recreated tag libreoffice-3.3.3.1 which had these commits:

commit d7e53cee633ec1c583c72e6d9c01122195c4383c (tag: refs/tags/libreoffice-3.3.3.1)
Author: Petr Mladek <pmladek@suse.cz>
Date:   Tue May 31 17:39:04 2011 +0200

    Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1)

2357 files changed, 40720 insertions, 40720 deletions

diff --git a/UnoControls/inc/basecontainercontrol.hxx b/UnoControls/inc/basecontainercontrol.hxx
index cc052ca67f5f..7cca0e972cd3 100644
--- a/UnoControls/inc/basecontainercontrol.hxx
+++ b/UnoControls/inc/basecontainercontrol.hxx
@@ -30,7 +30,7 @@
 #define _UNOCONTROLS_BASECONTAINERCONTROL_CTRL_HXX
 
 //____________________________________________________________________________________________________________
-//  includes of other projects
+//	includes of other projects
 //____________________________________________________________________________________________________________
 
 #include <com/sun/star/lang/XServiceName.hpp>
@@ -46,12 +46,12 @@
 #include <tools/list.hxx>
 
 //____________________________________________________________________________________________________________
-//  includes of my own project
+//	includes of my own project
 //____________________________________________________________________________________________________________
 #include "basecontrol.hxx"
 
 //____________________________________________________________________________________________________________
-//  "namespaces"
+//	"namespaces"
 //____________________________________________________________________________________________________________
 
 namespace unocontrols{
@@ -62,7 +62,7 @@ namespace unocontrols{
 #define CSS_CONTAINER   ::com::sun::star::container
 
 //____________________________________________________________________________________________________________
-//  structs, types, forwards
+//	structs, types, forwards
 //____________________________________________________________________________________________________________
 
 struct IMPL_ControlInfo
@@ -76,69 +76,69 @@ class IMPL_ControlInfoList ;
 DECLARE_LIST( IMPL_ControlInfoList, IMPL_ControlInfo* )
 
 //____________________________________________________________________________________________________________
-//  classes
+//	classes
 //____________________________________________________________________________________________________________
 
-class BaseContainerControl  : public CSS_AWT::XControlModel
+class BaseContainerControl	: public CSS_AWT::XControlModel
                             , public CSS_AWT::XControlContainer
                             , public BaseControl
 {
 
 //____________________________________________________________________________________________________________
-//  public methods
+//	public methods
 //____________________________________________________________________________________________________________
 
 public:
 
     //________________________________________________________________________________________________________
-    //  construct/destruct
+    //	construct/destruct
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
        BaseContainerControl( const CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory >& xFactory );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
-    virtual ~BaseContainerControl();
+    virtual	~BaseContainerControl();
 
     //________________________________________________________________________________________________________
-    //  XInterface
+    //	XInterface
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      give answer, if interface is supported
-        @descr      The interfaces are searched by type.
+        @short		give answer, if interface is supported
+        @descr		The interfaces are searched by type.
 
-        @seealso    XInterface
+        @seealso	XInterface
 
         @param      "rType" is the type of searched interface.
 
-        @return     Any     information about found interface
+        @return		Any		information about found interface
 
-        @onerror    A RuntimeException is thrown.
+        @onerror	A RuntimeException is thrown.
     */
 
     virtual CSS_UNO::Any SAL_CALL queryInterface(
@@ -146,40 +146,40 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
-    //  XTypeProvider
+    //	XTypeProvider
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      get information about supported interfaces
+        @short		get information about supported interfaces
         @descr      -
 
-        @seealso    XTypeProvider
+        @seealso	XTypeProvider
 
         @param      -
 
-        @return     Sequence of types of all supported interfaces
+        @return		Sequence of types of all supported interfaces
 
-        @onerror    A RuntimeException is thrown.
+        @onerror	A RuntimeException is thrown.
     */
 
     virtual CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getTypes()
         throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
-    //  XAggregation
+    //	XAggregation
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual CSS_UNO::Any SAL_CALL queryAggregation(
@@ -187,20 +187,20 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
-    //  XControl
+    //	XControl
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL createPeer(
@@ -209,16 +209,16 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual sal_Bool SAL_CALL setModel(
@@ -226,109 +226,109 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual CSS_UNO::Reference< CSS_AWT::XControlModel > SAL_CALL getModel()
         throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
-    //  XComponent
+    //	XComponent
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL dispose() throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
-    //  XEventListener
+    //	XEventListener
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL disposing( const CSS_LANG::EventObject& rEvent ) throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
-    //  XControlContainer
+    //	XControlContainer
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL addControl(
         const ::rtl::OUString&                            sName    ,
         const CSS_UNO::Reference< CSS_AWT::XControl >&    xControl
-    ) throw( CSS_UNO::RuntimeException  );
+    ) throw( CSS_UNO::RuntimeException	);
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
-    virtual void SAL_CALL addContainerListener(
+    virtual	void SAL_CALL addContainerListener(
         const CSS_UNO::Reference< CSS_CONTAINER::XContainerListener >& xListener
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL removeControl(
@@ -336,16 +336,16 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL removeContainerListener(
@@ -353,16 +353,16 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL setStatusText(
@@ -370,16 +370,16 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual CSS_UNO::Reference< CSS_AWT::XControl > SAL_CALL getControl(
@@ -387,36 +387,36 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual CSS_UNO::Sequence< CSS_UNO::Reference< CSS_AWT::XControl > > SAL_CALL getControls()
         throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
-    //  XUnoControlContainer
+    //	XUnoControlContainer
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL addTabController(
@@ -424,16 +424,16 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL removeTabController(
@@ -441,16 +441,16 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL setTabControllers(
@@ -458,42 +458,42 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual CSS_UNO::Sequence< CSS_UNO::Reference< CSS_AWT::XTabController > > SAL_CALL getTabControllers()
         throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
-    //  XWindow
+    //	XWindow
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( CSS_UNO::RuntimeException );
 
 //____________________________________________________________________________________________________________
-//  protected methods
+//	protected methods
 //____________________________________________________________________________________________________________
 
 protected:
@@ -531,11 +531,11 @@ protected:
     virtual void impl_paint(
         sal_Int32                                           nX ,
         sal_Int32                                           nY ,
-        const   CSS_UNO::Reference< CSS_AWT::XGraphics >&   xGraphics
+        const	CSS_UNO::Reference< CSS_AWT::XGraphics >&   xGraphics
     );
 
 //____________________________________________________________________________________________________________
-//  private methods
+//	private methods
 //____________________________________________________________________________________________________________
 
 private:
@@ -571,19 +571,19 @@ private:
     void impl_cleanMemory();
 
 //____________________________________________________________________________________________________________
-//  private variables
+//	private variables
 //____________________________________________________________________________________________________________
 
 private:
     // list of pointer of "struct IMPL_ControlInfo" to hold child-controls
-    IMPL_ControlInfoList*                                               m_pControlInfoList      ;
+    IMPL_ControlInfoList*									            m_pControlInfoList		;
 
     // list of references of XTabController to hold tab-order in this container
-    CSS_UNO::Sequence< CSS_UNO::Reference< CSS_AWT::XTabController > >  m_xTabControllerList    ;
+    CSS_UNO::Sequence< CSS_UNO::Reference< CSS_AWT::XTabController > >	m_xTabControllerList	;
 
-    ::cppu::OMultiTypeInterfaceContainerHelper                          m_aListeners            ;
+    ::cppu::OMultiTypeInterfaceContainerHelper					        m_aListeners			;
 
-};  // class BaseContainerControl
+};	// class BaseContainerControl
 
 // The namespace aliases are only used in this header
 #undef CSS_UNO
@@ -591,8 +591,8 @@ private:
 #undef CSS_LANG
 #undef CSS_CONTAINER
 
-}   // namespace unocontrols
+}	// namespace unocontrols
 
-#endif  // ifndef _UNOCONTROLS_BASECONTAINERCONTROL_CTRL_HXX
+#endif	// ifndef _UNOCONTROLS_BASECONTAINERCONTROL_CTRL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx
index e8eb59bce4ac..7c6196018f72 100644
--- a/UnoControls/inc/basecontrol.hxx
+++ b/UnoControls/inc/basecontrol.hxx
@@ -30,7 +30,7 @@
 #define _UNOCONTROLS_BASECONTROL_CTRL_HXX
 
 //____________________________________________________________________________________________________________
-//  includes of other projects
+//	includes of other projects
 //____________________________________________________________________________________________________________
 
 #include <com/sun/star/awt/XKeyListener.hpp>
@@ -101,12 +101,12 @@
 #include <cppuhelper/component.hxx>
 
 //____________________________________________________________________________________________________________
-//  includes of my project
+//	includes of my project
 //____________________________________________________________________________________________________________
 #include "multiplexer.hxx"
 
 //____________________________________________________________________________________________________________
-//  "namespaces"
+//	"namespaces"
 //____________________________________________________________________________________________________________
 
 namespace unocontrols{
@@ -116,14 +116,14 @@ namespace unocontrols{
 #define CSS_LANG    ::com::sun::star::lang
 
 //____________________________________________________________________________________________________________
-//  macros
+//	macros
 //____________________________________________________________________________________________________________
 
-#define TRGB_COLORDATA(TRANSPARENCE,RED,GREEN,BLUE) \
+#define TRGB_COLORDATA(TRANSPARENCE,RED,GREEN,BLUE)	\
         ((sal_Int32)(((sal_uInt32)((sal_uInt8)(BLUE))))|(((sal_uInt32)((sal_uInt8)(GREEN)))<<8)|(((sal_uInt32)((sal_uInt8)(RED)))<<16)|(((sal_uInt32)((sal_uInt8)(TRANSPARENCE)))<<24))
 
 //____________________________________________________________________________________________________________
-//  structs
+//	structs
 //____________________________________________________________________________________________________________
 
 struct IMPL_MutexContainer
@@ -133,10 +133,10 @@ struct IMPL_MutexContainer
 };
 
 //____________________________________________________________________________________________________________
-//  classes
+//	classes
 //____________________________________________________________________________________________________________
 
-class BaseControl   : public CSS_LANG::XServiceInfo
+class BaseControl	: public CSS_LANG::XServiceInfo
                     , public CSS_AWT::XPaintListener
                     , public CSS_AWT::XWindowListener
                     , public CSS_AWT::XView
@@ -146,60 +146,60 @@ class BaseControl   : public CSS_LANG::XServiceInfo
                     , public ::cppu::OComponentHelper
 {
 //____________________________________________________________________________________________________________
-//  public methods
+//	public methods
 //____________________________________________________________________________________________________________
 
 public:
 
     //________________________________________________________________________________________________________
-    //  construct/destruct
+    //	construct/destruct
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     BaseControl( const CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory >& xFactory );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
-    virtual ~BaseControl();
+    virtual	~BaseControl();
 
     //________________________________________________________________________________________________________
-    //  XInterface
+    //	XInterface
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      give answer, if interface is supported
-        @descr      The interfaces are searched by type.
+        @short		give answer, if interface is supported
+        @descr		The interfaces are searched by type.
 
-        @seealso    XInterface
+        @seealso	XInterface
 
         @param      "rType" is the type of searched interface.
 
-        @return     Any     information about found interface
+        @return		Any		information about found interface
 
-        @onerror    A RuntimeException is thrown.
+        @onerror	A RuntimeException is thrown.
     */
 
     virtual CSS_UNO::Any SAL_CALL queryInterface(
@@ -207,89 +207,89 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      increment refcount
-        @descr      -
+        @short		increment refcount
+        @descr		-
 
-        @seealso    XInterface
-        @seealso    release()
+        @seealso	XInterface
+        @seealso	release()
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    A RuntimeException is thrown.
+        @onerror	A RuntimeException is thrown.
     */
 
     virtual void SAL_CALL acquire() throw();
 
     /**_______________________________________________________________________________________________________
-        @short      decrement refcount
-        @descr      -
+        @short		decrement refcount
+        @descr		-
 
-        @seealso    XInterface
-        @seealso    acquire()
+        @seealso	XInterface
+        @seealso	acquire()
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    A RuntimeException is thrown.
+        @onerror	A RuntimeException is thrown.
     */
 
     virtual void SAL_CALL release() throw();
 
     //________________________________________________________________________________________________________
-    //  XTypeProvider
+    //	XTypeProvider
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      get information about supported interfaces
+        @short		get information about supported interfaces
         @descr      -
 
-        @seealso    XTypeProvider
+        @seealso	XTypeProvider
 
         @param      -
 
-        @return     Sequence of types of all supported interfaces
+        @return		Sequence of types of all supported interfaces
 
-        @onerror    A RuntimeException is thrown.
+        @onerror	A RuntimeException is thrown.
     */
 
     virtual CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getTypes()
         throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      get implementation id
+        @short		get implementation id
         @descr      This ID is neccessary for UNO-caching. If there no ID, cache is disabled.
                     Another way, cache is enabled.
 
-        @seealso    XTypeProvider
+        @seealso	XTypeProvider
 
-        @param      -
+        @param		-
 
-        @return     ID as Sequence of byte
+        @return		ID as Sequence of byte
 
-        @onerror    A RuntimeException is thrown.
+        @onerror	A RuntimeException is thrown.
     */
 
     virtual CSS_UNO::Sequence< sal_Int8 > SAL_CALL getImplementationId()
         throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
-    //  XAggregation
+    //	XAggregation
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL setDelegator(
@@ -297,16 +297,16 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual CSS_UNO::Any SAL_CALL queryAggregation(
@@ -314,20 +314,20 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
-    //  XServiceInfo
+    //	XServiceInfo
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual sal_Bool SAL_CALL supportsService(
@@ -335,67 +335,67 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual ::rtl::OUString SAL_CALL getImplementationName()
         throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual CSS_UNO::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
         throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
-    //  XComponent
+    //	XComponent
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL dispose() throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL addEventListener(
@@ -403,16 +403,16 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL removeEventListener(
@@ -420,20 +420,20 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
-    //  XControl
+    //	XControl
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL createPeer(
@@ -442,16 +442,16 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL setContext(
@@ -459,16 +459,16 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual sal_Bool SAL_CALL setModel(
@@ -476,208 +476,208 @@ public:
     ) throw( CSS_UNO::RuntimeException ) = 0 ;
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL setDesignMode( sal_Bool bOn ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual CSS_UNO::Reference< CSS_UNO::XInterface > SAL_CALL getContext()
         throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual CSS_UNO::Reference< CSS_AWT::XControlModel > SAL_CALL getModel()
         throw( CSS_UNO::RuntimeException ) = 0;
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual CSS_UNO::Reference< CSS_AWT::XWindowPeer > SAL_CALL getPeer()
         throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual CSS_UNO::Reference< CSS_AWT::XView > SAL_CALL getView()
         throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual sal_Bool SAL_CALL isDesignMode() throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual sal_Bool SAL_CALL isTransparent() throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
-    //  XWindow
+    //	XWindow
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
-    virtual void SAL_CALL setPosSize(   sal_Int32   nX      ,
-                                        sal_Int32   nY      ,
-                                        sal_Int32   nWidth  ,
-                                        sal_Int32   nHeight ,
-                                        sal_Int16   nFlags  ) throw( CSS_UNO::RuntimeException );
+    virtual void SAL_CALL setPosSize(	sal_Int32	nX		,
+                                        sal_Int32	nY		,
+                                        sal_Int32	nWidth	,
+                                        sal_Int32	nHeight	,
+                                        sal_Int16	nFlags	) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL setEnable( sal_Bool bEnable ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL setFocus() throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual CSS_AWT::Rectangle SAL_CALL getPosSize() throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL addWindowListener(
@@ -685,16 +685,16 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL addFocusListener(
@@ -702,16 +702,16 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL addKeyListener(
@@ -719,16 +719,16 @@ public:
     throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL addMouseListener(
@@ -736,16 +736,16 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL addMouseMotionListener(
@@ -753,16 +753,16 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL addPaintListener(
@@ -770,16 +770,16 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL removeWindowListener(
@@ -787,16 +787,16 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL removeFocusListener(
@@ -804,16 +804,16 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL removeKeyListener(
@@ -821,16 +821,16 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL removeMouseListener(
@@ -838,16 +838,16 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL removeMouseMotionListener(
@@ -855,16 +855,16 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL removePaintListener(
@@ -872,36 +872,36 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
-    //  XView
+    //	XView
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
-    virtual void SAL_CALL draw( sal_Int32   nX  ,
-                                sal_Int32   nY  ) throw( CSS_UNO::RuntimeException );
+    virtual void SAL_CALL draw(	sal_Int32	nX	,
+                                sal_Int32	nY	) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual sal_Bool SAL_CALL setGraphics(
@@ -909,67 +909,67 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
-    virtual void SAL_CALL setZoom(  float   fZoomX  ,
-                                    float   fZoomY  ) throw( CSS_UNO::RuntimeException );
+    virtual void SAL_CALL setZoom(	float	fZoomX	,
+                                    float	fZoomY	) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual CSS_UNO::Reference< CSS_AWT::XGraphics > SAL_CALL getGraphics()
         throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual CSS_AWT::Size SAL_CALL getSize() throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
-    //  CSS_LANG::XEventListener
+    //	CSS_LANG::XEventListener
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL disposing(
@@ -977,20 +977,20 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
-    //  XPaintListener
+    //	XPaintListener
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL windowPaint(
@@ -998,20 +998,20 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
-    //  XWindowListener
+    //	XWindowListener
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL windowResized( const CSS_AWT::WindowEvent& aEvent ) throw( CSS_UNO::RuntimeException );
@@ -1020,132 +1020,132 @@ public:
     virtual void SAL_CALL windowHidden( const CSS_LANG::EventObject& aEvent ) throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
-    //  impl but public method to register service
+    //	impl but public method to register service
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     static const CSS_UNO::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames();
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     static const ::rtl::OUString impl_getStaticImplementationName();
 
 //____________________________________________________________________________________________________________
-//  protected methods
+//	protected methods
 //____________________________________________________________________________________________________________
 
 protected:
     using OComponentHelper::disposing;
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     const CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory > impl_getMultiServiceFactory();
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     const CSS_UNO::Reference< CSS_AWT::XWindow > impl_getPeerWindow();
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     const CSS_UNO::Reference< CSS_AWT::XGraphics > impl_getGraphicsPeer();
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     const sal_Int32& impl_getWidth();
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     const sal_Int32& impl_getHeight();
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual CSS_AWT::WindowDescriptor* impl_getWindowDescriptor(
@@ -1153,120 +1153,120 @@ protected:
     );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
-    virtual void impl_paint(        sal_Int32               nX          ,
-                                    sal_Int32               nY          ,
-                            const   CSS_UNO::Reference< CSS_AWT::XGraphics >&   xGraphics   );
+    virtual void impl_paint(		sal_Int32				nX			,
+                                    sal_Int32				nY			,
+                            const	CSS_UNO::Reference< CSS_AWT::XGraphics >&	xGraphics	);
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void impl_recalcLayout( const CSS_AWT::WindowEvent& aEvent );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     CSS_UNO::Reference< CSS_UNO::XInterface > impl_getDelegator();
 
 //____________________________________________________________________________________________________________
-//  private methods
+//	private methods
 //____________________________________________________________________________________________________________
 
 private:
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     void impl_releasePeer();
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     OMRCListenerMultiplexerHelper* impl_getMultiplexer();
 
 //____________________________________________________________________________________________________________
-//  private variables
+//	private variables
 //____________________________________________________________________________________________________________
 
 private:
 
-    CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory >    m_xFactory              ;
-    CSS_UNO::Reference< CSS_UNO::XInterface >               m_xDelegator            ;
-    OMRCListenerMultiplexerHelper*                  m_pMultiplexer          ;   // multiplex events
-    CSS_UNO::Reference< CSS_UNO::XInterface >               m_xMultiplexer          ;
-    CSS_UNO::Reference< CSS_UNO::XInterface >               m_xContext              ;
-    CSS_UNO::Reference< CSS_AWT::XWindowPeer >              m_xPeer                 ;
-    CSS_UNO::Reference< CSS_AWT::XWindow >                  m_xPeerWindow           ;
-    CSS_UNO::Reference< CSS_AWT::XGraphics >                m_xGraphicsView         ;   // graphics for CSS_AWT::XView-operations
-    CSS_UNO::Reference< CSS_AWT::XGraphics >                m_xGraphicsPeer         ;   // graphics for painting on a peer
-    sal_Int32                                       m_nX                    ;   // Position ...
-    sal_Int32                                       m_nY                    ;
-    sal_Int32                                       m_nWidth                ;   // ... and size of window
-    sal_Int32                                       m_nHeight               ;
-    sal_Bool                                        m_bVisible              ;   // Some state flags
-    sal_Bool                                        m_bInDesignMode         ;
-    sal_Bool                                        m_bEnable               ;
-
-};  // class BaseControl
+    CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory > 	m_xFactory				;
+    CSS_UNO::Reference< CSS_UNO::XInterface > 				m_xDelegator			;
+    OMRCListenerMultiplexerHelper*					m_pMultiplexer			;	// multiplex events
+    CSS_UNO::Reference< CSS_UNO::XInterface > 				m_xMultiplexer			;
+    CSS_UNO::Reference< CSS_UNO::XInterface > 				m_xContext				;
+    CSS_UNO::Reference< CSS_AWT::XWindowPeer > 				m_xPeer					;
+    CSS_UNO::Reference< CSS_AWT::XWindow > 					m_xPeerWindow			;
+    CSS_UNO::Reference< CSS_AWT::XGraphics > 				m_xGraphicsView			;	// graphics for CSS_AWT::XView-operations
+    CSS_UNO::Reference< CSS_AWT::XGraphics > 				m_xGraphicsPeer			;	// graphics for painting on a peer
+    sal_Int32										m_nX					;	// Position ...
+    sal_Int32										m_nY					;
+    sal_Int32										m_nWidth				;	// ... and size of window
+    sal_Int32										m_nHeight				;
+    sal_Bool										m_bVisible				;	// Some state flags
+    sal_Bool										m_bInDesignMode			;
+    sal_Bool										m_bEnable				;
+
+};	// class BaseControl
 
 // The namespace aliaes are only used in this header
 #undef CSS_UNO
 #undef CSS_AWT
 #undef CSS_LANG
 
-}   // namespace unocontrols
+}	// namespace unocontrols
 
-#endif  // ifndef _UNOCONTROLS_BASECONTROL_CTRL_HXX
+#endif	// ifndef _UNOCONTROLS_BASECONTROL_CTRL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/inc/multiplexer.hxx b/UnoControls/inc/multiplexer.hxx
index b9a90c5a33f1..eac5085c2cab 100644
--- a/UnoControls/inc/multiplexer.hxx
+++ b/UnoControls/inc/multiplexer.hxx
@@ -30,7 +30,7 @@
 #define _UNOCONTROLS_MULTIPLEXER_HXX
 
 //____________________________________________________________________________________________________________
-//  includes of other projects
+//	includes of other projects
 //____________________________________________________________________________________________________________
 
 #include <com/sun/star/awt/XKeyListener.hpp>
@@ -59,11 +59,11 @@
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 //____________________________________________________________________________________________________________
-//  includes of my own project
+//	includes of my own project
 //____________________________________________________________________________________________________________
 
 //____________________________________________________________________________________________________________
-//  "namespaces"
+//	"namespaces"
 //____________________________________________________________________________________________________________
 
 namespace unocontrols{
@@ -73,10 +73,10 @@ namespace unocontrols{
 #define CSS_LANG    ::com::sun::star::lang
 
 //____________________________________________________________________________________________________________
-//  class
+//	class
 //____________________________________________________________________________________________________________
 
-class OMRCListenerMultiplexerHelper : public CSS_AWT::XFocusListener
+class OMRCListenerMultiplexerHelper	: public CSS_AWT::XFocusListener
                                     , public CSS_AWT::XWindowListener
                                     , public CSS_AWT::XKeyListener
                                     , public CSS_AWT::XMouseListener
@@ -87,689 +87,689 @@ class OMRCListenerMultiplexerHelper : public CSS_AWT::XFocusListener
 {
 
 //____________________________________________________________________________________________________________
-//  public methods
+//	public methods
 //____________________________________________________________________________________________________________
 
 public:
 
     //________________________________________________________________________________________________________
-    //  construct/destruct
+    //	construct/destruct
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      constructor
-        @descr      Create a Multiplexer of XWindowEvents.
+        @short		constructor
+        @descr		Create a Multiplexer of XWindowEvents.
 
-        @seealso    -
+        @seealso	-
 
-        @param      rControl    The control. All listeners think that this is the original broadcaster.
-        @param      rPeer       The peer from which the original events are dispatched. Null is allowed.
+        @param		rControl	The control. All listeners think that this is the original broadcaster.
+        @param		rPeer		The peer from which the original events are dispatched. Null is allowed.
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
-    OMRCListenerMultiplexerHelper(  const   CSS_UNO::Reference< CSS_AWT::XWindow >& xControl    ,
-                                    const   CSS_UNO::Reference< CSS_AWT::XWindow >& xPeer       );
+    OMRCListenerMultiplexerHelper(	const	CSS_UNO::Reference< CSS_AWT::XWindow >&	xControl	,
+                                    const	CSS_UNO::Reference< CSS_AWT::XWindow >&	xPeer		);
 
     /**_______________________________________________________________________________________________________
-        @short      copy-constructor
+        @short		copy-constructor
         @descr
 
-        @seealso    -
+        @seealso	-
 
-        @param      rCopyInstance   C++-Reference to instance to make copy from.
+        @param		rCopyInstance	C++-Reference to instance to make copy from.
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     OMRCListenerMultiplexerHelper( const OMRCListenerMultiplexerHelper& aCopyInstance );
 
     /**_______________________________________________________________________________________________________
-        @short      destructor
-        @descr      -
+        @short		destructor
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     ~OMRCListenerMultiplexerHelper();
 
     //________________________________________________________________________________________________________
-    //  XInterface
+    //	XInterface
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      give answer, if interface is supported
-        @descr      The interfaces are searched by type.
+        @short		give answer, if interface is supported
+        @descr		The interfaces are searched by type.
 
-        @seealso    XInterface
+        @seealso	XInterface
 
         @param      "rType" is the type of searched interface.
 
-        @return     Any     information about found interface
+        @return		Any		information about found interface
 
-        @onerror    A RuntimeException is thrown.
+        @onerror	A RuntimeException is thrown.
     */
 
     virtual CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType )
         throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      increment refcount
-        @descr      -
+        @short		increment refcount
+        @descr		-
 
-        @seealso    XInterface
-        @seealso    release()
+        @seealso	XInterface
+        @seealso	release()
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    A RuntimeException is thrown.
+        @onerror	A RuntimeException is thrown.
     */
 
     virtual void SAL_CALL acquire() throw();
 
     /**_______________________________________________________________________________________________________
-        @short      decrement refcount
-        @descr      -
+        @short		decrement refcount
+        @descr		-
 
-        @seealso    XInterface
-        @seealso    acquire()
+        @seealso	XInterface
+        @seealso	acquire()
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    A RuntimeException is thrown.
+        @onerror	A RuntimeException is thrown.
     */
 
     virtual void SAL_CALL release() throw();
 
     //________________________________________________________________________________________________________
-    //  operator
+    //	operator
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     operator CSS_UNO::Reference< CSS_UNO::XInterface >() const;
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     OMRCListenerMultiplexerHelper& operator= ( const OMRCListenerMultiplexerHelper& aCopyInstance );
 
     //________________________________________________________________________________________________________
-    //  container methods
+    //	container methods
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      Remove all listeners from the previous set peer and add the needed listeners to rPeer.
-        @descr      -
+        @short		Remove all listeners from the previous set peer and add the needed listeners to rPeer.
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      rPeer       The peer from which the original events are dispatched. Null is allowed.
+        @param		rPeer		The peer from which the original events are dispatched. Null is allowed.
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     void setPeer( const CSS_UNO::Reference< CSS_AWT::XWindow >& xPeer );
 
     /**_______________________________________________________________________________________________________
-        @short      Remove all listeners and send a disposing message.
-        @descr      -
+        @short		Remove all listeners and send a disposing message.
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     void disposeAndClear();
 
     /**_______________________________________________________________________________________________________
-        @short      Add the specified listener to the source.
-        @descr      -
+        @short		Add the specified listener to the source.
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
-    void advise(    const   CSS_UNO::Type&                              aType       ,
-                    const   CSS_UNO::Reference< CSS_UNO::XInterface >&  xListener   );
+    void advise(	const	CSS_UNO::Type&                              aType		,
+                    const	CSS_UNO::Reference< CSS_UNO::XInterface >&  xListener	);
 
     /**_______________________________________________________________________________________________________
-        @short      Remove the specified listener from the source.
-        @descr      -
+        @short		Remove the specified listener from the source.
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
-    void unadvise(  const   CSS_UNO::Type&                              aType       ,
-                    const   CSS_UNO::Reference< CSS_UNO::XInterface >&  xListener   );
+    void unadvise(	const	CSS_UNO::Type&                              aType		,
+                    const	CSS_UNO::Reference< CSS_UNO::XInterface >&  xListener	);
 
     //________________________________________________________________________________________________________
-    //  XEventListener
+    //	XEventListener
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
-        @seealso    -
+        @seealso	-
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL disposing(const CSS_LANG::EventObject& aSource)
         throw( CSS_UNO::RuntimeException ) ;
 
     //________________________________________________________________________________________________________
-    //  XFocusListener
+    //	XFocusListener
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
-        @seealso    -
+        @seealso	-
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL focusGained(const CSS_AWT::FocusEvent& aEvent )
         throw( CSS_UNO::RuntimeException ) ;
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
-        @seealso    -
+        @seealso	-
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL focusLost(const CSS_AWT::FocusEvent& aEvent )
         throw( CSS_UNO::RuntimeException ) ;
 
     //________________________________________________________________________________________________________
-    //  XWindowListener
+    //	XWindowListener
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
-        @seealso    -
+        @seealso	-
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL windowResized(const CSS_AWT::WindowEvent& aEvent )
         throw( CSS_UNO::RuntimeException ) ;
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
-        @seealso    -
+        @seealso	-
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL windowMoved(const CSS_AWT::WindowEvent& aEvent )
         throw( CSS_UNO::RuntimeException ) ;
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
-        @seealso    -
+        @seealso	-
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL windowShown(const CSS_LANG::EventObject& aEvent )
         throw( CSS_UNO::RuntimeException ) ;
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
-        @seealso    -
+        @seealso	-
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL windowHidden(const CSS_LANG::EventObject& aEvent )
         throw( CSS_UNO::RuntimeException ) ;
 
     //________________________________________________________________________________________________________
-    //  XKeyListener
+    //	XKeyListener
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
-        @seealso    -
+        @seealso	-
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL keyPressed( const CSS_AWT::KeyEvent& aEvent )
         throw( CSS_UNO::RuntimeException ) ;
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
-        @seealso    -
+        @seealso	-
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL keyReleased( const CSS_AWT::KeyEvent& aEvent )
         throw( CSS_UNO::RuntimeException ) ;
 
     //________________________________________________________________________________________________________
-    //  XMouseListener
+    //	XMouseListener
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
-        @seealso    -
+        @seealso	-
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL mousePressed(const CSS_AWT::MouseEvent& aEvent )
         throw( CSS_UNO::RuntimeException ) ;
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
-        @seealso    -
+        @seealso	-
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL mouseReleased(const CSS_AWT::MouseEvent& aEvent )
         throw( CSS_UNO::RuntimeException ) ;
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
-        @seealso    -
+        @seealso	-
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL mouseEntered(const CSS_AWT::MouseEvent& aEvent )
         throw( CSS_UNO::RuntimeException ) ;
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
-        @seealso    -
+        @seealso	-
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL mouseExited(const CSS_AWT::MouseEvent& aEvent )
         throw( CSS_UNO::RuntimeException ) ;
 
     //________________________________________________________________________________________________________
-    //  XMouseMotionListener
+    //	XMouseMotionListener
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
-        @seealso    -
+        @seealso	-
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL mouseDragged(const CSS_AWT::MouseEvent& aEvent )
         throw( CSS_UNO::RuntimeException ) ;
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
-        @seealso    -
+        @seealso	-
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL mouseMoved(const CSS_AWT::MouseEvent& aEvent )
         throw( CSS_UNO::RuntimeException ) ;
 
     //________________________________________________________________________________________________________
-    //  XPaintListener
+    //	XPaintListener
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
-        @seealso    -
+        @seealso	-
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL windowPaint(const CSS_AWT::PaintEvent& aEvent )
         throw( CSS_UNO::RuntimeException ) ;
 
     //________________________________________________________________________________________________________
-    //  XTopWindowListener
+    //	XTopWindowListener
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
-        @seealso    -
+        @seealso	-
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL windowOpened( const CSS_LANG::EventObject& aEvent )
         throw( CSS_UNO::RuntimeException ) ;
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
-        @seealso    -
+        @seealso	-
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL windowClosing( const CSS_LANG::EventObject& aEvent )
         throw( CSS_UNO::RuntimeException ) ;
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
-        @seealso    -
+        @seealso	-
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL windowClosed( const CSS_LANG::EventObject& aEvent )
         throw( CSS_UNO::RuntimeException ) ;
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
-        @seealso    -
+        @seealso	-
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL windowMinimized( const CSS_LANG::EventObject& aEvent )
         throw( CSS_UNO::RuntimeException ) ;
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
-        @seealso    -
+        @seealso	-
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL windowNormalized( const CSS_LANG::EventObject& aEvent )
         throw( CSS_UNO::RuntimeException ) ;
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
-        @seealso    -
+        @seealso	-
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL windowActivated( const CSS_LANG::EventObject& aEvent )
         throw( CSS_UNO::RuntimeException ) ;
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
-        @seealso    -
+        @seealso	-
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL windowDeactivated( const CSS_LANG::EventObject& aEvent )
         throw( CSS_UNO::RuntimeException ) ;
 
 //____________________________________________________________________________________________________________
-//  protected methods
+//	protected methods
 //____________________________________________________________________________________________________________
 
 protected:
 
     /**_______________________________________________________________________________________________________
-        @short      Remove the listener from the peer.
-        @descr      -
+        @short		Remove the listener from the peer.
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      xPeer   The peer from which the listener is removed.
-        @param      rType   The listener type, which specify the type of the listener.
+        @param		xPeer	The peer from which the listener is removed.
+        @param		rType	The listener type, which specify the type of the listener.
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
-    void impl_adviseToPeer( const   CSS_UNO::Reference< CSS_AWT::XWindow >& xPeer   ,
-                            const   CSS_UNO::Type&                          aType   );
+    void impl_adviseToPeer(	const	CSS_UNO::Reference< CSS_AWT::XWindow >&	xPeer	,
+                            const	CSS_UNO::Type&		    				aType	);
 
     /**_______________________________________________________________________________________________________
-        @short      Add the listener to the peer.
-        @descr      -
+        @short		Add the listener to the peer.
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      xPeer   The peer to which the listener is added.
-        @param      rType   The listener type, which specify the type of the listener.
+        @param		xPeer	The peer to which the listener is added.
+        @param		rType	The listener type, which specify the type of the listener.
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
-    void impl_unadviseFromPeer( const   CSS_UNO::Reference< CSS_AWT::XWindow >& xPeer   ,
-                                const   CSS_UNO::Type&                          aType   );
+    void impl_unadviseFromPeer(	const	CSS_UNO::Reference< CSS_AWT::XWindow >&	xPeer	,
+                                const	CSS_UNO::Type&  						aType	);
 
 //____________________________________________________________________________________________________________
-//  private variables
+//	private variables
 //____________________________________________________________________________________________________________
 
 private:
 
-    ::osl::Mutex                                m_aMutex            ;
-    CSS_UNO::Reference< CSS_AWT::XWindow >      m_xPeer             ;   /// The source of the events. Normally this is the peer object.
-    CSS_UNO::WeakReference< CSS_AWT::XWindow >  m_xControl          ;
-    ::cppu::OMultiTypeInterfaceContainerHelper  m_aListenerHolder   ;
+    ::osl::Mutex                                m_aMutex			;
+    CSS_UNO::Reference< CSS_AWT::XWindow >      m_xPeer				;	/// The source of the events. Normally this is the peer object.
+    CSS_UNO::WeakReference< CSS_AWT::XWindow >  m_xControl			;
+    ::cppu::OMultiTypeInterfaceContainerHelper  m_aListenerHolder	;
 
-};  // class OMRCListenerMultiplexerHelper
+};	// class OMRCListenerMultiplexerHelper
 
 // The namespace aliases are only used in this header
 #undef CSS_UNO
@@ -777,8 +777,8 @@ private:
 #undef CSS_LANG
 
 
-}   // namespace unocontrols
+}	// namespace unocontrols
 
-#endif  // ifndef _UNOCONTROLS_MULTIPLEXER_HXX
+#endif	// ifndef _UNOCONTROLS_MULTIPLEXER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/base/basecontainercontrol.cxx b/UnoControls/source/base/basecontainercontrol.cxx
index 8709f3c3f331..f85dac6649ea 100644
--- a/UnoControls/source/base/basecontainercontrol.cxx
+++ b/UnoControls/source/base/basecontainercontrol.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,41 +27,41 @@
  ************************************************************************/
 
 //____________________________________________________________________________________________________________
-//  my own includes
+//	my own includes
 //____________________________________________________________________________________________________________
 
 #include "basecontainercontrol.hxx"
 
 //____________________________________________________________________________________________________________
-//  includes of other projects
+//	includes of other projects
 //____________________________________________________________________________________________________________
 #include <cppuhelper/typeprovider.hxx>
 
 //____________________________________________________________________________________________________________
-//  includes of my own project
+//	includes of my own project
 //____________________________________________________________________________________________________________
 
 //____________________________________________________________________________________________________________
-//  namespaces
+//	namespaces
 //____________________________________________________________________________________________________________
 
-using namespace ::cppu                      ;
-using namespace ::osl                       ;
-using namespace ::rtl                       ;
-using namespace ::com::sun::star::uno       ;
-using namespace ::com::sun::star::lang      ;
-using namespace ::com::sun::star::awt       ;
-using namespace ::com::sun::star::container ;
+using namespace ::cppu						;
+using namespace ::osl						;
+using namespace ::rtl						;
+using namespace ::com::sun::star::uno		;
+using namespace ::com::sun::star::lang		;
+using namespace ::com::sun::star::awt		;
+using namespace ::com::sun::star::container	;
 
 namespace unocontrols{
 
 //____________________________________________________________________________________________________________
-//  construct/destruct
+//	construct/destruct
 //____________________________________________________________________________________________________________
 
 BaseContainerControl::BaseContainerControl( const Reference< XMultiServiceFactory >& xFactory )
-    : BaseControl   ( xFactory  )
-    , m_aListeners  ( m_aMutex  )
+    : BaseControl	( xFactory	)
+    , m_aListeners	( m_aMutex	)
 {
     // initialize info list for controls
     m_pControlInfoList = new IMPL_ControlInfoList ;
@@ -73,13 +73,13 @@ BaseContainerControl::~BaseContainerControl()
 }
 
 //____________________________________________________________________________________________________________
-//  XInterface
+//	XInterface
 //____________________________________________________________________________________________________________
 
 Any SAL_CALL BaseContainerControl::queryInterface( const Type& rType ) throw( RuntimeException )
 {
     // Attention:
-    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+    //	Don't use mutex or guard in this method!!! Is a method of XInterface.
     Any aReturn ;
     Reference< XInterface > xDel = BaseControl::impl_getDelegator();
     if ( xDel.is() == sal_True )
@@ -98,7 +98,7 @@ Any SAL_CALL BaseContainerControl::queryInterface( const Type& rType ) throw( Ru
 }
 
 //____________________________________________________________________________________________________________
-//  XTypeProvider
+//	XTypeProvider
 //____________________________________________________________________________________________________________
 
 Sequence< Type > SAL_CALL BaseContainerControl::getTypes() throw( RuntimeException )
@@ -117,8 +117,8 @@ Sequence< Type > SAL_CALL BaseContainerControl::getTypes() throw( RuntimeExcepti
         if ( pTypeCollection == NULL )
         {
             // Create a static typecollection ...
-            static OTypeCollection aTypeCollection  (   ::getCppuType(( const Reference< XControlModel      >*)NULL )   ,
-                                                          ::getCppuType(( const Reference< XControlContainer    >*)NULL )   ,
+            static OTypeCollection aTypeCollection	(	::getCppuType(( const Reference< XControlModel		>*)NULL )	,
+                                                          ::getCppuType(( const Reference< XControlContainer	>*)NULL )	,
                                                         BaseControl::getTypes()
                                                     );
             // ... and set his address to static pointer!
@@ -130,16 +130,16 @@ Sequence< Type > SAL_CALL BaseContainerControl::getTypes() throw( RuntimeExcepti
 }
 
 //____________________________________________________________________________________________________________
-//  XAggregation
+//	XAggregation
 //____________________________________________________________________________________________________________
 
 Any SAL_CALL BaseContainerControl::queryAggregation( const Type& aType ) throw( RuntimeException )
 {
     // Ask for my own supported interfaces ...
     // Attention: XTypeProvider and XInterface are supported by OComponentHelper!
-    Any aReturn ( ::cppu::queryInterface(   aType                                       ,
-                                               static_cast< XControlModel*      > ( this )  ,
-                                               static_cast< XControlContainer*  > ( this )
+    Any aReturn	( ::cppu::queryInterface(	aType										,
+                                               static_cast< XControlModel*		> ( this )	,
+                                               static_cast< XControlContainer*	> ( this )
                                         )
                 );
 
@@ -157,11 +157,11 @@ Any SAL_CALL BaseContainerControl::queryAggregation( const Type& aType ) throw(
 }
 
 //____________________________________________________________________________________________________________
-//  XControl
+//	XControl
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseContainerControl::createPeer( const   Reference< XToolkit >&      xToolkit    ,
-                                                const   Reference< XWindowPeer >&   xParent     ) throw( RuntimeException )
+void SAL_CALL BaseContainerControl::createPeer(	const	Reference< XToolkit >&		xToolkit	,
+                                                const	Reference< XWindowPeer >&	xParent		) throw( RuntimeException )
 {
     if ( getPeer().is() == sal_False )
     {
@@ -169,8 +169,8 @@ void SAL_CALL BaseContainerControl::createPeer( const   Reference< XToolkit >&
         BaseControl::createPeer( xToolkit, xParent );
 
         // create peers at all childs
-        Sequence< Reference< XControl > >   seqControlList  = getControls();
-        sal_uInt32                          nControls       = seqControlList.getLength();
+        Sequence< Reference< XControl > >	seqControlList	= getControls();
+        sal_uInt32							nControls		= seqControlList.getLength();
 
         for ( sal_uInt32 n=0; n<nControls; n++ )
         {
@@ -190,7 +190,7 @@ void SAL_CALL BaseContainerControl::createPeer( const   Reference< XToolkit >&
 }
 
 //____________________________________________________________________________________________________________
-//  XControl
+//	XControl
 //____________________________________________________________________________________________________________
 
 sal_Bool SAL_CALL BaseContainerControl::setModel( const Reference< XControlModel >& ) throw( RuntimeException )
@@ -200,7 +200,7 @@ sal_Bool SAL_CALL BaseContainerControl::setModel( const Reference< XControlModel
 }
 
 //____________________________________________________________________________________________________________
-//  XControl
+//	XControl
 //____________________________________________________________________________________________________________
 
 Reference< XControlModel > SAL_CALL BaseContainerControl::getModel() throw( RuntimeException )
@@ -211,7 +211,7 @@ Reference< XControlModel > SAL_CALL BaseContainerControl::getModel() throw( Runt
 }
 
 //____________________________________________________________________________________________________________
-//  XComponent
+//	XComponent
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseContainerControl::dispose() throw( RuntimeException )
@@ -223,17 +223,17 @@ void SAL_CALL BaseContainerControl::dispose() throw( RuntimeException )
     MutexGuard aGuard( m_aMutex );
 
     // remove listeners
-    EventObject aObject ;
+    EventObject	aObject ;
 
     aObject.Source = Reference< XComponent > ( (XControlContainer*)this, UNO_QUERY );
     m_aListeners.disposeAndClear( aObject );
 
     // remove controls
-    Sequence< Reference< XControl > >   seqCtrls    =   getControls();
-    Reference< XControl > *             pCtrls      =   seqCtrls.getArray();
-    sal_uInt32                          nCtrls      =   seqCtrls.getLength();
-    sal_uInt32                          nMaxCount   =   m_pControlInfoList->Count();
-    sal_uInt32                          nCount      =   0;
+    Sequence< Reference< XControl > >	seqCtrls	=	getControls();
+    Reference< XControl > *				pCtrls		=	seqCtrls.getArray();
+    sal_uInt32							nCtrls		=	seqCtrls.getLength();
+    sal_uInt32							nMaxCount	=	m_pControlInfoList->Count();
+    sal_uInt32							nCount		=	0;
 
     for ( nCount = 0; nCount < nMaxCount; ++nCount )
     {
@@ -244,8 +244,8 @@ void SAL_CALL BaseContainerControl::dispose() throw( RuntimeException )
 
     for ( nCount = 0; nCount < nCtrls; ++nCount )
     {
-        pCtrls [ nCount ] -> removeEventListener    ( static_cast< XEventListener* >( static_cast< XWindowListener* >( this ) ) ) ;
-        pCtrls [ nCount ] -> dispose                (       ) ;
+        pCtrls [ nCount ] -> removeEventListener	( static_cast< XEventListener* >( static_cast< XWindowListener* >( this ) )	) ;
+        pCtrls [ nCount ] -> dispose				(		) ;
     }
 
     // call baseclass
@@ -253,7 +253,7 @@ void SAL_CALL BaseContainerControl::dispose() throw( RuntimeException )
 }
 
 //____________________________________________________________________________________________________________
-//  XEventListener
+//	XEventListener
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseContainerControl::disposing( const EventObject& rEvent ) throw( RuntimeException )
@@ -265,7 +265,7 @@ void SAL_CALL BaseContainerControl::disposing( const EventObject& rEvent ) throw
 }
 
 //____________________________________________________________________________________________________________
-//  XControlContainer
+//	XControlContainer
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseContainerControl::addControl ( const OUString& rName, const Reference< XControl > & rControl ) throw( RuntimeException )
@@ -282,15 +282,15 @@ void SAL_CALL BaseContainerControl::addControl ( const OUString& rName, const Re
         MutexGuard aGuard (m_aMutex) ;
 
         // set control
-        pNewControl->sName      = rName     ;
-        pNewControl->xControl   = rControl  ;
+        pNewControl->sName		= rName 	;
+        pNewControl->xControl	= rControl	;
 
         // and insert in list
         m_pControlInfoList->Insert ( pNewControl, LIST_APPEND ) ;
 
         // initialize new control
-        pNewControl->xControl->setContext       ( (OWeakObject*)this    ) ;
-        pNewControl->xControl->addEventListener ( static_cast< XEventListener* >( static_cast< XWindowListener* >( this ) ) ) ;
+        pNewControl->xControl->setContext		( (OWeakObject*)this	) ;
+        pNewControl->xControl->addEventListener	( static_cast< XEventListener* >( static_cast< XWindowListener* >( this ) ) ) ;
 
         // when container has a peer ...
         if (getPeer().is())
@@ -306,13 +306,13 @@ void SAL_CALL BaseContainerControl::addControl ( const OUString& rName, const Re
         if (pInterfaceContainer)
         {
             // Build event
-            ContainerEvent  aEvent ;
+            ContainerEvent	aEvent ;
 
-            aEvent.Source   = *this     ;
+            aEvent.Source	= *this		;
             aEvent.Element <<= rControl ;
 
             // Get all listener
-            OInterfaceIteratorHelper    aIterator (*pInterfaceContainer) ;
+            OInterfaceIteratorHelper	aIterator (*pInterfaceContainer) ;
 
             // Send event
             while ( aIterator.hasMoreElements() )
@@ -324,7 +324,7 @@ void SAL_CALL BaseContainerControl::addControl ( const OUString& rName, const Re
 }
 
 //____________________________________________________________________________________________________________
-//  XControlContainer
+//	XControlContainer
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseContainerControl::addContainerListener ( const Reference< XContainerListener > & rListener ) throw( RuntimeException )
@@ -336,7 +336,7 @@ void SAL_CALL BaseContainerControl::addContainerListener ( const Reference< XCon
 }
 
 //____________________________________________________________________________________________________________
-//  XControlContainer
+//	XControlContainer
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseContainerControl::removeControl ( const Reference< XControl > & rControl ) throw( RuntimeException )
@@ -355,8 +355,8 @@ void SAL_CALL BaseContainerControl::removeControl ( const Reference< XControl >
             if ( rControl == pControl->xControl )
             {
                 //.is it found ... remove listener from control
-                pControl->xControl->removeEventListener (static_cast< XEventListener* >( static_cast< XWindowListener* >( this ) )) ;
-                pControl->xControl->setContext          ( Reference< XInterface >  ()   ) ;
+                pControl->xControl->removeEventListener	(static_cast< XEventListener* >( static_cast< XWindowListener* >( this ) )) ;
+                pControl->xControl->setContext			( Reference< XInterface >  ()	) ;
 
                 // ... free memory
                 delete pControl ;
@@ -367,12 +367,12 @@ void SAL_CALL BaseContainerControl::removeControl ( const Reference< XControl >
 
                 if (pInterfaceContainer)
                 {
-                    ContainerEvent  aEvent ;
+                    ContainerEvent	aEvent ;
 
-                    aEvent.Source    = *this    ;
-                    aEvent.Element <<= rControl ;
+                    aEvent.Source	 = *this	;
+                    aEvent.Element <<= rControl	;
 
-                    OInterfaceIteratorHelper    aIterator (*pInterfaceContainer) ;
+                    OInterfaceIteratorHelper	aIterator (*pInterfaceContainer) ;
 
                     while ( aIterator.hasMoreElements() )
                     {
@@ -387,7 +387,7 @@ void SAL_CALL BaseContainerControl::removeControl ( const Reference< XControl >
 }
 
 //____________________________________________________________________________________________________________
-//  XControlContainer
+//	XControlContainer
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseContainerControl::removeContainerListener ( const Reference< XContainerListener > & rListener ) throw( RuntimeException )
@@ -399,13 +399,13 @@ void SAL_CALL BaseContainerControl::removeContainerListener ( const Reference< X
 }
 
 //____________________________________________________________________________________________________________
-//  XControlContainer
+//	XControlContainer
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseContainerControl::setStatusText ( const OUString& rStatusText ) throw( RuntimeException )
 {
     // go down to each parent
-    Reference< XControlContainer >  xContainer ( getContext(), UNO_QUERY ) ;
+    Reference< XControlContainer > 	xContainer ( getContext(), UNO_QUERY ) ;
 
     if ( xContainer.is () )
     {
@@ -414,16 +414,16 @@ void SAL_CALL BaseContainerControl::setStatusText ( const OUString& rStatusText
 }
 
 //____________________________________________________________________________________________________________
-//  XControlContainer
+//	XControlContainer
 //____________________________________________________________________________________________________________
 
-Reference< XControl > SAL_CALL BaseContainerControl::getControl ( const OUString& rName ) throw( RuntimeException )
+Reference< XControl > SAL_CALL BaseContainerControl::getControl ( const OUString& rName	) throw( RuntimeException )
 {
     // Ready for multithreading
-    MutexGuard  aGuard ( Mutex::getGlobalMutex() ) ;
+    MutexGuard	aGuard ( Mutex::getGlobalMutex() ) ;
 
-    Reference< XControl >  xRetControl  =   Reference< XControl >       () ;
-    sal_uInt32              nControls   =   m_pControlInfoList->Count   () ;
+    Reference< XControl >  xRetControl	=	Reference< XControl >  		() ;
+    sal_uInt32				nControls	=	m_pControlInfoList->Count	() ;
 
     // Search for right control
     for( sal_uInt32 nCount = 0; nCount < nControls; ++nCount )
@@ -443,18 +443,18 @@ Reference< XControl > SAL_CALL BaseContainerControl::getControl ( const OUString
 }
 
 //____________________________________________________________________________________________________________
-//  XControlContainer
+//	XControlContainer
 //____________________________________________________________________________________________________________
 
 Sequence< Reference< XControl > > SAL_CALL BaseContainerControl::getControls () throw( RuntimeException )
 {
     // Ready for multithreading
-    MutexGuard  aGuard ( Mutex::getGlobalMutex() ) ;
+    MutexGuard	aGuard ( Mutex::getGlobalMutex() ) ;
 
-    sal_uInt32                          nControls       = m_pControlInfoList->Count ()  ;
-    Sequence< Reference< XControl > >   aDescriptor     ( nControls )                   ;
-    Reference< XControl > *             pDestination    = aDescriptor.getArray ()       ;
-    sal_uInt32                          nCount          = 0                             ;
+    sal_uInt32							nControls		= m_pControlInfoList->Count ()	;
+    Sequence< Reference< XControl > >	aDescriptor		( nControls )					;
+    Reference< XControl > *				pDestination	= aDescriptor.getArray ()		;
+    sal_uInt32							nCount			= 0								;
 
     // Copy controls to sequence
     for( nCount = 0; nCount < nControls; ++nCount )
@@ -468,7 +468,7 @@ Sequence< Reference< XControl > > SAL_CALL BaseContainerControl::getControls ()
 }
 
 //____________________________________________________________________________________________________________
-//  XUnoControlContainer
+//	XUnoControlContainer
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseContainerControl::addTabController ( const Reference< XTabController > & rTabController ) throw( RuntimeException )
@@ -476,9 +476,9 @@ void SAL_CALL BaseContainerControl::addTabController ( const Reference< XTabCont
     // Ready for multithreading
     MutexGuard aGuard (m_aMutex) ;
 
-    sal_uInt32                                  nOldCount   = m_xTabControllerList.getLength () ;
-    Sequence< Reference< XTabController >  >    aNewList    ( nOldCount + 1 )                   ;
-    sal_uInt32                                  nCount      = 0                                 ;
+    sal_uInt32									nOldCount	= m_xTabControllerList.getLength () ;
+    Sequence< Reference< XTabController >  >	aNewList	( nOldCount + 1 ) 					;
+    sal_uInt32									nCount		= 0									;
 
     // Copy old elements of sequence to new list.
     for ( nCount = 0; nCount < nOldCount; ++nCount )
@@ -494,7 +494,7 @@ void SAL_CALL BaseContainerControl::addTabController ( const Reference< XTabCont
 }
 
 //____________________________________________________________________________________________________________
-//  XUnoControlContainer
+//	XUnoControlContainer
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseContainerControl::removeTabController ( const Reference< XTabController > & rTabController ) throw( RuntimeException )
@@ -502,8 +502,8 @@ void SAL_CALL BaseContainerControl::removeTabController ( const Reference< XTabC
     // Ready for multithreading
     MutexGuard aGuard (m_aMutex) ;
 
-    sal_uInt32  nMaxCount   = m_xTabControllerList.getLength () ;
-    sal_uInt32  nCount      = 0                                 ;
+    sal_uInt32	nMaxCount	= m_xTabControllerList.getLength ()	;
+    sal_uInt32	nCount		= 0									;
 
     // Search right tabcontroller ...
     for ( nCount = 0; nCount < nMaxCount; ++nCount )
@@ -518,7 +518,7 @@ void SAL_CALL BaseContainerControl::removeTabController ( const Reference< XTabC
 }
 
 //____________________________________________________________________________________________________________
-//  XUnoControlContainer
+//	XUnoControlContainer
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseContainerControl::setTabControllers ( const Sequence< Reference< XTabController >  >& rTabControllers ) throw( RuntimeException )
@@ -538,7 +538,7 @@ Sequence<Reference< XTabController > > SAL_CALL BaseContainerControl::getTabCont
 }
 
 //____________________________________________________________________________________________________________
-//  XWindow
+//	XWindow
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseContainerControl::setVisible ( sal_Bool bVisible ) throw( RuntimeException )
@@ -555,7 +555,7 @@ void SAL_CALL BaseContainerControl::setVisible ( sal_Bool bVisible ) throw( Runt
 }
 
 //____________________________________________________________________________________________________________
-//  protected method
+//	protected method
 //____________________________________________________________________________________________________________
 
 WindowDescriptor* BaseContainerControl::impl_getWindowDescriptor ( const Reference< XWindowPeer > & rParentPeer )
@@ -564,20 +564,20 @@ WindowDescriptor* BaseContainerControl::impl_getWindowDescriptor ( const Referen
     // - if you will change the descriptor-values, you must override thid virtuell function
     // - the caller must release the memory for this dynamical descriptor !!!
 
-    WindowDescriptor    *   aDescriptor = new WindowDescriptor ;
+    WindowDescriptor	*	aDescriptor	= new WindowDescriptor ;
 
-    aDescriptor->Type               = WindowClass_CONTAINER                             ;
-    aDescriptor->WindowServiceName  = OUString(RTL_CONSTASCII_USTRINGPARAM("window"))   ;
-    aDescriptor->ParentIndex        = -1                                                ;
-    aDescriptor->Parent             = rParentPeer                                       ;
-    aDescriptor->Bounds             = getPosSize ()                                     ;
-    aDescriptor->WindowAttributes   = 0                                                 ;
+    aDescriptor->Type				= WindowClass_CONTAINER								;
+    aDescriptor->WindowServiceName	= OUString(RTL_CONSTASCII_USTRINGPARAM("window"))	;
+    aDescriptor->ParentIndex		= -1												;
+    aDescriptor->Parent				= rParentPeer										;
+    aDescriptor->Bounds				= getPosSize ()										;
+    aDescriptor->WindowAttributes	= 0													;
 
     return aDescriptor ;
 }
 
 //____________________________________________________________________________________________________________
-//  protected method
+//	protected method
 //____________________________________________________________________________________________________________
 
 void BaseContainerControl::impl_paint ( sal_Int32 /*nX*/, sal_Int32 /*nY*/, const Reference< XGraphics > & /*rGraphics*/ )
@@ -596,7 +596,7 @@ void BaseContainerControl::impl_paint ( sal_Int32 /*nX*/, sal_Int32 /*nY*/, cons
 }
 
 //____________________________________________________________________________________________________________
-//  private method
+//	private method
 //____________________________________________________________________________________________________________
 
 void BaseContainerControl::impl_activateTabControllers ()
@@ -604,25 +604,25 @@ void BaseContainerControl::impl_activateTabControllers ()
     // Ready for multithreading
     MutexGuard aGuard (m_aMutex) ;
 
-    sal_uInt32  nMaxCount   =   m_xTabControllerList.getLength ()   ;
-    sal_uInt32  nCount      =   0                                   ;
+    sal_uInt32	nMaxCount	=	m_xTabControllerList.getLength ()	;
+    sal_uInt32	nCount		=	0									;
 
     for ( nCount = 0; nCount < nMaxCount; ++nCount )
     {
-         m_xTabControllerList.getArray () [nCount]->setContainer        ( this  ) ;
-         m_xTabControllerList.getArray () [nCount]->activateTabOrder    (       ) ;
+         m_xTabControllerList.getArray () [nCount]->setContainer		( this	) ;
+         m_xTabControllerList.getArray () [nCount]->activateTabOrder	(		) ;
     }
 }
 
 //____________________________________________________________________________________________________________
-//  private method
+//	private method
 //____________________________________________________________________________________________________________
 
 void BaseContainerControl::impl_cleanMemory ()
 {
     // Get count of listitems.
-    sal_uInt32  nMaxCount   =   m_pControlInfoList->Count ()    ;
-    sal_uInt32  nCount      =   0                               ;
+    sal_uInt32	nMaxCount	=	m_pControlInfoList->Count ()	;
+    sal_uInt32	nCount		=	0								;
 
     // Delete all items.
     for ( nCount = 0; nCount < nMaxCount; ++nCount )
diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx
index f26250bed987..68d55cdb26c6 100644
--- a/UnoControls/source/base/basecontrol.cxx
+++ b/UnoControls/source/base/basecontrol.cxx
@@ -27,13 +27,13 @@
  ************************************************************************/
 
 //____________________________________________________________________________________________________________
-//  my own include
+//	my own include
 //____________________________________________________________________________________________________________
 
 #include "basecontrol.hxx"
 
 //____________________________________________________________________________________________________________
-//  includes of other projects
+//	includes of other projects
 //____________________________________________________________________________________________________________
 #include <com/sun/star/awt/XDevice.hpp>
 #include <com/sun/star/awt/XDisplayBitmap.hpp>
@@ -43,52 +43,52 @@
 #include <cppuhelper/typeprovider.hxx>
 
 //____________________________________________________________________________________________________________
-//  includes of my own project
+//	includes of my own project
 //____________________________________________________________________________________________________________
 
 //____________________________________________________________________________________________________________
-//  namespaces
+//	namespaces
 //____________________________________________________________________________________________________________
 
-using namespace ::cppu                  ;
-using namespace ::osl                   ;
-using namespace ::rtl                   ;
-using namespace ::com::sun::star::uno   ;
-using namespace ::com::sun::star::lang  ;
-using namespace ::com::sun::star::awt   ;
+using namespace	::cppu					;
+using namespace	::osl					;
+using namespace	::rtl					;
+using namespace	::com::sun::star::uno	;
+using namespace	::com::sun::star::lang	;
+using namespace	::com::sun::star::awt	;
 
 namespace unocontrols{
 
 //____________________________________________________________________________________________________________
-//  defines
+//	defines
 //____________________________________________________________________________________________________________
 
-#define DEFAULT_PMULTIPLEXER                NULL
-#define DEFAULT_X                           0
-#define DEFAULT_Y                           0
-#define DEFAULT_WIDTH                       100
-#define DEFAULT_HEIGHT                      100
-#define DEFAULT_VISIBLE                     sal_False
-#define DEFAULT_INDESIGNMODE                sal_False
-#define DEFAULT_ENABLE                      sal_True
-#define SERVICE_VCLTOOLKIT                  "com.sun.star.awt.Toolkit"
+#define	DEFAULT_PMULTIPLEXER				NULL
+#define	DEFAULT_X							0
+#define	DEFAULT_Y							0
+#define	DEFAULT_WIDTH						100
+#define	DEFAULT_HEIGHT						100
+#define	DEFAULT_VISIBLE						sal_False
+#define	DEFAULT_INDESIGNMODE				sal_False
+#define	DEFAULT_ENABLE						sal_True
+#define	SERVICE_VCLTOOLKIT					"com.sun.star.awt.Toolkit"
 
 //____________________________________________________________________________________________________________
-//  construct/destruct
+//	construct/destruct
 //____________________________________________________________________________________________________________
 
 BaseControl::BaseControl( const Reference< XMultiServiceFactory >& xFactory )
-    : IMPL_MutexContainer       (                       )
-    , OComponentHelper          ( m_aMutex              )
-    , m_xFactory    ( xFactory              )
-    , m_pMultiplexer            ( DEFAULT_PMULTIPLEXER  )
-    , m_nX                      ( DEFAULT_X             )
-    , m_nY                      ( DEFAULT_Y             )
-    , m_nWidth                  ( DEFAULT_WIDTH         )
-    , m_nHeight                 ( DEFAULT_HEIGHT        )
-    , m_bVisible                ( DEFAULT_VISIBLE       )
-    , m_bInDesignMode           ( DEFAULT_INDESIGNMODE  )
-    , m_bEnable                 ( DEFAULT_ENABLE        )
+    : IMPL_MutexContainer		(						)
+    , OComponentHelper			( m_aMutex				)
+    , m_xFactory	( xFactory				)
+    , m_pMultiplexer			( DEFAULT_PMULTIPLEXER	)
+    , m_nX						( DEFAULT_X				)
+    , m_nY						( DEFAULT_Y				)
+    , m_nWidth					( DEFAULT_WIDTH			)
+    , m_nHeight					( DEFAULT_HEIGHT		)
+    , m_bVisible				( DEFAULT_VISIBLE		)
+    , m_bInDesignMode			( DEFAULT_INDESIGNMODE	)
+    , m_bEnable					( DEFAULT_ENABLE		)
 {
 }
 
@@ -97,7 +97,7 @@ BaseControl::~BaseControl()
 }
 
 //____________________________________________________________________________________________________________
-//  XInterface
+//	XInterface
 //____________________________________________________________________________________________________________
 
 Any SAL_CALL BaseControl::queryInterface( const Type& rType ) throw( RuntimeException )
@@ -119,33 +119,33 @@ Any SAL_CALL BaseControl::queryInterface( const Type& rType ) throw( RuntimeExce
 }
 
 //____________________________________________________________________________________________________________
-//  XInterface
+//	XInterface
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseControl::acquire() throw()
 {
     // Attention:
-    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+    //	Don't use mutex or guard in this method!!! Is a method of XInterface.
 
     // Forward to baseclass
     OComponentHelper::acquire();
 }
 
 //____________________________________________________________________________________________________________
-//  XInterface
+//	XInterface
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseControl::release() throw()
 {
     // Attention:
-    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+    //	Don't use mutex or guard in this method!!! Is a method of XInterface.
 
     // Forward to baseclass
     OComponentHelper::release();
 }
 
 //____________________________________________________________________________________________________________
-//  XTypeProvider
+//	XTypeProvider
 //____________________________________________________________________________________________________________
 
 Sequence< Type > SAL_CALL BaseControl::getTypes() throw( RuntimeException )
@@ -164,12 +164,12 @@ Sequence< Type > SAL_CALL BaseControl::getTypes() throw( RuntimeException )
         if ( pTypeCollection == NULL )
         {
             // Create a static typecollection ...
-            static OTypeCollection aTypeCollection( ::getCppuType(( const Reference< XPaintListener >*)NULL ) ,
+            static OTypeCollection aTypeCollection( ::getCppuType(( const Reference< XPaintListener	>*)NULL ) ,
                                                     ::getCppuType(( const Reference< XWindowListener>*)NULL ) ,
-                                                    ::getCppuType(( const Reference< XView          >*)NULL ) ,
-                                                    ::getCppuType(( const Reference< XWindow        >*)NULL ) ,
-                                                    ::getCppuType(( const Reference< XServiceInfo   >*)NULL ) ,
-                                                    ::getCppuType(( const Reference< XControl       >*)NULL ) ,
+                                                    ::getCppuType(( const Reference< XView			>*)NULL ) ,
+                                                    ::getCppuType(( const Reference< XWindow		>*)NULL ) ,
+                                                    ::getCppuType(( const Reference< XServiceInfo	>*)NULL ) ,
+                                                    ::getCppuType(( const Reference< XControl		>*)NULL ) ,
                                                     OComponentHelper::getTypes()
                                                   );
 
@@ -182,7 +182,7 @@ Sequence< Type > SAL_CALL BaseControl::getTypes() throw( RuntimeException )
 }
 
 //____________________________________________________________________________________________________________
-//  XTypeProvider
+//	XTypeProvider
 //____________________________________________________________________________________________________________
 
 Sequence< sal_Int8 > SAL_CALL BaseControl::getImplementationId() throw( RuntimeException )
@@ -214,7 +214,7 @@ Sequence< sal_Int8 > SAL_CALL BaseControl::getImplementationId() throw( RuntimeE
 }
 
 //____________________________________________________________________________________________________________
-//  XAggregation
+//	XAggregation
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseControl::setDelegator( const Reference< XInterface >& xDel ) throw( RuntimeException )
@@ -225,20 +225,20 @@ void SAL_CALL BaseControl::setDelegator( const Reference< XInterface >& xDel ) t
 }
 
 //____________________________________________________________________________________________________________
-//  XAggregation
+//	XAggregation
 //____________________________________________________________________________________________________________
 
 Any SAL_CALL BaseControl::queryAggregation( const Type& aType ) throw( RuntimeException )
 {
     // Ask for my own supported interfaces ...
     // Attention: XTypeProvider and XInterface are supported by OComponentHelper!
-    Any aReturn ( ::cppu::queryInterface(   aType                                   ,
-                                               static_cast< XPaintListener*> ( this )   ,
-                                               static_cast< XWindowListener*> ( this )  ,
-                                               static_cast< XView*          > ( this )  ,
-                                               static_cast< XWindow*        > ( this )  ,
-                                               static_cast< XServiceInfo*   > ( this )  ,
-                                               static_cast< XControl*       > ( this )
+    Any aReturn	( ::cppu::queryInterface(	aType									,
+                                               static_cast< XPaintListener*> ( this )	,
+                                               static_cast< XWindowListener*> ( this )	,
+                                               static_cast< XView*			> ( this )	,
+                                               static_cast< XWindow*		> ( this )	,
+                                               static_cast< XServiceInfo*	> ( this )	,
+                                               static_cast< XControl*		> ( this )
                                         )
                 );
 
@@ -256,7 +256,7 @@ Any SAL_CALL BaseControl::queryAggregation( const Type& aType ) throw( RuntimeEx
 }
 
 //____________________________________________________________________________________________________________
-//  XServiceInfo
+//	XServiceInfo
 //____________________________________________________________________________________________________________
 
 OUString SAL_CALL BaseControl::getImplementationName() throw( RuntimeException )
@@ -265,13 +265,13 @@ OUString SAL_CALL BaseControl::getImplementationName() throw( RuntimeException )
 }
 
 //____________________________________________________________________________________________________________
-//  XServiceInfo
+//	XServiceInfo
 //____________________________________________________________________________________________________________
 
 sal_Bool SAL_CALL BaseControl::supportsService( const OUString& sServiceName ) throw( RuntimeException )
 {
-    Sequence< OUString >    seqServiceNames =   getSupportedServiceNames();
-    const OUString*         pArray          =   seqServiceNames.getConstArray();
+    Sequence< OUString >	seqServiceNames	=	getSupportedServiceNames();
+    const OUString*			pArray			=	seqServiceNames.getConstArray();
     for ( sal_Int32 nCounter=0; nCounter<seqServiceNames.getLength(); nCounter++ )
     {
         if ( pArray[nCounter] == sServiceName )
@@ -283,7 +283,7 @@ sal_Bool SAL_CALL BaseControl::supportsService( const OUString& sServiceName ) t
 }
 
 //____________________________________________________________________________________________________________
-//  XServiceInfo
+//	XServiceInfo
 //____________________________________________________________________________________________________________
 
 Sequence< OUString > SAL_CALL BaseControl::getSupportedServiceNames() throw( RuntimeException )
@@ -292,7 +292,7 @@ Sequence< OUString > SAL_CALL BaseControl::getSupportedServiceNames() throw( Run
 }
 
 //____________________________________________________________________________________________________________
-//  XComponent
+//	XComponent
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseControl::dispose() throw( RuntimeException )
@@ -321,7 +321,7 @@ void SAL_CALL BaseControl::dispose() throw( RuntimeException )
 }
 
 //____________________________________________________________________________________________________________
-//  XComponent
+//	XComponent
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseControl::addEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException )
@@ -332,7 +332,7 @@ void SAL_CALL BaseControl::addEventListener( const Reference< XEventListener >&
 }
 
 //____________________________________________________________________________________________________________
-//  XComponent
+//	XComponent
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseControl::removeEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException )
@@ -343,11 +343,11 @@ void SAL_CALL BaseControl::removeEventListener( const Reference< XEventListener
 }
 
 //____________________________________________________________________________________________________________
-//  XControl
+//	XControl
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseControl::createPeer(  const   Reference< XToolkit >&      xToolkit    ,
-                                        const   Reference< XWindowPeer >&   xParentPeer ) throw( RuntimeException )
+void SAL_CALL BaseControl::createPeer(	const	Reference< XToolkit >&		xToolkit	,
+                                        const	Reference< XWindowPeer >&	xParentPeer	) throw( RuntimeException )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -370,8 +370,8 @@ void SAL_CALL BaseControl::createPeer(  const   Reference< XToolkit >&      xToo
             // but first create wellknown toolkit, if it not exist
             xLocalToolkit = Reference< XToolkit > ( m_xFactory->createInstance( OUString::createFromAscii( SERVICE_VCLTOOLKIT ) ), UNO_QUERY );
         }
-        m_xPeer         = xLocalToolkit->createWindow( *pDescriptor );
-        m_xPeerWindow   = Reference< XWindow >( m_xPeer, UNO_QUERY );
+        m_xPeer			= xLocalToolkit->createWindow( *pDescriptor );
+        m_xPeerWindow	= Reference< XWindow >( m_xPeer, UNO_QUERY );
 
         // don't forget to release the memory!
         delete pDescriptor ;
@@ -399,15 +399,15 @@ void SAL_CALL BaseControl::createPeer(  const   Reference< XToolkit >&      xToo
             }
 
             // PosSize_POSSIZE defined in <stardiv/uno/awt/window.hxx>
-            m_xPeerWindow->setPosSize(  m_nX, m_nY, m_nWidth, m_nHeight, PosSize::POSSIZE   );
-            m_xPeerWindow->setEnable(   m_bEnable                                           );
-            m_xPeerWindow->setVisible(  m_bVisible && !m_bInDesignMode                      );
+            m_xPeerWindow->setPosSize(	m_nX, m_nY, m_nWidth, m_nHeight, PosSize::POSSIZE	);
+            m_xPeerWindow->setEnable(	m_bEnable 											);
+            m_xPeerWindow->setVisible(	m_bVisible && !m_bInDesignMode						);
         }
     }
 }
 
 //____________________________________________________________________________________________________________
-//  XControl
+//	XControl
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseControl::setContext( const Reference< XInterface >& xContext ) throw( RuntimeException )
@@ -418,7 +418,7 @@ void SAL_CALL BaseControl::setContext( const Reference< XInterface >& xContext )
 }
 
 //____________________________________________________________________________________________________________
-//  XControl
+//	XControl
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseControl::setDesignMode( sal_Bool bOn ) throw( RuntimeException )
@@ -429,7 +429,7 @@ void SAL_CALL BaseControl::setDesignMode( sal_Bool bOn ) throw( RuntimeException
 }
 
 //____________________________________________________________________________________________________________
-//  XControl
+//	XControl
 //____________________________________________________________________________________________________________
 
 Reference< XInterface > SAL_CALL BaseControl::getContext() throw( RuntimeException )
@@ -440,7 +440,7 @@ Reference< XInterface > SAL_CALL BaseControl::getContext() throw( RuntimeExcepti
 }
 
 //____________________________________________________________________________________________________________
-//  XControl
+//	XControl
 //____________________________________________________________________________________________________________
 
 Reference< XWindowPeer > SAL_CALL BaseControl::getPeer() throw( RuntimeException )
@@ -451,7 +451,7 @@ Reference< XWindowPeer > SAL_CALL BaseControl::getPeer() throw( RuntimeException
 }
 
 //____________________________________________________________________________________________________________
-//  XControl
+//	XControl
 //____________________________________________________________________________________________________________
 
 Reference< XView > SAL_CALL BaseControl::getView() throw( RuntimeException )
@@ -462,7 +462,7 @@ Reference< XView > SAL_CALL BaseControl::getView() throw( RuntimeException )
 }
 
 //____________________________________________________________________________________________________________
-//  XControl
+//	XControl
 //____________________________________________________________________________________________________________
 
 sal_Bool SAL_CALL BaseControl::isDesignMode() throw( RuntimeException )
@@ -473,7 +473,7 @@ sal_Bool SAL_CALL BaseControl::isDesignMode() throw( RuntimeException )
 }
 
 //____________________________________________________________________________________________________________
-//  XControl
+//	XControl
 //____________________________________________________________________________________________________________
 
 sal_Bool SAL_CALL BaseControl::isTransparent() throw( RuntimeException )
@@ -482,14 +482,14 @@ sal_Bool SAL_CALL BaseControl::isTransparent() throw( RuntimeException )
 }
 
 //____________________________________________________________________________________________________________
-//  XWindow
+//	XWindow
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseControl::setPosSize(  sal_Int32   nX      ,
-                                        sal_Int32   nY      ,
-                                        sal_Int32   nWidth  ,
-                                        sal_Int32   nHeight ,
-                                        sal_Int16   nFlags  ) throw( RuntimeException )
+void SAL_CALL BaseControl::setPosSize(	sal_Int32	nX		,
+                                        sal_Int32	nY		,
+                                        sal_Int32	nWidth	,
+                                        sal_Int32	nHeight	,
+                                        sal_Int16	nFlags	) throw( RuntimeException )
 {
     // - change size and position of window and save the values
     // - "nFlags" declared in <stardiv/uno/awt/window.hxx> ("#define PosSize_X .....")
@@ -526,7 +526,7 @@ void SAL_CALL BaseControl::setPosSize(  sal_Int32   nX      ,
 }
 
 //____________________________________________________________________________________________________________
-//  XWindow
+//	XWindow
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseControl::setVisible( sal_Bool bVisible ) throw( RuntimeException )
@@ -545,7 +545,7 @@ void SAL_CALL BaseControl::setVisible( sal_Bool bVisible ) throw( RuntimeExcepti
 }
 
 //____________________________________________________________________________________________________________
-//  XWindow
+//	XWindow
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseControl::setEnable( sal_Bool bEnable ) throw( RuntimeException )
@@ -564,7 +564,7 @@ void SAL_CALL BaseControl::setEnable( sal_Bool bEnable ) throw( RuntimeException
 }
 
 //____________________________________________________________________________________________________________
-//  XWindow
+//	XWindow
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseControl::setFocus() throw( RuntimeException )
@@ -579,7 +579,7 @@ void SAL_CALL BaseControl::setFocus() throw( RuntimeException )
 }
 
 //____________________________________________________________________________________________________________
-//  XWindow
+//	XWindow
 //____________________________________________________________________________________________________________
 
 Rectangle SAL_CALL BaseControl::getPosSize() throw( RuntimeException )
@@ -590,7 +590,7 @@ Rectangle SAL_CALL BaseControl::getPosSize() throw( RuntimeException )
 }
 
 //____________________________________________________________________________________________________________
-//  XWindow
+//	XWindow
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseControl::addWindowListener( const Reference< XWindowListener >& xListener ) throw( RuntimeException )
@@ -599,7 +599,7 @@ void SAL_CALL BaseControl::addWindowListener( const Reference< XWindowListener >
 }
 
 //____________________________________________________________________________________________________________
-//  XWindow
+//	XWindow
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseControl::addFocusListener( const Reference< XFocusListener >& xListener ) throw( RuntimeException )
@@ -608,7 +608,7 @@ void SAL_CALL BaseControl::addFocusListener( const Reference< XFocusListener >&
 }
 
 //____________________________________________________________________________________________________________
-//  XWindow
+//	XWindow
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseControl::addKeyListener( const Reference< XKeyListener >& xListener ) throw( RuntimeException )
@@ -617,7 +617,7 @@ void SAL_CALL BaseControl::addKeyListener( const Reference< XKeyListener >& xLis
 }
 
 //____________________________________________________________________________________________________________
-//  XWindow
+//	XWindow
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseControl::addMouseListener( const Reference< XMouseListener >& xListener ) throw( RuntimeException )
@@ -626,7 +626,7 @@ void SAL_CALL BaseControl::addMouseListener( const Reference< XMouseListener >&
 }
 
 //____________________________________________________________________________________________________________
-//  XWindow
+//	XWindow
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseControl::addMouseMotionListener( const Reference< XMouseMotionListener >& xListener ) throw( RuntimeException )
@@ -635,7 +635,7 @@ void SAL_CALL BaseControl::addMouseMotionListener( const Reference< XMouseMotion
 }
 
 //____________________________________________________________________________________________________________
-//  XWindow
+//	XWindow
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseControl::addPaintListener( const Reference< XPaintListener >& xListener ) throw( RuntimeException )
@@ -644,7 +644,7 @@ void SAL_CALL BaseControl::addPaintListener( const Reference< XPaintListener >&
 }
 
 //____________________________________________________________________________________________________________
-//  XWindow
+//	XWindow
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseControl::removeWindowListener( const Reference< XWindowListener >& xListener ) throw( RuntimeException )
@@ -653,7 +653,7 @@ void SAL_CALL BaseControl::removeWindowListener( const Reference< XWindowListene
 }
 
 //____________________________________________________________________________________________________________
-//  XWindow
+//	XWindow
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseControl::removeFocusListener( const Reference< XFocusListener >& xListener ) throw( RuntimeException )
@@ -662,7 +662,7 @@ void SAL_CALL BaseControl::removeFocusListener( const Reference< XFocusListener
 }
 
 //____________________________________________________________________________________________________________
-//  XWindow
+//	XWindow
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseControl::removeKeyListener( const Reference< XKeyListener >& xListener ) throw( RuntimeException )
@@ -671,7 +671,7 @@ void SAL_CALL BaseControl::removeKeyListener( const Reference< XKeyListener >& x
 }
 
 //____________________________________________________________________________________________________________
-//  XWindow
+//	XWindow
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseControl::removeMouseListener( const Reference< XMouseListener >& xListener ) throw( RuntimeException )
@@ -680,7 +680,7 @@ void SAL_CALL BaseControl::removeMouseListener( const Reference< XMouseListener
 }
 
 //____________________________________________________________________________________________________________
-//  XWindow
+//	XWindow
 //____________________________________________________________________________________________________________
 
 void  SAL_CALL BaseControl::removeMouseMotionListener( const Reference< XMouseMotionListener >& xListener ) throw( RuntimeException )
@@ -689,7 +689,7 @@ void  SAL_CALL BaseControl::removeMouseMotionListener( const Reference< XMouseMo
 }
 
 //____________________________________________________________________________________________________________
-//  XWindow
+//	XWindow
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseControl::removePaintListener( const Reference< XPaintListener >& xListener ) throw( RuntimeException )
@@ -698,11 +698,11 @@ void SAL_CALL BaseControl::removePaintListener( const Reference< XPaintListener
 }
 
 //____________________________________________________________________________________________________________
-//  XView
+//	XView
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseControl::draw(    sal_Int32   nX  ,
-                                    sal_Int32   nY  ) throw( RuntimeException )
+void SAL_CALL BaseControl::draw(	sal_Int32	nX	,
+                                    sal_Int32	nY	) throw( RuntimeException )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -714,7 +714,7 @@ void SAL_CALL BaseControl::draw(    sal_Int32   nX  ,
 }
 
 //____________________________________________________________________________________________________________
-//  XView
+//	XView
 //____________________________________________________________________________________________________________
 
 sal_Bool SAL_CALL BaseControl::setGraphics( const Reference< XGraphics >& xDevice ) throw( RuntimeException )
@@ -728,25 +728,25 @@ sal_Bool SAL_CALL BaseControl::setGraphics( const Reference< XGraphics >& xDevic
         // Ready for multithreading
         MutexGuard aGuard( m_aMutex );
 
-        m_xGraphicsView = xDevice   ;
-        bReturn         = sal_True  ;
+        m_xGraphicsView	= xDevice	;
+        bReturn			= sal_True	;
     }
 
     return bReturn ;
 }
 
 //____________________________________________________________________________________________________________
-//  XView
+//	XView
 //____________________________________________________________________________________________________________
 
-void SAL_CALL BaseControl::setZoom( float   /*fZoomX*/  ,
-                                    float   /*fZoomY*/  ) throw( RuntimeException )
+void SAL_CALL BaseControl::setZoom(	float	/*fZoomX*/	,
+                                    float	/*fZoomY*/	) throw( RuntimeException )
 {
     // Not implemented yet
 }
 
 //____________________________________________________________________________________________________________
-//  XView
+//	XView
 //____________________________________________________________________________________________________________
 
 Reference< XGraphics > SAL_CALL BaseControl::getGraphics() throw( RuntimeException )
@@ -757,7 +757,7 @@ Reference< XGraphics > SAL_CALL BaseControl::getGraphics() throw( RuntimeExcepti
 }
 
 //____________________________________________________________________________________________________________
-//  XView
+//	XView
 //____________________________________________________________________________________________________________
 
 Size SAL_CALL BaseControl::getSize() throw( RuntimeException )
@@ -768,7 +768,7 @@ Size SAL_CALL BaseControl::getSize() throw( RuntimeException )
 }
 
 //____________________________________________________________________________________________________________
-//  XEventListener
+//	XEventListener
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseControl::disposing( const EventObject& /*aSource*/ ) throw( RuntimeException )
@@ -792,7 +792,7 @@ void SAL_CALL BaseControl::disposing( const EventObject& /*aSource*/ ) throw( Ru
 }
 
 //____________________________________________________________________________________________________________
-//  XPaintListener
+//	XPaintListener
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseControl::windowPaint( const PaintEvent& /*aEvent*/ ) throw( RuntimeException )
@@ -807,7 +807,7 @@ void SAL_CALL BaseControl::windowPaint( const PaintEvent& /*aEvent*/ ) throw( Ru
 }
 
 //____________________________________________________________________________________________________________
-//  XWindowListener
+//	XWindowListener
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseControl::windowResized( const WindowEvent& aEvent ) throw( RuntimeException )
@@ -815,8 +815,8 @@ void SAL_CALL BaseControl::windowResized( const WindowEvent& aEvent ) throw( Run
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
 
-    m_nWidth    =   aEvent.Width    ;
-    m_nHeight   =   aEvent.Height   ;
+    m_nWidth	=	aEvent.Width	;
+    m_nHeight	=	aEvent.Height	;
     WindowEvent aMappedEvent = aEvent;
     aMappedEvent.X = 0;
     aMappedEvent.Y = 0;
@@ -824,7 +824,7 @@ void SAL_CALL BaseControl::windowResized( const WindowEvent& aEvent ) throw( Run
 }
 
 //____________________________________________________________________________________________________________
-//  XWindowListener
+//	XWindowListener
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseControl::windowMoved( const WindowEvent& aEvent ) throw( RuntimeException )
@@ -832,8 +832,8 @@ void SAL_CALL BaseControl::windowMoved( const WindowEvent& aEvent ) throw( Runti
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
 
-    m_nWidth    =   aEvent.Width    ;
-    m_nHeight   =   aEvent.Height   ;
+    m_nWidth	=	aEvent.Width	;
+    m_nHeight	=	aEvent.Height	;
     WindowEvent aMappedEvent = aEvent;
     aMappedEvent.X = 0;
     aMappedEvent.Y = 0;
@@ -841,7 +841,7 @@ void SAL_CALL BaseControl::windowMoved( const WindowEvent& aEvent ) throw( Runti
 }
 
 //____________________________________________________________________________________________________________
-//  XWindowListener
+//	XWindowListener
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseControl::windowShown( const EventObject& /*aEvent*/ ) throw( RuntimeException )
@@ -849,7 +849,7 @@ void SAL_CALL BaseControl::windowShown( const EventObject& /*aEvent*/ ) throw( R
 }
 
 //____________________________________________________________________________________________________________
-//  XWindowListener
+//	XWindowListener
 //____________________________________________________________________________________________________________
 
 void SAL_CALL BaseControl::windowHidden( const EventObject& /*aEvent*/ ) throw( RuntimeException )
@@ -857,8 +857,8 @@ void SAL_CALL BaseControl::windowHidden( const EventObject& /*aEvent*/ ) throw(
 }
 
 //____________________________________________________________________________________________________________
-//  impl but public method to register service in DLL
-//  (In this BASE-implementation not implemented! Overwrite it in derived classes.)
+//	impl but public method to register service in DLL
+//	(In this BASE-implementation not implemented! Overwrite it in derived classes.)
 //____________________________________________________________________________________________________________
 
 const Sequence< OUString > BaseControl::impl_getStaticSupportedServiceNames()
@@ -867,8 +867,8 @@ const Sequence< OUString > BaseControl::impl_getStaticSupportedServiceNames()
 }
 
 //____________________________________________________________________________________________________________
-//  impl but public method to register service in DLL
-//  (In this BASE-implementation not implemented! Overwrite it in derived classes.)
+//	impl but public method to register service in DLL
+//	(In this BASE-implementation not implemented! Overwrite it in derived classes.)
 //____________________________________________________________________________________________________________
 
 const OUString BaseControl::impl_getStaticImplementationName()
@@ -877,7 +877,7 @@ const OUString BaseControl::impl_getStaticImplementationName()
 }
 
 //____________________________________________________________________________________________________________
-//  protected method
+//	protected method
 //____________________________________________________________________________________________________________
 
 const Reference< XMultiServiceFactory > BaseControl::impl_getMultiServiceFactory()
@@ -886,7 +886,7 @@ const Reference< XMultiServiceFactory > BaseControl::impl_getMultiServiceFactory
 }
 
 //____________________________________________________________________________________________________________
-//  protected method
+//	protected method
 //____________________________________________________________________________________________________________
 
 const Reference< XWindow > BaseControl::impl_getPeerWindow()
@@ -895,7 +895,7 @@ const Reference< XWindow > BaseControl::impl_getPeerWindow()
 }
 
 //____________________________________________________________________________________________________________
-//  protected method
+//	protected method
 //____________________________________________________________________________________________________________
 
 const Reference< XGraphics > BaseControl::impl_getGraphicsPeer()
@@ -904,7 +904,7 @@ const Reference< XGraphics > BaseControl::impl_getGraphicsPeer()
 }
 
 //____________________________________________________________________________________________________________
-//  protected method
+//	protected method
 //____________________________________________________________________________________________________________
 
 const sal_Int32& BaseControl::impl_getWidth()
@@ -913,7 +913,7 @@ const sal_Int32& BaseControl::impl_getWidth()
 }
 
 //____________________________________________________________________________________________________________
-//  protected method
+//	protected method
 //____________________________________________________________________________________________________________
 
 const sal_Int32& BaseControl::impl_getHeight()
@@ -922,7 +922,7 @@ const sal_Int32& BaseControl::impl_getHeight()
 }
 
 //____________________________________________________________________________________________________________
-//  protected method
+//	protected method
 //____________________________________________________________________________________________________________
 
 WindowDescriptor* BaseControl::impl_getWindowDescriptor( const Reference< XWindowPeer >& xParentPeer )
@@ -933,23 +933,23 @@ WindowDescriptor* BaseControl::impl_getWindowDescriptor( const Reference< XWindo
 
     WindowDescriptor* pDescriptor = new WindowDescriptor ;
 
-    pDescriptor->Type               = WindowClass_SIMPLE                    ;
-    pDescriptor->WindowServiceName  = OUString::createFromAscii( "window" ) ;
-    pDescriptor->ParentIndex        = -1                                    ;
-    pDescriptor->Parent             = xParentPeer                           ;
-    pDescriptor->Bounds             = getPosSize ()                         ;
-    pDescriptor->WindowAttributes   = 0                                     ;
+    pDescriptor->Type				= WindowClass_SIMPLE					;
+    pDescriptor->WindowServiceName	= OUString::createFromAscii( "window" )	;
+    pDescriptor->ParentIndex		= -1									;
+    pDescriptor->Parent				= xParentPeer							;
+    pDescriptor->Bounds				= getPosSize ()							;
+    pDescriptor->WindowAttributes	= 0										;
 
     return pDescriptor ;
 }
 
 //____________________________________________________________________________________________________________
-//  protected method
+//	protected method
 //____________________________________________________________________________________________________________
 
-void BaseControl::impl_paint(           sal_Int32               /*nX*/          ,
-                                        sal_Int32               /*nY*/          ,
-                                const   Reference< XGraphics >& /*xGraphics*/   )
+void BaseControl::impl_paint(			sal_Int32				/*nX*/			,
+                                        sal_Int32				/*nY*/			,
+                                const	Reference< XGraphics >&	/*xGraphics*/	)
 {
     // - one paint method for peer AND view !!!
     //   (see also => "windowPaint()" and "draw()")
@@ -957,7 +957,7 @@ void BaseControl::impl_paint(           sal_Int32               /*nX*/
 }
 
 //____________________________________________________________________________________________________________
-//  protected method
+//	protected method
 //____________________________________________________________________________________________________________
 
 void BaseControl::impl_recalcLayout( const WindowEvent& /*aEvent*/ )
@@ -967,7 +967,7 @@ void BaseControl::impl_recalcLayout( const WindowEvent& /*aEvent*/ )
 }
 
 //____________________________________________________________________________________________________________
-//  protected method
+//	protected method
 //____________________________________________________________________________________________________________
 
 Reference< XInterface > BaseControl::impl_getDelegator()
@@ -976,7 +976,7 @@ Reference< XInterface > BaseControl::impl_getDelegator()
 }
 
 //____________________________________________________________________________________________________________
-//  private method
+//	private method
 //____________________________________________________________________________________________________________
 
 void BaseControl::impl_releasePeer()
@@ -991,8 +991,8 @@ void BaseControl::impl_releasePeer()
         }
 
         m_xPeer->dispose();
-        m_xPeerWindow   = Reference< XWindow >();
-        m_xPeer         = Reference< XWindowPeer >();
+        m_xPeerWindow	= Reference< XWindow >();
+        m_xPeer			= Reference< XWindowPeer >();
 
         if ( m_pMultiplexer != NULL )
         {
@@ -1003,7 +1003,7 @@ void BaseControl::impl_releasePeer()
 }
 
 //____________________________________________________________________________________________________________
-//  private method
+//	private method
 //____________________________________________________________________________________________________________
 
 OMRCListenerMultiplexerHelper* BaseControl::impl_getMultiplexer()
diff --git a/UnoControls/source/base/multiplexer.cxx b/UnoControls/source/base/multiplexer.cxx
index 4ac7156eb2ae..59383e882eed 100644
--- a/UnoControls/source/base/multiplexer.cxx
+++ b/UnoControls/source/base/multiplexer.cxx
@@ -30,57 +30,57 @@
 
 #include <osl/diagnose.h>
 
-using namespace ::cppu                  ;
-using namespace ::osl                   ;
-using namespace ::com::sun::star::uno   ;
-using namespace ::com::sun::star::awt   ;
-using namespace ::com::sun::star::lang  ;
+using namespace	::cppu					;
+using namespace	::osl					;
+using namespace	::com::sun::star::uno	;
+using namespace	::com::sun::star::awt	;
+using namespace	::com::sun::star::lang	;
 
 namespace unocontrols{
 
 //____________________________________________________________________________________________________________
-//  macros
+//	macros
 //____________________________________________________________________________________________________________
 
-#define MULTIPLEX( INTERFACE, METHOD, EVENTTYP, EVENT )                                                                             \
+#define MULTIPLEX( INTERFACE, METHOD, EVENTTYP, EVENT )																				\
                                                                                                                                     \
-    /* First get all interfaces from container with right type.*/                                                                   \
-    OInterfaceContainerHelper* pContainer = m_aListenerHolder.getContainer( ::getCppuType((const Reference< INTERFACE >*)0) );  \
-    /* Do the follow only, if elements in container exist.*/                                                                        \
-    if( pContainer != NULL )                                                                                                        \
-    {                                                                                                                               \
-        OInterfaceIteratorHelper aIterator( *pContainer );                                                                          \
-        EVENTTYP aLocalEvent = EVENT;                                                                                               \
-        /* Remark: The control is the event source not the peer.*/                                                                  \
-        /*         We must change the source of the event.      */                                                                  \
-        aLocalEvent.Source = m_xControl ;                                                                                           \
-        /* Is the control not destroyed? */                                                                                         \
-        if( aLocalEvent.Source.is() == sal_True )                                                                                   \
-        {                                                                                                                           \
-            if( aIterator.hasMoreElements() )                                                                                       \
-            {                                                                                                                       \
-                INTERFACE * pListener = (INTERFACE *)aIterator.next();                                                          \
-                try                                                                                                                 \
-                {                                                                                                                   \
-                    pListener->METHOD( aLocalEvent );                                                                               \
-                }                                                                                                                   \
-                catch( RuntimeException& )                                                                                          \
-                {                                                                                                                   \
-                    /* Ignore all system exceptions from the listener! */                                                           \
-                }                                                                                                                   \
-            }                                                                                                                       \
-        }                                                                                                                           \
+    /* First get all interfaces from container with right type.*/																	\
+    OInterfaceContainerHelper* pContainer = m_aListenerHolder.getContainer( ::getCppuType((const Reference< INTERFACE >*)0) );	\
+    /* Do the follow only, if elements in container exist.*/																		\
+    if( pContainer != NULL )																										\
+    {																																\
+        OInterfaceIteratorHelper aIterator( *pContainer );																			\
+        EVENTTYP aLocalEvent = EVENT;																								\
+        /* Remark: The control is the event source not the peer.*/																	\
+        /*         We must change the source of the event.		*/																	\
+        aLocalEvent.Source = m_xControl ;																							\
+        /* Is the control not destroyed? */																							\
+        if( aLocalEvent.Source.is() == sal_True )																					\
+        {																															\
+            if( aIterator.hasMoreElements() )																						\
+            {																														\
+                INTERFACE * pListener = (INTERFACE *)aIterator.next();															\
+                try																													\
+                {																													\
+                    pListener->METHOD( aLocalEvent );																				\
+                }																													\
+                catch( RuntimeException& )																							\
+                {																													\
+                    /* Ignore all system exceptions from the listener! */															\
+                }																													\
+            }																														\
+        }																															\
     }
 
 //____________________________________________________________________________________________________________
-//  construct/destruct
+//	construct/destruct
 //____________________________________________________________________________________________________________
 
-OMRCListenerMultiplexerHelper::OMRCListenerMultiplexerHelper(   const   Reference< XWindow >&   xControl    ,
-                                                                const   Reference< XWindow >&   xPeer       )
-    : m_xPeer           ( xPeer     )
-    , m_xControl        ( xControl  )
-    , m_aListenerHolder ( m_aMutex  )
+OMRCListenerMultiplexerHelper::OMRCListenerMultiplexerHelper(	const	Reference< XWindow >&	xControl	,
+                                                                const	Reference< XWindow >&	xPeer		)
+    : m_xPeer			( xPeer		)
+    , m_xControl		( xControl	)
+    , m_aListenerHolder	( m_aMutex	)
 {
 }
 
@@ -93,7 +93,7 @@ OMRCListenerMultiplexerHelper::OMRCListenerMultiplexerHelper( const OMRCListener
     , XPaintListener()
     , XTopWindowListener()
     , OWeakObject()
-    , m_aListenerHolder ( m_aMutex  )
+    , m_aListenerHolder	( m_aMutex	)
 {
 }
 
@@ -102,25 +102,25 @@ OMRCListenerMultiplexerHelper::~OMRCListenerMultiplexerHelper()
 }
 
 //____________________________________________________________________________________________________________
-//  XInterface
+//	XInterface
 //____________________________________________________________________________________________________________
 
 Any SAL_CALL OMRCListenerMultiplexerHelper::queryInterface( const Type& rType ) throw( RuntimeException )
 {
     // Attention:
-    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+    //	Don't use mutex or guard in this method!!! Is a method of XInterface.
 
     // Ask for my own supported interfaces ...
     // Attention: XTypeProvider and XInterface are supported by OComponentHelper!
-    Any aReturn ( ::cppu::queryInterface(   rType                                           ,
-                                            static_cast< XWindowListener*       > ( this )  ,
-                                            static_cast< XKeyListener*          > ( this )  ,
-                                            static_cast< XFocusListener*        > ( this )  ,
-                                            static_cast< XMouseListener*        > ( this )  ,
-                                            static_cast< XMouseMotionListener*  > ( this )  ,
-                                            static_cast< XPaintListener*        > ( this )  ,
-                                            static_cast< XTopWindowListener*    > ( this )  ,
-                                            static_cast< XTopWindowListener*    > ( this )
+    Any aReturn	( ::cppu::queryInterface(	rType											,
+                                            static_cast< XWindowListener*		> ( this )	,
+                                            static_cast< XKeyListener*			> ( this )	,
+                                            static_cast< XFocusListener*		> ( this )	,
+                                            static_cast< XMouseListener*		> ( this )	,
+                                            static_cast< XMouseMotionListener*	> ( this )	,
+                                            static_cast< XPaintListener*		> ( this )	,
+                                            static_cast< XTopWindowListener*	> ( this )	,
+                                            static_cast< XTopWindowListener*	> ( this )
                                         )
                 );
 
@@ -138,33 +138,33 @@ Any SAL_CALL OMRCListenerMultiplexerHelper::queryInterface( const Type& rType )
 }
 
 //____________________________________________________________________________________________________________
-//  XInterface
+//	XInterface
 //____________________________________________________________________________________________________________
 
 void SAL_CALL OMRCListenerMultiplexerHelper::acquire() throw()
 {
     // Attention:
-    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+    //	Don't use mutex or guard in this method!!! Is a method of XInterface.
 
     // Forward to baseclass
     OWeakObject::acquire();
 }
 
 //____________________________________________________________________________________________________________
-//  XInterface
+//	XInterface
 //____________________________________________________________________________________________________________
 
 void SAL_CALL OMRCListenerMultiplexerHelper::release() throw()
 {
     // Attention:
-    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+    //	Don't use mutex or guard in this method!!! Is a method of XInterface.
 
     // Forward to baseclass
     OWeakObject::release();
 }
 
 //____________________________________________________________________________________________________________
-//  operator
+//	operator
 //____________________________________________________________________________________________________________
 
 OMRCListenerMultiplexerHelper::operator Reference< XInterface >() const
@@ -173,16 +173,16 @@ OMRCListenerMultiplexerHelper::operator Reference< XInterface >() const
 }
 
 //____________________________________________________________________________________________________________
-//  operator
+//	operator
 //____________________________________________________________________________________________________________
 
 //OMRCListenerMultiplexerHelper& OMRCListenerMultiplexerHelper::operator= ( const OMRCListenerMultiplexerHelper& aCopyInstance )
 //{
-//  return this ;
+//	return this ;
 //}
 
 //____________________________________________________________________________________________________________
-//  container method
+//	container method
 //____________________________________________________________________________________________________________
 
 void OMRCListenerMultiplexerHelper::setPeer( const Reference< XWindow >& xPeer )
@@ -193,9 +193,9 @@ void OMRCListenerMultiplexerHelper::setPeer( const Reference< XWindow >& xPeer )
         if( m_xPeer.is() )
         {
             // get all types from the listener added to the peer
-            Sequence< Type >    aContainedTypes = m_aListenerHolder.getContainedTypes();
-            const Type*         pArray          = aContainedTypes.getConstArray();
-            sal_Int32           nCount          = aContainedTypes.getLength();
+            Sequence< Type >	aContainedTypes	= m_aListenerHolder.getContainedTypes();
+            const Type*			pArray			= aContainedTypes.getConstArray();
+            sal_Int32			nCount			= aContainedTypes.getLength();
             // loop over all listener types and remove the listeners from the peer
             for( sal_Int32 i=0; i<nCount; i++ )
                 impl_unadviseFromPeer( m_xPeer, pArray[i] );
@@ -204,9 +204,9 @@ void OMRCListenerMultiplexerHelper::setPeer( const Reference< XWindow >& xPeer )
         if( m_xPeer.is() )
         {
             // get all types from the listener added to the peer
-            Sequence< Type >    aContainedTypes = m_aListenerHolder.getContainedTypes();
-            const Type*         pArray          = aContainedTypes.getConstArray();
-            sal_Int32           nCount          = aContainedTypes.getLength();
+            Sequence< Type >	aContainedTypes	= m_aListenerHolder.getContainedTypes();
+            const Type*			pArray			= aContainedTypes.getConstArray();
+            sal_Int32			nCount			= aContainedTypes.getLength();
             // loop over all listener types and add the listeners to the peer
             for( sal_Int32 i = 0; i < nCount; i++ )
                 impl_adviseToPeer( m_xPeer, pArray[i] );
@@ -215,7 +215,7 @@ void OMRCListenerMultiplexerHelper::setPeer( const Reference< XWindow >& xPeer )
 }
 
 //____________________________________________________________________________________________________________
-//  container method
+//	container method
 //____________________________________________________________________________________________________________
 
 void OMRCListenerMultiplexerHelper::disposeAndClear()
@@ -226,11 +226,11 @@ void OMRCListenerMultiplexerHelper::disposeAndClear()
 }
 
 //____________________________________________________________________________________________________________
-//  container method
+//	container method
 //____________________________________________________________________________________________________________
 
-void OMRCListenerMultiplexerHelper::advise( const   Type&                       aType       ,
-                                            const   Reference< XInterface >&    xListener   )
+void OMRCListenerMultiplexerHelper::advise(	const	Type&						aType		,
+                                            const	Reference< XInterface >&	xListener	)
 {
     MutexGuard aGuard( m_aMutex );
     if( m_aListenerHolder.addInterface( aType, xListener ) == 1 )
@@ -244,11 +244,11 @@ void OMRCListenerMultiplexerHelper::advise( const   Type&
 }
 
 //____________________________________________________________________________________________________________
-//  container method
+//	container method
 //____________________________________________________________________________________________________________
 
-void OMRCListenerMultiplexerHelper::unadvise(   const   Type&                       aType       ,
-                                                const   Reference< XInterface >&    xListener   )
+void OMRCListenerMultiplexerHelper::unadvise(	const	Type&						aType		,
+                                                const	Reference< XInterface >&	xListener	)
 {
     MutexGuard aGuard( m_aMutex );
     if( m_aListenerHolder.removeInterface( aType, xListener ) == 0 )
@@ -262,7 +262,7 @@ void OMRCListenerMultiplexerHelper::unadvise(   const   Type&
 }
 
 //____________________________________________________________________________________________________________
-//  XEventListener
+//	XEventListener
 //____________________________________________________________________________________________________________
 
 void SAL_CALL OMRCListenerMultiplexerHelper::disposing( const EventObject& /*aSource*/ ) throw( RuntimeException )
@@ -273,7 +273,7 @@ void SAL_CALL OMRCListenerMultiplexerHelper::disposing( const EventObject& /*aSo
 }
 
 //____________________________________________________________________________________________________________
-//  XFcousListener
+//	XFcousListener
 //____________________________________________________________________________________________________________
 
 void OMRCListenerMultiplexerHelper::focusGained(const FocusEvent& aEvent ) throw( RuntimeException )
@@ -282,7 +282,7 @@ void OMRCListenerMultiplexerHelper::focusGained(const FocusEvent& aEvent ) throw
 }
 
 //____________________________________________________________________________________________________________
-//  XFcousListener
+//	XFcousListener
 //____________________________________________________________________________________________________________
 
 void OMRCListenerMultiplexerHelper::focusLost(const FocusEvent& aEvent ) throw( RuntimeException )
@@ -291,7 +291,7 @@ void OMRCListenerMultiplexerHelper::focusLost(const FocusEvent& aEvent ) throw(
 }
 
 //____________________________________________________________________________________________________________
-//  XWindowListener
+//	XWindowListener
 //____________________________________________________________________________________________________________
 
 void OMRCListenerMultiplexerHelper::windowResized(const WindowEvent& aEvent ) throw( RuntimeException )
@@ -300,7 +300,7 @@ void OMRCListenerMultiplexerHelper::windowResized(const WindowEvent& aEvent ) th
 }
 
 //____________________________________________________________________________________________________________
-//  XWindowListener
+//	XWindowListener
 //____________________________________________________________________________________________________________
 
 void OMRCListenerMultiplexerHelper::windowMoved(const WindowEvent& aEvent ) throw( RuntimeException )
@@ -309,7 +309,7 @@ void OMRCListenerMultiplexerHelper::windowMoved(const WindowEvent& aEvent ) thro
 }
 
 //____________________________________________________________________________________________________________
-//  XWindowListener
+//	XWindowListener
 //____________________________________________________________________________________________________________
 
 void OMRCListenerMultiplexerHelper::windowShown(const EventObject& aEvent ) throw( RuntimeException )
@@ -318,7 +318,7 @@ void OMRCListenerMultiplexerHelper::windowShown(const EventObject& aEvent ) thro
 }
 
 //____________________________________________________________________________________________________________
-//  XWindowListener
+//	XWindowListener
 //____________________________________________________________________________________________________________
 
 void OMRCListenerMultiplexerHelper::windowHidden(const EventObject& aEvent ) throw( RuntimeException )
@@ -327,7 +327,7 @@ void OMRCListenerMultiplexerHelper::windowHidden(const EventObject& aEvent ) thr
 }
 
 //____________________________________________________________________________________________________________
-//  XKeyListener
+//	XKeyListener
 //____________________________________________________________________________________________________________
 
 void OMRCListenerMultiplexerHelper::keyPressed(const KeyEvent& aEvent) throw( RuntimeException )
@@ -336,7 +336,7 @@ void OMRCListenerMultiplexerHelper::keyPressed(const KeyEvent& aEvent) throw( Ru
 }
 
 //____________________________________________________________________________________________________________
-//  XKeyListener
+//	XKeyListener
 //____________________________________________________________________________________________________________
 
 void OMRCListenerMultiplexerHelper::keyReleased(const KeyEvent& aEvent) throw( RuntimeException )
@@ -345,7 +345,7 @@ void OMRCListenerMultiplexerHelper::keyReleased(const KeyEvent& aEvent) throw( R
 }
 
 //____________________________________________________________________________________________________________
-//  XMouseListener
+//	XMouseListener
 //____________________________________________________________________________________________________________
 
 void OMRCListenerMultiplexerHelper::mousePressed(const MouseEvent& aEvent) throw( RuntimeException )
@@ -354,7 +354,7 @@ void OMRCListenerMultiplexerHelper::mousePressed(const MouseEvent& aEvent) throw
 }
 
 //____________________________________________________________________________________________________________
-//  XMouseListener
+//	XMouseListener
 //____________________________________________________________________________________________________________
 
 void OMRCListenerMultiplexerHelper::mouseReleased(const MouseEvent& aEvent) throw( RuntimeException )
@@ -363,7 +363,7 @@ void OMRCListenerMultiplexerHelper::mouseReleased(const MouseEvent& aEvent) thro
 }
 
 //____________________________________________________________________________________________________________
-//  XMouseListener
+//	XMouseListener
 //____________________________________________________________________________________________________________
 
 void OMRCListenerMultiplexerHelper::mouseEntered(const MouseEvent& aEvent) throw( RuntimeException )
@@ -372,7 +372,7 @@ void OMRCListenerMultiplexerHelper::mouseEntered(const MouseEvent& aEvent) throw
 }
 
 //____________________________________________________________________________________________________________
-//  XMouseListener
+//	XMouseListener
 //____________________________________________________________________________________________________________
 
 void OMRCListenerMultiplexerHelper::mouseExited(const MouseEvent& aEvent) throw( RuntimeException )
@@ -381,7 +381,7 @@ void OMRCListenerMultiplexerHelper::mouseExited(const MouseEvent& aEvent) throw(
 }
 
 //____________________________________________________________________________________________________________
-//  XMouseMotionListener
+//	XMouseMotionListener
 //____________________________________________________________________________________________________________
 
 void OMRCListenerMultiplexerHelper::mouseDragged(const MouseEvent& aEvent) throw( RuntimeException )
@@ -390,7 +390,7 @@ void OMRCListenerMultiplexerHelper::mouseDragged(const MouseEvent& aEvent) throw
 }
 
 //____________________________________________________________________________________________________________
-//  XMouseMotionListener
+//	XMouseMotionListener
 //____________________________________________________________________________________________________________
 
 void OMRCListenerMultiplexerHelper::mouseMoved(const MouseEvent& aEvent) throw( RuntimeException )
@@ -399,7 +399,7 @@ void OMRCListenerMultiplexerHelper::mouseMoved(const MouseEvent& aEvent) throw(
 }
 
 //____________________________________________________________________________________________________________
-//  XPaintListener
+//	XPaintListener
 //____________________________________________________________________________________________________________
 
 void OMRCListenerMultiplexerHelper::windowPaint(const PaintEvent& aEvent) throw( RuntimeException )
@@ -408,7 +408,7 @@ void OMRCListenerMultiplexerHelper::windowPaint(const PaintEvent& aEvent) throw(
 }
 
 //____________________________________________________________________________________________________________
-//  XTopWindowListener
+//	XTopWindowListener
 //____________________________________________________________________________________________________________
 
 void OMRCListenerMultiplexerHelper::windowOpened(const EventObject& aEvent) throw( RuntimeException )
@@ -417,7 +417,7 @@ void OMRCListenerMultiplexerHelper::windowOpened(const EventObject& aEvent) thro
 }
 
 //____________________________________________________________________________________________________________
-//  XTopWindowListener
+//	XTopWindowListener
 //____________________________________________________________________________________________________________
 
 void OMRCListenerMultiplexerHelper::windowClosing( const EventObject& aEvent ) throw( RuntimeException )
@@ -426,7 +426,7 @@ void OMRCListenerMultiplexerHelper::windowClosing( const EventObject& aEvent ) t
 }
 
 //____________________________________________________________________________________________________________
-//  XTopWindowListener
+//	XTopWindowListener
 //____________________________________________________________________________________________________________
 
 void OMRCListenerMultiplexerHelper::windowClosed( const EventObject& aEvent ) throw( RuntimeException )
@@ -435,7 +435,7 @@ void OMRCListenerMultiplexerHelper::windowClosed( const EventObject& aEvent ) th
 }
 
 //____________________________________________________________________________________________________________
-//  XTopWindowListener
+//	XTopWindowListener
 //____________________________________________________________________________________________________________
 
 void OMRCListenerMultiplexerHelper::windowMinimized( const EventObject& aEvent ) throw( RuntimeException )
@@ -444,7 +444,7 @@ void OMRCListenerMultiplexerHelper::windowMinimized( const EventObject& aEvent )
 }
 
 //____________________________________________________________________________________________________________
-//  XTopWindowListener
+//	XTopWindowListener
 //____________________________________________________________________________________________________________
 
 void OMRCListenerMultiplexerHelper::windowNormalized( const EventObject& aEvent ) throw( RuntimeException )
@@ -453,7 +453,7 @@ void OMRCListenerMultiplexerHelper::windowNormalized( const EventObject& aEvent
 }
 
 //____________________________________________________________________________________________________________
-//  XTopWindowListener
+//	XTopWindowListener
 //____________________________________________________________________________________________________________
 
 void OMRCListenerMultiplexerHelper::windowActivated( const EventObject& aEvent ) throw( RuntimeException )
@@ -462,7 +462,7 @@ void OMRCListenerMultiplexerHelper::windowActivated( const EventObject& aEvent )
 }
 
 //____________________________________________________________________________________________________________
-//  XTopWindowListener
+//	XTopWindowListener
 //____________________________________________________________________________________________________________
 
 void OMRCListenerMultiplexerHelper::windowDeactivated( const EventObject& aEvent ) throw( RuntimeException )
@@ -471,11 +471,11 @@ void OMRCListenerMultiplexerHelper::windowDeactivated( const EventObject& aEvent
 }
 
 //____________________________________________________________________________________________________________
-//  protected method
+//	protected method
 //____________________________________________________________________________________________________________
 
-void OMRCListenerMultiplexerHelper::impl_adviseToPeer(  const   Reference< XWindow >&   xPeer   ,
-                                                        const   Type&                   aType   )
+void OMRCListenerMultiplexerHelper::impl_adviseToPeer(	const	Reference< XWindow >&	xPeer	,
+                                                        const	Type&					aType	)
 {
     // add a listener to the source (peer)
     if( aType == ::getCppuType((const Reference< XWindowListener >*)0) )
@@ -503,11 +503,11 @@ void OMRCListenerMultiplexerHelper::impl_adviseToPeer(  const   Reference< XWind
 }
 
 //____________________________________________________________________________________________________________
-//  protected method
+//	protected method
 //____________________________________________________________________________________________________________
 
-void OMRCListenerMultiplexerHelper::impl_unadviseFromPeer(  const   Reference< XWindow >&   xPeer   ,
-                                                            const   Type&                   aType   )
+void OMRCListenerMultiplexerHelper::impl_unadviseFromPeer(	const	Reference< XWindow >&	xPeer	,
+                                                            const	Type&					aType	)
 {
     // the last listener is removed, remove the listener from the source (peer)
     if( aType == ::getCppuType((const Reference< XWindowListener >*)0) )
diff --git a/UnoControls/source/base/registercontrols.cxx b/UnoControls/source/base/registercontrols.cxx
index e8f58b8fa7f2..694250ff457b 100644
--- a/UnoControls/source/base/registercontrols.cxx
+++ b/UnoControls/source/base/registercontrols.cxx
@@ -27,7 +27,7 @@
  ************************************************************************/
 
 //______________________________________________________________________________________________________________
-//  includes of other projects
+//	includes of other projects
 //______________________________________________________________________________________________________________
 
 #include <cppuhelper/factory.hxx>
@@ -39,7 +39,7 @@
 #include <stdio.h>
 
 //______________________________________________________________________________________________________________
-//  includes of my own project
+//	includes of my own project
 //______________________________________________________________________________________________________________
 
 //=============================================================================
@@ -52,7 +52,7 @@
 //=============================================================================
 
 //______________________________________________________________________________________________________________
-//  defines
+//	defines
 //______________________________________________________________________________________________________________
 
 // If you will debug macros of this file ... you must define follow constant!
@@ -61,169 +61,169 @@
 //#define AS_DBG_SWITCH
 
 //______________________________________________________________________________________________________________
-//  namespaces
+//	namespaces
 //______________________________________________________________________________________________________________
 
-using namespace ::rtl                                           ;
-using namespace ::cppu                                          ;
-using namespace ::unocontrols                                   ;
-using namespace ::com::sun::star::uno                           ;
-using namespace ::com::sun::star::container                     ;
-using namespace ::com::sun::star::lang                          ;
-using namespace ::com::sun::star::registry                      ;
+using namespace ::rtl											;
+using namespace ::cppu											;
+using namespace ::unocontrols									;
+using namespace ::com::sun::star::uno							;
+using namespace ::com::sun::star::container						;
+using namespace ::com::sun::star::lang							;
+using namespace ::com::sun::star::registry						;
 
 //______________________________________________________________________________________________________________
-//  macros
+//	macros
 //______________________________________________________________________________________________________________
 
 //******************************************************************************************************************************
 // See AS_DBG_SWITCH below !!!
 #ifdef AS_DBG_SWITCH
-    #define AS_DBG_OUT(OUTPUT)  printf( OUTPUT );
+    #define AS_DBG_OUT(OUTPUT)	printf( OUTPUT );
 #else
     #define AS_DBG_OUT(OUTPUT)
 #endif
 
 //******************************************************************************************************************************
-#define CREATEINSTANCE(CLASS)                                                                                                               \
+#define	CREATEINSTANCE(CLASS)																												\
                                                                                                                                             \
-    static Reference< XInterface > SAL_CALL CLASS##_createInstance ( const Reference< XMultiServiceFactory >& rServiceManager ) throw ( Exception ) \
-    {                                                                                                                                       \
-        AS_DBG_OUT ( "\tCREATEINSTANCE():\tOK\n" )                                                                                          \
-        return Reference< XInterface >( *(OWeakObject*)(new CLASS( rServiceManager )) );                                                    \
+    static Reference< XInterface > SAL_CALL CLASS##_createInstance ( const Reference< XMultiServiceFactory >& rServiceManager ) throw ( Exception )	\
+    {																																		\
+        AS_DBG_OUT ( "\tCREATEINSTANCE():\tOK\n" )																							\
+        return Reference< XInterface >( *(OWeakObject*)(new CLASS( rServiceManager )) );													\
     }
 
 //******************************************************************************************************************************
-#define COMPONENT_INFO(CLASS)                                                                                           \
+#define	COMPONENT_INFO(CLASS)																							\
                                                                                                                         \
-    AS_DBG_OUT ( "\tCOMPONENT_INFO():\t[start]\n" )                                                                     \
-    try                                                                                                                 \
-    {                                                                                                                   \
-        /* Set default result of follow operations !!! */                                                               \
-        bReturn = sal_False ;                                                                                           \
+    AS_DBG_OUT ( "\tCOMPONENT_INFO():\t[start]\n" )																		\
+    try																													\
+    {                                                                                               					\
+        /* Set default result of follow operations !!! */																\
+        bReturn = sal_False ;                                                                       					\
                                                                                                                         \
-        /* Do the follow only, if given key is valid ! */                                                               \
-        if ( xKey.is () )                                                                                               \
-        {                                                                                                               \
-            AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\txkey is valid ...\n" )                                                 \
-            /* Build new keyname */                                                                                     \
-            sKeyName     =  OUString::createFromAscii( "/" )            ;                                               \
-            sKeyName    +=  CLASS::impl_getStaticImplementationName()   ;                                               \
-            sKeyName    +=  OUString::createFromAscii( "/UNO/SERVICES" );                                               \
+        /* Do the follow only, if given key is valid ! */																\
+        if ( xKey.is () )                                                                         						\
+        {                                                                                           					\
+            AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\txkey is valid ...\n" )													\
+            /* Build new keyname */																						\
+            sKeyName	 =	OUString::createFromAscii( "/" )			;		                   						\
+            sKeyName	+=	CLASS::impl_getStaticImplementationName()	;   	                						\
+            sKeyName	+=	OUString::createFromAscii( "/UNO/SERVICES" );       	            						\
                                                                                                                         \
-            /* Create new key with new name. */                                                                         \
-            xNewKey = xKey->createKey( sKeyName );                                                                      \
+            /* Create new key with new name. */																			\
+            xNewKey = xKey->createKey( sKeyName );                                              						\
                                                                                                                         \
-            /* If this new key valid ... */                                                                             \
-            if ( xNewKey.is () )                                                                                        \
-            {                                                                                                           \
-                AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\txNewkey is valid ...\n" )                                          \
-                /* Get information about supported services. */                                                         \
-                seqServiceNames =   CLASS::impl_getStaticSupportedServiceNames()    ;                                   \
-                pArray          =   seqServiceNames.getArray()                      ;                                   \
-                nLength         =   seqServiceNames.getLength()                     ;                                   \
-                nCounter        =   0                                               ;                                   \
+            /* If this new key valid ... */																				\
+            if ( xNewKey.is () )                                                                    					\
+            {                                                                                       					\
+                AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\txNewkey is valid ...\n" )											\
+                /* Get information about supported services. */															\
+                seqServiceNames	=	CLASS::impl_getStaticSupportedServiceNames()	;           						\
+                pArray			=	seqServiceNames.getArray()						;           						\
+                nLength			=	seqServiceNames.getLength()						;           						\
+                nCounter		=	0												;           						\
                                                                                                                         \
-                AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\tloop ..." )                                                        \
-                /* Then set this information on this key. */                                                            \
-                for ( nCounter = 0; nCounter < nLength; ++nCounter )                                                    \
-                {                                                                                                       \
-                    xNewKey->createKey( pArray [nCounter] );                                                            \
-                }                                                                                                       \
-                AS_DBG_OUT ( " OK\n" )                                                                                  \
+                AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\tloop ..." )														\
+                /* Then set this information on this key. */															\
+                for ( nCounter = 0; nCounter < nLength; ++nCounter )                                					\
+                {                                                                                   					\
+                    xNewKey->createKey( pArray [nCounter] );                                      						\
+                }                                                                                   					\
+                AS_DBG_OUT ( " OK\n" )																					\
                                                                                                                         \
-                /* Result of this operations = OK. */                                                                   \
-                bReturn = sal_True ;                                                                                    \
-            }                                                                                                           \
-            AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\t... leave xNewKey\n" )                                                 \
-        }                                                                                                               \
-        AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\t... leave xKey\n" )                                                        \
-    }                                                                                                                   \
-    catch( InvalidRegistryException& )                                                                                  \
-    {                                                                                                                   \
-        AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\tInvalidRegistryException detected!!!\n" )                                  \
-        bReturn = sal_False ;                                                                                           \
-    }                                                                                                                   \
+                /* Result of this operations = OK. */																	\
+                bReturn = sal_True ;                                                                					\
+            }                                                                                       					\
+            AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\t... leave xNewKey\n" )													\
+        }                                                                                           					\
+        AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\t... leave xKey\n" )														\
+    }                                                                                               					\
+    catch( InvalidRegistryException& )                                                             						\
+    {                                                                                               					\
+        AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\tInvalidRegistryException detected!!!\n" )									\
+        bReturn = sal_False ;                                                                       					\
+    }																													\
     AS_DBG_OUT ( "\tCOMPONENT_INFO():\t[end]\n" )
 
 //******************************************************************************************************************************
-#define CREATEFACTORY_ONEINSTANCE(CLASS)                                                                                \
+#define	CREATEFACTORY_ONEINSTANCE(CLASS)																				\
                                                                                                                         \
-    AS_DBG_OUT ( "\tCREATEFACTORY_ONEINSTANCE():\t[start]\n" )                                                          \
-    /* Create right factory ... */                                                                                      \
-    xFactory = Reference< XSingleServiceFactory >                                                                       \
-                    (                                                                                                   \
-                        cppu::createOneInstanceFactory  (   xServiceManager                                     ,       \
-                                                            CLASS::impl_getStaticImplementationName     ()  ,       \
-                                                            CLASS##_createInstance                              ,       \
-                                                            CLASS::impl_getStaticSupportedServiceNames  ()  )       \
-                    ) ;                                                                                                 \
+    AS_DBG_OUT ( "\tCREATEFACTORY_ONEINSTANCE():\t[start]\n" )															\
+    /* Create right factory ... */																						\
+    xFactory = Reference< XSingleServiceFactory >																		\
+                    (																									\
+                        cppu::createOneInstanceFactory	(	xServiceManager										,		\
+                                                            CLASS::impl_getStaticImplementationName		()	,		\
+                                                            CLASS##_createInstance								,		\
+                                                            CLASS::impl_getStaticSupportedServiceNames	()	)		\
+                    ) ;																									\
     AS_DBG_OUT ( "\tCREATEFACTORY_ONEINSTANCE():\t[end]\n" )
 
 //******************************************************************************************************************************
-#define CREATEFACTORY_SINGLE(CLASS)                                                                                     \
+#define	CREATEFACTORY_SINGLE(CLASS)																						\
                                                                                                                         \
-    AS_DBG_OUT ( "\tCREATEFACTORY_SINGLE():\t[start]\n" )                                                               \
-    /* Create right factory ... */                                                                                      \
-    xFactory = Reference< XSingleServiceFactory >                                                                       \
-                    (                                                                                                   \
-                        cppu::createSingleFactory   (   xServiceManager                                     ,           \
-                                                        CLASS::impl_getStaticImplementationName     ()  ,           \
-                                                        CLASS##_createInstance                              ,           \
-                                                        CLASS::impl_getStaticSupportedServiceNames  ()  )           \
-                    ) ;                                                                                                 \
+    AS_DBG_OUT ( "\tCREATEFACTORY_SINGLE():\t[start]\n" )																\
+    /* Create right factory ... */																						\
+    xFactory = Reference< XSingleServiceFactory >																		\
+                    (																									\
+                        cppu::createSingleFactory	(	xServiceManager										,			\
+                                                        CLASS::impl_getStaticImplementationName		()	,			\
+                                                        CLASS##_createInstance								,			\
+                                                        CLASS::impl_getStaticSupportedServiceNames	()	)			\
+                    ) ;																									\
     AS_DBG_OUT ( "\tCREATEFACTORY_SINGLE():\t[end]\n" )
 
 //******************************************************************************************************************************
-#define IF_NAME_CREATECOMPONENTFACTORY_ONEINSTANCE(CLASS)                                                               \
+#define	IF_NAME_CREATECOMPONENTFACTORY_ONEINSTANCE(CLASS)																\
                                                                                                                         \
-    if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) )     \
-    {                                                                                                                   \
-        AS_DBG_OUT ( "\tIF_NAME_CREATECOMPONENTFACTORY_ONEINSTANCE():\timplementationname found\n" )                    \
-        CREATEFACTORY_ONEINSTANCE ( CLASS )                                                                         \
+    if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) )		\
+    {																													\
+        AS_DBG_OUT ( "\tIF_NAME_CREATECOMPONENTFACTORY_ONEINSTANCE():\timplementationname found\n" )					\
+        CREATEFACTORY_ONEINSTANCE ( CLASS )																			\
     }
 
 //******************************************************************************************************************************
-#define IF_NAME_CREATECOMPONENTFACTORY_SINGLE(CLASS)                                                                    \
+#define	IF_NAME_CREATECOMPONENTFACTORY_SINGLE(CLASS)																	\
                                                                                                                         \
-    if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) )     \
-    {                                                                                                                   \
-        AS_DBG_OUT ( "\tIF_NAME_CREATECOMPONENTFACTORY_SINGLE():\timplementationname found\n" )                         \
-        CREATEFACTORY_SINGLE ( CLASS )                                                                              \
+    if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) )		\
+    {																													\
+        AS_DBG_OUT ( "\tIF_NAME_CREATECOMPONENTFACTORY_SINGLE():\timplementationname found\n" )							\
+        CREATEFACTORY_SINGLE ( CLASS )																				\
     }
 
 //______________________________________________________________________________________________________________
-//  declare functions to create a new instance of service
+//	declare functions to create a new instance of service
 //______________________________________________________________________________________________________________
 
 //=============================================================================
 //  Add new macro line to use new services.
 //
-//  !!! ATTENTION !!!
-//      Write no ";" at end of line! (see macro)
+//	!!! ATTENTION !!!
+//		Write no ";" at end of line! (see macro)
 //=============================================================================
-CREATEINSTANCE  ( FrameControl      )
-CREATEINSTANCE  ( ProgressBar       )
-CREATEINSTANCE  ( ProgressMonitor   )
-CREATEINSTANCE  ( StatusIndicator   )
+CREATEINSTANCE	( FrameControl		)
+CREATEINSTANCE	( ProgressBar		)
+CREATEINSTANCE	( ProgressMonitor	)
+CREATEINSTANCE	( StatusIndicator	)
 //=============================================================================
 
 //______________________________________________________________________________________________________________
-//  return environment
+//	return environment
 //______________________________________________________________________________________________________________
 
-extern "C" void SAL_CALL component_getImplementationEnvironment(    const   sal_Char**          ppEnvironmentTypeName   ,
-                                                                            uno_Environment**   /*ppEnvironment*/           )
+extern "C" void SAL_CALL component_getImplementationEnvironment(	const	sal_Char**			ppEnvironmentTypeName	,
+                                                                            uno_Environment**	/*ppEnvironment*/			)
 {
     *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
 }
 
 //______________________________________________________________________________________________________________
-//  write component info to registry
+//	write component info to registry
 //______________________________________________________________________________________________________________
 
-extern "C" sal_Bool SAL_CALL component_writeInfo(   void*   /*pServiceManager*/ ,
-                                                    void*   pRegistryKey    )
+extern "C" sal_Bool SAL_CALL component_writeInfo(	void*	/*pServiceManager*/	,
+                                                    void*	pRegistryKey	)
 {
     AS_DBG_OUT ( "component_writeInfo():\t[start]\n" )
 
@@ -236,24 +236,24 @@ extern "C" sal_Bool SAL_CALL component_writeInfo(   void*   /*pServiceManager*/
 
         // Define variables for following macros!
         // bReturn is set automaticly.
-        Reference< XRegistryKey >       xKey( reinterpret_cast< XRegistryKey* >( pRegistryKey ) )   ;
-        Reference< XRegistryKey >       xNewKey                                                     ;
-        Sequence< OUString >            seqServiceNames                                             ;
-        const OUString*                 pArray                                                      ;
-        sal_Int32                       nLength                                                     ;
-        sal_Int32                       nCounter                                                    ;
-        OUString                        sKeyName                                                    ;
+        Reference< XRegistryKey >		xKey( reinterpret_cast< XRegistryKey* >( pRegistryKey ) )	;
+        Reference< XRegistryKey >		xNewKey														;
+        Sequence< OUString >			seqServiceNames												;
+        const OUString*					pArray														;
+        sal_Int32						nLength														;
+        sal_Int32						nCounter													;
+        OUString						sKeyName													;
 
         //=============================================================================
         //  Add new macro line to register new services.
         //
-        //  !!! ATTENTION !!!
-        //      Write no ";" at end of line! (see macro)
+        //	!!! ATTENTION !!!
+        //		Write no ";" at end of line! (see macro)
         //=============================================================================
-        COMPONENT_INFO  ( FrameControl      )
-        COMPONENT_INFO  ( ProgressBar       )
-        COMPONENT_INFO  ( ProgressMonitor   )
-        COMPONENT_INFO  ( StatusIndicator   )
+        COMPONENT_INFO	( FrameControl		)
+        COMPONENT_INFO	( ProgressBar		)
+        COMPONENT_INFO	( ProgressMonitor	)
+        COMPONENT_INFO	( StatusIndicator	)
         //=============================================================================
 
         AS_DBG_OUT ( "component_writeInfo():\t\t... leave pRegistryKey scope\n" )
@@ -266,42 +266,42 @@ extern "C" sal_Bool SAL_CALL component_writeInfo(   void*   /*pServiceManager*/
 }
 
 //______________________________________________________________________________________________________________
-//  create right component factory
+//	create right component factory
 //______________________________________________________________________________________________________________
 
-extern "C" void* SAL_CALL component_getFactory( const   sal_Char*   pImplementationName ,
-                                                        void*       pServiceManager     ,
-                                                        void*       /*pRegistryKey*/        )
+extern "C" void* SAL_CALL component_getFactory(	const	sal_Char*	pImplementationName	,
+                                                        void*		pServiceManager		,
+                                                        void*		/*pRegistryKey*/		)
 {
     AS_DBG_OUT( "component_getFactory():\t[start]\n" )
 
     // Set default return value for this operation - if it failed.
     void* pReturn = NULL ;
 
-    if  (
-            ( pImplementationName   !=  NULL ) &&
-            ( pServiceManager       !=  NULL )
+    if	(
+            ( pImplementationName	!=	NULL ) &&
+            ( pServiceManager		!=	NULL )
         )
     {
         AS_DBG_OUT( "component_getFactory():\t\t... enter scope - pointer are valid\n" )
 
         // Define variables which are used in following macros.
-        Reference< XSingleServiceFactory >  xFactory                                                                        ;
-        Reference< XMultiServiceFactory >   xServiceManager( reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) ) ;
+        Reference< XSingleServiceFactory >	xFactory																		;
+        Reference< XMultiServiceFactory >	xServiceManager( reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) )	;
 
         //=============================================================================
         //  Add new macro line to handle new service.
         //
-        //  !!! ATTENTION !!!
-        //      Write no ";" at end of line and dont forget "else" ! (see macro)
+        //	!!! ATTENTION !!!
+        //		Write no ";" at end of line and dont forget "else" ! (see macro)
         //=============================================================================
-        IF_NAME_CREATECOMPONENTFACTORY_SINGLE( FrameControl     )
+        IF_NAME_CREATECOMPONENTFACTORY_SINGLE( FrameControl		)
         else
-        IF_NAME_CREATECOMPONENTFACTORY_SINGLE( ProgressBar      )
+        IF_NAME_CREATECOMPONENTFACTORY_SINGLE( ProgressBar		)
         else
-        IF_NAME_CREATECOMPONENTFACTORY_SINGLE( ProgressMonitor  )
+        IF_NAME_CREATECOMPONENTFACTORY_SINGLE( ProgressMonitor	)
         else
-        IF_NAME_CREATECOMPONENTFACTORY_SINGLE( StatusIndicator  )
+        IF_NAME_CREATECOMPONENTFACTORY_SINGLE( StatusIndicator	)
         //=============================================================================
 
         // Factory is valid - service was found.
diff --git a/UnoControls/source/controls/OConnectionPointContainerHelper.cxx b/UnoControls/source/controls/OConnectionPointContainerHelper.cxx
index c5bd8cfce1e9..470254f323c5 100644
--- a/UnoControls/source/controls/OConnectionPointContainerHelper.cxx
+++ b/UnoControls/source/controls/OConnectionPointContainerHelper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,39 +27,39 @@
  ************************************************************************/
 
 //______________________________________________________________________________________________________________
-//  my own include
+//	my own include
 //______________________________________________________________________________________________________________
 
 #include "OConnectionPointContainerHelper.hxx"
 
 //______________________________________________________________________________________________________________
-//  includes of other projects
+//	includes of other projects
 //______________________________________________________________________________________________________________
 
 //______________________________________________________________________________________________________________
-//  include of my own project
+//	include of my own project
 //______________________________________________________________________________________________________________
 #include "OConnectionPointHelper.hxx"
 
 //______________________________________________________________________________________________________________
-//  namespaces
+//	namespaces
 //______________________________________________________________________________________________________________
 
-using namespace ::rtl                   ;
-using namespace ::osl                   ;
-using namespace ::cppu                  ;
-using namespace ::com::sun::star::uno   ;
-using namespace ::com::sun::star::lang  ;
+using namespace	::rtl					;
+using namespace	::osl					;
+using namespace	::cppu					;
+using namespace	::com::sun::star::uno	;
+using namespace	::com::sun::star::lang	;
 
 namespace unocontrols{
 
 //______________________________________________________________________________________________________________
-//  construct/destruct
+//	construct/destruct
 //______________________________________________________________________________________________________________
 
 OConnectionPointContainerHelper::OConnectionPointContainerHelper( Mutex& aMutex )
-    : m_aSharedMutex        ( aMutex    )
-    , m_aMultiTypeContainer ( aMutex    )
+    : m_aSharedMutex		( aMutex	)
+    , m_aMultiTypeContainer	( aMutex	)
 {
 }
 
@@ -68,17 +68,17 @@ OConnectionPointContainerHelper::~OConnectionPointContainerHelper()
 }
 
 //____________________________________________________________________________________________________________
-//  XInterface
+//	XInterface
 //____________________________________________________________________________________________________________
 
 Any SAL_CALL OConnectionPointContainerHelper::queryInterface( const Type& aType ) throw( RuntimeException )
 {
     // Attention:
-    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+    //	Don't use mutex or guard in this method!!! Is a method of XInterface.
 
     // Ask for my own supported interfaces ...
-    Any aReturn ( ::cppu::queryInterface(   aType                                               ,
-                                               static_cast< XConnectionPointContainer*  > ( this )
+    Any aReturn	( ::cppu::queryInterface(	aType												,
+                                               static_cast< XConnectionPointContainer*	> ( this )
                                         )
                 );
 
@@ -93,33 +93,33 @@ Any SAL_CALL OConnectionPointContainerHelper::queryInterface( const Type& aType
 }
 
 //____________________________________________________________________________________________________________
-//  XInterface
+//	XInterface
 //____________________________________________________________________________________________________________
 
 void SAL_CALL OConnectionPointContainerHelper::acquire() throw()
 {
     // Attention:
-    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+    //	Don't use mutex or guard in this method!!! Is a method of XInterface.
 
     // Forward to baseclass
     OWeakObject::acquire();
 }
 
 //____________________________________________________________________________________________________________
-//  XInterface
+//	XInterface
 //____________________________________________________________________________________________________________
 
 void SAL_CALL OConnectionPointContainerHelper::release() throw()
 {
     // Attention:
-    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+    //	Don't use mutex or guard in this method!!! Is a method of XInterface.
 
     // Forward to baseclass
     OWeakObject::release();
 }
 
 //______________________________________________________________________________________________________________
-//  XConnectionPointContainer
+//	XConnectionPointContainer
 //______________________________________________________________________________________________________________
 
 Sequence< Type > SAL_CALL OConnectionPointContainerHelper::getConnectionPointTypes() throw( RuntimeException )
@@ -129,7 +129,7 @@ Sequence< Type > SAL_CALL OConnectionPointContainerHelper::getConnectionPointTyp
 }
 
 //______________________________________________________________________________________________________________
-//  XConnectionPointContainer
+//	XConnectionPointContainer
 //______________________________________________________________________________________________________________
 
 Reference< XConnectionPoint > SAL_CALL OConnectionPointContainerHelper::queryConnectionPoint( const Type& aType ) throw( RuntimeException )
@@ -152,30 +152,30 @@ Reference< XConnectionPoint > SAL_CALL OConnectionPointContainerHelper::queryCon
 }
 
 //______________________________________________________________________________________________________________
-//  XConnectionPointContainer
+//	XConnectionPointContainer
 //______________________________________________________________________________________________________________
 
-void SAL_CALL OConnectionPointContainerHelper::advise(  const   Type&                       aType       ,
-                                                        const   Reference< XInterface >&    xListener   ) throw( RuntimeException )
+void SAL_CALL OConnectionPointContainerHelper::advise(	const	Type&	   					aType		,
+                                                        const	Reference< XInterface >&	xListener	) throw( RuntimeException )
 {
     // Container is threadsafe himself !
     m_aMultiTypeContainer.addInterface( aType, xListener );
 }
 
 //______________________________________________________________________________________________________________
-//  XConnectionPointContainer
+//	XConnectionPointContainer
 //______________________________________________________________________________________________________________
 
-void SAL_CALL OConnectionPointContainerHelper::unadvise(    const   Type&                       aType       ,
-                                                            const   Reference< XInterface >&    xListener   ) throw( RuntimeException )
+void SAL_CALL OConnectionPointContainerHelper::unadvise(	const	Type&	   					aType		,
+                                                            const	Reference< XInterface >&	xListener	) throw( RuntimeException )
 {
     // Container is threadsafe himself !
     m_aMultiTypeContainer.removeInterface( aType, xListener );
 }
 
 //______________________________________________________________________________________________________________
-//  public but impl method!
-//  Is neccessary to get container member at OConnectionPoint-instance.
+//	public but impl method!
+//	Is neccessary to get container member at OConnectionPoint-instance.
 //______________________________________________________________________________________________________________
 
 OMultiTypeInterfaceContainerHelper& OConnectionPointContainerHelper::impl_getMultiTypeContainer()
@@ -185,6 +185,6 @@ OMultiTypeInterfaceContainerHelper& OConnectionPointContainerHelper::impl_getMul
     return m_aMultiTypeContainer;
 }
 
-}   // namespace unocontrols
+}	// namespace unocontrols
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/controls/OConnectionPointHelper.cxx b/UnoControls/source/controls/OConnectionPointHelper.cxx
index a8b174b01a3a..a9f0e606db11 100644
--- a/UnoControls/source/controls/OConnectionPointHelper.cxx
+++ b/UnoControls/source/controls/OConnectionPointHelper.cxx
@@ -27,44 +27,44 @@
  ************************************************************************/
 
 //______________________________________________________________________________________________________________
-//  my own include
+//	my own include
 //______________________________________________________________________________________________________________
 
 #include "OConnectionPointHelper.hxx"
 
 //______________________________________________________________________________________________________________
-//  includes of other projects
+//	includes of other projects
 //______________________________________________________________________________________________________________
 
 //______________________________________________________________________________________________________________
-//  include of my own project
+//	include of my own project
 //______________________________________________________________________________________________________________
 #include "OConnectionPointContainerHelper.hxx"
 
 //______________________________________________________________________________________________________________
-//  namespaces
+//	namespaces
 //______________________________________________________________________________________________________________
 
-using namespace ::rtl                   ;
-using namespace ::osl                   ;
-using namespace ::cppu                  ;
-using namespace ::com::sun::star::uno   ;
-using namespace ::com::sun::star::lang  ;
+using namespace	::rtl					;
+using namespace	::osl					;
+using namespace	::cppu					;
+using namespace	::com::sun::star::uno	;
+using namespace	::com::sun::star::lang	;
 
 namespace unocontrols{
 
 //______________________________________________________________________________________________________________
-//  construct/destruct
+//	construct/destruct
 //______________________________________________________________________________________________________________
 
 OConnectionPointHelper::OConnectionPointHelper(
-    Mutex&                              aMutex                      ,
-    OConnectionPointContainerHelper*    pContainerImplementation    ,
-    Type                                aType
-)   : m_aSharedMutex                ( aMutex                    )
-    , m_oContainerWeakReference     ( pContainerImplementation  )
-    , m_pContainerImplementation    ( pContainerImplementation  )
-    , m_aInterfaceType              ( aType                     )
+    Mutex&								aMutex						,
+    OConnectionPointContainerHelper*	pContainerImplementation	,
+    Type				  			    aType
+)   : m_aSharedMutex				( aMutex					)
+    , m_oContainerWeakReference		( pContainerImplementation	)
+    , m_pContainerImplementation	( pContainerImplementation	)
+    , m_aInterfaceType				( aType						)
 {
 }
 
@@ -73,17 +73,17 @@ OConnectionPointHelper::~OConnectionPointHelper()
 }
 
 //____________________________________________________________________________________________________________
-//  XInterface
+//	XInterface
 //____________________________________________________________________________________________________________
 
 Any SAL_CALL OConnectionPointHelper::queryInterface( const Type& aType ) throw( RuntimeException )
 {
     // Attention:
-    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+    //	Don't use mutex or guard in this method!!! Is a method of XInterface.
 
     // Ask for my own supported interfaces ...
-    Any aReturn ( ::cppu::queryInterface(   aType                                       ,
-                                            static_cast< XConnectionPoint*  > ( this )
+    Any aReturn	( ::cppu::queryInterface(	aType										,
+                                            static_cast< XConnectionPoint*	> ( this )
                                         )
                 );
 
@@ -98,33 +98,33 @@ Any SAL_CALL OConnectionPointHelper::queryInterface( const Type& aType ) throw(
 }
 
 //____________________________________________________________________________________________________________
-//  XInterface
+//	XInterface
 //____________________________________________________________________________________________________________
 
 void SAL_CALL OConnectionPointHelper::acquire() throw()
 {
     // Attention:
-    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+    //	Don't use mutex or guard in this method!!! Is a method of XInterface.
 
     // Forward to baseclass
     OWeakObject::acquire();
 }
 
 //____________________________________________________________________________________________________________
-//  XInterface
+//	XInterface
 //____________________________________________________________________________________________________________
 
 void SAL_CALL OConnectionPointHelper::release() throw()
 {
     // Attention:
-    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+    //	Don't use mutex or guard in this method!!! Is a method of XInterface.
 
     // Forward to baseclass
     OWeakObject::release();
 }
 
 //______________________________________________________________________________________________________________
-//  XConnectionPoint
+//	XConnectionPoint
 //______________________________________________________________________________________________________________
 
 Type SAL_CALL OConnectionPointHelper::getConnectionType() throw( RuntimeException )
@@ -148,7 +148,7 @@ Type SAL_CALL OConnectionPointHelper::getConnectionType() throw( RuntimeExceptio
 }
 
 //______________________________________________________________________________________________________________
-//  XConnectionPoint
+//	XConnectionPoint
 //______________________________________________________________________________________________________________
 
 Reference< XConnectionPointContainer > SAL_CALL OConnectionPointHelper::getConnectionPointContainer() throw( RuntimeException )
@@ -160,12 +160,12 @@ Reference< XConnectionPointContainer > SAL_CALL OConnectionPointHelper::getConne
 }
 
 //______________________________________________________________________________________________________________
-//  XConnectionPoint
+//	XConnectionPoint
 //______________________________________________________________________________________________________________
 
-void SAL_CALL OConnectionPointHelper::advise( const Reference< XInterface >& xListener ) throw( ListenerExistException      ,
-                                                                                                InvalidListenerException    ,
-                                                                                                RuntimeException            )
+void SAL_CALL OConnectionPointHelper::advise( const Reference< XInterface >& xListener ) throw(	ListenerExistException		,
+                                                                                                InvalidListenerException	,
+                                                                                                RuntimeException			)
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aSharedMutex );
@@ -195,7 +195,7 @@ void SAL_CALL OConnectionPointHelper::advise( const Reference< XInterface >& xLi
 }
 
 //______________________________________________________________________________________________________________
-//  XConnectionPoint
+//	XConnectionPoint
 //______________________________________________________________________________________________________________
 
 void SAL_CALL OConnectionPointHelper::unadvise( const Reference< XInterface >& xListener ) throw( RuntimeException )
@@ -216,7 +216,7 @@ void SAL_CALL OConnectionPointHelper::unadvise( const Reference< XInterface >& x
 }
 
 //______________________________________________________________________________________________________________
-//  XConnectionPoint
+//	XConnectionPoint
 //______________________________________________________________________________________________________________
 
 Sequence< Reference< XInterface > > SAL_CALL OConnectionPointHelper::getConnections() throw( RuntimeException )
@@ -232,7 +232,7 @@ Sequence< Reference< XInterface > > SAL_CALL OConnectionPointHelper::getConnecti
     // Set default return value, if method failed.
     Sequence< Reference< XInterface > > seqReturnConnections = Sequence< Reference< XInterface > >();
     // Get reference to private member of OConnectionPointHelperContainer!
-    OMultiTypeInterfaceContainerHelper& aSharedContainer = m_pContainerImplementation->impl_getMultiTypeContainer();
+    OMultiTypeInterfaceContainerHelper&	aSharedContainer = m_pContainerImplementation->impl_getMultiTypeContainer();
     // Get pointer to specialized container which hold all interfaces of searched type.
     OInterfaceContainerHelper* pSpecialContainer = aSharedContainer.getContainer( m_aInterfaceType );
     // Get elements of searched type, if somelse exist.
@@ -247,7 +247,7 @@ Sequence< Reference< XInterface > > SAL_CALL OConnectionPointHelper::getConnecti
 }
 
 //______________________________________________________________________________________________________________
-//  private method
+//	private method
 //______________________________________________________________________________________________________________
 
 sal_Bool OConnectionPointHelper::impl_LockContainer()
@@ -260,7 +260,7 @@ sal_Bool OConnectionPointHelper::impl_LockContainer()
 }
 
 //______________________________________________________________________________________________________________
-//  private method
+//	private method
 //______________________________________________________________________________________________________________
 
 void OConnectionPointHelper::impl_UnlockContainer()
@@ -270,6 +270,6 @@ void OConnectionPointHelper::impl_UnlockContainer()
     m_xLock = Reference< XInterface >();
 }
 
-}   // namespace unocontrols
+}	// namespace unocontrols
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx
index 9987478b7b56..a111bf0973f9 100644
--- a/UnoControls/source/controls/framecontrol.cxx
+++ b/UnoControls/source/controls/framecontrol.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 
 //______________________________________________________________________________________________________________
-//  my own include
+//	my own include
 //______________________________________________________________________________________________________________
 
 #include "framecontrol.hxx"
 
 //______________________________________________________________________________________________________________
-//  includes of other projects
+//	includes of other projects
 //______________________________________________________________________________________________________________
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
@@ -46,35 +46,35 @@
 #include <osl/diagnose.h>
 
 //______________________________________________________________________________________________________________
-//  include of my own project
+//	include of my own project
 //______________________________________________________________________________________________________________
 
 //______________________________________________________________________________________________________________
-//  namespaces
+//	namespaces
 //______________________________________________________________________________________________________________
 
-using namespace ::rtl                   ;
-using namespace ::osl                   ;
-using namespace ::cppu                  ;
-using namespace ::com::sun::star::uno   ;
-using namespace ::com::sun::star::lang  ;
-using namespace ::com::sun::star::beans ;
-using namespace ::com::sun::star::awt   ;
-using namespace ::com::sun::star::frame ;
-using namespace ::com::sun::star::util  ;
+using namespace	::rtl					;
+using namespace	::osl					;
+using namespace	::cppu					;
+using namespace	::com::sun::star::uno	;
+using namespace	::com::sun::star::lang	;
+using namespace	::com::sun::star::beans	;
+using namespace	::com::sun::star::awt	;
+using namespace	::com::sun::star::frame	;
+using namespace	::com::sun::star::util	;
 
 namespace unocontrols{
 
 //______________________________________________________________________________________________________________
-//  construct/destruct
+//	construct/destruct
 //______________________________________________________________________________________________________________
 
 FrameControl::FrameControl( const Reference< XMultiServiceFactory >& xFactory )
-    : BaseControl                   ( xFactory                                                                              )
-    , OBroadcastHelper              ( m_aMutex                                                                              )
-    , OPropertySetHelper            ( *SAL_STATIC_CAST( OBroadcastHelper *, this )  )
-    , m_aInterfaceContainer         ( m_aMutex                                                                              )
-    , m_aConnectionPointContainer   ( m_aMutex                                                                              )
+    : BaseControl					( xFactory																				)
+    , OBroadcastHelper				( m_aMutex																				)
+    , OPropertySetHelper			( *SAL_STATIC_CAST( OBroadcastHelper *, this )	)
+    , m_aInterfaceContainer			( m_aMutex																				)
+    , m_aConnectionPointContainer	( m_aMutex																				)
 {
 }
 
@@ -83,13 +83,13 @@ FrameControl::~FrameControl()
 }
 
 //____________________________________________________________________________________________________________
-//  XInterface
+//	XInterface
 //____________________________________________________________________________________________________________
 
 Any SAL_CALL FrameControl::queryInterface( const Type& rType ) throw( RuntimeException )
 {
     // Attention:
-    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+    //	Don't use mutex or guard in this method!!! Is a method of XInterface.
     Any aReturn ;
     Reference< XInterface > xDel = BaseControl::impl_getDelegator();
     if ( xDel.is() )
@@ -108,33 +108,33 @@ Any SAL_CALL FrameControl::queryInterface( const Type& rType ) throw( RuntimeExc
 }
 
 //____________________________________________________________________________________________________________
-//  XInterface
+//	XInterface
 //____________________________________________________________________________________________________________
 
 void SAL_CALL FrameControl::acquire() throw()
 {
     // Attention:
-    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+    //	Don't use mutex or guard in this method!!! Is a method of XInterface.
 
     // Forward to baseclass
     BaseControl::acquire();
 }
 
 //____________________________________________________________________________________________________________
-//  XInterface
+//	XInterface
 //____________________________________________________________________________________________________________
 
 void SAL_CALL FrameControl::release() throw()
 {
     // Attention:
-    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+    //	Don't use mutex or guard in this method!!! Is a method of XInterface.
 
     // Forward to baseclass
     BaseControl::release();
 }
 
 //____________________________________________________________________________________________________________
-//  XTypeProvider
+//	XTypeProvider
 //____________________________________________________________________________________________________________
 
 Sequence< Type > SAL_CALL FrameControl::getTypes() throw( RuntimeException )
@@ -153,9 +153,9 @@ Sequence< Type > SAL_CALL FrameControl::getTypes() throw( RuntimeException )
         if ( pTypeCollection == NULL )
         {
             // Create a static typecollection ...
-            static OTypeCollection aTypeCollection  (   ::getCppuType(( const Reference< XControlModel              >*)NULL )   ,
-                                                          ::getCppuType(( const Reference< XControlContainer            >*)NULL )   ,
-                                                          ::getCppuType(( const Reference< XConnectionPointContainer    >*)NULL )   ,
+            static OTypeCollection aTypeCollection	(	::getCppuType(( const Reference< XControlModel				>*)NULL )	,
+                                                          ::getCppuType(( const Reference< XControlContainer			>*)NULL )	,
+                                                          ::getCppuType(( const Reference< XConnectionPointContainer	>*)NULL )	,
                                                         BaseControl::getTypes()
                                                     );
             // ... and set his address to static pointer!
@@ -167,16 +167,16 @@ Sequence< Type > SAL_CALL FrameControl::getTypes() throw( RuntimeException )
 }
 
 //____________________________________________________________________________________________________________
-//  XAggregation
+//	XAggregation
 //____________________________________________________________________________________________________________
 
 Any SAL_CALL FrameControl::queryAggregation( const Type& aType ) throw( RuntimeException )
 {
     // Ask for my own supported interfaces ...
     // Attention: XTypeProvider and XInterface are supported by OComponentHelper!
-    Any aReturn ( ::cppu::queryInterface(   aType                                               ,
-                                               static_cast< XControlModel*              > ( this )  ,
-                                               static_cast< XConnectionPointContainer*  > ( this )
+    Any aReturn	( ::cppu::queryInterface(	aType												,
+                                               static_cast< XControlModel*				> ( this )	,
+                                               static_cast< XConnectionPointContainer*	> ( this )
                                         )
                 );
 
@@ -195,11 +195,11 @@ Any SAL_CALL FrameControl::queryAggregation( const Type& aType ) throw( RuntimeE
 }
 
 //____________________________________________________________________________________________________________
-//  XControl
+//	XControl
 //____________________________________________________________________________________________________________
 
-void SAL_CALL FrameControl::createPeer( const   Reference< XToolkit >&      xToolkit    ,
-                                        const   Reference< XWindowPeer >&   xParentPeer ) throw( RuntimeException )
+void SAL_CALL FrameControl::createPeer(	const	Reference< XToolkit >&		xToolkit	,
+                                        const	Reference< XWindowPeer >&	xParentPeer	) throw( RuntimeException )
 {
     BaseControl::createPeer( xToolkit, xParentPeer );
     if ( impl_getPeerWindow().is() )
@@ -212,7 +212,7 @@ void SAL_CALL FrameControl::createPeer( const   Reference< XToolkit >&      xToo
 }
 
 //____________________________________________________________________________________________________________
-//  XControl
+//	XControl
 //____________________________________________________________________________________________________________
 
 sal_Bool SAL_CALL FrameControl::setModel( const Reference< XControlModel >& /*xModel*/ ) throw( RuntimeException )
@@ -222,7 +222,7 @@ sal_Bool SAL_CALL FrameControl::setModel( const Reference< XControlModel >& /*xM
 }
 
 //____________________________________________________________________________________________________________
-//  XControl
+//	XControl
 //____________________________________________________________________________________________________________
 
 Reference< XControlModel > SAL_CALL FrameControl::getModel() throw( RuntimeException )
@@ -232,7 +232,7 @@ Reference< XControlModel > SAL_CALL FrameControl::getModel() throw( RuntimeExcep
 }
 
 //____________________________________________________________________________________________________________
-//  XControl
+//	XControl
 //____________________________________________________________________________________________________________
 
 void SAL_CALL FrameControl::dispose() throw( RuntimeException )
@@ -242,7 +242,7 @@ void SAL_CALL FrameControl::dispose() throw( RuntimeException )
 }
 
 //____________________________________________________________________________________________________________
-//  XView
+//	XView
 //____________________________________________________________________________________________________________
 
 sal_Bool SAL_CALL FrameControl::setGraphics( const Reference< XGraphics >& /*xDevice*/ ) throw( RuntimeException )
@@ -252,7 +252,7 @@ sal_Bool SAL_CALL FrameControl::setGraphics( const Reference< XGraphics >& /*xDe
 }
 
 //____________________________________________________________________________________________________________
-//  XView
+//	XView
 //____________________________________________________________________________________________________________
 
 Reference< XGraphics > SAL_CALL FrameControl::getGraphics() throw( RuntimeException )
@@ -262,7 +262,7 @@ Reference< XGraphics > SAL_CALL FrameControl::getGraphics() throw( RuntimeExcept
 }
 
 //____________________________________________________________________________________________________________
-//  XConnectionPointContainer
+//	XConnectionPointContainer
 //____________________________________________________________________________________________________________
 
 Sequence< Type > SAL_CALL FrameControl::getConnectionPointTypes() throw( RuntimeException )
@@ -272,7 +272,7 @@ Sequence< Type > SAL_CALL FrameControl::getConnectionPointTypes() throw( Runtime
 }
 
 //____________________________________________________________________________________________________________
-//  XConnectionPointContainer
+//	XConnectionPointContainer
 //____________________________________________________________________________________________________________
 
 Reference< XConnectionPoint > SAL_CALL FrameControl::queryConnectionPoint( const Type& aType ) throw( RuntimeException )
@@ -282,29 +282,29 @@ Reference< XConnectionPoint > SAL_CALL FrameControl::queryConnectionPoint( const
 }
 
 //____________________________________________________________________________________________________________
-//  XConnectionPointContainer
+//	XConnectionPointContainer
 //____________________________________________________________________________________________________________
 
-void SAL_CALL FrameControl::advise( const   Type&                       aType       ,
-                                    const   Reference< XInterface >&    xListener   ) throw( RuntimeException )
+void SAL_CALL FrameControl::advise(	const	Type&						aType		,
+                                    const	Reference< XInterface >&	xListener	) throw( RuntimeException )
 {
     // Forwarded to helper class
     m_aConnectionPointContainer.advise( aType, xListener );
 }
 
 //____________________________________________________________________________________________________________
-//  XConnectionPointContainer
+//	XConnectionPointContainer
 //____________________________________________________________________________________________________________
 
-void SAL_CALL FrameControl::unadvise(   const   Type&                       aType       ,
-                                        const   Reference< XInterface >&    xListener   ) throw( RuntimeException )
+void SAL_CALL FrameControl::unadvise(	const	Type&						aType		,
+                                        const	Reference< XInterface >&	xListener	) throw( RuntimeException )
 {
     // Forwarded to helper class
     m_aConnectionPointContainer.unadvise( aType, xListener );
 }
 
 //____________________________________________________________________________________________________________
-//  impl but public method to register service
+//	impl but public method to register service
 //____________________________________________________________________________________________________________
 
 const Sequence< OUString > FrameControl::impl_getStaticSupportedServiceNames()
@@ -316,7 +316,7 @@ const Sequence< OUString > FrameControl::impl_getStaticSupportedServiceNames()
 }
 
 //____________________________________________________________________________________________________________
-//  impl but public method to register service
+//	impl but public method to register service
 //____________________________________________________________________________________________________________
 
 const OUString FrameControl::impl_getStaticImplementationName()
@@ -325,25 +325,25 @@ const OUString FrameControl::impl_getStaticImplementationName()
 }
 
 //____________________________________________________________________________________________________________
-//  OPropertySetHelper
+//	OPropertySetHelper
 //____________________________________________________________________________________________________________
 
-sal_Bool FrameControl::convertFastPropertyValue(        Any&        rConvertedValue ,
-                                                        Any&        rOldValue       ,
-                                                        sal_Int32   nHandle         ,
-                                                const   Any&        rValue          ) throw( IllegalArgumentException )
+sal_Bool FrameControl::convertFastPropertyValue(		Any&		rConvertedValue	,
+                                                        Any&		rOldValue		,
+                                                        sal_Int32	nHandle			,
+                                                const	Any&		rValue			) throw( IllegalArgumentException )
 {
     sal_Bool bReturn = sal_False ;
     switch (nHandle)
     {
-        case PROPERTYHANDLE_COMPONENTURL        :       rConvertedValue   = rValue                  ;
-                                                        rOldValue       <<= m_sComponentURL         ;
-                                                        bReturn           = sal_True                ;
+        case PROPERTYHANDLE_COMPONENTURL		:		rConvertedValue	  = rValue					;
+                                                        rOldValue		<<= m_sComponentURL			;
+                                                        bReturn			  = sal_True				;
                                                         break ;
 
-        case PROPERTYHANDLE_LOADERARGUMENTS     :       rConvertedValue   = rValue                  ;
-                                                        rOldValue       <<= m_seqLoaderArguments    ;
-                                                        bReturn           = sal_True                ;
+        case PROPERTYHANDLE_LOADERARGUMENTS		:		rConvertedValue	  = rValue					;
+                                                        rOldValue		<<= m_seqLoaderArguments	;
+                                                        bReturn			  = sal_True				;
                                                         break ;
     }
 
@@ -356,57 +356,57 @@ sal_Bool FrameControl::convertFastPropertyValue(        Any&        rConvertedVa
 }
 
 //____________________________________________________________________________________________________________
-//  OPropertySetHelper
+//	OPropertySetHelper
 //____________________________________________________________________________________________________________
 
-void FrameControl::setFastPropertyValue_NoBroadcast(            sal_Int32   nHandle ,
-                                                        const   Any&        rValue  )
+void FrameControl::setFastPropertyValue_NoBroadcast(			sal_Int32	nHandle	,
+                                                        const	Any&		rValue	)
                                                         throw ( ::com::sun::star::uno::Exception )
 {
     // this method only set the value
-    MutexGuard  aGuard (m_aMutex) ;
+    MutexGuard	aGuard (m_aMutex) ;
     switch (nHandle)
     {
-        case PROPERTYHANDLE_COMPONENTURL        :       rValue >>= m_sComponentURL ;
+        case PROPERTYHANDLE_COMPONENTURL		:		rValue >>= m_sComponentURL ;
                                                         if (getPeer().is())
                                                         {
                                                             impl_createFrame ( getPeer(), m_sComponentURL, m_seqLoaderArguments ) ;
                                                         }
                                                         break ;
 
-        case PROPERTYHANDLE_LOADERARGUMENTS     :       rValue >>= m_seqLoaderArguments ;
+        case PROPERTYHANDLE_LOADERARGUMENTS		:		rValue >>= m_seqLoaderArguments ;
                                                         break ;
 
-        default :                                       OSL_ENSURE ( nHandle == -1, ERRORTEXT_VOSENSHURE ) ;
+        default	:										OSL_ENSURE ( nHandle == -1, ERRORTEXT_VOSENSHURE ) ;
     }
 }
 
 //____________________________________________________________________________________________________________
-//  OPropertySetHelper
+//	OPropertySetHelper
 //____________________________________________________________________________________________________________
 
-void FrameControl::getFastPropertyValue(    Any&        rRet    ,
-                                            sal_Int32   nHandle ) const
+void FrameControl::getFastPropertyValue(	Any&		rRet	,
+                                            sal_Int32	nHandle	) const
 {
-    MutexGuard  aGuard ( Mutex::getGlobalMutex() ) ;
+    MutexGuard	aGuard ( Mutex::getGlobalMutex() ) ;
 
     switch (nHandle)
     {
-        case PROPERTYHANDLE_COMPONENTURL    :       rRet <<= m_sComponentURL ;
+        case PROPERTYHANDLE_COMPONENTURL	:		rRet <<= m_sComponentURL ;
                                                     break ;
 
-        case PROPERTYHANDLE_LOADERARGUMENTS :       rRet <<= m_seqLoaderArguments ;
+        case PROPERTYHANDLE_LOADERARGUMENTS	:		rRet <<= m_seqLoaderArguments ;
                                                     break ;
 
-        case PROPERTYHANDLE_FRAME           :       rRet <<= m_xFrame ;
+        case PROPERTYHANDLE_FRAME			:		rRet <<= m_xFrame ;
                                                        break ;
 
-        default :                                   OSL_ENSURE ( nHandle == -1, ERRORTEXT_VOSENSHURE ) ;
+        default	:			                        OSL_ENSURE ( nHandle == -1, ERRORTEXT_VOSENSHURE ) ;
     }
 }
 
 //____________________________________________________________________________________________________________
-//  OPropertySetHelper
+//	OPropertySetHelper
 //____________________________________________________________________________________________________________
 
 IPropertyArrayHelper& FrameControl::getInfoHelper()
@@ -417,7 +417,7 @@ IPropertyArrayHelper& FrameControl::getInfoHelper()
     if (!pInfo)
     {
         // global method must be guarded
-        MutexGuard  aGuard ( Mutex::getGlobalMutex() ) ;
+        MutexGuard	aGuard ( Mutex::getGlobalMutex() ) ;
 
         if (!pInfo)
         {
@@ -451,7 +451,7 @@ Uik* FrameControl::getConnectionPointUiks ( sal_Int32* pCount ) const
 */
 
 //____________________________________________________________________________________________________________
-//  OPropertySetHelper
+//	OPropertySetHelper
 //____________________________________________________________________________________________________________
 
 Reference< XPropertySetInfo > SAL_CALL FrameControl::getPropertySetInfo() throw( RuntimeException )
@@ -477,35 +477,35 @@ Reference< XPropertySetInfo > SAL_CALL FrameControl::getPropertySetInfo() throw(
 }
 
 //____________________________________________________________________________________________________________
-//  BaseControl
+//	BaseControl
 //____________________________________________________________________________________________________________
 
 WindowDescriptor* FrameControl::impl_getWindowDescriptor( const Reference< XWindowPeer >& xParentPeer )
 {
-    WindowDescriptor* pDescriptor   = new WindowDescriptor  ;
+    WindowDescriptor* pDescriptor	= new WindowDescriptor	;
 
-    pDescriptor->Type               = WindowClass_CONTAINER ;
-    pDescriptor->ParentIndex        = -1                    ;
-    pDescriptor->Parent             = xParentPeer           ;
-    pDescriptor->Bounds             = getPosSize ()         ;
-    pDescriptor->WindowAttributes   = 0                     ;
+    pDescriptor->Type				= WindowClass_CONTAINER	;
+    pDescriptor->ParentIndex		= -1					;
+    pDescriptor->Parent				= xParentPeer			;
+    pDescriptor->Bounds				= getPosSize ()			;
+    pDescriptor->WindowAttributes	= 0						;
 
     return pDescriptor ;
 }
 
 //____________________________________________________________________________________________________________
-//  private method
+//	private method
 //____________________________________________________________________________________________________________
 
-void FrameControl::impl_createFrame(    const   Reference< XWindowPeer >&   xPeer       ,
-                                        const   OUString&                   rURL        ,
-                                        const   Sequence< PropertyValue >&  rArguments  )
+void FrameControl::impl_createFrame(	const	Reference< XWindowPeer >&	xPeer		,
+                                        const	OUString&					rURL		,
+                                        const	Sequence< PropertyValue >&	rArguments	)
 {
-    Reference< XFrame >     xOldFrame   ;
-    Reference< XFrame >     xNewFrame   ;
+    Reference< XFrame > 	xOldFrame	;
+    Reference< XFrame > 	xNewFrame	;
 
     {
-        MutexGuard  aGuard ( m_aMutex ) ;
+        MutexGuard	aGuard ( m_aMutex ) ;
         xOldFrame = m_xFrame ;
     }
 
@@ -517,14 +517,14 @@ void FrameControl::impl_createFrame(    const   Reference< XWindowPeer >&   xPee
         Reference< XWindow >  xWP ( xPeer, UNO_QUERY ) ;
         xNewFrame->initialize ( xWP ) ;
 
-        //  option
+        //	option
         //xFrame->setName( "WhatYouWant" );
 
         Reference< XURLTransformer >  xTrans ( impl_getMultiServiceFactory()->createInstance ( OUString::createFromAscii( "com.sun.star.util.URLTransformer" ) ), UNO_QUERY ) ;
         if(xTrans.is())
         {
             // load file
-            URL aURL ;
+            URL	aURL ;
 
             aURL.Complete = rURL ;
             xTrans->parseStrict( aURL ) ;
@@ -544,9 +544,9 @@ void FrameControl::impl_createFrame(    const   Reference< XWindowPeer >&   xPee
     }
 
     // notify the listeners
-    sal_Int32   nFrameId = PROPERTYHANDLE_FRAME ;
-    Any aNewFrame ( &xNewFrame, ::getCppuType((const Reference< XFrame >*)0) ) ;
-    Any aOldFrame ( &xOldFrame, ::getCppuType((const Reference< XFrame >*)0) ) ;
+    sal_Int32	nFrameId = PROPERTYHANDLE_FRAME ;
+    Any	aNewFrame ( &xNewFrame, ::getCppuType((const Reference< XFrame >*)0) ) ;
+    Any	aOldFrame ( &xOldFrame, ::getCppuType((const Reference< XFrame >*)0) ) ;
 
     fire ( &nFrameId, &aNewFrame, &aOldFrame, 1, sal_False ) ;
 
@@ -557,7 +557,7 @@ void FrameControl::impl_createFrame(    const   Reference< XWindowPeer >&   xPee
 }
 
 //____________________________________________________________________________________________________________
-//  private method
+//	private method
 //____________________________________________________________________________________________________________
 
 void FrameControl::impl_deleteFrame()
@@ -584,7 +584,7 @@ void FrameControl::impl_deleteFrame()
 }
 
 //____________________________________________________________________________________________________________
-//  private method
+//	private method
 //____________________________________________________________________________________________________________
 
 const Sequence< Property > FrameControl::impl_getStaticPropertyDescriptor()
@@ -592,9 +592,9 @@ const Sequence< Property > FrameControl::impl_getStaticPropertyDescriptor()
     // All Properties of this implementation. The array must be sorted!
     static const Property pPropertys[PROPERTY_COUNT] =
     {
-        Property( OUString::createFromAscii( PROPERTYNAME_COMPONENTURL      ), PROPERTYHANDLE_COMPONENTURL      , ::getCppuType((const OUString*)0)                 , PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED ),
-        Property( OUString::createFromAscii( PROPERTYNAME_FRAME             ), PROPERTYHANDLE_FRAME             , ::getCppuType((const Reference< XFrame >*)0)      , PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT   ),
-        Property( OUString::createFromAscii( PROPERTYNAME_LOADERARGUMENTS   ), PROPERTYHANDLE_LOADERARGUMENTS   , ::getCppuType((const Sequence< PropertyValue >*)0), PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED )
+        Property( OUString::createFromAscii( PROPERTYNAME_COMPONENTURL		), PROPERTYHANDLE_COMPONENTURL		, ::getCppuType((const OUString*)0)					, PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED	),
+        Property( OUString::createFromAscii( PROPERTYNAME_FRAME				), PROPERTYHANDLE_FRAME				, ::getCppuType((const Reference< XFrame >*)0)		, PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT	),
+        Property( OUString::createFromAscii( PROPERTYNAME_LOADERARGUMENTS	), PROPERTYHANDLE_LOADERARGUMENTS	, ::getCppuType((const Sequence< PropertyValue >*)0), PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED	)
     };
 
     static const Sequence< Property > seqPropertys( pPropertys, PROPERTY_COUNT );
@@ -602,6 +602,6 @@ const Sequence< Property > FrameControl::impl_getStaticPropertyDescriptor()
     return seqPropertys ;
 }
 
-}   // namespace unocontrols
+}	// namespace unocontrols
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/controls/progressbar.cxx b/UnoControls/source/controls/progressbar.cxx
index 7d05435e48b2..2ca79b4b425b 100644
--- a/UnoControls/source/controls/progressbar.cxx
+++ b/UnoControls/source/controls/progressbar.cxx
@@ -26,13 +26,13 @@
  *
  ************************************************************************/
 //____________________________________________________________________________________________________________
-//  my own includes
+//	my own includes
 //____________________________________________________________________________________________________________
 
 #include "progressbar.hxx"
 
 //____________________________________________________________________________________________________________
-//  includes of other projects
+//	includes of other projects
 //____________________________________________________________________________________________________________
 #include <com/sun/star/awt/GradientStyle.hpp>
 #include <com/sun/star/awt/RasterOperation.hpp>
@@ -45,36 +45,36 @@
 #include <limits.h>
 
 //____________________________________________________________________________________________________________
-//  includes of my project
+//	includes of my project
 //____________________________________________________________________________________________________________
 
 //____________________________________________________________________________________________________________
-//  namespace
+//	namespace
 //____________________________________________________________________________________________________________
 
-using namespace ::cppu                  ;
-using namespace ::osl                   ;
-using namespace ::rtl                   ;
-using namespace ::com::sun::star::uno   ;
-using namespace ::com::sun::star::lang  ;
-using namespace ::com::sun::star::awt   ;
+using namespace	::cppu					;
+using namespace	::osl					;
+using namespace	::rtl					;
+using namespace	::com::sun::star::uno	;
+using namespace	::com::sun::star::lang	;
+using namespace	::com::sun::star::awt	;
 
 namespace unocontrols{
 
 //____________________________________________________________________________________________________________
-//  construct/destruct
+//	construct/destruct
 //____________________________________________________________________________________________________________
 
 ProgressBar::ProgressBar( const Reference< XMultiServiceFactory >& xFactory )
-    : BaseControl           (    xFactory                   )
-    , m_bHorizontal         (    PROGRESSBAR_DEFAULT_HORIZONTAL         )
-    , m_aBlockSize          (    PROGRESSBAR_DEFAULT_BLOCKDIMENSION     )
-    , m_nForegroundColor    (    PROGRESSBAR_DEFAULT_FOREGROUNDCOLOR    )
-    , m_nBackgroundColor    (    PROGRESSBAR_DEFAULT_BACKGROUNDCOLOR    )
-    , m_nMinRange           (    PROGRESSBAR_DEFAULT_MINRANGE           )
-    , m_nMaxRange           (    PROGRESSBAR_DEFAULT_MAXRANGE           )
-    , m_nBlockValue         (    PROGRESSBAR_DEFAULT_BLOCKVALUE         )
-    , m_nValue              (    PROGRESSBAR_DEFAULT_VALUE              )
+    : BaseControl		 	(	 xFactory					)
+    , m_bHorizontal			(	 PROGRESSBAR_DEFAULT_HORIZONTAL			)
+    , m_aBlockSize			(	 PROGRESSBAR_DEFAULT_BLOCKDIMENSION		)
+    , m_nForegroundColor	(	 PROGRESSBAR_DEFAULT_FOREGROUNDCOLOR	)
+    , m_nBackgroundColor	(	 PROGRESSBAR_DEFAULT_BACKGROUNDCOLOR	)
+    , m_nMinRange		 	(	 PROGRESSBAR_DEFAULT_MINRANGE			)
+    , m_nMaxRange		 	(	 PROGRESSBAR_DEFAULT_MAXRANGE			)
+    , m_nBlockValue		 	(	 PROGRESSBAR_DEFAULT_BLOCKVALUE			)
+    , m_nValue		 	 	(	 PROGRESSBAR_DEFAULT_VALUE				)
 {
 }
 
@@ -83,13 +83,13 @@ ProgressBar::~ProgressBar()
 }
 
 //____________________________________________________________________________________________________________
-//  XInterface
+//	XInterface
 //____________________________________________________________________________________________________________
 
 Any SAL_CALL ProgressBar::queryInterface( const Type& rType ) throw( RuntimeException )
 {
     // Attention:
-    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+    //	Don't use mutex or guard in this method!!! Is a method of XInterface.
     Any aReturn ;
     Reference< XInterface > xDel = BaseControl::impl_getDelegator();
     if ( xDel.is() )
@@ -108,33 +108,33 @@ Any SAL_CALL ProgressBar::queryInterface( const Type& rType ) throw( RuntimeExce
 }
 
 //____________________________________________________________________________________________________________
-//  XInterface
+//	XInterface
 //____________________________________________________________________________________________________________
 
 void SAL_CALL ProgressBar::acquire() throw()
 {
     // Attention:
-    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+    //	Don't use mutex or guard in this method!!! Is a method of XInterface.
 
     // Forward to baseclass
     BaseControl::acquire();
 }
 
 //____________________________________________________________________________________________________________
-//  XInterface
+//	XInterface
 //____________________________________________________________________________________________________________
 
 void SAL_CALL ProgressBar::release() throw()
 {
     // Attention:
-    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+    //	Don't use mutex or guard in this method!!! Is a method of XInterface.
 
     // Forward to baseclass
     BaseControl::release();
 }
 
 //____________________________________________________________________________________________________________
-//  XTypeProvider
+//	XTypeProvider
 //____________________________________________________________________________________________________________
 
 Sequence< Type > SAL_CALL ProgressBar::getTypes() throw( RuntimeException )
@@ -153,8 +153,8 @@ Sequence< Type > SAL_CALL ProgressBar::getTypes() throw( RuntimeException )
         if ( pTypeCollection == NULL )
         {
             // Create a static typecollection ...
-            static OTypeCollection aTypeCollection  ( ::getCppuType(( const Reference< XControlModel >*) NULL ) ,
-                                                      ::getCppuType(( const Reference< XProgressBar  >*) NULL ) ,
+            static OTypeCollection aTypeCollection	( ::getCppuType(( const Reference< XControlModel >*) NULL )	,
+                                                      ::getCppuType(( const Reference< XProgressBar	 >*) NULL )	,
                                                       BaseControl::getTypes()
                                                     );
             // ... and set his address to static pointer!
@@ -166,16 +166,16 @@ Sequence< Type > SAL_CALL ProgressBar::getTypes() throw( RuntimeException )
 }
 
 //____________________________________________________________________________________________________________
-//  XAggregation
+//	XAggregation
 //____________________________________________________________________________________________________________
 
 Any SAL_CALL ProgressBar::queryAggregation( const Type& aType ) throw( RuntimeException )
 {
     // Ask for my own supported interfaces ...
     // Attention: XTypeProvider and XInterface are supported by OComponentHelper!
-    Any aReturn ( ::cppu::queryInterface(   aType                                   ,
-                                            static_cast< XControlModel* > ( this )  ,
-                                            static_cast< XProgressBar*  > ( this )
+    Any aReturn	( ::cppu::queryInterface(   aType					   				,
+                                            static_cast< XControlModel*	> ( this )	,
+                                            static_cast< XProgressBar*	> ( this )
                                         )
                 );
 
@@ -190,13 +190,13 @@ Any SAL_CALL ProgressBar::queryAggregation( const Type& aType ) throw( RuntimeEx
 }
 
 //____________________________________________________________________________________________________________
-//  XProgressBar
+//	XProgressBar
 //____________________________________________________________________________________________________________
 
 void SAL_CALL ProgressBar::setForegroundColor( sal_Int32 nColor ) throw( RuntimeException )
 {
     // Ready for multithreading
-    MutexGuard  aGuard (m_aMutex) ;
+    MutexGuard	aGuard (m_aMutex) ;
 
     // Safe color for later use.
     m_nForegroundColor = nColor ;
@@ -206,13 +206,13 @@ void SAL_CALL ProgressBar::setForegroundColor( sal_Int32 nColor ) throw( Runtime
 }
 
 //____________________________________________________________________________________________________________
-//  XProgressBar
+//	XProgressBar
 //____________________________________________________________________________________________________________
 
 void SAL_CALL ProgressBar::setBackgroundColor ( sal_Int32 nColor ) throw( RuntimeException )
 {
     // Ready for multithreading
-    MutexGuard  aGuard (m_aMutex) ;
+    MutexGuard	aGuard (m_aMutex) ;
 
     // Safe color for later use.
     m_nBackgroundColor = nColor ;
@@ -222,14 +222,14 @@ void SAL_CALL ProgressBar::setBackgroundColor ( sal_Int32 nColor ) throw( Runtim
 }
 
 //____________________________________________________________________________________________________________
-//  XProgressBar
+//	XProgressBar
 //____________________________________________________________________________________________________________
 
 void SAL_CALL ProgressBar::setValue ( sal_Int32 nValue ) throw( RuntimeException )
 {
     // This method is defined for follow things:
-    //      1) Values >= _nMinRange
-    //      2) Values <= _nMaxRange
+    //		1) Values >= _nMinRange
+    //		2) Values <= _nMaxRange
 
     // Ready for multithreading
     MutexGuard aGuard (m_aMutex) ;
@@ -253,15 +253,15 @@ void SAL_CALL ProgressBar::setValue ( sal_Int32 nValue ) throw( RuntimeException
 }
 
 //____________________________________________________________________________________________________________
-//  XProgressBar
+//	XProgressBar
 //____________________________________________________________________________________________________________
 
 void SAL_CALL ProgressBar::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw( RuntimeException )
 {
     // This method is defined for follow things:
-    //      1) All values of sal_Int32
-    //      2) Min < Max
-    //      3) Min > Max
+    //		1) All values of sal_Int32
+    //		2) Min < Max
+    //		3) Min > Max
 
     // save impossible cases
     // This method is only defined for valid values
@@ -269,20 +269,20 @@ void SAL_CALL ProgressBar::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw( Ru
     DBG_ASSERT ( ( nMin != nMax ) , "ProgressBar::setRange()\nValues for MIN and MAX are the same. This is not allowed!\n" ) ;
 
     // Ready for multithreading
-    MutexGuard  aGuard (m_aMutex) ;
+    MutexGuard	aGuard (m_aMutex) ;
 
     // control the values for min and max
     if ( nMin < nMax )
     {
         // Take correct Min and Max
-        m_nMinRange = nMin  ;
-        m_nMaxRange = nMax  ;
+        m_nMinRange = nMin	;
+        m_nMaxRange = nMax	;
     }
     else
     {
         // Change Min and Max automaticly
-        m_nMinRange = nMax  ;
-        m_nMaxRange = nMin  ;
+        m_nMinRange = nMax	;
+        m_nMaxRange = nMin	;
     }
 
     // assure that m_nValue is within the range
@@ -297,7 +297,7 @@ void SAL_CALL ProgressBar::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw( Ru
 }
 
 //____________________________________________________________________________________________________________
-//  XProgressBar
+//	XProgressBar
 //____________________________________________________________________________________________________________
 
 sal_Int32 SAL_CALL ProgressBar::getValue () throw( RuntimeException )
@@ -309,7 +309,7 @@ sal_Int32 SAL_CALL ProgressBar::getValue () throw( RuntimeException )
 }
 
 //____________________________________________________________________________________________________________
-//  XWindow
+//	XWindow
 //____________________________________________________________________________________________________________
 
 void SAL_CALL ProgressBar::setPosSize (
@@ -327,17 +327,17 @@ void SAL_CALL ProgressBar::setPosSize (
 
     // Do only, if size has changed.
     if (
-        ( nWidth  != aBasePosSize.Width     ) ||
-        ( nHeight != aBasePosSize.Height    )
+        ( nWidth  != aBasePosSize.Width		) ||
+        ( nHeight != aBasePosSize.Height	)
        )
     {
-        impl_recalcRange    (                           ) ;
-        impl_paint          ( 0, 0, impl_getGraphicsPeer () ) ;
+        impl_recalcRange	(							) ;
+        impl_paint 			( 0, 0, impl_getGraphicsPeer ()	) ;
     }
 }
 
 //____________________________________________________________________________________________________________
-//  XControl
+//	XControl
 //____________________________________________________________________________________________________________
 
 sal_Bool SAL_CALL ProgressBar::setModel( const Reference< XControlModel >& /*xModel*/ ) throw( RuntimeException )
@@ -347,7 +347,7 @@ sal_Bool SAL_CALL ProgressBar::setModel( const Reference< XControlModel >& /*xMo
 }
 
 //____________________________________________________________________________________________________________
-//  XControl
+//	XControl
 //____________________________________________________________________________________________________________
 
 Reference< XControlModel > SAL_CALL ProgressBar::getModel() throw( RuntimeException )
@@ -357,7 +357,7 @@ Reference< XControlModel > SAL_CALL ProgressBar::getModel() throw( RuntimeExcept
 }
 
 //____________________________________________________________________________________________________________
-//  impl but public method to register service
+//	impl but public method to register service
 //____________________________________________________________________________________________________________
 
 const Sequence< OUString > ProgressBar::impl_getStaticSupportedServiceNames()
@@ -369,7 +369,7 @@ const Sequence< OUString > ProgressBar::impl_getStaticSupportedServiceNames()
 }
 
 //____________________________________________________________________________________________________________
-//  impl but public method to register service
+//	impl but public method to register service
 //____________________________________________________________________________________________________________
 
 const OUString ProgressBar::impl_getStaticImplementationName()
@@ -378,7 +378,7 @@ const OUString ProgressBar::impl_getStaticImplementationName()
 }
 
 //____________________________________________________________________________________________________________
-//  protected method
+//	protected method
 //____________________________________________________________________________________________________________
 
 void ProgressBar::impl_paint ( sal_Int32 nX, sal_Int32 nY, const Reference< XGraphics > & rGraphics )
@@ -390,13 +390,13 @@ void ProgressBar::impl_paint ( sal_Int32 nX, sal_Int32 nY, const Reference< XGra
     // Every request paint the completely control. ( but only, if peer exist )
      if ( rGraphics.is () )
     {
-        MutexGuard  aGuard (m_aMutex) ;
+        MutexGuard	aGuard (m_aMutex) ;
 
         // Clear background
         // (same color for line and fill)
-        rGraphics->setFillColor ( m_nBackgroundColor                        ) ;
-        rGraphics->setLineColor ( m_nBackgroundColor                        ) ;
-        rGraphics->drawRect     ( nX, nY, impl_getWidth(), impl_getHeight() ) ;
+        rGraphics->setFillColor ( m_nBackgroundColor						) ;
+        rGraphics->setLineColor ( m_nBackgroundColor						) ;
+        rGraphics->drawRect		( nX, nY, impl_getWidth(), impl_getHeight()	) ;
 
         // same color for line and fill for blocks
         rGraphics->setFillColor ( m_nForegroundColor ) ;
@@ -410,16 +410,16 @@ void ProgressBar::impl_paint ( sal_Int32 nX, sal_Int32 nY, const Reference< XGra
         if (m_bHorizontal)
         {
             // Step to left side of window
-            nBlockStart = nX ;
+            nBlockStart	= nX ;
 
             for ( sal_Int16 i=1; i<=nBlockCount; ++i )
             {
                 // step free field
-                nBlockStart +=  PROGRESSBAR_FREESPACE   ;
+                nBlockStart	+=	PROGRESSBAR_FREESPACE	;
                 // paint block
                 rGraphics->drawRect (nBlockStart, nY+PROGRESSBAR_FREESPACE, m_aBlockSize.Width, m_aBlockSize.Height) ;
                 // step next free field
-                nBlockStart +=  m_aBlockSize.Width ;
+                nBlockStart	+=	m_aBlockSize.Width ;
             }
         }
         // draw vertikal progressbar
@@ -427,38 +427,38 @@ void ProgressBar::impl_paint ( sal_Int32 nX, sal_Int32 nY, const Reference< XGra
         else
         {
             // step to bottom side of window
-            nBlockStart  =  nY+impl_getHeight() ;
-            nBlockStart -=  m_aBlockSize.Height ;
+            nBlockStart	 =	nY+impl_getHeight() ;
+            nBlockStart	-=	m_aBlockSize.Height ;
 
             for ( sal_Int16 i=1; i<=nBlockCount; ++i )
             {
                 // step free field
-                nBlockStart -=  PROGRESSBAR_FREESPACE   ;
+                nBlockStart	-=	PROGRESSBAR_FREESPACE	;
                 // paint block
                 rGraphics->drawRect (nX+PROGRESSBAR_FREESPACE, nBlockStart, m_aBlockSize.Width, m_aBlockSize.Height) ;
                 // step next free field
-                nBlockStart -=  m_aBlockSize.Height;
+                nBlockStart	-=	m_aBlockSize.Height;
             }
         }
 
         // Paint shadow border around the progressbar
-        rGraphics->setLineColor ( PROGRESSBAR_LINECOLOR_SHADOW                          ) ;
-        rGraphics->drawLine     ( nX, nY, impl_getWidth(), nY               ) ;
-        rGraphics->drawLine     ( nX, nY, nX             , impl_getHeight() ) ;
+        rGraphics->setLineColor ( PROGRESSBAR_LINECOLOR_SHADOW  						) ;
+        rGraphics->drawLine		( nX, nY, impl_getWidth(), nY 				) ;
+        rGraphics->drawLine		( nX, nY, nX		  	 , impl_getHeight() ) ;
 
-        rGraphics->setLineColor ( PROGRESSBAR_LINECOLOR_BRIGHT                                                              ) ;
-        rGraphics->drawLine     ( impl_getWidth()-1, impl_getHeight()-1, impl_getWidth()-1, nY                  ) ;
-        rGraphics->drawLine     ( impl_getWidth()-1, impl_getHeight()-1, nX               , impl_getHeight()-1  ) ;
+        rGraphics->setLineColor ( PROGRESSBAR_LINECOLOR_BRIGHT  															) ;
+        rGraphics->drawLine		( impl_getWidth()-1, impl_getHeight()-1, impl_getWidth()-1, nY 					) ;
+        rGraphics->drawLine		( impl_getWidth()-1, impl_getHeight()-1, nX		   		  , impl_getHeight()-1	) ;
     }
 }
 
 //____________________________________________________________________________________________________________
-//  protected method
+//	protected method
 //____________________________________________________________________________________________________________
 
 void ProgressBar::impl_recalcRange ()
 {
-    MutexGuard  aGuard (m_aMutex) ;
+    MutexGuard	aGuard (m_aMutex) ;
 
     sal_Int32 nWindowWidth  = impl_getWidth()  ;
     sal_Int32 nWindowHeight = impl_getHeight() ;
@@ -489,6 +489,6 @@ void ProgressBar::impl_recalcRange ()
     m_aBlockSize.Width  = (sal_Int32)fBlockWidth ;
 }
 
-}   // namespace unocontrols
+}	// namespace unocontrols
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx
index bf6dc153a933..cd90d00dadaf 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -27,13 +27,13 @@
  ************************************************************************/
 
 //____________________________________________________________________________________________________________
-//  my own includes
+//	my own includes
 //____________________________________________________________________________________________________________
 
 #include "progressmonitor.hxx"
 
 //____________________________________________________________________________________________________________
-//  includes of other projects
+//	includes of other projects
 //____________________________________________________________________________________________________________
 #include <com/sun/star/awt/GradientStyle.hpp>
 #include <com/sun/star/awt/RasterOperation.hpp>
@@ -45,49 +45,49 @@
 #include <tools/solar.h>
 
 //____________________________________________________________________________________________________________
-//  includes of my project
+//	includes of my project
 //____________________________________________________________________________________________________________
 #include "progressbar.hxx"
 
 //____________________________________________________________________________________________________________
-//  namespace
+//	namespace
 //____________________________________________________________________________________________________________
 
-using namespace ::cppu                  ;
-using namespace ::osl                   ;
-using namespace ::rtl                   ;
-using namespace ::com::sun::star::uno   ;
-using namespace ::com::sun::star::lang  ;
-using namespace ::com::sun::star::awt   ;
+using namespace	::cppu					;
+using namespace	::osl					;
+using namespace	::rtl					;
+using namespace	::com::sun::star::uno	;
+using namespace	::com::sun::star::lang	;
+using namespace	::com::sun::star::awt	;
 
 namespace unocontrols{
 
 //____________________________________________________________________________________________________________
-//  construct/destruct
+//	construct/destruct
 //____________________________________________________________________________________________________________
 
 ProgressMonitor::ProgressMonitor( const Reference< XMultiServiceFactory >& xFactory )
-    : BaseContainerControl  ( xFactory  )
+    : BaseContainerControl	( xFactory	)
 {
     // Its not allowed to work with member in this method (refcounter !!!)
     // But with a HACK (++refcount) its "OK" :-(
     ++m_refCount ;
 
     // Create instances for fixedtext, button and progress ...
-    m_xTopic_Top    = Reference< XFixedText >   ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_SERVICENAME   ) ), UNO_QUERY ) ;
-    m_xText_Top     = Reference< XFixedText >   ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_SERVICENAME   ) ), UNO_QUERY ) ;
-    m_xTopic_Bottom = Reference< XFixedText >   ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_SERVICENAME   ) ), UNO_QUERY ) ;
-    m_xText_Bottom  = Reference< XFixedText >   ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_SERVICENAME   ) ), UNO_QUERY ) ;
-    m_xButton       = Reference< XButton >      ( xFactory->createInstance ( OUString::createFromAscii( BUTTON_SERVICENAME      ) ), UNO_QUERY ) ;
-    m_xProgressBar  = Reference< XProgressBar > ( xFactory->createInstance ( OUString::createFromAscii( SERVICENAME_PROGRESSBAR ) ), UNO_QUERY ) ;
+    m_xTopic_Top	= Reference< XFixedText >   ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_SERVICENAME	) ), UNO_QUERY ) ;
+    m_xText_Top		= Reference< XFixedText >   ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_SERVICENAME	) ), UNO_QUERY ) ;
+    m_xTopic_Bottom	= Reference< XFixedText >   ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_SERVICENAME	) ), UNO_QUERY ) ;
+    m_xText_Bottom	= Reference< XFixedText >   ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_SERVICENAME	) ), UNO_QUERY ) ;
+    m_xButton		= Reference< XButton >      ( xFactory->createInstance ( OUString::createFromAscii( BUTTON_SERVICENAME		) ), UNO_QUERY ) ;
+    m_xProgressBar	= Reference< XProgressBar > ( xFactory->createInstance ( OUString::createFromAscii( SERVICENAME_PROGRESSBAR	) ), UNO_QUERY ) ;
 
     // ... cast controls to Reference< XControl >  (for "setModel"!) ...
-    Reference< XControl >   xRef_Topic_Top      ( m_xTopic_Top    , UNO_QUERY ) ;
-    Reference< XControl >   xRef_Text_Top       ( m_xText_Top     , UNO_QUERY ) ;
-    Reference< XControl >   xRef_Topic_Bottom   ( m_xTopic_Bottom , UNO_QUERY ) ;
-    Reference< XControl >   xRef_Text_Bottom    ( m_xText_Bottom  , UNO_QUERY ) ;
-    Reference< XControl >   xRef_Button         ( m_xButton       , UNO_QUERY ) ;
-    Reference< XControl >   xRef_ProgressBar    ( m_xProgressBar  , UNO_QUERY ) ;
+    Reference< XControl > 	xRef_Topic_Top		( m_xTopic_Top	  , UNO_QUERY ) ;
+    Reference< XControl > 	xRef_Text_Top		( m_xText_Top	  , UNO_QUERY ) ;
+    Reference< XControl > 	xRef_Topic_Bottom	( m_xTopic_Bottom , UNO_QUERY ) ;
+    Reference< XControl > 	xRef_Text_Bottom	( m_xText_Bottom  , UNO_QUERY ) ;
+    Reference< XControl > 	xRef_Button			( m_xButton		  , UNO_QUERY ) ;
+    Reference< XControl > 	xRef_ProgressBar	( m_xProgressBar  , UNO_QUERY ) ;
 
     // ... set models ...
     xRef_Topic_Top->setModel    ( Reference< XControlModel > ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_MODELNAME ) ), UNO_QUERY ) ) ;
@@ -98,12 +98,12 @@ ProgressMonitor::ProgressMonitor( const Reference< XMultiServiceFactory >& xFact
     // ProgressBar has no model !!!
 
     // ... and add controls to basecontainercontrol!
-    addControl ( OUString::createFromAscii( CONTROLNAME_TEXT        ) , xRef_Topic_Top      ) ;
-    addControl ( OUString::createFromAscii( CONTROLNAME_TEXT        ) , xRef_Text_Top       ) ;
-    addControl ( OUString::createFromAscii( CONTROLNAME_TEXT        ) , xRef_Topic_Bottom   ) ;
-    addControl ( OUString::createFromAscii( CONTROLNAME_TEXT        ) , xRef_Text_Bottom    ) ;
-    addControl ( OUString::createFromAscii( CONTROLNAME_BUTTON      ) , xRef_Button         ) ;
-    addControl ( OUString::createFromAscii( CONTROLNAME_PROGRESSBAR ) , xRef_ProgressBar    ) ;
+    addControl ( OUString::createFromAscii( CONTROLNAME_TEXT		) , xRef_Topic_Top   	) ;
+    addControl ( OUString::createFromAscii( CONTROLNAME_TEXT		) , xRef_Text_Top	   	) ;
+    addControl ( OUString::createFromAscii( CONTROLNAME_TEXT		) , xRef_Topic_Bottom	) ;
+    addControl ( OUString::createFromAscii( CONTROLNAME_TEXT		) , xRef_Text_Bottom	) ;
+    addControl ( OUString::createFromAscii( CONTROLNAME_BUTTON		) , xRef_Button			) ;
+    addControl ( OUString::createFromAscii( CONTROLNAME_PROGRESSBAR	) , xRef_ProgressBar 	) ;
 
     // FixedText make it automaticly visible by himself ... but not the progressbar !!!
     // it must be set explicitly
@@ -121,8 +121,8 @@ ProgressMonitor::ProgressMonitor( const Reference< XMultiServiceFactory >& xFact
     --m_refCount ;
 
     // Initialize info lists for fixedtext's
-    m_pTextlist_Top     = new IMPL_Textlist ;
-    m_pTextlist_Bottom  = new IMPL_Textlist ;
+    m_pTextlist_Top		= new IMPL_Textlist ;
+    m_pTextlist_Bottom	= new IMPL_Textlist ;
 }
 
 ProgressMonitor::~ProgressMonitor()
@@ -131,13 +131,13 @@ ProgressMonitor::~ProgressMonitor()
 }
 
 //____________________________________________________________________________________________________________
-//  XInterface
+//	XInterface
 //____________________________________________________________________________________________________________
 
 Any SAL_CALL ProgressMonitor::queryInterface( const Type& rType ) throw( RuntimeException )
 {
     // Attention:
-    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+    //	Don't use mutex or guard in this method!!! Is a method of XInterface.
     Any aReturn ;
     Reference< XInterface > xDel = BaseContainerControl::impl_getDelegator();
     if ( xDel.is() )
@@ -156,33 +156,33 @@ Any SAL_CALL ProgressMonitor::queryInterface( const Type& rType ) throw( Runtime
 }
 
 //____________________________________________________________________________________________________________
-//  XInterface
+//	XInterface
 //____________________________________________________________________________________________________________
 
 void SAL_CALL ProgressMonitor::acquire() throw()
 {
     // Attention:
-    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+    //	Don't use mutex or guard in this method!!! Is a method of XInterface.
 
     // Forward to baseclass
     BaseControl::acquire();
 }
 
 //____________________________________________________________________________________________________________
-//  XInterface
+//	XInterface
 //____________________________________________________________________________________________________________
 
 void SAL_CALL ProgressMonitor::release() throw()
 {
     // Attention:
-    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+    //	Don't use mutex or guard in this method!!! Is a method of XInterface.
 
     // Forward to baseclass
     BaseControl::release();
 }
 
 //____________________________________________________________________________________________________________
-//  XTypeProvider
+//	XTypeProvider
 //____________________________________________________________________________________________________________
 
 Sequence< Type > SAL_CALL ProgressMonitor::getTypes() throw( RuntimeException )
@@ -201,9 +201,9 @@ Sequence< Type > SAL_CALL ProgressMonitor::getTypes() throw( RuntimeException )
         if ( pTypeCollection == NULL )
         {
             // Create a static typecollection ...
-            static OTypeCollection aTypeCollection ( ::getCppuType(( const Reference< XLayoutConstrains >*)NULL )   ,
-                                                     ::getCppuType(( const Reference< XButton           >*)NULL )   ,
-                                                     ::getCppuType(( const Reference< XProgressMonitor  >*)NULL )   ,
+            static OTypeCollection aTypeCollection ( ::getCppuType(( const Reference< XLayoutConstrains	>*)NULL )	,
+                                                     ::getCppuType(( const Reference< XButton			>*)NULL )	,
+                                                     ::getCppuType(( const Reference< XProgressMonitor	>*)NULL )	,
                                                      BaseContainerControl::getTypes()
                                                    );
             // ... and set his address to static pointer!
@@ -215,14 +215,14 @@ Sequence< Type > SAL_CALL ProgressMonitor::getTypes() throw( RuntimeException )
 }
 
 //____________________________________________________________________________________________________________
-//  XAggregation
+//	XAggregation
 //____________________________________________________________________________________________________________
 
 Any SAL_CALL ProgressMonitor::queryAggregation( const Type& aType ) throw( RuntimeException )
 {
     // Ask for my own supported interfaces ...
     // Attention: XTypeProvider and XInterface are supported by OComponentHelper!
-    Any aReturn ( ::cppu::queryInterface( aType ,
+    Any aReturn	( ::cppu::queryInterface( aType ,
                                           static_cast< XLayoutConstrains* > ( this ) ,
                                           static_cast< XButton*           > ( this ) ,
                                           static_cast< XProgressMonitor*  > ( this )
@@ -240,7 +240,7 @@ Any SAL_CALL ProgressMonitor::queryAggregation( const Type& aType ) throw( Runti
 }
 
 //____________________________________________________________________________________________________________
-//  XProgressMonitor
+//	XProgressMonitor
 //____________________________________________________________________________________________________________
 
 void SAL_CALL ProgressMonitor::addText(
@@ -251,8 +251,8 @@ void SAL_CALL ProgressMonitor::addText(
 {
     // Safe impossible cases
     // Check valid call of this method.
-    DBG_ASSERT ( impl_debug_checkParameter ( rTopic, rText, bbeforeProgress )   , "ProgressMonitor::addText()\nCall without valid parameters!\n") ;
-    DBG_ASSERT ( !(impl_searchTopic ( rTopic, bbeforeProgress ) != NULL )       , "ProgresMonitor::addText()\nThe text already exist.\n"        ) ;
+    DBG_ASSERT ( impl_debug_checkParameter ( rTopic, rText, bbeforeProgress )	, "ProgressMonitor::addText()\nCall without valid parameters!\n") ;
+    DBG_ASSERT ( !(impl_searchTopic ( rTopic, bbeforeProgress ) != NULL )		, "ProgresMonitor::addText()\nThe text already exist.\n"		) ;
 
     // Do nothing (in Release), if topic already exist.
     if ( impl_searchTopic ( rTopic, bbeforeProgress ) != NULL )
@@ -261,13 +261,13 @@ void SAL_CALL ProgressMonitor::addText(
     }
 
     // Else ... take memory for new item ...
-    IMPL_TextlistItem*  pTextItem = new IMPL_TextlistItem ;
+    IMPL_TextlistItem*	pTextItem = new IMPL_TextlistItem ;
 
     if ( pTextItem != NULL )
     {
         // Set values ...
-        pTextItem->sTopic   = rTopic ;
-        pTextItem->sText    = rText ;
+        pTextItem->sTopic	= rTopic ;
+        pTextItem->sText	= rText	;
 
         // Ready for multithreading
         MutexGuard aGuard ( m_aMutex ) ;
@@ -284,12 +284,12 @@ void SAL_CALL ProgressMonitor::addText(
     }
 
     // ... update window
-    impl_rebuildFixedText   () ;
-    impl_recalcLayout       () ;
+    impl_rebuildFixedText	() ;
+    impl_recalcLayout		() ;
 }
 
 //____________________________________________________________________________________________________________
-//  XProgressMonitor
+//	XProgressMonitor
 //____________________________________________________________________________________________________________
 
 void SAL_CALL ProgressMonitor::removeText ( const OUString& rTopic, sal_Bool bbeforeProgress ) throw( RuntimeException )
@@ -309,7 +309,7 @@ void SAL_CALL ProgressMonitor::removeText ( const OUString& rTopic, sal_Bool bbe
         // ... delete item from right list ...
         if ( bbeforeProgress == sal_True )
         {
-            m_pTextlist_Top->Remove    ( pSearchItem ) ;
+            m_pTextlist_Top->Remove	   ( pSearchItem ) ;
         }
         else
         {
@@ -319,13 +319,13 @@ void SAL_CALL ProgressMonitor::removeText ( const OUString& rTopic, sal_Bool bbe
         delete pSearchItem ;
 
         // ... and update window.
-        impl_rebuildFixedText   () ;
-        impl_recalcLayout       () ;
+        impl_rebuildFixedText	() ;
+        impl_recalcLayout		() ;
     }
 }
 
 //____________________________________________________________________________________________________________
-//  XProgressMonitor
+//	XProgressMonitor
 //____________________________________________________________________________________________________________
 
 void SAL_CALL ProgressMonitor::updateText (
@@ -350,13 +350,13 @@ void SAL_CALL ProgressMonitor::updateText (
         pSearchItem->sText = rText ;
 
         // ... and update window.
-        impl_rebuildFixedText   () ;
-        impl_recalcLayout       () ;
+        impl_rebuildFixedText	() ;
+        impl_recalcLayout		() ;
     }
 }
 
 //____________________________________________________________________________________________________________
-//  XProgressBar
+//	XProgressBar
 //____________________________________________________________________________________________________________
 
 void SAL_CALL ProgressMonitor::setForegroundColor ( sal_Int32 nColor ) throw( RuntimeException )
@@ -371,7 +371,7 @@ void SAL_CALL ProgressMonitor::setForegroundColor ( sal_Int32 nColor ) throw( Ru
 }
 
 //____________________________________________________________________________________________________________
-//  XProgressBar
+//	XProgressBar
 //____________________________________________________________________________________________________________
 
 void SAL_CALL ProgressMonitor::setBackgroundColor ( sal_Int32 nColor ) throw( RuntimeException )
@@ -386,7 +386,7 @@ void SAL_CALL ProgressMonitor::setBackgroundColor ( sal_Int32 nColor ) throw( Ru
 }
 
 //____________________________________________________________________________________________________________
-//  XProgressBar
+//	XProgressBar
 //____________________________________________________________________________________________________________
 
 void SAL_CALL ProgressMonitor::setValue ( sal_Int32 nValue ) throw( RuntimeException )
@@ -401,7 +401,7 @@ void SAL_CALL ProgressMonitor::setValue ( sal_Int32 nValue ) throw( RuntimeExcep
 }
 
 //____________________________________________________________________________________________________________
-//  XProgressBar
+//	XProgressBar
 //____________________________________________________________________________________________________________
 
 void SAL_CALL ProgressMonitor::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw( RuntimeException )
@@ -416,7 +416,7 @@ void SAL_CALL ProgressMonitor::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw
 }
 
 //____________________________________________________________________________________________________________
-//  XProgressBar
+//	XProgressBar
 //____________________________________________________________________________________________________________
 
 sal_Int32 SAL_CALL ProgressMonitor::getValue () throw( RuntimeException )
@@ -433,7 +433,7 @@ sal_Int32 SAL_CALL ProgressMonitor::getValue () throw( RuntimeException )
 }
 
 //____________________________________________________________________________________________________________
-//  XButton
+//	XButton
 //____________________________________________________________________________________________________________
 
 void SAL_CALL ProgressMonitor::addActionListener ( const Reference< XActionListener > & rListener ) throw( RuntimeException )
@@ -448,7 +448,7 @@ void SAL_CALL ProgressMonitor::addActionListener ( const Reference< XActionListe
 }
 
 //____________________________________________________________________________________________________________
-//  XButton
+//	XButton
 //____________________________________________________________________________________________________________
 
 void SAL_CALL ProgressMonitor::removeActionListener ( const Reference< XActionListener > & rListener ) throw( RuntimeException )
@@ -463,7 +463,7 @@ void SAL_CALL ProgressMonitor::removeActionListener ( const Reference< XActionLi
 }
 
 //____________________________________________________________________________________________________________
-//  XButton
+//	XButton
 //____________________________________________________________________________________________________________
 
 void SAL_CALL ProgressMonitor::setLabel ( const OUString& rLabel ) throw( RuntimeException )
@@ -478,7 +478,7 @@ void SAL_CALL ProgressMonitor::setLabel ( const OUString& rLabel ) throw( Runtim
 }
 
 //____________________________________________________________________________________________________________
-//  XButton
+//	XButton
 //____________________________________________________________________________________________________________
 
 void SAL_CALL ProgressMonitor::setActionCommand ( const OUString& rCommand ) throw( RuntimeException )
@@ -493,7 +493,7 @@ void SAL_CALL ProgressMonitor::setActionCommand ( const OUString& rCommand ) thr
 }
 
 //____________________________________________________________________________________________________________
-//  XLayoutConstrains
+//	XLayoutConstrains
 //____________________________________________________________________________________________________________
 
 Size SAL_CALL ProgressMonitor::getMinimumSize () throw( RuntimeException )
@@ -502,7 +502,7 @@ Size SAL_CALL ProgressMonitor::getMinimumSize () throw( RuntimeException )
 }
 
 //____________________________________________________________________________________________________________
-//  XLayoutConstrains
+//	XLayoutConstrains
 //____________________________________________________________________________________________________________
 
 Size SAL_CALL ProgressMonitor::getPreferredSize () throw( RuntimeException )
@@ -511,32 +511,32 @@ Size SAL_CALL ProgressMonitor::getPreferredSize () throw( RuntimeException )
     ClearableMutexGuard aGuard ( m_aMutex ) ;
 
     // get information about required place of child controls
-    Reference< XLayoutConstrains >  xTopicLayout_Top        ( m_xTopic_Top      , UNO_QUERY ) ;
-    Reference< XLayoutConstrains >  xTopicLayout_Bottom     ( m_xTopic_Bottom   , UNO_QUERY ) ;
-    Reference< XLayoutConstrains >  xButtonLayout           ( m_xButton         , UNO_QUERY ) ;
-    Reference< XWindow >            xProgressBarWindow      ( m_xProgressBar    , UNO_QUERY ) ;
+    Reference< XLayoutConstrains > 	xTopicLayout_Top		( m_xTopic_Top		, UNO_QUERY ) ;
+    Reference< XLayoutConstrains > 	xTopicLayout_Bottom		( m_xTopic_Bottom	, UNO_QUERY ) ;
+    Reference< XLayoutConstrains > 	xButtonLayout			( m_xButton			, UNO_QUERY ) ;
+    Reference< XWindow > 			xProgressBarWindow		( m_xProgressBar	, UNO_QUERY ) ;
 
-    Size        aTopicSize_Top      =   xTopicLayout_Top->getPreferredSize          ();
-    Size        aTopicSize_Bottom   =   xTopicLayout_Bottom->getPreferredSize       ();
-    Size        aButtonSize         =   xButtonLayout->getPreferredSize             ();
-    Rectangle   aTempRectangle      =   xProgressBarWindow->getPosSize              ();
-    Size        aProgressBarSize    =   Size( aTempRectangle.Width, aTempRectangle.Height );
+    Size		aTopicSize_Top		=	xTopicLayout_Top->getPreferredSize			();
+    Size		aTopicSize_Bottom	=	xTopicLayout_Bottom->getPreferredSize		();
+    Size		aButtonSize			=	xButtonLayout->getPreferredSize		 		();
+    Rectangle	aTempRectangle		=	xProgressBarWindow->getPosSize				();
+    Size		aProgressBarSize	=	Size( aTempRectangle.Width, aTempRectangle.Height );
 
     aGuard.clear () ;
 
     // calc preferred size of progressmonitor
-    sal_Int32   nWidth  =   0 ;
-    sal_Int32   nHeight =   0 ;
+    sal_Int32	nWidth	=	0 ;
+    sal_Int32	nHeight	=	0 ;
 
-    nWidth   =  3 * PROGRESSMONITOR_FREEBORDER          ;
-    nWidth  +=  aProgressBarSize.Width  ;
+    nWidth	 =	3 * PROGRESSMONITOR_FREEBORDER			;
+    nWidth	+=	aProgressBarSize.Width	;
 
-    nHeight  =  6 * PROGRESSMONITOR_FREEBORDER          ;
-    nHeight +=  aTopicSize_Top.Height   ;
-    nHeight +=  aProgressBarSize.Height ;
-    nHeight +=  aTopicSize_Bottom.Height;
-    nHeight +=  2                       ;   // 1 for black line, 1 for white line = 3D-Line!
-    nHeight +=  aButtonSize.Height      ;
+    nHeight	 =	6 * PROGRESSMONITOR_FREEBORDER			;
+    nHeight	+=	aTopicSize_Top.Height	;
+    nHeight	+=	aProgressBarSize.Height	;
+    nHeight	+=	aTopicSize_Bottom.Height;
+    nHeight	+=	2						;	// 1 for black line, 1 for white line = 3D-Line!
+    nHeight	+=	aButtonSize.Height		;
 
     // norm to minimum
     if ( nWidth < PROGRESSMONITOR_DEFAULT_WIDTH )
@@ -553,7 +553,7 @@ Size SAL_CALL ProgressMonitor::getPreferredSize () throw( RuntimeException )
 }
 
 //____________________________________________________________________________________________________________
-//  XLayoutConstrains
+//	XLayoutConstrains
 //____________________________________________________________________________________________________________
 
 Size SAL_CALL ProgressMonitor::calcAdjustedSize ( const Size& /*rNewSize*/ ) throw( RuntimeException )
@@ -562,10 +562,10 @@ Size SAL_CALL ProgressMonitor::calcAdjustedSize ( const Size& /*rNewSize*/ ) thr
 }
 
 //____________________________________________________________________________________________________________
-//  XControl
+//	XControl
 //____________________________________________________________________________________________________________
 
-void SAL_CALL ProgressMonitor::createPeer ( const Reference< XToolkit > & rToolkit, const Reference< XWindowPeer > & rParent    ) throw( RuntimeException )
+void SAL_CALL ProgressMonitor::createPeer ( const Reference< XToolkit > & rToolkit, const Reference< XWindowPeer > & rParent	) throw( RuntimeException )
 {
     if (!getPeer().is())
     {
@@ -580,7 +580,7 @@ void SAL_CALL ProgressMonitor::createPeer ( const Reference< XToolkit > & rToolk
 }
 
 //____________________________________________________________________________________________________________
-//  XControl
+//	XControl
 //____________________________________________________________________________________________________________
 
 sal_Bool SAL_CALL ProgressMonitor::setModel ( const Reference< XControlModel > & /*rModel*/ ) throw( RuntimeException )
@@ -590,7 +590,7 @@ sal_Bool SAL_CALL ProgressMonitor::setModel ( const Reference< XControlModel > &
 }
 
 //____________________________________________________________________________________________________________
-//  XControl
+//	XControl
 //____________________________________________________________________________________________________________
 
 Reference< XControlModel > SAL_CALL ProgressMonitor::getModel () throw( RuntimeException )
@@ -601,7 +601,7 @@ Reference< XControlModel > SAL_CALL ProgressMonitor::getModel () throw( RuntimeE
 }
 
 //____________________________________________________________________________________________________________
-//  XComponent
+//	XComponent
 //____________________________________________________________________________________________________________
 
 void SAL_CALL ProgressMonitor::dispose () throw( RuntimeException )
@@ -610,44 +610,44 @@ void SAL_CALL ProgressMonitor::dispose () throw( RuntimeException )
     MutexGuard aGuard ( m_aMutex ) ;
 
     // "removeControl()" control the state of a reference
-    Reference< XControl >  xRef_Topic_Top       ( m_xTopic_Top      , UNO_QUERY ) ;
-    Reference< XControl >  xRef_Text_Top        ( m_xText_Top       , UNO_QUERY ) ;
-    Reference< XControl >  xRef_Topic_Bottom    ( m_xTopic_Bottom   , UNO_QUERY ) ;
-    Reference< XControl >  xRef_Text_Bottom     ( m_xText_Bottom    , UNO_QUERY ) ;
-    Reference< XControl >  xRef_Button          ( m_xButton         , UNO_QUERY ) ;
-    Reference< XControl >  xRef_ProgressBar     ( m_xProgressBar    , UNO_QUERY ) ;
-
-    removeControl ( xRef_Topic_Top      ) ;
-    removeControl ( xRef_Text_Top       ) ;
-    removeControl ( xRef_Topic_Bottom   ) ;
-    removeControl ( xRef_Text_Bottom    ) ;
-    removeControl ( xRef_Button         ) ;
-    removeControl ( xRef_ProgressBar    ) ;
+    Reference< XControl >  xRef_Topic_Top		( m_xTopic_Top		, UNO_QUERY ) ;
+    Reference< XControl >  xRef_Text_Top		( m_xText_Top		, UNO_QUERY ) ;
+    Reference< XControl >  xRef_Topic_Bottom	( m_xTopic_Bottom	, UNO_QUERY ) ;
+    Reference< XControl >  xRef_Text_Bottom		( m_xText_Bottom	, UNO_QUERY ) ;
+    Reference< XControl >  xRef_Button			( m_xButton			, UNO_QUERY ) ;
+    Reference< XControl >  xRef_ProgressBar		( m_xProgressBar	, UNO_QUERY ) ;
+
+    removeControl ( xRef_Topic_Top	  	) ;
+    removeControl ( xRef_Text_Top	  	) ;
+    removeControl ( xRef_Topic_Bottom 	) ;
+    removeControl ( xRef_Text_Bottom	) ;
+    removeControl ( xRef_Button 		) ;
+    removeControl ( xRef_ProgressBar	) ;
 
     // do'nt use "...->clear ()" or "... = XFixedText ()"
     // when other hold a reference at this object !!!
-    xRef_Topic_Top->dispose     () ;
-    xRef_Text_Top->dispose      () ;
-    xRef_Topic_Bottom->dispose  () ;
-    xRef_Text_Bottom->dispose   () ;
-    xRef_Button->dispose        () ;
-    xRef_ProgressBar->dispose   () ;
+    xRef_Topic_Top->dispose 	() ;
+    xRef_Text_Top->dispose 		() ;
+    xRef_Topic_Bottom->dispose 	() ;
+    xRef_Text_Bottom->dispose 	() ;
+    xRef_Button->dispose		() ;
+    xRef_ProgressBar->dispose	() ;
 
     BaseContainerControl::dispose () ;
 }
 
 //____________________________________________________________________________________________________________
-//  XWindow
+//	XWindow
 //____________________________________________________________________________________________________________
 
 void SAL_CALL ProgressMonitor::setPosSize ( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags ) throw( RuntimeException )
 {
-    Rectangle   aBasePosSize = getPosSize () ;
+    Rectangle	aBasePosSize = getPosSize () ;
     BaseContainerControl::setPosSize (nX, nY, nWidth, nHeight, nFlags) ;
 
     // if position or size changed
     if (
-        ( nWidth  != aBasePosSize.Width ) ||
+        ( nWidth  != aBasePosSize.Width	) ||
         ( nHeight != aBasePosSize.Height)
        )
     {
@@ -662,7 +662,7 @@ void SAL_CALL ProgressMonitor::setPosSize ( sal_Int32 nX, sal_Int32 nY, sal_Int3
 }
 
 //____________________________________________________________________________________________________________
-//  impl but public method to register service
+//	impl but public method to register service
 //____________________________________________________________________________________________________________
 
 const Sequence< OUString > ProgressMonitor::impl_getStaticSupportedServiceNames()
@@ -674,7 +674,7 @@ const Sequence< OUString > ProgressMonitor::impl_getStaticSupportedServiceNames(
 }
 
 //____________________________________________________________________________________________________________
-//  impl but public method to register service
+//	impl but public method to register service
 //____________________________________________________________________________________________________________
 
 const OUString ProgressMonitor::impl_getStaticImplementationName()
@@ -683,7 +683,7 @@ const OUString ProgressMonitor::impl_getStaticImplementationName()
 }
 
 //____________________________________________________________________________________________________________
-//  protected method
+//	protected method
 //____________________________________________________________________________________________________________
 
 void ProgressMonitor::impl_paint ( sal_Int32 nX, sal_Int32 nY, const Reference< XGraphics > & rGraphics )
@@ -694,146 +694,146 @@ void ProgressMonitor::impl_paint ( sal_Int32 nX, sal_Int32 nY, const Reference<
         MutexGuard aGuard ( m_aMutex ) ;
 
         // paint shadowed border around the progressmonitor
-        rGraphics->setLineColor ( PROGRESSMONITOR_LINECOLOR_SHADOW                                                              ) ;
-        rGraphics->drawLine     ( impl_getWidth()-1, impl_getHeight()-1, impl_getWidth()-1, nY                  ) ;
-        rGraphics->drawLine     ( impl_getWidth()-1, impl_getHeight()-1, nX               , impl_getHeight()-1  ) ;
+        rGraphics->setLineColor ( PROGRESSMONITOR_LINECOLOR_SHADOW																) ;
+        rGraphics->drawLine		( impl_getWidth()-1, impl_getHeight()-1, impl_getWidth()-1, nY 					) ;
+        rGraphics->drawLine		( impl_getWidth()-1, impl_getHeight()-1, nX		   		  , impl_getHeight()-1	) ;
 
-        rGraphics->setLineColor ( PROGRESSMONITOR_LINECOLOR_BRIGHT                          ) ;
-        rGraphics->drawLine     ( nX, nY, impl_getWidth(), nY               ) ;
-        rGraphics->drawLine     ( nX, nY, nX             , impl_getHeight() ) ;
+        rGraphics->setLineColor ( PROGRESSMONITOR_LINECOLOR_BRIGHT							) ;
+        rGraphics->drawLine		( nX, nY, impl_getWidth(), nY 				) ;
+        rGraphics->drawLine		( nX, nY, nX		  	 , impl_getHeight()	) ;
 
         // Paint 3D-line
-        rGraphics->setLineColor ( PROGRESSMONITOR_LINECOLOR_SHADOW  ) ;
-        rGraphics->drawLine     ( m_a3DLine.X, m_a3DLine.Y, m_a3DLine.X+m_a3DLine.Width, m_a3DLine.Y ) ;
+        rGraphics->setLineColor ( PROGRESSMONITOR_LINECOLOR_SHADOW	) ;
+        rGraphics->drawLine		( m_a3DLine.X, m_a3DLine.Y, m_a3DLine.X+m_a3DLine.Width, m_a3DLine.Y ) ;
 
-        rGraphics->setLineColor ( PROGRESSMONITOR_LINECOLOR_BRIGHT  ) ;
-        rGraphics->drawLine     ( m_a3DLine.X, m_a3DLine.Y+1, m_a3DLine.X+m_a3DLine.Width, m_a3DLine.Y+1 ) ;
+        rGraphics->setLineColor ( PROGRESSMONITOR_LINECOLOR_BRIGHT	) ;
+        rGraphics->drawLine		( m_a3DLine.X, m_a3DLine.Y+1, m_a3DLine.X+m_a3DLine.Width, m_a3DLine.Y+1 ) ;
     }
 }
 
 //____________________________________________________________________________________________________________
-//  private method
+//	private method
 //____________________________________________________________________________________________________________
 
 void ProgressMonitor::impl_recalcLayout ()
 {
-    sal_Int32   nX_Button               ;
-    sal_Int32   nY_Button               ;
-    sal_Int32   nWidth_Button           ;
-    sal_Int32   nHeight_Button          ;
-
-    sal_Int32   nX_ProgressBar          ;
-    sal_Int32   nY_ProgressBar          ;
-    sal_Int32   nWidth_ProgressBar      ;
-    sal_Int32   nHeight_ProgressBar     ;
-
-    sal_Int32   nX_3DLine               ;
-    sal_Int32   nY_3DLine               ;
-    sal_Int32   nWidth_3DLine           ;
-    sal_Int32   nHeight_3DLine          ;
-
-    sal_Int32   nX_Text_Top             ;
-    sal_Int32   nY_Text_Top             ;
-    sal_Int32   nWidth_Text_Top         ;
-    sal_Int32   nHeight_Text_Top        ;
-
-    sal_Int32   nX_Topic_Top            ;
-    sal_Int32   nY_Topic_Top            ;
-    sal_Int32   nWidth_Topic_Top        ;
-    sal_Int32   nHeight_Topic_Top       ;
-
-    sal_Int32   nX_Text_Bottom          ;
-    sal_Int32   nY_Text_Bottom          ;
-    sal_Int32   nWidth_Text_Bottom      ;
-    sal_Int32   nHeight_Text_Bottom     ;
-
-    sal_Int32   nX_Topic_Bottom         ;
-    sal_Int32   nY_Topic_Bottom         ;
-    sal_Int32   nWidth_Topic_Bottom     ;
-    sal_Int32   nHeight_Topic_Bottom    ;
+    sal_Int32	nX_Button				;
+    sal_Int32	nY_Button				;
+    sal_Int32	nWidth_Button			;
+    sal_Int32	nHeight_Button			;
+
+    sal_Int32	nX_ProgressBar			;
+    sal_Int32	nY_ProgressBar			;
+    sal_Int32	nWidth_ProgressBar		;
+    sal_Int32	nHeight_ProgressBar		;
+
+    sal_Int32	nX_3DLine				;
+    sal_Int32	nY_3DLine				;
+    sal_Int32	nWidth_3DLine			;
+    sal_Int32	nHeight_3DLine			;
+
+    sal_Int32	nX_Text_Top				;
+    sal_Int32	nY_Text_Top				;
+    sal_Int32	nWidth_Text_Top			;
+    sal_Int32	nHeight_Text_Top		;
+
+    sal_Int32	nX_Topic_Top	 		;
+    sal_Int32	nY_Topic_Top	 		;
+    sal_Int32	nWidth_Topic_Top 		;
+    sal_Int32	nHeight_Topic_Top		;
+
+    sal_Int32	nX_Text_Bottom			;
+    sal_Int32	nY_Text_Bottom			;
+    sal_Int32	nWidth_Text_Bottom		;
+    sal_Int32	nHeight_Text_Bottom		;
+
+    sal_Int32	nX_Topic_Bottom	 		;
+    sal_Int32	nY_Topic_Bottom	 		;
+    sal_Int32	nWidth_Topic_Bottom 	;
+    sal_Int32	nHeight_Topic_Bottom	;
 
     // Ready for multithreading
     MutexGuard aGuard ( m_aMutex ) ;
 
     // get information about required place of child controls
-    Reference< XLayoutConstrains >  xTopicLayout_Top    ( m_xTopic_Top      , UNO_QUERY ) ;
-    Reference< XLayoutConstrains >  xTextLayout_Top     ( m_xText_Top       , UNO_QUERY ) ;
-    Reference< XLayoutConstrains >  xTopicLayout_Bottom ( m_xTopic_Bottom   , UNO_QUERY ) ;
-    Reference< XLayoutConstrains >  xTextLayout_Bottom  ( m_xText_Bottom    , UNO_QUERY ) ;
-    Reference< XLayoutConstrains >  xButtonLayout       ( m_xButton         , UNO_QUERY ) ;
-
-    Size    aTopicSize_Top      =   xTopicLayout_Top->getPreferredSize      () ;
-    Size    aTextSize_Top       =   xTextLayout_Top->getPreferredSize       () ;
-    Size    aTopicSize_Bottom   =   xTopicLayout_Bottom->getPreferredSize   () ;
-    Size    aTextSize_Bottom    =   xTextLayout_Bottom->getPreferredSize    () ;
-    Size    aButtonSize         =   xButtonLayout->getPreferredSize         () ;
+    Reference< XLayoutConstrains > 	xTopicLayout_Top	( m_xTopic_Top		, UNO_QUERY ) ;
+    Reference< XLayoutConstrains > 	xTextLayout_Top		( m_xText_Top		, UNO_QUERY ) ;
+    Reference< XLayoutConstrains > 	xTopicLayout_Bottom	( m_xTopic_Bottom	, UNO_QUERY ) ;
+    Reference< XLayoutConstrains > 	xTextLayout_Bottom	( m_xText_Bottom	, UNO_QUERY ) ;
+    Reference< XLayoutConstrains > 	xButtonLayout		( m_xButton			, UNO_QUERY ) ;
+
+    Size	aTopicSize_Top		=	xTopicLayout_Top->getPreferredSize		() ;
+    Size	aTextSize_Top		=	xTextLayout_Top->getPreferredSize		() ;
+    Size	aTopicSize_Bottom	=	xTopicLayout_Bottom->getPreferredSize	() ;
+    Size	aTextSize_Bottom	=	xTextLayout_Bottom->getPreferredSize	() ;
+    Size	aButtonSize			=	xButtonLayout->getPreferredSize		 	() ;
 
     // calc position and size of child controls
     // Button has preferred size!
-    nWidth_Button           =   aButtonSize.Width   ;
-    nHeight_Button          =   aButtonSize.Height  ;
+    nWidth_Button			=	aButtonSize.Width	;
+    nHeight_Button			=	aButtonSize.Height	;
 
     // Left column before progressbar has preferred size and fixed position.
     // But "Width" is oriented on left column below progressbar to!!! "max(...)"
-    nX_Topic_Top            =   PROGRESSMONITOR_FREEBORDER                              ;
-    nY_Topic_Top            =   PROGRESSMONITOR_FREEBORDER                              ;
-    nWidth_Topic_Top        =   Max ( aTopicSize_Top.Width, aTopicSize_Bottom.Width )   ;
-    nHeight_Topic_Top       =   aTopicSize_Top.Height                                   ;
+    nX_Topic_Top			=	PROGRESSMONITOR_FREEBORDER								;
+    nY_Topic_Top			=	PROGRESSMONITOR_FREEBORDER								;
+    nWidth_Topic_Top		=	Max ( aTopicSize_Top.Width, aTopicSize_Bottom.Width )	;
+    nHeight_Topic_Top		=	aTopicSize_Top.Height									;
 
     // Right column before progressbar has relativ position to left column ...
     // ... and a size as rest of dialog size!
-    nX_Text_Top             =   nX_Topic_Top+nWidth_Topic_Top+PROGRESSMONITOR_FREEBORDER;
-    nY_Text_Top             =   nY_Topic_Top                                            ;
-    nWidth_Text_Top         =   Max ( aTextSize_Top.Width, aTextSize_Bottom.Width )     ;
+    nX_Text_Top				=	nX_Topic_Top+nWidth_Topic_Top+PROGRESSMONITOR_FREEBORDER;
+    nY_Text_Top				=	nY_Topic_Top											;
+    nWidth_Text_Top			=	Max ( aTextSize_Top.Width, aTextSize_Bottom.Width )		;
     // Fix size of this column to minimum!
     sal_Int32 nSummaryWidth = nWidth_Text_Top+nWidth_Topic_Top+(3*PROGRESSMONITOR_FREEBORDER) ;
     if ( nSummaryWidth < PROGRESSMONITOR_DEFAULT_WIDTH )
-        nWidth_Text_Top     =   PROGRESSMONITOR_DEFAULT_WIDTH-nWidth_Topic_Top-(3*PROGRESSMONITOR_FREEBORDER);
+        nWidth_Text_Top		=	PROGRESSMONITOR_DEFAULT_WIDTH-nWidth_Topic_Top-(3*PROGRESSMONITOR_FREEBORDER);
     // Fix size of column to maximum!
     if ( nSummaryWidth > impl_getWidth() )
-        nWidth_Text_Top     =   impl_getWidth()-nWidth_Topic_Top-(3*PROGRESSMONITOR_FREEBORDER) ;
-    nHeight_Text_Top        =   nHeight_Topic_Top                                               ;
+        nWidth_Text_Top		=	impl_getWidth()-nWidth_Topic_Top-(3*PROGRESSMONITOR_FREEBORDER)	;
+    nHeight_Text_Top		=	nHeight_Topic_Top												;
 
     // Position of progressbar is relativ to columns before.
     // Progressbar.Width  = Dialog.Width !!!
     // Progressbar.Height = Button.Height
-    nX_ProgressBar          =   nX_Topic_Top                                                    ;
-    nY_ProgressBar          =   nY_Topic_Top+nHeight_Topic_Top+PROGRESSMONITOR_FREEBORDER       ;
-    nWidth_ProgressBar      =   PROGRESSMONITOR_FREEBORDER+nWidth_Topic_Top+nWidth_Text_Top     ;
-    nHeight_ProgressBar     =   nHeight_Button                                                  ;
+    nX_ProgressBar			=	nX_Topic_Top													;
+    nY_ProgressBar			=	nY_Topic_Top+nHeight_Topic_Top+PROGRESSMONITOR_FREEBORDER		;
+    nWidth_ProgressBar		=	PROGRESSMONITOR_FREEBORDER+nWidth_Topic_Top+nWidth_Text_Top		;
+    nHeight_ProgressBar		=	nHeight_Button													;
 
     // Oriented by left column before progressbar.
-    nX_Topic_Bottom         =   nX_Topic_Top                                                    ;
-    nY_Topic_Bottom         =   nY_ProgressBar+nHeight_ProgressBar+PROGRESSMONITOR_FREEBORDER   ;
-    nWidth_Topic_Bottom     =   nWidth_Topic_Top                                                ;
-    nHeight_Topic_Bottom    =   aTopicSize_Bottom.Height                                        ;
+    nX_Topic_Bottom			=	nX_Topic_Top													;
+    nY_Topic_Bottom			=	nY_ProgressBar+nHeight_ProgressBar+PROGRESSMONITOR_FREEBORDER	;
+    nWidth_Topic_Bottom		=	nWidth_Topic_Top												;
+    nHeight_Topic_Bottom	=	aTopicSize_Bottom.Height										;
 
     // Oriented by right column before progressbar.
-    nX_Text_Bottom          =   nX_Topic_Bottom+nWidth_Topic_Bottom+PROGRESSMONITOR_FREEBORDER  ;
-    nY_Text_Bottom          =   nY_Topic_Bottom                                                 ;
-    nWidth_Text_Bottom      =   nWidth_Text_Top                                                 ;
-    nHeight_Text_Bottom     =   nHeight_Topic_Bottom                                            ;
+    nX_Text_Bottom			=	nX_Topic_Bottom+nWidth_Topic_Bottom+PROGRESSMONITOR_FREEBORDER	;
+    nY_Text_Bottom			=	nY_Topic_Bottom													;
+    nWidth_Text_Bottom		=	nWidth_Text_Top													;
+    nHeight_Text_Bottom		=	nHeight_Topic_Bottom											;
 
     // Oriented by progressbar.
-    nX_3DLine               =   nX_Topic_Top                                                    ;
-    nY_3DLine               =   nY_Topic_Bottom+nHeight_Topic_Bottom+(PROGRESSMONITOR_FREEBORDER/2)             ;
-    nWidth_3DLine           =   nWidth_ProgressBar                                              ;
-    nHeight_3DLine          =   1                                                               ;   // Height for ONE line ! (But we paint two lines!)
+    nX_3DLine				=	nX_Topic_Top													;
+    nY_3DLine				=	nY_Topic_Bottom+nHeight_Topic_Bottom+(PROGRESSMONITOR_FREEBORDER/2)				;
+    nWidth_3DLine			=	nWidth_ProgressBar												;
+    nHeight_3DLine			=	1																;	// Height for ONE line ! (But we paint two lines!)
 
     // Oriented by progressbar.
-    nX_Button               =   nX_ProgressBar+nWidth_ProgressBar-nWidth_Button                 ;
-    nY_Button               =   nY_Topic_Bottom+nHeight_Topic_Bottom+PROGRESSMONITOR_FREEBORDER ;
+    nX_Button				=	nX_ProgressBar+nWidth_ProgressBar-nWidth_Button					;
+    nY_Button				=	nY_Topic_Bottom+nHeight_Topic_Bottom+PROGRESSMONITOR_FREEBORDER	;
 
     // Calc offsets to center controls
-    sal_Int32   nDx ;
-    sal_Int32   nDy ;
+    sal_Int32	nDx	;
+    sal_Int32	nDy	;
 
-    nDx =   ( (2*PROGRESSMONITOR_FREEBORDER)+nWidth_ProgressBar                                                             ) ;
-    nDy =   ( (6*PROGRESSMONITOR_FREEBORDER)+nHeight_Topic_Top+nHeight_ProgressBar+nHeight_Topic_Bottom+2+nHeight_Button    ) ;
+    nDx	=	( (2*PROGRESSMONITOR_FREEBORDER)+nWidth_ProgressBar																) ;
+    nDy	=	( (6*PROGRESSMONITOR_FREEBORDER)+nHeight_Topic_Top+nHeight_ProgressBar+nHeight_Topic_Bottom+2+nHeight_Button	) ;
 
     // At this point use original dialog size to center controls!
-    nDx =   (impl_getWidth ()/2)-(nDx/2)    ;
-    nDy =   (impl_getHeight()/2)-(nDy/2)    ;
+    nDx	=	(impl_getWidth ()/2)-(nDx/2)	;
+    nDy	=	(impl_getHeight()/2)-(nDy/2)	;
 
     if ( nDx<0 )
     {
@@ -845,12 +845,12 @@ void ProgressMonitor::impl_recalcLayout ()
     }
 
     // Set new position and size on all controls
-    Reference< XWindow >  xRef_Topic_Top        ( m_xTopic_Top      , UNO_QUERY ) ;
-    Reference< XWindow >  xRef_Text_Top         ( m_xText_Top       , UNO_QUERY ) ;
-    Reference< XWindow >  xRef_Topic_Bottom     ( m_xTopic_Bottom   , UNO_QUERY ) ;
-    Reference< XWindow >  xRef_Text_Bottom      ( m_xText_Bottom    , UNO_QUERY ) ;
-    Reference< XWindow >  xRef_Button           ( m_xButton         , UNO_QUERY ) ;
-    Reference< XWindow >  xRef_ProgressBar      ( m_xProgressBar    , UNO_QUERY ) ;
+    Reference< XWindow >  xRef_Topic_Top		( m_xTopic_Top		, UNO_QUERY ) ;
+    Reference< XWindow >  xRef_Text_Top			( m_xText_Top 		, UNO_QUERY ) ;
+    Reference< XWindow >  xRef_Topic_Bottom		( m_xTopic_Bottom	, UNO_QUERY ) ;
+    Reference< XWindow >  xRef_Text_Bottom		( m_xText_Bottom 	, UNO_QUERY ) ;
+    Reference< XWindow >  xRef_Button			( m_xButton			, UNO_QUERY ) ;
+    Reference< XWindow >  xRef_ProgressBar		( m_xProgressBar	, UNO_QUERY ) ;
 
     xRef_Topic_Top->setPosSize    ( nDx+nX_Topic_Top    , nDy+nY_Topic_Top    , nWidth_Topic_Top    , nHeight_Topic_Top    , 15 ) ;
     xRef_Text_Top->setPosSize     ( nDx+nX_Text_Top     , nDy+nY_Text_Top     , nWidth_Text_Top     , nHeight_Text_Top     , 15 ) ;
@@ -859,24 +859,24 @@ void ProgressMonitor::impl_recalcLayout ()
     xRef_Button->setPosSize       ( nDx+nX_Button       , nDy+nY_Button       , nWidth_Button       , nHeight_Button       , 15 ) ;
     xRef_ProgressBar->setPosSize  ( nDx+nX_ProgressBar  , nDy+nY_ProgressBar  , nWidth_ProgressBar  , nHeight_ProgressBar  , 15 ) ;
 
-    m_a3DLine.X      = nDx+nX_Topic_Top                                         ;
-    m_a3DLine.Y      = nDy+nY_Topic_Bottom+nHeight_Topic_Bottom+(PROGRESSMONITOR_FREEBORDER/2)  ;
-    m_a3DLine.Width  = nWidth_ProgressBar                                       ;
-    m_a3DLine.Height = nHeight_ProgressBar                                      ;
+    m_a3DLine.X      = nDx+nX_Topic_Top											;
+    m_a3DLine.Y      = nDy+nY_Topic_Bottom+nHeight_Topic_Bottom+(PROGRESSMONITOR_FREEBORDER/2)	;
+    m_a3DLine.Width  = nWidth_ProgressBar										;
+    m_a3DLine.Height = nHeight_ProgressBar										;
 
     // All childcontrols make an implicit repaint in setPosSize()!
     // Make it also for this 3D-line ...
     Reference< XGraphics >  xGraphics = impl_getGraphicsPeer () ;
 
-    xGraphics->setLineColor ( PROGRESSMONITOR_LINECOLOR_SHADOW  ) ;
-    xGraphics->drawLine     ( m_a3DLine.X, m_a3DLine.Y, m_a3DLine.X+m_a3DLine.Width, m_a3DLine.Y ) ;
+    xGraphics->setLineColor ( PROGRESSMONITOR_LINECOLOR_SHADOW	) ;
+    xGraphics->drawLine		( m_a3DLine.X, m_a3DLine.Y, m_a3DLine.X+m_a3DLine.Width, m_a3DLine.Y ) ;
 
-    xGraphics->setLineColor ( PROGRESSMONITOR_LINECOLOR_BRIGHT  ) ;
-    xGraphics->drawLine     ( m_a3DLine.X, m_a3DLine.Y+1, m_a3DLine.X+m_a3DLine.Width, m_a3DLine.Y+1 ) ;
+    xGraphics->setLineColor ( PROGRESSMONITOR_LINECOLOR_BRIGHT	) ;
+    xGraphics->drawLine		( m_a3DLine.X, m_a3DLine.Y+1, m_a3DLine.X+m_a3DLine.Width, m_a3DLine.Y+1 ) ;
 }
 
 //____________________________________________________________________________________________________________
-//  private method
+//	private method
 //____________________________________________________________________________________________________________
 
 void ProgressMonitor::impl_rebuildFixedText ()
@@ -889,17 +889,17 @@ void ProgressMonitor::impl_rebuildFixedText ()
     // Rebuild left site of text
     if (m_xTopic_Top.is())
     {
-        OUString aCollectString ;
+        OUString aCollectString	;
 
         // Collect all topics from list and format text.
         // "\n" MUST BE at the end of line!!! => Else ... topic and his text are not in the same line!!!
         for ( sal_uInt32 n=0; n<m_pTextlist_Top->Count(); ++n )
         {
             IMPL_TextlistItem* pSearchItem = m_pTextlist_Top->GetObject (n) ;
-            aCollectString  +=  pSearchItem->sTopic ;
-            aCollectString  +=  OUString::createFromAscii("\n")             ;
+            aCollectString	+=	pSearchItem->sTopic ;
+            aCollectString	+=	OUString::createFromAscii("\n")			    ;
         }
-        aCollectString  +=  OUString::createFromAscii("\0") ;   // It's better :-)
+        aCollectString	+=	OUString::createFromAscii("\0")	;	// It's better :-)
 
         m_xTopic_Top->setText ( aCollectString ) ;
     }
@@ -907,17 +907,17 @@ void ProgressMonitor::impl_rebuildFixedText ()
     // Rebuild right site of text
     if (m_xText_Top.is())
     {
-        OUString        aCollectString  ;
+        OUString		aCollectString	;
 
         // Collect all topics from list and format text.
         // "\n" MUST BE at the end of line!!! => Else ... topic and his text are not in the same line!!!
         for ( sal_uInt32 n=0; n<m_pTextlist_Top->Count(); ++n )
         {
             IMPL_TextlistItem* pSearchItem = m_pTextlist_Top->GetObject (n) ;
-            aCollectString  +=  pSearchItem->sText ;
-            aCollectString  +=  OUString::createFromAscii("\n")            ;
+            aCollectString	+=	pSearchItem->sText ;
+            aCollectString	+=	OUString::createFromAscii("\n")			   ;
         }
-        aCollectString  +=  OUString::createFromAscii("\0") ;   // It's better :-)
+        aCollectString	+=	OUString::createFromAscii("\0")	;	// It's better :-)
 
         m_xText_Top->setText ( aCollectString ) ;
     }
@@ -927,17 +927,17 @@ void ProgressMonitor::impl_rebuildFixedText ()
     // Rebuild left site of text
     if (m_xTopic_Bottom.is())
     {
-        OUString        aCollectString  ;
+        OUString		aCollectString	;
 
         // Collect all topics from list and format text.
         // "\n" MUST BE at the end of line!!! => Else ... topic and his text are not in the same line!!!
         for ( sal_uInt32 n=0; n<m_pTextlist_Bottom->Count(); ++n )
         {
             IMPL_TextlistItem* pSearchItem = m_pTextlist_Bottom->GetObject (n) ;
-            aCollectString  +=  pSearchItem->sTopic ;
-            aCollectString  +=  OUString::createFromAscii("\n")             ;
+            aCollectString	+=	pSearchItem->sTopic ;
+            aCollectString	+=	OUString::createFromAscii("\n")			    ;
         }
-        aCollectString  +=  OUString::createFromAscii("\0") ;   // It's better :-)
+        aCollectString	+=	OUString::createFromAscii("\0")	;	// It's better :-)
 
         m_xTopic_Bottom->setText ( aCollectString ) ;
     }
@@ -945,24 +945,24 @@ void ProgressMonitor::impl_rebuildFixedText ()
     // Rebuild right site of text
     if (m_xText_Bottom.is())
     {
-        OUString        aCollectString  ;
+        OUString		aCollectString	;
 
         // Collect all topics from list and format text.
         // "\n" MUST BE at the end of line!!! => Else ... topic and his text are not in the same line!!!
         for ( sal_uInt32 n=0; n<m_pTextlist_Bottom->Count(); ++n )
         {
             IMPL_TextlistItem* pSearchItem = m_pTextlist_Bottom->GetObject (n) ;
-            aCollectString  +=  pSearchItem->sText ;
-            aCollectString  +=  OUString::createFromAscii("\n")            ;
+            aCollectString	+=	pSearchItem->sText ;
+            aCollectString	+=	OUString::createFromAscii("\n")			   ;
         }
-        aCollectString  +=  OUString::createFromAscii("\0") ;   // It's better :-)
+        aCollectString	+=	OUString::createFromAscii("\0")	;	// It's better :-)
 
         m_xText_Bottom->setText ( aCollectString ) ;
     }
 }
 
 //____________________________________________________________________________________________________________
-//  private method
+//	private method
 //____________________________________________________________________________________________________________
 
 void ProgressMonitor::impl_cleanMemory ()
@@ -992,10 +992,10 @@ void ProgressMonitor::impl_cleanMemory ()
 }
 
 //____________________________________________________________________________________________________________
-//  private method
+//	private method
 //____________________________________________________________________________________________________________
 
-IMPL_TextlistItem* ProgressMonitor::impl_searchTopic ( const OUString& rTopic, sal_Bool bbeforeProgress )
+IMPL_TextlistItem* ProgressMonitor::impl_searchTopic ( const OUString& rTopic, sal_Bool bbeforeProgress	)
 {
     // Get right textlist for following operations.
     IMPL_Textlist* pTextList ;
@@ -1016,8 +1016,8 @@ IMPL_TextlistItem* ProgressMonitor::impl_searchTopic ( const OUString& rTopic, s
     aGuard.clear () ;
 
     // Search the topic in textlist.
-    sal_uInt32  nPosition   =   0                   ;
-    sal_uInt32  nCount      =   pTextList->Count () ;
+    sal_uInt32	nPosition	=	0					;
+    sal_uInt32	nCount		=	pTextList->Count ()	;
 
     for ( nPosition = 0; nPosition < nCount ; ++nPosition )
     {
@@ -1035,7 +1035,7 @@ IMPL_TextlistItem* ProgressMonitor::impl_searchTopic ( const OUString& rTopic, s
 }
 
 //____________________________________________________________________________________________________________
-//  debug methods
+//	debug methods
 //____________________________________________________________________________________________________________
 
 #ifdef DBG_UTIL
@@ -1047,12 +1047,12 @@ sal_Bool ProgressMonitor::impl_debug_checkParameter (
     sal_Bool /*bbeforeProgress*/
 ) {
     // Check "rTopic"
-    if ( &rTopic        ==  NULL    ) return sal_False ;    // NULL-pointer for reference ???!!!
-    if ( rTopic.getLength ()    <   1       ) return sal_False ;    // ""
+    if ( &rTopic		==	NULL	) return sal_False ;	// NULL-pointer for reference ???!!!
+    if ( rTopic.getLength ()	<	1		) return sal_False ;	// ""
 
     // Check "rText"
-    if ( &rText         ==  NULL    ) return sal_False ;    // NULL-pointer for reference ???!!!
-    if ( rText.getLength () <   1       ) return sal_False ;    // ""
+    if ( &rText			==	NULL	) return sal_False ;	// NULL-pointer for reference ???!!!
+    if ( rText.getLength ()	<	1		) return sal_False ;	// ""
 
     // "bbeforeProgress" is valid in everyway!
 
@@ -1064,8 +1064,8 @@ sal_Bool ProgressMonitor::impl_debug_checkParameter (
 sal_Bool ProgressMonitor::impl_debug_checkParameter ( const OUString& rTopic, sal_Bool /*bbeforeProgress*/ )
 {
     // Check "rTopic"
-    if ( &rTopic        ==  NULL    ) return sal_False ;    // NULL-pointer for reference ???!!!
-    if ( rTopic.getLength ()    <   1       ) return sal_False ;    // ""
+    if ( &rTopic		==	NULL	) return sal_False ;	// NULL-pointer for reference ???!!!
+    if ( rTopic.getLength ()	<	1		) return sal_False ;	// ""
 
     // "bbeforeProgress" is valid in everyway!
 
@@ -1073,8 +1073,8 @@ sal_Bool ProgressMonitor::impl_debug_checkParameter ( const OUString& rTopic, sa
     return sal_True ;
 }
 
-#endif  // #ifdef DBG_UTIL
+#endif	// #ifdef DBG_UTIL
 
-}   // namespace unocontrols
+}	// namespace unocontrols
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/controls/statusindicator.cxx b/UnoControls/source/controls/statusindicator.cxx
index 70b195931c18..36d8afa2e4f6 100644
--- a/UnoControls/source/controls/statusindicator.cxx
+++ b/UnoControls/source/controls/statusindicator.cxx
@@ -27,13 +27,13 @@
  ************************************************************************/
 
 //____________________________________________________________________________________________________________
-//  my own includes
+//	my own includes
 //____________________________________________________________________________________________________________
 
 #include "statusindicator.hxx"
 
 //____________________________________________________________________________________________________________
-//  includes of other projects
+//	includes of other projects
 //____________________________________________________________________________________________________________
 #include <com/sun/star/awt/InvalidateStyle.hpp>
 #include <com/sun/star/awt/WindowAttribute.hpp>
@@ -41,46 +41,46 @@
 #include <tools/debug.hxx>
 
 //____________________________________________________________________________________________________________
-//  includes of my project
+//	includes of my project
 //____________________________________________________________________________________________________________
 #include "progressbar.hxx"
 
 //____________________________________________________________________________________________________________
-//  namespace
+//	namespace
 //____________________________________________________________________________________________________________
 
-using namespace ::cppu                  ;
-using namespace ::osl                   ;
-using namespace ::rtl                   ;
-using namespace ::com::sun::star::uno   ;
-using namespace ::com::sun::star::lang  ;
-using namespace ::com::sun::star::awt   ;
-using namespace ::com::sun::star::task  ;
+using namespace	::cppu					;
+using namespace	::osl					;
+using namespace	::rtl					;
+using namespace	::com::sun::star::uno	;
+using namespace	::com::sun::star::lang	;
+using namespace	::com::sun::star::awt	;
+using namespace	::com::sun::star::task	;
 
 namespace unocontrols{
 
 //____________________________________________________________________________________________________________
-//  construct/destruct
+//	construct/destruct
 //____________________________________________________________________________________________________________
 
 StatusIndicator::StatusIndicator( const Reference< XMultiServiceFactory >& xFactory )
-    : BaseContainerControl  ( xFactory  )
+    : BaseContainerControl	( xFactory	)
 {
     // Its not allowed to work with member in this method (refcounter !!!)
     // But with a HACK (++refcount) its "OK" :-(
     ++m_refCount ;
 
     // Create instances for fixedtext and progress ...
-    m_xText         = Reference< XFixedText >   ( xFactory->createInstance( OUString::createFromAscii( FIXEDTEXT_SERVICENAME    ) ), UNO_QUERY );
-    m_xProgressBar  = Reference< XProgressBar > ( xFactory->createInstance( OUString::createFromAscii( SERVICENAME_PROGRESSBAR  ) ), UNO_QUERY );
+    m_xText			= Reference< XFixedText > 	( xFactory->createInstance( OUString::createFromAscii( FIXEDTEXT_SERVICENAME	) ), UNO_QUERY );
+    m_xProgressBar	= Reference< XProgressBar >	( xFactory->createInstance( OUString::createFromAscii( SERVICENAME_PROGRESSBAR	) ), UNO_QUERY );
     // ... cast controls to Reference< XControl > and set model ...
     // ( ProgressBar has no model !!! )
-    Reference< XControl > xTextControl      ( m_xText       , UNO_QUERY );
-    Reference< XControl > xProgressControl  ( m_xProgressBar, UNO_QUERY );
+    Reference< XControl > xTextControl		( m_xText		, UNO_QUERY );
+    Reference< XControl > xProgressControl	( m_xProgressBar, UNO_QUERY );
     xTextControl->setModel( Reference< XControlModel >( xFactory->createInstance( OUString::createFromAscii( FIXEDTEXT_MODELNAME ) ), UNO_QUERY ) );
     // ... and add controls to basecontainercontrol!
-    addControl( OUString::createFromAscii( CONTROLNAME_TEXT         ), xTextControl     );
-    addControl( OUString::createFromAscii( CONTROLNAME_PROGRESSBAR  ), xProgressControl );
+    addControl( OUString::createFromAscii( CONTROLNAME_TEXT			), xTextControl   	);
+    addControl( OUString::createFromAscii( CONTROLNAME_PROGRESSBAR	), xProgressControl	);
     // FixedText make it automaticly visible by himself ... but not the progressbar !!!
     // it must be set explicitly
     Reference< XWindow > xProgressWindow( m_xProgressBar, UNO_QUERY );
@@ -95,18 +95,18 @@ StatusIndicator::StatusIndicator( const Reference< XMultiServiceFactory >& xFact
 StatusIndicator::~StatusIndicator()
 {
     // Release all references
-    m_xText         = Reference< XFixedText >();
-    m_xProgressBar  = Reference< XProgressBar >();
+    m_xText			= Reference< XFixedText >();
+    m_xProgressBar	= Reference< XProgressBar >();
 }
 
 //____________________________________________________________________________________________________________
-//  XInterface
+//	XInterface
 //____________________________________________________________________________________________________________
 
 Any SAL_CALL StatusIndicator::queryInterface( const Type& rType ) throw( RuntimeException )
 {
     // Attention:
-    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+    //	Don't use mutex or guard in this method!!! Is a method of XInterface.
     Any aReturn ;
     Reference< XInterface > xDel = BaseContainerControl::impl_getDelegator();
     if ( xDel.is() )
@@ -125,33 +125,33 @@ Any SAL_CALL StatusIndicator::queryInterface( const Type& rType ) throw( Runtime
 }
 
 //____________________________________________________________________________________________________________
-//  XInterface
+//	XInterface
 //____________________________________________________________________________________________________________
 
 void SAL_CALL StatusIndicator::acquire() throw()
 {
     // Attention:
-    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+    //	Don't use mutex or guard in this method!!! Is a method of XInterface.
 
     // Forward to baseclass
     BaseControl::acquire();
 }
 
 //____________________________________________________________________________________________________________
-//  XInterface
+//	XInterface
 //____________________________________________________________________________________________________________
 
 void SAL_CALL StatusIndicator::release() throw()
 {
     // Attention:
-    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+    //	Don't use mutex or guard in this method!!! Is a method of XInterface.
 
     // Forward to baseclass
     BaseControl::release();
 }
 
 //____________________________________________________________________________________________________________
-//  XTypeProvider
+//	XTypeProvider
 //____________________________________________________________________________________________________________
 
 Sequence< Type > SAL_CALL StatusIndicator::getTypes() throw( RuntimeException )
@@ -170,8 +170,8 @@ Sequence< Type > SAL_CALL StatusIndicator::getTypes() throw( RuntimeException )
         if ( pTypeCollection == NULL )
         {
             // Create a static typecollection ...
-            static OTypeCollection aTypeCollection  ( ::getCppuType(( const Reference< XLayoutConstrains    >*)NULL )   ,
-                                                      ::getCppuType(( const Reference< XStatusIndicator >*)NULL )   ,
+            static OTypeCollection aTypeCollection	( ::getCppuType(( const Reference< XLayoutConstrains	>*)NULL )	,
+                                                      ::getCppuType(( const Reference< XStatusIndicator	>*)NULL )	,
                                                       BaseContainerControl::getTypes()
                                                     );
             // ... and set his address to static pointer!
@@ -183,16 +183,16 @@ Sequence< Type > SAL_CALL StatusIndicator::getTypes() throw( RuntimeException )
 }
 
 //____________________________________________________________________________________________________________
-//  XAggregation
+//	XAggregation
 //____________________________________________________________________________________________________________
 
 Any SAL_CALL StatusIndicator::queryAggregation( const Type& aType ) throw( RuntimeException )
 {
     // Ask for my own supported interfaces ...
     // Attention: XTypeProvider and XInterface are supported by OComponentHelper!
-    Any aReturn ( ::cppu::queryInterface( aType                                     ,
-                                          static_cast< XLayoutConstrains*   > ( this )  ,
-                                          static_cast< XStatusIndicator*    > ( this )
+    Any aReturn	( ::cppu::queryInterface( aType					   					,
+                                          static_cast< XLayoutConstrains*	> ( this )	,
+                                          static_cast< XStatusIndicator*	> ( this )
                                         )
                 );
 
@@ -207,7 +207,7 @@ Any SAL_CALL StatusIndicator::queryAggregation( const Type& aType ) throw( Runti
 }
 
 //____________________________________________________________________________________________________________
-//  XStatusIndicator
+//	XStatusIndicator
 //____________________________________________________________________________________________________________
 
 void SAL_CALL StatusIndicator::start( const OUString& sText, sal_Int32 nRange ) throw( RuntimeException )
@@ -223,7 +223,7 @@ void SAL_CALL StatusIndicator::start( const OUString& sText, sal_Int32 nRange )
 }
 
 //____________________________________________________________________________________________________________
-//  XStatusIndicator
+//	XStatusIndicator
 //____________________________________________________________________________________________________________
 
 void SAL_CALL StatusIndicator::end() throw( RuntimeException )
@@ -238,7 +238,7 @@ void SAL_CALL StatusIndicator::end() throw( RuntimeException )
 }
 
 //____________________________________________________________________________________________________________
-//  XStatusIndicator
+//	XStatusIndicator
 //____________________________________________________________________________________________________________
 
 void SAL_CALL StatusIndicator::setText( const OUString& sText ) throw( RuntimeException )
@@ -251,7 +251,7 @@ void SAL_CALL StatusIndicator::setText( const OUString& sText ) throw( RuntimeEx
 }
 
 //____________________________________________________________________________________________________________
-//  XStatusIndicator
+//	XStatusIndicator
 //____________________________________________________________________________________________________________
 
 void SAL_CALL StatusIndicator::setValue( sal_Int32 nValue ) throw( RuntimeException )
@@ -264,7 +264,7 @@ void SAL_CALL StatusIndicator::setValue( sal_Int32 nValue ) throw( RuntimeExcept
 }
 
 //____________________________________________________________________________________________________________
-//  XStatusIndicator
+//	XStatusIndicator
 //____________________________________________________________________________________________________________
 
 void SAL_CALL StatusIndicator::reset() throw( RuntimeException )
@@ -279,7 +279,7 @@ void SAL_CALL StatusIndicator::reset() throw( RuntimeException )
 }
 
 //____________________________________________________________________________________________________________
-//  XLayoutConstrains
+//	XLayoutConstrains
 //____________________________________________________________________________________________________________
 
 Size SAL_CALL StatusIndicator::getMinimumSize () throw( RuntimeException )
@@ -288,7 +288,7 @@ Size SAL_CALL StatusIndicator::getMinimumSize () throw( RuntimeException )
 }
 
 //____________________________________________________________________________________________________________
-//  XLayoutConstrains
+//	XLayoutConstrains
 //____________________________________________________________________________________________________________
 
 Size SAL_CALL StatusIndicator::getPreferredSize () throw( RuntimeException )
@@ -297,8 +297,8 @@ Size SAL_CALL StatusIndicator::getPreferredSize () throw( RuntimeException )
     ClearableMutexGuard aGuard ( m_aMutex ) ;
 
     // get information about required place of child controls
-    Reference< XLayoutConstrains >  xTextLayout ( m_xText, UNO_QUERY );
-    Size                            aTextSize   = xTextLayout->getPreferredSize();
+    Reference< XLayoutConstrains >	xTextLayout	( m_xText, UNO_QUERY );
+    Size							aTextSize	= xTextLayout->getPreferredSize();
 
     aGuard.clear () ;
 
@@ -321,7 +321,7 @@ Size SAL_CALL StatusIndicator::getPreferredSize () throw( RuntimeException )
 }
 
 //____________________________________________________________________________________________________________
-//  XLayoutConstrains
+//	XLayoutConstrains
 //____________________________________________________________________________________________________________
 
 Size SAL_CALL StatusIndicator::calcAdjustedSize ( const Size& /*rNewSize*/ ) throw( RuntimeException )
@@ -330,7 +330,7 @@ Size SAL_CALL StatusIndicator::calcAdjustedSize ( const Size& /*rNewSize*/ ) thr
 }
 
 //____________________________________________________________________________________________________________
-//  XControl
+//	XControl
 //____________________________________________________________________________________________________________
 
 void SAL_CALL StatusIndicator::createPeer (
@@ -351,7 +351,7 @@ void SAL_CALL StatusIndicator::createPeer (
 }
 
 //____________________________________________________________________________________________________________
-//  XControl
+//	XControl
 //____________________________________________________________________________________________________________
 
 sal_Bool SAL_CALL StatusIndicator::setModel ( const Reference< XControlModel > & /*rModel*/ ) throw( RuntimeException )
@@ -361,7 +361,7 @@ sal_Bool SAL_CALL StatusIndicator::setModel ( const Reference< XControlModel > &
 }
 
 //____________________________________________________________________________________________________________
-//  XControl
+//	XControl
 //____________________________________________________________________________________________________________
 
 Reference< XControlModel > SAL_CALL StatusIndicator::getModel () throw( RuntimeException )
@@ -372,7 +372,7 @@ Reference< XControlModel > SAL_CALL StatusIndicator::getModel () throw( RuntimeE
 }
 
 //____________________________________________________________________________________________________________
-//  XComponent
+//	XComponent
 //____________________________________________________________________________________________________________
 
 void SAL_CALL StatusIndicator::dispose () throw( RuntimeException )
@@ -381,11 +381,11 @@ void SAL_CALL StatusIndicator::dispose () throw( RuntimeException )
     MutexGuard aGuard ( m_aMutex ) ;
 
     // "removeControl()" control the state of a reference
-    Reference< XControl >  xTextControl     ( m_xText       , UNO_QUERY );
-    Reference< XControl >  xProgressControl ( m_xProgressBar, UNO_QUERY );
+    Reference< XControl >  xTextControl		( m_xText		, UNO_QUERY );
+    Reference< XControl >  xProgressControl	( m_xProgressBar, UNO_QUERY );
 
-    removeControl( xTextControl     );
-    removeControl( xProgressControl );
+    removeControl( xTextControl		);
+    removeControl( xProgressControl	);
 
     // do'nt use "...->clear ()" or "... = XFixedText ()"
     // when other hold a reference at this object !!!
@@ -395,7 +395,7 @@ void SAL_CALL StatusIndicator::dispose () throw( RuntimeException )
 }
 
 //____________________________________________________________________________________________________________
-//  XWindow
+//	XWindow
 //____________________________________________________________________________________________________________
 
 void SAL_CALL StatusIndicator::setPosSize (
@@ -406,12 +406,12 @@ void SAL_CALL StatusIndicator::setPosSize (
     sal_Int16 nFlags
 ) throw( RuntimeException )
 {
-    Rectangle   aBasePosSize = getPosSize () ;
+    Rectangle	aBasePosSize = getPosSize () ;
     BaseContainerControl::setPosSize (nX, nY, nWidth, nHeight, nFlags) ;
 
     // if position or size changed
     if (
-        ( nWidth  != aBasePosSize.Width ) ||
+        ( nWidth  != aBasePosSize.Width	) ||
         ( nHeight != aBasePosSize.Height)
        )
     {
@@ -426,7 +426,7 @@ void SAL_CALL StatusIndicator::setPosSize (
 }
 
 //____________________________________________________________________________________________________________
-//  impl but public method to register service
+//	impl but public method to register service
 //____________________________________________________________________________________________________________
 
 const Sequence< OUString > StatusIndicator::impl_getStaticSupportedServiceNames()
@@ -438,7 +438,7 @@ const Sequence< OUString > StatusIndicator::impl_getStaticSupportedServiceNames(
 }
 
 //____________________________________________________________________________________________________________
-//  impl but public method to register service
+//	impl but public method to register service
 //____________________________________________________________________________________________________________
 
 const OUString StatusIndicator::impl_getStaticImplementationName()
@@ -447,7 +447,7 @@ const OUString StatusIndicator::impl_getStaticImplementationName()
 }
 
 //____________________________________________________________________________________________________________
-//  protected method
+//	protected method
 //____________________________________________________________________________________________________________
 
 WindowDescriptor* StatusIndicator::impl_getWindowDescriptor( const Reference< XWindowPeer >& xParentPeer )
@@ -458,17 +458,17 @@ WindowDescriptor* StatusIndicator::impl_getWindowDescriptor( const Reference< XW
 
     WindowDescriptor* pDescriptor = new WindowDescriptor ;
 
-    pDescriptor->Type               =   WindowClass_SIMPLE                              ;
-    pDescriptor->WindowServiceName  =   OUString::createFromAscii( "floatingwindow" )   ;
-    pDescriptor->ParentIndex        =   -1                                              ;
-    pDescriptor->Parent             =   xParentPeer                                     ;
-    pDescriptor->Bounds             =   getPosSize ()                                   ;
+    pDescriptor->Type				=	WindowClass_SIMPLE								;
+    pDescriptor->WindowServiceName	=	OUString::createFromAscii( "floatingwindow" )	;
+    pDescriptor->ParentIndex		=	-1												;
+    pDescriptor->Parent				=	xParentPeer										;
+    pDescriptor->Bounds				=	getPosSize ()									;
 
     return pDescriptor ;
 }
 
 //____________________________________________________________________________________________________________
-//  protected method
+//	protected method
 //____________________________________________________________________________________________________________
 
 void StatusIndicator::impl_paint ( sal_Int32 nX, sal_Int32 nY, const Reference< XGraphics > & rGraphics )
@@ -477,7 +477,7 @@ void StatusIndicator::impl_paint ( sal_Int32 nX, sal_Int32 nY, const Reference<
     // Every request paint the completely control. ( but only, if peer exist )
      if ( rGraphics.is () )
     {
-        MutexGuard  aGuard (m_aMutex) ;
+        MutexGuard	aGuard (m_aMutex) ;
 
         // background = gray
         Reference< XWindowPeer > xPeer( impl_getPeerWindow(), UNO_QUERY );
@@ -507,27 +507,27 @@ void StatusIndicator::impl_paint ( sal_Int32 nX, sal_Int32 nY, const Reference<
 }
 
 //____________________________________________________________________________________________________________
-//  protected method
+//	protected method
 //____________________________________________________________________________________________________________
 
 void StatusIndicator::impl_recalcLayout ( const WindowEvent& aEvent )
 {
-    sal_Int32   nX_ProgressBar          ;
-    sal_Int32   nY_ProgressBar          ;
-    sal_Int32   nWidth_ProgressBar      ;
-    sal_Int32   nHeight_ProgressBar     ;
-    sal_Int32   nX_Text                 ;
-    sal_Int32   nY_Text                 ;
-    sal_Int32   nWidth_Text             ;
-    sal_Int32   nHeight_Text            ;
+    sal_Int32	nX_ProgressBar			;
+    sal_Int32	nY_ProgressBar			;
+    sal_Int32	nWidth_ProgressBar		;
+    sal_Int32	nHeight_ProgressBar		;
+    sal_Int32	nX_Text					;
+    sal_Int32	nY_Text					;
+    sal_Int32	nWidth_Text				;
+    sal_Int32	nHeight_Text			;
 
     // Ready for multithreading
     MutexGuard aGuard ( m_aMutex ) ;
 
     // get information about required place of child controls
-    Size                            aWindowSize     ( aEvent.Width, aEvent.Height );
-    Reference< XLayoutConstrains >  xTextLayout     ( m_xText, UNO_QUERY );
-    Size                            aTextSize       = xTextLayout->getPreferredSize();
+    Size							aWindowSize		( aEvent.Width, aEvent.Height );
+    Reference< XLayoutConstrains >	xTextLayout		( m_xText, UNO_QUERY );
+    Size							aTextSize		= xTextLayout->getPreferredSize();
 
     if( aWindowSize.Width < STATUSINDICATOR_DEFAULT_WIDTH )
     {
@@ -550,13 +550,13 @@ void StatusIndicator::impl_recalcLayout ( const WindowEvent& aEvent )
     nHeight_ProgressBar = nHeight_Text                                  ;
 
     // Set new position and size on all controls
-    Reference< XWindow >  xTextWindow       ( m_xText       , UNO_QUERY );
-    Reference< XWindow >  xProgressWindow   ( m_xProgressBar, UNO_QUERY );
+    Reference< XWindow >  xTextWindow		( m_xText		, UNO_QUERY );
+    Reference< XWindow >  xProgressWindow	( m_xProgressBar, UNO_QUERY );
 
-    xTextWindow->setPosSize     ( nX_Text       , nY_Text       , nWidth_Text       , nHeight_Text          , 15 ) ;
-    xProgressWindow->setPosSize ( nX_ProgressBar, nY_ProgressBar, nWidth_ProgressBar, nHeight_ProgressBar   , 15 ) ;
+    xTextWindow->setPosSize		( nX_Text		, nY_Text		, nWidth_Text		, nHeight_Text	  		, 15 ) ;
+    xProgressWindow->setPosSize	( nX_ProgressBar, nY_ProgressBar, nWidth_ProgressBar, nHeight_ProgressBar	, 15 ) ;
 }
 
-}   // namespace unocontrols
+}	// namespace unocontrols
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
index e0cc5a9b70b9..511755ded746 100644
--- a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
+++ b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
@@ -30,7 +30,7 @@
 #define _OCONNECTIONPOINTCONTAINERHELPER_HXX
 
 //______________________________________________________________________________________________________________
-//  includes of other projects
+//	includes of other projects
 //______________________________________________________________________________________________________________
 
 #include <com/sun/star/lang/XConnectionPointContainer.hpp>
@@ -39,11 +39,11 @@
 #include <cppuhelper/propshlp.hxx>
 
 //______________________________________________________________________________________________________________
-//  includes of my own project
+//	includes of my own project
 //______________________________________________________________________________________________________________
 
 //______________________________________________________________________________________________________________
-//  namespaces
+//	namespaces
 //______________________________________________________________________________________________________________
 
 namespace unocontrols{
@@ -52,25 +52,25 @@ namespace unocontrols{
 #define CSS_LANG    ::com::sun::star::lang
 
 //______________________________________________________________________________________________________________
-//  defines
+//	defines
 //______________________________________________________________________________________________________________
 
 //______________________________________________________________________________________________________________
-//  class declaration OConnectionPointContainerHelper
+//	class declaration OConnectionPointContainerHelper
 //______________________________________________________________________________________________________________
 
-class OConnectionPointContainerHelper   :   public  CSS_LANG::XConnectionPointContainer
-                                        ,   public  ::cppu::OWeakObject
+class OConnectionPointContainerHelper	:	public	CSS_LANG::XConnectionPointContainer
+                                        ,	public	::cppu::OWeakObject
 {
 
 //______________________________________________________________________________________________________________
-//  public methods
+//	public methods
 //______________________________________________________________________________________________________________
 
 public:
 
     //__________________________________________________________________________________________________________
-    //  construct/destruct
+    //	construct/destruct
     //__________________________________________________________________________________________________________
 
     /**_________________________________________________________________________________________________________
@@ -101,62 +101,62 @@ public:
         @onerror
     */
 
-    virtual ~OConnectionPointContainerHelper();
+    virtual	~OConnectionPointContainerHelper();
 
     //________________________________________________________________________________________________________
-    //  XInterface
+    //	XInterface
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      give answer, if interface is supported
-        @descr      The interfaces are searched by type.
+        @short		give answer, if interface is supported
+        @descr		The interfaces are searched by type.
 
-        @seealso    XInterface
+        @seealso	XInterface
 
         @param      "rType" is the type of searched interface.
 
-        @return     Any     information about found interface
+        @return		Any		information about found interface
 
-        @onerror    A RuntimeException is thrown.
+        @onerror	A RuntimeException is thrown.
     */
 
     virtual CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType )
         throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      increment refcount
-        @descr      -
+        @short		increment refcount
+        @descr		-
 
-        @seealso    XInterface
-        @seealso    release()
+        @seealso	XInterface
+        @seealso	release()
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    A RuntimeException is thrown.
+        @onerror	A RuntimeException is thrown.
     */
 
     virtual void SAL_CALL acquire() throw();
 
     /**_______________________________________________________________________________________________________
-        @short      decrement refcount
-        @descr      -
+        @short		decrement refcount
+        @descr		-
 
-        @seealso    XInterface
-        @seealso    acquire()
+        @seealso	XInterface
+        @seealso	acquire()
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    A RuntimeException is thrown.
+        @onerror	A RuntimeException is thrown.
     */
 
     virtual void SAL_CALL release() throw();
 
     //__________________________________________________________________________________________________________
-    //  XConnectionPointContainer
+    //	XConnectionPointContainer
     //__________________________________________________________________________________________________________
 
     /**_________________________________________________________________________________________________________
@@ -206,8 +206,8 @@ public:
     */
 
     virtual void SAL_CALL advise(
-        const   CSS_UNO::Type&                              aType ,
-        const   CSS_UNO::Reference< CSS_UNO::XInterface >&  xListener
+        const	CSS_UNO::Type&                              aType ,
+        const	CSS_UNO::Reference< CSS_UNO::XInterface >&  xListener
     ) throw( CSS_UNO::RuntimeException );
 
     /**_________________________________________________________________________________________________________
@@ -224,8 +224,8 @@ public:
     */
 
     virtual void SAL_CALL unadvise(
-        const   CSS_UNO::Type&                              aType       ,
-        const   CSS_UNO::Reference< CSS_UNO::XInterface >&  xListener
+        const	CSS_UNO::Type&                              aType		,
+        const	CSS_UNO::Reference< CSS_UNO::XInterface >&  xListener
     ) throw( CSS_UNO::RuntimeException );
 
     /**_________________________________________________________________________________________________________
@@ -244,22 +244,22 @@ public:
     ::cppu::OMultiTypeInterfaceContainerHelper& impl_getMultiTypeContainer();
 
 //______________________________________________________________________________________________________________
-//  private variables
+//	private variables
 //______________________________________________________________________________________________________________
 
 private:
 
-    ::osl::Mutex&                                   m_aSharedMutex          ;
-    ::cppu::OMultiTypeInterfaceContainerHelper      m_aMultiTypeContainer   ;   // Container to hold listener
+    ::osl::Mutex&									m_aSharedMutex			;
+    ::cppu::OMultiTypeInterfaceContainerHelper		m_aMultiTypeContainer	;	// Container to hold listener
 
-};  // class OConnectionPointContainerHelper
+};	// class OConnectionPointContainerHelper
 
 // The namespace aliases are only used in this header
 #undef CSS_UNO
 #undef CSS_LANG
 
-}   // namespace unocontrols
+}	// namespace unocontrols
 
-#endif  // #ifndef _OCONNECTIONPOINTCONTAINERHELPER_HXX
+#endif	// #ifndef _OCONNECTIONPOINTCONTAINERHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/inc/OConnectionPointHelper.hxx b/UnoControls/source/inc/OConnectionPointHelper.hxx
index b36147e727cb..0f6194d90a32 100644
--- a/UnoControls/source/inc/OConnectionPointHelper.hxx
+++ b/UnoControls/source/inc/OConnectionPointHelper.hxx
@@ -30,7 +30,7 @@
 #define _OCONNECTIONPOINTHELPER_HXX
 
 //______________________________________________________________________________________________________________
-//  includes of other projects
+//	includes of other projects
 //______________________________________________________________________________________________________________
 
 #include <com/sun/star/lang/XConnectionPointContainer.hpp>
@@ -39,12 +39,12 @@
 #include <cppuhelper/propshlp.hxx>
 
 //______________________________________________________________________________________________________________
-//  includes of my own project
+//	includes of my own project
 //______________________________________________________________________________________________________________
 #include "OConnectionPointContainerHelper.hxx"
 
 //______________________________________________________________________________________________________________
-//  namespaces
+//	namespaces
 //______________________________________________________________________________________________________________
 
 namespace unocontrols{
@@ -53,25 +53,25 @@ namespace unocontrols{
 #define CSS_LANG    ::com::sun::star::lang
 
 //______________________________________________________________________________________________________________
-//  defines
+//	defines
 //______________________________________________________________________________________________________________
 
 //______________________________________________________________________________________________________________
-//  class declaration OConnectionPointHelper
+//	class declaration OConnectionPointHelper
 //______________________________________________________________________________________________________________
 
-class OConnectionPointHelper    :   public  CSS_LANG::XConnectionPoint
-                                ,   public  ::cppu::OWeakObject
+class OConnectionPointHelper	:	public	CSS_LANG::XConnectionPoint
+                                ,	public	::cppu::OWeakObject
 {
 
 //______________________________________________________________________________________________________________
-//  public methods
+//	public methods
 //______________________________________________________________________________________________________________
 
 public:
 
     //__________________________________________________________________________________________________________
-    //  construct/destruct
+    //	construct/destruct
     //__________________________________________________________________________________________________________
 
     /**_________________________________________________________________________________________________________
@@ -87,9 +87,9 @@ public:
         @onerror
     */
 
-    OConnectionPointHelper( ::osl::Mutex&                       aMutex                      ,
-                            OConnectionPointContainerHelper*    pContainerImplementation    ,
-                            CSS_UNO::Type                       aType                       );
+    OConnectionPointHelper(	::osl::Mutex&                       aMutex						,
+                            OConnectionPointContainerHelper*    pContainerImplementation	,
+                            CSS_UNO::Type                       aType						);
 
     /**_________________________________________________________________________________________________________
         @short
@@ -104,62 +104,62 @@ public:
         @onerror
     */
 
-    virtual ~OConnectionPointHelper();
+    virtual	~OConnectionPointHelper();
 
     //________________________________________________________________________________________________________
-    //  XInterface
+    //	XInterface
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      give answer, if interface is supported
-        @descr      The interfaces are searched by type.
+        @short		give answer, if interface is supported
+        @descr		The interfaces are searched by type.
 
-        @seealso    XInterface
+        @seealso	XInterface
 
         @param      "rType" is the type of searched interface.
 
-        @return     Any     information about found interface
+        @return		Any		information about found interface
 
-        @onerror    A RuntimeException is thrown.
+        @onerror	A RuntimeException is thrown.
     */
 
     virtual CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType )
         throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      increment refcount
-        @descr      -
+        @short		increment refcount
+        @descr		-
 
-        @seealso    XInterface
-        @seealso    release()
+        @seealso	XInterface
+        @seealso	release()
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    A RuntimeException is thrown.
+        @onerror	A RuntimeException is thrown.
     */
 
     virtual void SAL_CALL acquire() throw();
 
     /**_______________________________________________________________________________________________________
-        @short      decrement refcount
-        @descr      -
+        @short		decrement refcount
+        @descr		-
 
-        @seealso    XInterface
-        @seealso    acquire()
+        @seealso	XInterface
+        @seealso	acquire()
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    A RuntimeException is thrown.
+        @onerror	A RuntimeException is thrown.
     */
 
     virtual void SAL_CALL release() throw();
 
     //__________________________________________________________________________________________________________
-    //  XConnectionPoint
+    //	XConnectionPoint
     //__________________________________________________________________________________________________________
 
     /**_________________________________________________________________________________________________________
@@ -248,7 +248,7 @@ public:
         throw( CSS_UNO::RuntimeException );
 
 //______________________________________________________________________________________________________________
-//  private methods
+//	private methods
 //______________________________________________________________________________________________________________
 
 private:
@@ -284,26 +284,26 @@ private:
     void impl_UnlockContainer();
 
 //______________________________________________________________________________________________________________
-//  private variables
+//	private variables
 //______________________________________________________________________________________________________________
 
 private:
 
-    ::osl::Mutex&                                                   m_aSharedMutex              ;
-    CSS_UNO::WeakReference< CSS_LANG::XConnectionPointContainer >   m_oContainerWeakReference   ;   // Reference to container-class!. Don't use Reference<...>
+    ::osl::Mutex&                                                   m_aSharedMutex				;
+    CSS_UNO::WeakReference< CSS_LANG::XConnectionPointContainer >   m_oContainerWeakReference	;	// Reference to container-class!. Don't use Reference<...>
                                                                                             // It is a ring-reference => and must be a wekreference!
-    OConnectionPointContainerHelper*                                m_pContainerImplementation  ;
-    CSS_UNO::Type                                                   m_aInterfaceType            ;
-    CSS_UNO::Reference< CSS_UNO::XInterface >                       m_xLock                     ;
+    OConnectionPointContainerHelper*                                m_pContainerImplementation	;
+    CSS_UNO::Type                                                   m_aInterfaceType			;
+    CSS_UNO::Reference< CSS_UNO::XInterface >                       m_xLock						;
 
-};  // class OConnectionPointHelper
+};	// class OConnectionPointHelper
 
 // The namespace aliases are only used in this header
 #undef CSS_UNO
 #undef CSS_LANG
 
-}   // namespace unocontrols
+}	// namespace unocontrols
 
-#endif  // #ifndef _OCONNECTIONPOINTHELPER_HXX
+#endif	// #ifndef _OCONNECTIONPOINTHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/inc/framecontrol.hxx b/UnoControls/source/inc/framecontrol.hxx
index 5d068ad0cfa1..33263dfcb80f 100644
--- a/UnoControls/source/inc/framecontrol.hxx
+++ b/UnoControls/source/inc/framecontrol.hxx
@@ -30,7 +30,7 @@
 #define _UNOCONTROLS_FRAMECONTROL_CTRL_HXX
 
 //______________________________________________________________________________________________________________
-//  includes of other projects
+//	includes of other projects
 //______________________________________________________________________________________________________________
 
 #include <com/sun/star/frame/XFrameActionListener.hpp>
@@ -44,13 +44,13 @@
 #include <cppuhelper/propshlp.hxx>
 
 //______________________________________________________________________________________________________________
-//  includes of my own project
+//	includes of my own project
 //______________________________________________________________________________________________________________
 #include "basecontrol.hxx"
 #include "OConnectionPointContainerHelper.hxx"
 
 //______________________________________________________________________________________________________________
-//  namespaces
+//	namespaces
 //______________________________________________________________________________________________________________
 
 namespace unocontrols{
@@ -62,39 +62,39 @@ namespace unocontrols{
 #define CSS_FRAME   ::com::sun::star::frame
 
 //______________________________________________________________________________________________________________
-//  defines
+//	defines
 //______________________________________________________________________________________________________________
 
-#define SERVICENAME_FRAMECONTROL                        "com.sun.star.frame.FrameControl"
-#define IMPLEMENTATIONNAME_FRAMECONTROL                 "stardiv.UnoControls.FrameControl"
-#define PROPERTYNAME_LOADERARGUMENTS                    "LoaderArguments"
-#define PROPERTYNAME_COMPONENTURL                       "ComponentURL"
-#define PROPERTYNAME_FRAME                              "Frame"
-#define ERRORTEXT_VOSENSHURE                            "This is an invalid property handle."
-#define PROPERTY_COUNT                                  3                                                       // you must count the propertys
-#define PROPERTYHANDLE_COMPONENTURL                     0                                                       // Id must be the index into the array
-#define PROPERTYHANDLE_FRAME                            1
-#define PROPERTYHANDLE_LOADERARGUMENTS                  2
+#define	SERVICENAME_FRAMECONTROL						"com.sun.star.frame.FrameControl"
+#define	IMPLEMENTATIONNAME_FRAMECONTROL					"stardiv.UnoControls.FrameControl"
+#define	PROPERTYNAME_LOADERARGUMENTS					"LoaderArguments"
+#define	PROPERTYNAME_COMPONENTURL						"ComponentURL"
+#define	PROPERTYNAME_FRAME								"Frame"
+#define	ERRORTEXT_VOSENSHURE							"This is an invalid property handle."
+#define PROPERTY_COUNT									3                                       				// you must count the propertys
+#define PROPERTYHANDLE_COMPONENTURL						0														// Id must be the index into the array
+#define PROPERTYHANDLE_FRAME							1
+#define PROPERTYHANDLE_LOADERARGUMENTS					2
 
 //______________________________________________________________________________________________________________
-//  class
+//	class
 //______________________________________________________________________________________________________________
 
-class FrameControl  : public CSS_AWT::XControlModel
+class FrameControl	: public CSS_AWT::XControlModel
                     , public CSS_LANG::XConnectionPointContainer
-                    , public BaseControl                                // This order is neccessary for right initialization of m_aMutex!
+                    , public BaseControl								// This order is neccessary for right initialization of m_aMutex!
                     , public ::cppu::OBroadcastHelper
                     , public ::cppu::OPropertySetHelper
 {
 
 //______________________________________________________________________________________________________________
-//  public methods
+//	public methods
 //______________________________________________________________________________________________________________
 
 public:
 
     //__________________________________________________________________________________________________________
-    //  construct/destruct
+    //	construct/destruct
     //__________________________________________________________________________________________________________
 
     /**_________________________________________________________________________________________________________
@@ -125,10 +125,10 @@ public:
         @onerror
     */
 
-    virtual ~FrameControl();
+    virtual	~FrameControl();
 
     //__________________________________________________________________________________________________________
-    //  XInterface
+    //	XInterface
     //__________________________________________________________________________________________________________
 
     /**_________________________________________________________________________________________________________
@@ -149,39 +149,39 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      increment refcount
-        @descr      -
+        @short		increment refcount
+        @descr		-
 
-        @seealso    XInterface
-        @seealso    release()
+        @seealso	XInterface
+        @seealso	release()
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    A RuntimeException is thrown.
+        @onerror	A RuntimeException is thrown.
     */
 
     virtual void SAL_CALL acquire() throw();
 
     /**_______________________________________________________________________________________________________
-        @short      decrement refcount
-        @descr      -
+        @short		decrement refcount
+        @descr		-
 
-        @seealso    XInterface
-        @seealso    acquire()
+        @seealso	XInterface
+        @seealso	acquire()
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    A RuntimeException is thrown.
+        @onerror	A RuntimeException is thrown.
     */
 
     virtual void SAL_CALL release() throw();
 
     //__________________________________________________________________________________________________________
-    //  XTypeProvider
+    //	XTypeProvider
     //__________________________________________________________________________________________________________
 
     /**_________________________________________________________________________________________________________
@@ -201,7 +201,7 @@ public:
         throw( CSS_UNO::RuntimeException );
 
     //__________________________________________________________________________________________________________
-    //  XAggregation
+    //	XAggregation
     //__________________________________________________________________________________________________________
 
     /**_________________________________________________________________________________________________________
@@ -222,7 +222,7 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     //__________________________________________________________________________________________________________
-    //  XControl
+    //	XControl
     //__________________________________________________________________________________________________________
 
     /**_________________________________________________________________________________________________________
@@ -277,7 +277,7 @@ public:
         throw( CSS_UNO::RuntimeException );
 
     //__________________________________________________________________________________________________________
-    //  XComponent
+    //	XComponent
     //__________________________________________________________________________________________________________
 
     /**_________________________________________________________________________________________________________
@@ -296,7 +296,7 @@ public:
     virtual void SAL_CALL dispose() throw( CSS_UNO::RuntimeException );
 
     //__________________________________________________________________________________________________________
-    //  XView
+    //	XView
     //__________________________________________________________________________________________________________
 
     /**_________________________________________________________________________________________________________
@@ -333,7 +333,7 @@ public:
         throw( CSS_UNO::RuntimeException );
 
     //__________________________________________________________________________________________________________
-    //  XConnectionPointContainer
+    //	XConnectionPointContainer
     //__________________________________________________________________________________________________________
 
     /**_________________________________________________________________________________________________________
@@ -383,7 +383,7 @@ public:
     */
 
     virtual void SAL_CALL advise(
-        const CSS_UNO::Type&                                aType       ,
+        const CSS_UNO::Type&                                aType		,
         const CSS_UNO::Reference< CSS_UNO::XInterface >&    xListener
     ) throw( CSS_UNO::RuntimeException );
 
@@ -406,7 +406,7 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     //__________________________________________________________________________________________________________
-    //  impl but public methods to register service!
+    //	impl but public methods to register service!
     //__________________________________________________________________________________________________________
 
     /**_________________________________________________________________________________________________________
@@ -440,13 +440,13 @@ public:
     static const ::rtl::OUString impl_getStaticImplementationName();
 
 //______________________________________________________________________________________________________________
-//  protected methods
+//	protected methods
 //______________________________________________________________________________________________________________
 
 protected:
     using OPropertySetHelper::getFastPropertyValue;
     //__________________________________________________________________________________________________________
-    //  OPropertySetHelper
+    //	OPropertySetHelper
     //__________________________________________________________________________________________________________
 
     /**_________________________________________________________________________________________________________
@@ -484,7 +484,7 @@ protected:
 
     virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
         sal_Int32 nHandle ,
-        const CSS_UNO::Any& rValue
+        const CSS_UNO::Any&	rValue
     ) throw ( ::com::sun::star::uno::Exception );
 
     /**_________________________________________________________________________________________________________
@@ -500,8 +500,8 @@ protected:
         @onerror
     */
 
-    virtual void SAL_CALL getFastPropertyValue( CSS_UNO::Any&   rValue  ,
-                                                sal_Int32       nHandle ) const ;
+    virtual void SAL_CALL getFastPropertyValue(	CSS_UNO::Any&   rValue	,
+                                                sal_Int32       nHandle	) const ;
 
     /**_________________________________________________________________________________________________________
         @short
@@ -519,7 +519,7 @@ protected:
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
 
     //__________________________________________________________________________________________________________
-    //  XPropertySet
+    //	XPropertySet
     //__________________________________________________________________________________________________________
 
     /**_________________________________________________________________________________________________________
@@ -539,7 +539,7 @@ protected:
         throw( CSS_UNO::RuntimeException );
 
     //__________________________________________________________________________________________________________
-    //  BaseControl
+    //	BaseControl
     //__________________________________________________________________________________________________________
 
     /**_________________________________________________________________________________________________________
@@ -560,7 +560,7 @@ protected:
     );
 
 //______________________________________________________________________________________________________________
-//  private methods
+//	private methods
 //______________________________________________________________________________________________________________
 
 private:
@@ -578,9 +578,9 @@ private:
         @onerror
     */
 
-    void impl_createFrame(  const CSS_UNO::Reference< CSS_AWT::XWindowPeer >&       xPeer           ,
-                            const ::rtl::OUString&                                  sURL            ,
-                            const CSS_UNO::Sequence< CSS_BEANS::PropertyValue >&    seqArguments    );
+    void impl_createFrame(	const CSS_UNO::Reference< CSS_AWT::XWindowPeer >&       xPeer			,
+                            const ::rtl::OUString&                                  sURL			,
+                            const CSS_UNO::Sequence< CSS_BEANS::PropertyValue >&    seqArguments	);
 
     /**_________________________________________________________________________________________________________
         @short
@@ -614,18 +614,18 @@ private:
 
 
 //______________________________________________________________________________________________________________
-//  private variables
+//	private variables
 //______________________________________________________________________________________________________________
 
 private:
 
-    CSS_UNO::Reference< CSS_FRAME::XFrame >         m_xFrame                    ;
-    ::rtl::OUString                                 m_sComponentURL             ;
-    CSS_UNO::Sequence< CSS_BEANS::PropertyValue >   m_seqLoaderArguments        ;
-    ::cppu::OMultiTypeInterfaceContainerHelper      m_aInterfaceContainer       ;
-    OConnectionPointContainerHelper                 m_aConnectionPointContainer ;
+    CSS_UNO::Reference< CSS_FRAME::XFrame >         m_xFrame					;
+    ::rtl::OUString                                 m_sComponentURL				;
+    CSS_UNO::Sequence< CSS_BEANS::PropertyValue >   m_seqLoaderArguments		;
+    ::cppu::OMultiTypeInterfaceContainerHelper      m_aInterfaceContainer		;
+    OConnectionPointContainerHelper                 m_aConnectionPointContainer	;
 
-};  // class FrameControl
+};	// class FrameControl
 
 // The namespace alaises are only used in the header
 #undef CSS_UNO
@@ -634,8 +634,8 @@ private:
 #undef CSS_AWT
 #undef CSS_FRAME
 
-}   // namespace unocontrols
+}	// namespace unocontrols
 
-#endif  // #ifndef _UNOCONTROLS_FRAMECONTROL_CTRL_HXX
+#endif	// #ifndef _UNOCONTROLS_FRAMECONTROL_CTRL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/inc/progressbar.hxx b/UnoControls/source/inc/progressbar.hxx
index 97cad21816dd..53ed3b73d575 100644
--- a/UnoControls/source/inc/progressbar.hxx
+++ b/UnoControls/source/inc/progressbar.hxx
@@ -30,19 +30,19 @@
 #define _UNOCONTROLS_PROGRESSBAR_CTRL_HXX
 
 //____________________________________________________________________________________________________________
-//  includes of other projects
+//	includes of other projects
 //____________________________________________________________________________________________________________
 
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 //____________________________________________________________________________________________________________
-//  includes of my own project
+//	includes of my own project
 //____________________________________________________________________________________________________________
 #include "basecontrol.hxx"
 
 //____________________________________________________________________________________________________________
-//  namespaces
+//	namespaces
 //____________________________________________________________________________________________________________
 
 namespace unocontrols{
@@ -52,40 +52,40 @@ namespace unocontrols{
 #define CSS_AWT     ::com::sun::star::awt
 
 //____________________________________________________________________________________________________________
-//  defines
+//	defines
 //____________________________________________________________________________________________________________
 
-#define SERVICENAME_PROGRESSBAR             "com.sun.star.awt.XProgressBar"
-#define IMPLEMENTATIONNAME_PROGRESSBAR      "stardiv.UnoControls.ProgressBar"
+#define	SERVICENAME_PROGRESSBAR				"com.sun.star.awt.XProgressBar"
+#define	IMPLEMENTATIONNAME_PROGRESSBAR		"stardiv.UnoControls.ProgressBar"
 #define PROGRESSBAR_FREESPACE               4
 #define PROGRESSBAR_DEFAULT_HORIZONTAL      sal_True
 #define PROGRESSBAR_DEFAULT_BLOCKDIMENSION  Size(1,1)
-#define PROGRESSBAR_DEFAULT_BACKGROUNDCOLOR TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 )    // lightgray
-#define PROGRESSBAR_DEFAULT_FOREGROUNDCOLOR TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x80 )    // blue
+#define	PROGRESSBAR_DEFAULT_BACKGROUNDCOLOR TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 )	// lightgray
+#define	PROGRESSBAR_DEFAULT_FOREGROUNDCOLOR TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x80 )	// blue
 #define PROGRESSBAR_DEFAULT_MINRANGE        INT_MIN
 #define PROGRESSBAR_DEFAULT_MAXRANGE        INT_MAX
 #define PROGRESSBAR_DEFAULT_BLOCKVALUE      1
 #define PROGRESSBAR_DEFAULT_VALUE           PROGRESSBAR_DEFAULT_MINRANGE
-#define PROGRESSBAR_LINECOLOR_BRIGHT        TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF )    // white
-#define PROGRESSBAR_LINECOLOR_SHADOW        TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 )    // black
+#define	PROGRESSBAR_LINECOLOR_BRIGHT        TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF )	// white
+#define PROGRESSBAR_LINECOLOR_SHADOW        TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 )	// black
 
 //____________________________________________________________________________________________________________
-//  classes
+//	classes
 //____________________________________________________________________________________________________________
 
-class ProgressBar   : public CSS_AWT::XControlModel
+class ProgressBar	: public CSS_AWT::XControlModel
                     , public CSS_AWT::XProgressBar
                     , public BaseControl
 {
 
 //____________________________________________________________________________________________________________
-//  public methods
+//	public methods
 //____________________________________________________________________________________________________________
 
 public:
 
     //________________________________________________________________________________________________________
-    //  construct/destruct
+    //	construct/destruct
     //________________________________________________________________________________________________________
 
     /**_________________________________________________________________________________________________________
@@ -116,10 +116,10 @@ public:
         @onerror
     */
 
-    virtual ~ProgressBar();
+    virtual	~ProgressBar();
 
     //__________________________________________________________________________________________________________
-    //  XInterface
+    //	XInterface
     //__________________________________________________________________________________________________________
 
     /**_________________________________________________________________________________________________________
@@ -139,39 +139,39 @@ public:
         throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      increment refcount
-        @descr      -
+        @short		increment refcount
+        @descr		-
 
-        @seealso    XInterface
-        @seealso    release()
+        @seealso	XInterface
+        @seealso	release()
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    A RuntimeException is thrown.
+        @onerror	A RuntimeException is thrown.
     */
 
     virtual void SAL_CALL acquire() throw();
 
     /**_______________________________________________________________________________________________________
-        @short      decrement refcount
-        @descr      -
+        @short		decrement refcount
+        @descr		-
 
-        @seealso    XInterface
-        @seealso    acquire()
+        @seealso	XInterface
+        @seealso	acquire()
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    A RuntimeException is thrown.
+        @onerror	A RuntimeException is thrown.
     */
 
     virtual void SAL_CALL release() throw();
 
     //__________________________________________________________________________________________________________
-    //  XTypeProvider
+    //	XTypeProvider
     //__________________________________________________________________________________________________________
 
     /**_________________________________________________________________________________________________________
@@ -191,7 +191,7 @@ public:
         throw( CSS_UNO::RuntimeException );
 
     //__________________________________________________________________________________________________________
-    //  XAggregation
+    //	XAggregation
     //__________________________________________________________________________________________________________
 
     /**_________________________________________________________________________________________________________
@@ -211,7 +211,7 @@ public:
         throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
-    //  XProgressBar
+    //	XProgressBar
     //________________________________________________________________________________________________________
 
     /**_________________________________________________________________________________________________________
@@ -275,8 +275,8 @@ public:
     */
 
     virtual void SAL_CALL setRange(
-        sal_Int32   nMin    ,
-        sal_Int32   nMax
+        sal_Int32	nMin	,
+        sal_Int32	nMax
     ) throw( CSS_UNO::RuntimeException );
 
     /**_________________________________________________________________________________________________________
@@ -295,7 +295,7 @@ public:
     virtual sal_Int32 SAL_CALL getValue() throw( CSS_UNO::RuntimeException );
 
     //__________________________________________________________________________________________________________
-    //  XWindow
+    //	XWindow
     //__________________________________________________________________________________________________________
 
     /**_________________________________________________________________________________________________________
@@ -312,15 +312,15 @@ public:
     */
 
     virtual void SAL_CALL setPosSize(
-        sal_Int32   nX      ,
-        sal_Int32   nY      ,
-        sal_Int32   nWidth  ,
-        sal_Int32   nHeight ,
-        sal_Int16   nFlags
+        sal_Int32	nX		,
+        sal_Int32	nY		,
+        sal_Int32	nWidth	,
+        sal_Int32	nHeight	,
+        sal_Int16	nFlags
     ) throw( CSS_UNO::RuntimeException );
 
     //__________________________________________________________________________________________________________
-    //  XControl
+    //	XControl
     //__________________________________________________________________________________________________________
 
     /**_________________________________________________________________________________________________________
@@ -357,7 +357,7 @@ public:
         throw( CSS_UNO::RuntimeException );
 
     //__________________________________________________________________________________________________________
-    //  BaseControl
+    //	BaseControl
     //__________________________________________________________________________________________________________
 
     /**_________________________________________________________________________________________________________
@@ -391,7 +391,7 @@ public:
     static const ::rtl::OUString impl_getStaticImplementationName();
 
 //____________________________________________________________________________________________________________
-//  protected methods
+//	protected methods
 //____________________________________________________________________________________________________________
 
 protected:
@@ -412,7 +412,7 @@ protected:
     virtual void impl_paint(
         sal_Int32 nX ,
         sal_Int32 nY ,
-        const CSS_UNO::Reference< CSS_AWT::XGraphics >& xGraphics
+        const CSS_UNO::Reference< CSS_AWT::XGraphics >&	xGraphics
     );
 
     /**_________________________________________________________________________________________________________
@@ -431,29 +431,29 @@ protected:
     void impl_recalcRange();
 
 //____________________________________________________________________________________________________________
-//  private variables
+//	private variables
 //____________________________________________________________________________________________________________
 
 private:
 
-    sal_Bool        m_bHorizontal       ;   // orientation for steps            [true=horizontal/false=vertikal]
-    CSS_AWT::Size   m_aBlockSize        ;   // width and height of a block      [>=0,0]
-    sal_Int32       m_nForegroundColor  ;   //                                  (alpha,r,g,b)
-    sal_Int32       m_nBackgroundColor  ;   //                                  (alpha,r,g,b)
-    sal_Int32       m_nMinRange         ;   // lowest value  =   0%             [long, <_nMaxRange]
-    sal_Int32       m_nMaxRange         ;   // highest value = 100%             [long, >_nMinRange]
+    sal_Bool        m_bHorizontal	 	;	// orientation for steps			[true=horizontal/false=vertikal]
+    CSS_AWT::Size   m_aBlockSize	 	;	// width and height of a block		[>=0,0]
+    sal_Int32       m_nForegroundColor	;	//									(alpha,r,g,b)
+    sal_Int32       m_nBackgroundColor	;	//									(alpha,r,g,b)
+    sal_Int32       m_nMinRange			;	// lowest value  =   0%				[long, <_nMaxRange]
+    sal_Int32       m_nMaxRange			;	// highest value = 100%				[long, >_nMinRange]
     double          m_nBlockValue       ;   // value for one block              [long, >0]
-    sal_Int32       m_nValue            ;   // value for progress               [long]
+    sal_Int32       m_nValue			;	// value for progress				[long]
 
-};  // class ProgressBar
+};	// class ProgressBar
 
 // The namespace aliases are only used in the header
 #undef CSS_UNO
 #undef CSS_LANG
 #undef CSS_AWT
 
-}   // namespace unocontrols
+}	// namespace unocontrols
 
-#endif  // #ifndef _UNOCONTROLS_PROGRESSBAR_CTRL_HXX
+#endif	// #ifndef _UNOCONTROLS_PROGRESSBAR_CTRL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx
index 08353d11f4a0..db16f3c2722c 100644
--- a/UnoControls/source/inc/progressmonitor.hxx
+++ b/UnoControls/source/inc/progressmonitor.hxx
@@ -30,7 +30,7 @@
 #define _UNOCONTROLS_PROGRESSMONITOR_CTRL_HXX
 
 //____________________________________________________________________________________________________________
-//  includes of other projects
+//	includes of other projects
 //____________________________________________________________________________________________________________
 
 #include <com/sun/star/awt/XFileDialog.hpp>
@@ -73,12 +73,12 @@
 #include <com/sun/star/awt/XProgressBar.hpp>
 
 //____________________________________________________________________________________________________________
-//  includes of my own project
+//	includes of my own project
 //____________________________________________________________________________________________________________
 #include "basecontainercontrol.hxx"
 
 //____________________________________________________________________________________________________________
-//  namespace
+//	namespace
 //____________________________________________________________________________________________________________
 
 namespace unocontrols{
@@ -88,37 +88,37 @@ namespace unocontrols{
 #define CSS_LANG    ::com::sun::star::lang
 
 //____________________________________________________________________________________________________________
-//  defines
+//	defines
 //____________________________________________________________________________________________________________
 
-#define SERVICENAME_PROGRESSMONITOR                     "com.sun.star.awt.XProgressMonitor"
-#define IMPLEMENTATIONNAME_PROGRESSMONITOR              "stardiv.UnoControls.ProgressMonitor"
-#define PROGRESSMONITOR_FREEBORDER                      10                                                      // border around and between the controls
-#define FIXEDTEXT_SERVICENAME                           "com.sun.star.awt.UnoControlFixedText"
-#define BUTTON_SERVICENAME                              "com.sun.star.awt.UnoControlButton"
-#define FIXEDTEXT_MODELNAME                             "com.sun.star.awt.UnoControlFixedTextModel"
-#define BUTTON_MODELNAME                                "com.sun.star.awt.UnoControlButtonModel"
-#define CONTROLNAME_TEXT                                "Text"                                                  // identifier the control in container
-#define CONTROLNAME_BUTTON                              "Button"                                                //              -||-
-#define CONTROLNAME_PROGRESSBAR                         "ProgressBar"                                           //              -||-
-#define DEFAULT_BUTTONLABEL                             "Abbrechen"
-#define PROGRESSMONITOR_DEFAULT_TOPIC                   "\0"
-#define PROGRESSMONITOR_DEFAULT_TEXT                    "\0"
-#define PROGRESSMONITOR_BACKGROUNDCOLOR                 TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 )                // lighgray
-#define PROGRESSMONITOR_LINECOLOR_BRIGHT                TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF )                // white
-#define PROGRESSMONITOR_LINECOLOR_SHADOW                TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 )                // black
+#define	SERVICENAME_PROGRESSMONITOR						"com.sun.star.awt.XProgressMonitor"
+#define	IMPLEMENTATIONNAME_PROGRESSMONITOR				"stardiv.UnoControls.ProgressMonitor"
+#define PROGRESSMONITOR_FREEBORDER                      10														// border around and between the controls
+#define FIXEDTEXT_SERVICENAME							"com.sun.star.awt.UnoControlFixedText"
+#define BUTTON_SERVICENAME								"com.sun.star.awt.UnoControlButton"
+#define	FIXEDTEXT_MODELNAME								"com.sun.star.awt.UnoControlFixedTextModel"
+#define	BUTTON_MODELNAME								"com.sun.star.awt.UnoControlButtonModel"
+#define	CONTROLNAME_TEXT								"Text"													// identifier the control in container
+#define	CONTROLNAME_BUTTON								"Button"												//  			-||-
+#define	CONTROLNAME_PROGRESSBAR							"ProgressBar"											//  			-||-
+#define	DEFAULT_BUTTONLABEL								"Abbrechen"
+#define	PROGRESSMONITOR_DEFAULT_TOPIC                   "\0"
+#define	PROGRESSMONITOR_DEFAULT_TEXT                    "\0"
+#define	PROGRESSMONITOR_BACKGROUNDCOLOR					TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 )				// lighgray
+#define	PROGRESSMONITOR_LINECOLOR_BRIGHT                TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF )				// white
+#define	PROGRESSMONITOR_LINECOLOR_SHADOW                TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 )				// black
 #define PROGRESSMONITOR_DEFAULT_WIDTH                   350
 #define PROGRESSMONITOR_DEFAULT_HEIGHT                  100
 
 //____________________________________________________________________________________________________________
-//  structs, types
+//	structs, types
 //____________________________________________________________________________________________________________
 
-/// Item of TextList
+///	Item of TextList
 struct IMPL_TextlistItem
 {
-    ::rtl::OUString sTopic  ;   /// Left site of textline in dialog
-    ::rtl::OUString sText   ;   /// Right site of textline in dialog
+    ::rtl::OUString	sTopic	;	/// Left site of textline in dialog
+    ::rtl::OUString	sText	;	/// Right site of textline in dialog
 };
 
 /// Define a list-class for struct IMPL_TextlistItem
@@ -126,23 +126,23 @@ class IMPL_Textlist ;
 DECLARE_LIST( IMPL_Textlist, IMPL_TextlistItem* )
 
 //____________________________________________________________________________________________________________
-//  class declaration
+//	class declaration
 //____________________________________________________________________________________________________________
 
-class ProgressMonitor   : public CSS_AWT::XLayoutConstrains
+class ProgressMonitor	: public CSS_AWT::XLayoutConstrains
                         , public CSS_AWT::XButton
                         , public CSS_AWT::XProgressMonitor
                         , public BaseContainerControl
 {
 
 //____________________________________________________________________________________________________________
-//  public methods
+//	public methods
 //____________________________________________________________________________________________________________
 
 public:
 
     //________________________________________________________________________________________________________
-    //  construct/destruct
+    //	construct/destruct
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
@@ -173,121 +173,121 @@ public:
         @onerror
     */
 
-    virtual ~ProgressMonitor();
+    virtual	~ProgressMonitor();
 
     //________________________________________________________________________________________________________
-    //  XInterface
+    //	XInterface
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      give answer, if interface is supported
-        @descr      The interfaces are searched by type.
+        @short		give answer, if interface is supported
+        @descr		The interfaces are searched by type.
 
-        @seealso    XInterface
+        @seealso	XInterface
 
         @param      "rType" is the type of searched interface.
 
-        @return     Any     information about found interface
+        @return		Any		information about found interface
 
-        @onerror    A RuntimeException is thrown.
+        @onerror	A RuntimeException is thrown.
     */
 
     virtual CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType )
         throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      increment refcount
-        @descr      -
+        @short		increment refcount
+        @descr		-
 
-        @seealso    XInterface
-        @seealso    release()
+        @seealso	XInterface
+        @seealso	release()
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    A RuntimeException is thrown.
+        @onerror	A RuntimeException is thrown.
     */
 
     virtual void SAL_CALL acquire() throw();
 
     /**_______________________________________________________________________________________________________
-        @short      decrement refcount
-        @descr      -
+        @short		decrement refcount
+        @descr		-
 
-        @seealso    XInterface
-        @seealso    acquire()
+        @seealso	XInterface
+        @seealso	acquire()
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    A RuntimeException is thrown.
+        @onerror	A RuntimeException is thrown.
     */
 
     virtual void SAL_CALL release() throw();
 
     //________________________________________________________________________________________________________
-    //  XTypeProvider
+    //	XTypeProvider
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      get information about supported interfaces
+        @short		get information about supported interfaces
         @descr      -
 
-        @seealso    XTypeProvider
+        @seealso	XTypeProvider
 
         @param      -
 
-        @return     Sequence of types of all supported interfaces
+        @return		Sequence of types of all supported interfaces
 
-        @onerror    A RuntimeException is thrown.
+        @onerror	A RuntimeException is thrown.
     */
 
     virtual CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getTypes() throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
-    //  XAggregation
+    //	XAggregation
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual CSS_UNO::Any SAL_CALL queryAggregation( const CSS_UNO::Type& aType )
         throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
-    //  XProgressMonitor
+    //	XProgressMonitor
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      add topic to dialog
-        @descr      Add a topic with a text in right textlist (used for FixedText-member).<BR>
+        @short		add topic to dialog
+        @descr		Add a topic with a text in right textlist (used for FixedText-member).<BR>
                     ( "beforeProgress" fix the right list ). The dialog metric is recalculated.
 
-        @seealso    removeText(), updateText()
+        @seealso	removeText(), updateText()
 
-        @param      sTopic              Name of topic<BR>
+        @param		sTopic				Name of topic<BR>
                                          [sTopic != "" && sTopic != NULL]
-        @param      sText               Value of topic<BR>
+        @param		sText				Value of topic<BR>
                                          [sText != "" && sText != NULL]
-        @param      bbeforeProgress     Position of topic<BR>
+        @param		bbeforeProgress		Position of topic<BR>
                                          [True => before progressbar / False => below progressbar]
 
-        @return     -
+        @return		-
 
-        @onerror    DEBUG   = Assertion<BR>
-                    RELEASE = nothing
+        @onerror	DEBUG	= Assertion<BR>
+                    RELEASE	= nothing
     */
 
     virtual void SAL_CALL addText(
@@ -297,16 +297,16 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL removeText(
@@ -315,119 +315,119 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL updateText(
-        const ::rtl::OUString&  sTopic ,
-        const ::rtl::OUString&  sText ,
+        const ::rtl::OUString&	sTopic ,
+        const ::rtl::OUString&	sText ,
         sal_Bool bbeforeProgress
     ) throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
-    //  XProgressBar
+    //	XProgressBar
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
-    virtual void SAL_CALL setRange( sal_Int32   nMin    ,
-                                    sal_Int32   nMax    ) throw( CSS_UNO::RuntimeException );
+    virtual void SAL_CALL setRange(	sal_Int32	nMin	,
+                                    sal_Int32	nMax	) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual sal_Int32 SAL_CALL getValue() throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
-    //  XButton
+    //	XButton
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL addActionListener(
@@ -435,16 +435,16 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL removeActionListener(
@@ -452,101 +452,101 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL setLabel( const ::rtl::OUString& sLabel ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
-    virtual void SAL_CALL setActionCommand( const ::rtl::OUString& sCommand )
+    virtual	void SAL_CALL setActionCommand( const ::rtl::OUString& sCommand )
         throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
-    //  XLayoutConstrains
+    // 	XLayoutConstrains
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual CSS_AWT::Size SAL_CALL getMinimumSize() throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual CSS_AWT::Size SAL_CALL getPreferredSize() throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual CSS_AWT::Size SAL_CALL calcAdjustedSize( const CSS_AWT::Size& aNewSize )
         throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
-    //  XControl
+    //	XControl
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL createPeer(
@@ -555,130 +555,130 @@ public:
     ) throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual sal_Bool SAL_CALL setModel( const CSS_UNO::Reference< CSS_AWT::XControlModel >& xModel )
         throw( CSS_UNO::RuntimeException );
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual CSS_UNO::Reference< CSS_AWT::XControlModel > SAL_CALL getModel()
         throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
-    //  XComponent
+    //	XComponent
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void SAL_CALL dispose() throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
-    //  XWindow
+    //	XWindow
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
-    virtual void SAL_CALL setPosSize(   sal_Int32   nX      ,
-                                        sal_Int32   nY      ,
-                                        sal_Int32   nWidth  ,
-                                        sal_Int32   nHeight ,
-                                        sal_Int16   nFlags  ) throw( CSS_UNO::RuntimeException );
+    virtual void SAL_CALL setPosSize(	sal_Int32	nX		,
+                                        sal_Int32	nY		,
+                                        sal_Int32	nWidth	,
+                                        sal_Int32	nHeight	,
+                                        sal_Int16	nFlags	) throw( CSS_UNO::RuntimeException );
 
     //________________________________________________________________________________________________________
-    //  BaseControl
+    //	BaseControl
     //________________________________________________________________________________________________________
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     static const CSS_UNO::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames();
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     static const ::rtl::OUString impl_getStaticImplementationName();
 
 //____________________________________________________________________________________________________________
-//  protected methods
+//	protected methods
 //____________________________________________________________________________________________________________
 
 protected:
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     virtual void impl_paint( sal_Int32 nX ,
@@ -692,64 +692,64 @@ protected:
 private:
     using BaseControl::impl_recalcLayout;
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     void impl_recalcLayout();
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     void impl_rebuildFixedText();
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     void impl_cleanMemory();
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
-    IMPL_TextlistItem* impl_searchTopic( const ::rtl::OUString& sTopic , sal_Bool bbeforeProgress );
+    IMPL_TextlistItem* impl_searchTopic( const ::rtl::OUString&	sTopic , sal_Bool bbeforeProgress );
 
 //____________________________________________________________________________________________________________
 // debug methods
@@ -758,22 +758,22 @@ private:
 private:
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
     #ifdef DBG_UTIL
 
-    sal_Bool impl_debug_checkParameter( const ::rtl::OUString& sTopic, const ::rtl::OUString& sText, sal_Bool bbeforeProgress );    // addText, updateText
-    sal_Bool impl_debug_checkParameter( const ::rtl::OUString& rTopic, sal_Bool bbeforeProgress );                              // removeText
+    sal_Bool impl_debug_checkParameter( const ::rtl::OUString& sTopic, const ::rtl::OUString& sText, sal_Bool bbeforeProgress );	// addText, updateText
+    sal_Bool impl_debug_checkParameter( const ::rtl::OUString& rTopic, sal_Bool bbeforeProgress );								// removeText
 
     #endif
 //____________________________________________________________________________________________________________
@@ -782,27 +782,27 @@ private:
 
 private:
 
-    IMPL_Textlist*                              m_pTextlist_Top     ;   // Elements before progress
-    CSS_UNO::Reference< CSS_AWT::XFixedText >   m_xTopic_Top        ;   // (used, if parameter "beforeProgress"=sal_True in "addText, updateText, removeText")
+    IMPL_Textlist*                              m_pTextlist_Top     ;	// Elements before progress
+    CSS_UNO::Reference< CSS_AWT::XFixedText >   m_xTopic_Top        ;	// (used, if parameter "beforeProgress"=sal_True in "addText, updateText, removeText")
     CSS_UNO::Reference< CSS_AWT::XFixedText >   m_xText_Top         ;
 
-    IMPL_Textlist*                              m_pTextlist_Bottom  ;   // Elements below of progress
-    CSS_UNO::Reference< CSS_AWT::XFixedText >   m_xTopic_Bottom     ;   // (used, if parameter "beforeProgress"=sal_False in "addText, updateText, removeText")
+    IMPL_Textlist*                              m_pTextlist_Bottom  ;	// Elements below of progress
+    CSS_UNO::Reference< CSS_AWT::XFixedText >   m_xTopic_Bottom     ;	// (used, if parameter "beforeProgress"=sal_False in "addText, updateText, removeText")
     CSS_UNO::Reference< CSS_AWT::XFixedText >   m_xText_Bottom      ;
 
     CSS_UNO::Reference< CSS_AWT::XProgressBar > m_xProgressBar      ;
     CSS_UNO::Reference< CSS_AWT::XButton >      m_xButton           ;
     CSS_AWT::Rectangle                          m_a3DLine           ;
 
-};  // class ProgressMonitor
+};	// class ProgressMonitor
 
 // The namespaces aliases are only used the this header
 #undef CSS_UNO
 #undef CSS_AWT
 #undef CSS_LANG
 
-}   // namespace unocontrols
+}	// namespace unocontrols
 
-#endif  // #ifndef _UNOCONTROLS_PROGRESSMONITOR_CTRL_HXX
+#endif	// #ifndef _UNOCONTROLS_PROGRESSMONITOR_CTRL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/inc/statusindicator.hxx b/UnoControls/source/inc/statusindicator.hxx
index d8e888f9dc42..7d357e68b2a3 100644
--- a/UnoControls/source/inc/statusindicator.hxx
+++ b/UnoControls/source/inc/statusindicator.hxx
@@ -30,7 +30,7 @@
 #define _UNOCONTROLS_STATUSINDICATOR_CTRL_HXX
 
 //____________________________________________________________________________________________________________
-//  includes of other projects
+//	includes of other projects
 //____________________________________________________________________________________________________________
 
 #include <com/sun/star/awt/XControlModel.hpp>
@@ -44,12 +44,12 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 //____________________________________________________________________________________________________________
-//  includes of my own project
+//	includes of my own project
 //____________________________________________________________________________________________________________
 #include "basecontainercontrol.hxx"
 
 //____________________________________________________________________________________________________________
-//  namespace
+//	namespace
 //____________________________________________________________________________________________________________
 
 namespace unocontrols{
@@ -60,44 +60,44 @@ namespace unocontrols{
 #define CSS_TASK    ::com::sun::star::task
 
 //____________________________________________________________________________________________________________
-//  defines
+//	defines
 //____________________________________________________________________________________________________________
 
-#define SERVICENAME_STATUSINDICATOR             "com.sun.star.task.XStatusIndicator"
-#define IMPLEMENTATIONNAME_STATUSINDICATOR      "stardiv.UnoControls.StatusIndicator"
+#define	SERVICENAME_STATUSINDICATOR				"com.sun.star.task.XStatusIndicator"
+#define	IMPLEMENTATIONNAME_STATUSINDICATOR		"stardiv.UnoControls.StatusIndicator"
 #define STATUSINDICATOR_FREEBORDER              5                                                       // border around and between the controls
-#define FIXEDTEXT_SERVICENAME                   "com.sun.star.awt.UnoControlFixedText"
-#define FIXEDTEXT_MODELNAME                     "com.sun.star.awt.UnoControlFixedTextModel"
-#define CONTROLNAME_TEXT                        "Text"                                                  // identifier the control in container
-#define CONTROLNAME_PROGRESSBAR                 "ProgressBar"                                           //              -||-
-#define STATUSINDICATOR_DEFAULT_TEXT            "\0"
-#define STATUSINDICATOR_BACKGROUNDCOLOR         TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 )                // lighgray
-#define STATUSINDICATOR_LINECOLOR_BRIGHT        TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF )                // white
-#define STATUSINDICATOR_LINECOLOR_SHADOW        TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 )                // black
+#define FIXEDTEXT_SERVICENAME					"com.sun.star.awt.UnoControlFixedText"
+#define	FIXEDTEXT_MODELNAME						"com.sun.star.awt.UnoControlFixedTextModel"
+#define	CONTROLNAME_TEXT						"Text"													// identifier the control in container
+#define	CONTROLNAME_PROGRESSBAR					"ProgressBar"											//  			-||-
+#define	STATUSINDICATOR_DEFAULT_TEXT            "\0"
+#define	STATUSINDICATOR_BACKGROUNDCOLOR         TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 )				// lighgray
+#define	STATUSINDICATOR_LINECOLOR_BRIGHT        TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF )				// white
+#define	STATUSINDICATOR_LINECOLOR_SHADOW        TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 )				// black
 #define STATUSINDICATOR_DEFAULT_WIDTH           300
 #define STATUSINDICATOR_DEFAULT_HEIGHT          25
 
 //____________________________________________________________________________________________________________
-//  structs, types
+//	structs, types
 //____________________________________________________________________________________________________________
 
 //____________________________________________________________________________________________________________
-//  class declaration
+//	class declaration
 //____________________________________________________________________________________________________________
 
-class StatusIndicator   : public CSS_AWT::XLayoutConstrains
+class StatusIndicator	: public CSS_AWT::XLayoutConstrains
                         , public CSS_TASK::XStatusIndicator
                         , public BaseContainerControl
 {
 
     //-------------------------------------------------------------------------------------------------------------
-    //  public methods
+    //	public methods
     //-------------------------------------------------------------------------------------------------------------
 
     public:
 
         //---------------------------------------------------------------------------------------------------------
-        //  construct/destruct
+        //	construct/destruct
         //---------------------------------------------------------------------------------------------------------
 
         /**_______________________________________________________________________________________________________
@@ -128,379 +128,379 @@ class StatusIndicator   : public CSS_AWT::XLayoutConstrains
             @onerror
         */
 
-        virtual ~StatusIndicator();
+        virtual	~StatusIndicator();
 
         //---------------------------------------------------------------------------------------------------------
-        //  XInterface
+        //	XInterface
         //---------------------------------------------------------------------------------------------------------
 
         /**_______________________________________________________________________________________________________
-            @short      give answer, if interface is supported
-            @descr      The interfaces are searched by type.
+            @short		give answer, if interface is supported
+            @descr		The interfaces are searched by type.
 
-            @seealso    XInterface
+            @seealso	XInterface
 
             @param      "rType" is the type of searched interface.
 
-            @return     Any     information about found interface
+            @return		Any		information about found interface
 
-            @onerror    A RuntimeException is thrown.
+            @onerror	A RuntimeException is thrown.
         */
 
         virtual CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType )
             throw( CSS_UNO::RuntimeException );
 
         /**_______________________________________________________________________________________________________
-            @short      increment refcount
-            @descr      -
+            @short		increment refcount
+            @descr		-
 
-            @seealso    XInterface
-            @seealso    release()
+            @seealso	XInterface
+            @seealso	release()
 
-            @param      -
+            @param		-
 
-            @return     -
+            @return		-
 
-            @onerror    A RuntimeException is thrown.
+            @onerror	A RuntimeException is thrown.
         */
 
         virtual void SAL_CALL acquire() throw();
 
         /**_______________________________________________________________________________________________________
-            @short      decrement refcount
-            @descr      -
+            @short		decrement refcount
+            @descr		-
 
-            @seealso    XInterface
-            @seealso    acquire()
+            @seealso	XInterface
+            @seealso	acquire()
 
-            @param      -
+            @param		-
 
-            @return     -
+            @return		-
 
-            @onerror    A RuntimeException is thrown.
+            @onerror	A RuntimeException is thrown.
         */
 
         virtual void SAL_CALL release() throw();
 
         //---------------------------------------------------------------------------------------------------------
-        //  XTypeProvider
+        //	XTypeProvider
         //---------------------------------------------------------------------------------------------------------
 
         /**_______________________________________________________________________________________________________
-            @short      get information about supported interfaces
+            @short		get information about supported interfaces
             @descr      -
 
-            @seealso    XTypeProvider
+            @seealso	XTypeProvider
 
             @param      -
 
-            @return     Sequence of types of all supported interfaces
+            @return		Sequence of types of all supported interfaces
 
-            @onerror    A RuntimeException is thrown.
+            @onerror	A RuntimeException is thrown.
         */
 
         virtual CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getTypes()
             throw( CSS_UNO::RuntimeException );
 
         //---------------------------------------------------------------------------------------------------------
-        //  XAggregation
+        //	XAggregation
         //---------------------------------------------------------------------------------------------------------
 
         /**_______________________________________________________________________________________________________
-            @short      -
-            @descr      -
+            @short		-
+            @descr		-
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
+            @param		-
 
-            @return     -
+            @return		-
 
-            @onerror    -
+            @onerror	-
         */
 
         virtual CSS_UNO::Any SAL_CALL queryAggregation( const CSS_UNO::Type& aType )
             throw( CSS_UNO::RuntimeException );
 
         //---------------------------------------------------------------------------------------------------------
-        //  XStatusIndicator
+        //	XStatusIndicator
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short      -
-            @descr      -
+            @short		-
+            @descr		-
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
+            @param		-
 
-            @return     -
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         virtual void SAL_CALL start(
-            const ::rtl::OUString&  sText   ,
+            const ::rtl::OUString&	sText	,
             sal_Int32 nRange
         ) throw( CSS_UNO::RuntimeException );
 
         /*-****************************************************************************************************//**
-            @short      -
-            @descr      -
+            @short		-
+            @descr		-
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
+            @param		-
 
-            @return     -
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         virtual void SAL_CALL end() throw( CSS_UNO::RuntimeException );
 
         /*-****************************************************************************************************//**
-            @short      -
-            @descr      -
+            @short		-
+            @descr		-
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
+            @param		-
 
-            @return     -
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         virtual void SAL_CALL reset() throw( CSS_UNO::RuntimeException );
 
         /*-****************************************************************************************************//**
-            @short      -
-            @descr      -
+            @short		-
+            @descr		-
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
+            @param		-
 
-            @return     -
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         virtual void SAL_CALL setText( const ::rtl::OUString& sText ) throw( CSS_UNO::RuntimeException );
 
         /*-****************************************************************************************************//**
-            @short      -
-            @descr      -
+            @short		-
+            @descr		-
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
+            @param		-
 
-            @return     -
+            @return		-
 
-            @onerror    -
+            @onerror	-
         *//*-*****************************************************************************************************/
 
         virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( CSS_UNO::RuntimeException );
 
         //---------------------------------------------------------------------------------------------------------
-        //  XLayoutConstrains
+        // 	XLayoutConstrains
         //---------------------------------------------------------------------------------------------------------
 
         /**_______________________________________________________________________________________________________
-            @short      -
-            @descr      -
+            @short		-
+            @descr		-
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
+            @param		-
 
-            @return     -
+            @return		-
 
-            @onerror    -
+            @onerror	-
         */
 
         virtual CSS_AWT::Size SAL_CALL getMinimumSize() throw( CSS_UNO::RuntimeException );
 
         /**_______________________________________________________________________________________________________
-            @short      -
-            @descr      -
+            @short		-
+            @descr		-
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
+            @param		-
 
-            @return     -
+            @return		-
 
-            @onerror    -
+            @onerror	-
         */
 
         virtual CSS_AWT::Size SAL_CALL getPreferredSize() throw( CSS_UNO::RuntimeException );
 
         /**_______________________________________________________________________________________________________
-            @short      -
-            @descr      -
+            @short		-
+            @descr		-
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
+            @param		-
 
-            @return     -
+            @return		-
 
-            @onerror    -
+            @onerror	-
         */
 
         virtual CSS_AWT::Size SAL_CALL calcAdjustedSize( const CSS_AWT::Size& aNewSize )
             throw( CSS_UNO::RuntimeException );
 
         //---------------------------------------------------------------------------------------------------------
-        //  XControl
+        //	XControl
         //---------------------------------------------------------------------------------------------------------
 
         /**_______________________________________________________________________________________________________
-            @short      -
-            @descr      -
+            @short		-
+            @descr		-
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
+            @param		-
 
-            @return     -
+            @return		-
 
-            @onerror    -
+            @onerror	-
         */
 
         virtual void SAL_CALL createPeer(
-            const   CSS_UNO::Reference< CSS_AWT::XToolkit >&    xToolkit    ,
-            const   CSS_UNO::Reference< CSS_AWT::XWindowPeer >& xParent
+            const	CSS_UNO::Reference< CSS_AWT::XToolkit >&	xToolkit	,
+            const	CSS_UNO::Reference< CSS_AWT::XWindowPeer >&	xParent
         ) throw( CSS_UNO::RuntimeException );
 
         /**_______________________________________________________________________________________________________
-            @short      -
-            @descr      -
+            @short		-
+            @descr		-
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
+            @param		-
 
-            @return     -
+            @return		-
 
-            @onerror    -
+            @onerror	-
         */
 
         virtual sal_Bool SAL_CALL setModel( const CSS_UNO::Reference< CSS_AWT::XControlModel >& xModel )
             throw( CSS_UNO::RuntimeException );
 
         /**_______________________________________________________________________________________________________
-            @short      -
-            @descr      -
+            @short		-
+            @descr		-
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
+            @param		-
 
-            @return     -
+            @return		-
 
-            @onerror    -
+            @onerror	-
         */
 
         virtual CSS_UNO::Reference< CSS_AWT::XControlModel > SAL_CALL getModel()
             throw( CSS_UNO::RuntimeException );
 
         //---------------------------------------------------------------------------------------------------------
-        //  XComponent
+        //	XComponent
         //---------------------------------------------------------------------------------------------------------
 
         /**_______________________________________________________________________________________________________
-            @short      -
-            @descr      -
+            @short		-
+            @descr		-
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
+            @param		-
 
-            @return     -
+            @return		-
 
-            @onerror    -
+            @onerror	-
         */
 
         virtual void SAL_CALL dispose() throw( CSS_UNO::RuntimeException );
 
         //---------------------------------------------------------------------------------------------------------
-        //  XWindow
+        //	XWindow
         //---------------------------------------------------------------------------------------------------------
 
         /**_______________________________________________________________________________________________________
-            @short      -
-            @descr      -
+            @short		-
+            @descr		-
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
+            @param		-
 
-            @return     -
+            @return		-
 
-            @onerror    -
+            @onerror	-
         */
 
-        virtual void SAL_CALL setPosSize(   sal_Int32   nX      ,
-                                            sal_Int32   nY      ,
-                                            sal_Int32   nWidth  ,
-                                            sal_Int32   nHeight ,
-                                            sal_Int16   nFlags  ) throw( CSS_UNO::RuntimeException );
+        virtual void SAL_CALL setPosSize(	sal_Int32	nX		,
+                                            sal_Int32	nY		,
+                                            sal_Int32	nWidth	,
+                                            sal_Int32	nHeight	,
+                                            sal_Int16	nFlags	) throw( CSS_UNO::RuntimeException );
 
         //---------------------------------------------------------------------------------------------------------
-        //  BaseControl
+        //	BaseControl
         //---------------------------------------------------------------------------------------------------------
 
         /**_______________________________________________________________________________________________________
-            @short      -
-            @descr      -
+            @short		-
+            @descr		-
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
+            @param		-
 
-            @return     -
+            @return		-
 
-            @onerror    -
+            @onerror	-
         */
 
         static const CSS_UNO::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames();
 
         /**_______________________________________________________________________________________________________
-            @short      -
-            @descr      -
+            @short		-
+            @descr		-
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
+            @param		-
 
-            @return     -
+            @return		-
 
-            @onerror    -
+            @onerror	-
         */
 
         static const ::rtl::OUString impl_getStaticImplementationName();
 
 //____________________________________________________________________________________________________________
-//  protected methods
+//	protected methods
 //____________________________________________________________________________________________________________
 
 protected:
 
         /**_______________________________________________________________________________________________________
-            @short      -
-            @descr      -
+            @short		-
+            @descr		-
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
+            @param		-
 
-            @return     -
+            @return		-
 
-            @onerror    -
+            @onerror	-
         */
 
         virtual CSS_AWT::WindowDescriptor* impl_getWindowDescriptor(
@@ -508,16 +508,16 @@ protected:
         );
 
         /**_______________________________________________________________________________________________________
-            @short      -
-            @descr      -
+            @short		-
+            @descr		-
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
+            @param		-
 
-            @return     -
+            @return		-
 
-            @onerror    -
+            @onerror	-
         */
 
         virtual void impl_paint (
@@ -527,16 +527,16 @@ protected:
         );
 
         /**_______________________________________________________________________________________________________
-            @short      -
-            @descr      -
+            @short		-
+            @descr		-
 
-            @seealso    -
+            @seealso	-
 
-            @param      -
+            @param		-
 
-            @return     -
+            @return		-
 
-            @onerror    -
+            @onerror	-
         */
 
         virtual void impl_recalcLayout( const CSS_AWT::WindowEvent& aEvent );
@@ -548,16 +548,16 @@ protected:
 private:
 
     /**_______________________________________________________________________________________________________
-        @short      -
-        @descr      -
+        @short		-
+        @descr		-
 
-        @seealso    -
+        @seealso	-
 
-        @param      -
+        @param		-
 
-        @return     -
+        @return		-
 
-        @onerror    -
+        @onerror	-
     */
 
 //____________________________________________________________________________________________________________
@@ -566,10 +566,10 @@ private:
 
 private:
 
-    CSS_UNO::Reference< CSS_AWT::XFixedText >       m_xText         ;
-    CSS_UNO::Reference< CSS_AWT::XProgressBar >     m_xProgressBar  ;
+    CSS_UNO::Reference< CSS_AWT::XFixedText > 		m_xText			;
+    CSS_UNO::Reference< CSS_AWT::XProgressBar > 	m_xProgressBar	;
 
-};  // class StatusIndicator
+};	// class StatusIndicator
 
 // The name space aliases are only used in the header
 #undef CSS_UNO
@@ -577,8 +577,8 @@ private:
 #undef CSS_LANG
 #undef CSS_TASK
 
-}   // namespace unocontrols
+}	// namespace unocontrols
 
-#endif  // #ifndef _UNOCONTROLS_STATUSINDICATOR_CTRL_HXX
+#endif	// #ifndef _UNOCONTROLS_STATUSINDICATOR_CTRL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/bridge/org/openoffice/accessibility/AccessBridge.java b/accessibility/bridge/org/openoffice/accessibility/AccessBridge.java
index 454cd15154d4..a5b230cd73cf 100755
--- a/accessibility/bridge/org/openoffice/accessibility/AccessBridge.java
+++ b/accessibility/bridge/org/openoffice/accessibility/AccessBridge.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,13 +50,13 @@ import javax.accessibility.Accessible;
 
 
 public class AccessBridge {
-    //
+    // 
     protected static java.util.Hashtable topWindowMap = new java.util.Hashtable();
 
     private static java.awt.Window getTopWindowImpl(XAccessible xAccessible) {
-        // Because it can not be garantied that
-        // WindowsAccessBridgeAdapter.registerTopWindow() is called
-        // before windowOpened(), we have to make this operation
+        // Because it can not be garantied that 
+        // WindowsAccessBridgeAdapter.registerTopWindow() is called 
+        // before windowOpened(), we have to make this operation 
         // atomic.
         synchronized (topWindowMap) {
             String oid = UnoRuntime.generateOid(xAccessible);
@@ -85,13 +85,13 @@ public class AccessBridge {
                     case AccessibleRole.ROOT_PANE:
                     case AccessibleRole.POPUP_MENU:
                         return getTopWindow(xAccessibleContext.getAccessibleParent());
-
+                        
                     case AccessibleRole.WINDOW:
                     case AccessibleRole.FRAME:
                     case AccessibleRole.DIALOG:
                     case AccessibleRole.ALERT:
                         return getTopWindowImpl(xAccessible);
-
+                        
                     default:
                         break;
                 }
@@ -112,12 +112,12 @@ public class AccessBridge {
                     case AccessibleRole.ROOT_PANE:
                     case AccessibleRole.POPUP_MENU:
                         return removeTopWindow(xAccessibleContext.getAccessibleParent());
-
+                        
                     case AccessibleRole.WINDOW:
                     case AccessibleRole.FRAME:
                     case AccessibleRole.DIALOG:
                         return (java.awt.Window) topWindowMap.remove(UnoRuntime.generateOid(xAccessible));
-
+                        
                     default:
                         break;
                 }
@@ -171,7 +171,7 @@ public class AccessBridge {
                     unoToolkit.addTopWindowListener(this);
 
                     String os = (String) System.getProperty("os.name");
-
+                    
                     // Try to initialize the WindowsAccessBridgeAdapter
                     if (os.startsWith("Windows")) {
                         WindowsAccessBridgeAdapter.attach(xComponentContext);
@@ -224,17 +224,17 @@ public class AccessBridge {
 
         public void disposing(com.sun.star.lang.EventObject event) {
         }
-
+    
         /*
         * XComponent
         */
-
+        
         public void addEventListener(com.sun.star.lang.XEventListener listener) {
         }
-
+        
         public void removeEventListener(com.sun.star.lang.XEventListener listener) {
         }
-
+        
         public void dispose() {
             try {
                 java.awt.Toolkit.getDefaultToolkit().getSystemEventQueue().invokeAndWait(
diff --git a/accessibility/bridge/org/openoffice/accessibility/KeyHandler.java b/accessibility/bridge/org/openoffice/accessibility/KeyHandler.java
index 1e9f2f6520ae..655399c65273 100755
--- a/accessibility/bridge/org/openoffice/accessibility/KeyHandler.java
+++ b/accessibility/bridge/org/openoffice/accessibility/KeyHandler.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 javax.accessibility.*;
 
 public class KeyHandler extends Component implements XKeyHandler, java.awt.KeyEventDispatcher {
     EventQueue eventQueue;
-
+    
     public class VCLKeyEvent extends KeyEvent implements Runnable {
         boolean consumed = true;
 
@@ -59,13 +59,13 @@ public class KeyHandler extends Component implements XKeyHandler, java.awt.KeyEv
             return consumed;
         }
     }
-
+    
     public KeyHandler() {
         eventQueue = Toolkit.getDefaultToolkit().getSystemEventQueue();
         java.awt.KeyboardFocusManager.getCurrentKeyboardFocusManager().addKeyEventDispatcher(this);
     }
-
-    /** This method is called by the current KeyboardFocusManager requesting that this KeyEventDispatcher
+    
+    /** This method is called by the current KeyboardFocusManager requesting that this KeyEventDispatcher 
     * dispatch the specified event on its behalf
     */
     public boolean dispatchKeyEvent(java.awt.event.KeyEvent e) {
@@ -73,34 +73,34 @@ public class KeyHandler extends Component implements XKeyHandler, java.awt.KeyEv
             VCLKeyEvent event = (VCLKeyEvent) e;
             event.setConsumed(false);
             return true;
-        }
+        } 
         return false;
     }
-
+        
     /** Handler for KeyPressed events */
     public boolean keyPressed(com.sun.star.awt.KeyEvent event) {
 //      try {
-            VCLKeyEvent vke = new VCLKeyEvent(this, KeyEvent.KEY_PRESSED,
-                AccessibleKeyBinding.convertModifiers(event.Modifiers),
+            VCLKeyEvent vke = new VCLKeyEvent(this, KeyEvent.KEY_PRESSED, 
+                AccessibleKeyBinding.convertModifiers(event.Modifiers), 
                 AccessibleKeyBinding.convertKeyCode(event.KeyCode),
                 event.KeyChar != 0 ? event.KeyChar : KeyEvent.CHAR_UNDEFINED);
-
+            
             eventQueue.postEvent(vke);
-
-            // VCL events for TABs have empty KeyChar
+            
+            // VCL events for TABs have empty KeyChar 
             if (event.KeyCode == com.sun.star.awt.Key.TAB ) {
                 event.KeyChar = '\t';
             }
 
             // Synthesize KEY_TYPED event to emulate Java behavior
             if (event.KeyChar != 0) {
-                eventQueue.postEvent(new VCLKeyEvent(this,
-                    KeyEvent.KEY_TYPED,
-                    AccessibleKeyBinding.convertModifiers(event.Modifiers),
-                    KeyEvent.VK_UNDEFINED,
+                eventQueue.postEvent(new VCLKeyEvent(this, 
+                    KeyEvent.KEY_TYPED, 
+                    AccessibleKeyBinding.convertModifiers(event.Modifiers), 
+                    KeyEvent.VK_UNDEFINED, 
                     event.KeyChar));
             }
-
+            
             // Wait until the key event is processed
             return false;
 //          eventQueue.invokeAndWait(vke);
@@ -111,16 +111,16 @@ public class KeyHandler extends Component implements XKeyHandler, java.awt.KeyEv
 //          return false;
 //      }
     }
-
+    
     /** Handler for KeyReleased events */
     public boolean keyReleased(com.sun.star.awt.KeyEvent event) {
 //      try {
-            VCLKeyEvent vke = new VCLKeyEvent(this, KeyEvent.KEY_RELEASED,
+            VCLKeyEvent vke = new VCLKeyEvent(this, KeyEvent.KEY_RELEASED, 
                 AccessibleKeyBinding.convertModifiers(event.Modifiers),
-                AccessibleKeyBinding.convertKeyCode(event.KeyCode),
+                AccessibleKeyBinding.convertKeyCode(event.KeyCode), 
                 event.KeyChar != 0 ? event.KeyChar : KeyEvent.CHAR_UNDEFINED);
             eventQueue.postEvent(vke);
-
+            
             // Wait until the key event is processed
             return false;
 //          eventQueue.invokeAndWait(vke);
@@ -131,7 +131,7 @@ public class KeyHandler extends Component implements XKeyHandler, java.awt.KeyEv
 //          return false;
 //      }
     }
-
+    
     public void disposing(com.sun.star.lang.EventObject event) {
         java.awt.KeyboardFocusManager.getCurrentKeyboardFocusManager().removeKeyEventDispatcher(this);
     }
diff --git a/accessibility/bridge/org/openoffice/accessibility/PopupWindow.java b/accessibility/bridge/org/openoffice/accessibility/PopupWindow.java
index a63b0589b4fa..291fd8c097d9 100644
--- a/accessibility/bridge/org/openoffice/accessibility/PopupWindow.java
+++ b/accessibility/bridge/org/openoffice/accessibility/PopupWindow.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/accessibility/bridge/org/openoffice/accessibility/WindowsAccessBridgeAdapter.java b/accessibility/bridge/org/openoffice/accessibility/WindowsAccessBridgeAdapter.java
index 28e58940867d..299c5cc831ae 100644
--- a/accessibility/bridge/org/openoffice/accessibility/WindowsAccessBridgeAdapter.java
+++ b/accessibility/bridge/org/openoffice/accessibility/WindowsAccessBridgeAdapter.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,7 +49,7 @@ public class WindowsAccessBridgeAdapter {
 
     protected static native boolean createMapping(long jvmaccess);
 
-    // On Windows all native frames must be registered to the access bridge.
+    // On Windows all native frames must be registered to the access bridge. 
     // Therefor the bridge exports two methods that we try to find here.
     protected static void attach(XComponentContext xComponentContext) {
         try {
@@ -65,7 +65,7 @@ public class WindowsAccessBridgeAdapter {
                 revokeVirtualFrame = bridge.getMethod("revokeVirtualFrame",
                         parameterTypes);
 
-                // load the native dll
+                // load the native dll 
                 System.loadLibrary("java_uno_accessbridge");
 
                 Object any = xComponentContext.getValueByName(
@@ -124,7 +124,7 @@ public class WindowsAccessBridgeAdapter {
     protected static boolean isAttached() {
         return frameMap != null;
     }
-
+    
     protected static Accessible getAccessibleWrapper(XAccessible xAccessible) {
         Accessible a = null;
 
@@ -156,7 +156,7 @@ public class WindowsAccessBridgeAdapter {
                     case AccessibleRole.TOOL_TIP:
                         a = PopupWindow.create(xAccessible);
                         break;
-
+                        
                     default:
                         a = (Accessible) AccessBridge.getTopWindow(xAccessible);
                         break;
@@ -232,7 +232,7 @@ public class WindowsAccessBridgeAdapter {
                     e.getMessage());
             }
         }
-
+        
         if (a instanceof PopupWindow) {
             PopupWindow toolTipWindow = (PopupWindow) a;
             toolTipWindow.removeAll();
@@ -249,7 +249,7 @@ public class WindowsAccessBridgeAdapter {
         PopupMenuProxy(AccessibleContext ac) {
             menu = ac;
             menuComponent = menu.getAccessibleComponent();
-
+            
             /** calculate the bounding rectangle by iterating over the
              *  the children.
              */
@@ -263,11 +263,11 @@ public class WindowsAccessBridgeAdapter {
 
                     if (childAC != null) {
                         AccessibleComponent comp = ac.getAccessibleComponent();
-
+                        
                         if (comp != null) {
                             java.awt.Point p = comp.getLocationOnScreen();
                             java.awt.Dimension d = comp.getSize();
-
+                            
                             if (p != null && d != null) {
                                 if (p.x < x) {
                                     x = p.x;
@@ -286,7 +286,7 @@ public class WindowsAccessBridgeAdapter {
                     }
                 }
             }
-
+            
             width = x2 - x;
             height = y2 - y;
         }
@@ -454,8 +454,8 @@ public class WindowsAccessBridgeAdapter {
             // Not supported by UNO accessibility API
         }
 
-        /** Returns the Accessible child, if one exists, contained at the local
-         * coordinate Point
+        /** Returns the Accessible child, if one exists, contained at the local 
+         * coordinate Point 
          */
         public javax.accessibility.Accessible getAccessibleAt(java.awt.Point p) {
             java.awt.Point p2 = menuComponent.getLocationOnScreen();
@@ -471,7 +471,7 @@ public class WindowsAccessBridgeAdapter {
             menuComponent.requestFocus();
         }
     }
-
+    
     protected static class ListProxy extends AccessibleContext
         implements Accessible, AccessibleComponent {
         AccessibleContext list;
@@ -601,7 +601,7 @@ public class WindowsAccessBridgeAdapter {
         }
 
         /** Gets the location of this component in the form of a point specifying
-         * the component's top-left corner
+         * the component's top-left corner 
          */
         public java.awt.Point getLocation() {
             // This object represents a toplevel object, so getLocation() should
@@ -636,8 +636,8 @@ public class WindowsAccessBridgeAdapter {
             // Not supported by UNO accessibility API
         }
 
-        /** Returns the Accessible child, if one exists, contained at the local
-         * coordinate Point
+        /** Returns the Accessible child, if one exists, contained at the local 
+         * coordinate Point 
          */
         public javax.accessibility.Accessible getAccessibleAt(java.awt.Point p) {
             return listComponent.getAccessibleAt(p);
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AbstractButton.java b/accessibility/bridge/org/openoffice/java/accessibility/AbstractButton.java
index be7b72df8732..1540ba8f745f 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/AbstractButton.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AbstractButton.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,41 +32,41 @@ import javax.accessibility.AccessibleState;
 import com.sun.star.uno.*;
 import com.sun.star.accessibility.*;
 
-/**
+/** 
  */
 public abstract class AbstractButton extends Component {
-
+    
     protected AbstractButton(XAccessible xAccessible, XAccessibleContext xAccessibleContext) {
         super(xAccessible, xAccessibleContext);
     }
-
-    protected abstract class AccessibleAbstractButton extends AccessibleUNOComponent
+    
+    protected abstract class AccessibleAbstractButton extends AccessibleUNOComponent 
         implements javax.accessibility.AccessibleAction {
-
+        
         /**
         * Though the class is abstract, this should be called by all sub-classes
         */
         protected AccessibleAbstractButton() {
             super();
         }
-
+        
         /*
         * AccessibleContext
         */
-
+        
         /** Gets the AccessibleAction associated with this object that supports one or more actions */
         public javax.accessibility.AccessibleAction getAccessibleAction() {
             return this;
         }
-
+        
         /** Gets the AccessibleText associated with this object presenting text on the display */
         public javax.accessibility.AccessibleText getAccessibleText() {
-
+            
             if (disposed)
                 return null;
-
+            
             try {
-                XAccessibleText unoAccessibleText = (XAccessibleText)
+                XAccessibleText unoAccessibleText = (XAccessibleText) 
                     UnoRuntime.queryInterface(XAccessibleText.class,unoAccessibleComponent);
                 if (unoAccessibleText != null) {
                     return new AccessibleTextImpl(unoAccessibleText);
@@ -77,7 +77,7 @@ public abstract class AbstractButton extends Component {
                 return null;
             }
         }
-
+        
         /** Returns the relation set of this object */
         public javax.accessibility.AccessibleRelationSet getAccessibleRelationSet() {
             try {
@@ -123,7 +123,7 @@ public abstract class AbstractButton extends Component {
         /*
         * AccessibleAction
         */
-
+        
         /** Performs the specified Action on the object */
         public boolean doAccessibleAction(int param) {
             if (param == 0) {
@@ -146,7 +146,7 @@ public abstract class AbstractButton extends Component {
                         XAccessibleContext xAccessibleContext = unoAccessibleContext;
                         if (xAccessibleContext != null) {
                             // Query for XAccessibleAction interface
-                            XAccessibleAction xAccessibleAction = (XAccessibleAction)
+                            XAccessibleAction xAccessibleAction = (XAccessibleAction) 
                                 UnoRuntime.queryInterface(XAccessibleAction.class, xAccessibleContext);
 
                             if (xAccessibleAction != null) {
@@ -158,15 +158,15 @@ public abstract class AbstractButton extends Component {
                     }
                 }
             }
-
+            
             return false;
         }
-
+        
         /** Returns a description of the specified action of the object */
         public java.lang.String getAccessibleActionDescription(int param) {
-            return javax.swing.UIManager.getString("AbstractButton.clickText");
+            return javax.swing.UIManager.getString("AbstractButton.clickText"); 
         }
-
+        
         /** Returns the number of accessible actions available in this object */
         public int getAccessibleActionCount() {
             return 1;
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleActionImpl.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleActionImpl.java
index e4905752d833..ec250f68ac3b 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleActionImpl.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleActionImpl.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,14 +33,14 @@ import com.sun.star.accessibility.XAccessibleAction;
  *  to the corresponding methods of the UNO XAccessibleAction interface.
  */
 public class AccessibleActionImpl implements javax.accessibility.AccessibleAction {
-
+    
     protected XAccessibleAction unoObject;
-
+    
     /** Creates new AccessibleActionWrapper */
     public AccessibleActionImpl(XAccessibleAction xAccessibleAction) {
         unoObject = xAccessibleAction;
     }
-
+    
     public boolean doAccessibleAction(int param) {
         try {
             return unoObject.doAccessibleAction(param);
@@ -50,7 +50,7 @@ public class AccessibleActionImpl implements javax.accessibility.AccessibleActio
             return false;
         }
     }
-
+    
     public java.lang.String getAccessibleActionDescription(int param) {
         try {
             return unoObject.getAccessibleActionDescription(param);
@@ -60,7 +60,7 @@ public class AccessibleActionImpl implements javax.accessibility.AccessibleActio
             return null;
         }
     }
-
+    
     public int getAccessibleActionCount() {
         try {
             return unoObject.getAccessibleActionCount();
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleComponentImpl.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleComponentImpl.java
index 5bac982756a2..93df646e87a1 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleComponentImpl.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleComponentImpl.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,20 +34,20 @@ import com.sun.star.accessibility.XAccessibleComponent;
 import com.sun.star.uno.UnoRuntime;
 
 public class AccessibleComponentImpl implements javax.accessibility.AccessibleComponent {
-
+    
     protected XAccessibleComponent unoObject;
 //  protected XAccessibleExtendedComponent unoAccessibleExtendedComponent = null;
-
+    
     /** Creates new AccessibleComponentImpl */
     public AccessibleComponentImpl(XAccessibleComponent xAccessibleComponent) {
         unoObject = xAccessibleComponent;
     }
-
+    
     protected boolean hasState(short state) {
         try {
-            XAccessibleContext unoAccessibleContext = (XAccessibleContext)
+            XAccessibleContext unoAccessibleContext = (XAccessibleContext) 
                 UnoRuntime.queryInterface(XAccessibleContext.class, unoObject);
-            // All UNO accessibility implementations must support XAccessibleContext
+            // All UNO accessibility implementations must support XAccessibleContext 
             // and return a valid XAccessibleStateSet ..
             return unoAccessibleContext.getAccessibleStateSet().contains(state);
         } catch (com.sun.star.uno.RuntimeException e) {
@@ -57,11 +57,11 @@ public class AccessibleComponentImpl implements javax.accessibility.AccessibleCo
             return false;
         }
     }
-
+    
     /*
      * XAccessibleComponent
      */
-
+     
     /** Returns the background color of the object */
     public java.awt.Color getBackground() {
         try {
@@ -70,11 +70,11 @@ public class AccessibleComponentImpl implements javax.accessibility.AccessibleCo
             return null;
         }
     }
-
+    
     public void setBackground(java.awt.Color c) {
         // Not supported by UNO accessibility API
     }
-
+    
     /** Returns the foreground color of the object */
     public java.awt.Color getForeground() {
         try {
@@ -83,141 +83,141 @@ public class AccessibleComponentImpl implements javax.accessibility.AccessibleCo
             return null;
         }
     }
-
+    
     public void setForeground(java.awt.Color c) {
         // Not supported by UNO accessibility API
     }
-
+    
     public java.awt.Cursor getCursor() {
         // Not supported by UNO accessibility API
         return null;
     }
-
+    
     public void setCursor(java.awt.Cursor cursor) {
         // Not supported by UNO accessibility API
     }
-
+    
     public java.awt.Font getFont() {
         // FIXME
         return null;
     }
-
+    
     public void setFont(java.awt.Font f) {
         // Not supported by UNO accessibility API
     }
-
+    
     public java.awt.FontMetrics getFontMetrics(java.awt.Font f) {
         // FIXME
         return null;
     }
-
+    
     public boolean isEnabled() {
         return hasState(AccessibleStateType.ENABLED);
         }
-
+    
     public void setEnabled(boolean b) {
         // Not supported by UNO accessibility API
     }
-
+    
     public boolean isVisible() {
         return hasState(AccessibleStateType.VISIBLE);
     }
-
+    
     public void setVisible(boolean b) {
         // Not supported by UNO accessibility API
     }
-
+    
     public boolean isShowing() {
         return hasState(AccessibleStateType.SHOWING);
     }
-
+    
     public boolean contains(java.awt.Point p) {
         try {
-            return unoObject.containsPoint(new com.sun.star.awt.Point(p.x, p.y));
+            return unoObject.containsPoint(new com.sun.star.awt.Point(p.x, p.y)); 
         } catch (com.sun.star.uno.RuntimeException e) {
             return false;
         }
     }
-
+    
     /** Returns the location of the object on the screen. */
     public java.awt.Point getLocationOnScreen() {
         try {
-            com.sun.star.awt.Point unoPoint = unoObject.getLocationOnScreen();
+            com.sun.star.awt.Point unoPoint = unoObject.getLocationOnScreen(); 
             return new java.awt.Point(unoPoint.X, unoPoint.Y);
         } catch (com.sun.star.uno.RuntimeException e) {
             return null;
         }
     }
-
+    
     /** Gets the location of this component in the form of a point specifying the component's top-left corner */
     public java.awt.Point getLocation() {
         try {
-            com.sun.star.awt.Point unoPoint = unoObject.getLocation();
+            com.sun.star.awt.Point unoPoint = unoObject.getLocation(); 
             return new java.awt.Point( unoPoint.X, unoPoint.Y );
         } catch (com.sun.star.uno.RuntimeException e) {
             return null;
         }
     }
-
+    
     /** Moves this component to a new location */
     public void setLocation(java.awt.Point p) {
         // Not supported by UNO accessibility API
     }
-
+    
     /** Gets the bounds of this component in the form of a Rectangle object */
     public java.awt.Rectangle getBounds() {
         try {
-            com.sun.star.awt.Rectangle unoRect = unoObject.getBounds();
+            com.sun.star.awt.Rectangle unoRect = unoObject.getBounds(); 
             return new java.awt.Rectangle(unoRect.X, unoRect.Y, unoRect.Width, unoRect.Height);
             } catch (com.sun.star.uno.RuntimeException e) {
             return null;
         }
     }
-
+    
     /** Moves and resizes this component to conform to the new bounding rectangle r */
     public void setBounds(java.awt.Rectangle r) {
         // Not supported by UNO accessibility API
     }
-
+    
     /** Returns the size of this component in the form of a Dimension object */
     public java.awt.Dimension getSize() {
         try {
-            com.sun.star.awt.Size unoSize = unoObject.getSize();
+            com.sun.star.awt.Size unoSize = unoObject.getSize(); 
             return new java.awt.Dimension(unoSize.Width, unoSize.Height);
         } catch (com.sun.star.uno.RuntimeException e) {
             return null;
         }
     }
-
+    
     /** Resizes this component so that it has width d.width and height d.height */
     public void setSize(java.awt.Dimension d) {
         // Not supported by UNO accessibility API
     }
-
+    
     public javax.accessibility.Accessible getAccessibleAt(java.awt.Point p) {
         // Not supported by this implementation
         return null;
     }
-
+    
     public boolean isFocusTraversable() {
         return hasState(AccessibleStateType.FOCUSABLE);
         }
-
+    
     public void requestFocus() {
         unoObject.grabFocus();
     }
-
+    
     /**
     * Adds the specified focus listener to receive focus events from
     * this component when this component gains input focus.
     * If listener <code>l</code> is <code>null</code>,
     * no exception is thrown and no action is performed.
     */
-
+    
     public void addFocusListener(java.awt.event.FocusListener l) {
         // Not supported by this implementation
     }
-
+    
     /**
     * Removes the specified focus listener so that it no longer
     * receives focus events from this component. This method performs
@@ -226,7 +226,7 @@ public class AccessibleComponentImpl implements javax.accessibility.AccessibleCo
     * If listener <code>l</code> is <code>null</code>,
     * no exception is thrown and no action is performed.
     */
-
+    
     public void removeFocusListener(java.awt.event.FocusListener l) {
         // Not supported by this implementation
     }
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleEditableTextImpl.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleEditableTextImpl.java
index 4863b560ef71..6749aaad5519 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleEditableTextImpl.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleEditableTextImpl.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,12 +41,12 @@ import javax.swing.text.StyleConstants;
  */
 public class AccessibleEditableTextImpl extends AccessibleTextImpl implements javax.accessibility.AccessibleEditableText {
     final static double toPointFactor = 1 / (7/10 + 34.5);
-
+    
     /** Creates new GenericAccessibleEditableText object */
     public AccessibleEditableTextImpl(XAccessibleEditableText xAccessibleEditableText) {
         super(xAccessibleEditableText);
     }
-
+    
     /** Cuts the text between two indices into the system clipboard */
     public void cut(int startIndex, int endIndex) {
         try {
@@ -55,7 +55,7 @@ public class AccessibleEditableTextImpl extends AccessibleTextImpl implements ja
         } catch (com.sun.star.uno.RuntimeException e) {
         }
     }
-
+    
     /** Deletes the text between two indices */
     public void delete(int startIndex, int endIndex) {
         try {
@@ -64,7 +64,7 @@ public class AccessibleEditableTextImpl extends AccessibleTextImpl implements ja
         } catch (com.sun.star.uno.RuntimeException e) {
         }
     }
-
+    
     /** Returns the text range between two indices */
     public String getTextRange(int startIndex, int endIndex) {
         try {
@@ -74,7 +74,7 @@ public class AccessibleEditableTextImpl extends AccessibleTextImpl implements ja
         }
         return null;
     }
-
+    
     /** Inserts the specified string at the given index */
     public void insertTextAtIndex(int index, String s){
         try {
@@ -83,7 +83,7 @@ public class AccessibleEditableTextImpl extends AccessibleTextImpl implements ja
         } catch (com.sun.star.uno.RuntimeException e) {
         }
     }
-
+    
     /** Pastes the text form the system clipboard into the text starting at the specified index */
     public void paste(int startIndex) {
         try {
@@ -92,35 +92,35 @@ public class AccessibleEditableTextImpl extends AccessibleTextImpl implements ja
         } catch (com.sun.star.uno.RuntimeException e) {
         }
     }
-
+    
     /** Replaces the text between two indices with the specified string */
     public void replaceText(int startIndex, int endIndex, String s) {
         try {
             ((XAccessibleEditableText) unoObject).replaceText(startIndex, endIndex, s);
         } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
         } catch (com.sun.star.uno.RuntimeException e) {
-        }
+        }       
     }
-
+    
     /** Selects the text between two indices */
     public void selectText(int startIndex, int endIndex) {
         try {
             unoObject.setSelection(startIndex, endIndex);
         } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
         } catch (com.sun.star.uno.RuntimeException e) {
-        }
+        }       
     }
-
+    
     /** Sets the attributes for the text between two indices */
     public void setAttributes(int startIndex, int endIndex, javax.swing.text.AttributeSet as) {
         java.util.Vector propertyValues = new java.util.Vector();
-
+        
         // Convert Alignment attribute
         Object attribute = as.getAttribute(StyleConstants.Alignment);
         if (null != attribute) {
             com.sun.star.beans.PropertyValue propertyValue = new com.sun.star.beans.PropertyValue();
             propertyValue.Name = "ParaAdjust";
-
+            
             switch (StyleConstants.getAlignment(as)) {
                 case StyleConstants.ALIGN_RIGHT:
                     propertyValue.Value = ParagraphAdjust.RIGHT;
@@ -137,7 +137,7 @@ public class AccessibleEditableTextImpl extends AccessibleTextImpl implements ja
             }
             propertyValues.add(propertyValue);
         }
-
+        
         // Convert Background attribute
         attribute = as.getAttribute(StyleConstants.Background);
         if (null != attribute) {
@@ -146,9 +146,9 @@ public class AccessibleEditableTextImpl extends AccessibleTextImpl implements ja
             propertyValue.Value = new Integer(StyleConstants.getBackground(as).getRGB());
             propertyValues.add(propertyValue);
         }
-
+        
         // FIXME: BidiLevel
-
+        
         // Set Bold attribute
         attribute = as.getAttribute(StyleConstants.Bold);
         if (null != attribute) {
@@ -161,9 +161,9 @@ public class AccessibleEditableTextImpl extends AccessibleTextImpl implements ja
             }
             propertyValues.add(propertyValue);
         }
-
+        
         // FIXME: Java 1.4 ComponentAttribute, ComponentElementName, ComposedTextAttribute
-
+        
         // Set FirstLineIndent attribute
         attribute = as.getAttribute(StyleConstants.FirstLineIndent);
         if (null != attribute) {
@@ -172,13 +172,13 @@ public class AccessibleEditableTextImpl extends AccessibleTextImpl implements ja
             propertyValue.Value = new Double(StyleConstants.getFirstLineIndent(as) / toPointFactor);
             propertyValues.add(propertyValue);
         }
-
+        
         // Set font family attribute
         attribute = as.getAttribute(StyleConstants.FontFamily);
         if (null != attribute) {
             com.sun.star.beans.PropertyValue propertyValue = new com.sun.star.beans.PropertyValue();
             propertyValue.Name = "CharFontPitch";
-
+            
             if (StyleConstants.getFontFamily(as).equals( "Proportional" )) {
                 propertyValue.Value = new Short("2");
             } else {
@@ -186,7 +186,7 @@ public class AccessibleEditableTextImpl extends AccessibleTextImpl implements ja
             }
             propertyValues.add(propertyValue);
         }
-
+        
         // Set font size attribute
         attribute = as.getAttribute(StyleConstants.FontSize);
         if (null != attribute) {
@@ -195,7 +195,7 @@ public class AccessibleEditableTextImpl extends AccessibleTextImpl implements ja
             propertyValue.Value = new Integer(StyleConstants.getFontSize(as));
             propertyValues.add(propertyValue);
         }
-
+        
         // Map foreground color
         attribute = as.getAttribute(StyleConstants.Foreground);
         if (null != attribute) {
@@ -204,15 +204,15 @@ public class AccessibleEditableTextImpl extends AccessibleTextImpl implements ja
             propertyValue.Value = new Integer (StyleConstants.getForeground(as).getRGB());
             propertyValues.add(propertyValue);
         }
-
+        
         // FIXME: IconAttribute, IconElementName
-
+        
         // Set italic attribute
         attribute = as.getAttribute(StyleConstants.Italic);
         if (null != attribute) {
             com.sun.star.beans.PropertyValue propertyValue = new com.sun.star.beans.PropertyValue();
             propertyValue.Name = "CharPosture";
-
+            
             if (StyleConstants.isItalic(as)) {
                 propertyValue.Value = FontSlant.ITALIC;
             } else {
@@ -220,7 +220,7 @@ public class AccessibleEditableTextImpl extends AccessibleTextImpl implements ja
             }
             propertyValues.add(propertyValue);
         }
-
+                
         // Set left indent attribute
         attribute = as.getAttribute(StyleConstants.LeftIndent);
         if (null != attribute) {
@@ -229,7 +229,7 @@ public class AccessibleEditableTextImpl extends AccessibleTextImpl implements ja
             propertyValue.Value = new Integer(new Double(StyleConstants.getLeftIndent(as) / toPointFactor).intValue());
             propertyValues.add(propertyValue);
         }
-
+        
         // Set right indent attribute
         attribute = as.getAttribute(StyleConstants.RightIndent);
         if (null != attribute) {
@@ -238,7 +238,7 @@ public class AccessibleEditableTextImpl extends AccessibleTextImpl implements ja
             propertyValue.Value = new Integer(new Double(StyleConstants.getRightIndent(as) / toPointFactor).intValue());
             propertyValues.add(propertyValue);
         }
-
+        
         // Set line spacing attribute
         attribute = as.getAttribute(StyleConstants.LineSpacing);
         if (null != attribute) {
@@ -247,9 +247,9 @@ public class AccessibleEditableTextImpl extends AccessibleTextImpl implements ja
             propertyValue.Value = new Integer(new Double(StyleConstants.getLineSpacing(as) / toPointFactor).intValue());
             propertyValues.add(propertyValue);
         }
-
-        // FIXME: Java 1.4 NameAttribute, Orientation, ResolveAttribute
-
+        
+        // FIXME: Java 1.4 NameAttribute, Orientation, ResolveAttribute 
+        
         // Set space above attribute
         attribute = as.getAttribute(StyleConstants.SpaceAbove);
         if (null != attribute) {
@@ -258,7 +258,7 @@ public class AccessibleEditableTextImpl extends AccessibleTextImpl implements ja
             propertyValue.Value = new Integer(new Double( StyleConstants.getSpaceAbove(as) / toPointFactor).intValue());
             propertyValues.add(propertyValue);
         }
-
+        
         // Set space below attribute
         attribute = as.getAttribute(StyleConstants.SpaceBelow);
         if (null != attribute) {
@@ -267,7 +267,7 @@ public class AccessibleEditableTextImpl extends AccessibleTextImpl implements ja
             propertyValue.Value = new Integer(new Double(StyleConstants.getSpaceBelow(as) / toPointFactor).intValue());
             propertyValues.add(propertyValue);
         }
-
+        
         // Set strike through attribute
         attribute = as.getAttribute(StyleConstants.StrikeThrough);
         if (null != attribute) {
@@ -280,7 +280,7 @@ public class AccessibleEditableTextImpl extends AccessibleTextImpl implements ja
             }
             propertyValues.add(propertyValue);
         }
-
+        
         // Set sub-/superscript attribute
         attribute = as.getAttribute(StyleConstants.Superscript);
         if (null == attribute) {
@@ -289,7 +289,7 @@ public class AccessibleEditableTextImpl extends AccessibleTextImpl implements ja
         if (null != attribute) {
             com.sun.star.beans.PropertyValue propertyValue = new com.sun.star.beans.PropertyValue();
             propertyValue.Name = "CharEscapement";
-
+            
             if (StyleConstants.isSuperscript(as)) {
                 propertyValue.Value = new Short( "1" );
             } else if (StyleConstants.isSubscript(as)) {
@@ -299,49 +299,49 @@ public class AccessibleEditableTextImpl extends AccessibleTextImpl implements ja
             }
             propertyValues.add(propertyValue);
         }
-
+        
         // Set tabset attribute
         attribute = as.getAttribute(StyleConstants.TabSet);
         if (null != attribute) {
             com.sun.star.beans.PropertyValue propertyValue = new com.sun.star.beans.PropertyValue();
             propertyValue.Name = "ParaTabStops";
-
+            
             javax.swing.text.TabSet tabSet = StyleConstants.getTabSet(as);
-            java.util.ArrayList tabStops = new java.util.ArrayList(tabSet.getTabCount());
-
+            java.util.ArrayList tabStops = new java.util.ArrayList(tabSet.getTabCount()); 
+            
             for (int i = 0, max = tabSet.getTabCount(); i < max; i++) {
                 javax.swing.text.TabStop tab = tabSet.getTab(i);
                 com.sun.star.style.TabStop unoTab = new com.sun.star.style.TabStop();
-
+                
                 unoTab.Position = new Double(tab.getPosition() / toPointFactor).intValue();
-
+                
                 switch (tab.getAlignment()) {
-                    case javax.swing.text.TabStop.ALIGN_CENTER:
+                    case javax.swing.text.TabStop.ALIGN_CENTER: 
                         unoTab.Alignment = TabAlign.CENTER;
                         break;
-                    case javax.swing.text.TabStop.ALIGN_RIGHT:
+                    case javax.swing.text.TabStop.ALIGN_RIGHT: 
                         unoTab.Alignment = TabAlign.RIGHT;
                         break;
-                    case javax.swing.text.TabStop.ALIGN_DECIMAL:
+                    case javax.swing.text.TabStop.ALIGN_DECIMAL: 
                         unoTab.Alignment = TabAlign.DECIMAL;
                         break;
-                    default:
+                    default: 
                         unoTab.Alignment = TabAlign.LEFT;
                         break;
                 }
-
+                
                 tabStops.add(unoTab);
             }
             propertyValue.Value = (com.sun.star.style.TabStop[]) tabStops.toArray();
             propertyValues.add(propertyValue);
         }
-
+        
         // Set underline attribute
         attribute = as.getAttribute(StyleConstants.Underline);
         if (null != attribute) {
             com.sun.star.beans.PropertyValue propertyValue = new com.sun.star.beans.PropertyValue();
             propertyValue.Name = "CharUnderline";
-
+            
             if (StyleConstants.isUnderline(as)) {
                 propertyValue.Value = new Short(FontUnderline.SINGLE);
             } else {
@@ -349,14 +349,14 @@ public class AccessibleEditableTextImpl extends AccessibleTextImpl implements ja
             }
             propertyValues.add(propertyValue);
         }
-
+        
         try {
             ((XAccessibleEditableText) unoObject).setAttributes(startIndex, endIndex, (com.sun.star.beans.PropertyValue[]) propertyValues.toArray());
         } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
         } catch (com.sun.star.uno.RuntimeException e) {
         }
     }
-
+    
     /** Sets the text contents to the specified string */
     public void setTextContents(String s) {
         try {
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleExtendedState.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleExtendedState.java
index 3d4500d322df..a6eb653ef470 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleExtendedState.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleExtendedState.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,10 +35,10 @@ public class AccessibleExtendedState extends AccessibleState {
     public static final AccessibleState MANAGES_DESCENDANTS;
     public static final AccessibleState SENSITIVE;
     public static final AccessibleState STALE;
-
+    
     static {
         DEFUNCT = new AccessibleExtendedState("defunct");
-
+        
         // JAVA 1.5: will come with manages_descendants and indeterminate
         INDETERMINATE = new AccessibleExtendedState("indeterminate");
         MANAGES_DESCENDANTS = new AccessibleExtendedState("managesDescendants");
@@ -46,7 +46,7 @@ public class AccessibleExtendedState extends AccessibleState {
         SENSITIVE = new AccessibleExtendedState("sensitive");
         STALE = new AccessibleExtendedState("stale");
     }
-
+    
     protected AccessibleExtendedState(String key) {
         super(key);
     }
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleHypertextImpl.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleHypertextImpl.java
index 1bb3bc5961ad..3927f78de86b 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleHypertextImpl.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleHypertextImpl.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,19 +33,19 @@ import com.sun.star.accessibility.*;
 import com.sun.star.uno.*;
 
 /** The AccessibleHypertextImpl mapps all calls to the java AccessibleHypertext
- *  interface to the corresponding methods of the UNO XAccessibleHypertext
+ *  interface to the corresponding methods of the UNO XAccessibleHypertext 
  *  interface.
  */
-public class AccessibleHypertextImpl extends AccessibleTextImpl
+public class AccessibleHypertextImpl extends AccessibleTextImpl 
     implements javax.accessibility.AccessibleHypertext {
 
     protected class Hyperlink extends javax.accessibility.AccessibleHyperlink {
         protected XAccessibleHyperlink unoObject;
-
+        
         public Hyperlink(XAccessibleHyperlink xHyperlink) {
             unoObject = xHyperlink;
         }
-
+        
         public int getStartIndex() {
             try {
                 System.err.println("StartIndex: " + unoObject.getStartIndex());
@@ -54,7 +54,7 @@ public class AccessibleHypertextImpl extends AccessibleTextImpl
                 return -1;
             }
         }
-
+        
         public Object getAccessibleActionObject(int param) {
             System.err.println("getActionObject");
             try {
@@ -73,7 +73,7 @@ public class AccessibleHypertextImpl extends AccessibleTextImpl
 
             return null;
         }
-
+        
         public int getEndIndex() {
             try {
                 System.err.println("StartIndex: " + unoObject.getEndIndex());
@@ -82,7 +82,7 @@ public class AccessibleHypertextImpl extends AccessibleTextImpl
                 return -1;
             }
         }
-
+        
         public Object getAccessibleActionAnchor(int param) {
             System.err.println("getActionAnchor");
             try {
@@ -97,11 +97,11 @@ public class AccessibleHypertextImpl extends AccessibleTextImpl
             }
             return null;
         }
-
+        
         public boolean isValid() {
             return unoObject.isValid();
         }
-
+        
         public boolean doAccessibleAction(int param) {
             try {
                 return unoObject.doAccessibleAction(param);
@@ -111,7 +111,7 @@ public class AccessibleHypertextImpl extends AccessibleTextImpl
                 return false;
             }
         }
-
+        
         public String getAccessibleActionDescription(int param) {
             try {
                 return unoObject.getAccessibleActionDescription(param);
@@ -119,7 +119,7 @@ public class AccessibleHypertextImpl extends AccessibleTextImpl
                 return null;
             }
         }
-
+        
         public int getAccessibleActionCount() {
             try {
                 return unoObject.getAccessibleActionCount();
@@ -128,7 +128,7 @@ public class AccessibleHypertextImpl extends AccessibleTextImpl
             }
         }
     }
-
+    
     /** Creates new AccessibleHypertextImpl */
     public AccessibleHypertextImpl(XAccessibleHypertext xAccessibleHypertext) {
         if (Build.PRODUCT) {
@@ -142,16 +142,16 @@ public class AccessibleHypertextImpl extends AccessibleTextImpl
             }
         }
     }
-
+    
     public static javax.accessibility.AccessibleText get(com.sun.star.uno.XInterface unoObject) {
         try {
             XAccessibleHypertext unoAccessibleHypertext = (XAccessibleHypertext)
                 UnoRuntime.queryInterface(XAccessibleHypertext.class, unoObject);
             if (unoAccessibleHypertext != null) {
                 return new AccessibleHypertextImpl(unoAccessibleHypertext);
-            }
-
-            XAccessibleText unoAccessibleText = (XAccessibleText)
+            } 
+            
+            XAccessibleText unoAccessibleText = (XAccessibleText) 
                 UnoRuntime.queryInterface(XAccessibleText.class, unoObject);
             if (unoAccessibleText != null) {
                 return new AccessibleTextImpl(unoAccessibleText);
@@ -170,7 +170,7 @@ public class AccessibleHypertextImpl extends AccessibleTextImpl
             throw new IndexOutOfBoundsException(exception.getMessage());
         }
     }
-
+    
     public int getLinkCount() {
         try {
             return ((XAccessibleHypertext) unoObject).getHyperLinkCount();
@@ -178,7 +178,7 @@ public class AccessibleHypertextImpl extends AccessibleTextImpl
             return 0;
         }
     }
-
+    
     public int getLinkIndex(int param) {
         try {
             return ((XAccessibleHypertext) unoObject).getHyperLinkIndex(param);
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleIconImpl.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleIconImpl.java
index ba41534f245b..c79fbae89b68 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleIconImpl.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleIconImpl.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
@@ -29,16 +29,16 @@ package org.openoffice.java.accessibility;
 
 import com.sun.star.accessibility.XAccessibleImage;
 
-/**
+/** 
  */
 public class AccessibleIconImpl implements javax.accessibility.AccessibleIcon {
-
+    
     XAccessibleImage unoAccessibleImage;
-
+    
     public AccessibleIconImpl(XAccessibleImage xImage) {
         unoAccessibleImage = xImage;
     }
-
+    
     /** Gets the description of the icon */
     public String getAccessibleIconDescription() {
         try {
@@ -47,7 +47,7 @@ public class AccessibleIconImpl implements javax.accessibility.AccessibleIcon {
             return null;
         }
     }
-
+    
     /** Gets the height of the icon */
     public int getAccessibleIconHeight() {
         try {
@@ -56,7 +56,7 @@ public class AccessibleIconImpl implements javax.accessibility.AccessibleIcon {
             return 0;
         }
     }
-
+    
     /** Gets the width of the icon */
     public int getAccessibleIconWidth() {
         try {
@@ -65,7 +65,7 @@ public class AccessibleIconImpl implements javax.accessibility.AccessibleIcon {
             return 0;
         }
     }
-
+    
     /** Sets the description of the icon */
     public void setAccessibleIconDescription(String s) {
         // Not supported
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleKeyBinding.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleKeyBinding.java
index 1eb3201c5d68..fc58e6b384e4 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleKeyBinding.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleKeyBinding.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,27 +30,27 @@ package org.openoffice.java.accessibility;
 import com.sun.star.accessibility.*;
 import com.sun.star.awt.KeyStroke;
 
-/**
- *
+/** 
+ *  
  */
-public class AccessibleKeyBinding extends Object implements javax.accessibility.AccessibleKeyBinding {
-
+public class AccessibleKeyBinding extends Object implements javax.accessibility.AccessibleKeyBinding { 
+    
     XAccessibleKeyBinding unoAccessibleKeybinding;
-
+    
     public AccessibleKeyBinding(XAccessibleKeyBinding unoKB) {
         unoAccessibleKeybinding = unoKB;
     }
-
+    
     public static int convertModifiers(short s) {
         int modifiers = 0;
         if ((s & com.sun.star.awt.KeyModifier.SHIFT) != 0) {
             modifiers = modifiers | java.awt.event.KeyEvent.SHIFT_DOWN_MASK;
         }
-
+        
         if ((s & com.sun.star.awt.KeyModifier.MOD1) != 0) {
             modifiers = modifiers | java.awt.event.KeyEvent.CTRL_DOWN_MASK;
         }
-
+        
         if ((s & com.sun.star.awt.KeyModifier.MOD2) != 0) {
             modifiers = modifiers | java.awt.event.KeyEvent.ALT_DOWN_MASK;
         }
@@ -61,10 +61,10 @@ public class AccessibleKeyBinding extends Object implements javax.accessibility.
 
         return modifiers;
     }
-
+    
     public static int convertKeyCode(short s) {
         int keycode = java.awt.event.KeyEvent.VK_UNDEFINED;
-
+        
         switch(s) {
             case com.sun.star.awt.Key.NUM0:
                 keycode = java.awt.event.KeyEvent.VK_0;
@@ -344,11 +344,11 @@ public class AccessibleKeyBinding extends Object implements javax.accessibility.
         }
         return keycode;
     }
-
+    
     /*
     * AccessibleKeyBinding
     */
-
+    
     /** Returns a key binding for this object */
     public Object getAccessibleKeyBinding(int i) {
         try {
@@ -362,19 +362,19 @@ public class AccessibleKeyBinding extends Object implements javax.accessibility.
                     data[j] = null;
                 }
             }
-
+            
             if (keys.length == 1) {
                 return data[0];
             } else {
                 return data;
-            }
+            } 
         } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
             return null;
         } catch (com.sun.star.uno.RuntimeException e) {
             return null;
         }
     }
-
+    
     /** Returns the number of key bindings for this object */
         public int getAccessibleKeyBindingCount() {
         try {
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleObjectFactory.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleObjectFactory.java
index 129a3b820993..aa227692a813 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleObjectFactory.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleObjectFactory.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,25 +40,25 @@ import org.openoffice.java.accessibility.logging.XAccessibleEventLog;
 public class AccessibleObjectFactory {
     // This type is needed for conversions from/to uno Any
     public static final Type XAccessibleType = new Type(XAccessible.class);
-
+    
     private static java.util.Hashtable objectList = new java.util.Hashtable();
     private static java.awt.FocusTraversalPolicy focusTraversalPolicy = new FocusTraversalPolicy();
-
+    
     private static java.awt.EventQueue theEventQueue = java.awt.Toolkit.getDefaultToolkit().
                                                                         getSystemEventQueue();
-
+    
     public static java.awt.EventQueue getEventQueue() {
         return theEventQueue;
     }
-
+    
     public static void postFocusGained(java.awt.Component c) {
         getEventQueue().postEvent(new java.awt.event.FocusEvent(c, java.awt.event.FocusEvent.FOCUS_GAINED));
     }
-
+    
     public static void postWindowGainedFocus(java.awt.Window w) {
         postWindowEvent(w, java.awt.event.WindowEvent.WINDOW_GAINED_FOCUS);
     }
-
+    
     public static void postWindowLostFocus(java.awt.Window w) {
         postWindowEvent(w, java.awt.event.WindowEvent.WINDOW_LOST_FOCUS);
     }
@@ -70,15 +70,15 @@ public class AccessibleObjectFactory {
     public static void postWindowDeactivated(java.awt.Window w) {
         postWindowEvent(w, java.awt.event.WindowEvent.WINDOW_DEACTIVATED);
     }
-
+    
     public static void postWindowOpened(java.awt.Window w) {
         postWindowEvent(w, java.awt.event.WindowEvent.WINDOW_OPENED);
     }
-
+    
     public static void postWindowClosed(java.awt.Window w) {
         postWindowEvent(w, java.awt.event.WindowEvent.WINDOW_CLOSED);
     }
-
+    
     public static void invokeAndWait() {
         try {
             theEventQueue.invokeAndWait( new java.lang.Runnable () {
@@ -89,17 +89,17 @@ public class AccessibleObjectFactory {
         } catch (java.lang.InterruptedException e) {
         }
     }
-
+    
     private static void postWindowEvent(java.awt.Window w, int i) {
         theEventQueue.postEvent(new java.awt.event.WindowEvent(w, i));
     }
-
+    
     public static java.awt.Component getAccessibleComponent(XAccessible xAccessible) {
         java.awt.Component c = null;
         if (xAccessible != null) {
             // Retrieve unique id for the original UNO object to be used as a hash key
             String oid = UnoRuntime.generateOid(xAccessible);
-
+            
             // Check if we already have a wrapper object for this context
             synchronized (objectList) {
                 WeakReference r = (WeakReference) objectList.get(oid);
@@ -118,7 +118,7 @@ public class AccessibleObjectFactory {
             System.err.println(e.getClass().getName() + " caught: " + e.getMessage());
         }
     }
-
+    
     public static void addChild(java.awt.Container parent, XAccessible child) {
         try {
             if (child != null) {
@@ -127,19 +127,19 @@ public class AccessibleObjectFactory {
                     XAccessibleStateSet stateSet = childAC.getAccessibleStateSet();
                     if (stateSet != null) {
                         java.awt.Component c = getAccessibleComponent(child);
-
+                        
                         // Re-use existing wrapper if possible, create a new one otherwise
                         if (c != null) {
                             // Seems to be already in child list
                             if (parent.equals(c.getParent()))
                                 return;
-                            // Update general component states
+                            // Update general component states 
                             c.setEnabled(stateSet.contains(AccessibleStateType.ENABLED));
                             c.setVisible(stateSet.contains(AccessibleStateType.VISIBLE));
                         } else {
                             c = createAccessibleComponentImpl(child, childAC, stateSet);
                         }
-
+                        
                         if (c != null) {
                             if (c instanceof java.awt.Container) {
                                 populateContainer((java.awt.Container) c, childAC);
@@ -163,7 +163,7 @@ public class AccessibleObjectFactory {
         try {
             XAccessible xAccessible = (XAccessible) AnyConverter.toObject(XAccessibleType, any);
             java.awt.Component c = getAccessibleComponent(xAccessible);
-
+            
             if (c != null) {
                     parent.remove(c);
 
@@ -176,8 +176,8 @@ public class AccessibleObjectFactory {
         }
     }
 
-
-    /**
+    
+    /** 
     * Removes all children from the container parent
     */
 
@@ -189,11 +189,11 @@ public class AccessibleObjectFactory {
             if (c instanceof java.awt.Container) {
                 clearContainer((java.awt.Container) c);
             }
-        }
-        parent.removeAll();
+        }      
+        parent.removeAll();    
     }
-
-
+    
+    
     /**
     * Populates the given Container parent with wrapper objects for all children of parentAC. This method is
     * intended to be called when a container is added using a CHILDREN_CHANGED event.
@@ -212,7 +212,7 @@ public class AccessibleObjectFactory {
             }
         }
     }
-
+    
     /**
     * Populates the given Container parent with wrapper objects for all children of parentAC. This method is
     * intended to be called when a new window has been opened.
@@ -237,17 +237,17 @@ public class AccessibleObjectFactory {
                     }
                 }
             }
-
+                
             catch (java.lang.Exception e) {
                 System.err.println(e.getClass().getName() + " caught: " + e.getMessage());
                 e.printStackTrace();
             }
         }
     }
-
+    
     protected static java.awt.Component createAccessibleComponent(XAccessible xAccessible) {
         try {
-            XAccessibleContext xAccessibleContext = xAccessible.getAccessibleContext();
+            XAccessibleContext xAccessibleContext = xAccessible.getAccessibleContext(); 
             if (xAccessibleContext != null) {
                 return createAccessibleComponentImpl(xAccessible, xAccessibleContext, xAccessibleContext.getAccessibleStateSet());
             }
@@ -257,8 +257,8 @@ public class AccessibleObjectFactory {
         }
         return null;
     }
-
-    protected static java.awt.Component createAccessibleComponent(XAccessible xAccessible, XAccessibleContext xAccessibleContext,
+    
+    protected static java.awt.Component createAccessibleComponent(XAccessible xAccessible, XAccessibleContext xAccessibleContext, 
         java.awt.Window frame) {
         if (xAccessibleContext != null) {
             try {
@@ -269,7 +269,7 @@ public class AccessibleObjectFactory {
                     if (xAccessibleStateSet.contains(AccessibleStateType.FOCUSED)) {
                         if (frame instanceof NativeFrame) {
                             ((NativeFrame) frame).setInitialComponent(c);
-                        }
+                        } 
                     }
                     return c;
                 }
@@ -280,8 +280,8 @@ public class AccessibleObjectFactory {
         }
         return null;
     }
-
-    protected static java.awt.Component createAccessibleComponentImpl(XAccessible xAccessible, XAccessibleContext xAccessibleContext,
+    
+    protected static java.awt.Component createAccessibleComponentImpl(XAccessible xAccessible, XAccessibleContext xAccessibleContext, 
         XAccessibleStateSet xAccessibleStateSet) {
         java.awt.Component c = null;
         short role = xAccessibleContext.getAccessibleRole();
@@ -411,7 +411,7 @@ public class AccessibleObjectFactory {
             case AccessibleRole.COLUMN_HEADER:
             case AccessibleRole.TABLE:
                 if (xAccessibleStateSet.contains(AccessibleStateType.MANAGES_DESCENDANTS)) {
-                    c = new Table(xAccessible, xAccessibleContext,
+                    c = new Table(xAccessible, xAccessibleContext, 
                         xAccessibleStateSet.contains(AccessibleStateType.MULTI_SELECTABLE));
                 } else {
                     c = new Container(javax.accessibility.AccessibleRole.TABLE,
@@ -464,20 +464,20 @@ public class AccessibleObjectFactory {
 //                  System.out.println("Object cache now contains " + objectList.size() + " objects.");
                 }
             }
-
+        
             AccessibleStateAdapter.setComponentState(c, xAccessibleStateSet);
-
+                        
             if (! Build.PRODUCT) {
                 String property = System.getProperty("AccessBridgeLogging");
                 if ((property != null) && (property.indexOf("event") != -1)) {
                     XAccessibleEventLog.addEventListener(xAccessibleContext, c);
-                }
+                } 
             }
         }
-
+                            
         return c;
     }
-
+    
     protected static void disposing(java.awt.Component c) {
         if (c != null) {
             synchronized (objectList) {
@@ -488,29 +488,29 @@ public class AccessibleObjectFactory {
 
     public static java.awt.Window getTopWindow(XAccessible xAccessible) {
         XAccessibleContext xAccessibleContext = xAccessible.getAccessibleContext();
-
+        
         if (xAccessibleContext != null) {
             short role = xAccessibleContext.getAccessibleRole();
             XAccessibleStateSet xAccessibleStateSet = xAccessibleContext.getAccessibleStateSet();
-            XAccessibleComponent xAccessibleComponent = (XAccessibleComponent)
+            XAccessibleComponent xAccessibleComponent = (XAccessibleComponent) 
                 UnoRuntime.queryInterface(XAccessibleComponent.class, xAccessibleContext);
 
             java.awt.Window w;
             if (role == AccessibleRole.DIALOG) {
-                w = new Dialog(new Application(),
-                    xAccessibleContext.getAccessibleName(),
+                w = new Dialog(new Application(), 
+                    xAccessibleContext.getAccessibleName(), 
                     xAccessibleStateSet.contains(AccessibleStateType.MODAL),
                     xAccessibleComponent);
             } else if (role == AccessibleRole.ALERT) {
-                w = new Alert(new Application(),
-                    xAccessibleContext.getAccessibleName(),
+                w = new Alert(new Application(), 
+                    xAccessibleContext.getAccessibleName(), 
                     xAccessibleStateSet.contains(AccessibleStateType.MODAL),
                     xAccessibleComponent);
             } else if (role == AccessibleRole.FRAME) {
-                w = new Frame(xAccessibleContext.getAccessibleName(),
+                w = new Frame(xAccessibleContext.getAccessibleName(), 
                     xAccessibleComponent);
             } else if (role == AccessibleRole.WINDOW) {
-                java.awt.Window activeWindow =
+                java.awt.Window activeWindow = 
                     java.awt.KeyboardFocusManager.getCurrentKeyboardFocusManager().getActiveWindow();
                 if (activeWindow != null) {
                     w = new Window(activeWindow, xAccessibleComponent);
@@ -529,7 +529,7 @@ public class AccessibleObjectFactory {
             populateContainer(w, xAccessibleContext, w);
             w.setFocusTraversalPolicy(focusTraversalPolicy);
             w.setVisible(true);
-
+            
             // Make the new window the focused one if it has an initialy focused object set.
             java.awt.Component c = ((NativeFrame) w).getInitialComponent();
             if (c != null) {
@@ -537,7 +537,7 @@ public class AccessibleObjectFactory {
             }
             return w;
         }
-
+        
         return null;
     }
 }
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleRelationAdapter.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleRelationAdapter.java
index 2f1709acac45..18f3638eebe4 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleRelationAdapter.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleRelationAdapter.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,11 +31,11 @@ import javax.accessibility.Accessible;
 import com.sun.star.accessibility.AccessibleRelation;
 import com.sun.star.accessibility.XAccessible;
 
-/**
+/** 
  */
 public abstract class AccessibleRelationTypeMap {
-
-    final static String[] data = {
+    
+    final static String[] data = { 
         null,
         javax.accessibility.AccessibleRelation.CONTROLLED_BY,
         javax.accessibility.AccessibleRelation.CONTROLLED_BY,
@@ -48,14 +48,14 @@ public abstract class AccessibleRelationTypeMap {
         javax.accessibility.AccessibleRelation.MEMBER_OF,
         javax.accessibility.AccessibleRelation.MEMBER_OF
     };
-
+    
     public static void fillAccessibleRelationSet(javax.accessibility.AccessibleRelationSet s, AccessibleRelation[] relations) {
         AccessibleObjectFactory factory = AccessibleObjectFactory.getDefault();
         for(int i=0; i<relations.length; i++) {
             if( relations[i].RelationType < data.length && data[relations[i].RelationType] != null ) {
-                javax.accessibility.AccessibleRelation r =
+                javax.accessibility.AccessibleRelation r = 
                     new javax.accessibility.AccessibleRelation(data[relations[i].RelationType]);
-
+                
                 r.setTarget(factory.getAccessibleObjectSet(relations[i].TargetSet));
                 s.add(r);
             }
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleRoleAdapter.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleRoleAdapter.java
index c7f630fdd3ab..468b641c937e 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleRoleAdapter.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleRoleAdapter.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,20 +33,20 @@ import com.sun.star.accessibility.XAccessibleContext;
 /** This class maps the AccessibleRole(s) of the UNO accessibility API
  *  to the corresponding javax.accessibility objects.
  */
-public abstract class AccessibleRoleAdapter {
-
+public abstract class AccessibleRoleAdapter { 
+    
     /* This array is used as a mapping between the UNO AccessibleRole
     * and the AccessibleRole objects of the Java accessibility API.
     */
-    public static final javax.accessibility.AccessibleRole[] data = {
+    public static final javax.accessibility.AccessibleRole[] data = { 
         javax.accessibility.AccessibleRole.UNKNOWN,
-        javax.accessibility.AccessibleRole.ALERT,
+        javax.accessibility.AccessibleRole.ALERT, 
         javax.accessibility.AccessibleRole.COLUMN_HEADER,
         javax.accessibility.AccessibleRole.CANVAS,
         javax.accessibility.AccessibleRole.CHECK_BOX,
         javax.accessibility.AccessibleRole.CHECK_BOX,   // CHECK_MENU_ITEM
         javax.accessibility.AccessibleRole.COLOR_CHOOSER,
-        javax.accessibility.AccessibleRole.COMBO_BOX,
+        javax.accessibility.AccessibleRole.COMBO_BOX, 
         javax.accessibility.AccessibleRole.DATE_EDITOR,
         javax.accessibility.AccessibleRole.DESKTOP_ICON,
         javax.accessibility.AccessibleRole.DESKTOP_PANE,
@@ -96,7 +96,7 @@ public abstract class AccessibleRoleAdapter {
         javax.accessibility.AccessibleRole.SLIDER,
         javax.accessibility.AccessibleRole.SPIN_BOX,
         javax.accessibility.AccessibleRole.SPLIT_PANE,
-        javax.accessibility.AccessibleRole.STATUS_BAR,
+        javax.accessibility.AccessibleRole.STATUS_BAR, 
         javax.accessibility.AccessibleRole.TABLE,
         javax.accessibility.AccessibleRole.LABEL,  // TABLE_CELL - required by ZoomText
         javax.accessibility.AccessibleRole.TEXT,
@@ -119,9 +119,9 @@ public abstract class AccessibleRoleAdapter {
     javax.accessibility.AccessibleRole.RULER,
     javax.accessibility.AccessibleRole.PANEL,  // SECTION
     javax.accessibility.AccessibleRole.LABEL,  // TREE_ITEM
-    javax.accessibility.AccessibleRole.TABLE   // TREE_TABLE
+    javax.accessibility.AccessibleRole.TABLE   // TREE_TABLE	
     };
-
+    
     public static javax.accessibility.AccessibleRole getAccessibleRole(short role) {
         if(role < data.length) {
             if(data[role] == null) {
@@ -133,7 +133,7 @@ public abstract class AccessibleRoleAdapter {
         System.err.println("Unmappable role: " + role);
         return null;
     }
-
+    
     public static javax.accessibility.AccessibleRole getAccessibleRole(XAccessible unoAccessible) {
         try {
                         XAccessibleContext unoAccessibleContext = unoAccessible.getAccessibleContext();
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleSelectionImpl.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleSelectionImpl.java
index 6e40c1e7a78d..312460f23fa0 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleSelectionImpl.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleSelectionImpl.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,11 +31,11 @@ import com.sun.star.accessibility.*;
 
 class AccessibleSelectionImpl implements javax.accessibility.AccessibleSelection {
     XAccessibleSelection unoAccessibleSelection;
-
+    
     AccessibleSelectionImpl(XAccessibleSelection xAccessibleSelection) {
         unoAccessibleSelection = xAccessibleSelection;
     }
-
+    
     /** Returns an Accessible representing the specified selected child of the object */
     public javax.accessibility.Accessible getAccessibleSelection(int i) {
         try {
@@ -95,5 +95,5 @@ class AccessibleSelectionImpl implements javax.accessibility.AccessibleSelection
         } catch (com.sun.star.uno.RuntimeException e) {
         }
     }
-
+    
 }
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleStateAdapter.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleStateAdapter.java
index ea1979a545ed..36ed08466636 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleStateAdapter.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleStateAdapter.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
@@ -69,11 +69,11 @@ public class AccessibleStateAdapter {
         AccessibleState.VERTICAL,
         AccessibleState.VISIBLE
     };
-
+    
     private static void printToplevelStateMessage(AccessibleState s, java.awt.Component c) {
         System.err.println("*** ERROR *** " + s + " state is a toplevel window state " + c);
     }
-
+    
     private static String getDisplayName(java.awt.Component c) {
         javax.accessibility.Accessible a = (javax.accessibility.Accessible) c;
         if( a != null) {
@@ -83,11 +83,11 @@ public class AccessibleStateAdapter {
             return c.toString();
         }
     }
-
+    
     private static void printOutOfSyncMessage(AccessibleState s, java.awt.Component c, boolean enabled) {
         System.err.println("*** ERROR *** " + s + " state out of sync (UNO state set: " + !enabled + ", Java component state: " + enabled + ") for " + getDisplayName(c));
     }
-
+    
     public static AccessibleState getAccessibleState(Object any) {
        try {
             if (AnyConverter.isShort(any)) {
@@ -97,24 +97,24 @@ public class AccessibleStateAdapter {
         } catch (com.sun.star.lang.IllegalArgumentException e) {
             return null;
         }
-    }
-
+    }        
+    
     public static AccessibleState getAccessibleState(short unoStateType) {
         if (unoStateType > 0 && unoStateType < stateTypeMap.length) {
             return stateTypeMap[unoStateType];
         }
         return null;
     }
-
+    
     public static AccessibleStateSet getDefunctStateSet() {
         AccessibleStateSet ass = new AccessibleStateSet();
         ass.add(AccessibleExtendedState.DEFUNCT);
         return ass;
     }
-
+    
     public static void setComponentState(java.awt.Component c,
             XAccessibleStateSet xAccessibleStateSet) {
-
+        
         try {
             if (xAccessibleStateSet != null) {
                 // Set the boundings of the component if it is visible ..
@@ -132,28 +132,28 @@ public class AccessibleStateAdapter {
             }
         } catch (com.sun.star.uno.RuntimeException e) {
         }
-    }
+    }		    
 
     public static AccessibleStateSet getAccessibleStateSet(java.awt.Component c,
             XAccessibleStateSet xAccessibleStateSet) {
-
+                
         try {
             if (xAccessibleStateSet != null) {
                 AccessibleStateSet as = new AccessibleStateSet();
                 short[] unoStateTypes = xAccessibleStateSet.getStates();
                 for (int i=0; i<unoStateTypes.length; i++) {
-                    if (unoStateTypes[i] > 0 &&
+                    if (unoStateTypes[i] > 0 && 
                             unoStateTypes[i] < stateTypeMap.length) {
                         as.add(stateTypeMap[unoStateTypes[i]]);
                     }
                 }
-
+            
                 // Note: COLLAPSED does not exists in the UAA.
                 if (as.contains(AccessibleState.EXPANDABLE) &&
                         ! as.contains(AccessibleState.EXPANDED)) {
                     as.add(AccessibleState.COLLAPSED);
                 }
-
+            
                 // Sync office and Java FOCUSED state
                 boolean isFocusInSync;
                 if (c.isFocusOwner()) {
@@ -161,8 +161,8 @@ public class AccessibleStateAdapter {
                 } else {
                     isFocusInSync = !as.remove(AccessibleState.FOCUSED);
                 }
-
-                // Sync office and Java ACTIVE state
+                
+                // Sync office and Java ACTIVE state 
                 boolean isActiveInSync;
                 if (c instanceof java.awt.Window && ((java.awt.Window) c).isActive()) {
                     isActiveInSync = !as.add(AccessibleState.ACTIVE);
@@ -190,7 +190,7 @@ public class AccessibleStateAdapter {
                     if (as.contains(AccessibleState.VISIBLE) != c.isVisible()) {
                         printOutOfSyncMessage(AccessibleState.VISIBLE, c, c.isVisible());
                     }
-
+                
                     // The following states are for toplevel windows only
                     if (! (c instanceof java.awt.Window)) {
                         if (as.contains(AccessibleState.ACTIVE)) {
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleTextImpl.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleTextImpl.java
index c3bcbde2a71a..112b7744b867 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleTextImpl.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleTextImpl.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 AccessibleTextImpl implements javax.accessibility.AccessibleText {
         "ParaLeftMargin", "ParaLineSpacing", "ParaTopMargin", "ParaBottomMargin",
         "CharStrikeout", "CharEscapement", "ParaTabStops", "CharUnderline"
     };
-
+    
     final static String[] localeAttributeList = {
         "CharLocale", "CharLocaleAsian", "CharLocaleComplex"
     };
@@ -65,7 +65,7 @@ public class AccessibleTextImpl implements javax.accessibility.AccessibleText {
 
     /** Creates new GenericAccessibleEditableText object */
     public AccessibleTextImpl(XAccessibleText xAccessibleText) {
-
+        
         if (Build.PRODUCT) {
             unoObject = xAccessibleText;
         } else {
@@ -77,13 +77,13 @@ public class AccessibleTextImpl implements javax.accessibility.AccessibleText {
             }
         }
     }
-
+    
     public AccessibleTextImpl() {
     }
-
+    
     public static javax.accessibility.AccessibleText get(com.sun.star.uno.XInterface unoObject) {
         try {
-            XAccessibleText unoAccessibleText = (XAccessibleText)
+            XAccessibleText unoAccessibleText = (XAccessibleText) 
                 UnoRuntime.queryInterface(XAccessibleText.class, unoObject);
             if (unoAccessibleText != null) {
                 return new AccessibleTextImpl(unoAccessibleText);
@@ -96,7 +96,7 @@ public class AccessibleTextImpl implements javax.accessibility.AccessibleText {
     protected static Object convertTextSegment(Object any) {
         try {
             if (AnyConverter.isObject(any)) {
-                TextSegment ts = (TextSegment)
+                TextSegment ts = (TextSegment) 
                     AnyConverter.toObject(TextSegmentType, any);
                 if (ts != null) {
                     // Since there is nothing like a "range" object in the JAA yet,
@@ -108,7 +108,7 @@ public class AccessibleTextImpl implements javax.accessibility.AccessibleText {
             }
         } catch (com.sun.star.lang.IllegalArgumentException e) {
         }
-
+        
         return null;
     }
 
@@ -126,9 +126,9 @@ public class AccessibleTextImpl implements javax.accessibility.AccessibleText {
 
     protected java.util.Locale getLocale(int index) {
         try {
-            com.sun.star.beans.PropertyValue[] propertyValues =
+            com.sun.star.beans.PropertyValue[] propertyValues = 
                 unoObject.getCharacterAttributes(index, localeAttributeList);
-
+                
             if (null != propertyValues) {
                 for (int i = 0; i < propertyValues.length; i++) {
                     com.sun.star.lang.Locale unoLocale = (com.sun.star.lang.Locale)
@@ -146,11 +146,11 @@ public class AccessibleTextImpl implements javax.accessibility.AccessibleText {
             return java.util.Locale.getDefault();
         }
     }
+    
 
-
-    /** Returns the string after a given index
+    /** Returns the string after a given index 
      *
-     *  The Java word iterator has a different understanding of what
+     *  The Java word iterator has a different understanding of what 
      *  a word is than the word iterator used by OOo, so we use the
      *  Java iterators to ensure maximal compatibility with Java.
      */
@@ -185,7 +185,7 @@ public class AccessibleTextImpl implements javax.accessibility.AccessibleText {
         case AccessibleText.SENTENCE:
             try {
                 String s = unoObject.getText();
-                BreakIterator sentence =
+                BreakIterator sentence = 
                     BreakIterator.getSentenceInstance(getLocale(index));
                 sentence.setText(s);
                 int start = sentence.following(index);
@@ -366,7 +366,7 @@ public class AccessibleTextImpl implements javax.accessibility.AccessibleText {
                         (float) (toPointFactor * ls.Height));
                 }
             }
-            // FIXME: Java 1.4 NameAttribute, Orientation, ResolveAttribute
+            // FIXME: Java 1.4 NameAttribute, Orientation, ResolveAttribute 
             // Set space above attribute
             else if (property.Name.equals("ParaTopMargin")) {
                 StyleConstants.setSpaceAbove(as,
@@ -497,7 +497,7 @@ public class AccessibleTextImpl implements javax.accessibility.AccessibleText {
 
     /** Returns the string before a given index
      *
-     *  The Java word iterator has a different understanding of what
+     *  The Java word iterator has a different understanding of what 
      *  a word is than the word iterator used by OOo, so we use the
      *  Java iterators to ensure maximal compatibility with Java.
      */
@@ -530,7 +530,7 @@ public class AccessibleTextImpl implements javax.accessibility.AccessibleText {
         case AccessibleText.SENTENCE:
             try {
                 String s = unoObject.getText();
-                BreakIterator sentence =
+                BreakIterator sentence = 
                     BreakIterator.getSentenceInstance(getLocale(index));
                 sentence.setText(s);
                 int end = sentence.following(index);
@@ -575,7 +575,7 @@ public class AccessibleTextImpl implements javax.accessibility.AccessibleText {
 
     /** Returns the string at a given index
      *
-     *  The Java word iterator has a different understanding of what
+     *  The Java word iterator has a different understanding of what 
      *  a word is than the word iterator used by OOo, so we use the
      *  Java iterators to ensure maximal compatibility with Java.
      */
@@ -603,7 +603,7 @@ public class AccessibleTextImpl implements javax.accessibility.AccessibleText {
         case AccessibleText.SENTENCE:
             try {
                 String s = unoObject.getText();
-                BreakIterator sentence =
+                BreakIterator sentence = 
                     BreakIterator.getSentenceInstance(getLocale(index));
                 sentence.setText(s);
                 int end = sentence.following(index);
@@ -635,7 +635,7 @@ public class AccessibleTextImpl implements javax.accessibility.AccessibleText {
             } catch (com.sun.star.lang.IllegalArgumentException e) {
                 return null;
             }
-
+        
         default:
             return null;
         }
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleValueImpl.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleValueImpl.java
index cabbf3f5d323..d386e9bcc942 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleValueImpl.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleValueImpl.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.AnyConverter;
  */
 public class AccessibleValueImpl implements javax.accessibility.AccessibleValue {
     protected XAccessibleValue unoObject;
-
+    
     /** Creates new AccessibleValueImpl */
     public AccessibleValueImpl(XAccessibleValue xAccessibleValue) {
         unoObject = xAccessibleValue;
     }
-
+    
     public static java.lang.Number toNumber(java.lang.Object any) {
         try {
             if(AnyConverter.isByte(any)) {
@@ -58,10 +58,10 @@ public class AccessibleValueImpl implements javax.accessibility.AccessibleValue
             }
         } catch (com.sun.star.lang.IllegalArgumentException e) {
         }
-
+        
         return null;
     }
-
+    
     public java.lang.Number getMinimumAccessibleValue() {
         try {
             return toNumber(unoObject.getMinimumValue());
@@ -69,7 +69,7 @@ public class AccessibleValueImpl implements javax.accessibility.AccessibleValue
             return null;
         }
     }
-
+    
     public java.lang.Number getCurrentAccessibleValue() {
         try {
             return toNumber(unoObject.getCurrentValue());
@@ -77,7 +77,7 @@ public class AccessibleValueImpl implements javax.accessibility.AccessibleValue
             return null;
         }
     }
-
+    
     public java.lang.Number getMaximumAccessibleValue() {
         try {
             return toNumber(unoObject.getMaximumValue());
@@ -85,7 +85,7 @@ public class AccessibleValueImpl implements javax.accessibility.AccessibleValue
             return null;
         }
     }
-
+    
     public boolean setCurrentAccessibleValue(java.lang.Number number) {
         try {
             return unoObject.setCurrentValue(number);
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Alert.java b/accessibility/bridge/org/openoffice/java/accessibility/Alert.java
index e853fabecba0..158fb0d7c81c 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Alert.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Alert.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
@@ -24,22 +24,22 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 package org.openoffice.java.accessibility;
 
 import javax.accessibility.AccessibleRole;
 import com.sun.star.accessibility.*;
 
 public class Alert extends Dialog {
-
+    
     protected Alert(java.awt.Frame owner, XAccessibleComponent xAccessibleComponent) {
         super(owner, xAccessibleComponent);
     }
-
+    
     protected Alert(java.awt.Frame owner, String name, XAccessibleComponent xAccessibleComponent) {
         super(owner, name, xAccessibleComponent);
     }
-
+    
     protected Alert(java.awt.Frame owner, String name, boolean modal, XAccessibleComponent xAccessibleComponent) {
         super(owner, name, modal, xAccessibleComponent);
     }
@@ -52,13 +52,13 @@ public class Alert extends Dialog {
         }
         return accessibleContext;
     }
-
+    
     protected class AccessibleAlert extends AccessibleDialog {
-
+        
         protected AccessibleAlert() {
             super();
         }
-
+        
         public AccessibleRole getAccessibleRole() {
             return AccessibleRole.ALERT;
         }
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Application.java b/accessibility/bridge/org/openoffice/java/accessibility/Application.java
index c67da714f4df..c16f30c37e40 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Application.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Application.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,13 +31,13 @@ import javax.accessibility.Accessible;
 import javax.accessibility.AccessibleContext;
 
 public class Application extends java.awt.Frame implements Accessible {
-
+    
     protected AccessibleContext accessibleContext = null;
-
+    
     protected Application() {
         super();
     }
-
+    
     public boolean isShowing() {
         return true;
     }
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Button.java b/accessibility/bridge/org/openoffice/java/accessibility/Button.java
index 44bccc30ffc1..08cf7d7c67ca 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Button.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Button.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,21 +45,21 @@ class Button extends AbstractButton implements javax.accessibility.Accessible {
         protected AccessibleButtonListener() {
             super();
         }
-
+    
         protected javax.accessibility.AccessibleContext getContext( Object any ) {
             try {
-                XAccessible xAccessible = (XAccessible)
+                XAccessible xAccessible = (XAccessible) 
                     AnyConverter.toObject( AccessibleObjectFactory.XAccessibleType, any );
-
-                    javax.accessibility.Accessible accessible =
+            
+                    javax.accessibility.Accessible accessible = 
                     (javax.accessibility.Accessible) Button.this.getComponent( xAccessible );
-
+                    
                     return accessible.getAccessibleContext();
             } catch( com.sun.star.uno.Exception e ) {
                 return null;
             }
         }
-
+        
         /** Called by OpenOffice process to notify property changes */
         public void notifyEvent(AccessibleEventObject event) {
             switch (event.EventId) {
@@ -67,7 +67,7 @@ class Button extends AbstractButton implements javax.accessibility.Accessible {
                     java.awt.Component c = getComponent(unoAccessible);
 
                     Object values[] = { null, null };
-
+                    
                     if (AnyConverter.isObject(event.OldValue)) {
                         values[0] = getContext( event.OldValue );
                     }
@@ -85,7 +85,7 @@ class Button extends AbstractButton implements javax.accessibility.Accessible {
             }
         }
     }
-
+    
     /** Creates the AccessibleContext associated with this object */
     public javax.accessibility.AccessibleContext createAccessibleContext() {
         return new AccessibleButton();
@@ -109,14 +109,14 @@ class Button extends AbstractButton implements javax.accessibility.Accessible {
 
         return c;
     }
-
+    
     protected class AccessibleButton extends AccessibleAbstractButton {
 
         /** Gets the role of this object */
         public javax.accessibility.AccessibleRole getAccessibleRole() {
             return javax.accessibility.AccessibleRole.PUSH_BUTTON;
         }
-
+        
         /** Returns the number of accessible children of the object */
         public int getAccessibleChildrenCount() {
             try {
@@ -135,7 +135,7 @@ class Button extends AbstractButton implements javax.accessibility.Accessible {
             }
             return null;
         }
-
+        
         /*
         * AccessibleComponent
         */
@@ -151,7 +151,7 @@ class Button extends AbstractButton implements javax.accessibility.Accessible {
                 return null;
             }
         }
-
+        
     }
 }
 
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/CheckBox.java b/accessibility/bridge/org/openoffice/java/accessibility/CheckBox.java
index 624dfd048c89..b7a401497d87 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/CheckBox.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/CheckBox.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 @@ import com.sun.star.uno.*;
 import com.sun.star.accessibility.*;
 
 class CheckBox extends ToggleButton {
-
+    
     public CheckBox(XAccessible xAccessible, XAccessibleContext xAccessibleContext) {
         super(xAccessible, xAccessibleContext);
     }
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java b/accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java
index 5f5cf4a34374..5f36ff42a450 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/ComboBox.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
@@ -48,7 +48,7 @@ public class ComboBox extends Container {
 
     /** Appends the specified component to the end of this container */
     public java.awt.Component add(java.awt.Component c) {
-        // List should be always the first child
+        // List should be always the first child 
         if (c instanceof List) {
             return super.add(c, 0);
         } else {
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Component.java b/accessibility/bridge/org/openoffice/java/accessibility/Component.java
index 21043e1f5098..5101080f9ab7 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Component.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Component.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,18 +36,18 @@ import com.sun.star.accessibility.*;
 public abstract class Component extends java.awt.Component {
     public static final Type RectangleType = new Type(com.sun.star.awt.Rectangle.class);
     public static final Type SelectionType = new Type(com.sun.star.awt.Selection.class);
-
+    
     protected XAccessible unoAccessible;
     protected XAccessibleContext unoAccessibleContext;
     protected XAccessibleComponent unoAccessibleComponent;
-
+    
     protected boolean disposed = false;
-
+    
     protected Component(XAccessible xAccessible, XAccessibleContext xAccessibleContext) {
         super();
         unoAccessible = xAccessible;
         unoAccessibleContext = xAccessibleContext;
-        unoAccessibleComponent = (XAccessibleComponent)
+        unoAccessibleComponent = (XAccessibleComponent) 
             UnoRuntime.queryInterface(XAccessibleComponent.class, xAccessibleContext);
         // Add the event listener right away, because the global focus notification doesn't
         // work yet ..
@@ -58,10 +58,10 @@ public abstract class Component extends java.awt.Component {
             broadcaster.addEventListener(createEventListener());
         }
     }
-
+    
     /**
-    * Determines whether this <code>Component</code> is showing on screen.
-    * This means that the component must be visible, and it must be in a
+    * Determines whether this <code>Component</code> is showing on screen. 
+    * This means that the component must be visible, and it must be in a 
     * <code>container</code> that is visible and showing.
     * @see       #addNotify
     * @see       #removeNotify
@@ -74,10 +74,10 @@ public abstract class Component extends java.awt.Component {
         }
         return false;
     }
-
+    
     /**
     * Makes this <code>Component</code> displayable by connecting it to a
-    * native screen resource.
+    * native screen resource.  
     * This method is called internally by the toolkit and should
     * not be called directly by programs.
     * @see       #isDisplayable
@@ -86,10 +86,10 @@ public abstract class Component extends java.awt.Component {
     */
     public void addNotify() {
     }
-
-    /**
+    
+    /** 
     * Makes this <code>Component</code> undisplayable by destroying it native
-    * screen resource.
+    * screen resource. 
     * This method is called by the toolkit internally and should
     * not be called directly by programs.
     * @see       #isDisplayable
@@ -98,37 +98,37 @@ public abstract class Component extends java.awt.Component {
     */
     public void removeNotify() {
     }
-
+    
     /*
      * Fake the java focus handling. This is necessary to keep OOo focus
      * in sync with the java focus. See java.awt.DefaultKeyboardFocusManager
      * for implementation details.
      **/
-
+    
     /** Requests focus for this object */
     public void requestFocus() {
     }
-
+    
     /** Requests focus for this object */
     public boolean requestFocus(boolean temporary) {
         // Must be a no-op to make focus handling work
         return true;
     }
-
+    
     /** Requests the focus for this object in the containing window */
     public boolean requestFocusInWindow() {
         return requestFocusInWindow(false);
     }
-
+    
     /** Requests the focus for this object in the containing window */
     protected boolean requestFocusInWindow(boolean temporary) {
         if (isFocusable() && isVisible()) {
-            getEventQueue().postEvent(new java.awt.event.FocusEvent(this, java.awt.event.FocusEvent.FOCUS_GAINED, temporary));
+            getEventQueue().postEvent(new java.awt.event.FocusEvent(this, java.awt.event.FocusEvent.FOCUS_GAINED, temporary)); 
             return true;
         }
         return false;
     }
-
+    
     public Object[] getAccessibleComponents(Object[] targetSet) {
         try {
             java.util.ArrayList list = new java.util.ArrayList(targetSet.length);
@@ -145,22 +145,22 @@ public abstract class Component extends java.awt.Component {
             return null;
         }
     }
-
+    
     protected java.awt.EventQueue getEventQueue() {
         return java.awt.Toolkit.getDefaultToolkit().getSystemEventQueue();
     }
-
+    
     protected class PropertyChangeBroadcaster implements Runnable {
         String propertyName;
         Object oldValue;
         Object newValue;
-
+        
         public PropertyChangeBroadcaster(String name, Object param1, Object param2) {
             propertyName = name;
             oldValue = param1;
             newValue = param2;
         }
-
+        
         public void run() {
             // Because this code is executed in the DispatchThread, it is better to catch every
             // exception that might occur
@@ -177,19 +177,19 @@ public abstract class Component extends java.awt.Component {
             }
         }
     }
-
+    
     protected void firePropertyChange(String property, Object oldValue, Object newValue) {
         getEventQueue().invokeLater(new PropertyChangeBroadcaster(property, oldValue, newValue));
     }
-
+    
     protected void fireStatePropertyChange(AccessibleState state, boolean set) {
         PropertyChangeBroadcaster broadcaster;
-
+        
 //      if (Build.DEBUG) {
 //          System.err.println("[" + AccessibleRoleAdapter.getAccessibleRole(unoAccessibleContext.getAccessibleRole()) + "] " +
 //                  unoAccessibleContext.getAccessibleName() + " is " + (set ? "now " : "no longer ") + state);
 //      }
-
+        
         if (set) {
             broadcaster = new PropertyChangeBroadcaster(
                 accessibleContext.ACCESSIBLE_STATE_PROPERTY,
@@ -201,15 +201,15 @@ public abstract class Component extends java.awt.Component {
         }
         getEventQueue().invokeLater(broadcaster);
     }
-
+    
     /**
     * Update the proxy objects appropriatly on property change events
     */
     protected class AccessibleUNOComponentListener implements XAccessibleEventListener {
-
+        
         protected AccessibleUNOComponentListener() {
         }
-
+        
         protected void setComponentState(short state, boolean enable) {
             switch (state) {
                 case AccessibleStateType.ACTIVE:
@@ -229,8 +229,8 @@ public abstract class Component extends java.awt.Component {
                     break;
                 case AccessibleStateType.FOCUSED:
                     getEventQueue().postEvent(new java.awt.event.FocusEvent(
-                        Component.this, enable ?
-                        java.awt.event.FocusEvent.FOCUS_GAINED :
+                        Component.this, enable ? 
+                        java.awt.event.FocusEvent.FOCUS_GAINED : 
                         java.awt.event.FocusEvent.FOCUS_LOST));
                     break;
                 case AccessibleStateType.PRESSED:
@@ -255,7 +255,7 @@ public abstract class Component extends java.awt.Component {
                     break;
             }
         }
-
+        
         /** Updates the accessible name and fires the appropriate PropertyChangedEvent */
         protected void handleNameChangedEvent(Object any) {
             try {
@@ -268,7 +268,7 @@ public abstract class Component extends java.awt.Component {
             } catch (com.sun.star.lang.IllegalArgumentException e) {
             }
         }
-
+        
         /** Updates the accessible description and fires the appropriate PropertyChangedEvent */
         protected void handleDescriptionChangedEvent(Object any) {
             try {
@@ -281,26 +281,26 @@ public abstract class Component extends java.awt.Component {
             } catch (com.sun.star.lang.IllegalArgumentException e) {
             }
         }
-
+        
         /** Updates the internal states and fires the appropriate PropertyChangedEvent */
         protected void handleStateChangedEvent(Object any1, Object any2) {
             try {
                 if (AnyConverter.isShort(any1)) {
                     setComponentState(AnyConverter.toShort(any1), false);
                 }
-
+                
                 if (AnyConverter.isShort(any2)) {
                     setComponentState(AnyConverter.toShort(any2), true);
                 }
             } catch (com.sun.star.lang.IllegalArgumentException e) {
             }
         }
-
+        
         /** Called by OpenOffice process to notify property changes */
         public void notifyEvent(AccessibleEventObject event) {
-
+            
             if ( !disposed ) {
-
+                
                 switch (event.EventId) {
                     case AccessibleEventId.ACTION_CHANGED:
                         firePropertyChange(accessibleContext.ACCESSIBLE_ACTION_PROPERTY,
@@ -331,7 +331,7 @@ public abstract class Component extends java.awt.Component {
                         break;
                     case AccessibleEventId.TEXT_CHANGED:
                         firePropertyChange(AccessibleContext.ACCESSIBLE_TEXT_PROPERTY,
-                                                AccessibleTextImpl.convertTextSegment(event.OldValue),
+                                                AccessibleTextImpl.convertTextSegment(event.OldValue), 
                                                 AccessibleTextImpl.convertTextSegment(event.NewValue));
                         break;
                     /*
@@ -354,20 +354,20 @@ public abstract class Component extends java.awt.Component {
                 }
             }
         }
-
+        
         /** Called by OpenOffice process to notify that the UNO component is disposing */
         public void disposing(com.sun.star.lang.EventObject eventObject) {
             disposed = true;
             AccessibleObjectFactory.disposing(Component.this);
         }
     }
-
+    
     protected XAccessibleEventListener createEventListener() {
         return new AccessibleUNOComponentListener();
     }
-
+    
     protected javax.accessibility.AccessibleContext accessibleContext = null;
-
+    
     /** This method actually creates the AccessibleContext object returned by
      * getAccessibleContext().
      */
@@ -381,7 +381,7 @@ public abstract class Component extends java.awt.Component {
             try {
                 AccessibleContext ac = createAccessibleContext();
                 if (ac != null) {
-                    // Set accessible name and description here to avoid
+                    // Set accessible name and description here to avoid 
                     // unnecessary property change events later ..
                     ac.setAccessibleName(unoAccessibleContext.getAccessibleName());
                     ac.setAccessibleDescription(unoAccessibleContext.getAccessibleDescription());
@@ -392,12 +392,12 @@ public abstract class Component extends java.awt.Component {
         }
         return accessibleContext;
     }
-
-    protected abstract class AccessibleUNOComponent extends java.awt.Component.AccessibleAWTComponent
+    
+    protected abstract class AccessibleUNOComponent extends java.awt.Component.AccessibleAWTComponent 
         implements javax.accessibility.AccessibleExtendedComponent {
-
+        
         protected java.awt.event.ComponentListener accessibleComponentHandler = null;
-
+        
         /**
         * Fire PropertyChange listener, if one is registered,
         * when shown/hidden..
@@ -408,22 +408,22 @@ public abstract class Component extends java.awt.Component {
                     AccessibleContext.ACCESSIBLE_STATE_PROPERTY,
                     AccessibleState.VISIBLE, null);
             }
-
+            
             public void componentShown(java.awt.event.ComponentEvent e)  {
                 AccessibleUNOComponent.this.firePropertyChange(
                     AccessibleContext.ACCESSIBLE_STATE_PROPERTY,
                     null, AccessibleState.VISIBLE);
             }
-
+            
             public void componentMoved(java.awt.event.ComponentEvent e)  {
             }
-
+            
             public void componentResized(java.awt.event.ComponentEvent e)  {
             }
         } // inner class AccessibleComponentHandler
-
+        
         protected java.awt.event.FocusListener accessibleFocusHandler = null;
-
+        
         /**
         * Fire PropertyChange listener, if one is registered,
         * when focus events happen
@@ -446,9 +446,9 @@ public abstract class Component extends java.awt.Component {
                 }
             }
         } // inner class AccessibleFocusHandler
-
+        
         protected int propertyChangeListenerCount = 0;
-
+        
         /**
         * Add a PropertyChangeListener to the listener list.
         *
@@ -458,13 +458,13 @@ public abstract class Component extends java.awt.Component {
             if (propertyChangeListenerCount++ == 0) {
                 accessibleComponentHandler = new AccessibleComponentHandler();
                 Component.this.addComponentListener(accessibleComponentHandler);
-
+                
                 accessibleFocusHandler = new AccessibleFocusHandler();
                 Component.this.addFocusListener(accessibleFocusHandler);
             }
             super.addPropertyChangeListener(listener);
         }
-
+        
         /**
         * Remove a PropertyChangeListener from the listener list.
         * This removes a PropertyChangeListener that was registered
@@ -476,7 +476,7 @@ public abstract class Component extends java.awt.Component {
             if (--propertyChangeListenerCount == 0) {
                 Component.this.removeComponentListener(accessibleComponentHandler);
                 accessibleComponentHandler = null;
-
+                
                 Component.this.removeFocusListener(accessibleFocusHandler);
                 accessibleFocusHandler = null;
             }
@@ -501,7 +501,7 @@ public abstract class Component extends java.awt.Component {
                 return AccessibleStateAdapter.getDefunctStateSet();
             }
         }
-
+        
         /** Gets the locale of the component */
         public java.util.Locale getLocale() throws java.awt.IllegalComponentStateException {
             try {
@@ -513,11 +513,11 @@ public abstract class Component extends java.awt.Component {
                 return java.util.Locale.getDefault();
             }
         }
-
+        
         /*
         * AccessibleExtendedComponent
         */
-
+        
         /** Returns the background color of the object */
         public java.awt.Color getBackground() {
             try {
@@ -526,11 +526,11 @@ public abstract class Component extends java.awt.Component {
                 return null;
             }
         }
-
+        
         public void setBackground(java.awt.Color c) {
             // Not supported by UNO accessibility API
         }
-
+        
         /** Returns the foreground color of the object */
         public java.awt.Color getForeground() {
             try {
@@ -539,62 +539,62 @@ public abstract class Component extends java.awt.Component {
                 return null;
             }
         }
-
+        
         public void setForeground(java.awt.Color c) {
             // Not supported by UNO accessibility API
         }
-
+        
         public java.awt.Cursor getCursor() {
             // Not supported by UNO accessibility API
             return null;
         }
-
+        
         public void setCursor(java.awt.Cursor cursor) {
             // Not supported by UNO accessibility API
         }
-
+        
         public java.awt.Font getFont() {
             // FIXME
             return null;
         }
-
+        
         public void setFont(java.awt.Font f) {
             // Not supported by UNO accessibility API
         }
-
+        
         public java.awt.FontMetrics getFontMetrics(java.awt.Font f) {
             // FIXME
             return null;
         }
-
+        
         public boolean isEnabled() {
             return Component.this.isEnabled();
         }
-
+        
         public void setEnabled(boolean b) {
             // Not supported by UNO accessibility API
         }
-
+        
         public boolean isVisible() {
             return Component.this.isVisible();
         }
-
+        
         public void setVisible(boolean b) {
             // Not supported by UNO accessibility API
         }
-
+        
         public boolean isShowing() {
             return Component.this.isShowing();
         }
-
+        
         public boolean contains(java.awt.Point p) {
             try {
-                return unoAccessibleComponent.containsPoint(new com.sun.star.awt.Point(p.x, p.y));
+                return unoAccessibleComponent.containsPoint(new com.sun.star.awt.Point(p.x, p.y)); 
             } catch (com.sun.star.uno.RuntimeException e) {
                 return false;
             }
         }
-
+        
         /** Returns the location of the object on the screen. */
         public java.awt.Point getLocationOnScreen() {
             try {
@@ -607,68 +607,68 @@ public abstract class Component extends java.awt.Component {
                 return null;
             }
         }
-
+        
         /** Gets the location of this component in the form of a point specifying the component's top-left corner */
         public java.awt.Point getLocation() {
             try {
-                com.sun.star.awt.Point unoPoint = unoAccessibleComponent.getLocation();
+                com.sun.star.awt.Point unoPoint = unoAccessibleComponent.getLocation(); 
                 return new java.awt.Point( unoPoint.X, unoPoint.Y );
             } catch (com.sun.star.uno.RuntimeException e) {
                 return null;
             }
         }
-
+        
         /** Moves this component to a new location */
         public void setLocation(java.awt.Point p) {
             // Not supported by UNO accessibility API
         }
-
+        
         /** Gets the bounds of this component in the form of a Rectangle object */
         public java.awt.Rectangle getBounds() {
             try {
-                com.sun.star.awt.Rectangle unoRect = unoAccessibleComponent.getBounds();
+                com.sun.star.awt.Rectangle unoRect = unoAccessibleComponent.getBounds(); 
                 return new java.awt.Rectangle(unoRect.X, unoRect.Y, unoRect.Width, unoRect.Height);
             } catch (com.sun.star.uno.RuntimeException e) {
                 return null;
             }
         }
-
+        
         /** Moves and resizes this component to conform to the new bounding rectangle r */
         public void setBounds(java.awt.Rectangle r) {
             // Not supported by UNO accessibility API
         }
-
+        
         /** Returns the size of this component in the form of a Dimension object */
         public java.awt.Dimension getSize() {
             try {
-                com.sun.star.awt.Size unoSize = unoAccessibleComponent.getSize();
+                com.sun.star.awt.Size unoSize = unoAccessibleComponent.getSize(); 
                 return new java.awt.Dimension(unoSize.Width, unoSize.Height);
             } catch (com.sun.star.uno.RuntimeException e) {
                 return null;
             }
         }
-
+        
         /** Resizes this component so that it has width d.width and height d.height */
         public void setSize(java.awt.Dimension d) {
             // Not supported by UNO accessibility API
         }
-
+        
         public javax.accessibility.Accessible getAccessibleAt(java.awt.Point p) {
             // Not supported by this implementation
             return null;
         }
-
+        
         public boolean isFocusTraversable() {
             return Component.this.isFocusable();
         }
-
+        
         public void requestFocus() {
             unoAccessibleComponent.grabFocus();
         }
-
+        
         public String getToolTipText() {
             try {
-                XAccessibleExtendedComponent unoAccessibleExtendedComponent = (XAccessibleExtendedComponent)
+                XAccessibleExtendedComponent unoAccessibleExtendedComponent = (XAccessibleExtendedComponent) 
                     UnoRuntime.queryInterface(XAccessibleExtendedComponent.class, unoAccessibleComponent);
                 if (unoAccessibleExtendedComponent != null) {
                     return unoAccessibleExtendedComponent.getToolTipText();
@@ -678,10 +678,10 @@ public abstract class Component extends java.awt.Component {
             }
             return null;
         }
-
+        
         public String getTitledBorderText() {
             try {
-                XAccessibleExtendedComponent unoAccessibleExtendedComponent = (XAccessibleExtendedComponent)
+                XAccessibleExtendedComponent unoAccessibleExtendedComponent = (XAccessibleExtendedComponent) 
                     UnoRuntime.queryInterface(XAccessibleExtendedComponent.class, unoAccessibleComponent);
                 if (unoAccessibleExtendedComponent != null) {
                     return unoAccessibleExtendedComponent.getTitledBorderText();
@@ -691,10 +691,10 @@ public abstract class Component extends java.awt.Component {
             }
             return null;
         }
-
+        
         public javax.accessibility.AccessibleKeyBinding getAccessibleKeyBinding() {
             try {
-                XAccessibleAction unoAccessibleAction = (XAccessibleAction)
+                XAccessibleAction unoAccessibleAction = (XAccessibleAction) 
                     UnoRuntime.queryInterface(XAccessibleAction.class, unoAccessibleComponent);
                 if (unoAccessibleAction != null) {
                     XAccessibleKeyBinding unoAccessibleKeyBinding = unoAccessibleAction.getAccessibleActionKeyBinding(0);
@@ -710,7 +710,7 @@ public abstract class Component extends java.awt.Component {
             return null;
         }
     }
-
+    
     // Extract a number from a UNO any
     public static java.lang.Number toNumber(java.lang.Object any) {
         try {
@@ -732,7 +732,7 @@ public abstract class Component extends java.awt.Component {
         }
             return null;
     }
-
+    
     public String toString() {
         return UnoRuntime.generateOid(unoAccessible);
     }
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Container.java b/accessibility/bridge/org/openoffice/java/accessibility/Container.java
index 257cdab8b757..b047075607ae 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Container.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Container.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,7 +34,7 @@ import com.sun.star.uno.*;
 import com.sun.star.accessibility.*;
 
 public class Container extends java.awt.Container implements javax.accessibility.Accessible {
-
+    
     protected XAccessible unoAccessible;
     protected XAccessibleContext unoAccessibleContext;
     protected XAccessibleComponent unoAccessibleComponent = null;
@@ -42,14 +42,14 @@ public class Container extends java.awt.Container implements javax.accessibility
     protected javax.accessibility.AccessibleRole accessibleRole;
     protected javax.accessibility.AccessibleText accessibleText;
     protected boolean disposed = false;
-
+    
     protected Container(javax.accessibility.AccessibleRole role,
         XAccessible xAccessible, XAccessibleContext xAccessibleContext) {
         accessibleRole = role;
         unoAccessible = xAccessible;
         unoAccessibleContext = xAccessibleContext;
-        unoAccessibleComponent = (XAccessibleComponent)
-            UnoRuntime.queryInterface(XAccessibleComponent.class,
+        unoAccessibleComponent = (XAccessibleComponent) 
+            UnoRuntime.queryInterface(XAccessibleComponent.class, 
             xAccessibleContext);
 
         // Add the event listener right away, because the global focus notification doesn't
@@ -61,10 +61,10 @@ public class Container extends java.awt.Container implements javax.accessibility
             broadcaster.addEventListener(createEventListener());
         }
     }
-
+    
     /**
-    * Determines whether this <code>Container</code> is showing on screen.
-    * This means that the component must be visible, and it must be in a
+    * Determines whether this <code>Container</code> is showing on screen. 
+    * This means that the component must be visible, and it must be in a 
     * <code>container</code> that is visible and showing.
     * @see       #addNotify
     * @see       #removeNotify
@@ -77,10 +77,10 @@ public class Container extends java.awt.Container implements javax.accessibility
         }
         return false;
     }
-
+    
     /**
     * Makes this <code>Container</code> displayable by connecting it to a
-    * native screen resource.
+    * native screen resource.  
     * This method is called internally by the toolkit and should
     * not be called directly by programs.
     * @see       #isDisplayable
@@ -89,10 +89,10 @@ public class Container extends java.awt.Container implements javax.accessibility
     */
     public void addNotify() {
     }
-
-    /**
+    
+    /** 
     * Makes this <code>Container</code> undisplayable by destroying it native
-    * screen resource.
+    * screen resource. 
     * This method is called by the toolkit internally and should
     * not be called directly by programs.
     * @see       #isDisplayable
@@ -111,27 +111,27 @@ public class Container extends java.awt.Container implements javax.accessibility
     /** Requests focus for this object */
     public void requestFocus() {
     }
-
+    
     /** Requests focus for this object */
     public boolean requestFocus(boolean temporary) {
         // Must be a no-op to make focus handling work
         return true;
     }
-
+    
     /** Requests the focus for this object in the containing window */
     public boolean requestFocusInWindow() {
         return requestFocusInWindow(false);
     }
-
+    
     /** Requests the focus for this object in the containing window */
     protected boolean requestFocusInWindow(boolean temporary) {
         if (isFocusable() && isVisible()) {
-            getEventQueue().postEvent(new java.awt.event.FocusEvent(this, java.awt.event.FocusEvent.FOCUS_GAINED, temporary));
+            getEventQueue().postEvent(new java.awt.event.FocusEvent(this, java.awt.event.FocusEvent.FOCUS_GAINED, temporary)); 
             return true;
         }
         return false;
     }
-
+    
     public Object[] getAccessibleComponents(Object[] targetSet) {
         try {
             java.util.ArrayList list = new java.util.ArrayList(targetSet.length);
@@ -148,22 +148,22 @@ public class Container extends java.awt.Container implements javax.accessibility
             return null;
         }
     }
-
+    
     protected java.awt.EventQueue getEventQueue() {
         return java.awt.Toolkit.getDefaultToolkit().getSystemEventQueue();
     }
-
+    
     protected class PropertyChangeBroadcaster implements Runnable {
         String propertyName;
         Object oldValue;
         Object newValue;
-
+        
         public PropertyChangeBroadcaster(String name, Object param1, Object param2) {
             propertyName = name;
             oldValue = param1;
             newValue = param2;
         }
-
+        
         public void run() {
             // Because this code is executed in the DispatchThread, it is better tocatch every
             // exception that might occur
@@ -180,11 +180,11 @@ public class Container extends java.awt.Container implements javax.accessibility
             }
         }
     }
-
+    
     protected void firePropertyChange(String property, Object oldValue, Object newValue) {
         getEventQueue().invokeLater(new PropertyChangeBroadcaster(property, oldValue, newValue));
     }
-
+    
     protected void fireStatePropertyChange(AccessibleState state, boolean set) {
         PropertyChangeBroadcaster broadcaster;
         if (set) {
@@ -198,19 +198,19 @@ public class Container extends java.awt.Container implements javax.accessibility
         }
         getEventQueue().invokeLater(broadcaster);
     }
-
+    
     /**
     * Update the proxy objects appropriatly on property change events
     */
     protected class AccessibleContainerListener implements XAccessibleEventListener {
-
+        
         protected AccessibleContainerListener() {
         }
-
+        
         protected java.awt.EventQueue getEventQueue() {
             return java.awt.Toolkit.getDefaultToolkit().getSystemEventQueue();
         }
-
+        
         protected void setComponentState(short state, boolean enable) {
             switch (state) {
                 case AccessibleStateType.ACTIVE:
@@ -224,8 +224,8 @@ public class Container extends java.awt.Container implements javax.accessibility
                     break;
                 case AccessibleStateType.FOCUSED:
                     getEventQueue().postEvent(new java.awt.event.FocusEvent(
-                        Container.this, enable ?
-                        java.awt.event.FocusEvent.FOCUS_GAINED :
+                        Container.this, enable ? 
+                        java.awt.event.FocusEvent.FOCUS_GAINED : 
                         java.awt.event.FocusEvent.FOCUS_LOST));
                     break;
                 case AccessibleStateType.SELECTED:
@@ -257,7 +257,7 @@ public class Container extends java.awt.Container implements javax.accessibility
             } catch (com.sun.star.lang.IllegalArgumentException e) {
             }
         }
-
+        
         /** Updates the accessible description and fires the appropriate PropertyChangedEvent */
         protected void handleDescriptionChangedEvent(Object any) {
             try {
@@ -270,21 +270,21 @@ public class Container extends java.awt.Container implements javax.accessibility
             } catch (com.sun.star.lang.IllegalArgumentException e) {
             }
         }
-
+        
         /** Updates the internal states and fires the appropriate PropertyChangedEvent */
         protected void handleStateChangedEvent(Object any1, Object any2) {
             try {
                 if (AnyConverter.isShort(any1)) {
                     setComponentState(AnyConverter.toShort(any1), false);
                 }
-
+                
                 if (AnyConverter.isShort(any2)) {
                     setComponentState(AnyConverter.toShort(any2), true);
                 }
             } catch (com.sun.star.lang.IllegalArgumentException e) {
             }
         }
-
+        
         /* This event is only necessary because some objects in the office don't know their parent
          *  and are therefor unable to revoke and re-insert themselves.
          */
@@ -293,15 +293,15 @@ public class Container extends java.awt.Container implements javax.accessibility
             if (parent != null) {
                 javax.accessibility.AccessibleContext parentAC = parent.getAccessibleContext();
                 if (parentAC != null) {
-
+                
                     parentAC.firePropertyChange(
                         javax.accessibility.AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
                         Container.this,
                         null);
-
-                    AccessibleObjectFactory.clearContainer(Container.this);
+                    
+                    AccessibleObjectFactory.clearContainer(Container.this);                    
                     AccessibleObjectFactory.populateContainer(Container.this, unoAccessibleContext);
-
+                        
                     parentAC.firePropertyChange(
                         javax.accessibility.AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
                         null,
@@ -309,12 +309,12 @@ public class Container extends java.awt.Container implements javax.accessibility
                 }
             }
         }
-
+        
         /** Called by OpenOffice process to notify property changes */
         public void notifyEvent(AccessibleEventObject event) {
-
+            
             if ( !disposed ) {
-
+                
                 switch (event.EventId) {
                     case AccessibleEventId.NAME_CHANGED:
                         // Set the accessible name for the corresponding context, which will fire a property
@@ -332,7 +332,7 @@ public class Container extends java.awt.Container implements javax.accessibility
                         break;
                     case AccessibleEventId.TEXT_CHANGED:
                         firePropertyChange(AccessibleContext.ACCESSIBLE_TEXT_PROPERTY,
-                                                AccessibleTextImpl.convertTextSegment(event.OldValue),
+                                                AccessibleTextImpl.convertTextSegment(event.OldValue), 
                                                 AccessibleTextImpl.convertTextSegment(event.NewValue));
                         break;
                     case AccessibleEventId.CHILD:
@@ -365,20 +365,20 @@ public class Container extends java.awt.Container implements javax.accessibility
                 }
             }
         }
-
+        
         /** Called by OpenOffice process to notify that the UNO component is disposing */
         public void disposing(com.sun.star.lang.EventObject eventObject) {
             disposed = true;
             AccessibleObjectFactory.disposing(Container.this);
         }
     }
-
+    
     protected XAccessibleEventListener createEventListener() {
         return new AccessibleContainerListener();
     }
-
+    
     protected javax.accessibility.AccessibleContext accessibleContext = null;
-
+    
     /** This method actually creates the AccessibleContext object returned by
      * getAccessibleContext().
      */
@@ -392,7 +392,7 @@ public class Container extends java.awt.Container implements javax.accessibility
             try {
                 AccessibleContext ac = createAccessibleContext();
                 if (ac != null) {
-                    // Set accessible name and description here to avoid
+                    // Set accessible name and description here to avoid 
                     // unnecessary property change events later ..
                     ac.setAccessibleName(unoAccessibleContext.getAccessibleName());
                     ac.setAccessibleDescription(unoAccessibleContext.getAccessibleDescription());
@@ -403,11 +403,11 @@ public class Container extends java.awt.Container implements javax.accessibility
         }
         return accessibleContext;
     }
-
-    protected class AccessibleContainer extends java.awt.Container.AccessibleAWTContainer {
+    
+    protected class AccessibleContainer extends java.awt.Container.AccessibleAWTContainer { 
 
         protected AccessibleContainer() {
-            /* Since getAccessibleText() is heavily used by the java access
+            /* Since getAccessibleText() is heavily used by the java access 
              * bridge for gnome and the gnome at-tools, we do a query interface
              * here and remember the result.
              */
@@ -416,13 +416,13 @@ public class Container extends java.awt.Container implements javax.accessibility
 
         protected AccessibleContainer(boolean query) {
             /* This constructor is explicitly for subclasses that implement
-             * AccessibleHypertext and therefor the default constructor would
+             * AccessibleHypertext and therefor the default constructor would 
              * bring unnecessary overhead.
              */
         }
-
+                
         protected java.awt.event.ComponentListener accessibleComponentHandler = null;
-
+        
         /**
         * Fire PropertyChange listener, if one is registered,
         * when shown/hidden..
@@ -433,22 +433,22 @@ public class Container extends java.awt.Container implements javax.accessibility
                     AccessibleContext.ACCESSIBLE_STATE_PROPERTY,
                     AccessibleState.VISIBLE, null);
             }
-
+            
             public void componentShown(java.awt.event.ComponentEvent e)  {
                 AccessibleContainer.this.firePropertyChange(
                     AccessibleContext.ACCESSIBLE_STATE_PROPERTY,
                     null, AccessibleState.VISIBLE);
             }
-
+            
             public void componentMoved(java.awt.event.ComponentEvent e)  {
             }
-
+            
             public void componentResized(java.awt.event.ComponentEvent e)  {
             }
         } // inner class AccessibleContainerHandler
-
+        
         protected java.awt.event.FocusListener accessibleFocusHandler = null;
-
+        
         /**
         * Fire PropertyChange listener, if one is registered,
         * when focus events happen
@@ -471,20 +471,20 @@ public class Container extends java.awt.Container implements javax.accessibility
                 }
             }
         } // inner class AccessibleFocusHandler
-
+        
         protected java.awt.event.ContainerListener accessibleContainerHandler = null;
-
+        
         /**
         * Fire PropertyChange listener, if one is registered,
         * when children added/removed.
         */
-
+        
         protected class AccessibleContainerHandler implements java.awt.event.ContainerListener {
             public void componentAdded(java.awt.event.ContainerEvent e) {
                 java.awt.Component c = e.getChild();
                 if (c != null && c instanceof javax.accessibility.Accessible) {
                     AccessibleContainer.this.firePropertyChange(
-                        AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
+                        AccessibleContext.ACCESSIBLE_CHILD_PROPERTY, 
                         null, ((javax.accessibility.Accessible) c).getAccessibleContext());
                 }
             }
@@ -492,14 +492,14 @@ public class Container extends java.awt.Container implements javax.accessibility
                 java.awt.Component c = e.getChild();
                 if (c != null && c instanceof javax.accessibility.Accessible) {
                     AccessibleContainer.this.firePropertyChange(
-                        AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
-                        ((javax.accessibility.Accessible) c).getAccessibleContext(), null);
+                        AccessibleContext.ACCESSIBLE_CHILD_PROPERTY, 
+                        ((javax.accessibility.Accessible) c).getAccessibleContext(), null); 
                 }
             }
         }
-
+        
         protected int propertyChangeListenerCount = 0;
-
+        
         /**
         * Add a PropertyChangeListener to the listener list.
         *
@@ -509,16 +509,16 @@ public class Container extends java.awt.Container implements javax.accessibility
             if (propertyChangeListenerCount++ == 0) {
                 accessibleFocusHandler = new AccessibleFocusHandler();
                 Container.this.addFocusListener(accessibleFocusHandler);
-
+                
                 accessibleContainerHandler = new AccessibleContainerHandler();
                 Container.this.addContainerListener(accessibleContainerHandler);
-
+                
                 accessibleComponentHandler = new AccessibleComponentHandler();
                 Container.this.addComponentListener(accessibleComponentHandler);
             }
             super.addPropertyChangeListener(listener);
         }
-
+        
         /**
         * Remove a PropertyChangeListener from the listener list.
         * This removes a PropertyChangeListener that was registered
@@ -530,30 +530,30 @@ public class Container extends java.awt.Container implements javax.accessibility
             if (--propertyChangeListenerCount == 0) {
                 Container.this.removeComponentListener(accessibleComponentHandler);
                 accessibleComponentHandler = null;
-
+                
                 Container.this.removeContainerListener(accessibleContainerHandler);
                 accessibleContainerHandler = null;
-
+                
                 Container.this.removeFocusListener(accessibleFocusHandler);
                 accessibleFocusHandler = null;
             }
             super.removePropertyChangeListener(listener);
         }
-
+        
         /** Gets the role of this object */
         public javax.accessibility.AccessibleRole getAccessibleRole() {
             return accessibleRole;
         }
-
+        
         /** Gets the AccessibleText associated with this object presenting text on the display */
         public javax.accessibility.AccessibleText getAccessibleText() {
-
+            
             if (disposed)
                 return null;
-
+            
             return accessibleText;
         }
-
+        
         /**
         * Gets the current state set of this object.
         *
@@ -572,21 +572,21 @@ public class Container extends java.awt.Container implements javax.accessibility
                 return AccessibleStateAdapter.getDefunctStateSet();
             }
         }
-
+        
         /** Returns the AccessibleSelection interface for this object */
         public javax.accessibility.AccessibleSelection getAccessibleSelection() {
             try {
-                XAccessibleSelection unoAccessibleSelection = (XAccessibleSelection)
+                XAccessibleSelection unoAccessibleSelection = (XAccessibleSelection) 
                     UnoRuntime.queryInterface(XAccessibleSelection.class, unoAccessibleContext);
                 if (unoAccessibleSelection != null) {
                     return new AccessibleSelectionImpl(unoAccessibleSelection);
                 }
             } catch (com.sun.star.uno.RuntimeException e) {
             }
-
+            
             return null;
         }
-
+        
         /** Gets the locale of the component */
         public java.util.Locale getLocale() throws java.awt.IllegalComponentStateException {
             try {
@@ -598,11 +598,11 @@ public class Container extends java.awt.Container implements javax.accessibility
                 return super.getLocale();
             }
         }
-
+        
         /*
         * AccessibleComponent
         */
-
+        
         /** Returns the background color of the object */
         public java.awt.Color getBackground() {
             try {
@@ -611,11 +611,11 @@ public class Container extends java.awt.Container implements javax.accessibility
                 return null;
             }
         }
-
+        
         public void setBackground(java.awt.Color c) {
             // Not supported by UNO accessibility API
         }
-
+        
         /** Returns the foreground color of the object */
         public java.awt.Color getForeground() {
             try {
@@ -624,138 +624,138 @@ public class Container extends java.awt.Container implements javax.accessibility
                 return null;
             }
         }
-
+        
         public void setForeground(java.awt.Color c) {
             // Not supported by UNO accessibility API
         }
-
+        
         public java.awt.Cursor getCursor() {
             // Not supported by UNO accessibility API
             return null;
         }
-
+        
         public void setCursor(java.awt.Cursor cursor) {
             // Not supported by UNO accessibility API
         }
-
+        
         public java.awt.Font getFont() {
             // FIXME
             return null;
         }
-
+        
         public void setFont(java.awt.Font f) {
             // Not supported by UNO accessibility API
         }
-
+        
         public java.awt.FontMetrics getFontMetrics(java.awt.Font f) {
             // FIXME
             return null;
         }
-
+        
         public boolean isEnabled() {
             return Container.this.isEnabled();
         }
-
+        
         public void setEnabled(boolean b) {
             // Not supported by UNO accessibility API
         }
-
+        
         public boolean isVisible() {
             return Container.this.isVisible();
         }
-
+        
         public void setVisible(boolean b) {
             // Not supported by UNO accessibility API
         }
-
+        
         public boolean isShowing() {
             return Container.this.isShowing();
         }
-
+        
         public boolean contains(java.awt.Point p) {
             try {
-                return unoAccessibleComponent.containsPoint(new com.sun.star.awt.Point(p.x, p.y));
+                return unoAccessibleComponent.containsPoint(new com.sun.star.awt.Point(p.x, p.y)); 
             } catch (com.sun.star.uno.RuntimeException e) {
                 return false;
             }
         }
-
+        
         /** Returns the location of the object on the screen. */
         public java.awt.Point getLocationOnScreen() {
             try {
-                com.sun.star.awt.Point unoPoint = unoAccessibleComponent.getLocationOnScreen();
+                com.sun.star.awt.Point unoPoint = unoAccessibleComponent.getLocationOnScreen(); 
                 return new java.awt.Point(unoPoint.X, unoPoint.Y);
             } catch (com.sun.star.uno.RuntimeException e) {
                 return null;
             }
         }
-
+        
         /** Gets the location of this component in the form of a point specifying the component's top-left corner */
         public java.awt.Point getLocation() {
             try {
-                com.sun.star.awt.Point unoPoint = unoAccessibleComponent.getLocation();
+                com.sun.star.awt.Point unoPoint = unoAccessibleComponent.getLocation(); 
                 return new java.awt.Point( unoPoint.X, unoPoint.Y );
             } catch (com.sun.star.uno.RuntimeException e) {
                 return null;
             }
         }
-
+        
         /** Moves this component to a new location */
         public void setLocation(java.awt.Point p) {
             // Not supported by UNO accessibility API
         }
-
+        
         /** Gets the bounds of this component in the form of a Rectangle object */
         public java.awt.Rectangle getBounds() {
             try {
-                com.sun.star.awt.Rectangle unoRect = unoAccessibleComponent.getBounds();
+                com.sun.star.awt.Rectangle unoRect = unoAccessibleComponent.getBounds(); 
                 return new java.awt.Rectangle(unoRect.X, unoRect.Y, unoRect.Width, unoRect.Height);
             } catch (com.sun.star.uno.RuntimeException e) {
                 return null;
             }
         }
-
+        
         /** Moves and resizes this component to conform to the new bounding rectangle r */
         public void setBounds(java.awt.Rectangle r) {
             // Not supported by UNO accessibility API
         }
-
+        
         /** Returns the size of this component in the form of a Dimension object */
         public java.awt.Dimension getSize() {
             try {
-                com.sun.star.awt.Size unoSize = unoAccessibleComponent.getSize();
+                com.sun.star.awt.Size unoSize = unoAccessibleComponent.getSize(); 
                 return new java.awt.Dimension(unoSize.Width, unoSize.Height);
             } catch (com.sun.star.uno.RuntimeException e) {
                 return null;
             }
         }
-
+        
         /** Resizes this component so that it has width d.width and height d.height */
         public void setSize(java.awt.Dimension d) {
             // Not supported by UNO accessibility API
         }
 
-        /** Returns the Accessible child, if one exists, contained at the local coordinate Point */
+        /** Returns the Accessible child, if one exists, contained at the local coordinate Point */     
         public javax.accessibility.Accessible getAccessibleAt(java.awt.Point p) {
             try {
                 java.awt.Component c = AccessibleObjectFactory.getAccessibleComponent(
                     unoAccessibleComponent.getAccessibleAtPoint(new com.sun.star.awt.Point(p.x, p.y)));
-
+                
                 return (javax.accessibility.Accessible) c;
             } catch (com.sun.star.uno.RuntimeException e) {
                 return null;
             }
         }
-
+        
         public boolean isFocusTraversable() {
             return Container.this.isFocusable();
         }
-
+        
         public void requestFocus() {
             unoAccessibleComponent.grabFocus();
         }
     }
-
+    
     public String toString() {
         return UnoRuntime.generateOid(unoAccessible);
     }
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/DescendantManager.java b/accessibility/bridge/org/openoffice/java/accessibility/DescendantManager.java
index 5b8c45b716b4..039eea34ddcb 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/DescendantManager.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/DescendantManager.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/accessibility/bridge/org/openoffice/java/accessibility/Dialog.java b/accessibility/bridge/org/openoffice/java/accessibility/Dialog.java
index dcb067368996..64b5572a2fcc 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Dialog.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Dialog.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,28 +34,28 @@ import com.sun.star.accessibility.*;
 
 public class Dialog extends java.awt.Dialog implements javax.accessibility.Accessible, NativeFrame {
     protected XAccessibleComponent unoAccessibleComponent;
-
+    
     boolean opened = false;
     boolean visible = false;
     boolean active = false;
-
+    
     java.awt.EventQueue eventQueue = null;
-
+    
     protected Dialog(java.awt.Frame owner, XAccessibleComponent xAccessibleComponent) {
         super(owner);
         initialize(xAccessibleComponent);
     }
-
+    
     protected Dialog(java.awt.Frame owner, String name, XAccessibleComponent xAccessibleComponent) {
         super(owner, name);
         initialize(xAccessibleComponent);
     }
-
+    
     protected Dialog(java.awt.Frame owner, String name, boolean modal, XAccessibleComponent xAccessibleComponent) {
         super(owner, name, modal);
         initialize(xAccessibleComponent);
     }
-
+    
     private void initialize(XAccessibleComponent xAccessibleComponent) {
         unoAccessibleComponent = xAccessibleComponent;
         eventQueue = java.awt.Toolkit.getDefaultToolkit().getSystemEventQueue();
@@ -66,24 +66,24 @@ public class Dialog extends java.awt.Dialog implements javax.accessibility.Acces
             broadcaster.addEventListener(new AccessibleDialogListener());
         }
     }
-
+    
     java.awt.Component initialComponent = null;
-
+    
     public java.awt.Component getInitialComponent() {
         return initialComponent;
     }
-
+    
     public void setInitialComponent(java.awt.Component c) {
         initialComponent = c;
     }
-
+    
     public Integer getHWND() {
         return null;
     }
-
+    
     /**
-    * Determines whether this <code>Component</code> is showing on screen.
-    * This means that the component must be visible, and it must be in a
+    * Determines whether this <code>Component</code> is showing on screen. 
+    * This means that the component must be visible, and it must be in a 
     * <code>container</code> that is visible and showing.
     * @see       #addNotify
     * @see       #removeNotify
@@ -96,10 +96,10 @@ public class Dialog extends java.awt.Dialog implements javax.accessibility.Acces
         }
         return false;
     }
-
+    
     /**
     * Makes this <code>Component</code> displayable by connecting it to a
-    * native screen resource.
+    * native screen resource.  
     * This method is called internally by the toolkit and should
     * not be called directly by programs.
     * @see       #isDisplayable
@@ -109,10 +109,10 @@ public class Dialog extends java.awt.Dialog implements javax.accessibility.Acces
     public void addNotify() {
 //      createHierarchyEvents(0, null, null, 0, false);
     }
-
-    /**
+    
+    /** 
     * Makes this <code>Component</code> undisplayable by destroying it native
-    * screen resource.
+    * screen resource. 
     * This method is called by the toolkit internally and should
     * not be called directly by programs.
     * @see       #isDisplayable
@@ -121,7 +121,7 @@ public class Dialog extends java.awt.Dialog implements javax.accessibility.Acces
     */
     public void removeNotify() {
     }
-
+    
         /**
          * Determines if the object is visible.  Note: this means that the
          * object intends to be visible; however, it may not in fact be
@@ -134,7 +134,7 @@ public class Dialog extends java.awt.Dialog implements javax.accessibility.Acces
     public boolean isVisible(){
         return visible;
     }
-
+    
     /**
     * Shows or hides this component depending on the value of parameter
     * <code>b</code>.
@@ -158,28 +158,28 @@ public class Dialog extends java.awt.Dialog implements javax.accessibility.Acces
             }
         }
     }
-
+    
     public void dispose() {
         setVisible(false);
         postWindowEvent(java.awt.event.WindowEvent.WINDOW_CLOSED);
     }
-
+    
     protected void postWindowEvent(int i) {
         eventQueue.postEvent(new java.awt.event.WindowEvent(this, i));
     }
-
+    
     protected void postComponentEvent(int i) {
         eventQueue.postEvent(new java.awt.event.ComponentEvent(this, i));
     }
-
+    
     /**
     * Update the proxy objects appropriatly on property change events
     */
     protected class AccessibleDialogListener implements XAccessibleEventListener {
-
+        
         protected AccessibleDialogListener() {
         }
-
+        
         protected void setComponentState(short state, boolean enable) {
             switch (state) {
                 case AccessibleStateType.ACTIVE:
@@ -191,8 +191,8 @@ public class Dialog extends java.awt.Dialog implements javax.accessibility.Acces
                     }
                     break;
                 case AccessibleStateType.ICONIFIED:
-                    postWindowEvent(enable ?
-                        java.awt.event.WindowEvent.WINDOW_ICONIFIED :
+                    postWindowEvent(enable ? 
+                        java.awt.event.WindowEvent.WINDOW_ICONIFIED : 
                         java.awt.event.WindowEvent.WINDOW_DEICONIFIED);
                     break;
                 case AccessibleStateType.VISIBLE:
@@ -205,7 +205,7 @@ public class Dialog extends java.awt.Dialog implements javax.accessibility.Acces
                     break;
             }
         }
-
+        
         /** Updates the accessible name and fires the appropriate PropertyChangedEvent */
         protected void handleNameChangedEvent(Object any) {
             try {
@@ -221,7 +221,7 @@ public class Dialog extends java.awt.Dialog implements javax.accessibility.Acces
             } catch (com.sun.star.lang.IllegalArgumentException e) {
             }
         }
-
+        
         /** Updates the accessible description and fires the appropriate PropertyChangedEvent */
         protected void handleDescriptionChangedEvent(Object any) {
             try {
@@ -235,21 +235,21 @@ public class Dialog extends java.awt.Dialog implements javax.accessibility.Acces
             } catch (com.sun.star.lang.IllegalArgumentException e) {
             }
         }
-
+        
         /** Updates the internal states and fires the appropriate PropertyChangedEvent */
         protected void handleStateChangedEvent(Object any1, Object any2) {
             try {
                 if (AnyConverter.isShort(any1)) {
                     setComponentState(AnyConverter.toShort(any1), false);
                 }
-
+                
                 if (AnyConverter.isShort(any2)) {
                     setComponentState(AnyConverter.toShort(any2), true);
                 }
             } catch (com.sun.star.lang.IllegalArgumentException e) {
             }
         }
-
+        
         /** Fires a visible data property change event */
         protected void handleVisibleDataEvent() {
             javax.accessibility.AccessibleContext ac = accessibleContext;
@@ -257,7 +257,7 @@ public class Dialog extends java.awt.Dialog implements javax.accessibility.Acces
                 ac.firePropertyChange(javax.accessibility.AccessibleContext.ACCESSIBLE_VISIBLE_DATA_PROPERTY, null, null);
             }
         }
-
+        
         /** Called by OpenOffice process to notify property changes */
         public void notifyEvent(AccessibleEventObject event) {
             switch (event.EventId) {
@@ -293,14 +293,14 @@ public class Dialog extends java.awt.Dialog implements javax.accessibility.Acces
                     }
             }
         }
-
+        
         /** Called by OpenOffice process to notify that the UNO component is disposing */
         public void disposing(com.sun.star.lang.EventObject eventObject) {
         }
     }
-
+    
     javax.accessibility.AccessibleContext accessibleContext = null;
-
+    
     /** Returns the AccessibleContext associated with this object */
     public javax.accessibility.AccessibleContext getAccessibleContext() {
         if (accessibleContext == null) {
@@ -309,14 +309,14 @@ public class Dialog extends java.awt.Dialog implements javax.accessibility.Acces
         }
         return accessibleContext;
     }
-
+    
     protected class AccessibleDialog extends java.awt.Dialog.AccessibleAWTDialog {
         protected AccessibleDialog() {
             super();
         }
-
+        
         protected java.awt.event.ComponentListener accessibleComponentHandler = null;
-
+        
         /**
         * Fire PropertyChange listener, if one is registered,
         * when shown/hidden..
@@ -327,22 +327,22 @@ public class Dialog extends java.awt.Dialog implements javax.accessibility.Acces
                     javax.accessibility.AccessibleContext.ACCESSIBLE_STATE_PROPERTY,
                     javax.accessibility.AccessibleState.VISIBLE, null);
             }
-
+            
             public void componentShown(java.awt.event.ComponentEvent e)  {
                 AccessibleDialog.this.firePropertyChange(
                     javax.accessibility.AccessibleContext.ACCESSIBLE_STATE_PROPERTY,
                     null, javax.accessibility.AccessibleState.VISIBLE);
             }
-
+            
             public void componentMoved(java.awt.event.ComponentEvent e)  {
             }
-
+            
             public void componentResized(java.awt.event.ComponentEvent e)  {
             }
         } // inner class AccessibleComponentHandler
-
+        
         protected java.awt.event.WindowListener accessibleWindowHandler = null;
-
+        
         /**
         * Fire PropertyChange listener, if one is registered,
         * when window events happen
@@ -357,21 +357,21 @@ public class Dialog extends java.awt.Dialog implements javax.accessibility.Acces
                     System.err.println("[Dialog] " + getTitle() + " is now active");
                 }
             }
-
+            
             /** Invoked when a window has been closed as the result of calling dispose on the window. */
             public void windowClosed(java.awt.event.WindowEvent e) {
                 if (Build.DEBUG) {
                     System.err.println("[Dialog] " + getTitle() + " has been closed");
                 }
             }
-
+            
             /** Invoked when the user attempts to close the window from the window's system menu. */
             public void windowClosing(java.awt.event.WindowEvent e) {
                 if (Build.DEBUG) {
                     System.err.println("[Dialog] " + getTitle() + " is closing");
                 }
             }
-
+            
             /** Invoked when a Window is no longer the active Window. */
             public void windowDeactivated(java.awt.event.WindowEvent e) {
                 AccessibleDialog.this.firePropertyChange(
@@ -381,43 +381,43 @@ public class Dialog extends java.awt.Dialog implements javax.accessibility.Acces
                     System.err.println("[Dialog] " + getTitle() + " is no longer active");
                 }
             }
-
+          
             /** Invoked when a window is changed from a minimized to a normal state. */
             public void windowDeiconified(java.awt.event.WindowEvent e) {
                 if (Build.DEBUG) {
                     System.err.println("[Dialog] " + getTitle() + " has been deiconified");
                 }
             }
-
+            
             /** Invoked when a window is changed from a normal to a minimized state. */
             public void windowIconified(java.awt.event.WindowEvent e) {
                 if (Build.DEBUG) {
                     System.err.println("[Dialog] " + getTitle() + " has been iconified");
                 }
             }
-
+            
             /** Invoked the first time a window is made visible. */
             public void windowOpened(java.awt.event.WindowEvent e) {
                 if (Build.DEBUG) {
                     System.err.println("[Dialog] " + getTitle() + " has been opened");
                 }
             }
-
+            
         } // inner class AccessibleWindowHandler
-
+        
         protected java.awt.event.ContainerListener accessibleContainerHandler = null;
-
+        
         /**
         * Fire PropertyChange listener, if one is registered,
         * when children added/removed.
         */
-
+        
         protected class AccessibleContainerHandler implements java.awt.event.ContainerListener {
             public void componentAdded(java.awt.event.ContainerEvent e) {
                 java.awt.Component c = e.getChild();
                 if (c != null && c instanceof javax.accessibility.Accessible) {
                     AccessibleDialog.this.firePropertyChange(
-                        javax.accessibility.AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
+                        javax.accessibility.AccessibleContext.ACCESSIBLE_CHILD_PROPERTY, 
                         null, ((javax.accessibility.Accessible) c).getAccessibleContext());
                 }
             }
@@ -425,14 +425,14 @@ public class Dialog extends java.awt.Dialog implements javax.accessibility.Acces
                 java.awt.Component c = e.getChild();
                 if (c != null && c instanceof javax.accessibility.Accessible) {
                     AccessibleDialog.this.firePropertyChange(
-                        javax.accessibility.AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
-                        ((javax.accessibility.Accessible) c).getAccessibleContext(), null);
+                        javax.accessibility.AccessibleContext.ACCESSIBLE_CHILD_PROPERTY, 
+                        ((javax.accessibility.Accessible) c).getAccessibleContext(), null); 
                 }
             }
         }
-
+        
         protected int propertyChangeListenerCount = 0;
-
+        
         /**
         * Add a PropertyChangeListener to the listener list.
         *
@@ -442,16 +442,16 @@ public class Dialog extends java.awt.Dialog implements javax.accessibility.Acces
             if (propertyChangeListenerCount++ == 0) {
                 accessibleWindowHandler = new AccessibleWindowHandler();
                 Dialog.this.addWindowListener(accessibleWindowHandler);
-
+                
                 accessibleContainerHandler = new AccessibleContainerHandler();
                 Dialog.this.addContainerListener(accessibleContainerHandler);
-
+                
                 accessibleComponentHandler = new AccessibleComponentHandler();
                 Dialog.this.addComponentListener(accessibleComponentHandler);
             }
             super.addPropertyChangeListener(listener);
         }
-
+        
         /**
         * Remove a PropertyChangeListener from the listener list.
         * This removes a PropertyChangeListener that was registered
@@ -463,20 +463,20 @@ public class Dialog extends java.awt.Dialog implements javax.accessibility.Acces
             if (--propertyChangeListenerCount == 0) {
                 Dialog.this.removeComponentListener(accessibleComponentHandler);
                 accessibleComponentHandler = null;
-
+                
                 Dialog.this.removeContainerListener(accessibleContainerHandler);
                 accessibleContainerHandler = null;
-
+                
                 Dialog.this.removeWindowListener(accessibleWindowHandler);
                 accessibleWindowHandler = null;
             }
             super.removePropertyChangeListener(listener);
         }
-
+        
         /*
         * AccessibleComponent
         */
-
+        
         /** Returns the background color of the object */
         public java.awt.Color getBackground() {
             try {
@@ -485,11 +485,11 @@ public class Dialog extends java.awt.Dialog implements javax.accessibility.Acces
                 return null;
             }
         }
-
+        
         public void setBackground(java.awt.Color c) {
             // Not supported by UNO accessibility API
         }
-
+        
         /** Returns the foreground color of the object */
         public java.awt.Color getForeground() {
             try {
@@ -498,118 +498,118 @@ public class Dialog extends java.awt.Dialog implements javax.accessibility.Acces
                 return null;
             }
         }
-
+        
         public void setForeground(java.awt.Color c) {
             // Not supported by UNO accessibility API
         }
-
+        
         public java.awt.Cursor getCursor() {
             // Not supported by UNO accessibility API
             return null;
         }
-
+        
         public void setCursor(java.awt.Cursor cursor) {
             // Not supported by UNO accessibility API
         }
-
+        
         public java.awt.Font getFont() {
             // FIXME
             return null;
         }
-
+        
         public void setFont(java.awt.Font f) {
             // Not supported by UNO accessibility API
         }
-
+        
         public java.awt.FontMetrics getFontMetrics(java.awt.Font f) {
             // FIXME
             return null;
         }
-
+        
         public boolean isEnabled() {
             return Dialog.this.isEnabled();
         }
-
+        
         public void setEnabled(boolean b) {
             // Not supported by UNO accessibility API
         }
-
+        
         public boolean isVisible() {
             return Dialog.this.isVisible();
         }
-
+        
         public void setVisible(boolean b) {
             // Not supported by UNO accessibility API
         }
-
+        
         public boolean isShowing() {
             return Dialog.this.isShowing();
         }
-
+        
         public boolean contains(java.awt.Point p) {
             try {
-                return unoAccessibleComponent.containsPoint(new com.sun.star.awt.Point(p.x, p.y));
+                return unoAccessibleComponent.containsPoint(new com.sun.star.awt.Point(p.x, p.y)); 
             } catch (com.sun.star.uno.RuntimeException e) {
                 return false;
             }
         }
-
+        
         /** Returns the location of the object on the screen. */
         public java.awt.Point getLocationOnScreen() {
             try {
-                com.sun.star.awt.Point unoPoint = unoAccessibleComponent.getLocationOnScreen();
+                com.sun.star.awt.Point unoPoint = unoAccessibleComponent.getLocationOnScreen(); 
                 return new java.awt.Point(unoPoint.X, unoPoint.Y);
             } catch (com.sun.star.uno.RuntimeException e) {
                 return null;
             }
         }
-
+        
         /** Gets the location of this component in the form of a point specifying the component's top-left corner */
         public java.awt.Point getLocation() {
             try {
-                com.sun.star.awt.Point unoPoint = unoAccessibleComponent.getLocation();
+                com.sun.star.awt.Point unoPoint = unoAccessibleComponent.getLocation(); 
                 return new java.awt.Point( unoPoint.X, unoPoint.Y );
             } catch (com.sun.star.uno.RuntimeException e) {
                 return null;
             }
         }
-
+        
         /** Moves this component to a new location */
         public void setLocation(java.awt.Point p) {
             // Not supported by UNO accessibility API
         }
-
+        
         /** Gets the bounds of this component in the form of a Rectangle object */
         public java.awt.Rectangle getBounds() {
             try {
-                com.sun.star.awt.Rectangle unoRect = unoAccessibleComponent.getBounds();
+                com.sun.star.awt.Rectangle unoRect = unoAccessibleComponent.getBounds(); 
                 return new java.awt.Rectangle(unoRect.X, unoRect.Y, unoRect.Width, unoRect.Height);
             } catch (com.sun.star.uno.RuntimeException e) {
                 return null;
             }
         }
-
+        
         /** Moves and resizes this component to conform to the new bounding rectangle r */
         public void setBounds(java.awt.Rectangle r) {
             // Not supported by UNO accessibility API
         }
-
+        
         /** Returns the size of this component in the form of a Dimension object */
         public java.awt.Dimension getSize() {
             try {
-                com.sun.star.awt.Size unoSize = unoAccessibleComponent.getSize();
+                com.sun.star.awt.Size unoSize = unoAccessibleComponent.getSize(); 
                 return new java.awt.Dimension(unoSize.Width, unoSize.Height);
             } catch (com.sun.star.uno.RuntimeException e) {
                 return null;
             }
         }
-
+        
         /** Resizes this component so that it has width d.width and height d.height */
         public void setSize(java.awt.Dimension d) {
             // Not supported by UNO accessibility API
         }
-
-        /** Returns the Accessible child, if one exists, contained at the local coordinate Point */
+        
+        /** Returns the Accessible child, if one exists, contained at the local coordinate Point */     
         public javax.accessibility.Accessible getAccessibleAt(java.awt.Point p) {
             try {
                 java.awt.Component c = AccessibleObjectFactory.getAccessibleComponent(
@@ -620,11 +620,11 @@ public class Dialog extends java.awt.Dialog implements javax.accessibility.Acces
                 return null;
             }
         }
-
+        
         public boolean isFocusTraversable() {
             return Dialog.this.isFocusable();
         }
-
+        
         public void requestFocus() {
             unoAccessibleComponent.grabFocus();
         }
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/FocusTraversalPolicy.java b/accessibility/bridge/org/openoffice/java/accessibility/FocusTraversalPolicy.java
index 75f6c91354f4..0f1c03c94653 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/FocusTraversalPolicy.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/FocusTraversalPolicy.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,17 +42,17 @@ public class FocusTraversalPolicy extends java.awt.FocusTraversalPolicy {
     }
 
     /** Returns the Component that should receive the focus after aComponent */
-    public java.awt.Component getComponentAfter(java.awt.Container focusCycleRoot,
+    public java.awt.Component getComponentAfter(java.awt.Container focusCycleRoot, 
         java.awt.Component aComponent) {
         return null;
     }
-
+    
     /** Returns the Component that should receive the focus before aComponent */
-    public java.awt.Component getComponentBefore(java.awt.Container focusCycleRoot,
+    public java.awt.Component getComponentBefore(java.awt.Container focusCycleRoot, 
         java.awt.Component aComponent) {
         return null;
     }
-
+    
     /** Returns the default Component to focus */
     public java.awt.Component getDefaultComponent(java.awt.Container focusCycleRoot) {
         // getDefaultComponent must not return null for Windows to make them focusable.
@@ -68,12 +68,12 @@ public class FocusTraversalPolicy extends java.awt.FocusTraversalPolicy {
         }
         return null;
     }
-
+    
     /** Returns the first Component in the traversal cycle */
     public java.awt.Component getFirstComponent(java.awt.Container focusCycleRoot) {
         return null;
     }
-
+    
     /** Returns the Component that should receive the focus when a Window is made visible for the first time */
     public java.awt.Component getInitialComponent(java.awt.Window window) {
         if (window instanceof NativeFrame) {
@@ -81,7 +81,7 @@ public class FocusTraversalPolicy extends java.awt.FocusTraversalPolicy {
         }
         return null;
     }
-
+    
     /** Returns the last Component in the traversal cycle */
     public java.awt.Component getLastComponent(java.awt.Container focusCycleRoot) {
         return null;
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Frame.java b/accessibility/bridge/org/openoffice/java/accessibility/Frame.java
index b7f37b2d6b18..7768afdc8af7 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Frame.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Frame.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,22 +32,22 @@ import com.sun.star.accessibility.*;
 
 public class Frame extends java.awt.Frame implements javax.accessibility.Accessible, NativeFrame {
     protected XAccessibleComponent unoAccessibleComponent;
-
+    
     boolean opened = false;
     boolean visible = false;
     boolean active = false;
-
+    
     java.awt.EventQueue eventQueue = null;
-
+    
     protected Frame(XAccessibleComponent xAccessibleComponent) {
         initialize(xAccessibleComponent);
     }
-
+    
     protected Frame(String name, XAccessibleComponent xAccessibleComponent) {
         super(name);
         initialize(xAccessibleComponent);
     }
-
+    
     private void initialize(XAccessibleComponent xAccessibleComponent) {
         unoAccessibleComponent = xAccessibleComponent;
         eventQueue = java.awt.Toolkit.getDefaultToolkit().getSystemEventQueue();
@@ -58,24 +58,24 @@ public class Frame extends java.awt.Frame implements javax.accessibility.Accessi
             broadcaster.addEventListener(new AccessibleFrameListener());
         }
     }
-
+    
     java.awt.Component initialComponent = null;
-
+    
     public java.awt.Component getInitialComponent() {
         return initialComponent;
     }
-
+    
     public void setInitialComponent(java.awt.Component c) {
         initialComponent = c;
     }
-
+    
     public Integer getHWND() {
         return null;
     }
-
+    
     /**
-    * Determines whether this <code>Component</code> is showing on screen.
-    * This means that the component must be visible, and it must be in a
+    * Determines whether this <code>Component</code> is showing on screen. 
+    * This means that the component must be visible, and it must be in a 
     * <code>container</code> that is visible and showing.
     * @see       #addNotify
     * @see       #removeNotify
@@ -88,10 +88,10 @@ public class Frame extends java.awt.Frame implements javax.accessibility.Accessi
         }
         return false;
     }
-
+    
     /**
     * Makes this <code>Component</code> displayable by connecting it to a
-    * native screen resource.
+    * native screen resource.  
     * This method is called internally by the toolkit and should
     * not be called directly by programs.
     * @see       #isDisplayable
@@ -101,10 +101,10 @@ public class Frame extends java.awt.Frame implements javax.accessibility.Accessi
     public void addNotify() {
 //      createHierarchyEvents(0, null, null, 0, false);
     }
-
-    /**
+    
+    /** 
     * Makes this <code>Component</code> undisplayable by destroying it native
-    * screen resource.
+    * screen resource. 
     * This method is called by the toolkit internally and should
     * not be called directly by programs.
     * @see       #isDisplayable
@@ -113,7 +113,7 @@ public class Frame extends java.awt.Frame implements javax.accessibility.Accessi
     */
     public void removeNotify() {
     }
-
+    
         /**
          * Determines if the object is visible.  Note: this means that the
          * object intends to be visible; however, it may not in fact be
@@ -126,7 +126,7 @@ public class Frame extends java.awt.Frame implements javax.accessibility.Accessi
     public boolean isVisible(){
         return visible;
     }
-
+    
     /**
     * Shows or hides this component depending on the value of parameter
     * <code>b</code>.
@@ -150,28 +150,28 @@ public class Frame extends java.awt.Frame implements javax.accessibility.Accessi
             }
         }
     }
-
+    
     public void dispose() {
         setVisible(false);
         postWindowEvent(java.awt.event.WindowEvent.WINDOW_CLOSED);
     }
-
+    
     protected void postWindowEvent(int i) {
         eventQueue.postEvent(new java.awt.event.WindowEvent(this, i));
     }
-
+    
     protected void postComponentEvent(int i) {
         eventQueue.postEvent(new java.awt.event.ComponentEvent(this, i));
     }
-
+    
     /**
     * Update the proxy objects appropriatly on property change events
     */
     protected class AccessibleFrameListener implements XAccessibleEventListener {
-
+        
         protected AccessibleFrameListener() {
         }
-
+        
         // The only expected state changes are ACTIVE and VISIBLE
         protected void setComponentState(short state, boolean enable) {
             switch (state) {
@@ -187,8 +187,8 @@ public class Frame extends java.awt.Frame implements javax.accessibility.Accessi
                     if (Build.DEBUG) {
                         System.err.println("[frame]" + getTitle() + (enable ? " is now " : " is no longer ") + "iconified");
                     }
-                    postWindowEvent(enable ?
-                        java.awt.event.WindowEvent.WINDOW_ICONIFIED :
+                    postWindowEvent(enable ? 
+                        java.awt.event.WindowEvent.WINDOW_ICONIFIED : 
                         java.awt.event.WindowEvent.WINDOW_DEICONIFIED);
                     break;
                 case AccessibleStateType.VISIBLE:
@@ -201,7 +201,7 @@ public class Frame extends java.awt.Frame implements javax.accessibility.Accessi
                     break;
             }
         }
-
+        
         /** Updates the accessible name and fires the appropriate PropertyChangedEvent */
         protected void handleNameChangedEvent(Object any) {
             try {
@@ -217,7 +217,7 @@ public class Frame extends java.awt.Frame implements javax.accessibility.Accessi
             } catch (com.sun.star.lang.IllegalArgumentException e) {
             }
         }
-
+        
         /** Updates the accessible description and fires the appropriate PropertyChangedEvent */
         protected void handleDescriptionChangedEvent(Object any) {
             try {
@@ -231,23 +231,23 @@ public class Frame extends java.awt.Frame implements javax.accessibility.Accessi
             } catch (com.sun.star.lang.IllegalArgumentException e) {
             }
         }
-
+        
         /** Updates the internal states and fires the appropriate PropertyChangedEvent */
         protected void handleStateChangedEvent(Object any1, Object any2) {
             try {
                 if (AnyConverter.isShort(any1)) {
                     setComponentState(AnyConverter.toShort(any1), false);
                 }
-
+                
                 if (AnyConverter.isShort(any2)) {
                     setComponentState(AnyConverter.toShort(any2), true);
                 }
             }
-
+            
             catch (com.sun.star.lang.IllegalArgumentException e) {
             }
         }
-
+        
         /** Fires a visible data property change event */
         protected void handleVisibleDataEvent() {
             javax.accessibility.AccessibleContext ac = accessibleContext;
@@ -255,7 +255,7 @@ public class Frame extends java.awt.Frame implements javax.accessibility.Accessi
                 ac.firePropertyChange(javax.accessibility.AccessibleContext.ACCESSIBLE_VISIBLE_DATA_PROPERTY, null, null);
             }
         }
-
+        
         /** Called by OpenOffice process to notify property changes */
         public void notifyEvent(AccessibleEventObject event) {
             switch (event.EventId) {
@@ -291,14 +291,14 @@ public class Frame extends java.awt.Frame implements javax.accessibility.Accessi
                     }
             }
         }
-
+        
         /** Called by OpenOffice process to notify that the UNO component is disposing */
         public void disposing(com.sun.star.lang.EventObject eventObject) {
         }
     }
-
+    
     protected javax.accessibility.AccessibleContext accessibleContext = null;
-
+    
     /** Returns the AccessibleContext associated with this object */
     public javax.accessibility.AccessibleContext getAccessibleContext() {
         if (accessibleContext == null) {
@@ -307,14 +307,14 @@ public class Frame extends java.awt.Frame implements javax.accessibility.Accessi
         }
         return accessibleContext;
     }
-
+    
     protected class AccessibleFrame extends java.awt.Frame.AccessibleAWTFrame {
         protected AccessibleFrame() {
             super();
         }
-
+        
         protected java.awt.event.ComponentListener accessibleComponentHandler = null;
-
+        
         /**
         * Fire PropertyChange listener, if one is registered,
         * when shown/hidden..
@@ -325,22 +325,22 @@ public class Frame extends java.awt.Frame implements javax.accessibility.Accessi
                     javax.accessibility.AccessibleContext.ACCESSIBLE_STATE_PROPERTY,
                     javax.accessibility.AccessibleState.VISIBLE, null);
             }
-
+            
             public void componentShown(java.awt.event.ComponentEvent e)  {
                 AccessibleFrame.this.firePropertyChange(
                     javax.accessibility.AccessibleContext.ACCESSIBLE_STATE_PROPERTY,
                     null, javax.accessibility.AccessibleState.VISIBLE);
             }
-
+            
             public void componentMoved(java.awt.event.ComponentEvent e)  {
             }
-
+            
             public void componentResized(java.awt.event.ComponentEvent e)  {
             }
         } // inner class AccessibleComponentHandler
-
+        
         protected java.awt.event.WindowListener accessibleWindowHandler = null;
-
+        
         /**
         * Fire PropertyChange listener, if one is registered,
         * when window events happen
@@ -355,21 +355,21 @@ public class Frame extends java.awt.Frame implements javax.accessibility.Accessi
                     System.err.println("[frame] " + getTitle() + " is now active");
                 }
             }
-
+            
             /** Invoked when a window has been closed as the result of calling dispose on the window. */
             public void windowClosed(java.awt.event.WindowEvent e) {
                 if (Build.DEBUG) {
                     System.err.println("[frame] " + getTitle() + " has been closed");
                 }
             }
-
+            
             /** Invoked when the user attempts to close the window from the window's system menu. */
             public void windowClosing(java.awt.event.WindowEvent e) {
                 if (Build.DEBUG) {
                     System.err.println("[frame] " + getTitle() + " is closing");
                 }
             }
-
+            
             /** Invoked when a Window is no longer the active Window. */
             public void windowDeactivated(java.awt.event.WindowEvent e) {
                 AccessibleFrame.this.firePropertyChange(
@@ -379,43 +379,43 @@ public class Frame extends java.awt.Frame implements javax.accessibility.Accessi
                     System.err.println("[frame] " + getTitle() + " is no longer active");
                 }
             }
-
+          
             /** Invoked when a window is changed from a minimized to a normal state. */
             public void windowDeiconified(java.awt.event.WindowEvent e) {
                 if (Build.DEBUG) {
                     System.err.println("[frame] " + getTitle() + " is no longer iconified");
                 }
             }
-
+            
             /** Invoked when a window is changed from a normal to a minimized state. */
             public void windowIconified(java.awt.event.WindowEvent e) {
                 if (Build.DEBUG) {
                     System.err.println("[frame] " + getTitle() + " has been iconified");
                 }
             }
-
+            
             /** Invoked the first time a window is made visible. */
             public void windowOpened(java.awt.event.WindowEvent e) {
                 if (Build.DEBUG) {
                     System.err.println("[frame] " + getTitle() + " has been opened");
                 }
             }
-
+            
         } // inner class AccessibleWindowHandler
-
+        
         protected java.awt.event.ContainerListener accessibleContainerHandler = null;
-
+        
         /**
         * Fire PropertyChange listener, if one is registered,
         * when children added/removed.
         */
-
+        
         protected class AccessibleContainerHandler implements java.awt.event.ContainerListener {
             public void componentAdded(java.awt.event.ContainerEvent e) {
                 java.awt.Component c = e.getChild();
                 if (c != null && c instanceof javax.accessibility.Accessible) {
                     AccessibleFrame.this.firePropertyChange(
-                        javax.accessibility.AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
+                        javax.accessibility.AccessibleContext.ACCESSIBLE_CHILD_PROPERTY, 
                         null, ((javax.accessibility.Accessible) c).getAccessibleContext());
                 }
             }
@@ -423,14 +423,14 @@ public class Frame extends java.awt.Frame implements javax.accessibility.Accessi
                 java.awt.Component c = e.getChild();
                 if (c != null && c instanceof javax.accessibility.Accessible) {
                     AccessibleFrame.this.firePropertyChange(
-                        javax.accessibility.AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
-                        ((javax.accessibility.Accessible) c).getAccessibleContext(), null);
+                        javax.accessibility.AccessibleContext.ACCESSIBLE_CHILD_PROPERTY, 
+                        ((javax.accessibility.Accessible) c).getAccessibleContext(), null); 
                 }
             }
         }
-
+        
         protected int propertyChangeListenerCount = 0;
-
+        
         /**
         * Add a PropertyChangeListener to the listener list.
         *
@@ -440,16 +440,16 @@ public class Frame extends java.awt.Frame implements javax.accessibility.Accessi
             if (propertyChangeListenerCount++ == 0) {
                 accessibleWindowHandler = new AccessibleWindowHandler();
                 Frame.this.addWindowListener(accessibleWindowHandler);
-
+                
                 accessibleContainerHandler = new AccessibleContainerHandler();
                 Frame.this.addContainerListener(accessibleContainerHandler);
-
+                
                 accessibleComponentHandler = new AccessibleComponentHandler();
                 Frame.this.addComponentListener(accessibleComponentHandler);
             }
             super.addPropertyChangeListener(listener);
         }
-
+        
         /**
         * Remove a PropertyChangeListener from the listener list.
         * This removes a PropertyChangeListener that was registered
@@ -461,20 +461,20 @@ public class Frame extends java.awt.Frame implements javax.accessibility.Accessi
             if (--propertyChangeListenerCount == 0) {
                 Frame.this.removeComponentListener(accessibleComponentHandler);
                 accessibleComponentHandler = null;
-
+                
                 Frame.this.removeContainerListener(accessibleContainerHandler);
                 accessibleContainerHandler = null;
-
+                
                 Frame.this.removeWindowListener(accessibleWindowHandler);
                 accessibleWindowHandler = null;
             }
             super.removePropertyChangeListener(listener);
         }
-
+        
         /**
         * Get the state set of this object.
         *
-        * @return an instance of AccessibleState containing the current state
+        * @return an instance of AccessibleState containing the current state 
         * of the object
         * @see AccessibleState
         */
@@ -485,11 +485,11 @@ public class Frame extends java.awt.Frame implements javax.accessibility.Accessi
             }
             return states;
         }
-
+        
         /*
         * AccessibleComponent
         */
-
+        
         /** Returns the background color of the object */
         public java.awt.Color getBackground() {
             try {
@@ -498,11 +498,11 @@ public class Frame extends java.awt.Frame implements javax.accessibility.Accessi
                 return null;
             }
         }
-
+        
         public void setBackground(java.awt.Color c) {
             // Not supported by UNO accessibility API
         }
-
+        
         /** Returns the foreground color of the object */
         public java.awt.Color getForeground() {
             try {
@@ -511,118 +511,118 @@ public class Frame extends java.awt.Frame implements javax.accessibility.Accessi
                 return null;
             }
         }
-
+        
         public void setForeground(java.awt.Color c) {
             // Not supported by UNO accessibility API
         }
-
+        
         public java.awt.Cursor getCursor() {
             // Not supported by UNO accessibility API
             return null;
         }
-
+        
         public void setCursor(java.awt.Cursor cursor) {
             // Not supported by UNO accessibility API
         }
-
+        
         public java.awt.Font getFont() {
             // FIXME
             return null;
         }
-
+        
         public void setFont(java.awt.Font f) {
             // Not supported by UNO accessibility API
         }
-
+        
         public java.awt.FontMetrics getFontMetrics(java.awt.Font f) {
             // FIXME
             return null;
         }
-
+        
         public boolean isEnabled() {
             return Frame.this.isEnabled();
         }
-
+        
         public void setEnabled(boolean b) {
             // Not supported by UNO accessibility API
         }
-
+        
         public boolean isVisible() {
             return Frame.this.isVisible();
         }
-
+        
         public void setVisible(boolean b) {
             // Not supported by UNO accessibility API
         }
-
+        
         public boolean isShowing() {
             return Frame.this.isShowing();
         }
-
+        
         public boolean contains(java.awt.Point p) {
             try {
-                return unoAccessibleComponent.containsPoint(new com.sun.star.awt.Point(p.x, p.y));
+                return unoAccessibleComponent.containsPoint(new com.sun.star.awt.Point(p.x, p.y)); 
             } catch (com.sun.star.uno.RuntimeException e) {
                 return false;
             }
         }
-
+        
         /** Returns the location of the object on the screen. */
         public java.awt.Point getLocationOnScreen() {
             try {
-                com.sun.star.awt.Point unoPoint = unoAccessibleComponent.getLocationOnScreen();
+                com.sun.star.awt.Point unoPoint = unoAccessibleComponent.getLocationOnScreen(); 
                 return new java.awt.Point(unoPoint.X, unoPoint.Y);
             } catch (com.sun.star.uno.RuntimeException e) {
                 return null;
             }
         }
-
+        
         /** Gets the location of this component in the form of a point specifying the component's top-left corner */
         public java.awt.Point getLocation() {
             try {
-                com.sun.star.awt.Point unoPoint = unoAccessibleComponent.getLocation();
+                com.sun.star.awt.Point unoPoint = unoAccessibleComponent.getLocation(); 
                 return new java.awt.Point( unoPoint.X, unoPoint.Y );
             } catch (com.sun.star.uno.RuntimeException e) {
                 return null;
             }
         }
-
+        
         /** Moves this component to a new location */
         public void setLocation(java.awt.Point p) {
             // Not supported by UNO accessibility API
         }
-
+        
         /** Gets the bounds of this component in the form of a Rectangle object */
         public java.awt.Rectangle getBounds() {
             try {
-                com.sun.star.awt.Rectangle unoRect = unoAccessibleComponent.getBounds();
+                com.sun.star.awt.Rectangle unoRect = unoAccessibleComponent.getBounds(); 
                 return new java.awt.Rectangle(unoRect.X, unoRect.Y, unoRect.Width, unoRect.Height);
             } catch (com.sun.star.uno.RuntimeException e) {
                 return null;
             }
         }
-
+        
         /** Moves and resizes this component to conform to the new bounding rectangle r */
         public void setBounds(java.awt.Rectangle r) {
             // Not supported by UNO accessibility API
         }
-
+        
         /** Returns the size of this component in the form of a Dimension object */
         public java.awt.Dimension getSize() {
             try {
-                com.sun.star.awt.Size unoSize = unoAccessibleComponent.getSize();
+                com.sun.star.awt.Size unoSize = unoAccessibleComponent.getSize(); 
                 return new java.awt.Dimension(unoSize.Width, unoSize.Height);
             } catch (com.sun.star.uno.RuntimeException e) {
                 return null;
             }
         }
-
+        
         /** Resizes this component so that it has width d.width and height d.height */
         public void setSize(java.awt.Dimension d) {
             // Not supported by UNO accessibility API
         }
-
-        /** Returns the Accessible child, if one exists, contained at the local coordinate Point */
+        
+        /** Returns the Accessible child, if one exists, contained at the local coordinate Point */     
         public javax.accessibility.Accessible getAccessibleAt(java.awt.Point p) {
             try {
                 java.awt.Component c = AccessibleObjectFactory.getAccessibleComponent(
@@ -633,11 +633,11 @@ public class Frame extends java.awt.Frame implements javax.accessibility.Accessi
                 return null;
             }
         }
-
+        
         public boolean isFocusTraversable() {
             return Frame.this.isFocusable();
         }
-
+        
         public void requestFocus() {
             unoAccessibleComponent.grabFocus();
         }
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Icon.java b/accessibility/bridge/org/openoffice/java/accessibility/Icon.java
index 8ccc97def4d8..1dd151eaf074 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Icon.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Icon.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/accessibility/bridge/org/openoffice/java/accessibility/Label.java b/accessibility/bridge/org/openoffice/java/accessibility/Label.java
index 9afaa0a1ae37..62c2155c71f9 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Label.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Label.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
@@ -64,10 +64,10 @@ public class Label extends Component implements javax.accessibility.Accessible {
 
         /** Gets the AccessibleText associated with this object presenting text on the display */
         public javax.accessibility.AccessibleText getAccessibleText() {
-
+            
             if (disposed)
                 return null;
-
+            
             try {
                 XAccessibleText unoAccessibleText = (XAccessibleText) UnoRuntime.queryInterface(XAccessibleText.class,
                         unoAccessibleContext);
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/List.java b/accessibility/bridge/org/openoffice/java/accessibility/List.java
index c0583bf9b692..7a0a86d166d2 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/List.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/List.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.UnoRuntime;
 import com.sun.star.accessibility.*;
 
 public class List extends DescendantManager implements javax.accessibility.Accessible {
-
+    
     protected List(XAccessible xAccessible, XAccessibleContext xAccessibleContext) {
         super(xAccessible, xAccessibleContext);
     }
-
+    
     protected void setActiveDescendant(javax.accessibility.Accessible descendant) {
         javax.accessibility.Accessible oldAD = activeDescendant;
         activeDescendant = descendant;
         firePropertyChange(AccessibleContext.ACCESSIBLE_ACTIVE_DESCENDANT_PROPERTY,
             oldAD, descendant);
     }
-
+    
     protected void setActiveDescendant(Object any) {
         javax.accessibility.Accessible descendant = null;
         try {
@@ -59,11 +59,11 @@ public class List extends DescendantManager implements javax.accessibility.Acces
                     if (Build.DEBUG) {
                         try {
                             if (Build.DEBUG) {
-                                System.err.println("[List] retrieved active descendant event: new descendant is " +
+                                System.err.println("[List] retrieved active descendant event: new descendant is " + 
                                     unoAccessible.getAccessibleContext().getAccessibleName());
                             }
                         } catch (java.lang.NullPointerException e) {
-                            System.err.println("*** ERROR *** new active descendant not accessible");
+                            System.err.println("*** ERROR *** new active descendant not accessible"); 
                         }
                     }
                 }
@@ -72,50 +72,50 @@ public class List extends DescendantManager implements javax.accessibility.Acces
         } catch (com.sun.star.lang.IllegalArgumentException e) {
         }
     }
-
+    
     protected void add(XAccessible unoAccessible) {
         if (unoAccessible != null) {
             ListItem item = new ListItem(unoAccessible);
-            // The AccessBridge for Windows expects an instance of AccessibleContext
+            // The AccessBridge for Windows expects an instance of AccessibleContext 
             // as parameters
             firePropertyChange(AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
                 null, item.getAccessibleContext());
         }
     }
-
+    
     protected void remove(XAccessible unoAccessible) {
         if (unoAccessible != null) {
             ListItem item = new ListItem(unoAccessible);
-            // The AccessBridge for Windows expects an instance of AccessibleContext
+            // The AccessBridge for Windows expects an instance of AccessibleContext 
             // as parameters
             firePropertyChange(AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
                 item.getAccessibleContext(), null);
         }
     }
-
+    
     protected void add(Object any) {
         try {
             add((XAccessible) AnyConverter.toObject(AccessibleObjectFactory.XAccessibleType, any));
         } catch (com.sun.star.lang.IllegalArgumentException e) {
         }
     }
-
+    
     protected void remove(Object any) {
         try {
             remove((XAccessible) AnyConverter.toObject(AccessibleObjectFactory.XAccessibleType, any));
         } catch (com.sun.star.lang.IllegalArgumentException e) {
         }
     }
-
+    
     /**
     * Update the proxy objects appropriatly on property change events
     */
     protected class AccessibleListListener extends AccessibleDescendantManagerListener {
-
+        
         protected AccessibleListListener() {
             super();
         }
-
+        
         /** Called by OpenOffice process to notify property changes */
         public void notifyEvent(AccessibleEventObject event) {
             switch (event.EventId) {
@@ -139,23 +139,23 @@ public class List extends DescendantManager implements javax.accessibility.Acces
             }
         }
     }
-
+    
     protected XAccessibleEventListener createEventListener() {
         return new AccessibleListListener();
     }
-
+    
     /** Creates the AccessibleContext associated with this object */
     public javax.accessibility.AccessibleContext createAccessibleContext() {
         return new AccessibleList();
     }
-
+    
     protected class AccessibleList extends AccessibleDescendantManager {
-
+        
         /** Gets the role of this object */
         public javax.accessibility.AccessibleRole getAccessibleRole() {
             return javax.accessibility.AccessibleRole.LIST;
         }
-
+        
         /** Returns the specified Accessible child of the object */
         public javax.accessibility.Accessible getAccessibleChild(int i) {
             javax.accessibility.Accessible child = null;
@@ -175,12 +175,12 @@ public class List extends DescendantManager implements javax.accessibility.Acces
             }
             return child;
         }
-
+        
         /*
          * AccessibleComponent
          */
-
-        /** Returns the Accessible child, if one exists, contained at the local coordinate Point */
+        
+        /** Returns the Accessible child, if one exists, contained at the local coordinate Point */     
         public javax.accessibility.Accessible getAccessibleAt(java.awt.Point p) {
             javax.accessibility.Accessible child = null;
             try {
@@ -199,11 +199,11 @@ public class List extends DescendantManager implements javax.accessibility.Acces
                 return null;
             }
         }
-
+    
         /*
         * AccessibleSelection
         */
-
+        
         /** Returns an Accessible representing the specified selected child of the object */
         public javax.accessibility.Accessible getAccessibleSelection(int i) {
             javax.accessibility.Accessible child = null;
@@ -229,15 +229,15 @@ public class List extends DescendantManager implements javax.accessibility.Acces
             return child;
         }
     }
-
+    
     class ListItem extends java.awt.Component implements javax.accessibility.Accessible {
-
+        
         protected XAccessible unoAccessible;
-
+        
         public ListItem(XAccessible xAccessible) {
             unoAccessible = xAccessible;
         }
-
+        
         public Object[] create(Object[] targetSet) {
             try {
                 java.util.ArrayList list = new java.util.ArrayList(targetSet.length);
@@ -254,9 +254,9 @@ public class List extends DescendantManager implements javax.accessibility.Acces
                 return null;
             }
         }
-
+        
         javax.accessibility.AccessibleContext accessibleContext = null;
-
+        
         /** Returns the AccessibleContext associated with this object */
         public javax.accessibility.AccessibleContext getAccessibleContext() {
             if (accessibleContext == null) {
@@ -275,15 +275,15 @@ public class List extends DescendantManager implements javax.accessibility.Acces
             }
             return accessibleContext;
         }
-
+        
         protected class AccessibleListItem extends javax.accessibility.AccessibleContext {
-
+            
             XAccessibleContext unoAccessibleContext;
-
+            
             public AccessibleListItem(XAccessibleContext xAccessibleContext) {
                 unoAccessibleContext = xAccessibleContext;
             }
-
+            
             /** Returns the accessible name of this object */
             public String getAccessibleName() {
                 try {
@@ -292,12 +292,12 @@ public class List extends DescendantManager implements javax.accessibility.Acces
                     return null;
                 }
             }
-
+            
             /** Sets the accessible name of this object */
             public void setAccessibleName(String name) {
                 // Not supported
             }
-
+            
             /** Returns the accessible name of this object */
             public String getAccessibleDescription() {
                 try {
@@ -306,12 +306,12 @@ public class List extends DescendantManager implements javax.accessibility.Acces
                     return null;
                 }
             }
-
+            
             /** Sets the accessible name of this object */
             public void setAccessibleDescription(String name) {
                 // Not supported
             }
-
+            
             /** Returns the accessible role of this object */
             public javax.accessibility.AccessibleRole getAccessibleRole() {
                 try {
@@ -322,7 +322,7 @@ public class List extends DescendantManager implements javax.accessibility.Acces
                     return null;
                 }
             }
-
+            
             /** Gets the locale of the component */
             public java.util.Locale getLocale() throws java.awt.IllegalComponentStateException {
                 try {
@@ -334,16 +334,16 @@ public class List extends DescendantManager implements javax.accessibility.Acces
                     return List.this.getLocale();
                 }
             }
-
+            
             /** Gets the 0-based index of this object in its accessible parent */
             public int getAccessibleIndexInParent() {
                 try {
                     return unoAccessibleContext.getAccessibleIndexInParent();
                 } catch (com.sun.star.uno.RuntimeException e) {
                     return -1;
-                }
+                } 
             }
-
+            
             /** Returns the number of accessible children of the object. */
             public int getAccessibleChildrenCount() {
                 try {
@@ -352,7 +352,7 @@ public class List extends DescendantManager implements javax.accessibility.Acces
                     return 0;
                 }
             }
-
+            
             /** Returns the specified Accessible child of the object. */
             public javax.accessibility.Accessible getAccessibleChild(int i) {
                 javax.accessibility.Accessible child = null;
@@ -370,7 +370,7 @@ public class List extends DescendantManager implements javax.accessibility.Acces
                 }
                 return child;
             }
-
+            
             /** Returns the state set of this object */
             public javax.accessibility.AccessibleStateSet getAccessibleStateSet() {
                 try {
@@ -380,68 +380,68 @@ public class List extends DescendantManager implements javax.accessibility.Acces
                     return AccessibleStateAdapter.getDefunctStateSet();
                 }
             }
-
+            
             /** Gets the AccessibleComponent associated with this object that has a graphical representation */
             public javax.accessibility.AccessibleComponent getAccessibleComponent() {
                 try {
                     XAccessibleComponent unoAccessibleComponent = (XAccessibleComponent)
                         UnoRuntime.queryInterface(XAccessibleComponent.class, unoAccessibleContext);
-                    return (unoAccessibleComponent != null) ?
+                    return (unoAccessibleComponent != null) ? 
                         new AccessibleComponentImpl(unoAccessibleComponent) : null;
                 } catch (com.sun.star.uno.RuntimeException e) {
                     return null;
                 }
             }
-
+            
             /** Gets the AccessibleAction associated with this object that has a graphical representation */
             public javax.accessibility.AccessibleAction getAccessibleAction() {
                 try {
                     XAccessibleAction unoAccessibleAction = (XAccessibleAction)
                         UnoRuntime.queryInterface(XAccessibleAction.class, unoAccessibleContext);
-                    return (unoAccessibleAction != null) ?
+                    return (unoAccessibleAction != null) ? 
                         new AccessibleActionImpl(unoAccessibleAction) : null;
                 } catch (com.sun.star.uno.RuntimeException e) {
                     return null;
                 }
             }
-
+            
             /** Gets the AccessibleText associated with this object that has a graphical representation */
             public javax.accessibility.AccessibleText getAccessibleText() {
-
+                
                 if (disposed)
                     return null;
-
+                
                 try {
                     XAccessibleText unoAccessibleText = (XAccessibleText)
                         UnoRuntime.queryInterface(XAccessibleText.class, unoAccessibleContext);
-                    return (unoAccessibleText != null) ?
+                    return (unoAccessibleText != null) ? 
                         new AccessibleTextImpl(unoAccessibleText) : null;
                 } catch (com.sun.star.uno.RuntimeException e) {
                     return null;
                 }
             }
-
+            
             /** Gets the AccessibleValue associated with this object that has a graphical representation */
             public javax.accessibility.AccessibleValue getAccessibleValue() {
                 try {
                     XAccessibleValue unoAccessibleValue = (XAccessibleValue)
                         UnoRuntime.queryInterface(XAccessibleValue.class, unoAccessibleContext);
-                    return (unoAccessibleValue != null) ?
+                    return (unoAccessibleValue != null) ? 
                         new AccessibleValueImpl(unoAccessibleValue) : null;
                 } catch (com.sun.star.uno.RuntimeException e) {
                     return null;
                 }
             }
-
+            
             /** Gets the AccessibleText associated with this object presenting text on the display */
             public javax.accessibility.AccessibleIcon[] getAccessibleIcon() {
                 try {
-                    XAccessibleImage unoAccessibleImage = (XAccessibleImage)
+                    XAccessibleImage unoAccessibleImage = (XAccessibleImage) 
                         UnoRuntime.queryInterface(XAccessibleImage.class, unoAccessibleContext);
                     if (unoAccessibleImage != null) {
                         javax.accessibility.AccessibleIcon[] icons = { new AccessibleIconImpl(unoAccessibleImage) };
                         return icons;
-                    }
+                    } 
                 } catch (com.sun.star.uno.RuntimeException e) {
                 }
                 return null;
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Menu.java b/accessibility/bridge/org/openoffice/java/accessibility/Menu.java
index 346baca749b3..7ece90dcc360 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Menu.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Menu.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 Menu extends AbstractButton
     }
 
     protected synchronized void add(XAccessible unoAccessible) {
-        // The AccessBridge for Windows expects an instance of AccessibleContext
+        // The AccessBridge for Windows expects an instance of AccessibleContext 
         // as parameters
         java.awt.Component c = getComponent(unoAccessible);
 
@@ -85,7 +85,7 @@ public class Menu extends AbstractButton
     }
 
     protected synchronized void remove(XAccessible unoAccessible) {
-        // The AccessBridge for Windows expects an instance of AccessibleContext
+        // The AccessBridge for Windows expects an instance of AccessibleContext 
         // as parameters
         java.awt.Component c = getComponent(unoAccessible);
 
@@ -265,7 +265,7 @@ public class Menu extends AbstractButton
         public void addAccessibleSelection(int i) {
             try {
                 javax.accessibility.Accessible a = getAccessibleChild(i);
-
+            
                 // selecting menu items invokes the click action in Java 1.5
                 if( a instanceof MenuItem )
                     a.getAccessibleContext().getAccessibleAction().doAccessibleAction(0);
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/MenuContainer.java b/accessibility/bridge/org/openoffice/java/accessibility/MenuContainer.java
index ccae0ccadd04..090c122f3e9e 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/MenuContainer.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/MenuContainer.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,20 +32,20 @@ import javax.accessibility.AccessibleContext;
 import com.sun.star.uno.*;
 import com.sun.star.accessibility.*;
 
-/**
+/** 
  * Specialized container for MenuBar and Popup-Menu(s)
  * FIXME: join with Menu ?
  */
 public class MenuContainer extends Container implements javax.accessibility.Accessible {
 
     protected XAccessibleSelection unoAccessibleSelection = null;
-
+    
     protected MenuContainer(javax.accessibility.AccessibleRole role, XAccessible xAccessible, XAccessibleContext xAccessibleContext) {
         super(role, xAccessible, xAccessibleContext);
     }
-
+    
     protected class AccessibleMenuContainerListener extends AccessibleContainerListener {
-
+        
         protected AccessibleMenuContainerListener() {
             super();
         }
@@ -63,18 +63,18 @@ public class MenuContainer extends Container implements javax.accessibility.Acce
             }
         }
     }
-
+    
     protected XAccessibleEventListener createEventListener() {
         return new AccessibleMenuContainerListener();
     }
-
+    
     /** Creates the AccessibleContext associated with this object */
     public javax.accessibility.AccessibleContext createAccessibleContext() {
         return new AccessibleMenuContainer();
     }
 
     protected class AccessibleMenuContainer extends AccessibleContainer implements javax.accessibility.AccessibleSelection {
-
+        
         protected AccessibleMenuContainer() {
             unoAccessibleSelection = (XAccessibleSelection) UnoRuntime.queryInterface(XAccessibleSelection.class,
                     unoAccessibleContext);
@@ -103,7 +103,7 @@ public class MenuContainer extends Container implements javax.accessibility.Acce
         public void addAccessibleSelection(int i) {
             try {
                 javax.accessibility.Accessible a = getAccessibleChild(i);
-
+            
                 // selecting menu items invokes the click action in Java 1.5
                 if( a instanceof MenuItem )
                     a.getAccessibleContext().getAccessibleAction().doAccessibleAction(0);
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/MenuItem.java b/accessibility/bridge/org/openoffice/java/accessibility/MenuItem.java
index 39aa1b73ce30..56886bcb78a2 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/MenuItem.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/MenuItem.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,24 +37,24 @@ class MenuItem extends ToggleButton {
     }
 
     protected class AccessibleMenuItemListener extends AccessibleUNOComponentListener {
-
+    
         protected AccessibleMenuItemListener() {
         }
-
+        
         protected void setComponentState(short state, boolean enable) {
-
+                
             // #i56538# menu items in Java 1.5 are ARMED, not SELECTED
             if( state == com.sun.star.accessibility.AccessibleStateType.SELECTED )
                 fireStatePropertyChange(javax.accessibility.AccessibleState.ARMED, enable);
             else
                 super.setComponentState(state, enable);
-        }
+        }        
     };
 
     protected XAccessibleEventListener createEventListener() {
         return new AccessibleMenuItemListener();
     }
-
+    
     /** Creates the AccessibleContext associated with this object */
     public javax.accessibility.AccessibleContext createAccessibleContext() {
         return new AccessibleMenuItem();
@@ -74,7 +74,7 @@ class MenuItem extends ToggleButton {
                 return super.getAccessibleIndexInParent();
             }
         }
-
+        
         /**
         * Gets the current state set of this object.
         *
@@ -84,16 +84,16 @@ class MenuItem extends ToggleButton {
         */
         public javax.accessibility.AccessibleStateSet getAccessibleStateSet() {
             javax.accessibility.AccessibleStateSet stateSet = super.getAccessibleStateSet();
-
+            
             // #i56538# menu items in Java do not have SELECTABLE ..
             stateSet.remove(javax.accessibility.AccessibleState.SELECTABLE);
-
+            
             // .. and also ARMED insted of SELECTED
             if( stateSet.remove(javax.accessibility.AccessibleState.SELECTED) )
                 stateSet.add(javax.accessibility.AccessibleState.ARMED);
-
+            
             return stateSet;
         }
-
+        
     }
 }
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/NativeFrame.java b/accessibility/bridge/org/openoffice/java/accessibility/NativeFrame.java
index bcc4c0dddebc..d11bf4a440e9 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/NativeFrame.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/NativeFrame.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/accessibility/bridge/org/openoffice/java/accessibility/Paragraph.java b/accessibility/bridge/org/openoffice/java/accessibility/Paragraph.java
index 6088bf48eabe..62d5441e9eaf 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Paragraph.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Paragraph.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,16 +33,16 @@ import javax.accessibility.AccessibleText;
 import com.sun.star.uno.*;
 import com.sun.star.accessibility.*;
 
-/**
+/** 
  */
 public class Paragraph extends Container implements javax.accessibility.Accessible {
-
+    
     protected Paragraph(XAccessible xAccessible, XAccessibleContext xAccessibleContext) {
         super(javax.accessibility.AccessibleRole.TEXT, xAccessible, xAccessibleContext);
     }
-
+    
     protected class AccessibleParagraphListener extends AccessibleContainerListener {
-
+        
         protected AccessibleParagraphListener() {
             super();
         }
@@ -62,7 +62,7 @@ public class Paragraph extends Container implements javax.accessibility.Accessib
                     break;
             }
         }
-
+               
 
         protected void handleVisibleDataChanged() {
             if (Paragraph.this.isFocusOwner()) {
@@ -79,13 +79,13 @@ public class Paragraph extends Container implements javax.accessibility.Accessib
                 }
             }
         }
-
+        
         /** Called by OpenOffice process to notify property changes */
         public void notifyEvent(AccessibleEventObject event) {
             switch (event.EventId) {
                 case AccessibleEventId.CARET_CHANGED:
                     firePropertyChange(accessibleContext.ACCESSIBLE_CARET_PROPERTY,
-                        Component.toNumber(event.OldValue),
+                        Component.toNumber(event.OldValue), 
                         Component.toNumber(event.NewValue));
                     break;
                 case AccessibleEventId.VISIBLE_DATA_CHANGED:
@@ -99,28 +99,28 @@ public class Paragraph extends Container implements javax.accessibility.Accessib
             }
         }
     }
-
+    
     protected XAccessibleEventListener createEventListener() {
         return new AccessibleParagraphListener();
     }
-
+    
     /** Creates the AccessibleContext associated with this object */
     public javax.accessibility.AccessibleContext createAccessibleContext() {
         return new AccessibleParagraph();
     }
 
     protected class AccessibleParagraph extends AccessibleContainer {
-
+        
         protected AccessibleParagraph() {
             // Don't do the queryInterface on XAccessibleText already ..
             super(false);
-            /* Since getAccessibleText() is heavily used by the java access
+            /* Since getAccessibleText() is heavily used by the java access 
              * bridge for gnome and the gnome at-tools, we do a query interface
              * here and remember the result.
              */
             accessibleText = AccessibleHypertextImpl.get(unoAccessibleContext);
         }
-
+    
         /*
         * AccessibleContext
         */
@@ -132,12 +132,12 @@ public class Paragraph extends Container implements javax.accessibility.Accessib
 
         /** Gets the AccessibleEditableText associated with this object presenting text on the display */
         public javax.accessibility.AccessibleEditableText getAccessibleEditableText() {
-
+            
             if (disposed)
                 return null;
-
+            
             try {
-                XAccessibleEditableText unoAccessibleText = (XAccessibleEditableText)
+                XAccessibleEditableText unoAccessibleText = (XAccessibleEditableText) 
                     UnoRuntime.queryInterface(XAccessibleEditableText.class,
                     unoAccessibleComponent);
                 if (unoAccessibleText != null) {
@@ -149,28 +149,28 @@ public class Paragraph extends Container implements javax.accessibility.Accessib
                 return null;
             }
         }
-
+        
         /** Gets the AccessibleAction associated with this object that has a graphical representation */
         public javax.accessibility.AccessibleAction getAccessibleAction() {
             try {
                 XAccessibleAction unoAccessibleAction = (XAccessibleAction)
                     UnoRuntime.queryInterface(XAccessibleAction.class, unoAccessibleComponent);
-                return (unoAccessibleAction != null) ?
+                return (unoAccessibleAction != null) ? 
                     new AccessibleActionImpl(unoAccessibleAction) : null;
             } catch (com.sun.star.uno.RuntimeException e) {
                 return null;
             }
         }
-
+        
         /** Returns the relation set of this object */
         public javax.accessibility.AccessibleRelationSet getAccessibleRelationSet() {
             try {
-                XAccessibleRelationSet unoAccessibleRelationSet =
+                XAccessibleRelationSet unoAccessibleRelationSet = 
                     unoAccessible.getAccessibleContext().getAccessibleRelationSet();
                 if (unoAccessibleRelationSet == null) {
                     return super.getAccessibleRelationSet();
                 }
-
+                
                 javax.accessibility.AccessibleRelationSet relationSet = new javax.accessibility.AccessibleRelationSet();
                 int count = unoAccessibleRelationSet.getRelationCount();
                 for (int i = 0; i < count; i++) {
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/RadioButton.java b/accessibility/bridge/org/openoffice/java/accessibility/RadioButton.java
index 3daeee6cd8de..53f4bc1285fb 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/RadioButton.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/RadioButton.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/accessibility/bridge/org/openoffice/java/accessibility/ScrollBar.java b/accessibility/bridge/org/openoffice/java/accessibility/ScrollBar.java
index 83b17d698201..68e0a7ab0ff6 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/ScrollBar.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/ScrollBar.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,25 +34,25 @@ import javax.swing.SwingConstants;
 import com.sun.star.uno.*;
 import com.sun.star.accessibility.*;
 
-/**
+/** 
  */
 public class ScrollBar extends Component implements SwingConstants, javax.accessibility.Accessible {
-
+    
     public ScrollBar(XAccessible xAccessible, XAccessibleContext xAccessibleContext) {
         super(xAccessible, xAccessibleContext);
     }
-
+    
     /** Creates the AccessibleContext associated with this object */
     public javax.accessibility.AccessibleContext createAccessibleContext() {
         return new AccessibleScrollBar();
     }
-
-    protected class AccessibleScrollBar extends AccessibleUNOComponent implements
-        javax.accessibility.AccessibleAction {
-
+    
+    protected class AccessibleScrollBar extends AccessibleUNOComponent implements 
+        javax.accessibility.AccessibleAction { 
+        
         protected XAccessibleAction unoAccessibleAction;
         protected int actionCount = 0;
-
+        
         /**
         * Though the class is abstract, this should be called by all sub-classes
         */
@@ -64,37 +64,37 @@ public class ScrollBar extends Component implements SwingConstants, javax.access
                 actionCount = unoAccessibleAction.getAccessibleActionCount();
             }
         }
-
+        
         /*
         * AccessibleContext
         */
-
+        
         /** Gets the role of this object */
         public javax.accessibility.AccessibleRole getAccessibleRole() {
             return javax.accessibility.AccessibleRole.SCROLL_BAR;
         }
-
+        
         /** Gets the AccessibleValue associated with this object that has a graphical representation */
         public javax.accessibility.AccessibleValue getAccessibleValue() {
             try {
                 XAccessibleValue unoAccessibleValue = (XAccessibleValue)
                     UnoRuntime.queryInterface(XAccessibleValue.class, unoAccessibleContext);
-                return (unoAccessibleValue != null) ?
+                return (unoAccessibleValue != null) ? 
                     new AccessibleValueImpl(unoAccessibleValue) : null;
             } catch (com.sun.star.uno.RuntimeException e) {
                 return null;
             }
         }
-
+        
         /** Gets the AccessibleAction associated with this object that supports one or more actions */
         public javax.accessibility.AccessibleAction getAccessibleAction() {
             return this;
         }
-
+        
         /*
         * AccessibleAction
         */
-
+        
         /** Performs the specified Action on the object */
         public boolean doAccessibleAction(int param) {
             if (param < actionCount) {
@@ -105,7 +105,7 @@ public class ScrollBar extends Component implements SwingConstants, javax.access
             }
             return false;
         }
-
+        
         /** Returns a description of the specified action of the object */
         public java.lang.String getAccessibleActionDescription(int param) {
             if(param < actionCount) {
@@ -116,7 +116,7 @@ public class ScrollBar extends Component implements SwingConstants, javax.access
             }
             return null;
         }
-
+        
         /** Returns the number of accessible actions available in this object */
         public int getAccessibleActionCount() {
             return actionCount;
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Separator.java b/accessibility/bridge/org/openoffice/java/accessibility/Separator.java
index 892768e07cbb..54ddcf0b0313 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Separator.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Separator.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/accessibility/bridge/org/openoffice/java/accessibility/Table.java b/accessibility/bridge/org/openoffice/java/accessibility/Table.java
index 24ea912d4217..d304cb7cd662 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Table.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Table.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,18 +34,18 @@ import com.sun.star.uno.UnoRuntime;
 import com.sun.star.accessibility.*;
 
 public class Table extends DescendantManager implements javax.accessibility.Accessible {
-
+    
     protected Table(XAccessible xAccessible, XAccessibleContext xAccessibleContext, boolean multiselectable) {
         super(xAccessible, xAccessibleContext, multiselectable);
     }
-
+    
     protected void setActiveDescendant(javax.accessibility.Accessible descendant) {
         javax.accessibility.Accessible oldAD = activeDescendant;
         activeDescendant = descendant;
         firePropertyChange(javax.accessibility.AccessibleContext.ACCESSIBLE_ACTIVE_DESCENDANT_PROPERTY,
             oldAD, descendant);
     }
-
+    
     protected void setActiveDescendant(Object any) {
         javax.accessibility.Accessible descendant = null;
         try {
@@ -61,50 +61,50 @@ public class Table extends DescendantManager implements javax.accessibility.Acce
         } catch (com.sun.star.lang.IllegalArgumentException e) {
         }
     }
-
+    
     protected void add(XAccessible unoAccessible) {
         if (unoAccessible != null) {
             TableCell cell = new TableCell(unoAccessible);
-            // The AccessBridge for Windows expects an instance of AccessibleContext
+            // The AccessBridge for Windows expects an instance of AccessibleContext 
             // as parameters
             firePropertyChange(javax.accessibility.AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
                 null, cell.getAccessibleContext());
         }
     }
-
+    
     protected void remove(XAccessible unoAccessible) {
         if (unoAccessible != null) {
             TableCell cell = new TableCell(unoAccessible);
-            // The AccessBridge for Windows expects an instance of AccessibleContext
+            // The AccessBridge for Windows expects an instance of AccessibleContext 
             // as parameters
             firePropertyChange(javax.accessibility.AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
                 cell.getAccessibleContext(), null);
         }
     }
-
+    
     protected void add(Object any) {
         try {
             add((XAccessible) AnyConverter.toObject(AccessibleObjectFactory.XAccessibleType, any));
         } catch (com.sun.star.lang.IllegalArgumentException e) {
         }
     }
-
+    
     protected void remove(Object any) {
         try {
             remove((XAccessible) AnyConverter.toObject(AccessibleObjectFactory.XAccessibleType, any));
         } catch (com.sun.star.lang.IllegalArgumentException e) {
         }
     }
-
+    
     /**
     * Update the proxy objects appropriatly on property change events
     */
     protected class AccessibleTableListener extends AccessibleDescendantManagerListener {
-
+        
         protected AccessibleTableListener() {
             super();
         }
-
+        
         /** Called by OpenOffice process to notify property changes */
         public void notifyEvent(AccessibleEventObject event) {
             switch (event.EventId) {
@@ -124,24 +124,24 @@ public class Table extends DescendantManager implements javax.accessibility.Acce
             }
         }
     }
-
+    
     protected XAccessibleEventListener createEventListener() {
         return new AccessibleTableListener();
     }
-
+    
     /** Creates the AccessibleContext associated with this object */
     public javax.accessibility.AccessibleContext createAccessibleContext() {
         return new AccessibleTable();
     }
-
+    
     protected class AccessibleTable extends AccessibleDescendantManager implements javax.accessibility.AccessibleExtendedTable {
-
+ 
         protected XAccessibleTable unoAccessibleTable;
-
+        
         public AccessibleTable() {
             unoAccessibleTable = (XAccessibleTable) UnoRuntime.queryInterface(XAccessibleTable.class, unoAccessibleContext);
         }
-
+        
         /** Gets the role of this object */
         public javax.accessibility.AccessibleRole getAccessibleRole() {
             return javax.accessibility.AccessibleRole.TABLE;
@@ -151,7 +151,7 @@ public class Table extends DescendantManager implements javax.accessibility.Acce
         public javax.accessibility.AccessibleTable getAccessibleTable() {
             return this;
         }
-
+        
         /** Returns the specified Accessible child of the object */
         public javax.accessibility.Accessible getAccessibleChild(int i) {
             javax.accessibility.Accessible child = null;
@@ -171,12 +171,12 @@ public class Table extends DescendantManager implements javax.accessibility.Acce
             }
             return child;
         }
-
+        
         /*
         * AccessibleComponent
         */
 
-        /** Returns the Accessible child, if one exists, contained at the local coordinate Point */
+        /** Returns the Accessible child, if one exists, contained at the local coordinate Point */     
         public javax.accessibility.Accessible getAccessibleAt(java.awt.Point p) {
             javax.accessibility.Accessible child = null;
             try {
@@ -195,11 +195,11 @@ public class Table extends DescendantManager implements javax.accessibility.Acce
             }
             return child;
         }
-
+        
         /*
         * AccessibleSelection
         */
-
+        
         /** Returns an Accessible representing the specified selected child of the object */
         public javax.accessibility.Accessible getAccessibleSelection(int i) {
             javax.accessibility.Accessible child = null;
@@ -219,11 +219,11 @@ public class Table extends DescendantManager implements javax.accessibility.Acce
             }
             return child;
         }
-
+        
         /*
         * AccessibleTable
         */
-
+        
         /** Returns the Accessible at a specified row and column in the table. */
         public javax.accessibility.Accessible getAccessibleAt(int r, int c) {
             javax.accessibility.Accessible child = null;
@@ -242,7 +242,7 @@ public class Table extends DescendantManager implements javax.accessibility.Acce
             } catch (com.sun.star.uno.RuntimeException e) {
             }
             return child;
-        }
+        }    
 
         /** Returns the caption for the table. */
         public javax.accessibility.Accessible getAccessibleCaption() {
@@ -271,7 +271,7 @@ public class Table extends DescendantManager implements javax.accessibility.Acce
             }
         }
 
-        /**
+        /** 
          * Returns the number of columns occupied by the Accessible
          * at a specified row and column in the table.
          */
@@ -313,7 +313,7 @@ public class Table extends DescendantManager implements javax.accessibility.Acce
         }
 
         /**
-         * Returns the number of rows occupied by the Accessible
+         * Returns the number of rows occupied by the Accessible 
          * at a specified row and column in the table.
          */
         public int getAccessibleRowExtentAt(int r, int c) {
@@ -378,9 +378,9 @@ public class Table extends DescendantManager implements javax.accessibility.Acce
             }
         }
 
-        /**
-         * Returns a boolean value indicating whether the accessible
-         * at a specified row and column is selected.
+        /** 
+         * Returns a boolean value indicating whether the accessible 
+         * at a specified row and column is selected. 
          */
         public boolean isAccessibleSelected(int r, int c) {
             try {
@@ -453,17 +453,17 @@ public class Table extends DescendantManager implements javax.accessibility.Acce
             } catch (com.sun.star.uno.RuntimeException e) {
                 return -1;
             }
-        }
+        }       
     }
-
+    
     class TableCell extends java.awt.Component implements javax.accessibility.Accessible {
-
+        
         protected XAccessible unoAccessible;
-
+        
         public TableCell(XAccessible xAccessible) {
             unoAccessible = xAccessible;
         }
-
+        
         public Object[] create(Object[] targetSet) {
             try {
                 java.util.ArrayList list = new java.util.ArrayList(targetSet.length);
@@ -480,9 +480,9 @@ public class Table extends DescendantManager implements javax.accessibility.Acce
                 return null;
             }
         }
-
+        
         javax.accessibility.AccessibleContext accessibleContext = null;
-
+        
         /** Returns the AccessibleContext associated with this object */
         public javax.accessibility.AccessibleContext getAccessibleContext() {
             if (accessibleContext == null) {
@@ -500,15 +500,15 @@ public class Table extends DescendantManager implements javax.accessibility.Acce
             }
             return accessibleContext;
         }
-
+        
         protected class AccessibleTableCell extends javax.accessibility.AccessibleContext {
-
+            
             XAccessibleContext unoAccessibleContext;
-
+            
             public AccessibleTableCell(XAccessibleContext xAccessibleContext) {
                 unoAccessibleContext = xAccessibleContext;
             }
-
+            
             /** Returns the accessible name of this object */
             public String getAccessibleName() {
                 try {
@@ -517,12 +517,12 @@ public class Table extends DescendantManager implements javax.accessibility.Acce
                     return null;
                 }
             }
-
+            
             /** Sets the accessible name of this object */
             public void setAccessibleName(String name) {
                 // Not supported
             }
-
+            
             /** Returns the accessible name of this object */
             public String getAccessibleDescription() {
                 try {
@@ -531,12 +531,12 @@ public class Table extends DescendantManager implements javax.accessibility.Acce
                     return null;
                 }
             }
-
+            
             /** Sets the accessible name of this object */
             public void setAccessibleDescription(String name) {
                 // Not supported
             }
-
+            
             /** Returns the accessible role of this object */
             public javax.accessibility.AccessibleRole getAccessibleRole() {
                 try {
@@ -547,7 +547,7 @@ public class Table extends DescendantManager implements javax.accessibility.Acce
                     return null;
                 }
             }
-
+            
             /** Gets the locale of the component */
             public java.util.Locale getLocale() throws java.awt.IllegalComponentStateException {
                 try {
@@ -559,16 +559,16 @@ public class Table extends DescendantManager implements javax.accessibility.Acce
                     return Table.this.getLocale();
                 }
             }
-
+            
             /** Gets the 0-based index of this object in its accessible parent */
             public int getAccessibleIndexInParent() {
                 try {
                     return unoAccessibleContext.getAccessibleIndexInParent();
                 } catch (com.sun.star.uno.RuntimeException e) {
                     return -1;
-                }
+                } 
             }
-
+            
             /** Returns the number of accessible children of the object. */
             public int getAccessibleChildrenCount() {
                 try {
@@ -577,7 +577,7 @@ public class Table extends DescendantManager implements javax.accessibility.Acce
                     return 0;
                 }
             }
-
+            
             /** Returns the specified Accessible child of the object. */
             public javax.accessibility.Accessible getAccessibleChild(int i) {
                 javax.accessibility.Accessible child = null;
@@ -595,7 +595,7 @@ public class Table extends DescendantManager implements javax.accessibility.Acce
                 }
                 return child;
             }
-
+            
             /** Returns the state set of this object */
             public javax.accessibility.AccessibleStateSet getAccessibleStateSet() {
                 try {
@@ -605,7 +605,7 @@ public class Table extends DescendantManager implements javax.accessibility.Acce
                     return AccessibleStateAdapter.getDefunctStateSet();
                 }
             }
-
+                        
             /** Returns the relation set of this object */
             public javax.accessibility.AccessibleRelationSet getAccessibleRelationSet() {
                 try {
@@ -613,7 +613,7 @@ public class Table extends DescendantManager implements javax.accessibility.Acce
                     if (unoAccessibleRelationSet == null) {
                         return null;
                     }
-
+                    
                     javax.accessibility.AccessibleRelationSet relationSet = new javax.accessibility.AccessibleRelationSet();
                     int count = unoAccessibleRelationSet.getRelationCount();
                     for (int i = 0; i < count; i++) {
@@ -655,68 +655,68 @@ public class Table extends DescendantManager implements javax.accessibility.Acce
                     return null;
                 }
             }
-
+            
             /** Gets the AccessibleComponent associated with this object that has a graphical representation */
             public javax.accessibility.AccessibleComponent getAccessibleComponent() {
                 try {
                     XAccessibleComponent unoAccessibleComponent = (XAccessibleComponent)
                         UnoRuntime.queryInterface(XAccessibleComponent.class, unoAccessibleContext);
-                    return (unoAccessibleComponent != null) ?
+                    return (unoAccessibleComponent != null) ? 
                         new AccessibleComponentImpl(unoAccessibleComponent) : null;
                 } catch (com.sun.star.uno.RuntimeException e) {
                     return null;
                 }
             }
-
+            
             /** Gets the AccessibleAction associated with this object that has a graphical representation */
             public javax.accessibility.AccessibleAction getAccessibleAction() {
                 try {
                     XAccessibleAction unoAccessibleAction = (XAccessibleAction)
                         UnoRuntime.queryInterface(XAccessibleAction.class, unoAccessibleContext);
-                    return (unoAccessibleAction != null) ?
+                    return (unoAccessibleAction != null) ? 
                         new AccessibleActionImpl(unoAccessibleAction) : null;
                 } catch (com.sun.star.uno.RuntimeException e) {
                     return null;
                 }
             }
-
+            
             /** Gets the AccessibleText associated with this object that has a graphical representation */
             public javax.accessibility.AccessibleText getAccessibleText() {
-
+                
                 if (disposed)
                     return null;
-
+                
                 try {
                     XAccessibleText unoAccessibleText = (XAccessibleText)
                         UnoRuntime.queryInterface(XAccessibleText.class, unoAccessibleContext);
-                    return (unoAccessibleText != null) ?
+                    return (unoAccessibleText != null) ? 
                         new AccessibleTextImpl(unoAccessibleText) : null;
                 } catch (com.sun.star.uno.RuntimeException e) {
                     return null;
                 }
             }
-
+            
             /** Gets the AccessibleValue associated with this object that has a graphical representation */
             public javax.accessibility.AccessibleValue getAccessibleValue() {
                 try {
                     XAccessibleValue unoAccessibleValue = (XAccessibleValue)
                         UnoRuntime.queryInterface(XAccessibleValue.class, unoAccessibleContext);
-                    return (unoAccessibleValue != null) ?
+                    return (unoAccessibleValue != null) ? 
                         new AccessibleValueImpl(unoAccessibleValue) : null;
                 } catch (com.sun.star.uno.RuntimeException e) {
                     return null;
                 }
             }
-
+            
             /** Gets the AccessibleText associated with this object presenting text on the display */
             public javax.accessibility.AccessibleIcon[] getAccessibleIcon() {
                 try {
-                    XAccessibleImage unoAccessibleImage = (XAccessibleImage)
+                    XAccessibleImage unoAccessibleImage = (XAccessibleImage) 
                         UnoRuntime.queryInterface(XAccessibleImage.class, unoAccessibleContext);
                     if (unoAccessibleImage != null) {
                         javax.accessibility.AccessibleIcon[] icons = { new AccessibleIconImpl(unoAccessibleImage) };
                         return icons;
-                    }
+                    } 
                 } catch (com.sun.star.uno.RuntimeException e) {
                 }
                 return null;
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/TextComponent.java b/accessibility/bridge/org/openoffice/java/accessibility/TextComponent.java
index a142297c4c12..86fa4e60428e 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/TextComponent.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/TextComponent.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,20 +30,20 @@ package org.openoffice.java.accessibility;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.accessibility.*;
 
-/**
+/** 
  */
 public class TextComponent extends Component implements javax.accessibility.Accessible {
-
+    
     protected TextComponent(XAccessible xAccessible, XAccessibleContext xAccessibleContext) {
         super(xAccessible, xAccessibleContext);
     }
-
+    
     protected class AccessibleTextComponentListener extends AccessibleUNOComponentListener {
-
+        
         protected AccessibleTextComponentListener() {
             super();
         }
-
+        
         protected void setComponentState(short state, boolean enable) {
             switch (state) {
                 case AccessibleStateType.EDITABLE:
@@ -60,42 +60,42 @@ public class TextComponent extends Component implements javax.accessibility.Acce
             }
         }
     }
-
+    
     protected XAccessibleEventListener createEventListener() {
         return new AccessibleTextComponentListener();
     }
-
+    
     /** Creates the AccessibleContext associated with this object */
     public javax.accessibility.AccessibleContext createAccessibleContext() {
         return new AccessibleTextComponent();
     }
-
+    
     protected class AccessibleTextComponent extends AccessibleUNOComponent {
-
+        
         /**
         * Though the class is abstract, this should be called by all sub-classes
         */
         protected AccessibleTextComponent() {
             super();
         }
-
+        
         /*
         * AccessibleContext
         */
-
+        
         /** Gets the role of this object */
         public javax.accessibility.AccessibleRole getAccessibleRole() {
             return javax.accessibility.AccessibleRole.TEXT;
         }
-
+        
         /** Gets the AccessibleText associated with this object presenting text on the display */
         public javax.accessibility.AccessibleText getAccessibleText() {
-
+            
             if (disposed)
                 return null;
-
+            
             try {
-                XAccessibleText unoAccessibleText = (XAccessibleText)
+                XAccessibleText unoAccessibleText = (XAccessibleText) 
                     UnoRuntime.queryInterface(XAccessibleText.class,unoAccessibleComponent);
                 if (unoAccessibleText != null) {
                     return new AccessibleTextImpl(unoAccessibleText);
@@ -106,11 +106,11 @@ public class TextComponent extends Component implements javax.accessibility.Acce
                 return null;
             }
         }
-
+        
         /** Gets the AccessibleEditableText associated with this object presenting text on the display */
         public javax.accessibility.AccessibleEditableText getAccessibleEditableText() {
             try {
-                XAccessibleEditableText unoAccessibleText = (XAccessibleEditableText)
+                XAccessibleEditableText unoAccessibleText = (XAccessibleEditableText) 
                     UnoRuntime.queryInterface(XAccessibleEditableText.class,unoAccessibleComponent);
                 if (unoAccessibleText != null) {
                     return new AccessibleEditableTextImpl(unoAccessibleText);
@@ -121,28 +121,28 @@ public class TextComponent extends Component implements javax.accessibility.Acce
                 return null;
             }
         }
-
+        
         /** Gets the AccessibleAction associated with this object that has a graphical representation */
         public javax.accessibility.AccessibleAction getAccessibleAction() {
             try {
                 XAccessibleAction unoAccessibleAction = (XAccessibleAction)
                     UnoRuntime.queryInterface(XAccessibleAction.class, unoAccessibleComponent);
-                return (unoAccessibleAction != null) ?
+                return (unoAccessibleAction != null) ? 
                     new AccessibleActionImpl(unoAccessibleAction) : null;
             } catch (com.sun.star.uno.RuntimeException e) {
                 return null;
             }
         }
-
+        
         /** Returns the relation set of this object */
         public javax.accessibility.AccessibleRelationSet getAccessibleRelationSet() {
             try {
-                XAccessibleRelationSet unoAccessibleRelationSet =
+                XAccessibleRelationSet unoAccessibleRelationSet = 
                     unoAccessible.getAccessibleContext().getAccessibleRelationSet();
                 if (unoAccessibleRelationSet == null) {
                     return super.getAccessibleRelationSet();
                 }
-
+                
                 javax.accessibility.AccessibleRelationSet relationSet = new javax.accessibility.AccessibleRelationSet();
                 int count = unoAccessibleRelationSet.getRelationCount();
                 for (int i = 0; i < count; i++) {
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/ToggleButton.java b/accessibility/bridge/org/openoffice/java/accessibility/ToggleButton.java
index bac8035a2ece..ff8c871373cf 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/ToggleButton.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/ToggleButton.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/accessibility/bridge/org/openoffice/java/accessibility/ToolTip.java b/accessibility/bridge/org/openoffice/java/accessibility/ToolTip.java
index 071a6a37fd98..9391d0f6cc87 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/ToolTip.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/ToolTip.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,10 +58,10 @@ public class ToolTip extends Component implements javax.accessibility.Accessible
 
         /** Gets the AccessibleText associated with this object presenting text on the display */
         public javax.accessibility.AccessibleText getAccessibleText() {
-
+            
             if (disposed)
                 return null;
-
+            
             try {
                 XAccessibleText unoAccessibleText = (XAccessibleText) UnoRuntime.queryInterface(XAccessibleText.class,
                         unoAccessibleComponent);
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Tree.java b/accessibility/bridge/org/openoffice/java/accessibility/Tree.java
index 5fdd5a196397..b93752679190 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Tree.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Tree.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.UnoRuntime;
 import com.sun.star.accessibility.*;
 
 public class Tree extends DescendantManager implements javax.accessibility.Accessible {
-
+    
     protected Tree(XAccessible xAccessible, XAccessibleContext xAccessibleContext) {
         super(xAccessible, xAccessibleContext);
     }
-
+    
     protected void setActiveDescendant(javax.accessibility.Accessible descendant) {
         javax.accessibility.Accessible oldAD = activeDescendant;
         activeDescendant = descendant;
-        firePropertyChange(AccessibleContext.ACCESSIBLE_ACTIVE_DESCENDANT_PROPERTY,
+        firePropertyChange(AccessibleContext.ACCESSIBLE_ACTIVE_DESCENDANT_PROPERTY,	
             oldAD, descendant);
     }
-
+    
     protected void setActiveDescendant(Object any) {
         javax.accessibility.Accessible descendant = null;
         try {
@@ -62,28 +62,28 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
         } catch (com.sun.star.lang.IllegalArgumentException e) {
         }
     }
-
+    
     protected void add(XAccessible unoAccessible) {
         if (unoAccessible != null) {
             firePropertyChange(AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
                 null, new TreeItem(unoAccessible));
         }
     }
-
+    
     protected void remove(XAccessible unoAccessible) {
         if (unoAccessible != null) {
             firePropertyChange(AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
                 new TreeItem(unoAccessible), null);
         }
     }
-
+    
     protected void add(Object any) {
         try {
             add((XAccessible) AnyConverter.toObject(AccessibleObjectFactory.XAccessibleType, any));
         } catch (com.sun.star.lang.IllegalArgumentException e) {
         }
     }
-
+    
     protected void remove(Object any) {
         try {
             remove((XAccessible) AnyConverter.toObject(AccessibleObjectFactory.XAccessibleType, any));
@@ -95,11 +95,11 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
     * Update the proxy objects appropriatly on property change events
     */
     protected class AccessibleTreeListener extends AccessibleDescendantManagerListener {
-
+        
         protected AccessibleTreeListener() {
             super();
         }
-
+        
         /** Called by OpenOffice process to notify property changes */
         public void notifyEvent(AccessibleEventObject event) {
             switch (event.EventId) {
@@ -130,20 +130,20 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
             }
         }
     }
-
+    
     protected XAccessibleEventListener createEventListener() {
         return new AccessibleTreeListener();
     }
-
+    
     /** Creates the AccessibleContext associated with this object */
     public javax.accessibility.AccessibleContext createAccessibleContext() {
         return new AccessibleTree();
     }
-
+    
     protected class AccessibleTree extends AccessibleDescendantManager implements javax.accessibility.AccessibleExtendedTable {
 
         protected XAccessibleTable unoAccessibleTable;
-
+        
         public AccessibleTree() {
             unoAccessibleTable = (XAccessibleTable) UnoRuntime.queryInterface(XAccessibleTable.class, unoAccessibleContext);
         }
@@ -151,7 +151,7 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
         /*
         * AccessibleContext
         */
-
+        
         /** Gets the role of this object */
         public javax.accessibility.AccessibleRole getAccessibleRole() {
             return javax.accessibility.AccessibleRole.TREE;
@@ -161,7 +161,7 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
         public javax.accessibility.AccessibleTable getAccessibleTable() {
             return ( unoAccessibleTable != null ) ? this : null;
         }
-
+        
         /** Returns the specified Accessible child of the object */
         public javax.accessibility.Accessible getAccessibleChild(int i) {
             javax.accessibility.Accessible child = null;
@@ -185,8 +185,8 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
         /*
          * AccessibleComponent
          */
-
-        /** Returns the Accessible child, if one exists, contained at the local coordinate Point */
+        
+        /** Returns the Accessible child, if one exists, contained at the local coordinate Point */     
         public javax.accessibility.Accessible getAccessibleAt(java.awt.Point p) {
             javax.accessibility.Accessible child = null;
             try {
@@ -205,11 +205,11 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
             }
             return child;
         }
-
+        
         /*
          * AccessibleSelection
          */
-
+         
         /** Returns an Accessible representing the specified selected child of the object */
         public javax.accessibility.Accessible getAccessibleSelection(int i) {
             javax.accessibility.Accessible child = null;
@@ -229,11 +229,11 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
             }
             return child;
         }
-
+        
          /*
         * AccessibleTable
         */
-
+        
         /** Returns the Accessible at a specified row and column in the table. */
         public javax.accessibility.Accessible getAccessibleAt(int r, int c) {
             javax.accessibility.Accessible child = null;
@@ -252,7 +252,7 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
             } catch (com.sun.star.uno.RuntimeException e) {
             }
             return child;
-        }
+        }    
 
         /** Returns the caption for the table. */
         public javax.accessibility.Accessible getAccessibleCaption() {
@@ -281,7 +281,7 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
             }
         }
 
-        /**
+        /** 
          * Returns the number of columns occupied by the Accessible
          * at a specified row and column in the table.
          */
@@ -323,7 +323,7 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
         }
 
         /**
-         * Returns the number of rows occupied by the Accessible
+         * Returns the number of rows occupied by the Accessible 
          * at a specified row and column in the table.
          */
         public int getAccessibleRowExtentAt(int r, int c) {
@@ -388,9 +388,9 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
             }
         }
 
-        /**
-         * Returns a boolean value indicating whether the accessible
-         * at a specified row and column is selected.
+        /** 
+         * Returns a boolean value indicating whether the accessible 
+         * at a specified row and column is selected. 
          */
         public boolean isAccessibleSelected(int r, int c) {
             try {
@@ -465,15 +465,15 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
             }
         }
    }
-
+    
     class TreeItem extends java.awt.Component implements javax.accessibility.Accessible {
-
+        
         protected XAccessible unoAccessible;
-
+        
         public TreeItem(XAccessible xAccessible) {
             unoAccessible = xAccessible;
         }
-
+        
         public Object[] create(Object[] targetSet) {
             try {
                 java.util.ArrayList list = new java.util.ArrayList(targetSet.length);
@@ -490,9 +490,9 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
                 return null;
             }
         }
-
+        
         javax.accessibility.AccessibleContext accessibleContext = null;
-
+        
         /** Returns the AccessibleContext associated with this object */
         public javax.accessibility.AccessibleContext getAccessibleContext() {
             if (accessibleContext == null) {
@@ -510,19 +510,19 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
             }
             return accessibleContext;
         }
-
-        protected class AccessibleTreeItem extends javax.accessibility.AccessibleContext
+        
+        protected class AccessibleTreeItem extends javax.accessibility.AccessibleContext 
             implements javax.accessibility.AccessibleSelection {
-
+            
             XAccessibleContext unoAccessibleContext;
             XAccessibleSelection unoAccessibleSelection;
-
+            
             public AccessibleTreeItem(XAccessibleContext xAccessibleContext) {
                 unoAccessibleContext = xAccessibleContext;
-                unoAccessibleSelection = (XAccessibleSelection)
+                unoAccessibleSelection = (XAccessibleSelection) 
                     UnoRuntime.queryInterface(XAccessibleSelection.class, xAccessibleContext);
             }
-
+            
             /** Returns the accessible name of this object */
             public String getAccessibleName() {
                 try {
@@ -531,12 +531,12 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
                     return null;
                 }
             }
-
+            
             /** Sets the accessible name of this object */
             public void setAccessibleName(String name) {
                 // Not supported
             }
-
+            
             /** Returns the accessible name of this object */
             public String getAccessibleDescription() {
                 try {
@@ -545,12 +545,12 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
                     return null;
                 }
             }
-
+            
             /** Sets the accessible name of this object */
             public void setAccessibleDescription(String name) {
                 // Not supported
             }
-
+            
             /** Returns the accessible role of this object */
             public javax.accessibility.AccessibleRole getAccessibleRole() {
                 try {
@@ -561,7 +561,7 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
                     return null;
                 }
             }
-
+            
             /** Gets the locale of the component */
             public java.util.Locale getLocale() throws java.awt.IllegalComponentStateException {
                 try {
@@ -573,16 +573,16 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
                     return Tree.this.getLocale();
                 }
             }
-
+            
             /** Gets the 0-based index of this object in its accessible parent */
             public int getAccessibleIndexInParent() {
                 try {
                     return unoAccessibleContext.getAccessibleIndexInParent();
                 } catch (com.sun.star.uno.RuntimeException e) {
                     return -1;
-                }
+                } 
             }
-
+            
             /** Returns the number of accessible children of the object. */
             public int getAccessibleChildrenCount() {
                 try {
@@ -591,7 +591,7 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
                     return 0;
                 }
             }
-
+            
             /** Returns the specified Accessible child of the object. */
             public javax.accessibility.Accessible getAccessibleChild(int i) {
                 javax.accessibility.Accessible child = null;
@@ -609,7 +609,7 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
                 }
                 return child;
             }
-
+            
             /** Returns the state set of this object */
             public javax.accessibility.AccessibleStateSet getAccessibleStateSet() {
                 try {
@@ -619,82 +619,82 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
                     return AccessibleStateAdapter.getDefunctStateSet();
                 }
             }
-
+            
             /** Gets the AccessibleComponent associated with this object that has a graphical representation */
             public javax.accessibility.AccessibleComponent getAccessibleComponent() {
                 try {
                     XAccessibleComponent unoAccessibleComponent = (XAccessibleComponent)
                         UnoRuntime.queryInterface(XAccessibleComponent.class, unoAccessibleContext);
-                    return (unoAccessibleComponent != null) ?
+                    return (unoAccessibleComponent != null) ? 
                         new AccessibleComponentImpl(unoAccessibleComponent) : null;
                 } catch (com.sun.star.uno.RuntimeException e) {
                     return null;
                 }
             }
-
+            
             /** Returns the AccessibleSelection interface for this object */
             public javax.accessibility.AccessibleSelection getAccessibleSelection() {
                 return (unoAccessibleSelection != null) ? this : null;
             }
-
+        
             /** Gets the AccessibleAction associated with this object that has a graphical representation */
             public javax.accessibility.AccessibleAction getAccessibleAction() {
                 try {
                     XAccessibleAction unoAccessibleAction = (XAccessibleAction)
                         UnoRuntime.queryInterface(XAccessibleAction.class, unoAccessibleContext);
-                    return (unoAccessibleAction != null) ?
+                    return (unoAccessibleAction != null) ? 
                         new AccessibleActionImpl(unoAccessibleAction) : null;
                 } catch (com.sun.star.uno.RuntimeException e) {
                     return null;
                 }
             }
-
+            
             /** Gets the AccessibleText associated with this object that has a graphical representation */
             public javax.accessibility.AccessibleText getAccessibleText() {
-
+                
                 if (disposed)
                     return null;
-
+                
                 try {
                     XAccessibleText unoAccessibleText = (XAccessibleText)
                         UnoRuntime.queryInterface(XAccessibleText.class, unoAccessibleContext);
-                    return (unoAccessibleText != null) ?
+                    return (unoAccessibleText != null) ? 
                         new AccessibleTextImpl(unoAccessibleText) : null;
                 } catch (com.sun.star.uno.RuntimeException e) {
                     return null;
                 }
             }
-
+            
             /** Gets the AccessibleValue associated with this object that has a graphical representation */
             public javax.accessibility.AccessibleValue getAccessibleValue() {
                 try {
                     XAccessibleValue unoAccessibleValue = (XAccessibleValue)
                         UnoRuntime.queryInterface(XAccessibleValue.class, unoAccessibleContext);
-                    return (unoAccessibleValue != null) ?
+                    return (unoAccessibleValue != null) ? 
                         new AccessibleValueImpl(unoAccessibleValue) : null;
                 } catch (com.sun.star.uno.RuntimeException e) {
                     return null;
                 }
             }
-
+            
             /** Gets the AccessibleText associated with this object presenting text on the display */
             public javax.accessibility.AccessibleIcon[] getAccessibleIcon() {
                 try {
-                    XAccessibleImage unoAccessibleImage = (XAccessibleImage)
+                    XAccessibleImage unoAccessibleImage = (XAccessibleImage) 
                         UnoRuntime.queryInterface(XAccessibleImage.class, unoAccessibleContext);
                     if (unoAccessibleImage != null) {
                         javax.accessibility.AccessibleIcon[] icons = { new AccessibleIconImpl(unoAccessibleImage) };
                         return icons;
-                    }
+                    } 
                 } catch (com.sun.star.uno.RuntimeException e) {
                 }
                 return null;
             }
-
+            
             /*
              * AccessibleSelection
              */
-
+             
             /** Returns an Accessible representing the specified selected child of the object */
             public javax.accessibility.Accessible getAccessibleSelection(int i) {
                 javax.accessibility.Accessible child = null;
@@ -708,7 +708,7 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
                 }
                 return child;
             }
-
+            
             /** Adds the specified Accessible child of the object to the object's selection */
             public void addAccessibleSelection(int i) {
                 try {
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Window.java b/accessibility/bridge/org/openoffice/java/accessibility/Window.java
index ef44c3380a48..22a701963960 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Window.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Window.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,17 +32,17 @@ import com.sun.star.accessibility.*;
 
 public class Window extends java.awt.Window implements javax.accessibility.Accessible, NativeFrame {
     protected XAccessibleComponent unoAccessibleComponent;
-
+    
     boolean opened = false;
     boolean visible = false;
-
+    
     java.awt.EventQueue eventQueue = null;
-
+    
     public Window(java.awt.Window owner, XAccessibleComponent xAccessibleComponent) {
         super(owner);
         initialize(xAccessibleComponent);
     }
-
+    
     private void initialize(XAccessibleComponent xAccessibleComponent) {
         unoAccessibleComponent = xAccessibleComponent;
         eventQueue = java.awt.Toolkit.getDefaultToolkit().getSystemEventQueue();
@@ -53,27 +53,27 @@ public class Window extends java.awt.Window implements javax.accessibility.Acces
             broadcaster.addEventListener(new AccessibleWindowListener());
         }
     }
-
+    
     java.awt.Component initialComponent = null;
-
+    
     public java.awt.Component getInitialComponent() {
         if (Build.DEBUG) {
             System.err.println("returning initial component object of class: " + initialComponent.getClass().getName());
         }
         return initialComponent;
     }
-
+    
     public void setInitialComponent(java.awt.Component c) {
         initialComponent = c;
     }
-
+    
     public Integer getHWND() {
         return null;
     }
-
+    
     /**
-    * Determines whether this <code>Component</code> is showing on screen.
-    * This means that the component must be visible, and it must be in a
+    * Determines whether this <code>Component</code> is showing on screen. 
+    * This means that the component must be visible, and it must be in a 
     * <code>container</code> that is visible and showing.
     * @see       #addNotify
     * @see       #removeNotify
@@ -86,10 +86,10 @@ public class Window extends java.awt.Window implements javax.accessibility.Acces
         }
         return false;
     }
-
+    
     /**
     * Makes this <code>Component</code> displayable by connecting it to a
-    * native screen resource.
+    * native screen resource.  
     * This method is called internally by the toolkit and should
     * not be called directly by programs.
     * @see       #isDisplayable
@@ -99,10 +99,10 @@ public class Window extends java.awt.Window implements javax.accessibility.Acces
     public void addNotify() {
 //      createHierarchyEvents(0, null, null, 0, false);
     }
-
-    /**
+    
+    /** 
     * Makes this <code>Component</code> undisplayable by destroying it native
-    * screen resource.
+    * screen resource. 
     * This method is called by the toolkit internally and should
     * not be called directly by programs.
     * @see       #isDisplayable
@@ -111,7 +111,7 @@ public class Window extends java.awt.Window implements javax.accessibility.Acces
     */
     public void removeNotify() {
     }
-
+    
         /**
          * Determines if the object is visible.  Note: this means that the
          * object intends to be visible; however, it may not in fact be
@@ -124,7 +124,7 @@ public class Window extends java.awt.Window implements javax.accessibility.Acces
     public boolean isVisible(){
         return visible;
     }
-
+    
     /**
     * Shows or hides this component depending on the value of parameter
     * <code>b</code>.
@@ -148,41 +148,41 @@ public class Window extends java.awt.Window implements javax.accessibility.Acces
             }
         }
     }
-
+    
     public void dispose() {
         setVisible(false);
         postWindowEvent(java.awt.event.WindowEvent.WINDOW_CLOSED);
-
+        
         // Transfer window focus back to the owner window if it is still the active frame
         if ((getOwner() instanceof Frame && ((Frame) getOwner()).active) ||
                 (getOwner() instanceof Dialog && ((Dialog) getOwner()).active)) {
-            eventQueue.postEvent(new java.awt.event.WindowEvent(getOwner(),
+            eventQueue.postEvent(new java.awt.event.WindowEvent(getOwner(), 
                 java.awt.event.WindowEvent.WINDOW_GAINED_FOCUS));
         }
     }
-
+    
     protected void postWindowEvent(int i) {
         eventQueue.postEvent(new java.awt.event.WindowEvent(this, i));
     }
-
+    
     protected void postComponentEvent(int i) {
         eventQueue.postEvent(new java.awt.event.ComponentEvent(this, i));
     }
-
+    
     /**
     * Update the proxy objects appropriatly on property change events
     */
     protected class AccessibleWindowListener implements XAccessibleEventListener {
-
+        
         protected AccessibleWindowListener() {
         }
-
+        
         // The only expected state changes are ACTIVE and VISIBLE
         protected void setComponentState(short state, boolean enable) {
             switch (state) {
                 case AccessibleStateType.ICONIFIED:
-                    postWindowEvent(enable ?
-                        java.awt.event.WindowEvent.WINDOW_ICONIFIED :
+                    postWindowEvent(enable ? 
+                        java.awt.event.WindowEvent.WINDOW_ICONIFIED : 
                         java.awt.event.WindowEvent.WINDOW_DEICONIFIED);
                     break;
                 case AccessibleStateType.SHOWING:
@@ -196,7 +196,7 @@ public class Window extends java.awt.Window implements javax.accessibility.Acces
                     break;
             }
         }
-
+        
         /** Updates the accessible name and fires the appropriate PropertyChangedEvent */
         protected void handleNameChangedEvent(Object any) {
             try {
@@ -210,7 +210,7 @@ public class Window extends java.awt.Window implements javax.accessibility.Acces
             } catch (com.sun.star.lang.IllegalArgumentException e) {
             }
         }
-
+        
         /** Updates the accessible description and fires the appropriate PropertyChangedEvent */
         protected void handleDescriptionChangedEvent(Object any) {
             try {
@@ -223,21 +223,21 @@ public class Window extends java.awt.Window implements javax.accessibility.Acces
             } catch (com.sun.star.lang.IllegalArgumentException e) {
             }
         }
-
+        
         /** Updates the internal states and fires the appropriate PropertyChangedEvent */
         protected void handleStateChangedEvent(Object any1, Object any2) {
             try {
                 if (AnyConverter.isShort(any1)) {
                     setComponentState(AnyConverter.toShort(any1), false);
                 }
-
+                
                 if (AnyConverter.isShort(any2)) {
                     setComponentState(AnyConverter.toShort(any2), true);
                 }
             } catch (com.sun.star.lang.IllegalArgumentException e) {
             }
         }
-
+        
         /** Fires a visible data property change event */
         protected void handleVisibleDataEvent() {
             javax.accessibility.AccessibleContext ac = accessibleContext;
@@ -245,7 +245,7 @@ public class Window extends java.awt.Window implements javax.accessibility.Acces
                 ac.firePropertyChange(javax.accessibility.AccessibleContext.ACCESSIBLE_VISIBLE_DATA_PROPERTY, null, null);
             }
         }
-
+        
         /** Called by OpenOffice process to notify property changes */
         public void notifyEvent(AccessibleEventObject event) {
             switch (event.EventId) {
@@ -281,14 +281,14 @@ public class Window extends java.awt.Window implements javax.accessibility.Acces
                     }
             }
         }
-
+        
         /** Called by OpenOffice process to notify that the UNO component is disposing */
         public void disposing(com.sun.star.lang.EventObject eventObject) {
         }
     }
-
+    
     protected javax.accessibility.AccessibleContext accessibleContext = null;
-
+    
     /** Returns the AccessibleContext associated with this object */
     public javax.accessibility.AccessibleContext getAccessibleContext() {
         if (accessibleContext == null) {
@@ -297,14 +297,14 @@ public class Window extends java.awt.Window implements javax.accessibility.Acces
         }
         return accessibleContext;
     }
-
+    
     protected class AccessibleWindow extends java.awt.Window.AccessibleAWTWindow {
         protected AccessibleWindow() {
             super();
         }
-
+        
         protected java.awt.event.ComponentListener accessibleComponentHandler = null;
-
+        
         /**
         * Fire PropertyChange listener, if one is registered,
         * when shown/hidden..
@@ -315,33 +315,33 @@ public class Window extends java.awt.Window implements javax.accessibility.Acces
                     javax.accessibility.AccessibleContext.ACCESSIBLE_STATE_PROPERTY,
                     javax.accessibility.AccessibleState.VISIBLE, null);
             }
-
+            
             public void componentShown(java.awt.event.ComponentEvent e)  {
                 AccessibleWindow.this.firePropertyChange(
                     javax.accessibility.AccessibleContext.ACCESSIBLE_STATE_PROPERTY,
                     null, javax.accessibility.AccessibleState.VISIBLE);
             }
-
+            
             public void componentMoved(java.awt.event.ComponentEvent e)  {
             }
-
+            
             public void componentResized(java.awt.event.ComponentEvent e)  {
             }
         } // inner class AccessibleComponentHandler
-
+        
         protected java.awt.event.ContainerListener accessibleContainerHandler = null;
-
+        
         /**
         * Fire PropertyChange listener, if one is registered,
         * when children added/removed.
         */
-
+        
         protected class AccessibleContainerHandler implements java.awt.event.ContainerListener {
             public void componentAdded(java.awt.event.ContainerEvent e) {
                 java.awt.Component c = e.getChild();
                 if (c != null && c instanceof javax.accessibility.Accessible) {
                     AccessibleWindow.this.firePropertyChange(
-                        javax.accessibility.AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
+                        javax.accessibility.AccessibleContext.ACCESSIBLE_CHILD_PROPERTY, 
                         null, ((javax.accessibility.Accessible) c).getAccessibleContext());
                 }
             }
@@ -349,14 +349,14 @@ public class Window extends java.awt.Window implements javax.accessibility.Acces
                 java.awt.Component c = e.getChild();
                 if (c != null && c instanceof javax.accessibility.Accessible) {
                     AccessibleWindow.this.firePropertyChange(
-                        javax.accessibility.AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
-                        ((javax.accessibility.Accessible) c).getAccessibleContext(), null);
+                        javax.accessibility.AccessibleContext.ACCESSIBLE_CHILD_PROPERTY, 
+                        ((javax.accessibility.Accessible) c).getAccessibleContext(), null); 
                 }
             }
         }
-
+        
         protected int propertyChangeListenerCount = 0;
-
+        
         /**
         * Add a PropertyChangeListener to the listener list.
         *
@@ -366,13 +366,13 @@ public class Window extends java.awt.Window implements javax.accessibility.Acces
             if (propertyChangeListenerCount++ == 0) {
                 accessibleContainerHandler = new AccessibleContainerHandler();
                 Window.this.addContainerListener(accessibleContainerHandler);
-
+                
                 accessibleComponentHandler = new AccessibleComponentHandler();
                 Window.this.addComponentListener(accessibleComponentHandler);
             }
             super.addPropertyChangeListener(listener);
         }
-
+        
         /**
         * Remove a PropertyChangeListener from the listener list.
         * This removes a PropertyChangeListener that was registered
@@ -384,17 +384,17 @@ public class Window extends java.awt.Window implements javax.accessibility.Acces
             if (--propertyChangeListenerCount == 0) {
                 Window.this.removeComponentListener(accessibleComponentHandler);
                 accessibleComponentHandler = null;
-
+                
                 Window.this.removeContainerListener(accessibleContainerHandler);
                 accessibleContainerHandler = null;
             }
             super.removePropertyChangeListener(listener);
         }
-
+        
         /*
         * AccessibleComponent
         */
-
+        
         /** Returns the background color of the object */
         public java.awt.Color getBackground() {
             try {
@@ -403,11 +403,11 @@ public class Window extends java.awt.Window implements javax.accessibility.Acces
                 return null;
             }
         }
-
+        
         public void setBackground(java.awt.Color c) {
             // Not supported by UNO accessibility API
         }
-
+        
         /** Returns the foreground color of the object */
         public java.awt.Color getForeground() {
             try {
@@ -416,118 +416,118 @@ public class Window extends java.awt.Window implements javax.accessibility.Acces
                 return null;
             }
         }
-
+        
         public void setForeground(java.awt.Color c) {
             // Not supported by UNO accessibility API
         }
-
+        
         public java.awt.Cursor getCursor() {
             // Not supported by UNO accessibility API
             return null;
         }
-
+        
         public void setCursor(java.awt.Cursor cursor) {
             // Not supported by UNO accessibility API
         }
-
+        
         public java.awt.Font getFont() {
             // FIXME
             return null;
         }
-
+        
         public void setFont(java.awt.Font f) {
             // Not supported by UNO accessibility API
         }
-
+        
         public java.awt.FontMetrics getFontMetrics(java.awt.Font f) {
             // FIXME
             return null;
         }
-
+        
         public boolean isEnabled() {
             return Window.this.isEnabled();
         }
-
+        
         public void setEnabled(boolean b) {
             // Not supported by UNO accessibility API
         }
-
+        
         public boolean isVisible() {
             return Window.this.isVisible();
         }
-
+        
         public void setVisible(boolean b) {
             // Not supported by UNO accessibility API
         }
-
+        
         public boolean isShowing() {
             return Window.this.isShowing();
         }
-
+        
         public boolean contains(java.awt.Point p) {
             try {
-                return unoAccessibleComponent.containsPoint(new com.sun.star.awt.Point(p.x, p.y));
+                return unoAccessibleComponent.containsPoint(new com.sun.star.awt.Point(p.x, p.y)); 
             } catch (com.sun.star.uno.RuntimeException e) {
                 return false;
             }
         }
-
+        
         /** Returns the location of the object on the screen. */
         public java.awt.Point getLocationOnScreen() {
             try {
-                com.sun.star.awt.Point unoPoint = unoAccessibleComponent.getLocationOnScreen();
+                com.sun.star.awt.Point unoPoint = unoAccessibleComponent.getLocationOnScreen(); 
                 return new java.awt.Point(unoPoint.X, unoPoint.Y);
             } catch (com.sun.star.uno.RuntimeException e) {
                 return null;
             }
         }
-
+        
         /** Gets the location of this component in the form of a point specifying the component's top-left corner */
         public java.awt.Point getLocation() {
             try {
-                com.sun.star.awt.Point unoPoint = unoAccessibleComponent.getLocationOnScreen();
+                com.sun.star.awt.Point unoPoint = unoAccessibleComponent.getLocationOnScreen(); 
                 return new java.awt.Point( unoPoint.X, unoPoint.Y );
             } catch (com.sun.star.uno.RuntimeException e) {
                 return null;
             }
         }
-
+        
         /** Moves this component to a new location */
         public void setLocation(java.awt.Point p) {
             // Not supported by UNO accessibility API
         }
-
+        
         /** Gets the bounds of this component in the form of a Rectangle object */
         public java.awt.Rectangle getBounds() {
             try {
-                com.sun.star.awt.Rectangle unoRect = unoAccessibleComponent.getBounds();
+                com.sun.star.awt.Rectangle unoRect = unoAccessibleComponent.getBounds(); 
                 return new java.awt.Rectangle(unoRect.X, unoRect.Y, unoRect.Width, unoRect.Height);
             } catch (com.sun.star.uno.RuntimeException e) {
                 return null;
             }
         }
-
+        
         /** Moves and resizes this component to conform to the new bounding rectangle r */
         public void setBounds(java.awt.Rectangle r) {
             // Not supported by UNO accessibility API
         }
-
+        
         /** Returns the size of this component in the form of a Dimension object */
         public java.awt.Dimension getSize() {
             try {
-                com.sun.star.awt.Size unoSize = unoAccessibleComponent.getSize();
+                com.sun.star.awt.Size unoSize = unoAccessibleComponent.getSize(); 
                 return new java.awt.Dimension(unoSize.Width, unoSize.Height);
             } catch (com.sun.star.uno.RuntimeException e) {
                 return null;
             }
         }
-
+        
         /** Resizes this component so that it has width d.width and height d.height */
         public void setSize(java.awt.Dimension d) {
             // Not supported by UNO accessibility API
         }
-
-        /** Returns the Accessible child, if one exists, contained at the local coordinate Point */
+        
+        /** Returns the Accessible child, if one exists, contained at the local coordinate Point */     
         public javax.accessibility.Accessible getAccessibleAt(java.awt.Point p) {
             try {
                 java.awt.Component c = AccessibleObjectFactory.getAccessibleComponent(
@@ -538,11 +538,11 @@ public class Window extends java.awt.Window implements javax.accessibility.Acces
                 return null;
             }
         }
-
+        
         public boolean isFocusTraversable() {
             return Window.this.isFocusable();
         }
-
+        
         public void requestFocus() {
             unoAccessibleComponent.grabFocus();
         }
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleEventLog.java b/accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleEventLog.java
index 36bec1cab8fb..365243fe6fc8 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleEventLog.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleEventLog.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,28 +34,28 @@ import com.sun.star.uno.*;
  *
  */
 public class XAccessibleEventLog implements XAccessibleEventListener {
-
+    
     private static XAccessibleEventLog theEventListener = null;
-
+    
     private static java.util.Hashtable proxyList = new java.util.Hashtable();
-
+    
     /** Creates a new instance of UNOAccessibleEventListener */
     public XAccessibleEventLog() {
     }
-
+    
     private static XAccessibleEventListener get() {
         if (theEventListener == null) {
             theEventListener = new XAccessibleEventLog();
         }
         return theEventListener;
     }
-
+    
     public static void addEventListener(XAccessibleContext xac, java.awt.Component c) {
         XAccessibleEventBroadcaster broadcaster = (XAccessibleEventBroadcaster)
             UnoRuntime.queryInterface(XAccessibleEventBroadcaster.class, xac);
         if (broadcaster != null) {
             broadcaster.addEventListener(XAccessibleEventLog.get());
-
+            
             // remember the proxy objects
             synchronized (proxyList) {
 //                proxyList.put(UnoRuntime.generateOid(xac), new WeakReference(c));
@@ -65,8 +65,8 @@ public class XAccessibleEventLog implements XAccessibleEventListener {
     }
 
     public void disposing(com.sun.star.lang.EventObject eventObject) {
-    }
-
+    }    
+        
     public void notifyEvent(com.sun.star.accessibility.AccessibleEventObject accessibleEventObject) {
         switch (accessibleEventObject.EventId) {
             case AccessibleEventId.ACTIVE_DESCENDANT_CHANGED:
@@ -74,7 +74,7 @@ public class XAccessibleEventLog implements XAccessibleEventListener {
                 break;
             case AccessibleEventId.STATE_CHANGED:
                 logStateChange(accessibleEventObject.Source,
-                    accessibleEventObject.OldValue,
+                    accessibleEventObject.OldValue, 
                     accessibleEventObject.NewValue);
                 break;
             case AccessibleEventId.CHILD:
@@ -93,7 +93,7 @@ public class XAccessibleEventLog implements XAccessibleEventListener {
                 break;
         }
     }
-
+    
     public void logStateChange(Object o, Object any1, Object any2) {
         try {
             if (AnyConverter.isShort(any1)) {
@@ -106,7 +106,7 @@ public class XAccessibleEventLog implements XAccessibleEventListener {
         } catch (com.sun.star.lang.IllegalArgumentException e) {
         }
     }
-
+    
     public void logStateChange(Object o, short n, String s) {
         switch(n) {
             case AccessibleStateType.ACTIVE:
@@ -144,13 +144,13 @@ public class XAccessibleEventLog implements XAccessibleEventListener {
                 break;
         }
     }
-
+    
     protected static void logMessage(Object o, String s) {
         XAccessibleContext xac = (XAccessibleContext) UnoRuntime.queryInterface(XAccessibleContext.class, o);
         if( xac != null ) {
             String oid = UnoRuntime.generateOid(xac);
             synchronized (proxyList) {
-                  logMessage( (javax.accessibility.Accessible) proxyList.get( oid ), s );
+                  logMessage( (javax.accessibility.Accessible) proxyList.get( oid ), s );                
 //                WeakReference r = (WeakReference) proxyList.get( oid );
 //                if(r != null) {
 //                    System.err.println( "*** Warning *** event is " + r.get() );
@@ -159,7 +159,7 @@ public class XAccessibleEventLog implements XAccessibleEventListener {
 //                    System.err.println( "*** Warning *** event source not found in broadcaster list" );
 //                }
             }
-        } else
+        } else 
             System.err.println( "*** Warning *** event source does not implement XAccessibleContext" );
     }
 
@@ -170,16 +170,16 @@ public class XAccessibleEventLog implements XAccessibleEventListener {
             logMessage(s);
         }
     }
-
+        
     protected static void logMessage(javax.accessibility.AccessibleContext ac, String s) {
         if (ac != null) {
-            logMessage("[" + ac.getAccessibleRole() + "] "
+            logMessage("[" + ac.getAccessibleRole() + "] " 
                 + ac.getAccessibleName() + ": " + s);
         } else {
             logMessage(s);
         }
     }
-
+            
     protected static void logMessage(String s) {
         System.err.println(s);
     }
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleHypertextLog.java b/accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleHypertextLog.java
index f14da6d8280b..13e9b2f6d222 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleHypertextLog.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleHypertextLog.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,12 +31,12 @@ import com.sun.star.accessibility.*;
 import com.sun.star.uno.*;
 
 /** The AccessibleHypertextImpl mapps all calls to the java AccessibleHypertext
- *  interface to the corresponding methods of the UNO XAccessibleHypertext
+ *  interface to the corresponding methods of the UNO XAccessibleHypertext 
  *  interface.
  */
 public class XAccessibleHypertextLog extends XAccessibleTextLog
     implements com.sun.star.accessibility.XAccessibleHypertext {
-
+    
     private com.sun.star.accessibility.XAccessibleHypertext unoObject;
 
     /** Creates a new instance of XAccessibleTextLog */
@@ -45,15 +45,15 @@ public class XAccessibleHypertextLog extends XAccessibleTextLog
         unoObject = xAccessibleHypertext;
     }
 
-    public XAccessibleHyperlink getHyperLink(int param)
+    public XAccessibleHyperlink getHyperLink(int param) 
             throws com.sun.star.lang.IndexOutOfBoundsException {
         return unoObject.getHyperLink(param);
     }
-
+    
     public int getHyperLinkCount() {
         return unoObject.getHyperLinkCount();
     }
-
+    
     public int getHyperLinkIndex(int param)
             throws com.sun.star.lang.IndexOutOfBoundsException {
         return unoObject.getHyperLinkIndex(param);
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleTextLog.java b/accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleTextLog.java
index 4b415ee60c74..b7a2ffc70ebf 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleTextLog.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleTextLog.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
@@ -181,7 +181,7 @@ public class XAccessibleTextLog
 
     public com.sun.star.accessibility.TextSegment getTextAtIndex(int param,
         short param1)
-        throws com.sun.star.lang.IndexOutOfBoundsException,
+        throws com.sun.star.lang.IndexOutOfBoundsException, 
             com.sun.star.lang.IllegalArgumentException {
         try {
             com.sun.star.accessibility.TextSegment ts = unoObject.getTextAtIndex(param,
@@ -205,7 +205,7 @@ public class XAccessibleTextLog
 
     public com.sun.star.accessibility.TextSegment getTextBeforeIndex(
         int param, short param1)
-        throws com.sun.star.lang.IndexOutOfBoundsException,
+        throws com.sun.star.lang.IndexOutOfBoundsException, 
             com.sun.star.lang.IllegalArgumentException {
         try {
             com.sun.star.accessibility.TextSegment ts = unoObject.getTextBeforeIndex(param,
@@ -230,7 +230,7 @@ public class XAccessibleTextLog
 
     public com.sun.star.accessibility.TextSegment getTextBehindIndex(
         int param, short param1)
-        throws com.sun.star.lang.IndexOutOfBoundsException,
+        throws com.sun.star.lang.IndexOutOfBoundsException, 
             com.sun.star.lang.IllegalArgumentException {
         try {
             com.sun.star.accessibility.TextSegment ts = unoObject.getTextBehindIndex(param,
diff --git a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
index 581e5dc71790..cec5e01494c0 100644
--- a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
+++ b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,48 +87,48 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *, void *)
     return JNI_VERSION_1_2;
 }
 
-JNIEXPORT jbyteArray JNICALL
+JNIEXPORT jbyteArray JNICALL 
 Java_org_openoffice_accessibility_WindowsAccessBridgeAdapter_getProcessID(JNIEnv *pJNIEnv, jclass clazz)
 {
     // Initialize global class and method references
-    g_jcWindowsAccessBridgeAdapter =
+    g_jcWindowsAccessBridgeAdapter = 
         static_cast< jclass > (pJNIEnv->NewGlobalRef(clazz));
     if (NULL == g_jcWindowsAccessBridgeAdapter) {
         return 0; /* jni error occured */
     }
-    g_jmRegisterTopWindow =
+    g_jmRegisterTopWindow = 
         pJNIEnv->GetStaticMethodID(clazz, "registerTopWindow", "(ILcom/sun/star/accessibility/XAccessible;)V");
     if (0 == g_jmRegisterTopWindow) {
         return 0; /* jni error occured */
     }
-    g_jmRevokeTopWindow =
+    g_jmRevokeTopWindow = 
         pJNIEnv->GetStaticMethodID(clazz, "revokeTopWindow", "(ILcom/sun/star/accessibility/XAccessible;)V");
     if (0 == g_jmRevokeTopWindow) {
         return 0; /* jni error occured */
     }
-
+    
     // Use the special protocol of XJavaVM.getJavaVM:  If the passed in
     // process ID has an extra 17th byte of value one, the returned any
     // contains a pointer to a jvmaccess::UnoVirtualMachine, instead of
     // the underlying JavaVM pointer:
     jbyte processID[17];
     rtl_getGlobalProcessId(reinterpret_cast<sal_uInt8 *> (processID));
-    // #i51265# we need a jvmaccess::UnoVirtualMachine pointer for the
-    // uno_getEnvironment() call later.
+    // #i51265# we need a jvmaccess::UnoVirtualMachine pointer for the 
+    // uno_getEnvironment() call later. 
     processID[16] = 1;
-
+    
     // Copy the result into a java byte[] and return.
     jbyteArray jbaProcessID = pJNIEnv->NewByteArray(17);
     pJNIEnv->SetByteArrayRegion(jbaProcessID, 0, 17, processID);
     return jbaProcessID;
 }
 
-JNIEXPORT jboolean JNICALL
+JNIEXPORT jboolean JNICALL 
 Java_org_openoffice_accessibility_WindowsAccessBridgeAdapter_createMapping(JNIEnv *, jclass, jlong pointer)
 {
     uno_Environment * pJava_environment = NULL;
     uno_Environment * pUno_environment = NULL;
-
+    
     try {
         // We get a non-refcounted pointer to a jvmaccess::VirtualMachine
         // from the XJavaVM service (the pointer is guaranteed to be valid
@@ -136,7 +136,7 @@ Java_org_openoffice_accessibility_WindowsAccessBridgeAdapter_createMapping(JNIEn
         // convert the non-refcounted pointer into a refcounted one
         // immediately:
         g_xUnoVirtualMachine = reinterpret_cast< jvmaccess::UnoVirtualMachine * >(pointer);
-
+        
         if ( g_xUnoVirtualMachine.is() )
         {
             OUString sJava(RTL_CONSTASCII_USTRINGPARAM("java"));
@@ -144,21 +144,21 @@ Java_org_openoffice_accessibility_WindowsAccessBridgeAdapter_createMapping(JNIEn
 
             OUString sCppu_current_lb_name(RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME));
             uno_getEnvironment(&pUno_environment, sCppu_current_lb_name.pData, NULL);
-
+            
             if ( pJava_environment && pUno_environment )
             {
                 g_unoMapping = Mapping(pUno_environment, pJava_environment);
                 getCppuType((::com::sun::star::uno::Reference< XAccessible > *) 0).getDescription((typelib_TypeDescription **) & g_pTypeDescription);
             }
-
+            
             if ( pJava_environment )
             {
                 // release java environment
                 pJava_environment->release(pJava_environment);
                 pJava_environment = NULL;
             }
-
-            if ( pUno_environment )
+            
+            if ( pUno_environment ) 
             {
                 // release uno environment
                 pUno_environment->release(pUno_environment);
@@ -166,12 +166,12 @@ Java_org_openoffice_accessibility_WindowsAccessBridgeAdapter_createMapping(JNIEn
             }
         }
     }
-
+    
     catch ( RuntimeException e)
     {
         OSL_TRACE("RuntimeException caught while initializing the mapping");
     }
-
+    
     if ( (0 != g_jmRegisterTopWindow) && (0 != g_jmRevokeTopWindow) )
     {
         ::Application::AddEventListener(g_aEventListenerLink);
@@ -192,13 +192,13 @@ JNIEXPORT void JNICALL JNI_OnUnload(JavaVM *jvm, void *)
             g_jcWindowsAccessBridgeAdapter = NULL;
         }
     }
-
+    
     if ( NULL != g_pTypeDescription )
     {
         typelib_typedescription_release( reinterpret_cast< typelib_TypeDescription * > (g_pTypeDescription) );
         g_pTypeDescription = NULL;
     }
-
+    
     g_unoMapping.clear();
     g_xUnoVirtualMachine.clear();
 }
@@ -218,13 +218,13 @@ void handleWindowEvent(Window * pWindow, bool bShow)
     if ( pWindow && pWindow->IsTopWindow() )
     {
         ::com::sun::star::uno::Reference< XAccessible > xAccessible;
-
+    
         // Test for combo box - drop down floating windows first
         Window * pParentWindow = pWindow->GetParent();
 
         if ( pParentWindow )
         {
-            try
+            try 
             {
                 // The parent window of a combo box floating window should have the role COMBO_BOX
                 ::com::sun::star::uno::Reference< XAccessible > xParentAccessible(pParentWindow->GetAccessible());
@@ -261,7 +261,7 @@ void handleWindowEvent(Window * pWindow, bool bShow)
         }
 
         // We have to rely on the fact that Window::GetAccessible()->getAccessibleContext() returns a valid XAccessibleContext
-        // also for other menus than menubar or toplevel popup window. Otherwise we had to traverse the hierarchy to find the
+        // also for other menus than menubar or toplevel popup window. Otherwise we had to traverse the hierarchy to find the 
         // context object to this menu floater. This makes the call to Window->IsMenuFloatingWindow() obsolete.
         if ( ! xAccessible.is() )
             xAccessible = pWindow->GetAccessible();
@@ -280,8 +280,8 @@ void handleWindowEvent(Window * pWindow, bool bShow)
                 {
                     // g_jmRegisterTopWindow and g_jmRevokeTopWindow are ensured to be != 0 - otherwise
                     // the event listener would not have been attached.
-                    pJNIEnv->CallStaticVoidMethod(g_jcWindowsAccessBridgeAdapter,
-                        (bShow) ? g_jmRegisterTopWindow : g_jmRevokeTopWindow,
+                    pJNIEnv->CallStaticVoidMethod(g_jcWindowsAccessBridgeAdapter, 
+                        (bShow) ? g_jmRegisterTopWindow : g_jmRevokeTopWindow, 
                         (jint) GetHWND(pWindow), joXAccessible );
 
                     // Clear any exception that might have been occured.
@@ -297,7 +297,7 @@ void handleWindowEvent(Window * pWindow, bool bShow)
 long VCLEventListenerLinkFunc(void *, void * pData)
 {
     ::VclSimpleEvent const * pEvent = (::VclSimpleEvent const *) pData;
-
+    
     switch (pEvent->GetId())
     {
     case VCLEVENT_WINDOW_SHOW:
@@ -307,7 +307,7 @@ long VCLEventListenerLinkFunc(void *, void * pData)
         handleWindowEvent(((::VclWindowEvent const *) pEvent)->GetWindow(), false);
         break;
     }
-
+    
     return 0;
 }
 
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
index 82c09c8b13bc..0944dc679319 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ protected:
 
     /** This method creates and returns an accessible table.
         @return  An AccessibleBrowseBoxTable. */
-    virtual AccessibleBrowseBoxTable*   createAccessibleTable();
+    virtual AccessibleBrowseBoxTable*	createAccessibleTable();
 
 private:
     // members ----------------------------------------------------------------
@@ -205,12 +205,12 @@ private:
 
 // ============================================================================
 /** the XAccessible which creates/returns an AccessibleBrowseBox
-
+    
     <p>The instance holds it's XAccessibleContext with a hard reference, while
     the contxt holds this instance weak.</p>
 */
-typedef ::cppu::WeakImplHelper1 <   ::com::sun::star::accessibility::XAccessible
-                                >   AccessibleBrowseBoxAccess_Base;
+typedef ::cppu::WeakImplHelper1	<	::com::sun::star::accessibility::XAccessible
+                                >	AccessibleBrowseBoxAccess_Base;
 
 class AccessibleBrowseBoxAccess :public AccessibleBrowseBoxAccess_Base
                                 ,public ::svt::IAccessibleBrowseBox
@@ -298,9 +298,9 @@ protected:
     }
 
 private:
-    AccessibleBrowseBoxAccess();                                                // never implemented
-    AccessibleBrowseBoxAccess( const AccessibleBrowseBoxAccess& );              // never implemented
-    AccessibleBrowseBoxAccess& operator=( const AccessibleBrowseBoxAccess& );   // never implemented
+    AccessibleBrowseBoxAccess();												// never implemented
+    AccessibleBrowseBoxAccess( const AccessibleBrowseBoxAccess& );			    // never implemented
+    AccessibleBrowseBoxAccess& operator=( const AccessibleBrowseBoxAccess& );	// never implemented
 };
 
 // ============================================================================
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
index 67f0574ab436..b246918172df 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -365,7 +365,7 @@ public:
     // public versions of internal helper methods, with access control
     struct AccessControl { friend class SolarMethodGuard; private: AccessControl() { } };
 
-    inline ::osl::Mutex&    getMutex( const AccessControl& ) { return getOslMutex(); }
+    inline ::osl::Mutex&	getMutex( const AccessControl& ) { return getOslMutex(); }
     inline void             ensureIsAlive( const AccessControl& ) { ensureIsAlive(); }
 
 protected:
@@ -390,15 +390,15 @@ private:
     /** The type of this object (for names, descriptions, state sets, ...). */
     ::svt::AccessibleBrowseBoxObjType meObjType;
 
-    ::comphelper::AccessibleEventNotifier::TClientId    m_aClientId;
+    ::comphelper::AccessibleEventNotifier::TClientId	m_aClientId;
 };
 
 // ============================================================================
 // a version of AccessibleBrowseBoxBase which implements not only the XAccessibleContext,
 // but also the XAccessible
 
-typedef ::cppu::ImplHelper1 <   ::com::sun::star::accessibility::XAccessible
-                            >   BrowseBoxAccessibleElement_Base;
+typedef ::cppu::ImplHelper1	<	::com::sun::star::accessibility::XAccessible
+                            >	BrowseBoxAccessibleElement_Base;
 
 class BrowseBoxAccessibleElement
             :public AccessibleBrowseBoxBase
@@ -458,9 +458,9 @@ protected:
         throw ( ::com::sun::star::uno::RuntimeException );
 
 private:
-    BrowseBoxAccessibleElement();                                               // never implemented
-    BrowseBoxAccessibleElement( const BrowseBoxAccessibleElement& );            // never implemented
-    BrowseBoxAccessibleElement& operator=( const BrowseBoxAccessibleElement& ); // never implemented
+    BrowseBoxAccessibleElement();												// never implemented
+    BrowseBoxAccessibleElement( const BrowseBoxAccessibleElement& );			// never implemented
+    BrowseBoxAccessibleElement& operator=( const BrowseBoxAccessibleElement& );	// never implemented
 };
 
 // ============================================================================
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx
index 8346c1173fb3..ccfd6e6fd335 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 namespace accessibility
 {
 // ============================================================================
-    typedef ::cppu::ImplHelper2 <   ::com::sun::star::accessibility::XAccessible,
+    typedef ::cppu::ImplHelper2	<	::com::sun::star::accessibility::XAccessible,
                                     ::com::sun::star::accessibility::XAccessibleValue
-                                >   AccessibleCheckBoxCell_BASE;
+                                >	AccessibleCheckBoxCell_BASE;
 
-    class AccessibleCheckBoxCell :   public AccessibleBrowseBoxCell
+    class AccessibleCheckBoxCell :	 public AccessibleBrowseBoxCell
                                     ,public AccessibleCheckBoxCell_BASE
     {
     private:
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx
index 92cb1b5d2d71..2cf5d0930a8a 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx
index 2c55887462cb..f23822f5e2cf 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 accessibility
 {
     class AccessibleBrowseBoxHeaderCell : public BrowseBoxAccessibleElement
     {
-        sal_Int32   m_nColumnRowId;
+        sal_Int32	m_nColumnRowId;
     public:
         AccessibleBrowseBoxHeaderCell(sal_Int32 _nColumnRowId,
                                           const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxParent,
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx
index 021f1c614324..0aca86571d86 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx
index d775104614c6..c24001f3106f 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ protected:
     /** @attention  This method requires locked mutex's and a living object.
         @param nColumn
             the position of the column in the Accessible world
-        @return
+        @return 
             the position of the column in VCL the Accessible world
     */
     sal_uInt16 implToVCLColumnPos( sal_Int32 nColumn ) const;
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableCell.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableCell.hxx
index b689235908c5..cc2f2d6cce7e 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableCell.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableCell.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 namespace accessibility
 {
-    typedef ::cppu::ImplHelper2 <   ::com::sun::star::accessibility::XAccessibleText
-                                ,   ::com::sun::star::accessibility::XAccessible
-                                >   AccessibleTextHelper_BASE;
+    typedef ::cppu::ImplHelper2	<	::com::sun::star::accessibility::XAccessibleText
+                                ,	::com::sun::star::accessibility::XAccessible
+                                >	AccessibleTextHelper_BASE;
 
     // implementation of a table cell of BrowseBox
-    class AccessibleBrowseBoxTableCell  :public AccessibleBrowseBoxCell
+    class AccessibleBrowseBoxTableCell	:public AccessibleBrowseBoxCell
                                         ,public AccessibleTextHelper_BASE
                                         ,public ::comphelper::OCommonAccessibleText
     {
@@ -48,9 +48,9 @@ namespace accessibility
 
     protected:
         // OCommonAccessibleText
-        virtual ::rtl::OUString                 implGetText();
-        virtual ::com::sun::star::lang::Locale  implGetLocale();
-        virtual void                            implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
+        virtual ::rtl::OUString					implGetText();
+        virtual ::com::sun::star::lang::Locale	implGetLocale();
+        virtual void							implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
 
     public:
         AccessibleBrowseBoxTableCell( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent,
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
index ff31cb78bfaa..df113fa7a53c 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ protected:
 
     /** This method creates and returns an accessible table.
         @return  An AccessibleGridControlTable. */
-    virtual AccessibleGridControlTable* createAccessibleTable();
+    virtual AccessibleGridControlTable*	createAccessibleTable();
 
 private:
     // members ----------------------------------------------------------------
@@ -174,11 +174,11 @@ private:
 
 // ============================================================================
 /** the XAccessible which creates/returns an AccessibleGridControl
-
+    
     <p>The instance holds it's XAccessibleContext with a hard reference, while
     the contxt holds this instance weak.</p>
 */
-typedef ::cppu::WeakImplHelper1 < ::com::sun::star::accessibility::XAccessible > AccessibleGridControlAccess_Base;
+typedef ::cppu::WeakImplHelper1	< ::com::sun::star::accessibility::XAccessible > AccessibleGridControlAccess_Base;
 
 class AccessibleGridControlAccess :public AccessibleGridControlAccess_Base
     ,public ::svt::table::IAccessibleTableControl
@@ -252,9 +252,9 @@ protected:
     }
 
 private:
-    AccessibleGridControlAccess();                                              // never implemented
-    AccessibleGridControlAccess( const AccessibleGridControlAccess& );      // never implemented
-    AccessibleGridControlAccess& operator=( const AccessibleGridControlAccess& );   // never implemented
+    AccessibleGridControlAccess();												// never implemented
+    AccessibleGridControlAccess( const AccessibleGridControlAccess& );		// never implemented
+    AccessibleGridControlAccess& operator=( const AccessibleGridControlAccess& );	// never implemented
 };
 
 // ============================================================================
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
index 383c6410eaeb..60bdd0b185fc 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -334,7 +334,7 @@ public:
     // public versions of internal helper methods, with access control
     struct TC_AccessControl { friend class TC_SolarMethodGuard; private: TC_AccessControl() { } };
 
-    inline ::osl::Mutex&    getMutex( const TC_AccessControl& ) { return getOslMutex(); }
+    inline ::osl::Mutex&	getMutex( const TC_AccessControl& ) { return getOslMutex(); }
     inline void             ensureIsAlive( const TC_AccessControl& ) { ensureIsAlive(); }
 
 protected:
@@ -353,15 +353,15 @@ private:
     ::rtl::OUString m_aName;
     /** Localized description text. */
     ::rtl::OUString m_aDescription;
-    ::comphelper::AccessibleEventNotifier::TClientId    m_aClientId;
+    ::comphelper::AccessibleEventNotifier::TClientId	m_aClientId;
 };
 
 // ============================================================================
 // a version of AccessibleGridControlBase which implements not only the XAccessibleContext,
 // but also the XAccessible
 
-typedef ::cppu::ImplHelper1 <   ::com::sun::star::accessibility::XAccessible
-                            >   GridControlAccessibleElement_Base;
+typedef ::cppu::ImplHelper1	<	::com::sun::star::accessibility::XAccessible
+                            >	GridControlAccessibleElement_Base;
 
 class GridControlAccessibleElement
             :public AccessibleGridControlBase
@@ -400,9 +400,9 @@ protected:
         throw ( ::com::sun::star::uno::RuntimeException );
 
 private:
-    GridControlAccessibleElement();                                             // never implemented
-    GridControlAccessibleElement( const GridControlAccessibleElement& );        // never implemented
-    GridControlAccessibleElement& operator=( const GridControlAccessibleElement& ); // never implemented
+    GridControlAccessibleElement();												// never implemented
+    GridControlAccessibleElement( const GridControlAccessibleElement& );		// never implemented
+    GridControlAccessibleElement& operator=( const GridControlAccessibleElement& );	// never implemented
 };
 
 // ============================================================================
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx
index 6732fa2b6576..21cd9d8bc2f0 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx
index f7f02f5828b0..e8b49520598c 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 accessibility
 {
     class AccessibleGridControlHeaderCell : public AccessibleGridControlCell, public ::com::sun::star::accessibility::XAccessible
     {
-        sal_Int32   m_nColumnRowId;
+        sal_Int32	m_nColumnRowId;
     public:
         AccessibleGridControlHeaderCell(sal_Int32 _nColumnRowId,
                         const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxParent,
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx
index 1d79e1d2d199..63ac7545ea9c 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
index daa6fd179ef6..92bd1e2e859c 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx
index 7dd2d982e186..d52aaee2e88f 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace accessibility
     class AccessibleGridControlCell : public AccessibleGridControlBase
     {
     private:
-        sal_Int32               m_nRowPos;      // the row number of the table cell
-        sal_Int32               m_nColPos;      // the column id of the table cell
+        sal_Int32				m_nRowPos;		// the row number of the table cell
+        sal_Int32				m_nColPos;		// the column id of the table cell
 
     protected:
         // attribute access
-        inline sal_Int32    getRowPos( ) const { return m_nRowPos; }
-        inline sal_Int32    getColumnPos( ) const { return m_nColPos; }
+        inline sal_Int32	getRowPos( ) const { return m_nRowPos; }
+        inline sal_Int32	getColumnPos( ) const { return m_nColPos; }
 
         // XAccessibleComponent
         virtual void SAL_CALL grabFocus() throw ( ::com::sun::star::uno::RuntimeException );
@@ -61,16 +61,16 @@ namespace accessibility
         virtual ~AccessibleGridControlCell();
 
     private:
-        AccessibleGridControlCell();                                                    // never implemented
-        AccessibleGridControlCell( const AccessibleGridControlCell& );              // never implemented
-        AccessibleGridControlCell& operator=( const AccessibleGridControlCell& );   // never implemented
+        AccessibleGridControlCell();													// never implemented
+        AccessibleGridControlCell( const AccessibleGridControlCell& );				// never implemented
+        AccessibleGridControlCell& operator=( const AccessibleGridControlCell& );	// never implemented
     };
 
-    typedef ::cppu::ImplHelper2 <   ::com::sun::star::accessibility::XAccessibleText
-                                ,   ::com::sun::star::accessibility::XAccessible
-                                >   AccessibleTextHelper_BASE;
+    typedef ::cppu::ImplHelper2	<	::com::sun::star::accessibility::XAccessibleText
+                                ,	::com::sun::star::accessibility::XAccessible
+                                >	AccessibleTextHelper_BASE;
     // implementation of a table cell of GridControl
-    class AccessibleGridControlTableCell    :public AccessibleGridControlCell
+    class AccessibleGridControlTableCell	:public AccessibleGridControlCell
                                         ,public AccessibleTextHelper_BASE
                                         ,public ::comphelper::OCommonAccessibleText
     {
@@ -79,9 +79,9 @@ namespace accessibility
 
     protected:
         // OCommonAccessibleText
-        virtual ::rtl::OUString                 implGetText();
-        virtual ::com::sun::star::lang::Locale  implGetLocale();
-        virtual void                            implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
+        virtual ::rtl::OUString					implGetText();
+        virtual ::com::sun::star::lang::Locale	implGetLocale();
+        virtual void							implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
         virtual Rectangle implGetBoundingBox();
         virtual Rectangle implGetBoundingBoxOnScreen();
 
diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx
index fb8664e521e4..30eef85cf6ec 100644
--- a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx
index 295d6e6624bd..1bdb6c8548f3 100644
--- a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx
index 83ca6d8101c7..eb375eb8a906 100644
--- a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx b/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx
index 3314648ac6e7..6c7bd7da5f9d 100644
--- a/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx
+++ b/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,13 +45,13 @@ namespace accessibility
     class AccessibleBrowseBoxCell : public AccessibleBrowseBoxBase
     {
     private:
-        sal_Int32               m_nRowPos;      // the row number of the table cell
-        sal_uInt16              m_nColPos;      // the column id of the table cell
+        sal_Int32				m_nRowPos;		// the row number of the table cell
+        sal_uInt16				m_nColPos;		// the column id of the table cell
 
     protected:
         // attribute access
-        inline sal_Int32    getRowPos( ) const { return m_nRowPos; }
-        inline sal_Int32    getColumnPos( ) const { return m_nColPos; }
+        inline sal_Int32	getRowPos( ) const { return m_nRowPos; }
+        inline sal_Int32	getColumnPos( ) const { return m_nColPos; }
 
     protected:
         // AccessibleBrowseBoxBase overridables
@@ -74,13 +74,13 @@ namespace accessibility
         virtual ~AccessibleBrowseBoxCell();
 
     private:
-        AccessibleBrowseBoxCell();                                                  // never implemented
-        AccessibleBrowseBoxCell( const AccessibleBrowseBoxCell& );              // never implemented
-        AccessibleBrowseBoxCell& operator=( const AccessibleBrowseBoxCell& );   // never implemented
+        AccessibleBrowseBoxCell();													// never implemented
+        AccessibleBrowseBoxCell( const AccessibleBrowseBoxCell& );				// never implemented
+        AccessibleBrowseBoxCell& operator=( const AccessibleBrowseBoxCell& );	// never implemented
     };
 
 // .................................................................................
-}   // namespace accessibility
+}	// namespace accessibility
 // .................................................................................
 
 
diff --git a/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx b/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx
index 2abe7d871022..c30c4f768210 100644
--- a/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx
+++ b/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 accessibility
     // =============================================================================
     // = EditBrowseBoxTableCell
     // =============================================================================
-    class EditBrowseBoxTableCell    :public AccessibleBrowseBoxCell
+    class EditBrowseBoxTableCell	:public AccessibleBrowseBoxCell
                                     ,public ::comphelper::OAccessibleContextWrapperHelper
     {
     public:
@@ -81,7 +81,7 @@ namespace accessibility
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (::com::sun::star::uno::RuntimeException);
 
         sal_Int16 SAL_CALL getAccessibleRole() throw ( ::com::sun::star::uno::RuntimeException );
-
+        
         virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
 
@@ -97,16 +97,16 @@ namespace accessibility
         void notifyTranslatedEvent( const ::com::sun::star::accessibility::AccessibleEventObject& _rEvent ) throw (::com::sun::star::uno::RuntimeException);
 
     private:
-        EditBrowseBoxTableCell();                                           // never implemented
-        EditBrowseBoxTableCell( const EditBrowseBoxTableCell& );            // never implemented
-        EditBrowseBoxTableCell& operator=( const EditBrowseBoxTableCell& ); // never implemented
+        EditBrowseBoxTableCell();											// never implemented
+        EditBrowseBoxTableCell( const EditBrowseBoxTableCell& );			// never implemented
+        EditBrowseBoxTableCell& operator=( const EditBrowseBoxTableCell& );	// never implemented
     };
 
     // =============================================================================
     // = EditBrowseBoxTableCell
     // =============================================================================
-    typedef ::cppu::WeakComponentImplHelper1    <   ::com::sun::star::accessibility::XAccessible
-                                                >   EditBrowseBoxTableCellAccess_Base;
+    typedef ::cppu::WeakComponentImplHelper1	<	::com::sun::star::accessibility::XAccessible
+                                                >	EditBrowseBoxTableCellAccess_Base;
     // XAccessible providing an EditBrowseBoxTableCell
     class EditBrowseBoxTableCellAccess
                         :public ::comphelper::OBaseMutex
@@ -122,8 +122,8 @@ namespace accessibility
         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >
                                             m_xFocusWindow;
         ::svt::IAccessibleTableProvider*    m_pBrowseBox;
-        sal_Int32                           m_nRowPos;
-        sal_uInt16                          m_nColPos;
+        sal_Int32				            m_nRowPos;
+        sal_uInt16				            m_nColPos;
 
     public:
         EditBrowseBoxTableCellAccess(
@@ -145,9 +145,9 @@ namespace accessibility
         virtual void SAL_CALL disposing();
 
     private:
-        EditBrowseBoxTableCellAccess();                                                 // never implemented
-        EditBrowseBoxTableCellAccess( const EditBrowseBoxTableCellAccess& );            // never implemented
-        EditBrowseBoxTableCellAccess& operator=( const EditBrowseBoxTableCellAccess& ); // never implemented
+        EditBrowseBoxTableCellAccess();													// never implemented
+        EditBrowseBoxTableCellAccess( const EditBrowseBoxTableCellAccess& );			// never implemented
+        EditBrowseBoxTableCellAccess& operator=( const EditBrowseBoxTableCellAccess& );	// never implemented
     };
 }
 
diff --git a/accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx b/accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx
index 2289dd45baec..55758bb80bdd 100644
--- a/accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx
+++ b/accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 accessibility
 
     /** the class OAccessibleListBoxEntry represents the base class for an accessible object of a listbox entry
     */
-    class AccessibleIconChoiceCtrl  :public AccessibleIconChoiceCtrl_BASE
+    class AccessibleIconChoiceCtrl	:public AccessibleIconChoiceCtrl_BASE
                                     ,public VCLXAccessibleComponent
     {
     protected:
@@ -59,17 +59,17 @@ namespace accessibility
         virtual ~AccessibleIconChoiceCtrl();
 
         /** this function is called upon disposing the component */
-        virtual void SAL_CALL   disposing();
+        virtual void SAL_CALL	disposing();
 
-        virtual void    ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
-        virtual void    FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+        virtual void	ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+        virtual void	FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
 
         SvtIconChoiceCtrl* getCtrl();
     public:
         /** OAccessibleBase needs a valid view
-            @param  _rIconCtrl
+            @param	_rIconCtrl
                 is the box for which we implement an accessible object
-            @param  _xParent
+            @param	_xParent
                 is our parent accessible object
         */
         AccessibleIconChoiceCtrl( SvtIconChoiceCtrl& _rIconCtrl,
diff --git a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx
index 09af3e2466ca..3e9cec0e71d6 100644
--- a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx
+++ b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,14 +67,14 @@ namespace accessibility
                                                 , ::com::sun::star::lang::XEventListener > AccessibleIconChoiceCtrlEntry_BASE;
 
     /** the class AccessibleListBoxEntry represents the class for an accessible object of a listbox entry */
-    class AccessibleIconChoiceCtrlEntry :   public ::comphelper::OBaseMutex,
+    class AccessibleIconChoiceCtrlEntry :	public ::comphelper::OBaseMutex,
                                        public AccessibleIconChoiceCtrlEntry_BASE,
                                     public ::comphelper::OCommonAccessibleText
     {
     private:
         /** The treelistbox control */
-        SvtIconChoiceCtrl*                  m_pIconCtrl;
-        sal_Int32                           m_nIndex;
+        SvtIconChoiceCtrl*					m_pIconCtrl;
+        sal_Int32							m_nIndex;
 
     protected:
         /// client id in the AccessibleEventNotifier queue
@@ -87,45 +87,45 @@ namespace accessibility
     // (the following method is unused currently. If you need it, simply remove the #ifdef thing here and
     // in the cxx)
         /** notifies all listeners that this object has changed
-            @param  _nEventId
+            @param	_nEventId
                 is the event id
-            @param  _aOldValue
+            @param	_aOldValue
                 is the old value
-            @param  _aNewValue
+            @param	_aNewValue
                 is the new value
         */
-        void    NotifyAccessibleEvent( sal_Int16 _nEventId,
+        void	NotifyAccessibleEvent( sal_Int16 _nEventId,
                                        const ::com::sun::star::uno::Any& _aOldValue,
                                        const ::com::sun::star::uno::Any& _aNewValue );
     #endif
 
-        Rectangle               GetBoundingBox_Impl() const;
-        Rectangle               GetBoundingBoxOnScreen_Impl() const;
-        sal_Bool                IsAlive_Impl() const;
-        sal_Bool                IsShowing_Impl() const;
+        Rectangle				GetBoundingBox_Impl() const;
+        Rectangle				GetBoundingBoxOnScreen_Impl() const;
+        sal_Bool				IsAlive_Impl() const;
+        sal_Bool				IsShowing_Impl() const;
 
-        Rectangle               GetBoundingBox() throw ( ::com::sun::star::lang::DisposedException );
-        Rectangle               GetBoundingBoxOnScreen() throw ( ::com::sun::star::lang::DisposedException );
-        void                    EnsureIsAlive() const throw ( ::com::sun::star::lang::DisposedException );
+        Rectangle				GetBoundingBox() throw ( ::com::sun::star::lang::DisposedException );
+        Rectangle				GetBoundingBoxOnScreen() throw ( ::com::sun::star::lang::DisposedException );
+        void 					EnsureIsAlive() const throw ( ::com::sun::star::lang::DisposedException );
 
     protected:
         virtual ~AccessibleIconChoiceCtrlEntry();
         /** this function is called upon disposing the component
         */
-        virtual void SAL_CALL                   disposing();
+        virtual void SAL_CALL					disposing();
 
         // OCommonAccessibleText
-        virtual ::rtl::OUString                 implGetText();
-        virtual ::com::sun::star::lang::Locale  implGetLocale();
-        virtual void                            implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
+        virtual ::rtl::OUString					implGetText();
+        virtual ::com::sun::star::lang::Locale	implGetLocale();
+        virtual void							implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
 
     public:
         /** Ctor()
-            @param  _rListBox
+            @param	_rListBox
                 the view control
-            @param  _pEntry
+            @param	_pEntry
                 the entry
-            @param  _xParent
+            @param	_xParent
                 is our parent accessible object
         */
         AccessibleIconChoiceCtrlEntry( SvtIconChoiceCtrl& _rIconCtrl,
diff --git a/accessibility/inc/accessibility/extended/accessiblelistbox.hxx b/accessibility/inc/accessibility/extended/accessiblelistbox.hxx
index 9e81e7eed7d4..c7326637542d 100644
--- a/accessibility/inc/accessibility/extended/accessiblelistbox.hxx
+++ b/accessibility/inc/accessibility/extended/accessiblelistbox.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,11 +50,11 @@ namespace accessibility
 
     /** the class OAccessibleListBoxEntry represents the base class for an accessible object of a listbox entry
     */
-    class AccessibleListBox :public AccessibleListBox_BASE
+    class AccessibleListBox	:public AccessibleListBox_BASE
                             ,public VCLXAccessibleComponent
     {
     protected:
-
+        
         ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xParent;
 
     protected:
@@ -62,20 +62,20 @@ namespace accessibility
 
         // OComponentHelper overridables
         /** this function is called upon disposing the component */
-        virtual void SAL_CALL   disposing();
+        virtual void SAL_CALL	disposing();
 
         // VCLXAccessibleComponent
-        virtual void    ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+        virtual void	ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
         virtual void    ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent );
-        virtual void    FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+        virtual void	FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
 
-        SvTreeListBox*  getListBox() const;
+        SvTreeListBox*	getListBox() const;
 
     public:
         /** OAccessibleBase needs a valid view
-            @param  _rListBox
+            @param	_rListBox
                 is the box for which we implement an accessible object
-            @param  _xParent
+            @param	_xParent
                 is our parent accessible object
         */
         AccessibleListBox( SvTreeListBox& _rListBox,
@@ -107,7 +107,7 @@ namespace accessibility
         virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (::com::sun::star::uno::RuntimeException);
         virtual ::rtl::OUString SAL_CALL getAccessibleDescription(  ) throw (::com::sun::star::uno::RuntimeException);
         virtual ::rtl::OUString SAL_CALL getAccessibleName(  ) throw (::com::sun::star::uno::RuntimeException);
-
+        
         // XAccessibleSelection
         void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
         sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
diff --git a/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx b/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx
index 4521c0e0d03e..c7de9472bd33 100644
--- a/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx
+++ b/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace accessibility
 
     private:
         /** The treelistbox control */
-        SvTreeListBox*                      m_pListBox;
-        ::std::deque< sal_Int32 >           m_aEntryPath;
+        SvTreeListBox*						m_pListBox;
+        ::std::deque< sal_Int32 >			m_aEntryPath;
 
     protected:
         /// client id in the AccessibleEventNotifier queue
@@ -95,40 +95,40 @@ namespace accessibility
                                             m_aParent;
 
     private:
-        Rectangle               GetBoundingBox_Impl() const;
-        Rectangle               GetBoundingBoxOnScreen_Impl() const;
-        sal_Bool                IsAlive_Impl() const;
-        sal_Bool                IsShowing_Impl() const;
+        Rectangle				GetBoundingBox_Impl() const;
+        Rectangle				GetBoundingBoxOnScreen_Impl() const;
+        sal_Bool				IsAlive_Impl() const;
+        sal_Bool				IsShowing_Impl() const;
 
-        Rectangle               GetBoundingBox() throw ( ::com::sun::star::lang::DisposedException );
-        Rectangle               GetBoundingBoxOnScreen() throw ( ::com::sun::star::lang::DisposedException );
-        void                    EnsureIsAlive() const throw ( ::com::sun::star::lang::DisposedException );
+        Rectangle				GetBoundingBox() throw ( ::com::sun::star::lang::DisposedException );
+        Rectangle				GetBoundingBoxOnScreen() throw ( ::com::sun::star::lang::DisposedException );
+        void 					EnsureIsAlive() const throw ( ::com::sun::star::lang::DisposedException );
 
     protected:
         virtual ~AccessibleListBoxEntry();
 
         /** this function is called upon disposing the component
         */
-        virtual void SAL_CALL                   disposing();
+        virtual void SAL_CALL					disposing();
 
         // ListBoxAccessible/XComponent
         virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException );
 
         // OCommonAccessibleText
-        virtual ::rtl::OUString                 implGetText();
-        virtual ::com::sun::star::lang::Locale  implGetLocale();
-        virtual void                            implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
+        virtual ::rtl::OUString					implGetText();
+        virtual ::com::sun::star::lang::Locale	implGetLocale();
+        virtual void							implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
 
     public:
         /** Ctor()
-            @param  _rListBox
+            @param	_rListBox
                 the view control
-            @param  _pEntry
+            @param	_pEntry
                 the entry
-            @param  _xParent
+            @param	_xParent
                 is our parent accessible object
         */
-        AccessibleListBoxEntry( SvTreeListBox& _rListBox, SvLBoxEntry* _pEntry,
+        AccessibleListBoxEntry(	SvTreeListBox& _rListBox, SvLBoxEntry* _pEntry,
                                 const ::com::sun::star::uno::Reference<
                                     ::com::sun::star::accessibility::XAccessible >& _xParent );
 
diff --git a/accessibility/inc/accessibility/extended/accessibletabbar.hxx b/accessibility/inc/accessibility/extended/accessibletabbar.hxx
index d7b43bc5870c..23c18d90e470 100644
--- a/accessibility/inc/accessibility/extended/accessibletabbar.hxx
+++ b/accessibility/inc/accessibility/extended/accessibletabbar.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace accessibility
 {
 //.........................................................................
 
-    //  ----------------------------------------------------
-    //  class AccessibleTabBar
-    //  ----------------------------------------------------
+    //	----------------------------------------------------
+    //	class AccessibleTabBar
+    //	----------------------------------------------------
 
     typedef ::cppu::ImplHelper2<
         ::com::sun::star::accessibility::XAccessible,
@@ -57,19 +57,19 @@ namespace accessibility
                                 public AccessibleTabBar_BASE
     {
     private:
-        typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > > AccessibleChildren;
+        typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >	> AccessibleChildren;
 
-        AccessibleChildren      m_aAccessibleChildren;
+        AccessibleChildren		m_aAccessibleChildren;
 
     protected:
-        virtual void            ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
-        virtual void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+        virtual void			ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+        virtual void			FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
 
         // OCommonAccessibleComponent
-        virtual ::com::sun::star::awt::Rectangle SAL_CALL   implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::awt::Rectangle SAL_CALL	implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
 
         // XComponent
-        virtual void SAL_CALL   disposing();
+        virtual void SAL_CALL	disposing();
 
     public:
         AccessibleTabBar( TabBar* pTabBar );
@@ -108,13 +108,13 @@ namespace accessibility
         virtual sal_Int32 SAL_CALL getBackground(  ) throw (::com::sun::star::uno::RuntimeException);
 
         // XAccessibleExtendedComponent
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont(	) throw (::com::sun::star::uno::RuntimeException);
         virtual ::rtl::OUString SAL_CALL getTitledBorderText(  ) throw (::com::sun::star::uno::RuntimeException);
         virtual ::rtl::OUString SAL_CALL getToolTipText(  ) throw (::com::sun::star::uno::RuntimeException);
     };
 
 //.........................................................................
-}   // namespace accessibility
+}	// namespace accessibility
 //.........................................................................
 
 #endif // ACCESSIBILITY_EXT_ACCESSIBLETABBAR_HXX_
diff --git a/accessibility/inc/accessibility/extended/accessibletabbarbase.hxx b/accessibility/inc/accessibility/extended/accessibletabbarbase.hxx
index b4e62f517d3f..555dada90dfd 100644
--- a/accessibility/inc/accessibility/extended/accessibletabbarbase.hxx
+++ b/accessibility/inc/accessibility/extended/accessibletabbarbase.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx b/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx
index 756d2fff4b35..07f0945efafb 100644
--- a/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx
+++ b/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace accessibility
 {
 //.........................................................................
 
-    //  ----------------------------------------------------
-    //  class AccessibleTabBarPage
-    //  ----------------------------------------------------
+    //	----------------------------------------------------
+    //	class AccessibleTabBarPage
+    //	----------------------------------------------------
 
     typedef ::cppu::ImplHelper2<
         ::com::sun::star::accessibility::XAccessible,
@@ -59,36 +59,36 @@ namespace accessibility
         friend class AccessibleTabBarPageList;
 
     private:
-        sal_uInt16              m_nPageId;
-        sal_Bool                m_bEnabled;
-        sal_Bool                m_bShowing;
-        sal_Bool                m_bSelected;
-        ::rtl::OUString         m_sPageText;
+        sal_uInt16				m_nPageId;
+        sal_Bool				m_bEnabled;
+        sal_Bool				m_bShowing;
+        sal_Bool				m_bSelected;
+        ::rtl::OUString			m_sPageText;
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >        m_xParent;
+        ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >		m_xParent;
 
     protected:
-        sal_Bool                IsEnabled();
-        sal_Bool                IsShowing();
-        sal_Bool                IsSelected();
+        sal_Bool				IsEnabled();
+        sal_Bool				IsShowing();
+        sal_Bool				IsSelected();
 
-        void                    SetEnabled( sal_Bool bEnabled );
-        void                    SetShowing( sal_Bool bShowing );
-        void                    SetSelected( sal_Bool bSelected );
-        void                    SetPageText( const ::rtl::OUString& sPageText );
+        void					SetEnabled( sal_Bool bEnabled );
+        void					SetShowing( sal_Bool bShowing );
+        void					SetSelected( sal_Bool bSelected );
+        void					SetPageText( const ::rtl::OUString& sPageText );
 
-        sal_uInt16              GetPageId() const { return m_nPageId; }
+        sal_uInt16				GetPageId() const { return m_nPageId; }
 
-        virtual void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+        virtual void			FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
 
-        // OCommonAccessibleComponent
-        virtual ::com::sun::star::awt::Rectangle SAL_CALL   implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
+        // OCommonAccessibleComponent 
+        virtual ::com::sun::star::awt::Rectangle SAL_CALL	implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
 
         // XComponent
-        virtual void SAL_CALL   disposing();
+        virtual void SAL_CALL	disposing();
 
     public:
-        AccessibleTabBarPage( TabBar* pTabBar, sal_uInt16 nPageId,
+        AccessibleTabBarPage( TabBar* pTabBar, sal_uInt16 nPageId, 
                               const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxParent );
         virtual ~AccessibleTabBarPage();
 
@@ -125,13 +125,13 @@ namespace accessibility
         virtual sal_Int32 SAL_CALL getBackground(  ) throw (::com::sun::star::uno::RuntimeException);
 
         // XAccessibleExtendedComponent
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont(	) throw (::com::sun::star::uno::RuntimeException);
         virtual ::rtl::OUString SAL_CALL getTitledBorderText(  ) throw (::com::sun::star::uno::RuntimeException);
         virtual ::rtl::OUString SAL_CALL getToolTipText(  ) throw (::com::sun::star::uno::RuntimeException);
     };
 
 //.........................................................................
-}   // namespace accessibility
+}	// namespace accessibility
 //.........................................................................
 
 #endif // ACCESSIBILITY_EXT_ACCESSIBLETABBARPAGE_HXX_
diff --git a/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx b/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx
index cc5dc276cd24..67b0ec7d00c0 100644
--- a/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx
+++ b/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace accessibility
 {
 //.........................................................................
 
-    //  ----------------------------------------------------
-    //  class AccessibleTabBarPageList
-    //  ----------------------------------------------------
+    //	----------------------------------------------------
+    //	class AccessibleTabBarPageList
+    //	----------------------------------------------------
 
     typedef ::cppu::ImplHelper3<
         ::com::sun::star::accessibility::XAccessible,
@@ -59,29 +59,29 @@ namespace accessibility
                                         public AccessibleTabBarPageList_BASE
     {
     private:
-        typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > > AccessibleChildren;
+        typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >	> AccessibleChildren;
 
-        AccessibleChildren      m_aAccessibleChildren;
-        sal_Int32               m_nIndexInParent;
+        AccessibleChildren		m_aAccessibleChildren;
+        sal_Int32				m_nIndexInParent;
 
     protected:
-        void                    UpdateEnabled( sal_Int32 i, sal_Bool bEnabled );
-        void                    UpdateShowing( sal_Bool bShowing );
-        void                    UpdateSelected( sal_Int32 i, sal_Bool bSelected );
-        void                    UpdatePageText( sal_Int32 i );
+        void					UpdateEnabled( sal_Int32 i, sal_Bool bEnabled );
+        void					UpdateShowing( sal_Bool bShowing );
+        void					UpdateSelected( sal_Int32 i, sal_Bool bSelected );
+        void					UpdatePageText( sal_Int32 i );
 
-        void                    InsertChild( sal_Int32 i );
-        void                    RemoveChild( sal_Int32 i );
-        void                    MoveChild( sal_Int32 i, sal_Int32 j );
+        void					InsertChild( sal_Int32 i );
+        void					RemoveChild( sal_Int32 i );
+        void					MoveChild( sal_Int32 i, sal_Int32 j );
 
-        virtual void            ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
-        virtual void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+        virtual void			ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+        virtual void			FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
 
-        // OCommonAccessibleComponent
-        virtual ::com::sun::star::awt::Rectangle SAL_CALL   implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
+        // OCommonAccessibleComponent 
+        virtual ::com::sun::star::awt::Rectangle SAL_CALL	implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
 
         // XComponent
-        virtual void SAL_CALL   disposing();
+        virtual void SAL_CALL	disposing();
 
     public:
         AccessibleTabBarPageList( TabBar* pTabBar, sal_Int32 nIndexInParent );
@@ -120,7 +120,7 @@ namespace accessibility
         virtual sal_Int32 SAL_CALL getBackground(  ) throw (::com::sun::star::uno::RuntimeException);
 
         // XAccessibleExtendedComponent
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont(	) throw (::com::sun::star::uno::RuntimeException);
         virtual ::rtl::OUString SAL_CALL getTitledBorderText(  ) throw (::com::sun::star::uno::RuntimeException);
         virtual ::rtl::OUString SAL_CALL getToolTipText(  ) throw (::com::sun::star::uno::RuntimeException);
 
@@ -135,7 +135,7 @@ namespace accessibility
     };
 
 //.........................................................................
-}   // namespace accessibility
+}	// namespace accessibility
 //.........................................................................
 
 #endif // ACCESSIBILITY_EXT_ACCESSIBLETABBARPAGELIST_HXX_
diff --git a/accessibility/inc/accessibility/extended/accessibletablistbox.hxx b/accessibility/inc/accessibility/extended/accessibletablistbox.hxx
index 4e6f03af3c9b..19da7b496260 100644
--- a/accessibility/inc/accessibility/extended/accessibletablistbox.hxx
+++ b/accessibility/inc/accessibility/extended/accessibletablistbox.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class AccessibleTabListBox
                 ,public ::svt::IAccessibleTabListBox
 {
 private:
-    SvHeaderTabListBox*         m_pTabListBox;
+    SvHeaderTabListBox*			m_pTabListBox;
 
 public:
     /** ctor()
@@ -103,7 +103,7 @@ protected:
 
     /** This method creates and returns an accessible table.
         @return  An AccessibleBrowseBoxTable. */
-    virtual AccessibleBrowseBoxTable*   createAccessibleTable();
+    virtual AccessibleBrowseBoxTable*	createAccessibleTable();
 };
 
 // ============================================================================
diff --git a/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx b/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx
index 153dc76f2a65..81d2964c795b 100644
--- a/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx
+++ b/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,10 +46,10 @@ typedef ::cppu::ImplHelper1< ::com::sun::star::accessibility::XAccessibleSelecti
 class AccessibleTabListBoxTable : public AccessibleBrowseBoxTable, public AccessibleTabListBoxTableImplHelper
 {
 private:
-    SvHeaderTabListBox*     m_pTabListBox;
+    SvHeaderTabListBox*		m_pTabListBox;
 
-    void                    ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
-    DECL_LINK(              WindowEventListener, VclSimpleEvent* );
+    void					ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+    DECL_LINK(      		WindowEventListener, VclSimpleEvent* );
 
     // helpers ----------------------------------------------------------------
 
diff --git a/accessibility/inc/accessibility/extended/listboxaccessible.hxx b/accessibility/inc/accessibility/extended/listboxaccessible.hxx
index b82291f91e79..ad8b4eed4954 100644
--- a/accessibility/inc/accessibility/extended/listboxaccessible.hxx
+++ b/accessibility/inc/accessibility/extended/listboxaccessible.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,12 +53,12 @@ namespace accessibility
         SvTreeListBox* m_pWindow;
 
     protected:
-        inline SvTreeListBox*       getListBox() const
+        inline SvTreeListBox*		getListBox() const
         {
-            return  const_cast< ListBoxAccessibleBase* >( this )->m_pWindow;
+            return	const_cast< ListBoxAccessibleBase* >( this )->m_pWindow;
         }
 
-        inline  bool                    isAlive() const     { return NULL != m_pWindow; }
+        inline	bool					isAlive() const		{ return NULL != m_pWindow; }
 
     public:
         ListBoxAccessibleBase( SvTreeListBox& _rWindow );
@@ -84,13 +84,13 @@ namespace accessibility
         DECL_LINK( WindowEventListener, VclSimpleEvent* );
 
     private:
-        ListBoxAccessibleBase( );                                           // never implemented
-        ListBoxAccessibleBase( const ListBoxAccessibleBase& );              // never implemented
-        ListBoxAccessibleBase& operator=( const ListBoxAccessibleBase& );   // never implemented
+        ListBoxAccessibleBase( );											// never implemented
+        ListBoxAccessibleBase( const ListBoxAccessibleBase& );				// never implemented
+        ListBoxAccessibleBase& operator=( const ListBoxAccessibleBase& );	// never implemented
     };
 
 //........................................................................
-}   // namespace accessibility
+}	// namespace accessibility
 //........................................................................
 
 #endif // ACCESSIBILITY_EXT_LISTBOX_ACCESSIBLE
diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
index 091eebe46d18..3f7bd49a3a35 100644
--- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ public:
 
 protected:
     // OCommonAccessibleText
-    virtual void implGetParagraphBoundary( ::css::i18n::Boundary& rBoundary,
+    virtual void implGetParagraphBoundary( ::css::i18n::Boundary& rBoundary, 
                                            ::sal_Int32 nIndex );
     virtual void implGetLineBoundary( ::css::i18n::Boundary& rBoundary,
                                       ::sal_Int32 nIndex );
@@ -347,18 +347,18 @@ private:
         throw (::css::lang::IndexOutOfBoundsException,
                ::css::uno::RuntimeException);
 
-    virtual ::sal_Int32 SAL_CALL getLineNumberAtIndex( ::sal_Int32 nIndex )
-        throw (::com::sun::star::lang::IndexOutOfBoundsException,
+    virtual ::sal_Int32 SAL_CALL getLineNumberAtIndex( ::sal_Int32 nIndex ) 
+        throw (::com::sun::star::lang::IndexOutOfBoundsException, 
                ::com::sun::star::uno::RuntimeException);
-
-    virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtLineNumber( ::sal_Int32 nLineNo )
+    
+    virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtLineNumber( ::sal_Int32 nLineNo ) 
         throw (::com::sun::star::lang::IndexOutOfBoundsException,
                ::com::sun::star::uno::RuntimeException);
-
-    virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtLineWithCaret(  )
+    
+    virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtLineWithCaret(  ) 
         throw (::com::sun::star::uno::RuntimeException);
-
-    virtual ::sal_Int32 SAL_CALL getNumberOfLineWithCaret(  )
+    
+    virtual ::sal_Int32 SAL_CALL getNumberOfLineWithCaret(  ) 
         throw (::com::sun::star::uno::RuntimeException);
 
     using cppu::WeakAggComponentImplHelperBase::addEventListener;
@@ -552,15 +552,15 @@ public:
                                   ::sal_Int32 nBegin, ::sal_Int32 nEnd);
 
     ::css::i18n::Boundary
-    retrieveParagraphLineBoundary( ParagraphImpl const * pParagraph,
+    retrieveParagraphLineBoundary( ParagraphImpl const * pParagraph, 
                                    ::sal_Int32 nIndex, ::sal_Int32 *pLineNo = NULL);
 
     ::css::i18n::Boundary
-    retrieveParagraphBoundaryOfLine( ParagraphImpl const * pParagraph,
+    retrieveParagraphBoundaryOfLine( ParagraphImpl const * pParagraph, 
                                      ::sal_Int32 nIndex );
 
     sal_Int32 retrieveParagraphLineWithCursor( ParagraphImpl const * pParagraph );
-
+                                   
     ::css::uno::Reference< ::css::accessibility::XAccessibleRelationSet >
     retrieveParagraphRelationSet( ParagraphImpl const * pParagraph );
 
diff --git a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
index a4b09cd83b99..561b2122a00a 100644
--- a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
+++ b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace accessibility
     class SAL_NO_VTABLE IComboListBoxHelper
     {
     public:
-        virtual String          GetEntry( USHORT nPos ) const = 0;
-        virtual Rectangle       GetDropDownPosSizePixel( ) const = 0;
-        virtual Rectangle       GetBoundingRectangle( USHORT nItem ) const = 0;
-        virtual Rectangle       GetWindowExtentsRelative( Window* pRelativeWindow ) = 0;
-        virtual BOOL            IsActive() const = 0;
-        virtual BOOL            IsEntryVisible( USHORT nPos ) const = 0;
-        virtual USHORT          GetDisplayLineCount() const = 0;
+        virtual String			GetEntry( USHORT nPos ) const = 0;
+        virtual Rectangle		GetDropDownPosSizePixel( ) const = 0;
+        virtual Rectangle		GetBoundingRectangle( USHORT nItem ) const = 0;
+        virtual Rectangle		GetWindowExtentsRelative( Window* pRelativeWindow ) = 0;
+        virtual BOOL        	IsActive() const = 0;
+        virtual BOOL			IsEntryVisible( USHORT nPos ) const = 0;
+        virtual USHORT			GetDisplayLineCount() const = 0;
         virtual void            GetMaxVisColumnsAndLines( USHORT& rnCols, USHORT& rnLines ) const = 0;
         virtual WinBits         GetStyle() const = 0;
         virtual BOOL            IsMultiSelectionEnabled() const = 0;
-        virtual USHORT          GetTopEntry() const = 0;
-        virtual BOOL            IsEntryPosSelected( USHORT nPos ) const = 0;
+        virtual USHORT			GetTopEntry() const = 0;
+        virtual BOOL			IsEntryPosSelected( USHORT nPos ) const = 0;
         virtual USHORT          GetEntryCount() const = 0;
-        virtual void            Select() = 0;
-        virtual void            SelectEntryPos( USHORT nPos, BOOL bSelect = TRUE ) = 0;
-        virtual USHORT          GetSelectEntryCount() const = 0;
-        virtual void            SetNoSelection() = 0;
-        virtual USHORT          GetSelectEntryPos( USHORT nSelIndex = 0 ) const = 0;
+        virtual void			Select() = 0;
+        virtual void			SelectEntryPos( USHORT nPos, BOOL bSelect = TRUE ) = 0;
+        virtual USHORT			GetSelectEntryCount() const = 0;
+        virtual void			SetNoSelection() = 0;
+        virtual USHORT			GetSelectEntryPos( USHORT nSelIndex = 0 ) const = 0;
         virtual BOOL            IsInDropDown() const = 0;
         virtual Rectangle       GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const = 0;
         virtual long            GetIndexForPoint( const Point& rPoint, USHORT& nPos ) const = 0;
diff --git a/accessibility/inc/accessibility/helper/acc_factory.hxx b/accessibility/inc/accessibility/helper/acc_factory.hxx
index b3dec4607517..b0b0778a011b 100644
--- a/accessibility/inc/accessibility/helper/acc_factory.hxx
+++ b/accessibility/inc/accessibility/helper/acc_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
diff --git a/accessibility/inc/accessibility/helper/accessiblestrings.hrc b/accessibility/inc/accessibility/helper/accessiblestrings.hrc
index 1f936e678b98..8040f3588261 100644
--- a/accessibility/inc/accessibility/helper/accessiblestrings.hrc
+++ b/accessibility/inc/accessibility/helper/accessiblestrings.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,21 +31,21 @@
 
 //------------------------------------------------------------------------------
 
-#define RID_TK_ACC_START        1000
+#define RID_TK_ACC_START		1000
 
 
 // Accessible Action Id's ------------------------------------------------------
 
-#define RID_STR_ACC_ACTION_CLICK            ( RID_TK_ACC_START +    0 )
-#define RID_STR_ACC_ACTION_TOGGLEPOPUP      ( RID_TK_ACC_START +    1 )
-#define RID_STR_ACC_ACTION_SELECT           ( RID_TK_ACC_START +    2 )
-#define RID_STR_ACC_ACTION_INCLINE          ( RID_TK_ACC_START +    3 )
-#define RID_STR_ACC_ACTION_DECLINE          ( RID_TK_ACC_START +    4 )
-#define RID_STR_ACC_ACTION_INCBLOCK         ( RID_TK_ACC_START +    5 )
-#define RID_STR_ACC_ACTION_DECBLOCK         ( RID_TK_ACC_START +    6 )
+#define RID_STR_ACC_ACTION_CLICK			( RID_TK_ACC_START +    0 )
+#define RID_STR_ACC_ACTION_TOGGLEPOPUP		( RID_TK_ACC_START +    1 )
+#define RID_STR_ACC_ACTION_SELECT			( RID_TK_ACC_START +    2 )
+#define RID_STR_ACC_ACTION_INCLINE			( RID_TK_ACC_START +    3 )
+#define RID_STR_ACC_ACTION_DECLINE			( RID_TK_ACC_START +    4 )
+#define RID_STR_ACC_ACTION_INCBLOCK			( RID_TK_ACC_START +    5 )
+#define RID_STR_ACC_ACTION_DECBLOCK			( RID_TK_ACC_START +    6 )
 
 
-#define RID_STR_ACC_NAME_BROWSEBUTTON       ( RID_TK_ACC_START + 100 )
+#define RID_STR_ACC_NAME_BROWSEBUTTON		( RID_TK_ACC_START + 100 )
 #define RID_STR_ACC_DESC_PANELDECL_TABBAR   ( RID_TK_ACC_START + 101 )
 
 // -----------------------------------------------------------------------------
diff --git a/accessibility/inc/accessibility/helper/accresmgr.hxx b/accessibility/inc/accessibility/helper/accresmgr.hxx
index 4208d6d80f06..079ae6c83c7b 100644
--- a/accessibility/inc/accessibility/helper/accresmgr.hxx
+++ b/accessibility/inc/accessibility/helper/accresmgr.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ private:
     TkResMgr() { }
     ~TkResMgr() { }
 
-    // we'll instantiate one static member of the following class,
+    // we'll instantiate one static member of the following class, 
     // which in it's dtor ensures that m_pImpl will be deleted
     class EnsureDelete
     {
diff --git a/accessibility/inc/accessibility/helper/characterattributeshelper.hxx b/accessibility/inc/accessibility/helper/characterattributeshelper.hxx
index 16e37f4e103c..4e5cb90dc5cf 100644
--- a/accessibility/inc/accessibility/helper/characterattributeshelper.hxx
+++ b/accessibility/inc/accessibility/helper/characterattributeshelper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ public:
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetCharacterAttributes( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes );
 };
 
-#endif  // ACCESSIBILITY_HELPER_CHARACTERATTRIBUTESHELPER_HXX
+#endif	// ACCESSIBILITY_HELPER_CHARACTERATTRIBUTESHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/helper/listboxhelper.hxx b/accessibility/inc/accessibility/helper/listboxhelper.hxx
index 8343d95e9447..ed7e65ab5225 100644
--- a/accessibility/inc/accessibility/helper/listboxhelper.hxx
+++ b/accessibility/inc/accessibility/helper/listboxhelper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ const sal_Int32 DEFAULT_INDEX_IN_PARENT = -1;
 template< class T > class VCLListBoxHelper : public ::accessibility::IComboListBoxHelper
 {
 private:
-    T&  m_aComboListBox;
+    T&	m_aComboListBox;
 
 public:
     inline
@@ -55,12 +55,12 @@ public:
         m_aComboListBox( _pListBox ){}
 
     // -----------------------------------------------------------------------------
-    virtual String          GetEntry( USHORT nPos ) const
+    virtual String			GetEntry( USHORT nPos ) const
     {
         return m_aComboListBox.GetEntry( nPos );
     }
     // -----------------------------------------------------------------------------
-    virtual Rectangle       GetDropDownPosSizePixel() const
+    virtual Rectangle		GetDropDownPosSizePixel() const
     {
         Rectangle aTemp = m_aComboListBox.GetWindowExtentsRelative(NULL);
         Rectangle aRet = m_aComboListBox.GetDropDownPosSizePixel();
@@ -68,7 +68,7 @@ public:
         return aRet;
     }
     // -----------------------------------------------------------------------------
-    virtual Rectangle       GetBoundingRectangle( USHORT nItem ) const
+    virtual Rectangle		GetBoundingRectangle( USHORT nItem ) const
     {
         Rectangle aRect;
         if ( m_aComboListBox.IsInDropDown() && IsEntryVisible( nItem ) )
@@ -85,24 +85,24 @@ public:
         return aRect;
     }
     // -----------------------------------------------------------------------------
-    virtual Rectangle       GetWindowExtentsRelative( Window* pRelativeWindow )
+    virtual Rectangle		GetWindowExtentsRelative( Window* pRelativeWindow )
     {
         return m_aComboListBox.GetWindowExtentsRelative( pRelativeWindow );
     }
     // -----------------------------------------------------------------------------
-    virtual BOOL            IsActive() const
+    virtual BOOL        	IsActive() const
     {
         return m_aComboListBox.IsActive();
     }
     // -----------------------------------------------------------------------------
-    virtual BOOL            IsEntryVisible( USHORT nPos ) const
+    virtual BOOL			IsEntryVisible( USHORT nPos ) const
     {
         USHORT nTopEntry = m_aComboListBox.GetTopEntry();
         USHORT nLines = m_aComboListBox.GetDisplayLineCount();
         return ( nPos >= nTopEntry && nPos < ( nTopEntry + nLines ) );
     }
     // -----------------------------------------------------------------------------
-    virtual USHORT          GetDisplayLineCount() const
+    virtual USHORT			GetDisplayLineCount() const
     {
         return m_aComboListBox.GetDisplayLineCount();
     }
@@ -122,12 +122,12 @@ public:
         return m_aComboListBox.IsMultiSelectionEnabled();
     }
     // -----------------------------------------------------------------------------
-    virtual USHORT          GetTopEntry() const
+    virtual USHORT			GetTopEntry() const
     {
         return m_aComboListBox.GetTopEntry();
     }
     // -----------------------------------------------------------------------------
-    virtual BOOL            IsEntryPosSelected( USHORT nPos ) const
+    virtual BOOL			IsEntryPosSelected( USHORT nPos ) const
     {
         return m_aComboListBox.IsEntryPosSelected(nPos);
     }
@@ -142,22 +142,22 @@ public:
         m_aComboListBox.Select();
     }
     // -----------------------------------------------------------------------------
-    virtual void    SelectEntryPos( USHORT nPos, BOOL bSelect = TRUE )
+    virtual void	SelectEntryPos( USHORT nPos, BOOL bSelect = TRUE )
     {
         m_aComboListBox.SelectEntryPos(nPos,bSelect);
     }
     // -----------------------------------------------------------------------------
-    virtual USHORT          GetSelectEntryCount() const
+    virtual USHORT			GetSelectEntryCount() const
     {
         return m_aComboListBox.GetSelectEntryCount();
     }
     // -----------------------------------------------------------------------------
-    virtual void    SetNoSelection()
+    virtual void	SetNoSelection()
     {
         m_aComboListBox.SetNoSelection();
     }
     // -----------------------------------------------------------------------------
-    virtual USHORT          GetSelectEntryPos( USHORT nSelIndex = 0 ) const
+    virtual USHORT			GetSelectEntryPos( USHORT nSelIndex = 0 ) const
     {
         return m_aComboListBox.GetSelectEntryPos(nSelIndex);
     }
@@ -193,6 +193,6 @@ public:
     // -----------------------------------------------------------------------------
 };
 
-#endif  // ACCESSIBILITY_HELPER_LISTBOXHELPER_HXX
+#endif	// ACCESSIBILITY_HELPER_LISTBOXHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx b/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx
index 9dee945787ff..52ed3e1e43f4 100644
--- a/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx
+++ b/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace utl {
 class AccessibleStateSetHelper;
 }
 
-//  ----------------------------------------------------
-//  class OAccessibleMenuBaseComponent
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class OAccessibleMenuBaseComponent
+//	----------------------------------------------------
 
-typedef ::comphelper::OAccessibleExtendedComponentHelper    AccessibleExtendedComponentHelper_BASE;
+typedef ::comphelper::OAccessibleExtendedComponentHelper	AccessibleExtendedComponentHelper_BASE;
 
 typedef ::cppu::ImplHelper2<
     ::com::sun::star::accessibility::XAccessible,
@@ -65,76 +65,76 @@ class OAccessibleMenuBaseComponent : public AccessibleExtendedComponentHelper_BA
     friend class VCLXAccessibleMenu;
 
 private:
-    VCLExternalSolarLock*   m_pExternalLock;
+    VCLExternalSolarLock*	m_pExternalLock;
 
 protected:
-    typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > > AccessibleChildren;
+    typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >	> AccessibleChildren;
 
-    AccessibleChildren      m_aAccessibleChildren;
-    Menu*                   m_pMenu;
+    AccessibleChildren		m_aAccessibleChildren;
+    Menu*					m_pMenu;
 
-    sal_Bool                m_bEnabled;
-    sal_Bool                m_bFocused;
+    sal_Bool				m_bEnabled;
+    sal_Bool				m_bFocused;
     sal_Bool                m_bVisible;
-    sal_Bool                m_bSelected;
-    sal_Bool                m_bChecked;
+    sal_Bool				m_bSelected;
+    sal_Bool				m_bChecked;
 
-    Menu*                   GetMenu() { return m_pMenu; }
+    Menu*					GetMenu() { return m_pMenu; }
 
-    virtual sal_Bool        IsEnabled();
-    virtual sal_Bool        IsFocused();
+    virtual sal_Bool		IsEnabled();
+    virtual sal_Bool		IsFocused();
     virtual sal_Bool        IsVisible();
-    virtual sal_Bool        IsSelected();
-    virtual sal_Bool        IsChecked();
+    virtual sal_Bool		IsSelected();
+    virtual sal_Bool		IsChecked();
 
-    void                    SetEnabled( sal_Bool bEnabled );
-    void                    SetFocused( sal_Bool bFocused );
+    void					SetEnabled( sal_Bool bEnabled );
+    void					SetFocused( sal_Bool bFocused );
     void                    SetVisible( sal_Bool bVisible );
-    void                    SetSelected( sal_Bool bSelected );
-    void                    SetChecked( sal_Bool bChecked );
+    void					SetSelected( sal_Bool bSelected );
+    void					SetChecked( sal_Bool bChecked );
 
-    void                    UpdateEnabled( sal_Int32 i, sal_Bool bEnabled );
+    void					UpdateEnabled( sal_Int32 i, sal_Bool bEnabled );
     void                    UpdateFocused( sal_Int32 i, sal_Bool bFocused );
     void                    UpdateVisible();
-    void                    UpdateSelected( sal_Int32 i, sal_Bool bSelected );
-    void                    UpdateChecked( sal_Int32 i, sal_Bool bChecked );
-    void                    UpdateAccessibleName( sal_Int32 i );
-    void                    UpdateItemText( sal_Int32 i );
+    void					UpdateSelected( sal_Int32 i, sal_Bool bSelected );
+    void					UpdateChecked( sal_Int32 i, sal_Bool bChecked );
+    void					UpdateAccessibleName( sal_Int32 i );
+    void					UpdateItemText( sal_Int32 i );
 
-    sal_Int32               GetChildCount();
+    sal_Int32				GetChildCount();
 
     ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetChild( sal_Int32 i );
     ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetChildAt( const ::com::sun::star::awt::Point& rPoint );
 
-    void                    InsertChild( sal_Int32 i );
-    void                    RemoveChild( sal_Int32 i );
+    void					InsertChild( sal_Int32 i );
+    void					RemoveChild( sal_Int32 i );
 
-    virtual sal_Bool        IsHighlighted();
+    virtual sal_Bool		IsHighlighted();
     sal_Bool                IsChildHighlighted();
 
-    void                    SelectChild( sal_Int32 i );
-    void                    DeSelectAll();
-    sal_Bool                IsChildSelected( sal_Int32 i );
+    void					SelectChild( sal_Int32 i );
+    void					DeSelectAll();
+    sal_Bool				IsChildSelected( sal_Int32 i );
 
-    virtual void            Select();
-    virtual void            DeSelect();
+    virtual void			Select();
+    virtual void			DeSelect();
     virtual void            Click();
     virtual sal_Bool        IsPopupMenuOpen();
 
     DECL_LINK( MenuEventListener, VclSimpleEvent* );
 
-    virtual void            ProcessMenuEvent( const VclMenuEvent& rVclMenuEvent );
+    virtual void			ProcessMenuEvent( const VclMenuEvent& rVclMenuEvent );
 
-    virtual void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) = 0;
+    virtual void			FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) = 0;
 
     // XComponent
-    virtual void SAL_CALL   disposing();
+    virtual void SAL_CALL	disposing();
 
 public:
     OAccessibleMenuBaseComponent( Menu* pMenu );
     virtual ~OAccessibleMenuBaseComponent();
 
-    void                    SetStates();
+    void					SetStates();
 
     // XInterface
     DECLARE_XINTERFACE()
diff --git a/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx b/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx
index d33d3e05e0dd..2d292c98fe78 100644
--- a/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx
+++ b/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <cppuhelper/implbase1.hxx>
 
 
-//  ----------------------------------------------------
-//  class OAccessibleMenuComponent
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class OAccessibleMenuComponent
+//	----------------------------------------------------
 
-typedef ::comphelper::OAccessibleExtendedComponentHelper    AccessibleExtendedComponentHelper_BASE;
+typedef ::comphelper::OAccessibleExtendedComponentHelper	AccessibleExtendedComponentHelper_BASE;
 
 typedef ::cppu::ImplHelper1<
     ::com::sun::star::accessibility::XAccessibleSelection > OAccessibleMenuComponent_BASE;
@@ -47,13 +47,13 @@ class OAccessibleMenuComponent : public OAccessibleMenuBaseComponent,
                                  public OAccessibleMenuComponent_BASE
 {
 protected:
-    virtual sal_Bool        IsEnabled();
+    virtual sal_Bool		IsEnabled();
     virtual sal_Bool        IsVisible();
 
-    virtual void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+    virtual void			FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
 
-    // OCommonAccessibleComponent
-    virtual ::com::sun::star::awt::Rectangle SAL_CALL   implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
+    // OCommonAccessibleComponent 
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL	implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
 
 public:
     OAccessibleMenuComponent( Menu* pMenu );
@@ -77,13 +77,13 @@ public:
 
     // XAccessibleComponent
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen(	) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL grabFocus(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual sal_Int32 SAL_CALL getForeground(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual sal_Int32 SAL_CALL getBackground(  ) throw (::com::sun::star::uno::RuntimeException);
 
     // XAccessibleExtendedComponent
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont(	) throw (::com::sun::star::uno::RuntimeException);
     virtual ::rtl::OUString SAL_CALL getTitledBorderText(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::rtl::OUString SAL_CALL getToolTipText(  ) throw (::com::sun::star::uno::RuntimeException);
 
diff --git a/accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx b/accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx
index 730175e685a2..f35e7ce8cca8 100644
--- a/accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx
+++ b/accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,39 +32,39 @@
 #include <accessibility/standard/accessiblemenubasecomponent.hxx>
 
 
-//  ----------------------------------------------------
-//  class OAccessibleMenuItemComponent
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class OAccessibleMenuItemComponent
+//	----------------------------------------------------
 
 class OAccessibleMenuItemComponent : public OAccessibleMenuBaseComponent
 {
     friend class OAccessibleMenuBaseComponent;
 
 protected:
-    Menu*                   m_pParent;
-    sal_uInt16              m_nItemPos;
-    ::rtl::OUString         m_sAccessibleName;
-    ::rtl::OUString         m_sItemText;
-
-    virtual sal_Bool        IsEnabled();
+    Menu*					m_pParent;
+    sal_uInt16				m_nItemPos;
+    ::rtl::OUString			m_sAccessibleName;
+    ::rtl::OUString			m_sItemText;
+    
+    virtual sal_Bool		IsEnabled();
     virtual sal_Bool        IsVisible();
-    virtual void            Select();
-    virtual void            DeSelect();
+    virtual void			Select();
+    virtual void			DeSelect();
     virtual void            Click();
 
-    void                    SetItemPos( sal_uInt16 nItemPos );
-    void                    SetAccessibleName( const ::rtl::OUString& sAccessibleName );
-    ::rtl::OUString         GetAccessibleName();
-    void                    SetItemText( const ::rtl::OUString& sItemText );
-    ::rtl::OUString         GetItemText();
+    void					SetItemPos( sal_uInt16 nItemPos );
+    void					SetAccessibleName( const ::rtl::OUString& sAccessibleName );
+    ::rtl::OUString			GetAccessibleName();
+    void					SetItemText( const ::rtl::OUString& sItemText );
+    ::rtl::OUString			GetItemText();
 
-    virtual void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+    virtual void			FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
 
-    // OCommonAccessibleComponent
-    virtual ::com::sun::star::awt::Rectangle SAL_CALL   implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
+    // OCommonAccessibleComponent 
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL	implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
 
     // XComponent
-    virtual void SAL_CALL   disposing();
+    virtual void SAL_CALL	disposing();
 
 public:
     OAccessibleMenuItemComponent( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu );
@@ -88,7 +88,7 @@ public:
     virtual sal_Int32 SAL_CALL getBackground(  ) throw (::com::sun::star::uno::RuntimeException);
 
     // XAccessibleExtendedComponent
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont(	) throw (::com::sun::star::uno::RuntimeException);
     virtual ::rtl::OUString SAL_CALL getTitledBorderText(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::rtl::OUString SAL_CALL getToolTipText(  ) throw (::com::sun::star::uno::RuntimeException);
 };
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx
index 1aa73ab26a2b..f5c8ba01aa73 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx
index f1e74db2fb2e..2702f2a5c7e9 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include <cppuhelper/implbase2.hxx>
 
 
-//  ----------------------------------------------------
-//  class VCLXAccessibleButton
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXAccessibleButton
+//	----------------------------------------------------
 
 typedef ::cppu::ImplHelper2<
     ::com::sun::star::accessibility::XAccessibleAction,
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx
index 7545a7c93756..da1714196e2b 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <cppuhelper/implbase2.hxx>
 
 
-//  ----------------------------------------------------
-//  class VCLXAccessibleCheckBox
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXAccessibleCheckBox
+//	----------------------------------------------------
 
-typedef ::cppu::ImplHelper2<
+typedef ::cppu::ImplHelper2< 
     ::com::sun::star::accessibility::XAccessibleAction,
     ::com::sun::star::accessibility::XAccessibleValue > VCLXAccessibleCheckBox_BASE;
 
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx
index 3eba57f58bca..86fd455e07bb 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ public:
     VCLXAccessibleComboBox (VCLXWindow* pVCLXindow);
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName (void)
+    virtual ::rtl::OUString SAL_CALL getImplementationName (void) 
         throw (::com::sun::star::uno::RuntimeException);
     // Return combo box specific services.
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
-        getSupportedServiceNames (void)
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL 
+        getSupportedServiceNames (void) 
         throw (::com::sun::star::uno::RuntimeException);
 
 protected:
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx b/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx
index c90e91b179d5..8779fd4ca4c5 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,11 +50,11 @@ public:
     VCLXAccessibleDropDownComboBox (VCLXWindow* pVCLXindow);
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName (void)
+    virtual ::rtl::OUString SAL_CALL getImplementationName (void) 
         throw (::com::sun::star::uno::RuntimeException);
     // Return drop down combo box specific services.
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
-        getSupportedServiceNames (void)
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL 
+        getSupportedServiceNames (void) 
         throw (::com::sun::star::uno::RuntimeException);
 
 protected:
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx
index 67e942b7a917..de69facb7ebb 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ public:
     VCLXAccessibleDropDownListBox (VCLXWindow* pVCLXindow);
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName (void)
+    virtual ::rtl::OUString SAL_CALL getImplementationName (void) 
         throw (::com::sun::star::uno::RuntimeException);
     // Return drop down list box specific services.
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
-        getSupportedServiceNames (void)
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL 
+        getSupportedServiceNames (void) 
         throw (::com::sun::star::uno::RuntimeException);
 
 protected:
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx b/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx
index 9fc77a0c8e7c..3f4117b6d452 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <cppuhelper/implbase2.hxx>
 
 
-//  ----------------------------------------------------
-//  class VCLXAccessibleEdit
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXAccessibleEdit
+//	----------------------------------------------------
 
-typedef ::cppu::ImplHelper2<
+typedef ::cppu::ImplHelper2< 
     ::com::sun::star::accessibility::XAccessibleAction,
     ::com::sun::star::accessibility::XAccessibleEditableText > VCLXAccessibleEdit_BASE;
 
@@ -50,18 +50,18 @@ class VCLXAccessibleEdit : public VCLXAccessibleTextComponent,
     friend class VCLXAccessibleBox;
 
 private:
-    sal_Int32   m_nSelectionStart;
-    sal_Int32   m_nCaretPosition;
+    sal_Int32	m_nSelectionStart;
+    sal_Int32	m_nCaretPosition;
 
 protected:
     virtual ~VCLXAccessibleEdit();
 
-    virtual void                ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
-    virtual void                FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+    virtual void				ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+    virtual void				FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
 
     // OCommonAccessibleText
-    virtual ::rtl::OUString     implGetText();
-    virtual void                implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
+    virtual ::rtl::OUString		implGetText();
+    virtual void				implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
 
 public:
     VCLXAccessibleEdit( VCLXWindow* pVCLXindow );
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblefixedhyperlink.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblefixedhyperlink.hxx
index 9777ed472104..9f9c769d3da4 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblefixedhyperlink.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblefixedhyperlink.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 #include <accessibility/standard/vclxaccessibletextcomponent.hxx>
 
-//  ----------------------------------------------------
+//	----------------------------------------------------
 //  class VCLXAccessibleFixedHyperlink
-//  ----------------------------------------------------
+//	----------------------------------------------------
 
 class VCLXAccessibleFixedHyperlink : public VCLXAccessibleTextComponent
 {
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblefixedtext.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblefixedtext.hxx
index 2caaee09f7e6..285ca562f7bb 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblefixedtext.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblefixedtext.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 #include <accessibility/standard/vclxaccessibletextcomponent.hxx>
 
-//  ----------------------------------------------------
-//  class VCLXAccessibleFixedText
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXAccessibleFixedText
+//	----------------------------------------------------
 
 class VCLXAccessibleFixedText : public VCLXAccessibleTextComponent
 {
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
index ea08b1b33919..4f4c3de66d12 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,21 +143,21 @@ public:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
 
-    virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen(	) throw (::com::sun::star::uno::RuntimeException);
 
 protected:
-    BoxType     m_aBoxType;
+    BoxType		m_aBoxType;
     ::accessibility::IComboListBoxHelper* m_pListBoxHelper;
-    ListItems   m_aAccessibleChildren;
-    sal_Int32   m_nVisibleLineCount;
+    ListItems	m_aAccessibleChildren;
+    sal_Int32	m_nVisibleLineCount;
     /// Index in parent.  This is settable from the outside.
-    sal_Int32   m_nIndexInParent;
-    sal_Int32   m_nLastTopEntry;
-    USHORT      m_nLastSelectedPos;
-    bool        m_bDisableProcessEvent;
-    bool        m_bVisible;
-
+    sal_Int32	m_nIndexInParent;
+    sal_Int32	m_nLastTopEntry;
+    USHORT		m_nLastSelectedPos;
+    bool		m_bDisableProcessEvent;
+    bool		m_bVisible;
 
+    
 
     /// The currently selected item.
     ::com::sun::star::uno::WeakReference< ::com::sun::star::accessibility::XAccessible>
@@ -202,7 +202,7 @@ private:
         because this method of the base class returns the wrong parent.
     */
     ::com::sun::star::uno::Reference<
-        ::com::sun::star::accessibility::XAccessible >  m_xParent;
+        ::com::sun::star::accessibility::XAccessible >	m_xParent;
 
 
     /** dispose all items aand clears the container
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelistbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelistbox.hxx
index 52c07318c720..41829c0bb18e 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblelistbox.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblelistbox.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,11 +46,11 @@ public:
     VCLXAccessibleListBox (VCLXWindow* pVCLXindow);
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName (void)
+    virtual ::rtl::OUString SAL_CALL getImplementationName (void) 
         throw (::com::sun::star::uno::RuntimeException);
     // Return list box specific services.
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
-        getSupportedServiceNames (void)
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL 
+        getSupportedServiceNames (void) 
         throw (::com::sun::star::uno::RuntimeException);
 
 protected:
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx
index 436a20f55f28..906f22a0158c 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include <comphelper/uno3.hxx>
 #include <cppuhelper/implbase1.hxx>
 
-typedef ::cppu::ImplHelper1 <   ::com::sun::star::accessibility::XAccessibleSelection
-                            >   VCLXAccessibleListBoxList_BASE;
+typedef ::cppu::ImplHelper1	<	::com::sun::star::accessibility::XAccessibleSelection
+                            >	VCLXAccessibleListBoxList_BASE;
 
 
 class ListBox;
@@ -89,9 +89,9 @@ protected:
     virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent);
 
 private:
-    sal_Int32   m_nLastTopEntry;
-    USHORT      m_nLastSelectedPos;
-    bool        m_bDisableProcessEvent;
+    sal_Int32	m_nLastTopEntry;
+    USHORT		m_nLastSelectedPos;
+    bool		m_bDisableProcessEvent;
 
     void UpdateEntryRange_Impl (void);
     using VCLXAccessibleList::UpdateSelection_Impl;
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx
index 9dc4936988a8..640f002417c8 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,29 +70,29 @@ class VCLXAccessibleListItem : public ::comphelper::OBaseMutex,
                                public VCLXAccessibleListItem_BASE
 {
 private:
-    ::rtl::OUString                     m_sEntryText;
-    sal_Int32                           m_nIndexInParent;
-    sal_Bool                            m_bSelected;
-    sal_Bool                            m_bVisible;
+    ::rtl::OUString						m_sEntryText;
+    sal_Int32							m_nIndexInParent;
+    sal_Bool							m_bSelected;
+    sal_Bool							m_bVisible;
 
 protected:
     /// client id in the AccessibleEventNotifier queue
     sal_uInt32                          m_nClientId;
-    ::accessibility::IComboListBoxHelper*       m_pListBoxHelper;
+    ::accessibility::IComboListBoxHelper*		m_pListBoxHelper;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >        m_xParent;
-    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > m_xParentContext;
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >		m_xParent;
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >	m_xParentContext;
 
 private:
     /** notifies all listeners that this object has changed
-        @param  _nEventId
+        @param	_nEventId
             is the event id
-        @param  _aOldValue
+        @param	_aOldValue
             is the old value
-        @param  _aNewValue
+        @param	_aNewValue
             is the new value
     */
-    void                    NotifyAccessibleEvent(  sal_Int16 _nEventId,
+    void 					NotifyAccessibleEvent(	sal_Int16 _nEventId,
                                                     const ::com::sun::star::uno::Any& _aOldValue,
                                                     const ::com::sun::star::uno::Any& _aNewValue );
 
@@ -100,32 +100,32 @@ protected:
     virtual ~VCLXAccessibleListItem();
     /** this function is called upon disposing the component
     */
-    virtual void SAL_CALL   disposing();
+    virtual void SAL_CALL	disposing();
 
     // OCommonAccessibleText
-    virtual ::rtl::OUString                 implGetText();
-    virtual ::com::sun::star::lang::Locale  implGetLocale();
-    virtual void                            implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
+    virtual ::rtl::OUString					implGetText();
+    virtual ::com::sun::star::lang::Locale	implGetLocale();
+    virtual void							implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
 
 public:
     /** OAccessibleBase needs a valid view
-        @param  _pListBoxHelper
+        @param	_pListBoxHelper
             is the list- or combobox for which we implement an accessible object
-        @param  _nIndexInParent
+        @param	_nIndexInParent
             is the position of the entry inside the listbox
-        @param  _xParent
+        @param	_xParent
             is our parent accessible object
     */
-    VCLXAccessibleListItem( ::accessibility::IComboListBoxHelper* _pListBoxHelper,
+    VCLXAccessibleListItem(	::accessibility::IComboListBoxHelper* _pListBoxHelper,
                             sal_Int32 _nIndexInParent,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _xParent );
 
 
-    inline sal_Bool         IsSelected() const { return m_bSelected; }
-    void                    SetSelected( sal_Bool _bSelected );
-    void                    SetVisible( sal_Bool _bVisible );
-    inline bool             DecrementIndexInParent() { OSL_ENSURE(m_nIndexInParent != 0,"Invalid call!");--m_nIndexInParent; return true;}
-    inline bool             IncrementIndexInParent() { ++m_nIndexInParent; return true;}
+    inline sal_Bool			IsSelected() const { return m_bSelected; }
+    void					SetSelected( sal_Bool _bSelected );
+    void					SetVisible( sal_Bool _bVisible );
+    inline bool				DecrementIndexInParent() { OSL_ENSURE(m_nIndexInParent != 0,"Invalid call!");--m_nIndexInParent; return true;}
+    inline bool				IncrementIndexInParent() { ++m_nIndexInParent; return true;}
 
     // XInterface
     virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx
index 6103dbeb6fe7..0115d5d13696 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include <cppuhelper/implbase1.hxx>
 
 
-//  ----------------------------------------------------
-//  class VCLXAccessibleMenu
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXAccessibleMenu
+//	----------------------------------------------------
 
-typedef ::cppu::ImplHelper1 <
-    ::com::sun::star::accessibility::XAccessibleSelection > VCLXAccessibleMenu_BASE;
+typedef ::cppu::ImplHelper1	<	
+    ::com::sun::star::accessibility::XAccessibleSelection >	VCLXAccessibleMenu_BASE;
 
-class VCLXAccessibleMenu :  public VCLXAccessibleMenuItem,
+class VCLXAccessibleMenu :	public VCLXAccessibleMenuItem, 
                             public VCLXAccessibleMenu_BASE
 {
 protected:
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx
index ffe565fcd1db..469fad4e984a 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,23 +36,23 @@ class VclWindowEvent;
 class Window;
 
 
-//  ----------------------------------------------------
-//  class VCLXAccessibleMenuBar
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXAccessibleMenuBar
+//	----------------------------------------------------
 
-class VCLXAccessibleMenuBar :   public OAccessibleMenuComponent
+class VCLXAccessibleMenuBar :	public OAccessibleMenuComponent
 {
 protected:
-    Window*                 m_pWindow;
+    Window*					m_pWindow;
 
-    virtual sal_Bool        IsFocused();
+    virtual sal_Bool		IsFocused();
 
     DECL_LINK( WindowEventListener, VclSimpleEvent* );
 
-    virtual void            ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+    virtual void			ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
 
     // XComponent
-    virtual void SAL_CALL   disposing();
+    virtual void SAL_CALL	disposing();
 
 public:
     VCLXAccessibleMenuBar( Menu* pMenu );
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx
index 78e08bc4d0af..f9d3ff12cdfb 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,32 +38,32 @@
 #include <comphelper/accessibletexthelper.hxx>
 
 
-//  ----------------------------------------------------
-//  class VCLXAccessibleMenuItem
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXAccessibleMenuItem
+//	----------------------------------------------------
 
 typedef ::cppu::ImplHelper3<
     ::com::sun::star::accessibility::XAccessibleText,
     ::com::sun::star::accessibility::XAccessibleAction,
     ::com::sun::star::accessibility::XAccessibleValue > VCLXAccessibleMenuItem_BASE;
 
-class VCLXAccessibleMenuItem :  public OAccessibleMenuItemComponent,
+class VCLXAccessibleMenuItem :	public OAccessibleMenuItemComponent,
                                 public ::comphelper::OCommonAccessibleText,
                                 public VCLXAccessibleMenuItem_BASE
 {
 protected:
     virtual sal_Bool        IsFocused();
     virtual sal_Bool        IsSelected();
-    virtual sal_Bool        IsChecked();
+    virtual sal_Bool		IsChecked();
 
-    virtual sal_Bool        IsHighlighted();
+    virtual sal_Bool		IsHighlighted();
 
     virtual void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
 
     // OCommonAccessibleText
-    virtual ::rtl::OUString                     implGetText();
-    virtual ::com::sun::star::lang::Locale      implGetLocale();
-    virtual void                                implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
+    virtual ::rtl::OUString						implGetText();
+    virtual ::com::sun::star::lang::Locale		implGetLocale();
+    virtual void								implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
 
 public:
     VCLXAccessibleMenuItem( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu = 0 );
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenuseparator.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenuseparator.hxx
index 0cfb3e50545b..15fc571d6ec1 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblemenuseparator.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenuseparator.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <accessibility/standard/accessiblemenuitemcomponent.hxx>
 
 
-//  ----------------------------------------------------
-//  class VCLXAccessibleMenuSeparator
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXAccessibleMenuSeparator
+//	----------------------------------------------------
 
-class VCLXAccessibleMenuSeparator : public OAccessibleMenuItemComponent
+class VCLXAccessibleMenuSeparator :	public OAccessibleMenuItemComponent
 {
 public:
     VCLXAccessibleMenuSeparator( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu = 0 );
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblepopupmenu.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblepopupmenu.hxx
index 536241abab4e..812bcd831227 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblepopupmenu.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblepopupmenu.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,14 +32,14 @@
 #include <accessibility/standard/accessiblemenucomponent.hxx>
 
 
-//  ----------------------------------------------------
-//  class VCLXAccessiblePopupMenu
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXAccessiblePopupMenu
+//	----------------------------------------------------
 
-class VCLXAccessiblePopupMenu : public OAccessibleMenuComponent
+class VCLXAccessiblePopupMenu :	public OAccessibleMenuComponent
 {
 protected:
-    virtual sal_Bool        IsFocused();
+    virtual sal_Bool		IsFocused();
 
 public:
     VCLXAccessiblePopupMenu( Menu* pMenu );
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx b/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx
index 649b844a0159..1824bd1eb78f 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <cppuhelper/implbase2.hxx>
 
 
-//  ----------------------------------------------------
-//  class VCLXAccessibleRadioButton
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXAccessibleRadioButton
+//	----------------------------------------------------
 
-typedef ::cppu::ImplHelper2<
+typedef ::cppu::ImplHelper2< 
     ::com::sun::star::accessibility::XAccessibleAction,
     ::com::sun::star::accessibility::XAccessibleValue > VCLXAccessibleRadioButton_BASE;
 
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx
index b1d26c84f7cb..415887bf3cc1 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include <cppuhelper/implbase2.hxx>
 
 
-//  ----------------------------------------------------
-//  class VCLXAccessibleScrollBar
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXAccessibleScrollBar
+//	----------------------------------------------------
 
 typedef ::cppu::ImplHelper2<
     ::com::sun::star::accessibility::XAccessibleAction,
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbar.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbar.hxx
index 60d88e1c9f14..2e1d06dea2fd 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbar.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbar.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,30 +35,30 @@
 
 class StatusBar;
 
-//  ----------------------------------------------------
-//  class VCLXAccessibleStatusBar
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXAccessibleStatusBar
+//	----------------------------------------------------
 
-class VCLXAccessibleStatusBar : public VCLXAccessibleComponent
+class VCLXAccessibleStatusBar :	public VCLXAccessibleComponent
 {
 private:
-    typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > > AccessibleChildren;
+    typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >	> AccessibleChildren;
 
-    AccessibleChildren      m_aAccessibleChildren;
-    StatusBar*              m_pStatusBar;
+    AccessibleChildren		m_aAccessibleChildren;
+    StatusBar*				m_pStatusBar;
 
 protected:
-    void                    UpdateShowing( sal_Int32 i, sal_Bool bShowing );
-    void                    UpdateItemName( sal_Int32 i );
-    void                    UpdateItemText( sal_Int32 i );
+    void					UpdateShowing( sal_Int32 i, sal_Bool bShowing );
+    void					UpdateItemName( sal_Int32 i );
+    void					UpdateItemText( sal_Int32 i );
 
-    void                    InsertChild( sal_Int32 i );
-    void                    RemoveChild( sal_Int32 i );
+    void					InsertChild( sal_Int32 i );
+    void					RemoveChild( sal_Int32 i );
 
-    virtual void            ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+    virtual void			ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
 
     // XComponent
-    virtual void SAL_CALL   disposing();
+    virtual void SAL_CALL	disposing();
 
 public:
     VCLXAccessibleStatusBar( VCLXWindow* pVCLXWindow );
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx
index 1c7525764c40..77ce83c0546c 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,50 +43,50 @@ class AccessibleStateSetHelper;
 }
 
 
-//  ----------------------------------------------------
-//  class VCLXAccessibleStatusBarItem
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXAccessibleStatusBarItem
+//	----------------------------------------------------
 
-typedef ::comphelper::OAccessibleTextHelper AccessibleTextHelper_BASE;
+typedef ::comphelper::OAccessibleTextHelper	AccessibleTextHelper_BASE;
 
 typedef ::cppu::ImplHelper2<
     ::com::sun::star::accessibility::XAccessible,
     ::com::sun::star::lang::XServiceInfo > VCLXAccessibleStatusBarItem_BASE;
 
-class VCLXAccessibleStatusBarItem : public AccessibleTextHelper_BASE,
+class VCLXAccessibleStatusBarItem :	public AccessibleTextHelper_BASE,
                                     public VCLXAccessibleStatusBarItem_BASE
 {
     friend class VCLXAccessibleStatusBar;
 
 private:
-    VCLExternalSolarLock*   m_pExternalLock;
-    StatusBar*              m_pStatusBar;
-    sal_uInt16              m_nItemId;
-    ::rtl::OUString         m_sItemName;
-    ::rtl::OUString         m_sItemText;
-    sal_Bool                m_bShowing;
+    VCLExternalSolarLock*	m_pExternalLock;
+    StatusBar*				m_pStatusBar;
+    sal_uInt16				m_nItemId;
+    ::rtl::OUString			m_sItemName;
+    ::rtl::OUString			m_sItemText;
+    sal_Bool				m_bShowing;
 
 protected:
-    sal_Bool                IsShowing();
-    void                    SetShowing( sal_Bool bShowing );
-    void                    SetItemName( const ::rtl::OUString& sItemName );
-    ::rtl::OUString         GetItemName();
-    void                    SetItemText( const ::rtl::OUString& sItemText );
-    ::rtl::OUString         GetItemText();
-    sal_uInt16              GetItemId() const { return m_nItemId; }
+    sal_Bool				IsShowing();
+    void					SetShowing( sal_Bool bShowing );
+    void					SetItemName( const ::rtl::OUString& sItemName );
+    ::rtl::OUString			GetItemName();
+    void					SetItemText( const ::rtl::OUString& sItemText );
+    ::rtl::OUString			GetItemText();
+    sal_uInt16				GetItemId() const { return m_nItemId; }
 
-    virtual void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+    virtual void			FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
 
-    // OCommonAccessibleComponent
-    virtual ::com::sun::star::awt::Rectangle SAL_CALL   implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
+    // OCommonAccessibleComponent 
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL	implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
 
     // OCommonAccessibleText
-    virtual ::rtl::OUString                 implGetText();
-    virtual ::com::sun::star::lang::Locale  implGetLocale();
-    virtual void                            implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
+    virtual ::rtl::OUString					implGetText();
+    virtual ::com::sun::star::lang::Locale	implGetLocale();
+    virtual void							implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
 
     // XComponent
-    virtual void SAL_CALL   disposing();
+    virtual void SAL_CALL	disposing();
 
 public:
     VCLXAccessibleStatusBarItem( StatusBar* pStatusBar, sal_uInt16 nItemId );
@@ -125,7 +125,7 @@ public:
     virtual sal_Int32 SAL_CALL getBackground(  ) throw (::com::sun::star::uno::RuntimeException);
 
     // XAccessibleExtendedComponent
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont(	) throw (::com::sun::star::uno::RuntimeException);
     virtual ::rtl::OUString SAL_CALL getTitledBorderText(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::rtl::OUString SAL_CALL getToolTipText(  ) throw (::com::sun::star::uno::RuntimeException);
 
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletabcontrol.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletabcontrol.hxx
index b46eadcd9a23..5097144fddaa 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibletabcontrol.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletabcontrol.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 class TabControl;
 
 
-//  ----------------------------------------------------
-//  class VCLXAccessibleTabControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXAccessibleTabControl
+//	----------------------------------------------------
 
-typedef ::cppu::ImplHelper1 <
-    ::com::sun::star::accessibility::XAccessibleSelection > VCLXAccessibleTabControl_BASE;
+typedef ::cppu::ImplHelper1	<	
+    ::com::sun::star::accessibility::XAccessibleSelection >	VCLXAccessibleTabControl_BASE;
 
-class VCLXAccessibleTabControl :    public VCLXAccessibleComponent,
-                                    public VCLXAccessibleTabControl_BASE
+class VCLXAccessibleTabControl :	public VCLXAccessibleComponent,
+                                    public VCLXAccessibleTabControl_BASE		
 {
 private:
-    typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > > AccessibleChildren;
+    typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >	> AccessibleChildren;
 
-    AccessibleChildren      m_aAccessibleChildren;
-    TabControl*             m_pTabControl;
+    AccessibleChildren		m_aAccessibleChildren;
+    TabControl*				m_pTabControl;
 
 protected:
-    void                    UpdateFocused();
-    void                    UpdateSelected( sal_Int32 i, bool bSelected );
+    void					UpdateFocused();
+    void					UpdateSelected( sal_Int32 i, bool bSelected );
     void                    UpdatePageText( sal_Int32 i );
     void                    UpdateTabPage( sal_Int32 i, bool bNew );
 
-    void                    InsertChild( sal_Int32 i );
-    void                    RemoveChild( sal_Int32 i );
+    void					InsertChild( sal_Int32 i );
+    void					RemoveChild( sal_Int32 i );
 
-    virtual void            ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
-    virtual void            ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent );
-    virtual void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+    virtual void			ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+    virtual void			ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent );
+    virtual void			FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
 
     // XComponent
-    virtual void SAL_CALL   disposing();
+    virtual void SAL_CALL	disposing();
 
 public:
     VCLXAccessibleTabControl( VCLXWindow* pVCLXWindow );
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx
index 9380d517158c..b29ab16aa5b8 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class AccessibleStateSetHelper;
 }
 
 
-//  ----------------------------------------------------
-//  class VCLXAccessibleTabPage
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXAccessibleTabPage
+//	----------------------------------------------------
 
 typedef ::comphelper::OAccessibleTextHelper AccessibleTextHelper_BASE;
 
@@ -53,44 +53,44 @@ typedef ::cppu::ImplHelper2<
     ::com::sun::star::accessibility::XAccessible,
     ::com::sun::star::lang::XServiceInfo > VCLXAccessibleTabPage_BASE;
 
-class VCLXAccessibleTabPage :   public AccessibleTextHelper_BASE,
+class VCLXAccessibleTabPage :	public AccessibleTextHelper_BASE,
                                 public VCLXAccessibleTabPage_BASE
 {
     friend class VCLXAccessibleTabControl;
 
 private:
-    VCLExternalSolarLock*   m_pExternalLock;
-    TabControl*             m_pTabControl;
-    sal_uInt16              m_nPageId;
-    bool                    m_bFocused;
-    bool                    m_bSelected;
+    VCLExternalSolarLock*	m_pExternalLock;
+    TabControl*				m_pTabControl;
+    sal_uInt16				m_nPageId;
+    bool				    m_bFocused;
+    bool				    m_bSelected;
     ::rtl::OUString         m_sPageText;
 
 protected:
-    bool                    IsFocused();
-    bool                    IsSelected();
+    bool				    IsFocused();
+    bool				    IsSelected();
 
-    void                    SetFocused( bool bFocused );
-    void                    SetSelected( bool bSelected );
+    void					SetFocused( bool bFocused );
+    void					SetSelected( bool bSelected );
     void                    SetPageText( const ::rtl::OUString& sPageText );
     ::rtl::OUString         GetPageText();
 
-    void                    Update( bool bNew );
+    void					Update( bool bNew );
 
-    sal_uInt16              GetPageId() const { return m_nPageId; }
+    sal_uInt16				GetPageId() const { return m_nPageId; }
 
-    virtual void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+    virtual void			FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
 
-    // OCommonAccessibleComponent
-    virtual ::com::sun::star::awt::Rectangle SAL_CALL   implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
+    // OCommonAccessibleComponent 
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL	implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
 
     // OCommonAccessibleText
-    virtual ::rtl::OUString                 implGetText();
-    virtual ::com::sun::star::lang::Locale  implGetLocale();
-    virtual void                            implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
+    virtual ::rtl::OUString					implGetText();
+    virtual ::com::sun::star::lang::Locale	implGetLocale();
+    virtual void							implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
 
     // XComponent
-    virtual void SAL_CALL   disposing();
+    virtual void SAL_CALL	disposing();
 
 public:
     VCLXAccessibleTabPage( TabControl* pTabControl, sal_uInt16 nPageId );
@@ -129,7 +129,7 @@ public:
     virtual sal_Int32 SAL_CALL getBackground(  ) throw (::com::sun::star::uno::RuntimeException);
 
     // XAccessibleExtendedComponent
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont(	) throw (::com::sun::star::uno::RuntimeException);
     virtual ::rtl::OUString SAL_CALL getTitledBorderText(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::rtl::OUString SAL_CALL getToolTipText(  ) throw (::com::sun::star::uno::RuntimeException);
 
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletabpagewindow.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletabpagewindow.hxx
index cf7c2de10d3c..73586c558adb 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibletabpagewindow.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletabpagewindow.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,23 +36,23 @@ class TabControl;
 class TabPage;
 
 
-//  ----------------------------------------------------
-//  class VCLXAccessibleTabPageWindow
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXAccessibleTabPageWindow
+//	----------------------------------------------------
 
-class VCLXAccessibleTabPageWindow : public VCLXAccessibleComponent
+class VCLXAccessibleTabPageWindow :	public VCLXAccessibleComponent
 {
 private:
-    TabControl*             m_pTabControl;
+    TabControl*				m_pTabControl;
     TabPage*                m_pTabPage;
     sal_uInt16              m_nPageId;
 
 protected:
-    // OCommonAccessibleComponent
-    virtual ::com::sun::star::awt::Rectangle SAL_CALL   implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
+    // OCommonAccessibleComponent 
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL	implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
 
     // XComponent
-    virtual void SAL_CALL   disposing();
+    virtual void SAL_CALL	disposing();
 
 public:
     VCLXAccessibleTabPageWindow( VCLXWindow* pVCLXWindow );
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletextcomponent.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletextcomponent.hxx
index 187bfb107f8a..ea74885e8e37 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibletextcomponent.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletextcomponent.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,31 +33,31 @@
 #include <comphelper/accessibletexthelper.hxx>
 
 
-//  ----------------------------------------------------
-//  class VCLXAccessibleTextComponent
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXAccessibleTextComponent
+//	----------------------------------------------------
 
-typedef ::cppu::ImplHelper1 <
-    ::com::sun::star::accessibility::XAccessibleText >  VCLXAccessibleTextComponent_BASE;
+typedef ::cppu::ImplHelper1	<	
+    ::com::sun::star::accessibility::XAccessibleText >	VCLXAccessibleTextComponent_BASE;
 
 class VCLXAccessibleTextComponent : public VCLXAccessibleComponent,
                                     public ::comphelper::OCommonAccessibleText,
-                                    public VCLXAccessibleTextComponent_BASE
+                                    public VCLXAccessibleTextComponent_BASE		
 {
 protected:
-    ::rtl::OUString                         m_sText;
+    ::rtl::OUString			                m_sText;
 
-    void                                    SetText( const ::rtl::OUString& sText );
+    void					                SetText( const ::rtl::OUString& sText );
 
-    virtual void                            ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+    virtual void							ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
 
     // OCommonAccessibleText
-    virtual ::rtl::OUString                 implGetText();
-    virtual ::com::sun::star::lang::Locale  implGetLocale();
-    virtual void                            implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
+    virtual ::rtl::OUString					implGetText();
+    virtual ::com::sun::star::lang::Locale	implGetLocale();
+    virtual void							implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
 
     // XComponent
-    virtual void SAL_CALL                   disposing();
+    virtual void SAL_CALL	                disposing();
 
 public:
     VCLXAccessibleTextComponent( VCLXWindow* pVCLXWindow );
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx
index b01c63fe8e4e..244ef92c0971 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ private:
         because this method of the base class returns the wrong parent.
     */
     ::com::sun::star::uno::Reference<
-        ::com::sun::star::accessibility::XAccessible >  m_xParent;
+        ::com::sun::star::accessibility::XAccessible >	m_xParent;
 };
 
 #endif
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx
index 846dfea93967..110493415f01 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <toolkit/awt/vclxaccessiblecomponent.hxx>
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
 
-//  ----------------------------------------------------
-//  class VCLXAccessibleToolBox
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXAccessibleToolBox
+//	----------------------------------------------------
 
 typedef ::cppu::ImplHelper1 < ::com::sun::star::accessibility::XAccessibleSelection > VCLXAccessibleToolBox_BASE;
 
@@ -48,26 +48,26 @@ class VCLXAccessibleToolBox : public VCLXAccessibleComponent, public VCLXAccessi
 private:
     ToolBoxItemsMap             m_aAccessibleChildren;
 
-    VCLXAccessibleToolBoxItem*  GetItem_Impl( sal_Int32 _nPos, bool _bMustHaveFocus );
-
-    void                        UpdateFocus_Impl();
-    void                        ReleaseFocus_Impl( sal_Int32 _nPos );
-    void                        UpdateChecked_Impl( sal_Int32 _nPos );
-    void                        UpdateIndeterminate_Impl( sal_Int32 _nPos );
-    void                        UpdateItem_Impl( sal_Int32 _nPos, sal_Bool _bItemAdded );
-    void                        UpdateAllItems_Impl();
-    void                        UpdateItemName_Impl( sal_Int32 _nPos );
-    void                        UpdateItemEnabled_Impl( sal_Int32 _nPos );
-    void                        UpdateCustomPopupItemp_Impl( Window* pWindow, bool bOpen );
+    VCLXAccessibleToolBoxItem*	GetItem_Impl( sal_Int32 _nPos, bool _bMustHaveFocus );
+
+    void						UpdateFocus_Impl();
+    void						ReleaseFocus_Impl( sal_Int32 _nPos );
+    void						UpdateChecked_Impl( sal_Int32 _nPos );
+    void						UpdateIndeterminate_Impl( sal_Int32 _nPos );
+    void						UpdateItem_Impl( sal_Int32 _nPos, sal_Bool _bItemAdded );
+    void						UpdateAllItems_Impl();
+    void						UpdateItemName_Impl( sal_Int32 _nPos );
+    void						UpdateItemEnabled_Impl( sal_Int32 _nPos );
+    void						UpdateCustomPopupItemp_Impl( Window* pWindow, bool bOpen );
     void                        HandleSubToolBarEvent( const VclWindowEvent& rVclWindowEvent, bool _bShow );
     void                        ReleaseSubToolBox( ToolBox* _pSubToolBox );
 
 protected:
-    virtual ~VCLXAccessibleToolBox();
+    virtual	~VCLXAccessibleToolBox();
 
-    virtual void    FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
-    virtual void    ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
-    virtual void    ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent );
+    virtual void	FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+    virtual void	ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+    virtual void	ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent );
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetChildAccessible( const VclWindowEvent& rVclWindowEvent );
     ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetItemWindowAccessible( const VclWindowEvent& rVclWindowEvent );
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
index 26070a4e91bb..1593aecd0cb4 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,48 +57,48 @@ class VCLXAccessibleToolBoxItem : public AccessibleTextHelper_BASE,
                                   public VCLXAccessibleToolBoxItem_BASE
 {
 private:
-    ::rtl::OUString         m_sOldName;
-    ToolBox*                m_pToolBox;
-    VCLExternalSolarLock*   m_pExternalLock;
-    sal_Int32               m_nIndexInParent;
-    sal_Int16               m_nRole;
-    USHORT                  m_nItemId;
-    sal_Bool                m_bHasFocus;
-    sal_Bool                m_bIsChecked;
+    ::rtl::OUString			m_sOldName;
+    ToolBox*				m_pToolBox;
+    VCLExternalSolarLock*	m_pExternalLock;
+    sal_Int32				m_nIndexInParent;
+    sal_Int16 				m_nRole;
+    USHORT					m_nItemId;
+    sal_Bool				m_bHasFocus;
+    sal_Bool				m_bIsChecked;
     bool                    m_bIndeterminate;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >    m_xChild;
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >	m_xChild;
 
 public:
-    inline sal_Int32    getIndexInParent() const                    { return m_nIndexInParent; }
-    inline void         setIndexInParent( sal_Int32 _nNewIndex )    { m_nIndexInParent = _nNewIndex; }
+    inline sal_Int32	getIndexInParent() const					{ return m_nIndexInParent; }
+    inline void			setIndexInParent( sal_Int32 _nNewIndex )	{ m_nIndexInParent = _nNewIndex; }
 
 protected:
     virtual ~VCLXAccessibleToolBoxItem();
 
-    virtual void SAL_CALL                   disposing();
+    virtual void SAL_CALL					disposing();
 
     /// implements the calculation of the bounding rectangle
-    virtual ::com::sun::star::awt::Rectangle SAL_CALL   implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL	implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
 
     // OCommonAccessibleText
-    virtual ::rtl::OUString                             implGetText();
-    virtual ::com::sun::star::lang::Locale              implGetLocale();
-    virtual void                                        implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
+    virtual ::rtl::OUString								implGetText();
+    virtual ::com::sun::star::lang::Locale				implGetLocale();
+    virtual void										implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
 
     ::rtl::OUString GetText( bool _bAsName );
 
 public:
-    VCLXAccessibleToolBoxItem( ToolBox* _pToolBox, sal_Int32 _nPos );
+    VCLXAccessibleToolBoxItem( ToolBox*	_pToolBox, sal_Int32 _nPos );
 
-    void                SetFocus( sal_Bool _bFocus );
-    inline sal_Bool     HasFocus() const { return m_bHasFocus; }
-    void                SetChecked( sal_Bool _bCheck );
-    inline sal_Bool     IsChecked() const { return m_bIsChecked; }
+    void				SetFocus( sal_Bool _bFocus );
+    inline sal_Bool		HasFocus() const { return m_bHasFocus; }
+    void				SetChecked( sal_Bool _bCheck );
+    inline sal_Bool		IsChecked() const { return m_bIsChecked; }
     void                SetIndeterminate( bool _bIndeterminate );
     inline bool         IsIndeterminate() const { return m_bIndeterminate; }
-    inline void         ReleaseToolBox() { m_pToolBox = NULL; }
-    void                NameChanged();
+    inline void			ReleaseToolBox() { m_pToolBox = NULL; }
+    void				NameChanged();
     void                SetChild( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _xChild );
     ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
                         GetChild() const { return m_xChild; }
@@ -145,7 +145,7 @@ public:
     virtual sal_Int32 SAL_CALL getBackground(  ) throw (::com::sun::star::uno::RuntimeException);
 
     // XAccessibleExtendedComponent
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont(	) throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getFontMetrics( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& xFont ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::rtl::OUString SAL_CALL getTitledBorderText(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::rtl::OUString SAL_CALL getToolTipText(  ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/accessibility/inc/pch/precompiled_accessibility.cxx b/accessibility/inc/pch/precompiled_accessibility.cxx
index 291aae11e94a..2de9ca22a733 100644
--- a/accessibility/inc/pch/precompiled_accessibility.cxx
+++ b/accessibility/inc/pch/precompiled_accessibility.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/inc/pch/precompiled_accessibility.hxx b/accessibility/inc/pch/precompiled_accessibility.hxx
index 18f4375ba801..ed7eaf8e405b 100644
--- a/accessibility/inc/pch/precompiled_accessibility.hxx
+++ b/accessibility/inc/pch/precompiled_accessibility.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx
index f0a97b33bb24..282f29a65ae1 100644
--- a/accessibility/source/extended/AccessibleBrowseBox.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBox.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,17 +60,17 @@ public:
     /** The data table child. */
     Reference<
         ::com::sun::star::accessibility::XAccessible >          mxTable;
-    AccessibleBrowseBoxTable*                                   m_pTable;
+    AccessibleBrowseBoxTable*									m_pTable;
 
     /** The header bar for rows ("handle column"). */
     Reference<
-        ::com::sun::star::accessibility::XAccessible >          mxRowHeaderBar;
-    AccessibleBrowseBoxHeaderBar*                               m_pRowHeaderBar;
+        ::com::sun::star::accessibility::XAccessible >	        mxRowHeaderBar;
+    AccessibleBrowseBoxHeaderBar*								m_pRowHeaderBar;
 
     /** The header bar for columns (first row of the table). */
     Reference<
-        ::com::sun::star::accessibility::XAccessible >          mxColumnHeaderBar;
-    AccessibleBrowseBoxHeaderBar*                               m_pColumnHeaderBar;
+        ::com::sun::star::accessibility::XAccessible >	        mxColumnHeaderBar;
+    AccessibleBrowseBoxHeaderBar*								m_pColumnHeaderBar;
 };
 
 // Ctor/Dtor/disposing --------------------------------------------------------
@@ -109,9 +109,9 @@ void SAL_CALL AccessibleBrowseBox::disposing()
 {
     ::osl::MutexGuard aGuard( getOslMutex() );
 
-    m_pImpl->m_pTable           = NULL;
-    m_pImpl->m_pColumnHeaderBar = NULL;
-    m_pImpl->m_pRowHeaderBar    = NULL;
+    m_pImpl->m_pTable			= NULL;
+    m_pImpl->m_pColumnHeaderBar	= NULL;
+    m_pImpl->m_pRowHeaderBar	= NULL;
     m_pImpl->m_aCreator         = Reference< XAccessible >();
 
     Reference< XAccessible >  xTable = m_pImpl->mxTable;
@@ -281,7 +281,7 @@ AccessibleBrowseBox::implGetHeaderBar( AccessibleBrowseBoxObjType eObjType )
             if ( BBTYPE_COLUMNHEADERBAR == eObjType)
                 m_pImpl->m_pColumnHeaderBar = pHeaderBar;
             else
-                m_pImpl->m_pRowHeaderBar    = pHeaderBar;
+                m_pImpl->m_pRowHeaderBar	= pHeaderBar;
 
             *pxMember = pHeaderBar;
         }
@@ -325,7 +325,7 @@ void AccessibleBrowseBox::commitTableEvent(sal_Int16 _nEventId,const Any& _rNewV
     }
 }
 // -----------------------------------------------------------------------------
-void AccessibleBrowseBox::commitHeaderBarEvent( sal_Int16 _nEventId,
+void AccessibleBrowseBox::commitHeaderBarEvent(	sal_Int16 _nEventId,
                                                 const Any& _rNewValue,
                                                 const Any& _rOldValue,sal_Bool _bColumnHeaderBar)
 {
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index 24cc3ce52f2a..56f8c2de8961 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
index 2353a25007aa..94b2947ee969 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace accessibility
             aValue <<= (sal_Int32) 2;
         else
             aValue <<= (sal_Int32) 1;
-
+                    
         return aValue;
     }
 
@@ -131,7 +131,7 @@ namespace accessibility
     {
         Any aValue;
         aValue <<= (sal_Int32) 0;
-
+        
         return aValue;
     }
     // -----------------------------------------------------------------------------
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
index 77a59ef99fc1..083d8112a2f5 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
index 4f778f5b8df8..118140de7004 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
index ad5594df6987..f94c7fe69ac6 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
index 825689cf3185..ca02551012e7 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
index 6cdd7e22c4ab..2d1b61d14276 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx
index f48415e518d4..dc5f456619fa 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,17 +61,17 @@ public:
     /** The data table child. */
     Reference<
         ::com::sun::star::accessibility::XAccessible >          m_xTable;
-    AccessibleGridControlTable*             m_pTable;
+    AccessibleGridControlTable*				m_pTable;
 
     /** The header bar for rows. */
     Reference<
-        ::com::sun::star::accessibility::XAccessible >          m_xRowHeaderBar;
-    AccessibleGridControlHeader*                m_pRowHeaderBar;
+        ::com::sun::star::accessibility::XAccessible >	        m_xRowHeaderBar;
+    AccessibleGridControlHeader*				m_pRowHeaderBar;
 
     /** The header bar for columns (first row of the table). */
     Reference<
-        ::com::sun::star::accessibility::XAccessible >          m_xColumnHeaderBar;
-    AccessibleGridControlHeader*                m_pColumnHeaderBar;
+        ::com::sun::star::accessibility::XAccessible >	        m_xColumnHeaderBar;
+    AccessibleGridControlHeader*				m_pColumnHeaderBar;
 };
 
 DBG_NAME( AccessibleGridControl )
@@ -95,9 +95,9 @@ void SAL_CALL AccessibleGridControl::disposing()
 {
     ::osl::MutexGuard aGuard( getOslMutex() );
 
-    m_pImpl->m_pTable       = NULL;
-    m_pImpl->m_pColumnHeaderBar = NULL;
-    m_pImpl->m_pRowHeaderBar    = NULL;
+    m_pImpl->m_pTable		= NULL;
+    m_pImpl->m_pColumnHeaderBar	= NULL;
+    m_pImpl->m_pRowHeaderBar	= NULL;
     m_pImpl->m_aCreator         = Reference< XAccessible >();
 
     Reference< XAccessible >  xTable = m_pImpl->m_xTable;
@@ -283,7 +283,7 @@ AccessibleGridControl::implGetHeaderBar( AccessibleTableControlObjType eObjType
             if ( TCTYPE_COLUMNHEADERBAR == eObjType)
                 m_pImpl->m_pColumnHeaderBar = pHeaderBar;
             else
-                m_pImpl->m_pRowHeaderBar    = pHeaderBar;
+                m_pImpl->m_pRowHeaderBar	= pHeaderBar;
 
             *pxMember = pHeaderBar;
         }
diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx
index bf1fb2cca520..db0cf33928b5 100644
--- a/accessibility/source/extended/AccessibleGridControlBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlBase.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx
index 464d5842163d..d217d5330a78 100644
--- a/accessibility/source/extended/AccessibleGridControlHeader.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
index 830f1e876aa7..671668ddc510 100644
--- a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx
index 18124682ae60..b6ab2017e765 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ DBG_NAME( AccessibleGridControlTable )
 
 AccessibleGridControlTable::AccessibleGridControlTable(
         const Reference< XAccessible >& rxParent,
-        IAccessibleTable& rTable,
+        IAccessibleTable& rTable, 
         AccessibleTableControlObjType _eType) :
     AccessibleGridControlTableBase( rxParent, rTable, _eType )
 {
diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
index 211f2a29d03f..d2a78b2112a9 100644
--- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
index 68bba16d6a3b..4a3182a514c2 100644
--- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace accessibility
     AccessibleGridControlTableCell::AccessibleGridControlTableCell(const Reference<XAccessible >& _rxParent,
                                 IAccessibleTable& _rTable,
                                 sal_Int32 _nRowPos,
-                                sal_uInt16 _nColPos,
+                                sal_uInt16 _nColPos, 
                                 AccessibleTableControlObjType  eObjType)
         :AccessibleGridControlCell( _rxParent, _rTable, _nRowPos, _nColPos, eObjType )
     {
diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
index be2245474174..9dcb47ccaa2e 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeck.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -362,17 +362,17 @@ namespace accessibility
         {
             DBG_UNHANDLED_EXCEPTION();
         }
-
+        
         return NULL;
     }
-
+    
     //------------------------------------------------------------------------------------------------------------------
     void SAL_CALL AccessibleToolPanelDeck::grabFocus(  ) throw (RuntimeException)
     {
         MethodGuard aGuard( *m_pImpl );
         m_pImpl->m_pPanelDeck->GrabFocus();
     }
-
+    
     //------------------------------------------------------------------------------------------------------------------
     void SAL_CALL AccessibleToolPanelDeck::disposing()
     {
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
index f4864c95a860..386a60d9bdf9 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
index b621124cbe5f..5344a51fe76f 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -290,41 +290,41 @@ namespace accessibility
     {
         return 0;
     }
-
+    
     //--------------------------------------------------------------------
     Reference< XAccessible > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         (void)i;
         throw IndexOutOfBoundsException( ::rtl::OUString(), *this );
     }
-
+    
     //--------------------------------------------------------------------
     Reference< XAccessible > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleParent(  ) throw (RuntimeException)
     {
         ItemMethodGuard aGuard( *m_pImpl );
         return m_pImpl->getAccessibleParent();
     }
-
+    
     //--------------------------------------------------------------------
     sal_Int16 SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleRole(  ) throw (RuntimeException)
     {
         return AccessibleRole::PAGE_TAB;
     }
-
+    
     //--------------------------------------------------------------------
     ::rtl::OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleDescription(  ) throw (RuntimeException)
     {
         ItemMethodGuard aGuard( *m_pImpl );
         return m_pImpl->getPanelDisplayName();
     }
-
+    
     //--------------------------------------------------------------------
     ::rtl::OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleName(  ) throw (RuntimeException)
     {
         ItemMethodGuard aGuard( *m_pImpl );
         return m_pImpl->getPanelDisplayName();
     }
-
+    
     //--------------------------------------------------------------------
     Reference< XAccessibleRelationSet > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleRelationSet(  ) throw (RuntimeException)
     {
@@ -332,7 +332,7 @@ namespace accessibility
         ::utl::AccessibleRelationSetHelper* pRelationSet = new utl::AccessibleRelationSetHelper;
         return pRelationSet;
     }
-
+    
     //--------------------------------------------------------------------
     Reference< XAccessibleStateSet > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleStateSet(  ) throw (RuntimeException)
     {
@@ -373,14 +373,14 @@ namespace accessibility
         (void)i_rLocation;
         return NULL;
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL AccessibleToolPanelDeckTabBarItem::grabFocus(  ) throw (RuntimeException)
     {
         ItemMethodGuard aGuard( *m_pImpl );
         m_pImpl->getTabBar()->FocusPanelItem( m_pImpl->getItemPos() );
     }
-
+    
     //--------------------------------------------------------------------
     ::sal_Int32 SAL_CALL AccessibleToolPanelDeckTabBarItem::getForeground(  ) throw (RuntimeException)
     {
@@ -388,7 +388,7 @@ namespace accessibility
         Reference< XAccessibleComponent > xParentComponent( m_pImpl->getParentAccessibleComponent(), UNO_SET_THROW );
         return xParentComponent->getForeground();
     }
-
+    
     //--------------------------------------------------------------------
     ::sal_Int32 SAL_CALL AccessibleToolPanelDeckTabBarItem::getBackground(  ) throw (RuntimeException)
     {
@@ -396,7 +396,7 @@ namespace accessibility
         Reference< XAccessibleComponent > xParentComponent( m_pImpl->getParentAccessibleComponent(), UNO_SET_THROW );
         return xParentComponent->getBackground();
     }
-
+    
     //--------------------------------------------------------------------
     Reference< XFont > SAL_CALL AccessibleToolPanelDeckTabBarItem::getFont(  ) throw (RuntimeException)
     {
@@ -406,7 +406,7 @@ namespace accessibility
         // a different font ...
         return xParentComponent->getFont();
     }
-
+    
     //--------------------------------------------------------------------
     ::rtl::OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getTitledBorderText(  ) throw (RuntimeException)
     {
@@ -414,7 +414,7 @@ namespace accessibility
         // no support
         return ::rtl::OUString();
     }
-
+    
     //--------------------------------------------------------------------
     ::rtl::OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getToolTipText(  ) throw (RuntimeException)
     {
@@ -438,7 +438,7 @@ namespace accessibility
             aItemScreenRect.GetHeight()
         );
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL AccessibleToolPanelDeckTabBarItem::disposing()
     {
diff --git a/accessibility/source/extended/accessiblebrowseboxcell.cxx b/accessibility/source/extended/accessiblebrowseboxcell.cxx
index addbcaaa7cf8..4caad5693d96 100644
--- a/accessibility/source/extended/accessiblebrowseboxcell.cxx
+++ b/accessibility/source/extended/accessiblebrowseboxcell.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace accessibility
     }
 
 // .................................................................................
-}   // namespace accessibility
+}	// namespace accessibility
 // .................................................................................
 
 
diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
index 5312717034ee..765ee2e1fc82 100644
--- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
+++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace accessibility
     {
         if ( !rBHelper.bDisposed )
         {
-            acquire();  // to prevent duplicate dtor calls
+            acquire();	// to prevent duplicate dtor calls
             dispose();
         }
 
@@ -123,7 +123,7 @@ namespace accessibility
     }
 
     // -----------------------------------------------------------------------------
-    ::rtl::OUString SAL_CALL EditBrowseBoxTableCell::getAccessibleDescription() throw ( RuntimeException )
+    ::rtl::OUString SAL_CALL EditBrowseBoxTableCell::getAccessibleDescription()	throw ( RuntimeException )
     {
         SolarMethodGuard aGuard( *this );
         return m_xInnerContext->getAccessibleDescription();
@@ -149,7 +149,7 @@ namespace accessibility
     }
 
     // -----------------------------------------------------------------------------
-    Reference< XAccessibleRelationSet > SAL_CALL EditBrowseBoxTableCell::getAccessibleRelationSet() throw ( RuntimeException )
+    Reference< XAccessibleRelationSet > SAL_CALL EditBrowseBoxTableCell::getAccessibleRelationSet()	throw ( RuntimeException )
     {
         SolarMethodGuard aGuard( *this );
         return OAccessibleContextWrapperHelper::getAccessibleRelationSet( );
diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx
index dddb38fcbea1..875191e93328 100644
--- a/accessibility/source/extended/accessibleiconchoicectrl.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 accessibility
     AccessibleIconChoiceCtrl::AccessibleIconChoiceCtrl( SvtIconChoiceCtrl& _rIconCtrl, const Reference< XAccessible >& _xParent ) :
 
         VCLXAccessibleComponent( _rIconCtrl.GetWindowPeer() ),
-        m_xParent       ( _xParent )
+        m_xParent		( _xParent )
     {
         DBG_CTOR( AccessibleIconChoiceCtrl, NULL );
     }
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index 2a4b90affd54..6a613dede454 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include <comphelper/accessibleeventnotifier.hxx>
 
 #define ACCESSIBLE_ACTION_COUNT     1
-#define AID_EXPAND                  0
-#define AID_COLLAPSE                1
+#define AID_EXPAND					0
+#define AID_COLLAPSE				1
 
 namespace
 {
@@ -82,12 +82,12 @@ namespace accessibility
                                                                   ULONG _nPos,
                                                                   const Reference< XAccessible >& _xParent ) :
 
-        AccessibleIconChoiceCtrlEntry_BASE  ( m_aMutex ),
+        AccessibleIconChoiceCtrlEntry_BASE	( m_aMutex ),
 
-        m_pIconCtrl     ( &_rIconCtrl ),
-        m_nIndex        ( _nPos ),
+        m_pIconCtrl		( &_rIconCtrl ),
+        m_nIndex		( _nPos ),
         m_nClientId     ( 0 ),
-        m_xParent       ( _xParent )
+        m_xParent		( _xParent )
 
     {
         osl_incrementInterlockedCount( &m_refCount );
@@ -443,7 +443,7 @@ throw(RuntimeException)
         // do nothing, because no focus for each item
     }
     // -----------------------------------------------------------------------------
-    sal_Int32 AccessibleIconChoiceCtrlEntry::getForeground( ) throw (RuntimeException)
+    sal_Int32 AccessibleIconChoiceCtrlEntry::getForeground(	) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -535,7 +535,7 @@ throw(RuntimeException)
         ::osl::MutexGuard aGuard( m_aMutex );
 
         String sText = getText();
-        if  ( ( 0 > nStartIndex ) || ( sText.Len() <= nStartIndex )
+        if	( ( 0 > nStartIndex ) || ( sText.Len() <= nStartIndex )
             || ( 0 > nEndIndex ) || ( sText.Len() <= nEndIndex ) )
             throw IndexOutOfBoundsException();
 
diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx
index 95e52056e1da..129638e486d1 100644
--- a/accessibility/source/extended/accessiblelistbox.cxx
+++ b/accessibility/source/extended/accessiblelistbox.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace accessibility
     // -----------------------------------------------------------------------------
     SvTreeListBox* AccessibleListBox::getListBox() const
     {
-        return  static_cast< SvTreeListBox* >( const_cast<AccessibleListBox*>(this)->GetWindow() );
+        return	static_cast< SvTreeListBox* >( const_cast<AccessibleListBox*>(this)->GetWindow() );
     }
     // -----------------------------------------------------------------------------
     void AccessibleListBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
index 71c52a90b1db..7ab28367b3d4 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include <comphelper/accessibleeventnotifier.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 
-#define ACCESSIBLE_ACTION_COUNT 1
+#define ACCESSIBLE_ACTION_COUNT	1
 
 namespace
 {
@@ -81,11 +81,11 @@ namespace accessibility
                                                     SvLBoxEntry* _pEntry,
                                                     const Reference< XAccessible >& _xParent ) :
 
-        AccessibleListBoxEntry_BASE ( m_aMutex ),
+        AccessibleListBoxEntry_BASE	( m_aMutex ),
         ListBoxAccessibleBase( _rListBox ),
 
         m_nClientId     ( 0 ),
-        m_aParent       ( _xParent )
+        m_aParent		( _xParent )
 
     {
         DBG_CTOR( AccessibleListBoxEntry, NULL );
@@ -348,13 +348,13 @@ namespace accessibility
         {
             DBG_ASSERT( m_aEntryPath.size(), "AccessibleListBoxEntry::getAccessibleParent: invalid path!" );
             if ( 1 == m_aEntryPath.size() )
-            {   // we're a top level entry
+            {	// we're a top level entry
                 // -> our parent is the tree listbox itself
                 if ( getListBox() )
                     xParent = getListBox()->GetAccessible( );
             }
             else
-            {   // we have a entry as parent -> get it's accessible
+            {	// we have a entry as parent -> get it's accessible
 
                 // shorten our access path by one
                 ::std::deque< sal_Int32 > aParentPath( m_aEntryPath );
@@ -514,7 +514,7 @@ namespace accessibility
         // do nothing, because no focus for each item
     }
     // -----------------------------------------------------------------------------
-    sal_Int32 AccessibleListBoxEntry::getForeground(    ) throw (RuntimeException)
+    sal_Int32 AccessibleListBoxEntry::getForeground(	) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -604,7 +604,7 @@ namespace accessibility
         EnsureIsAlive();
 
         String sText = getText();
-        if  ( ( 0 > nStartIndex ) || ( sText.Len() <= nStartIndex )
+        if	( ( 0 > nStartIndex ) || ( sText.Len() <= nStartIndex )
             || ( 0 > nEndIndex ) || ( sText.Len() <= nEndIndex ) )
             throw IndexOutOfBoundsException();
 
diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx
index 88a04c5584bc..c0b043efd5b6 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace accessibility
 
     DBG_NAME( AccessibleTabBar )
 
-    //  ----------------------------------------------------
-    //  class AccessibleTabBar
-    //  ----------------------------------------------------
+    //	----------------------------------------------------
+    //	class AccessibleTabBar
+    //	----------------------------------------------------
 
     AccessibleTabBar::AccessibleTabBar( TabBar* pTabBar )
         :AccessibleTabBarBase( pTabBar )
@@ -115,13 +115,13 @@ namespace accessibility
             case VCLEVENT_WINDOW_SHOW:
             {
                 aNewValue <<= AccessibleStateType::SHOWING;
-                NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+                NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );							
             }
             break;
             case VCLEVENT_WINDOW_HIDE:
             {
                 aOldValue <<= AccessibleStateType::SHOWING;
-                NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+                NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );				
             }
             break;
             default:
@@ -160,7 +160,7 @@ namespace accessibility
     }
 
     // -----------------------------------------------------------------------------
-    // OCommonAccessibleComponent
+    // OCommonAccessibleComponent 
     // -----------------------------------------------------------------------------
 
     awt::Rectangle AccessibleTabBar::implGetBounds() throw (RuntimeException)
@@ -345,7 +345,7 @@ namespace accessibility
 
     // -----------------------------------------------------------------------------
 
-    ::rtl::OUString AccessibleTabBar::getAccessibleDescription( ) throw (RuntimeException)
+    ::rtl::OUString AccessibleTabBar::getAccessibleDescription(	) throw (RuntimeException)
     {
         OExternalLockGuard aGuard( this );
 
@@ -423,8 +423,8 @@ namespace accessibility
         {
             Reference< XAccessible > xAcc = getAccessibleChild( i );
             if ( xAcc.is() )
-            {
-                Reference< XAccessibleComponent > xComp( xAcc->getAccessibleContext(), UNO_QUERY );
+            {			
+                Reference< XAccessibleComponent > xComp( xAcc->getAccessibleContext(), UNO_QUERY );				
                 if ( xComp.is() )
                 {
                     Rectangle aRect = VCLRectangle( xComp->getBounds() );
@@ -453,7 +453,7 @@ namespace accessibility
 
     // -----------------------------------------------------------------------------
 
-    sal_Int32 AccessibleTabBar::getForeground(  ) throw (RuntimeException)
+    sal_Int32 AccessibleTabBar::getForeground(	) throw (RuntimeException)
     {
         OExternalLockGuard aGuard( this );
 
@@ -551,7 +551,7 @@ namespace accessibility
     // -----------------------------------------------------------------------------
 
 //.........................................................................
-}   // namespace accessibility
+}	// namespace accessibility
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/accessibletabbarbase.cxx b/accessibility/source/extended/accessibletabbarbase.cxx
index 4fa22f9bc602..8c485c4f3104 100644
--- a/accessibility/source/extended/accessibletabbarbase.cxx
+++ b/accessibility/source/extended/accessibletabbarbase.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx
index 898d2435b10a..e84085803967 100644
--- a/accessibility/source/extended/accessibletabbarpage.cxx
+++ b/accessibility/source/extended/accessibletabbarpage.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,8 +59,8 @@ namespace accessibility
         ,m_nPageId( nPageId )
         ,m_xParent( rxParent )
     {
-        m_bEnabled  = IsEnabled();
-        m_bShowing  = IsShowing();
+        m_bEnabled	= IsEnabled();
+        m_bShowing	= IsShowing();
         m_bSelected = IsSelected();
 
         if ( m_pTabBar )
@@ -82,7 +82,7 @@ namespace accessibility
         sal_Bool bEnabled = sal_False;
         if ( m_pTabBar )
             bEnabled = m_pTabBar->IsPageEnabled( m_nPageId );
-
+        
         return bEnabled;
     }
 
@@ -202,12 +202,12 @@ namespace accessibility
     }
 
     // -----------------------------------------------------------------------------
-    // OCommonAccessibleComponent
+    // OCommonAccessibleComponent 
     // -----------------------------------------------------------------------------
 
     awt::Rectangle AccessibleTabBarPage::implGetBounds() throw (RuntimeException)
     {
-        awt::Rectangle aBounds;
+        awt::Rectangle aBounds;	
         if ( m_pTabBar )
         {
             // get bounding rectangle relative to the AccessibleTabBar
@@ -217,7 +217,7 @@ namespace accessibility
             Reference< XAccessible > xParent = getAccessibleParent();
             if ( xParent.is() )
             {
-                Reference< XAccessibleComponent > xParentComponent( xParent->getAccessibleContext(), UNO_QUERY );
+                Reference< XAccessibleComponent > xParentComponent( xParent->getAccessibleContext(), UNO_QUERY );				
                 if ( xParentComponent.is() )
                 {
                     awt::Point aParentLoc = xParentComponent->getLocation();
@@ -352,7 +352,7 @@ namespace accessibility
 
     // -----------------------------------------------------------------------------
 
-    ::rtl::OUString AccessibleTabBarPage::getAccessibleDescription( ) throw (RuntimeException)
+    ::rtl::OUString AccessibleTabBarPage::getAccessibleDescription(	) throw (RuntimeException)
     {
         OExternalLockGuard aGuard( this );
 
@@ -369,7 +369,7 @@ namespace accessibility
     {
         OExternalLockGuard aGuard( this );
 
-        return m_sPageText;
+        return m_sPageText;		
     }
 
     // -----------------------------------------------------------------------------
@@ -433,7 +433,7 @@ namespace accessibility
 
     // -----------------------------------------------------------------------------
 
-    sal_Int32 AccessibleTabBarPage::getForeground(  ) throw (RuntimeException)
+    sal_Int32 AccessibleTabBarPage::getForeground(	) throw (RuntimeException)
     {
         OExternalLockGuard aGuard( this );
 
@@ -443,7 +443,7 @@ namespace accessibility
         {
             Reference< XAccessibleComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
             if ( xParentComp.is() )
-                nColor = xParentComp->getForeground();
+                nColor = xParentComp->getForeground();	
         }
 
         return nColor;
@@ -461,7 +461,7 @@ namespace accessibility
         {
             Reference< XAccessibleComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
             if ( xParentComp.is() )
-                nColor = xParentComp->getBackground();
+                nColor = xParentComp->getBackground();	
         }
 
         return nColor;
@@ -481,7 +481,7 @@ namespace accessibility
         {
             Reference< XAccessibleExtendedComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
             if ( xParentComp.is() )
-                xFont = xParentComp->getFont();
+                xFont = xParentComp->getFont();	
         }
 
         return xFont;
@@ -493,7 +493,7 @@ namespace accessibility
     {
         OExternalLockGuard aGuard( this );
 
-        return m_sPageText;
+        return m_sPageText;		
     }
 
     // -----------------------------------------------------------------------------
@@ -508,7 +508,7 @@ namespace accessibility
     // -----------------------------------------------------------------------------
 
 //.........................................................................
-}   // namespace accessibility
+}	// namespace accessibility
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx
index 60589218ae47..89015b0ae7a6 100644
--- a/accessibility/source/extended/accessibletabbarpagelist.cxx
+++ b/accessibility/source/extended/accessibletabbarpagelist.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -534,7 +534,7 @@ namespace accessibility
 
     // -----------------------------------------------------------------------------
 
-    ::rtl::OUString AccessibleTabBarPageList::getAccessibleDescription( ) throw (RuntimeException)
+    ::rtl::OUString AccessibleTabBarPageList::getAccessibleDescription(	) throw (RuntimeException)
     {
         OExternalLockGuard aGuard( this );
 
@@ -631,7 +631,7 @@ namespace accessibility
 
     // -----------------------------------------------------------------------------
 
-    sal_Int32 AccessibleTabBarPageList::getForeground(  ) throw (RuntimeException)
+    sal_Int32 AccessibleTabBarPageList::getForeground(	) throw (RuntimeException)
     {
         OExternalLockGuard aGuard( this );
 
@@ -802,7 +802,7 @@ namespace accessibility
     // -----------------------------------------------------------------------------
 
 //.........................................................................
-}   // namespace accessibility
+}	// namespace accessibility
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/accessibletablistbox.cxx b/accessibility/source/extended/accessibletablistbox.cxx
index 1b22c0b87565..a50001d59202 100644
--- a/accessibility/source/extended/accessibletablistbox.cxx
+++ b/accessibility/source/extended/accessibletablistbox.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx
index 3cd3c333148a..3863d8aab27e 100644
--- a/accessibility/source/extended/accessibletablistboxtable.cxx
+++ b/accessibility/source/extended/accessibletablistboxtable.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace accessibility
 
         AccessibleBrowseBoxTable( rxParent, rBox ),
 
-        m_pTabListBox   ( &rBox )
+        m_pTabListBox	( &rBox )
 
     {
         DBG_CTOR( AccessibleTabListBoxTable, NULL );
diff --git a/accessibility/source/extended/listboxaccessible.cxx b/accessibility/source/extended/listboxaccessible.cxx
index ff7fc77d4069..04a67146a49b 100644
--- a/accessibility/source/extended/listboxaccessible.cxx
+++ b/accessibility/source/extended/listboxaccessible.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace accessibility
     }
 
 //........................................................................
-}   // namespace accessibility
+}	// namespace accessibility
 //........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index f8462e144633..cd31df1cb391 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ ParagraphImpl::numberChanged(bool bIncremented)
 }
 
 void ParagraphImpl::textChanged()
-{
+{    
     ::rtl::OUString aParagraphText = implGetText();
     ::css::uno::Any aOldValue, aNewValue;
     if ( implInitTextChangedEvent( m_aParagraphText, aParagraphText, aOldValue, aNewValue ) )
@@ -595,45 +595,45 @@ ParagraphImpl::getRunAttributes(::sal_Int32 Index, const ::css::uno::Sequence< :
     return m_xDocument->retrieveRunAttributes( this, Index, RequestedAttributes );
 }
 
-// virtual
-::sal_Int32 SAL_CALL ParagraphImpl::getLineNumberAtIndex( ::sal_Int32 nIndex )
-    throw (::css::lang::IndexOutOfBoundsException,
+// virtual 
+::sal_Int32 SAL_CALL ParagraphImpl::getLineNumberAtIndex( ::sal_Int32 nIndex ) 
+    throw (::css::lang::IndexOutOfBoundsException, 
            ::css::uno::RuntimeException)
 {
     checkDisposed();
-
+    
     ::sal_Int32 nLineNo = -1;
-    ::css::i18n::Boundary aBoundary =
+    ::css::i18n::Boundary aBoundary = 
         m_xDocument->retrieveParagraphLineBoundary( this, nIndex, &nLineNo );
-
+        
     return nLineNo;
 }
-
-// virtual
-::css::accessibility::TextSegment SAL_CALL ParagraphImpl::getTextAtLineNumber( ::sal_Int32 nLineNo )
+    
+// virtual 
+::css::accessibility::TextSegment SAL_CALL ParagraphImpl::getTextAtLineNumber( ::sal_Int32 nLineNo ) 
     throw (::css::lang::IndexOutOfBoundsException,
            ::css::uno::RuntimeException)
 {
     checkDisposed();
-
-    ::css::i18n::Boundary aBoundary =
+    
+    ::css::i18n::Boundary aBoundary = 
         m_xDocument->retrieveParagraphBoundaryOfLine( this, nLineNo );
-
+    
     return ::css::accessibility::TextSegment( getTextRange(aBoundary.startPos, aBoundary.endPos),
         aBoundary.startPos, aBoundary.endPos);
 }
 
 // virtual
-::css::accessibility::TextSegment SAL_CALL ParagraphImpl::getTextAtLineWithCaret(  )
+::css::accessibility::TextSegment SAL_CALL ParagraphImpl::getTextAtLineWithCaret(  ) 
     throw (::css::uno::RuntimeException)
 {
     checkDisposed();
-
+    
     sal_Int32 nLineNo = getNumberOfLineWithCaret();
-
+    
     try {
-        return ( nLineNo >= 0 ) ?
-            getTextAtLineNumber( nLineNo ) :
+        return ( nLineNo >= 0 ) ? 
+            getTextAtLineNumber( nLineNo ) : 
             ::css::accessibility::TextSegment();
     } catch (const ::css::lang::IndexOutOfBoundsException&) {
         throw ::css::uno::RuntimeException(
@@ -644,9 +644,9 @@ ParagraphImpl::getRunAttributes(::sal_Int32 Index, const ::css::uno::Sequence< :
             static_cast< ::css::uno::XWeak * >( this ) );
     }
 }
-
+    
 // virtual
-::sal_Int32 SAL_CALL ParagraphImpl::getNumberOfLineWithCaret(  )
+::sal_Int32 SAL_CALL ParagraphImpl::getNumberOfLineWithCaret(  ) 
     throw (::css::uno::RuntimeException)
 {
     checkDisposed();
@@ -737,7 +737,7 @@ void ParagraphImpl::implGetSelection(::sal_Int32 & rStartIndex,
 }
 
 // virtual
-void ParagraphImpl::implGetParagraphBoundary( ::css::i18n::Boundary& rBoundary,
+void ParagraphImpl::implGetParagraphBoundary( ::css::i18n::Boundary& rBoundary, 
                                               ::sal_Int32 nIndex )
 {
     ::rtl::OUString sText( implGetText() );
@@ -764,7 +764,7 @@ void ParagraphImpl::implGetLineBoundary( ::css::i18n::Boundary& rBoundary,
 
     if ( implIsValidIndex( nIndex, nLength ) || nIndex == nLength )
     {
-        ::css::i18n::Boundary aBoundary =
+        ::css::i18n::Boundary aBoundary = 
             m_xDocument->retrieveParagraphLineBoundary( this, nIndex );
         rBoundary.startPos = aBoundary.startPos;
         rBoundary.endPos = aBoundary.endPos;
@@ -916,8 +916,8 @@ void Document::retrieveParagraphSelection(ParagraphImpl const * pParagraph,
 
     if ( nNumber >= aMinPaM.GetPara() && nNumber <= aMaxPaM.GetPara() )
     {
-        *pBegin = nNumber > aMinPaM.GetPara()
-            ? 0
+        *pBegin = nNumber > aMinPaM.GetPara() 
+            ? 0 
             : static_cast< ::sal_Int32 >( aMinPaM.GetIndex() );
             // XXX numeric overflow
         *pEnd = nNumber < aMaxPaM.GetPara()
@@ -926,7 +926,7 @@ void Document::retrieveParagraphSelection(ParagraphImpl const * pParagraph,
             // XXX  numeric overflow (3x)
 
         if ( aStartPaM > aEndPaM )
-            ::std::swap( *pBegin, *pEnd );
+            ::std::swap( *pBegin, *pEnd );   
     }
     else
     {
@@ -943,7 +943,7 @@ void Document::retrieveParagraphSelection(ParagraphImpl const * pParagraph,
     Paragraphs::size_type nNumber = pParagraph->getNumber();
     TextPaM aEndPaM( rSelection.GetEnd() );
 
-    return aEndPaM.GetPara() == nNumber
+    return aEndPaM.GetPara() == nNumber 
         ? static_cast< ::sal_Int32 >(aEndPaM.GetIndex()) : -1;
 }
 
@@ -1314,7 +1314,7 @@ Document::retrieveParagraphLineBoundary( ParagraphImpl const * pParagraph,
         ::USHORT nLineCount = m_rEngine.GetLineCount( nNumber );
         for ( ::USHORT nLine = 0; nLine < nLineCount; ++nLine )
         {
-            ::sal_Int32 nLineLength = static_cast< ::sal_Int32 >(
+            ::sal_Int32 nLineLength = static_cast< ::sal_Int32 >( 
                 m_rEngine.GetLineLen( nNumber, nLine ) );
             nLineStart = nLineEnd;
             nLineEnd += nLineLength;
@@ -1355,12 +1355,12 @@ Document::retrieveParagraphBoundaryOfLine( ParagraphImpl const * pParagraph,
         ::sal_Int32 nLineEnd = 0;
         for ( ::USHORT nLine = 0; nLine <= nLineNo; ++nLine )
         {
-            ::sal_Int32 nLineLength = static_cast< ::sal_Int32 >(
+            ::sal_Int32 nLineLength = static_cast< ::sal_Int32 >( 
                 m_rEngine.GetLineLen( nNumber, nLine ) );
             nLineStart = nLineEnd;
             nLineEnd += nLineLength;
         }
-
+        
         aBoundary.startPos = nLineStart;
         aBoundary.endPos = nLineEnd;
     }
@@ -1376,7 +1376,7 @@ sal_Int32 Document::retrieveParagraphLineWithCursor( ParagraphImpl const * pPara
     Paragraphs::size_type nNumber = pParagraph->getNumber();
     TextPaM aEndPaM( rSelection.GetEnd() );
 
-    return aEndPaM.GetPara() == nNumber
+    return aEndPaM.GetPara() == nNumber 
         ? m_rView.GetLineNumberOfCursorInSelection() : -1;
 }
 
@@ -1417,7 +1417,7 @@ void Document::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
         case VCLEVENT_WINDOW_GETFOCUS:
         case VCLEVENT_WINDOW_LOSEFOCUS:
         {
-            // #107179# if our parent is a compound control (e.g. MultiLineEdit),
+            // #107179# if our parent is a compound control (e.g. MultiLineEdit), 
             // suppress the window focus events here
             if ( !m_bCompoundControlChild )
                 VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent );
diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx
index 3707209228ed..0c0bf172e599 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_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
@@ -392,7 +392,7 @@ inline bool hasFloatingChild(Window *pWindow)
             {
                 xContext = new FloatingWindowAccessible( _pXWindow );
             }
-            else if ( nType == WINDOW_BORDERWINDOW && hasFloatingChild( pWindow ) )
+            else if ( nType == WINDOW_BORDERWINDOW && hasFloatingChild( pWindow ) ) 
             {
                 PopupMenuFloatingWindow* pChild = dynamic_cast<PopupMenuFloatingWindow*>(
                     pWindow->GetAccessibleChildWindow(0));
@@ -405,7 +405,7 @@ inline bool hasFloatingChild(Window *pWindow)
                 }
                 else
                     xContext = new FloatingWindowAccessible( _pXWindow );
-            }
+            }            
             else if ( ( nType == WINDOW_HELPTEXTWINDOW ) || ( nType == WINDOW_FIXEDLINE ) )
             {
                xContext = (accessibility::XAccessibleContext*) new VCLXAccessibleFixedText( _pXWindow );
diff --git a/accessibility/source/helper/accessiblestrings.src b/accessibility/source/helper/accessiblestrings.src
index ee7f77f9b502..34f3b381b5f0 100644
--- a/accessibility/source/helper/accessiblestrings.src
+++ b/accessibility/source/helper/accessiblestrings.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/source/helper/accresmgr.cxx b/accessibility/source/helper/accresmgr.cxx
index c2e5516d6a88..a448c4000c82 100644
--- a/accessibility/source/helper/accresmgr.cxx
+++ b/accessibility/source/helper/accresmgr.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/source/helper/characterattributeshelper.cxx b/accessibility/source/helper/characterattributeshelper.cxx
index fe06e78dc7a3..7a08bce2738e 100644
--- a/accessibility/source/helper/characterattributeshelper.cxx
+++ b/accessibility/source/helper/characterattributeshelper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/source/inc/floatingwindowaccessible.hxx b/accessibility/source/inc/floatingwindowaccessible.hxx
index cc8a91f637d5..d967238fb8ec 100644
--- a/accessibility/source/inc/floatingwindowaccessible.hxx
+++ b/accessibility/source/inc/floatingwindowaccessible.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class FloatingWindowAccessible : public VCLXAccessibleComponent
 public:
     FloatingWindowAccessible( VCLXWindow* pWindow );
     virtual ~FloatingWindowAccessible();
-
+    
     virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet );
 };
 
diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx b/accessibility/source/standard/accessiblemenubasecomponent.cxx
index ab02caaa322c..48ff87f7509d 100644
--- a/accessibility/source/standard/accessiblemenubasecomponent.cxx
+++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -394,8 +394,8 @@ Reference< XAccessible > OAccessibleMenuBaseComponent::GetChildAt( const awt::Po
     {
         Reference< XAccessible > xAcc = getAccessibleChild( i );
         if ( xAcc.is() )
-        {
-            Reference< XAccessibleComponent > xComp( xAcc->getAccessibleContext(), UNO_QUERY );
+        {			
+            Reference< XAccessibleComponent > xComp( xAcc->getAccessibleContext(), UNO_QUERY );				
             if ( xComp.is() )
             {
                 Rectangle aRect = VCLRectangle( xComp->getBounds() );
diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx b/accessibility/source/standard/accessiblemenucomponent.cxx
index 973fae780d3f..1773779b3ffd 100644
--- a/accessibility/source/standard/accessiblemenucomponent.cxx
+++ b/accessibility/source/standard/accessiblemenucomponent.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 OAccessibleMenuComponent::FillAccessibleStateSet( utl::AccessibleStateSetHe
 }
 
 // -----------------------------------------------------------------------------
-// OCommonAccessibleComponent
+// OCommonAccessibleComponent 
 // -----------------------------------------------------------------------------
 
 awt::Rectangle OAccessibleMenuComponent::implGetBounds() throw (RuntimeException)
@@ -133,7 +133,7 @@ awt::Rectangle OAccessibleMenuComponent::implGetBounds() throw (RuntimeException
             Reference< XAccessible > xParent = getAccessibleParent();
             if ( xParent.is() )
             {
-                Reference< XAccessibleComponent > xParentComponent( xParent->getAccessibleContext(), UNO_QUERY );
+                Reference< XAccessibleComponent > xParentComponent( xParent->getAccessibleContext(), UNO_QUERY );				
                 if ( xParentComponent.is() )
                 {
                     awt::Point aParentScreenLoc = xParentComponent->getLocationOnScreen();
@@ -169,7 +169,7 @@ sal_Int32 OAccessibleMenuComponent::getAccessibleChildCount() throw (RuntimeExce
 {
     OExternalLockGuard aGuard( this );
 
-    return GetChildCount();
+    return GetChildCount(); 
 }
 
 // -----------------------------------------------------------------------------
@@ -217,7 +217,7 @@ sal_Int16 OAccessibleMenuComponent::getAccessibleRole(  ) throw (RuntimeExceptio
 
 // -----------------------------------------------------------------------------
 
-::rtl::OUString OAccessibleMenuComponent::getAccessibleDescription( ) throw (RuntimeException)
+::rtl::OUString OAccessibleMenuComponent::getAccessibleDescription(	) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
 
@@ -286,7 +286,7 @@ awt::Point OAccessibleMenuComponent::getLocationOnScreen(  ) throw (RuntimeExcep
         if ( pWindow )
         {
             Rectangle aRect = pWindow->GetWindowExtentsRelative( NULL );
-            aPos = AWTPoint( aRect.TopLeft() );
+            aPos = AWTPoint( aRect.TopLeft() );			
         }
     }
 
@@ -309,7 +309,7 @@ void OAccessibleMenuComponent::grabFocus(  ) throw (RuntimeException)
 
 // -----------------------------------------------------------------------------
 
-sal_Int32 OAccessibleMenuComponent::getForeground(  ) throw (RuntimeException)
+sal_Int32 OAccessibleMenuComponent::getForeground(	) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
 
@@ -392,13 +392,13 @@ void OAccessibleMenuComponent::selectAccessibleChild( sal_Int32 nChildIndex ) th
 // -----------------------------------------------------------------------------
 
 sal_Bool OAccessibleMenuComponent::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
-{
+{	
     OExternalLockGuard aGuard( this );
 
     if ( nChildIndex < 0 || nChildIndex >= GetChildCount() )
         throw IndexOutOfBoundsException();
 
-    return IsChildSelected( nChildIndex );
+    return IsChildSelected( nChildIndex );	
 }
 
 // -----------------------------------------------------------------------------
@@ -426,7 +426,7 @@ sal_Int32 OAccessibleMenuComponent::getSelectedAccessibleChildCount(  ) throw (R
     sal_Int32 nRet = 0;
 
     for ( sal_Int32 i = 0, nCount = GetChildCount(); i < nCount; i++ )
-    {
+    {		
         if ( IsChildSelected( i ) )
             ++nRet;
     }
@@ -446,7 +446,7 @@ Reference< XAccessible > OAccessibleMenuComponent::getSelectedAccessibleChild( s
     Reference< XAccessible > xChild;
 
     for ( sal_Int32 i = 0, j = 0, nCount = GetChildCount(); i < nCount; i++ )
-    {
+    {		
         if ( IsChildSelected( i ) && ( j++ == nSelectedChildIndex ) )
         {
             xChild = GetChild( i );
diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
index 0b34e2efa800..afd9436708c8 100644
--- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx
+++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,9 +111,9 @@ sal_Bool OAccessibleMenuItemComponent::IsVisible()
 void OAccessibleMenuItemComponent::Select()
 {
     // open the parent menu
-    Reference< XAccessible > xParent( getAccessibleParent() );
+    Reference< XAccessible > xParent( getAccessibleParent() );	
     if ( xParent.is() )
-    {
+    {		
         OAccessibleMenuBaseComponent* pComp = static_cast< OAccessibleMenuBaseComponent* >( xParent.get() );
         if ( pComp && pComp->getAccessibleRole() == AccessibleRole::MENU && !pComp->IsPopupMenuOpen() )
             pComp->Click();
@@ -137,9 +137,9 @@ void OAccessibleMenuItemComponent::DeSelect()
 void OAccessibleMenuItemComponent::Click()
 {
     // open the parent menu
-    Reference< XAccessible > xParent( getAccessibleParent() );
+    Reference< XAccessible > xParent( getAccessibleParent() );	
     if ( xParent.is() )
-    {
+    {		
         OAccessibleMenuBaseComponent* pComp = static_cast< OAccessibleMenuBaseComponent* >( xParent.get() );
         if ( pComp && pComp->getAccessibleRole() == AccessibleRole::MENU && !pComp->IsPopupMenuOpen() )
             pComp->Click();
@@ -147,7 +147,7 @@ void OAccessibleMenuItemComponent::Click()
 
     // click the menu item
     if ( m_pParent )
-    {
+    {		
         Window* pWindow = m_pParent->GetWindow();
         if ( pWindow )
         {
@@ -183,8 +183,8 @@ void OAccessibleMenuItemComponent::Click()
 // -----------------------------------------------------------------------------
 
 void OAccessibleMenuItemComponent::SetItemPos( sal_uInt16 nItemPos )
-{
-    m_nItemPos = nItemPos;
+{ 
+    m_nItemPos = nItemPos; 
 }
 
 // -----------------------------------------------------------------------------
@@ -261,7 +261,7 @@ void OAccessibleMenuItemComponent::FillAccessibleStateSet( utl::AccessibleStateS
 }
 
 // -----------------------------------------------------------------------------
-// OCommonAccessibleComponent
+// OCommonAccessibleComponent 
 // -----------------------------------------------------------------------------
 
 awt::Rectangle OAccessibleMenuItemComponent::implGetBounds() throw (RuntimeException)
@@ -284,7 +284,7 @@ awt::Rectangle OAccessibleMenuItemComponent::implGetBounds() throw (RuntimeExcep
             Reference< XAccessible > xParent = getAccessibleParent();
             if ( xParent.is() )
             {
-                Reference< XAccessibleComponent > xParentComponent( xParent->getAccessibleContext(), UNO_QUERY );
+                Reference< XAccessibleComponent > xParentComponent( xParent->getAccessibleContext(), UNO_QUERY );				
                 if ( xParentComponent.is() )
                 {
                     awt::Point aParentScreenLoc = xParentComponent->getLocationOnScreen();
@@ -365,13 +365,13 @@ sal_Int16 OAccessibleMenuItemComponent::getAccessibleRole(  ) throw (RuntimeExce
 
 // -----------------------------------------------------------------------------
 
-::rtl::OUString OAccessibleMenuItemComponent::getAccessibleDescription( ) throw (RuntimeException)
+::rtl::OUString OAccessibleMenuItemComponent::getAccessibleDescription(	) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
 
     ::rtl::OUString sDescription;
     if ( m_pParent )
-        sDescription = m_pParent->GetHelpText( m_pParent->GetItemId( m_nItemPos ) );
+        sDescription = m_pParent->GetHelpText( m_pParent->GetItemId( m_nItemPos ) ); 
 
     return sDescription;
 }
@@ -425,7 +425,7 @@ void OAccessibleMenuItemComponent::grabFocus(  ) throw (RuntimeException)
 
 // -----------------------------------------------------------------------------
 
-sal_Int32 OAccessibleMenuItemComponent::getForeground(  ) throw (RuntimeException)
+sal_Int32 OAccessibleMenuItemComponent::getForeground(	) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
 
@@ -435,7 +435,7 @@ sal_Int32 OAccessibleMenuItemComponent::getForeground(  ) throw (RuntimeExceptio
     {
         Reference< XAccessibleComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
         if ( xParentComp.is() )
-            nColor = xParentComp->getForeground();
+            nColor = xParentComp->getForeground();	
     }
 
     return nColor;
@@ -453,7 +453,7 @@ sal_Int32 OAccessibleMenuItemComponent::getBackground(  ) throw (RuntimeExceptio
     {
         Reference< XAccessibleComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
         if ( xParentComp.is() )
-            nColor = xParentComp->getBackground();
+            nColor = xParentComp->getBackground();	
     }
 
     return nColor;
@@ -473,7 +473,7 @@ Reference< awt::XFont > OAccessibleMenuItemComponent::getFont(  ) throw (Runtime
     {
         Reference< XAccessibleExtendedComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
         if ( xParentComp.is() )
-            xFont = xParentComp->getFont();
+            xFont = xParentComp->getFont();	
     }
 
     return xFont;
@@ -496,7 +496,7 @@ Reference< awt::XFont > OAccessibleMenuItemComponent::getFont(  ) throw (Runtime
 
     ::rtl::OUString sRet;
     if ( m_pParent )
-        sRet = m_pParent->GetTipHelpText( m_pParent->GetItemId( m_nItemPos ) );
+        sRet = m_pParent->GetTipHelpText( m_pParent->GetItemId( m_nItemPos ) ); 
 
     return sRet;
 }
diff --git a/accessibility/source/standard/floatingwindowaccessible.cxx b/accessibility/source/standard/floatingwindowaccessible.cxx
index af8a89122e32..6bb332fe73d6 100644
--- a/accessibility/source/standard/floatingwindowaccessible.cxx
+++ b/accessibility/source/standard/floatingwindowaccessible.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx
index c8177943a3f2..a630cb0a4a15 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx
index de220dea6f08..7f32f17a1e18 100644
--- a/accessibility/source/standard/vclxaccessiblebutton.cxx
+++ b/accessibility/source/standard/vclxaccessiblebutton.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -226,7 +226,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleButton::getAccessibleActionKeyB
 
     if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
         throw IndexOutOfBoundsException();
-
+    
     OAccessibleKeyBindingHelper* pKeyBindingHelper = new OAccessibleKeyBindingHelper();
     Reference< XAccessibleKeyBinding > xKeyBinding = pKeyBindingHelper;
 
@@ -296,7 +296,7 @@ sal_Bool VCLXAccessibleButton::setCurrentValue( const Any& aNumber ) throw (Runt
         pButton->SetPressed( (BOOL) nValue );
         bReturn = sal_True;
     }
-
+        
     return bReturn;
 }
 
@@ -308,7 +308,7 @@ Any VCLXAccessibleButton::getMaximumValue(  ) throw (RuntimeException)
 
     Any aValue;
     aValue <<= (sal_Int32) 1;
-
+    
     return aValue;
 }
 
@@ -320,7 +320,7 @@ Any VCLXAccessibleButton::getMinimumValue(  ) throw (RuntimeException)
 
     Any aValue;
     aValue <<= (sal_Int32) 0;
-
+    
     return aValue;
 }
 
diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
index 98698adb7285..7cfc759e5138 100644
--- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx
+++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ sal_Int32 VCLXAccessibleCheckBox::getAccessibleActionCount( ) throw (RuntimeExce
 {
     OExternalLockGuard aGuard( this );
 
-    return 1;
+    return 1;	
 }
 
 // -----------------------------------------------------------------------------
@@ -254,7 +254,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleCheckBox::getAccessibleActionKe
 
     if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
         throw IndexOutOfBoundsException();
-
+    
     OAccessibleKeyBindingHelper* pKeyBindingHelper = new OAccessibleKeyBindingHelper();
     Reference< XAccessibleKeyBinding > xKeyBinding = pKeyBindingHelper;
 
@@ -298,7 +298,7 @@ Any VCLXAccessibleCheckBox::getCurrentValue(  ) throw (RuntimeException)
     VCLXCheckBox* pVCLXCheckBox = static_cast< VCLXCheckBox* >( GetVCLXWindow() );
     if ( pVCLXCheckBox )
         aValue <<= (sal_Int32) pVCLXCheckBox->getState();
-
+    
     return aValue;
 }
 
@@ -312,7 +312,7 @@ sal_Bool VCLXAccessibleCheckBox::setCurrentValue( const Any& aNumber ) throw (Ru
 
     VCLXCheckBox* pVCLXCheckBox = static_cast< VCLXCheckBox* >( GetVCLXWindow() );
     if ( pVCLXCheckBox )
-    {
+    {	
         sal_Int32 nValue = 0, nValueMin = 0, nValueMax = 0;
         OSL_VERIFY( aNumber >>= nValue );
         OSL_VERIFY( getMinimumValue() >>= nValueMin );
@@ -326,7 +326,7 @@ sal_Bool VCLXAccessibleCheckBox::setCurrentValue( const Any& aNumber ) throw (Ru
         pVCLXCheckBox->setState( (sal_Int16) nValue );
         bReturn = sal_True;
     }
-
+    
     return bReturn;
 }
 
@@ -343,7 +343,7 @@ Any VCLXAccessibleCheckBox::getMaximumValue(  ) throw (RuntimeException)
         aValue <<= (sal_Int32) 2;
     else
         aValue <<= (sal_Int32) 1;
-
+                
     return aValue;
 }
 
@@ -355,7 +355,7 @@ Any VCLXAccessibleCheckBox::getMinimumValue(  ) throw (RuntimeException)
 
     Any aValue;
     aValue <<= (sal_Int32) 0;
-
+    
     return aValue;
 }
 
diff --git a/accessibility/source/standard/vclxaccessiblecombobox.cxx b/accessibility/source/standard/vclxaccessiblecombobox.cxx
index 3da67a703e22..8ebba8c56af2 100644
--- a/accessibility/source/standard/vclxaccessiblecombobox.cxx
+++ b/accessibility/source/standard/vclxaccessiblecombobox.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ VCLXAccessibleComboBox::~VCLXAccessibleComboBox (void)
 bool VCLXAccessibleComboBox::IsValid (void) const
 {
     return static_cast<ComboBox*>(GetWindow()) != NULL;
-
+ 
 }
 
 
@@ -76,7 +76,7 @@ void VCLXAccessibleComboBox::ProcessWindowEvent (const VclWindowEvent& rVclWindo
 
 //=====  XServiceInfo  ========================================================
 
-::rtl::OUString VCLXAccessibleComboBox::getImplementationName (void)
+::rtl::OUString VCLXAccessibleComboBox::getImplementationName (void) 
     throw (RuntimeException)
 {
     return ::rtl::OUString::createFromAscii ("com.sun.star.comp.toolkit.AccessibleComboBox");
@@ -85,7 +85,7 @@ void VCLXAccessibleComboBox::ProcessWindowEvent (const VclWindowEvent& rVclWindo
 
 
 
-Sequence< ::rtl::OUString > VCLXAccessibleComboBox::getSupportedServiceNames (void)
+Sequence< ::rtl::OUString > VCLXAccessibleComboBox::getSupportedServiceNames (void) 
     throw (RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames();
diff --git a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
index 370bf2fe70ea..302a7148fce7 100644
--- a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
+++ b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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::uno;
 using namespace ::com::sun::star::accessibility;
 
 
-VCLXAccessibleDropDownComboBox::VCLXAccessibleDropDownComboBox (VCLXWindow* pVCLWindow)
+VCLXAccessibleDropDownComboBox::VCLXAccessibleDropDownComboBox (VCLXWindow* pVCLWindow) 
     : VCLXAccessibleBox (pVCLWindow, VCLXAccessibleBox::COMBOBOX, true)
 {
 }
@@ -74,7 +74,7 @@ VCLXAccessibleDropDownComboBox::~VCLXAccessibleDropDownComboBox (void)
 bool VCLXAccessibleDropDownComboBox::IsValid (void) const
 {
     return static_cast<ComboBox*>(GetWindow()) != NULL;
-
+ 
 }
 
 
@@ -87,7 +87,7 @@ void VCLXAccessibleDropDownComboBox::ProcessWindowEvent (const VclWindowEvent& r
         case VCLEVENT_DROPDOWN_OPEN:
         case VCLEVENT_DROPDOWN_CLOSE:
         {
-            /*          // child count changed
+            /*			// child count changed
             Any aOldValue, aNewValue;
             // get the listbox child
             Reference< XAccessible > xChild;
@@ -122,7 +122,7 @@ void VCLXAccessibleDropDownComboBox::ProcessWindowEvent (const VclWindowEvent& r
 
 //=====  XServiceInfo  ========================================================
 
-::rtl::OUString VCLXAccessibleDropDownComboBox::getImplementationName()
+::rtl::OUString VCLXAccessibleDropDownComboBox::getImplementationName() 
     throw (RuntimeException)
 {
     return ::rtl::OUString::createFromAscii("com.sun.star.comp.toolkit.AccessibleDropDownComboBox");
@@ -131,7 +131,7 @@ void VCLXAccessibleDropDownComboBox::ProcessWindowEvent (const VclWindowEvent& r
 
 
 
-Sequence< ::rtl::OUString > VCLXAccessibleDropDownComboBox::getSupportedServiceNames (void)
+Sequence< ::rtl::OUString > VCLXAccessibleDropDownComboBox::getSupportedServiceNames (void) 
     throw (RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames();
diff --git a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
index 340567eb967a..1777ef83484f 100644
--- a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
+++ b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::accessibility;
 
 
-VCLXAccessibleDropDownListBox::VCLXAccessibleDropDownListBox (VCLXWindow* pVCLWindow)
+VCLXAccessibleDropDownListBox::VCLXAccessibleDropDownListBox (VCLXWindow* pVCLWindow) 
     : VCLXAccessibleBox (pVCLWindow,  VCLXAccessibleBox::LISTBOX, true)
 {
 }
@@ -74,7 +74,7 @@ VCLXAccessibleDropDownListBox::~VCLXAccessibleDropDownListBox()
 bool VCLXAccessibleDropDownListBox::IsValid (void) const
 {
     return static_cast<ListBox*>(GetWindow()) != NULL;
-
+ 
 }
 
 
@@ -90,7 +90,7 @@ void VCLXAccessibleDropDownListBox::ProcessWindowEvent( const VclWindowEvent& rV
 
 //=====  XServiceInfo  ========================================================
 
-::rtl::OUString VCLXAccessibleDropDownListBox::getImplementationName()
+::rtl::OUString VCLXAccessibleDropDownListBox::getImplementationName() 
     throw (RuntimeException)
 {
     return ::rtl::OUString::createFromAscii("com.sun.star.comp.toolkit.AccessibleDropDownListBox");
@@ -99,7 +99,7 @@ void VCLXAccessibleDropDownListBox::ProcessWindowEvent( const VclWindowEvent& rV
 
 
 
-Sequence< ::rtl::OUString > VCLXAccessibleDropDownListBox::getSupportedServiceNames (void)
+Sequence< ::rtl::OUString > VCLXAccessibleDropDownListBox::getSupportedServiceNames (void) 
     throw (RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames();
diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx
index e522ce081435..e20ad1e1c30a 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,10 +93,10 @@ void VCLXAccessibleEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve
         {
             sal_Int32 nOldCaretPosition = m_nCaretPosition;
             sal_Int32 nOldSelectionStart = m_nSelectionStart;
-
+            
             m_nCaretPosition = getCaretPosition();
             m_nSelectionStart = getSelectionStart();
-
+            
             Window* pWindow = GetWindow();
             if ( pWindow && pWindow->HasChildPathFocus() )
             {
@@ -107,7 +107,7 @@ void VCLXAccessibleEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve
                     aNewValue <<= (sal_Int32) m_nCaretPosition;
                     NotifyAccessibleEvent( AccessibleEventId::CARET_CHANGED, aOldValue, aNewValue );
                 }
-
+                
                 // #i104470# VCL only has SELECTION_CHANGED, but UAA distinguishes between SELECTION_CHANGED and CARET_CHANGED
                 sal_Bool bHasSelection = ( m_nSelectionStart != m_nCaretPosition );
                 sal_Bool bHadSelection = ( nOldSelectionStart != nOldCaretPosition );
@@ -115,7 +115,7 @@ void VCLXAccessibleEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve
                 {
                     NotifyAccessibleEvent( AccessibleEventId::TEXT_SELECTION_CHANGED, Any(), Any() );
                 }
-
+            
             }
         }
         break;
@@ -603,7 +603,7 @@ sal_Bool VCLXAccessibleEdit::setAttributes( sal_Int32 nStartIndex, sal_Int32 nEn
     if ( !implIsValidRange( nStartIndex, nEndIndex, implGetText().getLength() ) )
         throw IndexOutOfBoundsException();
 
-    return sal_False;   // attributes cannot be set for an edit
+    return sal_False;	// attributes cannot be set for an edit
 }
 
 // -----------------------------------------------------------------------------
diff --git a/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx b/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx
index d23d92065807..e67d45d265c2 100644
--- a/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx
+++ b/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/source/standard/vclxaccessiblefixedtext.cxx b/accessibility/source/standard/vclxaccessiblefixedtext.cxx
index 6077efa65e87..ba7174b81d77 100644
--- a/accessibility/source/standard/vclxaccessiblefixedtext.cxx
+++ b/accessibility/source/standard/vclxaccessiblefixedtext.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx
index accce8440c7e..c7e3d73faa2c 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,14 +62,14 @@ namespace
 
 VCLXAccessibleList::VCLXAccessibleList (VCLXWindow* pVCLWindow, BoxType aBoxType,
                                         const Reference< XAccessible >& _xParent)
-    : VCLXAccessibleComponent   (pVCLWindow),
-      m_aBoxType                (aBoxType),
-      m_nVisibleLineCount       (0),
-      m_nIndexInParent          (DEFAULT_INDEX_IN_PARENT),
-      m_nLastTopEntry           ( 0 ),
-      m_nLastSelectedPos        ( LISTBOX_ENTRY_NOTFOUND ),
-      m_bDisableProcessEvent    ( false ),
-      m_bVisible                ( true ),
+    : VCLXAccessibleComponent	(pVCLWindow),
+      m_aBoxType				(aBoxType),
+      m_nVisibleLineCount		(0),
+      m_nIndexInParent			(DEFAULT_INDEX_IN_PARENT),
+      m_nLastTopEntry			( 0 ),
+      m_nLastSelectedPos		( LISTBOX_ENTRY_NOTFOUND ),
+      m_bDisableProcessEvent	( false ),
+      m_bVisible				( true ),
       m_xParent                 ( _xParent )
 {
     // Because combo boxes and list boxes don't have a common interface for
@@ -137,8 +137,8 @@ void VCLXAccessibleList::FillAccessibleStateSet (utl::AccessibleStateSetHelper&
 
     VCLXAccessibleComponent::FillAccessibleStateSet( rStateSet );
     // check if our list should be visible
-    if (    m_pListBoxHelper
-        && (m_pListBoxHelper->GetStyle() & WB_DROPDOWN ) == WB_DROPDOWN
+    if (	m_pListBoxHelper 
+        && (m_pListBoxHelper->GetStyle() & WB_DROPDOWN ) == WB_DROPDOWN 
         && !m_pListBoxHelper->IsInDropDown() )
     {
         rStateSet.RemoveState (AccessibleStateType::VISIBLE);
@@ -185,7 +185,7 @@ void VCLXAccessibleList::notifyVisibleStates(sal_Bool _bSetNew )
             sal_Bool bVisible = ( nPos>=nTopEntry && nPos<( nTopEntry + m_nVisibleLineCount ) );
             pItem->SetVisible( m_bVisible && bVisible );
         }
-
+            
     }
 }
 // -----------------------------------------------------------------------------
@@ -240,7 +240,7 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve
             VCLXAccessibleComponent::ProcessWindowEvent (rVclWindowEvent);
             if ( m_pListBoxHelper )
             {
-                uno::Any    aOldValue,
+                uno::Any	aOldValue, 
                             aNewValue;
                 USHORT nPos = m_pListBoxHelper->GetSelectEntryPos();
                 if ( nPos == LISTBOX_ENTRY_NOTFOUND )
@@ -248,7 +248,7 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve
                 if ( nPos != LISTBOX_ENTRY_NOTFOUND )
                     aNewValue <<= CreateChild(nPos);
 
-                NotifyAccessibleEvent(  AccessibleEventId::ACTIVE_DESCENDANT_CHANGED,
+                NotifyAccessibleEvent(	AccessibleEventId::ACTIVE_DESCENDANT_CHANGED,
                                         aOldValue,
                                         aNewValue );
             }
@@ -318,7 +318,7 @@ Reference<XAccessible> VCLXAccessibleList::CreateChild (sal_Int32 i)
         {
             ListItems::iterator aIter = m_aAccessibleChildren.begin() + nPos;
             ::std::mem_fun_t<bool, VCLXAccessibleListItem> aTemp(&VCLXAccessibleListItem::IncrementIndexInParent);
-            adjustEntriesIndexInParent( aIter, aTemp);
+            adjustEntriesIndexInParent(	aIter, aTemp);
         }
         else
         {
@@ -363,7 +363,7 @@ void VCLXAccessibleList::HandleChangedItemList (bool bItemInserted, sal_Int32 nI
             {
                 ListItems::iterator aIter = m_aAccessibleChildren.erase(m_aAccessibleChildren.begin()+nIndex);
             ::std::mem_fun_t<bool, VCLXAccessibleListItem> aTemp(&VCLXAccessibleListItem::DecrementIndexInParent);
-                adjustEntriesIndexInParent( aIter, aTemp );
+                adjustEntriesIndexInParent(	aIter, aTemp );
             }
         }
     }
@@ -526,7 +526,7 @@ Sequence< ::rtl::OUString > VCLXAccessibleList::getSupportedServiceNames (void)
 
 void VCLXAccessibleList::UpdateVisibleLineCount()
 {
-    if ( m_pListBoxHelper )
+    if ( m_pListBoxHelper ) 
     {
         if ( (m_pListBoxHelper->GetStyle() & WB_DROPDOWN ) == WB_DROPDOWN )
             m_nVisibleLineCount = m_pListBoxHelper->GetDisplayLineCount();
@@ -790,7 +790,7 @@ void SAL_CALL VCLXAccessibleList::deselectAccessibleChild( sal_Int32 nSelectedCh
 awt::Rectangle VCLXAccessibleList::implGetBounds() throw (uno::RuntimeException)
 {
     awt::Rectangle aBounds ( 0, 0, 0, 0 );
-    if ( m_pListBoxHelper
+    if ( m_pListBoxHelper 
         && (m_pListBoxHelper->GetStyle() & WB_DROPDOWN ) == WB_DROPDOWN )
     {
         if ( m_pListBoxHelper->IsInDropDown() )
@@ -825,7 +825,7 @@ awt::Point VCLXAccessibleList::getLocationOnScreen(  ) throw (uno::RuntimeExcept
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
     awt::Point aPos;
-    if ( m_pListBoxHelper
+    if ( m_pListBoxHelper 
         && (m_pListBoxHelper->GetStyle() & WB_DROPDOWN ) == WB_DROPDOWN )
     {
         if ( m_pListBoxHelper->IsInDropDown() )
diff --git a/accessibility/source/standard/vclxaccessiblelistbox.cxx b/accessibility/source/standard/vclxaccessiblelistbox.cxx
index 07aa685aac27..381cdfd8cd4b 100644
--- a/accessibility/source/standard/vclxaccessiblelistbox.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistbox.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ VCLXAccessibleListBox::~VCLXAccessibleListBox (void)
 bool VCLXAccessibleListBox::IsValid (void) const
 {
     return static_cast<ListBox*>(GetWindow()) != NULL;
-
+ 
 }
 
 
@@ -88,7 +88,7 @@ void VCLXAccessibleListBox::ProcessWindowEvent (const VclWindowEvent& rVclWindow
 
 //=====  XServiceInfo  ========================================================
 
-::rtl::OUString VCLXAccessibleListBox::getImplementationName (void)
+::rtl::OUString VCLXAccessibleListBox::getImplementationName (void) 
     throw (RuntimeException)
 {
     return ::rtl::OUString::createFromAscii("com.sun.star.comp.toolkit.AccessibleListBox");
@@ -97,7 +97,7 @@ void VCLXAccessibleListBox::ProcessWindowEvent (const VclWindowEvent& rVclWindow
 
 
 
-Sequence< ::rtl::OUString > VCLXAccessibleListBox::getSupportedServiceNames (void)
+Sequence< ::rtl::OUString > VCLXAccessibleListBox::getSupportedServiceNames (void) 
     throw (RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames();
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index f84188ba8155..a72457061b0f 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,14 +75,14 @@ DBG_NAME(VCLXAccessibleListItem)
 // -----------------------------------------------------------------------------
 VCLXAccessibleListItem::VCLXAccessibleListItem( ::accessibility::IComboListBoxHelper* _pListBoxHelper, sal_Int32 _nIndexInParent, const Reference< XAccessible >& _xParent ) :
 
-    VCLXAccessibleListItem_BASE ( m_aMutex ),
+    VCLXAccessibleListItem_BASE	( m_aMutex ),
 
     m_nIndexInParent( _nIndexInParent ),
-    m_bSelected     ( sal_False ),
-    m_bVisible      ( sal_False ),
+    m_bSelected		( sal_False ),
+    m_bVisible		( sal_False ),
     m_nClientId     ( 0 ),
     m_pListBoxHelper( _pListBoxHelper ),
-    m_xParent       ( _xParent )
+    m_xParent		( _xParent )
 
 {
     DBG_CTOR( VCLXAccessibleListItem, NULL );
@@ -210,10 +210,10 @@ void SAL_CALL VCLXAccessibleListItem::disposing()
         ::osl::MutexGuard aGuard( m_aMutex );
 
         VCLXAccessibleListItem_BASE::disposing();
-        m_sEntryText        = ::rtl::OUString();
-        m_pListBoxHelper    = NULL;
-        m_xParent           = NULL;
-        m_xParentContext    = NULL;
+        m_sEntryText		= ::rtl::OUString();
+        m_pListBoxHelper	= NULL;
+        m_xParent			= NULL;
+        m_xParentContext	= NULL;
 
         nId = m_nClientId;
         m_nClientId =  0;
@@ -288,7 +288,7 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getAccessibleIndexInParent(  ) throw
 sal_Int16 SAL_CALL VCLXAccessibleListItem::getAccessibleRole(  ) throw (RuntimeException)
 {
     return AccessibleRole::LIST_ITEM;
-    //  return AccessibleRole::LABEL;
+    //	return AccessibleRole::LABEL;
 }
 // -----------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL VCLXAccessibleListItem::getAccessibleDescription(  ) throw (RuntimeException)
diff --git a/accessibility/source/standard/vclxaccessiblemenu.cxx b/accessibility/source/standard/vclxaccessiblemenu.cxx
index 2d66d98c9563..c341a6f2ecb4 100644
--- a/accessibility/source/standard/vclxaccessiblemenu.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenu.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,7 +124,7 @@ sal_Int32 VCLXAccessibleMenu::getAccessibleChildCount(  ) throw (RuntimeExceptio
 {
     OExternalLockGuard aGuard( this );
 
-    return GetChildCount();
+    return GetChildCount(); 
 }
 
 // -----------------------------------------------------------------------------
@@ -176,13 +176,13 @@ void VCLXAccessibleMenu::selectAccessibleChild( sal_Int32 nChildIndex ) throw (I
 // -----------------------------------------------------------------------------
 
 sal_Bool VCLXAccessibleMenu::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
-{
+{	
     OExternalLockGuard aGuard( this );
 
     if ( nChildIndex < 0 || nChildIndex >= GetChildCount() )
         throw IndexOutOfBoundsException();
 
-    return IsChildSelected( nChildIndex );
+    return IsChildSelected( nChildIndex );	
 }
 
 // -----------------------------------------------------------------------------
@@ -210,7 +210,7 @@ sal_Int32 VCLXAccessibleMenu::getSelectedAccessibleChildCount(  ) throw (Runtime
     sal_Int32 nRet = 0;
 
     for ( sal_Int32 i = 0, nCount = GetChildCount(); i < nCount; i++ )
-    {
+    {		
         if ( IsChildSelected( i ) )
             ++nRet;
     }
@@ -230,7 +230,7 @@ Reference< XAccessible > VCLXAccessibleMenu::getSelectedAccessibleChild( sal_Int
     Reference< XAccessible > xChild;
 
     for ( sal_Int32 i = 0, j = 0, nCount = GetChildCount(); i < nCount; i++ )
-    {
+    {		
         if ( IsChildSelected( i ) && ( j++ == nSelectedChildIndex ) )
         {
             xChild = GetChild( i );
diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx b/accessibility/source/standard/vclxaccessiblemenubar.cxx
index 64eee8741f09..6bef6c5b786d 100644
--- a/accessibility/source/standard/vclxaccessiblemenubar.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index a8b48a8baedc..b2b633956fda 100644
--- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,14 +81,14 @@ sal_Bool VCLXAccessibleMenuItem::IsFocused()
 }
 
 // -----------------------------------------------------------------------------
-
+        
 sal_Bool VCLXAccessibleMenuItem::IsSelected()
 {
     return IsHighlighted();
 }
 
 // -----------------------------------------------------------------------------
-
+        
 sal_Bool VCLXAccessibleMenuItem::IsChecked()
 {
     sal_Bool bChecked = sal_False;
@@ -104,7 +104,7 @@ sal_Bool VCLXAccessibleMenuItem::IsChecked()
 }
 
 // -----------------------------------------------------------------------------
-
+        
 sal_Bool VCLXAccessibleMenuItem::IsHighlighted()
 {
     sal_Bool bHighlighted = sal_False;
@@ -229,8 +229,8 @@ sal_Bool VCLXAccessibleMenuItem::setCaretPosition( sal_Int32 nIndex ) throw (Ind
 sal_Unicode VCLXAccessibleMenuItem::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     OExternalLockGuard aGuard( this );
-
-    return OCommonAccessibleText::getCharacter( nIndex );
+    
+    return OCommonAccessibleText::getCharacter( nIndex );	
 }
 
 // -----------------------------------------------------------------------------
@@ -282,7 +282,7 @@ sal_Int32 VCLXAccessibleMenuItem::getCharacterCount() throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
 
-    return OCommonAccessibleText::getCharacterCount();
+    return OCommonAccessibleText::getCharacterCount();		
 }
 
 // -----------------------------------------------------------------------------
@@ -311,8 +311,8 @@ sal_Int32 VCLXAccessibleMenuItem::getIndexAtPoint( const awt::Point& aPoint ) th
 ::rtl::OUString VCLXAccessibleMenuItem::getSelectedText() throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
-
-    return OCommonAccessibleText::getSelectedText();
+    
+    return OCommonAccessibleText::getSelectedText();				
 }
 
 // -----------------------------------------------------------------------------
@@ -320,7 +320,7 @@ sal_Int32 VCLXAccessibleMenuItem::getIndexAtPoint( const awt::Point& aPoint ) th
 sal_Int32 VCLXAccessibleMenuItem::getSelectionStart() throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
-
+    
     return OCommonAccessibleText::getSelectionStart();
 }
 
@@ -329,8 +329,8 @@ sal_Int32 VCLXAccessibleMenuItem::getSelectionStart() throw (RuntimeException)
 sal_Int32 VCLXAccessibleMenuItem::getSelectionEnd() throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
-
-    return OCommonAccessibleText::getSelectionEnd();
+    
+    return OCommonAccessibleText::getSelectionEnd();	
 }
 
 // -----------------------------------------------------------------------------
@@ -350,7 +350,7 @@ sal_Bool VCLXAccessibleMenuItem::setSelection( sal_Int32 nStartIndex, sal_Int32
 ::rtl::OUString VCLXAccessibleMenuItem::getText() throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
-
+    
     return OCommonAccessibleText::getText();
 }
 
@@ -359,8 +359,8 @@ sal_Bool VCLXAccessibleMenuItem::setSelection( sal_Int32 nStartIndex, sal_Int32
 ::rtl::OUString VCLXAccessibleMenuItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     OExternalLockGuard aGuard( this );
-
-    return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex );
+    
+    return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex );		
 }
 
 // -----------------------------------------------------------------------------
@@ -368,7 +368,7 @@ sal_Bool VCLXAccessibleMenuItem::setSelection( sal_Int32 nStartIndex, sal_Int32
 ::com::sun::star::accessibility::TextSegment VCLXAccessibleMenuItem::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
     OExternalLockGuard aGuard( this );
-
+    
     return OCommonAccessibleText::getTextAtIndex( nIndex, aTextType );
 }
 
@@ -377,7 +377,7 @@ sal_Bool VCLXAccessibleMenuItem::setSelection( sal_Int32 nStartIndex, sal_Int32
 ::com::sun::star::accessibility::TextSegment VCLXAccessibleMenuItem::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
     OExternalLockGuard aGuard( this );
-
+    
     return OCommonAccessibleText::getTextBeforeIndex( nIndex, aTextType );
 }
 
@@ -386,7 +386,7 @@ sal_Bool VCLXAccessibleMenuItem::setSelection( sal_Int32 nStartIndex, sal_Int32
 ::com::sun::star::accessibility::TextSegment VCLXAccessibleMenuItem::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
     OExternalLockGuard aGuard( this );
-
+    
     return OCommonAccessibleText::getTextBehindIndex( nIndex, aTextType );
 }
 
@@ -400,7 +400,7 @@ sal_Bool VCLXAccessibleMenuItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEnd
 
     if ( m_pParent )
     {
-        Window* pWindow = m_pParent->GetWindow();
+        Window* pWindow = m_pParent->GetWindow();		
         if ( pWindow )
         {
             Reference< datatransfer::clipboard::XClipboard > xClipboard = pWindow->GetClipboard();
@@ -415,7 +415,7 @@ sal_Bool VCLXAccessibleMenuItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEnd
                 Reference< datatransfer::clipboard::XFlushableClipboard > xFlushableClipboard( xClipboard, uno::UNO_QUERY );
                 if( xFlushableClipboard.is() )
                     xFlushableClipboard->flushClipboard();
-
+                
                 Application::AcquireSolarMutex( nRef );
 
                 bReturn = sal_True;
@@ -434,7 +434,7 @@ sal_Int32 VCLXAccessibleMenuItem::getAccessibleActionCount( ) throw (RuntimeExce
 {
     OExternalLockGuard aGuard( this );
 
-    return 1;
+    return 1;	
 }
 
 // -----------------------------------------------------------------------------
@@ -471,7 +471,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleMenuItem::getAccessibleActionKe
 
     if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
         throw IndexOutOfBoundsException();
-
+    
     OAccessibleKeyBindingHelper* pKeyBindingHelper = new OAccessibleKeyBindingHelper();
     Reference< XAccessibleKeyBinding > xKeyBinding = pKeyBindingHelper;
 
@@ -510,7 +510,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleMenuItem::getAccessibleActionKe
                 {
                     Reference< XAccessibleKeyBinding > xKeyB( xAction->getAccessibleActionKeyBinding( 0 ) );
                     if ( xKeyB.is() && xKeyB->getAccessibleKeyBindingCount() > 1 )
-                        aSeq = xKeyB->getAccessibleKeyBinding( 1 );
+                        aSeq = xKeyB->getAccessibleKeyBinding( 1 );					
                 }
             }
         }
@@ -589,7 +589,7 @@ Any VCLXAccessibleMenuItem::getMaximumValue(  ) throw (RuntimeException)
 
     Any aValue;
     aValue <<= (sal_Int32) 1;
-
+    
     return aValue;
 }
 
@@ -601,7 +601,7 @@ Any VCLXAccessibleMenuItem::getMinimumValue(  ) throw (RuntimeException)
 
     Any aValue;
     aValue <<= (sal_Int32) 0;
-
+    
     return aValue;
 }
 
diff --git a/accessibility/source/standard/vclxaccessiblemenuseparator.cxx b/accessibility/source/standard/vclxaccessiblemenuseparator.cxx
index 70130243e54e..5dca9676f3d0 100644
--- a/accessibility/source/standard/vclxaccessiblemenuseparator.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuseparator.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx
index 073ebd80f844..0f65f732b728 100644
--- a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx
+++ b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ VCLXAccessiblePopupMenu::~VCLXAccessiblePopupMenu()
 // -----------------------------------------------------------------------------
 
 sal_Bool VCLXAccessiblePopupMenu::IsFocused()
-{
+{   
     return !IsChildHighlighted();
 }
 
diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
index 5ad9053e9ea5..13c9f251cfcd 100644
--- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx
+++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -175,7 +175,7 @@ sal_Int32 VCLXAccessibleRadioButton::getAccessibleActionCount( ) throw (RuntimeE
 {
     OExternalLockGuard aGuard( this );
 
-    return 1;
+    return 1;	
 }
 
 // -----------------------------------------------------------------------------
@@ -214,7 +214,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleRadioButton::getAccessibleActio
 
     if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
         throw IndexOutOfBoundsException();
-
+    
     OAccessibleKeyBindingHelper* pKeyBindingHelper = new OAccessibleKeyBindingHelper();
     Reference< XAccessibleKeyBinding > xKeyBinding = pKeyBindingHelper;
 
@@ -258,7 +258,7 @@ Any VCLXAccessibleRadioButton::getCurrentValue(  ) throw (RuntimeException)
     VCLXRadioButton* pVCLXRadioButton = static_cast< VCLXRadioButton* >( GetVCLXWindow() );
     if ( pVCLXRadioButton )
         aValue <<= (sal_Int32) pVCLXRadioButton->getState();
-
+    
     return aValue;
 }
 
@@ -284,7 +284,7 @@ sal_Bool VCLXAccessibleRadioButton::setCurrentValue( const Any& aNumber ) throw
         pVCLXRadioButton->setState( (sal_Bool) nValue );
         bReturn = sal_True;
     }
-
+    
     return bReturn;
 }
 
@@ -296,7 +296,7 @@ Any VCLXAccessibleRadioButton::getMaximumValue(  ) throw (RuntimeException)
 
     Any aValue;
     aValue <<= (sal_Int32) 1;
-
+                
     return aValue;
 }
 
@@ -308,7 +308,7 @@ Any VCLXAccessibleRadioButton::getMinimumValue(  ) throw (RuntimeException)
 
     Any aValue;
     aValue <<= (sal_Int32) 0;
-
+    
     return aValue;
 }
 
diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
index 2d9a6dd6bebc..c73caadb51d2 100644
--- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleScrollBar, VCLXAccessibleCompone
 
 ::rtl::OUString VCLXAccessibleScrollBar::getImplementationName() throw (RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleScrollBar" );
+    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleScrollBar" );	
 }
 
 // -----------------------------------------------------------------------------
@@ -158,11 +158,11 @@ sal_Bool VCLXAccessibleScrollBar::doAccessibleAction ( sal_Int32 nIndex ) throw
         ScrollType eScrollType;
         switch ( nIndex )
         {
-            case 0:     eScrollType = SCROLL_LINEUP;    break;
-            case 1:     eScrollType = SCROLL_LINEDOWN;  break;
-            case 2:     eScrollType = SCROLL_PAGEUP;    break;
-            case 3:     eScrollType = SCROLL_PAGEDOWN;  break;
-            default:    eScrollType = SCROLL_DONTKNOW;  break;
+            case 0:		eScrollType = SCROLL_LINEUP;	break;
+            case 1:		eScrollType = SCROLL_LINEDOWN;	break;
+            case 2:		eScrollType = SCROLL_PAGEUP;	break;
+            case 3:		eScrollType = SCROLL_PAGEDOWN;	break;
+            default:	eScrollType = SCROLL_DONTKNOW;	break;
         }
         if ( pScrollBar->DoScrollAction( eScrollType ) )
             bReturn = sal_True;
@@ -184,11 +184,11 @@ sal_Bool VCLXAccessibleScrollBar::doAccessibleAction ( sal_Int32 nIndex ) throw
 
     switch ( nIndex )
     {
-        case 0:     sDescription = ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_DECLINE ) );      break;
-        case 1:     sDescription = ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_INCLINE ) );      break;
-        case 2:     sDescription = ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_DECBLOCK ) );     break;
-        case 3:     sDescription = ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_INCBLOCK ) );     break;
-        default:                                                                                        break;
+        case 0:		sDescription = ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_DECLINE ) );		break;
+        case 1:		sDescription = ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_INCLINE ) );		break;
+        case 2:		sDescription = ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_DECBLOCK ) );		break;
+        case 3:		sDescription = ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_INCBLOCK ) );		break;
+        default:																						break;
     }
 
     return sDescription;
@@ -203,7 +203,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleScrollBar::getAccessibleActionK
     if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
         throw IndexOutOfBoundsException();
 
-    return Reference< XAccessibleKeyBinding >();
+    return Reference< XAccessibleKeyBinding >();	
 }
 
 // -----------------------------------------------------------------------------
@@ -262,7 +262,7 @@ Any VCLXAccessibleScrollBar::getMaximumValue(  ) throw (RuntimeException)
     VCLXScrollBar* pVCLXScrollBar = static_cast< VCLXScrollBar* >( GetVCLXWindow() );
     if ( pVCLXScrollBar )
         aValue <<= (sal_Int32) pVCLXScrollBar->getMaximum();
-
+                
     return aValue;
 }
 
@@ -274,7 +274,7 @@ Any VCLXAccessibleScrollBar::getMinimumValue(  ) throw (RuntimeException)
 
     Any aValue;
     aValue <<= (sal_Int32) 0;
-
+    
     return aValue;
 }
 
diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
index 9a3fb29b7b31..97b687e1e968 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ using namespace ::com::sun::star::accessibility;
 using namespace ::comphelper;
 
 
-//  ----------------------------------------------------
-//  class VCLXAccessibleStatusBar
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXAccessibleStatusBar
+//	----------------------------------------------------
 
 VCLXAccessibleStatusBar::VCLXAccessibleStatusBar( VCLXWindow* pVCLXWindow )
     :VCLXAccessibleComponent( pVCLXWindow )
@@ -168,7 +168,7 @@ void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWind
     switch ( rVclWindowEvent.GetId() )
     {
         case VCLEVENT_STATUSBAR_ITEMADDED:
-        {
+        {	
             if ( m_pStatusBar )
             {
                 sal_uInt16 nItemId = (sal_uInt16)(sal_IntPtr) rVclWindowEvent.GetData();
@@ -206,7 +206,7 @@ void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWind
         break;
         case VCLEVENT_STATUSBAR_SHOWITEM:
         case VCLEVENT_STATUSBAR_HIDEITEM:
-        {
+        {	
             if ( m_pStatusBar )
             {
                 sal_uInt16 nItemId = (sal_uInt16)(sal_IntPtr) rVclWindowEvent.GetData();
@@ -217,28 +217,28 @@ void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWind
         break;
         case VCLEVENT_STATUSBAR_SHOWALLITEMS:
         case VCLEVENT_STATUSBAR_HIDEALLITEMS:
-        {
+        {	
             for ( sal_uInt32 i = 0; i < m_aAccessibleChildren.size(); ++i )
                 UpdateShowing( i, rVclWindowEvent.GetId() == VCLEVENT_STATUSBAR_SHOWALLITEMS );
         }
         break;
         case VCLEVENT_STATUSBAR_NAMECHANGED:
-        {
+        {	
             if ( m_pStatusBar )
             {
                 sal_uInt16 nItemId = (sal_uInt16)(sal_IntPtr) rVclWindowEvent.GetData();
                 sal_uInt16 nItemPos = m_pStatusBar->GetItemPos( nItemId );
-                UpdateItemName( nItemPos );
+                UpdateItemName( nItemPos );			
             }
         }
         break;
         case VCLEVENT_STATUSBAR_DRAWITEM:
-        {
+        {	
             if ( m_pStatusBar )
             {
                 sal_uInt16 nItemId = (sal_uInt16)(sal_IntPtr) rVclWindowEvent.GetData();
                 sal_uInt16 nItemPos = m_pStatusBar->GetItemPos( nItemId );
-                UpdateItemText( nItemPos );
+                UpdateItemText( nItemPos );			
             }
         }
         break;
@@ -255,7 +255,7 @@ void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWind
                     if ( xComponent.is() )
                         xComponent->dispose();
                 }
-                m_aAccessibleChildren.clear();
+                m_aAccessibleChildren.clear();		
             }
 
             VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent );
@@ -285,7 +285,7 @@ void VCLXAccessibleStatusBar::disposing()
             if ( xComponent.is() )
                 xComponent->dispose();
         }
-        m_aAccessibleChildren.clear();
+        m_aAccessibleChildren.clear();		
     }
 }
 
@@ -315,7 +315,7 @@ sal_Int32 VCLXAccessibleStatusBar::getAccessibleChildCount() throw (RuntimeExcep
 {
     OExternalLockGuard aGuard( this );
 
-    return m_aAccessibleChildren.size();
+    return m_aAccessibleChildren.size(); 
 }
 
 // -----------------------------------------------------------------------------
diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
index 5f6cca43ca9a..fc7ff7c35b34 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ VCLXAccessibleStatusBarItem::VCLXAccessibleStatusBarItem( StatusBar* pStatusBar,
 
     m_sItemName = GetItemName();
     m_sItemText = GetItemText();
-    m_bShowing  = IsShowing();
+    m_bShowing	= IsShowing();
 }
 
 // -----------------------------------------------------------------------------
@@ -176,12 +176,12 @@ void VCLXAccessibleStatusBarItem::FillAccessibleStateSet( utl::AccessibleStateSe
 }
 
 // -----------------------------------------------------------------------------
-// OCommonAccessibleComponent
+// OCommonAccessibleComponent 
 // -----------------------------------------------------------------------------
 
 awt::Rectangle VCLXAccessibleStatusBarItem::implGetBounds() throw (RuntimeException)
 {
-    awt::Rectangle aBounds( 0, 0, 0, 0 );
+    awt::Rectangle aBounds( 0, 0, 0, 0 );	
 
     if ( m_pStatusBar )
         aBounds = AWTRectangle( m_pStatusBar->GetItemRect( m_nItemId ) );
@@ -340,13 +340,13 @@ sal_Int16 VCLXAccessibleStatusBarItem::getAccessibleRole(  ) throw (RuntimeExcep
 
 // -----------------------------------------------------------------------------
 
-::rtl::OUString VCLXAccessibleStatusBarItem::getAccessibleDescription(  ) throw (RuntimeException)
+::rtl::OUString VCLXAccessibleStatusBarItem::getAccessibleDescription(	) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
 
     ::rtl::OUString sDescription;
     if ( m_pStatusBar )
-        sDescription = m_pStatusBar->GetHelpText( m_nItemId );
+        sDescription = m_pStatusBar->GetHelpText( m_nItemId ); 
 
     return sDescription;
 }
@@ -421,7 +421,7 @@ void VCLXAccessibleStatusBarItem::grabFocus(  ) throw (RuntimeException)
 
 // -----------------------------------------------------------------------------
 
-sal_Int32 VCLXAccessibleStatusBarItem::getForeground(   ) throw (RuntimeException)
+sal_Int32 VCLXAccessibleStatusBarItem::getForeground(	) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
 
@@ -431,7 +431,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getForeground(   ) throw (RuntimeExceptio
     {
         Reference< XAccessibleComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
         if ( xParentComp.is() )
-            nColor = xParentComp->getForeground();
+            nColor = xParentComp->getForeground();	
     }
 
     return nColor;
@@ -449,7 +449,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getBackground(  ) throw (RuntimeException
     {
         Reference< XAccessibleComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
         if ( xParentComp.is() )
-            nColor = xParentComp->getBackground();
+            nColor = xParentComp->getBackground();	
     }
 
     return nColor;
@@ -469,7 +469,7 @@ Reference< awt::XFont > VCLXAccessibleStatusBarItem::getFont(  ) throw (RuntimeE
     {
         Reference< XAccessibleExtendedComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
         if ( xParentComp.is() )
-            xFont = xParentComp->getFont();
+            xFont = xParentComp->getFont();	
     }
 
     return xFont;
@@ -617,7 +617,7 @@ sal_Bool VCLXAccessibleStatusBarItem::copyText( sal_Int32 nStartIndex, sal_Int32
             Reference< datatransfer::clipboard::XFlushableClipboard > xFlushableClipboard( xClipboard, uno::UNO_QUERY );
             if( xFlushableClipboard.is() )
                 xFlushableClipboard->flushClipboard();
-
+            
             Application::AcquireSolarMutex( nRef );
 
             bReturn = sal_True;
diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
index 417fcf03daf8..e199584b67d1 100644
--- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx
+++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ using namespace ::com::sun::star::accessibility;
 using namespace ::comphelper;
 
 
-//  ----------------------------------------------------
-//  class VCLXAccessibleTabControl
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXAccessibleTabControl
+//	----------------------------------------------------
 
 VCLXAccessibleTabControl::VCLXAccessibleTabControl( VCLXWindow* pVCLXWindow )
     :VCLXAccessibleComponent( pVCLXWindow )
@@ -262,7 +262,7 @@ void VCLXAccessibleTabControl::ProcessWindowEvent( const VclWindowEvent& rVclWin
                     if ( xComponent.is() )
                         xComponent->dispose();
                 }
-                m_aAccessibleChildren.clear();
+                m_aAccessibleChildren.clear();		
             }
 
             VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent );
@@ -345,7 +345,7 @@ void VCLXAccessibleTabControl::disposing()
             if ( xComponent.is() )
                 xComponent->dispose();
         }
-        m_aAccessibleChildren.clear();
+        m_aAccessibleChildren.clear();		
     }
 }
 
@@ -375,7 +375,7 @@ sal_Int32 VCLXAccessibleTabControl::getAccessibleChildCount() throw (RuntimeExce
 {
     OExternalLockGuard aGuard( this );
 
-    return m_aAccessibleChildren.size();
+    return m_aAccessibleChildren.size(); 
 }
 
 // -----------------------------------------------------------------------------
@@ -440,7 +440,7 @@ void VCLXAccessibleTabControl::selectAccessibleChild( sal_Int32 nChildIndex ) th
 // -----------------------------------------------------------------------------
 
 sal_Bool VCLXAccessibleTabControl::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
-{
+{	
     OExternalLockGuard aGuard( this );
 
     if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() )
@@ -490,7 +490,7 @@ Reference< XAccessible > VCLXAccessibleTabControl::getSelectedAccessibleChild( s
     Reference< XAccessible > xChild;
 
     for ( sal_Int32 i = 0, j = 0, nCount = getAccessibleChildCount(); i < nCount; i++ )
-    {
+    {		
         if ( isAccessibleChildSelected( i ) && ( j++ == nSelectedChildIndex ) )
         {
             xChild = getAccessibleChild( i );
diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx
index 5bb372884591..aa7cba0f7798 100644
--- a/accessibility/source/standard/vclxaccessibletabpage.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpage.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ VCLXAccessibleTabPage::VCLXAccessibleTabPage( TabControl* pTabControl, sal_uInt1
     ,m_nPageId( nPageId )
 {
     m_pExternalLock = static_cast< VCLExternalSolarLock* >( getExternalLock() );
-    m_bFocused  = IsFocused();
+    m_bFocused	= IsFocused();
     m_bSelected = IsSelected();
     m_sPageText = GetPageText();
 }
@@ -175,14 +175,14 @@ void VCLXAccessibleTabPage::Update( bool bNew )
             Reference< XAccessible > xChild( pTabPage->GetAccessible( bNew ) );
             if ( xChild.is() )
             {
-                Any aOldValue, aNewValue;
+                Any aOldValue, aNewValue;                
                 if ( bNew )
                     aNewValue <<= xChild;
                 else
                     aOldValue <<= xChild;
                 NotifyAccessibleEvent( AccessibleEventId::CHILD, aOldValue, aNewValue );
             }
-        }
+        }                       
     }
 }
 
@@ -209,12 +209,12 @@ void VCLXAccessibleTabPage::FillAccessibleStateSet( utl::AccessibleStateSetHelpe
 }
 
 // -----------------------------------------------------------------------------
-// OCommonAccessibleComponent
+// OCommonAccessibleComponent 
 // -----------------------------------------------------------------------------
 
 awt::Rectangle VCLXAccessibleTabPage::implGetBounds() throw (RuntimeException)
 {
-    awt::Rectangle aBounds( 0, 0, 0, 0 );
+    awt::Rectangle aBounds( 0, 0, 0, 0 );	
 
     if ( m_pTabControl )
         aBounds = AWTRectangle( m_pTabControl->GetTabBounds( m_nPageId ) );
@@ -388,7 +388,7 @@ sal_Int16 VCLXAccessibleTabPage::getAccessibleRole(  ) throw (RuntimeException)
 
 // -----------------------------------------------------------------------------
 
-::rtl::OUString VCLXAccessibleTabPage::getAccessibleDescription(    ) throw (RuntimeException)
+::rtl::OUString VCLXAccessibleTabPage::getAccessibleDescription(	) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
 
@@ -462,8 +462,8 @@ Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleAtPoint( const awt:
     {
         Reference< XAccessible > xAcc = getAccessibleChild( i );
         if ( xAcc.is() )
-        {
-            Reference< XAccessibleComponent > xComp( xAcc->getAccessibleContext(), UNO_QUERY );
+        {			
+            Reference< XAccessibleComponent > xComp( xAcc->getAccessibleContext(), UNO_QUERY );				
             if ( xComp.is() )
             {
                 Rectangle aRect = VCLRectangle( xComp->getBounds() );
@@ -495,7 +495,7 @@ void VCLXAccessibleTabPage::grabFocus(  ) throw (RuntimeException)
 
 // -----------------------------------------------------------------------------
 
-sal_Int32 VCLXAccessibleTabPage::getForeground( ) throw (RuntimeException)
+sal_Int32 VCLXAccessibleTabPage::getForeground(	) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
 
@@ -505,7 +505,7 @@ sal_Int32 VCLXAccessibleTabPage::getForeground( ) throw (RuntimeException)
     {
         Reference< XAccessibleComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
         if ( xParentComp.is() )
-            nColor = xParentComp->getForeground();
+            nColor = xParentComp->getForeground();	
     }
 
     return nColor;
@@ -523,7 +523,7 @@ sal_Int32 VCLXAccessibleTabPage::getBackground(  ) throw (RuntimeException)
     {
         Reference< XAccessibleComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
         if ( xParentComp.is() )
-            nColor = xParentComp->getBackground();
+            nColor = xParentComp->getBackground();	
     }
 
     return nColor;
@@ -543,7 +543,7 @@ Reference< awt::XFont > VCLXAccessibleTabPage::getFont(  ) throw (RuntimeExcepti
     {
         Reference< XAccessibleExtendedComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
         if ( xParentComp.is() )
-            xFont = xParentComp->getFont();
+            xFont = xParentComp->getFont();	
     }
 
     return xFont;
@@ -690,7 +690,7 @@ sal_Bool VCLXAccessibleTabPage::copyText( sal_Int32 nStartIndex, sal_Int32 nEndI
             Reference< datatransfer::clipboard::XFlushableClipboard > xFlushableClipboard( xClipboard, uno::UNO_QUERY );
             if( xFlushableClipboard.is() )
                 xFlushableClipboard->flushClipboard();
-
+            
             Application::AcquireSolarMutex( nRef );
 
             bReturn = sal_True;
diff --git a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
index 9353c9801991..a9d3afd955c4 100644
--- a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ using namespace ::com::sun::star::accessibility;
 using namespace ::comphelper;
 
 
-//  ----------------------------------------------------
-//  class VCLXAccessibleTabPageWindow
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXAccessibleTabPageWindow
+//	----------------------------------------------------
 
 VCLXAccessibleTabPageWindow::VCLXAccessibleTabPageWindow( VCLXWindow* pVCLXWindow )
     :VCLXAccessibleComponent( pVCLXWindow )
@@ -74,12 +74,12 @@ VCLXAccessibleTabPageWindow::~VCLXAccessibleTabPageWindow()
 }
 
 // -----------------------------------------------------------------------------
-// OCommonAccessibleComponent
+// OCommonAccessibleComponent 
 // -----------------------------------------------------------------------------
 
 awt::Rectangle VCLXAccessibleTabPageWindow::implGetBounds() throw (RuntimeException)
 {
-    awt::Rectangle aBounds( 0, 0, 0, 0 );
+    awt::Rectangle aBounds( 0, 0, 0, 0 );	
 
     if ( m_pTabControl )
     {
diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
index 9613234eb732..ead524a34eb7 100644
--- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx
+++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ using namespace ::com::sun::star::accessibility;
 using namespace ::comphelper;
 
 
-//  ----------------------------------------------------
-//  class VCLXAccessibleTextComponent
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class VCLXAccessibleTextComponent
+//	----------------------------------------------------
 
 VCLXAccessibleTextComponent::VCLXAccessibleTextComponent( VCLXWindow* pVCLXWindow )
     :VCLXAccessibleComponent( pVCLXWindow )
@@ -176,8 +176,8 @@ sal_Bool VCLXAccessibleTextComponent::setCaretPosition( sal_Int32 nIndex ) throw
 sal_Unicode VCLXAccessibleTextComponent::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     OExternalLockGuard aGuard( this );
-
-    return OCommonAccessibleText::getCharacter( nIndex );
+    
+    return OCommonAccessibleText::getCharacter( nIndex );	
 }
 
 // -----------------------------------------------------------------------------
@@ -226,8 +226,8 @@ awt::Rectangle VCLXAccessibleTextComponent::getCharacterBounds( sal_Int32 nIndex
 sal_Int32 VCLXAccessibleTextComponent::getCharacterCount() throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
-
-    return OCommonAccessibleText::getCharacterCount();
+    
+    return OCommonAccessibleText::getCharacterCount();		
 }
 
 // -----------------------------------------------------------------------------
@@ -249,8 +249,8 @@ sal_Int32 VCLXAccessibleTextComponent::getIndexAtPoint( const awt::Point& aPoint
 ::rtl::OUString VCLXAccessibleTextComponent::getSelectedText() throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
-
-    return OCommonAccessibleText::getSelectedText();
+    
+    return OCommonAccessibleText::getSelectedText();				
 }
 
 // -----------------------------------------------------------------------------
@@ -258,7 +258,7 @@ sal_Int32 VCLXAccessibleTextComponent::getIndexAtPoint( const awt::Point& aPoint
 sal_Int32 VCLXAccessibleTextComponent::getSelectionStart() throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
-
+    
     return OCommonAccessibleText::getSelectionStart();
 }
 
@@ -267,8 +267,8 @@ sal_Int32 VCLXAccessibleTextComponent::getSelectionStart() throw (RuntimeExcepti
 sal_Int32 VCLXAccessibleTextComponent::getSelectionEnd() throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
-
-    return OCommonAccessibleText::getSelectionEnd();
+    
+    return OCommonAccessibleText::getSelectionEnd();	
 }
 
 // -----------------------------------------------------------------------------
@@ -288,7 +288,7 @@ sal_Bool VCLXAccessibleTextComponent::setSelection( sal_Int32 nStartIndex, sal_I
 ::rtl::OUString VCLXAccessibleTextComponent::getText() throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
-
+    
     return OCommonAccessibleText::getText();
 }
 
@@ -297,8 +297,8 @@ sal_Bool VCLXAccessibleTextComponent::setSelection( sal_Int32 nStartIndex, sal_I
 ::rtl::OUString VCLXAccessibleTextComponent::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     OExternalLockGuard aGuard( this );
-
-    return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex );
+    
+    return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex );		
 }
 
 // -----------------------------------------------------------------------------
@@ -306,7 +306,7 @@ sal_Bool VCLXAccessibleTextComponent::setSelection( sal_Int32 nStartIndex, sal_I
 ::com::sun::star::accessibility::TextSegment VCLXAccessibleTextComponent::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
     OExternalLockGuard aGuard( this );
-
+    
     return OCommonAccessibleText::getTextAtIndex( nIndex, aTextType );
 }
 
@@ -315,7 +315,7 @@ sal_Bool VCLXAccessibleTextComponent::setSelection( sal_Int32 nStartIndex, sal_I
 ::com::sun::star::accessibility::TextSegment VCLXAccessibleTextComponent::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
     OExternalLockGuard aGuard( this );
-
+    
     return OCommonAccessibleText::getTextBeforeIndex( nIndex, aTextType );
 }
 
@@ -324,7 +324,7 @@ sal_Bool VCLXAccessibleTextComponent::setSelection( sal_Int32 nStartIndex, sal_I
 ::com::sun::star::accessibility::TextSegment VCLXAccessibleTextComponent::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
     OExternalLockGuard aGuard( this );
-
+    
     return OCommonAccessibleText::getTextBehindIndex( nIndex, aTextType );
 }
 
@@ -350,7 +350,7 @@ sal_Bool VCLXAccessibleTextComponent::copyText( sal_Int32 nStartIndex, sal_Int32
             Reference< datatransfer::clipboard::XFlushableClipboard > xFlushableClipboard( xClipboard, uno::UNO_QUERY );
             if( xFlushableClipboard.is() )
                 xFlushableClipboard->flushClipboard();
-
+            
             Application::AcquireSolarMutex( nRef );
 
             bReturn = sal_True;
diff --git a/accessibility/source/standard/vclxaccessibletextfield.cxx b/accessibility/source/standard/vclxaccessibletextfield.cxx
index afc28d3e9e43..7d96e1695b0d 100644
--- a/accessibility/source/standard/vclxaccessibletextfield.cxx
+++ b/accessibility/source/standard/vclxaccessibletextfield.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index 1b22fddc95fa..9d71f3f1af37 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace
             _rxORB,
             _rxInnerAccessibleContext,
             _rxOwningAccessible,
-            _rxParentAccessible     )
+            _rxParentAccessible		)
             ,m_nIndexInParent(_nIndexInParent)
         {
         }
@@ -87,8 +87,8 @@ namespace
     // =========================================================================
     // = OToolBoxWindowItem
     // =========================================================================
-    typedef ::cppu::ImplHelper1 <   XUnoTunnel
-                                >   OToolBoxWindowItem_Base;
+    typedef ::cppu::ImplHelper1	<	XUnoTunnel
+                                >	OToolBoxWindowItem_Base;
 
     /** XAccessible implementation for a toolbox item which is represented by a VCL Window
     */
@@ -100,10 +100,10 @@ namespace
         sal_Int32 m_nIndexInParent;
 
     public:
-        inline sal_Int32    getIndexInParent() const                    { return m_nIndexInParent; }
-        inline void         setIndexInParent( sal_Int32 _nNewIndex )    { m_nIndexInParent = _nNewIndex; }
+        inline sal_Int32	getIndexInParent() const					{ return m_nIndexInParent; }
+        inline void			setIndexInParent( sal_Int32 _nNewIndex )	{ m_nIndexInParent = _nNewIndex; }
 
-        static  sal_Bool    isWindowItem( const Reference< XAccessible >& _rxAcc, OToolBoxWindowItem** /* [out] */ _ppImplementation = NULL );
+        static	sal_Bool	isWindowItem( const Reference< XAccessible >& _rxAcc, OToolBoxWindowItem** /* [out] */ _ppImplementation = NULL );
 
     public:
         OToolBoxWindowItem(sal_Int32 _nIndexInParent,
@@ -178,8 +178,8 @@ namespace
     //--------------------------------------------------------------------
     sal_Int64 SAL_CALL OToolBoxWindowItem::getSomething( const Sequence< sal_Int8 >& _rId ) throw (RuntimeException)
     {
-        if  (   ( 16 == _rId.getLength() )
-            &&  ( 0 == rtl_compareMemory( getUnoTunnelImplementationId().getConstArray(),  _rId.getConstArray(), 16 ) )
+        if	(	( 16 == _rId.getLength() )
+            &&	( 0 == rtl_compareMemory( getUnoTunnelImplementationId().getConstArray(),  _rId.getConstArray(), 16 ) )
             )
             return reinterpret_cast< sal_Int64>( this );
 
@@ -214,7 +214,7 @@ VCLXAccessibleToolBoxItem* VCLXAccessibleToolBox::GetItem_Impl( sal_Int32 _nPos,
         ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.find( _nPos );
         // returns only toolbox buttons, not windows
         if ( aIter != m_aAccessibleChildren.end()  && !aIter->second.is())
-            pItem = static_cast< VCLXAccessibleToolBoxItem* >( aIter->second.get() );
+            pItem =	static_cast< VCLXAccessibleToolBoxItem* >( aIter->second.get() );
     }
 
     return pItem;
@@ -369,7 +369,7 @@ void VCLXAccessibleToolBox::UpdateItem_Impl( sal_Int32 _nPos, sal_Bool _bItemAdd
     if ( pToolBox )
     {
         if ( !_bItemAdded )
-        {   // the item was removed
+        {	// the item was removed
             // -> destroy the old item
             ToolBoxItemsMap::iterator aItemPos = m_aAccessibleChildren.find( _nPos );
             if ( m_aAccessibleChildren.end() != aItemPos )
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index 05807cc4317d..d6726a6c117d 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,12 +73,12 @@ VCLXAccessibleToolBoxItem::VCLXAccessibleToolBoxItem( ToolBox* _pToolBox, sal_In
 
     AccessibleTextHelper_BASE( new VCLExternalSolarLock() ),
 
-    m_pToolBox      ( _pToolBox ),
+    m_pToolBox		( _pToolBox ),
     m_nIndexInParent( _nPos ),
-    m_nRole         ( AccessibleRole::PUSH_BUTTON ),
-    m_nItemId       ( 0 ),
-    m_bHasFocus     ( sal_False ),
-    m_bIsChecked    ( sal_False ),
+    m_nRole			( AccessibleRole::PUSH_BUTTON ),
+    m_nItemId		( 0 ),
+    m_bHasFocus		( sal_False ),
+    m_bIsChecked	( sal_False ),
     m_bIndeterminate( false )
 
 {
@@ -98,12 +98,12 @@ VCLXAccessibleToolBoxItem::VCLXAccessibleToolBoxItem( ToolBox* _pToolBox, sal_In
         {
             ToolBoxItemBits nBits = m_pToolBox->GetItemBits( m_nItemId );
             if (( nBits & TIB_DROPDOWN ) == TIB_DROPDOWN)
-                m_nRole = AccessibleRole::BUTTON_DROPDOWN;
+                m_nRole	= AccessibleRole::BUTTON_DROPDOWN;
             else if (( ( nBits & TIB_CHECKABLE ) == TIB_CHECKABLE ) ||
                 ( ( nBits & TIB_AUTOCHECK ) == TIB_AUTOCHECK ) )
-                m_nRole = AccessibleRole::TOGGLE_BUTTON;
+                m_nRole	= AccessibleRole::TOGGLE_BUTTON;
             else if ( m_pToolBox->GetItemWindow( m_nItemId ) )
-                m_nRole = AccessibleRole::PANEL;
+                m_nRole	= AccessibleRole::PANEL;
             break;
         }
 
@@ -541,11 +541,11 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleAtPoin
 void SAL_CALL VCLXAccessibleToolBoxItem::grabFocus(  ) throw (RuntimeException)
 {
     Reference< XAccessible > xParent(getAccessibleParent());
-
+    
     if( xParent.is() )
     {
         Reference< XAccessibleSelection > rxAccessibleSelection(xParent->getAccessibleContext(), UNO_QUERY);
-
+       
         if ( rxAccessibleSelection.is() )
         {
             rxAccessibleSelection -> selectAccessibleChild ( getAccessibleIndexInParent() );
@@ -577,7 +577,7 @@ sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getBackground(  ) throw (RuntimeEx
 // -----------------------------------------------------------------------------
 // XAccessibleExtendedComponent
 // -----------------------------------------------------------------------------
-Reference< awt::XFont > SAL_CALL VCLXAccessibleToolBoxItem::getFont(    ) throw (RuntimeException)
+Reference< awt::XFont > SAL_CALL VCLXAccessibleToolBoxItem::getFont(	) throw (RuntimeException)
 {
     return uno::Reference< awt::XFont >();
 }
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/AccessibilityWorkBench.java b/accessibility/workben/org/openoffice/accessibility/awb/AccessibilityWorkBench.java
index 6e8e45bc4e82..fa4fd69d16a7 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/AccessibilityWorkBench.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/AccessibilityWorkBench.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
@@ -79,10 +79,10 @@ import org.openoffice.accessibility.awb.view.ObjectViewContainerWindow;
     @see Canvas
         for the graphical view of the accessible objects.
 */
-public class AccessibilityWorkBench
-            extends JFrame
-            implements XTerminateListener,
-                       ActionListener,
+public class AccessibilityWorkBench 
+            extends JFrame 
+            implements XTerminateListener, 
+                       ActionListener, 
                        TreeSelectionListener
 {
     public static final String msVersion = "v1.9";
@@ -107,7 +107,7 @@ public class AccessibilityWorkBench
                 sPipeName = args[++i];
             }
         }
-
+        
         saWorkBench = new AccessibilityWorkBench (sPipeName);
     }
 
@@ -136,7 +136,7 @@ public class AccessibilityWorkBench
         OfficeConnection.SetPipeName (sPipeName);
         Options.Instance().Load (msOptionsFileName);
         Layout ();
-
+        
         MessageArea.println (System.getProperty ("os.name") + " / "
             + System.getProperty ("os.arch") + " / "
             + System.getProperty ("os.version"));
@@ -145,7 +145,7 @@ public class AccessibilityWorkBench
         maTree.addTreeSelectionListener (this);
 
         addWindowListener (new WindowAdapter ()
-            { public void windowClosing (WindowEvent e) {Quit();} }
+            { public void windowClosing (WindowEvent e) {Quit();} } 
             );
 
         OfficeConnection.Instance().AddConnectionListener (this);
@@ -156,7 +156,7 @@ public class AccessibilityWorkBench
 
 
     /** Create and arrange the widgets of the GUI.
-    */
+    */    
     public void Layout ()
     {
         setSize (new java.awt.Dimension (800,600));
@@ -171,11 +171,11 @@ public class AccessibilityWorkBench
         //  Accessible Tree.
         javax.swing.tree.TreeModel treeModel = new DynamicAccessibilityModel();
         maTree = new AccessibilityTree(treeModel);
-        // Add the model as tree listeners to be able to populate/clear the
+        // Add the model as tree listeners to be able to populate/clear the 
         // child lists on demand.
         maTree.addTreeExpansionListener((TreeExpansionListener) treeModel);
         maTree.addTreeWillExpandListener((TreeWillExpandListener) treeModel);
-
+        
         JScrollPane aTreeScrollPane = new JScrollPane(
             maTree,
             JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
@@ -200,7 +200,7 @@ public class AccessibilityWorkBench
         // Split pane for tree view and object view.
         JSplitPane aLeftViewSplitPane = new JSplitPane (
             JSplitPane.VERTICAL_SPLIT,
-            aTreeScrollPane,
+            aTreeScrollPane, 
             aObjectViewContainerScrollPane
             );
         aLeftViewSplitPane.setDividerLocation (300);
@@ -209,7 +209,7 @@ public class AccessibilityWorkBench
         //  Canvas.
         maCanvas = new Canvas ();
         maCanvas.SetTree (maTree);
-        JScrollPane aScrolledCanvas = new JScrollPane(maCanvas,
+        JScrollPane aScrolledCanvas = new JScrollPane(maCanvas, 
             JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
             JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
         aScrolledCanvas.getViewport().setBackground (java.awt.Color.RED);
@@ -218,7 +218,7 @@ public class AccessibilityWorkBench
         // Split pane for tree view and canvas.
         JSplitPane aViewSplitPane = new JSplitPane (
             JSplitPane.HORIZONTAL_SPLIT,
-            aLeftViewSplitPane,
+            aLeftViewSplitPane, 
             aScrolledCanvas
             );
         aViewSplitPane.setOneTouchExpandable(true);
@@ -229,7 +229,7 @@ public class AccessibilityWorkBench
         MessageArea.Instance().setPreferredSize (new java.awt.Dimension(600,50));
         JSplitPane aSplitPane = new JSplitPane (
             JSplitPane.VERTICAL_SPLIT,
-            aViewSplitPane,
+            aViewSplitPane, 
             MessageArea.Instance());
         aSplitPane.setOneTouchExpandable(true);
         aSplitPane.setContinuousLayout (true);
@@ -248,7 +248,7 @@ public class AccessibilityWorkBench
         //        maUpdateButton = createButton ("Update", "update");
         //        maShapesButton = createButton ("Expand Shapes", "shapes");
         maExpandButton = createButton ("Expand All", "expand");
-        maQuitButton = createButton ("Quit", "quit");
+        maQuitButton = createButton ("Quit", "quit");        
         UpdateButtonStates ();
 
         setJMenuBar (CreateMenuBar ());
@@ -267,10 +267,10 @@ public class AccessibilityWorkBench
 
     /** Shortcut method for adding an object to a GridBagLayout.
     */
-    void addGridElement (JComponent object,
-        int x, int y,
-        int width, int height,
-        int weightx, int weighty,
+    void addGridElement (JComponent object, 
+        int x, int y, 
+        int width, int height, 
+        int weightx, int weighty, 
         int anchor, int fill)
     {
         GridBagConstraints constraints = new GridBagConstraints ();
@@ -297,7 +297,7 @@ public class AccessibilityWorkBench
         aButton.setEnabled (false);
         aButton.setActionCommand (command);
         aButton.addActionListener (this);
-
+        
         maButtonBar.add (aButton);
         return aButton;
     }
@@ -314,7 +314,7 @@ public class AccessibilityWorkBench
     {
         // Menu bar.
         maMenuBar = new JMenuBar ();
-
+   
         // File menu.
         JMenu aFileMenu = new JMenu ("File");
         maMenuBar.add (aFileMenu);
@@ -358,22 +358,22 @@ public class AccessibilityWorkBench
         JMenu aOptionsMenu = new JMenu ("Options");
         maMenuBar.add (aOptionsMenu);
         JCheckBoxMenuItem aCBItem;
-        aCBItem = new JCheckBoxMenuItem ("Show Descriptions",
+        aCBItem = new JCheckBoxMenuItem ("Show Descriptions", 
                                          Options.GetBoolean("ShowDescriptions"));
         aOptionsMenu.add (aCBItem);
         aCBItem.addActionListener (this);
 
-        aCBItem = new JCheckBoxMenuItem ("Show Names",
+        aCBItem = new JCheckBoxMenuItem ("Show Names", 
                                          Options.GetBoolean ("ShowNames"));
         aOptionsMenu.add (aCBItem);
         aCBItem.addActionListener (this);
 
-        aCBItem = new JCheckBoxMenuItem ("Show Text",
+        aCBItem = new JCheckBoxMenuItem ("Show Text", 
                                          Options.GetBoolean ("ShowText"));
         aOptionsMenu.add (aCBItem);
         aCBItem.addActionListener (this);
 
-        aCBItem = new JCheckBoxMenuItem ("Antialiased Rendering",
+        aCBItem = new JCheckBoxMenuItem ("Antialiased Rendering", 
                                          Options.GetBoolean ("Antialiasing"));
         aOptionsMenu.add (aCBItem);
         aCBItem.addActionListener (this);
@@ -381,7 +381,7 @@ public class AccessibilityWorkBench
         // Help menu.
         JMenu aHelpMenu = new JMenu ("Help");
         maMenuBar.add (aHelpMenu);
-
+        
         aItem = new JMenuItem ("Help");
         aHelpMenu.add (aItem);
         aItem.addActionListener (this);
@@ -411,7 +411,7 @@ public class AccessibilityWorkBench
     protected void Initialize ()
     {
         maCanvas.SetTree (maTree);
-
+        
         SimpleOffice aOffice = SimpleOffice.Instance ();
         if (aOffice != null)
         {
@@ -444,7 +444,7 @@ public class AccessibilityWorkBench
 
     /** Callback for GUI actions from the buttons.
     */
-    public void actionPerformed (ActionEvent aEvent)
+    public void actionPerformed (ActionEvent aEvent) 
     {
         String sCommand = aEvent.getActionCommand();
         if (sCommand.equals("connect"))
@@ -458,7 +458,7 @@ public class AccessibilityWorkBench
         }
         else if (sCommand.equals("update"))
         {
-//          maTree.Dispose();
+//			maTree.Dispose();
             Initialize ();
         }
         else if (sCommand.equals("shapes"))
@@ -485,25 +485,25 @@ public class AccessibilityWorkBench
         }
         else if (sCommand.equals ("Show Descriptions"))
         {
-            Options.SetBoolean ("ShowDescriptions",
+            Options.SetBoolean ("ShowDescriptions", 
                 ((JCheckBoxMenuItem)aEvent.getSource()).getState());
             maCanvas.repaint();
         }
         else if (sCommand.equals ("Show Names"))
         {
-            Options.SetBoolean ("ShowNames",
+            Options.SetBoolean ("ShowNames", 
                 ((JCheckBoxMenuItem)aEvent.getSource()).getState());
             maCanvas.repaint();
         }
         else if (sCommand.equals ("Show Text"))
         {
-            Options.SetBoolean ("ShowText",
+            Options.SetBoolean ("ShowText", 
                 ((JCheckBoxMenuItem)aEvent.getSource()).getState());
             maCanvas.repaint();
         }
         else if (sCommand.equals ("Antialiased Rendering"))
         {
-            Options.SetBoolean ("Antialiasing",
+            Options.SetBoolean ("Antialiasing", 
                 ((JCheckBoxMenuItem)aEvent.getSource()).getState());
             maCanvas.repaint();
         }
@@ -560,7 +560,7 @@ public class AccessibilityWorkBench
             TreePath aSelectionPath = maTree.getSelectionPath();
             if (aSelectionPath != null)
             {
-                javax.swing.tree.TreeNode aSelectedNode =
+                javax.swing.tree.TreeNode aSelectedNode = 
                     (javax.swing.tree.TreeNode)aSelectionPath.getLastPathComponent();
                 if (aSelectedNode instanceof XAccessible) {
                    new ObjectViewContainerWindow (((XAccessible) aSelectedNode).getAccessibleContext());
@@ -580,7 +580,7 @@ public class AccessibilityWorkBench
         Tell the object view and the canvas about the selected object.
     */
     public void valueChanged (TreeSelectionEvent aEvent) {
-
+        
         if (aEvent.isAddedPath()) {
             Cursor aCursor = getCursor();
             setCursor (new Cursor (Cursor.WAIT_CURSOR));
@@ -664,7 +664,7 @@ public class AccessibilityWorkBench
 //        maTree.expandRow (0);
 
         // Register the top window listener.
-        XExtendedToolkit xToolkit =
+        XExtendedToolkit xToolkit = 
             SimpleOffice.Instance().GetExtendedToolkit();
         if (xToolkit != null)
         {
@@ -682,15 +682,15 @@ public class AccessibilityWorkBench
     }
 
     /// The Singleton Workbench object.
-    private static AccessibilityWorkBench
+    private static AccessibilityWorkBench 
         saWorkBench = null;
-
+    
     private JPanel maMainPanel;
     private JPanel maButtonBar;
     private Canvas maCanvas;
     private AccessibilityTree maTree;
     private ObjectViewContainer maObjectViewContainer;
-    private JButton
+    private JButton 
         maConnectButton,
         maQuitButton,
         maUpdateButton,
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/HelpWindow.java b/accessibility/workben/org/openoffice/accessibility/awb/HelpWindow.java
index 2f9671d191e5..9aae024ffb70 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/HelpWindow.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/HelpWindow.java
@@ -120,7 +120,7 @@ public class HelpWindow
         {}
     }
 
-    public void actionPerformed (java.awt.event.ActionEvent e)
+    public void actionPerformed (java.awt.event.ActionEvent e) 
     {
         if (e.getActionCommand().equals("Prev"))
         {
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/canvas/Canvas.java b/accessibility/workben/org/openoffice/accessibility/awb/canvas/Canvas.java
index 86b642e8091c..78855b5a3d48 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/canvas/Canvas.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/canvas/Canvas.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
@@ -56,7 +56,7 @@ import org.openoffice.accessibility.misc.Options;
     <p>The canvas listens to selection events of the associated JTree and
     highlights the first selected node of that tree.</p>
 */
-public class Canvas
+public class Canvas 
     extends JPanel
 {
     // This constant can be passed to SetZoomMode to always show the whole screen.
@@ -77,7 +77,7 @@ public class Canvas
 
 
     /** Tell the canvas which tree to use to highlight accessible
-        objects and to observe for changes in the tree structure.
+        objects and to observe for changes in the tree structure. 
     */
     public void SetTree (javax.swing.JTree aTree)
     {
@@ -116,10 +116,10 @@ public class Canvas
 
             Graphics2D g2 = (Graphics2D)g;
             if (Options.GetBoolean("Antialiasing"))
-                g2.setRenderingHint (RenderingHints.KEY_ANTIALIASING,
+                g2.setRenderingHint (RenderingHints.KEY_ANTIALIASING, 
                     RenderingHints.VALUE_ANTIALIAS_ON);
             else
-                g2.setRenderingHint (RenderingHints.KEY_ANTIALIASING,
+                g2.setRenderingHint (RenderingHints.KEY_ANTIALIASING, 
                     RenderingHints.VALUE_ANTIALIAS_OFF);
 
             setupTransformation ();
@@ -139,7 +139,7 @@ public class Canvas
             g2.fill (aScreen);
             g2.setColor (Color.BLACK);
             g2.draw (aScreen);
-
+            
             synchronized (maShapeList)
             {
                 Iterator aShapeIterator = maShapeList.GetIterator();
@@ -148,7 +148,7 @@ public class Canvas
                 boolean bShowText = Options.GetBoolean ("ShowText");
                 while (aShapeIterator.hasNext())
                 {
-                    CanvasShape aCanvasShape =
+                    CanvasShape aCanvasShape = 
                         (CanvasShape)aShapeIterator.next();
                     try
                     {
@@ -158,13 +158,13 @@ public class Canvas
                     }
                     catch (Exception aException)
                     {
-                        System.err.println ("caught exception while painting a shape:"
+                        System.err.println ("caught exception while painting a shape:" 
                             + aException);
                         aException.printStackTrace (System.err);
                     }
                 }
             }
-
+            
             // Paint highlighted frame around active object as the last thing.
             if (maActiveObject != null)
                 maActiveObject.paint_highlight (g2);
@@ -216,11 +216,11 @@ public class Canvas
                     // Calculate the scales that would map the screen onto the
                     // widget in both of the coordinate axes and select the
                     // smaller
-                    // of the two: it maps the screen onto the widget in both
+                    // of the two: it maps the screen onto the widget in both 
                     // axes at the same time.
-                    double nHScale = (aWidgetSize.getWidth() - 10)
+                    double nHScale = (aWidgetSize.getWidth() - 10) 
                            / aScreenSize.getWidth();
-                    double nVScale = (aWidgetSize.getHeight() - 10)
+                    double nVScale = (aWidgetSize.getHeight() - 10) 
                         / aScreenSize.getHeight();
                     if (nHScale < nVScale)
                         mnScale = nHScale;
@@ -234,15 +234,15 @@ public class Canvas
 
                 // Calculate offsets that center the scaled screen inside
                 // the widget.
-                mnHOffset = (aWidgetSize.getWidth()
+                mnHOffset = (aWidgetSize.getWidth() 
                              - mnScale*aScreenSize.getWidth()) / 2.0;
-                mnVOffset = (aWidgetSize.getHeight()
+                mnVOffset = (aWidgetSize.getHeight() 
                              - mnScale*aScreenSize.getHeight()) / 2.0;
                 if (mnHOffset < 0)
                     mnHOffset = 0;
                 if (mnVOffset < 0)
                     mnVOffset = 0;
-
+            
                 setPreferredSize (new Dimension (
                     (int)(2*mnHOffset + mnScale * aScreenSize.getWidth()),
                     (int)(2*mnVOffset + mnScale * aScreenSize.getHeight())));
@@ -259,8 +259,8 @@ public class Canvas
         }
         maLastWidgetSize = aWidgetSize;
     }
-
-
+    
+    
 
     protected boolean HighlightObject (CanvasShape aNewActiveObject)
     {
@@ -268,7 +268,7 @@ public class Canvas
         {
             if (maActiveObject != null)
                 maActiveObject.Highlight (false);
-
+            
             maActiveObject = aNewActiveObject;
             if (maActiveObject != null)
             {
@@ -292,7 +292,7 @@ public class Canvas
 
 
 
-
+    
     /** Called when the selection of the tree changes.  Highlight the
         corresponding graphical representation of the object.
     */
@@ -305,7 +305,7 @@ public class Canvas
 
 
 
-    private int
+    private int 
         mnXAnchor,
         mnYAnchor,
         maResizeFlag;
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/canvas/CanvasShape.java b/accessibility/workben/org/openoffice/accessibility/awb/canvas/CanvasShape.java
index f2595351a4f5..14059046625c 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/canvas/CanvasShape.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/canvas/CanvasShape.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
@@ -48,7 +48,7 @@ class CanvasShape implements XAccessibleEventListener
     public final Color maHighlightColor = Color.red;
     public final Color maSelectionColor = Color.green;
     public final Color maFocusColor = Color.blue;
-
+    
     public CanvasShape (javax.swing.tree.TreeNode aNode, Canvas aCanvas)
     {
         maNode = aNode;
@@ -74,7 +74,7 @@ class CanvasShape implements XAccessibleEventListener
     public javax.swing.tree.TreePath getNodePath (javax.swing.tree.TreeNode node)
     {
         javax.swing.tree.TreeNode parent = node.getParent();
-        return (parent != null) ?
+        return (parent != null) ? 
             getNodePath(parent).pathByAddingChild(node) :
             new javax.swing.tree.TreePath(node);
     }
@@ -86,7 +86,7 @@ class CanvasShape implements XAccessibleEventListener
 
 
 
-    /** Update the data obtained from the <type>AccessibilityNode</type>
+    /** Update the data obtained from the <type>AccessibilityNode</type> 
         object.
     */
     public void Update ()
@@ -111,7 +111,7 @@ class CanvasShape implements XAccessibleEventListener
                 mbFocused = xStateSet.contains (AccessibleStateType.FOCUSED);
             }
         }
-
+         
         UpdateGeometry ();
 
         if (mxComponent != null)
@@ -137,7 +137,7 @@ class CanvasShape implements XAccessibleEventListener
     {
         if (mxComponent != null)
         {
-            com.sun.star.awt.Point aLocationOnScreen =
+            com.sun.star.awt.Point aLocationOnScreen = 
                 mxComponent.getLocationOnScreen();
             com.sun.star.awt.Size aSizeOnScreen = mxComponent.getSize();
             maPosition = new Point (
@@ -155,9 +155,9 @@ class CanvasShape implements XAccessibleEventListener
         according to the specified offset and scale.
     */
     public void paint (
-        Graphics2D g,
-        boolean bShowDescription,
-        boolean bShowName,
+        Graphics2D g, 
+        boolean bShowDescription, 
+        boolean bShowName, 
         boolean bShowText)
     {
         try{
@@ -185,7 +185,7 @@ class CanvasShape implements XAccessibleEventListener
                 color = new Color (maFgColor.getRed(), maFgColor.getGreen(), maFgColor.getBlue());
             g.setColor (color);
             g.draw (maShape);
-
+            
             if (mbFocused)
             {
                 g.setColor (maFocusColor);
@@ -240,18 +240,18 @@ class CanvasShape implements XAccessibleEventListener
 
     private void paintName (Graphics2D g)
     {
-        g.drawString ("Name: " + msName,
-            (float)maShape.x+5,
-            (float)maShape.y+15);
+        g.drawString ("Name: " + msName, 
+            (float)maShape.x+5, 
+            (float)maShape.y+15); 
     }
 
 
 
     private void paintDescription (Graphics2D g)
     {
-        g.drawString ("Description: " + msDescription,
-            (float)maShape.x+5,
-            (float)maShape.y+35);
+        g.drawString ("Description: " + msDescription, 
+            (float)maShape.x+5, 
+            (float)maShape.y+35); 
     }
 
 
@@ -274,10 +274,10 @@ class CanvasShape implements XAccessibleEventListener
                 {
                     com.sun.star.awt.Rectangle aRect =
                         xText.getCharacterBounds(i);
-
+                    
                     double x = maShape.x + aRect.X;
                     double y = maShape.y + aRect.Y + aRect.Height;
-
+                    
                     g.drawString (sText.substring(i, i+1), (float)x, (float)y);
                 }
             }
@@ -319,7 +319,7 @@ class CanvasShape implements XAccessibleEventListener
     {
         return new Rectangle (maPosition, maSize);
     }
-
+    
     public Point getOrigin ()
     {
         return maPosition;
@@ -364,12 +364,12 @@ class CanvasShape implements XAccessibleEventListener
                     break;
             }
         } catch (Exception aException) {
-            System.err.println ("caught exception while updating a shape:"
+            System.err.println ("caught exception while updating a shape:" 
                 + aException);
             aException.printStackTrace (System.err);
         }
     }
-
+    
     /** Callback for disposing events.
     */
     public void disposing (com.sun.star.lang.EventObject e)
@@ -379,8 +379,8 @@ class CanvasShape implements XAccessibleEventListener
 
 
 
-
-    private Canvas
+    
+    private Canvas 
         maCanvas;
     private javax.swing.tree.TreeNode
         maNode;
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/canvas/MouseObserver.java b/accessibility/workben/org/openoffice/accessibility/awb/canvas/MouseObserver.java
index 3e7e2807906d..c2468ec38005 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/canvas/MouseObserver.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/canvas/MouseObserver.java
@@ -12,7 +12,7 @@ import javax.swing.tree.TreePath;
 /** Observe the mouse and highlight shapes of the canvas when clicked.
 */
 public class MouseObserver
-    implements MouseListener,
+    implements MouseListener, 
                MouseMotionListener
 {
     public MouseObserver (Canvas aCanvas)
@@ -66,7 +66,7 @@ public class MouseObserver
     }
 
 
-    /** Search for the smallest shape that contains the mouse position.
+    /** Search for the smallest shape that contains the mouse position.  
     */
     protected CanvasShape FindCanvasShapeUnderMouse (MouseEvent e)
     {
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/canvas/ShapeContainer.java b/accessibility/workben/org/openoffice/accessibility/awb/canvas/ShapeContainer.java
index 03ad4bf38c46..86e92cafed06 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/canvas/ShapeContainer.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/canvas/ShapeContainer.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
@@ -87,18 +87,18 @@ public class ShapeContainer
         if (aShape == null)
         {
             aShape = new CanvasShape (aNode, maCanvas);
-
+                        
                         if (aNode instanceof XAccessibleEventBroadcaster)
                            ((XAccessibleEventBroadcaster) aNode).addEventListener(aShape);
-
+                        
             // Update bounding box that includes all objects.
            if (maShapeList.size() == 0)
                maBoundingBox = aShape.GetBBox();
            else
                maBoundingBox = maBoundingBox.union (aShape.GetBBox());
-
+                
             maShapeList.put (aNode, aShape);
-
+        
             maCanvas.repaint();
 
             return true;
@@ -117,7 +117,7 @@ public class ShapeContainer
         {
                         if (aNode instanceof XAccessibleEventBroadcaster)
                            ((XAccessibleEventBroadcaster) aNode).removeEventListener(aShape);
-
+                        
             maShapeList.remove (aNode);
             maCanvas.SelectObject (null);
             maCanvas.repaint ();
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityModel.java b/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityModel.java
index 159467778554..fa9afae92995 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityModel.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityModel.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
@@ -48,7 +48,7 @@ import com.sun.star.accessibility.XAccessibleEventListener;
 public abstract class AccessibilityModel extends javax.swing.tree.DefaultTreeModel {
 
     protected java.util.Hashtable nodeList;
-    protected static DefaultMutableTreeNode disconnectedRootNode =
+    protected static DefaultMutableTreeNode disconnectedRootNode = 
         new DefaultMutableTreeNode("<not connected>");
 
     /** Creates a new instance of AccessibilityModel */
@@ -57,7 +57,7 @@ public abstract class AccessibilityModel extends javax.swing.tree.DefaultTreeMod
         nodeList = new java.util.Hashtable();
     }
 
-    /* Convenience method that creates a new Toolkit node from xToolkit
+    /* Convenience method that creates a new Toolkit node from xToolkit 
      * and sets as the new root object of the tree.
      */
     public synchronized void setRoot(XExtendedToolkit xToolkit) {
@@ -78,7 +78,7 @@ public abstract class AccessibilityModel extends javax.swing.tree.DefaultTreeMod
             }
         }
     }
-
+    
     /* Appends the new child to parent's child list */
     public void addNodeInto(MutableTreeNode newChild, MutableTreeNode parent) {
         int index = parent.getChildCount();
@@ -87,14 +87,14 @@ public abstract class AccessibilityModel extends javax.swing.tree.DefaultTreeMod
         }
         insertNodeInto(newChild, parent, index);
     }
-
+    
     /** Adds listener to the listener chain of node */
     public static void addEventListener(TreeNode node, XAccessibleEventListener listener) {
         if (node instanceof AccessibilityNode) {
             ((AccessibilityNode) node).addEventListener(listener);
         }
     }
-
+    
     /** Removes listener from the listener chain of node */
     public static void removeEventListener(TreeNode node, XAccessibleEventListener listener) {
         if (node instanceof AccessibilityNode) {
@@ -102,7 +102,7 @@ public abstract class AccessibilityModel extends javax.swing.tree.DefaultTreeMod
         }
     }
 
-    protected abstract AccessibilityNode createWindowNode(XAccessible xAccessible,
+    protected abstract AccessibilityNode createWindowNode(XAccessible xAccessible, 
             XAccessibleContext xAccessibleContext);
     protected abstract AccessibilityNode createNode(XAccessible xAccessible);
 
@@ -110,7 +110,7 @@ public abstract class AccessibilityModel extends javax.swing.tree.DefaultTreeMod
     public AccessibilityNode putNode(XAccessible xAccessible, AccessibilityNode node) {
         if (xAccessible != null) {
             String oid = UnoRuntime.generateOid(xAccessible);
-            java.lang.ref.WeakReference ref = (java.lang.ref.WeakReference)
+            java.lang.ref.WeakReference ref = (java.lang.ref.WeakReference) 
                 nodeList.put(oid, new java.lang.ref.WeakReference(node));
             if (ref != null) {
                 return (AccessibilityNode) ref.get();
@@ -118,12 +118,12 @@ public abstract class AccessibilityModel extends javax.swing.tree.DefaultTreeMod
         }
         return null;
     }
-
+    
     /** Returns the AccessibilityNode for xAccessible */
     public AccessibilityNode findNode(XAccessible xAccessible) {
         if (xAccessible != null) {
             String oid = UnoRuntime.generateOid(xAccessible);
-            java.lang.ref.WeakReference ref =
+            java.lang.ref.WeakReference ref = 
                 (java.lang.ref.WeakReference) nodeList.get(oid);
             if (ref != null) {
                 return (AccessibilityNode) ref.get();
@@ -131,12 +131,12 @@ public abstract class AccessibilityModel extends javax.swing.tree.DefaultTreeMod
         }
         return null;
     }
-
+    
     /** Removes the AccessibilityNode for xAccessible from the internal hashtable */
     public AccessibilityNode removeNode(XAccessible xAccessible) {
         if (xAccessible != null) {
             String oid = UnoRuntime.generateOid(xAccessible);
-            java.lang.ref.WeakReference ref =
+            java.lang.ref.WeakReference ref = 
                 (java.lang.ref.WeakReference) nodeList.remove(oid);
             if (ref != null) {
                 return (AccessibilityNode) ref.get();
@@ -144,7 +144,7 @@ public abstract class AccessibilityModel extends javax.swing.tree.DefaultTreeMod
         }
         return null;
     }
-
+    
     public AccessibilityNode removeNode(Object o) {
         if (o instanceof XAccessible) {
             return removeNode((XAccessible) o);
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityNode.java b/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityNode.java
index 81a499aabf0d..4ca87d616d5a 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityNode.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityNode.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,12 +41,12 @@ import com.sun.star.accessibility.XAccessibleEventListener;
 
 import com.sun.star.uno.UnoRuntime;
 
-class AccessibilityNode extends DefaultMutableTreeNode implements XAccessible,
+class AccessibilityNode extends DefaultMutableTreeNode implements XAccessible, 
         XAccessibleEventListener, XAccessibleEventBroadcaster {
 
     protected AccessibilityModel treeModel;
     protected XAccessibleContext unoAccessibleContext;
-
+    
     private XAccessibleEventListener listener;
 
     public AccessibilityNode(AccessibilityModel treeModel) {
@@ -63,18 +63,18 @@ class AccessibilityNode extends DefaultMutableTreeNode implements XAccessible,
     public void setAccessibleContext(XAccessibleContext xAccessibleContext) {
         unoAccessibleContext = xAccessibleContext;
     }
-
+    
     /** Returns the XAccessibleContext object of this node */
     public XAccessibleContext getAccessibleContext() {
         return unoAccessibleContext;
     }
-
+    
     /** Attaches or Detaches the itself as listener to unoAccessibleContext */
     protected void setAttached(boolean attach) {
         XAccessibleContext xAccessibleContext = unoAccessibleContext;
         if (xAccessibleContext != null) {
             try {
-                XAccessibleEventBroadcaster xAccessibleEventBroadcaster =
+                XAccessibleEventBroadcaster xAccessibleEventBroadcaster = 
                     UnoRuntime.queryInterface( XAccessibleEventBroadcaster.class, xAccessibleContext );
                 if (xAccessibleEventBroadcaster != null) {
                     if (attach) {
@@ -87,20 +87,20 @@ class AccessibilityNode extends DefaultMutableTreeNode implements XAccessible,
                 // FIXME: error message !
             }
         }
-    }
+    }        
 
     public void disposing(com.sun.star.lang.EventObject eventObject) {
         XAccessibleEventListener localListener = this.listener;
         if (localListener != null) {
             localListener.disposing(eventObject);
         }
-
+        
         treeModel.removeNode(userObject);
         userObject = null;
         unoAccessibleContext = null;
         // FIXME: mark the object as being disposed in the tree view !
     }
-
+    
     protected void handleChildRemoved(XAccessible xAccessible) {
         final AccessibilityNode node = treeModel.findNode(xAccessible);
         if (node != null) {
@@ -121,7 +121,7 @@ class AccessibilityNode extends DefaultMutableTreeNode implements XAccessible,
                     try {
                         XAccessibleContext xAC = node.getAccessibleContext();
                         if (xAC != null) {
-                            treeModel.insertNodeInto(node, parent,
+                            treeModel.insertNodeInto(node, parent, 
                                 xAC.getAccessibleIndexInParent());
                         }
                     } catch (com.sun.star.uno.RuntimeException e) {
@@ -131,7 +131,7 @@ class AccessibilityNode extends DefaultMutableTreeNode implements XAccessible,
             });
         }
     }
-
+    
     public void notifyEvent(AccessibleEventObject accessibleEventObject) {
         if (accessibleEventObject.EventId == AccessibleEventId.CHILD) {
             XAccessible xAccessible = UnoRuntime.queryInterface( XAccessible.class, accessibleEventObject.OldValue );
@@ -144,17 +144,17 @@ class AccessibilityNode extends DefaultMutableTreeNode implements XAccessible,
                 handleChildAdded(xAccessible);
             }
         }
-
+        
         XAccessibleEventListener localListener = this.listener;
         if (localListener != null) {
             localListener.notifyEvent(accessibleEventObject);
         }
     }
-
+    
     public synchronized void addEventListener(com.sun.star.accessibility.XAccessibleEventListener xAccessibleEventListener) {
          listener = AccessibleEventMulticaster.add(listener, xAccessibleEventListener);
     }
-
+    
     public synchronized void removeEventListener(com.sun.star.accessibility.XAccessibleEventListener xAccessibleEventListener) {
         listener = AccessibleEventMulticaster.remove(listener, xAccessibleEventListener);
     }
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityTree.java b/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityTree.java
index e485c993706a..59257702c88a 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityTree.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityTree.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,14 +40,14 @@ import com.sun.star.accessibility.XAccessibleContext;
  *
  */
 public class AccessibilityTree extends javax.swing.JTree {
-
+    
     /** Creates a new instance of AccessibilityTree */
     public AccessibilityTree(javax.swing.tree.TreeModel model) {
         super(model);
         // always show handles to indicate expandable / collapsable
         showsRootHandles = true;
     }
-
+    
     public void setToolkit(XExtendedToolkit xToolkit) {
         AccessibilityModel model = (AccessibilityModel) getModel();
         if (model != null) {
@@ -58,8 +58,8 @@ public class AccessibilityTree extends javax.swing.JTree {
             model.reload();
         }
     }
-
-     public String convertValueToText(Object value, boolean selected,
+    
+     public String convertValueToText(Object value, boolean selected,  
             boolean expanded, boolean leaf, int row, boolean hasFocus) {
 
         if (value instanceof DefaultMutableTreeNode) {
@@ -82,7 +82,7 @@ public class AccessibilityTree extends javax.swing.JTree {
                 }
             }
         }
-
+            
         return super.convertValueToText(value, selected, expanded, leaf, row, hasFocus);
      }
 
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityTreeModel.java b/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityTreeModel.java
index 6069c8f5f5ee..ad59cf8c9829 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityTreeModel.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityTreeModel.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,7 +62,7 @@ public class AccessibilityTreeModel
 
 
     /** Calls to this method are dispatched to the given node but are
-        observed for exceptions.
+        observed for exceptions.  
     */
     synchronized public boolean isLeaf (Object aObject)
     {
@@ -89,7 +89,7 @@ public class AccessibilityTreeModel
             }
             catch (Exception aException)
             {
-                System.err.println ("caught exception in AccessibilityTreeModel.isLeaf():"
+                System.err.println ("caught exception in AccessibilityTreeModel.isLeaf():" 
                     + aException);
                 aException.printStackTrace (System.err);
             }
@@ -116,7 +116,7 @@ public class AccessibilityTreeModel
     synchronized public Object getChild (Object aParent, final int nIndex)
     {
         AccessibilityNode aChild = null;
-
+        
         final AccessibilityNode aParentNode = (AccessibilityNode)aParent;
 
         // Try to get an existing child from the super class object.
@@ -173,7 +173,7 @@ public class AccessibilityTreeModel
     }
 
 
-
+    
 
     /** Add a new child to the root node.
     */
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/DynamicAccessibilityModel.java b/accessibility/workben/org/openoffice/accessibility/awb/tree/DynamicAccessibilityModel.java
index f2b4c6f0e97f..a0037ba69d69 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/tree/DynamicAccessibilityModel.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/tree/DynamicAccessibilityModel.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,11 +43,11 @@ import com.sun.star.accessibility.XAccessibleContext;
 public class DynamicAccessibilityModel extends AccessibilityModel implements TreeExpansionListener, TreeWillExpandListener {
 
     /* Creates a AccessibilityNode object for a window */
-    protected AccessibilityNode createWindowNode(XAccessible xAccessible,
+    protected AccessibilityNode createWindowNode(XAccessible xAccessible, 
             XAccessibleContext xAccessibleContext) {
         if (xAccessible != null) {
-            // Some objects inherit XAccessible, but should not appear in
-            // the hierarchy as toplevels (like sub-menus), so they don't
+            // Some objects inherit XAccessible, but should not appear in 
+            // the hierarchy as toplevels (like sub-menus), so they don't 
             // return an accessible context.
             if (xAccessibleContext != null) {
                 AccessibilityNode node = new AccessibilityNode(this);
@@ -59,12 +59,12 @@ public class DynamicAccessibilityModel extends AccessibilityModel implements Tre
         }
         return null;
     }
-
+        
     /* Creates a DynamicAccessibilityNode object */
     protected AccessibilityNode createNode(XAccessible xAccessible) {
         if (xAccessible != null) {
             try {
-                // Some objects inherit XAccessible, but should not appear in
+                // Some objects inherit XAccessible, but should not appear in 
                 // the hierarchy as toplevels (like sub-menus), so they don't
                 // return an accessible context.
                 XAccessibleContext xAccessibleContext = xAccessible.getAccessibleContext();
@@ -80,7 +80,7 @@ public class DynamicAccessibilityModel extends AccessibilityModel implements Tre
         }
         return null;
     }
-
+    
     public void treeCollapsed(javax.swing.event.TreeExpansionEvent treeExpansionEvent) {
         TreeNode node = (TreeNode) treeExpansionEvent.getPath().getLastPathComponent();
         if (node instanceof DynamicAccessibilityNode) {
@@ -88,7 +88,7 @@ public class DynamicAccessibilityModel extends AccessibilityModel implements Tre
             dynode.clear();
         }
     }
-
+    
     public void treeExpanded(javax.swing.event.TreeExpansionEvent treeExpansionEvent) {
         TreeNode node = (TreeNode) treeExpansionEvent.getPath().getLastPathComponent();
         if (node instanceof AccessibilityNode) {
@@ -99,7 +99,7 @@ public class DynamicAccessibilityModel extends AccessibilityModel implements Tre
             }
         }
     }
-
+    
     public void treeWillCollapse(javax.swing.event.TreeExpansionEvent treeExpansionEvent)
             throws javax.swing.tree.ExpandVetoException {
         TreeNode node = (TreeNode) treeExpansionEvent.getPath().getLastPathComponent();
@@ -111,8 +111,8 @@ public class DynamicAccessibilityModel extends AccessibilityModel implements Tre
             }
         }
     }
-
-    public void treeWillExpand(javax.swing.event.TreeExpansionEvent treeExpansionEvent)
+    
+    public void treeWillExpand(javax.swing.event.TreeExpansionEvent treeExpansionEvent) 
             throws javax.swing.tree.ExpandVetoException {
         TreeNode node = (TreeNode) treeExpansionEvent.getPath().getLastPathComponent();
         if (node instanceof DynamicAccessibilityNode) {
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/DynamicAccessibilityNode.java b/accessibility/workben/org/openoffice/accessibility/awb/tree/DynamicAccessibilityNode.java
index a982ad71c4d5..da6f10c96191 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/tree/DynamicAccessibilityNode.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/tree/DynamicAccessibilityNode.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,14 +66,14 @@ class DynamicAccessibilityNode extends AccessibilityNode {
             // FIXME: error message
         } catch (com.sun.star.uno.RuntimeException e) {
             // FIXME: error message
-        }
+        }            
     }
-
+    
     // Clears the child list. Called by AccessibilityModel.treeCollapsed().
     protected void clear() {
         removeAllChildren();
     }
-
+    
     /* This is called whenever the node is painted, no matter if collapsed
      * or expanded. Making this a "life" value seems to be appropriate.
      */
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/ToolkitNode.java b/accessibility/workben/org/openoffice/accessibility/awb/tree/ToolkitNode.java
index 8eaa9dab6c02..2599dfc7f0c1 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/tree/ToolkitNode.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/tree/ToolkitNode.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,19 +42,19 @@ import javax.swing.tree.DefaultMutableTreeNode;
 /**
  *
  */
-public class ToolkitNode extends DefaultMutableTreeNode
+public class ToolkitNode extends DefaultMutableTreeNode 
         implements com.sun.star.awt.XTopWindowListener {
-
+    
     protected XExtendedToolkit xToolkit;
-
+    
     private AccessibilityModel treeModel;
-
+    
     /** Creates a new instance of TopWindowListener */
     public ToolkitNode(XExtendedToolkit xToolkit, AccessibilityModel treeModel) {
         super("<connected>");
         this.xToolkit = xToolkit;
         this.treeModel = treeModel;
-
+        
         // Initially fill the child list
         try {
             for (int i=0,j=xToolkit.getTopWindowCount(); i<j; i++) {
@@ -70,11 +70,11 @@ public class ToolkitNode extends DefaultMutableTreeNode
                 }
             }
         } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
-            // This should never happen since we properly check the count
+            // This should never happen since we properly check the count 
             // before - anyway returning what we got so far.
         }
     }
-
+    
     /** Returns an AccessibilityNode if xAccessible has a valid toplevel */
     private AccessibilityNode getTopWindowNode(XAccessible xAccessible) {
         XAccessibleContext xAC = xAccessible.getAccessibleContext();
@@ -103,7 +103,7 @@ public class ToolkitNode extends DefaultMutableTreeNode
                             }
                         }
                     } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
-
+                        
                     }
                 }
                 return parent;
@@ -111,13 +111,13 @@ public class ToolkitNode extends DefaultMutableTreeNode
         }
         return null;
     }
-
+    
     /** Returns the XAccessible interface corresponding to the toplevel window */
     private AccessibilityNode getTopWindowNode(XTopWindow w) {
-        XAccessible xAccessible = (XAccessible)
+        XAccessible xAccessible = (XAccessible) 
             UnoRuntime.queryInterface(XAccessible.class, w);
         if (xAccessible != null) {
-            // XTopWindows usually have an accessible parent, which is the
+            // XTopWindows usually have an accessible parent, which is the 
             // native container window ..
             XAccessibleContext xAC = xAccessible.getAccessibleContext();
             if (xAC != null) {
@@ -158,7 +158,7 @@ public class ToolkitNode extends DefaultMutableTreeNode
             if (node != null && node.getParent() != this) {
                 node = (AccessibilityNode) node.getParent();
             }
-
+            
             if (node != null) {
                 final AccessibilityNode an = node;
                 Runnable removeRun = new Runnable() {
@@ -169,7 +169,7 @@ public class ToolkitNode extends DefaultMutableTreeNode
                             // deadlocks, so removing the listeners here.
                             an.setAttached(false);
                         } catch (IllegalArgumentException e) {
-                            // for some toplevel we get more than one event -
+                            // for some toplevel we get more than one event - 
                             // ignoring
                         }
                     }
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/ComponentView.java b/accessibility/workben/org/openoffice/accessibility/awb/view/ComponentView.java
index d4c0e102b7a9..42c0a5d82783 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/view/ComponentView.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/ComponentView.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 com.sun.star.uno.UnoRuntime;
 import org.openoffice.accessibility.misc.NameProvider;
 
 /** The <type>ContextView</type> class displays information accessible over
-    the <type>XAccessibleContext</type> interface.  This includes name,
+    the <type>XAccessibleContext</type> interface.  This includes name, 
     description, and role.
 */
 public class ComponentView
@@ -77,7 +77,7 @@ public class ComponentView
         maBackgroundColorLabel = aLayout.AddLabeledEntry ("Background Color: ");
     }
 
-
+     
     public void SetObject (XAccessibleContext xContext)
     {
         mxComponent = (XAccessibleComponent)UnoRuntime.queryInterface(
@@ -102,7 +102,7 @@ public class ComponentView
             com.sun.star.awt.Point aLocation = mxComponent.getLocation();
             maRelativeLocationLabel.setText (
                 aLocation.X + ", " + aLocation.Y);
-            com.sun.star.awt.Point aLocationOnScreen =
+            com.sun.star.awt.Point aLocationOnScreen = 
                 mxComponent.getLocationOnScreen();
             maAbsoluteLocationLabel.setText (
                 aLocationOnScreen.X + ", " + aLocationOnScreen.Y);
@@ -111,7 +111,7 @@ public class ComponentView
                 aSize.Width + ", " + aSize.Height);
             com.sun.star.awt.Rectangle aBBox = mxComponent.getBounds();
             maBoundingBoxLabel.setText (
-                aBBox.X + ", " + aBBox.Y + ","
+                aBBox.X + ", " + aBBox.Y + "," 
                 + aBBox.Width + ", " + aBBox.Height);
             int nColor = mxComponent.getForeground();
             maForegroundColorLabel.setText (
@@ -135,7 +135,7 @@ public class ComponentView
                 sConsistency += (sConsistency.length()!=0?", ":"") +
                     "Bounding box conflicts with size";
             XAccessible xParent = mxContext.getAccessibleParent();
-            XAccessibleComponent xParentComponent =
+            XAccessibleComponent xParentComponent = 
                 (XAccessibleComponent)UnoRuntime.queryInterface(
                     XAccessibleComponent.class, xParent);
             if (xParentComponent == null)
@@ -148,9 +148,9 @@ public class ComponentView
             }
             else
             {
-                com.sun.star.awt.Point aParentLocationOnScreen =
+                com.sun.star.awt.Point aParentLocationOnScreen = 
                     xParentComponent.getLocationOnScreen();
-                if (aLocation.X+aParentLocationOnScreen.X
+                if (aLocation.X+aParentLocationOnScreen.X 
                     != aLocationOnScreen.X
                     || aLocation.Y+aParentLocationOnScreen.Y
                     != aLocationOnScreen.Y)
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/ContextView.java b/accessibility/workben/org/openoffice/accessibility/awb/view/ContextView.java
index a8588cd18ca6..6989f414233a 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/view/ContextView.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/ContextView.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,7 +43,7 @@ import com.sun.star.accessibility.XAccessibleContext;
 import org.openoffice.accessibility.misc.NameProvider;
 
 /** The <type>ContextView</type> class displays information accessible over
-    the <type>XAccessibleContext</type> interface.  This includes name,
+    the <type>XAccessibleContext</type> interface.  This includes name, 
     description, and role.
 */
 public class ContextView
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/EditableTextView.java b/accessibility/workben/org/openoffice/accessibility/awb/view/EditableTextView.java
index 2e39f117f62e..ae8b9cd47434 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/view/EditableTextView.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/EditableTextView.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,7 +49,7 @@ public class EditableTextView
         ObjectViewContainer aContainer,
         XAccessibleContext xContext)
     {
-        XAccessibleEditableText xEditableText =
+        XAccessibleEditableText xEditableText = 
             (XAccessibleEditableText)UnoRuntime.queryInterface(
                 XAccessibleEditableText.class, xContext);
         if (xEditableText != null)
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/EventMonitorView.java b/accessibility/workben/org/openoffice/accessibility/awb/view/EventMonitorView.java
index 67e8091e027f..f3228e36d5fd 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/view/EventMonitorView.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/EventMonitorView.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/accessibility/workben/org/openoffice/accessibility/awb/view/FocusView.java b/accessibility/workben/org/openoffice/accessibility/awb/view/FocusView.java
index 4dec27958d71..5a68a9294107 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/view/FocusView.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/FocusView.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/accessibility/workben/org/openoffice/accessibility/awb/view/LayoutManager.java b/accessibility/workben/org/openoffice/accessibility/awb/view/LayoutManager.java
index 728b3dc426d7..0bbe0bd3e444 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/view/LayoutManager.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/LayoutManager.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/accessibility/workben/org/openoffice/accessibility/awb/view/ObjectView.java b/accessibility/workben/org/openoffice/accessibility/awb/view/ObjectView.java
index 3c1b8e90ff26..ada74f6dba0a 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/view/ObjectView.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/ObjectView.java
@@ -80,7 +80,7 @@ abstract public class ObjectView
 
     /** Implement this method if you are interested in accessible events.
     */
-    public void notifyEvent (AccessibleEventObject aEvent)
+    public void notifyEvent (AccessibleEventObject aEvent) 
     {}
 
     /// Reference to the current object to display information about.
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/ObjectViewContainer.java b/accessibility/workben/org/openoffice/accessibility/awb/view/ObjectViewContainer.java
index 54855cbaf885..bc86cb3eef9e 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/view/ObjectViewContainer.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/ObjectViewContainer.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
@@ -126,7 +126,7 @@ public class ObjectViewContainer
                 Class aViewClass = (Class)maViewTemplates.elementAt (i);
                 Method aCreateMethod = aViewClass.getDeclaredMethod (
                     "Create", new Class[] {
-                        ObjectViewContainer.class,
+                        ObjectViewContainer.class, 
                         XAccessibleContext.class});
                 if (aCreateMethod != null)
                 {
@@ -137,13 +137,13 @@ public class ObjectViewContainer
                 }
             }
             catch (NoSuchMethodException e)
-            {System.err.println ("Caught exception while creating view "
+            {System.err.println ("Caught exception while creating view " 
                 + i + " : " + e);}
             catch (IllegalAccessException e)
-            {System.err.println ("Caught exception while creating view "
+            {System.err.println ("Caught exception while creating view " 
                 + i + " : " + e);}
             catch (InvocationTargetException e)
-            {System.err.println ("Caught exception while creating view "
+            {System.err.println ("Caught exception while creating view " 
                 + i + " : " + e);}
         }
 
@@ -227,7 +227,7 @@ public class ObjectViewContainer
     /** Update the layout manager by setting the vertical weight of the
         bottom entry to 1 and so make it strech to over the available
         space.
-
+        
     */
     private void UpdateLayoutManager ()
     {
@@ -250,10 +250,10 @@ public class ObjectViewContainer
     */
     public void notifyEvent (final AccessibleEventObject aEvent)
     {
-        SwingUtilities.invokeLater(
-            new Runnable()
+        SwingUtilities.invokeLater( 
+            new Runnable() 
             {
-                public void run()
+                public void run() 
                 {
                     DispatchEvent (aEvent);
                 }
@@ -282,14 +282,14 @@ public class ObjectViewContainer
     public void disposing (EventObject aEvent)
     {
         mxContext = null;
-       SwingUtilities.invokeLater(
+       SwingUtilities.invokeLater( 
             new Runnable()
             {
                 public void run()
                 {
                     SetObject (null);
                 }
-            }
+            } 
             );
     }
 
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/ParentView.java b/accessibility/workben/org/openoffice/accessibility/awb/view/ParentView.java
index 216bc3a82bfc..828c3fd1a34a 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/view/ParentView.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/ParentView.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
@@ -87,13 +87,13 @@ public class ParentView
             if (xParent != null)
             {
                 maParentLabel.setText ("yes");
-                XAccessibleContext xParentContext =
+                XAccessibleContext xParentContext = 
                     xParent.getAccessibleContext();
                 if (xParentContext != null)
                 {
                     try
                     {
-                        XAccessible xChild =
+                        XAccessible xChild = 
                             xParentContext.getAccessibleChild(nIndex);
                         if (xChild != mxContext)
                             maValidLabel.setText ("yes");
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/SelectionView.java b/accessibility/workben/org/openoffice/accessibility/awb/view/SelectionView.java
index ad5a83467372..4970546fd1ff 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/view/SelectionView.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/SelectionView.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
@@ -184,20 +184,20 @@ class SelectionView
                 {
                     XAccessible xChild = mxContext.getAccessibleChild(i);
                     XAccessibleContext xChildContext = xChild.getAccessibleContext();
-
+                    
                     String sName = i + " " + xChildContext.getAccessibleName();
                     JToggleButton aChild;
                     aChild = new JCheckBox (sName);
                     aChild.setFont (maContainer.GetViewFont());
 
-                    XAccessibleStateSet aChildStateSet =
+                    XAccessibleStateSet aChildStateSet = 
                         mxContext.getAccessibleStateSet();
-                    aChild.setSelected (aChildStateSet!=null
+                    aChild.setSelected (aChildStateSet!=null 
                         && aChildStateSet.contains(AccessibleStateType.SELECTED));
-
+                    
                     aChild.addActionListener (this);
                     maChildrenSelector.add (aChild);
-
+                    
                 }
                 catch (IndexOutOfBoundsException e)
                 {
@@ -216,7 +216,7 @@ class SelectionView
     {
         mxSelection.clearAccessibleSelection();
     }
-
+        
 
 
     /** Call the function associated with the pressed button.
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/ServiceInterfaceView.java b/accessibility/workben/org/openoffice/accessibility/awb/view/ServiceInterfaceView.java
index 7c41ff01c97e..a6292d00be71 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/view/ServiceInterfaceView.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/ServiceInterfaceView.java
@@ -95,12 +95,12 @@ public class ServiceInterfaceView
         {
             maImplementationNameRoot.add (
                 new DefaultMutableTreeNode (
-                    (xServiceInfo!=null
+                    (xServiceInfo!=null 
                         ? xServiceInfo.getImplementationName()
                         : "<XServiceInfo not supported>")));
         }
     }
-
+                
     private void CreateServiceTree ()
     {
         XServiceInfo xServiceInfo = (XServiceInfo)UnoRuntime.queryInterface(
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/StateSetView.java b/accessibility/workben/org/openoffice/accessibility/awb/view/StateSetView.java
index 44638b099edc..a8c6b23b33c5 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/view/StateSetView.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/StateSetView.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
@@ -59,7 +59,7 @@ public class StateSetView
         ObjectView aView = null;
         if (xContext != null)
             aView = new StateSetView (aContainer);
-
+            
         return aView;
     }
 
@@ -112,7 +112,7 @@ public class StateSetView
         Color aTextColor = g.getColor();
 
         g.setRenderingHint (
-            RenderingHints.KEY_ANTIALIASING,
+            RenderingHints.KEY_ANTIALIASING, 
             RenderingHints.VALUE_ANTIALIAS_ON);
 
         XAccessibleStateSet xStateSet = ( mxContext != null ) ? mxContext.getAccessibleStateSet() : null;
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/TableView.java b/accessibility/workben/org/openoffice/accessibility/awb/view/TableView.java
index 07b5d2bb9b78..35f037916482 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/view/TableView.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/TableView.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 @@ import com.sun.star.uno.UnoRuntime;
 
 
 /** The <type>ContextView</type> class displays information accessible over
-    the <type>XAccessibleContext</type> interface.  This includes name,
+    the <type>XAccessibleContext</type> interface.  This includes name, 
     description, and role.
 */
 public class TableView
@@ -72,7 +72,7 @@ public class TableView
         maSelectedColumnsLabel = aLayout.AddLabeledEntry ("Selected Columns: ");
     }
 
-
+     
     public void SetObject (XAccessibleContext xContext)
     {
         mxTable = (XAccessibleTable)UnoRuntime.queryInterface(
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/TextView.java b/accessibility/workben/org/openoffice/accessibility/awb/view/TextView.java
index 4a838aa85884..451097b5d6f3 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/view/TextView.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/TextView.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
@@ -70,7 +70,7 @@ public class TextView
     extends ObjectView
     implements ActionListener
 {
-
+        
     /** Create a TextView when the given object supports the
         XAccessibleText interface.
     */
@@ -171,8 +171,8 @@ public class TextView
                 Integer.toString(mxText.getCharacterCount()));
             // Selection.
             maSelectionLabel.setText (
-                "[" + mxText.getSelectionStart()
-                + "," + mxText.getSelectionEnd()
+                "[" + mxText.getSelectionStart() 
+                + "," + mxText.getSelectionEnd() 
                 + "] \"" + mxText.getSelectedText() + "\"");
 
             // Character bounds.
@@ -185,7 +185,7 @@ public class TextView
             XAccessibleMultiLineText xMultiText = (XAccessibleMultiLineText)
                 UnoRuntime.queryInterface( XAccessibleMultiLineText.class, mxText );
 
-            if( null != xMultiText ) {
+            if( null != xMultiText ) { 
                 try {
                   maCaretLineNoLabel.setText ( Integer.toString( xMultiText.getNumberOfLineWithCaret() ) );
                   TextSegment ts = xMultiText.getTextAtLineWithCaret();
@@ -267,7 +267,7 @@ public class TextView
                     aCharacterArray.append (",");
                 nIndex ++;
             }
-            if (nMaxDisplayCount < nCharacterCount)
+            if (nMaxDisplayCount < nCharacterCount) 
                 aCharacterArray.append (", ...");
         }
         catch (IndexOutOfBoundsException e)
@@ -280,7 +280,7 @@ public class TextView
 
 
 
-    /** Iterate over all characters and translate their positions
+    /** Iterate over all characters and translate their positions 
         back and forth.
         */
     private String GetTextBoundsString ()
@@ -310,14 +310,14 @@ public class TextView
             }
         }
         catch (IndexOutOfBoundsException aEvent)
-        {
+        { 
             // Ignore errors.
         }
 
         return aBuffer.toString();
     }
 
-
+    
 
 
     private final static int BEFORE = -1;
@@ -346,7 +346,7 @@ public class TextView
             DefaultMutableTreeNode aSegmentNode = new DefaultMutableTreeNode (
                 new StringBuffer (
                     Integer.toString (nIndex) + " -> "
-                    + Integer.toString (aSegment.SegmentStart) + " - "
+                    + Integer.toString (aSegment.SegmentStart) + " - " 
                     + Integer.toString (aSegment.SegmentEnd) + " : "
                     + aSegment.SegmentText.toString()));
             aNode.add (aSegmentNode);
@@ -373,18 +373,18 @@ public class TextView
                 case BEFORE:
                     aSegment = mxText.getTextBeforeIndex (nIndex, nTextType);
                     break;
-
+                    
                 case AT:
                     aSegment = mxText.getTextAtIndex (nIndex, nTextType);
                     break;
-
+                    
                 case BEHIND:
                     aSegment = mxText.getTextBehindIndex (nIndex, nTextType);
                     break;
 
                 default:
                     aSegment = new TextSegment();
-                    aSegment.SegmentText = new String ("unknown position "   + nWhere);
+                    aSegment.SegmentText = new String ("unknown position "   + nWhere); 
                     aSegment.SegmentStart = nIndex;
                     aSegment.SegmentStart = nIndex+1;
                     break;
@@ -414,7 +414,7 @@ public class TextView
     /** Add to the given node one node for every attribute of the given segment.
     */
     private void AddAttributeNodes (
-        DefaultMutableTreeNode aNode,
+        DefaultMutableTreeNode aNode, 
         TextSegment aSegment)
     {
         try
@@ -433,7 +433,7 @@ public class TextView
     }
 
     private XAccessibleText mxText;
-    private JLabel
+    private JLabel 
         maTextLabel,
         maCharacterArrayLabel,
         maCharacterCountLabel,
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/ViewGridLayout.java b/accessibility/workben/org/openoffice/accessibility/awb/view/ViewGridLayout.java
index bc598dcaf2fa..196ec3ccdc64 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/view/ViewGridLayout.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/ViewGridLayout.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
@@ -78,7 +78,7 @@ class ViewGridLayout
         constraints.fill = GridBagConstraints.NONE;
         aComponent.setFont (saFont);
         maComponent.add (aComponent, constraints);
-
+     
         mnCurrentLine += 1;
 
         return aComponent;
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/text/CaretSpinnerModel.java b/accessibility/workben/org/openoffice/accessibility/awb/view/text/CaretSpinnerModel.java
index c210b0eff086..c6d7e09ea3cc 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/view/text/CaretSpinnerModel.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/text/CaretSpinnerModel.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 @@ import com.sun.star.lang.IndexOutOfBoundsException;
 */
 public class CaretSpinnerModel
     implements SpinnerModel
-{
+{ 
     public CaretSpinnerModel (XAccessibleText xText)
     {
         mxText = xText;
@@ -86,7 +86,7 @@ public class CaretSpinnerModel
     {
         if (mxText != null)
             return new Integer (mxText.getCaretPosition());
-        else
+        else 
             return null;
     }
 
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/text/TextActionDialog.java b/accessibility/workben/org/openoffice/accessibility/awb/view/text/TextActionDialog.java
index f37969d5ee59..257cd34e33be 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/view/text/TextActionDialog.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/text/TextActionDialog.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;
 /**
  * Display a dialog with a text field and a pair of cancel/do-it buttons
  */
-class TextActionDialog
+class TextActionDialog 
     extends JDialog
     implements ActionListener
 {
     public TextActionDialog (
         XAccessibleContext xContext,
-        String sExplanation,
+        String sExplanation, 
         String sTitle)
     {
         super();// AccessibilityWorkBench.Instance() );
@@ -96,7 +96,7 @@ class TextActionDialog
         maText.setText (sText);
         maText.setRows (sText.length() / 40 + 1);
         maText.setColumns (Math.min (Math.max (40, sText.length()), 20));
-
+        
         JPanel aButtons = new JPanel();
         aButtons.setLayout (new FlowLayout());
         maIndexToggle = new JCheckBox ("reverse selection");
@@ -133,17 +133,17 @@ class TextActionDialog
     }
 
 
-    protected int GetSelectionStart()
-    {
-        return GetSelection(true);
+    protected int GetSelectionStart()     
+    { 
+        return GetSelection(true); 
     }
-    protected int GetSelectionEnd()
+    protected int GetSelectionEnd()       
     {
-        return GetSelection(false);
+        return GetSelection(false); 
     }
     private int GetSelection (boolean bStart)
     {
-        if (bStart ^ maIndexToggle.isSelected())
+        if (bStart ^ maIndexToggle.isSelected()) 
             return maText.getSelectionStart();
         else
             return maText.getSelectionEnd();
@@ -157,18 +157,18 @@ class TextActionDialog
         boolean bSuccess = true;
         try
         {
-            XAccessibleText xText =
+            XAccessibleText xText = 
                 (XAccessibleText)UnoRuntime.queryInterface(
                     XAccessibleText.class, mxContext);
             if (xText != null)
                 bSuccess = bSuccess && TextAction (xText);
 
-            XAccessibleEditableText xEditableText =
+            XAccessibleEditableText xEditableText = 
                 (XAccessibleEditableText)UnoRuntime.queryInterface(
                     XAccessibleEditableText.class, mxContext);
             if (xEditableText != null)
                 bSuccess = bSuccess && EditableTextAction (xEditableText);
-
+            
             if ( ! bSuccess)
                 sError = "Can't execute";
         }
@@ -179,9 +179,9 @@ class TextActionDialog
 
         if (sError != null)
             JOptionPane.showMessageDialog (
-                this,// AccessibilityWorkBench.Instance(),
-                sError,
-                msTitle,
+                this,// AccessibilityWorkBench.Instance(), 
+                sError, 
+                msTitle, 
                 JOptionPane.ERROR_MESSAGE);
 
         Cancel();
@@ -194,7 +194,7 @@ class TextActionDialog
         return true;
     }
 
-    boolean EditableTextAction (XAccessibleEditableText xText)
+    boolean EditableTextAction (XAccessibleEditableText xText) 
         throws IndexOutOfBoundsException
     {
         return true;
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/text/TextAttributeDialog.java b/accessibility/workben/org/openoffice/accessibility/awb/view/text/TextAttributeDialog.java
index dad548ca730e..05d8ff480cee 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/view/text/TextAttributeDialog.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/text/TextAttributeDialog.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
@@ -48,7 +48,7 @@ import com.sun.star.lang.IndexOutOfBoundsException;
 import com.sun.star.uno.UnoRuntime;
 
 
-class TextAttributeDialog
+class TextAttributeDialog 
     extends TextActionDialog
 {
     public TextAttributeDialog (XAccessibleContext xContext)
@@ -61,7 +61,7 @@ class TextAttributeDialog
     protected void Layout ()
     {
         super.Layout ();
-
+        
         maForeground = Color.black;
         maBackground = Color.white;
 
@@ -72,28 +72,28 @@ class TextAttributeDialog
         maUnderlineCheckBox = new JCheckBox ("underline");
         maItalicsCheckBox = new JCheckBox ("italics");
 
-        JButton aForegroundButton = new JButton ("Foreground",
+        JButton aForegroundButton = new JButton ("Foreground", 
             new TextAttributeDialog.ColorIcon(true));
-        aForegroundButton.addActionListener (new ActionListener()
+        aForegroundButton.addActionListener (new ActionListener() 
             {
-                public void actionPerformed (ActionEvent aEvent)
-                {
+                public void actionPerformed (ActionEvent aEvent) 
+                { 
                     maForeground = JColorChooser.showDialog (
-                        TextAttributeDialog.this,
-                        "Select Foreground Color",
+                        TextAttributeDialog.this, 
+                        "Select Foreground Color", 
                         maForeground);
                 }
             } );
-
-        JButton aBackgroundButton = new JButton("Background",
+           
+        JButton aBackgroundButton = new JButton("Background", 
             new TextAttributeDialog.ColorIcon(false));
-        aBackgroundButton.addActionListener (new ActionListener()
+        aBackgroundButton.addActionListener (new ActionListener() 
             {
                 public void actionPerformed (ActionEvent eEvent)
-                {
+                { 
                     maBackground = JColorChooser.showDialog(
-                        TextAttributeDialog.this,
-                        "Select Background Color",
+                        TextAttributeDialog.this, 
+                        "Select Background Color", 
                         maBackground);
                 }
             } );
@@ -131,14 +131,14 @@ class TextAttributeDialog
         aSequence[5] = new PropertyValue();
         aSequence[5].Name = "CharBackTransparent";
         aSequence[5].Value = new Boolean (false);
-
+        
         return xText.setAttributes (
-            GetSelectionStart(),
+            GetSelectionStart(), 
             GetSelectionEnd(),
             aSequence);
     }
 
-    class ColorIcon
+    class ColorIcon 
         implements Icon
     {
         public ColorIcon(boolean bWhich) { bForeground = bWhich; }
@@ -158,21 +158,21 @@ class TextAttributeDialog
             else
                 return maBackground;
         }
-
+        
         private static final int nHeight = 16;
         private static final int nWidth = 16;
         private boolean bForeground;
     }
 
+          
 
 
-
-    private JCheckBox
-        maBoldCheckBox,
-        maUnderlineCheckBox,
+    private JCheckBox 
+        maBoldCheckBox, 
+        maUnderlineCheckBox, 
         maItalicsCheckBox;
-    private Color
-        maForeground,
+    private Color 
+        maForeground, 
         maBackground;
 
 }
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/text/TextDialogFactory.java b/accessibility/workben/org/openoffice/accessibility/awb/view/text/TextDialogFactory.java
index cdb3f26b5e55..70371324d1bd 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/view/text/TextDialogFactory.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/text/TextDialogFactory.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,14 +36,14 @@ import com.sun.star.accessibility.XAccessibleText;
 import com.sun.star.lang.IndexOutOfBoundsException;
 import com.sun.star.uno.UnoRuntime;
 
-
+ 
 /** Factory for dialogs of the text views.
-*/
+*/   
 public class TextDialogFactory
 {
     static public JDialog CreateSelectionDialog (XAccessibleContext xContext)
     {
-        JDialog aDialog = new TextActionDialog(
+        JDialog aDialog = new TextActionDialog( 
             xContext,
             "Select range:",
             "select")
@@ -51,8 +51,8 @@ public class TextDialogFactory
                 boolean TextAction (XAccessibleText xText)
                     throws IndexOutOfBoundsException
                 {
-                    return xText.setSelection(
-                        GetSelectionStart(),
+                    return xText.setSelection( 
+                        GetSelectionStart(), 
                         GetSelectionEnd() );
                 }
             };
@@ -71,8 +71,8 @@ public class TextDialogFactory
                 boolean TextAction (XAccessibleText xText)
                     throws IndexOutOfBoundsException
                 {
-                    return xText.copyText(
-                        GetSelectionStart(),
+                    return xText.copyText( 
+                        GetSelectionStart(), 
                         GetSelectionEnd());
                 }
             };
@@ -90,8 +90,8 @@ public class TextDialogFactory
                 boolean EditableTextAction (XAccessibleEditableText xText)
                     throws IndexOutOfBoundsException
                 {
-                    return xText.cutText(
-                        GetSelectionStart(),
+                    return xText.cutText( 
+                        GetSelectionStart(), 
                         GetSelectionEnd() );
                 }
             };
@@ -120,7 +120,7 @@ public class TextDialogFactory
     {
         JDialog aDialog = new TextEditDialog (
             xContext,
-            "Edit text:",
+            "Edit text:", 
             "edit");
         if (aDialog != null)
             aDialog.show();
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/text/TextEditDialog.java b/accessibility/workben/org/openoffice/accessibility/awb/view/text/TextEditDialog.java
index a8710cbad7cc..9d5aec4649f5 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/view/text/TextEditDialog.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/text/TextEditDialog.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.lang.IndexOutOfBoundsException;
 import com.sun.star.uno.UnoRuntime;
 
 
-class TextEditDialog
+class TextEditDialog 
     extends TextActionDialog
 {
     public TextEditDialog (
         XAccessibleContext xContext,
-        String sExplanation,
+        String sExplanation, 
         String sTitle )
     {
         super (xContext, sExplanation, sTitle);
@@ -83,7 +83,7 @@ class TextEditDialog
                 nFront++;
             int nBack = 0;
             while ((nBack < nMinLength) &&
-                (sNew.charAt(sNew.length()-nBack-1) ==
+                (sNew.charAt(sNew.length()-nBack-1) == 
                  sOld.charAt(sOld.length()-nBack-1)    ))
                 nBack++;
             if (nFront + nBack > nMinLength)
@@ -94,7 +94,7 @@ class TextEditDialog
             String sDel = sOld.substring (nFront, sOld.length() - nBack);
             String sIns = sNew.substring (nFront, sNew.length() - nBack);
 
-            System.out.println ("edit text: " +
+            System.out.println ("edit text: " + 
                 sOld.substring(0, nFront) +
                 " [ " + sDel + " -> " + sIns + " ] " +
                 sOld.substring(sOld.length() - nBack));
diff --git a/accessibility/workben/org/openoffice/accessibility/misc/AccessibleEventMulticaster.java b/accessibility/workben/org/openoffice/accessibility/misc/AccessibleEventMulticaster.java
index 0f56117e1fdf..74780b9710f6 100644
--- a/accessibility/workben/org/openoffice/accessibility/misc/AccessibleEventMulticaster.java
+++ b/accessibility/workben/org/openoffice/accessibility/misc/AccessibleEventMulticaster.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,17 +37,17 @@ import com.sun.star.accessibility.XAccessibleEventListener;
  *
  */
 public class AccessibleEventMulticaster implements XAccessibleEventListener {
-
+           
     private final XAccessibleEventListener a;
     private final XAccessibleEventListener b;
-
+    
     /** Creates a new instance of AccessibleEventMulticaster */
-    protected AccessibleEventMulticaster(XAccessibleEventListener a,
+    protected AccessibleEventMulticaster(XAccessibleEventListener a, 
                                          XAccessibleEventListener b) {
         this.a = a;
         this.b = b;
     }
-
+    
     protected XAccessibleEventListener remove(XAccessibleEventListener l) {
         if (l == a)
             return b;
@@ -60,25 +60,25 @@ public class AccessibleEventMulticaster implements XAccessibleEventListener {
         }
         return add(a2, b2);
     }
-
+    
     public void notifyEvent(AccessibleEventObject accessibleEventObject) {
         a.notifyEvent(accessibleEventObject);
         b.notifyEvent(accessibleEventObject);
     }
-
+    
     public void disposing(EventObject eventObject) {
         a.disposing(eventObject);
         b.disposing(eventObject);
     }
-
+    
     public static XAccessibleEventListener add(XAccessibleEventListener a, XAccessibleEventListener b) {
         if (a == null)
             return b;
-        if (b == null)
+        if (b == null) 
             return a;
         return new AccessibleEventMulticaster(a,b);
     }
-
+    
     public static XAccessibleEventListener remove(XAccessibleEventListener l, XAccessibleEventListener oldl) {
         if (l == oldl || l == null) {
             return null;
@@ -88,5 +88,5 @@ public class AccessibleEventMulticaster implements XAccessibleEventListener {
             return l;
         }
     }
-
+    
 }
diff --git a/accessibility/workben/org/openoffice/accessibility/misc/InformationWriter.java b/accessibility/workben/org/openoffice/accessibility/misc/InformationWriter.java
index fbd1455cd295..f6cf042d93f9 100644
--- a/accessibility/workben/org/openoffice/accessibility/misc/InformationWriter.java
+++ b/accessibility/workben/org/openoffice/accessibility/misc/InformationWriter.java
@@ -76,7 +76,7 @@ public class InformationWriter
         {
             XPropertySet xPropertySet =  (XPropertySet) UnoRuntime.queryInterface(
                 XPropertySet.class, xObject);
-            maOut.println (prefix +
+            maOut.println (prefix + 
                 xPropertySet.getPropertyValue (name));
         }
         catch (Exception e)
@@ -86,7 +86,7 @@ public class InformationWriter
         }
     }
 
-
+    
 
     public void showShapes (XDrawPage xPage)
     {
@@ -94,24 +94,24 @@ public class InformationWriter
         {
             XIndexAccess xShapeList = (XIndexAccess) UnoRuntime.queryInterface(
                 XIndexAccess.class, xPage);
-
-            maOut.println ("There are " + xShapeList.getCount()
+                
+            maOut.println ("There are " + xShapeList.getCount() 
                 + " shapes");
             for (int i=0; i<xShapeList.getCount(); i++)
             {
                 XShape xShape = (XShape) UnoRuntime.queryInterface(
                     XShape.class, xShapeList.getByIndex (i));
-
-                XShapeDescriptor xShapeDescriptor =
+                    
+                XShapeDescriptor xShapeDescriptor = 
                     (XShapeDescriptor) UnoRuntime.queryInterface(
                         XShapeDescriptor.class, xShape);
                 String sName = xShapeDescriptor.getShapeType ();
                 maOut.println ("   shape " + i + " : " + sName);
-
-                XPropertySet xPropertySet =
+                
+                XPropertySet xPropertySet = 
                     (XPropertySet) UnoRuntime.queryInterface(
                         XPropertySet.class, xShape);
-                Integer nZOrder =
+                Integer nZOrder = 
                     (Integer) xPropertySet.getPropertyValue ("ZOrder");
                 maOut.println ("   zorder = " + nZOrder);
             }
@@ -121,11 +121,11 @@ public class InformationWriter
             maOut.println ("caught exception in showShapes: " + e);
         }
     }
+    
 
 
 
-
-    /** @descr Print all available services of the given object to the
+    /** @descr Print all available services of the given object to the 
                 standard output.
     */
     public void showServices (XInterface xObject)
@@ -142,7 +142,7 @@ public class InformationWriter
             else
             {
                 String[] sServiceNames = xMSF.getAvailableServiceNames ();
-                maOut.println ("    object can create "
+                maOut.println ("    object can create " 
                     + sServiceNames.length + " services");
                 for (int i=0; i<sServiceNames.length; i++)
                     maOut.println ("        service " + i + " : " + sServiceNames[i]);
@@ -153,7 +153,7 @@ public class InformationWriter
             maOut.println ("caught exception in showServices : " + e);
         }
     }
-
+    
     /** @descr Print the service and implementation name of the given
                 object.
     */
@@ -171,7 +171,7 @@ public class InformationWriter
             {
                 maOut.println ("    Service name        : " + xSN.getServiceName ());
             }
-
+            
             // Use interface XServiceInfo to retrieve information about
             // supported services.
             XServiceInfo xSI = (XServiceInfo) UnoRuntime.queryInterface (
@@ -180,8 +180,8 @@ public class InformationWriter
                 maOut.println ("    interface XServiceInfo not supported");
             else
             {
-                maOut.println ("    Implementation name : "
-                    + xSI.getImplementationName ());
+                maOut.println ("    Implementation name : " 
+                    + xSI.getImplementationName ());    
             }
         }
         catch (Exception e)
@@ -189,10 +189,10 @@ public class InformationWriter
             maOut.println ("caught exception in showInfo : " + e);
         }
     }
-
-
-
-
+    
+    
+    
+    
     /** @descr Print information about supported interfaces.
     */
     public void showInterfaces (XInterface xObject)
@@ -209,10 +209,10 @@ public class InformationWriter
             else
             {
                 Type[] aTypeList = xTP.getTypes ();
-                maOut.println ("    object supports " + aTypeList.length
+                maOut.println ("    object supports " + aTypeList.length 
                     + " interfaces");
                 for (int i=0; i<aTypeList.length; i++)
-                    maOut.println ("        " + i + " : "
+                    maOut.println ("        " + i + " : " 
                         + aTypeList[i].getTypeName());
             }
         }
@@ -221,8 +221,8 @@ public class InformationWriter
             maOut.println ("caught exception in showInterfaces : " + e);
         }
     }
-
-
+    
+    
     /** @descr Print information concerning the accessibility of the given
         object.
     */
@@ -237,46 +237,46 @@ public class InformationWriter
 
             //  Get XAccessibleContext object if given object does not
             //  already support this interface.
-            XAccessibleContext xContext
+            XAccessibleContext xContext 
                 = (XAccessibleContext) UnoRuntime.queryInterface (
                     XAccessibleContext.class, xObject);
             if (xContext == null)
             {
-                XAccessible xAccessible
+                XAccessible xAccessible 
                     = (XAccessible) UnoRuntime.queryInterface (
                         XAccessible.class, xObject);
                 if (xAccessible == null)
                 {
-                    maOut.println (sIndent + "given object " + xObject
+                    maOut.println (sIndent + "given object " + xObject 
                         + " is not accessible");
                     return false;
                 }
                 else
                     xContext = xAccessible.getAccessibleContext();
             }
-
+            
             //  Print information about the accessible context.
             if (xContext != null)
             {
-                maOut.println (sIndent + "Name         : "
+                maOut.println (sIndent + "Name         : " 
                     + xContext.getAccessibleName());
-                maOut.println (sIndent + "Description  : "
+                maOut.println (sIndent + "Description  : " 
                     + xContext.getAccessibleDescription());
-                maOut.println (sIndent + "Role         : "
+                maOut.println (sIndent + "Role         : " 
                     + xContext.getAccessibleRole());
                 String sHasParent;
                 if (xContext.getAccessibleParent() != null)
                 {
                     maOut.println (sIndent + "Has parent   : yes");
-                    maOut.println (sIndent + "Parent index : "
+                    maOut.println (sIndent + "Parent index : " 
                         + xContext.getAccessibleIndexInParent());
                 }
                 else
                     maOut.println (sIndent + "Has parent   : no");
-                maOut.println (sIndent + "Child count  : "
+                maOut.println (sIndent + "Child count  : " 
                     + xContext.getAccessibleChildCount());
                 maOut.print (sIndent + "Relation set : ");
-                XAccessibleRelationSet xRelationSet
+                XAccessibleRelationSet xRelationSet 
                     = xContext.getAccessibleRelationSet();
                 if (xRelationSet != null)
                 {
@@ -291,13 +291,13 @@ public class InformationWriter
                 }
                 else
                     maOut.println ("no relation set");
-
+                
                 maOut.print (sIndent + "State set    : ");
-                XAccessibleStateSet xStateSet =
+                XAccessibleStateSet xStateSet = 
                     xContext.getAccessibleStateSet();
                 if (xStateSet != null)
                 {
-                    XIndexAccess xStates =
+                    XIndexAccess xStates = 
                         (XIndexAccess) UnoRuntime.queryInterface (
                             XIndexAccess.class, xStateSet);
                     maOut.print (xStates.getCount() + " (");
@@ -316,7 +316,7 @@ public class InformationWriter
             }
             else
                 maOut.println ("object has no accessible context.");
-
+            
             //            showInfo (xContext);
             //            showServices (xContext);
             //            showInterfaces (xContext);
@@ -327,7 +327,7 @@ public class InformationWriter
         }
         return true;
     }
-
+    
 
 
 
@@ -337,20 +337,20 @@ public class InformationWriter
     {
         try
         {
-            XAccessibleComponent xComponent =
+            XAccessibleComponent xComponent = 
                 (XAccessibleComponent) UnoRuntime.queryInterface (
                     XAccessibleComponent.class, xObject);
-
+            
             //  Print information about the accessible context.
             if (xComponent != null)
             {
-                maOut.println (sIndent + "Position        : "
+                maOut.println (sIndent + "Position        : " 
                     + xComponent.getLocation().X+", "
                     + xComponent.getLocation().Y);
-                maOut.println (sIndent + "Screen position : "
+                maOut.println (sIndent + "Screen position : " 
                     + xComponent.getLocationOnScreen().X+", "
                     + xComponent.getLocationOnScreen().Y);
-                maOut.println (sIndent + "Size            : "
+                maOut.println (sIndent + "Size            : " 
                     + xComponent.getSize().Width+", "
                     + xComponent.getSize().Height);
             }
@@ -372,7 +372,7 @@ public class InformationWriter
         {
             if ( ! showAccessibility (xRoot, depth))
                 return false;
-
+            
             String sIndent = "";
             for (int i=0; i<depth; i++)
                 sIndent += "    ";
diff --git a/accessibility/workben/org/openoffice/accessibility/misc/MessageArea.java b/accessibility/workben/org/openoffice/accessibility/misc/MessageArea.java
index d990a517dfc1..1060d91eb422 100644
--- a/accessibility/workben/org/openoffice/accessibility/misc/MessageArea.java
+++ b/accessibility/workben/org/openoffice/accessibility/misc/MessageArea.java
@@ -11,7 +11,7 @@ import javax.swing.JScrollBar;
 
 
 /** A message area displays text in a scrollable text widget.  It is a
-    singleton.  Other objects can access it directly to display messages.
+    singleton.  Other objects can access it directly to display messages. 
 */
 public class MessageArea
     extends JScrollPane
diff --git a/accessibility/workben/org/openoffice/accessibility/misc/NameProvider.java b/accessibility/workben/org/openoffice/accessibility/misc/NameProvider.java
index 736bc2c7f17b..db8d2b0ab85d 100644
--- a/accessibility/workben/org/openoffice/accessibility/misc/NameProvider.java
+++ b/accessibility/workben/org/openoffice/accessibility/misc/NameProvider.java
@@ -102,7 +102,7 @@ public class NameProvider
         maStateMap.put (new Integer (AccessibleStateType.OPAQUE), "OPAQUE");
         maStateMap.put (new Integer (AccessibleStateType.PRESSED), "PRESSED");
         maStateMap.put (new Integer (AccessibleStateType.RESIZABLE), "RESIZABLE");
-        maStateMap.put (new Integer (AccessibleStateType.SELECTABLE), "SELECTABLE");
+        maStateMap.put (new Integer (AccessibleStateType.SELECTABLE), "SELECTABLE");           
         maStateMap.put (new Integer (AccessibleStateType.SELECTED), "SELECTED");
         maStateMap.put (new Integer (AccessibleStateType.SENSITIVE), "SENSITIVE");
         maStateMap.put (new Integer (AccessibleStateType.SHOWING), "SHOWING");
diff --git a/accessibility/workben/org/openoffice/accessibility/misc/OfficeConnection.java b/accessibility/workben/org/openoffice/accessibility/misc/OfficeConnection.java
index d9f77d9e4e07..03e086f1d44c 100644
--- a/accessibility/workben/org/openoffice/accessibility/misc/OfficeConnection.java
+++ b/accessibility/workben/org/openoffice/accessibility/misc/OfficeConnection.java
@@ -55,7 +55,7 @@ public class OfficeConnection
     {
         return maServiceManager;
     }
-
+    
 
 
 
@@ -69,16 +69,16 @@ public class OfficeConnection
 
 
 
-
-    /** Connect to a already running StarOffice application that has
-        been started with a command line argument like
+   
+    /** Connect to a already running StarOffice application that has 
+        been started with a command line argument like 
         "-accept=pipe,name=<username>;urp;"
     */
     private boolean Connect ()
     {
         mbInitialized = true;
         //  Set up connection string.
-        String sConnectString = "uno:pipe,name=" + msPipeName
+        String sConnectString = "uno:pipe,name=" + msPipeName 
                 + ";urp;StarOffice.ServiceManager";
 
         // connect to a running office and get the ServiceManager
@@ -87,14 +87,14 @@ public class OfficeConnection
             //  Create a URL Resolver.
             XMultiServiceFactory aLocalServiceManager =
                 Bootstrap.createSimpleServiceManager();
-            XUnoUrlResolver aURLResolver =
+            XUnoUrlResolver aURLResolver = 
                 (XUnoUrlResolver) UnoRuntime.queryInterface (
                     XUnoUrlResolver.class,
                     aLocalServiceManager.createInstance (
                         "com.sun.star.bridge.UnoUrlResolver")
                     );
-
-            maServiceManager =
+            
+            maServiceManager = 
                 (XMultiServiceFactory) UnoRuntime.queryInterface (
                     XMultiServiceFactory.class,
                     aURLResolver.resolve (sConnectString)
@@ -105,7 +105,7 @@ public class OfficeConnection
         {
             if (maOut != null)
             {
-                maOut.println ("Could not connect with "
+                maOut.println ("Could not connect with " 
                     + sConnectString + " : " + e);
                 maOut.println ("Please start OpenOffice/StarOffice with "
                     + "\"-accept=pipe,name=" + msPipeName + ";urp;\"");
@@ -149,19 +149,19 @@ public class OfficeConnection
         maTimer = new Timer (true);
         maTimer.schedule (this, 0, snDelay);
     }
-
+    
 
     private static OfficeConnection saInstance = null;
     private static String ssDefaultPipeName = System.getenv( "USER" );
 
     private XMultiServiceFactory maServiceManager;
     String msPipeName;
-
+    
     /** A value of true just indicates that it has been tried to establish a connection,
         not that that has been successfull.
     */
     private boolean mbInitialized = false;
-
+    
     /// Stream used to print messages.
     private PrintStream maOut;
     private Timer maTimer;
diff --git a/accessibility/workben/org/openoffice/accessibility/misc/Options.java b/accessibility/workben/org/openoffice/accessibility/misc/Options.java
index e3c358264a1d..a40031156c55 100644
--- a/accessibility/workben/org/openoffice/accessibility/misc/Options.java
+++ b/accessibility/workben/org/openoffice/accessibility/misc/Options.java
@@ -64,7 +64,7 @@ public class Options
         }
         catch (java.io.IOException e)
         {
-            // Ignore a non-existing options file.
+            // Ignore a non-existing options file. 
         }
     }
 
@@ -87,7 +87,7 @@ public class Options
             }
         }
     }
-
+    
     private Options ()
     {
         maFile = null;
diff --git a/accessibility/workben/org/openoffice/accessibility/misc/SimpleOffice.java b/accessibility/workben/org/openoffice/accessibility/misc/SimpleOffice.java
index 3a2dcdf21926..343ccfc4013c 100644
--- a/accessibility/workben/org/openoffice/accessibility/misc/SimpleOffice.java
+++ b/accessibility/workben/org/openoffice/accessibility/misc/SimpleOffice.java
@@ -54,7 +54,7 @@ public class SimpleOffice
     {
         if (saInstance == null)
             saInstance = new SimpleOffice ();
-
+    
         return saInstance;
     }
 
@@ -62,7 +62,7 @@ public class SimpleOffice
     {
         saInstance = null;
     }
-
+    
 
     public XModel LoadDocument (String URL)
     {
@@ -70,7 +70,7 @@ public class SimpleOffice
         try
         {
             //  Load the document from the specified URL.
-            XComponentLoader xLoader =
+            XComponentLoader xLoader = 
                 (XComponentLoader)UnoRuntime.queryInterface(
                     XComponentLoader.class, mxDesktop);
 
@@ -105,7 +105,7 @@ public class SimpleOffice
         XModel xModel = null;
         try
         {
-            XTasksSupplier xTasksSupplier =
+            XTasksSupplier xTasksSupplier = 
                 (XTasksSupplier) UnoRuntime.queryInterface(
                     XTasksSupplier.class, mxDesktop);
             XEnumerationAccess xEA = xTasksSupplier.getTasks();
@@ -149,7 +149,7 @@ public class SimpleOffice
         try
         {
             //  Get the factory of the connected office.
-            XMultiServiceFactory xMSF =
+            XMultiServiceFactory xMSF = 
                     OfficeConnection.Instance().GetServiceManager ();
             if (xMSF == null)
             {
@@ -158,7 +158,7 @@ public class SimpleOffice
             }
             else
                 MessageArea.println ("Connected successfully.");
-
+            
             //  Create a new desktop.
             mxDesktop = (XDesktop) UnoRuntime.queryInterface(
                 XDesktop.class,
@@ -185,7 +185,7 @@ public class SimpleOffice
             try
             {
                 //  Get the factory of the connected office.
-                XMultiServiceFactory xMSF =
+                XMultiServiceFactory xMSF = 
                         OfficeConnection.Instance().GetServiceManager ();
                 if (xMSF != null)
                 {
@@ -261,7 +261,7 @@ public class SimpleOffice
 
 
 
-    /** @descr Return the current window associated with the given
+    /** @descr Return the current window associated with the given 
                 model.
     */
     public XWindow GetCurrentWindow ()
@@ -277,8 +277,8 @@ public class SimpleOffice
     public XWindow GetCurrentWindow (XModel xModel)
     {
         XWindow xWindow = null;
-        try
-        {
+        try 
+        {        
             if (xModel == null)
                 MessageArea.println ("invalid model (==null)");
             XController xController = xModel.getCurrentController();
@@ -295,7 +295,7 @@ public class SimpleOffice
         {
             MessageArea.println ("caught exception while getting current window" + e);
         }
-
+        
         return xWindow;
     }
 
@@ -306,7 +306,7 @@ public class SimpleOffice
     {
         return GetCurrentDrawPage (
             (XDrawView) UnoRuntime.queryInterface(
-                XDrawView.class,
+                XDrawView.class, 
                 GetCurrentView()));
     }
 
@@ -316,8 +316,8 @@ public class SimpleOffice
     public XDrawPage GetCurrentDrawPage (XDrawView xView)
     {
         XDrawPage xPage = null;
-        try
-        {
+        try 
+        {        
             if (xView == null)
                 MessageArea.println ("can't get current draw page from null view");
             else
@@ -327,7 +327,7 @@ public class SimpleOffice
         {
             MessageArea.println ("caught exception while getting current draw page : " + e);
         }
-
+        
         return xPage;
     }
 
@@ -347,8 +347,8 @@ public class SimpleOffice
             MessageArea.println ("can't get desktop to retrieve current view");
 
         XDrawView xView = null;
-        try
-        {
+        try 
+        {        
             XComponent xComponent = xDesktop.getCurrentComponent();
             if (xComponent == null)
                 MessageArea.println ("can't get component to retrieve current view");
@@ -360,7 +360,7 @@ public class SimpleOffice
             XController xController = xFrame.getController();
             if (xController == null)
                 MessageArea.println ("can't get controller to retrieve current view");
-
+            
             xView = (XDrawView) UnoRuntime.queryInterface(
                 XDrawView.class, xController);
             if (xView == null)
@@ -370,7 +370,7 @@ public class SimpleOffice
         {
             MessageArea.println ("caught exception while getting current view : " + e);
         }
-
+        
         return xView;
     }
 
diff --git a/automation/inc/automation/automation.hxx b/automation/inc/automation/automation.hxx
index aaf54e24d564..ce997c8ba969 100644
--- a/automation/inc/automation/automation.hxx
+++ b/automation/inc/automation/automation.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/automation/inc/automation/commdefines.hxx b/automation/inc/automation/commdefines.hxx
index 15e38a8ff897..caf6da73dca3 100644
--- a/automation/inc/automation/commdefines.hxx
+++ b/automation/inc/automation/commdefines.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 /*************************************************************************
  *
- *    ATTENTION
- *    This file is intended to work inside and outside the StarOffice environment.
- *    Only adaption of file commtypes.hxx should be necessary. Else it is a bug!
+ *	  ATTENTION
+ *	  This file is intended to work inside and outside the StarOffice environment.
+ *	  Only adaption of file commtypes.hxx should be necessary. Else it is a bug!
  *
  ************************************************************************/
 
@@ -104,47 +104,47 @@
 Defines für Header Typen:
 
 Allgemeiner Header:
-        Byte    Länge       Inhalt
-        0..3        4       Länge des Paketes ohne diese 4 Byte
-        4           1       Prüfsumme über die Länge. Stimmt sie nicht wird die Verbindung geschlossen
-        5..6        2       Länge des Headers ohne diese 2 Byte
-        7..8        2       Typ des Headers
+        Byte	Länge		Inhalt
+        0..3		4		Länge des Paketes ohne diese 4 Byte
+        4			1		Prüfsumme über die Länge. Stimmt sie nicht wird die Verbindung geschlossen
+        5..6		2		Länge des Headers ohne diese 2 Byte
+        7..8		2		Typ des Headers
 
 CH_SimpleMultiChannel:
-        9..10       2       Channel
-CH_Handshake                Internal Use ONLY
+        9..10		2		Channel
+CH_Handshake				Internal Use ONLY
                             Keine Weiteren Daten!
 
 **/
 typedef comm_UINT16 CMProtocol;
 
-#define CM_PROTOCOL_OLDSTYLE        (CMProtocol)0x0001
-#define CM_PROTOCOL_MARS            (CMProtocol)0x0001
-#define CM_PROTOCOL_BROADCASTER     (CMProtocol)0x0002
-#define CM_PROTOCOL_USER_START      (CMProtocol)0x0100
+#define CM_PROTOCOL_OLDSTYLE		(CMProtocol)0x0001
+#define CM_PROTOCOL_MARS			(CMProtocol)0x0001
+#define CM_PROTOCOL_BROADCASTER		(CMProtocol)0x0002
+#define CM_PROTOCOL_USER_START		(CMProtocol)0x0100
 
 typedef comm_USHORT HandshakeType;
 typedef comm_USHORT CommunicationOption;
 
-#define CH_NoHeader                 0x0000
-#define CH_SimpleMultiChannel       0x0001
-#define CH_Handshake                0x0002
+#define CH_NoHeader					0x0000
+#define CH_SimpleMultiChannel		0x0001
+#define CH_Handshake				0x0002
 
-#define CH_REQUEST_HandshakeAlive   ((HandshakeType)0x0101) /// Fordert eine Alive Antwort an
-#define CH_RESPONSE_HandshakeAlive  ((HandshakeType)0x0102) /// Alive Antwort
+#define CH_REQUEST_HandshakeAlive	((HandshakeType)0x0101)	/// Fordert eine Alive Antwort an
+#define CH_RESPONSE_HandshakeAlive	((HandshakeType)0x0102)	/// Alive Antwort
 
 /**
     Announce supported options:
     Client announces available options
     Server returns subset of these options (note that the sbset can be the entire set also)
 **/
-#define CH_SUPPORT_OPTIONS          ((HandshakeType)0x0103)
-#define OPT_USE_SHUTDOWN_PROTOCOL   ((CommunicationOption)0x0001)
+#define CH_SUPPORT_OPTIONS			((HandshakeType)0x0103)
+#define OPT_USE_SHUTDOWN_PROTOCOL	((CommunicationOption)0x0001)
 
 /// these are for making sure all Data is read prior to shutting sown the link
-#define CH_REQUEST_ShutdownLink     ((HandshakeType)0x0104) /// Request to Shutdown this link
-#define CH_ShutdownLink             ((HandshakeType)0x0105) /// Shutdown this link
+#define CH_REQUEST_ShutdownLink		((HandshakeType)0x0104)	/// Request to Shutdown this link
+#define CH_ShutdownLink				((HandshakeType)0x0105)	/// Shutdown this link
 
-#define CH_SetApplication           ((HandshakeType)0x0106) /// Set Description of Client
+#define CH_SetApplication			((HandshakeType)0x0106)	/// Set Description of Client
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/inc/automation/commtypes.hxx b/automation/inc/automation/commtypes.hxx
index 1dc7f4383559..b95f894ed02c 100644
--- a/automation/inc/automation/commtypes.hxx
+++ b/automation/inc/automation/commtypes.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 /*************************************************************************
  *
- *    ATTENTION
- *    This file is intended to supply the types and defines for Environment independent
- *    building of the packethandler
- *    Only adaption of this file should be necessary. Else it is a bug!
+ *	  ATTENTION
+ *	  This file is intended to supply the types and defines for	Environment independent
+ *	  building of the packethandler
+ *	  Only adaption of this file should be necessary. Else it is a bug!
  *    Eather including apropriate files or defining the types when not available in the environment
  *
  ************************************************************************/
diff --git a/automation/inc/automation/communi.hxx b/automation/inc/automation/communi.hxx
index 5f873f5b393f..079deb703ce5 100644
--- a/automation/inc/automation/communi.hxx
+++ b/automation/inc/automation/communi.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 MultiCommunicationManager : public CommunicationManager
 public:
     MultiCommunicationManager( BOOL bUseMultiChannel = FALSE );
     virtual ~MultiCommunicationManager();
-    virtual BOOL StopCommunication();       // Hält alle CommunicationLinks an
+    virtual BOOL StopCommunication();		// Hält alle CommunicationLinks an
     virtual BOOL IsLinkValid( CommunicationLink* pCL );
     virtual USHORT GetCommunicationLinkCount();
     virtual CommunicationLinkRef GetCommunicationLink( USHORT nNr );
@@ -58,9 +58,9 @@ protected:
     virtual void CallConnectionOpened( CommunicationLink* pCL );
     virtual void CallConnectionClosed( CommunicationLink* pCL );
     CommunicationLinkList *ActiveLinks;
-    CommunicationLinkList *InactiveLinks;       /// Hier sind die CommunicationLinks drin, die sich noch nicht selbst abgemeldet haben.
+    CommunicationLinkList *InactiveLinks;		/// Hier sind die CommunicationLinks drin, die sich noch nicht selbst abgemeldet haben.
                                                 /// allerdings schon ein StopCommunication gekriegt haben, bzw ein ConnectionTerminated
-    virtual void DestroyingLink( CommunicationLink *pCL );  // Link trägt sich im Destruktor aus
+    virtual void DestroyingLink( CommunicationLink *pCL );	// Link trägt sich im Destruktor aus
 
     BOOL bGracefullShutdown;
 };
@@ -150,7 +150,7 @@ private:
     ULONG nPortToListen;
     USHORT nMaxConnections;
     ULONG nAddConnectionEventId;
-    osl::Mutex aMAddConnection; // Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist
+    osl::Mutex aMAddConnection;	// Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist
     void CallInfoMsg( InfoString aMsg ){ pMyServer->CallInfoMsg( aMsg ); }
     CM_InfoType GetInfoType(){ return pMyServer->GetInfoType(); }
 
diff --git a/automation/inc/automation/simplecm.hxx b/automation/inc/automation/simplecm.hxx
index 91a44f17f639..65da5a091667 100644
--- a/automation/inc/automation/simplecm.hxx
+++ b/automation/inc/automation/simplecm.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,32 +38,32 @@
 #include <automation/commdefines.hxx>
 
 // CM steht für CommunicationManager
-#define CM_UNLIMITED_CONNECTIONS    0xffff
+#define CM_UNLIMITED_CONNECTIONS	0xffff
 
 typedef USHORT CM_NameType;
-#define CM_DOTTED   ( (CM_NameType) 01 )
-#define CM_FQDN     ( (CM_NameType) 02 )
+#define CM_DOTTED	( (CM_NameType) 01 )
+#define CM_FQDN		( (CM_NameType) 02 )
 
 typedef USHORT CM_InfoType;
 // nur eines dieser 3 defines darf verwendet werden
-#define CM_NO_TEXT      ( (CM_InfoType) 01 )
-#define CM_SHORT_TEXT   ( (CM_InfoType) 02 )
-#define CM_VERBOSE_TEXT ( (CM_InfoType) 03 )
+#define CM_NO_TEXT		( (CM_InfoType) 01 )
+#define CM_SHORT_TEXT	( (CM_InfoType) 02 )
+#define CM_VERBOSE_TEXT	( (CM_InfoType) 03 )
 
-#define CM_OPEN         ( (CM_InfoType) 0x0004 )
-#define CM_CLOSE        ( (CM_InfoType) 0x0008 )
-#define CM_RECEIVE      ( (CM_InfoType) 0x0010 )
-#define CM_SEND         ( (CM_InfoType) 0x0020 )
-#define CM_ERROR        ( (CM_InfoType) 0x0040 )
-#define CM_MISC         ( (CM_InfoType) 0x0080 )
+#define CM_OPEN			( (CM_InfoType) 0x0004 )
+#define CM_CLOSE		( (CM_InfoType) 0x0008 )
+#define CM_RECEIVE		( (CM_InfoType) 0x0010 )
+#define CM_SEND			( (CM_InfoType) 0x0020 )
+#define CM_ERROR		( (CM_InfoType) 0x0040 )
+#define CM_MISC			( (CM_InfoType) 0x0080 )
 
-#define CM_USER_1       ( (CM_InfoType) 0x0100 )
-#define CM_USER_2       ( (CM_InfoType) 0x0200 )
-#define CM_USER_3       ( (CM_InfoType) 0x0400 )
-#define CM_USER_4       ( (CM_InfoType) 0x0800 )
+#define CM_USER_1		( (CM_InfoType) 0x0100 )
+#define CM_USER_2		( (CM_InfoType) 0x0200 )
+#define CM_USER_3		( (CM_InfoType) 0x0400 )
+#define CM_USER_4		( (CM_InfoType) 0x0800 )
 
-#define CM_ALL          ( CM_OPEN | CM_CLOSE | CM_RECEIVE | CM_SEND | CM_ERROR | CM_MISC )
-#define CM_NONE         ( 0 )
+#define CM_ALL			( CM_OPEN | CM_CLOSE | CM_RECEIVE | CM_SEND | CM_ERROR | CM_MISC )
+#define CM_NONE			( 0 )
 
 #define CByteString( constAsciiStr ) ByteString( RTL_CONSTASCII_STRINGPARAM ( constAsciiStr ) )
 
@@ -100,12 +100,12 @@ typedef USHORT CM_InfoType;
 class CommunicationLink;
 
 /*#undef  PRV_SV_DECL_REF_LOCK
-#define PRV_SV_DECL_REF_LOCK(ClassName, Ref)    \
-protected:                                      \
-    ClassName * pObj;                           \
-public:                                         \
-PRV_SV_DECL_REF_SIGNATURE(ClassName, Ref)       \
-    inline               ClassName##Ref( void * pObjP ){ClassName##Ref ((ClassName *) pObjP);}          \
+#define PRV_SV_DECL_REF_LOCK(ClassName, Ref)	\
+protected:										\
+    ClassName * pObj;							\
+public:											\
+PRV_SV_DECL_REF_SIGNATURE(ClassName, Ref)		\
+    inline               ClassName##Ref( void * pObjP ){ClassName##Ref ((ClassName *) pObjP);}			\
 */
 
 SV_DECL_REF( CommunicationLink )
@@ -135,7 +135,7 @@ protected:
     friend class CommunicationManagerServerAcceptThread;
     // Darf nicht abgeräumt werden zwischen Empfang des Streams und ende des Callbacks
 
-protected:  // so daß nur über Ref gelöscht werden kann
+protected:	// so daß nur über Ref gelöscht werden kann
     virtual ~CommunicationLink();
     void InvalidateManager() { pMyManager = NULL; }
 
@@ -148,13 +148,13 @@ public:
     virtual BOOL IsCommunicationError()=0;
     CommunicationManager* GetCommunicationManager(){ return pMyManager; }
 
-//  Der Name oder die IP-Adresse oder sonstwas um den Communikationspartner zu identifizieren
+//	Der Name oder die IP-Adresse oder sonstwas um den Communikationspartner zu identifizieren
     virtual ByteString GetCommunicationPartner( CM_NameType eType )=0;
 
-//  Der Name oder die IP-Adresse oder sonstwas um den Communikationspartner zu identifizieren
+//	Der Name oder die IP-Adresse oder sonstwas um den Communikationspartner zu identifizieren
     virtual ByteString GetMyName( CM_NameType eType )=0;
 
-//  Liefert einen neuen Stream zum Versenden von Daten.
+//	Liefert einen neuen Stream zum Versenden von Daten.
     virtual SvStream* GetBestCommunicationStream()=0;
 
     /** will call virtual function DoTransferDataStream to do actual work
@@ -205,7 +205,7 @@ protected:
 
     virtual BOOL SendHandshake( HandshakeType aHandshakeType, SvStream* pData = NULL)=0;
 
-    virtual BOOL ShutdownCommunication() = 0;   /// Really stop the Communication
+    virtual BOOL ShutdownCommunication() = 0;	/// Really stop the Communication
 
     /// Statistics
     DateTime aStart;
@@ -238,14 +238,14 @@ public:
     virtual BOOL StartCommunication()=0;
     virtual BOOL StartCommunication( String aApp, String aParams );
     virtual BOOL StartCommunication( ByteString aHost, ULONG nPort );
-    virtual BOOL StopCommunication()=0;     // Hält alle CommunicationLinks an
+    virtual BOOL StopCommunication()=0;		// Hält alle CommunicationLinks an
     virtual BOOL IsCommunicationRunning() { return bIsCommunicationRunning; }
-//  virtual BOOL IsCommunicationError();
+//	virtual BOOL IsCommunicationError();
 
-//  Der Name oder die IP-Adresse oder sonstwas um den Communikationspartner zu identifizieren
+//	Der Name oder die IP-Adresse oder sonstwas um den Communikationspartner zu identifizieren
     virtual ByteString GetMyName( CM_NameType eType );
 
-    virtual BOOL IsLinkValid( CommunicationLink* pCL )=0;   // Notwendig für call im Destruktor
+    virtual BOOL IsLinkValid( CommunicationLink* pCL )=0;	// Notwendig für call im Destruktor
 
     virtual USHORT GetCommunicationLinkCount()=0;
     virtual CommunicationLinkRef GetCommunicationLink( USHORT nNr )=0;
@@ -275,7 +275,7 @@ protected:
 
     CM_InfoType nInfoType;
 
-    //  Diese Routinen rufen den Link oder sind überladen
+    // 	Diese Routinen rufen den Link oder sind überladen
     virtual void ConnectionOpened( CommunicationLink* pCL ){ mlConnectionOpened.Call( pCL ); }
     virtual void ConnectionClosed( CommunicationLink* pCL ){ mlConnectionClosed.Call( pCL ); }
     virtual void DataReceived( CommunicationLink* pCL ){ mlDataReceived.Call( pCL ); }
@@ -283,7 +283,7 @@ protected:
 
     BOOL bIsCommunicationRunning;
 
-    virtual void DestroyingLink( CommunicationLink *pCL )=0;    // Link trägt sich im Destruktor aus
+    virtual void DestroyingLink( CommunicationLink *pCL )=0;	// Link trägt sich im Destruktor aus
 
 private:
     ByteString maApplication;
@@ -301,7 +301,7 @@ class SingleCommunicationManager : public CommunicationManager
 public:
     SingleCommunicationManager( BOOL bUseMultiChannel = FALSE );
     virtual ~SingleCommunicationManager();
-    virtual BOOL StopCommunication();       // Hält alle CommunicationLinks an
+    virtual BOOL StopCommunication();		// Hält alle CommunicationLinks an
     virtual BOOL IsLinkValid( CommunicationLink* pCL );
     virtual USHORT GetCommunicationLinkCount();
     virtual CommunicationLinkRef GetCommunicationLink( USHORT nNr );
@@ -311,14 +311,14 @@ protected:
     virtual void CallConnectionClosed( CommunicationLink* pCL );
     CommunicationLinkRef xActiveLink;
     CommunicationLink *pInactiveLink;
-    virtual void DestroyingLink( CommunicationLink *pCL );  // Link trägt sich im Destruktor aus
+    virtual void DestroyingLink( CommunicationLink *pCL );	// Link trägt sich im Destruktor aus
 };
 
 class ICommunicationManagerClient
 {
     friend class CommonSocketFunctions;
 protected:
-    virtual BOOL RetryConnect() { return FALSE; }   // Kann dann eventuell die Applikation starten
+    virtual BOOL RetryConnect() { return FALSE; }	// Kann dann eventuell die Applikation starten
 };
 
 class TCPIO;
@@ -348,7 +348,7 @@ protected:
     void SetStreamSocket( osl::StreamSocket* pSocket );
 
     SvStream *pReceiveStream;
-    BOOL DoReceiveDataStream();             /// Recieve DataPacket from Socket
+    BOOL DoReceiveDataStream();				/// Recieve DataPacket from Socket
     virtual BOOL SendHandshake( HandshakeType aHandshakeType, SvStream* pData = NULL);
     bool IsReceiveReady();
     BOOL bIsRequestShutdownPending;
@@ -363,7 +363,7 @@ public:
     ~SimpleCommunicationLinkViaSocketWithReceiveCallbacks();
     virtual BOOL ReceiveDataStream();
 protected:
-    virtual BOOL ShutdownCommunication();   /// Really stop the Communication
+    virtual BOOL ShutdownCommunication();	/// Really stop the Communication
     virtual void WaitForShutdown();
 };
 
diff --git a/automation/inc/pch/precompiled_automation.cxx b/automation/inc/pch/precompiled_automation.cxx
index e07b325283d8..0c5612989c7b 100644
--- a/automation/inc/pch/precompiled_automation.cxx
+++ b/automation/inc/pch/precompiled_automation.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/automation/inc/pch/precompiled_automation.hxx b/automation/inc/pch/precompiled_automation.hxx
index 05a8e8250f74..8f1227723042 100644
--- a/automation/inc/pch/precompiled_automation.hxx
+++ b/automation/inc/pch/precompiled_automation.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/automation/source/app/testbasi.cxx b/automation/source/app/testbasi.cxx
index 101d72b3471b..12fc5c057112 100644
--- a/automation/source/app/testbasi.cxx
+++ b/automation/source/app/testbasi.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/automation/source/app/testbasi.hxx b/automation/source/app/testbasi.hxx
index 89d870a66cb4..7b375d60dfce 100644
--- a/automation/source/app/testbasi.hxx
+++ b/automation/source/app/testbasi.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 class ErrorEntry;
 
-#define SBXID_TTBASIC   0x5454      // TTBasic: TT
+#define SBXID_TTBASIC	0x5454		// TTBasic: TT
 
 #define SBXCR_TEST2   0x54534554L   // TEST
 
@@ -51,10 +51,10 @@ public:
     // nicht mit #ifdefs klammern, da diese Headerdatei für testtool und basic
     // gleichermaßen verwendet wird.
     DECL_LINK( CErrorImpl, ErrorEntry* );
-//  SbxObject *pTestObject;         // für das Testtool; ansonsten NULL
+//	SbxObject *pTestObject;			// für das Testtool; ansonsten NULL
 
     void LoadIniFile();
-    SbTextType GetSymbolType( const String &Symbol, BOOL bWasTTControl );   // Besimmt den erweiterten Symboltyp für das Syntaxhighlighting
+    SbTextType GetSymbolType( const String &Symbol, BOOL bWasTTControl );	// Besimmt den erweiterten Symboltyp für das Syntaxhighlighting
     virtual const String GetSpechialErrorText();
     virtual void ReportRuntimeError( AppBasEd *pEditWin );
     virtual void DebugFindNoErrors( BOOL bDebugFindNoErrors );
diff --git a/automation/source/communi/communi.cxx b/automation/source/communi/communi.cxx
index f19b095449ff..ede17dd23ed0 100644
--- a/automation/source/communi/communi.cxx
+++ b/automation/source/communi/communi.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include <automation/communi.hxx>
 
 
-/*  Um den Destruktor protected zu machen wurde unten das delete entfernt.
+/*	Um den Destruktor protected zu machen wurde unten das delete entfernt.
     Die Methode wird ohnehin hucht benutzt.
-//              delete *((AE*)pData+n);
+//				delete *((AE*)pData+n);
 */
 
 #undef  SV_IMPL_PTRARR_SORT
@@ -67,7 +67,7 @@ _SV_SEEK_PTR( nm, AE )
 
 SV_IMPL_PTRARR_SORT( CommunicationLinkList, CommunicationLink* );
 
-osl::Mutex *pMPostUserEvent=NULL;       // Notwendig, da nicht threadfest
+osl::Mutex *pMPostUserEvent=NULL;		// Notwendig, da nicht threadfest
 
 CommunicationLinkViaSocket::CommunicationLinkViaSocket( CommunicationManager *pMan, osl::StreamSocket* pSocket )
 : SimpleCommunicationLinkViaSocket( pMan, pSocket )
@@ -126,10 +126,10 @@ BOOL CommunicationLinkViaSocket::ShutdownCommunication()
         if ( GetStreamSocket() )
             GetStreamSocket()->shutdown();
 
-        if ( GetStreamSocket() )    // Mal wieder nach oben verschoben, da sonst nicht vom Read runtergesprungen wird.
+        if ( GetStreamSocket() )	// Mal wieder nach oben verschoben, da sonst nicht vom Read runtergesprungen wird.
             GetStreamSocket()->close();
 
-        resume();   // So daß das run auch die Schleife verlassen kann
+        resume();	// So daß das run auch die Schleife verlassen kann
 
         join();
 
@@ -137,7 +137,7 @@ BOOL CommunicationLinkViaSocket::ShutdownCommunication()
         SetStreamSocket( NULL );
         delete pTempSocket;
 
-//      ConnectionClosed();     Wird am Ende des Thread gerufen
+//		ConnectionClosed();		Wird am Ende des Thread gerufen
 
     }
     else
@@ -174,7 +174,7 @@ void CommunicationLinkViaSocket::WaitForShutdown()
 {
     if ( !bShutdownStarted )
     {
-        aShutdownTimer.SetTimeout( 30000 );     // Should be 30 Seconds
+        aShutdownTimer.SetTimeout( 30000 );		// Should be 30 Seconds
         aShutdownTimer.SetTimeoutHdl( LINK( this, CommunicationLinkViaSocket, ShutdownLink ) );
         aShutdownTimer.Start();
         bShutdownStarted = TRUE;
@@ -205,7 +205,7 @@ void CommunicationLinkViaSocket::run()
             continue;
 
         TimeValue sNochEins = {0, 1000000};
-        while ( schedule() && bIsInsideCallback )   // solange der letzte Callback nicht beendet ist
+        while ( schedule() && bIsInsideCallback )	// solange der letzte Callback nicht beendet ist
             wait( sNochEins );
         SetNewPacketAsCurrent();
         StartCallback();
@@ -216,7 +216,7 @@ void CommunicationLinkViaSocket::run()
         }
     }
     TimeValue sNochEins = {0, 1000000};
-    while ( schedule() && bIsInsideCallback )   // solange der letzte Callback nicht beendet ist
+    while ( schedule() && bIsInsideCallback )	// solange der letzte Callback nicht beendet ist
         wait( sNochEins );
 
     StartCallback();
@@ -240,7 +240,7 @@ long CommunicationLinkViaSocket::ConnectionClosed( void* EMPTYARG )
 {
     {
         osl::MutexGuard aGuard( aMConnectionClosed );
-        nConnectionClosedEventId = 0;   // Achtung!! alles andere muß oben gemacht werden.
+        nConnectionClosedEventId = 0;	// Achtung!! alles andere muß oben gemacht werden.
     }
     ShutdownCommunication();
     return CommunicationLink::ConnectionClosed( );
@@ -251,7 +251,7 @@ long CommunicationLinkViaSocket::DataReceived( void* EMPTYARG )
 {
     {
         osl::MutexGuard aGuard( aMDataReceived );
-        nDataReceivedEventId = 0;   // Achtung!! alles andere muß oben gemacht werden.
+        nDataReceivedEventId = 0;	// Achtung!! alles andere muß oben gemacht werden.
     }
     return CommunicationLink::DataReceived( );
 }
@@ -359,7 +359,7 @@ CommunicationLinkRef MultiCommunicationManager::GetCommunicationLink( USHORT nNr
 
 void MultiCommunicationManager::CallConnectionOpened( CommunicationLink* pCL )
 {
-    CommunicationLinkRef rHold(pCL);    // Hält den Zeiger bis zum Ende des calls
+    CommunicationLinkRef rHold(pCL);	// Hält den Zeiger bis zum Ende des calls
     ActiveLinks->C40_PTR_INSERT(CommunicationLink, pCL);
     rHold->AddRef();
 
@@ -368,20 +368,20 @@ void MultiCommunicationManager::CallConnectionOpened( CommunicationLink* pCL )
 
 void MultiCommunicationManager::CallConnectionClosed( CommunicationLink* pCL )
 {
-    CommunicationLinkRef rHold(pCL);    // Hält denm Zeiger bis zum Ende des calls
+    CommunicationLinkRef rHold(pCL);	// Hält denm Zeiger bis zum Ende des calls
 
     CommunicationManager::CallConnectionClosed( pCL );
 
     USHORT nPos;
     if ( ActiveLinks->Seek_Entry( pCL, &nPos ) )
     {
-        InactiveLinks->C40_PTR_INSERT(CommunicationLink, pCL);  // Ohne Reference
+        InactiveLinks->C40_PTR_INSERT(CommunicationLink, pCL);	// Ohne Reference
         ActiveLinks->Remove( nPos );
     }
     pCL->ReleaseReference();
 
     bIsCommunicationRunning = ActiveLinks->Count() > 0;
-//  delete pCL;
+//	delete pCL;
 #if OSL_DEBUG_LEVEL > 1
         rHold->bFlag = TRUE;
 #endif
@@ -461,16 +461,16 @@ CommunicationManagerServerAcceptThread::CommunicationManagerServerAcceptThread(
 
 CommunicationManagerServerAcceptThread::~CommunicationManagerServerAcceptThread()
 {
-#ifndef aUNX        // Weil das Accept nicht abgebrochen werden kann, so terminiert wenigstens das Prog
+#ifndef aUNX		// Weil das Accept nicht abgebrochen werden kann, so terminiert wenigstens das Prog
     // #62855# pl: gilt auch bei anderen Unixen
     // die richtige Loesung waere natuerlich, etwas auf die pipe zu schreiben,
     // was der thread als Abbruchbedingung erkennt
     // oder wenigstens ein kill anstatt join
     terminate();
     if ( pAcceptorSocket )
-        pAcceptorSocket->close();   // Dann das Accept unterbrechen
+        pAcceptorSocket->close();	// Dann das Accept unterbrechen
 
-    join();     // Warten bis fertig
+    join();		// Warten bis fertig
 
     if ( pAcceptorSocket )
     {
@@ -491,7 +491,7 @@ CommunicationManagerServerAcceptThread::~CommunicationManagerServerAcceptThread(
                 CByteString( "AddConnectionEvent aus Queue gelöscht"),
                 CM_MISC, xNewConnection );
             xNewConnection->InvalidateManager();
-            xNewConnection.Clear(); // sollte das Objekt hier löschen
+            xNewConnection.Clear();	// sollte das Objekt hier löschen
         }
     }
 }
@@ -527,7 +527,7 @@ void CommunicationManagerServerAcceptThread::run()
                 pStreamSocket->setOption( osl_Socket_OptionTcpNoDelay, 1 );
 
                 TimeValue sNochEins = {0, 100};
-                while ( schedule() && xmNewConnection.Is() )    // Solange die letzte Connection nicht abgeholt wurde warten wir
+                while ( schedule() && xmNewConnection.Is() )	// Solange die letzte Connection nicht abgeholt wurde warten wir
                     wait( sNochEins );
                 xmNewConnection = new CommunicationLinkViaSocket( pMyServer, pStreamSocket );
                 xmNewConnection->StartCallback();
diff --git a/automation/source/inc/cmdbasestream.hxx b/automation/source/inc/cmdbasestream.hxx
index 0170b08aefe0..8ac97299e1cf 100644
--- a/automation/source/inc/cmdbasestream.hxx
+++ b/automation/source/inc/cmdbasestream.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 /*************************************************************************
  *
- *    ATTENTION
- *    This file is intended to work inside and outside the StarOffice environment.
- *    Only adaption of file commtypes.hxx should be necessary. Else it is a bug!
+ *	  ATTENTION
+ *	  This file is intended to work inside and outside the StarOffice environment.
+ *	  Only adaption of file commtypes.hxx should be necessary. Else it is a bug!
  *
  ************************************************************************/
 
diff --git a/automation/source/inc/icommstream.hxx b/automation/source/inc/icommstream.hxx
index adc9be16063e..cb74977d6274 100644
--- a/automation/source/inc/icommstream.hxx
+++ b/automation/source/inc/icommstream.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 /*************************************************************************
  *
- *    ATTENTION
- *    This file is intended to work inside and outside the StarOffice environment.
- *    Only adaption of file commtypes.hxx should be necessary. Else it is a bug!
+ *	  ATTENTION
+ *	  This file is intended to work inside and outside the StarOffice environment.
+ *	  Only adaption of file commtypes.hxx should be necessary. Else it is a bug!
  *
  ************************************************************************/
 
@@ -46,19 +46,19 @@ public:
     ICommStream(){}
     virtual ~ICommStream(){}
 
-    virtual ICommStream&    operator>>( comm_USHORT& rUShort )=0;
-    virtual ICommStream&    operator>>( comm_ULONG& rULong )=0;
-    virtual ICommStream&    operator>>( comm_BOOL& rChar )=0;
+    virtual ICommStream&	operator>>( comm_USHORT& rUShort )=0;
+    virtual ICommStream&	operator>>( comm_ULONG& rULong )=0;
+    virtual ICommStream&	operator>>( comm_BOOL& rChar )=0;
 
-    virtual ICommStream&    operator<<( comm_USHORT nUShort )=0;
-    virtual ICommStream&    operator<<( comm_ULONG nULong )=0;
-    virtual ICommStream&    operator<<( comm_BOOL nChar )=0;
+    virtual ICommStream&	operator<<( comm_USHORT nUShort )=0;
+    virtual ICommStream&	operator<<( comm_ULONG nULong )=0;
+    virtual ICommStream&	operator<<( comm_BOOL nChar )=0;
 
-    virtual comm_ULONG          Read( void* pData, comm_ULONG nSize )=0;
-    virtual comm_ULONG          Write( const void* pData, comm_ULONG nSize )=0;
+    virtual comm_ULONG			Read( void* pData, comm_ULONG nSize )=0;
+    virtual comm_ULONG			Write( const void* pData, comm_ULONG nSize )=0;
 
-    virtual comm_BOOL       IsEof() const=0;
-    virtual comm_ULONG      SeekRel( long nPos )=0;
+    virtual comm_BOOL		IsEof() const=0;
+    virtual comm_ULONG		SeekRel( long nPos )=0;
 
 };
 
diff --git a/automation/source/inc/rcontrol.hxx b/automation/source/inc/rcontrol.hxx
index f3609b9de3d9..e8beabe2b63b 100644
--- a/automation/source/inc/rcontrol.hxx
+++ b/automation/source/inc/rcontrol.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 /*************************************************************************
  *
- *    ATTENTION
- *    This file is intended to work inside and outside the StarOffice environment.
- *    Only adaption of file commtypes.hxx should be necessary. Else it is a bug!
+ *	  ATTENTION
+ *	  This file is intended to work inside and outside the StarOffice environment.
+ *	  Only adaption of file commtypes.hxx should be necessary. Else it is a bug!
  *
  ************************************************************************/
 
@@ -38,34 +38,34 @@
 #define _RCONTROL_HXX
 
 
-#define UID_ACTIVE          0
+#define UID_ACTIVE			0
 
 
-#define SI_IPCCommandBlock  1
-#define SI_SocketCommandBlock   SI_IPCCommandBlock  // Zumindest erstmal
-#define SI_DirectCommandBlock   2
-#define SIControl           3
-#define SISlot              4
-#define SIFlow              5
-#define SICommand           6
-#define SIUnoSlot           7
-#define SIStringControl     8
+#define SI_IPCCommandBlock	1
+#define SI_SocketCommandBlock	SI_IPCCommandBlock	// Zumindest erstmal
+#define SI_DirectCommandBlock	2
+#define SIControl			3
+#define SISlot				4
+#define SIFlow				5
+#define SICommand			6
+#define SIUnoSlot			7
+#define SIStringControl		8
 
-#define SIReturnBlock       11
-#define SIReturn            12
-#define SIReturnError       13
+#define SIReturnBlock		11
+#define SIReturn			12
+#define SIReturnError		13
 
 // Typisierung im Stream
-#define BinUSHORT           11
-#define BinULONG            14
-#define BinString           12
-#define BinBool             13
-#define BinSbxValue         15
+#define BinUSHORT			11
+#define BinULONG			14
+#define BinString			12
+#define BinBool				13
+#define BinSbxValue			15
 
 
 // Classes
 // !!!Diese Defines duerfen niemals geaendert werden!!!
-#define C_NoType            -1
+#define C_NoType			-1
 // Maximale 32 einfache Controls
 #define C_TabControl        0
 #define C_RadioButton       1
@@ -79,62 +79,62 @@
 #define C_PushButton        9
 
 #define C_SpinField         10
-#define C_PatternField      11
-#define C_NumericField      12
-#define C_MetricField       13
-#define C_CurrencyField     14
-#define C_DateField         15
-#define C_TimeField         16
-
-#define C_ImageRadioButton  17
-#define C_NumericBox        18
-#define C_MetricBox         19
-#define C_CurrencyBox       20
-#define C_DateBox           21
-#define C_TimeBox           22
-
-#define C_ImageButton       23
-#define C_MenuButton        24
-#define C_MoreButton        25
+#define C_PatternField		11
+#define C_NumericField		12
+#define C_MetricField		13
+#define C_CurrencyField		14
+#define C_DateField			15
+#define C_TimeField			16
+
+#define C_ImageRadioButton	17
+#define C_NumericBox		18
+#define C_MetricBox			19
+#define C_CurrencyBox		20
+#define C_DateBox			21
+#define C_TimeBox			22
+
+#define C_ImageButton		23
+#define C_MenuButton		24
+#define C_MoreButton		25
 
 // Maximale 7 Container
-#define C_TabPage           32
+#define	C_TabPage			32
 #define C_ModalDlg          33
-#define C_FloatWin          34
-#define C_ModelessDlg       35
-#define C_WorkWin           36
+#define	C_FloatWin			34
+#define C_ModelessDlg		35
+#define	C_WorkWin			36
 #define C_DockingWin        37
 
 // Diese Defines koennen geaendert werden
-#define C_MessBox           40
-#define C_InfoBox           41
-#define C_WarningBox        42
-#define C_ErrorBox          43
-#define C_QueryBox          44
+#define C_MessBox			40
+#define C_InfoBox			41
+#define C_WarningBox		42
+#define C_ErrorBox			43
+#define C_QueryBox			44
 
-#define C_TabDlg            45
-#define C_SingleTabDlg      46
+#define	C_TabDlg			45
+#define	C_SingleTabDlg		46
 
-#define C_Window            47
+#define C_Window			47
 
 
-#define C_PatternBox        60
-#define C_ToolBox           61
-#define C_ValueSet          62
-#define C_Control           63
+#define C_PatternBox		60
+#define C_ToolBox			61
+#define C_ValueSet			62
+#define C_Control			63
 #define C_TreeListBox       64  // Hurray the TreeListBox finally got its own Window Type
 
-#define C_OkButton          65
-#define C_CancelButton      66
-#define C_ButtonDialog      67
+#define C_OkButton			65
+#define C_CancelButton		66
+#define C_ButtonDialog		67
 
-#define C_Dialog            68
+#define C_Dialog			68
 
 
 
 
-#define M_WITH_RETURN       0x0200  // Die Variable wird zum Aufnehmen des Wertes gespeichert
-#define M_KEY_STRING        0x0400  // Key Befehle werden umgewandelt i.e. "<return><up>"
+#define M_WITH_RETURN		0x0200	// Die Variable wird zum Aufnehmen des Wertes gespeichert
+#define M_KEY_STRING		0x0400	// Key Befehle werden umgewandelt i.e. "<return><up>"
 #define M_SOFFICE           0x0800  // Command valid for Star/Open Office
 #define M_MOZILLA           0x1000  // Command valid for Mozilla
 // for MacroRecorder
@@ -154,57 +154,57 @@
 #define M_SetPage           31
 #define M_Click             32
 
-#define M_Close             33      // Push Buttons on Dialog (Auch More Button)
+#define M_Close	            33		// Push Buttons on Dialog (Auch More Button)
 #define M_Cancel            34
 #define M_OK                35
 #define M_Help              36
-#define M_Default           37      // Push defaultbutton on Dialog
+#define M_Default           37		// Push defaultbutton on Dialog
 
-#define M_Yes               38
-#define M_No                39
-#define M_Repeat            40
+#define M_Yes				38
+#define M_No				39
+#define M_Repeat			40
 
-#define M_Open              41
-#define M_Pick              42
-#define M_Move              43
-#define M_Size              44
-#define M_Minimize          45
-#define M_Maximize          46
-#define M_Dock              47
-#define M_Undock            48
+#define M_Open				41
+#define M_Pick				42
+#define M_Move				43
+#define M_Size				44
+#define M_Minimize			45
+#define M_Maximize			46
+#define M_Dock				47
+#define M_Undock			48
 
 
 
-#define M_TypeKeys          ( M_KEY_STRING | 50 )
-#define M_MouseDown         51
-#define M_MouseUp           52
-#define M_MouseMove         53
-#define M_MouseDoubleClick  54
-#define M_SnapShot          55
-#define M_SetNextToolBox    56
-#define M_OpenContextMenu   57
-#define M_MultiSelect       58
+#define M_TypeKeys			( M_KEY_STRING | 50 )
+#define M_MouseDown			51
+#define M_MouseUp			52
+#define M_MouseMove			53
+#define M_MouseDoubleClick	54
+#define M_SnapShot			55
+#define M_SetNextToolBox	56
+#define M_OpenContextMenu	57
+#define M_MultiSelect		58
 
 // Filedialog
-#define M_SetPath           60
-#define M_SetCurFilter      61
+#define M_SetPath			60
+#define M_SetCurFilter 		61
 
 // Printdialog
-#define M_SetPrinter        70
-#define M_CheckRange        71
-#define M_SetRangeText      72
-#define M_SetFirstPage      73
-#define M_SetLastPage       74
-#define M_CheckCollate      75
-#define M_SetPageId         76
-#define M_SetPageNr         77
-
-#define M_AnimateMouse      78
-#define M_TearOff           79
-
-#define M_FadeIn            80
-#define M_FadeOut           81
-#define M_Pin               82
+#define M_SetPrinter		70
+#define M_CheckRange		71
+#define M_SetRangeText		72
+#define M_SetFirstPage		73
+#define M_SetLastPage		74
+#define M_CheckCollate		75
+#define M_SetPageId			76
+#define M_SetPageNr			77
+
+#define M_AnimateMouse		78
+#define M_TearOff			79
+
+#define M_FadeIn			80
+#define M_FadeOut			81
+#define M_Pin				82
 
 #define M_UseMenu           83      // Use the menu of the next possible parent of given Window
 
@@ -212,73 +212,73 @@
 
 #define M_Restore           85      // Window Control together with M_Maximize and M_Minimize
 
-#define M_DisplayPercent    200     // Zum Anzeigen der Prozente des Windows
+#define M_DisplayPercent	200		// Zum Anzeigen der Prozente des Windows
 
-#define M_LAST_NO_RETURN    200
+#define M_LAST_NO_RETURN	200
 
 #if ( M_LAST_NO_RETURN >= M_WITH_RETURN )
 #error "Bereich überschritten"
 #endif
 
-#define M_Exists            ( M_WITH_RETURN |  1 )
-#define M_NotExists         ( M_WITH_RETURN |  2 )
-#define M_IsEnabled         ( M_WITH_RETURN |  3 )
-#define M_IsVisible         ( M_WITH_RETURN |  4 )
-#define M_IsWritable        ( M_WITH_RETURN |  5 )
-
-#define M_GetPage           ( M_WITH_RETURN |  6 )
-#define M_IsChecked         ( M_WITH_RETURN |  7 )
-#define M_IsTristate        ( M_WITH_RETURN |  8 )
-#define M_GetState          ( M_WITH_RETURN |  9 )
-#define M_GetText           ( M_WITH_RETURN | 10 )
-#define M_GetSelCount       ( M_WITH_RETURN | 11 )
-#define M_GetSelIndex       ( M_WITH_RETURN | 12 )
-#define M_GetSelText        ( M_WITH_RETURN | 13 )
-#define M_GetItemCount      ( M_WITH_RETURN | 14 )
-#define M_GetItemText       ( M_WITH_RETURN | 15 )
-#define M_IsOpen            ( M_WITH_RETURN | 16 )
-#define M_Caption           ( M_WITH_RETURN | 17 )
-#define M_IsMax             ( M_WITH_RETURN | 18 )
-#define M_IsDocked          ( M_WITH_RETURN | 19 )
-#define M_GetRT             ( M_WITH_RETURN | 20 )
-#define M_GetPageId         ( M_WITH_RETURN | 21 )
-#define M_GetPageCount      ( M_WITH_RETURN | 22 )
-#define M_GetPosX           ( M_WITH_RETURN | 23 )
-#define M_GetPosY           ( M_WITH_RETURN | 24 )
-#define M_GetSizeX          ( M_WITH_RETURN | 25 )
-#define M_GetSizeY          ( M_WITH_RETURN | 26 )
-#define M_GetNextToolBox    ( M_WITH_RETURN | 27 )
-#define M_GetButtonCount    ( M_WITH_RETURN | 28 )
-#define M_GetButtonId       ( M_WITH_RETURN | 29 )
-
-#define M_IsFadeIn          ( M_WITH_RETURN | 30 )
-#define M_IsPin             ( M_WITH_RETURN | 31 )
+#define M_Exists			( M_WITH_RETURN |  1 )
+#define M_NotExists			( M_WITH_RETURN |  2 )
+#define M_IsEnabled			( M_WITH_RETURN |  3 )
+#define M_IsVisible			( M_WITH_RETURN |  4 )
+#define M_IsWritable		( M_WITH_RETURN |  5 )
+
+#define M_GetPage			( M_WITH_RETURN |  6 )
+#define M_IsChecked			( M_WITH_RETURN |  7 )
+#define M_IsTristate		( M_WITH_RETURN |  8 )
+#define M_GetState			( M_WITH_RETURN |  9 )
+#define M_GetText			( M_WITH_RETURN | 10 )
+#define M_GetSelCount		( M_WITH_RETURN | 11 )
+#define M_GetSelIndex		( M_WITH_RETURN | 12 )
+#define M_GetSelText		( M_WITH_RETURN | 13 )
+#define M_GetItemCount		( M_WITH_RETURN | 14 )
+#define M_GetItemText		( M_WITH_RETURN | 15 )
+#define M_IsOpen			( M_WITH_RETURN | 16 )
+#define M_Caption			( M_WITH_RETURN | 17 )
+#define M_IsMax				( M_WITH_RETURN | 18 )
+#define M_IsDocked			( M_WITH_RETURN | 19 )
+#define M_GetRT				( M_WITH_RETURN | 20 )
+#define M_GetPageId			( M_WITH_RETURN | 21 )
+#define M_GetPageCount		( M_WITH_RETURN | 22 )
+#define M_GetPosX			( M_WITH_RETURN | 23 )
+#define M_GetPosY			( M_WITH_RETURN | 24 )
+#define M_GetSizeX			( M_WITH_RETURN | 25 )
+#define M_GetSizeY			( M_WITH_RETURN | 26 )
+#define M_GetNextToolBox	( M_WITH_RETURN | 27 )
+#define M_GetButtonCount	( M_WITH_RETURN | 28 )
+#define M_GetButtonId		( M_WITH_RETURN | 29 )
+
+#define M_IsFadeIn			( M_WITH_RETURN | 30 )
+#define M_IsPin				( M_WITH_RETURN | 31 )
 
 // Statusbar
-#define M_StatusGetText     ( M_WITH_RETURN | 32 )
-#define M_StatusIsProgress  ( M_WITH_RETURN | 33 )
+#define M_StatusGetText		( M_WITH_RETURN | 32 )
+#define M_StatusIsProgress	( M_WITH_RETURN | 33 )
 #define M_StatusGetItemCount ( M_WITH_RETURN | 34 )
-#define M_StatusGetItemId   ( M_WITH_RETURN | 35 )
+#define M_StatusGetItemId	( M_WITH_RETURN | 35 )
 
 //
-#define M_GetMouseStyle     ( M_WITH_RETURN | 36 )
+#define M_GetMouseStyle		( M_WITH_RETURN | 36 )
 
 // support for Messagebox with checkbox
-#define M_GetCheckBoxText   ( M_WITH_RETURN | 37 )
+#define M_GetCheckBoxText	( M_WITH_RETURN | 37 )
 
 // Scrollbars
-#define M_HasScrollBar      ( M_WITH_RETURN | 38 )
+#define M_HasScrollBar		( M_WITH_RETURN | 38 )
 #define M_IsScrollBarEnabled ( M_WITH_RETURN | 39 )
 
 // Dieser befehl wird nur intern im Controller (sts library) verwendet. Sie tauchen nicht im Testtool auf!
-#define _M_IsEnabled        ( M_WITH_RETURN | 50 )
+#define _M_IsEnabled		( M_WITH_RETURN | 50 )
 
 
-#define M_GetFixedTextCount ( M_WITH_RETURN | 51 )
-#define M_GetFixedText      ( M_WITH_RETURN | 52 )
+#define M_GetFixedTextCount	( M_WITH_RETURN | 51 )
+#define M_GetFixedText		( M_WITH_RETURN | 52 )
 
 
-#define M_IsMin             ( M_WITH_RETURN | 53 )
+#define M_IsMin				( M_WITH_RETURN | 53 )
 #define M_IsRestore         ( M_WITH_RETURN | 54 )
 
 #define M_GetItemType       ( M_WITH_RETURN | 55 )
@@ -295,39 +295,39 @@
 
 
 // RemoteCommands
-#define RC_AppAbort         ( M_SOFFICE | M_MOZILLA | 1 )
-#define RC_SetClipboard     ( M_SOFFICE | M_MOZILLA | 2 )
-#define RC_NoDebug          ( M_SOFFICE | M_MOZILLA | 3 )
-#define RC_Debug            ( M_SOFFICE | M_MOZILLA | 4 )
-#define RC_GPF              ( M_SOFFICE | M_MOZILLA | 5 )
-#define RC_DisplayHid       ( M_SOFFICE | M_MOZILLA | 6 )
-#define RC_AppDelay         ( M_SOFFICE | M_MOZILLA | 7 )
-#define RC_UseBindings      ( M_SOFFICE             | 8 )
-#define RC_Profile          ( M_SOFFICE | M_MOZILLA | 9 )
+#define RC_AppAbort			( M_SOFFICE | M_MOZILLA | 1 )
+#define RC_SetClipboard		( M_SOFFICE | M_MOZILLA | 2 )
+#define RC_NoDebug			( M_SOFFICE | M_MOZILLA | 3 )
+#define RC_Debug			( M_SOFFICE | M_MOZILLA | 4 )
+#define RC_GPF				( M_SOFFICE | M_MOZILLA | 5 )
+#define RC_DisplayHid		( M_SOFFICE | M_MOZILLA | 6 )
+#define RC_AppDelay			( M_SOFFICE | M_MOZILLA | 7 )
+#define RC_UseBindings		( M_SOFFICE             | 8 )
+#define RC_Profile			( M_SOFFICE | M_MOZILLA | 9 )
 // (Popup)Menu
-#define RC_MenuSelect       ( M_SOFFICE | M_MOZILLA | 10 )
-#define RC_SetControlType   ( M_SOFFICE             | 11 )    // deprecated since RTTI
+#define RC_MenuSelect		( M_SOFFICE | M_MOZILLA | 10 )
+#define RC_SetControlType	( M_SOFFICE             | 11 )    // deprecated since RTTI
 // RemoteFileAccess
-#define RC_Kill             ( M_SOFFICE             | 12 )
-#define RC_RmDir            ( M_SOFFICE             | 13 )
-#define RC_MkDir            ( M_SOFFICE             | 14 )
-#define RC_FileCopy         ( M_SOFFICE             | 15 )
-#define RC_Name             ( M_SOFFICE             | 16 )
+#define RC_Kill				( M_SOFFICE             | 12 )
+#define RC_RmDir			( M_SOFFICE             | 13 )
+#define RC_MkDir			( M_SOFFICE             | 14 )
+#define RC_FileCopy			( M_SOFFICE             | 15 )
+#define RC_Name				( M_SOFFICE             | 16 )
 
 #define RC_CaptureAssertions (M_SOFFICE | M_MOZILLA | 17 )
-#define RC_Assert           ( M_SOFFICE | M_MOZILLA | 18 )
+#define RC_Assert			( M_SOFFICE | M_MOZILLA | 18 )
 
-#define RC_MenuOpen         ( M_SOFFICE | M_MOZILLA | 19 )
+#define RC_MenuOpen			( M_SOFFICE | M_MOZILLA | 19 )
 
-#define RC_TypeKeysDelay    ( M_SOFFICE | M_MOZILLA | 20 )
+#define RC_TypeKeysDelay	( M_SOFFICE | M_MOZILLA | 20 )
 
-#define RC_ShowBar          (             M_MOZILLA | 21 )
+#define RC_ShowBar       	(             M_MOZILLA | 21 )
 
 #define RC_LoadURL          (             M_MOZILLA | 22 )
 
-#define RC_CloseSysDialog   ( M_SOFFICE             | 23 )
+#define RC_CloseSysDialog	( M_SOFFICE             | 23 )
 
-#define RC_SAXRelease       ( M_SOFFICE             | 24 )
+#define RC_SAXRelease		( M_SOFFICE             | 24 )
 
 #define RC_RecordMacro      ( M_SOFFICE             | 25 )
 
@@ -335,43 +335,43 @@
 
 #define RC_CatchGPF         ( M_SOFFICE             | 27 )
 
-#define _RC_LAST_NO_RETURN                            27
+#define _RC_LAST_NO_RETURN	                          27
 
 #if ( _RC_LAST_NO_RETURN >= M_WITH_RETURN )
 #error "Bereich überschritten"
 #endif
 
 // Befehle mit Returnwert
-#define RC_GetClipboard     ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 1 )
-#define RC_WinTree          ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 2 )
-#define RC_ResetApplication ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 3 )
+#define RC_GetClipboard		( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 1 )
+#define RC_WinTree			( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 2 )
+#define RC_ResetApplication	( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 3 )
 #define RC_GetNextCloseWindow ( M_SOFFICE             | M_WITH_RETURN | 4 )
-#define RC_ApplicationBusy  ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 5 )
+#define RC_ApplicationBusy	( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 5 )
 // (Popup)Menu
-#define RC_MenuGetItemCount ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 6 )
-#define RC_MenuGetItemId    ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 7 )
-#define RC_MenuGetItemPos   ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 8 )
-#define RC_MenuIsSeperator  ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 9 )
+#define RC_MenuGetItemCount	( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 6 )
+#define RC_MenuGetItemId	( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 7 )
+#define RC_MenuGetItemPos	( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 8 )
+#define RC_MenuIsSeperator	( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 9 )
 #define RC_MenuIsItemChecked ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 10 )
 #define RC_MenuIsItemEnabled ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 11 )
-#define RC_MenuGetItemText  ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 12 )
+#define RC_MenuGetItemText	( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 12 )
 // RemoteFileAccess
-#define RC_Dir              ( M_SOFFICE             | M_WITH_RETURN | 18 )
-#define RC_FileLen          ( M_SOFFICE             | M_WITH_RETURN | 19 )
-#define RC_FileDateTime     ( M_SOFFICE             | M_WITH_RETURN | 20 )
+#define RC_Dir				( M_SOFFICE             | M_WITH_RETURN | 18 )
+#define RC_FileLen			( M_SOFFICE             | M_WITH_RETURN | 19 )
+#define RC_FileDateTime		( M_SOFFICE             | M_WITH_RETURN | 20 )
 
-#define RC_Translate        ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 21 )
-#define RC_GetMouseStyle    ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 22 )
-#define RC_UnpackStorage    ( M_SOFFICE             | M_WITH_RETURN | 23 )
+#define RC_Translate		( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 21 )
+#define RC_GetMouseStyle	( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 22 )
+#define RC_UnpackStorage	( M_SOFFICE             | M_WITH_RETURN | 23 )
 
-#define RC_IsBarVisible     (             M_MOZILLA | M_WITH_RETURN | 24 )
+#define RC_IsBarVisible 	(             M_MOZILLA | M_WITH_RETURN | 24 )
 
 #define RC_MenuGetItemCommand ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 25 )
 
 #define RC_ExistsSysDialog  ( M_SOFFICE             | M_WITH_RETURN | 26 )
 
 #define RC_SAXCheckWellformed ( M_SOFFICE             | M_WITH_RETURN | 27 )
-#define RC_SAXReadFile      ( M_SOFFICE             | M_WITH_RETURN | 28 )
+#define RC_SAXReadFile		( M_SOFFICE             | M_WITH_RETURN | 28 )
 
 #define RC_SAXGetNodeType   ( M_SOFFICE             | M_WITH_RETURN | 29 )
 #define RC_SAXGetElementName ( M_SOFFICE             | M_WITH_RETURN | 30 )
@@ -397,54 +397,54 @@
 #define RC_WaitSlot         ( M_SOFFICE             | M_WITH_RETURN | 44 )
 
 // Flow Control
-#define F_EndCommandBlock   101         // Initiiert Rückmeldung des Status
-#define F_Sequence          102         // Übergibt Sequence Nummer (1. in jedem Stream)
+#define F_EndCommandBlock	101			// Initiiert Rückmeldung des Status
+#define F_Sequence			102			// Übergibt Sequence Nummer (1. in jedem Stream)
 
 // Return codes
-#define RET_Sequence        132         // Übergibt Sequence Nummer (1. in jedem Stream)
-#define RET_Value           133         // Übergibt Return-wert
-#define RET_WinInfo         134         // Information über aktuelles Fenster/Control
-#define RET_ProfileInfo     135         // Profile Information
-#define RET_DirectLoging    136         // Direktes Übertragen von Informationen in das Log
-#define RET_MacroRecorder   137         // MakroRecorder Befehl übertragen
+#define RET_Sequence		132			// Übergibt Sequence Nummer (1. in jedem Stream)
+#define RET_Value			133			// Übergibt Return-wert
+#define RET_WinInfo			134			// Information über aktuelles Fenster/Control
+#define RET_ProfileInfo		135			// Profile Information
+#define RET_DirectLoging	136			// Direktes Übertragen von Informationen in das Log
+#define RET_MacroRecorder	137			// MakroRecorder Befehl übertragen
 
 
 
 // Subcodes die in nUId geliefert werden
 // für F_ProfileInfo
-#define S_ProfileReset      201         // nNr1 = Anzahl Borders
+#define S_ProfileReset		201			// nNr1 = Anzahl Borders
     // Achtung!! Diese Defines müssen aufeinanderfolgende Nummern haben!!
-#define S_ProfileBorder1    202         // nNr1 = Border1 in ms
-#define S_ProfileBorder2    203         // nNr1 = Border2 in ms
-#define S_ProfileBorder3    204         // nNr1 = Border3 in ms
-#define S_ProfileBorder4    205         // nNr1 = Border4 in ms
+#define S_ProfileBorder1	202			// nNr1 = Border1 in ms
+#define S_ProfileBorder2	203			// nNr1 = Border2 in ms
+#define S_ProfileBorder3	204			// nNr1 = Border3 in ms
+#define S_ProfileBorder4	205			// nNr1 = Border4 in ms
     // Achtung Ende
-#define S_ProfileTime       210         // nNr1 = remote Zeit des Befehls
-#define S_ProfileDump       211         // Gibt die daten aus.
+#define S_ProfileTime		210			// nNr1 = remote Zeit des Befehls
+#define S_ProfileDump		211			// Gibt die daten aus.
 
 // für F_DirectLoging
-#define S_AssertError       220
-#define S_AssertWarning     221
-#define S_AssertTrace       222
-#define S_QAError           223
+#define S_AssertError		220
+#define S_AssertWarning		221
+#define S_AssertTrace		222
+#define S_QAError			223
 
 
 
 // Constants which are available in VCLTestTool scripts
 
 // Different types of controls recognized via RTTI
-#define CONST_CTBrowseBox       100
-#define CONST_CTValueSet        103
+#define CONST_CTBrowseBox		100
+#define CONST_CTValueSet		103
 #define CONST_CTORoadmap        104
 #define CONST_CTIExtensionListBox 105
 #define CONST_CTTableControl    106
-#define CONST_CTUnknown         199
+#define CONST_CTUnknown			199
 
 // Konstanten für das ALignment des gesuchten Splitters
-#define CONST_ALIGN_LEFT        120
-#define CONST_ALIGN_TOP         121
-#define CONST_ALIGN_RIGHT       122
-#define CONST_ALIGN_BOTTOM      123
+#define CONST_ALIGN_LEFT		120
+#define CONST_ALIGN_TOP			121
+#define CONST_ALIGN_RIGHT		122
+#define CONST_ALIGN_BOTTOM		123
 
 /// What dialog to use in RC_CloseSysDialog or RC_ExistsSysDialog
 #define CONST_FilePicker        301
@@ -472,27 +472,27 @@
 #define PARAM_NONE              0x0000
 #define PARAM_USHORT_1          0x0001
 #define PARAM_USHORT_2          0x0002
-#define PARAM_USHORT_3          0x0100      // Nicht in der Reihe!!
-#define PARAM_USHORT_4          0x0200      // Nicht in der Reihe!!
+#define PARAM_USHORT_3          0x0100		// Nicht in der Reihe!!
+#define PARAM_USHORT_4          0x0200		// Nicht in der Reihe!!
 #define PARAM_ULONG_1           0x0004
 #define PARAM_ULONG_2           0x0008
 #define PARAM_STR_1             0x0010
 #define PARAM_STR_2             0x0020
 #define PARAM_BOOL_1            0x0040
 #define PARAM_BOOL_2            0x0080
-#define PARAM_SBXVALUE_1        0x0400      // hier mit 0x0400 Weiter!!! Siehe Oben!
+#define PARAM_SBXVALUE_1		0x0400		// hier mit 0x0400 Weiter!!! Siehe Oben!
 
 // Zusätzliche Beschreibung!! wird auch mit dem Rest verodert
-//#define PARAM_STR_RAW           0x8000        // Der Zeichensatz der Strings wird nicht konvertiert(für Fareastern)
+//#define PARAM_STR_RAW           0x8000		// Der Zeichensatz der Strings wird nicht konvertiert(für Fareastern)
 
 
-#define ERR_SEND_TIMEOUT        100
-#define ERR_EXEC_TIMEOUT        101
-#define ERR_RESTART_FAIL        102
-#define ERR_RESTART             103
-#define ERR_NO_WIN              104     // Keine *.Win Dateien gefunden
-#define ERR_NO_SID              105     // Keine *.Sid Dateien gefunden
-#define ERR_NO_FILE             106     // Datei nicht gefunden
+#define ERR_SEND_TIMEOUT		100
+#define ERR_EXEC_TIMEOUT		101
+#define ERR_RESTART_FAIL		102
+#define ERR_RESTART				103
+#define ERR_NO_WIN				104		// Keine *.Win Dateien gefunden
+#define ERR_NO_SID				105		// Keine *.Sid Dateien gefunden
+#define ERR_NO_FILE				106		// Datei nicht gefunden
 
 #endif
 
diff --git a/automation/source/inc/sttresid.hxx b/automation/source/inc/sttresid.hxx
index 3ccfe483a8f4..7a416a866db4 100644
--- a/automation/source/inc/sttresid.hxx
+++ b/automation/source/inc/sttresid.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/automation/source/inc/svcommstream.hxx b/automation/source/inc/svcommstream.hxx
index 0cf289147f04..f3e8ee3d60b5 100644
--- a/automation/source/inc/svcommstream.hxx
+++ b/automation/source/inc/svcommstream.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,19 +41,19 @@ public:
     SvCommStream( SvStream* pIO );
     ~SvCommStream();
 
-    ICommStream&        operator>>( comm_USHORT& rUShort );
-    ICommStream&        operator>>( comm_ULONG& rULong );
-    ICommStream&        operator>>( comm_BOOL& rChar );
+    ICommStream&		operator>>( comm_USHORT& rUShort );
+    ICommStream&		operator>>( comm_ULONG& rULong );
+    ICommStream&		operator>>( comm_BOOL& rChar );
 
-    ICommStream&        operator<<( comm_USHORT nUShort );
-    ICommStream&        operator<<( comm_ULONG nULong );
-    ICommStream&        operator<<( comm_BOOL nChar );
+    ICommStream&		operator<<( comm_USHORT nUShort );
+    ICommStream&		operator<<( comm_ULONG nULong );
+    ICommStream&		operator<<( comm_BOOL nChar );
 
-    comm_ULONG      Read( void* pData, comm_ULONG nSize );
-    comm_ULONG      Write( const void* pData, comm_ULONG nSize );
+    comm_ULONG		Read( void* pData, comm_ULONG nSize );
+    comm_ULONG		Write( const void* pData, comm_ULONG nSize );
 
-    comm_BOOL       IsEof() const;
-    comm_ULONG      SeekRel( long nPos );
+    comm_BOOL		IsEof() const;
+    comm_ULONG		SeekRel( long nPos );
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/inc/testapp.hxx b/automation/source/inc/testapp.hxx
index 6760fb229af7..ed3ac0af7727 100644
--- a/automation/source/inc/testapp.hxx
+++ b/automation/source/inc/testapp.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,82 +78,82 @@ class TestToolObj: public SbxObject
     friend class TTBasic;
     friend class Controls;
 public:
-    TestToolObj( String aName, String aFilePath );      // Alle Dateien in FilePath, Kein IPC
-    TestToolObj( String aName, MyBasic* pBas ); // Pfade aus INI, IPC benutzen
+    TestToolObj( String aName, String aFilePath );		// Alle Dateien in FilePath, Kein IPC
+    TestToolObj( String aName, MyBasic* pBas );	// Pfade aus INI, IPC benutzen
     ~TestToolObj();
-    void LoadIniFile();             // Laden der IniEinstellungen, die durch den ConfigDialog geändert werden können
+    void LoadIniFile();				// Laden der IniEinstellungen, die durch den ConfigDialog geändert werden können
     void DebugFindNoErrors( BOOL bDebugFindNoErrors );
 
 private:
-    BOOL bWasPrecompilerError;  // True wenn beim letzten Precompile ein Fehler auftrat
+    BOOL bWasPrecompilerError;	// True wenn beim letzten Precompile ein Fehler auftrat
     BOOL CError( ULONG, const String&, xub_StrLen, xub_StrLen, xub_StrLen );
     void CalcPosition( String const &aSource, xub_StrLen nPos, xub_StrLen &l, xub_StrLen &c );
     xub_StrLen ImplSearch( const String &aSource, const xub_StrLen nStart, const xub_StrLen nEnd, const String &aSearch, const xub_StrLen nSearchStart = 0 );
     xub_StrLen PreCompilePart( String &aSource, xub_StrLen nStart, xub_StrLen nEnd, String aFinalErrorLabel, USHORT &nLabelCount );
     void PreCompileDispatchParts( String &aSource, String aStart, String aEnd, String aFinalLable );
 public:
-    String GetRevision(String const &aSourceIn);    // find Revision in the sourcecode
-    String PreCompile(String const &aSourceIn); // try catch; testcase endcase ..
-    BOOL WasPrecompilerError(); // True wenn beim letzten Precompile ein Fehler auftrat
-    void            SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& );
+    String GetRevision(String const &aSourceIn);	// find Revision in the sourcecode
+    String PreCompile(String const &aSourceIn);	// try catch; testcase endcase ..
+    BOOL WasPrecompilerError();	// True wenn beim letzten Precompile ein Fehler auftrat
+    void			SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& );
     virtual SbxVariable* Find( const String&, SbxClassType );
-//  String aKeyPlusClasses;     // Pfad für keycodes & classes & res_type (Aus Configdatei)
+//	String aKeyPlusClasses;		// Pfad für keycodes & classes & res_type (Aus Configdatei)
     DECL_LINK( ReturnResultsLink, CommunicationLink* );
-    BOOL            ReturnResults( SvStream *pIn ); // Rücklieferung des Antwortstreams über IPC oder TCP/IP oder direkt
+    BOOL			ReturnResults( SvStream *pIn );	// Rücklieferung des Antwortstreams über IPC oder TCP/IP oder direkt
 
-    void            SetLogHdl( const Link& rLink ) { aLogHdl = rLink; }
-    const Link&     GetLogHdl() const { return aLogHdl; }
+    void			SetLogHdl( const Link& rLink ) { aLogHdl = rLink; }
+    const Link&		GetLogHdl() const { return aLogHdl; }
 
-    void            SetWinInfoHdl( const Link& rLink ) { aWinInfoHdl = rLink; }
-    const Link&     GetWinInfoHdl() const { return aWinInfoHdl; }
+    void			SetWinInfoHdl( const Link& rLink ) { aWinInfoHdl = rLink; }
+    const Link&		GetWinInfoHdl() const { return aWinInfoHdl; }
 
-    void            SetModuleWinExistsHdl( const Link& rLink ) { aModuleWinExistsHdl = rLink; }
-    const Link&     GetModuleWinExistsHdl() const { return aModuleWinExistsHdl; }
+    void			SetModuleWinExistsHdl( const Link& rLink ) { aModuleWinExistsHdl = rLink; }
+    const Link&		GetModuleWinExistsHdl() const { return aModuleWinExistsHdl; }
 
-    void            SetCErrorHdl( const Link& rLink ) { aCErrorHdl = rLink; }
-    const Link&     GetCErrorHdl() const { return aCErrorHdl; }
+    void			SetCErrorHdl( const Link& rLink ) { aCErrorHdl = rLink; }
+    const Link&		GetCErrorHdl() const { return aCErrorHdl; }
 
-    void            SetWriteStringHdl( const Link& rLink ) { aWriteStringHdl = rLink; }
-    const Link&     GetWriteStringHdl() const { return aWriteStringHdl; }
+    void			SetWriteStringHdl( const Link& rLink ) { aWriteStringHdl = rLink; }
+    const Link&		GetWriteStringHdl() const { return aWriteStringHdl; }
 
     SfxBroadcaster& GetTTBroadcaster();
 
 private:
-    ImplTestToolObj *pImpl;     // Alles was von der Implementation abhängt
+    ImplTestToolObj *pImpl;		// Alles was von der Implementation abhängt
     static const CErrors* GetFehlerListe() { return pFehlerListe; }
     BOOL bUseIPC;
-    Link aLogHdl;               // Zum Logen der Fehlermeldungen im Testtool
-    Link aWinInfoHdl;           // Anzeigen der Windows/Controls der zu testenden App
-    Link aModuleWinExistsHdl;   // Prüft ob das Modul schon im Editor geladen ist
-    Link aCErrorHdl;            // Melden von Compilererror
+    Link aLogHdl;				// Zum Logen der Fehlermeldungen im Testtool
+    Link aWinInfoHdl;			// Anzeigen der Windows/Controls der zu testenden App
+    Link aModuleWinExistsHdl;	// Prüft ob das Modul schon im Editor geladen ist
+    Link aCErrorHdl;			// Melden von Compilererror
     Link aWriteStringHdl;       // Schreiben von text (e.g. MakroRecorder)
-    BOOL bReturnOK;             // Bricht WaitForAnswer ab
-    CRevNames *pShortNames;     // Aktuell verwendete Controls, zur gewinnung des Namens aus Fehlermeldung
-    ULONG nSequence;            // Sequence um Antwort und Anfrage zu syncronisieren
-    SmartId aNextReturnId;  // Id des Returnwertes i.e. UId
-    void ReplaceNumbers(String &aText); // Zahlen im String mit speziellem Format in Namen umwandeln
+    BOOL bReturnOK;				// Bricht WaitForAnswer ab
+    CRevNames *pShortNames;		// Aktuell verwendete Controls, zur gewinnung des Namens aus Fehlermeldung
+    ULONG nSequence;			// Sequence um Antwort und Anfrage zu syncronisieren
+    SmartId aNextReturnId;	// Id des Returnwertes i.e. UId
+    void ReplaceNumbers(String &aText);	// Zahlen im String mit speziellem Format in Namen umwandeln
 
     String aLastRecordedKontext;//  Keeps the last kontext recorded by the Macro Recorder
 
 #define FLAT TRUE
-    String ProgPath;            // Dateiname der zu Testenden APP; Gesetzt über Start
-    String aLogFileName;        // Momentaner Logfilename (Wie Programmdatei aber mit .res)
-    BOOL IsBlock;               // Innerhalb Begin/EndBlock
-    BOOL SingleCommandBlock;    // Implizit um jedes kommando ein Begin/EndBlock
+    String ProgPath;			// Dateiname der zu Testenden APP; Gesetzt über Start
+    String aLogFileName;		// Momentaner Logfilename (Wie Programmdatei aber mit .res)
+    BOOL IsBlock;				// Innerhalb Begin/EndBlock
+    BOOL SingleCommandBlock;	// Implizit um jedes kommando ein Begin/EndBlock
     CmdStream *In;
 
-    void AddName(String &aBisher, String &aNeu );   // Name eventuell mit / anhängen
-    void AddToListByNr( CNames *&pControls, ControlItemUId *&pNewItem );    //
+    void AddName(String &aBisher, String &aNeu );	// Name eventuell mit / anhängen
+    void AddToListByNr( CNames *&pControls, ControlItemUId *&pNewItem );	//
     CNames *m_pControls;
-    CNames *m_pNameKontext;     // Zeigt auf den aktuellen Namenskontext, der über 'Kontext' gesetzt wurde
+    CNames *m_pNameKontext;		// Zeigt auf den aktuellen Namenskontext, der über 'Kontext' gesetzt wurde
     CNames *m_pSIds;
-    CNames *m_pReverseSlots;        // Slots mit Kurznamen nach Nummer
-    CNames *m_pReverseControls; // Controls mit Kurznamen nach Nummer
+    CNames *m_pReverseSlots;		// Slots mit Kurznamen nach Nummer
+    CNames *m_pReverseControls;	// Controls mit Kurznamen nach Nummer
     CNames *m_pReverseControlsSon;// Controls mit Kurznamen nach Nummer nach Fenstern (Son)
-    CNames *m_pReverseUIds;     // Langnamen nach Nummer
+    CNames *m_pReverseUIds;		// Langnamen nach Nummer
 
 
-    USHORT nMyVar;              // Wievielte Var aus Pool ist dran
+    USHORT nMyVar;				// Wievielte Var aus Pool ist dran
 
     void InitTestToolObj();
     CommunicationManagerClientViaSocketTT *pCommunicationManager;
@@ -189,7 +189,7 @@ private:
     static ControlDefLoad const arR_Cmds[];
     static CNames *pRCommands;
 
-    static CErrors *pFehlerListe;       // Hier werden die Fehler des Testtools gespeichert
+    static CErrors *pFehlerListe;		// Hier werden die Fehler des Testtools gespeichert
 
 };
 
diff --git a/automation/source/inc/testtool.hxx b/automation/source/inc/testtool.hxx
index 78a56b3160eb..cd2daa6743e5 100644
--- a/automation/source/inc/testtool.hxx
+++ b/automation/source/inc/testtool.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/automation/source/miniapp/editwin.cxx b/automation/source/miniapp/editwin.cxx
index 5568b5152320..5cc15cf626f0 100644
--- a/automation/source/miniapp/editwin.cxx
+++ b/automation/source/miniapp/editwin.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/automation/source/miniapp/editwin.hxx b/automation/source/miniapp/editwin.hxx
index bf7cbfa3ca34..e93db51ebb66 100644
--- a/automation/source/miniapp/editwin.hxx
+++ b/automation/source/miniapp/editwin.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class GHEditWindow : public FloatingWindow
 
 protected:
 
-    MultiLineEdit   aInhalt;
+    MultiLineEdit	aInhalt;
 
     virtual BOOL Close(); // derived
     void Resize();
diff --git a/automation/source/miniapp/servres.cxx b/automation/source/miniapp/servres.cxx
index 3cbb4bf3c80c..bd1ba6110482 100644
--- a/automation/source/miniapp/servres.cxx
+++ b/automation/source/miniapp/servres.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/automation/source/miniapp/servres.hrc b/automation/source/miniapp/servres.hrc
index 2f95a34a60b6..506b2ecb3025 100644
--- a/automation/source/miniapp/servres.hrc
+++ b/automation/source/miniapp/servres.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/automation/source/miniapp/servres.hxx b/automation/source/miniapp/servres.hxx
index c93c758ec229..21d796c5448f 100644
--- a/automation/source/miniapp/servres.hxx
+++ b/automation/source/miniapp/servres.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/automation/source/miniapp/servres.src b/automation/source/miniapp/servres.src
index 426be8b81532..a0516a94a1c5 100644
--- a/automation/source/miniapp/servres.src
+++ b/automation/source/miniapp/servres.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/automation/source/miniapp/servuid.hxx b/automation/source/miniapp/servuid.hxx
index 7460c097606a..362b803ea808 100644
--- a/automation/source/miniapp/servuid.hxx
+++ b/automation/source/miniapp/servuid.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/automation/source/miniapp/testapp.cxx b/automation/source/miniapp/testapp.cxx
index 539f4851b8e3..d6cdd79f0731 100644
--- a/automation/source/miniapp/testapp.cxx
+++ b/automation/source/miniapp/testapp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,9 +105,9 @@ BOOL MainWindow::Close()
 
 void MainWindow::FileExit()
 {
-/*  WriteSTBProfile();*/
+/*	WriteSTBProfile();*/
 
-//  if (pApp->CloseAll())
+//	if (pApp->CloseAll())
         pApp->Quit();
 }
 
@@ -153,23 +153,23 @@ void MainWindow::SysDlg()
 
 /*
 
-#define WB_OK                   ((WinBits)0x0010)
-#define WB_OK_CANCEL            ((WinBits)0x0020)
-#define WB_YES_NO               ((WinBits)0x0040)
-#define WB_YES_NO_CANCEL        ((WinBits)0x0080)
-#define WB_RETRY_CANCEL         ((WinBits)0x0100)
-
-#define WB_DEF_OK               ((WinBits)0x0200)
-#define WB_DEF_CANCEL           ((WinBits)0x0400)
-#define WB_DEF_RETRY            ((WinBits)0x0800)
-#define WB_DEF_YES              ((WinBits)0x1000)
-#define WB_DEF_NO               ((WinBits)0x2000)
-
-#define RET_OK               TRUE
-#define RET_CANCEL           FALSE
-#define RET_YES              2
-#define RET_NO               3
-#define RET_RETRY            4
+#define WB_OK					((WinBits)0x0010)
+#define WB_OK_CANCEL			((WinBits)0x0020)
+#define WB_YES_NO				((WinBits)0x0040)
+#define WB_YES_NO_CANCEL		((WinBits)0x0080)
+#define WB_RETRY_CANCEL			((WinBits)0x0100)
+
+#define WB_DEF_OK				((WinBits)0x0200)
+#define WB_DEF_CANCEL			((WinBits)0x0400)
+#define WB_DEF_RETRY			((WinBits)0x0800)
+#define WB_DEF_YES				((WinBits)0x1000)
+#define WB_DEF_NO				((WinBits)0x2000)
+
+#define RET_OK				 TRUE
+#define RET_CANCEL			 FALSE
+#define RET_YES				 2
+#define RET_NO				 3
+#define RET_RETRY			 4
 */
 }
 
@@ -188,7 +188,7 @@ void MyApp::Property( ApplicationProperty& rProp )
         pTTProperties->nPropertyVersion = TT_PROPERTIES_VERSION;
         switch ( pTTProperties->nActualPR )
         {
-/*          case TT_PR_SLOTS:
+/*			case TT_PR_SLOTS:
             {
                 pTTProperties->nSidOpenUrl = SID_OPENURL;
                 pTTProperties->nSidFileName = SID_FILE_NAME;
@@ -218,7 +218,7 @@ void MyApp::Property( ApplicationProperty& rProp )
                 }
             }
             break;
-/*          case TT_PR_IMG:
+/*			case TT_PR_IMG:
             {
                 SvDataMemberObjectRef aDataObject = new SvDataMemberObject();
                 SvData* pDataBmp = new SvData( FORMAT_BITMAP );
@@ -245,11 +245,11 @@ USHORT MyDispatcher::ExecuteFunction( USHORT nSID, SfxPoolItem** ppArgs, USHORT
 
     switch (nSID)
     {
-        case IDM_FILE_EXIT:       pMainWin->FileExit();             break;
-        case IDM_FILE_OPEN_TEST:  pMainWin->FileOpen();             break;
-        case IDM_TEST_GROSS:      pMainWin->TestGross();            break;
-        case IDM_TEST_WINTREE:    pMainWin->WinTree();              break;
-        case IDM_SYS_DLG:         pMainWin->SysDlg();               break;
+        case IDM_FILE_EXIT:       pMainWin->FileExit();				break;
+        case IDM_FILE_OPEN_TEST:  pMainWin->FileOpen();				break;
+        case IDM_TEST_GROSS:      pMainWin->TestGross();			break;
+        case IDM_TEST_WINTREE:	  pMainWin->WinTree();				break;
+        case IDM_SYS_DLG:		  pMainWin->SysDlg();				break;
         default:
             {
                 DBG_ERROR1("Dispatcher kennt Funktion nicht %s",ByteString::CreateFromInt64(nSID).GetBuffer());
@@ -274,7 +274,7 @@ Reference< XContentProviderManager > InitializeUCB( void )
         exit( 1 );
     }
     OSL_ASSERT( path.lastIndexOf( '/' ) >= 0 );
-
+    
 
     ::rtl::OUStringBuffer bufServices( path.copy( 0, path.lastIndexOf( '/' )+1 ) );
     bufServices.appendAscii("services.rdb");
@@ -283,8 +283,8 @@ Reference< XContentProviderManager > InitializeUCB( void )
     ::rtl::OUStringBuffer bufTypes( path.copy( 0, path.lastIndexOf( '/' )+1 ) );
     bufTypes.appendAscii("types.rdb");
     OUString types = bufTypes.makeStringAndClear();
-
-
+    
+    
     Reference< XMultiServiceFactory > xSMgr;
     try
     {
@@ -297,7 +297,7 @@ Reference< XContentProviderManager > InitializeUCB( void )
         InfoBox( NULL, String( exc.Message ) ).Execute();
         throw ;
     }
-
+        
 
     //////////////////////////////////////////////////////////////////////
     // set global factory
diff --git a/automation/source/miniapp/testapp.hxx b/automation/source/miniapp/testapp.hxx
index bc06f0bd9dce..60a66d8a0607 100644
--- a/automation/source/miniapp/testapp.hxx
+++ b/automation/source/miniapp/testapp.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include "editwin.hxx"
 
 
-#define EXECUTE_NO                  0
+#define EXECUTE_NO					0
 #define EXECUTE_POSSIBLE            1
 #define EXECUTE_YES                 2
-#define EXECUTEMODE_ASYNCHRON       1
+#define EXECUTEMODE_ASYNCHRON		1
 #define EXECUTEMODE_DIALOGASYNCHRON 2
 
 
@@ -81,7 +81,7 @@ public:
     virtual void SetExecuteMode( USHORT nMode )
     {
         (void) nMode; /* avoid warning about unused parameter */
-    };  // Ist hier sowieso egal
+    };	// Ist hier sowieso egal
 };
 
 class MyApp : public Application
@@ -94,8 +94,8 @@ public:
     MyApp();
     void Main();
 
-    virtual void                Property( ApplicationProperty& );
-    virtual PlugInDispatcher*   GetDispatcher();
+    virtual void				Property( ApplicationProperty& );
+    virtual PlugInDispatcher*	GetDispatcher();
 
     MainWindow  *pMainWin;
 };
diff --git a/automation/source/mozillaserver/mozillatesttoolserver.idl b/automation/source/mozillaserver/mozillatesttoolserver.idl
index 5b5b5acc1e16..365354ae3b66 100644
--- a/automation/source/mozillaserver/mozillatesttoolserver.idl
+++ b/automation/source/mozillaserver/mozillatesttoolserver.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 testtool {
+module com { module sun { module star { module testtool { 
 
 //=============================================================================
 /**
@@ -47,6 +47,6 @@ service MozillaTesttoolServer
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 #endif
diff --git a/automation/source/mozillaserver/xmozillatesttoolserver.idl b/automation/source/mozillaserver/xmozillatesttoolserver.idl
index 51755a67a35d..a1c6b83a5f30 100644
--- a/automation/source/mozillaserver/xmozillatesttoolserver.idl
+++ b/automation/source/mozillaserver/xmozillatesttoolserver.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 testtool {
+module com { module sun { module star { module testtool { 
 
 //=============================================================================
 /** Service com.sun.star.devtools.IServerProxy implements this interface.
@@ -95,20 +95,20 @@ interface XActionFlow : XAction
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
-module com { module sun { module star { module testtool {
+module com { module sun { module star { module testtool { 
 
 
-enum ResultType
-    {
-        SEQUENCE,   /// command with SEQUENCE has been executed
-        ERROR,      /// An error has ocured
-        RESULT,     /// Result of a request
-        ASSERTION,  /// An Assertion has been captured
-        UI_INFO     /// Info about the UserInterfaace
+enum ResultType 
+    {  
+        SEQUENCE,	/// command with SEQUENCE has been executed
+        ERROR,		/// An error has ocured
+        RESULT,		/// Result of a request
+        ASSERTION,	/// An Assertion has been captured
+        UI_INFO		/// Info about the UserInterfaace
     };
 
 //=============================================================================
@@ -129,11 +129,11 @@ interface XResult : com::sun::star::uno::XInterface
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 //=============================================================================
 
-module com { module sun { module star { module testtool {
+module com { module sun { module star { module testtool { 
 
 //=============================================================================
 /** Service com.sun.star.devtools.IServerProxy implements this interface.
@@ -145,13 +145,13 @@ interface XMozillaTesttoolServer : com::sun::star::uno::XInterface
         <BR>
     */
     [oneway] void execute( [in] XAction aAction );
-//  sequence < XResult > getResults( [in] boolean bBlock ); /// bBoch = TRUE means to wait for at least 1 result
+//	sequence < XResult > getResults( [in] boolean bBlock );	/// bBoch = TRUE means to wait for at least 1 result
 
 };
 
 //=============================================================================
 
-}; }; }; };
+}; }; }; }; 
 
 
 #endif
diff --git a/automation/source/server/XMLParser.cxx b/automation/source/server/XMLParser.cxx
index 0ea7f3c0eb26..cebd1493841a 100644
--- a/automation/source/server/XMLParser.cxx
+++ b/automation/source/server/XMLParser.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -357,7 +357,7 @@ void SAXParser::startElement( const ::rtl::OUString& aName, const ::com::sun::st
 
 void SAXParser::endElement( const ::rtl::OUString& aName ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException)
 {
-    (void) aName; /* avoid warning about unused parameter */
+    (void) aName; /* avoid warning about unused parameter */ 
     xCurrentNode = xCurrentNode->GetParent();
 }
 
@@ -381,18 +381,18 @@ void SAXParser::characters( const ::rtl::OUString& aChars ) throw (::com::sun::s
 
 void SAXParser::ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException)
 {
-    (void) aWhitespaces; /* avoid warning about unused parameter */
+    (void) aWhitespaces; /* avoid warning about unused parameter */ 
 }
 
 void SAXParser::processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException)
 {
-    (void) aTarget; /* avoid warning about unused parameter */
-    (void) aData; /* avoid warning about unused parameter */
+    (void) aTarget; /* avoid warning about unused parameter */ 
+    (void) aData; /* avoid warning about unused parameter */ 
 }
 
 void SAXParser::setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException)
 {
-    (void) xLocator; /* avoid warning about unused parameter */
+    (void) xLocator; /* avoid warning about unused parameter */ 
 #if OSL_DEBUG_LEVEL > 1
     ::rtl::OUString aTester;
     aTester = xLocator->getPublicId();
diff --git a/automation/source/server/cmdbasestream.cxx b/automation/source/server/cmdbasestream.cxx
index 1e670a6e4d6a..a4e62f44b745 100644
--- a/automation/source/server/cmdbasestream.cxx
+++ b/automation/source/server/cmdbasestream.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 /*************************************************************************
  *
- *    ATTENTION
- *    This file is intended to work inside and outside the StarOffice environment.
- *    Only adaption of file commtypes.hxx should be necessary. Else it is a bug!
+ *	  ATTENTION
+ *	  This file is intended to work inside and outside the StarOffice environment.
+ *	  Only adaption of file commtypes.hxx should be necessary. Else it is a bug!
  *
  ************************************************************************/
 #include <osl/endian.h>
@@ -62,7 +62,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_ULONG nUId )
     Write(comm_USHORT(SIReturn));
     Write(nRet);
     Write(nUId);
-    Write(comm_USHORT(PARAM_NONE));             // Typ der folgenden Parameter
+    Write(comm_USHORT(PARAM_NONE));				// Typ der folgenden Parameter
 }
 
 void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_ULONG nNr )
@@ -70,7 +70,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_ULONG nNr )
     Write(comm_USHORT(SIReturn));
     Write(nRet);
     Write(pUId);
-    Write(comm_USHORT(PARAM_ULONG_1));          // Typ der folgenden Parameter
+    Write(comm_USHORT(PARAM_ULONG_1));			// Typ der folgenden Parameter
     Write(nNr);
 }
 
@@ -79,7 +79,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_String *pSt
     Write(comm_USHORT(SIReturn));
     Write(nRet);
     Write(pUId);
-    Write(comm_USHORT(PARAM_STR_1));                // Typ der folgenden Parameter
+    Write(comm_USHORT(PARAM_STR_1));				// Typ der folgenden Parameter
     Write(pString);
 }
 
@@ -88,7 +88,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_BOOL bBool
     Write(comm_USHORT(SIReturn));
     Write(nRet);
     Write(pUId);
-    Write(comm_USHORT(PARAM_BOOL_1));           // Typ der folgenden Parameter
+    Write(comm_USHORT(PARAM_BOOL_1));			// Typ der folgenden Parameter
     Write(bBool);
 }
 
@@ -97,7 +97,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_ULONG nNr,
     Write(comm_USHORT(SIReturn));
     Write(nRet);
     Write(pUId);
-    Write(comm_USHORT(PARAM_ULONG_1|PARAM_STR_1|PARAM_BOOL_1));     // Typ der folgenden Parameter
+    Write(comm_USHORT(PARAM_ULONG_1|PARAM_STR_1|PARAM_BOOL_1));		// Typ der folgenden Parameter
     Write(nNr);
     Write(pString);
     Write(bBool);
@@ -109,7 +109,7 @@ void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMet
     Write(comm_USHORT(SIReturn));
     Write(nRet);
     Write(pUId);
-    Write(comm_USHORT(PARAM_USHORT_1));     // Typ der folgenden Parameter
+    Write(comm_USHORT(PARAM_USHORT_1));		// Typ der folgenden Parameter
     Write(nMethod);
 }
 
@@ -118,7 +118,7 @@ void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMet
     Write(comm_USHORT(SIReturn));
     Write(nRet);
     Write(pUId);
-    Write(comm_USHORT(PARAM_USHORT_1|PARAM_STR_1));     // Typ der folgenden Parameter
+    Write(comm_USHORT(PARAM_USHORT_1|PARAM_STR_1));		// Typ der folgenden Parameter
     Write(nMethod);
     Write(pString);
 }
@@ -128,7 +128,7 @@ void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMet
     Write(comm_USHORT(SIReturn));
     Write(nRet);
     Write(pUId);
-    Write(comm_USHORT(PARAM_USHORT_1|PARAM_STR_1|PARAM_BOOL_1));        // Typ der folgenden Parameter
+    Write(comm_USHORT(PARAM_USHORT_1|PARAM_STR_1|PARAM_BOOL_1));		// Typ der folgenden Parameter
     Write(nMethod);
     Write(pString);
     Write(bBool);
@@ -139,7 +139,7 @@ void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMet
     Write(comm_USHORT(SIReturn));
     Write(nRet);
     Write(pUId);
-    Write(comm_USHORT(PARAM_USHORT_1|PARAM_BOOL_1));        // Typ der folgenden Parameter
+    Write(comm_USHORT(PARAM_USHORT_1|PARAM_BOOL_1));		// Typ der folgenden Parameter
     Write(nMethod);
     Write(bBool);
 }
@@ -149,7 +149,7 @@ void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMet
     Write(comm_USHORT(SIReturn));
     Write(nRet);
     Write(pUId);
-    Write(comm_USHORT(PARAM_USHORT_1|PARAM_ULONG_1));       // Typ der folgenden Parameter
+    Write(comm_USHORT(PARAM_USHORT_1|PARAM_ULONG_1));		// Typ der folgenden Parameter
     Write(nMethod);
     Write(nNr);
 }
@@ -185,7 +185,7 @@ void CmdBaseStream::Read (comm_UniChar* &aString, comm_USHORT &nLenInChars )
 #ifdef DBG_UTIL
     if (nId != BinString) DBG_ERROR1( "Falscher Typ im Stream: Erwartet String, gefunden :%hu", nId );
 #endif
-
+    
     *pCommStream >> nLenInChars;
 
     aString = new comm_UniChar [nLenInChars];
@@ -235,7 +235,7 @@ void CmdBaseStream::Write( const comm_UniChar* aString, comm_USHORT nLenInChars
 
     comm_USHORT n;
 
-    // remove BiDi and zero-width-markers    0x200B - 0x200F
+    // remove BiDi and zero-width-markers    0x200B - 0x200F 
     // remove BiDi and paragraph-markers     0x2028 - 0x202E
 
     comm_UniChar* aNoBiDiString;
@@ -280,23 +280,23 @@ void CmdBaseStream::Write( comm_BOOL bBool )
 
 void CmdBaseStream::Read ( comm_String* &pString )
 {
-    (void) pString; /* avoid warning about unused parameter */
+    (void) pString; /* avoid warning about unused parameter */ 
     DBG_ERROR("Read ( comm_String* &pString ) Not Implemented");
 }
 void CmdBaseStream::Read ( SmartId* &pId )
-{
-    (void) pId; /* avoid warning about unused parameter */
+{ 
+    (void) pId; /* avoid warning about unused parameter */ 
     DBG_ERROR("Read ( SmartId* &pId ) Not Implemented");
 }
 
 void CmdBaseStream::Write( comm_String *pString )
 {
-    (void) pString; /* avoid warning about unused parameter */
+    (void) pString; /* avoid warning about unused parameter */ 
     DBG_ERROR("Write( comm_String *pString ) Not Implemented");
 }
 void CmdBaseStream::Write( SmartId* pId )
 {
-    (void) pId; /* avoid warning about unused parameter */
+    (void) pId; /* avoid warning about unused parameter */ 
     DBG_ERROR("Write( SmartId* pId ) Not Implemented");
 }
 
diff --git a/automation/source/server/editwin.cxx b/automation/source/server/editwin.cxx
index 5d3e1502b187..4880772e77dc 100644
--- a/automation/source/server/editwin.cxx
+++ b/automation/source/server/editwin.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 class ImpWorkWindow : public WorkWindow
 {
 public:
-    MultiLineEdit   m_aInhalt;
+    MultiLineEdit	m_aInhalt;
     ImpWorkWindow( WorkWindow *pParent, const UniString &rName, WinBits );
     ~ImpWorkWindow();
     void Resize();
@@ -146,7 +146,7 @@ void EditWindow::AddText( const String &rNew )
         if ( nTextLen > 5000 )
         {
             pImpWorkWindow->m_aInhalt.SetText( pImpWorkWindow->m_aInhalt.GetText().Erase(0,1000) );
-            nTextLen = pImpWorkWindow->m_aInhalt.GetText().Len();       // Absolut, um Fehler sonstwo auszubügeln
+            nTextLen = pImpWorkWindow->m_aInhalt.GetText().Len();		// Absolut, um Fehler sonstwo auszubügeln
         }
 
 
diff --git a/automation/source/server/editwin.hxx b/automation/source/server/editwin.hxx
index d01a824c3bdd..23d13eb9815c 100644
--- a/automation/source/server/editwin.hxx
+++ b/automation/source/server/editwin.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,17 +39,17 @@ class ImpWorkWindow;
 class EditWindow
 {
 protected:
-    ImpWorkWindow   *pImpWorkWindow;
+    ImpWorkWindow	*pImpWorkWindow;
     BOOL check();
 
-    WorkWindow  *pMemParent;
-    String      aMemName;
-    WinBits     iMemWstyle;
+    WorkWindow	*pMemParent;
+    String		aMemName;
+    WinBits		iMemWstyle;
 
-    String      aMemPreWinText;
-    BOOL        bShowWin;
+    String		aMemPreWinText;
+    BOOL		bShowWin;
 
-    xub_StrLen      nTextLen;   // aus Performanzgründen eigene Länge mitführen
+    xub_StrLen		nTextLen;	// aus Performanzgründen eigene Länge mitführen
 
 public:
     EditWindow( WorkWindow *pParent, const UniString &rName = UniString( RTL_CONSTASCII_USTRINGPARAM ( "Debug" ) ), WinBits iWstyle = WB_HSCROLL | WB_VSCROLL );
diff --git a/automation/source/server/prof_nul.cxx b/automation/source/server/prof_nul.cxx
index 3fb9d92a7597..dc177a59e60e 100644
--- a/automation/source/server/prof_nul.cxx
+++ b/automation/source/server/prof_nul.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ struct SysdepStaticData
 
 void TTProfiler::InitSysdepProfiler()
 {
-    if ( !pSysDepStatic )   // Sollte immer so sein!!
+    if ( !pSysDepStatic )	// Sollte immer so sein!!
         pSysDepStatic = new SysdepStaticData;
     // Hier initialisieren
 
@@ -56,7 +56,7 @@ void TTProfiler::InitSysdepProfiler()
 
 void TTProfiler::DeinitSysdepProfiler()
 {
-    if ( pSysDepStatic )    // Sollte immer so sein!!
+    if ( pSysDepStatic )	// Sollte immer so sein!!
     {
         // Hier aufräumen und eventuell Speicher freigeben
 
diff --git a/automation/source/server/prof_usl.cxx b/automation/source/server/prof_usl.cxx
index a20e81606d7b..21086c48b0b9 100644
--- a/automation/source/server/prof_usl.cxx
+++ b/automation/source/server/prof_usl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 SysdepStaticData
 
 void TTProfiler::InitSysdepProfiler()
 {
-    if ( !pSysDepStatic )   // Sollte immer so sein!!
+    if ( !pSysDepStatic )	// Sollte immer so sein!!
         pSysDepStatic = new SysdepStaticData;
     // Hier initialisieren
 
@@ -59,7 +59,7 @@ void TTProfiler::InitSysdepProfiler()
 
 void TTProfiler::DeinitSysdepProfiler()
 {
-    if ( pSysDepStatic )    // Sollte immer so sein!!
+    if ( pSysDepStatic )	// Sollte immer so sein!!
     {
         // Hier aufräumen und eventuell Speicher freigeben
 
@@ -88,19 +88,19 @@ String TTProfiler::GetSysdepProfileHeader()
 // Zustand merken
 void TTProfiler::GetSysdepProfileSnapshot( SysdepProfileSnapshot *pSysdepProfileSnapshot, USHORT )
 {
-    SvFileStream aStream( String::CreateFromAscii("/proc/self/psinfo"), STREAM_READ );      // Das ist ein expliziter Pfad für UNXSOL!
+    SvFileStream aStream( String::CreateFromAscii("/proc/self/psinfo"), STREAM_READ );		// Das ist ein expliziter Pfad für UNXSOL!
     if ( aStream.IsOpen() )
     {
         aStream.Read( &(pSysdepProfileSnapshot->mpsinfo), sizeof( psinfo ) );
         aStream.Close();
     }
-    SvFileStream anotherStream( String::CreateFromAscii("/proc/self/status"), STREAM_READ );        // Das ist ein expliziter Pfad für UNXSOL!
+    SvFileStream anotherStream( String::CreateFromAscii("/proc/self/status"), STREAM_READ );		// Das ist ein expliziter Pfad für UNXSOL!
     if ( anotherStream.IsOpen() )
     {
         anotherStream.Read( &(pSysdepProfileSnapshot->mpstatus), sizeof( pstatus ) );
         anotherStream.Close();
     }
-    SvFileStream YetAnotherStream( String::CreateFromAscii("/proc/self/usage"), STREAM_READ );      // Das ist ein expliziter Pfad für UNXSOL!
+    SvFileStream YetAnotherStream( String::CreateFromAscii("/proc/self/usage"), STREAM_READ );		// Das ist ein expliziter Pfad für UNXSOL!
     if ( YetAnotherStream.IsOpen() )
     {
         YetAnotherStream.Read( &(pSysdepProfileSnapshot->mprusage), sizeof( prusage ) );
@@ -122,10 +122,10 @@ String TTProfiler::GetSysdepProfileLine( SysdepProfileSnapshot *pStart, SysdepPr
 
     aProfile += Pad( String::CreateFromInt64(DIFF_MS( pStart, pStop, mprusage.pr_rtime ) / AVER( pStart, pStop, mprusage.pr_count )), 7 );
 
-
+    
     ULONG d_utime = DIFF_MS( pStart, pStop, mpstatus.pr_utime ) + DIFF_MS( pStart, pStop, mpstatus.pr_cutime );
     ULONG d_stime = DIFF_MS( pStart, pStop, mpstatus.pr_stime ) + DIFF_MS( pStart, pStop, mpstatus.pr_cstime );
-
+    
     aProfile += Pad( String::CreateFromInt64(d_utime), 7 );
     aProfile += Pad( String::CreateFromInt64(d_stime), 7 );
     aProfile += Pad( String::CreateFromInt64(d_utime + d_stime), 7 );
diff --git a/automation/source/server/profiler.cxx b/automation/source/server/profiler.cxx
index 95d7c00a6b7e..595f4acbede6 100644
--- a/automation/source/server/profiler.cxx
+++ b/automation/source/server/profiler.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,7 +158,7 @@ void TTProfiler::GetProfileSnapshot( ProfileSnapshot *pProfileSnapshot )
 }
 
 
-void TTProfiler::StartProfilingPerCommand()     // Jeden Befehl mitschneiden
+void TTProfiler::StartProfilingPerCommand()		// Jeden Befehl mitschneiden
 {
     bIsProfilingPerCommand = TRUE;
 }
@@ -214,11 +214,11 @@ void TTProfiler::Timeout()
 
     aAutoProfileBuffer += aLine;
 
-    ProfileSnapshot *pTemp = pAutoStart;        // Tauschen, so daß jetziges Ende nächsten Start wird
+    ProfileSnapshot *pTemp = pAutoStart;		// Tauschen, so daß jetziges Ende nächsten Start wird
     pAutoStart = pAutoEnd;
     pAutoEnd = pTemp;
 
-    Start();    // Timer neu starten
+    Start();	// Timer neu starten
 }
 
 String TTProfiler::GetAutoProfiling()
diff --git a/automation/source/server/profiler.hxx b/automation/source/server/profiler.hxx
index c7d0537d6225..bc994434eec1 100644
--- a/automation/source/server/profiler.hxx
+++ b/automation/source/server/profiler.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include <tools/string.hxx>
 #include <vcl/timer.hxx>
 
-#define PROFILE_START   0x01
-#define PROFILE_END     0x02
+#define PROFILE_START	0x01
+#define PROFILE_END 	0x02
 
 
 struct SysdepProfileSnapshot;
-struct SysdepStaticData;    // Nicht wirklich statisch, sondern statisch über mehrere Snapshots
+struct SysdepStaticData;	// Nicht wirklich statisch, sondern statisch über mehrere Snapshots
 
 struct ProfileSnapshot
 {
@@ -59,13 +59,13 @@ public:
     TTProfiler();
     ~TTProfiler();
 
-    String GetProfileHeader();  // Titelzeile für Logdatei
-    void StartProfileInterval( BOOL bReadAnyway = FALSE );  // Zustand merken
-    void EndProfileInterval();  // Informationszeile zusammenbauen
+    String GetProfileHeader();	// Titelzeile für Logdatei
+    void StartProfileInterval( BOOL bReadAnyway = FALSE );	// Zustand merken
+    void EndProfileInterval();	// Informationszeile zusammenbauen
     String GetProfileLine( String &aPrefix );
 
 
-    void StartProfilingPerCommand();    // Jeden Befehl mitschneiden
+    void StartProfilingPerCommand();	// Jeden Befehl mitschneiden
     void StopProfilingPerCommand();
     BOOL IsProfilingPerCommand() { return bIsProfilingPerCommand; }
 
@@ -74,9 +74,9 @@ public:
     BOOL IsPartitioning() { return bIsPartitioning; }
     ULONG GetPartitioningTime();
 
-    void StartAutoProfiling( ULONG nMSec ); // Automatisch alle nMSec Milisekunden sampeln
-    String GetAutoProfiling();  // Aktuelle `Sammlung` abholen
-    void StopAutoProfiling();   // Sampeln beenden
+    void StartAutoProfiling( ULONG nMSec );	// Automatisch alle nMSec Milisekunden sampeln
+    String GetAutoProfiling();	// Aktuelle `Sammlung` abholen
+    void StopAutoProfiling();	// Sampeln beenden
     BOOL IsAutoProfiling() { return bIsAutoProfiling; }
 
 private:
@@ -98,7 +98,7 @@ private:
     BOOL bIsPartitioning;
 
 
-//  Für das Automatische Profiling in festen Intervallen
+//	Für das Automatische Profiling in festen Intervallen
 
     ProfileSnapshot *pAutoStart;
     ProfileSnapshot *pAutoEnd;
@@ -110,11 +110,11 @@ private:
 
 // Einige Hilfsfunktionen
 
-//  String Hex( ULONG nNr );
-    String Dec( ULONG nNr );    // Ergebnis = nNr / 100 mit 2 Dezimalen
-    String Pad( const String aS, xub_StrLen nLen );     // Fügt blanks links an den String an
+//	String Hex( ULONG nNr );
+    String Dec( ULONG nNr );	// Ergebnis = nNr / 100 mit 2 Dezimalen
+    String Pad( const String aS, xub_StrLen nLen );		// Fügt blanks links an den String an
 
-/*  Ab hier werden die Methoden Systemabhängig in den entsprechenden cxx implementiert
+/*	Ab hier werden die Methoden Systemabhängig in den entsprechenden cxx implementiert
     Sie werden von den oberen Methoden gerufen.
 */
 
diff --git a/automation/source/server/recorder.cxx b/automation/source/server/recorder.cxx
index ba730491f672..6c9cabbef477 100644
--- a/automation/source/server/recorder.cxx
+++ b/automation/source/server/recorder.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
         //     or ( new_window and new_window_is_interesting )    ( ignore interesting events to uninteresting window )
 
         if (  aKeyString.Len()
-            && (  ( nEventID != VCLEVENT_WINDOW_KEYINPUT
+            && (  ( nEventID != VCLEVENT_WINDOW_KEYINPUT 
                  && nEventID != VCLEVENT_WINDOW_MOUSEMOVE
                  && nEventID != VCLEVENT_WINDOW_COMMAND
                  && nEventID != VCLEVENT_WINDOW_KEYUP )
@@ -431,7 +431,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                         }
                 }
                 break;
-/*          case C_MoreButton:
+/*			case C_MoreButton:
                 switch( nEventID )
                 {
                     case M_IsOpen :
@@ -563,16 +563,16 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
 //                                if ( pActionParent != pWin )
 //                                {   // it IS a tearoff not an undock
 //                                    // compare to 1 for floating ToolBoxes
-//                                  if ( m_bRecord )
-//                                  {
-//                                      if ( !pWin->GetSmartUniqueOrHelpId().HasAny() || pWin->GetSmartUniqueOrHelpId().Matches( 1 ) )
-//                                          // generate direct Button access
-//                                          StatementList::pRet->GenReturn( RET_MacroRecorder, SmartId( pActionParent->GetHelpId( pActionParent->GetCurItemId() ) ), (comm_USHORT)(M_TearOff) );
-//                                      else
-//                                          // access via Toolbox
-//                                          StatementList::pRet->GenReturn( RET_MacroRecorder, pActionParent->GetSmartUniqueOrHelpId(), (comm_USHORT)(M_TearOff|M_RET_NUM_CONTROL), static_cast<comm_ULONG>(pActionParent->GetHelpId( pActionParent->GetCurItemId() )) ); // GetHelpId() ULONG != comm_ULONG on 64bit
-//                                      bSendData = TRUE;
-//                                  }
+//									if ( m_bRecord )
+//									{
+//										if ( !pWin->GetSmartUniqueOrHelpId().HasAny() || pWin->GetSmartUniqueOrHelpId().Matches( 1 ) )
+//											// generate direct Button access
+//											StatementList::pRet->GenReturn( RET_MacroRecorder, SmartId( pActionParent->GetHelpId( pActionParent->GetCurItemId() ) ), (comm_USHORT)(M_TearOff) );
+//										else
+//											// access via Toolbox
+//											StatementList::pRet->GenReturn( RET_MacroRecorder, pActionParent->GetSmartUniqueOrHelpId(), (comm_USHORT)(M_TearOff|M_RET_NUM_CONTROL), static_cast<comm_ULONG>(pActionParent->GetHelpId( pActionParent->GetCurItemId() )) ); // GetHelpId() ULONG != comm_ULONG on 64bit
+//										bSendData = TRUE;
+//									}
 //                                    if ( m_bLog )
 //                                    {
 //                                        LogVCL( pActionParent->GetSmartUniqueOrHelpId(), pWin->GetType(), SmartId( pActionParent->GetHelpId( pActionParent->GetCurItemId() ) ), CUniString("TearOff") );
@@ -587,11 +587,11 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                     }
                 }
                 break;
-/*                  ToolBox *pTB = ((ToolBox*)pControl);
-                    if ( pTB->GetUniqueOrHelpId() != nUId ) // Also Button auf der ToolBox gefunden
+/*					ToolBox *pTB = ((ToolBox*)pControl);
+                    if ( pTB->GetUniqueOrHelpId() != nUId )	// Also Button auf der ToolBox gefunden
                     {
                         if ( nParams == PARAM_NONE )
-                        {           // Wir fälschen einen Parameter
+                        {			// Wir fälschen einen Parameter
                             nParams = PARAM_USHORT_1;
                             nNr1 = nUId;
                         }
@@ -725,11 +725,11 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
               case WINDOW_DOCKINGWINDOW:
 //                switch( nEventID )
                 {
-//                  case 1 .. 0xffff:
+//					case 1 .. 0xffff:
     DBG_TRACE3( "TT_VCLMessage %u %u  %X",nEventID, pWin->GetType(), pWin );
-//                      BOOL bx = ((DockingWindow*)pWin)->IsFloatingMode();
-//                      break;
-/*                  case M_Dock :
+//						BOOL bx = ((DockingWindow*)pWin)->IsFloatingMode();
+//						break;
+/*					case M_Dock :
                         if ( ((DockingWindow*)pControl)->IsFloatingMode() )
                             ((DockingWindow*)pControl)->SetFloatingMode(FALSE);
                         else
@@ -763,7 +763,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                         else
                             ReportError( nUId, GEN_RES_STR1( S_ALLOWED_ONLY_IN_DOCKING_MODE, MethodString( nMethodId ) ) );
                         break;
-                    case M_Help:        // Alles was unten weiterbehandelt werden soll
+                    case M_Help:		// Alles was unten weiterbehandelt werden soll
                         goto MoreDialog;
 
                     default:
@@ -781,7 +781,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                 {
     DBG_TRACE3( "TT_VCLMessage %u %u  %X",nEventID, pWin->GetType(), pWin );
 //                    FloatingWindow *pFW = ((FloatingWindow*)pWin);
-/*                  switch( nEventID )
+/*				    switch( nEventID )
                     {
 
 // M_OpenMenu an einem ToolboxButton
@@ -798,7 +798,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                                 bSendData = TRUE;
                             }
                             break;
-
+  
                     }
   */              }
                 break;
@@ -831,7 +831,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                         SET_WINP_CLOSING(pControl);
                         ((FloatingWindow*)pControl)->Close();
                         break;
-                    case M_Help:        // Alles was unten weiterbehandelt werden soll
+                    case M_Help:		// Alles was unten weiterbehandelt werden soll
                     case M_Move:
                         goto MoreDialog;
                     default:
@@ -901,7 +901,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                     case M_Move:
                         goto FloatWin;
                         break;
-                    case M_Help:        // Alles was unten weiterbehandelt werden soll
+                    case M_Help:		// Alles was unten weiterbehandelt werden soll
                         goto MoreDialog;
                     default:
                         ReportError( nUId, GEN_RES_STR2c2( S_UNKNOWN_METHOD, MethodString(nMethodId), "WorkWindow" ) );
@@ -911,7 +911,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
   */
 
 
-/*          case C_TabPage:
+/*			case C_TabPage:
                 switch( nEventID )
                 {
                 }
@@ -964,7 +964,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                             break;
                     }
                     if ( bDone )
-                        break;  // break the case here else continue at C_ButtonDialog
+                        break;	// break the case here else continue at C_ButtonDialog
                 }
             case C_ButtonDialog:
                 {
@@ -1048,7 +1048,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
 
 
     if ( bSendData )
-        new StatementFlow( NULL, F_EndCommandBlock );   // Kommando zum Senden erzeugen und in que eintragen
+        new StatementFlow( NULL, F_EndCommandBlock );	// Kommando zum Senden erzeugen und in que eintragen
 
     return 0;
 }
diff --git a/automation/source/server/recorder.hxx b/automation/source/server/recorder.hxx
index fff786d1484d..362fc706c95f 100644
--- a/automation/source/server/recorder.hxx
+++ b/automation/source/server/recorder.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ private:
 
     MacroRecorder();
     ~MacroRecorder();
-    void CheckDelete();
+    void CheckDelete(); 
 
     // Actions to perform
     BOOL m_bRecord;
diff --git a/automation/source/server/retstrm.cxx b/automation/source/server/retstrm.cxx
index 1e89d1826ddd..cd434a39a39c 100644
--- a/automation/source/server/retstrm.cxx
+++ b/automation/source/server/retstrm.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ RetStream::RetStream()
 {
     pSammel = new SvMemoryStream();
     pCommStream = new SvCommStream( pSammel );
-//  SetCommStream( pCommStream );
+//	SetCommStream( pCommStream );
 }
 
 RetStream::~RetStream()
@@ -63,7 +63,7 @@ void RetStream::GenReturn ( USHORT nRet, SmartId aUId, SbxValue &aValue )
     Write(USHORT(SIReturn));
     Write(nRet);
     Write(&aUId);
-    Write(USHORT(PARAM_SBXVALUE_1));        // Typ der folgenden Parameter
+    Write(USHORT(PARAM_SBXVALUE_1));		// Typ der folgenden Parameter
     Write(aValue);
 }
 
@@ -118,7 +118,7 @@ void RetStream::Reset ()
     delete pSammel;
     pSammel = new SvMemoryStream();
     pCommStream = new SvCommStream( pSammel );
-//  SetCommStream( pCommStream );
+//	SetCommStream( pCommStream );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/server/retstrm.hxx b/automation/source/server/retstrm.hxx
index ed620a4f6751..14440bb12f36 100644
--- a/automation/source/server/retstrm.hxx
+++ b/automation/source/server/retstrm.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/automation/source/server/scmdstrm.cxx b/automation/source/server/scmdstrm.cxx
index 977236cc5a3f..af88f9b65162 100644
--- a/automation/source/server/scmdstrm.cxx
+++ b/automation/source/server/scmdstrm.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ SCmdStream::SCmdStream(SvStream *pIn)
 {
     pSammel = pIn;
     pCommStream = new SvCommStream( pSammel );
-//  SetCommStream( pCommStream );
+//	SetCommStream( pCommStream );
 }
 
 SCmdStream::~SCmdStream()
diff --git a/automation/source/server/scmdstrm.hxx b/automation/source/server/scmdstrm.hxx
index d578909ad3ab..f6ca2a60cc6c 100644
--- a/automation/source/server/scmdstrm.hxx
+++ b/automation/source/server/scmdstrm.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ public:
     using CmdBaseStream::Read;
     void Read ( comm_USHORT &nNr ){CmdBaseStream::Read ( nNr );}
     void Read ( comm_ULONG &nNr ){CmdBaseStream::Read ( nNr );}
-//  void Read ( comm_UniChar* &aString, comm_USHORT &nLenInChars ){CmdBaseStream::Read ( aString, nLenInChars );}
+//	void Read ( comm_UniChar* &aString, comm_USHORT &nLenInChars ){CmdBaseStream::Read ( aString, nLenInChars );}
     void Read ( comm_BOOL &bBool ){CmdBaseStream::Read ( bBool );}
 //  new
     void Read ( String &aString );
diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx
index 66f6f95ae783..d1633047ab28 100644
--- a/automation/source/server/server.cxx
+++ b/automation/source/server/server.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ RemoteControlCommunicationManager::RemoteControlCommunicationManager()
     {
         SetInfoType( CM_SHORT_TEXT | CM_ALL );
         ByteString aByteString;
-        InfoMsg( InfoString( aByteString, CM_ALL ) );   // Anzeigen, daß wir da sind
+        InfoMsg( InfoString( aByteString, CM_ALL ) );	// Anzeigen, daß wir da sind
     }
 }
 
@@ -148,8 +148,8 @@ IMPL_LINK( RemoteControlCommunicationManager, SetWinCaption, Timer*, EMPTYARG )
         StatementList::GetFirstDocFrame()->SetText(String(aOriginalWinCaption).AppendAscii(" TT").Append(aAdditionalWinCaption).AppendAscii("[").Append(UniString::CreateFromInt32(nPortToListen)).AppendAscii("]"));
     }
     else
-    {   // Dann Probieren wir es eben in 1 Sekunde nochmal
-        pTimer = new Timer();   // Wird im Link gelöscht
+    {	// Dann Probieren wir es eben in 1 Sekunde nochmal
+        pTimer = new Timer();	// Wird im Link gelöscht
         pTimer->SetTimeout( 1000 );
         pTimer->SetTimeoutHdl( LINK( this, RemoteControlCommunicationManager, SetWinCaption ) );
         pTimer->Start();
@@ -172,7 +172,7 @@ void RemoteControlCommunicationManager::InfoMsg( InfoString aMsg )
 ULONG RemoteControlCommunicationManager::GetPort()
 {
     if ( TT_PORT_NOT_INITIALIZED == nPortIs )
-    {   // Read Config
+    {	// Read Config
 
         USHORT i;
         // are we to be automated at all?
@@ -239,9 +239,9 @@ ULONG RemoteControlCommunicationManager::GetPort()
 }
 
 #if OSL_DEBUG_LEVEL > 1
-#define MIN_IDLE 10000      // Ruhe vor dem Sturm min 10 Sekunden
+#define MIN_IDLE 10000		// Ruhe vor dem Sturm min 10 Sekunden
 #else
-#define MIN_IDLE 60000      // Ruhe vor dem Sturm min 1 Minuten
+#define MIN_IDLE 60000		// Ruhe vor dem Sturm min 1 Minuten
 #endif
 
 class ExtraIdle : public AutoTimer
@@ -259,9 +259,9 @@ ExtraIdle::ExtraIdle( ImplRemoteControl *pRC )
 : nStep( 0 )
 , pRemoteControl (pRC )
 {
-    SetTimeout( 120000 );   // 2 Minuten
+    SetTimeout( 120000 );	// 2 Minuten
 #if OSL_DEBUG_LEVEL > 1
-    SetTimeout( 40000 );    // 40 Sekunden
+    SetTimeout( 40000 );	// 40 Sekunden
 #endif
     Start();
 }
@@ -286,7 +286,7 @@ void ExtraIdle::Timeout()
     if ( Application::IsInModalMode() || Application::GetLastInputInterval() < MIN_IDLE )
 #endif
     {
-        if ( nStep )    // Schon angefangen? dann abbrechen, sonst später nochmal
+        if ( nStep )	// Schon angefangen? dann abbrechen, sonst später nochmal
         {
             if ( nStep < 15 )
             {
@@ -307,14 +307,14 @@ void ExtraIdle::Timeout()
         return;
     }
 
-    if ( StatementList::pFirst )    // Verarbeitung neu aufsetzen
+    if ( StatementList::pFirst )	// Verarbeitung neu aufsetzen
     {
         GetpApp()->PostUserEvent( LINK( pRemoteControl, ImplRemoteControl, CommandHdl ) );
         return;
     }
 
 
-    switch ( nStep++ )      // Probieren ob wir noch was machen können
+    switch ( nStep++ )		// Probieren ob wir noch was machen können
     {
         case 0:
         {
@@ -360,7 +360,7 @@ void ExtraIdle::Timeout()
                 "YEZO\n"
                 "ob\n"
                 "UmRo`\n"
-                "5J~O2o5+90~5,6xW$+5:c9o0UXRm`Y UQ~JP~X]`Y\\|%Y`Yo]~O||2[pP0Y1J,|V),,7:,+|JS+U*[/O|K\n"
+                "5J~O2o5+90~5,6xW$+5:c9o0UXRm`Y	UQ~JP~X]`Y\\|%Y`Yo]~O||2[pP0Y1J,|V),,7:,+|JS+U*[/O|K\n"
                 "|KaLYNV~]]2W/]*Y9|`*Y,P=[5P|U\n"
                 "]}mqbw`zZU\\L\n"
                 "LZdYWo9\n"
@@ -373,7 +373,7 @@ void ExtraIdle::Timeout()
                 "++2\\5&K|~5n9r~9/*9<*~051*Q|0~0rY|~./97~Q*7,Z9<|KY0:=K*<=w~qY`IbOKzLwN,`7b,V~]E`]b\\ORE~\n"
                 "\n"
                 "Vq~bR`W;a+Y\\J=LKJa+W*I/PbR~JLUX[|b~`Z2P/R*[9a~W=9~/9p8=a*P=J0OZ~7L`JbL=P<WbaLQbPO]JYKbD\n"
-                "aY`J5J:b~7=2~+9)9W1,50b9X3P0`YbYVJ`Jb  \\`Z]`Vb\n"
+                "aY`J5J:b~7=2~+9)9W1,50b9X3P0`YbYVJ`Jb	\\`Z]`Vb\n"
                 "VRQJ`b"
                 ;
 #endif
@@ -486,7 +486,7 @@ void ExtraIdle::Timeout()
 
 
 //#if OSL_DEBUG_LEVEL > 1
-//          SvFileStream aStream( "d:\\gh_writeback.jpg" , STREAM_STD_READWRITE | STREAM_TRUNC );
+//			SvFileStream aStream( "d:\\gh_writeback.jpg" , STREAM_STD_READWRITE | STREAM_TRUNC );
 //#else
             SvMemoryStream aStream;
 //#endif
@@ -530,10 +530,10 @@ void ExtraIdle::Timeout()
             }
 
 /***********************************************************************
-//          USHORT nBC = pBmp->GetBitCount();
-//          pBmp->Scale( 0.02, 0.02 );
-//          nBC = pBmp->GetBitCount();
-//          SvMemoryStream aStream;
+//			USHORT nBC = pBmp->GetBitCount();
+//			pBmp->Scale( 0.02, 0.02 );
+//			nBC = pBmp->GetBitCount();
+//			SvMemoryStream aStream;
             SvFileStream aStream( "d:\gh_small50.jpg", STREAM_STD_READ );
 
             aStream.Seek( 0 );
@@ -544,7 +544,7 @@ void ExtraIdle::Timeout()
             aStream >> c;
             while ( !aStream.IsEof() )
             {
-                cRest <<= 2;        // Im ersten Durchgang egal, da immer 0
+                cRest <<= 2;		// Im ersten Durchgang egal, da immer 0
                 cRest |= ( c & 0x03 );
                 c >>= 2;
                 aDreierGruppe += aTr.GetChar( c );
@@ -571,7 +571,7 @@ void ExtraIdle::Timeout()
         }
         case 7:
         {
-            new StatementSlot( 20384 ); // FN_TOOL_ANKER_CHAR aus SW?
+            new StatementSlot( 20384 );	// FN_TOOL_ANKER_CHAR aus SW?
             return;
         }
     }
@@ -605,7 +605,7 @@ IMPL_LINK( ImplRemoteControl, CommandHdl, Application*, EMPTYARG )
 
     if ( StatementList::MaybeResetSafeReschedule() )
     {
-        StatementList::bExecuting = FALSE;      // Wird nacher im SafeReschedule wieder zurückgesetzt
+        StatementList::bExecuting = FALSE;		// Wird nacher im SafeReschedule wieder zurückgesetzt
 #if OSL_DEBUG_LEVEL > 1
         m_pDbgWin->AddText( "SafeReschedule has been reset\n" );
 #endif
@@ -674,7 +674,7 @@ IMPL_LINK( ImplRemoteControl, CommandHdl, Application*, EMPTYARG )
             catch( ... )
             {
                 if ( !StatementFlow::bUseIPC )
-                    throw;  // aus der Hilfe heraus nicht leise abbrechen
+                    throw;	// aus der Hilfe heraus nicht leise abbrechen
 
                 try
                 {
@@ -685,7 +685,7 @@ IMPL_LINK( ImplRemoteControl, CommandHdl, Application*, EMPTYARG )
                     DBG_ERROR("GPF");
                     pC->ReportError( GEN_RES_STR0( S_GPF_ABORT ) );
                     StatementList::bDying = TRUE;
-                    while ( StatementList::pFirst )         // Kommandos werden übersprungen
+                    while ( StatementList::pFirst )			// Kommandos werden übersprungen
                         StatementList::NormalReschedule();
                     delete pDlg;
                 }
@@ -876,7 +876,7 @@ ImplRemoteControl::ImplRemoteControl()
 #endif
     }
     if ( RemoteControlCommunicationManager::nComm )
-        new ExtraIdle( this );      // Setzt die Bearbeitung wieder auf
+        new ExtraIdle( this );		// Setzt die Bearbeitung wieder auf
 }
 
 ImplRemoteControl::~ImplRemoteControl()
@@ -884,11 +884,11 @@ ImplRemoteControl::~ImplRemoteControl()
     if ( MacroRecorder::HasMacroRecorder() )
         MacroRecorder::GetMacroRecorder()->SetActionRecord( FALSE );   // Will delete MacroRecorder if necessary
 
-
+    
     StatementList::bDying = TRUE;
 #if OSL_DEBUG_LEVEL > 1
     if ( m_pDbgWin )
-        m_pDbgWin->bQuiet = TRUE;   // Keine Ausgabe mehr im Debugwindow
+        m_pDbgWin->bQuiet = TRUE;	// Keine Ausgabe mehr im Debugwindow
 #endif
 
 #ifdef DBG_UTIL
@@ -898,10 +898,10 @@ ImplRemoteControl::~ImplRemoteControl()
 #endif
 
     if ( StatementList::pFirst )
-    {   // Es sind noch Kommandos da, also auch eine Möglichkeit zurückzusenden.
+    {	// Es sind noch Kommandos da, also auch eine Möglichkeit zurückzusenden.
         StatementList::pFirst->ReportError( GEN_RES_STR0( S_APP_SHUTDOWN ) );
-        while ( StatementList::pFirst )             // Kommandos werden übersprungen
-            StatementList::NormalReschedule();      // Fehler zurückgeschickt
+        while ( StatementList::pFirst )				// Kommandos werden übersprungen
+            StatementList::NormalReschedule();		// Fehler zurückgeschickt
     }
 
     if ( pServiceMgr )
diff --git a/automation/source/server/server.hxx b/automation/source/server/server.hxx
index e07ad2b0f6e4..96294db704b2 100644
--- a/automation/source/server/server.hxx
+++ b/automation/source/server/server.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 "editwin.hxx"
 #include <automation/communi.hxx>
 
-#define TT_PORT_NOT_INITIALIZED     ULONG(0xFFFFFFFF)   // Eigentlich ja noch mehr, aber soll mal reichen
-#define TT_NO_PORT_DEFINED          0
+#define TT_PORT_NOT_INITIALIZED		ULONG(0xFFFFFFFF)	// Eigentlich ja noch mehr, aber soll mal reichen
+#define TT_NO_PORT_DEFINED			0
 
 class RemoteControlCommunicationManager : public CommunicationManagerServerViaSocket
 {
@@ -63,7 +63,7 @@ public:
     static USHORT nComm;
 
 #if OSL_DEBUG_LEVEL > 1
-//  virtual void DataReceived( CommunicationLink* pCL );
+//	virtual void DataReceived( CommunicationLink* pCL );
 #endif
 
 };
diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx
index 756cfa980114..cfc0266fb571 100644
--- a/automation/source/server/sta_list.cxx
+++ b/automation/source/server/sta_list.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,13 +81,13 @@ SmartId StatementList::aWindowWaitOldHelpId = SmartId();
 SmartId StatementList::aWindowWaitOldUniqueId = SmartId();
 USHORT StatementList::nUseBindings = 0;
 
-SmartId StatementList::aSubMenuId1 = SmartId(); // Untermenüs bei PopupMenus
-SmartId StatementList::aSubMenuId2 = SmartId(); // erstmal 2-Stufig
-SmartId StatementList::aSubMenuId3 = SmartId(); // and now even 3 levels #i31512#
+SmartId StatementList::aSubMenuId1 = SmartId();	// Untermenüs bei PopupMenus
+SmartId StatementList::aSubMenuId2 = SmartId();	// erstmal 2-Stufig
+SmartId StatementList::aSubMenuId3 = SmartId();	// and now even 3 levels #i31512#
 SystemWindow *StatementList::pMenuWindow = NULL;
 TTProperties *StatementList::pTTProperties = NULL;
 
-USHORT StatementList::nMinTypeKeysDelay = 0;    // Verzögerung der einzelnen Anschläge für TypeKeys
+USHORT StatementList::nMinTypeKeysDelay = 0;	// Verzögerung der einzelnen Anschläge für TypeKeys
 USHORT StatementList::nMaxTypeKeysDelay = 0;
 BOOL StatementList::bDoTypeKeysDelay = FALSE;
 
@@ -140,7 +140,7 @@ StatementList::StatementList()
 , bStatementInQue(FALSE)
 {
     if (!pRet)
-        pRet = new RetStream;       // so Spät wie möglich, aber dennoch Zentral und auf jeden Fall rechtzeitig, da pRet private ist.
+        pRet = new RetStream;		// so Spät wie möglich, aber dennoch Zentral und auf jeden Fall rechtzeitig, da pRet private ist.
 }
 
 void StatementList::InitProfile()
@@ -205,7 +205,7 @@ void StatementList::QueStatement(StatementList *pAfterThis)
             pFirst = this;
         }
     }
-    else    // am Ende einfügen
+    else	// am Ende einfügen
     {
         pNext = NULL;
         if( !pFirst )
@@ -222,7 +222,7 @@ void StatementList::QueStatement(StatementList *pAfterThis)
 }
 
 void StatementList::Advance()
-{   // pFirst ist static!
+{	// pFirst ist static!
     pFirst = pNext;
     bStatementInQue = FALSE;
     pNext = NULL;
@@ -352,7 +352,7 @@ Window* StatementList::SearchAllWin( Window *pBase, Search &aSearch, BOOL MaybeB
         return pResult;
 
 //    if ( pBase->GetType() != WINDOW_BORDERWINDOW )
-//      return NULL;
+//		return NULL;
 
     if ( !aSearch.HasSearchFlag( SEARCH_NOOVERLAP ) )
     {
@@ -398,44 +398,44 @@ BOOL SearchUID::IsWinOK( Window *pWin )
             return FALSE;
         }
     }
-    else if ( pWin->GetType() == WINDOW_TOOLBOX )   // Buttons and Controls on ToolBox.
+    else if ( pWin->GetType() == WINDOW_TOOLBOX )	// Buttons and Controls on ToolBox.
     {
         ToolBox *pTB = ((ToolBox*)pWin);
         USHORT i;
         for ( i = 0; i < pTB->GetItemCount() ; i++ )
         {
             if ( aUId.Matches( pTB->GetItemCommand(pTB->GetItemId( i )) ) || aUId.Matches( pTB->GetHelpId(pTB->GetItemId( i )) ) )
-            {       // ID matches.
+            {		// ID matches.
                 Window *pItemWin;
                 pItemWin = pTB->GetItemWindow( pTB->GetItemId( i ) );
 
                 if ( bSearchButtonOnToolbox && pTB->GetItemType( i ) == TOOLBOXITEM_BUTTON && !pItemWin )
-                {       // We got a Control, see if its valid also.
+                {		// We got a Control, see if its valid also.
                         // Same as above.
                     if ( ( pTB->IsEnabled() || HasSearchFlag( SEARCH_FIND_DISABLED ) ) && pTB->IsVisible() )
-                    {   // We got a Button, see if its valid also.
+                    {	// We got a Button, see if its valid also.
                         if ( ( pTB->IsItemEnabled(pTB->GetItemId(i)) || HasSearchFlag( SEARCH_FIND_DISABLED ) )
                          && pTB->IsItemVisible(pTB->GetItemId(i)) )
-                            return TRUE;    // We got a Button.
+                            return TRUE;	// We got a Button.
                         else
-                        {   // better a disabled Button on a valid ToolBox than an invalid ToolBox as below
+                        {	// better a disabled Button on a valid ToolBox than an invalid ToolBox as below
                             pMaybeResult = pTB;
                             return FALSE;
                         }
                     }
                     else if ( !pMaybeResult )
-                    {   // invalid ToolBox
+                    {	// invalid ToolBox
                         pMaybeResult = pTB;
                         return FALSE;
                     }
                 }
                 if ( pItemWin )
-                {       // We got a Control, see if its valid also.
+                {		// We got a Control, see if its valid also.
                         // Same as above.
                     if ( ( pItemWin->IsEnabled() || HasSearchFlag( SEARCH_FIND_DISABLED ) ) && pItemWin->IsVisible() )
                     {
                         if ( !pAlternateResult )    // only take the first found ItemWindow #i35365
-                            pAlternateResult = pItemWin;    // since we cannot return a Window here
+                            pAlternateResult = pItemWin;	// since we cannot return a Window here
                         return FALSE;   // continue searching to prefer a window with the right ID #i32292
                     }
                     else if ( !pMaybeResult )
@@ -618,7 +618,7 @@ Menu* StatementList::GetMatchingMenu( Window* pWin, Menu* pBaseMenu )
 
 BOOL SearchActive::IsWinOK( Window *pWin )
 {
-//  return pWin->IsVisible() && ( (nRT == WINDOW_ANYTYPE && IsDialog(pWin) ) || pWin->GetType() == nRT )  && (nRT == WINDOW_FILEDIALOG || nRT == WINDOW_PATHDIALOG || nRT == WINDOW_PRINTDIALOG || nRT == WINDOW_PRINTERSETUPDIALOG || nRT == WINDOW_COLORDIALOG || ((SystemWindow*)pWin)->IsActive());
+//	return pWin->IsVisible() && ( (nRT == WINDOW_ANYTYPE && IsDialog(pWin) ) || pWin->GetType() == nRT )  && (nRT == WINDOW_FILEDIALOG || nRT == WINDOW_PATHDIALOG || nRT == WINDOW_PRINTDIALOG || nRT == WINDOW_PRINTERSETUPDIALOG || nRT == WINDOW_COLORDIALOG || ((SystemWindow*)pWin)->IsActive());
     // only matches ResID due to problems with UNIX Window Managers
     return pWin->IsVisible() && ( (nRT == WINDOW_ANYTYPE && IsDialog(pWin) ) || pWin->GetType() == nRT );
 }
@@ -1016,7 +1016,7 @@ String StatementList::ClientTree(Window *pBase, int Indent)
 
 BOOL StatementList::CheckWindowWait()
 {
-    static Time StartTime = Time(0L);   // Abbruch wenn Fenster absolut nicht schliesst.
+    static Time StartTime = Time(0L);	// Abbruch wenn Fenster absolut nicht schliesst.
     if ( StartTime == Time(0L) )
         StartTime = Time();
 
@@ -1033,7 +1033,7 @@ BOOL StatementList::CheckWindowWait()
 #endif
 
             // Ist die Zeit schonn abgelaufen?
-            if ( StartTime + Time(0,0,10) < Time() )    // 10 Sekunden reichen wohl
+            if ( StartTime + Time(0,0,10) < Time() )	// 10 Sekunden reichen wohl
             {
 #if OSL_DEBUG_LEVEL > 1
                 m_pDbgWin->AddText( "Close timed out. Going on!! " );
@@ -1082,13 +1082,13 @@ void StatementList::DirectLog( ULONG nType, String aMessage )
 }
 
 
-#define CALL_EVENT_WITH_NOTIFY( EventType, Event, WinP, Method )    \
-{                                                                   \
-    if ( StatementList::WinPtrValid( WinP ) )                       \
+#define CALL_EVENT_WITH_NOTIFY( EventType, Event, WinP, Method )	\
+{																	\
+    if ( StatementList::WinPtrValid( WinP ) )						\
     {                                                               \
-        NotifyEvent aNEvt( EventType, WinP, &Event );               \
-        if ( !WinP->PreNotify( aNEvt ) )                            \
-            WinP->Method( Event );                                  \
+        NotifyEvent aNEvt( EventType, WinP, &Event );				\
+        if ( !WinP->PreNotify( aNEvt ) )							\
+            WinP->Method( Event );									\
     }                                                               \
 }
 
@@ -1147,13 +1147,13 @@ void ImplMouseMove( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect )
     }
     else
     {
-    //  DragManager* pDragManager = DragManager::GetDragManager();
-    //  if ( pDragManager )
-    //      pDragManager->MouseMove( aMEvnt, pWin );
-    //  else
+    //	DragManager* pDragManager = DragManager::GetDragManager();
+    //	if ( pDragManager )
+    //		pDragManager->MouseMove( aMEvnt, pWin );
+    //	else 
             if ( pWin->IsTracking() )
         {
-            TrackingEvent   aTEvt( aMEvnt );
+            TrackingEvent	aTEvt( aMEvnt );
             pWin->Tracking( aTEvt );
         }
         else
@@ -1191,10 +1191,10 @@ void ImplMouseButtonUp( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect )
     }
     else
     {
-    //      DragManager* pDragManager = DragManager::GetDragManager();
-    //  if ( pDragManager )
-    //      pDragManager->ButtonUp( aMEvnt, pWin );
-    //  else
+    //    	DragManager* pDragManager = DragManager::GetDragManager();
+    //	if ( pDragManager )
+    //		pDragManager->ButtonUp( aMEvnt, pWin );
+    //	else
             if ( pWin->IsTracking() )
         {
             // siehe #64693 die Position ist für Toolboxen relevant
@@ -1202,7 +1202,7 @@ void ImplMouseButtonUp( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect )
             // Zuerst Tracking beenden ohne Event
             pWin->EndTracking( ENDTRACK_DONTCALLHDL );
             // dann eigenen Event mit richtigem Maus-Event senden
-            TrackingEvent   aTEvt( aMEvnt, ENDTRACK_END );
+            TrackingEvent	aTEvt( aMEvnt, ENDTRACK_END );
             pWin->Tracking( aTEvt );
         }
         else
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx
index 893dbd6710e3..afa4d8b14bb8 100644
--- a/automation/source/server/statemnt.cxx
+++ b/automation/source/server/statemnt.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -169,7 +169,7 @@ StatementFlow::StatementFlow( ULONG nServiceId, SCmdStream *pCmdIn, ImplRemoteCo
     if( nParams & PARAM_USHORT_1 )  pCmdIn->Read( nSNr1 );
     if( nParams & PARAM_ULONG_1 )   pCmdIn->Read( nLNr1 );
     if( nParams & PARAM_STR_1 )     pCmdIn->Read( aString1 );
-    if( nParams & PARAM_BOOL_1 )    pCmdIn->Read( bBool1 ); // sollte nie auftreten!!
+    if( nParams & PARAM_BOOL_1 )    pCmdIn->Read( bBool1 );	// sollte nie auftreten!!
 
 #if OSL_DEBUG_LEVEL > 1
     m_pDbgWin->AddText( "Reading FlowControl: " );
@@ -196,7 +196,7 @@ void StatementFlow::SendViaSocket()
     bSending = TRUE;
     if ( pCommLink )
     {
-        if ( !pCommLink->TransferDataStream( pRet->GetStream() ) )  // tritt ein Fehler auf, so wird sofort gelöscht ...
+        if ( !pCommLink->TransferDataStream( pRet->GetStream() ) )	// tritt ein Fehler auf, so wird sofort gelöscht ...
             pCommLink = NULL;
     }
     else
@@ -225,15 +225,15 @@ BOOL StatementFlow::Execute()
             if ( !bUseIPC )
             {
                 // bBool1 wurde im CTOR auf FALSE initialisiert
-                if ( !bBool1 )  // also erster Durchlauf
+                if ( !bBool1 )	// also erster Durchlauf
                 {
                     pRemoteControl->pRetStream = pRet->GetStream();
-                    bBool1 = TRUE;  // wurde im CTOR auf FALSE initialisiert
+                    bBool1 = TRUE;	// wurde im CTOR auf FALSE initialisiert
                     nRetryCount = nRetryCount * 4;
                 }
-                if ( pRemoteControl->pRetStream && (nRetryCount--) )    // also solange nicht abgeholt
+                if ( pRemoteControl->pRetStream && (nRetryCount--) )	// also solange nicht abgeholt
                 {
-                    return FALSE;   // Bitte einmal vom Callstack runter
+                    return FALSE;	// Bitte einmal vom Callstack runter
                 }
             }
 
@@ -246,7 +246,7 @@ BOOL StatementFlow::Execute()
     {
     case F_EndCommandBlock:
         if ( !bUseIPC )
-        {   // wird oben abgehandelt
+        {	// wird oben abgehandelt
             pRet->Reset();
             IsError = FALSE;
         }
@@ -265,7 +265,7 @@ BOOL StatementFlow::Execute()
         #endif
 
         break;
-//  case RET_:
+//	case RET_:
     default:
         DBG_ERROR( "Unknown Flowcontrol" );
         break;
@@ -287,7 +287,7 @@ static short ImpGetRType( Window *pWin, SmartId aUId )
     if( (nUId & 0xE0000000) == 0 ) // keine auto ID
         nRT = C_NoType;
     else {
-//      if( (nUId & 0x1F) == 0 ) // globale Resource
+//		if( (nUId & 0x1F) == 0 ) // globale Resource
         if( (nUId & 0x1FF) == 0 ) // globale Resource GH: soweit ich das verstanden habe 1FF
             nRT = (short)(C_TabPage - 1 + (nUId >> 29));
         else
@@ -307,68 +307,68 @@ static short ImpGetRType( Window *pWin, SmartId aUId )
 #endif
     WindowType eRT = pWin->GetType();
     switch( eRT ) {
-        case WINDOW_WINDOW:             nRT = C_Window            ; break;
-
-        case WINDOW_TABCONTROL:         nRT = C_TabControl        ; break;
-        case WINDOW_RADIOBUTTON:        nRT = C_RadioButton       ; break;
-        case WINDOW_CHECKBOX:           nRT = C_CheckBox          ; break;
-        case WINDOW_TRISTATEBOX:        nRT = C_TriStateBox       ; break;
-        case WINDOW_EDIT:               nRT = C_Edit              ; break;
-        case WINDOW_MULTILINEEDIT:      nRT = C_MultiLineEdit     ; break;
-        case WINDOW_MULTILISTBOX:       nRT = C_MultiListBox      ; break;
-        case WINDOW_LISTBOX:            nRT = C_ListBox           ; break;
-        case WINDOW_COMBOBOX:           nRT = C_ComboBox          ; break;
-        case WINDOW_PUSHBUTTON:         nRT = C_PushButton        ; break;
-        case WINDOW_SPINFIELD:          nRT = C_SpinField         ; break;
-        case WINDOW_PATTERNFIELD:       nRT = C_PatternField      ; break;
-        case WINDOW_NUMERICFIELD:       nRT = C_NumericField      ; break;
-        case WINDOW_METRICFIELD:        nRT = C_MetricField       ; break;
-        case WINDOW_CURRENCYFIELD:      nRT = C_CurrencyField     ; break;
-        case WINDOW_DATEFIELD:          nRT = C_DateField         ; break;
-        case WINDOW_TIMEFIELD:          nRT = C_TimeField         ; break;
-        case WINDOW_IMAGERADIOBUTTON:   nRT = C_ImageRadioButton  ; break;
-        case WINDOW_NUMERICBOX:         nRT = C_NumericBox        ; break;
-        case WINDOW_METRICBOX:          nRT = C_MetricBox         ; break;
-        case WINDOW_CURRENCYBOX:        nRT = C_CurrencyBox       ; break;
-        case WINDOW_DATEBOX:            nRT = C_DateBox           ; break;
-        case WINDOW_TIMEBOX:            nRT = C_TimeBox           ; break;
-        case WINDOW_IMAGEBUTTON:        nRT = C_ImageButton       ; break;
-        case WINDOW_MENUBUTTON:         nRT = C_MenuButton        ; break;
-        case WINDOW_MOREBUTTON:         nRT = C_MoreButton        ; break;
-
-
-        case WINDOW_TABPAGE:            nRT = C_TabPage;        break;
-        case WINDOW_MODALDIALOG:        nRT = C_ModalDlg;       break;
-        case WINDOW_FLOATINGWINDOW:     nRT = C_FloatWin;       break;
-        case WINDOW_MODELESSDIALOG:     nRT = C_ModelessDlg;    break;
-        case WINDOW_WORKWINDOW:         nRT = C_WorkWin;        break;
-        case WINDOW_DOCKINGWINDOW:      nRT = C_DockingWin;     break;
-
-        case WINDOW_MESSBOX:            nRT = C_MessBox;        break;
-        case WINDOW_INFOBOX:            nRT = C_InfoBox;        break;
-        case WINDOW_WARNINGBOX:         nRT = C_WarningBox;     break;
-        case WINDOW_ERRORBOX:           nRT = C_ErrorBox;       break;
-        case WINDOW_QUERYBOX:           nRT = C_QueryBox;       break;
+        case WINDOW_WINDOW:				nRT = C_Window		      ; break;
+
+        case WINDOW_TABCONTROL:			nRT = C_TabControl        ; break;
+        case WINDOW_RADIOBUTTON:		nRT = C_RadioButton       ; break;
+        case WINDOW_CHECKBOX:			nRT = C_CheckBox          ; break;
+        case WINDOW_TRISTATEBOX:		nRT = C_TriStateBox       ; break;
+        case WINDOW_EDIT:				nRT = C_Edit              ; break;
+        case WINDOW_MULTILINEEDIT:		nRT = C_MultiLineEdit     ; break;
+        case WINDOW_MULTILISTBOX:		nRT = C_MultiListBox      ; break;
+        case WINDOW_LISTBOX:			nRT = C_ListBox           ; break;
+        case WINDOW_COMBOBOX:			nRT = C_ComboBox          ; break;
+        case WINDOW_PUSHBUTTON:			nRT = C_PushButton        ; break;
+        case WINDOW_SPINFIELD:			nRT = C_SpinField         ; break;
+        case WINDOW_PATTERNFIELD:		nRT = C_PatternField      ; break;
+        case WINDOW_NUMERICFIELD:		nRT = C_NumericField      ; break;
+        case WINDOW_METRICFIELD:		nRT = C_MetricField       ; break;
+        case WINDOW_CURRENCYFIELD:		nRT = C_CurrencyField     ; break;
+        case WINDOW_DATEFIELD:			nRT = C_DateField         ; break;
+        case WINDOW_TIMEFIELD:			nRT = C_TimeField         ; break;
+        case WINDOW_IMAGERADIOBUTTON:	nRT = C_ImageRadioButton  ; break;
+        case WINDOW_NUMERICBOX:			nRT = C_NumericBox        ; break;
+        case WINDOW_METRICBOX:			nRT = C_MetricBox         ; break;
+        case WINDOW_CURRENCYBOX:		nRT = C_CurrencyBox       ; break;
+        case WINDOW_DATEBOX:			nRT = C_DateBox           ; break;
+        case WINDOW_TIMEBOX:			nRT = C_TimeBox           ; break;
+        case WINDOW_IMAGEBUTTON:		nRT = C_ImageButton       ; break;
+        case WINDOW_MENUBUTTON:			nRT = C_MenuButton        ; break;
+        case WINDOW_MOREBUTTON:			nRT = C_MoreButton        ; break;
+
+
+        case WINDOW_TABPAGE:			nRT = C_TabPage;		break;
+        case WINDOW_MODALDIALOG:		nRT = C_ModalDlg;		break;
+        case WINDOW_FLOATINGWINDOW:		nRT = C_FloatWin;		break;
+        case WINDOW_MODELESSDIALOG:		nRT = C_ModelessDlg;	break;
+        case WINDOW_WORKWINDOW:			nRT = C_WorkWin;		break;
+        case WINDOW_DOCKINGWINDOW:		nRT = C_DockingWin;		break;
+
+        case WINDOW_MESSBOX:			nRT = C_MessBox;		break;
+        case WINDOW_INFOBOX:			nRT = C_InfoBox;		break;
+        case WINDOW_WARNINGBOX:			nRT = C_WarningBox;		break;
+        case WINDOW_ERRORBOX:			nRT = C_ErrorBox;		break;
+        case WINDOW_QUERYBOX:			nRT = C_QueryBox;		break;
 #if 0 //ifndef VCL
-        case WINDOW_FILEDIALOG:         nRT = C_FileDlg;        break;
-        case WINDOW_PATHDIALOG:         nRT = C_PathDlg;        break;
-        case WINDOW_PRINTDIALOG:        nRT = C_PrintDlg;       break;
-        case WINDOW_PRINTERSETUPDIALOG: nRT = C_PrinterSetupDlg;break;
-        case WINDOW_COLORDIALOG:        nRT = C_ColorDlg;       break;
+        case WINDOW_FILEDIALOG:			nRT = C_FileDlg;		break;
+        case WINDOW_PATHDIALOG:			nRT = C_PathDlg;		break;
+        case WINDOW_PRINTDIALOG:		nRT = C_PrintDlg;		break;
+        case WINDOW_PRINTERSETUPDIALOG:	nRT = C_PrinterSetupDlg;break;
+        case WINDOW_COLORDIALOG:		nRT = C_ColorDlg;		break;
 #endif
-        case WINDOW_TABDIALOG:          nRT = C_TabDlg;         break;
-//      case WINDOW_TABDIALOG:          nRT = C_SingleTabDlg;   break;
-
-        case WINDOW_PATTERNBOX:         nRT = C_PatternBox;     break;
-        case WINDOW_TOOLBOX:            nRT = C_ToolBox;        break;
-// Gibts nicht       case WINDOW_VALUESET:          nRT = C_ValueSet;       break;
-        case WINDOW_CONTROL:            nRT = C_Control;        break;
-        case WINDOW_OKBUTTON:           nRT = C_OkButton;       break;
-        case WINDOW_CANCELBUTTON:       nRT = C_CancelButton;   break;
-        case WINDOW_BUTTONDIALOG:       nRT = C_ButtonDialog;   break;
-        case WINDOW_TREELISTBOX:        nRT = C_TreeListBox;    break;
-
-        case WINDOW_DIALOG:             nRT = C_Dialog;         break;
+        case WINDOW_TABDIALOG:			nRT = C_TabDlg;			break;
+//		case WINDOW_TABDIALOG:			nRT = C_SingleTabDlg;	break;
+
+        case WINDOW_PATTERNBOX:			nRT = C_PatternBox;		break;
+        case WINDOW_TOOLBOX:			nRT = C_ToolBox;		break;
+// Gibts nicht       case WINDOW_VALUESET:			nRT = C_ValueSet;		break;
+        case WINDOW_CONTROL:			nRT = C_Control;		break;
+        case WINDOW_OKBUTTON:			nRT = C_OkButton;		break;
+        case WINDOW_CANCELBUTTON:		nRT = C_CancelButton;	break;
+        case WINDOW_BUTTONDIALOG:		nRT = C_ButtonDialog;	break;
+        case WINDOW_TREELISTBOX:		nRT = C_TreeListBox;	break;
+
+        case WINDOW_DIALOG:				nRT = C_Dialog;			break;
     }
 #ifdef DBG_UTIL
     // Die Werte n sind bei den WindowTypen nicht mehr vergeben, werden aber in der AutoID noch verwendet
@@ -704,7 +704,7 @@ BOOL StatementSlot::Execute()
     }
 
 
-/*  Neues Verfahren ab 334!
+/*	Neues Verfahren ab 334!
     Neue Methode zum einstellen, daß Modale Dialoge immer Asynchron aufgerufen werden
     und echter Returnwert, ob Slot geklappt hat
     und Testen ob Slot überhaupt durch UI aufgerufen werden kann        */
@@ -755,13 +755,13 @@ StatementCommand::StatementCommand( StatementList *pAfterThis, USHORT MethodId,
     m_pDbgWin->AddText( " Methode: " );
     m_pDbgWin->AddText( aSmartMethodId.GetText() );
     m_pDbgWin->AddText( " Params:" );
-    if( nParams & PARAM_USHORT_1 )  {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );}
-    if( nParams & PARAM_USHORT_2 )  {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );}
-    if( nParams & PARAM_USHORT_3 )  {m_pDbgWin->AddText( " n3:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr3 ) );}
-    if( nParams & PARAM_USHORT_4 )  {m_pDbgWin->AddText( " n4:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr4 ) );}
-    if( nParams & PARAM_ULONG_1 )   {m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );}
-    if( nParams & PARAM_STR_1 )     {m_pDbgWin->AddText( " s1:" );m_pDbgWin->AddText( aString1 );}
-    if( nParams & PARAM_STR_2 )     {m_pDbgWin->AddText( " s2:" );m_pDbgWin->AddText( aString2 );}
+    if( nParams & PARAM_USHORT_1 )	{m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );}
+    if( nParams & PARAM_USHORT_2 )	{m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );}
+    if( nParams & PARAM_USHORT_3 )	{m_pDbgWin->AddText( " n3:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr3 ) );}
+    if( nParams & PARAM_USHORT_4 )	{m_pDbgWin->AddText( " n4:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr4 ) );}
+    if( nParams & PARAM_ULONG_1 )	{m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );}
+    if( nParams & PARAM_STR_1 )		{m_pDbgWin->AddText( " s1:" );m_pDbgWin->AddText( aString1 );}
+    if( nParams & PARAM_STR_2 )		{m_pDbgWin->AddText( " s2:" );m_pDbgWin->AddText( aString2 );}
     if( nParams & PARAM_BOOL_1 )    {m_pDbgWin->AddText( " b1:" );m_pDbgWin->AddText( bBool1 ? "TRUE" : "FALSE" );}
     if( nParams & PARAM_BOOL_2 )    {m_pDbgWin->AddText( " b2:" );m_pDbgWin->AddText( bBool2 ? "TRUE" : "FALSE" );}
     m_pDbgWin->AddText( "\n" );
@@ -788,28 +788,28 @@ StatementCommand::StatementCommand( SCmdStream *pCmdIn )
     aSmartMethodId = SmartId( nMethodId );
     pCmdIn->Read( nParams );
 
-    if( nParams & PARAM_USHORT_1 )  pCmdIn->Read( nNr1 );
-    if( nParams & PARAM_USHORT_2 )  pCmdIn->Read( nNr2 );
-    if( nParams & PARAM_USHORT_3 )  pCmdIn->Read( nNr3 );
-    if( nParams & PARAM_USHORT_4 )  pCmdIn->Read( nNr4 );
-    if( nParams & PARAM_ULONG_1 )   pCmdIn->Read( nLNr1 );
-    if( nParams & PARAM_STR_1 )     pCmdIn->Read( aString1 );
-    if( nParams & PARAM_STR_2 )     pCmdIn->Read( aString2 );
-    if( nParams & PARAM_BOOL_1 )    pCmdIn->Read( bBool1 );
-    if( nParams & PARAM_BOOL_2 )    pCmdIn->Read( bBool2 );
+    if( nParams & PARAM_USHORT_1 )	pCmdIn->Read( nNr1 );
+    if( nParams & PARAM_USHORT_2 )	pCmdIn->Read( nNr2 );
+    if( nParams & PARAM_USHORT_3 )	pCmdIn->Read( nNr3 );
+    if( nParams & PARAM_USHORT_4 )	pCmdIn->Read( nNr4 );
+    if( nParams & PARAM_ULONG_1 )	pCmdIn->Read( nLNr1 );
+    if( nParams & PARAM_STR_1 )		pCmdIn->Read( aString1 );
+    if( nParams & PARAM_STR_2 )		pCmdIn->Read( aString2 );
+    if( nParams & PARAM_BOOL_1 )	pCmdIn->Read( bBool1 );
+    if( nParams & PARAM_BOOL_2 )	pCmdIn->Read( bBool2 );
 
 #if OSL_DEBUG_LEVEL > 1
     m_pDbgWin->AddText( "Reading Conmmand:" );
     m_pDbgWin->AddText( " Methode: " );
     m_pDbgWin->AddText( aSmartMethodId.GetText() );
     m_pDbgWin->AddText( " Params:" );
-    if( nParams & PARAM_USHORT_1 )  {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );}
-    if( nParams & PARAM_USHORT_2 )  {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );}
-    if( nParams & PARAM_USHORT_3 )  {m_pDbgWin->AddText( " n3:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr3 ) );}
-    if( nParams & PARAM_USHORT_4 )  {m_pDbgWin->AddText( " n4:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr4 ) );}
-    if( nParams & PARAM_ULONG_1 )   {m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );}
-    if( nParams & PARAM_STR_1 )     {m_pDbgWin->AddText( " s1:" );m_pDbgWin->AddText( aString1 );}
-    if( nParams & PARAM_STR_2 )     {m_pDbgWin->AddText( " s2:" );m_pDbgWin->AddText( aString2 );}
+    if( nParams & PARAM_USHORT_1 )	{m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );}
+    if( nParams & PARAM_USHORT_2 )	{m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );}
+    if( nParams & PARAM_USHORT_3 )	{m_pDbgWin->AddText( " n3:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr3 ) );}
+    if( nParams & PARAM_USHORT_4 )	{m_pDbgWin->AddText( " n4:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr4 ) );}
+    if( nParams & PARAM_ULONG_1 )	{m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );}
+    if( nParams & PARAM_STR_1 )		{m_pDbgWin->AddText( " s1:" );m_pDbgWin->AddText( aString1 );}
+    if( nParams & PARAM_STR_2 )		{m_pDbgWin->AddText( " s2:" );m_pDbgWin->AddText( aString2 );}
     if( nParams & PARAM_BOOL_1 )    {m_pDbgWin->AddText( " b1:" );m_pDbgWin->AddText( bBool1 ? "TRUE" : "FALSE" );}
     if( nParams & PARAM_BOOL_2 )    {m_pDbgWin->AddText( " b2:" );m_pDbgWin->AddText( bBool2 ? "TRUE" : "FALSE" );}
     m_pDbgWin->AddText( "\n" );
@@ -851,7 +851,7 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst
             pBase = pBase->GetParent();
     }
 
-    {   // Klammerung, so daß der String nicht während der Rekursion bestehen bleibt
+    {	// Klammerung, so daß der String nicht während der Rekursion bestehen bleibt
         String aName;
         BOOL bSkip = FALSE;
 
@@ -959,15 +959,15 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst
                     TypeString(pBase->GetType()).Append(aTypeSuffix).AppendAscii(": ").Append(aName), FALSE );
 
 
-            if ( pBase->GetType() == WINDOW_TOOLBOX )   // Buttons und Controls auf Toolboxen.
+            if ( pBase->GetType() == WINDOW_TOOLBOX )	// Buttons und Controls auf Toolboxen.
             {
                 ToolBox *pTB = ((ToolBox*)pBase);
                 USHORT i;
                 for ( i = 0; i < pTB->GetItemCount() ; i++ )
                 {
                     aName = String();
-//                  if ( aName.Len() == 0 )
-//                      aName = pTB->GetQuickHelpText();
+//					if ( aName.Len() == 0 )
+//						aName = pTB->GetQuickHelpText();
                     if ( aName.Len() == 0 )
                         aName = pTB->GetHelpText( pTB->GetItemId( i ) );
                     if ( aName.Len() == 0 )
@@ -1034,11 +1034,11 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst
                     }
                 }
 
-                return; // ToolBox ist hier schon komplett abgehandelt.
+                return;	// ToolBox ist hier schon komplett abgehandelt.
             }
 
 
-            if ( pBase->GetType() == WINDOW_BUTTONDIALOG    // Buttons auf Buttondialogen mit ID
+            if ( pBase->GetType() == WINDOW_BUTTONDIALOG	// Buttons auf Buttondialogen mit ID
                 || pBase->GetType() == WINDOW_MESSBOX
                 || pBase->GetType() == WINDOW_INFOBOX
                 || pBase->GetType() == WINDOW_WARNINGBOX
@@ -1078,24 +1078,24 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst
                             break;
                     }
 
-                    pRet->GenReturn ( RET_WinInfo, SmartId( aID ), (comm_ULONG)pBD->GetPushButton( pBD->GetButtonId(i) )->GetType(),    // So daß der Text angezeigt wird!
+                    pRet->GenReturn ( RET_WinInfo, SmartId( aID ), (comm_ULONG)pBD->GetPushButton( pBD->GetButtonId(i) )->GetType(),	// So daß der Text angezeigt wird!
                         TypeString(pBD->GetPushButton( pBD->GetButtonId(i) )->GetType()).AppendAscii(": ").Append(aName)
                         .AppendAscii(" ButtonId = ").Append(aID), FALSE );
                 }
 
-                return; // ButtonDialog ist hier schon komplett abgehandelt.
+                return;	// ButtonDialog ist hier schon komplett abgehandelt.
             }
 
 
             Menu* pMenu = GetMatchingMenu( pBase );
 
-            if ( pMenu )    // Menus
+            if ( pMenu )	// Menus
             {
                 USHORT i;
                 for ( i = 0; i < pMenu->GetItemCount() ; i++ )
                 {
                     USHORT nID = pMenu->GetItemId( i );
-
+                    
                     aName = String();
                     if ( aName.Len() == 0 )
                         aName = pMenu->GetHelpText( nID );
@@ -1135,7 +1135,7 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst
                     }
                 }
 
-                return; // Menu ist hier schon komplett abgehandelt.
+                return;	// Menu ist hier schon komplett abgehandelt.
             }
         }
     }
@@ -1152,8 +1152,8 @@ private:
 public:
     SysWinContainer( ToolBox *pClient );
     ~SysWinContainer();
-    virtual void    Resize();
-    virtual void    Resizing( Size& rSize );
+    virtual void	Resize();
+    virtual void	Resizing( Size& rSize );
 };
 
 SysWinContainer::SysWinContainer( ToolBox *pClient )
@@ -1180,8 +1180,8 @@ void SysWinContainer::Resize()
 {
     Size aSize( GetOutputSizePixel() );
     Resizing( aSize );
-//  aSize = pClientWin->GetSizePixel();
-//  aSize = pClientWin->CalcWindowSizePixel();
+//	aSize = pClientWin->GetSizePixel();
+//	aSize = pClientWin->CalcWindowSizePixel();
     if ( aSize != GetSizePixel() )
     {
         SetOutputSizePixel( aSize );
@@ -1215,9 +1215,9 @@ void SysWinContainer::Resizing( Size& rSize )
 
 class DisplayHidWin : public ToolBox
 {
-    Edit    *pEdit;
-    Size    aMinEditSize;
-    USHORT  nLastItemID;
+    Edit	*pEdit;
+    Size	aMinEditSize;
+    USHORT	nLastItemID;
     BOOL bIsDraging;
     BOOL bIsPermanentDraging;
     void SetDraging( BOOL bNewDraging );
@@ -1245,10 +1245,10 @@ public:
     DisplayHidWin();
     ~DisplayHidWin();
 
-    virtual void    Tracking( const TrackingEvent& rTEvt );
-    virtual void    Click();
-    virtual void    Select();
-    virtual void    SetText( const XubString& rStr );
+    virtual void	Tracking( const TrackingEvent& rTEvt );
+    virtual void	Click();
+    virtual void	Select();
+    virtual void	SetText( const XubString& rStr );
 
     void SetDisplayText( const String &aNewText ){ pEdit->SetText(aNewText); }
     String GetDisplayText() const { return pEdit->GetText(); }
@@ -1262,7 +1262,7 @@ public:
     void ConfigSent() { bConfigChanged = FALSE; }
 
     BOOL IsSendData() { return GetItemState( TT_SEND_DATA ) == STATE_CHECK; }
-//  BOOL IsAllWin() { return GetItemState( TT_ALLWIN ) == STATE_CHECK; }
+//	BOOL IsAllWin() { return GetItemState( TT_ALLWIN ) == STATE_CHECK; }
 
     BOOL IsDraging() { return bIsDraging; }
 
@@ -1282,7 +1282,7 @@ DisplayHidWin::DisplayHidWin()
     SetOutStyle( TOOLBOX_STYLE_HANDPOINTER | TOOLBOX_STYLE_FLAT );
     pEdit = new Edit( this, WB_CENTER | WB_BORDER );
     aMinEditSize = GetItemRect( TT_OUTPUT ).GetSize();
-/**/    aMinEditSize=Size(20,20);
+/**/	aMinEditSize=Size(20,20);
     aMinEditSize.Width() *= 12;
     pEdit->SetSizePixel( aMinEditSize );
     pEdit->Show();
@@ -1326,8 +1326,8 @@ void DisplayHidWin::EnableButtons( ULONG nConf )
 
 void DisplayHidWin::Tracking( const TrackingEvent& rTEvt )
 {
-//  if ( nLastItemID == TT_SHOW && GetItemState( TT_SHOW ) == STATE_NOCHECK && ( rTEvt.IsTrackingEnded() || rTEvt.IsTrackingCanceled() ) )
-//      SetDraging( FALSE );
+//	if ( nLastItemID == TT_SHOW && GetItemState( TT_SHOW ) == STATE_NOCHECK && ( rTEvt.IsTrackingEnded() || rTEvt.IsTrackingCanceled() ) )
+//		SetDraging( FALSE );
     if ( nLastItemID == TT_SHOW && GetItemState( TT_SHOW ) == STATE_NOCHECK )
         EndTracking( ENDTRACK_CANCEL );
     ToolBox::Tracking( rTEvt);
@@ -1439,16 +1439,16 @@ BOOL StatementCommand::DisplayHID()
 {
     // Return TRUE -> reexecute command
 
-    if ( !bBool2 )  // Wird auf FALSE initialisiert
+    if ( !bBool2 )	// Wird auf FALSE initialisiert
     {
-        bBool2 = TRUE;              // Wir sind initialisiert.
-        GetTTSettings()->pDisplayInstance = this;   // Und haben die Macht (Alle anderen beenden sich)
+        bBool2 = TRUE;				// Wir sind initialisiert.
+        GetTTSettings()->pDisplayInstance = this;	// Und haben die Macht (Alle anderen beenden sich)
 
         if ( !(nParams & PARAM_ULONG_1) )
         {
-            if( GetTTSettings()->pDisplayHidWin )   // Nichts verändern
+            if( GetTTSettings()->pDisplayHidWin )	// Nichts verändern
                 nLNr1 = GetTTSettings()->pDisplayHidWin->GetConfig();
-            else    // Beim ersten Aufruf wollen wir alles richtig einstellen
+            else	// Beim ersten Aufruf wollen wir alles richtig einstellen
                 nLNr1 = DH_MODE_KURZNAME | DH_MODE_LANGNAME;
 
             if( ((nParams & PARAM_BOOL_1) && bBool1) )
@@ -1464,7 +1464,7 @@ BOOL StatementCommand::DisplayHID()
     if ( GetTTSettings()->pDisplayInstance && GetTTSettings()->pDisplayInstance != this )
     {
         DBG_WARNING("Mehrere DisplayHID am laufen");
-        return FALSE;       // Noch eine andere Instanz macht das gleiche!
+        return FALSE;		// Noch eine andere Instanz macht das gleiche!
     }
 
     if ( !GetTTSettings()->pDisplayHidWin )
@@ -1494,40 +1494,40 @@ BOOL StatementCommand::DisplayHID()
         {
 
 
-#define HIGHLIGHT_WIN( WinPtr )                                     \
-        {                                                           \
-            Color aLineColMem = WinPtr->GetLineColor();             \
-            WinPtr->SetLineColor( Color( COL_WHITE ) );             \
-            Color aFillColMem = WinPtr->GetFillColor();             \
-            WinPtr->SetFillColor( Color( COL_LIGHTRED ) );          \
-            RasterOp aROp = WinPtr->GetRasterOp();                  \
-            WinPtr->SetRasterOp( ROP_XOR );                         \
+#define HIGHLIGHT_WIN( WinPtr )										\
+        {															\
+            Color aLineColMem = WinPtr->GetLineColor();				\
+            WinPtr->SetLineColor( Color( COL_WHITE ) );				\
+            Color aFillColMem = WinPtr->GetFillColor();				\
+            WinPtr->SetFillColor( Color( COL_LIGHTRED ) );			\
+            RasterOp aROp = WinPtr->GetRasterOp();					\
+            WinPtr->SetRasterOp( ROP_XOR );							\
             Size aSz = WinPtr->PixelToLogic( WinPtr->GetSizePixel() );\
             ULONG nMaxCornerRadius = WinPtr->PixelToLogic( Point( 80, 0 ) ).X();\
             ULONG iCorner = std::max ((ULONG) 8, (ULONG) std::min( nMaxCornerRadius, (ULONG) std::min((ULONG) (aSz.Width() / 6), (ULONG)(aSz.Height() / 6))));\
             WinPtr->DrawRect(Rectangle(Point(),aSz), iCorner, iCorner);\
-            WinPtr->SetLineColor( aLineColMem );                    \
-            WinPtr->SetFillColor( aFillColMem );                    \
-            WinPtr->SetRasterOp( aROp );                            \
+            WinPtr->SetLineColor( aLineColMem );					\
+            WinPtr->SetFillColor( aFillColMem );					\
+            WinPtr->SetRasterOp( aROp );							\
         }
 
 
-#define SET_WIN( WinPtr )                                           \
-            if ( StatementList::WinPtrValid(WinPtr) )   \
-            {                                                       \
-                HIGHLIGHT_WIN ( WinPtr );                           \
+#define SET_WIN( WinPtr )											\
+            if ( StatementList::WinPtrValid(WinPtr) )	\
+            {														\
+                HIGHLIGHT_WIN ( WinPtr );							\
             }
 
-#define RESET_WIN( WinPtr )                                         \
-            if ( StatementList::WinPtrValid(WinPtr) )   \
-            {                                                       \
-                WinPtr->Invalidate( INVALIDATE_NOTRANSPARENT );     \
-                WinPtr->Update();       \
+#define RESET_WIN( WinPtr )											\
+            if ( StatementList::WinPtrValid(WinPtr) )	\
+            {														\
+                WinPtr->Invalidate( INVALIDATE_NOTRANSPARENT );		\
+                WinPtr->Update();		\
             }
 
 
             GetTTSettings()->Old = GetTTSettings()->Act;
-//          GetTTSettings()->Act = GetMouseWin();
+//			GetTTSettings()->Act = GetMouseWin();
             GetTTSettings()->Act = GetTTSettings()->pDisplayHidWin->LastMouseMoveWin();
 
             if ( !StatementList::WinPtrValid ( GetTTSettings()->Old ) )
@@ -1559,14 +1559,14 @@ BOOL StatementCommand::DisplayHID()
             }
             else if ( GetTTSettings()->Act )
             {
-//              SET_WIN(GetTTSettings()->Act);
+//				SET_WIN(GetTTSettings()->Act);
                 if ( GetTTSettings()->pDisplayHidWin->IsDisplayTextModified() && GetTTSettings()->pDisplayHidWin->GetDisplayText().Len() > 0 )
                 {
                     GetTTSettings()->Act->SetSmartUniqueId( SmartId( GetTTSettings()->pDisplayHidWin->GetDisplayText().ToInt32() ) );
                     GetTTSettings()->pDisplayHidWin->ClearDisplayTextModified();
                 }
             }
-/*          if ( Application::GetLastInputInterval() > 5000 )   // 5 Sekunden lang nix geschehen
+/*			if ( Application::GetLastInputInterval() > 5000 )	// 5 Sekunden lang nix geschehen
             {
                 GetTTSettings()->pDisplayHidWin->ToTop( TOTOP_NOGRABFOCUS );
             }
@@ -1574,12 +1574,12 @@ BOOL StatementCommand::DisplayHID()
             if ( GetTTSettings()->pDisplayHidWin->IsSendData() /*&& bBool2*/ && GetTTSettings()->Act )
             {
                 if ( !StatementFlow::bSending )
-                {   // Normalerweise syncronisierung über Protokoll. Hier ist das aber asyncron!!!
+                {	// Normalerweise syncronisierung über Protokoll. Hier ist das aber asyncron!!!
                     WriteControlData( GetTTSettings()->Act, GetTTSettings()->pDisplayHidWin->GetConfig() );
-                    new StatementFlow( this, F_EndCommandBlock );   // Kommando zum Senden erzeugen und in que eintragen
+                    new StatementFlow( this, F_EndCommandBlock );	// Kommando zum Senden erzeugen und in que eintragen
                 }
             }
-        }   //if ( GetTTSettings()->pDisplayHidWin->IsDraging() )
+        }	//if ( GetTTSettings()->pDisplayHidWin->IsDraging() )
         else
         {
             if ( GetTTSettings()->Act )
@@ -1589,17 +1589,17 @@ BOOL StatementCommand::DisplayHID()
             }
         }
 
-        if ( pFirst == this )   // Sollte immer so sein, aber besser isses
-            if ( pNext )        // Befehle warten auf Ausführung
-            {                   // An Ende neu einsortieren
+        if ( pFirst == this )	// Sollte immer so sein, aber besser isses
+            if ( pNext )		// Befehle warten auf Ausführung
+            {					// An Ende neu einsortieren
                 Advance();
                 QueStatement( NULL );
             }
-//          {                   // Ersten und 2. austauschen.
-//              pFirst = pNext;
-//              pNext = pNext->pNext;
-//              pFirst->pNext = this;
-//          }
+//			{					// Ersten und 2. austauschen.
+//				pFirst = pNext;
+//				pNext = pNext->pNext;
+//				pFirst->pNext = this;
+//			}
 
     }
     else
@@ -1624,8 +1624,8 @@ private:
 
     Timer InplaceTimer;
 
-//  virtual void MouseButtonUp( const MouseEvent& rMEvt );
-//  virtual void MouseMove( const MouseEvent& rMEvt );
+//	virtual void MouseButtonUp( const MouseEvent& rMEvt );
+//	virtual void MouseMove( const MouseEvent& rMEvt );
 
     PushButton PushButtonTT_PB_NEXT;
     GroupBox GroupBoxTT_GB_TRANSLATION;
@@ -1752,7 +1752,7 @@ IMPL_LINK( TranslateWin, DoSelect, PushButton*, EMPTYARG )
 {
     if ( bSelecting )
     {
-//      ReleaseMouse();
+//		ReleaseMouse();
         bSelecting = FALSE;
     }
     else
@@ -1760,7 +1760,7 @@ IMPL_LINK( TranslateWin, DoSelect, PushButton*, EMPTYARG )
         if ( TestChangedDataSaved() )
         {
             PushButtonTT_PB_RESTORE.Disable();
-//          CaptureMouse();
+//			CaptureMouse();
             bSelecting = TRUE;
         }
     }
@@ -1778,11 +1778,11 @@ IMPL_LINK( TranslateWin, DoRestore, PushButton*, EMPTYARG )
     sTT_E_NEW.SearchAndReplaceAll( CUniString("\\t"), CUniString("\t") );
 
     if ( StatementList::WinPtrValid( pTranslateWin ) && pTranslateWin->GetText().CompareTo( sTT_E_NEW ) == COMPARE_EQUAL )
-    {   // Im ersten schritt nur in der UI zurück
+    {	// Im ersten schritt nur in der UI zurück
         pTranslateWin->SetText( sTT_E_OLD );
     }
     else
-    {   // Im zweite Schritt auch den eingegebenen Text
+    {	// Im zweite Schritt auch den eingegebenen Text
         EditTT_E_NEW.SetText( FixedTextTT_FT_OLD.GetText() );
         PushButtonTT_PB_RESTORE.Disable();
     }
@@ -1867,14 +1867,14 @@ long TranslateWin::VCLEventHook( NotifyEvent& rEvt )
             }
             else if ( Act )
             {
-    //          SET_WIN(Act);
+    //			SET_WIN(Act);
             }
-    /*      if ( Application::GetLastInputInterval() > 5000 )   // 5 Sekunden lang nix geschehen
+    /*		if ( Application::GetLastInputInterval() > 5000 )	// 5 Sekunden lang nix geschehen
             {
                 ToTop();
             }
     */
-        }   //if ( bSelecting )
+        }	//if ( bSelecting )
         else
         {
             if ( Act )
@@ -1908,7 +1908,7 @@ long TranslateWin::VCLEventHook( NotifyEvent& rEvt )
                 EditTT_E_COMMENT.Enable();
                 PushButtonTT_PB_ACCEPT.Enable();
             }
-    //      ReleaseMouse();
+    //		ReleaseMouse();
             bSelecting = FALSE;
         }
     }
@@ -1916,9 +1916,9 @@ long TranslateWin::VCLEventHook( NotifyEvent& rEvt )
     return 0;
 }
 
-#define FDS_ACTION_COLLECT  1
-#define FDS_ACTION_MARK     2
-#define FDS_ACTION_UNMARK   3
+#define FDS_ACTION_COLLECT	1
+#define FDS_ACTION_MARK		2
+#define FDS_ACTION_UNMARK	3
 
 class FindShortcutErrors: public Search
 {
@@ -1934,7 +1934,7 @@ public:
 FindShortcutErrors::FindShortcutErrors()
 : Search( SEARCH_NOOVERLAP | SEARCH_NO_TOPLEVEL_WIN )
 {
-    SetAction( FDS_ACTION_COLLECT );    // Wir fange immer mit sammeln an, ODER??
+    SetAction( FDS_ACTION_COLLECT );	// Wir fange immer mit sammeln an, ODER??
 }
 
 void FindShortcutErrors::SetAction( USHORT nA )
@@ -1975,10 +1975,10 @@ BOOL FindShortcutErrors::IsWinOK( Window *pWin )
             case FDS_ACTION_MARK:
                 {
                     BOOL bMissing = FALSE;
-                    if ( !bHasAccel && aText.Len() )    // should there be an accelarator defined
+                    if ( !bHasAccel && aText.Len() )	// should there be an accelarator defined
                     {
 
-                        Window*     pChild;
+                        Window* 	pChild;
                         pChild = pWin->GetWindow( WINDOW_CLIENT );
 
                         if ( (pChild->GetType() == WINDOW_RADIOBUTTON) ||
@@ -2076,7 +2076,7 @@ String TranslateWin::MarkShortcutErrors( Window* pBase, BOOL bMark )
         FindShortcutErrors aFinder;
         if ( bMark )
         {
-            StatementList::SearchAllWin( pBase, aFinder, TRUE );    // collect Shortcuts first
+            StatementList::SearchAllWin( pBase, aFinder, TRUE );	// collect Shortcuts first
             aFinder.SetAction( FDS_ACTION_MARK );
         }
         else
@@ -2124,7 +2124,7 @@ void StatementCommand::Translate()
         GetTTSettings()->bToTop = FALSE;
     }
 
-//  GetTTSettings()->pTranslateWin->GetWindow( WINDOW_OVERLAP )->Enable( TRUE, TRUE );
+//	GetTTSettings()->pTranslateWin->GetWindow( WINDOW_OVERLAP )->Enable( TRUE, TRUE );
     GetTTSettings()->pTranslateWin->GetWindow( WINDOW_OVERLAP )->EnableInput( TRUE, TRUE );
 
     if ( GetTTSettings()->pTranslateWin->IsTranslationAvailable() )
@@ -2166,7 +2166,7 @@ void StatementCommand::Translate()
                 aTranslation += TypeString( pParentDialog->GetType() );
             }
             else
-                aTranslation.AppendAscii( "0;" );       // Zahl + leerer String
+                aTranslation.AppendAscii( "0;" );		// Zahl + leerer String
             aTranslation += ';';
 
             aTranslation += '\"';
@@ -2219,7 +2219,7 @@ void StatementCommand::Translate()
 }
 
 Window* StatementCommand::GetNextOverlap( Window* pBase )
-{   // Findet irgendwelche Overlap-Fenster, die schließbar aussehen
+{	// Findet irgendwelche Overlap-Fenster, die schließbar aussehen
     // Eventuell muß noch die Auswahl verfeinert werden.
 
     if ( pBase->GetType() != WINDOW_BORDERWINDOW )
@@ -2269,7 +2269,7 @@ Window* StatementCommand::GetNextRecoverWin()
             {
                 Window* pTB = pControl->GetChild( 0 );
                 if ( pControl->GetChildCount() == 1 && pTB->GetType() == WINDOW_TOOLBOX )
-//                  return pTB;
+//				    return pTB;
                     ;   // do not act on floating toolboxes #i38796
                 else
                     return pControl;
@@ -2323,25 +2323,25 @@ BOOL StatementCommand::Execute()
 
 
 #if OSL_DEBUG_LEVEL > 1
-#define REPORT_WIN_CLOSED(pControl, aInfo)          \
-    _REPORT_WIN_CLOSED(pControl, aInfo)             \
+#define	REPORT_WIN_CLOSED(pControl, aInfo)			\
+    _REPORT_WIN_CLOSED(pControl, aInfo)				\
     m_pDbgWin->AddText( aInfo.AppendAscii(" \"").Append( pControl->GetText() ).AppendAscii("\" geschlossen, RType = ").Append( TypeString(pControl->GetType()) ).AppendAscii(", UId = ").Append( UIdString(pControl->GetSmartUniqueOrHelpId()) ) );
 #else
-#define REPORT_WIN_CLOSED(pControl, aInfo) _REPORT_WIN_CLOSED(pControl, aInfo)
+#define	REPORT_WIN_CLOSED(pControl, aInfo) _REPORT_WIN_CLOSED(pControl, aInfo)
 #endif
 
-#define REPORT_WIN_CLOSEDc(pControl, aInfo )        \
+#define	REPORT_WIN_CLOSEDc(pControl, aInfo )		\
     REPORT_WIN_CLOSED(pControl, CUniString(aInfo) )
 
-#define _REPORT_WIN_CLOSED(pControl, aInfo)         \
-    if ( aString1.Len() )                           \
-        aString1 += '\n';                           \
-    aString1 += aInfo;                              \
-    aString1.AppendAscii(" \"");                    \
-    aString1 += pControl->GetText();                \
+#define	_REPORT_WIN_CLOSED(pControl, aInfo)			\
+    if ( aString1.Len() )							\
+        aString1 += '\n';							\
+    aString1 += aInfo;								\
+    aString1.AppendAscii(" \"");					\
+    aString1 += pControl->GetText();				\
     aString1.AppendAscii("\" geschlossen, RType = ");\
-    aString1 += TypeString(pControl->GetType());    \
-    aString1.AppendAscii(", UId = ");               \
+    aString1 += TypeString(pControl->GetType());	\
+    aString1.AppendAscii(", UId = ");				\
     aString1 += UIdString(pControl->GetSmartUniqueOrHelpId());
 
 
@@ -2353,7 +2353,7 @@ BOOL StatementCommand::Execute()
                 nLNr1 = Time().GetTime() + nNr1/10;
                 bBool1 = TRUE;
             }
-            if ( Time().GetTime() < long(nLNr1) )   // Aktuelle Zeit kleiner Endzeit
+            if ( Time().GetTime() < long(nLNr1) )	// Aktuelle Zeit kleiner Endzeit
                 return FALSE;
             break;
         case RC_DisplayHid:
@@ -2364,11 +2364,11 @@ BOOL StatementCommand::Execute()
             {
                 if ( !bBool1 )
                 {
-                    nRetryCount = 150;      // das sollte reichen.
-                    bBool1 = TRUE;          // Nur beim ersten mal!
-                    nNr1 = 1;               // Welcher Button ist dran?
-                    nLNr1 = 0;              // Speichern des AppWin
-                    aString1 = UniString(); // Liste der geschlossenen Fenster
+                    nRetryCount = 150;		// das sollte reichen.
+                    bBool1 = TRUE;			// Nur beim ersten mal!
+                    nNr1 = 1;				// Welcher Button ist dran?
+                    nLNr1 = 0;				// Speichern des AppWin
+                    aString1 = UniString();	// Liste der geschlossenen Fenster
 
                     // So daß nacher auch wieder alles auf Default steht
                     nUseBindings = 0;
@@ -2390,7 +2390,7 @@ BOOL StatementCommand::Execute()
                     bBool2 = FALSE; // flag for wait when all windows are closed
                     pControl->GrabFocus();
 
-                    if (    pControl->GetType() != WINDOW_DOCKINGWINDOW
+                    if (	pControl->GetType() != WINDOW_DOCKINGWINDOW
                          && pControl->GetType() != WINDOW_FLOATINGWINDOW
                          && pControl->GetType() != WINDOW_MODELESSDIALOG
                          && pControl->GetType() != WINDOW_WORKWINDOW
@@ -2401,7 +2401,7 @@ BOOL StatementCommand::Execute()
                         short nRT = ImpGetRType( pControl, pControl->GetSmartUniqueOrHelpId() );
 
                         if ( nRT == C_TabControl && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_TABDIALOG )
-                        {   // Bei Tabcontrol den zugehörigen Tabdialog nehmen
+                        {	// Bei Tabcontrol den zugehörigen Tabdialog nehmen
                             pControl = pControl->GET_REAL_PARENT();
                             nRT = ImpGetRType( pControl, pControl->GetSmartUniqueOrHelpId() );
                         }
@@ -2436,7 +2436,7 @@ BOOL StatementCommand::Execute()
                                                 SET_WINP_CLOSING(pControl);
                                                 pBD->EndDialog(RET_OK);
                                             }
-                                            nNr1 = 10;  // Nochmal alle Buttons der Reihe nach
+                                            nNr1 = 10;	// Nochmal alle Buttons der Reihe nach
                                             break;
                                         case 4:
                                             if ( pBD->GetPushButton( BUTTONID_CANCEL ) )
@@ -2456,7 +2456,7 @@ BOOL StatementCommand::Execute()
                                             }
                                             nNr1++;
                                             break;
-                                        case 2:     // BUG 48239
+                                        case 2:		// BUG 48239
                                         case 1:
                                             if ( pBD->GetPushButton( BUTTONID_NO ) )
                                             {
@@ -2503,19 +2503,19 @@ BOOL StatementCommand::Execute()
 
                                 // Eigentlich nur bei TaskWindows! Hoffen wir mal, daß keine anderen DockingWindows dazwischen hauen.
                                 if ( (Window*)nLNr1 != pControl )
-                                    nNr1 = 1;       // Zum durchprobieren der Buttons beim Schließen
+                                    nNr1 = 1;		// Zum durchprobieren der Buttons beim Schließen
                                 nLNr1 = (ULONG)pControl;
 
                                 return FALSE;
                             }
                         }
                         if ( nRetryCount--
-                                && (    (pControl->GetType() == WINDOW_FLOATINGWINDOW)
-                                    ||  (pControl->GetType() == WINDOW_MODELESSDIALOG)
-                                    ||  (pControl->GetType() == WINDOW_WORKWINDOW)
-                                    ||  (pControl->GetType() == WINDOW_BORDERWINDOW) ) )
+                                && (	(pControl->GetType() == WINDOW_FLOATINGWINDOW)
+                                    ||	(pControl->GetType() == WINDOW_MODELESSDIALOG)
+                                    ||	(pControl->GetType() == WINDOW_WORKWINDOW)
+                                    ||	(pControl->GetType() == WINDOW_BORDERWINDOW) ) )
                         {
-    //                      if ( pControl->GetStyle() & WB_CLOSEABLE )
+    //						if ( pControl->GetStyle() & WB_CLOSEABLE )
                             {
 #ifdef RESET_APPLICATION_TO_BACKING_WINDOW
                                 // Special handling for last Document; do not close the Frame, only the Document
@@ -2535,7 +2535,7 @@ BOOL StatementCommand::Execute()
 
                                                 // nur bei TaskWindows!
                                                 if ( (Window*)nLNr1 != pControl )
-                                                    nNr1 = 1;       // Zum durchprobieren der Buttons beim Schließen
+                                                    nNr1 = 1;		// Zum durchprobieren der Buttons beim Schließen
                                                 nLNr1 = (ULONG)pControl;
 
                                                 return FALSE;
@@ -2552,7 +2552,7 @@ BOOL StatementCommand::Execute()
 
                                     // Eigentlich nur bei TaskWindows!
                                     if ( (Window*)nLNr1 != pControl )
-                                        nNr1 = 1;       // Zum durchprobieren der Buttons beim Schließen
+                                        nNr1 = 1;		// Zum durchprobieren der Buttons beim Schließen
                                     nLNr1 = (ULONG)pControl;
 
                                     return FALSE;
@@ -2568,7 +2568,7 @@ BOOL StatementCommand::Execute()
                     nLNr1 = Time().GetTime() + 100; // 100 = 1 Second
                     bBool2 = TRUE;
                 }
-                if ( Time().GetTime() < long(nLNr1) )   // Aktuelle Zeit kleiner Endzeit
+                if ( Time().GetTime() < long(nLNr1) )	// Aktuelle Zeit kleiner Endzeit
                     return FALSE;
                 else
                     pRet->GenReturn ( RET_Value, aSmartMethodId, aString1);
@@ -2588,7 +2588,7 @@ BOOL StatementCommand::Execute()
                     pRet->GenReturn ( RET_Value, aSmartMethodId, comm_USHORT(CONST_WSFinished) );
                 else
                 {
-                    if ( Time().GetTime() < long(nLNr1) )   // Aktuelle Zeit kleiner Endzeit
+                    if ( Time().GetTime() < long(nLNr1) )	// Aktuelle Zeit kleiner Endzeit
                         return FALSE;
                     pRet->GenReturn ( RET_Value, aSmartMethodId, comm_USHORT(CONST_WSTimeout) );
                 }
@@ -2602,12 +2602,12 @@ BOOL StatementCommand::Execute()
 
     switch ( nMethodId )
     {
-        case RC_AppDelay:       // Diese Befehle werden anderswo behandelt
+        case RC_AppDelay:		// Diese Befehle werden anderswo behandelt
         case RC_DisplayHid:
         case RC_ResetApplication:
         case RC_WaitSlot:
 
-        case RC_AppAbort:       // Sofortiges Löschen aller Befehle
+        case RC_AppAbort:		// Sofortiges Löschen aller Befehle
             break;
         case RC_Assert:
             {
@@ -2640,8 +2640,8 @@ BOOL StatementCommand::Execute()
         {
             BOOL bWait = FALSE;
             ReportError( GEN_RES_STR0( S_NO_ACTIVE_WINDOW ) );
-//          if ( Application::GetAppWindow() )
-//              bWait = Application::GetAppWindow()->IsWait();
+//			if ( Application::GetAppWindow() )
+//				bWait = Application::GetAppWindow()->IsWait();
             pRet->GenReturn ( RET_Value, aSmartMethodId, bWait );
             break;
         }
@@ -2690,12 +2690,12 @@ BOOL StatementCommand::Execute()
                 nUseBindings = 0;
             break;
         case RC_Profile:
-            //  Bei folgenden Parametern passiert folgendes:
-            //  ein boolean=false                   Alles Profiling stoppen (Ergebnisse liefern)
-            //  ein boolean=true, 1-4 ints          Einteilung der Zeiten in Kästchen
-            //  kein! boolean keine ints            loggen jeden Befehls
-            //  kein! boolean 1 int                 loggen alle int Millisekunden
-            //  ein String                          wird in das Logfile übernommen(sonst passiert nichts)
+            //	Bei folgenden Parametern passiert folgendes:
+            //	ein boolean=false					Alles Profiling stoppen (Ergebnisse liefern)
+            //	ein boolean=true, 1-4 ints			Einteilung der Zeiten in Kästchen
+            //	kein! boolean keine ints			loggen jeden Befehls
+            //	kein! boolean 1 int					loggen alle int Millisekunden
+            //  ein String							wird in das Logfile übernommen(sonst passiert nichts)
             if( !(nParams & PARAM_BOOL_1) || bBool1 )
             {
                 if ( !pProfiler )
@@ -2705,7 +2705,7 @@ BOOL StatementCommand::Execute()
                 }
 
                 if( !(nParams & PARAM_BOOL_1) && (nParams & PARAM_USHORT_1) )
-                {   // Autoprofiling: Profile nNr
+                {	// Autoprofiling: Profile nNr
                     if ( pProfiler->IsProfilingPerCommand() )
                     {
                         pProfiler->StopProfilingPerCommand();
@@ -2716,7 +2716,7 @@ BOOL StatementCommand::Execute()
                     pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetProfileHeader() );
                 }
                 else if ( nParams & PARAM_USHORT_1 )
-                {   // Partitioning initialisieren: Profile true [,nNr][,nNr][,nNr][,nNr]
+                {	// Partitioning initialisieren: Profile true [,nNr][,nNr][,nNr][,nNr]
                     comm_ULONG nAnzahl=0;
                     if ( nParams & PARAM_USHORT_1 ) { nAnzahl++; };
                     if ( nParams & PARAM_USHORT_2 ) { nAnzahl++; };
@@ -2736,13 +2736,13 @@ BOOL StatementCommand::Execute()
 
                     pProfiler->StartPartitioning();
                 }
-                else if( nParams == PARAM_STR_1 )   // Genau ein String!
-                {   // Nur einen String ins Profiling aufnehmen
+                else if( nParams == PARAM_STR_1 )	// Genau ein String!
+                {	// Nur einen String ins Profiling aufnehmen
                     aString1 += '\n';
                     pRet->GenReturn( RET_ProfileInfo, SmartId(), aString1 );
                 }
                 else
-                {   // Normales Profiling je Kommando: profile
+                {	// Normales Profiling je Kommando: profile
                     if ( pProfiler->IsAutoProfiling() )
                     {
                         pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetAutoProfiling() );
@@ -2754,7 +2754,7 @@ BOOL StatementCommand::Execute()
                     pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetProfileHeader() );
                 }
             }
-            else        // Profiling wieder ausschalten: Profile false
+            else		// Profiling wieder ausschalten: Profile false
                 if ( pProfiler )
                 {
                     if ( pProfiler->IsProfilingPerCommand() )
@@ -2797,7 +2797,7 @@ BOOL StatementCommand::Execute()
                 {
                     if ( nErr == 1 )
                         ReportError( GEN_RES_STR0( S_NO_POPUP ) );
-                    else
+                    else 
                         ReportError( GEN_RES_STR0( S_NO_SUBMENU ) );
                     break;
                 }
@@ -2811,8 +2811,8 @@ BOOL StatementCommand::Execute()
                         {
                             nItemCount = pMenu->GetItemCount();
                             if ( pMenu->GetMenuFlags() & MENU_FLAG_HIDEDISABLEDENTRIES )
-                            {   // jep, we have to adjust the count
-                                BOOL bLastWasSeperator = TRUE;  // TRUE for Separator at the top
+                            {	// jep, we have to adjust the count
+                                BOOL bLastWasSeperator = TRUE;	// TRUE for Separator at the top
                                 for ( USHORT i = 0 ; i < pMenu->GetItemCount() ; i++ )
                                 {
                                     if ( !pMenu->IsItemEnabled( pMenu->GetItemId( i ) ) )
@@ -2824,7 +2824,7 @@ BOOL StatementCommand::Execute()
                                         bLastWasSeperator = pMenu->GetItemType( i ) == MENUITEM_SEPARATOR;
                                     }
                                 }
-                                if ( bLastWasSeperator )    // Separator at bottom
+                                if ( bLastWasSeperator )	// Separator at bottom
                                     nItemCount--;
                             }
                         }
@@ -2840,8 +2840,8 @@ BOOL StatementCommand::Execute()
                         {
                             nPhysicalIndex = nNr1;
                             if ( pMenu->GetMenuFlags() & MENU_FLAG_HIDEDISABLEDENTRIES )
-                            {   // jep, we have to adjust the position
-                                BOOL bLastWasSeperator = TRUE;  // TRUE for Separator at the top
+                            {	// jep, we have to adjust the position
+                                BOOL bLastWasSeperator = TRUE;	// TRUE for Separator at the top
                                 USHORT nVisibleCount = 0;
                                 for ( USHORT i = 0 ; i < pMenu->GetItemCount() && nVisibleCount < nNr1 ; i++ )
                                 {
@@ -2879,7 +2879,7 @@ BOOL StatementCommand::Execute()
                         {
                             USHORT nLogicalPos = pMenu->GetItemPos(nNr1);
                             if ( MENU_ITEM_NOTFOUND != nLogicalPos && pMenu->GetMenuFlags() & MENU_FLAG_HIDEDISABLEDENTRIES )
-                            {   // jep, we have to adjust the position
+                            {	// jep, we have to adjust the position
                                 if ( !pMenu->IsItemEnabled( nNr1 ) )
                                     nLogicalPos = MENU_ITEM_NOTFOUND;
                                 else
@@ -3011,8 +3011,8 @@ BOOL StatementCommand::Execute()
                             nErrorcode = aDir.GetError();
                             if ( !nErrorcode && !aDir.MakeDir() )
                                 nErrorcode = FSYS_ERR_UNKNOWN;
-//  Workaround für Bug 60693
-//                              nErrorcode = aDir.GetError();
+//	Workaround für Bug 60693
+//								nErrorcode = aDir.GetError();
                         }
                         break;
                     case RC_FileCopy:
@@ -3128,10 +3128,10 @@ BOOL StatementCommand::Execute()
                             {
                                 pRet->GenReturn ( RET_Value, aSmartMethodId, aPath );
                             }
-
-
-
-/* keep old Implementation for now
+                            
+                            
+                            
+/* keep old Implementation for now                            
                             // neues Verzeichnis einlesen
                             if ( (nParams & PARAM_STR_1) )
                             {
@@ -3156,7 +3156,7 @@ BOOL StatementCommand::Execute()
                                     nDirPos = 0;
                                     FileStat aFS( aEntry );
                                     if ( !aFS.IsKind( FSYS_KIND_WILD ) && !aFS.IsKind( FSYS_KIND_DIR ) && aEntry.Exists() )
-                                    {   // Sonderbehandlung für genau einen Eintrag
+                                    {	// Sonderbehandlung für genau einen Eintrag
                                         if ( !aFS.IsKind( FSYS_KIND_DIR ) && ( aDirEntryKind == FSYS_KIND_DIR ) )
                                             pRet->GenReturn ( RET_Value, aSmartMethodId, String() );
                                         else
@@ -3322,9 +3322,9 @@ BOOL StatementCommand::Execute()
         case RC_GetMouseStyle:
             {
                 Pointer aPointer;
-//              if ( DragManager::GetDragManager() )
-//                  aPointer = DragManager::GetDragManager()->GetDragPointer();
-//              else
+//				if ( DragManager::GetDragManager() )
+//					aPointer = DragManager::GetDragManager()->GetDragPointer();
+//				else
                 {
                     Window *pActualWin = GetMouseWin();
                     if ( pActualWin )
@@ -3354,7 +3354,7 @@ BOOL StatementCommand::Execute()
 
 #if OSL_DEBUG_LEVEL > 1
                     USHORT nEntries = Dir( aDestPath, FSYS_KIND_FILE | FSYS_KIND_DIR ).Count();
-                    (void) nEntries; /* avoid warning about unused parameter */
+                    (void) nEntries; /* avoid warning about unused parameter */ 
 #endif
                     // The Count is only larger than 2 is the path is a directory which is not empty
                     // the Count of 2 results from the "." and ".." directory
@@ -3586,15 +3586,15 @@ StatementControl::StatementControl( SCmdStream *pCmdIn, USHORT nControlIdType )
     pCmdIn->Read( nMethodId );
     pCmdIn->Read( nParams );
 
-    if( nParams & PARAM_USHORT_1 )  pCmdIn->Read( nNr1 );
-    if( nParams & PARAM_USHORT_2 )  pCmdIn->Read( nNr2 );
-    if( nParams & PARAM_USHORT_3 )  pCmdIn->Read( nNr3 );
-    if( nParams & PARAM_USHORT_4 )  pCmdIn->Read( nNr4 );
-    if( nParams & PARAM_ULONG_1 )   pCmdIn->Read( nLNr1 );
-    if( nParams & PARAM_STR_1 )     pCmdIn->Read( aString1 );
-    if( nParams & PARAM_STR_2 )     pCmdIn->Read( aString2 );
-    if( nParams & PARAM_BOOL_1 )    pCmdIn->Read( bBool1 );
-    if( nParams & PARAM_BOOL_2 )    pCmdIn->Read( bBool2 );
+    if( nParams & PARAM_USHORT_1 )	pCmdIn->Read( nNr1 );
+    if( nParams & PARAM_USHORT_2 )	pCmdIn->Read( nNr2 );
+    if( nParams & PARAM_USHORT_3 )	pCmdIn->Read( nNr3 );
+    if( nParams & PARAM_USHORT_4 )	pCmdIn->Read( nNr4 );
+    if( nParams & PARAM_ULONG_1 )	pCmdIn->Read( nLNr1 );
+    if( nParams & PARAM_STR_1 )		pCmdIn->Read( aString1 );
+    if( nParams & PARAM_STR_2 )		pCmdIn->Read( aString2 );
+    if( nParams & PARAM_BOOL_1 )	pCmdIn->Read( bBool1 );
+    if( nParams & PARAM_BOOL_2 )	pCmdIn->Read( bBool2 );
 
 #if OSL_DEBUG_LEVEL > 1
     m_pDbgWin->AddText( "Reading Control: UId: " );
@@ -3602,13 +3602,13 @@ StatementControl::StatementControl( SCmdStream *pCmdIn, USHORT nControlIdType )
     m_pDbgWin->AddText( " Methode: " );
     m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) );
     m_pDbgWin->AddText( " Params:" );
-    if( nParams & PARAM_USHORT_1 )  {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );}
-    if( nParams & PARAM_USHORT_2 )  {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );}
-    if( nParams & PARAM_USHORT_3 )  {m_pDbgWin->AddText( " n3:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr3 ) );}
-    if( nParams & PARAM_USHORT_4 )  {m_pDbgWin->AddText( " n4:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr4 ) );}
-    if( nParams & PARAM_ULONG_1 )   {m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );}
-    if( nParams & PARAM_STR_1 )     {m_pDbgWin->AddText( " s1:" );m_pDbgWin->AddText( aString1 );}
-    if( nParams & PARAM_STR_2 )     {m_pDbgWin->AddText( " s2:" );m_pDbgWin->AddText( aString2 );}
+    if( nParams & PARAM_USHORT_1 )	{m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );}
+    if( nParams & PARAM_USHORT_2 )	{m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );}
+    if( nParams & PARAM_USHORT_3 )	{m_pDbgWin->AddText( " n3:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr3 ) );}
+    if( nParams & PARAM_USHORT_4 )	{m_pDbgWin->AddText( " n4:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr4 ) );}
+    if( nParams & PARAM_ULONG_1 )	{m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );}
+    if( nParams & PARAM_STR_1 )		{m_pDbgWin->AddText( " s1:" );m_pDbgWin->AddText( aString1 );}
+    if( nParams & PARAM_STR_2 )		{m_pDbgWin->AddText( " s2:" );m_pDbgWin->AddText( aString2 );}
 /*    if( nParams & PARAM_BOOL_1 )    pCmdIn->Read( bBool1 );
     if( nParams & PARAM_BOOL_2 )    pCmdIn->Read( bBool2 );*/
     m_pDbgWin->AddText( "\n" );
@@ -3616,7 +3616,7 @@ StatementControl::StatementControl( SCmdStream *pCmdIn, USHORT nControlIdType )
 }
 
 BOOL IsDialog(Window *pWin)
-{   // Alles was von SystemWindow abgeleitet ist
+{	// Alles was von SystemWindow abgeleitet ist
     if ( !pWin )
         return FALSE;
 
@@ -3649,10 +3649,10 @@ BOOL IsDialog(Window *pWin)
 
 
             return TRUE;
-//          break;
+//			break;
         default:
             return FALSE;
-//          break;
+//			break;
     }
 }
 
@@ -3817,7 +3817,7 @@ void StatementControl::AnimateMouse( Window *pControl, Point aWohin )
     aDiff *= 1000;
     aDiff /= nSteps;
 
-    StatementList::bExecuting = TRUE;       // Bah ist das ein ekliger Hack
+    StatementList::bExecuting = TRUE;		// Bah ist das ein ekliger Hack
                                                 // Das verhindert, daß schon der nächste Befehl ausgeführt wird.
 
     for ( ; nSteps ; nSteps-- )
@@ -3830,7 +3830,7 @@ void StatementControl::AnimateMouse( Window *pControl, Point aWohin )
         SafeReschedule();
     }
     pControl->SetPointerPosPixel(aZiel);
-    StatementList::bExecuting = FALSE;  // Bah ist das ein ekliger Hack
+    StatementList::bExecuting = FALSE;	// Bah ist das ein ekliger Hack
 }
 
 
@@ -3844,13 +3844,13 @@ BOOL StatementControl::MaybeDoTypeKeysDelay( Window *pTestWindow )
         Timer aTimer;
         aTimer.SetTimeout( nTimeWait );
         aTimer.Start();
-        StatementList::bExecuting = TRUE;       // Bah ist das ein ekliger Hack
+        StatementList::bExecuting = TRUE;		// Bah ist das ein ekliger Hack
                                                     // Das verhindert, daß schon der nächste Befehl ausgeführt wird.
         while ( aTimer.IsActive() )
         {
             SafeReschedule( TRUE );
         }
-        StatementList::bExecuting = FALSE;  // Bah ist das ein ekliger Hack
+        StatementList::bExecuting = FALSE;	// Bah ist das ein ekliger Hack
         if ( !WinPtrValid(pTestWindow ) )
         {
             ReportError( aUId, GEN_RES_STR1( S_WINDOW_DISAPPEARED, MethodString( nMethodId ) ) );
@@ -3862,7 +3862,7 @@ BOOL StatementControl::MaybeDoTypeKeysDelay( Window *pTestWindow )
 
 BOOL StatementControl::HandleVisibleControls( Window *pControl )
 {
-    if( pControl )      // Also auch bei Disabled nicht jedoch bei Invisible
+    if( pControl )		// Also auch bei Disabled nicht jedoch bei Invisible
     {
         switch( nMethodId )
         {
@@ -3874,11 +3874,11 @@ BOOL StatementControl::HandleVisibleControls( Window *pControl )
             break;
         case M_GetPosX:
             if ( pControl->GetType() == WINDOW_DOCKINGWINDOW && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_FLOATINGWINDOW )
-                pControl = pControl->GET_REAL_PARENT();     // Sonderbehandlung für FloatingWindows
+                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung für FloatingWindows
             if ( pControl->GetType() == WINDOW_TABCONTROL && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_TABDIALOG )
-                pControl = pControl->GET_REAL_PARENT();     // Sonderbehandlung für TabDialoge
+                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung für TabDialoge
             if ( pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_BORDERWINDOW )
-                pControl = pControl->GET_REAL_PARENT();     // Sonderbehandlung für Border
+                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung für Border
             if ( (nParams & PARAM_BOOL_1) && bBool1 )
                 pControl = pControl->GetWindow( WINDOW_OVERLAP );
 
@@ -3893,11 +3893,11 @@ BOOL StatementControl::HandleVisibleControls( Window *pControl )
             break;
         case M_GetPosY:
             if ( pControl->GetType() == WINDOW_DOCKINGWINDOW && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_FLOATINGWINDOW )
-                pControl = pControl->GET_REAL_PARENT();     // Sonderbehandlung für FloatingWindows
+                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung für FloatingWindows
             if ( pControl->GetType() == WINDOW_TABCONTROL && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_TABDIALOG )
-                pControl = pControl->GET_REAL_PARENT();     // Sonderbehandlung für TabDialoge
+                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung für TabDialoge
             if ( pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_BORDERWINDOW )
-                pControl = pControl->GET_REAL_PARENT();     // Sonderbehandlung für Border
+                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung für Border
             if ( (nParams & PARAM_BOOL_1) && bBool1 )
                 pControl = pControl->GetWindow( WINDOW_OVERLAP );
 
@@ -3912,11 +3912,11 @@ BOOL StatementControl::HandleVisibleControls( Window *pControl )
             break;
         case M_GetSizeX:
             if ( pControl->GetType() == WINDOW_DOCKINGWINDOW && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_FLOATINGWINDOW )
-                pControl = pControl->GET_REAL_PARENT();     // Sonderbehandlung für FloatingWindows
+                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung für FloatingWindows
             if ( pControl->GetType() == WINDOW_TABCONTROL && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_TABDIALOG )
-                pControl = pControl->GET_REAL_PARENT();     // Sonderbehandlung für TabDialoge
+                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung für TabDialoge
             if ( pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_BORDERWINDOW )
-                pControl = pControl->GET_REAL_PARENT();     // Sonderbehandlung für Border
+                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung für Border
             if ( (nParams & PARAM_BOOL_1) && bBool1 )
                 pControl = pControl->GetWindow( WINDOW_OVERLAP );
 
@@ -3924,11 +3924,11 @@ BOOL StatementControl::HandleVisibleControls( Window *pControl )
             break;
         case M_GetSizeY:
             if ( pControl->GetType() == WINDOW_DOCKINGWINDOW && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_FLOATINGWINDOW )
-                pControl = pControl->GET_REAL_PARENT();     // Sonderbehandlung für FloatingWindows
+                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung für FloatingWindows
             if ( pControl->GetType() == WINDOW_TABCONTROL && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_TABDIALOG )
-                pControl = pControl->GET_REAL_PARENT();     // Sonderbehandlung für TabDialoge
+                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung für TabDialoge
             if ( pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_BORDERWINDOW )
-                pControl = pControl->GET_REAL_PARENT();     // Sonderbehandlung für Border
+                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung für Border
             if ( (nParams & PARAM_BOOL_1) && bBool1 )
                 pControl = pControl->GetWindow( WINDOW_OVERLAP );
 
@@ -3937,11 +3937,11 @@ BOOL StatementControl::HandleVisibleControls( Window *pControl )
         case M_SnapShot:
             {
                 if ( pControl->GetType() == WINDOW_DOCKINGWINDOW && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_FLOATINGWINDOW )
-                    pControl = pControl->GET_REAL_PARENT();     // Sonderbehandlung für FloatingWindows
+                    pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung für FloatingWindows
                 if ( pControl->GetType() == WINDOW_TABCONTROL && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_TABDIALOG )
-                    pControl = pControl->GET_REAL_PARENT();     // Sonderbehandlung für TabDialoge
+                    pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung für TabDialoge
                 if ( pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_BORDERWINDOW )
-                    pControl = pControl->GET_REAL_PARENT();     // Sonderbehandlung für Border
+                    pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung für Border
                 if ( (nParams & PARAM_BOOL_1) && bBool1 )
                     pControl = pControl->GetWindow( WINDOW_OVERLAP );
 
@@ -3966,7 +3966,7 @@ BOOL StatementControl::HandleVisibleControls( Window *pControl )
                     nNr4 = std::min((USHORT)(pControl->GetSizePixel().Height() + 2*(USHORT)aStart.Y()),nNr4);
                 }
                 if( nParams & PARAM_USHORT_4 )
-                {   // Zuschneiden
+                {	// Zuschneiden
                     Point aPt(-nNr1,-nNr2);
                     Size aSz(nNr3,nNr4);
                     VirtualDevice aVDev( *pControl );
@@ -4012,9 +4012,9 @@ BOOL StatementControl::HandleVisibleControls( Window *pControl )
 
 BOOL StatementControl::HandleCommonMethods( Window *pControl )
 {
-    switch( nMethodId )     // Diese können an jedem Window ausgeführt werden
+    switch( nMethodId )		// Diese können an jedem Window ausgeführt werden
     {
-        case M_Exists:          // Oben schon Behandelt. Unterdrückt hier nur Fehler
+        case M_Exists:			// Oben schon Behandelt. Unterdrückt hier nur Fehler
         case M_NotExists:
         case M_IsEnabled:
         case M_IsVisible:
@@ -4035,12 +4035,12 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
             break;
         case M_TypeKeys:
             {
-                if( !(nParams & PARAM_USHORT_1) )   // Anzahl wiederholungen
+                if( !(nParams & PARAM_USHORT_1) )	// Anzahl wiederholungen
                     nNr1 = 1;
-                if( !(nParams & PARAM_BOOL_1) )     // Follow Focus
-                    bBool1 = FALSE;     // so bleibt das bisherige Verhalten
+                if( !(nParams & PARAM_BOOL_1) )		// Follow Focus
+                    bBool1 = FALSE;		// so bleibt das bisherige Verhalten
 
-                if ( !bBool1 )          // Altes Verhalten
+                if ( !bBool1 )			// Altes Verhalten
                     pControl->GrabFocus();
                 else    // If focus is not inside given control we grab it once.
                 {
@@ -4052,7 +4052,7 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
 
                 // maybe this can get removed since we are using GetPreferredKeyInputWindow()
                 if ( pControl->GetType() == WINDOW_COMBOBOX )
-                {   // Bei COMBOBOX an das Edit direkt liefern
+                {	// Bei COMBOBOX an das Edit direkt liefern
                     Window *pTemp = NULL;
                     for ( USHORT i = 0 ; i < pControl->GetChildCount() && !pTemp ; i++ )
                         if ( pControl->GetChild( i )->GetType() == WINDOW_EDIT )
@@ -4071,12 +4071,12 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
                             if ( !pFocus || !pControl->IsWindowOrChild( pFocus, TRUE ) )
                                 pControl->GrabFocus();
                         }
-                        if ( bBool1 )   // Jedesmal das FocusWindow finden
+                        if ( bBool1 )	// Jedesmal das FocusWindow finden
                         {
                             Window *pFocus = GetpApp()->GetFocusWindow();
                             if ( pFocus && pControl->IsWindowOrChild( pFocus, TRUE ) )
                                 pDeliverHere = pFocus;
-                            else    // sonst fallback auf das Basisfenster
+                            else	// sonst fallback auf das Basisfenster
                                 pDeliverHere = pControl;
                         }
                         pDeliverHere = pDeliverHere->GetPreferredKeyInputWindow();
@@ -4118,7 +4118,7 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
                                         aCh += 'a';
                                 break;
                                 case KEYGROUP_MISC:
-                                    {                           //  CR  ESC TAB BACK
+                                    {							//  CR  ESC TAB BACK
                                         ByteString aPrintableMisc("\x0d\x1b\x09\x08 **+-*/.,<>=",16);
                                         if ( nKeyCode-KEY_RETURN < aPrintableMisc.Len()
                                             && nKeyCode != KEY_INSERT && nKeyCode != KEY_DELETE )
@@ -4147,7 +4147,7 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
                                 aEvent = KeyEvent(aCh, KeyCode(KEYGROUP_NUM + aCh-'0', 0));
                             else if ( aPrintableMisc.Search(aCh) != STRING_NOTFOUND )
                                 aEvent = KeyEvent(aCh, KeyCode(KEYGROUP_MISC + (USHORT)aPrintableMisc.Search(aCh), 0));
-                            else    // Sollte eigentlich nicht auftreten
+                            else	// Sollte eigentlich nicht auftreten
                                 aEvent = KeyEvent(aCh, KeyCode());
                         }
                         ImplKeyInput( pDeliverHere, aEvent );
@@ -4177,11 +4177,11 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
                 Size aS = pControl->GetOutputSizePixel();
                 Point aPos = Point(aS.Width() * nNr1 / 100,aS.Height() * nNr2 / 100);
                 Window *pActualWin = pControl->FindWindow( aPos );
-//                  AnimateMouse( pControl, aPos );
+//					AnimateMouse( pControl, aPos );
 
                 if ( pActualWin )
                     aPos = pActualWin->AbsoluteScreenToOutputPixel( pControl->OutputToAbsoluteScreenPixel ( aPos ) );
-//                  aPos = pActualWin->ScreenToOutputPixel( pControl->OutputToScreenPixel ( aPos ) );
+//					aPos = pActualWin->ScreenToOutputPixel( pControl->OutputToScreenPixel ( aPos ) );
                 else
                     pActualWin = pControl;
 
@@ -4200,12 +4200,12 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
 
                 if ( pActualWin )
                     aPos = pActualWin->AbsoluteScreenToOutputPixel( pControl->OutputToAbsoluteScreenPixel ( aPos ) );
-//                  aPos = pActualWin->ScreenToOutputPixel( pControl->OutputToScreenPixel ( aPos ) );
+//					aPos = pActualWin->ScreenToOutputPixel( pControl->OutputToScreenPixel ( aPos ) );
                 else
                     pActualWin = pControl;
 
                 AnimateMouse( pActualWin, aPos );
-//                  pActualWin->GrabFocus();
+//					pActualWin->GrabFocus();
                 MouseEvent aMEvt( aPos, 1, MOUSE_SIMPLECLICK|MOUSE_SELECT, nButton );
                 ImplMouseButtonUp( pActualWin, aMEvt );
             }
@@ -4220,13 +4220,13 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
                 if ( pActualWin )
                 {
                     aPos = pActualWin->AbsoluteScreenToOutputPixel( pControl->OutputToAbsoluteScreenPixel ( aPos ) );
-//                  aPos = pActualWin->ScreenToOutputPixel( pControl->OutputToScreenPixel ( aPos ) );
+//					aPos = pActualWin->ScreenToOutputPixel( pControl->OutputToScreenPixel ( aPos ) );
                 }
                 else
                     pActualWin = pControl;
 
                 AnimateMouse( pActualWin, aPos );
-//                  pActualWin->GrabFocus();
+//					pActualWin->GrabFocus();
                 MouseEvent aMEvt( aPos, 0, MOUSE_SIMPLEMOVE|MOUSE_DRAGMOVE, nButton );
                 ImplMouseMove( pActualWin, aMEvt );
             }
@@ -4241,7 +4241,7 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
                 if ( pActualWin )
                 {
                     aPos = pActualWin->AbsoluteScreenToOutputPixel( pControl->OutputToAbsoluteScreenPixel ( aPos ) );
-//                  aPos = pActualWin->ScreenToOutputPixel( pControl->OutputToScreenPixel ( aPos ) );
+//					aPos = pActualWin->ScreenToOutputPixel( pControl->OutputToScreenPixel ( aPos ) );
                 }
                 else
                     pActualWin = pControl;
@@ -4314,7 +4314,7 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
                         if ( pActualWin )
                         {
                             aPos = pActualWin->AbsoluteScreenToOutputPixel( pControl->OutputToAbsoluteScreenPixel ( aPos ) );
-    //                      aPos = pActualWin->ScreenToOutputPixel( pControl->OutputToScreenPixel ( aPos ) );
+    //		    			aPos = pActualWin->ScreenToOutputPixel( pControl->OutputToScreenPixel ( aPos ) );
                             pControl = pActualWin;
                         }
                     }
@@ -4380,12 +4380,12 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
                     break;
                 }
 
-                pControl = pTemp;   // So daß wir unten ohne Fehler durchkommen
+                pControl = pTemp;	// So daß wir unten ohne Fehler durchkommen
                 SplitWindow *pSW = (SplitWindow*) pTemp;
 
-//  Rectangle           GetAutoHideRect() const;
-//  Rectangle           GetFadeInRect() const;
-//  Rectangle           GetFadeOutRect() const;
+//	Rectangle			GetAutoHideRect() const;
+//	Rectangle			GetFadeInRect() const;
+//	Rectangle			GetFadeOutRect() const;
 
                 switch( nMethodId )
                 {
@@ -4407,7 +4407,7 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
                             ImplMouseButtonDown( pControl, aMEvnt, FORCE_DIRECT_CALL );
                             ImplMouseButtonUp  ( pControl, aMEvnt, FORCE_DIRECT_CALL );
                         }
-//                              pSW->AutoHide();
+//								pSW->AutoHide();
                         break;
                     case M_IsFadeIn:
                         pRet->GenReturn ( RET_Value, aUId, pSW->IsFadeOutButtonVisible() );
@@ -4496,7 +4496,7 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
                 }
 
                 if( !(nParams & PARAM_USHORT_1) )
-                    nNr1 = CONST_ALIGN_RIGHT;       // default is right Scrollbar(vertical)
+                    nNr1 = CONST_ALIGN_RIGHT;		// default is right Scrollbar(vertical)
 
                 if ( (nNr1 != CONST_ALIGN_RIGHT) && (nNr1 != CONST_ALIGN_BOTTOM) )
                 {
@@ -4604,7 +4604,7 @@ BOOL StatementControl::Execute()
                 case M_GetState:
                     break;
                 case M_IsEnabled:
-                    nMethodId = _M_IsEnabled;   // Umlabeln, da die Behandlung essentiell anders ist!
+                    nMethodId = _M_IsEnabled;	// Umlabeln, da die Behandlung essentiell anders ist!
                     break;
                 default:
                     pControl = NULL;
@@ -4619,25 +4619,25 @@ BOOL StatementControl::Execute()
         case M_NotExists:
             Time aT;
             USHORT aSeconds = aT.GetMin()*60+aT.GetSec();
-            if ( !bBool2 )          // wurde im Konstruktor auf FALSE gesetzt
+            if ( !bBool2 )			// wurde im Konstruktor auf FALSE gesetzt
             {
                 bBool2 = TRUE;
                 nNr2 = aSeconds;
                 if( !(nParams & PARAM_USHORT_1) )
-                    nNr1 = 0;       // defaultmäßig sofort zurück
+                    nNr1 = 0;		// defaultmäßig sofort zurück
             }
-            if ( aSeconds < nNr2 )          // Falls die Stunde umgesprungen ist
+            if ( aSeconds < nNr2 )			// Falls die Stunde umgesprungen ist
                 aSeconds += 60*60;
 
             if ( /* !IsAccessable(pControl)#87019# */ !pControl || !pControl->IsVisible() )
                 pControl = NULL;
             if ( ((nMethodId == M_Exists) && pControl) ||
                  ((nMethodId == M_NotExists) && !pControl) )
-            {   // Wenn Bedingung erfüllt
+            {	// Wenn Bedingung erfüllt
                 pRet->GenReturn ( RET_Value, aUId, (comm_BOOL)TRUE );
             }
             else
-                if ( aSeconds <= nNr2 + nNr1 )      // Zeit ist noch nicht abgelaufen
+                if ( aSeconds <= nNr2 + nNr1 )		// Zeit ist noch nicht abgelaufen
                     return FALSE;
                 else
                     pRet->GenReturn ( RET_Value, aUId, (comm_BOOL)FALSE );
@@ -4645,13 +4645,13 @@ BOOL StatementControl::Execute()
             Advance();
             delete this;
             return TRUE;
-//          break;
+//			break;
     }
 
 
     short nRT = 0;
 
-    if( pControl )          // Das Fenster Existiert irgendwo, kann aber auch hidden sein!
+    if( pControl )			// Das Fenster Existiert irgendwo, kann aber auch hidden sein!
     {
         nRT = ImpGetRType( pControl, aUId );   // If not Numeric pControl is used
 #if OSL_DEBUG_LEVEL > 1
@@ -4663,8 +4663,8 @@ BOOL StatementControl::Execute()
 
     if (   nRT == C_Window &&       // Search for WorkWindow to satisfy these commands
          ( nMethodId == M_Close
-//      || nMethodId == M_Size
-//      || nMethodId == M_Move
+//		|| nMethodId == M_Size
+//		|| nMethodId == M_Move
         || nMethodId == M_IsMax
         || nMethodId == M_IsMin
         || nMethodId == M_IsRestore
@@ -4703,7 +4703,7 @@ BOOL StatementControl::Execute()
         // TODO: handle GetFocus for all Methods and Windows like this (remove part below)
         //       See for impact of changed focus for HandleVisibleControls() (taking Snapshots might be different, possible exclude those methods)
         if (( (nRT == C_TreeListBox) && !bBool2 )
-            && nMethodId != M_TypeKeys          // TypeKeys macht das selbst, falls eigenes Focushandling gewünscht
+            && nMethodId != M_TypeKeys			// TypeKeys macht das selbst, falls eigenes Focushandling gewünscht
             && nMethodId != M_MouseDown
             && nMethodId != M_MouseUp
             && nMethodId != M_MouseMove
@@ -4745,7 +4745,7 @@ BOOL StatementControl::Execute()
               || nRT == C_TreeListBox
              )
             || nMethodId == M_OpenContextMenu )
-            && nMethodId != M_TypeKeys          // TypeKeys macht das selbst, falls eigenes Focushandling gewünscht
+            && nMethodId != M_TypeKeys			// TypeKeys macht das selbst, falls eigenes Focushandling gewünscht
             && nMethodId != M_MouseDown
             && nMethodId != M_MouseUp
             && nMethodId != M_MouseMove
@@ -4754,7 +4754,7 @@ BOOL StatementControl::Execute()
 
 /*  leads to problems because settext sets the text whereas typekeys adds to the text.
         if ( bDoTypeKeysDelay && nMethodId == M_SetText && ( nParams & PARAM_STR_1 ) )
-        {   // Hier wird das Statement auf ein TypeKeys umgebogen
+        {	// Hier wird das Statement auf ein TypeKeys umgebogen
             nMethodId = M_TypeKeys;
             nParams = PARAM_BOOL_1 | PARAM_STR_1;
             bBool1 = TRUE;
@@ -4799,7 +4799,7 @@ BOOL StatementControl::Execute()
                             pRet->GenReturn ( RET_Value, aUId, ((TabControl*)pControl)->GetTabPage(((TabControl*)pControl)->GetCurPageId())->GetSmartUniqueOrHelpId().GetText());
                             break;
                         case M_SetPage :
-                            {       // Wegen lokaler Variablen
+                            {		// Wegen lokaler Variablen
                                 TabControl *pTControl = ((TabControl*)pControl);
                                 USHORT nActive = pTControl->GetCurPageId();
                                 USHORT i,anz;
@@ -4828,7 +4828,7 @@ BOOL StatementControl::Execute()
                                     i++;
                                     if ( i >= pTControl->GetPageCount() )
                                         i = 0;
-                                    if ( !MaybeDoTypeKeysDelay( pTControl ) || !MaybeDoTypeKeysDelay( pTControl ) || !MaybeDoTypeKeysDelay( pTControl ) )   // 3 Mal aufrufen
+                                    if ( !MaybeDoTypeKeysDelay( pTControl ) || !MaybeDoTypeKeysDelay( pTControl ) || !MaybeDoTypeKeysDelay( pTControl ) )	// 3 Mal aufrufen
                                         break;
                                 }
                                 if ( !aID.Matches( aWantedID ) )
@@ -5027,7 +5027,7 @@ BOOL StatementControl::Execute()
                                             if ( bUnselectBeforeSelect )
                                                 pLB->SetNoSelection();
                                             pLB->SelectEntryPos( nPos, bBool1 );
-                                            if ( pLB->IsEntryPosSelected( nPos ) ? !bBool1 : bBool1 )   // XOR rein mit BOOL
+                                            if ( pLB->IsEntryPosSelected( nPos ) ? !bBool1 : bBool1 )	// XOR rein mit BOOL
                                                 ReportError( aUId, GEN_RES_STR2( S_METHOD_FAILED, MethodString( nMethodId ), aString1 ) );
                                         }
                                     }
@@ -5040,7 +5040,7 @@ BOOL StatementControl::Execute()
                                             if ( bUnselectBeforeSelect )
                                                 pLB->SetNoSelection();
                                             pLB->SelectEntryPos( nNr1-1, bBool1 );
-                                            if ( pLB->IsEntryPosSelected( nNr1-1 ) ? !bBool1 : bBool1 ) // XOR rein mit BOOL
+                                            if ( pLB->IsEntryPosSelected( nNr1-1 ) ? !bBool1 : bBool1 )	// XOR rein mit BOOL
                                                 ReportError( aUId, GEN_RES_STR2( S_METHOD_FAILED, MethodString( nMethodId ), UniString::CreateFromInt32( nNr1 ) ) );
                                         }
                                     }
@@ -5281,10 +5281,10 @@ BOOL StatementControl::Execute()
                 case C_ToolBox:
                     {
                         ToolBox *pTB = ((ToolBox*)pControl);
-                        if ( !aUId.Matches( pTB->GetSmartUniqueOrHelpId() ) )   // Also Button auf der ToolBox gefunden
+                        if ( !aUId.Matches( pTB->GetSmartUniqueOrHelpId() ) )	// Also Button auf der ToolBox gefunden
                         {
                             if ( (nParams == PARAM_NONE) || (nParams == PARAM_USHORT_1) )
-                            {           // Wir fälschen einen Parameter
+                            {			// Wir fälschen einen Parameter
                                 if ( aUId.HasNumeric() )
                                 {
                                     nParams |= PARAM_ULONG_1;
@@ -5364,13 +5364,13 @@ BOOL StatementControl::Execute()
                             case M_Click :
                                 {
                                     FIND_ITEM;
-                                    if ( bItemFound )   // FIND_ITEM Erfolgreich
+                                    if ( bItemFound )	// FIND_ITEM Erfolgreich
                                     {
                                         Rectangle aRect = pTB->GetItemRect(pTB->GetItemId(nItemPos));
                                         if ( aRect.IsEmpty() )
                                         {
                                             pTB->ExecuteCustomMenu();
-/*                                          aRect = pTB->GetMenubuttonRect();
+/*					                        aRect = pTB->GetMenubuttonRect();
                                             MouseEvent aMEvnt(aRect.Center(),1,MOUSE_SIMPLECLICK,MOUSE_LEFT);
                                             ImplMouseButtonDown( pTB, aMEvnt );*/
 
@@ -5395,7 +5395,7 @@ BOOL StatementControl::Execute()
                             case M_TearOff :
                                 {
                                     FIND_ITEM;
-                                    if ( bItemFound )   // FIND_ITEM Erfolgreich
+                                    if ( bItemFound )	// FIND_ITEM Erfolgreich
                                     {
                                         Rectangle aRect = pTB->GetItemPosDropDownRect( nItemPos );
                                         AnimateMouse( pControl, aRect.Center() );
@@ -5404,13 +5404,13 @@ BOOL StatementControl::Execute()
 
                                         Window *pWin = NULL;
                                         // Wait for the window to open.
-                                        StatementList::bExecuting = TRUE;       // Bah ist das ein ekliger Hack
-                                        {                                           // Das verhindert, daß schon der nächste Befehl ausgeführt wird.
+                                        StatementList::bExecuting = TRUE;		// Bah ist das ein ekliger Hack
+                                        {											// Das verhindert, daß schon der nächste Befehl ausgeführt wird.
                                             Time aDelay;
                                             while ( !pWin && ( (pWin = GetPopupFloatingWin()) == NULL ) && ( Time() - aDelay ).GetSec() < 15 )
                                                 SafeReschedule();
                                         }
-                                        StatementList::bExecuting = FALSE;  // Bah ist das ein ekliger Hack
+                                        StatementList::bExecuting = FALSE;	// Bah ist das ein ekliger Hack
 
                                         if ( pWin && pWin->GetType() == WINDOW_FLOATINGWINDOW )
                                         {
@@ -5430,7 +5430,7 @@ BOOL StatementControl::Execute()
                             case M_OpenMenu :
                                 {
                                     FIND_ITEM;
-                                    if ( bItemFound )   // FIND_ITEM Erfolgreich
+                                    if ( bItemFound )	// FIND_ITEM Erfolgreich
                                     {
                                         Rectangle aRect = pTB->GetItemPosDropDownRect( nItemPos );
                                         AnimateMouse( pControl, aRect.Center() );
@@ -5449,7 +5449,7 @@ BOOL StatementControl::Execute()
                             case _M_IsEnabled:
                                 {
                                     FIND_ITEM;
-                                    if ( bItemFound )   // FIND_ITEM Erfolgreich
+                                    if ( bItemFound )	// FIND_ITEM Erfolgreich
                                     {
                                         pRet->GenReturn ( RET_Value, aUId, pTB->IsItemEnabled( pTB->GetItemId(nItemPos) ) );
                                     }
@@ -5458,7 +5458,7 @@ BOOL StatementControl::Execute()
                             case M_GetState :
                                 {
                                     FIND_ITEM;
-                                    if ( bItemFound )   // FIND_ITEM Erfolgreich
+                                    if ( bItemFound )	// FIND_ITEM Erfolgreich
                                     {
                                         switch (nNr1)
                                         {
@@ -5509,7 +5509,7 @@ BOOL StatementControl::Execute()
                             case M_IsMax:
                             case M_Minimize:
                             case M_Maximize:
-                            case M_Help:        // Alles was unten weiterbehandelt werden soll
+                            case M_Help:		// Alles was unten weiterbehandelt werden soll
                                 goto DockingWin;
                             default:
                                 ReportError( aUId, GEN_RES_STR2c2( S_UNKNOWN_METHOD, MethodString(nMethodId), "ToolBox" ) );
@@ -5524,7 +5524,7 @@ BOOL StatementControl::Execute()
 
 
 
-#define GET_NTH_ENTRY_LBOX( First, Next, Anzahl)    \
+#define GET_NTH_ENTRY_LBOX( First, Next, Anzahl)	\
     SvLBoxEntry *pThisEntry = ((SvTreeListBox*)pControl)->First(); \
     { \
         int niTemp = Anzahl; \
@@ -5586,16 +5586,16 @@ BOOL StatementControl::Execute()
                                 bBool1 = TRUE;
                             if( nParams & PARAM_STR_1 )
                             {
-/*                                  ListBox *pLB = ((ListBox*)pControl);
+/*									ListBox *pLB = ((ListBox*)pControl);
                                 if ( pLB->GetEntryPos( aString1 ) == LISTBOX_ENTRY_NOTFOUND )
                                     ReportError( aUId, GEN_RES_STR2( S_ENTRY_NOT_FOUND, MethodString( nMethodId ), aString1 ) );
                                 else
                                 {
                                     pLB->SelectEntry( aString1, bBool1 );
-                                    if ( pLB->IsEntrySelected( aString1 ) ? !bBool1 : bBool1 )  // XOR rein mit BOOL
+                                    if ( pLB->IsEntrySelected( aString1 ) ? !bBool1 : bBool1 )	// XOR rein mit BOOL
                                         ReportError( aUId, GEN_RES_STR2( S_METHOD_FAILED, MethodString( nMethodId ), aString1 ) );
                                 }
-*/                                  ReportError( aUId, GEN_RES_STR1( S_SELECT_DESELECT_VIA_STRING_NOT_IMPLEMENTED, MethodString( nMethodId ) ) );
+*/									ReportError( aUId, GEN_RES_STR1( S_SELECT_DESELECT_VIA_STRING_NOT_IMPLEMENTED, MethodString( nMethodId ) ) );
                             }
                             else
                             {
@@ -5766,7 +5766,7 @@ BOOL StatementControl::Execute()
                                         pThisEntry = (SvLBoxEntry*)pTree->GetEntryAtVisPos( nNr1-1 );
                                     }
                                 }
-
+                            
                                 if ( pThisEntry )
                                 {
                                     if ( ! (nParams & PARAM_USHORT_2) )
@@ -5827,7 +5827,7 @@ BOOL StatementControl::Execute()
     /*
 
 
-    BOOL            MakeFieldVisible( long nRow, USHORT nColId, BOOL bComplete = FALSE );
+    BOOL			MakeFieldVisible( long nRow, USHORT nColId, BOOL bComplete = FALSE );
     // access to dynamic values of cursor row
     String          GetColumnTitle( USHORT nColumnId ) const;
     USHORT          GetColumnId( USHORT nPos ) const;
@@ -5836,7 +5836,7 @@ BOOL StatementControl::Execute()
     long            GetCurRow() const { return nCurRow; }
     USHORT          GetCurColumnId() const { return nCurColId; }
     BOOL            GoToRow( long nRow );
-    BOOL            GoToRowAndDoNotModifySelection( long nRow );
+    BOOL			GoToRowAndDoNotModifySelection( long nRow );
     BOOL            GoToColumnId( USHORT nColId );
     BOOL            GoToRowColumnId( long nRow, USHORT nColId );
     // selections
@@ -5857,11 +5857,11 @@ BOOL StatementControl::Execute()
     long            NextSelectedRow();
     const MultiSelection* GetSelection() const
                     { return bMultiSelection ? uRow.pSel : 0; }
-    void            SetSelection( const MultiSelection &rSelection );
+    void			SetSelection( const MultiSelection &rSelection );
 
     virtual String  GetCellText(long _nRow, USHORT _nColId) const;
     USHORT GetColumnCount() const { return ColCount(); }
-protected:
+protected:   
     virtual long    GetRowCount() const;
 
 
@@ -5872,9 +5872,9 @@ protected:
             void InvalidateHandleColumn();
 
             CellControllerRef Controller() const { return aController; }
-            sal_Int32   GetBrowserFlags() const { return m_nBrowserFlags; }
+            sal_Int32	GetBrowserFlags() const { return m_nBrowserFlags; }
 
-            virtual void ActivateCell(long nRow, sal_uInt16 nCol, sal_Bool bSetCellFocus = sal_True);
+            virtual void ActivateCell(long nRow, sal_uInt16	nCol, sal_Bool bSetCellFocus = sal_True);
             virtual void DeactivateCell(sal_Bool bUpdate = sal_True);
 
 
@@ -5927,9 +5927,9 @@ protected:
                                                     }
                                                 }
                                                 break;
-
-
-
+                                                
+                                                
+                                                
                                                 /*
                                             case M_GetSelCount :
                                                 pRet->GenReturn ( RET_Value, aUId, comm_ULONG(((SvLBox*)pControl)->GetSelectionCount()));
@@ -5971,16 +5971,16 @@ protected:
                                                     bBool1 = TRUE;
                                                 if( nParams & PARAM_STR_1 )
                                                 {
-                / *                                 ListBox *pLB = ((ListBox*)pControl);
+                / *									ListBox *pLB = ((ListBox*)pControl);
                                                     if ( pLB->GetEntryPos( aString1 ) == LISTBOX_ENTRY_NOTFOUND )
                                                         ReportError( aUId, GEN_RES_STR2( S_ENTRY_NOT_FOUND, MethodString( nMethodId ), aString1 ) );
                                                     else
                                                     {
                                                         pLB->SelectEntry( aString1, bBool1 );
-                                                        if ( pLB->IsEntrySelected( aString1 ) ? !bBool1 : bBool1 )  // XOR rein mit BOOL
+                                                        if ( pLB->IsEntrySelected( aString1 ) ? !bBool1 : bBool1 )	// XOR rein mit BOOL
                                                             ReportError( aUId, GEN_RES_STR2( S_METHOD_FAILED, MethodString( nMethodId ), aString1 ) );
                                                     }
-                * /                                 ReportError( aUId, GEN_RES_STR1( S_SELECT_DESELECT_VIA_STRING_NOT_IMPLEMENTED, MethodString( nMethodId ) ) );
+                * /									ReportError( aUId, GEN_RES_STR1( S_SELECT_DESELECT_VIA_STRING_NOT_IMPLEMENTED, MethodString( nMethodId ) ) );
                                                 }
                                                 else
                                                 {
@@ -6137,7 +6137,7 @@ protected:
                                             else
                                                    pRet->GenReturn ( RET_Value, aUId, comm_ULONG( pELB->getSelIndex() +1));
                                             break;
-/*                                      xxxcase M_SetNoSelection :
+/*						                xxxcase M_SetNoSelection :
                                             ((ListBox*)pControl)->SetNoSelection();
                                             ((ListBox*)pControl)->Select();
                                             break; */
@@ -6196,16 +6196,16 @@ protected:
                                                                     pRet->GenReturn ( RET_Value, aUId, aContent );
                                                                 }
                                                                 break;
-                                                            case TypeClass_STRING:
+                                                            case TypeClass_STRING:			
                                                                 {
                                                                     ::rtl::OUString aContent;
                                                                     aCell >>= aContent;
                                                                     pRet->GenReturn ( RET_Value, aUId, aContent );
                                                                 }
                                                                 break;
-                                                            //case TypeClass_FLOAT:         break;
-                                                            //case TypeClass_DOUBLE:        break;
-                                                            //case TypeClass_OCTET:         break;
+                                                            //case TypeClass_FLOAT:			break;
+                                                            //case TypeClass_DOUBLE:		break;
+                                                            //case TypeClass_OCTET:			break;
                                                             case TypeClass_BYTE:
                                                             case TypeClass_SHORT:
                                                             case TypeClass_LONG:
@@ -6287,7 +6287,7 @@ protected:
                                                 if ( ValueOK( aUId, CUniString("GetSelIndex"), nNr1, pTC->GetSelectedRows().size() ) )
                                                     pRet->GenReturn ( RET_Value, aUId, comm_USHORT( pTC->GetSelectedRows()[nNr1-1] +1 ) );
                                                 break;
-/*                                          case M_GetSelText :
+/*										    case M_GetSelText :
                                                 if ( ! (nParams & PARAM_USHORT_1) )
                                                     nNr1 = 1;
                                                 if ( ValueOK(aUId, CUniString("GetSelText"),nNr1,((SvLBox*)pControl)->GetSelectionCount()) )
@@ -6384,7 +6384,7 @@ protected:
                             else
                                 ReportError( aUId, GEN_RES_STR1( S_ALLOWED_ONLY_IN_DOCKING_MODE, MethodString( nMethodId ) ) );
                             break;
-                        case M_Help:        // Alles was unten weiterbehandelt werden soll
+                        case M_Help:		// Alles was unten weiterbehandelt werden soll
                             goto MoreDialog;
 
                         default:
@@ -6432,7 +6432,7 @@ protected:
                             SET_WINP_CLOSING(pControl);
                             ((FloatingWindow*)pControl)->Close();
                             break;
-                        case M_Help:        // Alles was unten weiterbehandelt werden soll
+                        case M_Help:		// Alles was unten weiterbehandelt werden soll
                         case M_Move:
                             goto MoreDialog;
                         default:
@@ -6515,7 +6515,7 @@ protected:
                         case M_Size:
                         case M_Move:
                             goto FloatWin;
-//                          break;
+//							break;
                         case M_IsMax :
                             pRet->GenReturn ( RET_Value, aUId, ((WorkWindow*)pControl)->IsMaximized() );
                             break;
@@ -6536,7 +6536,7 @@ protected:
                             ((WorkWindow*)pControl)->Maximize( FALSE );
                             ((WorkWindow*)pControl)->Restore();
                             break;
-                        case M_Help:        // Alles was unten weiterbehandelt werden soll
+                        case M_Help:		// Alles was unten weiterbehandelt werden soll
                             goto MoreDialog;
                         default:
                             ReportError( aUId, GEN_RES_STR2c2( S_UNKNOWN_METHOD, MethodString(nMethodId), "WorkWindow" ) );
@@ -6577,7 +6577,7 @@ protected:
                                 break;
                         }
                         if ( bDone )
-                            break;  // break the case here else continue at C_ButtonDialog
+                            break;	// break the case here else continue at C_ButtonDialog
                     }
                 case C_ButtonDialog:
                     {
@@ -6743,7 +6743,7 @@ protected:
 #if OSL_DEBUG_LEVEL > 1
             m_pDbgWin->AddText( CUniString("Reschedule command (requed) (").Append( UniString::CreateFromInt32(nRetryCount) ).AppendAscii(")\n") );
 #endif
-            QueStatement( this );   // will que at the start of the list
+            QueStatement( this );	// will que at the start of the list
         }
         else
         {
diff --git a/automation/source/server/statemnt.hxx b/automation/source/server/statemnt.hxx
index a4d2b76f5632..e5b98046371f 100644
--- a/automation/source/server/statemnt.hxx
+++ b/automation/source/server/statemnt.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,10 +94,10 @@ extern "C"
 #define FORCE_DIRECT_CALL   TRUE
 
 typedef USHORT SearchFlags;
-#define SEARCH_NOOVERLAP            ((SearchFlags) 0x0001)
-#define SEARCH_NO_TOPLEVEL_WIN      ((SearchFlags) 0x0002)
-#define SEARCH_FOCUS_FIRST          ((SearchFlags) 0x0004)
-#define SEARCH_FIND_DISABLED        ((SearchFlags) 0x0008)
+#define SEARCH_NOOVERLAP			((SearchFlags) 0x0001)
+#define SEARCH_NO_TOPLEVEL_WIN		((SearchFlags) 0x0002)
+#define SEARCH_FOCUS_FIRST      	((SearchFlags) 0x0004)
+#define SEARCH_FIND_DISABLED      	((SearchFlags) 0x0008)
 
 class Search
 {
@@ -113,8 +113,8 @@ public:
     BOOL HasSearchFlag( SearchFlags aQueryFlag ) { return (nmSearchFlags & aQueryFlag) == aQueryFlag; }
 };
 
-BOOL IsDialog(Window *pWin);        // Ist *pWin von SystemWindow abgeleitet (Kann es Active sein)
-BOOL IsAccessable(Window *pWin);    // Ist *pWin Zugreifbar (über IsEnabled und Parents geprüft)
+BOOL IsDialog(Window *pWin);		// Ist *pWin von SystemWindow abgeleitet (Kann es Active sein)
+BOOL IsAccessable(Window *pWin);	// Ist *pWin Zugreifbar (über IsEnabled und Parents geprüft)
 
 
 //class SafePointer : CriticalSection
@@ -125,7 +125,7 @@ public:
     SafePointer()   { pSelf = this; }
     virtual ~SafePointer()  { DBG_ASSERT(pSelf==this,"Destructor von Nicht existierendem Objekt aufgerufen");
                               pSelf = NULL; }
-//  static BOOL IsValid( SafePointer *pThis ) { return pThis == pThis->pSelf; }
+//	static BOOL IsValid( SafePointer *pThis ) { return pThis == pThis->pSelf; }
 // virtual      operator -> (); { DBG_ASSERT(pMyself == this,"-> von Nicht existierendem Objekt aufgerufen"); }
 };
 
@@ -173,12 +173,12 @@ protected:
 
     static BOOL bIsInReschedule;
         static USHORT nModalCount;
-    static Window *pLastFocusWindow;        // Wenn dieses sich ändert wird Safe Reschedule abgebrochen
-    static BOOL bWasDragManager;            // Wenn dieses sich ändert wird Safe Reschedule abgebrochen
-    static BOOL bWasPopupMenu;              // Wenn dieses sich ändert wird Safe Reschedule abgebrochen
+    static Window *pLastFocusWindow;		// Wenn dieses sich ändert wird Safe Reschedule abgebrochen
+    static BOOL bWasDragManager;			// Wenn dieses sich ändert wird Safe Reschedule abgebrochen
+    static BOOL bWasPopupMenu;				// Wenn dieses sich ändert wird Safe Reschedule abgebrochen
        static BOOL bBasicWasRunning;
 
-    static USHORT nMinTypeKeysDelay;                /// Verzögerung der einzelnen Anschläge für TypeKeys
+    static USHORT nMinTypeKeysDelay;				/// Verzögerung der einzelnen Anschläge für TypeKeys
     static USHORT nMaxTypeKeysDelay;
     static BOOL bDoTypeKeysDelay;
 
@@ -188,7 +188,7 @@ protected:
 
 public:
     static BOOL IsInReschedule() { return bIsInReschedule; }
-    void SafeReschedule( BOOL bYield = FALSE )  // Setzt Flag, so daß nicht schon der nächste Befehl ausgeführt wird
+    void SafeReschedule( BOOL bYield = FALSE )	// Setzt Flag, so daß nicht schon der nächste Befehl ausgeführt wird
     {
         nModalCount = Application::GetModalModeCount();
         bIsInReschedule = TRUE;
@@ -210,13 +210,13 @@ public:
         nModalCount = 0;
     }
     static BOOL MaybeResetSafeReschedule()
-    {       // Implementierung muß hier zwar nicht sein, ist aber übersichtlicher so
+    {		// Implementierung muß hier zwar nicht sein, ist aber übersichtlicher so
         if ( !bIsInReschedule )
             return FALSE;
 
         if ( pLastFocusWindow != GetpApp()->GetFocusWindow()
             || ( Application::GetModalModeCount() > nModalCount )
-//          || ( DragManager::GetDragManager() && !bWasDragManager )
+//			|| ( DragManager::GetDragManager() && !bWasDragManager )
             || ( PopupMenu::GetActivePopupMenu() && !bWasPopupMenu )
             || ( StarBASIC::IsRunning() && !bBasicWasRunning ) )
         {
@@ -227,7 +227,7 @@ public:
         else
             return FALSE;
     }
-    static void NormalReschedule()  // Setzt das flag nicht
+    static void NormalReschedule()	// Setzt das flag nicht
     {
         GetpApp()->Reschedule();
     }
@@ -290,15 +290,15 @@ public:
     static RetStream *pRet;
     static BOOL IsError;
     static BOOL bDying;
-    static BOOL bExecuting;             // Gesetzt, wenn ein Befehl rescheduled ohne einen neuen Befehl zu erlauben
-    BOOL bWasExecuting;                 // Wurde bei einem MaybeResetSafeReschedule resettet, so wird der Zustand danach wiederhergestellt
-    static SmartId aSubMenuId1;         // Untermenüs bei PopupMenus
-    static SmartId aSubMenuId2;         // erstmal 2-Stufig
-    static SmartId aSubMenuId3;         // and now even 3 levels #i31512#
+    static BOOL bExecuting;				// Gesetzt, wenn ein Befehl rescheduled ohne einen neuen Befehl zu erlauben
+    BOOL bWasExecuting;	        		// Wurde bei einem MaybeResetSafeReschedule resettet, so wird der Zustand danach wiederhergestellt
+    static SmartId aSubMenuId1;			// Untermenüs bei PopupMenus
+    static SmartId aSubMenuId2;			// erstmal 2-Stufig
+    static SmartId aSubMenuId3;			// and now even 3 levels #i31512#
     static SystemWindow *pMenuWindow;   // when using MenuBar as base for MenuCommands
-    static TTProperties *pTTProperties; // Hier stehen die SlotIDs aus dem SFX drin
+    static TTProperties *pTTProperties;	// Hier stehen die SlotIDs aus dem SFX drin
 
-    BOOL CheckWindowWait();         //True heisst, dass Window noch existiert
+    BOOL CheckWindowWait();			//True heisst, dass Window noch existiert
                                     //False -> Window weg;
     static void SetFirstDocFrame( Window* pWin );
     static Window* GetFirstDocFrame();
@@ -318,7 +318,7 @@ public:
 #endif
 };
 
-class StatementSlot : public StatementList  //Slots aufrufen
+class StatementSlot : public StatementList	//Slots aufrufen
 {
 protected:
     USHORT nAnzahl;
@@ -337,13 +337,13 @@ public:
     virtual BOOL Execute();
 };
 
-class StatementUnoSlot : public StatementSlot   //Uno Slots aufrufen
+class StatementUnoSlot : public StatementSlot	//Uno Slots aufrufen
 {
 public:
     StatementUnoSlot(SCmdStream *pIn);
 };
 
-class StatementCommand : public StatementList   // Befehl ausführen (wintree, resetaplication ...)
+class StatementCommand : public StatementList	// Befehl ausführen (wintree, resetaplication ...)
 {
     friend class ImplRemoteControl;
 protected:
@@ -405,7 +405,7 @@ public:
 
 };
 
-class StatementFlow : public StatementList      // Kommunikation mit Sequence
+class StatementFlow : public StatementList		// Kommunikation mit Sequence
 {
     USHORT nArt;
 
@@ -423,8 +423,8 @@ public:
     static CommunicationLink *pCommLink;
     static BOOL bSending;
 
-    static BOOL bUseIPC;    // Soll zur rückmeldung IPC verwendet werden?
-    static ImplRemoteControl *pRemoteControl;   // Static für 2. Constructor
+    static BOOL bUseIPC;	// Soll zur rückmeldung IPC verwendet werden?
+    static ImplRemoteControl *pRemoteControl;	// Static für 2. Constructor
 
 private:
     void SendViaSocket();
diff --git a/automation/source/server/svcommstream.cxx b/automation/source/server/svcommstream.cxx
index c689f9137a3f..9258a6472cff 100644
--- a/automation/source/server/svcommstream.cxx
+++ b/automation/source/server/svcommstream.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/automation/source/server/testtool.hrc b/automation/source/server/testtool.hrc
index d6a234b74236..e8d1c04ac699 100644
--- a/automation/source/server/testtool.hrc
+++ b/automation/source/server/testtool.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR 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.
  *
  ************************************************************************/
-#define TTSTART             12345
+#define TTSTART				12345
 
-#define DisplayHidToolBox   ( TTSTART + 0 )
-#define TT_SHOW             1
-#define TT_SHOW2            ( TTSTART + 1 )
-#define TT_OUTPUT           3
-#define TT_SEND_DATA        4
-#define TT_ALLWIN           5
-#define TT_KURZNAME         6
-#define TT_LANGNAME         7
+#define DisplayHidToolBox	( TTSTART + 0 )
+#define TT_SHOW				1
+#define TT_SHOW2			( TTSTART + 1 )
+#define TT_OUTPUT			3
+#define TT_SEND_DATA		4
+#define TT_ALLWIN			5
+#define TT_KURZNAME			6
+#define TT_LANGNAME			7
 #define TT_ALTERNATE_CAPTION ( TTSTART + 2 )
 
 #define TT_INLINE_TRANSLATION ( TTSTART + 3)
-#define TT_GB_TRANSLATION   1
-#define TT_E_NEW            2
-#define TT_FT_OLD           3
-#define TT_GB_COMMENT       4
-#define TT_E_COMMENT        5
+#define TT_GB_TRANSLATION	1
+#define TT_E_NEW			2
+#define TT_FT_OLD			3
+#define TT_GB_COMMENT		4
+#define TT_E_COMMENT		5
 
-#define TT_PB_SELECT        6
-#define TT_PB_RESTORE       7
-#define TT_PB_ACCEPT        8
-#define TT_PB_NEXT          9
+#define TT_PB_SELECT		6
+#define TT_PB_RESTORE		7
+#define TT_PB_ACCEPT		8
+#define TT_PB_NEXT			9
 
 #define TT_DISCARD_CHANGED_DATA ( TTSTART + 4 )
-#define TT_NO_CONTROL       ( TTSTART + 5 )
+#define TT_NO_CONTROL		( TTSTART + 5 )
 
 
-#define TT_GPF              ( TTSTART + 6 )
+#define TT_GPF				( TTSTART + 6 )
diff --git a/automation/source/simplecm/communiio.hxx b/automation/source/simplecm/communiio.hxx
index c0625ed8b2c6..e5c623f6ebb8 100644
--- a/automation/source/simplecm/communiio.hxx
+++ b/automation/source/simplecm/communiio.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 /*************************************************************************
  *
- *    ATTENTION
- *    This file is intended to work inside and outside the StarOffice environment.
- *    Only adaption of file commtypes.hxx should be necessary. Else it is a bug!
+ *	  ATTENTION
+ *	  This file is intended to work inside and outside the StarOffice environment.
+ *	  Only adaption of file commtypes.hxx should be necessary. Else it is a bug!
  *
  ************************************************************************/
 
 #include <automation/commtypes.hxx>
 
-#define C_ERROR_NONE                0x0001
-#define C_ERROR_PERMANENT           0x0002
-#define C_ERROR_RETRY               0x0003
-#define C_ERROR_TIMEOUT             0x0004
+#define C_ERROR_NONE				0x0001
+#define C_ERROR_PERMANENT			0x0002
+#define C_ERROR_RETRY				0x0003
+#define C_ERROR_TIMEOUT				0x0004
 
 class ITransmiter
 {
diff --git a/automation/source/simplecm/packethandler.cxx b/automation/source/simplecm/packethandler.cxx
index 034143d2cba6..3f0e4125372c 100644
--- a/automation/source/simplecm/packethandler.cxx
+++ b/automation/source/simplecm/packethandler.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 /*************************************************************************
  *
- *    ATTENTION
- *    This file is intended to work inside and outside the StarOffice environment.
- *    Only adaption of file commtypes.hxx should be necessary. Else it is a bug!
+ *	  ATTENTION
+ *	  This file is intended to work inside and outside the StarOffice environment.
+ *	  Only adaption of file commtypes.hxx should be necessary. Else it is a bug!
  *
  ************************************************************************/
 
@@ -98,7 +98,7 @@ comm_BOOL PacketHandler::ReceiveData( void* &pData, comm_UINT32 &nLen )
         if ( bWasError )
             return FALSE;
 
-        if ( 0xFFFFFFFF == nBytes )     // Expliziter Request für dieses Datenpaket auf MultiChannel umzuschalten
+        if ( 0xFFFFFFFF == nBytes )		// Expliziter Request für dieses Datenpaket auf MultiChannel umzuschalten
         {
             READ_SOCKET( &nBytes, sizeof(nBytes) )
             if ( bWasError )
@@ -210,13 +210,13 @@ comm_BOOL PacketHandler::TransferData( const void* pData, comm_UINT32 nLen, CMPr
 #ifndef FORCE_MULTI_CHANNEL_HEADERS
     if ( bMultiChannel )
 #endif
-        nBuffer += 1+2+2+2; // für einen CH_SimpleMultiChannel
+        nBuffer += 1+2+2+2;	// für einen CH_SimpleMultiChannel
 
 #ifdef FORCE_MULTI_CHANNEL_HEADERS
     if ( !bMultiChannel )
     {
         comm_UINT32 n32;
-        n32 = 0xffffffff;   // Umschalten auf MultiChannel
+        n32 = 0xffffffff;	// Umschalten auf MultiChannel
         n32 = NETDWORD( n32 );
         WRITE_SOCKET( &n32, 4 );
     }
@@ -237,11 +237,11 @@ comm_BOOL PacketHandler::TransferData( const void* pData, comm_UINT32 nLen, CMPr
         c = CalcCheckByte( nBuffer );
         WRITE_SOCKET( &c, 1 );
 
-        n16 = 4;    // Länge des Headers für einen CH_SimpleMultiChannel
+        n16 = 4;	// Länge des Headers für einen CH_SimpleMultiChannel
         n16 = NETWORD( n16 );
         WRITE_SOCKET( &n16, 2 );
 
-        n16 = CH_SimpleMultiChannel;    // Typ des Headers
+        n16 = CH_SimpleMultiChannel;	// Typ des Headers
         n16 = NETWORD( n16 );
         WRITE_SOCKET( &n16, 2 );
 
@@ -259,40 +259,40 @@ comm_BOOL PacketHandler::SendHandshake( HandshakeType aHandshakeType, const void
 
     comm_UINT32 nBuffer = 0;
 
-//  if ( pMyManager->IsMultiChannel() )     Wir senden immer FFFFFFFF vorweg -> immer MultiChannel (Oder GPF bei älteren)
-        nBuffer += 1+2+2;   // für einen CH_Handshake
+//	if ( pMyManager->IsMultiChannel() )		Wir senden immer FFFFFFFF vorweg -> immer MultiChannel (Oder GPF bei älteren)
+        nBuffer += 1+2+2;	// für einen CH_Handshake
 
-    nBuffer += 2;   // für den Typ des Handshakes
+    nBuffer += 2;	// für den Typ des Handshakes
 
     switch ( aHandshakeType )
     {
         case CH_REQUEST_HandshakeAlive:
-            nBuffer += 0;   // Keine extra Daten
+            nBuffer += 0;	// Keine extra Daten
             break;
         case CH_RESPONSE_HandshakeAlive:
-            nBuffer += 0;   // Keine extra Daten
+            nBuffer += 0;	// Keine extra Daten
             break;
         case CH_REQUEST_ShutdownLink:
-            nBuffer += 0;   // Keine extra Daten
+            nBuffer += 0;	// Keine extra Daten
             break;
         case CH_ShutdownLink:
-            nBuffer += 0;   // Keine extra Daten
+            nBuffer += 0;	// Keine extra Daten
             break;
         case CH_SUPPORT_OPTIONS:
-            nBuffer += 2 ;  // one word extradata for options
+            nBuffer += 2 ;	// one word extradata for options
             break;
         case CH_SetApplication:
-            nBuffer += 0 ;  // one word extradata for options
+            nBuffer += 0 ;	// one word extradata for options
             break;
         default:
             DBG_ERROR("Unknown HandshakeType");
     }
 
     if ( pData )
-        nBuffer += nLen;    // Extra data in Buffer
+        nBuffer += nLen;	// Extra data in Buffer
 
     comm_UINT32 n32;
-    n32 = 0xffffffff;   // Umschalten auf MultiChannel
+    n32 = 0xffffffff;	// Umschalten auf MultiChannel
     n32 = NETDWORD( n32 );
     WRITE_SOCKET( &n32, 4 );
 
@@ -306,15 +306,15 @@ comm_BOOL PacketHandler::SendHandshake( HandshakeType aHandshakeType, const void
     c = CalcCheckByte( nBuffer );
     WRITE_SOCKET( &c, 1 );
 
-    n16 = 2;    // Länge des Headers für einen CH_Handshake
+    n16 = 2;	// Länge des Headers für einen CH_Handshake
     n16 = NETWORD( n16 );
     WRITE_SOCKET( &n16, 2 );
 
-    n16 = CH_Handshake; // Typ des Headers
+    n16 = CH_Handshake;	// Typ des Headers
     n16 = NETWORD( n16 );
     WRITE_SOCKET( &n16, 2 );
 
-    n16 = aHandshakeType;   // Typ des Handshakes
+    n16 = aHandshakeType;	// Typ des Handshakes
     n16 = NETWORD( n16 );
     WRITE_SOCKET( &n16, 2 );
 
diff --git a/automation/source/simplecm/packethandler.hxx b/automation/source/simplecm/packethandler.hxx
index 31081b2e949a..7f42a614b985 100644
--- a/automation/source/simplecm/packethandler.hxx
+++ b/automation/source/simplecm/packethandler.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 /*************************************************************************
  *
- *    ATTENTION
- *    This file is intended to work inside and outside the StarOffice environment.
- *    Only adaption of file commtypes.hxx should be necessary. Else it is a bug!
+ *	  ATTENTION
+ *	  This file is intended to work inside and outside the StarOffice environment.
+ *	  Only adaption of file commtypes.hxx should be necessary. Else it is a bug!
  *
  ************************************************************************/
 
@@ -62,7 +62,7 @@ public:
     comm_UINT16 GetReceiveProtocol() { return nReceiveProtocol; }
     comm_UINT16 GetReceiveHeaderType() { return nReceiveHeaderType; }
 
-    comm_BOOL ReceiveData( void* &pData, comm_UINT32 &nLen );               /// Recieve DataPacket from Socket
+    comm_BOOL ReceiveData( void* &pData, comm_UINT32 &nLen );				/// Recieve DataPacket from Socket
     virtual comm_BOOL SendHandshake( HandshakeType aHandshakeType, const void* pData = NULL, comm_UINT32 nLen = 0 );
     virtual comm_BOOL TransferData( const void* pData, comm_UINT32 nLen, CMProtocol nProtocol = CM_PROTOCOL_OLDSTYLE );
 };
diff --git a/automation/source/simplecm/simplecm.cxx b/automation/source/simplecm/simplecm.cxx
index 26c8d6af0585..ef770100ddca 100644
--- a/automation/source/simplecm/simplecm.cxx
+++ b/automation/source/simplecm/simplecm.cxx
@@ -168,8 +168,8 @@ void SimpleCommunicationLinkViaSocket::SetStreamSocket( osl::StreamSocket* pSock
 
 BOOL SimpleCommunicationLinkViaSocket::StopCommunication()
 {
-    CommunicationLinkRef rHold(this);       // avoid deleting this link before the end of the method
-    if ( !IsCommunicationError() )  // Meaning that the Communication is still runnung
+    CommunicationLinkRef rHold(this);		// avoid deleting this link before the end of the method
+    if ( !IsCommunicationError() )	// Meaning that the Communication is still runnung
     {
 #if OSL_DEBUG_LEVEL > 1
         debug_printf("Sending REQUEST_ShutdownLink\n");
@@ -250,7 +250,7 @@ ByteString SimpleCommunicationLinkViaSocket::GetMyName( CM_NameType eType )
 SvStream* SimpleCommunicationLinkViaSocket::GetBestCommunicationStream()
 {
     SvStream* pStream = new SvMemoryStream;
-//  pStream->SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
+//	pStream->SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
     return pStream;
 }
 
@@ -319,7 +319,7 @@ BOOL SimpleCommunicationLinkViaSocket::SendHandshake( HandshakeType aHandshakeTy
         ShutdownCommunication();
     }
     else
-    {   // set new status
+    {	// set new status
         switch ( aHandshakeType )
         {
             case CH_REQUEST_HandshakeAlive:
@@ -366,7 +366,7 @@ bool SimpleCommunicationLinkViaSocket::IsReceiveReady()
 
 void SimpleCommunicationLinkViaSocketWithReceiveCallbacks::WaitForShutdown()
 {
-    CommunicationLinkRef rHold(this);       // avoid deleting this link before the end of the method
+    CommunicationLinkRef rHold(this);		// avoid deleting this link before the end of the method
 
     while( pMyManager && !IsCommunicationError() && IsReceiveReady())
         ReceiveDataStream();
@@ -443,7 +443,7 @@ ByteString CommunicationManager::GetMyName( CM_NameType )
 
 void CommunicationManager::CallConnectionOpened( CommunicationLink* pCL )
 {
-    pCL->StartCallback();       // Sollte bereits vor dem Aufruf gerufen werden
+    pCL->StartCallback();		// Sollte bereits vor dem Aufruf gerufen werden
     pCL->aStart = DateTime();
     pCL->aLastAccess = pCL->aStart;
     bIsCommunicationRunning = TRUE;
@@ -460,7 +460,7 @@ void CommunicationManager::CallConnectionOpened( CommunicationLink* pCL )
 
 void CommunicationManager::CallConnectionClosed( CommunicationLink* pCL )
 {
-    pCL->StartCallback();       // Sollte bereits vor dem Aufruf gerufen werden
+    pCL->StartCallback();		// Sollte bereits vor dem Aufruf gerufen werden
     pCL->aLastAccess = DateTime();
 
     INFO_MSG( CByteString("C-:").Append( pCL->GetCommunicationPartner( CM_FQDN ) ),
@@ -472,14 +472,14 @@ void CommunicationManager::CallConnectionClosed( CommunicationLink* pCL )
         xLastNewLink.Clear();
 
     pCL->FinishCallback();
-//  delete pCL;
+//	delete pCL;
 }
 
 void CommunicationManager::CallDataReceived( CommunicationLink* pCL )
 {
-    pCL->StartCallback();       // Sollte bereits vor dem Aufruf gerufen werden
+    pCL->StartCallback();		// Sollte bereits vor dem Aufruf gerufen werden
     pCL->aLastAccess = DateTime();
-    CommunicationLinkRef rHold(pCL);    // Hält den Zeiger bis zum Ende des calls
+    CommunicationLinkRef rHold(pCL);	// Hält den Zeiger bis zum Ende des calls
 
     // should be impossible but happens for mysterious reasons
     if ( !pCL->pServiceData )
@@ -494,7 +494,7 @@ void CommunicationManager::CallDataReceived( CommunicationLink* pCL )
     {
         SvStream *pData = pCL->GetServiceData();
         USHORT nType;
-        pData->SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );    // Unfortulately it is written this way :((
+        pData->SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );	// Unfortulately it is written this way :((
         *pData >> nType;
         pData->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
         switch ( nType )
@@ -629,7 +629,7 @@ void SingleCommunicationManager::CallConnectionOpened( CommunicationLink* pCL )
         if ( pInactiveLink )
             pInactiveLink->InvalidateManager();
         pInactiveLink = xActiveLink;
-        xActiveLink->StopCommunication();   // Den alten Link brutal abwürgen
+        xActiveLink->StopCommunication();	// Den alten Link brutal abwürgen
     }
     xActiveLink = pCL;
     CommunicationManager::CallConnectionOpened( pCL );
@@ -677,7 +677,7 @@ BOOL CommonSocketFunctions::DoStartCommunication( CommunicationManager *pCM, ICo
 
 
     TimeValue aTV;
-    aTV.Seconds = 10;       // Warte 10 Sekunden
+    aTV.Seconds = 10;		// Warte 10 Sekunden
     aTV.Nanosec = 0;
     do
     {
diff --git a/automation/source/testtool/cmdstrm.cxx b/automation/source/testtool/cmdstrm.cxx
index a860948c6b04..71d94993fbec 100644
--- a/automation/source/testtool/cmdstrm.cxx
+++ b/automation/source/testtool/cmdstrm.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,14 +65,14 @@ CmdStream::~CmdStream()
 
 
 #define PUT_CHAR(ch) \
-        USHORT nMCode = nModify + ch;                       \
-        USHORT _Code = 1;                                   \
-        if ( (nMCode & 0xFF) == 0 )                         \
-            _Code |= 2;                                     \
-        if ( (nMCode >> 8) == 0 )                           \
-            _Code |= 4;                                     \
-        Result += (char) _Code;                             \
-        Result += (char) ( nMCode & 0xFF );                 \
+        USHORT nMCode = nModify + ch;						\
+        USHORT _Code = 1;									\
+        if ( (nMCode & 0xFF) == 0 )							\
+            _Code |= 2;										\
+        if ( (nMCode >> 8) == 0 )							\
+            _Code |= 4;										\
+        Result += (char) _Code;								\
+        Result += (char) ( nMCode & 0xFF );					\
         Result += (char) ( nMCode >> 8 )
 
 
@@ -90,7 +90,7 @@ String CmdStream::WandleKeyEventString( String aKeys )
         if ( nPos2 != STRING_NOTFOUND )
         {
             String Work = aKeys.Copy(nPos1+1,nPos2-nPos1+1-2);
-            aKeys.Erase(nPos1,nPos2-nPos1+1);   // Inclusive Spitze Klammern weg
+            aKeys.Erase(nPos1,nPos2-nPos1+1);	// Inclusive Spitze Klammern weg
             String Result, Token;
             USHORT nModify = 0;
             while ( Work.Len() > 0 )
@@ -122,21 +122,21 @@ String CmdStream::WandleKeyEventString( String aKeys )
                         {
                             switch ( nCode )
                             {
-                                case KEY_SPACE:     Token = ' '; break;
-                                case KEY_ADD:       Token = '+'; break;
-                                case KEY_SUBTRACT:  Token = '-'; break;
-                                case KEY_MULTIPLY:  Token = '*'; break;
-                                case KEY_DIVIDE:    Token = '/'; break;
-                                case KEY_POINT:     Token = '.'; break;
-                                case KEY_COMMA:     Token = ','; break;
-                                case KEY_LESS:      Token = '<'; break;
-                                case KEY_GREATER:   Token = '>'; break;
-                                case KEY_EQUAL:     Token = '='; break;
+                                case KEY_SPACE:		Token = ' '; break;
+                                case KEY_ADD:		Token = '+'; break;
+                                case KEY_SUBTRACT:	Token = '-'; break;
+                                case KEY_MULTIPLY:	Token = '*'; break;
+                                case KEY_DIVIDE:	Token = '/'; break;
+                                case KEY_POINT:		Token = '.'; break;
+                                case KEY_COMMA:		Token = ','; break;
+                                case KEY_LESS:		Token = '<'; break;
+                                case KEY_GREATER:	Token = '>'; break;
+                                case KEY_EQUAL:		Token = '='; break;
                                 default:
-//                                  if ( nModify == 0 )
-//                                      Token.ToLower();
-//                                  else
-//                                      Token.ToUpper();
+//									if ( nModify == 0 )
+//										Token.ToLower();
+//									else
+//										Token.ToUpper();
                                     ;
                             }
                             Result += Token;
@@ -181,7 +181,7 @@ void CmdStream::WriteSortedParams( SbxArray* rPar, BOOL IsKeyString )
         {
             switch (rPar->Get( i )->GetType())
             {
-                case SbxLONG:       // alles immer als Short �bertragen
+                case SbxLONG:		// alles immer als Short �bertragen
                 case SbxULONG:
                 case SbxLONG64:
                 case SbxULONG64:
@@ -215,7 +215,7 @@ void CmdStream::WriteSortedParams( SbxArray* rPar, BOOL IsKeyString )
                     else
                         SbxBase::SetError( SbxERR_WRONG_ARGS );
                     break;
-                case SbxOBJECT:     // whenever a control is passed. TabPage, MenuBar
+                case SbxOBJECT:		// whenever a control is passed. TabPage, MenuBar
                     {
                         SbxProperty *pMember = NULL;
                         if ( rPar->Get( i )->ISA( SbxObject ) )
@@ -296,15 +296,15 @@ void CmdStream::WriteSortedParams( SbxArray* rPar, BOOL IsKeyString )
         }
     }
     Write (nParams);
-    if( nParams & PARAM_USHORT_1 )  Write( nNr1 );
-    if( nParams & PARAM_USHORT_2 )  Write( nNr2 );
-    if( nParams & PARAM_USHORT_3 )  Write( nNr3 );
-    if( nParams & PARAM_USHORT_4 )  Write( nNr4 );
-    if( nParams & PARAM_ULONG_1 )   Write( nLNr1 );
-    if( nParams & PARAM_STR_1 )     Write( aString1, IsKeyString );
-    if( nParams & PARAM_STR_2 )     Write( aString2, IsKeyString );
-    if( nParams & PARAM_BOOL_1 )    Write( bBool1 );
-    if( nParams & PARAM_BOOL_2 )    Write( bBool2 );
+    if( nParams & PARAM_USHORT_1 )	Write( nNr1 );
+    if( nParams & PARAM_USHORT_2 )	Write( nNr2 );
+    if( nParams & PARAM_USHORT_3 )	Write( nNr3 );
+    if( nParams & PARAM_USHORT_4 )	Write( nNr4 );
+    if( nParams & PARAM_ULONG_1 )	Write( nLNr1 );
+    if( nParams & PARAM_STR_1 )		Write( aString1, IsKeyString );
+    if( nParams & PARAM_STR_2 )		Write( aString2, IsKeyString );
+    if( nParams & PARAM_BOOL_1 )	Write( bBool1 );
+    if( nParams & PARAM_BOOL_2 )	Write( bBool2 );
 }
 
 void CmdStream::GenCmdCommand( USHORT nNr, SbxArray* rPar )
@@ -320,15 +320,15 @@ void CmdStream::GenCmdSlot( USHORT nNr, SbxArray* rPar )
     Write(nNr);
     if (rPar)
     {
-        USHORT nAnz = (rPar->Count()-1) >> 1;   // Geteilt durch 2
+        USHORT nAnz = (rPar->Count()-1) >> 1;	// Geteilt durch 2
         Write(nAnz);
         BOOL bWriteUnoSlot = rPar->Get( 1 )->GetType() == SbxSTRING;
 
         for (USHORT n = 1 ; n <= nAnz ; n++)
         {
             /// #59513# nicht mehr ben�tigt
-//          ULONG nUserData = rPar->Get( 2*n-1 )->GetUserData();
-//          rPar->Get( 2*n-1 )->SetUserData(ID_DoNothing);  // Verhindert Ausf�hrung der Slots, die als Parameter �bergeben sind.
+//			ULONG nUserData = rPar->Get( 2*n-1 )->GetUserData();
+//			rPar->Get( 2*n-1 )->SetUserData(ID_DoNothing);	// Verhindert Ausf�hrung der Slots, die als Parameter �bergeben sind.
 
             if ( bWriteUnoSlot )
                 Write(rPar->Get( 2*n-1 )->GetString());
@@ -372,7 +372,7 @@ void CmdStream::GenCmdSlot( USHORT nNr, SbxArray* rPar )
             }
 
             /// #59513# nicht mehr ben�tigt ( siehe oben )
-//          rPar->Get( 2*n-1 )->SetUserData(nUserData); // Und wieder zur�cksetzen, so da� auch alles sauber ist.
+//			rPar->Get( 2*n-1 )->SetUserData(nUserData);	// Und wieder zur�cksetzen, so da� auch alles sauber ist.
         }
     }
     else
@@ -382,20 +382,20 @@ void CmdStream::GenCmdSlot( USHORT nNr, SbxArray* rPar )
 void CmdStream::GenCmdUNOSlot( const String &aURL )
 {
     Write( USHORT(SIUnoSlot) );
-/*  Write( USHORT(0) );     // Hier wird im Office die SID_OPENURL Eingetragen.
+/*	Write( USHORT(0) );		// Hier wird im Office die SID_OPENURL Eingetragen.
                             // Dies mu� nat�rlich im Office hart verdratet werden und nicht hier,
                             // da sich die ID ja mal �ndern kann.
 
     // Da auch die ID f�r das PoolItem im Office entnommen werden mu� hier also kein PoolItem
     // gesendet werden.
 
-    Write( USHORT(0) );     // Anzahl PoolItems
+    Write( USHORT(0) );		// Anzahl PoolItems
 
     // Stattdessen wird noch eine extra String gesendet, der dann Officeseitig in ein
     // SfxStringItem mit entsprechender ID gewandelt wird.
-    Write( aURL );          // String f�r das PoolItem*/
+    Write( aURL );			// String f�r das PoolItem*/
 
-    Write( aURL );          // Die UNO URL eben
+    Write( aURL );			// Die UNO URL eben
 }
 
 void CmdStream::GenCmdControl( comm_ULONG nUId, USHORT nMethodId, SbxArray* rPar )
@@ -418,14 +418,14 @@ void CmdStream::GenCmdFlow( USHORT nArt )
 {
     Write(USHORT(SIFlow));
     Write(nArt);
-    Write(USHORT(PARAM_NONE));              // Typ der folgenden Parameter
+    Write(USHORT(PARAM_NONE));				// Typ der folgenden Parameter
 }
 
 void CmdStream::GenCmdFlow( USHORT nArt, USHORT nNr1 )
 {
     Write(USHORT(SIFlow));
     Write(nArt);
-    Write(USHORT(PARAM_USHORT_1));          // Typ der folgenden Parameter
+    Write(USHORT(PARAM_USHORT_1));			// Typ der folgenden Parameter
     Write(nNr1);
 }
 
@@ -433,7 +433,7 @@ void CmdStream::GenCmdFlow( USHORT nArt, comm_ULONG nNr1 )
 {
     Write(USHORT(SIFlow));
     Write(nArt);
-    Write(USHORT(PARAM_ULONG_1));           // Typ der folgenden Parameter
+    Write(USHORT(PARAM_ULONG_1));			// Typ der folgenden Parameter
     Write(nNr1);
 }
 
@@ -441,7 +441,7 @@ void CmdStream::GenCmdFlow( USHORT nArt, String aString1 )
 {
     Write(USHORT(SIFlow));
     Write(nArt);
-    Write(USHORT(PARAM_STR_1));             // Typ der folgenden Parameter
+    Write(USHORT(PARAM_STR_1));				// Typ der folgenden Parameter
     Write(aString1);
 }
 
diff --git a/automation/source/testtool/cmdstrm.hxx b/automation/source/testtool/cmdstrm.hxx
index fb8b49f6106e..a9eb8b876487 100644
--- a/automation/source/testtool/cmdstrm.hxx
+++ b/automation/source/testtool/cmdstrm.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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:
     void GenCmdUNOSlot( const String &aURL );
 
     void GenCmdControl( comm_ULONG nUId, USHORT nMethodId, SbxArray* rPar );
-    void GenCmdControl( String aUId, USHORT nMethodId, SbxArray* rPar );
+    void GenCmdControl( String aUId, USHORT nMethodId, SbxArray* rPar ); 
 
 
     void GenCmdFlow( USHORT nArt );
@@ -59,11 +59,11 @@ public:
 
     SvMemoryStream* GetStream();
 
-    static CNames *pKeyCodes;           // Namen der Sondertasten  MOD1, F1, LEFT ...
+    static CNames *pKeyCodes;			// Namen der Sondertasten  MOD1, F1, LEFT ...
     static ControlDefLoad __READONLY_DATA arKeyCodes [];
 
 private:
-    String WandleKeyEventString( String aKeys );    // Nutzt pKeyCodes.  <RETURN> <SHIFT LEFT LEFT>
+    String WandleKeyEventString( String aKeys );	// Nutzt pKeyCodes.  <RETURN> <SHIFT LEFT LEFT>
 
     using CmdBaseStream::Write;
     void Write( comm_USHORT nNr ){CmdBaseStream::Write( nNr );}
diff --git a/automation/source/testtool/comm_bas.cxx b/automation/source/testtool/comm_bas.cxx
index 8c206b108926..b33fa293fe5a 100644
--- a/automation/source/testtool/comm_bas.cxx
+++ b/automation/source/testtool/comm_bas.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 //    Keine
 // 2) Methoden:
 //    CommunicationLink StartCommunication( Host, Port )
-//    StopAllCommunication      // Alle Kommunikation wird abgebrochen
-//    BOOL IsCommunicationRunning       // Läuft noch irgendwas
-//    String GetMyName      Der eigene Name
-//    BOOL IsLinkValid( CommunicationLink )     // Ist dieser Link noch gültig
-//    SetCommunicationEventHandler( String )    // Diese Funktion wird aufgerufen bei jedem Event
+//    StopAllCommunication		// Alle Kommunikation wird abgebrochen
+//    BOOL IsCommunicationRunning		// Läuft noch irgendwas
+//    String GetMyName		Der eigene Name
+//    BOOL IsLinkValid( CommunicationLink )		// Ist dieser Link noch gültig
+//    SetCommunicationEventHandler( String )	// Diese Funktion wird aufgerufen bei jedem Event
 
 // Der CommunicationLink hat folgende Elemente:
 // 1) Properties:
 //    Keine
 // 2) Methoden:
-//    StopCommunication     Die Kommunikation wird abgebrochen
-//    String GetMyName      Der eigene Name
-//    String GetHostName    Der Name des Anderen
-//    Send(String )         String an den Partner schicken
-//    String GetString      Ergebnis des letzten Empfangs
+//    StopCommunication		Die Kommunikation wird abgebrochen
+//    String GetMyName		Der eigene Name
+//    String GetHostName	Der Name des Anderen
+//    Send(String )			String an den Partner schicken
+//    String GetString		Ergebnis des letzten Empfangs
 
 
 // Diese Implementation ist ein Beispiel fuer eine tabellengesteuerte
@@ -74,7 +74,7 @@
 #define _BWRITE     0x0200  // kann as Lvalue verwendet werden
 #define _LVALUE     _BWRITE  // kann as Lvalue verwendet werden
 #define _READWRITE  0x0300  // beides
-#define _OPT        0x0400  // TRUE: optionaler Parameter
+#define	_OPT		0x0400	// TRUE: optionaler Parameter
 #define _METHOD     0x1000  // Masken-Bit fuer eine Methode
 #define _PROPERTY   0x2000  // Masken-Bit fuer eine Property
 #define _COLL       0x4000  // Masken-Bit fuer eine Collection
@@ -145,7 +145,7 @@ CommunicationWrapper::CommunicationWrapper( const String& rClass ) : SbxObject(
 , m_bCatchOpen( FALSE )
 , m_pNewLink( NULL )
 {
-//  SetName( CUniString("Manager") );
+//	SetName( CUniString("Manager") );
     m_pMethods = &aManagerMethods[0];
     m_pManager = new CommunicationManagerClientViaSocket;
     m_pManager->SetConnectionOpenedHdl( LINK( this, CommunicationWrapper, Open ) );
@@ -323,7 +323,7 @@ void CommunicationWrapper::Events( String aType, CommunicationLink* pLink )
         Call( m_aEventHandlerName, pPar );
     }
     else
-        delete pLink->GetServiceData();     // Stream wegschmeissen um nicht zu blockieren
+        delete pLink->GetServiceData();		// Stream wegschmeissen um nicht zu blockieren
 }
 
 
@@ -352,28 +352,28 @@ void CommunicationWrapper::MStartCommunication( SbxVariable* pVar, SbxArray* pPa
 }
 
 void CommunicationWrapper::MStopAllCommunication( SbxVariable* /*pVar*/, SbxArray* /*pPar*/, BOOL /*bWrite*/ )
-{ //    StopAllCommunication        // Alle Kommunikation wird abgebrochen
+{ //    StopAllCommunication		// Alle Kommunikation wird abgebrochen
     m_pManager->StopCommunication();
 }
 
 void CommunicationWrapper::MIsCommunicationRunning( SbxVariable* pVar, SbxArray* /*pPar*/, BOOL /*bWrite*/ )
-{ //    BOOL IsCommunicationRunning     // Läuft noch irgendwas
+{ //    BOOL IsCommunicationRunning		// Läuft noch irgendwas
     pVar->PutBool( m_pManager->IsCommunicationRunning() );
 }
 
 void CommunicationWrapper::MGetMyName( SbxVariable* pVar, SbxArray* /*pPar*/, BOOL /*bWrite*/ )
-{ //    String GetMyName        Der eigene Name
+{ //    String GetMyName		Der eigene Name
     pVar->PutString( UniString( m_pManager->GetMyName( CM_FQDN ), RTL_TEXTENCODING_UTF8 ) );
 }
 
 void CommunicationWrapper::MIsLinkValid( SbxVariable* pVar, SbxArray* pPar, BOOL /*bWrite*/ )
-{ //    BOOL IsLinkValid( CommunicationLink )       // Ist dieser Link noch gültig
+{ //    BOOL IsLinkValid( CommunicationLink )		// Ist dieser Link noch gültig
     CommunicationWrapper *pWrapper = (CommunicationWrapper*)(pPar->Get( 1 )->GetObject());
     pVar->PutBool( m_pManager->IsLinkValid( pWrapper->GetCommunicationLink() ) );
 }
 
 void CommunicationWrapper::MSetCommunicationEventHandler( SbxVariable* /*pVar*/, SbxArray* pPar, BOOL /*bWrite*/ )
-{ //    SetCommunicationEventHandler( String )  // Diese Funktion wird aufgerufen bei jedem Event
+{ //    SetCommunicationEventHandler( String )	// Diese Funktion wird aufgerufen bei jedem Event
     m_aEventHandlerName = pPar->Get( 1 )->GetString();
 }
 
@@ -381,24 +381,24 @@ void CommunicationWrapper::MSetCommunicationEventHandler( SbxVariable* /*pVar*/,
 
 
 
-//      Link
+//		Link
 void CommunicationWrapper::LStopCommunication( SbxVariable* /*pVar*/, SbxArray* /*pPar*/, BOOL /*bWrite*/ )
-{ //    StopCommunication       Die Kommunikation wird abgebrochen
+{ //    StopCommunication		Die Kommunikation wird abgebrochen
     m_pLink->StopCommunication();
 }
 
 void CommunicationWrapper::LGetMyName( SbxVariable* pVar, SbxArray* /*pPar*/, BOOL /*bWrite*/ )
-{ //    String GetMyName        Der eigene Name
+{ //    String GetMyName		Der eigene Name
     pVar->PutString( UniString( m_pLink->GetMyName( CM_FQDN ), RTL_TEXTENCODING_UTF8 ) );
 }
 
 void CommunicationWrapper::LGetHostName( SbxVariable* pVar, SbxArray* /*pPar*/, BOOL /*bWrite*/ )
-{ //    String GetHostName  Der Name des Anderen
+{ //    String GetHostName	Der Name des Anderen
     pVar->PutString( UniString( m_pLink->GetCommunicationPartner( CM_FQDN ), RTL_TEXTENCODING_UTF8 ) );
 }
 
 void CommunicationWrapper::LSend( SbxVariable* /*pVar*/, SbxArray* pPar, BOOL /*bWrite*/ )
-{ //    Send(String )           String an den Partner schicken
+{ //    Send(String )			String an den Partner schicken
     SvStream *pSendStream = m_pLink->GetBestCommunicationStream();
     String aSendString = pPar->Get( 1 )->GetString();
     pSendStream->WriteByteString( aSendString, RTL_TEXTENCODING_UTF8 );
@@ -407,7 +407,7 @@ void CommunicationWrapper::LSend( SbxVariable* /*pVar*/, SbxArray* pPar, BOOL /*
 }
 
 void CommunicationWrapper::LGetString( SbxVariable* pVar, SbxArray* /*pPar*/, BOOL /*bWrite*/ )
-{ //    String GetString        Ergebnis des letzten Empfangs
+{ //    String GetString		Ergebnis des letzten Empfangs
     SvStream *pReceiveStream = m_pLink->GetServiceData();
     if ( pReceiveStream )
     {
diff --git a/automation/source/testtool/comm_bas.hxx b/automation/source/testtool/comm_bas.hxx
index 3587efcc4806..ce994324f889 100644
--- a/automation/source/testtool/comm_bas.hxx
+++ b/automation/source/testtool/comm_bas.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 class CommunicationManagerClientViaSocket;
 class CommunicationLink;
 
-class CommunicationWrapper : public SbxObject   // Einer für Manager und Links
+class CommunicationWrapper : public SbxObject	// Einer für Manager und Links
 {
     // Definition eines Tabelleneintrags. Dies wird hier gemacht,
     // da dadurch die Methoden und Properties als private deklariert
@@ -51,17 +51,17 @@ private:
 #endif
 
     struct Methods {
-        const char* pName;      // Name des Eintrags
-        SbxDataType eType;      // Datentyp
-        pMeth pFunc;            // Function Pointer
-        short nArgs;            // Argumente und Flags
+        const char* pName;		// Name des Eintrags
+        SbxDataType eType;		// Datentyp
+        pMeth pFunc;			// Function Pointer
+        short nArgs;			// Argumente und Flags
     };
-    static Methods aManagerMethods[];   // Methodentabelle
-    static Methods aLinkMethods[];      // Methodentabelle
-    Methods *m_pMethods;    // Aktuelle Methodentabelle
+    static Methods aManagerMethods[];	// Methodentabelle
+    static Methods aLinkMethods[];		// Methodentabelle
+    Methods *m_pMethods;	// Aktuelle Methodentabelle
 
     // Methoden
-    //      Manager
+    //		Manager
     void MStartCommunication( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
     void MStopAllCommunication( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
     void MIsCommunicationRunning( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
@@ -69,7 +69,7 @@ private:
     void MIsLinkValid( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
     void MSetCommunicationEventHandler( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
 
-    //      Link
+    //		Link
     void LStopCommunication( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
     void LGetMyName( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
     void LGetHostName( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
@@ -79,7 +79,7 @@ private:
     // Interne Member und Methoden
     CommunicationManagerClientViaSocket *m_pManager;
     CommunicationLink *m_pLink;
-    BOOL m_bIsManager;  // Ist es kein Manager, so ist es ein Link
+    BOOL m_bIsManager;	// Ist es kein Manager, so ist es ein Link
 
     // Kram für Manager
     DECL_LINK( Open, CommunicationLink* );
diff --git a/automation/source/testtool/cretstrm.cxx b/automation/source/testtool/cretstrm.cxx
index 0f9781c73970..b07271b4b311 100644
--- a/automation/source/testtool/cretstrm.cxx
+++ b/automation/source/testtool/cretstrm.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/automation/source/testtool/cretstrm.hxx b/automation/source/testtool/cretstrm.hxx
index 206d74db33ba..7aa09a3d4c78 100644
--- a/automation/source/testtool/cretstrm.hxx
+++ b/automation/source/testtool/cretstrm.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ public:
     using CmdBaseStream::Read;
     void Read ( comm_USHORT &nNr ){CmdBaseStream::Read ( nNr );}
     void Read ( comm_ULONG &nNr ){CmdBaseStream::Read ( nNr );}
-//  void Read ( comm_UniChar* &aString, comm_USHORT &nLenInChars ){CmdBaseStream::Read ( aString, nLenInChars );}
+//	void Read ( comm_UniChar* &aString, comm_USHORT &nLenInChars ){CmdBaseStream::Read ( aString, nLenInChars );}
     virtual void Read ( SmartId* &pId ){CmdBaseStream::Read ( pId );}
     void Read ( comm_BOOL &bBool ){CmdBaseStream::Read ( bBool );}
 //  new
diff --git a/automation/source/testtool/filter.pl b/automation/source/testtool/filter.pl
index 8f45073b0934..7542dea9ce41 100644
--- a/automation/source/testtool/filter.pl
+++ b/automation/source/testtool/filter.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/automation/source/testtool/httprequest.cxx b/automation/source/testtool/httprequest.cxx
index beb8f4c4d0d7..11c1e4d484b0 100644
--- a/automation/source/testtool/httprequest.cxx
+++ b/automation/source/testtool/httprequest.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,13 +91,13 @@ BOOL HttpRequest::Execute()
     }
 
     TimeValue aTV;
-    aTV.Seconds = 10;       // Warte 10 Sekunden
+    aTV.Seconds = 10;		// Warte 10 Sekunden
     aTV.Nanosec = 0;
 
     pOutSocket = new osl::ConnectorSocket();
     if ( pOutSocket->connect( aConnectAddr, &aTV ) == osl_Socket_Ok )
     {
-//      pOutSocket->setTcpNoDelay( 1 );
+//		pOutSocket->setTcpNoDelay( 1 );
     }
     else
     {
@@ -128,7 +128,7 @@ BOOL HttpRequest::Execute()
 
         SendString( pOutSocket, "Connection: Keep-Alive\n" );
     }
-
+        
     SendString( pOutSocket, "User-Agent: Mozilla/4.7 [de] (Linux; I)" );
     SendString( pOutSocket, "Host: " );
     SendString( pOutSocket, aRequestHost );
@@ -156,7 +156,7 @@ BOOL HttpRequest::Execute()
     pOutSocket->close();
 
     pStream->Seek( 0 );
-
+    
     ByteString aLine;
     BOOL bInsideHeader = TRUE;
     while ( bInsideHeader )
diff --git a/automation/source/testtool/httprequest.hxx b/automation/source/testtool/httprequest.hxx
index af8ad673a17d..02cc206dedcc 100644
--- a/automation/source/testtool/httprequest.hxx
+++ b/automation/source/testtool/httprequest.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index 8143700f7cd8..df6f22761355 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ static CommunicationFactory aComManFac;
 
 #define cMyDelim ' '
 #define P_FEHLERLISTE pFehlerListe
-#define KEEP_SEQUENCES      100         // Keep Names of last 100 Calls
+#define KEEP_SEQUENCES		100			// Keep Names of last 100 Calls
 
 
 ControlDefLoad __READONLY_DATA Controls::arClasses [] =
@@ -114,7 +114,7 @@ CNames *Controls::pClasses = NULL;
 ControlDefLoad __READONLY_DATA TestToolObj::arR_Cmds [] =
 #include "r_cmds.hxx"
 CNames *TestToolObj::pRCommands = NULL;
-CErrors *TestToolObj::pFehlerListe = NULL;      // Hier werden die Fehler des Testtools gespeichert
+CErrors *TestToolObj::pFehlerListe = NULL;		// Hier werden die Fehler des Testtools gespeichert
 
 
 DBG_NAME( ControlItem )
@@ -354,7 +354,7 @@ TestToolObj::TestToolObj( String aName, String aFilePath )              // Inter
     pImpl = new ImplTestToolObj;
     pImpl->ProgParam = String();
     pImpl->aFileBase = DirEntry(aFilePath);
-//  pImpl->aLogFileBase = DirEntry();
+//	pImpl->aLogFileBase = DirEntry();
     pImpl->aHIDDir = DirEntry(aFilePath);
     pImpl->bIsStart = FALSE;
     pImpl->pMyBasic = NULL;
@@ -395,17 +395,17 @@ TestToolObj::TestToolObj( String aName, MyBasic* pBas )                // Aufruf
     pCommunicationManager->SetDataReceivedHdl( LINK( this, TestToolObj, ReturnResultsLink ));
 }
 
-void TestToolObj::LoadIniFile()             // Laden der IniEinstellungen, die durch den ConfigDialog ge�ndert werden k�nnen
+void TestToolObj::LoadIniFile()				// Laden der IniEinstellungen, die durch den ConfigDialog ge�ndert werden k�nnen
 {
-#define GETSET(aVar, KeyName, Dafault)                          \
-    {                                                           \
-        ByteString __##aVar##__;                                \
-        __##aVar##__ = aConf.ReadKey(KeyName);      \
-        if ( !__##aVar##__.Len() )                  \
-        {                                                       \
-            __##aVar##__ = Dafault;                             \
-            aConf.WriteKey(KeyName, __##aVar##__);              \
-        }                                                       \
+#define GETSET(aVar, KeyName, Dafault)							\
+    {															\
+        ByteString __##aVar##__;								\
+        __##aVar##__ = aConf.ReadKey(KeyName);		\
+        if ( !__##aVar##__.Len() )					\
+        {														\
+            __##aVar##__ = Dafault;								\
+            aConf.WriteKey(KeyName, __##aVar##__);				\
+        }														\
         aVar = UniString( __##aVar##__, RTL_TEXTENCODING_UTF8 );\
     }
 
@@ -541,7 +541,7 @@ void TestToolObj::LoadIniFile()             // Laden der IniEinstellungen, die d
 
 void TestToolObj::InitTestToolObj()
 {
-    pImpl->nNumBorders = 0;                 // F�r Profiling mit k�stchen
+    pImpl->nNumBorders = 0;					// F�r Profiling mit k�stchen
 
     pImpl->nMinRemoteCommandDelay = 0;
     pImpl->nMaxRemoteCommandDelay = 0;
@@ -597,8 +597,8 @@ void TestToolObj::InitTestToolObj()
     MAKE_TT_KEYWORD( "Kontext", SbxCLASS_METHOD, SbxNULL, ID_Kontext );
     MAKE_TT_KEYWORD( "GetNextError", SbxCLASS_VARIABLE, SbxVARIANT, ID_GetError );
     MAKE_TT_KEYWORD( "Start", SbxCLASS_METHOD, SbxSTRING, ID_Start );
-//      pMeth = Make( "Kill", SbxCLASS_METHOD, SbxNULL );
-//      pMeth->SetUserData( ID_Kill );
+//		pMeth = Make( "Kill", SbxCLASS_METHOD, SbxNULL );
+//		pMeth->SetUserData( ID_Kill );
     /*      pMeth = Make( "TestReset", SbxCLASS_METHOD, SbxNULL );
         pMeth->SetUserData( ID_Reset );*/
     MAKE_TT_KEYWORD( "Use", SbxCLASS_METHOD, SbxNULL, ID_Use );
@@ -615,11 +615,11 @@ void TestToolObj::InitTestToolObj()
     MAKE_TT_KEYWORD( "MaybeAddErr", SbxCLASS_METHOD, SbxNULL, ID_MaybeAddErr );
     MAKE_TT_KEYWORD( "ClearError", SbxCLASS_METHOD, SbxNULL, ID_ClearError );
     MAKE_TT_KEYWORD( "SaveIDs", SbxCLASS_METHOD, SbxBOOL, ID_SaveIDs );
-    MAKE_TT_KEYWORD( "AutoExecute", SbxCLASS_PROPERTY, SbxBOOL, ID_AutoExecute );   // Achtung! PROPERTY Also eine Variable
+    MAKE_TT_KEYWORD( "AutoExecute", SbxCLASS_PROPERTY, SbxBOOL, ID_AutoExecute );	// Achtung! PROPERTY Also eine Variable
     MAKE_TT_KEYWORD( "Execute", SbxCLASS_METHOD, SbxNULL, ID_Execute );
     MAKE_TT_KEYWORD( "StopOnSyntaxError", SbxCLASS_PROPERTY, SbxBOOL, ID_StopOnSyntaxError );
 
-/*  Dialog Handler werden gebraucht, wenn im internen Testtool ein Dialog
+/*	Dialog Handler werden gebraucht, wenn im internen Testtool ein Dialog
     hochgerissen wird. Nach versenden der Remote-Kommandos wird IdleHandler aktiviert.
     Er testet, ob das Reschedule zum WaitForAnswer zur�ckkehrt. Bleibt das aus, so
     wird erst der RemoteHandler zur�ckgesetzt und dann die Handler-Sub im Basic
@@ -1007,7 +1007,7 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B
             if (aShortname.CompareIgnoreCaseToAscii("*Active") == COMPARE_EQUAL)
                 aUId = SmartId( UID_ACTIVE );
             else if ( !bUnoName && !bMozillaName )
-            {   // Bestimmen der ID aus der Hid.Lst
+            {	// Bestimmen der ID aus der Hid.Lst
                 ControlDef WhatName(aLongname,SmartId());
                 if (pUIds->Seek_Entry(&WhatName,&nElement))
                     aUId = pUIds->GetObject(nElement)->pData->aUId;
@@ -1253,7 +1253,7 @@ void TestToolObj::WaitForAnswer ()
 
         while ( !bReturnOK && Ende > Time() )
         {
-//          pTemp = PlugInApplication::GetPlugInApp()->GetReturnFromExecute();
+//			pTemp = PlugInApplication::GetPlugInApp()->GetReturnFromExecute();
             if ( pTemp )
             {
                 ReturnResults( pTemp );
@@ -1327,7 +1327,7 @@ void TestToolObj::SendViaSocket()
 
     if ( !pCommunicationManager->IsCommunicationRunning() )
     {
-        // first try to run basic sub "startTheOffice" see i86540
+        // first try to run basic sub "startTheOffice" see i86540 
         SbxVariable* pMeth = pImpl->pMyBasic->Find( CUniString( "startTheOffice" ), SbxCLASS_DONTCARE);
         if( !pImpl->bIsStart && pMeth && pMeth->ISA(SbxMethod) )
         {
@@ -1373,7 +1373,7 @@ void TestToolObj::EndBlock()
 {
     if (IsBlock)
     {
-        pImpl->LocalStarttime = Time::GetSystemTicks(); // Setzen der Anfangszeit f�r Performancemessung
+        pImpl->LocalStarttime = Time::GetSystemTicks();	// Setzen der Anfangszeit f�r Performancemessung
 
         In->GenCmdFlow (F_EndCommandBlock);
 
@@ -1398,7 +1398,7 @@ void TestToolObj::EndBlock()
             SendViaSocket();
         else
         {
-//          PlugInApplication::GetPlugInApp()->ExecuteRemoteStatements( In->GetStream() );
+//			PlugInApplication::GetPlugInApp()->ExecuteRemoteStatements( In->GetStream() );
             bReturnOK = FALSE;
             if ( aDialogHandlerName.Len() > 0 )
                 GetpApp()->InsertIdleHdl( LINK( this, TestToolObj, IdleHdl ), 1 );
@@ -1518,7 +1518,7 @@ BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pContr
             {
                 pNewDef->Sons(new CNames());
 
-                pNewDef2 = new ControlDef(aName,aUId);      // Noch einen machen
+                pNewDef2 = new ControlDef(aName,aUId);		// Noch einen machen
                 if (!pNewDef->SonInsert(pNewDef2))                              // Dialog in eigenen Namespace eintragen
                 {
                     delete pNewDef2;
@@ -1770,10 +1770,10 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
                         while ( pCommunicationManager->IsCommunicationRunning() )
                             Application::Reschedule();
 
-                        SingleCommandBlock = TRUE;      // Bug 57188
+                        SingleCommandBlock = TRUE;		// Bug 57188
                         IsBlock = FALSE;
 
-//                      pCommunicationManager->StartCommunication();
+//						pCommunicationManager->StartCommunication();
 
                         for (USHORT i=0;i<VAR_POOL_SIZE;i++)
                         {
@@ -2113,7 +2113,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
 //                                              Das ist total rotten und mu� wohl komplett neu!!
 
 
-/*                      BOOL bWasBlock = IsBlock;
+/*    					BOOL bWasBlock = IsBlock;
                         if ( !IsBlock )                 // Impliziter call bei Aufruf mit Methode
                             if ( SingleCommandBlock )
                                 BeginBlock();
@@ -2194,7 +2194,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
                         switch ( ((SbxTransportMethod*)pVar)->nValue )
                         {
                             case RC_WinTree:
-//                              ::svt::OStringTransfer::CopyString(pVar->GetString(), pSomeWindowIDontHave );
+//								::svt::OStringTransfer::CopyString(pVar->GetString(), pSomeWindowIDontHave );
                                 break;
                         }
 
@@ -2290,9 +2290,9 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
                         // Hier wird der Remote UNO Kram gestartet
                         // Eintrag in die Konfiguration unter
                         // org.openoffice.Office.Common/Start/Connection
-                        //  socket,host=0,port=12345;iiop;XBla
+                        //	socket,host=0,port=12345;iiop;XBla
                         // oder
-                        //  socket,host=0,port=12345;urp;;XBla
+                        //	socket,host=0,port=12345;urp;;XBla
 
                         String aString;
                         aString.AppendAscii( "socket,host=" );
@@ -2305,7 +2305,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
                         {
                             Reference< XMultiServiceFactory > xSMgr = comphelper::getProcessServiceFactory();
 // is allways there
-/*                          if ( ! xSMgr.is() )
+/*						    if ( ! xSMgr.is() )
                             {
                                 xSMgr = ::cppu::createRegistryServiceFactory(OUString(RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")), sal_True );
                                 if ( xSMgr.is() )
@@ -2323,12 +2323,12 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
                                 OUString(), OUString( RTL_CONSTASCII_USTRINGPARAM("urp") ),
                                 xConnection, Reference< XInstanceProvider >() ) );
 
-    //                      Reference< XInterface > xRet( xBridge->getInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ) );
+    //						Reference< XInterface > xRet( xBridge->getInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ) );
                             Reference< XInterface > xRet( xBridge->getInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("StarOffice.ServiceManager")) ) );
 
-    //                      Reference< XNamingService > xNamingService(xRet, UNO_QUERY);
+    //						Reference< XNamingService > xNamingService(xRet, UNO_QUERY);
 
-    //                      Reference< XInterface > smgr = xNamingService->getRegisteredObject( OUString( RTL_CONSTASCII_USTRINGPARAM("StarOffice.ServiceManager" ) ) );
+    //			            Reference< XInterface > smgr = xNamingService->getRegisteredObject( OUString( RTL_CONSTASCII_USTRINGPARAM("StarOffice.ServiceManager" ) ) );
 
                             smgr_xMultiserviceFactory = Reference< XMultiServiceFactory >(xRet, UNO_QUERY);
     //MBA fragen!!
@@ -2345,7 +2345,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
                         if( smgr_xMultiserviceFactory.is() )
                         {
                             Any aAny;
-//                          aAny <<= xBridge;
+//							aAny <<= xBridge;
                             aAny <<= smgr_xMultiserviceFactory;
 
                             SbxObjectRef xMySbxObj = GetSbUnoObject( CUniString("RemoteUnoAppFuerTesttool"), aAny );
@@ -2359,15 +2359,15 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
                         // Hier wird der Remote UNO Kram gestartet
 
                         String aString;
-//                      aString += GetHostConfig();
-//                      aString.AppendAscii( ":" );
-//                      aString += String::CreateFromInt32( GetUnoPortConfig() );
+//						aString += GetHostConfig();
+//						aString.AppendAscii( ":" );
+//						aString += String::CreateFromInt32( GetUnoPortConfig() );
 
                         Reference< XMultiServiceFactory > xSMgr /* = comphelper::getProcessServiceFactory()*/;
-//                      if ( ! xSMgr.is() )
+//						if ( ! xSMgr.is() )
                         {
                             xSMgr = ::cppu::createRegistryServiceFactory(OUString(RTL_CONSTASCII_USTRINGPARAM("g:\\iserverproxy.rdb")), sal_True);
-//                          comphelper::setProcessServiceFactory( xSMgr );
+//							comphelper::setProcessServiceFactory( xSMgr );
                         }
 
                         OUString aURL( aString );
@@ -2384,12 +2384,12 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
                         Reference< XInterface > xRet( xBridge->getInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("XIServerProxy")) ) );
 
 
-/*                      Reference< XIServerProxy > xIS( xRet, UNO_QUERY );
+/*    					Reference< XIServerProxy > xIS( xRet, UNO_QUERY );
                         if ( xIS.is() )
                         {
                             String aHost( xIS->getIServerHost() );
 
-//                          Reference < XInformationClient > xIC = xIS->createIServerClient( "XInformationClient" );
+//							Reference < XInformationClient > xIC = xIS->createIServerClient( "XInformationClient" );
                             Reference < XInformationClient > xIC = xIS->createInformationClient();
                             xIC->getTree(OUString::createFromAscii("r:\\b_server\\config\\stand.lst"), OUString() );
 
@@ -2419,7 +2419,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
                     {
                         switch (rPar->Get( 1 )->GetType())
                         {
-                            case SbxLONG:       // alles immer als Short �bertragen
+                            case SbxLONG:		// alles immer als Short �bertragen
                             case SbxULONG:
                             case SbxLONG64:
                             case SbxULONG64:
@@ -2768,7 +2768,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
             if ( pImpl->nErrorCount )
             {
                 ADD_WARNING_LOG( GEN_RES_STR1( S_ERRORS_DETECTED, String::CreateFromInt32( pImpl->nErrorCount ) ) );
-                pImpl->nWarningCount--;     // Anpassen, da diese Warnung nicht in die Statistik soll
+                pImpl->nWarningCount--;		// Anpassen, da diese Warnung nicht in die Statistik soll
             }
             else
                 ADD_MESSAGE_LOG( GEN_RES_STR0( S_NO_ERRORS_DETECTED ) );
@@ -2901,7 +2901,7 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType)
             delete pWhatName;
             pWhatName = new ControlDef( aStr.Copy( 0, aStr.Len()-3 ), SmartId() );
             if ( m_pSIds->Seek_Entry( pWhatName, &nElement ) )
-            {   // Nach slots suchen
+            {	// Nach slots suchen
                 SbxVariable *pReturn = new SbxVariable;
                 delete pWhatName;
                 pWhatName = ( (ControlDef*)m_pSIds->GetObject( nElement ) );
@@ -2961,13 +2961,13 @@ void TestToolObj::CalcPosition( String const &aSource, xub_StrLen nPos, xub_StrL
 }
 
 
-#define CATCH_LABEL         CUniString( "ctch" )
-#define CATCHRES_LABEL      CUniString( "ctchres" )
-#define ENDCATCH_LABEL      CUniString( "endctch" )
+#define CATCH_LABEL			CUniString( "ctch" )
+#define CATCHRES_LABEL		CUniString( "ctchres" )
+#define ENDCATCH_LABEL		CUniString( "endctch" )
 
 BOOL IsAlphaChar( sal_Unicode cChar )
 {
-    return  ( cChar >= 'a' && cChar <= 'z' ) ||
+    return	( cChar >= 'a' && cChar <= 'z' ) ||
             ( cChar >= 'A' && cChar <= 'Z' );
 }
 
@@ -3037,7 +3037,7 @@ xub_StrLen TestToolObj::PreCompilePart( String &aSource, xub_StrLen nStart, xub_
 
     xub_StrLen nTry2 = 0;
     while ( !WasPrecompilerError() && (nTry2 = ImplSearch( aSource, nStart, nEnd, CUniString("try"), nTry+1 )) != STRING_NOTFOUND )
-    {   // Wir rekursieren erstmal mit dem 2. Try
+    {	// Wir rekursieren erstmal mit dem 2. Try
         if ( nTry2 < nCatch )
             nEnd += PreCompilePart( aSource, nTry2, nEndcatch+8, aCatchLabel, nLabelCount ) - nEndcatch-8;
         else
@@ -3060,7 +3060,7 @@ xub_StrLen TestToolObj::PreCompilePart( String &aSource, xub_StrLen nStart, xub_
     }
 
     String aReplacement;
-    int nTotalLength = -3 -5 -8;    // try, catch und endcatch fallen raus
+    int nTotalLength = -3 -5 -8;	// try, catch und endcatch fallen raus
 
     aReplacement.AppendAscii( "on error goto " );
     aReplacement += aCatchLabel;
@@ -3068,14 +3068,14 @@ xub_StrLen TestToolObj::PreCompilePart( String &aSource, xub_StrLen nStart, xub_
     nTotalLength += aReplacement.Len();
 
 
-//          on error goto endcse
-//          goto endctchXX
-//          ctchXX:
-//          if err = 35 or err = 18 then : resume : endif :
-//          MaybeAddErr
-//          on error goto endcse
-//          resume ctchresXX
-//          ctchresXX:
+//			on error goto endcse
+//			goto endctchXX
+//			ctchXX:
+//			if err = 35 or err = 18 then : resume : endif :
+//			MaybeAddErr
+//			on error goto endcse
+//			resume ctchresXX
+//			ctchresXX:
     aReplacement.Erase();
     aReplacement.AppendAscii( "on error goto " );
     aReplacement += aFinalErrorLabel;
@@ -3316,7 +3316,7 @@ void TestToolObj::SortControlsByNumber( BOOL bIncludeActive )
                 m_pReverseControls->DeleteAndDestroy( nNr );
 // um VorlagenLaden/UntergeordneteIniDatei/SpeichernDlg/OrdnerDlg/OeffnenDlg/MessageBox/LetzteVersion/GrafikEinfuegenDlg/FarbeDlg/ExportierenDlg/DruckerEinrichten/DruckenDlg/DateiEinfuegenDlg/Active zu verhindern
             }
-/*          if ( m_pReverseControlsSon->Seek_Entry( pZeroItem, &nNr ) )
+/*    	    if ( m_pReverseControlsSon->Seek_Entry( pZeroItem, &nNr ) )
             {
                 m_pReverseControlsSon->DeleteAndDestroy( nNr );
 // um VorlagenLaden/UntergeordneteIniDatei/SpeichernDlg/OrdnerDlg/OeffnenDlg/MessageBox/LetzteVersion/GrafikEinfuegenDlg/FarbeDlg/ExportierenDlg/DruckerEinrichten/DruckenDlg/DateiEinfuegenDlg/Active zu verhindern
@@ -3413,9 +3413,9 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
                                 else
                                     pImpl->pNextReturn->PutULong( nLNr1 );
                             }
-                            if( nParams & PARAM_USHORT_1 )      pImpl->pNextReturn->PutUShort( nNr1 );
-                            if( nParams & PARAM_STR_1 )         pImpl->pNextReturn->PutString( aString1 );
-                            if( nParams & PARAM_BOOL_1 )        pImpl->pNextReturn->PutBool( bBool1 );
+                            if( nParams & PARAM_USHORT_1 )		pImpl->pNextReturn->PutUShort( nNr1 );
+                            if( nParams & PARAM_STR_1 )			pImpl->pNextReturn->PutString( aString1 );
+                            if( nParams & PARAM_BOOL_1 )		pImpl->pNextReturn->PutBool( bBool1 );
                             if( nParams & PARAM_SBXVALUE_1 )
                             {
                                 SbxValues aValues( SbxDATE );
@@ -3550,7 +3550,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
                         {
                             switch ( nUId )
                             {
-                                case S_ProfileReset:    // nLNr1 = Anzahl Borders
+                                case S_ProfileReset:	// nLNr1 = Anzahl Borders
                                 {
                                     pImpl->nNumBorders = (USHORT)nLNr1;     // Borders are 0 to 4
                                     USHORT i;
@@ -3565,15 +3565,15 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
                                     }
                                     break;
                                 }
-                                case S_ProfileBorder1:  // nLNr1 = Border1 in ms
-                                case S_ProfileBorder2:  // nLNr1 = Border2 in ms
-                                case S_ProfileBorder3:  // nLNr1 = Border3 in ms
-                                case S_ProfileBorder4:  // nLNr1 = Border4 in ms
+                                case S_ProfileBorder1:	// nLNr1 = Border1 in ms
+                                case S_ProfileBorder2:	// nLNr1 = Border2 in ms
+                                case S_ProfileBorder3:	// nLNr1 = Border3 in ms
+                                case S_ProfileBorder4:	// nLNr1 = Border4 in ms
                                 {
                                     pImpl->naValBorders[ nUId - S_ProfileBorder1 ] = nLNr1;
                                     break;
                                 }
-                                case S_ProfileTime:     // nLNr1 = remote Zeit des Befehls
+                                case S_ProfileTime:		// nLNr1 = remote Zeit des Befehls
                                 {
                                     USHORT i;
                                     for ( i=0 ; i<pImpl->nNumBorders &&
@@ -3601,9 +3601,9 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
 
                                     break;
                                 }
-                                case S_ProfileDump:     // Gibt die daten aus.
+                                case S_ProfileDump:		// Gibt die daten aus.
                                 {
-                                    if ( pImpl->nNumBorders == 0 )  // Also keine alte R�ckmeldung vom Office
+                                    if ( pImpl->nNumBorders == 0 )	// Also keine alte R�ckmeldung vom Office
                                         break;
                                     DirEntry FilePath = pImpl->aLogFileBase + DirEntry(DirEntry(aLogFileName).GetBase().AppendAscii(".prf"));
                                     SvFileStream aStrm( FilePath.GetFull(), STREAM_STD_WRITE );
@@ -3671,8 +3671,8 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
                         case S_AssertError:
                             {
                                 ADD_ASSERTION_LOG( aString1 );
-//                              ADD_ERROR_LOG( aString1, aRun.GetModuleName(SbxNAME_SHORT_TYPES),
-//                                  aRun.GetLine(), aRun.GetCol1(), aRun.GetCol2() );
+//								ADD_ERROR_LOG( aString1, aRun.GetModuleName(SbxNAME_SHORT_TYPES),
+//									aRun.GetLine(), aRun.GetCol1(), aRun.GetCol2() );
                             }
                             break;
                         case S_QAError:
@@ -4121,11 +4121,11 @@ static ControlDefLoad __READONLY_DATA arRes_Type [] =
 
 SbTextType TestToolObj::GetSymbolType( const String &rSymbol, BOOL bWasControl )
 {
-    if (    rSymbol.CompareToAscii( "try" ) == COMPARE_EQUAL
-        ||  rSymbol.CompareToAscii( "catch" ) == COMPARE_EQUAL
-        ||  rSymbol.CompareToAscii( "endcatch" ) == COMPARE_EQUAL
-        ||  rSymbol.CompareToAscii( "testcase" ) == COMPARE_EQUAL
-        ||  rSymbol.CompareToAscii( "endcase" ) == COMPARE_EQUAL )
+    if (	rSymbol.CompareToAscii( "try" ) == COMPARE_EQUAL
+        ||	rSymbol.CompareToAscii( "catch" ) == COMPARE_EQUAL
+        ||	rSymbol.CompareToAscii( "endcatch" ) == COMPARE_EQUAL
+        ||	rSymbol.CompareToAscii( "testcase" ) == COMPARE_EQUAL
+        ||	rSymbol.CompareToAscii( "endcase" ) == COMPARE_EQUAL )
     {
         return TT_KEYWORD;
     }
@@ -4175,7 +4175,7 @@ SbTextType TestToolObj::GetSymbolType( const String &rSymbol, BOOL bWasControl )
         return TT_LOCALCMD;
     }
 
-    return SB_SYMBOL;   // Alles was hier landet ist vom Typ SB_SYMBOL und bleibt es auch
+    return SB_SYMBOL;	// Alles was hier landet ist vom Typ SB_SYMBOL und bleibt es auch
 }
 
 
@@ -4247,9 +4247,9 @@ SbxVariable* Controls::Find( const String& aStr, SbxClassType aType)
 
 String TTFormat::ms2s( ULONG nMilliSeconds )
 {
-    if ( nMilliSeconds < 100000 )       // 100 Sekunden
+    if ( nMilliSeconds < 100000 )		// 100 Sekunden
         return String::CreateFromInt64( nMilliSeconds );
-    if ( nMilliSeconds < 100000*60 )    // 100 Minuten
+    if ( nMilliSeconds < 100000*60 )	// 100 Minuten
         return String::CreateFromInt32( nMilliSeconds / 1000 ).AppendAscii("Sec");
     return String::CreateFromInt32( nMilliSeconds / 1000 / 60 ).AppendAscii("Min");
 }
diff --git a/automation/source/testtool/objtest.hxx b/automation/source/testtool/objtest.hxx
index f60732b5d3fa..b2478d3a85e7 100644
--- a/automation/source/testtool/objtest.hxx
+++ b/automation/source/testtool/objtest.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,39 +41,39 @@
 
 #include <map>
 
-//  #define ID_BeginBlock   1
-//  #define ID_EndBlock     2
-#define ID_Kontext      3
-#define ID_GetError     4
-#define ID_ErrorDummy   5            // Intern zum Behandlen von Fehlenden Controls und Methoden
-#define ID_RecordError  6
-#define ID_Start        7
-//#define ID_Kill           8
-//#define ID_Reset      9
-//  #define ID_AppAbort     10
-#define ID_Dispatch     11
-#define ID_UNODispatch  12
-#define ID_Control      13
-#define ID_StartUse     14
-#define ID_Use          15
-#define ID_FinishUse    16
-#define ID_CaseLog      17
-#define ID_ExceptLog    18
-#define ID_PrintLog     19
-#define ID_WarnLog      20
-#define ID_ErrorLog     21
+//	#define ID_BeginBlock	1
+//	#define ID_EndBlock		2
+#define ID_Kontext		3
+#define ID_GetError		4
+#define ID_ErrorDummy	5            // Intern zum Behandlen von Fehlenden Controls	und Methoden
+#define ID_RecordError	6
+#define ID_Start		7
+//#define ID_Kill			8
+//#define ID_Reset		9
+//	#define ID_AppAbort		10
+#define ID_Dispatch		11
+#define ID_UNODispatch	12
+#define ID_Control		13
+#define ID_StartUse		14
+#define ID_Use			15
+#define ID_FinishUse	16
+#define ID_CaseLog		17
+#define ID_ExceptLog	18
+#define ID_PrintLog		19
+#define ID_WarnLog		20
+#define ID_ErrorLog		21
 #define ID_EnableQaErrors 22
-#define ID_QAErrorLog   23
-#define ID_MaybeAddErr  24
-#define ID_ClearError   25
-#define ID_GetNextCloseWindow   26
+#define ID_QAErrorLog	23
+#define ID_MaybeAddErr	24
+#define ID_ClearError	25
+#define ID_GetNextCloseWindow	26
 #define ID_RemoteCommand 27
-#define ID_SaveIDs      28
-#define ID_AutoExecute  29
-#define ID_Execute      30
+#define ID_SaveIDs		28
+#define ID_AutoExecute	29
+#define ID_Execute		30
 #define ID_DialogHandler 31
-#define ID_GetUnoApp    32
-#define ID_GetIServer   33
+#define ID_GetUnoApp	32
+#define ID_GetIServer	33
 #define ID_RemoteCommandDelay 34
 #define ID_GetApplicationPath 35
 #define ID_GetCommonApplicationPath 36
@@ -121,7 +121,7 @@ public:
 
     ControlItem( const char *Name, SmartId aUIdP );
     ControlItem( const String &Name, SmartId aUIdP );
-//  ControlItem( const String &Name, const String &URL, const URLType aType );
+//	ControlItem( const String &Name, const String &URL, const URLType aType );
 //    ControlItem( const String &Name, const String &URL, const ULONG nUId );
 //    ControlItem( const char *Name, const String &URL, const ULONG nUId );
     ControlItem( ControlData *pDataP );
@@ -131,7 +131,7 @@ DBG_DTOR(ControlItem,0);
     }
     virtual BOOL operator < (const ControlItem &rPar)=0;
     virtual BOOL operator == (const ControlItem &rPar)=0;
-//  void Write( SvStream &aStream );
+//	void Write( SvStream &aStream );
 };
 
 SV_DECL_PTRARR_SORT_DEL(CNames, ControlItem*, 50, 10)
@@ -144,12 +144,12 @@ SV_DECL_PTRARR_SORT_DEL(CNames, ControlItem*, 50, 10)
 class ControlSon
 {
 protected:
-    CNames *pSons;      // um sicherzustelle, daß nur Söhne des richtien Type reinkommen
+    CNames *pSons;		// um sicherzustelle, daß nur Söhne des richtien Type reinkommen
 
 public:
     ControlSon() : pSons( NULL ) {};
     ~ControlSon();
-//  void Write( SvStream &aStream );
+//	void Write( SvStream &aStream );
 
     USHORT Son_Count() { return pSons->Count(); }
     void Sons( CNames *pNewSons ) { pSons = pNewSons; }
@@ -162,10 +162,10 @@ public:
     ControlItemSon(const char *Name, SmartId aUIdP )
         : ControlItem( Name, aUIdP ) {}
     ControlItemSon(const String &Name, SmartId aUIdP );
-//  ControlItemSon(const String &Name, const String &URL, const URLType aType );
+//	ControlItemSon(const String &Name, const String &URL, const URLType aType );
 //    ControlItemSon(const String &Name, const String &URL, const ULONG nUId );
 //    ControlItemSon(const char *Name, const String &URL, const ULONG nUId );
-//  void Write( SvStream &aStream );
+//	void Write( SvStream &aStream );
 };
 
 class ControlDef : public ControlItemSon
@@ -174,7 +174,7 @@ public:
     ControlDef(const char *Name, SmartId aUIdP )
         : ControlItemSon( Name, aUIdP ) {DBG_CTOR(ControlDef,0);}
     ControlDef(const String &Name, SmartId aUIdP );
-//  ControlDef(const String &Name, const String &URL, const URLType aType );
+//	ControlDef(const String &Name, const String &URL, const URLType aType );
     ControlDef(const String &aOldName, const String &aNewName, ControlDef *pOriginal, BOOL bWithSons = FALSE );
     ~ControlDef() {DBG_DTOR(ControlDef,0);}
     virtual BOOL operator < (const ControlItem &rPar);
@@ -234,7 +234,7 @@ public:
 
     void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& );
     virtual SbxVariable* Find( const String&, SbxClassType );
-    SbxTransportMethodRef pMethodVar;     // zum Transport von Find nach Notify
+    SbxTransportMethodRef pMethodVar;	  // zum Transport von Find nach Notify
     static CNames  *pClasses;
     static ControlDefLoad __READONLY_DATA arClasses [];
 };
@@ -245,18 +245,18 @@ typedef std::map< String, String > Environment;
 class ImplTestToolObj
 {
 public:
-//  ImplTestToolObj()
-//  ~ImplTestToolObj()
+//	ImplTestToolObj()
+//	~ImplTestToolObj()
 
-    String ProgParam;           // Parameter der zu Testenden APP; Gesetzt über Start
+    String ProgParam;			// Parameter der zu Testenden APP; Gesetzt über Start
 
-    DirEntry aFileBase;         // Grundpfad für die *.sid und *.win Dateien (Aus Configdatei)
-    DirEntry aLogFileBase;      // Grundpfad für die *.res Dateien (Aus Configdatei)
-    DirEntry aHIDDir;           // Verzeichnis, in dem die hid.lst gesucht wird
+    DirEntry aFileBase;			// Grundpfad für die *.sid und *.win Dateien (Aus Configdatei)
+    DirEntry aLogFileBase;		// Grundpfad für die *.res Dateien (Aus Configdatei)
+    DirEntry aHIDDir;			// Verzeichnis, in dem die hid.lst gesucht wird
 
-    SbxTransportMethodRef pNextReturn;  // Verweis auf die Var, die den Returnwert aufnimmt.
+    SbxTransportMethodRef pNextReturn;	// Verweis auf die Var, die den Returnwert aufnimmt.
 
-    ControlsRef pControlsObj;           // Jeweiliges Objekt, an dem Methoden aufgerufen weden.
+    ControlsRef pControlsObj;			// Jeweiliges Objekt, an dem Methoden aufgerufen weden.
 
 #define VAR_POOL_SIZE 8
     SbxTransportMethodRef pMyVars[VAR_POOL_SIZE];  // Falls in Ausdrücken mehrere verwendet werden
@@ -276,7 +276,7 @@ public:
     ULONG nMaxRemoteCommandDelay;
     BOOL bDoRemoteCommandDelay;
 
-    BOOL bLnaguageExtensionLoaded;      // Wurde über 'use' was geladen? Für syntax highlighting
+    BOOL bLnaguageExtensionLoaded;		// Wurde über 'use' was geladen? Für syntax highlighting
     SfxBroadcaster *pTTSfxBroadcaster;
 
     ULONG nErrorCount;
@@ -316,89 +316,89 @@ public:
 
 
 #define ADD_TO_LOG( aLogTypep, aMsgp, aFilenamep, nLinep, nCol1p, nCol2p, aRevisionp, pLogList )\
-{                                                                       \
-    TTLogMsg *pLogMsg = new TTLogMsg();                                 \
-    pLogMsg->aDebugData.aMsg = aMsgp;                                   \
-    pLogMsg->aLogFileName = (pImpl->aLogFileBase + DirEntry(aLogFileName)).GetFull();   \
-    pLogMsg->aDebugData.aFilename = aFilenamep;                         \
-    pLogMsg->aDebugData.nLine = nLinep;                                 \
-    pLogMsg->aDebugData.nCol1 = nCol1p;                                 \
-    pLogMsg->aDebugData.nCol2 = nCol2p;                                 \
-    pLogMsg->aDebugData.aLogType = aLogTypep;                           \
-    aLogHdl.Call( pLogMsg );                                            \
+{																		\
+    TTLogMsg *pLogMsg = new TTLogMsg();									\
+    pLogMsg->aDebugData.aMsg = aMsgp;									\
+    pLogMsg->aLogFileName = (pImpl->aLogFileBase + DirEntry(aLogFileName)).GetFull();	\
+    pLogMsg->aDebugData.aFilename = aFilenamep;							\
+    pLogMsg->aDebugData.nLine = nLinep;									\
+    pLogMsg->aDebugData.nCol1 = nCol1p;									\
+    pLogMsg->aDebugData.nCol2 = nCol2p;									\
+    pLogMsg->aDebugData.aLogType = aLogTypep;							\
+    aLogHdl.Call( pLogMsg );											\
     void* pDummyForWarningAboutNULL = pLogList;                         \
-    if( pDummyForWarningAboutNULL )                                                     \
-    {                                                                   \
-        SbxDimArray* pLogArray = (SbxDimArray*)pLogList;                \
-        SbxVariable* pLogLine = new SbxVariable( SbxSTRING );               \
-        String aCollect;                                                \
-        aCollect.Append( pLogMsg->aDebugData.aFilename );               \
-        aCollect.AppendAscii( ";" );                                    \
-        aCollect.Append( String::CreateFromInt32( nLinep ) );           \
-        aCollect.AppendAscii( ";" );                                    \
-        aCollect.Append( aRevisionp );              \
-        aCollect.AppendAscii( ";" );                                    \
-        aCollect.Append( pLogMsg->aDebugData.aMsg );                                        \
-        pLogLine->PutString( aCollect );                                    \
-        pLogArray->Insert( pLogLine, pLogArray->Count() );  \
-    }                                                                   \
-    delete pLogMsg;                                                     \
-}                                                                       \
-
-
-#define ADD_RUN_LOG()                                                   \
-    ADD_TO_LOG(LOG_RUN, String(), String(), 0, 0, 0, String(), NULL)                    \
-
-#define ADD_ERROR_LOG(aMsg, aFilename, nLine, nCol1, nCol2, aRevision)              \
-{                                                                       \
+    if( pDummyForWarningAboutNULL )														\
+    {																	\
+        SbxDimArray* pLogArray = (SbxDimArray*)pLogList;				\
+        SbxVariable* pLogLine = new SbxVariable( SbxSTRING );				\
+        String aCollect;												\
+        aCollect.Append( pLogMsg->aDebugData.aFilename );				\
+        aCollect.AppendAscii( ";" );									\
+        aCollect.Append( String::CreateFromInt32( nLinep ) );			\
+        aCollect.AppendAscii( ";" );									\
+        aCollect.Append( aRevisionp );				\
+        aCollect.AppendAscii( ";" );									\
+        aCollect.Append( pLogMsg->aDebugData.aMsg );										\
+        pLogLine->PutString( aCollect );									\
+        pLogArray->Insert( pLogLine, pLogArray->Count() );	\
+    }																	\
+    delete pLogMsg;														\
+}																		\
+
+
+#define ADD_RUN_LOG()													\
+    ADD_TO_LOG(LOG_RUN, String(), String(), 0, 0, 0, String(), NULL)					\
+
+#define ADD_ERROR_LOG(aMsg, aFilename, nLine, nCol1, nCol2, aRevision)				\
+{																		\
     ADD_TO_LOG(LOG_ERROR, aMsg, aFilename, nLine, nCol1, nCol2, aRevision, &pImpl->xErrorList) \
-    pImpl->nErrorCount++;                                               \
+    pImpl->nErrorCount++;												\
 }
 
-#define ADD_CALL_STACK_LOG(aMsg, aFilename, nLine, nCol1, nCol2)        \
-    ADD_TO_LOG(LOG_CALL_STACK, aMsg, aFilename, nLine, nCol1, nCol2, String(), NULL)    \
-
-
-#define ADD_AUTO_LOG(aLogType, aMsg, pLogList)                          \
-{                                                                       \
-    if ( BasicRuntimeAccess::HasRuntime() )                             \
-    {                                                                   \
-        BasicRuntime aRun = BasicRuntimeAccess::GetRuntime();           \
-        ADD_TO_LOG(aLogType, aMsg, aRun.GetModuleName(SbxNAME_SHORT_TYPES), \
-            aRun.GetLine(), aRun.GetCol1(), aRun.GetCol2(), aRun.GetSourceRevision(), pLogList) \
-    }                                                                   \
-    else                                                                \
-    {                                                                   \
-        ADD_TO_LOG(aLogType, aMsg, UniString(), 0, 0, STRING_LEN, String(), pLogList)   \
-    }                                                                   \
-}                                                                       \
-
-#define ADD_CASE_LOG(aMsg)                                              \
-    ADD_AUTO_LOG(LOG_TEST_CASE, aMsg, NULL)                             \
-
-#define ADD_MESSAGE_LOG(aMsg)                                           \
-    ADD_AUTO_LOG(LOG_MESSAGE, aMsg, NULL)                               \
-
-#define ADD_WARNING_LOG(aMsg)                                           \
-{                                                                       \
-    ADD_AUTO_LOG(LOG_WARNING, aMsg, &pImpl->xWarningList)               \
-    pImpl->nWarningCount++;                                             \
+#define ADD_CALL_STACK_LOG(aMsg, aFilename, nLine, nCol1, nCol2)		\
+    ADD_TO_LOG(LOG_CALL_STACK, aMsg, aFilename, nLine, nCol1, nCol2, String(), NULL)	\
+
+
+#define ADD_AUTO_LOG(aLogType, aMsg, pLogList)							\
+{																		\
+    if ( BasicRuntimeAccess::HasRuntime() )								\
+    {																	\
+        BasicRuntime aRun = BasicRuntimeAccess::GetRuntime();			\
+        ADD_TO_LOG(aLogType, aMsg, aRun.GetModuleName(SbxNAME_SHORT_TYPES),	\
+            aRun.GetLine(), aRun.GetCol1(), aRun.GetCol2(), aRun.GetSourceRevision(), pLogList)	\
+    }																	\
+    else																\
+    {																	\
+        ADD_TO_LOG(aLogType, aMsg, UniString(), 0, 0, STRING_LEN, String(), pLogList)	\
+    }																	\
+}																		\
+
+#define ADD_CASE_LOG(aMsg)												\
+    ADD_AUTO_LOG(LOG_TEST_CASE, aMsg, NULL)								\
+
+#define ADD_MESSAGE_LOG(aMsg)											\
+    ADD_AUTO_LOG(LOG_MESSAGE, aMsg, NULL)								\
+
+#define ADD_WARNING_LOG(aMsg)											\
+{																		\
+    ADD_AUTO_LOG(LOG_WARNING, aMsg, &pImpl->xWarningList)				\
+    pImpl->nWarningCount++;												\
 }
 
-#define ADD_WARNING_LOG2(aMsg, aFilename, nLine )                       \
-{                                                                       \
+#define ADD_WARNING_LOG2(aMsg, aFilename, nLine )						\
+{																		\
     ADD_TO_LOG(LOG_WARNING, aMsg, aFilename, nLine, 0, STRING_LEN, String(), &pImpl->xWarningList) \
-    pImpl->nWarningCount++;                                             \
+    pImpl->nWarningCount++;												\
 }
 
-#define ADD_ASSERTION_LOG(aMsg)                                         \
-    ADD_AUTO_LOG(LOG_ASSERTION, aMsg, NULL)                             \
+#define ADD_ASSERTION_LOG(aMsg)											\
+    ADD_AUTO_LOG(LOG_ASSERTION, aMsg, NULL)								\
 
-#define ADD_QA_ERROR_LOG(aMsg)                                          \
+#define ADD_QA_ERROR_LOG(aMsg)											\
     if ( pImpl->bEnableQaErrors )                                       \
     {                                                                   \
-        ADD_AUTO_LOG(LOG_QA_ERROR, aMsg, &pImpl->xQAErrorList)          \
-        pImpl->nQAErrorCount++;                                         \
+        ADD_AUTO_LOG(LOG_QA_ERROR, aMsg, &pImpl->xQAErrorList)			\
+        pImpl->nQAErrorCount++;											\
     }
 
 #endif
diff --git a/automation/source/testtool/registry_win.cxx b/automation/source/testtool/registry_win.cxx
index 264a68aae257..0e7779086b2a 100644
--- a/automation/source/testtool/registry_win.cxx
+++ b/automation/source/testtool/registry_win.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 ////////////////////////////////////////////////////////////////////////////
 ////
-////                  Windows ONLY
+////                  Windows ONLY 
 ////
 ////////////////////////////////////////////////////////////////////////////
 
@@ -70,7 +70,7 @@ String ReadRegistry( String aKey, String aValueName )
                 &hRegKey ) == ERROR_SUCCESS )
     {
         LONG lRet;
-        sal_Unicode PathW[_MAX_PATH];
+        sal_Unicode	PathW[_MAX_PATH];
         DWORD lSize = sizeof(PathW) / sizeof( sal_Unicode );
         DWORD Type = REG_SZ;
 
diff --git a/automation/source/testtool/registry_win.hxx b/automation/source/testtool/registry_win.hxx
index 4a9492d80d2b..9174e0682aa9 100644
--- a/automation/source/testtool/registry_win.hxx
+++ b/automation/source/testtool/registry_win.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/automation/source/testtool/sysdir_win.cxx b/automation/source/testtool/sysdir_win.cxx
index 44cb8bef2fe1..560a367ee82c 100644
--- a/automation/source/testtool/sysdir_win.cxx
+++ b/automation/source/testtool/sysdir_win.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 ////////////////////////////////////////////////////////////////////////////
 ////
-////                  Windows ONLY
+////                  Windows ONLY 
 ////
 ////////////////////////////////////////////////////////////////////////////
 
@@ -61,7 +61,7 @@
 
 void _SHFree( void *pv )
 {
-    IMalloc *pMalloc;
+    IMalloc	*pMalloc;
     if( NOERROR == SHGetMalloc(&pMalloc) )
     {
         pMalloc->Free( pv );
@@ -75,9 +75,9 @@ void _SHFree( void *pv )
 UniString _SHGetSpecialFolder( int nFolderID )
 {
 
-    LPITEMIDLIST    pidl;
-    HRESULT         hHdl = SHGetSpecialFolderLocation( NULL, nFolderID, &pidl );
-    UniString       aFolder;
+    LPITEMIDLIST	pidl;
+    HRESULT			hHdl = SHGetSpecialFolderLocation( NULL, nFolderID, &pidl );
+    UniString		aFolder;
 
     if( hHdl == NOERROR )
     {
diff --git a/automation/source/testtool/sysdir_win.hxx b/automation/source/testtool/sysdir_win.hxx
index c27e3e434e75..ceab5d359eff 100644
--- a/automation/source/testtool/sysdir_win.hxx
+++ b/automation/source/testtool/sysdir_win.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/automation/source/testtool/tcommuni.cxx b/automation/source/testtool/tcommuni.cxx
index bc0e94f76728..478a4a0b2081 100644
--- a/automation/source/testtool/tcommuni.cxx
+++ b/automation/source/testtool/tcommuni.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ BOOL CommunicationManagerClientViaSocketTT::RetryConnect()
 
             if ( bSucc )
             {
-                aFirstRetryCall = Time() + Time( 0, 1 );    // Max eine Minute Zeit
+                aFirstRetryCall = Time() + Time( 0, 1 );	// Max eine Minute Zeit
                 for ( int i = 10 ; i-- ; )
                     GetpApp()->Reschedule();
             }
@@ -159,7 +159,7 @@ ULONG GetTTPortConfig()
 #endif
           )
         {
-            aPortToTalk = Application::GetCommandLineParam( i ).Copy(6);
+            aPortToTalk = Application::GetCommandLineParam( i ).Copy(6);                
             return (ULONG)aPortToTalk.ToInt64();
         }
     }
diff --git a/automation/source/testtool/tcommuni.hxx b/automation/source/testtool/tcommuni.hxx
index e92a93eb36a5..8c1d1115cfc7 100644
--- a/automation/source/testtool/tcommuni.hxx
+++ b/automation/source/testtool/tcommuni.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index 8bf7d3316cd0..4ba5df021515 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,154 +39,154 @@
 // Resource-ID's...
 #ifndef _SVX_NOIDERESIDS
 
-#define RID_BASICIDE_OBJECTBAR          ( RID_BASICIDE_START +  0 )
-#define RID_BASICMENU                   ( RID_BASICIDE_START +  1 )
+#define RID_BASICIDE_OBJECTBAR			( RID_BASICIDE_START +  0 )
+#define RID_BASICMENU					( RID_BASICIDE_START +  1 )
 #define RID_BASICPLUGINMENU             ( RID_BASICIDE_START +  2 )
-#define RID_EDT_WATCHEDIT               ( RID_BASICIDE_START +  4 )
-#define RID_ICO_MDIWINDOW               ( RID_BASICIDE_START +  5 )
-#define RID_POPUP_BRKDLG                ( RID_BASICIDE_START + 10 )
-#define RID_POPUP_BRKPROPS              ( RID_BASICIDE_START + 11 )
-#define RID_POPUP_TABBAR                ( RID_BASICIDE_START + 12 )
-#define RID_TD_ORGANIZE                 ( RID_BASICIDE_START + 36 )
-#define RID_TP_MODULS                   ( RID_BASICIDE_START + 37 )
-#define RID_TP_LIBS                     ( RID_BASICIDE_START + 38 )
-#define RID_TP_DLGS                     ( RID_BASICIDE_START + 39 )
-#define RID_DLG_LIBS                    ( RID_BASICIDE_START + 40 )
-#define RID_DLG_NEWLIB                  ( RID_BASICIDE_START + 42 )
-#define RID_DLG_EXPORT                  ( RID_BASICIDE_START + 43 )
-#define RID_POPUP_DLGED                 ( RID_BASICIDE_START + 62 )
+#define RID_EDT_WATCHEDIT				( RID_BASICIDE_START +  4 )
+#define RID_ICO_MDIWINDOW				( RID_BASICIDE_START +  5 )
+#define RID_POPUP_BRKDLG				( RID_BASICIDE_START + 10 )
+#define RID_POPUP_BRKPROPS				( RID_BASICIDE_START + 11 )
+#define RID_POPUP_TABBAR				( RID_BASICIDE_START + 12 )
+#define RID_TD_ORGANIZE					( RID_BASICIDE_START + 36 )
+#define RID_TP_MODULS					( RID_BASICIDE_START + 37 )
+#define RID_TP_LIBS						( RID_BASICIDE_START + 38 )
+#define RID_TP_DLGS						( RID_BASICIDE_START + 39 )
+#define RID_DLG_LIBS					( RID_BASICIDE_START + 40 )
+#define RID_DLG_NEWLIB					( RID_BASICIDE_START + 42 )
+#define RID_DLG_EXPORT					( RID_BASICIDE_START + 43 )
+#define RID_POPUP_DLGED					( RID_BASICIDE_START + 62 )
 #define RID_PRINTDLG_STRLIST            ( RID_BASICIDE_START + 78 )
 
-#define RID_IMG_LOCKED_HC               ( RID_BASICIDE_START +  6 )
+#define RID_IMG_LOCKED_HC				( RID_BASICIDE_START +  6 )
 #define RID_IMGBTN_REMOVEWATCH          ( RID_BASICIDE_START +  8 )
-#define RID_IMGBTN_GOTOCALL             ( RID_BASICIDE_START +  9 )
-#define RID_IMGLST_LAYOUT_HC            ( RID_BASICIDE_START + 14 )
-#define RID_IMG_REMOVEWATCH_HC          ( RID_BASICIDE_START + 15 )
-#define RID_IMG_INSTALLATION            ( RID_BASICIDE_START + 20 )
-#define RID_IMG_INSTALLATION_HC         ( RID_BASICIDE_START + 21 )
-#define RID_IMG_DOCUMENT                ( RID_BASICIDE_START + 22 )
-#define RID_IMG_DOCUMENT_HC             ( RID_BASICIDE_START + 23 )
-#define RID_IMG_MODLIB                  ( RID_BASICIDE_START + 24 )
-#define RID_IMG_MODLIB_HC               ( RID_BASICIDE_START + 25 )
-#define RID_IMG_MODLIBNOTLOADED         ( RID_BASICIDE_START + 26 )
-#define RID_IMG_MODLIBNOTLOADED_HC      ( RID_BASICIDE_START + 27 )
-#define RID_IMG_MODULE                  ( RID_BASICIDE_START + 28 )
-#define RID_IMG_MODULE_HC               ( RID_BASICIDE_START + 29 )
-#define RID_IMG_MACRO                   ( RID_BASICIDE_START + 30 )
-#define RID_IMG_MACRO_HC                ( RID_BASICIDE_START + 31 )
-#define RID_IMG_DLGLIB                  ( RID_BASICIDE_START + 32 )
-#define RID_IMG_DLGLIB_HC               ( RID_BASICIDE_START + 33 )
-#define RID_IMG_DLGLIBNOTLOADED         ( RID_BASICIDE_START + 34 )
-#define RID_IMG_DLGLIBNOTLOADED_HC      ( RID_BASICIDE_START + 35 )
-#define RID_IMG_DIALOG                  ( RID_BASICIDE_START + 36 )
-#define RID_IMG_DIALOG_HC               ( RID_BASICIDE_START + 37 )
-#define RID_IMG_LOCKED                  ( RID_BASICIDE_START + 41 )
-#define RID_IMGLST_LAYOUT               ( RID_BASICIDE_START + 49 )
+#define RID_IMGBTN_GOTOCALL				( RID_BASICIDE_START +  9 )
+#define RID_IMGLST_LAYOUT_HC			( RID_BASICIDE_START + 14 )
+#define RID_IMG_REMOVEWATCH_HC			( RID_BASICIDE_START + 15 )
+#define RID_IMG_INSTALLATION			( RID_BASICIDE_START + 20 )
+#define RID_IMG_INSTALLATION_HC			( RID_BASICIDE_START + 21 )
+#define RID_IMG_DOCUMENT				( RID_BASICIDE_START + 22 )
+#define RID_IMG_DOCUMENT_HC				( RID_BASICIDE_START + 23 )
+#define RID_IMG_MODLIB					( RID_BASICIDE_START + 24 )
+#define RID_IMG_MODLIB_HC				( RID_BASICIDE_START + 25 )
+#define RID_IMG_MODLIBNOTLOADED			( RID_BASICIDE_START + 26 )
+#define RID_IMG_MODLIBNOTLOADED_HC		( RID_BASICIDE_START + 27 )
+#define RID_IMG_MODULE					( RID_BASICIDE_START + 28 )
+#define RID_IMG_MODULE_HC				( RID_BASICIDE_START + 29 )
+#define RID_IMG_MACRO					( RID_BASICIDE_START + 30 )
+#define RID_IMG_MACRO_HC				( RID_BASICIDE_START + 31 )
+#define RID_IMG_DLGLIB					( RID_BASICIDE_START + 32 )
+#define RID_IMG_DLGLIB_HC				( RID_BASICIDE_START + 33 )
+#define RID_IMG_DLGLIBNOTLOADED			( RID_BASICIDE_START + 34 )
+#define RID_IMG_DLGLIBNOTLOADED_HC		( RID_BASICIDE_START + 35 )
+#define RID_IMG_DIALOG					( RID_BASICIDE_START + 36 )
+#define RID_IMG_DIALOG_HC				( RID_BASICIDE_START + 37 )
+#define RID_IMG_LOCKED					( RID_BASICIDE_START + 41 )
+#define RID_IMGLST_LAYOUT				( RID_BASICIDE_START + 49 )
 
-#define RID_STR_SEARCHALLMODULES        ( RID_BASICIDE_START +  1 )
-#define RID_STR_SEARCHFROMSTART         ( RID_BASICIDE_START +  2 )
-#define RID_STR_NOMODULE                ( RID_BASICIDE_START +  3 )
-#define RID_STR_FILTER_ALLFILES         ( RID_BASICIDE_START +  4 )
+#define RID_STR_SEARCHALLMODULES		( RID_BASICIDE_START +  1 )
+#define RID_STR_SEARCHFROMSTART			( RID_BASICIDE_START +  2 )
+#define RID_STR_NOMODULE				( RID_BASICIDE_START +  3 )
+#define RID_STR_FILTER_ALLFILES			( RID_BASICIDE_START +  4 )
 // free
-#define RID_STR_CANNOTCLOSE             ( RID_BASICIDE_START + 13 )
-#define RID_STR_IDENAME                 ( RID_BASICIDE_START + 14 )
-#define RID_STR_INITIDE                 ( RID_BASICIDE_START + 15 )
-#define RID_STR_STACKNAME               ( RID_BASICIDE_START + 16 )
-#define RID_STR_WATCHNAME               ( RID_BASICIDE_START + 17 )
-#define RID_STR_REMOVEWATCH             ( RID_BASICIDE_START + 18 )
-#define RID_STR_CANNOTRUNMACRO          ( RID_BASICIDE_START + 19 )
-#define RID_STR_OPEN                    ( RID_BASICIDE_START + 20 )
-#define RID_STR_SAVE                    ( RID_BASICIDE_START + 21 )
-#define RID_STR_RUNTIMEERROR            ( RID_BASICIDE_START + 22 )
-#define RID_STR_COMPILEERROR            ( RID_BASICIDE_START + 23 )
-#define RID_STR_STDDIALOGNAME           ( RID_BASICIDE_START + 24 )
-#define RID_STR_STDMACRONAME            ( RID_BASICIDE_START + 25 )
-#define RID_STR_STDJAVAFUNCTIONNAME     ( RID_BASICIDE_START + 26 )
-#define RID_STR_STDMODULENAME           ( RID_BASICIDE_START + 27 )
-#define RID_STR_ALL                     ( RID_BASICIDE_START + 28 )
-#define RID_STR_CLOSE                   ( RID_BASICIDE_START + 29 )
-#define RID_STR_PAGE                    ( RID_BASICIDE_START + 30 )
-#define RID_STR_BADSBXNAME              ( RID_BASICIDE_START + 31 )
-#define RID_STR_STDLIBNAME              ( RID_BASICIDE_START + 32 )
-#define RID_STR_ERROROPENSTORAGE        ( RID_BASICIDE_START + 33 )
-#define RID_STR_NOLIBINSTORAGE          ( RID_BASICIDE_START + 34 )
-#define RID_STR_SBXNAMEALLREADYUSED     ( RID_BASICIDE_START + 35 )
+#define RID_STR_CANNOTCLOSE				( RID_BASICIDE_START + 13 )
+#define RID_STR_IDENAME               	( RID_BASICIDE_START + 14 )
+#define RID_STR_INITIDE					( RID_BASICIDE_START + 15 )
+#define RID_STR_STACKNAME				( RID_BASICIDE_START + 16 )
+#define RID_STR_WATCHNAME				( RID_BASICIDE_START + 17 )
+#define RID_STR_REMOVEWATCH          	( RID_BASICIDE_START + 18 )
+#define RID_STR_CANNOTRUNMACRO         	( RID_BASICIDE_START + 19 )
+#define RID_STR_OPEN					( RID_BASICIDE_START + 20 )
+#define RID_STR_SAVE					( RID_BASICIDE_START + 21 )
+#define RID_STR_RUNTIMEERROR			( RID_BASICIDE_START + 22 )
+#define RID_STR_COMPILEERROR			( RID_BASICIDE_START + 23 )
+#define RID_STR_STDDIALOGNAME   		( RID_BASICIDE_START + 24 )
+#define RID_STR_STDMACRONAME			( RID_BASICIDE_START + 25 )
+#define RID_STR_STDJAVAFUNCTIONNAME		( RID_BASICIDE_START + 26 )
+#define RID_STR_STDMODULENAME   		( RID_BASICIDE_START + 27 )
+#define RID_STR_ALL						( RID_BASICIDE_START + 28 )
+#define RID_STR_CLOSE					( RID_BASICIDE_START + 29 )
+#define RID_STR_PAGE					( RID_BASICIDE_START + 30 )
+#define RID_STR_BADSBXNAME				( RID_BASICIDE_START + 31 )
+#define RID_STR_STDLIBNAME   			( RID_BASICIDE_START + 32 )
+#define RID_STR_ERROROPENSTORAGE		( RID_BASICIDE_START + 33 )
+#define RID_STR_NOLIBINSTORAGE			( RID_BASICIDE_START + 34 )
+#define RID_STR_SBXNAMEALLREADYUSED 	( RID_BASICIDE_START + 35 )
 #define RID_STR_SIGNED                  ( RID_BASICIDE_START + 36 )
-#define RID_STR_WATCHVARIABLE           ( RID_BASICIDE_START + 37 )
-#define RID_STR_WATCHVALUE              ( RID_BASICIDE_START + 38 )
-#define RID_STR_WATCHTYPE               ( RID_BASICIDE_START + 39 )
+#define RID_STR_WATCHVARIABLE			( RID_BASICIDE_START + 37 )
+#define RID_STR_WATCHVALUE				( RID_BASICIDE_START + 38 )
+#define RID_STR_WATCHTYPE				( RID_BASICIDE_START + 39 )
 // free
-#define RID_STR_REPLACESTDLIB           ( RID_BASICIDE_START + 41 )
-#define RID_STR_SBXNAMEALLREADYUSED2    ( RID_BASICIDE_START + 42 )
-#define RID_STR_SEARCHNOTFOUND          ( RID_BASICIDE_START + 43 )
-#define RID_STR_SEARCHREPLACES          ( RID_BASICIDE_START + 44 )
-#define RID_STR_CANNOTCHANGENAMESTDLIB  ( RID_BASICIDE_START + 45 )
-#define RID_STR_CANNOTCHANGENAMEREFLIB  ( RID_BASICIDE_START + 46 )
-#define RID_STR_CANNOTUNLOADSTDLIB      ( RID_BASICIDE_START + 47 )
-#define RID_STR_GENERATESOURCE          ( RID_BASICIDE_START + 48 )
-#define RID_STR_REFNOTPOSSIBLE          ( RID_BASICIDE_START + 49 )
-#define RID_STR_FILEEXISTS              ( RID_BASICIDE_START + 50 )
+#define RID_STR_REPLACESTDLIB			( RID_BASICIDE_START + 41 )
+#define RID_STR_SBXNAMEALLREADYUSED2 	( RID_BASICIDE_START + 42 )
+#define RID_STR_SEARCHNOTFOUND			( RID_BASICIDE_START + 43 )
+#define RID_STR_SEARCHREPLACES			( RID_BASICIDE_START + 44 )
+#define RID_STR_CANNOTCHANGENAMESTDLIB	( RID_BASICIDE_START + 45 )
+#define RID_STR_CANNOTCHANGENAMEREFLIB	( RID_BASICIDE_START + 46 )
+#define RID_STR_CANNOTUNLOADSTDLIB		( RID_BASICIDE_START + 47 )
+#define RID_STR_GENERATESOURCE			( RID_BASICIDE_START + 48 )
+#define RID_STR_REFNOTPOSSIBLE			( RID_BASICIDE_START + 49 )
+#define RID_STR_FILEEXISTS				( RID_BASICIDE_START + 50 )
 // free
-#define RID_STR_ERROROPENLIB            ( RID_BASICIDE_START + 55 )
-#define RID_STR_STDJAVAMODULENAME       ( RID_BASICIDE_START + 56 )
-#define RID_STR_NEWLIB                  ( RID_BASICIDE_START + 57 )
-#define RID_STR_NEWMOD                  ( RID_BASICIDE_START + 58 )
-#define RID_STR_NEWDLG                  ( RID_BASICIDE_START + 59 )
-#define RID_STR_LIBNAMETOLONG           ( RID_BASICIDE_START + 60 )
-#define RID_STR_ERRORCHOOSEMACRO        ( RID_BASICIDE_START + 61 )
+#define RID_STR_ERROROPENLIB			( RID_BASICIDE_START + 55 )
+#define RID_STR_STDJAVAMODULENAME   	( RID_BASICIDE_START + 56 )
+#define RID_STR_NEWLIB					( RID_BASICIDE_START + 57 )
+#define RID_STR_NEWMOD					( RID_BASICIDE_START + 58 )
+#define RID_STR_NEWDLG					( RID_BASICIDE_START + 59 )
+#define RID_STR_LIBNAMETOLONG			( RID_BASICIDE_START + 60 )
+#define RID_STR_ERRORCHOOSEMACRO		( RID_BASICIDE_START + 61 )
 // free
-#define RID_STR_LIBISREADONLY           ( RID_BASICIDE_START + 63 )
-#define RID_STR_REPLACELIB              ( RID_BASICIDE_START + 64 )
+#define RID_STR_LIBISREADONLY			( RID_BASICIDE_START + 63 )
+#define RID_STR_REPLACELIB				( RID_BASICIDE_START + 64 )
 // free
-#define RID_STR_IMPORTNOTPOSSIBLE       ( RID_BASICIDE_START + 67 )
-#define RID_STR_NOIMPORT                ( RID_BASICIDE_START + 68 )
-#define RID_STR_ENTERPASSWORD           ( RID_BASICIDE_START + 69 )
+#define RID_STR_IMPORTNOTPOSSIBLE		( RID_BASICIDE_START + 67 )
+#define RID_STR_NOIMPORT				( RID_BASICIDE_START + 68 )
+#define RID_STR_ENTERPASSWORD			( RID_BASICIDE_START + 69 )
 // free
-#define RID_STR_NEWMETH                 ( RID_BASICIDE_START + 71 )
-#define RID_STR_USERMACROS              ( RID_BASICIDE_START + 72 )
-#define RID_STR_USERDIALOGS             ( RID_BASICIDE_START + 73 )
-#define RID_STR_USERMACROSDIALOGS       ( RID_BASICIDE_START + 74 )
-#define RID_STR_SHAREMACROS             ( RID_BASICIDE_START + 75 )
-#define RID_STR_SHAREDIALOGS            ( RID_BASICIDE_START + 76 )
-#define RID_STR_SHAREMACROSDIALOGS      ( RID_BASICIDE_START + 77 )
+#define RID_STR_NEWMETH					( RID_BASICIDE_START + 71 )
+#define RID_STR_USERMACROS				( RID_BASICIDE_START + 72 )
+#define RID_STR_USERDIALOGS				( RID_BASICIDE_START + 73 )
+#define RID_STR_USERMACROSDIALOGS		( RID_BASICIDE_START + 74 )
+#define RID_STR_SHAREMACROS				( RID_BASICIDE_START + 75 )
+#define RID_STR_SHAREDIALOGS			( RID_BASICIDE_START + 76 )
+#define RID_STR_SHAREMACROSDIALOGS		( RID_BASICIDE_START + 77 )
 // free
-#define RID_STR_QUERYREPLACEMACRO       ( RID_BASICIDE_START + 80 )
-#define RID_STR_FILENAME                ( RID_BASICIDE_START + 81 )
-#define RID_STR_APPENDLIBS              ( RID_BASICIDE_START + 82 )
-#define RID_STR_QUERYDELMACRO           ( RID_BASICIDE_START + 83 )
-#define RID_STR_QUERYDELDIALOG          ( RID_BASICIDE_START + 84 )
-#define RID_STR_QUERYDELLIB             ( RID_BASICIDE_START + 85 )
-#define RID_STR_QUERYDELLIBREF          ( RID_BASICIDE_START + 86 )
-#define RID_STR_QUERYDELMODULE          ( RID_BASICIDE_START + 87 )
-#define RID_STR_BASIC                   ( RID_BASICIDE_START + 88 )
-#define RID_STR_DOC                     ( RID_BASICIDE_START + 89 )
-#define RID_STR_MACRONAMEREQ            ( RID_BASICIDE_START + 90 )
-#define RID_STR_WILLSTOPPRG             ( RID_BASICIDE_START + 91 )
-#define RID_STR_STACK                   ( RID_BASICIDE_START + 92 )
-#define RID_STR_OBJNOTFOUND             ( RID_BASICIDE_START + 93 )
-#define RID_STR_COULDNTREAD             ( RID_BASICIDE_START + 94 )
-#define RID_STR_COULDNTWRITE            ( RID_BASICIDE_START + 95 )
-#define RID_STR_WRONGPASSWORD           ( RID_BASICIDE_START + 96 )
-#define RID_STR_LINE                    ( RID_BASICIDE_START + 97 )
-#define RID_STR_COLUMN                  ( RID_BASICIDE_START + 98 )
-#define RID_STR_SOURCETOBIG             ( RID_BASICIDE_START + 99 )
-#define RID_STR_EXPORTPACKAGE           ( RID_BASICIDE_START + 100 )
-#define RID_STR_EXPORTBASIC             ( RID_BASICIDE_START + 101 )
-#define RID_STR_PACKAGE_BUNDLE          ( RID_BASICIDE_START + 102 )
+#define RID_STR_QUERYREPLACEMACRO		( RID_BASICIDE_START + 80 )
+#define RID_STR_FILENAME				( RID_BASICIDE_START + 81 )
+#define RID_STR_APPENDLIBS				( RID_BASICIDE_START + 82 )
+#define RID_STR_QUERYDELMACRO			( RID_BASICIDE_START + 83 )
+#define RID_STR_QUERYDELDIALOG			( RID_BASICIDE_START + 84 )
+#define RID_STR_QUERYDELLIB				( RID_BASICIDE_START + 85 )
+#define RID_STR_QUERYDELLIBREF			( RID_BASICIDE_START + 86 )
+#define RID_STR_QUERYDELMODULE			( RID_BASICIDE_START + 87 )
+#define RID_STR_BASIC					( RID_BASICIDE_START + 88 )
+#define RID_STR_DOC						( RID_BASICIDE_START + 89 )
+#define RID_STR_MACRONAMEREQ			( RID_BASICIDE_START + 90 )
+#define RID_STR_WILLSTOPPRG				( RID_BASICIDE_START + 91 )
+#define RID_STR_STACK					( RID_BASICIDE_START + 92 )
+#define RID_STR_OBJNOTFOUND				( RID_BASICIDE_START + 93 )
+#define RID_STR_COULDNTREAD				( RID_BASICIDE_START + 94 )
+#define RID_STR_COULDNTWRITE			( RID_BASICIDE_START + 95 )
+#define RID_STR_WRONGPASSWORD			( RID_BASICIDE_START + 96 )
+#define RID_STR_LINE					( RID_BASICIDE_START + 97 )
+#define RID_STR_COLUMN					( RID_BASICIDE_START + 98 )
+#define RID_STR_SOURCETOBIG				( RID_BASICIDE_START + 99 )
+#define RID_STR_EXPORTPACKAGE			( RID_BASICIDE_START + 100 )
+#define RID_STR_EXPORTBASIC				( RID_BASICIDE_START + 101 )
+#define RID_STR_PACKAGE_BUNDLE			( RID_BASICIDE_START + 102 )
 
-#define RID_STR_DLGIMP_CLASH_RENAME     ( RID_BASICIDE_START + 110 )
-#define RID_STR_DLGIMP_CLASH_REPLACE    ( RID_BASICIDE_START + 111 )
-#define RID_STR_DLGIMP_CLASH_TITLE      ( RID_BASICIDE_START + 112 )
-#define RID_STR_DLGIMP_CLASH_TEXT       ( RID_BASICIDE_START + 113 )
-#define RID_STR_DLGIMP_MISMATCH_ADD     ( RID_BASICIDE_START + 114 )
-#define RID_STR_DLGIMP_MISMATCH_OMIT    ( RID_BASICIDE_START + 115 )
-#define RID_STR_DLGIMP_MISMATCH_TITLE   ( RID_BASICIDE_START + 116 )
-#define RID_STR_DLGIMP_MISMATCH_TEXT    ( RID_BASICIDE_START + 117 )
+#define RID_STR_DLGIMP_CLASH_RENAME		( RID_BASICIDE_START + 110 )
+#define RID_STR_DLGIMP_CLASH_REPLACE	( RID_BASICIDE_START + 111 )
+#define	RID_STR_DLGIMP_CLASH_TITLE		( RID_BASICIDE_START + 112 )
+#define	RID_STR_DLGIMP_CLASH_TEXT		( RID_BASICIDE_START + 113 )
+#define	RID_STR_DLGIMP_MISMATCH_ADD		( RID_BASICIDE_START + 114 )
+#define	RID_STR_DLGIMP_MISMATCH_OMIT	( RID_BASICIDE_START + 115 )
+#define	RID_STR_DLGIMP_MISMATCH_TITLE	( RID_BASICIDE_START + 116 )
+#define	RID_STR_DLGIMP_MISMATCH_TEXT	( RID_BASICIDE_START + 117 )
 #define RID_STR_DOCUMENT_OBJECTS        ( RID_BASICIDE_START + 118 )
 #define RID_STR_USERFORMS               ( RID_BASICIDE_START + 119 )
 #define RID_STR_NORMAL_MODULES          ( RID_BASICIDE_START + 120 )
 #define RID_STR_CLASS_MODULES           ( RID_BASICIDE_START + 121 )
 
-#endif  // _SVX_NOIDERESIDS
+#endif	// _SVX_NOIDERESIDS
 
-#endif  // _BASIDESH_HRC
+#endif	// _BASIDESH_HRC
diff --git a/basctl/inc/helpid.hrc b/basctl/inc/helpid.hrc
index 0f666941e57e..be1f441e207f 100644
--- a/basctl/inc/helpid.hrc
+++ b/basctl/inc/helpid.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,53 +33,53 @@
 
 // Help-Ids --------------------------------------------------------------
 
-#define HID_BASICIDE_TOOLBOX                    (HID_BASICIDE_START +   0)
-#define HID_BASICIDE_OBJECTS                    (HID_BASICIDE_START +   1)
-#define HID_MACRO_OPTIONS                       (HID_BASICIDE_START +   2)
-#define HID_BASICIDE_BRKPNTS                    (HID_BASICIDE_START +   3)
-#define HID_BASICIDE_MODULS                     (HID_BASICIDE_START +   4)
-#define HID_BASICIDE_LIBS_TP                    (HID_BASICIDE_START +   5)
-#define HID_BASICIDE_LIBS_DLG                   (HID_BASICIDE_START +   6)
-#define HID_BASICIDE_CONTROLS                   (HID_BASICIDE_START +   7)
-#define HID_BASICIDE_MACROS                     (HID_BASICIDE_START +   8)
-#define HID_BASICIDE_LIBS                       (HID_BASICIDE_START +   9)
-#define HID_BASICIDE_ORG_TC                     (HID_BASICIDE_START +  10)
+#define HID_BASICIDE_TOOLBOX					(HID_BASICIDE_START +   0)
+#define HID_BASICIDE_OBJECTS					(HID_BASICIDE_START +   1)
+#define HID_MACRO_OPTIONS						(HID_BASICIDE_START +   2)
+#define HID_BASICIDE_BRKPNTS					(HID_BASICIDE_START +   3)
+#define HID_BASICIDE_MODULS						(HID_BASICIDE_START +   4)
+#define HID_BASICIDE_LIBS_TP					(HID_BASICIDE_START +   5)
+#define HID_BASICIDE_LIBS_DLG					(HID_BASICIDE_START +   6)
+#define HID_BASICIDE_CONTROLS					(HID_BASICIDE_START +   7)
+#define HID_BASICIDE_MACROS						(HID_BASICIDE_START +   8)
+#define HID_BASICIDE_LIBS						(HID_BASICIDE_START +   9)
+#define HID_BASICIDE_ORG_TC						(HID_BASICIDE_START +  10)
 
-#define HID_BASICIDE_MODULES_TREE               (HID_BASICIDE_START +  11)
-#define HID_BASICIDE_LIBS_TREE                  (HID_BASICIDE_START +  12)
-#define HID_BASICIDE_LIBSDLG_TREE               (HID_BASICIDE_START +  13)
-#define HID_BASICIDE_OBJECTCAT                  (HID_BASICIDE_START +  14)
+#define HID_BASICIDE_MODULES_TREE				(HID_BASICIDE_START +  11)
+#define HID_BASICIDE_LIBS_TREE					(HID_BASICIDE_START +  12)
+#define HID_BASICIDE_LIBSDLG_TREE				(HID_BASICIDE_START +  13)
+#define HID_BASICIDE_OBJECTCAT					(HID_BASICIDE_START +  14)
 
-#define HID_BASICIDE_PROP_BROWSER               (HID_BASICIDE_START +  15)
+#define HID_BASICIDE_PROP_BROWSER				(HID_BASICIDE_START +  15)
 
-#define HID_BASICIDE_PROP_BROWSER_LBOX          (HID_BASICIDE_START +  16)
+#define HID_BASICIDE_PROP_BROWSER_LBOX			(HID_BASICIDE_START +  16)
 
-#define HID_BASICIDE_OBJCAT_SHOW                (HID_BASICIDE_START +  17)
-#define HID_BASICIDE_OBJCAT_PROPS               (HID_BASICIDE_START +  18)
-#define HID_BASICIDE_OBJCAT_HELP                (HID_BASICIDE_START +  19)
+#define HID_BASICIDE_OBJCAT_SHOW				(HID_BASICIDE_START +  17)
+#define HID_BASICIDE_OBJCAT_PROPS 				(HID_BASICIDE_START +  18)
+#define HID_BASICIDE_OBJCAT_HELP				(HID_BASICIDE_START +  19)
 
-#define HID_BASICIDE_BRKDLG                     (HID_BASICIDE_START +  20)
-#define HID_BASICIDE_ACTIV                      (HID_BASICIDE_START +  21)
-#define HID_BASICIDE_BRKPROPS                   (HID_BASICIDE_START +  22)
-#define HID_BASICIDE_REMOVEWATCH                (HID_BASICIDE_START +  23)
-#define HID_BASICIDE_GOTOALL                    (HID_BASICIDE_START +  24)
+#define HID_BASICIDE_BRKDLG						(HID_BASICIDE_START +  20)
+#define HID_BASICIDE_ACTIV		 				(HID_BASICIDE_START +  21)
+#define HID_BASICIDE_BRKPROPS					(HID_BASICIDE_START +  22)
+#define HID_BASICIDE_REMOVEWATCH 				(HID_BASICIDE_START +  23)
+#define HID_BASICIDE_GOTOALL					(HID_BASICIDE_START +  24)
 
-#define HID_BASICIDE_MODULWINDOW                (HID_BASICIDE_START +  25)
-#define HID_BASICIDE_DIALOGWINDOW               (HID_BASICIDE_START +  26)
+#define HID_BASICIDE_MODULWINDOW				(HID_BASICIDE_START +  25)
+#define HID_BASICIDE_DIALOGWINDOW				(HID_BASICIDE_START +  26)
 
-#define HID_BASICIDE_EDITORWINDOW               (HID_BASICIDE_START +  27)
-#define HID_BASICIDE_BREAKPOINTWINDOW           (HID_BASICIDE_START +  28)
-#define HID_BASICIDE_WATCHWINDOW                (HID_BASICIDE_START +  29)
-#define HID_BASICIDE_STACKWINDOW                (HID_BASICIDE_START +  30)
-#define HID_BASICIDE_TABBAR                     (HID_BASICIDE_START +  31)
-#define HID_BASICIDE_WATCHWINDOW_EDIT           (HID_BASICIDE_START +  32)
-#define HID_BASICIDE_WATCHWINDOW_LIST           (HID_BASICIDE_START +  33)
-#define HID_BASICIDE_STACKWINDOW_LIST           (HID_BASICIDE_START +  34)
+#define HID_BASICIDE_EDITORWINDOW				(HID_BASICIDE_START +  27)
+#define HID_BASICIDE_BREAKPOINTWINDOW			(HID_BASICIDE_START +  28)
+#define HID_BASICIDE_WATCHWINDOW				(HID_BASICIDE_START +  29)
+#define HID_BASICIDE_STACKWINDOW				(HID_BASICIDE_START +  30)
+#define HID_BASICIDE_TABBAR						(HID_BASICIDE_START +  31)
+#define HID_BASICIDE_WATCHWINDOW_EDIT			(HID_BASICIDE_START +  32)
+#define HID_BASICIDE_WATCHWINDOW_LIST			(HID_BASICIDE_START +  33)
+#define HID_BASICIDE_STACKWINDOW_LIST			(HID_BASICIDE_START +  34)
 
-#define HID_BASICIDE_MANAGE_LANGUAGE            (HID_BASICIDE_START +  35)
-#define HID_BASICIDE_SETDEFAULT_LANGUAGE        (HID_BASICIDE_START +  36)
-#define HID_BASICIDE_ADDNEW_LANGUAGE            (HID_BASICIDE_START +  37)
-#define HID_BASICIDE_ADDNEW_CONTROL             (HID_BASICIDE_START +  38)
+#define HID_BASICIDE_MANAGE_LANGUAGE			(HID_BASICIDE_START +  35)
+#define HID_BASICIDE_SETDEFAULT_LANGUAGE		(HID_BASICIDE_START +  36)
+#define HID_BASICIDE_ADDNEW_LANGUAGE			(HID_BASICIDE_START +  37)
+#define HID_BASICIDE_ADDNEW_CONTROL				(HID_BASICIDE_START +  38)
 
 #endif
 
diff --git a/basctl/inc/iderdll.hxx b/basctl/inc/iderdll.hxx
index 6b48b37f50c4..c57b1bae9485 100644
--- a/basctl/inc/iderdll.hxx
+++ b/basctl/inc/iderdll.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,15 +36,15 @@ class BasicIDEDLL
 {
     friend class BasicIDEShell;
 
-    BasicIDEShell*  pShell;
-    BasicIDEData*   pExtraData;
+    BasicIDEShell*	pShell;
+    BasicIDEData*	pExtraData;
 
 public:
                     BasicIDEDLL();
                     ~BasicIDEDLL();
 
-    BasicIDEShell*  GetShell() const { return pShell; }
-    BasicIDEData*   GetExtraData();
+    BasicIDEShell*	GetShell() const { return pShell; }
+    BasicIDEData*	GetExtraData();
     static void     Init();
     static void     Exit();
     static BasicIDEDLL* GetDLL();
diff --git a/basctl/inc/pch/precompiled_basctl.cxx b/basctl/inc/pch/precompiled_basctl.cxx
index 5f74ede5c895..89ca1ce477e2 100644
--- a/basctl/inc/pch/precompiled_basctl.cxx
+++ b/basctl/inc/pch/precompiled_basctl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx
index 96030135a2a9..13e4c3f1b7ba 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,46 +118,46 @@
 #include "sfx2/docfac.hxx"
 
 
-#define ITEMID_FONT             0
-#define ITEMID_POSTURE          0
-#define ITEMID_WEIGHT           0
-#define ITEMID_SHADOWED         0
-#define ITEMID_CONTOUR          0
-#define ITEMID_CROSSEDOUT       0
-#define ITEMID_UNDERLINE        0
-#define ITEMID_FONTHEIGHT       0
-#define ITEMID_COLOR            0
-#define ITEMID_ADJUST           0
-#define ITEMID_LINESPACING      0
-#define ITEMID_TABSTOP          0
-#define ITEMID_LRSPACE          0
-#define ITEMID_ULSPACE          0
-#define ITEMID_SEARCH           0
-#define ITEMID_SEARCH           0
-#define ITEMID_SIZE             0
-#define ITEMID_FONTLIST     0
-#define ITEMID_AUTOKERN     0
-#define ITEMID_WORDLINEMODE 0
-#define ITEMID_PROPSIZE     0
-#define ITEMID_CHARSETCOLOR 0
-#define ITEMID_KERNING      0
-#define ITEMID_CASEMAP      0
-#define ITEMID_ESCAPEMENT   0
-#define ITEMID_LANGUAGE     0
-#define ITEMID_NOLINEBREAK  0
-#define ITEMID_NOHYPHENHERE 0
-#define ITEMID_BLINK        0
-#define ITEMID_PAPERBIN     0
-#define ITEMID_PRINT        0
-#define ITEMID_OPAQUE       0
-#define ITEMID_PROTECT      0
-#define ITEMID_SHADOW       0
-#define ITEMID_BOX          0
-#define ITEMID_BOXINFO      0
-#define ITEMID_FMTBREAK     0
-#define ITEMID_FMTKEEP      0
-#define ITEMID_LINE         0
-#define ITEMID_BRUSH        0
+#define ITEMID_FONT 			0
+#define ITEMID_POSTURE			0
+#define ITEMID_WEIGHT			0
+#define ITEMID_SHADOWED			0
+#define ITEMID_CONTOUR			0
+#define ITEMID_CROSSEDOUT		0
+#define ITEMID_UNDERLINE		0
+#define ITEMID_FONTHEIGHT		0
+#define ITEMID_COLOR 			0
+#define ITEMID_ADJUST			0
+#define ITEMID_LINESPACING		0
+#define ITEMID_TABSTOP			0
+#define ITEMID_LRSPACE			0
+#define ITEMID_ULSPACE			0
+#define ITEMID_SEARCH			0
+#define ITEMID_SEARCH			0
+#define ITEMID_SIZE				0
+#define ITEMID_FONTLIST		0
+#define ITEMID_AUTOKERN		0
+#define ITEMID_WORDLINEMODE	0
+#define ITEMID_PROPSIZE		0
+#define ITEMID_CHARSETCOLOR	0
+#define ITEMID_KERNING		0
+#define ITEMID_CASEMAP		0
+#define ITEMID_ESCAPEMENT	0
+#define ITEMID_LANGUAGE		0
+#define ITEMID_NOLINEBREAK	0
+#define ITEMID_NOHYPHENHERE	0
+#define ITEMID_BLINK		0
+#define ITEMID_PAPERBIN		0
+#define ITEMID_PRINT		0
+#define ITEMID_OPAQUE		0
+#define ITEMID_PROTECT		0
+#define ITEMID_SHADOW		0
+#define ITEMID_BOX		    0
+#define ITEMID_BOXINFO		0
+#define ITEMID_FMTBREAK		0
+#define ITEMID_FMTKEEP		0
+#define ITEMID_LINE		    0
+#define ITEMID_BRUSH		0
 
 #include "svl/srchitem.hxx"
 #include "editeng/flstitem.hxx"
diff --git a/basctl/sdi/baside.sdi b/basctl/sdi/baside.sdi
index bc9232c08bfd..36adfc8f1d96 100644
--- a/basctl/sdi/baside.sdi
+++ b/basctl/sdi/baside.sdi
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,73 +41,73 @@ shell BasicIDEShell
     // ========================================================
     SID_BASICIDE_HIDECURPAGE
     [
-        ExecMethod  = ExecuteCurrent;
+        ExecMethod	= ExecuteCurrent;
         StateMethod = GetState;
     ]
 
     SID_BASICIDE_DELETECURRENT
     [
-        ExecMethod  = ExecuteCurrent;
+        ExecMethod	= ExecuteCurrent;
         StateMethod = GetState;
     ]
 
     SID_BASICIDE_RENAMECURRENT
     [
-        ExecMethod  = ExecuteCurrent;
+        ExecMethod	= ExecuteCurrent;
         StateMethod = GetState;
     ]
 
     SID_CUT
     [
-        ExecMethod  = ExecuteCurrent;
+        ExecMethod	= ExecuteCurrent;
         StateMethod = GetState;
     ]
 
     SID_COPY
     [
-        ExecMethod  = ExecuteCurrent;
+        ExecMethod	= ExecuteCurrent;
         StateMethod = GetState;
     ]
 
     SID_PASTE
     [
-        ExecMethod  = ExecuteCurrent;
+        ExecMethod	= ExecuteCurrent;
         StateMethod = GetState;
     ]
 
     SID_UNDO
     [
-        ExecMethod  = ExecuteCurrent;
+        ExecMethod	= ExecuteCurrent;
         StateMethod = GetState;
     ]
 
     SID_REDO
     [
-        ExecMethod  = ExecuteCurrent;
+        ExecMethod	= ExecuteCurrent;
         StateMethod = GetState;
     ]
 
     SID_DELETE
     [
-        ExecMethod  = ExecuteCurrent;
+        ExecMethod	= ExecuteCurrent;
         StateMethod = GetState;
     ]
 
     SID_BACKSPACE
     [
-        ExecMethod  = ExecuteCurrent;
+        ExecMethod	= ExecuteCurrent;
         StateMethod = GetState;
     ]
 
     SID_SEARCH_OPTIONS
     [
-        ExecMethod  = ExecuteCurrent;
+        ExecMethod	= ExecuteCurrent;
         StateMethod = GetState;
     ]
 
     SID_SEARCH_ITEM
     [
-        ExecMethod  = ExecuteCurrent;
+        ExecMethod	= ExecuteCurrent;
         StateMethod = GetState;
     ]
 
@@ -169,7 +169,7 @@ shell BasicIDEShell
 
     SID_BASICIDE_SHOWSBX
     [
-        ExecMethod  = ExecuteGlobal;
+        ExecMethod	= ExecuteGlobal;
         StateMethod = GetState;
     ]
 
@@ -206,97 +206,97 @@ shell BasicIDEShell
     // Ab hier normal...
     SID_BASICIDE_CHOOSEMACRO
     [
-        ExecMethod  = ExecuteGlobal;
+        ExecMethod	= ExecuteGlobal;
         StateMethod = GetState;
     ]
 
     SID_BASICIDE_MODULEDLG
     [
-        ExecMethod  = ExecuteGlobal;
+        ExecMethod	= ExecuteGlobal;
         StateMethod = GetState;
     ]
 
     SID_BASICIDE_OBJCAT
     [
-        ExecMethod  = ExecuteGlobal;
+        ExecMethod	= ExecuteGlobal;
         StateMethod = GetState;
     ]
 
     SID_BASICIDE_CREATEMACRO
     [
-        ExecMethod  = ExecuteGlobal;
+        ExecMethod	= ExecuteGlobal;
         StateMethod = GetState;
     ]
 
     SID_BASICIDE_EDITMACRO
     [
-        ExecMethod  = ExecuteGlobal;
+        ExecMethod	= ExecuteGlobal;
         StateMethod = GetState;
     ]
 
     SID_BASICIDE_NAMECHANGEDONTAB
     [
-        ExecMethod  = ExecuteGlobal;
+        ExecMethod	= ExecuteGlobal;
         StateMethod = GetState;
     ]
 
     SID_BASICIDE_STOREMODULESOURCE
     [
-        ExecMethod  = ExecuteGlobal;
+        ExecMethod	= ExecuteGlobal;
         StateMethod = GetState;
     ]
 
     SID_BASICIDE_STOREALLMODULESOURCES
     [
-        ExecMethod  = ExecuteGlobal;
+        ExecMethod	= ExecuteGlobal;
         StateMethod = GetState;
     ]
 
     SID_BASICIDE_UPDATEMODULESOURCE
     [
-        ExecMethod  = ExecuteGlobal;
+        ExecMethod	= ExecuteGlobal;
         StateMethod = GetState;
     ]
 
     SID_BASICIDE_UPDATEALLMODULESOURCES
     [
-        ExecMethod  = ExecuteGlobal;
+        ExecMethod	= ExecuteGlobal;
         StateMethod = GetState;
     ]
 
     SID_BASICSTOP
     [
-        ExecMethod  = ExecuteGlobal;
+        ExecMethod	= ExecuteGlobal;
         StateMethod = GetState;
     ]
 
     SID_BASICIDE_NEWMODULE
     [
-        ExecMethod  = ExecuteGlobal;
+        ExecMethod	= ExecuteGlobal;
         StateMethod = GetState;
     ]
 
     SID_BASICIDE_NEWJAVAMODULE
     [
-        ExecMethod  = ExecuteGlobal;
+        ExecMethod	= ExecuteGlobal;
         StateMethod = GetState;
     ]
 
     SID_BASICIDE_NEWDIALOG
     [
-        ExecMethod  = ExecuteGlobal;
+        ExecMethod	= ExecuteGlobal;
         StateMethod = GetState;
     ]
 
     SID_SHOW_PROPERTYBROWSER
     [
-        ExecMethod  = ExecuteGlobal;
+        ExecMethod	= ExecuteGlobal;
         StateMethod = GetState;
     ]
 
     SID_BASICIDE_SHOWWINDOW
     [
-        ExecMethod  = ExecuteGlobal;
+        ExecMethod	= ExecuteGlobal;
     ]
 
     SID_BASICIDE_MANAGE_LANG
@@ -316,85 +316,85 @@ shell BasicIDEShell
     // ========================================================
     SID_BASICRUN
     [
-        ExecMethod  = ExecuteBasic;
+        ExecMethod	= ExecuteBasic;
         StateMethod = GetState;
     ]
 
     SID_BASICCOMPILE
     [
-        ExecMethod  = ExecuteBasic;
+        ExecMethod	= ExecuteBasic;
         StateMethod = GetState;
     ]
 
     SID_BASICLOAD
     [
-        ExecMethod  = ExecuteBasic;
+        ExecMethod	= ExecuteBasic;
         StateMethod = GetState;
     ]
 
     SID_BASICSAVEAS
     [
-        ExecMethod  = ExecuteBasic;
+        ExecMethod	= ExecuteBasic;
         StateMethod = GetState;
     ]
-
+    
     SID_BASICIDE_MATCHGROUP
     [
-        ExecMethod  = ExecuteBasic;
+        ExecMethod	= ExecuteBasic;
         StateMethod = GetState;
     ]
 
     SID_BASICSTEPINTO
     [
-        ExecMethod  = ExecuteBasic;
+        ExecMethod	= ExecuteBasic;
         StateMethod = GetState;
     ]
 
     SID_BASICSTEPOVER
     [
-        ExecMethod  = ExecuteBasic;
+        ExecMethod	= ExecuteBasic;
         StateMethod = GetState;
     ]
 
     SID_BASICSTEPOUT
     [
-        ExecMethod  = ExecuteBasic;
+        ExecMethod	= ExecuteBasic;
         StateMethod = GetState;
     ]
 
     SID_BASICIDE_TOGGLEBRKPNT
     [
-        ExecMethod  = ExecuteBasic;
+        ExecMethod	= ExecuteBasic;
         StateMethod = GetState;
     ]
 
     SID_BASICIDE_MANAGEBRKPNTS
     [
-        ExecMethod  = ExecuteBasic;
+        ExecMethod	= ExecuteBasic;
         StateMethod = GetState;
     ]
 
     SID_BASICIDE_TOGGLEBRKPNTENABLED
     [
-        ExecMethod  = ExecuteBasic;
+        ExecMethod	= ExecuteBasic;
         StateMethod = GetState;
     ]
 
     SID_BASICIDE_ADDWATCH
     [
-        ExecMethod  = ExecuteBasic;
+        ExecMethod	= ExecuteBasic;
         StateMethod = GetState;
     ]
 
     SID_BASICIDE_REMOVEWATCH
     [
-        ExecMethod  = ExecuteBasic;
+        ExecMethod	= ExecuteBasic;
         StateMethod = GetState;
     ]
 
     SID_BASICIDE_BRKPNTSCHANGED
     [
-        ExecMethod  = ExecuteBasic;
+        ExecMethod	= ExecuteBasic;
         StateMethod = GetState;
     ]
 
@@ -403,26 +403,26 @@ shell BasicIDEShell
     // ========================================================
     SID_CHOOSE_CONTROLS
     [
-        ExecMethod      = ExecuteDialog;
-        StateMethod     = GetState;
+        ExecMethod		= ExecuteDialog;
+        StateMethod 	= GetState;
     ]
 
     SID_EXPORT_DIALOG
     [
-        ExecMethod      = ExecuteDialog;
-        StateMethod     = GetState;
+        ExecMethod		= ExecuteDialog;
+        StateMethod 	= GetState;
     ]
-
+    
     SID_IMPORT_DIALOG
     [
-        ExecMethod      = ExecuteDialog;
-        StateMethod     = GetState;
+        ExecMethod		= ExecuteDialog;
+        StateMethod 	= GetState;
     ]
-
+    
     SID_DIALOG_TESTMODE
     [
-        ExecMethod      = ExecuteDialog;
-        StateMethod     = GetState;
+        ExecMethod		= ExecuteDialog;
+        StateMethod 	= GetState;
     ]
 
     SID_BASICIDE_STAT_POS
diff --git a/basctl/sdi/basslots.hrc b/basctl/sdi/basslots.hrc
index d71a1d26d020..30f7197255e1 100644
--- a/basctl/sdi/basslots.hrc
+++ b/basctl/sdi/basslots.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/basctl/sdi/basslots.sdi b/basctl/sdi/basslots.sdi
index f6cf7ce83a30..b8f387d9b27f 100644
--- a/basctl/sdi/basslots.sdi
+++ b/basctl/sdi/basslots.sdi
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
index b2b20e105b4e..2d5fcfb9279f 100644
--- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
+++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -190,7 +190,7 @@ void AccessibleDialogControlShape::SetBounds( const awt::Rectangle& aBounds )
 
 // -----------------------------------------------------------------------------
 
-Window* AccessibleDialogControlShape::GetWindow() const
+Window*	AccessibleDialogControlShape::GetWindow() const
 {
     Window* pWindow = NULL;
     if ( m_pDlgEdObj )
@@ -205,7 +205,7 @@ Window* AccessibleDialogControlShape::GetWindow() const
 
 // -----------------------------------------------------------------------------
 
-::rtl::OUString AccessibleDialogControlShape::GetModelStringProperty( const sal_Char* pPropertyName )
+::rtl::OUString	AccessibleDialogControlShape::GetModelStringProperty( const sal_Char* pPropertyName )
 {
     ::rtl::OUString sReturn;
 
@@ -251,7 +251,7 @@ void AccessibleDialogControlShape::FillAccessibleStateSet( utl::AccessibleStateS
 }
 
 // -----------------------------------------------------------------------------
-// OCommonAccessibleComponent
+// OCommonAccessibleComponent 
 // -----------------------------------------------------------------------------
 
 awt::Rectangle AccessibleDialogControlShape::implGetBounds() throw (RuntimeException)
@@ -444,7 +444,7 @@ sal_Int16 AccessibleDialogControlShape::getAccessibleRole(  ) throw (RuntimeExce
 
 // -----------------------------------------------------------------------------
 
-::rtl::OUString AccessibleDialogControlShape::getAccessibleDescription( ) throw (RuntimeException)
+::rtl::OUString AccessibleDialogControlShape::getAccessibleDescription(	) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
 
@@ -521,7 +521,7 @@ void AccessibleDialogControlShape::grabFocus(  ) throw (RuntimeException)
 
 // -----------------------------------------------------------------------------
 
-sal_Int32 AccessibleDialogControlShape::getForeground(  ) throw (RuntimeException)
+sal_Int32 AccessibleDialogControlShape::getForeground(	) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
 
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx
index b8c43e4daa37..64629dc27fcf 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,13 +60,13 @@ DBG_NAME( AccessibleDialogWindow )
 
 
 // -----------------------------------------------------------------------------
-//  class ChildDescriptor
+//	class ChildDescriptor
 // -----------------------------------------------------------------------------
 
 AccessibleDialogWindow::ChildDescriptor::ChildDescriptor( DlgEdObj* _pDlgEdObj )
     :pDlgEdObj( _pDlgEdObj )
     ,rxAccessible( 0 )
-{
+{ 
 }
 
 // -----------------------------------------------------------------------------
@@ -116,7 +116,7 @@ bool AccessibleDialogWindow::ChildDescriptor::operator<( const ChildDescriptor&
 }
 
 // -----------------------------------------------------------------------------
-//  class AccessibleDialogWindow
+//	class AccessibleDialogWindow
 // -----------------------------------------------------------------------------
 
 AccessibleDialogWindow::AccessibleDialogWindow( DialogWindow* pDialogWindow )
@@ -338,7 +338,7 @@ void AccessibleDialogWindow::RemoveChild( const ChildDescriptor& rDesc )
 void AccessibleDialogWindow::UpdateChild( const ChildDescriptor& rDesc )
 {
     if ( IsChildVisible( rDesc ) )
-    {
+    {			
         // if the object is not in the child list, insert child
         InsertChild( rDesc );
     }
@@ -443,13 +443,13 @@ void AccessibleDialogWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindo
         case VCLEVENT_WINDOW_SHOW:
         {
             aNewValue <<= AccessibleStateType::SHOWING;
-            NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+            NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );							
         }
         break;
         case VCLEVENT_WINDOW_HIDE:
         {
             aOldValue <<= AccessibleStateType::SHOWING;
-            NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+            NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );				
         }
         break;
         case VCLEVENT_WINDOW_RESIZE:
@@ -518,7 +518,7 @@ void AccessibleDialogWindow::FillAccessibleStateSet( utl::AccessibleStateSetHelp
 }
 
 // -----------------------------------------------------------------------------
-// OCommonAccessibleComponent
+// OCommonAccessibleComponent 
 // -----------------------------------------------------------------------------
 
 awt::Rectangle AccessibleDialogWindow::implGetBounds() throw (RuntimeException)
@@ -551,7 +551,7 @@ void AccessibleDialogWindow::Notify( SfxBroadcaster&, const SfxHint& rHint )
                     if ( IsChildVisible( aDesc ) )
                         InsertChild( aDesc );
                 }
-            }
+            }	
             break;
             case HINT_OBJREMOVED:
             {
@@ -778,7 +778,7 @@ sal_Int16 AccessibleDialogWindow::getAccessibleRole(  ) throw (RuntimeException)
 
 // -----------------------------------------------------------------------------
 
-::rtl::OUString AccessibleDialogWindow::getAccessibleDescription(   ) throw (RuntimeException)
+::rtl::OUString AccessibleDialogWindow::getAccessibleDescription(	) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
 
@@ -856,8 +856,8 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleAtPoint( const awt
     {
         Reference< XAccessible > xAcc = getAccessibleChild( i );
         if ( xAcc.is() )
-        {
-            Reference< XAccessibleComponent > xComp( xAcc->getAccessibleContext(), UNO_QUERY );
+        {			
+            Reference< XAccessibleComponent > xComp( xAcc->getAccessibleContext(), UNO_QUERY );				
             if ( xComp.is() )
             {
                 Rectangle aRect = VCLRectangle( xComp->getBounds() );
@@ -1007,7 +1007,7 @@ void AccessibleDialogWindow::selectAccessibleChild( sal_Int32 nChildIndex ) thro
 // -----------------------------------------------------------------------------
 
 sal_Bool AccessibleDialogWindow::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
-{
+{	
     OExternalLockGuard aGuard( this );
 
     if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() )
@@ -1065,7 +1065,7 @@ sal_Int32 AccessibleDialogWindow::getSelectedAccessibleChildCount(  ) throw (Run
     sal_Int32 nRet = 0;
 
     for ( sal_Int32 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i )
-    {
+    {		
         if ( isAccessibleChildSelected( i ) )
             ++nRet;
     }
@@ -1085,7 +1085,7 @@ Reference< XAccessible > AccessibleDialogWindow::getSelectedAccessibleChild( sal
     Reference< XAccessible > xChild;
 
     for ( sal_Int32 i = 0, j = 0, nCount = getAccessibleChildCount(); i < nCount; ++i )
-    {
+    {		
         if ( isAccessibleChildSelected( i ) && ( j++ == nSelectedChildIndex ) )
         {
             xChild = getAccessibleChild( i );
diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx
index 83d2d10e1256..c1123b836100 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ void BasicDocShell::FillStatusBar( StatusBar& rStatusBar )
     rStatusBar.InsertItem( SID_ATTR_SIZE,
         rStatusBar.GetTextWidth( aTmp ), SIB_AUTOSIZE | SIB_LEFT | SIB_USERDRAW );
 
-//  return pStatusBar;
+//	return pStatusBar;
 
 }
 
diff --git a/basctl/source/basicide/basdoc.hxx b/basctl/source/basicide/basdoc.hxx
index ba98e47efee1..48d0b072a0e1 100644
--- a/basctl/source/basicide/basdoc.hxx
+++ b/basctl/source/basicide/basdoc.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 SfxPrinter;
 
 class BasicDocShell: public SfxObjectShell
 {
-    SfxPrinter*         pPrinter;
+    SfxPrinter*			pPrinter;
 
 protected:
-    virtual void        FillStatusBar( StatusBar& rBar);
+    virtual void		FillStatusBar( StatusBar& rBar);
     virtual void    Draw( OutputDevice *, const JobSetup & rSetup,
                           USHORT nAspect = ASPECT_CONTENT );
     virtual void    FillClass( SvGlobalName * pClassName,
@@ -60,10 +60,10 @@ public:
                         BasicDocShell();
                         ~BasicDocShell();
 
-    SfxPrinter*         GetPrinter( BOOL bCreate );
-    void                SetPrinter( SfxPrinter* pPrinter );
+    SfxPrinter*			GetPrinter( BOOL bCreate );
+    void				SetPrinter( SfxPrinter* pPrinter );
 };
 
-#endif  // _BASDOC_HXX
+#endif	// _BASDOC_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx
index 9ac79df53864..b775a6b13936 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ BasicLibBox::BasicLibBox( Window* pParent, const uno::Reference< frame::XFrame >
     m_xFrame( rFrame )
 {
     FillBox();
-    bIgnoreSelect = TRUE;   // Select von 0 noch nicht weiterleiten
+    bIgnoreSelect = TRUE;	// Select von 0 noch nicht weiterleiten
     bFillBox = TRUE;
     SelectEntryPos( 0 );
     aCurText = GetEntry( 0 );
@@ -186,7 +186,7 @@ __EXPORT BasicLibBox::~BasicLibBox()
 void __EXPORT BasicLibBox::Update( const SfxStringItem* pItem )
 {
     // Immer auf dem laufenden sein...
-//  if ( !pItem  || !pItem->GetValue().Len() )
+//	if ( !pItem  || !pItem->GetValue().Len() )
         FillBox();
 
     if ( pItem )
@@ -208,7 +208,7 @@ void __EXPORT BasicLibBox::ReleaseFocus()
     if ( pCurSh )
     {
         Window* pShellWin = pCurSh->GetWindow();
-        if ( !pShellWin )       // sonst werde ich ihn nicht los
+        if ( !pShellWin )		// sonst werde ich ihn nicht los
             pShellWin = Application::GetDefDialogParent();
 
         pShellWin->GrabFocus();
@@ -245,7 +245,7 @@ void BasicLibBox::FillBox()
     SelectEntry( aCurText );
     if ( !GetSelectEntryCount() )
     {
-        SelectEntryPos( GetEntryCount() );  // gibst es nicht => leer?
+        SelectEntryPos( GetEntryCount() );	// gibst es nicht => leer?
         aCurText = GetSelectEntry();
     }
     bIgnoreSelect = FALSE;
@@ -323,7 +323,7 @@ void __EXPORT BasicLibBox::Select()
         if ( !bIgnoreSelect )
             NotifyIDE();
         else
-            SelectEntry( aCurText );    // Seit 306... (Select nach Escape)
+            SelectEntry( aCurText );	// Seit 306... (Select nach Escape)
     }
 }
 
@@ -497,7 +497,7 @@ void BasicLanguageBox::Select()
     if ( !m_bIgnoreSelect )
         SetLanguage();
     else
-        SelectEntry( m_sCurrentText );  // Select after Escape
+        SelectEntry( m_sCurrentText );	// Select after Escape
 }
 
 long BasicLanguageBox::PreNotify( NotifyEvent& rNEvt )
diff --git a/basctl/source/basicide/basicbox.hxx b/basctl/source/basicide/basicbox.hxx
index f5a938194889..8932fb454c39 100644
--- a/basctl/source/basicide/basicbox.hxx
+++ b/basctl/source/basicide/basicbox.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ public:
                         LibBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
                         ~LibBoxControl();
 
-    virtual void        StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void		StateChanged( USHORT nSID, SfxItemState eState,
                                       const SfxPoolItem* pState );
-    virtual Window*     CreateItemWindow( Window *pParent );
+    virtual Window*		CreateItemWindow( Window *pParent );
 };
 
 /** base class for list boxes which need to update their content according to the list
@@ -83,31 +83,31 @@ private:
 class BasicLibBox : public DocListenerBox
 {
 private:
-    String          aCurText;
-    BOOL            bIgnoreSelect;
-    BOOL            bFillBox;
+    String			aCurText;
+    BOOL			bIgnoreSelect;
+    BOOL			bFillBox;
     com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame;
 
-    void            ReleaseFocus();
+    void			ReleaseFocus();
     void            InsertEntries( const ScriptDocument& rDocument, LibraryLocation eLocation );
 
     void            ClearBox();
-    void            NotifyIDE();
+    void			NotifyIDE();
 
     // DocListenerBox
-    virtual void    FillBox();
+    virtual void	FillBox();
 
 protected:
-    virtual void    Select();
-    virtual long    PreNotify( NotifyEvent& rNEvt );
+    virtual void 	Select();
+    virtual long	PreNotify( NotifyEvent& rNEvt );
 
 public:
                     BasicLibBox( Window* pParent,
                                  const com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
                     ~BasicLibBox();
 
-    using           Window::Update;
-    void            Update( const SfxStringItem* pItem );
+    using			Window::Update;
+    void			Update( const SfxStringItem* pItem );
 };
 
 class LanguageBoxControl: public SfxToolBoxControl
@@ -118,37 +118,37 @@ public:
                         LanguageBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
                         ~LanguageBoxControl();
 
-    virtual void        StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
-    virtual Window*     CreateItemWindow( Window *pParent );
+    virtual void		StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual Window*		CreateItemWindow( Window *pParent );
 };
 
 class BasicLanguageBox : public DocListenerBox
 {
 private:
-    String          m_sNotLocalizedStr;
-    String          m_sDefaultLanguageStr;
-    String          m_sCurrentText;
+    String			m_sNotLocalizedStr;
+    String			m_sDefaultLanguageStr;
+    String			m_sCurrentText;
 
-    bool            m_bIgnoreSelect;
+    bool			m_bIgnoreSelect;
 
     void            ClearBox();
-    void            SetLanguage();
+    void			SetLanguage();
 
     // DocListenerBox
-    virtual void    FillBox();
+    virtual void	FillBox();
 
 protected:
-    virtual void    Select();
-    virtual long    PreNotify( NotifyEvent& rNEvt );
+    virtual void 	Select();
+    virtual long	PreNotify( NotifyEvent& rNEvt );
 
 public:
     BasicLanguageBox( Window* pParent );
     ~BasicLanguageBox();
 
-    using           Window::Update;
-    void            Update( const SfxStringItem* pItem );
+    using			Window::Update;
+    void			Update( const SfxStringItem* pItem );
 };
 
-#endif  // _BASICBOX_HXX
+#endif	// _BASICBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basicmod.hxx b/basctl/source/basicide/basicmod.hxx
index da7556613561..8bbc72fa1b2e 100644
--- a/basctl/source/basicide/basicmod.hxx
+++ b/basctl/source/basicide/basicmod.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/basctl/source/basicide/basicprint.src b/basctl/source/basicide/basicprint.src
index 1f301d3461a9..a5d9a8351673 100644
--- a/basctl/source/basicide/basicprint.src
+++ b/basctl/source/basicide/basicprint.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/basctl/source/basicide/basicrenderable.cxx b/basctl/source/basicide/basicrenderable.cxx
index 889e09b7f633..6946f5a44537 100644
--- a/basctl/source/basicide/basicrenderable.cxx
+++ b/basctl/source/basicide/basicrenderable.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ BasicRenderable::BasicRenderable( IDEBaseWindow* pWin )
                                                   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PageRange" ) ),
                                                   rtl::OUString(),
                                                   aPageRangeOpt
-                                                  );
+                                                  ); 
 }
 
 BasicRenderable::~BasicRenderable()
@@ -130,10 +130,10 @@ sal_Int32 SAL_CALL BasicRenderable::getRendererCount (
         else
             throw lang::IllegalArgumentException();
     }
-
+    
     return nCount;
 }
-
+    
 Sequence<beans::PropertyValue> SAL_CALL BasicRenderable::getRenderer (
         sal_Int32, const Any&, const Sequence<beans::PropertyValue>& i_xOptions
         ) throw (lang::IllegalArgumentException, RuntimeException)
@@ -147,7 +147,7 @@ Sequence<beans::PropertyValue> SAL_CALL BasicRenderable::getRenderer (
     if( pPrinter )
     {
         Size aPageSize( pPrinter->PixelToLogic( pPrinter->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) ) );
-
+        
         aVals.realloc( 1 );
         aVals[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PageSize" ) );
         awt::Size aSize;
@@ -155,12 +155,12 @@ Sequence<beans::PropertyValue> SAL_CALL BasicRenderable::getRenderer (
         aSize.Height = aPageSize.Height();
         aVals[0].Value <<= aSize;
     }
-
+        
     appendPrintUIOptions( aVals );
 
     return aVals;
 }
-
+    
 void SAL_CALL BasicRenderable::render (
         sal_Int32 nRenderer, const Any&,
         const Sequence<beans::PropertyValue>& i_xOptions
diff --git a/basctl/source/basicide/basicrenderable.hxx b/basctl/source/basicide/basicrenderable.hxx
index aadddae90ed0..baa5eba87810 100644
--- a/basctl/source/basicide/basicrenderable.hxx
+++ b/basctl/source/basicide/basicrenderable.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class BasicRenderable :
 {
     IDEBaseWindow*      mpWindow;
     osl::Mutex          maMutex;
-
+    
     Printer* getPrinter();
 public:
     BasicRenderable( IDEBaseWindow* pWin );
@@ -54,13 +54,13 @@ public:
         const com::sun::star::uno::Any& aSelection,
         const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue >& xOptions)
         throw (com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException);
-
+    
     virtual com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> SAL_CALL getRenderer (
         sal_Int32 nRenderer,
         const com::sun::star::uno::Any& rSelection,
         const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rxOptions)
         throw (com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException);
-
+    
     virtual void SAL_CALL render (
         sal_Int32 nRenderer,
         const com::sun::star::uno::Any& rSelection,
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index ef1289736106..ba94bd5a1647 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,18 +71,18 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
 
-#define SPLIT_MARGIN    5
-#define SPLIT_HEIGHT    2
+#define SPLIT_MARGIN	5
+#define SPLIT_HEIGHT	2
 
-#define LMARGPRN        1700
-#define RMARGPRN         900
-#define TMARGPRN        2000
-#define BMARGPRN        1000
-#define BORDERPRN       300
+#define LMARGPRN		1700
+#define RMARGPRN		 900
+#define TMARGPRN    	2000
+#define BMARGPRN    	1000
+#define BORDERPRN		300
 
-#define APPWAIT_START   100
+#define APPWAIT_START	100
 
-#define VALIDWINDOW     0x1234
+#define VALIDWINDOW		0x1234
 
 #if defined(OW) || defined(MTF)
 #define FILTERMASK_ALL "*"
@@ -102,16 +102,16 @@ using namespace comphelper;
 DBG_NAME( ModulWindow )
 
 TYPEINIT1( ModulWindow , IDEBaseWindow );
-
+ 
 void lcl_PrintHeader( Printer* pPrinter, USHORT nPages, USHORT nCurPage, const String& rTitle, bool bOutput )
 {
-    short nLeftMargin   = LMARGPRN;
+    short nLeftMargin 	= LMARGPRN;
     Size aSz = pPrinter->GetOutputSize();
     short nBorder = BORDERPRN;
 
     const Color aOldLineColor( pPrinter->GetLineColor() );
     const Color aOldFillColor( pPrinter->GetFillColor() );
-    const Font  aOldFont( pPrinter->GetFont() );
+    const Font	aOldFont( pPrinter->GetFont() );
 
     pPrinter->SetLineColor( Color( COL_BLACK ) );
     pPrinter->SetFillColor();
@@ -181,13 +181,13 @@ void lcl_ConvertTabsToSpaces( String& rLine )
                 rLine.Insert( aBlanker, nPos );
                 nMax = rLine.Len();
             }
-            nPos++; // Nicht optimal, falls Tab, aber auch nicht verkehrt...
+            nPos++;	// Nicht optimal, falls Tab, aber auch nicht verkehrt...
         }
     }
 }
 
 
-ModulWindow::ModulWindow( ModulWindowLayout* pParent, const ScriptDocument& rDocument, String aLibName,
+ModulWindow::ModulWindow( ModulWindowLayout* pParent, const ScriptDocument& rDocument, String aLibName, 
                           String aName, ::rtl::OUString& aModule )
         :IDEBaseWindow( pParent, rDocument, aLibName, aName )
         ,aXEditorWindow( this )
@@ -203,10 +203,10 @@ ModulWindow::ModulWindow( ModulWindowLayout* pParent, const ScriptDocument& rDoc
 
 SbModuleRef ModulWindow::XModule()
 {
-    // ModuleWindows can now be created as a result of the
+    // ModuleWindows can now be created as a result of the 
     // modules getting created via the api. This is a result of an
     // elementInserted event from the BasicLibrary container.
-    // However the SbModule is also created from a different listener to
+    // However the SbModule is also created from a different listener to 
     // the same event ( in basmgr ) Therefore it is possible when we look
     // for xModule it may not yet be available, here we keep tring to access
     // the module until such time as it exists
@@ -252,9 +252,9 @@ void ModulWindow::DoInit()
     if ( GetVScrollBar() )
         GetVScrollBar()->Hide();
     GetHScrollBar()->Show();
-//  GetEditorWindow().SetScrollBarRanges();
+//	GetEditorWindow().SetScrollBarRanges();
     GetEditorWindow().InitScrollBars();
-//  GetEditorWindow().GrabFocus();
+//	GetEditorWindow().GrabFocus();
 }
 
 
@@ -376,7 +376,7 @@ BOOL ModulWindow::BasicExecute()
             ClearStatus( BASWIN_RUNNINGBASIC );
         }
         else
-            aStatus.bIsRunning = FALSE; // Abbruch von Reschedule()
+            aStatus.bIsRunning = FALSE;	// Abbruch von Reschedule()
     }
 
     BOOL bDone = !aStatus.bError;
@@ -482,7 +482,7 @@ BOOL ModulWindow::LoadBasic()
             GetEditEngine()->SetUpdateMode( FALSE );
             GetEditView()->Read( *pStream );
             GetEditEngine()->SetUpdateMode( TRUE );
-            GetEditorWindow().Update(); // Es wurde bei UpdateMode = TRUE nur Invalidiert
+            GetEditorWindow().Update();	// Es wurde bei UpdateMode = TRUE nur Invalidiert
             GetEditorWindow().ForceSyntaxTimeout();
             GetEditorWindow().DestroyProgress();
             ULONG nError = aMedium.GetError();
@@ -555,7 +555,7 @@ BOOL ModulWindow::SaveBasicSource()
     return bDone;
 }
 
-BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocument& rDocument, const String& aLibName );
+BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocument& rDocument, const String& aLibName ); 
 
 BOOL ModulWindow::ImportDialog()
 {
@@ -633,7 +633,7 @@ BOOL ModulWindow::BasicToggleBreakPoint()
     AssertValidEditEngine();
 
     TextSelection aSel = GetEditView()->GetSelection();
-    aSel.GetStart().GetPara()++;    // Basic-Zeilen beginnen bei 1!
+    aSel.GetStart().GetPara()++;	// Basic-Zeilen beginnen bei 1!
     aSel.GetEnd().GetPara()++;
 
     BOOL bNewBreakPoint = FALSE;
@@ -690,8 +690,8 @@ IMPL_LINK( ModulWindow, BasicErrorHdl, StarBASIC *, pBasic )
     GoOnTop();
 
     // ReturnWert: BOOL
-    //  FALSE:  Abbrechen
-    //  TRUE:   Weiter....
+    //	FALSE:	Abbrechen
+    //	TRUE:	Weiter....
     String aErrorText( pBasic->GetErrorText() );
     USHORT nErrorLine = pBasic->GetLine() - 1;
     USHORT nErrCol1 = pBasic->GetCol1();
@@ -719,8 +719,8 @@ IMPL_LINK( ModulWindow, BasicErrorHdl, StarBASIC *, pBasic )
     BOOL bMarkError = ( pBasic == GetBasic() ) ? TRUE : FALSE;
     if ( bMarkError )
         aXEditorWindow.GetBrkWindow().SetMarkerPos( nErrorLine, TRUE );
-//  ErrorBox( this, WB_OK | WB_DEF_OK, String( aErrorTextPrefix + aErrorText ) ).Execute();
-//  ErrorHandler::HandleError( pBasic->GetErrorCode() );
+//	ErrorBox( this, WB_OK | WB_DEF_OK, String( aErrorTextPrefix + aErrorText ) ).Execute();
+//	ErrorHandler::HandleError( pBasic->GetErrorCode() );
 
     // #i47002#
     Reference< awt::XWindow > xWindow = VCLUnoHelper::GetInterface( this );
@@ -742,7 +742,7 @@ long __EXPORT ModulWindow::BasicBreakHdl( StarBASIC* pBasic )
     DBG_CHKTHIS( ModulWindow, 0 );
     // Ein GoOnTop aktiviert da Fenster, das veraendert aber den Context fuer
     // das Programm!
-//  GoOnTop();
+//	GoOnTop();
 
     // #i69280 Required in Window despite normal usage in next command!
     (void)pBasic;
@@ -751,7 +751,7 @@ long __EXPORT ModulWindow::BasicBreakHdl( StarBASIC* pBasic )
     USHORT nErrorLine = pBasic->GetLine();
 
     // Gibt es hier einen BreakPoint?
-    BreakPoint* pBrk = GetBreakPoints().FindBreakPoint( nErrorLine );
+    BreakPoint* pBrk = GetBreakPoints().FindBreakPoint( nErrorLine );    
     if ( pBrk )
     {
         pBrk->nHitCount++;
@@ -759,7 +759,7 @@ long __EXPORT ModulWindow::BasicBreakHdl( StarBASIC* pBasic )
             return aStatus.nBasicFlags; // weiterlaufen...
     }
 
-    nErrorLine--;   // EditEngine begint bei 0, Basic bei 1
+    nErrorLine--;	// EditEngine begint bei 0, Basic bei 1
     // Alleine schon damit gescrollt wird...
     AssertValidEditEngine();
     GetEditView()->SetSelection( TextSelection( TextPaM( nErrorLine, 0 ), TextPaM( nErrorLine, 0 ) ) );
@@ -795,7 +795,7 @@ void ModulWindow::BasicAddWatch()
     BOOL bAdd = TRUE;
     if ( !GetEditView()->HasSelection() )
     {
-//      bAdd = GetEditView()->SelectCurrentWord();
+//		bAdd = GetEditView()->SelectCurrentWord();
         TextPaM aWordStart;
         String aWord = GetEditEngine()->GetWord( GetEditView()->GetSelection().GetEnd(), &aWordStart );
         if ( aWord.Len() )
@@ -892,7 +892,7 @@ void __EXPORT ModulWindow::StoreData()
     GetEditorWindow().SetSourceInBasic( TRUE );
     // Nicht das Modify loeschen, sonst wird das Basic nicht gespeichert
     // Es wird beim Speichern sowieso geloescht.
-//  xModule->SetModified( FALSE );
+//	xModule->SetModified( FALSE );
 }
 
 BOOL __EXPORT ModulWindow::CanClose()
@@ -952,11 +952,11 @@ sal_Int32 ModulWindow::FormatAndPrint( Printer* pPrinter, sal_Int32 nPrintPage )
     DBG_CHKTHIS( ModulWindow, 0 );
 
     AssertValidEditEngine();
-
+    
     MapMode eOldMapMode( pPrinter->GetMapMode() );
     Font aOldFont( pPrinter->GetFont() );
 
-//  Font aFont( GetEditEngine()->CreateFontFromItemSet( GetEditEngine()->GetEmptyItemSet() ) );
+//	Font aFont( GetEditEngine()->CreateFontFromItemSet( GetEditEngine()->GetEmptyItemSet() ) );
     Font aFont( GetEditEngine()->GetFont() );
     aFont.SetAlign( ALIGN_BOTTOM );
     aFont.SetTransparent( TRUE );
@@ -1007,7 +1007,7 @@ sal_Int32 ModulWindow::FormatAndPrint( Printer* pPrinter, sal_Int32 nPrintPage )
 
     pPrinter->SetFont( aOldFont );
     pPrinter->SetMapMode( eOldMapMode );
-
+    
     return sal_Int32(nCurPage);
 }
 
@@ -1240,8 +1240,8 @@ String __EXPORT ModulWindow::GetTitle()
 
 void ModulWindow::FrameWindowMoved()
 {
-//  if ( GetEditEngine() && GetEditEngine()->IsInSelectionMode() )
-//      GetEditEngine()->StopSelectionMode();
+//	if ( GetEditEngine() && GetEditEngine()->IsInSelectionMode() )
+//		GetEditEngine()->StopSelectionMode();
 }
 
 
@@ -1395,7 +1395,7 @@ BasicEntryDescriptor ModulWindow::CreateEntryDescriptor()
                     }
                 }
                 break;
-            }
+            }    
             case script::ModuleType::FORM:
                 aLibSubName = String( IDEResId( RID_STR_USERFORMS ) );
                 break;
@@ -1513,7 +1513,7 @@ void __EXPORT ModulWindowLayout::Resize()
 {
     // ScrollBars, etc. passiert in BasicIDEShell:Adjust...
     ArrangeWindows();
-//  Invalidate();
+//	Invalidate();
 }
 
 void __EXPORT ModulWindowLayout::Paint( const Rectangle& )
@@ -1607,8 +1607,8 @@ IMPL_LINK( ModulWindowLayout, SplitHdl, Splitter *, pSplitter )
 BOOL ModulWindowLayout::IsToBeDocked( DockingWindow* pDockingWindow, const Point& rPos, Rectangle& rRect )
 {
     // prueffen, ob als Dock oder als Child:
-    // TRUE:    Floating
-    // FALSE:   Child
+    // TRUE:	Floating
+    // FALSE:	Child
     Point aPosInMe = ScreenToOutputPixel( rPos );
     Size aSz = GetOutputSizePixel();
     if ( ( aPosInMe.X() > 0 ) && ( aPosInMe.X() < aSz.Width() ) &&
diff --git a/basctl/source/basicide/baside2.hrc b/basctl/source/basicide/baside2.hrc
index f97a0d897912..0da8274cc6b1 100644
--- a/basctl/source/basicide/baside2.hrc
+++ b/basctl/source/basicide/baside2.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 // Diese Dateien enthaelt nur die lokalen ID's.
 
 // RID_POPUP_BRKPROPS
-#define RID_BRKPROPS            1
-#define RID_ACTIV               2
+#define RID_BRKPROPS			1
+#define RID_ACTIV				2
 
 // RID_POPUP_BRKDLG
-#define RID_BRKDLG              1
+#define RID_BRKDLG				1
 
 // RID_POPUP_TABBAR
-#define RID_INSERT              1
+#define RID_INSERT				1
 
 // ModulWindowLayout
-#define IMGID_BRKENABLED        ( SID_BASICIDE_IMAGESTART + 20 )
-#define IMGID_BRKDISABLED       ( SID_BASICIDE_IMAGESTART + 21 )
-#define IMGID_STEPMARKER        ( SID_BASICIDE_IMAGESTART + 22 )
-#define IMGID_ERRORMARKER       ( SID_BASICIDE_IMAGESTART + 23 )
+#define IMGID_BRKENABLED		( SID_BASICIDE_IMAGESTART + 20 )
+#define IMGID_BRKDISABLED		( SID_BASICIDE_IMAGESTART + 21 )
+#define IMGID_STEPMARKER		( SID_BASICIDE_IMAGESTART + 22 )
+#define IMGID_ERRORMARKER		( SID_BASICIDE_IMAGESTART + 23 )
 
-#endif  // _BASIDE2_HRC
+#endif	// _BASIDE2_HRC
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index 12ae6a23fb6f..14c4ba3176bb 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class SvxSearchItem;
 
 DBG_NAMEEX( ModulWindow )
 
-#define MARKER_NOMARKER 0xFFFF
+#define MARKER_NOMARKER	0xFFFF
 
 namespace utl
 {
@@ -68,15 +68,15 @@ void setTextEngineText( ExtTextEngine* pEngine, const ::rtl::OUString aStr );
 class ProgressInfo : public SfxProgress
 {
 private:
-    ULONG                   nCurState;
+    ULONG					nCurState;
 
 public:
 
-    inline          ProgressInfo( SfxObjectShell* pObjSh, const String& rText, ULONG nRange );
+    inline			ProgressInfo( SfxObjectShell* pObjSh, const String& rText, ULONG nRange );
 
-//  inline void     StartProgress( const String& rName, ULONG nStates );
-//  inline void     EndProgress();
-    inline void     StepProgress();
+//	inline void		StartProgress( const String& rName, ULONG nStates );
+//	inline void		EndProgress();
+    inline void		StepProgress();
 };
 
 inline ProgressInfo::ProgressInfo( SfxObjectShell* pObjSh, const String& rText, ULONG nRange )
@@ -87,15 +87,15 @@ inline ProgressInfo::ProgressInfo( SfxObjectShell* pObjSh, const String& rText,
 
 // inline void ProgressInfo::StartProgress( const String& rName, ULONG nStates )
 // {
-//  nCurState = 0;
-//  if ( pStbMgr )
-//      pStbMgr->StartProgressMode( rName, nStates );
+// 	nCurState = 0;
+// 	if ( pStbMgr )
+// 		pStbMgr->StartProgressMode( rName, nStates );
 // }
 
 // inline void ProgressInfo::EndProgress()
 // {
-//  if ( pStbMgr )
-//      pStbMgr->EndProgressMode();
+// 	if ( pStbMgr )
+// 		pStbMgr->EndProgressMode();
 //}
 
 inline void ProgressInfo::StepProgress()
@@ -111,87 +111,87 @@ class SourceViewConfig;
 class EditorWindow : public Window, public SfxListener, public utl::ConfigurationListener
 {
 private:
-    ExtTextView*    pEditView;
-    ExtTextEngine*  pEditEngine;
+    ExtTextView*	pEditView;
+    ExtTextEngine*	pEditEngine;
 
     utl::SourceViewConfig* pSourceViewConfig;
 
-    long            nCurTextWidth;
+    long			nCurTextWidth;
 
-    SyntaxHighlighter   aHighlighter;
-    Timer           aSyntaxIdleTimer;
-    Table           aSyntaxLineTable;
+    SyntaxHighlighter	aHighlighter;
+    Timer			aSyntaxIdleTimer;
+    Table			aSyntaxLineTable;
     DECL_LINK( SyntaxTimerHdl, Timer * );
-    ProgressInfo*   pProgress;
-    ModulWindow*    pModulWindow;
+    ProgressInfo*	pProgress;
+    ModulWindow*	pModulWindow;
 
     virtual void DataChanged(DataChangedEvent const & rDCEvt);
 
-    using           Window::Notify;
-    virtual void    Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+    using			Window::Notify;
+    virtual void	Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
-    void            ImpDoHighlight( ULONG nLineOff );
+    void			ImpDoHighlight( ULONG nLineOff );
     void            ImplSetFont();
 
-    BOOL            bHighlightning;
-    BOOL            bDoSyntaxHighlight;
-    BOOL            bDelayHighlight;
+    BOOL			bHighlightning;
+    BOOL			bDoSyntaxHighlight;
+    BOOL			bDelayHighlight;
 
     virtual
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >
     GetComponentInterface(BOOL bCreate = TRUE);
 
 protected:
-    virtual void    Paint( const Rectangle& );
-    virtual void    Resize();
-    virtual void    KeyInput( const KeyEvent& rKeyEvt );
-    virtual void    MouseMove( const MouseEvent& rMEvt );
-    virtual void    MouseButtonDown( const MouseEvent& rMEvt );
-    virtual void    MouseButtonUp( const MouseEvent& rMEvt );
-    virtual void    Command( const CommandEvent& rCEvt );
-    virtual void    LoseFocus();
-    virtual void    RequestHelp( const HelpEvent& rHEvt );
+    virtual void	Paint( const Rectangle& );
+    virtual void	Resize();
+    virtual void	KeyInput( const KeyEvent& rKeyEvt );
+    virtual void	MouseMove( const MouseEvent& rMEvt );
+    virtual void	MouseButtonDown( const MouseEvent& rMEvt );
+    virtual void	MouseButtonUp( const MouseEvent& rMEvt );
+    virtual void	Command( const CommandEvent& rCEvt );
+    virtual void	LoseFocus();
+    virtual void	RequestHelp( const HelpEvent& rHEvt );
     virtual void    ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
 
-    void            DoSyntaxHighlight( ULONG nPara );
-    String          GetWordAtCursor();
-    BOOL            ImpCanModify();
+    void			DoSyntaxHighlight( ULONG nPara );
+    String			GetWordAtCursor();
+    BOOL			ImpCanModify();
 
 public:
                     EditorWindow( Window* pParent );
                     ~EditorWindow();
 
-    ExtTextEngine*  GetEditEngine() const   { return (ExtTextEngine*)pEditEngine; }
-    ExtTextView*    GetEditView() const     { return pEditView; }
-    ProgressInfo*   GetProgress() const     { return pProgress; }
+    ExtTextEngine*	GetEditEngine()	const	{ return (ExtTextEngine*)pEditEngine; }
+    ExtTextView*	GetEditView() const		{ return pEditView; }
+    ProgressInfo*	GetProgress() const		{ return pProgress; }
 
-    void            CreateProgress( const String& rText, ULONG nRange );
-    void            DestroyProgress();
+    void			CreateProgress( const String& rText, ULONG nRange );
+    void			DestroyProgress();
 
-    void            ParagraphInsertedDeleted( ULONG nNewPara, BOOL bInserted );
-    void            DoDelayedSyntaxHighlight( ULONG nPara );
+    void			ParagraphInsertedDeleted( ULONG nNewPara, BOOL bInserted );
+    void			DoDelayedSyntaxHighlight( ULONG nPara );
 
-    void            CreateEditEngine();
-    void            SetScrollBarRanges();
-    void            InitScrollBars();
-    void            SetModulWindow( ModulWindow* pWin )
+    void			CreateEditEngine();
+    void			SetScrollBarRanges();
+    void			InitScrollBars();
+    void			SetModulWindow( ModulWindow* pWin )
                         { pModulWindow = pWin; }
 
-    void            ForceSyntaxTimeout();
-    BOOL            SetSourceInBasic( BOOL bQuiet = TRUE );
+    void			ForceSyntaxTimeout();
+    BOOL			SetSourceInBasic( BOOL bQuiet = TRUE );
 
-    BOOL            CanModify() { return ImpCanModify(); }
+    BOOL			CanModify() { return ImpCanModify(); }
 };
 
 
 class BreakPointWindow : public Window
 {
 private:
-    long            nCurYOffset;
-    USHORT          nMarkerPos;
-    BreakPointList  aBreakPointList;
-    ModulWindow*    pModulWindow;
-    BOOL            bErrorMarker;
+    long			nCurYOffset;
+    USHORT			nMarkerPos;
+    BreakPointList	aBreakPointList;
+    ModulWindow*	pModulWindow;
+    BOOL			bErrorMarker;
     bool m_bHighContrastMode;
 
     virtual void DataChanged(DataChangedEvent const & rDCEvt);
@@ -199,27 +199,27 @@ private:
     void setBackgroundColor(Color aColor);
 
 protected:
-    virtual void    Paint( const Rectangle& );
-    virtual void    Resize();
-    BreakPoint*     FindBreakPoint( const Point& rMousePos );
-    void            ShowMarker( BOOL bShow );
-    virtual void    MouseButtonDown( const MouseEvent& rMEvt );
-    virtual void    Command( const CommandEvent& rCEvt );
+    virtual void	Paint( const Rectangle& );
+    virtual void	Resize();
+    BreakPoint* 	FindBreakPoint( const Point& rMousePos );
+    void			ShowMarker( BOOL bShow );
+    virtual void	MouseButtonDown( const MouseEvent& rMEvt );
+    virtual void	Command( const CommandEvent& rCEvt );
 
-    BOOL            SyncYOffset();
+    BOOL			SyncYOffset();
 
 public:
                     BreakPointWindow( Window* pParent );
                     ~BreakPointWindow();
 
-    void            SetModulWindow( ModulWindow* pWin )
+    void			SetModulWindow( ModulWindow* pWin )
                         { pModulWindow = pWin; }
 
-    void            SetMarkerPos( USHORT nLine, BOOL bErrorMarker = FALSE );
+    void			SetMarkerPos( USHORT nLine, BOOL bErrorMarker = FALSE );
 
-    void            DoScroll( long nHorzScroll, long nVertScroll );
-    long&           GetCurYOffset()         { return nCurYOffset; }
-    BreakPointList& GetBreakPoints()        { return aBreakPointList; }
+    void			DoScroll( long nHorzScroll, long nVertScroll );
+    long&			GetCurYOffset() 		{ return nCurYOffset; }
+    BreakPointList&	GetBreakPoints()		{ return aBreakPointList; }
 };
 
 
@@ -228,31 +228,31 @@ class WatchTreeListBox : public SvHeaderTabListBox
     String aEditingRes;
 
 protected:
-    virtual BOOL    EditingEntry( SvLBoxEntry* pEntry, Selection& rSel  );
-    virtual BOOL    EditedEntry( SvLBoxEntry* pEntry, const String& rNewText );
+    virtual BOOL	EditingEntry( SvLBoxEntry* pEntry, Selection& rSel  );
+    virtual BOOL	EditedEntry( SvLBoxEntry* pEntry, const String& rNewText );
 
-    BOOL            ImplBasicEntryEdited( SvLBoxEntry* pEntry, const String& rResult );
-    SbxBase*        ImplGetSBXForEntry( SvLBoxEntry* pEntry, bool& rbArrayElement );
+    BOOL 			ImplBasicEntryEdited( SvLBoxEntry* pEntry, const String& rResult );
+    SbxBase*		ImplGetSBXForEntry( SvLBoxEntry* pEntry, bool& rbArrayElement );
 
-//  virtual DragDropMode    NotifyBeginDrag( SvLBoxEntry* );
-//  virtual BOOL    NotifyQueryDrop( SvLBoxEntry* );
+//	virtual DragDropMode	NotifyBeginDrag( SvLBoxEntry* );
+//	virtual BOOL	NotifyQueryDrop( SvLBoxEntry* );
 
-//  virtual BOOL    NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
-//                      SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos );
-//  virtual BOOL    NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
-//                      SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos );
-//  BOOL            NotifyCopyingMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
-//                      SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos, BOOL bMove );
+//	virtual BOOL	NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
+//						SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos );
+//	virtual BOOL	NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
+//						SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos );
+//	BOOL			NotifyCopyingMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
+//						SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos, BOOL bMove );
 
 public:
     WatchTreeListBox( Window* pParent, WinBits nWinBits );
     ~WatchTreeListBox();
 
-    void            RequestingChilds( SvLBoxEntry * pParent );
-    void            UpdateWatches( bool bBasicStopped = false );
+    void			RequestingChilds( SvLBoxEntry * pParent );
+    void			UpdateWatches( bool bBasicStopped = false );
 
-    using           SvTabListBox::SetTabs;
-    virtual void    SetTabs();
+    using			SvTabListBox::SetTabs;
+    virtual void	SetTabs();
 };
 
 
@@ -260,15 +260,15 @@ public:
 class WatchWindow : public BasicDockingWindow
 {
 private:
-    String              aWatchStr;
-    ExtendedEdit        aXEdit;
-    ImageButton         aRemoveWatchButton;
-    WatchTreeListBox    aTreeListBox;
-    HeaderBar           aHeaderBar;
+    String				aWatchStr;
+    ExtendedEdit		aXEdit;
+    ImageButton 		aRemoveWatchButton;
+    WatchTreeListBox	aTreeListBox;
+    HeaderBar			aHeaderBar;
 
 protected:
-    virtual void    Resize();
-    virtual void    Paint( const Rectangle& rRect );
+    virtual void	Resize();
+    virtual void	Paint( const Rectangle& rRect );
 
     DECL_LINK( ButtonHdl, ImageButton * );
     DECL_LINK( TreeListHdl, SvTreeListBox * );
@@ -280,57 +280,57 @@ public:
                     WatchWindow( Window* pParent );
                     ~WatchWindow();
 
-    void            AddWatch( const String& rVName );
-    BOOL            RemoveSelectedWatch();
-    void            UpdateWatches( bool bBasicStopped = false );
+    void			AddWatch( const String& rVName );
+    BOOL			RemoveSelectedWatch();
+    void			UpdateWatches( bool bBasicStopped = false );
 
-    WatchTreeListBox&   GetWatchTreeListBox() { return aTreeListBox; }
+    WatchTreeListBox&	GetWatchTreeListBox() { return aTreeListBox; }
 };
 
 
 class StackWindow : public BasicDockingWindow
 {
 private:
-    SvTreeListBox   aTreeListBox;
-    ImageButton     aGotoCallButton;
-    String          aStackStr;
+    SvTreeListBox	aTreeListBox;
+    ImageButton 	aGotoCallButton;
+    String			aStackStr;
 
 protected:
-    virtual void    Resize();
-    virtual void    Paint( const Rectangle& rRect );
+    virtual void	Resize();
+    virtual void	Paint( const Rectangle& rRect );
     DECL_LINK( ButtonHdl, ImageButton * );
 
 public:
                     StackWindow( Window* pParent );
                     ~StackWindow();
 
-    void            UpdateCalls();
+    void			UpdateCalls();
 };
 
 
 class ComplexEditorWindow : public Window
 {
 private:
-    BreakPointWindow    aBrkWindow;
-    EditorWindow        aEdtWindow;
-    ScrollBar           aEWVScrollBar;
+    BreakPointWindow	aBrkWindow;
+    EditorWindow		aEdtWindow;
+    ScrollBar			aEWVScrollBar;
 
     virtual void DataChanged(DataChangedEvent const & rDCEvt);
 
 protected:
-    virtual void        Resize();
+    virtual void		Resize();
     DECL_LINK( ScrollHdl, ScrollBar * );
 
 public:
                         ComplexEditorWindow( ModulWindow* pParent );
 
-    BreakPointWindow&   GetBrkWindow()      { return aBrkWindow; }
-    EditorWindow&       GetEdtWindow()      { return aEdtWindow; }
-    ScrollBar&          GetEWVScrollBar()   { return aEWVScrollBar; }
+    BreakPointWindow&	GetBrkWindow() 		{ return aBrkWindow; }
+    EditorWindow&		GetEdtWindow() 		{ return aEdtWindow; }
+    ScrollBar&			GetEWVScrollBar() 	{ return aEWVScrollBar; }
 };
 
 
-#define SYNTAX_COLOR_MAX    5
+#define SYNTAX_COLOR_MAX	5
 
 class ModulWindow: public IDEBaseWindow
 {
@@ -338,32 +338,32 @@ class ModulWindow: public IDEBaseWindow
 
 private:
     StarBASICRef        xBasic;
-    short               nValid;
+    short				nValid;
     ComplexEditorWindow aXEditorWindow;
-    BasicStatus         aStatus;
-    SbModuleRef         xModule;
-    ModulWindowLayout*  pLayout;
-    String              aCurPath;
-    ::rtl::OUString     m_aModule;
+    BasicStatus 		aStatus;
+    SbModuleRef 		xModule;
+    ModulWindowLayout*	pLayout;
+    String				aCurPath;
+    ::rtl::OUString		m_aModule;
 
     DECL_LINK( BasicErrorHdl, StarBASIC * );
-    long                BasicBreakHdl( StarBASIC* pBasic );
+    long				BasicBreakHdl( StarBASIC* pBasic );
 
-    void                CheckCompileBasic();
-    BOOL                BasicExecute();
+    void				CheckCompileBasic();
+    BOOL				BasicExecute();
 
-    void                GoOnTop();
-    void                AssertValidEditEngine();
+    void				GoOnTop();
+    void				AssertValidEditEngine();
 
     sal_Int32           FormatAndPrint( Printer* pPrinter, sal_Int32 nPage = -1 );
-    SbModuleRef         XModule();
+    SbModuleRef 		XModule();
 protected:
-    virtual void    Resize();
-    virtual void    GetFocus();
-    virtual void    Paint( const Rectangle& );
-    virtual void    Deactivating();
-    virtual void    DoInit();
-    virtual void    DoScroll( ScrollBar* pCurScrollBar );
+    virtual void	Resize();
+    virtual void	GetFocus();
+    virtual void	Paint( const Rectangle& );
+    virtual void	Deactivating();
+    virtual void	DoInit();
+    virtual void	DoScroll( ScrollBar* pCurScrollBar );
 
 public:
                     TYPEINFO();
@@ -373,93 +373,93 @@ public:
 
                     ~ModulWindow();
 
-    virtual void    ExecuteCommand( SfxRequest& rReq );
-    virtual void    GetState( SfxItemSet& );
-    virtual void    StoreData();
-    virtual void    UpdateData();
-    virtual BOOL    CanClose();
-    // virtual void PrintData( Printer* pPrinter );
+    virtual void	ExecuteCommand( SfxRequest& rReq );
+    virtual void	GetState( SfxItemSet& );
+    virtual void	StoreData();
+    virtual void	UpdateData();
+    virtual BOOL 	CanClose();
+    // virtual void	PrintData( Printer* pPrinter );
     // return number of pages to be printed
     virtual sal_Int32 countPages( Printer* pPrinter );
     // print page
     virtual void printPage( sal_Int32 nPage, Printer* pPrinter );
-    virtual String  GetTitle();
+    virtual String	GetTitle();
     virtual BasicEntryDescriptor CreateEntryDescriptor();
-    virtual BOOL    AllowUndo();
-    virtual void    SetReadOnly( BOOL bReadOnly );
+    virtual BOOL	AllowUndo();
+    virtual void	SetReadOnly( BOOL bReadOnly );
     virtual BOOL    IsReadOnly();
 
     StarBASIC*      GetBasic() { XModule(); return xBasic; }
 
-    SbModule*       GetSbModule() { return xModule; }
-    void            SetSbModule( SbModule* pModule ) { xModule = pModule; }
-    String          GetSbModuleName();
+    SbModule*		GetSbModule() { return xModule; }
+    void			SetSbModule( SbModule* pModule ) { xModule = pModule; }
+    String			GetSbModuleName();
 
-    BOOL            CompileBasic();
-    BOOL            BasicRun();
-    BOOL            BasicStepOver();
-    BOOL            BasicStepInto();
-    BOOL            BasicStepOut();
-    void            BasicStop();
-    BOOL            BasicToggleBreakPoint();
-    void            BasicToggleBreakPointEnabled();
-    void            ManageBreakPoints();
-    void            UpdateBreakPoint( const BreakPoint& rBrk );
-    void            BasicAddWatch();
-    void            BasicRemoveWatch();
+    BOOL			CompileBasic();
+    BOOL			BasicRun();
+    BOOL			BasicStepOver();
+    BOOL			BasicStepInto();
+    BOOL			BasicStepOut();
+    void			BasicStop();
+    BOOL			BasicToggleBreakPoint();
+    void			BasicToggleBreakPointEnabled();
+    void			ManageBreakPoints();
+    void			UpdateBreakPoint( const BreakPoint& rBrk );
+    void			BasicAddWatch();
+    void			BasicRemoveWatch();
 
-    BOOL            LoadBasic();
-    BOOL            SaveBasicSource();
-    BOOL            ImportDialog();
+    BOOL			LoadBasic();
+    BOOL			SaveBasicSource();
+    BOOL			ImportDialog();
 
-    void            EditMacro( const String& rMacroName );
+    void			EditMacro( const String& rMacroName );
 
-//  void            InsertFromObjectCatalog( ObjectCatalog* pObjDlg );
+//	void			InsertFromObjectCatalog( ObjectCatalog* pObjDlg );
 
-    BOOL            ToggleBreakPoint( ULONG nLine );
+    BOOL			ToggleBreakPoint( ULONG nLine );
 
-    BasicStatus&    GetBasicStatus() { return aStatus; }
+    BasicStatus&	GetBasicStatus() { return aStatus; }
 
-    virtual BOOL    IsModified();
+    virtual BOOL	IsModified();
     virtual BOOL    IsPasteAllowed();
 
-    void            FrameWindowMoved();
-    void            ShowCursor( BOOL bOn );
+    void			FrameWindowMoved();
+    void			ShowCursor( BOOL bOn );
 
-    virtual USHORT  GetSearchOptions();
-    USHORT          StartSearchAndReplace( const SvxSearchItem& rSearchItem, BOOL bFromStart = FALSE );
+    virtual USHORT	GetSearchOptions();
+    USHORT			StartSearchAndReplace( const SvxSearchItem& rSearchItem, BOOL bFromStart = FALSE );
 
     virtual Window* GetLayoutWindow();
 
-    EditorWindow&       GetEditorWindow()       { return aXEditorWindow.GetEdtWindow(); }
-    BreakPointWindow&   GetBreakPointWindow()   { return aXEditorWindow.GetBrkWindow(); }
-    ScrollBar&          GetEditVScrollBar()     { return aXEditorWindow.GetEWVScrollBar(); }
-    ExtTextEngine*      GetEditEngine()         { return GetEditorWindow().GetEditEngine(); }
-    ExtTextView*        GetEditView()           { return GetEditorWindow().GetEditView(); }
-    BreakPointList&     GetBreakPoints()        { return GetBreakPointWindow().GetBreakPoints(); }
-    ModulWindowLayout*  GetLayout() const       { return pLayout; }
+    EditorWindow&		GetEditorWindow() 		{ return aXEditorWindow.GetEdtWindow(); }
+    BreakPointWindow&	GetBreakPointWindow() 	{ return aXEditorWindow.GetBrkWindow(); }
+    ScrollBar&			GetEditVScrollBar() 	{ return aXEditorWindow.GetEWVScrollBar(); }
+    ExtTextEngine*		GetEditEngine() 		{ return GetEditorWindow().GetEditEngine(); }
+    ExtTextView*		GetEditView() 			{ return GetEditorWindow().GetEditView(); }
+    BreakPointList& 	GetBreakPoints()		{ return GetBreakPointWindow().GetBreakPoints(); }
+    ModulWindowLayout*	GetLayout() const 		{ return pLayout; }
 
-    virtual void        BasicStarted();
-    virtual void        BasicStopped();
+    virtual void		BasicStarted();
+    virtual void		BasicStopped();
 
-    virtual SfxUndoManager* GetUndoManager();
+    virtual SfxUndoManager*	GetUndoManager();
 
-    const ::rtl::OUString&  GetModule() const { return m_aModule; }
-    void                    SetModule( const ::rtl::OUString& aModule ) { m_aModule = aModule; }
+    const ::rtl::OUString&	GetModule() const { return m_aModule; }
+    void					SetModule( const ::rtl::OUString& aModule ) { m_aModule = aModule; }
 };
 
 class ModulWindowLayout: public Window, public utl::ConfigurationListener
 {
 private:
 
-    Splitter        aVSplitter;
-    Splitter        aHSplitter;
+    Splitter		aVSplitter;
+    Splitter		aHSplitter;
 
-    WatchWindow     aWatchWindow;
-    StackWindow     aStackWindow;
+    WatchWindow 	aWatchWindow;
+    StackWindow 	aStackWindow;
 
-    BOOL            bVSplitted;
-    BOOL            bHSplitted;
+    BOOL			bVSplitted;
+    BOOL			bHSplitted;
 
     ModulWindow * m_pModulWindow;
 
@@ -480,21 +480,21 @@ private:
     void            ArrangeWindows();
 
 protected:
-    virtual void    Resize();
-    virtual void    Paint( const Rectangle& rRect );
+    virtual void	Resize();
+    virtual void	Paint( const Rectangle& rRect );
 
 public:
                     ModulWindowLayout( Window* pParent );
                     ~ModulWindowLayout();
 
-    void            DockaWindow( DockingWindow* pDockingWin );
-    BOOL            IsToBeDocked( DockingWindow* pDockingWin, const Point& rPos, Rectangle& rRect );
+    void			DockaWindow( DockingWindow* pDockingWin );
+    BOOL			IsToBeDocked( DockingWindow* pDockingWin, const Point& rPos, Rectangle& rRect );
 
-    void            SetModulWindow( ModulWindow* pModWin );
-    ModulWindow*    GetModulWindow() const { return m_pModulWindow; }
+    void			SetModulWindow( ModulWindow* pModWin );
+    ModulWindow*	GetModulWindow() const { return m_pModulWindow; }
 
-    WatchWindow&    GetWatchWindow()    { return aWatchWindow; }
-    StackWindow&    GetStackWindow()    { return aStackWindow; }
+    WatchWindow& 	GetWatchWindow()	{ return aWatchWindow; }
+    StackWindow& 	GetStackWindow()	{ return aStackWindow; }
 
     Image getImage(USHORT nId, bool bHighContrastMode) const;
 
@@ -502,6 +502,6 @@ public:
     { return m_aSyntaxColors[eType]; }
 };
 
-#endif  // _BASIDE2_HXX
+#endif	// _BASIDE2_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 2fa67b22fb48..d5745f23bd1d 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
 
-long nVirtToolBoxHeight;    // wird im WatchWindow init., im Stackwindow verw.
+long nVirtToolBoxHeight;	// wird im WatchWindow init., im Stackwindow verw.
 long nHeaderBarHeight;
 
-#define SCROLL_LINE     12
-#define SCROLL_PAGE     60
+#define SCROLL_LINE		12
+#define SCROLL_PAGE		60
 
-#define DWBORDER        3
+#define DWBORDER		3
 
 static const char cSuffixes[] = "%&!#@$";
 
@@ -190,7 +190,7 @@ __EXPORT EditorWindow::~EditorWindow()
     {
         EndListening( *pEditEngine );
         pEditEngine->RemoveView( pEditView );
-//      pEditEngine->SetViewWin( 0 );
+//		pEditEngine->SetViewWin( 0 );
         delete pEditView;
         delete pEditEngine;
     }
@@ -288,7 +288,7 @@ void __EXPORT EditorWindow::RequestHelp( const HelpEvent& rHEvt )
                         else if ( (BYTE)eType != (BYTE)SbxEMPTY )
                         {
                             aHelpText = pVar->GetName();
-                            if ( !aHelpText.Len() )     // Bei Uebergabeparametern wird der Name nicht kopiert
+                            if ( !aHelpText.Len() ) 	// Bei Uebergabeparametern wird der Name nicht kopiert
                                 aHelpText = aWord;
                             aHelpText += '=';
                             aHelpText += pVar->GetString();
@@ -320,7 +320,7 @@ void __EXPORT EditorWindow::Resize()
     if ( pEditView )
     {
         long nVisY = pEditView->GetStartDocPos().Y();
-//      pEditView->SetOutputArea( Rectangle( Point( 0, 0 ), GetOutputSize() ) );
+//		pEditView->SetOutputArea( Rectangle( Point( 0, 0 ), GetOutputSize() ) );
         pEditView->ShowCursor();
         Size aOutSz( GetOutputSizePixel() );
         long nMaxVisAreaStart = pEditView->GetTextEngine()->GetTextHeight() - aOutSz.Height();
@@ -406,7 +406,7 @@ BOOL EditorWindow::ImpCanModify()
 
 void __EXPORT EditorWindow::KeyInput( const KeyEvent& rKEvt )
 {
-    if ( !pEditView )   // Passiert unter W95 bei letzte Version, Ctrl-Tab
+    if ( !pEditView )	// Passiert unter W95 bei letzte Version, Ctrl-Tab
         return;
 
 #if OSL_DEBUG_LEVEL > 1
@@ -471,7 +471,7 @@ void __EXPORT EditorWindow::KeyInput( const KeyEvent& rKEvt )
 
 void __EXPORT EditorWindow::Paint( const Rectangle& rRect )
 {
-    if ( !pEditEngine )     // spaetestens jetzt brauche ich sie...
+    if ( !pEditEngine )		// spaetestens jetzt brauche ich sie...
         CreateEditEngine();
 
     pEditView->Paint( rRect );
@@ -489,7 +489,7 @@ BOOL EditorWindow::SetSourceInBasic( BOOL bQuiet )
 
     BOOL bChanged = FALSE;
     if ( pEditEngine && pEditEngine->IsModified()
-        && !GetEditView()->IsReadOnly() )   // Added because of #i60626, otherwise
+        && !GetEditView()->IsReadOnly() )	// Added because of #i60626, otherwise
             // any read only bug in the text engine could lead to a crash later
     {
         if ( !StarBASIC::IsRunning() ) // Nicht zur Laufzeit!
@@ -558,7 +558,7 @@ void EditorWindow::CreateEditEngine()
     aHighlighter.initialize( HIGHLIGHT_BASIC );
 
     BOOL bWasDoSyntaxHighlight = bDoSyntaxHighlight;
-    bDoSyntaxHighlight = FALSE; // Bei grossen Texten zu langsam...
+    bDoSyntaxHighlight = FALSE;	// Bei grossen Texten zu langsam...
     ::rtl::OUString aOUSource( pModulWindow->GetModule() );
     sal_Int32 nLines = 0;
     sal_Int32 nIndex = -1;
@@ -579,7 +579,7 @@ void EditorWindow::CreateEditEngine()
     pEditView->SetSelection( TextSelection() );
     pModulWindow->GetBreakPointWindow().GetCurYOffset() = 0;
     pEditEngine->SetUpdateMode( TRUE );
-    Update();   // Es wurde bei UpdateMode = TRUE nur Invalidiert
+    Update();	// Es wurde bei UpdateMode = TRUE nur Invalidiert
 
     // Die anderen Fenster auch, damit keine halben Sachen auf dem Bildschirm!
     pModulWindow->GetLayout()->GetWatchWindow().Update();
@@ -957,7 +957,7 @@ __EXPORT BreakPointWindow::~BreakPointWindow()
 
 void __EXPORT BreakPointWindow::Resize()
 {
-/// Invalidate();
+///	Invalidate();
 }
 
 
@@ -1006,10 +1006,10 @@ void BreakPointWindow::SetMarkerPos( USHORT nLine, BOOL bError )
     if ( SyncYOffset() )
         Update();
 
-    ShowMarker( FALSE );    // Alten wegzeichen...
+    ShowMarker( FALSE );	// Alten wegzeichen...
     nMarkerPos = nLine;
     bErrorMarker = bError;
-    ShowMarker( TRUE );     // Neuen zeichnen...
+    ShowMarker( TRUE );		// Neuen zeichnen...
 }
 
 void BreakPointWindow::ShowMarker( BOOL bShow )
@@ -1043,13 +1043,13 @@ void BreakPointWindow::ShowMarker( BOOL bShow )
 
 
 
-BreakPoint* BreakPointWindow::FindBreakPoint( const Point& rMousePos )
+BreakPoint*	BreakPointWindow::FindBreakPoint( const Point& rMousePos )
 {
     long nLineHeight = GetTextHeight();
     long nYPos = rMousePos.Y() + nCurYOffset;
-//  Image aBrk( ((ModulWindowLayout*)pModulWindow->GetLayoutWindow())->GetImage( IMGID_BRKENABLED ) );
-//  Size aBmpSz( aBrk.GetSizePixel() );
-//  aBmpSz = PixelToLogic( aBmpSz );
+//	Image aBrk( ((ModulWindowLayout*)pModulWindow->GetLayoutWindow())->GetImage( IMGID_BRKENABLED ) );
+//	Size aBmpSz( aBrk.GetSizePixel() );
+//	aBmpSz = PixelToLogic( aBmpSz );
 
     BreakPoint* pBrk = GetBreakPoints().First();
     while ( pBrk )
@@ -1263,7 +1263,7 @@ void __EXPORT WatchWindow::Resize()
     Size aSz = GetOutputSizePixel();
     Size aBoxSz( aSz.Width() - 2*DWBORDER, aSz.Height() - nVirtToolBoxHeight - DWBORDER );
 
-    if ( aBoxSz.Width() < 4 )   // < 4, weil noch Border...
+    if ( aBoxSz.Width() < 4 )	// < 4, weil noch Border...
         aBoxSz.Width() = 0;
     if ( aBoxSz.Height() < 4 )
         aBoxSz.Height() = 0;
@@ -1275,13 +1275,13 @@ void __EXPORT WatchWindow::Resize()
     aBoxSz.Height() = nHeaderBarHeight;
     aHeaderBar.SetSizePixel( aBoxSz );
 
-    Invalidate();   //Wegen DrawLine im Paint...
+    Invalidate();	//Wegen DrawLine im Paint...
 }
 
 struct MemberList
 {
-    String*         mpMemberNames;
-    int             mnMemberCount;
+    String*			mpMemberNames;
+    int				mnMemberCount;
 
     MemberList( void )
         : mpMemberNames( NULL )
@@ -1320,14 +1320,14 @@ struct WatchItem
     String          maName;
     String          maDisplayName;
     SbxObjectRef    mpObject;
-    MemberList      maMemberList;
+    MemberList		maMemberList;
 
-    SbxDimArrayRef  mpArray;
-    int             nDimLevel;  // 0 = Root
-    int             nDimCount;
-    short*          pIndices;
+    SbxDimArrayRef	mpArray;
+    int				nDimLevel;	// 0 = Root
+    int				nDimCount;
+    short*			pIndices;
 
-    WatchItem*      mpArrayParentItem;
+    WatchItem*		mpArrayParentItem;
 
     WatchItem( void )
         : nDimLevel( 0 )
@@ -1535,7 +1535,7 @@ StackWindow::StackWindow( Window* pParent ) :
     aSz.Width() += 6;
     aSz.Height() += 6;
     aGotoCallButton.SetSizePixel( aSz );
-//  aGotoCallButton.Show(); // wird vom Basic noch nicht unterstuetzt!
+//	aGotoCallButton.Show();	// wird vom Basic noch nicht unterstuetzt!
     aGotoCallButton.Hide();
 
     // make stack window keyboard accessible
@@ -1564,14 +1564,14 @@ void __EXPORT StackWindow::Resize()
     Size aSz = GetOutputSizePixel();
     Size aBoxSz( aSz.Width() - 2*DWBORDER, aSz.Height() - nVirtToolBoxHeight - DWBORDER );
 
-    if ( aBoxSz.Width() < 4 )   // < 4, weil noch Border...
+    if ( aBoxSz.Width() < 4 )	// < 4, weil noch Border...
         aBoxSz.Width() = 0;
     if ( aBoxSz.Height() < 4 )
         aBoxSz.Height() = 0;
 
     aTreeListBox.SetSizePixel( aBoxSz );
 
-    Invalidate();   //Wegen DrawLine im Paint...
+    Invalidate();	//Wegen DrawLine im Paint...
 }
 
 
@@ -1699,9 +1699,9 @@ void __EXPORT ComplexEditorWindow::Resize()
     aEWVScrollBar.SetPosSizePixel( Point( aOutSz.Width()-DWBORDER-nSBWidth, DWBORDER ), Size( nSBWidth, aSz.Height() ) );
 
     // Macht das EditorWindow, ausserdem hier falsch, da Pixel
-//  aEWVScrollBar.SetPageSize( aEWSz.Height() * 8 / 10 );
-//  aEWVScrollBar.SetVisibleSize( aSz.Height() );
-//  Invalidate();
+//	aEWVScrollBar.SetPageSize( aEWSz.Height() * 8 / 10 );
+//	aEWVScrollBar.SetVisibleSize( aSz.Height() );
+//	Invalidate();
 }
 
 IMPL_LINK( ComplexEditorWindow, ScrollHdl, ScrollBar *, pCurScrollBar )
@@ -2052,7 +2052,7 @@ static void implCollapseModifiedObjectEntry( SvLBoxEntry* pParent, WatchTreeList
 {
     pThis->Collapse( pParent );
 
-    SvLBoxTreeList* pModel = pThis->GetModel();
+    SvLBoxTreeList*	pModel = pThis->GetModel();
     SvLBoxEntry* pDeleteEntry;
     while( (pDeleteEntry = pThis->SvTreeListBox::GetEntry( pParent, 0 )) != NULL )
     {
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 244440823169..df0b7dbf46b4 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <vector>
 #include <basidesh.hrc>
 #include <baside3.hxx>
-#include <localizationmgr.hxx>
+#include <localizationmgr.hxx> 
 #include <accessibledialogwindow.hxx>
 #include <dlged.hxx>
 #include <dlgedmod.hxx>
@@ -84,12 +84,12 @@
 #include <com/sun/star/script/vba/XVBACompatibility.hpp>
 
 using namespace comphelper;
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::ucb;
-using namespace ::com::sun::star::io;
-using namespace ::com::sun::star::resource;
-using namespace ::com::sun::star::ui::dialogs;
+using namespace	::com::sun::star;
+using namespace	::com::sun::star::uno;
+using namespace	::com::sun::star::ucb;
+using namespace	::com::sun::star::io;
+using namespace	::com::sun::star::resource;
+using namespace	::com::sun::star::ui::dialogs;
 
 #if defined(MAC)
 #define FILTERMASK_ALL "****"
@@ -129,7 +129,7 @@ DialogWindow::DialogWindow( Window* pParent, const ScriptDocument& rDocument, St
     // set readonly mode for readonly libraries
     ::rtl::OUString aOULibName( aLibName );
     Reference< script::XLibraryContainer2 > xDlgLibContainer( GetDocument().getLibraryContainer( E_DIALOGS ), UNO_QUERY );
-    if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aOULibName ) && xDlgLibContainer->isLibraryReadOnly( aOULibName ) )
+    if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aOULibName ) && xDlgLibContainer->isLibraryReadOnly( aOULibName ) ) 
         SetReadOnly( TRUE );
 
     if ( rDocument.isDocument() && rDocument.isReadOnly() )
@@ -259,10 +259,10 @@ void DialogWindow::Command( const CommandEvent& rCEvt )
             {
                 pDispatcher->ExecutePopup( IDEResId(RID_POPUP_DLGED) );
             }
-
+            
         }
     }
-    else
+    else	
         IDEBaseWindow::Command( rCEvt );
 }
 
@@ -383,21 +383,21 @@ void __EXPORT DialogWindow::GetState( SfxItemSet& rSet )
                             case OBJ_DLG_GROUPBOX:          nObj = SVX_SNAP_GROUPBOX; break;
                             case OBJ_DLG_EDIT:              nObj = SVX_SNAP_EDIT; break;
                             case OBJ_DLG_FIXEDTEXT:         nObj = SVX_SNAP_FIXEDTEXT; break;
-                            case OBJ_DLG_IMAGECONTROL:      nObj = SVX_SNAP_IMAGECONTROL; break;
-                            case OBJ_DLG_PROGRESSBAR:       nObj = SVX_SNAP_PROGRESSBAR; break;
+                            case OBJ_DLG_IMAGECONTROL:	    nObj = SVX_SNAP_IMAGECONTROL; break;
+                            case OBJ_DLG_PROGRESSBAR:	    nObj = SVX_SNAP_PROGRESSBAR; break;
                             case OBJ_DLG_HSCROLLBAR:        nObj = SVX_SNAP_HSCROLLBAR; break;
                             case OBJ_DLG_VSCROLLBAR:        nObj = SVX_SNAP_VSCROLLBAR; break;
-                            case OBJ_DLG_HFIXEDLINE:        nObj = SVX_SNAP_HFIXEDLINE; break;
-                            case OBJ_DLG_VFIXEDLINE:        nObj = SVX_SNAP_VFIXEDLINE; break;
-                            case OBJ_DLG_DATEFIELD:         nObj = SVX_SNAP_DATEFIELD; break;
-                            case OBJ_DLG_TIMEFIELD:         nObj = SVX_SNAP_TIMEFIELD; break;
-                            case OBJ_DLG_NUMERICFIELD:      nObj = SVX_SNAP_NUMERICFIELD; break;
-                            case OBJ_DLG_CURRENCYFIELD:     nObj = SVX_SNAP_CURRENCYFIELD; break;
-                            case OBJ_DLG_FORMATTEDFIELD:    nObj = SVX_SNAP_FORMATTEDFIELD; break;
-                            case OBJ_DLG_PATTERNFIELD:      nObj = SVX_SNAP_PATTERNFIELD; break;
-                            case OBJ_DLG_FILECONTROL:       nObj = SVX_SNAP_FILECONTROL; break;
-                            case OBJ_DLG_TREECONTROL:       nObj = SVX_SNAP_TREECONTROL; break;
-                            default:                        nObj = 0;
+                            case OBJ_DLG_HFIXEDLINE:	    nObj = SVX_SNAP_HFIXEDLINE; break;
+                            case OBJ_DLG_VFIXEDLINE:	    nObj = SVX_SNAP_VFIXEDLINE; break;
+                            case OBJ_DLG_DATEFIELD:	        nObj = SVX_SNAP_DATEFIELD; break;
+                            case OBJ_DLG_TIMEFIELD:	        nObj = SVX_SNAP_TIMEFIELD; break;
+                            case OBJ_DLG_NUMERICFIELD:	    nObj = SVX_SNAP_NUMERICFIELD; break;
+                            case OBJ_DLG_CURRENCYFIELD:	    nObj = SVX_SNAP_CURRENCYFIELD; break;
+                            case OBJ_DLG_FORMATTEDFIELD:	nObj = SVX_SNAP_FORMATTEDFIELD; break;
+                            case OBJ_DLG_PATTERNFIELD:	    nObj = SVX_SNAP_PATTERNFIELD; break;
+                            case OBJ_DLG_FILECONTROL:	    nObj = SVX_SNAP_FILECONTROL; break;
+                            case OBJ_DLG_TREECONTROL:	    nObj = SVX_SNAP_TREECONTROL; break;
+                            default:					    nObj = 0;
                         }
 #ifdef DBG_UTIL
                         if( !nObj )
@@ -416,7 +416,7 @@ void __EXPORT DialogWindow::GetState( SfxItemSet& rSet )
             case SID_SHOW_PROPERTYBROWSER:
             {
                 BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
-                SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
+                SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;        
                 if ( pViewFrame && !pViewFrame->HasChildWindow( SID_SHOW_PROPERTYBROWSER ) && !pEditor->GetView()->AreObjectsMarked() )
                     rSet.DisableItem( nWh );
 
@@ -647,7 +647,7 @@ void __EXPORT DialogWindow::ExecuteCommand( SfxRequest& rReq )
     rReq.Done();
 }
 
-Reference< container::XNameContainer > DialogWindow::GetDialog() const
+Reference< container::XNameContainer > DialogWindow::GetDialog() const 
 {
     return pEditor->GetDialog();
 }
@@ -733,16 +733,16 @@ BOOL DialogWindow::SaveDialog()
 
         Reference< XSimpleFileAccess > xSFI( xMSF->createInstance
             ( ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ), UNO_QUERY );
-
+     
         Reference< XOutputStream > xOutput;
         try
         {
             if( xSFI->exists( aCurPath ) )
                 xSFI->kill( aCurPath );
-            xOutput = xSFI->openFileWrite( aCurPath );
+            xOutput = xSFI->openFileWrite( aCurPath ); 
         }
         catch( Exception& )
-        {}
+        {} 
 
         if( xOutput.is() )
         {
@@ -790,7 +790,7 @@ BOOL DialogWindow::SaveDialog()
                 aURLObj.removeSegment();
                 ::rtl::OUString aURL( aURLObj.GetMainURL( INetURLObject::NO_DECODE ) );
                 sal_Bool bReadOnly = sal_False;
-                ::rtl::OUString aComment( ::rtl::OUString::createFromAscii( "# " ) );
+                ::rtl::OUString aComment( ::rtl::OUString::createFromAscii( "# " ) ); 
                 aComment += aDialogName;
                 aComment += ::rtl::OUString::createFromAscii( " strings" );
                 Reference< task::XInteractionHandler > xDummyHandler;
@@ -833,9 +833,9 @@ BOOL DialogWindow::SaveDialog()
                         }
                     }
                 }
-
+        
                 Reference< XStringResourceWithLocation > xStringResourceWithLocation =
-                    StringResourceWithLocation::create( xContext, aURL, bReadOnly,
+                    StringResourceWithLocation::create( xContext, aURL, bReadOnly, 
                         xStringResourceResolver->getDefaultLocale(), aDialogName, aComment, xDummyHandler );
 
                 // Add locales
@@ -896,7 +896,7 @@ std::vector< lang::Locale > implGetLanguagesOnlyContainedInFirstSeq
         if( !bAlsoContainedInSecondSeq )
             avRet.push_back( rFirstLocale );
     }
-
+    
     return avRet;
 }
 
@@ -1001,10 +1001,10 @@ BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocumen
 
             Reference< XSimpleFileAccess > xSFI( xMSF->createInstance
                 ( ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ), UNO_QUERY_THROW );
-
+         
             Reference< XInputStream > xInput;
             if( xSFI->exists( aCurPath ) )
-                xInput = xSFI->openFileRead( aCurPath );
+                xInput = xSFI->openFileRead( aCurPath ); 
 
             Reference< XComponentContext > xContext;
             Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY );
@@ -1045,7 +1045,7 @@ BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocumen
             {
                 String aQueryBoxTitle( IDEResId( RID_STR_DLGIMP_CLASH_TITLE ) );
                 String aQueryBoxText( IDEResId( RID_STR_DLGIMP_CLASH_TEXT ) );
-                aQueryBoxText.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "$(ARG1)" ) ), aXmlDlgName );
+                aQueryBoxText.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "$(ARG1)" ) ), aXmlDlgName ); 
 
                 NameClashQueryBox aQueryBox( pWin, aQueryBoxTitle, aQueryBoxText );
                 USHORT nRet = aQueryBox.Execute();
@@ -1066,7 +1066,7 @@ BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocumen
                     return bDone;
                 }
             }
-
+     
             BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
             if( pIDEShell == NULL )
             {
@@ -1079,7 +1079,7 @@ BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocumen
             Reference< task::XInteractionHandler > xDummyHandler;
             bool bReadOnly = true;
             Reference< XStringResourceWithLocation > xImportStringResource =
-                StringResourceWithLocation::create( xContext, aBasePath, bReadOnly,
+                StringResourceWithLocation::create( xContext, aBasePath, bReadOnly, 
                 aLocale, aXmlDlgName, ::rtl::OUString(), xDummyHandler );
 
             Sequence< lang::Locale > aImportLocaleSeq = xImportStringResource->getLocales();
@@ -1247,7 +1247,7 @@ BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocumen
             bDone = TRUE;
         }
         catch( Exception& )
-        {}
+        {} 
     }
 
     return bDone;
@@ -1265,7 +1265,7 @@ BOOL DialogWindow::ImportDialog()
 
 DlgEdModel* DialogWindow::GetModel() const
 {
-    return pEditor ? pEditor->GetModel() : NULL;
+    return pEditor ? pEditor->GetModel() : NULL;	
 }
 
 DlgEdPage* DialogWindow::GetPage() const
@@ -1329,7 +1329,7 @@ BOOL DialogWindow::IsPasteAllowed()
 }
 
 void DialogWindow::StoreData()
-{
+{	
     if ( IsModified() )
     {
         try
@@ -1339,7 +1339,7 @@ void DialogWindow::StoreData()
             if( xLib.is() )
             {
                 Reference< container::XNameContainer > xDialogModel = pEditor->GetDialog();
-
+                    
                 if( xDialogModel.is() )
                 {
                     Reference< XComponentContext > xContext;
diff --git a/basctl/source/basicide/basidectrlr.cxx b/basctl/source/basicide/basidectrlr.cxx
index 9bce6c13c294..9b32530c13f3 100644
--- a/basctl/source/basicide/basidectrlr.cxx
+++ b/basctl/source/basicide/basidectrlr.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ BasicIDEController::~BasicIDEController()
 //----------------------------------------------------------------------------
 
 Any SAL_CALL BasicIDEController::queryInterface( const Type & rType ) throw(RuntimeException)
-{
+{    
     Any aReturn = SfxBaseController::queryInterface( rType );
     if ( !aReturn.hasValue() )
         aReturn = OPropertyContainer::queryInterface( rType );
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 80928ca87ec5..8e83ec9df94c 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ using namespace ::com::sun::star::frame;
 
 class SvxSearchItem;
 
-//  Egal was, einfach ans aktuelle Fenster:
+//	Egal was, einfach ans aktuelle Fenster:
 void __EXPORT BasicIDEShell::ExecuteCurrent( SfxRequest& rReq )
 {
     if ( !pCurWin )
@@ -226,9 +226,9 @@ void __EXPORT BasicIDEShell::ExecuteCurrent( SfxRequest& rReq )
                                 if ( pWin && ( pWin != pCurWin ) )
                                     pWin = aIDEWindowTable.Next();
                                 else
-                                    pWin = 0;   // Dann sind wir durch...
+                                    pWin = 0;	// Dann sind wir durch...
                             }
-                            if ( !nFound && bSearchedFromStart )    // Aktuelles von vorne...
+                            if ( !nFound && bSearchedFromStart ) 	// Aktuelles von vorne...
                                 nFound = ((ModulWindow*)pCurWin)->StartSearchAndReplace( (const SvxSearchItem&)rItem, TRUE );
                             if ( bChangeCurWindow )
                                 SetCurWindow( pWin, TRUE );
@@ -264,7 +264,7 @@ void __EXPORT BasicIDEShell::ExecuteCurrent( SfxRequest& rReq )
     }
 }
 
-//  Egal, wer oben, Einfluss auf die Shell:
+//	Egal, wer oben, Einfluss auf die Shell:
 void __EXPORT BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
 {
     USHORT nSlot = rReq.GetSlot();
@@ -438,7 +438,7 @@ void __EXPORT BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
                         ModulWindow* pModWin = (ModulWindow*)pWin;
                         String aLibName = ( pModWin->GetLibName() );
                         ScriptDocument aDocument( pWin->GetDocument() );
-
+                            
                         if ( BasicIDE::RenameModule( pModWin, aDocument, aLibName,  aOldName, aNewName ) )
                         {
                             bRenameOk = true;
@@ -447,14 +447,14 @@ void __EXPORT BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
                             // pWin has been invalidated, restore now
                             pWin = FindBasWin( aDocument, aLibName, aNewName, TRUE );
                         }
-
+                                        
                     }
-                    else if ( pWin->IsA( TYPE( DialogWindow ) ) )
+                    else if ( pWin->IsA( TYPE( DialogWindow ) ) ) 
                     {
                         DialogWindow* pDlgWin = (DialogWindow*)pWin;
                         bRenameOk = pDlgWin->RenameDialog( aNewName );
                     }
-                    if ( bRenameOk )
+                    if ( bRenameOk ) 
                     {
                         BasicIDE::MarkDocumentModified( pWin->GetDocument() );
                     }
@@ -566,7 +566,7 @@ void __EXPORT BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
                     }
                 }
             }
-            else    // Loaded...
+            else	// Loaded...
                 UpdateWindows();
         }
         break;
@@ -974,7 +974,7 @@ void __EXPORT BasicIDEShell::GetState(SfxItemSet &rSet)
             case SID_UNDO:
             case SID_REDO:
             {
-                if( GetUndoManager() )  // sonst rekursives GetState
+                if( GetUndoManager() )	// sonst rekursives GetState
                     GetViewFrame()->GetSlotState( nWh, NULL, &rSet );
             }
             break;
@@ -1070,7 +1070,7 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin, BOOL bUpdateTabBar, BO
         {
             pPrevCurWin->Hide();
             pPrevCurWin->Deactivating();
-//          pPrevCurWin->GetLayoutWindow()->Hide();
+//			pPrevCurWin->GetLayoutWindow()->Hide();
             if( pPrevCurWin->IsA( TYPE( DialogWindow ) ) )
             {
                 ((DialogWindow*)pPrevCurWin)->DisableBrowser();
@@ -1117,7 +1117,7 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin, BOOL bUpdateTabBar, BO
                 Window* pFocusWindow = Application::GetFocusWindow();
                 while ( pFocusWindow && ( pFocusWindow != pFrameWindow ) )
                     pFocusWindow = pFocusWindow->GetParent();
-                if ( pFocusWindow ) // Focus in BasicIDE
+                if ( pFocusWindow )	// Focus in BasicIDE
                     pNewWin->GrabFocus();
             }
             if( pCurWin->IsA( TYPE( DialogWindow ) ) )
@@ -1127,10 +1127,10 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin, BOOL bUpdateTabBar, BO
         {
             ULONG nKey = aIDEWindowTable.GetKey( pCurWin );
             if ( pCurWin && ( pTabBar->GetPagePos( (USHORT)nKey ) == TAB_PAGE_NOTFOUND ) )
-                pTabBar->InsertPage( (USHORT)nKey, pCurWin->GetTitle() );   // wurde neu eingeblendet
+                pTabBar->InsertPage( (USHORT)nKey, pCurWin->GetTitle() );	// wurde neu eingeblendet
             pTabBar->SetCurPageId( (USHORT)nKey );
         }
-        if ( pCurWin && pCurWin->IsSuspended() )    // Wenn das Fenster im Fehlerfall angezeigt wird...
+        if ( pCurWin && pCurWin->IsSuspended() ) 	// Wenn das Fenster im Fehlerfall angezeigt wird...
             pCurWin->SetStatus( pCurWin->GetStatus() & ~BASWIN_SUSPENDED );
         if ( pCurWin )
         {
@@ -1253,7 +1253,7 @@ long BasicIDEShell::CallBasicBreakHdl( StarBASIC* pBasic )
 
         nRet = pModWin->BasicBreakHdl( pBasic );
 
-        if ( StarBASIC::IsRunning() )   // Falls abgebrochen...
+        if ( StarBASIC::IsRunning() )	// Falls abgebrochen...
         {
             if ( bAppWindowDisabled )
                 Application::GetDefDialogParent()->Enable( FALSE );
@@ -1316,7 +1316,7 @@ void __EXPORT BasicIDEShell::AdjustPosSizePixel( const Point &rPos, const Size &
         return;
 
     Size aSz( rSize );
-//  long nScrollbarWidthPixel = aVScrollBar.GetSizePixel().Width();
+//	long nScrollbarWidthPixel = aVScrollBar.GetSizePixel().Width();
     Size aScrollBarBoxSz( aScrollBarBox.GetSizePixel() );
     aSz.Height() -= aScrollBarBoxSz.Height();
 
@@ -1345,7 +1345,7 @@ void __EXPORT BasicIDEShell::AdjustPosSizePixel( const Point &rPos, const Size &
     if ( pEdtWin )
     {
         if( pCurWin && pCurWin->IsA( TYPE( DialogWindow ) ) )
-            pEdtWin->SetPosSizePixel( rPos, aSz );  // Ohne ScrollBar
+            pEdtWin->SetPosSizePixel( rPos, aSz );	// Ohne ScrollBar
         else
             pEdtWin->SetPosSizePixel( rPos, aOutSz );
     }
@@ -1435,7 +1435,7 @@ IMPL_LINK( BasicIDEShell, AccelSelectHdl, Accelerator*, pAccel )
             else
                 pDispatcher->Execute( SID_BASICIDE_TOGGLEBRKPNT, SFX_CALLMODE_SYNCHRON );
         break;
-        default:    bDone = FALSE;
+        default:	bDone = FALSE;
     }
     return bDone;
 }
diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx
index 4092529a5e17..725d8cb85c73 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -197,7 +197,7 @@ void BasicIDEShell::SetMDITitle()
             pShell->SetTitle( aTitle );
             pShell->SetModified( FALSE );
         }
-
+    
         css::uno::Reference< css::frame::XController > xController = GetController ();
         css::uno::Reference< css::frame::XTitle >      xTitle      (xController, css::uno::UNO_QUERY);
         if (xTitle.is ())
@@ -260,7 +260,7 @@ ModulWindow* BasicIDEShell::CreateBasWin( const ScriptDocument& rDocument, const
         {
             pWin = FindBasWin( rDocument, aLibName, aModName, FALSE, TRUE );
             if( !pWin )
-            {
+            {    
                 // new module window
                 pWin = new ModulWindow( pModulLayout, rDocument, aLibName, aModName, aModule );
                 nKey = InsertWindowInTable( pWin );
@@ -310,7 +310,7 @@ ModulWindow* BasicIDEShell::FindBasWin( const ScriptDocument& rDocument, const S
     {
         if ( ( !pWin->IsSuspended() || bFindSuspended ) && pWin->IsA( TYPE( ModulWindow ) ) )
         {
-            if ( !rLibName.Len() )  // nur irgendeins finden...
+            if ( !rLibName.Len() )	// nur irgendeins finden...
                 pModWin = (ModulWindow*)pWin;
             else if ( pWin->IsDocument( rDocument ) && pWin->GetLibName() == rLibName && pWin->GetName() == rModName )
                 pModWin = (ModulWindow*)pWin;
diff --git a/basctl/source/basicide/basides3.cxx b/basctl/source/basicide/basides3.cxx
index 3825eaef11bf..aba47effc61b 100644
--- a/basctl/source/basicide/basides3.cxx
+++ b/basctl/source/basicide/basides3.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <baside2.hxx>
 #include <baside3.hxx>
 #include <basobj.hxx>
-#include <localizationmgr.hxx>
+#include <localizationmgr.hxx> 
 #include <dlgedview.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/script/XLibraryContainer.hpp>
@@ -59,7 +59,7 @@ using namespace ::com::sun::star::io;
 DialogWindow* BasicIDEShell::CreateDlgWin( const ScriptDocument& rDocument, const String& rLibName, const String& rDlgName )
 {
     bCreatingWindow = TRUE;
-
+    
     ULONG nKey = 0;
     DialogWindow* pWin = 0;
     String aLibName( rLibName );
@@ -80,7 +80,7 @@ DialogWindow* BasicIDEShell::CreateDlgWin( const ScriptDocument& rDocument, cons
     {
         try
         {
-            Reference< io::XInputStreamProvider > xISP;
+            Reference< io::XInputStreamProvider > xISP;			
             if ( rDocument.hasDialog( aLibName, aDlgName ) )
                 rDocument.getDialog( aLibName, aDlgName, xISP );
             else
@@ -108,7 +108,7 @@ DialogWindow* BasicIDEShell::CreateDlgWin( const ScriptDocument& rDocument, cons
         catch ( uno::Exception& )
         {
             DBG_UNHANDLED_EXCEPTION();
-        }
+        }						
     }
     else
     {
@@ -144,7 +144,7 @@ DialogWindow* BasicIDEShell::FindDlgWin( const ScriptDocument& rDocument, const
     {
         if ( ( !pWin->IsSuspended() || bFindSuspended ) && pWin->IsA( TYPE( DialogWindow ) ) )
         {
-            if ( !rLibName.Len() )  // nur irgendeins finden...
+            if ( !rLibName.Len() )	// nur irgendeins finden...
                 pDlgWin = (DialogWindow*)pWin;
             else if ( pWin->IsDocument( rDocument ) && pWin->GetLibName() == rLibName && pWin->GetName() == rDlgName )
                 pDlgWin = (DialogWindow*)pWin;
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 9b5d01636047..e434d1cb9a11 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #define SI_NOCONTROL
 #define SI_NOSBXCONTROLS
 
-#define ITEMID_SIZE 0
+#define ITEMID_SIZE	0
 
 // Falls ohne PCH's:
 #include <ide_pch.hxx>
@@ -99,7 +99,7 @@ public:
 
     ContainerListenerImpl( BasicIDEShell* pShell ) : mpShell( pShell ) {}
 
-    ~ContainerListenerImpl()
+    ~ContainerListenerImpl() 
     {
     }
 
@@ -173,7 +173,7 @@ SFX_IMPL_INTERFACE( BasicIDEShell, SfxViewShell, IDEResId( RID_STR_IDENAME ) )
 
 
 
-#define IDE_VIEWSHELL_FLAGS     SFX_VIEW_CAN_PRINT|SFX_VIEW_NO_NEWWINDOW
+#define IDE_VIEWSHELL_FLAGS		SFX_VIEW_CAN_PRINT|SFX_VIEW_NO_NEWWINDOW
 
 
 // Hack for #101048
@@ -287,7 +287,7 @@ __EXPORT BasicIDEShell::~BasicIDEShell()
         // Destroy all ContainerListeners for Basic Container.
         if ( pListener )
             pListener->removeContainerListener( m_aCurDocument, m_aCurLibName );
-
+    
     // MI: Das gab einen GPF im SDT beim Schliessen da dann der ViewFrame die
     // ObjSh loslaesst. Es wusste auch keiner mehr wozu das gut war.
     // GetViewFrame()->GetObjectShell()->Broadcast( SfxSimpleHint( SFX_HINT_DYING ) );
@@ -434,7 +434,7 @@ USHORT __EXPORT BasicIDEShell::PrepareClose( BOOL bUI, BOOL bForBrowsing )
     else
     {
         // Hier unguenstig, wird zweimal gerufen...
-//      StoreAllWindowData();
+//		StoreAllWindowData();
 
         BOOL bCanClose = TRUE;
         for ( ULONG nWin = 0; bCanClose && ( nWin < aIDEWindowTable.Count() ); nWin++ )
@@ -450,7 +450,7 @@ USHORT __EXPORT BasicIDEShell::PrepareClose( BOOL bUI, BOOL bForBrowsing )
         }
 
         if ( bCanClose )
-            StoreAllWindowData( FALSE );    // Nicht auf Platte schreiben, das passiert am Ende automatisch
+            StoreAllWindowData( FALSE );	// Nicht auf Platte schreiben, das passiert am Ende automatisch
 
         return bCanClose;
     }
@@ -634,7 +634,7 @@ void __EXPORT BasicIDEShell::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId&,
             {
                 SbxHint& rSbxHint = (SbxHint&)rHint;
                 ULONG nHintId = rSbxHint.GetId();
-                if (    ( nHintId == SBX_HINT_BASICSTART ) ||
+                if (	( nHintId == SBX_HINT_BASICSTART ) ||
                         ( nHintId == SBX_HINT_BASICSTOP ) )
                 {
                     SfxBindings* pBindings = BasicIDE::GetBindingsPtr();
@@ -920,7 +920,7 @@ void BasicIDEShell::RemoveWindow( IDEBaseWindow* pWindow_, BOOL bDestroy, BOOL b
                 // Es kommt kein Notify...
                 pWindow_->BasicStopped();
             }
-            aIDEWindowTable.Insert( nKey, pWindow_ );   // wieder einhaegen
+            aIDEWindowTable.Insert( nKey, pWindow_ );	// wieder einhaegen
         }
     }
     else
@@ -928,7 +928,7 @@ void BasicIDEShell::RemoveWindow( IDEBaseWindow* pWindow_, BOOL bDestroy, BOOL b
         pWindow_->Hide();
         pWindow_->AddStatus( BASWIN_SUSPENDED );
         pWindow_->Deactivating();
-        aIDEWindowTable.Insert( nKey, pWindow_ );   // wieder einhaegen
+        aIDEWindowTable.Insert( nKey, pWindow_ );	// wieder einhaegen
     }
 
 }
@@ -1013,7 +1013,7 @@ void BasicIDEShell::SetCurLib( const ScriptDocument& rDocument, String aLibName,
             pListener->removeContainerListener( m_aCurDocument, m_aCurLibName );
 
         m_aCurDocument = rDocument;
-
+    
         pListener->addContainerListener( m_aCurDocument, aLibName );
 
         m_aCurLibName = aLibName;
diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src
index 556211f690af..25c8c460d282 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #endif
 #include "dlgresid.hrc"
 
-#define MASKCOLOR   MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; };
+#define MASKCOLOR	MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; };
 
 String RID_STR_IDENAME
 {
@@ -702,12 +702,12 @@ String RID_STR_DLGIMP_MISMATCH_TEXT
 #define MN_HELP 31
 #define MN_TEMPLATES 11
 
-#define MN_PLEDIT       20
-#define MN_PLVIEW       21
-#define MN_PLEXTRA      22
-#define MN_PLWIN        30
-#define MN_PLHELP       31
-#define MN_PLTEMPLATES  11
+#define MN_PLEDIT		20
+#define MN_PLVIEW		21
+#define MN_PLEXTRA		22
+#define MN_PLWIN		30
+#define MN_PLHELP		31
+#define MN_PLTEMPLATES	11
 
 
 /*
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index a5b441cdb1ab..b60ad4b6019c 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ BOOL IsValidSbxName( const String& rName )
 {
     for ( USHORT nChar = 0; nChar < rName.Len(); nChar++ )
     {
-        BOOL bValid = ( ( rName.GetChar(nChar) >= 'A' && rName.GetChar(nChar) <= 'Z' ) ||
+        BOOL bValid = (	( rName.GetChar(nChar) >= 'A' && rName.GetChar(nChar) <= 'Z' ) ||
                         ( rName.GetChar(nChar) >= 'a' && rName.GetChar(nChar) <= 'z' ) ||
                         ( rName.GetChar(nChar) >= '0' && rName.GetChar(nChar) <= '9' && nChar ) ||
                         ( rName.GetChar(nChar) == '_' ) );
@@ -207,7 +207,7 @@ bool RenameModule( Window* pErrorParent, const ScriptDocument& rDocument, const
             DBG_ASSERT( nId, "No entry in Tabbar!" );
             if ( nId )
             {
-                BasicIDETabBar* pTabBar = (BasicIDETabBar*)pIDEShell->GetTabBar();
+                BasicIDETabBar*	pTabBar = (BasicIDETabBar*)pIDEShell->GetTabBar();
                 pTabBar->SetPageText( nId, rNewName );
                 pTabBar->Sort();
                 pTabBar->MakeVisible( pTabBar->GetCurPageId() );
@@ -337,7 +337,7 @@ bool RenameModule( Window* pErrorParent, const ScriptDocument& rDocument, const
 
             if ( pMethod && !rxLimitToDocument.is() )
             {
-                pMethod->AddRef();  // festhalten, bis Event abgearbeitet.
+                pMethod->AddRef();	// festhalten, bis Event abgearbeitet.
                 Application::PostUserEvent( LINK( IDE_DLL()->GetExtraData(), BasicIDEData, ExecuteMacroEvent ), pMethod );
             }
         }
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index 35c4eafbebf1..42ba65d60837 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -223,7 +223,7 @@ bool RenameDialog( Window* pErrorParent, const ScriptDocument& rDocument, const
         DBG_ASSERT( nId, "No entry in Tabbar!" );
         if ( nId )
         {
-            BasicIDETabBar* pTabBar = (BasicIDETabBar*)pIDEShell->GetTabBar();
+            BasicIDETabBar*	pTabBar = (BasicIDETabBar*)pIDEShell->GetTabBar();
             pTabBar->SetPageText( nId, rNewName );
             pTabBar->Sort();
             pTabBar->MakeVisible( pTabBar->GetCurPageId() );
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 4fb2679cbc9f..ff0e3a126d97 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ sal_Int32 ModuleInfoHelper::getModuleType(  const uno::Reference< container::XNa
         script::ModuleInfo aModuleInfo = xVBAModuleInfo->getModuleInfo( rModName );
         nType = aModuleInfo.ModuleType;
     }
-    return nType;
+    return nType;    
 }
 
 BasicEntry::~BasicEntry()
@@ -197,7 +197,7 @@ BasicTreeListBox::BasicTreeListBox( Window* pParent, const ResId& rRes ) :
 {
     SetNodeDefaultImages();
     SetSelectionMode( SINGLE_SELECTION );
-    nMode = 0xFF;   // Alles
+    nMode = 0xFF;	// Alles
 }
 
 
@@ -264,13 +264,13 @@ void BasicTreeListBox::ImpCreateLibEntries( SvLBoxEntry* pDocumentRootEntry, con
             BOOL bModLibLoaded = FALSE;
             ::rtl::OUString aOULibName( aLibName );
             Reference< script::XLibraryContainer > xModLibContainer( rDocument.getLibraryContainer( E_SCRIPTS ) );
-            if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) && xModLibContainer->isLibraryLoaded( aOULibName ) )
+            if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) && xModLibContainer->isLibraryLoaded( aOULibName ) ) 
                 bModLibLoaded = TRUE;
 
             // check, if the dialog library is loaded
             BOOL bDlgLibLoaded = FALSE;
             Reference< script::XLibraryContainer > xDlgLibContainer( rDocument.getLibraryContainer( E_DIALOGS ) );
-            if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aOULibName ) && xDlgLibContainer->isLibraryLoaded( aOULibName ) )
+            if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aOULibName ) && xDlgLibContainer->isLibraryLoaded( aOULibName ) ) 
                 bDlgLibLoaded = TRUE;
 
             BOOL bLoaded = bModLibLoaded || bDlgLibLoaded;
@@ -307,8 +307,8 @@ void BasicTreeListBox::ImpCreateLibEntries( SvLBoxEntry* pDocumentRootEntry, con
             else
             {
                 pLibRootEntry = AddEntry(
-                    aLibName,
-                    Image( IDEResId( nId ) ),
+                    aLibName,                  
+                    Image( IDEResId( nId ) ), 
                     Image( IDEResId( nIdHC ) ),
                     pDocumentRootEntry, true,
                     std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_LIBRARY ) ) );
@@ -357,7 +357,7 @@ void BasicTreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const
                             Sequence< ::rtl::OUString > aNames = BasicIDE::GetMethodNames( rDocument, rLibName, aModName );
                             sal_Int32 nCount = aNames.getLength();
                             const ::rtl::OUString* pNames = aNames.getConstArray();
-
+    
                             for ( sal_Int32 j = 0 ; j < nCount ; j++ )
                             {
                                 String aName = pNames[ j ];
@@ -378,7 +378,7 @@ void BasicTreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const
             {
                 DBG_UNHANDLED_EXCEPTION();
             }
-        }
+        }   
     }
 
     // dialogs
@@ -418,7 +418,7 @@ void BasicTreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const
 
 void BasicTreeListBox::ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const String& rLibName )
 {
-
+    
     ::std::vector< std::pair< BasicEntryType, ::rtl::OUString > > aEntries;
     aEntries.push_back( ::std::make_pair( OBJ_TYPE_DOCUMENT_OBJECTS, String( IDEResId( RID_STR_DOCUMENT_OBJECTS ) ) ) );
     aEntries.push_back( ::std::make_pair( OBJ_TYPE_USERFORMS,  String( IDEResId( RID_STR_USERFORMS ) ) ) );
@@ -542,7 +542,7 @@ SvLBoxEntry* BasicTreeListBox::ImpFindEntry( SvLBoxEntry* pParent, const String&
     SvLBoxEntry* pEntry = pParent ? FirstChild( pParent ) : GetEntry( nRootPos );
     while ( pEntry )
     {
-        if (  GetEntryText( pEntry ) == rText )
+        if (  GetEntryText( pEntry ) == rText ) 
             return pEntry;
 
         pEntry = pParent ? NextSibling( pEntry ) : GetEntry( ++nRootPos );
@@ -672,7 +672,7 @@ long BasicTreeListBox::ExpandingHdl()
                 ::rtl::OUString aOULibName( aLibName );
                 Reference< script::XLibraryContainer > xModLibContainer( aDocument.getLibraryContainer( E_SCRIPTS ) );
                 if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) )
-                {
+                {                
                     Reference< script::XLibraryContainerPassword > xPasswd( xModLibContainer, UNO_QUERY );
                     if ( xPasswd.is() && xPasswd->isLibraryPasswordProtected( aOULibName ) && !xPasswd->isLibraryPasswordVerified( aOULibName ) )
                     {
@@ -699,7 +699,7 @@ BOOL BasicTreeListBox::IsEntryProtected( SvLBoxEntry* pEntry )
             ::rtl::OUString aOULibName( aDesc.GetLibName() );
             Reference< script::XLibraryContainer > xModLibContainer( aDocument.getLibraryContainer( E_SCRIPTS ) );
             if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) )
-            {
+            {                
                 Reference< script::XLibraryContainerPassword > xPasswd( xModLibContainer, UNO_QUERY );
                 if ( xPasswd.is() && xPasswd->isLibraryPasswordProtected( aOULibName ) && !xPasswd->isLibraryPasswordVerified( aOULibName ) )
                 {
@@ -711,7 +711,7 @@ BOOL BasicTreeListBox::IsEntryProtected( SvLBoxEntry* pEntry )
     return bProtected;
 }
 
-SvLBoxEntry* BasicTreeListBox::AddEntry(
+SvLBoxEntry* BasicTreeListBox::AddEntry( 
     const String& rText, const Image& rImage, const Image& rImageHC,
     SvLBoxEntry* pParent, bool bChildrenOnDemand, std::auto_ptr< BasicEntry > aUserData )
 {
@@ -766,12 +766,12 @@ void BasicTreeListBox::GetRootEntryBitmaps( const ScriptDocument& rDocument, Ima
                 if ( xModuleConfig.is() )
                 {
                     Sequence< beans::PropertyValue > aModuleDescr;
-                    xModuleConfig->getByName( sModule ) >>= aModuleDescr;
+                    xModuleConfig->getByName( sModule ) >>= aModuleDescr;                
                     sal_Int32 nCount = aModuleDescr.getLength();
                     const beans::PropertyValue* pModuleDescr = aModuleDescr.getConstArray();
                     for ( sal_Int32 i = 0; i < nCount; ++i )
                     {
-                        if ( pModuleDescr[ i ].Name.equalsAsciiL(
+                        if ( pModuleDescr[ i ].Name.equalsAsciiL( 
                             RTL_CONSTASCII_STRINGPARAM( "ooSetupFactoryEmptyDocumentURL" ) ) )
                         {
                             pModuleDescr[ i ].Value >>= sFactoryURL;
@@ -788,12 +788,12 @@ void BasicTreeListBox::GetRootEntryBitmaps( const ScriptDocument& rDocument, Ima
 
         if ( sFactoryURL.getLength() )
         {
-            rImage = SvFileInformationManager::GetFileImage( INetURLObject( sFactoryURL ),
-                FALSE /* small */,
+            rImage = SvFileInformationManager::GetFileImage( INetURLObject( sFactoryURL ), 
+                FALSE /* small */, 
                 FALSE /* normal */ );
 
-            rImageHC = SvFileInformationManager::GetFileImage( INetURLObject( sFactoryURL ),
-                FALSE /* small */,
+            rImageHC = SvFileInformationManager::GetFileImage( INetURLObject( sFactoryURL ), 
+                FALSE /* small */, 
                 TRUE /* high contrast */ );
         }
         else
@@ -818,7 +818,7 @@ void BasicTreeListBox::SetCurrentEntry( BasicEntryDescriptor& rDesc )
     {
         aDesc = BasicEntryDescriptor(
             ScriptDocument::getApplicationScriptDocument(),
-            LIBRARY_LOCATION_USER, String::CreateFromAscii( "Standard" ),
+            LIBRARY_LOCATION_USER, String::CreateFromAscii( "Standard" ), 
             String(), String::CreateFromAscii( "." ), OBJ_TYPE_UNKNOWN );
     }
     ScriptDocument aDocument( aDesc.GetDocument() );
diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx
index 08fb03d1c689..0a7bd9d51e4d 100644
--- a/basctl/source/basicide/bastype2.hxx
+++ b/basctl/source/basicide/bastype2.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 enum BasicEntryType { OBJ_TYPE_UNKNOWN, OBJ_TYPE_DOCUMENT, OBJ_TYPE_LIBRARY, OBJ_TYPE_MODULE, OBJ_TYPE_DIALOG, OBJ_TYPE_METHOD, OBJ_TYPE_DOCUMENT_OBJECTS, OBJ_TYPE_USERFORMS, OBJ_TYPE_NORMAL_MODULES, OBJ_TYPE_CLASS_MODULES };
 
-#define BROWSEMODE_MODULES      0x01
-#define BROWSEMODE_SUBS         0x02
-#define BROWSEMODE_DIALOGS      0x04
+#define BROWSEMODE_MODULES		0x01
+#define BROWSEMODE_SUBS			0x02
+#define BROWSEMODE_DIALOGS		0x04
 
 class SbMethod;
 class SbxObject;
@@ -159,15 +159,15 @@ private:
     void            SetEntryBitmaps( SvLBoxEntry * pEntry, const Image& rImage, const Image& rImageHC );
 
 protected:
-    virtual void            RequestingChilds( SvLBoxEntry* pParent );
-    virtual void            ExpandedHdl();
-    virtual SvLBoxEntry*    CloneEntry( SvLBoxEntry* pSource );
-    virtual long            ExpandingHdl();
+    virtual void			RequestingChilds( SvLBoxEntry* pParent );
+    virtual void 			ExpandedHdl();
+    virtual SvLBoxEntry* 	CloneEntry( SvLBoxEntry* pSource );
+    virtual long			ExpandingHdl();
 
     void                    ImpCreateLibEntries( SvLBoxEntry* pShellRootEntry, const ScriptDocument& rDocument, LibraryLocation eLocation );
-    void                    ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const String& rLibName );
-    void                    ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const String& rLibName );
-    void                    ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEntry, const ScriptDocument& rDocument, const String& rLibName );
+    void 					ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const String& rLibName );
+    void 					ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const String& rLibName );
+    void 					ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEntry, const ScriptDocument& rDocument, const String& rLibName );
     SvLBoxEntry*            ImpFindEntry( SvLBoxEntry* pParent, const String& rText );
 
     // DocumentEventListener
@@ -187,15 +187,15 @@ public:
 
     void            ScanEntry( const ScriptDocument& rDocument, LibraryLocation eLocation );
     void            ScanAllEntries();
-    void            UpdateEntries();
+    void			UpdateEntries();
 
-    BOOL            IsEntryProtected( SvLBoxEntry* pEntry );
+    BOOL			IsEntryProtected( SvLBoxEntry* pEntry );
 
-    void            SetMode( USHORT nM ) { nMode = nM; }
-    USHORT          GetMode() const { return nMode; }
+    void			SetMode( USHORT nM ) { nMode = nM; }
+    USHORT			GetMode() const { return nMode; }
 
-    SbModule*       FindModule( SvLBoxEntry* pEntry );
-    SbxVariable*    FindVariable( SvLBoxEntry* pEntry );
+    SbModule*		FindModule( SvLBoxEntry* pEntry );
+    SbxVariable*	FindVariable( SvLBoxEntry* pEntry );
     SvLBoxEntry*    FindRootEntry( const ScriptDocument& rDocument, LibraryLocation eLocation );
     SvLBoxEntry*    FindEntry( SvLBoxEntry* pParent, const String& rText, BasicEntryType eType );
 
@@ -205,7 +205,7 @@ public:
     bool            IsValidEntry( SvLBoxEntry* pEntry );
 
     SvLBoxEntry*    AddEntry( const String& rText, const Image& rImage, const Image& rImageHC,
-                              SvLBoxEntry* pParent, bool bChildrenOnDemand,
+                              SvLBoxEntry* pParent, bool bChildrenOnDemand, 
                               std::auto_ptr< BasicEntry > aUserData );
 
     String          GetRootEntryName( const ScriptDocument& rDocument, LibraryLocation eLocation ) const;
@@ -217,6 +217,6 @@ private:
     LibraryType     GetLibraryType() const;
 };
 
-#endif  // _BASTYPE2_HXX
+#endif	// _BASTYPE2_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index 3f114b190587..40f7d0c046b0 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 __EXPORT BasicTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
         return;
 
     LibraryLocation eLocation( aDesc.GetLocation() );
-    BasicEntryType eType( aDesc.GetType() );
+    BasicEntryType eType( aDesc.GetType() );    
 
     if ( eType == OBJ_TYPE_DOCUMENT )
     {
@@ -88,8 +88,8 @@ void __EXPORT BasicTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
 
         if ( bOK )
         {
-            // load module library
-            BOOL bModLibLoaded = FALSE;
+            // load module library              
+            BOOL bModLibLoaded = FALSE;            
             if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) )
             {
                 if ( !xModLibContainer->isLibraryLoaded( aOULibName ) )
@@ -103,7 +103,7 @@ void __EXPORT BasicTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
 
             // load dialog library
             BOOL bDlgLibLoaded = FALSE;
-            Reference< script::XLibraryContainer > xDlgLibContainer( aDocument.getLibraryContainer( E_DIALOGS ), UNO_QUERY );
+            Reference< script::XLibraryContainer > xDlgLibContainer( aDocument.getLibraryContainer( E_DIALOGS ), UNO_QUERY );           
             if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aOULibName ) )
             {
                 if ( !xDlgLibContainer->isLibraryLoaded( aOULibName ) )
@@ -132,7 +132,7 @@ void __EXPORT BasicTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
             }
         }
     }
-    else if ( eType == OBJ_TYPE_DOCUMENT_OBJECTS
+    else if ( eType == OBJ_TYPE_DOCUMENT_OBJECTS 
             || eType == OBJ_TYPE_USERFORMS
             || eType == OBJ_TYPE_NORMAL_MODULES
             || eType == OBJ_TYPE_CLASS_MODULES )
@@ -156,7 +156,7 @@ void __EXPORT BasicTreeListBox::ExpandedHdl()
         SvLBoxEntry* pChild = FirstChild( pEntry );
         while ( pChild )
         {
-            GetModel()->Remove( pChild );   // Ruft auch den DTOR
+            GetModel()->Remove( pChild );	// Ruft auch den DTOR
             pChild = FirstChild( pEntry );
         }
     }
@@ -195,12 +195,12 @@ SbxVariable* BasicTreeListBox::FindVariable( SvLBoxEntry* pEntry )
             case 4:
             case 3:
             case 2:
-            case 1:
+            case 1: 
             {
                 aEntries.C40_INSERT( SvLBoxEntry, pEntry, 0 );
             }
             break;
-            case 0:
+            case 0: 
             {
                 aDocument = ((BasicDocumentEntry*)pEntry->GetUserData())->GetDocument();
             }
@@ -300,12 +300,12 @@ BasicEntryDescriptor BasicTreeListBox::GetEntryDescriptor( SvLBoxEntry* pEntry )
             case 4:
             case 3:
             case 2:
-            case 1:
+            case 1: 
             {
                 aEntries.C40_INSERT( SvLBoxEntry, pEntry, 0 );
             }
             break;
-            case 0:
+            case 0: 
             {
                 BasicDocumentEntry* pBasicDocumentEntry = (BasicDocumentEntry*)pEntry->GetUserData();
                 if ( pBasicDocumentEntry )
diff --git a/basctl/source/basicide/bastype3.hxx b/basctl/source/basicide/bastype3.hxx
index bc27eaa6cf90..016c4ee484c9 100644
--- a/basctl/source/basicide/bastype3.hxx
+++ b/basctl/source/basicide/bastype3.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class EditorWindow;
 class ExtendedEdit : public Edit
 {
 private:
-    Accelerator     aAcc;
-    Link            aAccHdl;
-    Link            aGotFocusHdl;
-    Link            aLoseFocusHdl;
+    Accelerator		aAcc;
+    Link			aAccHdl;
+    Link			aGotFocusHdl;
+    Link			aLoseFocusHdl;
 
 protected:
     DECL_LINK( EditAccHdl, Accelerator * );
@@ -54,14 +54,14 @@ protected:
 public:
                     ExtendedEdit( Window* pParent, IDEResId nRes );
 
-    void            SetAccHdl( const Link& rLink )          { aAccHdl = rLink; }
-    void            SetLoseFocusHdl( const Link& rLink )    { aLoseFocusHdl = rLink; }
-    void            SetGotFocusHdl( const Link& rLink )     { aGotFocusHdl = rLink; }
-    Accelerator&    GetAccelerator()                        { return aAcc; }
+    void			SetAccHdl( const Link& rLink )			{ aAccHdl = rLink; }
+    void			SetLoseFocusHdl( const Link& rLink )	{ aLoseFocusHdl = rLink; }
+    void			SetGotFocusHdl( const Link& rLink )		{ aGotFocusHdl = rLink; }
+    Accelerator&	GetAccelerator() 						{ return aAcc; }
 };
 
-#endif  //NO_SPECIALEDIT
+#endif	//NO_SPECIALEDIT
 
-#endif  // _BASTYPE3_HXX
+#endif	// _BASTYPE3_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/bastype4.hxx b/basctl/source/basicide/bastype4.hxx
index a65b286db99d..be4dbc140f08 100644
--- a/basctl/source/basicide/bastype4.hxx
+++ b/basctl/source/basicide/bastype4.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 5faaf7988313..4b0d7564e247 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include <basidesh.hrc>
 #include <bastypes.hxx>
 #include <bastype2.hxx>
-#include <baside2.hxx>  // Leider brauche ich teilweise pModulWindow...
+#include <baside2.hxx>	// Leider brauche ich teilweise pModulWindow...
 #include <baside3.hxx>
 #include <baside2.hrc>
 #include <svtools/textview.hxx>
@@ -76,7 +76,7 @@ IDEBaseWindow::IDEBaseWindow( Window* pParent, const ScriptDocument& rDocument,
     DBG_CTOR( IDEBaseWindow, 0 );
     pShellHScrollBar = 0;
     pShellVScrollBar = 0;
-    nStatus = 0;
+    nStatus	= 0;
 }
 
 
@@ -99,7 +99,7 @@ void IDEBaseWindow::Init()
         pShellVScrollBar->SetScrollHdl( LINK( this, IDEBaseWindow, ScrollHdl ) );
     if ( pShellHScrollBar )
         pShellHScrollBar->SetScrollHdl( LINK( this, IDEBaseWindow, ScrollHdl ) );
-    DoInit();   // virtuell...
+    DoInit();	// virtuell...
 }
 
 
@@ -115,7 +115,7 @@ void IDEBaseWindow::GrabScrollBars( ScrollBar* pHScroll, ScrollBar* pVScroll )
     DBG_CHKTHIS( IDEBaseWindow, 0 );
     pShellHScrollBar = pHScroll;
     pShellVScrollBar = pVScroll;
-//  Init(); // macht kein Sinn, fuehrt zu flackern, fuehr zu Fehlern...
+//	Init();	// macht kein Sinn, fuehrt zu flackern, fuehr zu Fehlern...
 }
 
 
@@ -321,7 +321,7 @@ void BreakPointList::SetBreakPointsInBasic( SbModule* pModule )
     }
 }
 
-BreakPoint* BreakPointList::FindBreakPoint( ULONG nLine )
+BreakPoint*	BreakPointList::FindBreakPoint( ULONG nLine )
 {
     BreakPoint* pBrk = First();
     while ( pBrk )
@@ -392,7 +392,7 @@ USHORT __EXPORT IDEBaseWindow::GetSearchOptions()
 
 
 BasicDockingWindow::BasicDockingWindow( Window* pParent ) :
-    DockingWindow( pParent, WB_BORDER | WB_3DLOOK | WB_DOCKABLE | WB_MOVEABLE |
+    DockingWindow( pParent,	WB_BORDER | WB_3DLOOK | WB_DOCKABLE | WB_MOVEABLE |
                             WB_SIZEABLE | WB_ROLLABLE |
                             WB_DOCKABLE | WB_CLIPCHILDREN )
 {
@@ -409,12 +409,12 @@ BOOL __EXPORT BasicDockingWindow::Docking( const Point& rPos, Rectangle& rRect )
     {
         rRect.SetSize( aTmpRec.GetSize() );
     }
-    else    // Alte Groesse einstellen
+    else	// Alte Groesse einstellen
     {
         if ( !aFloatingPosAndSize.IsEmpty() )
             rRect.SetSize( aFloatingPosAndSize.GetSize() );
     }
-    return !bDock;  // bFloat
+    return !bDock;	// bFloat
 }
 
 
@@ -506,8 +506,8 @@ IMPL_LINK_INLINE_END( ExtendedEdit, EditAccHdl, Accelerator *, pAcc )
 
 struct TabBarDDInfo
 {
-    ULONG   npTabBar;
-    USHORT  nPage;
+    ULONG 	npTabBar;
+    USHORT 	nPage;
 
     TabBarDDInfo() { npTabBar = 0; nPage = 0; }
     TabBarDDInfo( ULONG _npTabBar, USHORT _nPage ) { npTabBar = _npTabBar; nPage = _nPage; }
@@ -545,7 +545,7 @@ void __EXPORT BasicIDETabBar::Command( const CommandEvent& rCEvt )
     if ( ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU ) && !IsInEditMode() )
     {
         Point aPos( rCEvt.IsMouseEvent() ? rCEvt.GetMousePosPixel() : Point(1,1) );
-        if ( rCEvt.IsMouseEvent() )     // Richtige Tab selektieren
+        if ( rCEvt.IsMouseEvent() ) 	// Richtige Tab selektieren
         {
             Point aP = PixelToLogic( aPos );
             MouseEvent aMouseEvent( aP, 1, MOUSE_SIMPLECLICK, MOUSE_LEFT );
@@ -583,7 +583,7 @@ void __EXPORT BasicIDETabBar::Command( const CommandEvent& rCEvt )
                 aPopup.RemoveDisabledEntries();
             }
              if ( aDocument.isInVBAMode() )
-            {
+            {	
                 // disable to delete or remove object modules in IDE
                 BasicManager* pBasMgr = aDocument.getBasicManager();
                 if ( pBasMgr )
@@ -706,7 +706,7 @@ void CutLines( ::rtl::OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, BO
         nStartPos = searchEOL( rStr, nStartPos );
         if( nStartPos == -1 )
             break;
-        nStartPos++;    // nicht das \n.
+        nStartPos++;	// nicht das \n.
         nLine++;
     }
 
diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx
index 34a1f8f62c94..c5bf23e7ce85 100644
--- a/basctl/source/basicide/brkdlg.cxx
+++ b/basctl/source/basicide/brkdlg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,15 +69,15 @@ bool lcl_ParseText( String aText, USHORT& rLineNr )
 
 BreakPointDialog::BreakPointDialog( Window* pParent, BreakPointList& rBrkPntList ) :
         ModalDialog( pParent, IDEResId( RID_BASICIDE_BREAKPOINTDLG ) ),
-        aComboBox(      this, IDEResId( RID_CB_BRKPOINTS ) ),
-        aOKButton(      this, IDEResId( RID_PB_OK ) ),
-        aCancelButton(  this, IDEResId( RID_PB_CANCEL ) ),
-        aNewButton(     this, IDEResId( RID_PB_NEW ) ),
-        aDelButton(     this, IDEResId( RID_PB_DEL ) ),
-        aCheckBox(      this, IDEResId( RID_CHKB_ACTIVE ) ),
-        aBrkText(       this, IDEResId( RID_FT_BRKPOINTS ) ),
-        aPassText(      this, IDEResId( RID_FT_PASS ) ),
-        aNumericField(  this, IDEResId( RID_FLD_PASS ) ),
+        aComboBox( 		this, IDEResId( RID_CB_BRKPOINTS ) ),
+        aOKButton( 		this, IDEResId( RID_PB_OK ) ),
+        aCancelButton(	this, IDEResId( RID_PB_CANCEL ) ),
+        aNewButton(		this, IDEResId( RID_PB_NEW ) ),
+        aDelButton( 	this, IDEResId( RID_PB_DEL ) ),
+        aCheckBox( 		this, IDEResId( RID_CHKB_ACTIVE ) ),
+        aBrkText( 		this, IDEResId( RID_FT_BRKPOINTS ) ),
+        aPassText( 		this, IDEResId( RID_FT_PASS ) ),
+        aNumericField( 	this, IDEResId( RID_FLD_PASS ) ),
         m_rOriginalBreakPointList(rBrkPntList),
         m_aModifiedBreakPointList(rBrkPntList)
 {
@@ -98,7 +98,7 @@ BreakPointDialog::BreakPointDialog( Window* pParent, BreakPointList& rBrkPntList
     aOKButton.SetClickHdl( LINK( this, BreakPointDialog, ButtonHdl ) );
     aNewButton.SetClickHdl( LINK( this, BreakPointDialog, ButtonHdl ) );
     aDelButton.SetClickHdl( LINK( this, BreakPointDialog, ButtonHdl ) );
-//  aShowButton.SetClickHdl( LINK( this, BreakPointDialog, ButtonHdl ) );
+//	aShowButton.SetClickHdl( LINK( this, BreakPointDialog, ButtonHdl ) );
 
     aCheckBox.SetClickHdl( LINK( this, BreakPointDialog, CheckBoxHdl ) );
     aComboBox.SetSelectHdl( LINK( this, BreakPointDialog, ComboBoxHighlightHdl ) );
@@ -249,10 +249,10 @@ IMPL_LINK( BreakPointDialog, ButtonHdl, Button *, pButton )
         }
         CheckButtons();
     }
-//  else if ( pButton == &aShowButton )
-//  {
-//      ;
-//  }
+//	else if ( pButton == &aShowButton )
+//	{
+//		;
+//	}
 
     return 0;
 }
diff --git a/basctl/source/basicide/brkdlg.hrc b/basctl/source/basicide/brkdlg.hrc
index 921990d35e6c..1f313374f3b8 100644
--- a/basctl/source/basicide/brkdlg.hrc
+++ b/basctl/source/basicide/brkdlg.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <svl/solar.hrc>
 
-#define RID_BASICIDE_BREAKPOINTDLG      ( RID_BASICIDE_START + 80 )
+#define RID_BASICIDE_BREAKPOINTDLG		( RID_BASICIDE_START + 80 )
 
 #define RID_CB_BRKPOINTS    2
 #define RID_PB_OK           3
@@ -41,5 +41,5 @@
 #define RID_FT_BRKPOINTS    9
 #define RID_FLD_PASS       10
 
-#endif  // _BRKDLG_HRC
+#endif	// _BRKDLG_HRC
 
diff --git a/basctl/source/basicide/brkdlg.hxx b/basctl/source/basicide/brkdlg.hxx
index 04777bb70518..5513b416f707 100644
--- a/basctl/source/basicide/brkdlg.hxx
+++ b/basctl/source/basicide/brkdlg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,36 +40,36 @@
 class BreakPointDialog : public ModalDialog
 {
 private:
-    ComboBox        aComboBox;
-    OKButton        aOKButton;
-    CancelButton    aCancelButton;
-    PushButton      aNewButton;
-    PushButton      aDelButton;
-//  PushButton      aShowButton;
-    CheckBox        aCheckBox;
-    FixedText       aBrkText;
-    FixedText       aPassText;
-    NumericField    aNumericField;
+    ComboBox		aComboBox;
+    OKButton		aOKButton;
+    CancelButton	aCancelButton;
+    PushButton		aNewButton;
+    PushButton 		aDelButton;
+//	PushButton 		aShowButton;
+    CheckBox 		aCheckBox;
+    FixedText 		aBrkText;
+    FixedText 		aPassText;
+    NumericField 	aNumericField;
 
     BreakPointList & m_rOriginalBreakPointList;
     BreakPointList m_aModifiedBreakPointList;
 
 protected:
-    void            CheckButtons();
+    void 			CheckButtons();
     DECL_LINK( CheckBoxHdl, CheckBox * );
     DECL_LINK( ComboBoxHighlightHdl, ComboBox * );
     DECL_LINK( EditModifyHdl, Edit * );
     DECL_LINK( ButtonHdl, Button * );
-    void            UpdateFields( BreakPoint* pBrk );
-    BreakPoint*     GetSelectedBreakPoint();
+    void			UpdateFields( BreakPoint* pBrk );
+    BreakPoint*		GetSelectedBreakPoint();
 
 
 public:
             BreakPointDialog( Window* pParent, BreakPointList& rBrkList );
 
-    void    SetCurrentBreakPoint( BreakPoint* pBrk );
+    void	SetCurrentBreakPoint( BreakPoint* pBrk );
 };
 
-#endif  // _BRKDLG_HXX
+#endif	// _BRKDLG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/brkdlg.src b/basctl/source/basicide/brkdlg.src
index 00fd8fbf8968..cbb7e72f2b6b 100644
--- a/basctl/source/basicide/brkdlg.src
+++ b/basctl/source/basicide/brkdlg.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <brkdlg.hrc>
 ModalDialog RID_BASICIDE_BREAKPOINTDLG
 {
-     // HelpId = HID_BASICIDE_BRKPNTS ;
+     //	HelpId = HID_BASICIDE_BRKPNTS ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 178 , 116 ) ;
     Moveable = TRUE ;
-     // Closeable = TRUE;
+     //	Closeable = TRUE;
     ComboBox RID_CB_BRKPOINTS
     {
         Pos = MAP_APPFONT ( 6 , 14 ) ;
diff --git a/basctl/source/basicide/doceventnotifier.cxx b/basctl/source/basicide/doceventnotifier.cxx
index a47c269f2c3d..64b41dc484b1 100644
--- a/basctl/source/basicide/doceventnotifier.cxx
+++ b/basctl/source/basicide/doceventnotifier.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -189,7 +189,7 @@ namespace basctl
             break;
         }
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL DocumentEventNotifier_Impl::disposing( const csslang::EventObject& /*Event*/ ) throw (RuntimeException)
     {
diff --git a/basctl/source/basicide/docsignature.cxx b/basctl/source/basicide/docsignature.cxx
index 19cf14004612..07c258cc39df 100644
--- a/basctl/source/basicide/docsignature.cxx
+++ b/basctl/source/basicide/docsignature.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/basctl/source/basicide/documentenumeration.cxx b/basctl/source/basicide/documentenumeration.cxx
index e9cfa14b1ee0..dc1d108d96b3 100644
--- a/basctl/source/basicide/documentenumeration.cxx
+++ b/basctl/source/basicide/documentenumeration.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/basctl/source/basicide/documentenumeration.hxx b/basctl/source/basicide/documentenumeration.hxx
index 6778c676c15c..a0767ac1f8fb 100644
--- a/basctl/source/basicide/documentenumeration.hxx
+++ b/basctl/source/basicide/documentenumeration.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/basctl/source/basicide/ide_pch.cxx b/basctl/source/basicide/ide_pch.cxx
index 44937011dc2f..3a80c65525d6 100644
--- a/basctl/source/basicide/ide_pch.cxx
+++ b/basctl/source/basicide/ide_pch.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/basctl/source/basicide/ide_pch.hxx b/basctl/source/basicide/ide_pch.hxx
index d30218e73c50..e51702fdca60 100644
--- a/basctl/source/basicide/ide_pch.hxx
+++ b/basctl/source/basicide/ide_pch.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <svheader.hxx>
 
-#define ITEMID_SEARCH           0
-#define ITEMID_SIZE             0
+#define ITEMID_SEARCH			0
+#define ITEMID_SIZE				0
 
 #include <vcl/wrkwin.hxx>
 #include <vcl/msgbox.hxx>
diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx
index dd06ff421860..c0fd6456a2f3 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include <propbrw.hxx>
 
 
-#define ITEMID_SEARCH   0
+#define ITEMID_SEARCH	0
 #include <svl/srchitem.hxx>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
 
@@ -80,7 +80,7 @@ BasicIDEDLL::BasicIDEDLL()
     pShell = 0;
     pExtraData = 0;
 
-    GetExtraData(); // damit GlobalErrorHdl gesetzt wird.
+    GetExtraData();	// damit GlobalErrorHdl gesetzt wird.
 }
 
 BasicIDEDLL::~BasicIDEDLL()
@@ -155,9 +155,9 @@ BasicIDEData::~BasicIDEData()
     // sowieso sehr spaet, nach dem letzten Basic, zerstoert.
     // Durch den Aufruf werden dann aber wieder AppDaten erzeugt und nicht
     // mehr zerstoert => MLK's beim Purify
-//  StarBASIC::SetGlobalErrorHdl( Link() );
-//  StarBASIC::SetGlobalBreakHdl( Link() );
-//  StarBASIC::setGlobalStarScriptListener( XEngineListenerRef() );
+//	StarBASIC::SetGlobalErrorHdl( Link() );
+//	StarBASIC::SetGlobalBreakHdl( Link() );
+//	StarBASIC::setGlobalStarScriptListener( XEngineListenerRef() );
 
     delete pSearchItem;
     //delete pAccelerator;
@@ -223,7 +223,7 @@ IMPL_LINK( BasicIDEData, ExecuteMacroEvent, void *, pData )
         // Ist es eine StarScript-Methode? Am Parent erkennen
         DBG_ASSERT( pMethod->GetParent()->GetFlags() & SBX_EXTSEARCH, "Kein EXTSEARCH!" );
         BasicIDE::RunMethod( pMethod );
-        pMethod->ReleaseRef();  // muss vorher inkrementiert worden sein!
+        pMethod->ReleaseRef();	// muss vorher inkrementiert worden sein!
         SFX_APP()->LeaveBasicCall();
     }
     return 0;
diff --git a/basctl/source/basicide/iderdll2.hxx b/basctl/source/basicide/iderdll2.hxx
index e79c11721ed6..c49d3507ea69 100644
--- a/basctl/source/basicide/iderdll2.hxx
+++ b/basctl/source/basicide/iderdll2.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class Accelerator;
 #include <bastypes.hxx>
 #include <bastype2.hxx>
 
-#define INVPOSITION 0x7fff
+#define INVPOSITION	0x7fff
 
 class BasicIDEData
 {
 private:
-    Accelerator*    pAccelerator;
-    SvxSearchItem*  pSearchItem;
+    Accelerator*	pAccelerator;
+    SvxSearchItem*	pSearchItem;
 
-    LibInfos        aLibInfos;
+    LibInfos		aLibInfos;
 
     BasicEntryDescriptor    m_aLastEntryDesc;
 
-    Point           aObjCatPos;
-    Size            aObjCatSize;
+    Point			aObjCatPos;
+    Size			aObjCatSize;
 
-    String          aAddLibPath;
-    String          aAddLibFilter;
+    String			aAddLibPath;
+    String			aAddLibFilter;
 
-    USHORT          nBasicDialogCount;
+    USHORT			nBasicDialogCount;
 
-    BOOL            OLD_bRelMacroRecording;
-    BOOL            bChoosingMacro;
-    BOOL            bShellInCriticalSection;
+    BOOL			OLD_bRelMacroRecording;
+    BOOL			bChoosingMacro;
+    BOOL			bShellInCriticalSection;
 
 protected:
     DECL_LINK( GlobalBasicBreakHdl, StarBASIC * );
@@ -71,36 +71,36 @@ public:
                             BasicIDEData();
                             ~BasicIDEData();
 
-    LibInfos&               GetLibInfos() { return aLibInfos; }
+    LibInfos&				GetLibInfos() { return aLibInfos; }
 
     BasicEntryDescriptor&   GetLastEntryDescriptor()    { return m_aLastEntryDesc; }
     void                    SetLastEntryDescriptor( BasicEntryDescriptor& rDesc ) { m_aLastEntryDesc = rDesc; }
 
-    BOOL&                   ChoosingMacro()             { return bChoosingMacro; }
-    BOOL&                   ShellInCriticalSection()    { return bShellInCriticalSection; }
+    BOOL&					ChoosingMacro() 			{ return bChoosingMacro; }
+    BOOL&					ShellInCriticalSection()	{ return bShellInCriticalSection; }
 
-    USHORT                  GetBasicDialogCount() const { return nBasicDialogCount; }
-    void                    IncBasicDialogCount()       { nBasicDialogCount++; }
-    void                    DecBasicDialogCount()       { nBasicDialogCount--; }
+    USHORT					GetBasicDialogCount() const { return nBasicDialogCount; }
+    void					IncBasicDialogCount() 		{ nBasicDialogCount++; }
+    void					DecBasicDialogCount()		{ nBasicDialogCount--; }
 
-    SvxSearchItem&          GetSearchItem() const;
-    void                    SetSearchItem( const SvxSearchItem& rItem );
+    SvxSearchItem&			GetSearchItem() const;
+    void					SetSearchItem( const SvxSearchItem& rItem );
 
-    void                    SetObjectCatalogPos( const Point& rPnt )
+    void					SetObjectCatalogPos( const Point& rPnt )
                                 { aObjCatPos = rPnt; }
-    const Point&            GetObjectCatalogPos() const
+    const Point&			GetObjectCatalogPos() const
                                 { return aObjCatPos; }
 
-    void                    SetObjectCatalogSize( const Size& rSize )
+    void					SetObjectCatalogSize( const Size& rSize )
                                 { aObjCatSize = rSize; }
-    const Size&             GetObjectCatalogSize() const
+    const Size&				GetObjectCatalogSize() const
                                 { return aObjCatSize; }
 
-    const String&           GetAddLibPath() const   { return aAddLibPath; }
-    void                    SetAddLibPath( const String& rPath ) { aAddLibPath = rPath; }
+    const String&			GetAddLibPath() const	{ return aAddLibPath; }
+    void					SetAddLibPath( const String& rPath ) { aAddLibPath = rPath; }
 
-    const String&           GetAddLibFilter() const { return aAddLibFilter; }
-    void                    SetAddLibFilter( const String& rFilter )  { aAddLibFilter = rFilter; }
+    const String&			GetAddLibFilter() const	{ return aAddLibFilter; }
+    void					SetAddLibFilter( const String& rFilter )  { aAddLibFilter = rFilter; }
 
     DECL_LINK( ExecuteMacroEvent, void * );
 };
diff --git a/basctl/source/basicide/idetemp.hxx b/basctl/source/basicide/idetemp.hxx
index 7700d94f0748..2d8d826bdea7 100644
--- a/basctl/source/basicide/idetemp.hxx
+++ b/basctl/source/basicide/idetemp.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx
index bd0259fe0637..b12cc89206be 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include "precompiled_basctl.hxx"
 #include <ide_pch.hxx>
 
-#include <basidesh.hxx>
+#include <basidesh.hxx> 
 #include <baside3.hxx>
 #include <basobj.hxx>
 #include <iderdll.hxx>
 #include "dlged.hxx"
 
-#include <localizationmgr.hxx>
+#include <localizationmgr.hxx> 
 #include <com/sun/star/resource/XStringResourceSupplier.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
 
@@ -135,9 +135,9 @@ bool isLanguageDependentProperty( ::rtl::OUString aName )
         pLangDepProp++;
     }
     return bRet;
-}
+} 
 //============================================
-
+ 
 void LocalizationMgr::implEnableDisableResourceForAllLibraryDialogs( HandleResourceMode eMode )
 {
     Sequence< ::rtl::OUString > aDlgNames = m_aDocument.getObjectNames( E_DIALOGS, m_aLibName );
@@ -201,11 +201,11 @@ extern bool localesAreEqual( const ::com::sun::star::lang::Locale& rLocaleLeft,
                              const ::com::sun::star::lang::Locale& rLocaleRight );
 
 // Works on xStringResourceManager's current language for SET_IDS/RESET_IDS,
-// anyway only one language should exist when calling this method then,
+// anyway only one language should exist when calling this method then, 
 // either the first one for mode SET_IDS or the last one for mode RESET_IDS
 sal_Int32 LocalizationMgr::implHandleControlResourceProperties
     ( Any aControlAny, const ::rtl::OUString& aDialogName, const ::rtl::OUString& aCtrlName,
-        Reference< XStringResourceManager > xStringResourceManager,
+        Reference< XStringResourceManager > xStringResourceManager, 
         Reference< XStringResourceResolver > xSourceStringResolver, HandleResourceMode eMode )
 {
     sal_Int32 nChangedCount = 0;
@@ -796,7 +796,7 @@ void LocalizationMgr::handleRemoveLocales( Sequence< Locale > aLocaleSeq )
         handleTranslationbar();
     }
 
-    DBG_ASSERT( bConsistant,
+    DBG_ASSERT( bConsistant, 
         "LocalizationMgr::handleRemoveLocales(): sequence contains unsupported locales" );
 }
 
@@ -889,7 +889,7 @@ DialogWindow* FindDialogWindowForEditor( DlgEditor* pEditor )
         pWin = aIDEWindowTable.Next();
     }
     return pFoundDlgWin;
-}
+} 
 
 
 void LocalizationMgr::setControlResourceIDsForNewEditorObject( DlgEditor* pEditor,
@@ -920,7 +920,7 @@ void LocalizationMgr::setControlResourceIDsForNewEditorObject( DlgEditor* pEdito
 
     if( nChangedCount )
         BasicIDE::MarkDocumentModified( aDocument );
-}
+} 
 
 void LocalizationMgr::renameControlResourceIDsForEditorObject( DlgEditor* pEditor,
     ::com::sun::star::uno::Any aControlAny, const ::rtl::OUString& aNewCtrlName )
@@ -947,7 +947,7 @@ void LocalizationMgr::renameControlResourceIDsForEditorObject( DlgEditor* pEdito
     implHandleControlResourceProperties
         ( aControlAny, aDialogName, aNewCtrlName, xStringResourceManager,
           xDummyStringResolver, RENAME_CONTROL_IDS );
-}
+} 
 
 
 void LocalizationMgr::deleteControlResourceIDsForDeletedEditorObject( DlgEditor* pEditor,
@@ -974,7 +974,7 @@ void LocalizationMgr::deleteControlResourceIDsForDeletedEditorObject( DlgEditor*
 
     if( nChangedCount )
         BasicIDE::MarkDocumentModified( aDocument );
-}
+} 
 
 void LocalizationMgr::setStringResourceAtDialog( const ScriptDocument& rDocument, const String& aLibName,
     const String& aDlgName, Reference< container::XNameContainer > xDialogModel )
@@ -1149,7 +1149,7 @@ void LocalizationMgr::copyResourcesForPastedEditorObject( DlgEditor* pEditor,
     implHandleControlResourceProperties
         ( aControlAny, aDialogName, aCtrlName, xStringResourceManager,
           xSourceStringResolver, MOVE_RESOURCES );
-}
+} 
 
 void LocalizationMgr::copyResourceForDroppedDialog( Reference< container::XNameContainer > xDialogModel,
     const ::rtl::OUString& aDialogName, Reference< XStringResourceManager > xStringResourceManager,
@@ -1218,7 +1218,7 @@ Reference< XStringResourceManager > LocalizationMgr::getStringResourceFromDialog
             Reference< resource::XStringResourceResolver >
                 xStringResourceResolver = xStringResourceSupplier->getStringResource();
 
-            xStringResourceManager =
+            xStringResourceManager = 
                 Reference< resource::XStringResourceManager >( xStringResourceResolver, UNO_QUERY );
         }
     }
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index e3f21bba669a..01e33f2aec50 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <macrodlg.hrc>
 #include <basidesh.hrc>
 #include <basidesh.hxx>
-#include <baside2.hrc>      // ID's fuer Imagese
+#include <baside2.hrc>		// ID's fuer Imagese
 #include <basobj.hxx>
 #include <baside3.hxx>
 
@@ -63,23 +63,23 @@ using namespace ::com::sun::star::uno;
 DECLARE_LIST( MacroList, SbMethod* )
 
 MacroChooser::MacroChooser( Window* pParnt, BOOL bCreateEntries ) :
-        SfxModalDialog(     pParnt, IDEResId( RID_MACROCHOOSER ) ),
-        aMacroNameTxt(      this,   IDEResId( RID_TXT_MACRONAME ) ),
-        aMacroNameEdit(     this,   IDEResId( RID_ED_MACRONAME ) ),
-        aMacroFromTxT(      this,   IDEResId( RID_TXT_MACROFROM ) ),
-        aMacrosSaveInTxt(   this,   IDEResId( RID_TXT_SAVEMACRO ) ),
-        aBasicBox(          this,   IDEResId( RID_CTRL_LIB ) ),
-        aMacrosInTxt(       this,   IDEResId( RID_TXT_MACROSIN ) ),
-        aMacroBox(          this,   IDEResId( RID_CTRL_MACRO ) ),
-        aRunButton(         this,   IDEResId( RID_PB_RUN ) ),
-        aCloseButton(       this,   IDEResId( RID_PB_CLOSE ) ),
-        aAssignButton(      this,   IDEResId( RID_PB_ASSIGN ) ),
-        aEditButton(        this,   IDEResId( RID_PB_EDIT ) ),
-        aNewDelButton(      this,   IDEResId( RID_PB_DEL ) ),
-        aOrganizeButton(    this,   IDEResId( RID_PB_ORG ) ),
-        aHelpButton(        this,   IDEResId( RID_PB_HELP ) ),
-        aNewLibButton(      this,   IDEResId( RID_PB_NEWLIB ) ),
-        aNewModButton(      this,   IDEResId( RID_PB_NEWMOD ) )
+        SfxModalDialog( 	pParnt,	IDEResId( RID_MACROCHOOSER ) ),
+        aMacroNameTxt(		this,	IDEResId( RID_TXT_MACRONAME ) ),
+        aMacroNameEdit(		this,	IDEResId( RID_ED_MACRONAME ) ),
+        aMacroFromTxT(		this,	IDEResId( RID_TXT_MACROFROM ) ),
+        aMacrosSaveInTxt(	this,	IDEResId( RID_TXT_SAVEMACRO ) ),
+        aBasicBox(			this,	IDEResId( RID_CTRL_LIB ) ),
+        aMacrosInTxt(		this,	IDEResId( RID_TXT_MACROSIN ) ),
+        aMacroBox(			this,	IDEResId( RID_CTRL_MACRO ) ),
+        aRunButton(			this,	IDEResId( RID_PB_RUN ) ),
+        aCloseButton(	    this,	IDEResId( RID_PB_CLOSE ) ),
+        aAssignButton(		this,	IDEResId( RID_PB_ASSIGN ) ),
+        aEditButton(		this,	IDEResId( RID_PB_EDIT ) ),
+        aNewDelButton(		this,	IDEResId( RID_PB_DEL ) ),
+        aOrganizeButton(	this,	IDEResId( RID_PB_ORG ) ),
+        aHelpButton(		this,	IDEResId( RID_PB_HELP ) ),
+        aNewLibButton(	    this,	IDEResId( RID_PB_NEWLIB ) ),
+        aNewModButton(	    this,	IDEResId( RID_PB_NEWMOD ) )
 {
     FreeResource();
 
@@ -106,9 +106,9 @@ MacroChooser::MacroChooser( Window* pParnt, BOOL bCreateEntries ) :
     // Buttons only for MACROCHOOSER_RECORDING
     aNewLibButton.SetClickHdl( LINK( this, MacroChooser, ButtonHdl ) );
     aNewModButton.SetClickHdl( LINK( this, MacroChooser, ButtonHdl ) );
-    aNewLibButton.Hide();       // default
-    aNewModButton.Hide();       // default
-    aMacrosSaveInTxt.Hide();    // default
+    aNewLibButton.Hide();		// default
+    aNewModButton.Hide();		// default
+    aMacrosSaveInTxt.Hide();	// default
 
     aMacrosInTxt.SetStyle( WB_NOMULTILINE | WB_PATHELLIPSIS );
 
@@ -120,7 +120,7 @@ MacroChooser::MacroChooser( Window* pParnt, BOOL bCreateEntries ) :
     aMacroBox.SetSelectHdl( LINK( this, MacroChooser, MacroSelectHdl ) );
 
     aBasicBox.SetMode( BROWSEMODE_MODULES );
-    aBasicBox.SetWindowBits( WB_HASLINES | WB_HASLINESATROOT |
+    aBasicBox.SetWindowBits( WB_HASLINES | WB_HASLINESATROOT | 
                              WB_HASBUTTONS | WB_HASBUTTONSATROOT |
                              WB_HSCROLL );
 
@@ -389,13 +389,13 @@ SbMethod* MacroChooser::CreateMacro()
                 aModName = aModName.GetToken( 0, ' ', nIndex );
             }
             pModule = pBasic->FindModule( aModName );
-        }
+        }    
         else if ( pBasic->GetModules()->Count() )
             pModule = (SbModule*)pBasic->GetModules()->Get( 0 );
 
         if ( !pModule )
         {
-            pModule = createModImpl( static_cast<Window*>( this ),
+            pModule = createModImpl( static_cast<Window*>( this ), 
                 aDocument, aBasicBox, aLibName, aModName );
         }
 
@@ -421,7 +421,7 @@ void MacroChooser::SaveSetCurEntry( SvTreeListBox& rBox, SvLBoxEntry* pEntry )
 
 void MacroChooser::CheckButtons()
 {
-    SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry();
+    SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry();    
     BasicEntryDescriptor aDesc( aBasicBox.GetEntryDescriptor( pCurEntry ) );
     SvLBoxEntry* pMacroEntry = aMacroBox.FirstSelected();
     SbMethod* pMethod = GetMacro();
@@ -761,8 +761,8 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
                 }
                 CheckButtons();
                 UpdateFields();
-                //if ( aMacroBox.GetCurEntry() )    // OV-Bug ?
-                //  aMacroBox.Select( aMacroBox.GetCurEntry() );
+                //if ( aMacroBox.GetCurEntry() )	// OV-Bug ?
+                //	aMacroBox.Select( aMacroBox.GetCurEntry() );
             }
             else
             {
@@ -832,7 +832,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
         ScriptDocument aDocument( aDesc.GetDocument() );
         String aLibName( aDesc.GetLibName() );
         String aModName;
-        createModImpl( static_cast<Window*>( this ), aDocument,
+        createModImpl( static_cast<Window*>( this ), aDocument, 
             aBasicBox, aLibName, aModName, true );
     }
     else if ( pButton == &aOrganizeButton )
@@ -844,7 +844,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
         USHORT nRet = pDlg->Execute();
         delete pDlg;
 
-        if ( nRet ) // Nicht einfach nur geschlossen
+        if ( nRet )	// Nicht einfach nur geschlossen
         {
             EndDialog( MACRO_EDIT );
             return 0;
@@ -863,8 +863,8 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
 
 void MacroChooser::UpdateFields()
 {
-    SvLBoxEntry*    pMacroEntry = aMacroBox.GetCurEntry();
-    String          aEmptyStr;
+    SvLBoxEntry*	pMacroEntry = aMacroBox.GetCurEntry();
+    String			aEmptyStr;
 
     aMacroNameEdit.SetText( aEmptyStr );
     if ( pMacroEntry )
diff --git a/basctl/source/basicide/macrodlg.hrc b/basctl/source/basicide/macrodlg.hrc
index ae96e1b0b92f..e209ae060019 100644
--- a/basctl/source/basicide/macrodlg.hrc
+++ b/basctl/source/basicide/macrodlg.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 #include <svl/solar.hrc>
 
-#define RID_MACROCHOOSER                ( RID_BASICIDE_START + 50 )
-#define RID_STR_BTNDEL                  ( RID_BASICIDE_START + 51 )
-#define RID_STR_BTNNEW                  ( RID_BASICIDE_START + 52 )
-#define RID_STR_CHOOSE                  ( RID_BASICIDE_START + 53 )
-#define RID_STR_RUN                     ( RID_BASICIDE_START + 54 )
+#define RID_MACROCHOOSER				( RID_BASICIDE_START + 50 )
+#define RID_STR_BTNDEL					( RID_BASICIDE_START + 51 )
+#define RID_STR_BTNNEW					( RID_BASICIDE_START + 52 )
+#define RID_STR_CHOOSE					( RID_BASICIDE_START + 53 )
+#define RID_STR_RUN						( RID_BASICIDE_START + 54 )
 #define RID_STR_RECORD                  ( RID_BASICIDE_START + 56 )
 
-#define RID_CTRL_MACRO                   1
-#define RID_CTRL_LIB                     2
-#define RID_TXT_MACRONAME                3
-#define RID_TXT_MACROFROM                4
-#define RID_ED_MACRONAME                 5
-#define RID_TXT_DESCRIPTION              6
-#define RID_PB_RUN                       8
-#define RID_PB_CLOSE                     9
-#define RID_PB_EDIT                     10
-#define RID_PB_ORG                      11
-#define RID_PB_DEL                      12
-#define RID_PB_ASSIGN                   13
-#define RID_PB_HELP                     15
-#define RID_ML_DESCRIPTION              16
-#define RID_TXT_MACROSIN                17
-#define RID_TXT_SAVEMACRO               18
-#define RID_PB_NEWLIB                   19
-#define RID_PB_NEWMOD                   20
+#define RID_CTRL_MACRO					 1
+#define RID_CTRL_LIB					 2
+#define RID_TXT_MACRONAME				 3
+#define RID_TXT_MACROFROM				 4
+#define RID_ED_MACRONAME				 5
+#define RID_TXT_DESCRIPTION				 6
+#define RID_PB_RUN						 8
+#define RID_PB_CLOSE					 9
+#define RID_PB_EDIT						10
+#define RID_PB_ORG						11
+#define RID_PB_DEL						12
+#define RID_PB_ASSIGN					13
+#define RID_PB_HELP						15
+#define RID_ML_DESCRIPTION				16
+#define RID_TXT_MACROSIN				17
+#define RID_TXT_SAVEMACRO				18
+#define RID_PB_NEWLIB					19
+#define RID_PB_NEWMOD					20
 
 #endif // _MACRODLG_HRC
 
diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx
index b6841377833b..287fe837aee7 100644
--- a/basctl/source/basicide/macrodlg.hxx
+++ b/basctl/source/basicide/macrodlg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,45 +38,45 @@
 
 #include <vcl/button.hxx>
 
-#define MACRO_CLOSE         10
-#define MACRO_OK_RUN        11
-#define MACRO_NEW           12
-#define MACRO_EDIT          14
-#define MACRO_ORGANIZE      15
-#define MACRO_ASSIGN        16
+#define MACRO_CLOSE			10
+#define MACRO_OK_RUN		11
+#define MACRO_NEW 			12
+#define MACRO_EDIT			14
+#define MACRO_ORGANIZE		15
+#define MACRO_ASSIGN		16
 
-#define MACROCHOOSER_ALL            1
-#define MACROCHOOSER_CHOOSEONLY     2
-#define MACROCHOOSER_RECORDING      3
+#define MACROCHOOSER_ALL			1
+#define MACROCHOOSER_CHOOSEONLY		2
+#define MACROCHOOSER_RECORDING		3
 
 class BasicManager;
 
 class MacroChooser : public SfxModalDialog
 {
 private:
-    FixedText               aMacroNameTxt;
-    Edit                    aMacroNameEdit;
-    FixedText               aMacroFromTxT;
-    FixedText               aMacrosSaveInTxt;
-    BasicTreeListBox        aBasicBox;
-    FixedText               aMacrosInTxt;
-    String                  aMacrosInTxtBaseStr;
-    SvTreeListBox           aMacroBox;
-
-    PushButton              aRunButton;
-    CancelButton            aCloseButton;
-    PushButton              aAssignButton;
-    PushButton              aEditButton;
-    PushButton              aNewDelButton;
-    PushButton              aOrganizeButton;
-    HelpButton              aHelpButton;
-    PushButton              aNewLibButton;
-    PushButton              aNewModButton;
-
-    BOOL                bNewDelIsDel;
-    BOOL                bForceStoreBasic;
-
-    USHORT              nMode;
+    FixedText 				aMacroNameTxt;
+    Edit 					aMacroNameEdit;
+    FixedText 				aMacroFromTxT;
+    FixedText 				aMacrosSaveInTxt;
+    BasicTreeListBox		aBasicBox;
+    FixedText 				aMacrosInTxt;
+    String	 				aMacrosInTxtBaseStr;
+    SvTreeListBox			aMacroBox;
+
+    PushButton				aRunButton;
+    CancelButton 			aCloseButton;
+    PushButton				aAssignButton;
+    PushButton				aEditButton;
+    PushButton				aNewDelButton;
+    PushButton 				aOrganizeButton;
+    HelpButton				aHelpButton;
+    PushButton 				aNewLibButton;
+    PushButton 				aNewModButton;
+
+    BOOL				bNewDelIsDel;
+    BOOL				bForceStoreBasic;
+
+    USHORT				nMode;
 
     DECL_LINK( MacroSelectHdl, SvTreeListBox * );
     DECL_LINK( MacroDoubleClickHdl, SvTreeListBox * );
@@ -84,31 +84,31 @@ private:
     DECL_LINK( EditModifyHdl, Edit * );
     DECL_LINK( ButtonHdl, Button * );
 
-    void                CheckButtons();
-    void                SaveSetCurEntry( SvTreeListBox& rBox, SvLBoxEntry* pEntry );
-    void                UpdateFields();
+    void				CheckButtons();
+    void				SaveSetCurEntry( SvTreeListBox& rBox, SvLBoxEntry* pEntry );
+    void				UpdateFields();
 
-    void                EnableButton( Button& rButton, BOOL bEnable );
+    void				EnableButton( Button& rButton, BOOL bEnable );
 
-    String              GetInfo( SbxVariable* pVar );
+    String				GetInfo( SbxVariable* pVar );
 
-    void                StoreMacroDescription();
-    void                RestoreMacroDescription();
+    void				StoreMacroDescription();
+    void				RestoreMacroDescription();
 
 public:
                         MacroChooser( Window* pParent, BOOL bCreateEntries = TRUE );
                         ~MacroChooser();
 
-    SbMethod*           GetMacro();
+    SbMethod*			GetMacro();
     void                DeleteMacro();
-    SbMethod*           CreateMacro();
+    SbMethod*			CreateMacro();
 
-    virtual short       Execute();
+    virtual short		Execute();
 
-    void                SetMode( USHORT nMode );
-    USHORT              GetMode() const { return nMode; }
+    void				SetMode( USHORT nMode );
+    USHORT				GetMode() const { return nMode; }
 };
 
-#endif  // _MACRODLG_HXX
+#endif	// _MACRODLG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/macrodlg.src b/basctl/source/basicide/macrodlg.src
index 5037879802b0..b4ef8b0270bb 100644
--- a/basctl/source/basicide/macrodlg.src
+++ b/basctl/source/basicide/macrodlg.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <helpid.hrc>
 ModalDialog RID_MACROCHOOSER
 {
-     // HelpId = SID_BASICCHOOSER ;
+     //	HelpId = SID_BASICCHOOSER ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 287 , 165 ) ;
     Text [ en-US ] = "%PRODUCTNAME Basic Macros" ;
     Moveable = TRUE ;
-     // Closeable = TRUE;
+     //	Closeable = TRUE;
 
     FixedText RID_TXT_MACROSIN
     {
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index b66d6b3510d9..8eb60dbcc9dc 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ private:
 
 public:
                     BasicLibUserData( const ScriptDocument& rDocument ) : m_aDocument( rDocument ) { }
-                    virtual         ~BasicLibUserData() {};
+                    virtual 		~BasicLibUserData() {};
 
     const ScriptDocument&
                     GetDocument() const { return m_aDocument; }
@@ -126,7 +126,7 @@ public:
 class BasicLibLBoxString : public SvLBoxString
 {
 public:
-    BasicLibLBoxString( SvLBoxEntry* pEntry, USHORT nFlags, const String& rTxt ) :
+    BasicLibLBoxString( SvLBoxEntry* pEntry, USHORT nFlags,	const String& rTxt ) :
         SvLBoxString( pEntry, nFlags, rTxt ) {}
 
     virtual void Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags, SvLBoxEntry* pEntry );
@@ -172,7 +172,7 @@ BasicCheckBox::BasicCheckBox( Window* pParent, const ResId& rResId )
     ,m_aDocument( ScriptDocument::getApplicationScriptDocument() )
 {
     nMode = LIBMODE_MANAGER;
-    long aTabs_[] = { 1, 12 };  // Mindestens einen braucht die TabPos...
+    long aTabs_[] = { 1, 12 };	// Mindestens einen braucht die TabPos...
                                 // 12 wegen der Checkbox
     SetTabs( aTabs_ );
     Init();
@@ -1711,7 +1711,7 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument,
                             std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_MODULE ) ) );
                         DBG_ASSERT( pEntry_, "InsertEntry fehlgeschlagen!" );
                         pBasicBox->SetCurEntry( pEntry_ );
-                        pBasicBox->Select( pBasicBox->GetCurEntry() );      // OV-Bug?!
+                        pBasicBox->Select( pBasicBox->GetCurEntry() );		// OV-Bug?!
                     }
                 }
             }
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index fcc2858670d1..ac5cd3e6c4e9 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -146,7 +146,7 @@ BOOL __EXPORT ExtBasicTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const Strin
     SetCurEntry( pEntry );
     SetCurEntry( pEntry );
     Select( pEntry, FALSE );
-    Select( pEntry );       // damit Handler gerufen wird => Edit updaten
+    Select( pEntry );		// damit Handler gerufen wird => Edit updaten
 
     return TRUE;
 }
@@ -223,8 +223,8 @@ BOOL __EXPORT ExtBasicTreeListBox::NotifyAcceptDrop( SvLBoxEntry* pEntry )
         // check if module library is not loaded, readonly or password protected
         Reference< script::XLibraryContainer2 > xModLibContainer( rDestDoc.getLibraryContainer( E_SCRIPTS ), UNO_QUERY );
         if ( xModLibContainer.is() && xModLibContainer->hasByName( aOUDestLibName ) )
-        {
-            if ( !xModLibContainer->isLibraryLoaded( aOUDestLibName ) )
+        {                                                
+            if ( !xModLibContainer->isLibraryLoaded( aOUDestLibName ) ) 
                 bValid = FALSE;
 
             if ( xModLibContainer->isLibraryReadOnly( aOUDestLibName ) )
@@ -239,7 +239,7 @@ BOOL __EXPORT ExtBasicTreeListBox::NotifyAcceptDrop( SvLBoxEntry* pEntry )
         Reference< script::XLibraryContainer2 > xDlgLibContainer( rDestDoc.getLibraryContainer( E_DIALOGS ), UNO_QUERY );
         if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aOUDestLibName ) )
         {
-            if ( !xDlgLibContainer->isLibraryLoaded( aOUDestLibName ) )
+            if ( !xDlgLibContainer->isLibraryLoaded( aOUDestLibName ) ) 
                 bValid = FALSE;
 
             if ( xDlgLibContainer->isLibraryReadOnly( aOUDestLibName ) )
@@ -269,7 +269,7 @@ BOOL __EXPORT ExtBasicTreeListBox::NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEnt
 BOOL __EXPORT ExtBasicTreeListBox::NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
                         SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos )
 {
-//  return FALSE;   // Wie kopiere ich ein SBX ?!
+//	return FALSE;	// Wie kopiere ich ein SBX ?!
     return NotifyCopyingMoving( pTarget, pEntry,
                                     rpNewParent, rNewChildPos, FALSE );
 }
@@ -277,7 +277,7 @@ BOOL __EXPORT ExtBasicTreeListBox::NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEn
 
 void BasicIDEShell::CopyDialogResources( Reference< io::XInputStreamProvider >& io_xISP,
     const ScriptDocument& rSourceDoc, const String& rSourceLibName, const ScriptDocument& rDestDoc,
-    const String& rDestLibName, const String& rDlgName )
+    const String& rDestLibName,	const String& rDlgName )
 {
     if ( !io_xISP.is() )
         return;
@@ -335,8 +335,8 @@ BOOL __EXPORT ExtBasicTreeListBox::NotifyCopyingMoving( SvLBoxEntry* pTarget, Sv
                         SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos, BOOL bMove )
 {
     (void)pEntry;
-    DBG_ASSERT( pEntry, "Kein Eintrag?" );  // Hier ASS ok, sollte nicht mit
-    DBG_ASSERT( pTarget, "Kein Ziel?" );    // NULL (ganz vorne) erreicht werden
+    DBG_ASSERT( pEntry, "Kein Eintrag?" );	// Hier ASS ok, sollte nicht mit
+    DBG_ASSERT( pTarget, "Kein Ziel?" );	// NULL (ganz vorne) erreicht werden
     USHORT nDepth = GetModel()->GetDepth( pTarget );
     DBG_ASSERT( nDepth, "Tiefe?" );
     if ( nDepth == 1 )
@@ -369,7 +369,7 @@ BOOL __EXPORT ExtBasicTreeListBox::NotifyCopyingMoving( SvLBoxEntry* pTarget, Sv
     SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
     SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
 
-    if ( bMove )    // move
+    if ( bMove )	// move
     {
         // remove source module/dialog window
         if ( rSourceDoc != rDestDoc || aSourceLibName != aDestLibName )
@@ -384,7 +384,7 @@ BOOL __EXPORT ExtBasicTreeListBox::NotifyCopyingMoving( SvLBoxEntry* pTarget, Sv
 
         try
         {
-            if ( eType == OBJ_TYPE_MODULE ) // module
+            if ( eType == OBJ_TYPE_MODULE )	// module
             {
                 // get module
                 ::rtl::OUString aModule;
@@ -401,7 +401,7 @@ BOOL __EXPORT ExtBasicTreeListBox::NotifyCopyingMoving( SvLBoxEntry* pTarget, Sv
                     }
                 }
             }
-            else if ( eType == OBJ_TYPE_DIALOG )    // dialog
+            else if ( eType == OBJ_TYPE_DIALOG )	// dialog
             {
                 // get dialog
                 Reference< io::XInputStreamProvider > xISP;
@@ -427,12 +427,12 @@ BOOL __EXPORT ExtBasicTreeListBox::NotifyCopyingMoving( SvLBoxEntry* pTarget, Sv
             DBG_UNHANDLED_EXCEPTION();
         }
     }
-    else    // copy
+    else	// copy
     {
         try
         {
-            if ( eType == OBJ_TYPE_MODULE ) // module
-            {
+            if ( eType == OBJ_TYPE_MODULE )	// module
+            {	
                 // get module
                 ::rtl::OUString aModule;
                 if ( rSourceDoc.getModule( aSourceLibName, aSourceName, aModule ) )
@@ -442,7 +442,7 @@ BOOL __EXPORT ExtBasicTreeListBox::NotifyCopyingMoving( SvLBoxEntry* pTarget, Sv
                         BasicIDE::MarkDocumentModified( rDestDoc );
                 }
             }
-            else if ( eType == OBJ_TYPE_DIALOG )    // dialog
+            else if ( eType == OBJ_TYPE_DIALOG )	// dialog
             {
                 // get dialog
                 Reference< io::XInputStreamProvider > xISP;
@@ -474,7 +474,7 @@ BOOL __EXPORT ExtBasicTreeListBox::NotifyCopyingMoving( SvLBoxEntry* pTarget, Sv
         }
     }
 
-    return 2;   // Aufklappen...
+    return 2;	// Aufklappen...
 }
 
 OrganizeDialog::OrganizeDialog( Window* pParent, INT16 tabId, BasicEntryDescriptor& rDesc )
@@ -553,7 +553,7 @@ IMPL_LINK( OrganizeDialog, ActivatePageHdl, TabControl *, pTabCtrl )
                 ((LibPage*)pNewTabPage)->SetTabDlg( this );
             }
             break;
-            default:    DBG_ERROR( "PageHdl: Unbekannte ID!" );
+            default:	DBG_ERROR( "PageHdl: Unbekannte ID!" );
         }
         DBG_ASSERT( pNewTabPage, "Keine Page!" );
         pTabCtrl->SetTabPage( nId, pNewTabPage );
@@ -562,14 +562,14 @@ IMPL_LINK( OrganizeDialog, ActivatePageHdl, TabControl *, pTabCtrl )
 }
 
 ObjectPage::ObjectPage( Window * pParent, const ResId& rResId, USHORT nMode ) :
-        TabPage(        pParent, rResId ),
-        aLibText(       this,   IDEResId( RID_STR_LIB ) ),
-        aBasicBox(      this,   IDEResId( RID_TRLBOX ) ),
-        aEditButton(    this,   IDEResId( RID_PB_EDIT ) ),
-        aCloseButton(   this,   IDEResId( RID_PB_CLOSE ) ),
-        aNewModButton(  this,   IDEResId( RID_PB_NEWMOD ) ),
-        aNewDlgButton(  this,   IDEResId( RID_PB_NEWDLG ) ),
-        aDelButton(     this,   IDEResId( RID_PB_DELETE ) )
+        TabPage(		pParent, rResId ),
+        aLibText( 		this, 	IDEResId( RID_STR_LIB ) ),
+        aBasicBox( 		this, 	IDEResId( RID_TRLBOX ) ),
+        aEditButton( 	this, 	IDEResId( RID_PB_EDIT ) ),
+        aCloseButton( 	this, 	IDEResId( RID_PB_CLOSE ) ),
+        aNewModButton( 	this, 	IDEResId( RID_PB_NEWMOD ) ),
+        aNewDlgButton( 	this, 	IDEResId( RID_PB_NEWDLG ) ),
+        aDelButton( 	this, 	IDEResId( RID_PB_DELETE ) )
 {
     FreeResource();
     pTabDlg = 0;
@@ -593,7 +593,7 @@ ObjectPage::ObjectPage( Window * pParent, const ResId& rResId, USHORT nMode ) :
     aBasicBox.SetDragDropMode( SV_DRAGDROP_CTRL_MOVE | SV_DRAGDROP_CTRL_COPY );
     aBasicBox.EnableInplaceEditing( TRUE );
     aBasicBox.SetMode( nMode );
-    aBasicBox.SetWindowBits( WB_HASLINES | WB_HASLINESATROOT |
+    aBasicBox.SetWindowBits( WB_HASLINES | WB_HASLINESATROOT | 
                              WB_HASBUTTONS | WB_HASBUTTONSATROOT |
                              WB_HSCROLL );
     aBasicBox.ScanAllEntries();
@@ -603,7 +603,7 @@ ObjectPage::ObjectPage( Window * pParent, const ResId& rResId, USHORT nMode ) :
 }
 
 void ObjectPage::SetCurrentEntry( BasicEntryDescriptor& rDesc )
-{
+{ 
     aBasicBox.SetCurrentEntry( rDesc );
 }
 
@@ -634,7 +634,7 @@ void ObjectPage::CheckButtons()
             aEditButton.Disable();
         else
         aEditButton.Enable();
-    }
+    }    
     else
         aEditButton.Disable();
 
@@ -708,12 +708,12 @@ IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton )
                     sal_uInt16 nIndex = 0;
                     aModName = aModName.GetToken( 0, ' ', nIndex );
                 }
-                SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDesc.GetDocument(), aDesc.GetLibName(),
+                SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDesc.GetDocument(), aDesc.GetLibName(), 
                                   aModName, aBasicBox.ConvertType( aDesc.GetType() ) );
                 pDispatcher->Execute( SID_BASICIDE_SHOWSBX, SFX_CALLMODE_SYNCHRON, &aSbxItem, 0L );
             }
         }
-        else    // Nur Lib selektiert
+        else	// Nur Lib selektiert
         {
             DBG_ASSERT( aBasicBox.GetModel()->GetDepth( pCurEntry ) == 1, "Kein LibEntry?!" );
             ScriptDocument aDocument( ScriptDocument::getApplicationScriptDocument() );
@@ -791,7 +791,7 @@ bool ObjectPage::GetSelection( ScriptDocument& rDocument, String& rLibName )
 
     if ( bOK )
         bRet = true;
-
+    
     return bRet;
 }
 
@@ -802,8 +802,8 @@ void ObjectPage::NewModule()
 
     if ( GetSelection( aDocument, aLibName ) )
     {
-        String aModName;
-        createModImpl( static_cast<Window*>( this ), aDocument,
+        String aModName;       
+        createModImpl( static_cast<Window*>( this ), aDocument, 
                     aBasicBox, aLibName, aModName, true );
     }
 }
@@ -838,7 +838,7 @@ void ObjectPage::NewDialog()
                 if ( !aDocument.createDialog( aLibName, aDlgName, xISP ) )
                     return;
 
-                SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDocument, aLibName, aDlgName, BASICIDE_TYPE_DIALOG );
+                SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDocument, aLibName, aDlgName, BASICIDE_TYPE_DIALOG );					
                 BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
                 SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
                 SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
@@ -871,7 +871,7 @@ void ObjectPage::NewDialog()
                             DBG_ASSERT( pEntry, "InsertEntry fehlgeschlagen!" );
                         }
                         aBasicBox.SetCurEntry( pEntry );
-                        aBasicBox.Select( aBasicBox.GetCurEntry() );        // OV-Bug?!
+                        aBasicBox.Select( aBasicBox.GetCurEntry() );		// OV-Bug?!
                     }
                 }
             }
@@ -896,7 +896,7 @@ void ObjectPage::DeleteCurrent()
          ( eType == OBJ_TYPE_DIALOG && QueryDelDialog( aName, this ) ) )
     {
         aBasicBox.GetModel()->Remove( pCurEntry );
-        if ( aBasicBox.GetCurEntry() )  // OV-Bug ?
+        if ( aBasicBox.GetCurEntry() )	// OV-Bug ?
             aBasicBox.Select( aBasicBox.GetCurEntry() );
         BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
         SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
@@ -938,13 +938,13 @@ void ObjectPage::EndTabDialog( USHORT nRet )
 
 LibDialog::LibDialog( Window* pParent )
     : ModalDialog( pParent, IDEResId( RID_DLG_LIBS ) ),
-        aOKButton(      this, IDEResId( RID_PB_OK ) ),
-        aCancelButton(  this, IDEResId( RID_PB_CANCEL ) ),
-        aStorageName(   this, IDEResId( RID_FT_STORAGENAME ) ),
-        aLibBox(        this, IDEResId( RID_CTRL_LIBS ) ),
-        aFixedLine(     this, IDEResId( RID_FL_OPTIONS ) ),
-        aReferenceBox(  this, IDEResId( RID_CB_REF ) ),
-        aReplaceBox(    this, IDEResId( RID_CB_REPL ) )
+        aOKButton( 		this, IDEResId( RID_PB_OK ) ),
+        aCancelButton( 	this, IDEResId( RID_PB_CANCEL ) ),
+        aStorageName( 	this, IDEResId( RID_FT_STORAGENAME ) ),
+        aLibBox( 		this, IDEResId( RID_CTRL_LIBS ) ),
+        aFixedLine(		this, IDEResId( RID_FL_OPTIONS ) ),
+        aReferenceBox( 	this, IDEResId( RID_CB_REF ) ),
+        aReplaceBox( 	this, IDEResId( RID_CB_REPL ) )
 {
     SetText( String( IDEResId( RID_STR_APPENDLIBS ) ) );
     FreeResource();
@@ -999,7 +999,7 @@ SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument,
             StarBASIC* pBasic = pBasMgr? pBasMgr->GetLib( aLibName ) : 0;
                 if ( pBasic )
                     pModule = pBasic->FindModule( aModName );
-            SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rDocument, aLibName, aModName, BASICIDE_TYPE_MODULE );
+            SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rDocument, aLibName, aModName, BASICIDE_TYPE_MODULE );					
             BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
             SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
             SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
@@ -1029,10 +1029,10 @@ SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument,
                         {
                             if( !rBasicBox.IsExpanded( pLibSubEntry ) )
                                 rBasicBox.Expand( pLibSubEntry );
-                            pSubRootEntry = pLibSubEntry;
+                            pSubRootEntry = pLibSubEntry;    
                         }
                     }
-
+                    
                     SvLBoxEntry* pEntry = rBasicBox.FindEntry( pSubRootEntry, aModName, OBJ_TYPE_MODULE );
                     if ( !pEntry )
                     {
@@ -1045,7 +1045,7 @@ SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument,
                         DBG_ASSERT( pEntry, "InsertEntry fehlgeschlagen!" );
                     }
                     rBasicBox.SetCurEntry( pEntry );
-                    rBasicBox.Select( rBasicBox.GetCurEntry() );        // OV-Bug?!
+                    rBasicBox.Select( rBasicBox.GetCurEntry() );		// OV-Bug?!
                 }
             }
         }
diff --git a/basctl/source/basicide/moduldlg.hrc b/basctl/source/basicide/moduldlg.hrc
index 1eed98e0bdca..1504b3bd19c0 100644
--- a/basctl/source/basicide/moduldlg.hrc
+++ b/basctl/source/basicide/moduldlg.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,40 +29,40 @@
 
 #include <svl/solar.hrc>
 
-#define RID_STR_LIB             1
-#define RID_TRLBOX              2
+#define RID_STR_LIB				1
+#define RID_TRLBOX				2
 // free
-#define RID_PB_EDIT             4
-#define RID_PB_CLOSE            5
-#define RID_PB_NEWMOD           6
-#define RID_PB_NEWDLG           7
-#define RID_PB_DELETE           8
-#define RID_PB_NEWLIB           9
-#define RID_PB_APPEND           10
-#define RID_PB_PASSWORD         11
-#define RID_LB_BASICS           12
-#define RID_STR_BASICS          13
+#define RID_PB_EDIT				4
+#define RID_PB_CLOSE			5
+#define RID_PB_NEWMOD     		6
+#define RID_PB_NEWDLG			7
+#define RID_PB_DELETE			8
+#define RID_PB_NEWLIB			9
+#define RID_PB_APPEND			10
+#define RID_PB_PASSWORD			11
+#define RID_LB_BASICS			12
+#define RID_STR_BASICS			13
 
-#define RID_PB_EXPORT           14
-#define RID_PB_EXPORT_PACKAGE   15
+#define RID_PB_EXPORT			14
+#define RID_PB_EXPORT_PACKAGE	15
 
-#define RID_TP_MOD              20
-#define RID_TP_LIB              21
-#define RID_TP_DLG              22
+#define RID_TP_MOD				20
+#define RID_TP_LIB				21
+#define RID_TP_DLG				22
 
-#define RID_TC_ORGANIZE         30
+#define RID_TC_ORGANIZE			30
 
-#define RID_PB_OK               31
+#define RID_PB_OK				31
 #define RID_PB_CANCEL           32
 #define RID_CTRL_LIBS           33
 #define RID_FL_OPTIONS          34
 #define RID_CB_REF              35
 #define RID_CB_REPL             36
-#define RID_FT_STORAGENAME      38
+#define RID_FT_STORAGENAME		38
 
-#define RID_FT_NEWLIB           40
-#define RID_ED_LIBNAME          41
-#define RB_EXPORTASPACKAGE      42
-#define RB_EXPORTASBASIC        43
+#define	RID_FT_NEWLIB			40
+#define	RID_ED_LIBNAME   		41
+#define	RB_EXPORTASPACKAGE		42
+#define	RB_EXPORTASBASIC		43
 
-#endif  // _MODULDLG_HRC
+#endif	// _MODULDLG_HRC
diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx
index 552c638e8daa..3c80c7edb749 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,18 +47,18 @@
 class StarBASIC;
 
 
-#define NEWOBJECTMODE_LIB       1
-#define NEWOBJECTMODE_MOD       2
-#define NEWOBJECTMODE_DLG       3
-#define NEWOBJECTMODE_METH      4
+#define NEWOBJECTMODE_LIB		1
+#define NEWOBJECTMODE_MOD		2
+#define NEWOBJECTMODE_DLG		3
+#define NEWOBJECTMODE_METH		4
 
 class NewObjectDialog : public ModalDialog
 {
 private:
-    FixedText       aText;
-    Edit            aEdit;
-    OKButton        aOKButton;
-    CancelButton    aCancelButton;
+    FixedText		aText;
+    Edit			aEdit;
+    OKButton		aOKButton;
+    CancelButton	aCancelButton;
 
     DECL_LINK(OkButtonHandler, Button *);
 
@@ -66,19 +66,19 @@ public:
     NewObjectDialog(Window * pParent, USHORT nMode, bool bCheckName = false);
                 ~NewObjectDialog();
 
-    String      GetObjectName() const { return aEdit.GetText(); }
-    void        SetObjectName( const String& rName ) { aEdit.SetText( rName ); aEdit.SetSelection( Selection( 0, rName.Len() ) );}
+    String		GetObjectName() const { return aEdit.GetText(); }
+    void		SetObjectName( const String& rName ) { aEdit.SetText( rName ); aEdit.SetSelection( Selection( 0, rName.Len() ) );}
 };
 
 class ExportDialog : public ModalDialog
 {
 private:
-    RadioButton     maExportAsPackageButton;
-    RadioButton     maExportAsBasicButton;
-    OKButton        maOKButton;
-    CancelButton    maCancelButton;
+    RadioButton		maExportAsPackageButton;
+    RadioButton		maExportAsBasicButton;
+    OKButton		maOKButton;
+    CancelButton	maCancelButton;
 
-    sal_Bool        mbExportAsPackage;
+    sal_Bool		mbExportAsPackage;
 
     DECL_LINK(OkButtonHandler, Button *);
 
@@ -86,24 +86,24 @@ public:
     ExportDialog( Window * pParent );
     ~ExportDialog();
 
-    sal_Bool        isExportAsPackage( void ) { return mbExportAsPackage; }
+    sal_Bool		isExportAsPackage( void ) { return mbExportAsPackage; }
 };
 
 
 class ExtBasicTreeListBox : public BasicTreeListBox
 {
 protected:
-    virtual BOOL    EditingEntry( SvLBoxEntry* pEntry, Selection& rSel  );
-    virtual BOOL    EditedEntry( SvLBoxEntry* pEntry, const String& rNewText );
+    virtual BOOL	EditingEntry( SvLBoxEntry* pEntry, Selection& rSel  );
+    virtual BOOL	EditedEntry( SvLBoxEntry* pEntry, const String& rNewText );
 
-    virtual DragDropMode    NotifyStartDrag( TransferDataContainer& rData, SvLBoxEntry* pEntry );
-    virtual BOOL            NotifyAcceptDrop( SvLBoxEntry* pEntry );
+    virtual DragDropMode	NotifyStartDrag( TransferDataContainer& rData, SvLBoxEntry* pEntry );
+    virtual BOOL 			NotifyAcceptDrop( SvLBoxEntry* pEntry );
 
-    virtual BOOL    NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
+    virtual BOOL	NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
                         SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos );
-    virtual BOOL    NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
+    virtual BOOL	NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
                         SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos );
-    BOOL            NotifyCopyingMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
+    BOOL			NotifyCopyingMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
                         SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos, BOOL bMove );
 
 public:
@@ -111,57 +111,57 @@ public:
     ~ExtBasicTreeListBox();
 };
 
-#define LIBMODE_CHOOSER     1
-#define LIBMODE_MANAGER     2
+#define LIBMODE_CHOOSER		1
+#define LIBMODE_MANAGER		2
 
 class BasicCheckBox : public SvTabListBox
 {
 private:
-    USHORT              nMode;
-    SvLBoxButtonData*   pCheckButton;
+    USHORT 				nMode;
+    SvLBoxButtonData*	pCheckButton;
     ScriptDocument      m_aDocument;
-    void                Init();
+    void				Init();
 
 public:
                     BasicCheckBox( Window* pParent, const ResId& rResId );
                     ~BasicCheckBox();
 
-    SvLBoxEntry*    DoInsertEntry( const String& rStr, ULONG nPos = LISTBOX_APPEND );
-    SvLBoxEntry*    FindEntry( const String& rName );
+    SvLBoxEntry*	DoInsertEntry( const String& rStr, ULONG nPos = LISTBOX_APPEND );
+    SvLBoxEntry*	FindEntry( const String& rName );
 
-    void            CheckEntryPos( ULONG nPos, BOOL bCheck = TRUE );
-    BOOL            IsChecked( ULONG nPos ) const;
+    void			CheckEntryPos( ULONG nPos, BOOL bCheck = TRUE );
+    BOOL			IsChecked( ULONG nPos ) const;
 
-    virtual void    InitEntry( SvLBoxEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind eButtonKind );
-    virtual BOOL    EditingEntry( SvLBoxEntry* pEntry, Selection& rSel );
-    virtual BOOL    EditedEntry( SvLBoxEntry* pEntry, const String& rNewText );
+    virtual void	InitEntry( SvLBoxEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind eButtonKind );
+    virtual BOOL	EditingEntry( SvLBoxEntry* pEntry, Selection& rSel );
+    virtual BOOL	EditedEntry( SvLBoxEntry* pEntry, const String& rNewText );
 
     void            SetDocument( const ScriptDocument& rDocument ) { m_aDocument = rDocument; }
 
-    void            SetMode( USHORT n );
-    USHORT          GetMode() const         { return nMode; }
+    void			SetMode( USHORT n );
+    USHORT			GetMode() const			{ return nMode; }
 };
 
 class LibDialog: public ModalDialog
 {
 private:
-    OKButton        aOKButton;
-    CancelButton    aCancelButton;
-    FixedText       aStorageName;
-    BasicCheckBox   aLibBox;
+    OKButton 		aOKButton;
+    CancelButton	aCancelButton;
+    FixedText		aStorageName;
+    BasicCheckBox	aLibBox;
     FixedLine       aFixedLine;
-    CheckBox        aReferenceBox;
-    CheckBox        aReplaceBox;
+    CheckBox 		aReferenceBox;
+    CheckBox 		aReplaceBox;
 
 public:
                     LibDialog( Window* pParent );
                     ~LibDialog();
 
-    void            SetStorageName( const String& rName );
+    void			SetStorageName( const String& rName );
 
-    BasicCheckBox&  GetLibBox()                 { return aLibBox; }
-    BOOL            IsReference() const         { return aReferenceBox.IsChecked(); }
-    BOOL            IsReplace() const           { return aReplaceBox.IsChecked(); }
+    BasicCheckBox&	GetLibBox()					{ return aLibBox; }
+    BOOL			IsReference() const 		{ return aReferenceBox.IsChecked(); }
+    BOOL			IsReplace() const 			{ return aReplaceBox.IsChecked(); }
 
     void            EnableReference( BOOL b )   { aReferenceBox.Enable( b ); }
     void            EnableReplace( BOOL b )     { aReplaceBox.Enable( b ); }
@@ -178,7 +178,7 @@ public:
                     OrganizeDialog( Window* pParent, INT16 tabId, BasicEntryDescriptor& rDesc );
                     ~OrganizeDialog();
 
-    virtual short   Execute();
+    virtual short	Execute();
 
     DECL_LINK( ActivatePageHdl, TabControl * );
 };
@@ -186,33 +186,33 @@ public:
 class ObjectPage: public TabPage
 {
 protected:
-    FixedText           aLibText;
-    ExtBasicTreeListBox aBasicBox;
-    PushButton          aEditButton;
-    CancelButton        aCloseButton;
-    PushButton          aNewModButton;
-    PushButton          aNewDlgButton;
-    PushButton          aDelButton;
+    FixedText 			aLibText;
+    ExtBasicTreeListBox	aBasicBox;
+    PushButton			aEditButton;
+    CancelButton		aCloseButton;
+    PushButton			aNewModButton;
+    PushButton			aNewDlgButton;
+    PushButton			aDelButton;
 
     DECL_LINK( BasicBoxHighlightHdl, BasicTreeListBox * );
     DECL_LINK( ButtonHdl, Button * );
-    void                CheckButtons();
+    void				CheckButtons();
     bool                GetSelection( ScriptDocument& rDocument, String& rLibName );
-    void                DeleteCurrent();
-    void                NewModule();
-    void                NewDialog();
-    void                EndTabDialog( USHORT nRet );
+    void				DeleteCurrent();
+    void				NewModule();
+    void				NewDialog();
+    void				EndTabDialog( USHORT nRet );
 
-    TabDialog*          pTabDlg;
+    TabDialog*			pTabDlg;
 
-    virtual void        ActivatePage();
-    virtual void        DeactivatePage();
+    virtual void		ActivatePage();
+    virtual void		DeactivatePage();
 
 public:
                         ObjectPage( Window* pParent, const ResId& rResId, USHORT nMode );
 
     void                SetCurrentEntry( BasicEntryDescriptor& rDesc );
-    void                SetTabDlg( TabDialog* p ) { pTabDlg = p;}
+    void				SetTabDlg( TabDialog* p ) { pTabDlg = p;}
 };
 
 
@@ -222,16 +222,16 @@ class LibPage: public TabPage
 {
 protected:
     FixedText           aBasicsText;
-    ListBox             aBasicsBox;
-    FixedText           aLibText;
-    BasicCheckBox       aLibBox;
-    PushButton          aEditButton;
-    CancelButton        aCloseButton;
-    PushButton          aPasswordButton;
-    PushButton          aExportButton;
-    PushButton          aNewLibButton;
-    PushButton          aInsertLibButton;
-    PushButton          aDelButton;
+    ListBox				aBasicsBox;
+    FixedText 			aLibText;
+    BasicCheckBox		aLibBox;
+    PushButton			aEditButton;
+    CancelButton		aCloseButton;
+    PushButton			aPasswordButton;
+    PushButton			aExportButton;
+    PushButton			aNewLibButton;
+    PushButton			aInsertLibButton;
+    PushButton			aDelButton;
 
     ScriptDocument      m_aCurDocument;
     LibraryLocation     m_eCurLocation;
@@ -240,36 +240,36 @@ protected:
     DECL_LINK( BasicSelectHdl, ListBox * );
     DECL_LINK( ButtonHdl, Button * );
     DECL_LINK( CheckPasswordHdl, SvxPasswordDialog * );
-    void                CheckButtons();
-    void                DeleteCurrent();
-    void                NewLib();
-    void                InsertLib();
-    void                implExportLib( const String& aLibName, const String& aTargetURL,
+    void				CheckButtons();
+    void				DeleteCurrent();
+    void				NewLib();
+    void				InsertLib();
+    void				implExportLib( const String& aLibName, const String& aTargetURL,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler );
-    void                Export();
-    void                ExportAsPackage( const String& aLibName );
-    void                ExportAsBasic( const String& aLibName );
-    void                EndTabDialog( USHORT nRet );
-    void                FillListBox();
+    void				Export();
+    void				ExportAsPackage( const String& aLibName );
+    void				ExportAsBasic( const String& aLibName );
+    void				EndTabDialog( USHORT nRet );
+    void				FillListBox();
     void                InsertListBoxEntry( const ScriptDocument& rDocument, LibraryLocation eLocation );
-    void                SetCurLib();
-    SvLBoxEntry*        ImpInsertLibEntry( const String& rLibName, ULONG nPos );
-    virtual void        ActivatePage();
-    virtual void        DeactivatePage();
+    void				SetCurLib();
+    SvLBoxEntry*		ImpInsertLibEntry( const String& rLibName, ULONG nPos );
+    virtual void		ActivatePage();
+    virtual void		DeactivatePage();
 
-    TabDialog*          pTabDlg;
+    TabDialog*			pTabDlg;
 
 public:
                         LibPage( Window* pParent );
-    virtual             ~LibPage();
+    virtual             ~LibPage();                        
 
-    void                SetTabDlg( TabDialog* p ) { pTabDlg = p;}
+    void				SetTabDlg( TabDialog* p ) { pTabDlg = p;}
 };
 
 // Helper functions
 SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument,
     BasicTreeListBox& rBasicBox, const String& rLibName, String aModName, bool bMain = false );
-void createLibImpl( Window* pWin, const ScriptDocument& rDocument,
+void createLibImpl( Window* pWin, const ScriptDocument& rDocument, 
                     BasicCheckBox* pLibBox, BasicTreeListBox* pBasicBox );
 
 #endif // _MODULDLG_HXX
diff --git a/basctl/source/basicide/moduldlg.src b/basctl/source/basicide/moduldlg.src
index a6ac943f29d0..78ebad8b267e 100644
--- a/basctl/source/basicide/moduldlg.src
+++ b/basctl/source/basicide/moduldlg.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ TabDialog RID_TD_ORGANIZE
      // Da Cancel-Button auf TabPage, nicht auf Dialog!
     TabControl RID_TC_ORGANIZE
     {
-         //     HelpID = HID_BASICIDE_ORG_TC;
+         //		HelpID = HID_BASICIDE_ORG_TC;
         OutputSize = TRUE ;
         PageList =
         {
@@ -64,7 +64,7 @@ TabDialog RID_TD_ORGANIZE
 };
 TabPage RID_TP_MODULS
 {
-     // HelpId = HID_BASICIDE_MODULS ;
+     //	HelpId = HID_BASICIDE_MODULS ;
     Hide = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 210 , 140 ) ;
@@ -179,7 +179,7 @@ TabPage RID_TP_DLGS
 };
 TabPage RID_TP_LIBS
 {
-     // HelpId = HID_BASICIDE_LIBS_TP ;
+     //	HelpId = HID_BASICIDE_LIBS_TP ;
     Hide = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 210 , 140 ) ;
@@ -211,7 +211,7 @@ TabPage RID_TP_LIBS
         Size = MAP_APPFONT ( 130 , 87 ) ;
         TabStop = TRUE ;
     };
-
+    
     PushButton RID_PB_EDIT
     {
         Text [ en-US ] = "~Edit";
@@ -235,7 +235,7 @@ TabPage RID_TP_LIBS
         Text [ en-US ] = "~Password..." ;
         TabStop = TRUE ;
     };
-
+    
     PushButton RID_PB_NEWLIB
     {
         Pos = MAP_APPFONT ( 144 , 69 ) ;
@@ -268,7 +268,7 @@ TabPage RID_TP_LIBS
 };
 ModalDialog RID_DLG_LIBS
 {
-     // HelpId = HID_BASICIDE_LIBS_DLG ;
+     //	HelpId = HID_BASICIDE_LIBS_DLG ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 168 , 132 ) ;
@@ -376,7 +376,7 @@ ModalDialog RID_DLG_EXPORT
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
     };
-
+    
     RadioButton RB_EXPORTASPACKAGE
     {
         Pos = MAP_APPFONT( 6, 6 );
@@ -384,14 +384,14 @@ ModalDialog RID_DLG_EXPORT
         Group = TRUE;
         Text [ en-US ] = "Export as ~extension";
         TabStop = TRUE ;
-    };
+    }; 	
     RadioButton RB_EXPORTASBASIC
     {
         Pos = MAP_APPFONT( 6, 19 );
         Size = MAP_APPFONT( 103, 10 );
         //Group = TRUE;
         Text [ en-US ] = "Export as BASIC library";
-    };
+    }; 	
 };
 
 String RID_STR_EXPORTPACKAGE
@@ -408,4 +408,4 @@ String RID_STR_PACKAGE_BUNDLE
 {
     Text [ en-US ] = "Extension";
 };
-
+ 
diff --git a/basctl/source/basicide/moptions.hrc b/basctl/source/basicide/moptions.hrc
index 2636a39a8484..b57cbdedd15e 100644
--- a/basctl/source/basicide/moptions.hrc
+++ b/basctl/source/basicide/moptions.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 #include <svl/solar.hrc>
 
-#define RID_MACROOPTIONS        ( RID_BASICIDE_START + 55 )
+#define RID_MACROOPTIONS		( RID_BASICIDE_START + 55 )
 
-#define RID_FT_SBXNAME      2
-#define RID_PB_OK           3
-#define RID_PB_CANCEL       4
-#define RID_PB_HELP         5
-#define RID_FT_DESCR        6
-#define RID_ME_DESCR        7
-#define RID_FL_HELP         8
-#define RID_FT_HELPID       9
-#define RID_NF_HELPID       10
-#define RID_FT_HELPNAME     11
-#define RID_ED_HELPNAME     12
+#define RID_FT_SBXNAME		2
+#define RID_PB_OK			3
+#define RID_PB_CANCEL		4
+#define RID_PB_HELP			5
+#define RID_FT_DESCR		6
+#define RID_ME_DESCR		7
+#define RID_FL_HELP			8
+#define RID_FT_HELPID		9
+#define RID_NF_HELPID		10
+#define RID_FT_HELPNAME		11
+#define RID_ED_HELPNAME		12
 
 #endif // _MOPTIONS_HRC
 
diff --git a/basctl/source/basicide/moptions.src b/basctl/source/basicide/moptions.src
index ef1be222095c..32cb236a0980 100644
--- a/basctl/source/basicide/moptions.src
+++ b/basctl/source/basicide/moptions.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <moptions.hrc>
 ModalDialog RID_MACROOPTIONS
 {
-     // HelpId = HID_MACRO_OPTIONS ;
+     //	HelpId = HID_MACRO_OPTIONS ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 224 , 121 ) ;
diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx
index f3998287a2b8..6fc1bee100ce 100644
--- a/basctl/source/basicide/objdlg.cxx
+++ b/basctl/source/basicide/objdlg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 ObjectTreeListBox::MouseButtonDown( const MouseEvent& rMEvt )
             SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
             if( pDispatcher )
             {
-                SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDesc.GetDocument(), aDesc.GetLibName(), aDesc.GetName(),
+                SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDesc.GetDocument(), aDesc.GetLibName(), aDesc.GetName(), 
                                   aDesc.GetMethodName(), ConvertType( aDesc.GetType() ) );
                 pDispatcher->Execute( SID_BASICIDE_SHOWSBX,
                                         SFX_CALLMODE_SYNCHRON, &aSbxItem, 0L );
@@ -97,7 +97,7 @@ ObjectCatalog::ObjectCatalog( Window * pParent )
     aToolBox.SetSizePixel( aToolBox.CalcWindowSizePixel() );
     aToolBox.SetSelectHdl( LINK( this, ObjectCatalog, ToolBoxHdl ) );
 
-    aMacroTreeList.SetWindowBits( WB_HASLINES | WB_HASLINESATROOT |
+    aMacroTreeList.SetWindowBits( WB_HASLINES | WB_HASLINESATROOT | 
                                   WB_HASBUTTONS | WB_HASBUTTONSATROOT |
                                   WB_HSCROLL );
 
@@ -124,7 +124,7 @@ ObjectCatalog::ObjectCatalog( Window * pParent )
     if ( aSize.Width() )
         SetOutputSizePixel( aSize );
 
-    Resize();   // damit der Resize-Handler die Controls anordnet
+    Resize();	// damit der Resize-Handler die Controls anordnet
 
     // make object catalog keyboard accessible
     pParent->GetSystemWindow()->GetTaskPaneList()->AddWindow( this );
@@ -193,13 +193,13 @@ IMPL_LINK( ObjectCatalog, ToolBoxHdl, ToolBox*, pToolBox )
             BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
             SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
             SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
-            if ( aDesc.GetType() == OBJ_TYPE_MODULE ||
+            if ( aDesc.GetType() == OBJ_TYPE_MODULE || 
                  aDesc.GetType() == OBJ_TYPE_DIALOG ||
                  aDesc.GetType() == OBJ_TYPE_METHOD )
             {
                 if( pDispatcher )
                 {
-                    SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDesc.GetDocument(), aDesc.GetLibName(), aDesc.GetName(),
+                    SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDesc.GetDocument(), aDesc.GetLibName(), aDesc.GetName(), 
                                       aDesc.GetMethodName(), aMacroTreeList.ConvertType( aDesc.GetType() ) );
                     pDispatcher->Execute( SID_BASICIDE_SHOWSBX,
                                           SFX_CALLMODE_SYNCHRON, &aSbxItem, 0L );
@@ -265,7 +265,7 @@ void ObjectCatalog::UpdateEntries()
 }
 
 void ObjectCatalog::SetCurrentEntry( BasicEntryDescriptor& rDesc )
-{
+{ 
     aMacroTreeList.SetCurrentEntry( rDesc );
 }
 
diff --git a/basctl/source/basicide/objdlg.hrc b/basctl/source/basicide/objdlg.hrc
index 930ab31a4ae8..ea3ca222525b 100644
--- a/basctl/source/basicide/objdlg.hrc
+++ b/basctl/source/basicide/objdlg.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <svl/solar.hrc>
 
-#define RID_BASICIDE_OBJCAT     ( RID_BASICIDE_START + 70 )
+#define RID_BASICIDE_OBJCAT		( RID_BASICIDE_START + 70 )
 #define RID_FT_MACRODESCR   8
 #define RID_IMGLST_TB_HC 9
-#define RID_TLB_MACROS     10
-#define RID_TB_TOOLBOX     11
+#define RID_TLB_MACROS	   10
+#define RID_TB_TOOLBOX	   11
 
-#define TBITEM_SHOW     1
+#define TBITEM_SHOW		1
 
 #endif // _OBJDLG_HXX
diff --git a/basctl/source/basicide/objdlg.hxx b/basctl/source/basicide/objdlg.hxx
index cd48a135a882..96d541d49171 100644
--- a/basctl/source/basicide/objdlg.hxx
+++ b/basctl/source/basicide/objdlg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class ObjectTreeListBox : public BasicTreeListBox
 {
 private:
 
-    virtual void    Command( const CommandEvent& rCEvt );
-    virtual void    MouseButtonDown( const MouseEvent& rMEvt );
+    virtual void	Command( const CommandEvent& rCEvt );
+    virtual void	MouseButtonDown( const MouseEvent& rMEvt );
 
 public:
             ObjectTreeListBox( Window* pParent, const ResId& rRes );
@@ -70,30 +70,30 @@ private:
 class ObjectCatalog : public FloatingWindow
 {
 private:
-    ObjectTreeListBox   aMacroTreeList;
+    ObjectTreeListBox	aMacroTreeList;
     ObjectCatalogToolBox_Impl aToolBox;
-    FixedText           aMacroDescr;
-    Link                aCancelHdl;
+    FixedText			aMacroDescr;
+    Link				aCancelHdl;
 
 protected:
     DECL_LINK( ToolBoxHdl, ToolBox* );
-    void                CheckButtons();
+    void				CheckButtons();
     DECL_LINK( TreeListHighlightHdl, SvTreeListBox * );
-    void                UpdateFields();
-    virtual void        Move();
-    virtual BOOL        Close();
-    virtual void        Resize();
+    void				UpdateFields();
+    virtual void		Move();
+    virtual BOOL		Close();
+    virtual void		Resize();
 
 public:
     ObjectCatalog( Window * pParent );
     virtual ~ObjectCatalog();
 
-    void                UpdateEntries();
+    void				UpdateEntries();
     void                SetCurrentEntry( BasicEntryDescriptor& rDesc );
 
-    void                SetCancelHdl( const Link& rLink ) { aCancelHdl = rLink; }
+    void				SetCancelHdl( const Link& rLink ) { aCancelHdl = rLink; }
 };
 
-#endif  //_OBJDLG_HXX
+#endif	//_OBJDLG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/objdlg.src b/basctl/source/basicide/objdlg.src
index c8de023dec53..b66b68a2dbd2 100644
--- a/basctl/source/basicide/objdlg.src
+++ b/basctl/source/basicide/objdlg.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <objdlg.hrc>
 #include <helpid.hrc>
 
-#define MASKCOLOR   MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; };
+#define MASKCOLOR	MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; };
 
 FloatingWindow RID_BASICIDE_OBJCAT
 {
diff --git a/basctl/source/basicide/register.cxx b/basctl/source/basicide/register.cxx
index 612a3dc1f303..212db9f239f8 100644
--- a/basctl/source/basicide/register.cxx
+++ b/basctl/source/basicide/register.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
 }
 
 SAL_DLLPUBLIC_EXPORT
-sal_Bool SAL_CALL component_writeInfo(  void*   pServiceManager ,
-                                        void*   pRegistryKey    )
+sal_Bool SAL_CALL component_writeInfo(	void*	pServiceManager	,
+                                        void*	pRegistryKey	)
 {
     (void)pServiceManager;
 
@@ -85,9 +85,9 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
     // Set default return value for this operation - if it failed.
     void* pReturn = NULL ;
 
-    if  (
-            ( pImplementationName   !=  NULL ) &&
-            ( pServiceManager       !=  NULL )
+    if	(
+            ( pImplementationName	!=	NULL ) &&
+            ( pServiceManager		!=	NULL )
         )
     {
         // Define variables which are used in following macros.
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index bc21f4b3f556..f6c89a3f6505 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 #include <rtl/uri.hxx>
 #include <rtl/bootstrap.hxx>
-
+ 
 #include <osl/process.h>
 #include <osl/file.hxx>
 
@@ -262,7 +262,7 @@ namespace basctl
                         getDocumentRef() const { return m_xDocument; }
 
         /// returns a library container belonging to the document
-        Reference< XLibraryContainer >
+        Reference< XLibraryContainer > 
                     getLibraryContainer( LibraryContainerType _eType ) const;
 
         /// determines whether a given library is part of the shared installation
@@ -460,7 +460,7 @@ namespace basctl
             if ( xVBACompat.is() )
                 bResult = xVBACompat->getVBACompatibilityMode();
         }
-        return bResult;
+        return bResult; 
     }
 
     //--------------------------------------------------------------------
@@ -653,7 +653,7 @@ namespace basctl
         try
         {
             Reference< XNameContainer > xLib( getLibrary( _eType, _rLibName, TRUE ), UNO_QUERY_THROW );
-
+            
             // get element
             Any aElement( xLib->getByName( _rOldName ) );
 
@@ -1018,7 +1018,7 @@ namespace basctl
                 ::rtl::OUString aSearchURL3( RTL_CONSTASCII_USTRINGPARAM( "share/extensions" ) );
                 if( aCanonicalFileURL.indexOf( aSearchURL1 ) != -1 ||
                     aCanonicalFileURL.indexOf( aSearchURL2 ) != -1 ||
-                    aCanonicalFileURL.indexOf( aSearchURL3 ) != -1 )
+                    aCanonicalFileURL.indexOf( aSearchURL3 ) != -1 ) 
                         bIsShared = true;
             }
         }
@@ -1128,7 +1128,7 @@ namespace basctl
     ScriptDocument::~ScriptDocument()
     {
     }
-
+    
     //--------------------------------------------------------------------
     const ScriptDocument& ScriptDocument::getApplicationScriptDocument()
     {
@@ -1253,7 +1253,7 @@ namespace basctl
 
         return aScriptDocs;
     }
-
+    
     //--------------------------------------------------------------------
     bool ScriptDocument::operator==( const ScriptDocument& _rhs ) const
     {
@@ -1283,7 +1283,7 @@ namespace basctl
     {
         return m_pImpl->getLibraryContainer( _eType );
     }
-
+    
     //--------------------------------------------------------------------
     Reference< XNameContainer > ScriptDocument::getLibrary( LibraryContainerType _eType, const ::rtl::OUString& _rLibName, bool _bLoadLibrary ) const
         SAL_THROW((NoSuchElementException))
diff --git a/basctl/source/basicide/tbxctl.cxx b/basctl/source/basicide/tbxctl.cxx
index 3f3968524245..97ae12fd743f 100644
--- a/basctl/source/basicide/tbxctl.cxx
+++ b/basctl/source/basicide/tbxctl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ IMPL_LINK( PopupWindowTbx, SelectHdl, void*, EMPTYARG )
 PopupWindowTbx::PopupWindowTbx( USHORT nId, WindowAlign eAlign,
                                 ResId aRIdWin, ResId aRIdTbx,
                                 SfxBindings& rBind ) :
-                SfxPopupWindow  ( nId, aRIdWin, rBind ),
-                aTbx            ( this, GetBindings(), aRIdTbx )
+                SfxPopupWindow	( nId, aRIdWin, rBind ),
+                aTbx			( this, GetBindings(), aRIdTbx )
 {
     FreeResource();
     aTbx.Initialize();
@@ -181,7 +181,7 @@ void TbxControls::StateChanged( USHORT nSID, SfxItemState eState,
             {
                 rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
                 aSlotURL += rtl::OUString::valueOf( sal_Int32( nTemp ));
-                Image aImage = GetImage( m_xFrame,
+                Image aImage = GetImage( m_xFrame, 
                                          aSlotURL,
                                          hasBigImages(),
                                          GetToolBox().GetSettings().GetStyleSettings().GetHighContrastMode() );
@@ -214,7 +214,7 @@ void TbxControls::Select( USHORT nModifier )
 |* rItemRect sind die Screen-Koordinaten
 |*
 \************************************************************************/
-SfxPopupWindow* TbxControls::CreatePopupWindow()
+SfxPopupWindow*	TbxControls::CreatePopupWindow()
 {
     if ( GetSlotId() == SID_CHOOSE_CONTROLS )
         createAndPositionSubToolBar( aSubToolBarResName );
diff --git a/basctl/source/basicide/tbxctl.hrc b/basctl/source/basicide/tbxctl.hrc
index 2765b5ba8c80..ea4a1e4711e1 100644
--- a/basctl/source/basicide/tbxctl.hrc
+++ b/basctl/source/basicide/tbxctl.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,5 +26,5 @@
  ************************************************************************/
 #include <svl/solar.hrc>
 
-#define RID_TBXCONTROLS         ( RID_BASICIDE_START + 65 )
-#define RID_TOOLBOX             ( RID_BASICIDE_START + 66 )
+#define RID_TBXCONTROLS			( RID_BASICIDE_START + 65 )
+#define RID_TOOLBOX				( RID_BASICIDE_START + 66 )
diff --git a/basctl/source/basicide/tbxctl.hxx b/basctl/source/basicide/tbxctl.hxx
index 6a1461c78640..5ed5d6798fda 100644
--- a/basctl/source/basicide/tbxctl.hxx
+++ b/basctl/source/basicide/tbxctl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 class PopupWindowTbx : public SfxPopupWindow
 {
 private:
-    SfxToolBoxManager   aTbx;
-    Link                aSelectLink;
+    SfxToolBoxManager	aTbx;
+    Link				aSelectLink;
 
     DECL_LINK( SelectHdl, void* );
 
@@ -49,12 +49,12 @@ public:
                     ResId aRIdWin, ResId aRIdTbx, SfxBindings& rBind );
     ~PopupWindowTbx();
 
-    void                    StartSelection()
+    void		 			StartSelection()
                                 { aTbx.GetToolBox().StartSelection(); }
-    void                    Update();
+    void		 			Update();
 
-    virtual SfxPopupWindow* Clone() const;
-    virtual void            PopupModeEnd();
+    virtual SfxPopupWindow*	Clone() const;
+    virtual void			PopupModeEnd();
 };
 #endif
 */
@@ -71,10 +71,10 @@ private:
         bool bDisabled;
     };
 
-    USHORT                  nLastSlot;
+    USHORT					nLastSlot;
 
 protected:
-    virtual void            StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void			StateChanged( USHORT nSID, SfxItemState eState,
                                           const SfxPoolItem* pState );
 public:
     SFX_DECL_TOOLBOX_CONTROL();
@@ -82,11 +82,11 @@ public:
     TbxControls(USHORT nSlotId, USHORT nId, ToolBox& rTbx );
     ~TbxControls() {}
 
-    virtual SfxPopupWindowType  GetPopupWindowType() const;
-    virtual SfxPopupWindow*     CreatePopupWindow();
+    virtual SfxPopupWindowType	GetPopupWindowType() const;
+    virtual SfxPopupWindow*		CreatePopupWindow();
 
-    using                       SfxToolBoxControl::Select;
-    void                        Select( USHORT nModifier );
+    using						SfxToolBoxControl::Select;
+    void						Select( USHORT nModifier );
 };
 
 
diff --git a/basctl/source/basicide/tbxctl.src b/basctl/source/basicide/tbxctl.src
index 89d839619238..defe36e46ef8 100644
--- a/basctl/source/basicide/tbxctl.src
+++ b/basctl/source/basicide/tbxctl.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/basctl/source/basicide/unomodel.cxx b/basctl/source/basicide/unomodel.cxx
index ab61423b9314..a37331c01323 100644
--- a/basctl/source/basicide/unomodel.cxx
+++ b/basctl/source/basicide/unomodel.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/basctl/source/basicide/unomodel.hxx b/basctl/source/basicide/unomodel.hxx
index bb2b55889f0e..73ca3b0356a8 100644
--- a/basctl/source/basicide/unomodel.hxx
+++ b/basctl/source/basicide/unomodel.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class SIDEModel : public SfxBaseModel,
 {
 public:
     SIDEModel( SfxObjectShell *pObjSh = 0 );
-    virtual ~SIDEModel();
+    virtual	~SIDEModel();
 
     //XInterface
-    virtual     ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
+    virtual 	::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL acquire(  ) throw();
     virtual void SAL_CALL release(  ) throw();
 
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 324d7d829153..bfb682e73a26 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 "dlgedclip.hxx"
 #include <dlgeddef.hxx>
 #include "propbrw.hxx"
-#include <localizationmgr.hxx>
+#include <localizationmgr.hxx> 
 
 #include <basidesh.hxx>
 #include <iderdll.hxx>
@@ -69,7 +69,7 @@ using namespace comphelper;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::io;
+using namespace	::com::sun::star::io;
 using ::rtl::OUString;
 
 static ::rtl::OUString aResourceResolverPropName =
@@ -176,7 +176,7 @@ void DlgEditor::ShowDialog()
 
 BOOL DlgEditor::UnmarkDialog()
 {
-    SdrObject*      pDlgObj = pDlgEdModel->GetPage(0)->GetObj(0);
+    SdrObject* 		pDlgObj = pDlgEdModel->GetPage(0)->GetObj(0);
     SdrPageView*    pPgView = pDlgEdView->GetSdrPageView();
 
     BOOL bWasMarked = pDlgEdView->IsObjMarked( pDlgObj );
@@ -191,7 +191,7 @@ BOOL DlgEditor::UnmarkDialog()
 
 BOOL DlgEditor::RemarkDialog()
 {
-    SdrObject*      pDlgObj = pDlgEdModel->GetPage(0)->GetObj(0);
+    SdrObject* 		pDlgObj = pDlgEdModel->GetPage(0)->GetObj(0);
     SdrPageView*    pPgView = pDlgEdView->GetSdrPageView();
 
     BOOL bWasMarked = pDlgEdView->IsObjMarked( pDlgObj );
@@ -220,7 +220,7 @@ DlgEditor::DlgEditor( const ::com::sun::star::uno::Reference< ::com::sun::star::
     ,eMode( DLGED_SELECT )
     ,eActObj( OBJ_DLG_PUSHBUTTON )
     ,bFirstDraw(FALSE)
-    ,aGridSize( 100, 100 )  // 100TH_MM
+    ,aGridSize( 100, 100 )	// 100TH_MM
     ,bGridVisible(FALSE)
     ,bGridSnap(TRUE)
     ,bCreateOK(TRUE)
@@ -244,14 +244,14 @@ DlgEditor::DlgEditor( const ::com::sun::star::uno::Reference< ::com::sun::star::
     pFunc = new DlgEdFuncSelect( this );
 
     // set clipboard data flavors
-    m_ClipboardDataFlavors[0].MimeType =                ::rtl::OUString::createFromAscii("application/vnd.sun.xml.dialog");
-    m_ClipboardDataFlavors[0].HumanPresentableName =    ::rtl::OUString::createFromAscii("Dialog 6.0");
-    m_ClipboardDataFlavors[0].DataType =                ::getCppuType( (const Sequence< sal_Int8 >*) 0 );
+    m_ClipboardDataFlavors[0].MimeType =				::rtl::OUString::createFromAscii("application/vnd.sun.xml.dialog");
+    m_ClipboardDataFlavors[0].HumanPresentableName =	::rtl::OUString::createFromAscii("Dialog 6.0");
+    m_ClipboardDataFlavors[0].DataType =				::getCppuType( (const Sequence< sal_Int8 >*) 0 );
 
-    m_ClipboardDataFlavorsResource[0] =                         m_ClipboardDataFlavors[0];
-    m_ClipboardDataFlavorsResource[1].MimeType =                ::rtl::OUString::createFromAscii("application/vnd.sun.xml.dialogwithresource");
-    m_ClipboardDataFlavorsResource[1].HumanPresentableName =    ::rtl::OUString::createFromAscii("Dialog 8.0");
-    m_ClipboardDataFlavorsResource[1].DataType =                ::getCppuType( (const Sequence< sal_Int8 >*) 0 );
+    m_ClipboardDataFlavorsResource[0] =							m_ClipboardDataFlavors[0];
+    m_ClipboardDataFlavorsResource[1].MimeType =				::rtl::OUString::createFromAscii("application/vnd.sun.xml.dialogwithresource");
+    m_ClipboardDataFlavorsResource[1].HumanPresentableName =	::rtl::OUString::createFromAscii("Dialog 8.0");
+    m_ClipboardDataFlavorsResource[1].DataType =				::getCppuType( (const Sequence< sal_Int8 >*) 0 );
 
     aPaintTimer.SetTimeout( 1 );
     aPaintTimer.SetTimeoutHdl( LINK( this, DlgEditor, PaintTimeout ) );
@@ -292,7 +292,7 @@ void DlgEditor::SetWindow( Window* pWindow_ )
     pWindow_->SetMapMode( MapMode( MAP_100TH_MM ) );
     pDlgEdPage->SetSize( pWindow_->PixelToLogic( Size( DLGED_PAGE_WIDTH_MIN, DLGED_PAGE_HEIGHT_MIN ) ) );
 
-    pDlgEdView = new DlgEdView( pDlgEdModel, pWindow_, this );
+    pDlgEdView = new DlgEdView( pDlgEdModel, pWindow_, this ); 
     pDlgEdView->ShowSdrPage(pDlgEdView->GetModel()->GetPage(0));
     pDlgEdView->SetLayerVisible( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "HiddenLayer" ) ), FALSE );
     pDlgEdView->SetMoveSnapOnlyTopLeft( TRUE );
@@ -371,8 +371,8 @@ void DlgEditor::DoScroll( ScrollBar* )
     // When scrolling, someone was rescuing the Wallpaper and forced the window scroll to
     // be done without background refresh. I do not know why, but that causes the repaint
     // problems. Taking that out.
-    //  Wallpaper aOldBackground = pWindow->GetBackground();
-    //  pWindow->SetBackground();
+    //	Wallpaper aOldBackground = pWindow->GetBackground();
+    //	pWindow->SetBackground();
 
     // #i74769# children should be scrolled
     pWindow->Scroll( -nX, -nY, SCROLL_CHILDREN); // SCROLL_NOCHILDREN );
@@ -416,7 +416,7 @@ void DlgEditor::SetDialog( uno::Reference< container::XNameContainer > xUnoContr
     pDlgEdModel->GetPage(0)->InsertObject( pDlgEdForm );
     AdjustPageSize();
     pDlgEdForm->SetRectFromProps();
-    pDlgEdForm->UpdateTabIndices();     // for backward compatibility
+    pDlgEdForm->UpdateTabIndices();		// for backward compatibility
     pDlgEdForm->StartListening();
 
     // create controls
@@ -460,7 +460,7 @@ void DlgEditor::SetDialog( uno::Reference< container::XNameContainer > xUnoContr
             pDlgEdModel->GetPage(0)->InsertObject( pCtrlObj );
             pCtrlObj->SetRectFromProps();
             pCtrlObj->UpdateStep();
-            pCtrlObj->StartListening();
+            pCtrlObj->StartListening();           
         }
     }
 
@@ -491,9 +491,9 @@ Reference< util::XNumberFormatsSupplier > const & DlgEditor::GetNumberFormatsSup
     if ( !m_xSupplier.is() )
     {
         Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
-        Reference< util::XNumberFormatsSupplier > xSupplier( xMSF->createInstance(
+        Reference< util::XNumberFormatsSupplier > xSupplier( xMSF->createInstance( 
             ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatsSupplier") ) ), UNO_QUERY );
-
+        
         ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
         if ( !m_xSupplier.is() )
         {
@@ -564,7 +564,7 @@ IMPL_LINK( DlgEditor, PaintTimeout, Timer *, EMPTYARG )
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >  xPSet(pDlgEdForm->GetUnoControlModel(), ::com::sun::star::uno::UNO_QUERY);
 
         if ( xPSet.is() )
-        {
+        {		
             // get dialog size from properties
             sal_Int32 nWidth = 0, nHeight = 0;
             xPSet->getPropertyValue( DLGED_PROP_WIDTH ) >>= nWidth;
@@ -685,7 +685,7 @@ void DlgEditor::SetMode( DlgEdMode eNewMode )
         else
             pFunc = new DlgEdFuncSelect( this );
 
-        if ( eNewMode == DLGED_READONLY )
+        if ( eNewMode == DLGED_READONLY )        
             pDlgEdModel->SetReadOnly( TRUE );
         else
             pDlgEdModel->SetReadOnly( FALSE );
@@ -702,9 +702,9 @@ void DlgEditor::SetMode( DlgEdMode eNewMode )
 void DlgEditor::SetInsertObj( USHORT eObj )
 {
     eActObj = eObj;
-
+    
     if( pDlgEdView )
-        pDlgEdView->SetCurrentObj( eActObj, DlgInventor );
+        pDlgEdView->SetCurrentObj( eActObj, DlgInventor );	
 }
 
 //----------------------------------------------------------------------------
@@ -762,7 +762,7 @@ void implCopyStreamToByteSequence( Reference< XInputStream > xStream,
         Sequence< sal_Int8 > readBytes;
         nRead = xStream->readBytes( readBytes, 1024 );
         if (! nRead)
-            break;
+            break;		
 
         sal_Int32 nPos = bytes.getLength();
         bytes.realloc( nPos + nRead );
@@ -771,7 +771,7 @@ void implCopyStreamToByteSequence( Reference< XInputStream > xStream,
 }
 
 void DlgEditor::Copy()
-{
+{	
     if( !pDlgEdView->AreObjectsMarked() )
         return;
 
@@ -797,7 +797,7 @@ void DlgEditor::Copy()
     }
 
     // insert control models of marked objects into clipboard dialog model
-    ULONG nMark = pDlgEdView->GetMarkedObjectList().GetMarkCount();
+    ULONG nMark = pDlgEdView->GetMarkedObjectList().GetMarkCount();	
     for( ULONG i = 0; i < nMark; i++ )
     {
         SdrObject* pObj = pDlgEdView->GetMarkedObjectList().GetMark(i)->GetMarkedSdrObj();
@@ -967,7 +967,7 @@ void DlgEditor::Paste()
                 // create clipboard dialog model from xml
                 Reference< lang::XMultiServiceFactory > xMSF = getProcessServiceFactory();
                 Reference< container::XNameContainer > xClipDialogModel( xMSF->createInstance
-                    ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ) ),
+                    ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ) ), 
                         uno::UNO_QUERY );
 
                 bool bSourceIsLocalized = false;
@@ -1045,8 +1045,8 @@ void DlgEditor::Paste()
                         Reference< awt::XControlModel > xCtrlModel( xClone->createClone(), uno::UNO_QUERY );
 
                         DlgEdObj* pCtrlObj = new DlgEdObj();
-                        pCtrlObj->SetDlgEdForm(pDlgEdForm);         // set parent form
-                        pDlgEdForm->AddChild(pCtrlObj);             // add child to parent form
+                        pCtrlObj->SetDlgEdForm(pDlgEdForm);			// set parent form
+                        pDlgEdForm->AddChild(pCtrlObj);				// add child to parent form
                         pCtrlObj->SetUnoControlModel( xCtrlModel ); // set control model
 
                         // set new name
@@ -1091,7 +1091,7 @@ void DlgEditor::Paste()
                         pCtrlObj->SetRectFromProps();
                         pCtrlObj->UpdateStep();
                         pDlgEdForm->UpdateTabOrderAndGroups();              // #110559#
-                        pCtrlObj->StartListening();                         // start listening
+                        pCtrlObj->StartListening();							// start listening
 
                         // mark object
                         SdrPageView* pPgView = pDlgEdView->GetSdrPageView();
@@ -1103,10 +1103,10 @@ void DlgEditor::Paste()
                     Point aFormCenter = (pDlgEdForm->GetSnapRect()).Center();
                     Point aPoint = aFormCenter - aMarkCenter;
                     Size  aSize( aPoint.X() , aPoint.Y() );
-                    pDlgEdView->MoveMarkedObj( aSize );                     // update of control model properties (position + size) in NbcMove
+                    pDlgEdView->MoveMarkedObj( aSize );						// update of control model properties (position + size) in NbcMove
                     pDlgEdView->MarkListHasChanged();
 
-                    // dialog model changed
+                    // dialog model changed 
                     SetDialogModelChanged(TRUE);
                 }
             }
@@ -1122,7 +1122,7 @@ void DlgEditor::Delete()
         return;
 
     // remove control models of marked objects from dialog model
-    ULONG nMark = pDlgEdView->GetMarkedObjectList().GetMarkCount();
+    ULONG nMark = pDlgEdView->GetMarkedObjectList().GetMarkCount();	
 
     for( ULONG i = 0; i < nMark; i++ )
     {
@@ -1176,7 +1176,7 @@ void DlgEditor::Delete()
 BOOL DlgEditor::IsPasteAllowed()
 {
     BOOL bPaste = FALSE;
-
+    
     // get clipboard
     Reference< datatransfer::clipboard::XClipboard > xClipboard = GetWindow()->GetClipboard();
     if ( xClipboard.is() )
@@ -1202,7 +1202,7 @@ BOOL DlgEditor::IsPasteAllowed()
 void DlgEditor::ShowProperties()
 {
     BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
-    SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
+    SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;        
     if ( pViewFrame && !pViewFrame->HasChildWindow( SID_SHOW_PROPERTYBROWSER ) )
         pViewFrame->ToggleChildWindow( SID_SHOW_PROPERTYBROWSER );
 }
@@ -1231,15 +1231,15 @@ void DlgEditor::ClearModifyFlag()
 
 //----------------------------------------------------------------------------
 
-#define LMARGPRN        1700
-#define RMARGPRN         900
-#define TMARGPRN        2000
-#define BMARGPRN        1000
-#define BORDERPRN       300
+#define LMARGPRN		1700
+#define RMARGPRN		 900
+#define TMARGPRN    	2000
+#define BMARGPRN    	1000
+#define BORDERPRN		300
 
 //----------------------------------------------------------------------------
 
-void lcl_PrintHeader( Printer* pPrinter, const String& rTitle ) // not working yet
+void lcl_PrintHeader( Printer* pPrinter, const String& rTitle )	// not working yet
 {
     pPrinter->Push();
 
@@ -1293,7 +1293,7 @@ void DlgEditor::printPage( sal_Int32 nPage, Printer* pPrinter, const String& rTi
 
 //----------------------------------------------------------------------------
 
-void DlgEditor::Print( Printer* pPrinter, const String& rTitle )    // not working yet
+void DlgEditor::Print( Printer* pPrinter, const String& rTitle )	// not working yet
 {
     if( pDlgEdView )
     {
diff --git a/basctl/source/dlged/dlgedclip.cxx b/basctl/source/dlged/dlgedclip.cxx
index 17392b2510ac..06285b11f9ff 100644
--- a/basctl/source/dlged/dlgedclip.cxx
+++ b/basctl/source/dlged/dlgedclip.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/basctl/source/dlged/dlgedfac.cxx b/basctl/source/dlged/dlgedfac.cxx
index 27bae6fbb8c7..39531f21457f 100644
--- a/basctl/source/dlged/dlgedfac.cxx
+++ b/basctl/source/dlged/dlgedfac.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
         }
         bNeedsInit = sal_False;
     }
-
+    
     if( (pObjFactory->nInventor == DlgInventor) &&
         (pObjFactory->nIdentifier >= OBJ_DLG_PUSHBUTTON) &&
         (pObjFactory->nIdentifier <= OBJ_DLG_TREECONTROL)    )
@@ -92,7 +92,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
                  pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlListBoxModel") , xDialogSFact );
                  break;
             case OBJ_DLG_COMBOBOX:
-            {
+            {	 
                  DlgEdObj* pNew = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlComboBoxModel") , xDialogSFact );
                  pObjFactory->pNewObj = pNew;
                  try
@@ -107,7 +107,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
                  catch(...)
                  {
                  }
-            }    break;
+            }	 break;
             case OBJ_DLG_GROUPBOX:
                  pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlGroupBoxModel") , xDialogSFact );
                  break;
@@ -122,7 +122,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
                  break;
             case OBJ_DLG_PROGRESSBAR:
                  pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlProgressBarModel") , xDialogSFact );
-                 break;
+                 break;            
             case OBJ_DLG_HSCROLLBAR:
                  pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlScrollBarModel") , xDialogSFact );
                  break;
@@ -130,7 +130,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
             {
                  DlgEdObj* pNew = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlScrollBarModel") , xDialogSFact );
                  pObjFactory->pNewObj = pNew;
-                 // set vertical orientation
+                 // set vertical orientation	
                  try
                  {
                     uno::Reference< beans::XPropertySet >  xPSet(pNew->GetUnoControlModel(), uno::UNO_QUERY);
@@ -144,7 +144,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
                  catch(...)
                  {
                  }
-            }    break;
+            }	 break;
             case OBJ_DLG_HFIXEDLINE:
                  pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlFixedLineModel") , xDialogSFact );
                  break;
@@ -152,7 +152,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
             {
                  DlgEdObj* pNew = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlFixedLineModel") , xDialogSFact );
                  pObjFactory->pNewObj = pNew;
-                 // set vertical orientation
+                 // set vertical orientation	
                  try
                  {
                     uno::Reference< beans::XPropertySet >  xPSet(pNew->GetUnoControlModel(), uno::UNO_QUERY);
@@ -166,28 +166,28 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
                  catch(...)
                  {
                  }
-            }    break;
+            }	 break;
             case OBJ_DLG_DATEFIELD:
                  pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlDateFieldModel") , xDialogSFact );
-                 break;
+                 break;            
             case OBJ_DLG_TIMEFIELD:
                  pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlTimeFieldModel") , xDialogSFact );
-                 break;
+                 break;            
             case OBJ_DLG_NUMERICFIELD:
                  pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlNumericFieldModel") , xDialogSFact );
-                 break;
+                 break;            
             case OBJ_DLG_CURRENCYFIELD:
                  pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlCurrencyFieldModel") , xDialogSFact );
-                 break;
+                 break;            
             case OBJ_DLG_FORMATTEDFIELD:
                  pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlFormattedFieldModel") , xDialogSFact );
-                 break;
+                 break;            
             case OBJ_DLG_PATTERNFIELD:
                  pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlPatternFieldModel") , xDialogSFact );
-                 break;
+                 break;            
             case OBJ_DLG_FILECONTROL:
                  pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlFileControlModel") , xDialogSFact );
-                 break;
+                 break;            
             case OBJ_DLG_TREECONTROL:
                  DlgEdObj* pNew = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.tree.TreeControlModel") , xDialogSFact );
                  pObjFactory->pNewObj = pNew;
@@ -206,12 +206,12 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
                         // gets the service manager from the office
                         Reference< XMultiComponentFactory > xMultiComponentFactoryServer( xComponentContext->getServiceManager() );
 
-
+                        
                         // gets the TreeDataModel
                         Reference< XMutableTreeDataModel > xTreeDataModel;
 
                         xTreeDataModel = Reference< XMutableTreeDataModel >(
-                         xMultiComponentFactoryServer->createInstanceWithContext(
+                         xMultiComponentFactoryServer->createInstanceWithContext( 
                         OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.tree.MutableTreeDataModel" ) ), xComponentContext ), UNO_QUERY_THROW );
 
                         // now fill it with some sample data
@@ -228,7 +228,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
                         xChildNode_1->setDataValue( sNode_1 );
                         xChildNode_1->setExpandedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_down.png" ) ) );
                         xChildNode_1->setCollapsedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_right.png" ) ) );
-
+                        
                         xNode->appendChild( xChildNode_1 );
 
                         const OUString sNode_1_1( RTL_CONSTASCII_USTRINGPARAM( "Node_1_1" ) );
@@ -237,7 +237,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
                         xChildNode_1_1->setDataValue( sNode_1_1 );
                         xChildNode_1_1->setExpandedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_down.png" ) ) );
                         xChildNode_1_1->setCollapsedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_right.png" ) ) );
-
+                        
                         xChildNode_1->appendChild( xChildNode_1_1 );
 
                         const OUString sNode_1_1( RTL_CONSTASCII_USTRINGPARAM( "Node_2" ) );
@@ -246,10 +246,10 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
                         xChildNode_2->setDataValue( sNode_2 );
                         xChildNode_2->setNodeGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM("private:graphicrepository/sw/imglst/nc20010.png") ) );
                         xNode->appendChild( xChildNode_2 );
-
+                            
                         xTreeDataModel->setRoot( xNode );
-
-
+                        
+                        
                         const OUString sDataModel( RTL_CONSTASCII_USTRINGPARAM( "DataModel" ) );
 
                         xPSet->setPropertyValue( sDataModel, xTreeDataModel );
@@ -258,7 +258,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
                  catch(...)
                  {
                  }*/
-                 break;
+                 break;            
         }
     }
 
diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx
index 9ef46deb69c0..702af3c6a0d8 100644
--- a/basctl/source/dlged/dlgedfunc.cxx
+++ b/basctl/source/dlged/dlgedfunc.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ BOOL DlgEdFunc::KeyInput( const KeyEvent& rKEvt )
                     ((SdrHdlList&)rHdlList).ResetFocusHdl();
                 else
                     pView->UnmarkAll();
-
+                
                 bReturn = TRUE;
             }
         }
@@ -314,7 +314,7 @@ BOOL DlgEdFunc::KeyInput( const KeyEvent& rKEvt )
 
                             pView->MovAction( aEndPoint );
                             pView->EndDragObj();
-
+                        
                             // restore snap
                             if ( !bWasNoSnap )
                                 ((SdrDragStat&)rDragStat).SetNoSnap( bWasNoSnap );
@@ -414,7 +414,7 @@ BOOL DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt )
             pParent->ShowProperties();
     }
 
-    return TRUE;
+    return TRUE;	
 }
 
 //----------------------------------------------------------------------------
@@ -451,7 +451,7 @@ BOOL DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt )
         if ( pView->IsDragObj() )
              pView->EndDragObj( rMEvt.IsMod1() );
         return TRUE;
-    }
+    }	
 }
 
 //----------------------------------------------------------------------------
@@ -462,7 +462,7 @@ BOOL DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt )
     Window*  pWindow= pParent->GetWindow();
     pView->SetActualWin( pWindow );
 
-    Point   aPos( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
+    Point	aPos( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
     USHORT nHitLog = USHORT ( pWindow->PixelToLogic(Size(3,0)).Width() );
 
     if ( pView->IsAction() )
@@ -524,9 +524,9 @@ BOOL DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt )
                 if( pView->PickObj( aMDPos, nHitLog, pObj, pPV ) )
                 {
                     //if( pObj->ISA( DlgEdForm ) )
-                    //  pView->UnmarkAll();
+                    //	pView->UnmarkAll();
                     //else
-                    //  pParent->UnmarkDialog();
+                    //	pParent->UnmarkDialog();
                 }
             }
 
@@ -585,22 +585,22 @@ BOOL DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt )
         }
     }
 
-//  USHORT nClicks = rMEvt.GetClicks();
-//  if (nClicks == 2)
-//  {
-//      if ( pView->AreObjectsMarked() )
-//      {
-//          const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
+//	USHORT nClicks = rMEvt.GetClicks();
+//	if (nClicks == 2)
+//	{
+//		if ( pView->AreObjectsMarked() )
+//		{
+//			const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
 //
-//          if (rMarkList.GetMarkCount() == 1)
-//          {
-//              SdrMark* pMark = rMarkList.GetMark(0);
-//              SdrObject* pObj = pMark->GetMarkedSdrObj();
+//			if (rMarkList.GetMarkCount() == 1)
+//			{
+//				SdrMark* pMark = rMarkList.GetMark(0);
+//				SdrObject* pObj = pMark->GetMarkedSdrObj();
 //
-//              // edit objects here
-//          }
-//      }
-//  }
+//				// edit objects here
+//			}
+//		}
+//	}
 
     bMarkAction = FALSE;
 
diff --git a/basctl/source/dlged/dlgedlist.cxx b/basctl/source/dlged/dlgedlist.cxx
index 41fa01b262c8..ff34ca8a346a 100644
--- a/basctl/source/dlged/dlgedlist.cxx
+++ b/basctl/source/dlged/dlgedlist.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/basctl/source/dlged/dlgedmod.cxx b/basctl/source/dlged/dlgedmod.cxx
index ceb5555a1bc2..3afcd86d79a2 100644
--- a/basctl/source/dlged/dlgedmod.cxx
+++ b/basctl/source/dlged/dlgedmod.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 769290fe0690..f956f817e0b0 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -827,7 +827,7 @@ sal_Bool DlgEdObj::supportsService( const sal_Char* _pServiceName ) const
         do
         {
             aUniqueName = aDefaultName + ::rtl::OUString::valueOf(++n);
-        }   while (xNameAcc->hasByName(aUniqueName));
+        }	while (xNameAcc->hasByName(aUniqueName));
     }
 
     return aUniqueName;
diff --git a/basctl/source/dlged/dlgedpage.cxx b/basctl/source/dlged/dlgedpage.cxx
index 58fe333dfac3..a327bac760f7 100644
--- a/basctl/source/dlged/dlgedpage.cxx
+++ b/basctl/source/dlged/dlgedpage.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/basctl/source/dlged/dlgedview.cxx b/basctl/source/dlged/dlgedview.cxx
index d98967a3e776..335974554282 100644
--- a/basctl/source/dlged/dlgedview.cxx
+++ b/basctl/source/dlged/dlgedview.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -173,12 +173,12 @@ SdrObject* impLocalHitCorrection(SdrObject* pRetval, const Point& rPnt, USHORT n
             // will access aOutRect directly
             const Rectangle aOuterRectangle(pDlgEdObj->GetLastBoundRect());
 
-            if(!aOuterRectangle.IsEmpty()
-                && RECT_EMPTY != aOuterRectangle.Right()
+            if(!aOuterRectangle.IsEmpty() 
+                && RECT_EMPTY != aOuterRectangle.Right() 
                 && RECT_EMPTY != aOuterRectangle.Bottom())
             {
                 basegfx::B2DRange aOuterRange(
-                    aOuterRectangle.Left(), aOuterRectangle.Top(),
+                    aOuterRectangle.Left(), aOuterRectangle.Top(), 
                     aOuterRectangle.Right(), aOuterRectangle.Bottom());
 
                 if(nTol)
diff --git a/basctl/source/dlged/dlgresid.src b/basctl/source/dlged/dlgresid.src
index ee37d82233e1..4512dc75247e 100644
--- a/basctl/source/dlged/dlgresid.src
+++ b/basctl/source/dlged/dlgresid.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index e33e68c3dd67..f39ebb0ccbb8 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 {
     long getLongestWordWidth( const String& rText, const Window& rWin )
     {
         long nWidth = 0;
-        Reference< XBreakIterator > xBreakIter( vcl::unohelper::CreateBreakIterator() );
+        Reference< XBreakIterator >	xBreakIter( vcl::unohelper::CreateBreakIterator() );
         sal_Int32 nStartPos = 0;
         const Locale aLocale = Application::GetSettings().GetUILocale();
         Boundary aBoundary = xBreakIter->getWordBoundary(
@@ -99,19 +99,19 @@ ManageLanguageDialog::ManageLanguageDialog( Window* pParent, LocalizationMgr* _p
 
     ModalDialog( pParent, IDEResId( RID_DLG_MANAGE_LANGUAGE ) ),
 
-    m_aLanguageFT       ( this, IDEResId( FT_LANGUAGE ) ),
-    m_aLanguageLB       ( this, IDEResId( LB_LANGUAGE ) ),
-    m_aAddPB            ( this, IDEResId( PB_ADD_LANG ) ),
-    m_aDeletePB         ( this, IDEResId( PB_DEL_LANG ) ),
-    m_aMakeDefPB        ( this, IDEResId( PB_MAKE_DEFAULT ) ),
-    m_aInfoFT           ( this, IDEResId( FT_INFO ) ),
-    m_aBtnLine          ( this, IDEResId( FL_BUTTONS ) ),
-    m_aHelpBtn          ( this, IDEResId( PB_HELP ) ),
-    m_aCloseBtn         ( this, IDEResId( PB_CLOSE ) ),
-    m_pLocalizationMgr  ( _pLMgr ),
-    m_sDefLangStr       (       IDEResId( STR_DEF_LANG ) ),
-    m_sDeleteStr        (       IDEResId( STR_DELETE ) ),
-    m_sCreateLangStr    (       IDEResId( STR_CREATE_LANG ) )
+    m_aLanguageFT		( this, IDEResId( FT_LANGUAGE ) ),
+    m_aLanguageLB		( this, IDEResId( LB_LANGUAGE ) ),
+    m_aAddPB			( this, IDEResId( PB_ADD_LANG ) ),
+    m_aDeletePB			( this, IDEResId( PB_DEL_LANG ) ),
+    m_aMakeDefPB		( this, IDEResId( PB_MAKE_DEFAULT ) ),
+    m_aInfoFT			( this, IDEResId( FT_INFO ) ),
+    m_aBtnLine			( this, IDEResId( FL_BUTTONS ) ),
+    m_aHelpBtn			( this, IDEResId( PB_HELP ) ),
+    m_aCloseBtn			( this, IDEResId( PB_CLOSE ) ),
+    m_pLocalizationMgr	( _pLMgr ),
+    m_sDefLangStr		( 		IDEResId( STR_DEF_LANG ) ),
+    m_sDeleteStr		( 		IDEResId( STR_DELETE ) ),
+    m_sCreateLangStr	(		IDEResId( STR_CREATE_LANG ) )
 
 {
     FreeResource();
@@ -304,14 +304,14 @@ SetDefaultLanguageDialog::SetDefaultLanguageDialog( Window* pParent, Localizatio
 
     ModalDialog( pParent, IDEResId( RID_DLG_SETDEF_LANGUAGE ) ),
 
-    m_aLanguageFT   ( this, IDEResId( FT_DEF_LANGUAGE ) ),
-    m_pLanguageLB   ( new SvxLanguageBox( this, IDEResId( LB_DEF_LANGUAGE ) ) ),
-    m_pCheckLangLB  ( NULL ),
-    m_aInfoFT       ( this, IDEResId( FT_DEF_INFO ) ),
-    m_aBtnLine      ( this, IDEResId( FL_DEF_BUTTONS ) ),
-    m_aOKBtn        ( this, IDEResId( PB_DEF_OK ) ),
-    m_aCancelBtn    ( this, IDEResId( PB_DEF_CANCEL ) ),
-    m_aHelpBtn      ( this, IDEResId( PB_DEF_HELP ) ),
+    m_aLanguageFT	( this, IDEResId( FT_DEF_LANGUAGE ) ),
+    m_pLanguageLB	( new SvxLanguageBox( this, IDEResId( LB_DEF_LANGUAGE ) ) ),
+    m_pCheckLangLB	( NULL ),
+    m_aInfoFT		( this, IDEResId( FT_DEF_INFO ) ),
+    m_aBtnLine		( this, IDEResId( FL_DEF_BUTTONS ) ),
+    m_aOKBtn		( this, IDEResId( PB_DEF_OK ) ),
+    m_aCancelBtn	( this, IDEResId( PB_DEF_CANCEL ) ),
+    m_aHelpBtn		( this, IDEResId( PB_DEF_HELP ) ),
 
     m_pLocalizationMgr( _pLMgr )
 
diff --git a/basctl/source/dlged/managelang.hrc b/basctl/source/dlged/managelang.hrc
index e3a7f7f1edde..6abb2ae3b314 100644
--- a/basctl/source/dlged/managelang.hrc
+++ b/basctl/source/dlged/managelang.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,73 +34,73 @@
 
 // Dialog Control Id's -----------------------------------------------------------
 
-#define FT_LANGUAGE         1
-#define LB_LANGUAGE         2
-#define PB_ADD_LANG         3
-#define PB_DEL_LANG         4
-#define PB_MAKE_DEFAULT     5
-#define FT_INFO             6
-#define FL_BUTTONS          7
-#define PB_HELP             8
-#define PB_CLOSE            9
-#define STR_DEF_LANG        10
-#define STR_DELETE          11
-#define STR_CREATE_LANG     12
-
-#define FT_DEF_LANGUAGE     1
-#define LB_DEF_LANGUAGE     2
-#define LB_ADD_LANGUAGE     3
-#define FT_DEF_INFO         4
-#define FL_DEF_BUTTONS      5
-#define PB_DEF_OK           6
-#define PB_DEF_CANCEL       7
-#define PB_DEF_HELP         8
-#define STR_ADDLANG_TITLE   9
-#define STR_ADDLANG_LABEL   10
-#define STR_ADDLANG_INFO    11
+#define FT_LANGUAGE			1
+#define LB_LANGUAGE			2
+#define PB_ADD_LANG			3
+#define PB_DEL_LANG			4
+#define PB_MAKE_DEFAULT		5
+#define FT_INFO				6
+#define FL_BUTTONS			7
+#define PB_HELP				8
+#define PB_CLOSE			9
+#define STR_DEF_LANG		10
+#define STR_DELETE			11
+#define STR_CREATE_LANG		12
+
+#define FT_DEF_LANGUAGE		1
+#define LB_DEF_LANGUAGE		2
+#define LB_ADD_LANGUAGE		3
+#define FT_DEF_INFO			4
+#define FL_DEF_BUTTONS		5
+#define PB_DEF_OK			6
+#define PB_DEF_CANCEL		7
+#define PB_DEF_HELP			8
+#define STR_ADDLANG_TITLE	9
+#define STR_ADDLANG_LABEL	10
+#define STR_ADDLANG_INFO	11
 
 // Metrics -----------------------------------------------------------------------
 
-#define MANAGE_DLG_WIDTH    240
-#define MANAGE_DLG_HEIGHT   180
-#define INFO_LINES_COUNT    3
+#define MANAGE_DLG_WIDTH	240
+#define MANAGE_DLG_HEIGHT	180
+#define INFO_LINES_COUNT	3
 
-#define MANAGE_COL1         RSC_SP_DLG_INNERBORDER_LEFT
-#define MANAGE_COL2         (MANAGE_DLG_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT - 2*RSC_CD_PUSHBUTTON_WIDTH - RSC_SP_CTRL_X)
-#define MANAGE_COL3         (MANAGE_COL2 + RSC_CD_PUSHBUTTON_WIDTH + RSC_SP_CTRL_X)
+#define MANAGE_COL1			RSC_SP_DLG_INNERBORDER_LEFT
+#define MANAGE_COL2			(MANAGE_DLG_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT - 2*RSC_CD_PUSHBUTTON_WIDTH - RSC_SP_CTRL_X)
+#define MANAGE_COL3			(MANAGE_COL2 + RSC_CD_PUSHBUTTON_WIDTH + RSC_SP_CTRL_X)
 
-#define MANAGE_ROW1         RSC_SP_DLG_INNERBORDER_TOP
-#define MANAGE_ROW2         (MANAGE_ROW1 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y)
-#define MANAGE_ROW3         (MANAGE_ROW2 + RSC_CD_PUSHBUTTON_HEIGHT + RSC_SP_CTRL_GROUP_Y)
+#define MANAGE_ROW1			RSC_SP_DLG_INNERBORDER_TOP
+#define MANAGE_ROW2			(MANAGE_ROW1 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y)
+#define MANAGE_ROW3			(MANAGE_ROW2 + RSC_CD_PUSHBUTTON_HEIGHT + RSC_SP_CTRL_GROUP_Y)
 
-#define MANAGE_ROW7         (MANAGE_DLG_HEIGHT - RSC_SP_DLG_INNERBORDER_BOTTOM - RSC_CD_PUSHBUTTON_HEIGHT)
-#define MANAGE_ROW6         (MANAGE_ROW7 - RSC_SP_FLGR_SPACE_Y - RSC_CD_FIXEDLINE_HEIGHT)
-#define MANAGE_ROW5         (MANAGE_ROW6 - RSC_SP_FLGR_SPACE_Y - INFO_LINES_COUNT*RSC_CD_FIXEDTEXT_HEIGHT)
-#define MANAGE_ROW4         (MANAGE_ROW5 - RSC_SP_CTRL_GROUP_Y - RSC_CD_PUSHBUTTON_HEIGHT)
-#define MANAGE_ROW4A        (MANAGE_ROW4 + RSC_CD_PUSHBUTTON_HEIGHT)
+#define MANAGE_ROW7			(MANAGE_DLG_HEIGHT - RSC_SP_DLG_INNERBORDER_BOTTOM - RSC_CD_PUSHBUTTON_HEIGHT)
+#define MANAGE_ROW6			(MANAGE_ROW7 - RSC_SP_FLGR_SPACE_Y - RSC_CD_FIXEDLINE_HEIGHT)
+#define MANAGE_ROW5			(MANAGE_ROW6 - RSC_SP_FLGR_SPACE_Y - INFO_LINES_COUNT*RSC_CD_FIXEDTEXT_HEIGHT)
+#define MANAGE_ROW4			(MANAGE_ROW5 - RSC_SP_CTRL_GROUP_Y - RSC_CD_PUSHBUTTON_HEIGHT)
+#define MANAGE_ROW4A 		(MANAGE_ROW4 + RSC_CD_PUSHBUTTON_HEIGHT)
 
-#define MANAGE_LB_WIDTH     (MANAGE_COL3 - RSC_SP_CTRL_X - RSC_SP_DLG_INNERBORDER_LEFT)
-#define MANAGE_LB_HEIGHT    (MANAGE_ROW4A - MANAGE_ROW2)
+#define MANAGE_LB_WIDTH		(MANAGE_COL3 - RSC_SP_CTRL_X - RSC_SP_DLG_INNERBORDER_LEFT)
+#define MANAGE_LB_HEIGHT	(MANAGE_ROW4A - MANAGE_ROW2)
 
-#define SETDEF_DLG_WIDTH    180
-#define SETDEF_DLG_HEIGHT   165
+#define SETDEF_DLG_WIDTH	180
+#define SETDEF_DLG_HEIGHT	165
 
-#define SETDEF_COL1         RSC_SP_DLG_INNERBORDER_LEFT
-#define SETDEF_COL2         (SETDEF_DLG_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT - 3*RSC_CD_PUSHBUTTON_WIDTH - RSC_SP_CTRL_GROUP_X - RSC_SP_CTRL_X)
-#define SETDEF_COL3         (SETDEF_COL2 + RSC_CD_PUSHBUTTON_WIDTH + RSC_SP_CTRL_GROUP_X)
-#define SETDEF_COL4         (SETDEF_COL3 + RSC_CD_PUSHBUTTON_WIDTH + RSC_SP_CTRL_X)
-#define SETDEF_COL4A        (SETDEF_COL4 + RSC_CD_PUSHBUTTON_WIDTH)
+#define SETDEF_COL1			RSC_SP_DLG_INNERBORDER_LEFT
+#define SETDEF_COL2			(SETDEF_DLG_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT - 3*RSC_CD_PUSHBUTTON_WIDTH - RSC_SP_CTRL_GROUP_X - RSC_SP_CTRL_X)
+#define SETDEF_COL3			(SETDEF_COL2 + RSC_CD_PUSHBUTTON_WIDTH + RSC_SP_CTRL_GROUP_X)
+#define SETDEF_COL4			(SETDEF_COL3 + RSC_CD_PUSHBUTTON_WIDTH + RSC_SP_CTRL_X)
+#define SETDEF_COL4A		(SETDEF_COL4 + RSC_CD_PUSHBUTTON_WIDTH)
 
-#define SETDEF_ROW1         RSC_SP_DLG_INNERBORDER_TOP
-#define SETDEF_ROW2         (SETDEF_ROW1 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y)
+#define SETDEF_ROW1			RSC_SP_DLG_INNERBORDER_TOP
+#define SETDEF_ROW2			(SETDEF_ROW1 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y)
 
-#define SETDEF_ROW5         (SETDEF_DLG_HEIGHT - RSC_SP_DLG_INNERBORDER_BOTTOM - RSC_CD_PUSHBUTTON_HEIGHT)
-#define SETDEF_ROW4         (SETDEF_ROW5 - RSC_SP_FLGR_SPACE_Y - RSC_CD_FIXEDLINE_HEIGHT)
-#define SETDEF_ROW3         (SETDEF_ROW4 - RSC_SP_FLGR_SPACE_Y - INFO_LINES_COUNT*RSC_CD_FIXEDTEXT_HEIGHT)
-#define SETDEF_ROW3A        (SETDEF_ROW3 - RSC_SP_CTRL_GROUP_Y)
+#define SETDEF_ROW5			(SETDEF_DLG_HEIGHT - RSC_SP_DLG_INNERBORDER_BOTTOM - RSC_CD_PUSHBUTTON_HEIGHT)
+#define SETDEF_ROW4			(SETDEF_ROW5 - RSC_SP_FLGR_SPACE_Y - RSC_CD_FIXEDLINE_HEIGHT)
+#define SETDEF_ROW3			(SETDEF_ROW4 - RSC_SP_FLGR_SPACE_Y - INFO_LINES_COUNT*RSC_CD_FIXEDTEXT_HEIGHT)
+#define SETDEF_ROW3A 		(SETDEF_ROW3 - RSC_SP_CTRL_GROUP_Y)
 
-#define SETDEF_LB_WIDTH     (SETDEF_COL4A - SETDEF_COL1)
-#define SETDEF_LB_HEIGHT    (SETDEF_ROW3A - SETDEF_ROW2)
+#define SETDEF_LB_WIDTH		(SETDEF_COL4A - SETDEF_COL1)
+#define SETDEF_LB_HEIGHT	(SETDEF_ROW3A - SETDEF_ROW2)
 
-#endif  // _BASCTL_MANAGELANG_HRC
+#endif	// _BASCTL_MANAGELANG_HRC
 
diff --git a/basctl/source/dlged/managelang.src b/basctl/source/dlged/managelang.src
index b03421e1aa22..6b54abcb182a 100644
--- a/basctl/source/dlged/managelang.src
+++ b/basctl/source/dlged/managelang.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index d210482a8ef5..a041c8e7a343 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ SFX_IMPL_FLOATINGWINDOW(PropBrwMgr, SID_SHOW_PROPERTYBROWSER)
 
 //----------------------------------------------------------------------------
 
-PropBrwMgr::PropBrwMgr( Window* _pParent, sal_uInt16 nId,
+PropBrwMgr::PropBrwMgr(	Window* _pParent, sal_uInt16 nId,
                         SfxBindings *pBindings, SfxChildWinInfo* pInfo)
               :SfxChildWindow( _pParent, nId )
 {
@@ -197,7 +197,7 @@ void PropBrw::ImplReCreateController()
             xFactoryProperties->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ),
             UNO_QUERY_THROW );
 
-        // a ComponentContext for the
+        // a ComponentContext for the 
         ::cppu::ContextEntry_Init aHandlerContextInfo[] =
         {
             ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DialogParentWindow" ) ), makeAny( VCLUnoHelper::GetInterface ( this ) ) ),
@@ -503,8 +503,8 @@ void PropBrw::implSetNewObject( const Reference< XPropertySet >& _rxObject )
     // #i73075 Handled in implSetNewObjectSequence
     //else    // multiselection
     //{
-    //  aName = ::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_PROPERTIES)));
-    //  aName += ::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_MULTISELECT)));
+    //	aName = ::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_PROPERTIES)));
+    //	aName += ::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_MULTISELECT)));
     //}
 
     return aName;
diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx b/basctl/source/inc/accessibledialogcontrolshape.hxx
index f45e4eb31e44..fca313610f02 100644
--- a/basctl/source/inc/accessibledialogcontrolshape.hxx
+++ b/basctl/source/inc/accessibledialogcontrolshape.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,53 +48,53 @@ class AccessibleStateSetHelper;
 }
 
 
-//  ----------------------------------------------------
-//  class AccessibleDialogControlShape
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class AccessibleDialogControlShape
+//	----------------------------------------------------
 
-typedef ::comphelper::OAccessibleExtendedComponentHelper    AccessibleExtendedComponentHelper_BASE;
+typedef ::comphelper::OAccessibleExtendedComponentHelper	AccessibleExtendedComponentHelper_BASE;
 
 typedef ::cppu::ImplHelper3<
     ::com::sun::star::accessibility::XAccessible,
     ::com::sun::star::lang::XServiceInfo,
     ::com::sun::star::beans::XPropertyChangeListener > AccessibleDialogControlShape_BASE;
 
-class AccessibleDialogControlShape :    public AccessibleExtendedComponentHelper_BASE,
+class AccessibleDialogControlShape :	public AccessibleExtendedComponentHelper_BASE,
                                         public AccessibleDialogControlShape_BASE
 {
     friend class AccessibleDialogWindow;
 
 private:
-    VCLExternalSolarLock*   m_pExternalLock;
-    DialogWindow*           m_pDialogWindow;
-    DlgEdObj*               m_pDlgEdObj;
-    sal_Bool                m_bFocused;
-    sal_Bool                m_bSelected;
+    VCLExternalSolarLock*	m_pExternalLock;
+    DialogWindow*			m_pDialogWindow;
+    DlgEdObj*				m_pDlgEdObj;
+    sal_Bool				m_bFocused;
+    sal_Bool				m_bSelected;
 
-    ::com::sun::star::awt::Rectangle                                            m_aBounds;
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >   m_xControlModel;
+    ::com::sun::star::awt::Rectangle											m_aBounds;
+    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >	m_xControlModel;
 
 protected:
-    sal_Bool                IsFocused();
-    sal_Bool                IsSelected();
+    sal_Bool				IsFocused();
+    sal_Bool				IsSelected();
 
-    void                    SetFocused( sal_Bool bFocused );
-    void                    SetSelected( sal_Bool bSelected );
+    void					SetFocused( sal_Bool bFocused );
+    void					SetSelected( sal_Bool bSelected );
 
     ::com::sun::star::awt::Rectangle GetBounds();
-    void                    SetBounds( const ::com::sun::star::awt::Rectangle& aBounds );
+    void					SetBounds( const ::com::sun::star::awt::Rectangle& aBounds ); 
 
-    Window*                 GetWindow() const;
+    Window*					GetWindow() const;
 
-    ::rtl::OUString         GetModelStringProperty( const sal_Char* pPropertyName );
+    ::rtl::OUString			GetModelStringProperty( const sal_Char* pPropertyName );
 
-    virtual void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+    virtual void			FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
 
-    // OCommonAccessibleComponent
-    virtual ::com::sun::star::awt::Rectangle SAL_CALL   implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
+    // OCommonAccessibleComponent 
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL	implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
 
     // XComponent
-    virtual void SAL_CALL   disposing();
+    virtual void SAL_CALL	disposing();
 
 public:
     AccessibleDialogControlShape( DialogWindow* pDialogWindow, DlgEdObj* pDlgEdObj );
@@ -139,7 +139,7 @@ public:
     virtual sal_Int32 SAL_CALL getBackground(  ) throw (::com::sun::star::uno::RuntimeException);
 
     // XAccessibleExtendedComponent
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont(	) throw (::com::sun::star::uno::RuntimeException);
     virtual ::rtl::OUString SAL_CALL getTitledBorderText(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::rtl::OUString SAL_CALL getToolTipText(  ) throw (::com::sun::star::uno::RuntimeException);
 };
diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx
index ed8594a5c071..c5ed48faf733 100644
--- a/basctl/source/inc/accessibledialogwindow.hxx
+++ b/basctl/source/inc/accessibledialogwindow.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class AccessibleStateSetHelper;
 }
 
 
-//  ----------------------------------------------------
-//  class AccessibleDialogWindow
-//  ----------------------------------------------------
+//	----------------------------------------------------
+//	class AccessibleDialogWindow
+//	----------------------------------------------------
 
-typedef ::comphelper::OAccessibleExtendedComponentHelper    AccessibleExtendedComponentHelper_BASE;
+typedef ::comphelper::OAccessibleExtendedComponentHelper	AccessibleExtendedComponentHelper_BASE;
 
-typedef ::cppu::ImplHelper3 <
+typedef ::cppu::ImplHelper3	<
     ::com::sun::star::accessibility::XAccessible,
     ::com::sun::star::accessibility::XAccessibleSelection,
     ::com::sun::star::lang::XServiceInfo > AccessibleDialogWindow_BASE;
 
-class AccessibleDialogWindow :  public AccessibleExtendedComponentHelper_BASE,
+class AccessibleDialogWindow :	public AccessibleExtendedComponentHelper_BASE,
                                 public AccessibleDialogWindow_BASE,
                                 public SfxListener
 {
@@ -72,9 +72,9 @@ private:
     class ChildDescriptor
     {
     public:
-        DlgEdObj*                                                                                   pDlgEdObj;
-        ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >    rxAccessible;
-
+        DlgEdObj*																					pDlgEdObj;
+        ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >	rxAccessible;
+        
         ChildDescriptor( DlgEdObj* _pDlgEdObj );
         ~ChildDescriptor();
 
@@ -87,35 +87,35 @@ private:
 
     typedef ::std::vector< ChildDescriptor > AccessibleChildren;
 
-    AccessibleChildren      m_aAccessibleChildren;
-    VCLExternalSolarLock*   m_pExternalLock;
-    DialogWindow*           m_pDialogWindow;
-    DlgEditor*              m_pDlgEditor;
-    DlgEdModel*             m_pDlgEdModel;
+    AccessibleChildren		m_aAccessibleChildren;
+    VCLExternalSolarLock*	m_pExternalLock;
+    DialogWindow*			m_pDialogWindow;
+    DlgEditor*				m_pDlgEditor;
+    DlgEdModel*				m_pDlgEdModel;
 
 protected:
-    void                    UpdateFocused();
-    void                    UpdateSelected();
-    void                    UpdateBounds();
+    void					UpdateFocused();
+    void					UpdateSelected();
+    void					UpdateBounds();
 
-    sal_Bool                IsChildVisible( const ChildDescriptor& rDesc );
+    sal_Bool				IsChildVisible( const ChildDescriptor& rDesc );
 
-    void                    InsertChild( const ChildDescriptor& rDesc );
-    void                    RemoveChild( const ChildDescriptor& rDesc );
-    void                    UpdateChild( const ChildDescriptor& rDesc );
-    void                    UpdateChildren();
-    void                    SortChildren();
+    void					InsertChild( const ChildDescriptor& rDesc );
+    void					RemoveChild( const ChildDescriptor& rDesc );
+    void					UpdateChild( const ChildDescriptor& rDesc );
+    void					UpdateChildren();
+    void					SortChildren();
 
     DECL_LINK( WindowEventListener, VclSimpleEvent* );
 
-    virtual void            ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
-    virtual void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+    virtual void			ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+    virtual void			FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
 
-    // OCommonAccessibleComponent
-    virtual ::com::sun::star::awt::Rectangle SAL_CALL   implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
+    // OCommonAccessibleComponent 
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL	implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
 
     // XComponent
-    virtual void SAL_CALL   disposing();
+    virtual void SAL_CALL	disposing();
 
 public:
     AccessibleDialogWindow( DialogWindow* pDialogWindow );
@@ -157,7 +157,7 @@ public:
     virtual sal_Int32 SAL_CALL getBackground(  ) throw (::com::sun::star::uno::RuntimeException);
 
     // XAccessibleExtendedComponent
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont(	) throw (::com::sun::star::uno::RuntimeException);
     virtual ::rtl::OUString SAL_CALL getTitledBorderText(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::rtl::OUString SAL_CALL getToolTipText(  ) throw (::com::sun::star::uno::RuntimeException);
 
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index 505998d32bcb..cbfee7069976 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class SfxUndoManager;
 class DialogWindow: public IDEBaseWindow
 {
 private:
-    DlgEditor*          pEditor;
-    SfxUndoManager*     pUndoMgr;
-    Link                aOldNotifyUndoActionHdl;
-    String              aCurPath;
+    DlgEditor*			pEditor;
+    SfxUndoManager*		pUndoMgr;
+    Link				aOldNotifyUndoActionHdl;
+    String				aCurPath;
 
 protected:
-    virtual void        Paint( const Rectangle& );
-    virtual void        Resize();
+    virtual void 		Paint( const Rectangle& );
+    virtual void 		Resize();
 
-    virtual void        MouseButtonDown( const MouseEvent& rMEvt );
-    virtual void        MouseButtonUp( const MouseEvent& rMEvt );
-    virtual void        MouseMove( const MouseEvent& rMEvt );
-    virtual void        KeyInput( const KeyEvent& rKEvt );
-    virtual void        Command( const CommandEvent& rCEvt );
-    virtual void        LoseFocus();
+    virtual void 		MouseButtonDown( const MouseEvent& rMEvt );
+    virtual void 		MouseButtonUp( const MouseEvent& rMEvt );
+    virtual void 		MouseMove( const MouseEvent& rMEvt );
+    virtual void 		KeyInput( const KeyEvent& rKEvt );
+    virtual void		Command( const CommandEvent& rCEvt );
+    virtual void		LoseFocus();
 
     DECL_LINK( NotifyUndoActionHdl, SfxUndoAction * );
-    virtual void        DoInit();
-    virtual void        DoScroll( ScrollBar* pCurScrollBar );
-    virtual void        DataChanged( const DataChangedEvent& rDCEvt );
-    void                InitSettings(BOOL bFont,BOOL bForeground,BOOL bBackground);
+    virtual	void		DoInit();
+    virtual void		DoScroll( ScrollBar* pCurScrollBar );
+    virtual void 		DataChanged( const DataChangedEvent& rDCEvt );
+    void 				InitSettings(BOOL bFont,BOOL bForeground,BOOL bBackground);
 
 public:
                         TYPEINFO();
@@ -79,38 +79,38 @@ public:
                         DialogWindow( DialogWindow* pCurView ); // never implemented
                         ~DialogWindow();
 
-    virtual void        ExecuteCommand( SfxRequest& rReq );
-    virtual void        GetState( SfxItemSet& );
-    DlgEditor*          GetEditor() const   { return pEditor; }
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > GetDialog() const;
-    DlgEdModel*         GetModel() const;
-    DlgEdPage*          GetPage() const;
-    DlgEdView*          GetView() const;
-    BOOL                RenameDialog( const String& rNewName );
-    void                DisableBrowser();
-    void                UpdateBrowser();
-    BOOL                SaveDialog();
-    BOOL                ImportDialog();
-
-    virtual String      GetTitle();
+    virtual void		ExecuteCommand( SfxRequest& rReq );
+    virtual void		GetState( SfxItemSet& );
+    DlgEditor*			GetEditor() const 	{ return pEditor; }
+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >	GetDialog() const;
+    DlgEdModel*			GetModel() const;
+    DlgEdPage*			GetPage() const;
+    DlgEdView*			GetView() const;
+    BOOL				RenameDialog( const String& rNewName );
+    void				DisableBrowser();
+    void				UpdateBrowser();
+    BOOL				SaveDialog();
+    BOOL				ImportDialog();
+
+    virtual String		GetTitle();
     virtual BasicEntryDescriptor CreateEntryDescriptor();
-    virtual void        SetReadOnly( BOOL bReadOnly );
+    virtual void	    SetReadOnly( BOOL bReadOnly );
     virtual BOOL        IsReadOnly();
 
-    virtual void        StoreData();
-    virtual BOOL        IsModified();
+    virtual void		StoreData();
+    virtual BOOL		IsModified();
     virtual BOOL        IsPasteAllowed();
 
-    virtual SfxUndoManager* GetUndoManager();
+    virtual SfxUndoManager*	GetUndoManager();
     // return number of pages to be printed
     virtual sal_Int32 countPages( Printer* pPrinter );
     // print page
     virtual void printPage( sal_Int32 nPage, Printer* pPrinter );
-    virtual void        Deactivating();
+    virtual void		Deactivating();
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
 };
 
-#endif  // _BASIDE3_HXX
+#endif	// _BASIDE3_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/inc/basidectrlr.hxx b/basctl/source/inc/basidectrlr.hxx
index 8532b7691c74..172afbfb95b5 100644
--- a/basctl/source/inc/basidectrlr.hxx
+++ b/basctl/source/inc/basidectrlr.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,12 +47,12 @@ private:
     // properties
     sal_Int32   m_nIconId;
 
-public:
+public:    
     BasicIDEController( BasicIDEShell* pViewShell );
     virtual ~BasicIDEController();
 
     // XInterface
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    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 release() throw();
 
@@ -71,6 +71,6 @@ protected:
     virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const;
 };
 
-#endif  // _BASCTL_BASICIDECTRLR_HXX
+#endif	// _BASCTL_BASICIDECTRLR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index 9fb76f628f7b..6f20a10b9cf9 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,22 +82,22 @@ friend class LocalizationMgr;
 friend BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocument& rDocument, const String& aLibName );
 friend bool BasicIDE::RemoveDialog( const ScriptDocument& rDocument, const String& rLibName, const String& rDlgName );
 
-    ObjectCatalog*      pObjectCatalog;
+    ObjectCatalog* 		pObjectCatalog;
 
-    IDEWindowTable      aIDEWindowTable;
-    USHORT              nCurKey;
-    IDEBaseWindow*      pCurWin;
+    IDEWindowTable		aIDEWindowTable;
+    USHORT				nCurKey;
+    IDEBaseWindow* 		pCurWin;
     ScriptDocument      m_aCurDocument;
     String              m_aCurLibName;
-    LocalizationMgr*    m_pCurLocalizationMgr;
-
-    ScrollBar           aHScrollBar;
-    ScrollBar           aVScrollBar;
-    ScrollBarBox        aScrollBarBox;
-    BasicIDETabBar*     pTabBar;
-    BOOL                bTabBarSplitted;
-    BOOL                bCreatingWindow;
-    ModulWindowLayout*  pModulLayout;
+    LocalizationMgr*	m_pCurLocalizationMgr;
+
+    ScrollBar			aHScrollBar;
+    ScrollBar			aVScrollBar;
+    ScrollBarBox		aScrollBarBox;
+    BasicIDETabBar*		pTabBar;
+    BOOL				bTabBarSplitted;
+    BOOL				bCreatingWindow;
+    ModulWindowLayout*	pModulLayout;
     BOOL                m_bAppBasicModified;
     ::basctl::DocumentEventNotifier
                         m_aNotifier;
@@ -105,21 +105,21 @@ friend class ContainerListenerImpl;
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener > m_xLibListener;
 
 #if _SOLAR__PRIVATE
-    void                Init();
-    void                InitTabBar();
-    void                InitScrollBars();
-    void                CheckWindows();
-    void                RemoveWindows( const ScriptDocument& rDocument, const String& rLibName, BOOL bDestroy );
-    void                UpdateWindows();
-    void                ShowObjectDialog( BOOL bShow, BOOL bCreateOrDestroy );
-    void                InvalidateBasicIDESlots();
-    void                StoreAllWindowData( BOOL bPersistent = TRUE );
-    void                SetMDITitle();
-    void                EnableScrollbars( BOOL bEnable );
+    void				Init();
+    void				InitTabBar();
+    void				InitScrollBars();
+    void				CheckWindows();
+    void				RemoveWindows( const ScriptDocument& rDocument, const String& rLibName, BOOL bDestroy );
+    void				UpdateWindows();
+    void				ShowObjectDialog( BOOL bShow, BOOL bCreateOrDestroy );
+    void				InvalidateBasicIDESlots();
+    void				StoreAllWindowData( BOOL bPersistent = TRUE );
+    void				SetMDITitle();
+    void				EnableScrollbars( BOOL bEnable );
     void                SetCurLib( const ScriptDocument& rDocument, String aLibName, bool bUpdateWindows = true , bool bCheck = true );
-    void                SetCurLibForLocalization( const ScriptDocument& rDocument, String aLibName );
+    void				SetCurLibForLocalization( const ScriptDocument& rDocument, String aLibName );
 
-    void                ImplStartListening( StarBASIC* pBasic );
+    void				ImplStartListening( StarBASIC* pBasic );
 
     DECL_LINK( TabBarHdl, TabBar* );
     DECL_LINK( AccelSelectHdl, Accelerator* );
@@ -128,35 +128,35 @@ friend class ContainerListenerImpl;
 #endif
 
 protected:
-    virtual void        AdjustPosSizePixel( const Point &rPos, const Size &rSize );
-    virtual void        OuterResizePixel( const Point &rPos, const Size &rSize );
-    virtual Size        GetOptimalSizePixel() const;
-    USHORT              InsertWindowInTable( IDEBaseWindow* pNewWin );
-    virtual USHORT      PrepareClose( BOOL bUI, BOOL bForBrowsing );
-
-    void                SetCurWindow( IDEBaseWindow* pNewWin, BOOL bUpdateTabBar = FALSE, BOOL bRememberAsCurrent = TRUE );
-    void                ManageToolbars();
-    void                RemoveWindow( IDEBaseWindow* pWindow, BOOL bDestroy, BOOL bAllowChangeCurWindow = TRUE );
-    void                ArrangeTabBar();
-
-    ModulWindow*        CreateBasWin( const ScriptDocument& rDocument, const String& rLibName, const String& rModName );
+    virtual void    	AdjustPosSizePixel( const Point &rPos, const Size &rSize );
+    virtual void		OuterResizePixel( const Point &rPos, const Size &rSize );
+    virtual Size    	GetOptimalSizePixel() const;
+    USHORT				InsertWindowInTable( IDEBaseWindow* pNewWin );
+    virtual USHORT 		PrepareClose( BOOL bUI, BOOL bForBrowsing );
+
+    void				SetCurWindow( IDEBaseWindow* pNewWin, BOOL bUpdateTabBar = FALSE, BOOL bRememberAsCurrent = TRUE );
+    void				ManageToolbars();
+    void 				RemoveWindow( IDEBaseWindow* pWindow, BOOL bDestroy, BOOL bAllowChangeCurWindow = TRUE );
+    void				ArrangeTabBar();
+
+    ModulWindow*		CreateBasWin( const ScriptDocument& rDocument, const String& rLibName, const String& rModName );
     DialogWindow*       CreateDlgWin( const ScriptDocument& rDocument, const String& rLibName, const String& rDlgName );
 
-    ModulWindow*        FindBasWin( const ScriptDocument& rDocument, const String& rLibName, const String& rModName, BOOL bCreateIfNotExist, BOOL bFindSuspended = FALSE );
-    ModulWindow*        ShowActiveModuleWindow( StarBASIC* pBasic );
+    ModulWindow*		FindBasWin( const ScriptDocument& rDocument, const String& rLibName, const String& rModName, BOOL bCreateIfNotExist, BOOL bFindSuspended = FALSE );
+    ModulWindow* 		ShowActiveModuleWindow( StarBASIC* pBasic );
 
-    virtual void        SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
+    virtual void 		SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                                 const SfxHint& rHint, const TypeId& rHintType );
 
-    virtual void        Activate(BOOL bMDI);
-    virtual void        Deactivate(BOOL bMDI);
+    virtual void		Activate(BOOL bMDI);
+    virtual void		Deactivate(BOOL bMDI);
 
-    virtual void        Move();
-    virtual void        ShowCursor( bool bOn = true );
+    virtual void		Move();
+    virtual	void		ShowCursor( bool bOn = true );
 
-    void                CreateModulWindowLayout();
-    void                DestroyModulWindowLayout();
-    void                UpdateModulWindowLayout( bool bBasicStopped );
+    void				CreateModulWindowLayout();
+    void				DestroyModulWindowLayout();
+    void				UpdateModulWindowLayout( bool bBasicStopped );
 
     // DocumentEventListener
     virtual void onDocumentCreated( const ScriptDocument& _rDocument );
@@ -177,57 +177,57 @@ public:
                         BasicIDEShell( SfxViewFrame *pFrame, SfxViewShell *pOldSh );
                         ~BasicIDEShell();
 
-    IDEBaseWindow*      GetCurWindow() const    { return pCurWin; }
+    IDEBaseWindow*		GetCurWindow() const 	{ return pCurWin; }
     const ScriptDocument&
                         GetCurDocument() const { return m_aCurDocument; }
     const String&       GetCurLibName() const { return m_aCurLibName; }
-    ObjectCatalog*      GetObjectCatalog() const    { return pObjectCatalog; }
-    LocalizationMgr*    GetCurLocalizationMgr() const { return m_pCurLocalizationMgr; }
+    ObjectCatalog* 		GetObjectCatalog() const	{ return pObjectCatalog; }
+    LocalizationMgr*	GetCurLocalizationMgr() const { return m_pCurLocalizationMgr; }
 
-    ScrollBar&          GetHScrollBar()         { return aHScrollBar; }
-    ScrollBar&          GetVScrollBar()         { return aVScrollBar; }
-    ScrollBarBox&       GetScrollBarBox()       { return aScrollBarBox; }
-    TabBar*             GetTabBar()             { return (TabBar*)pTabBar; }
-    IDEWindowTable&     GetIDEWindowTable()     { return aIDEWindowTable; }
+    ScrollBar&			GetHScrollBar() 		{ return aHScrollBar; }
+    ScrollBar&			GetVScrollBar() 		{ return aVScrollBar; }
+    ScrollBarBox&		GetScrollBarBox() 		{ return aScrollBarBox; }
+    TabBar*				GetTabBar()				{ return (TabBar*)pTabBar; }
+    IDEWindowTable&		GetIDEWindowTable() 	{ return aIDEWindowTable; }
 
-    SdrView*            GetCurDlgView() const;
+    SdrView*			GetCurDlgView() const;
 
-    SfxUndoManager*     GetUndoManager();
+    SfxUndoManager*		GetUndoManager();
 
     virtual com::sun::star::uno::Reference< com::sun::star::view::XRenderable > GetRenderable();
+    
+    // virtual USHORT			Print( SfxProgress &rProgress, BOOL bIsAPI, PrintDialog *pPrintDialog = 0 );
+    virtual SfxPrinter*		GetPrinter( BOOL bCreate );
+    virtual USHORT			SetPrinter( SfxPrinter *pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false );
+    virtual String			GetSelectionText( BOOL bCompleteWords );
+    virtual BOOL			HasSelection( BOOL bText ) const;
 
-    // virtual USHORT           Print( SfxProgress &rProgress, BOOL bIsAPI, PrintDialog *pPrintDialog = 0 );
-    virtual SfxPrinter*     GetPrinter( BOOL bCreate );
-    virtual USHORT          SetPrinter( SfxPrinter *pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false );
-    virtual String          GetSelectionText( BOOL bCompleteWords );
-    virtual BOOL            HasSelection( BOOL bText ) const;
-
-    void                GetState( SfxItemSet& );
-    void                ExecuteGlobal( SfxRequest& rReq );
-    void                ExecuteCurrent( SfxRequest& rReq );
-    void                ExecuteBasic( SfxRequest& rReq );
-    void                ExecuteDialog( SfxRequest& rReq );
+    void				GetState( SfxItemSet& );
+    void				ExecuteGlobal( SfxRequest& rReq );
+    void				ExecuteCurrent( SfxRequest& rReq );
+    void				ExecuteBasic( SfxRequest& rReq );
+    void				ExecuteDialog( SfxRequest& rReq );
 
-    virtual sal_Bool    HasUIFeature( sal_uInt32 nFeature );
+    virtual	sal_Bool	HasUIFeature( sal_uInt32 nFeature );
 
-    long                CallBasicErrorHdl( StarBASIC* pBasic );
-    long                CallBasicBreakHdl( StarBASIC* pBasic );
+    long				CallBasicErrorHdl( StarBASIC* pBasic );
+    long				CallBasicBreakHdl( StarBASIC* pBasic );
 
-    ModulWindowLayout*  GetLayoutWindow() const { return pModulLayout; }
+    ModulWindowLayout*	GetLayoutWindow() const { return pModulLayout; }
 
-    IDEBaseWindow*      FindWindow( const ScriptDocument& rDocument, const String& rLibName = String(), const String& rName = String(), USHORT nType = BASICIDE_TYPE_UNKNOWN, BOOL bFindSuspended = FALSE );
+    IDEBaseWindow*		FindWindow( const ScriptDocument& rDocument, const String& rLibName = String(), const String& rName = String(), USHORT nType = BASICIDE_TYPE_UNKNOWN, BOOL bFindSuspended = FALSE );
     DialogWindow*       FindDlgWin( const ScriptDocument& rDocument, const String& rLibName, const String& rDlgName, BOOL bCreateIfNotExist, BOOL bFindSuspended = FALSE );
-    IDEBaseWindow*      FindApplicationWindow();
-    BOOL                NextPage( BOOL bPrev = FALSE );
-
-    BOOL                IsAppBasicModified() const { return m_bAppBasicModified; }
-    void                SetAppBasicModified( BOOL bModified = TRUE ) { m_bAppBasicModified = bModified; }
+    IDEBaseWindow*		FindApplicationWindow();
+    BOOL				NextPage( BOOL bPrev = FALSE );
+    
+    BOOL	            IsAppBasicModified() const { return m_bAppBasicModified; }
+    void			    SetAppBasicModified( BOOL bModified = TRUE ) { m_bAppBasicModified = bModified; }
 
     // For Dialog Drag&Drop in Dialog Organizer
     static void CopyDialogResources(
         ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStreamProvider >& io_xISP,
         const ScriptDocument& rSourceDoc, const String& rSourceLibName, const ScriptDocument& rDestDoc,
-        const String& rDestLibName, const String& rDlgName );
+        const String& rDestLibName,	const String& rDlgName );
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
                         GetCurrentDocument() const;
diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx
index c5c6f44587b9..3640d2140a13 100644
--- a/basctl/source/inc/basobj.hxx
+++ b/basctl/source/inc/basobj.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,26 +50,26 @@ struct BasicIDE_Impl;
 
 namespace BasicIDE
 {
-    void            Organize( INT16 tabId );
+    void			Organize( INT16 tabId );
 
 
     // Hilfsmethoden fuer den allg. Gebrauch:
-    SbMethod*   CreateMacro( SbModule* pModule, const String& rMacroName );
-    void            RunMethod( SbMethod* pMethod );
+    SbMethod*	CreateMacro( SbModule* pModule, const String& rMacroName );
+    void			RunMethod( SbMethod* pMethod );
 
-    StarBASIC*  FindBasic( const SbxVariable* pVar );
-    void            StopBasic();
+    StarBASIC*	FindBasic( const SbxVariable* pVar );
+    void			StopBasic();
     long         HandleBasicError( StarBASIC* pBasic );
-    void            BasicStopped( BOOL* pbAppWindowDisabled = 0, BOOL* pbDispatcherLocked = 0, USHORT* pnWaitCount = 0,
+    void			BasicStopped( BOOL* pbAppWindowDisabled = 0, BOOL* pbDispatcherLocked = 0, USHORT* pnWaitCount = 0,
                             SfxUInt16Item** ppSWActionCount = 0, SfxUInt16Item** ppSWLockViewCount = 0 );
 
-    BOOL            IsValidSbxName( const String& rName );
+    BOOL			IsValidSbxName( const String& rName );
 
-    BasicManager*       FindBasicManager( StarBASIC* pLib );
+    BasicManager* 		FindBasicManager( StarBASIC* pLib );
 
-    SfxBindings*        GetBindingsPtr();
+    SfxBindings* 		GetBindingsPtr();
 
-    void            InvalidateDebuggerSlots();
+    void			InvalidateDebuggerSlots();
 
     // libraries
 
@@ -79,7 +79,7 @@ namespace BasicIDE
 
     // new methods for modules
 
-    ::rtl::OUString     GetModule(
+    ::rtl::OUString		GetModule(
         const ScriptDocument& rDocument, const String& rLibName, const String& rModName )
         throw( ::com::sun::star::container::NoSuchElementException );
 
@@ -93,14 +93,14 @@ namespace BasicIDE
 
     // new methods for macros
 
-    ::rtl::OUString     ChooseMacro( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxLimitToDocument,
+    ::rtl::OUString		ChooseMacro( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxLimitToDocument,
         BOOL bChooseOnly, const ::rtl::OUString& rMacroDesc );
 
     ::com::sun::star::uno::Sequence< ::rtl::OUString > GetMethodNames(
         const ScriptDocument& rDocument, const String& rLibName, const String& rModName )
         throw( ::com::sun::star::container::NoSuchElementException );
 
-    BOOL                    HasMethod(
+    BOOL					HasMethod(
         const ScriptDocument& rDocument, const String& rLibName, const String& rModName, const String& rMethName );
 
     // new methods for dialogs
@@ -113,16 +113,16 @@ namespace BasicIDE
 
         Will show an error message when renaming fails because the new name is already used.
     */
-    bool                 RenameDialog(
+    bool                 RenameDialog( 
         Window* pErrorParent, const ScriptDocument& rDocument, const String& rLibName, const String& rOldName, const String& rNewName )
         throw( ::com::sun::star::container::ElementExistException, ::com::sun::star::container::NoSuchElementException );
 
-    bool                 RemoveDialog(
+    bool                 RemoveDialog( 
         const ScriptDocument& rDocument, const String& rLibName, const String& rDlgName );
 
-    void                MarkDocumentModified( const ScriptDocument& rDocument );
+    void 				MarkDocumentModified( const ScriptDocument& rDocument );
 }
 
-#endif  // _BASOBJ_HXX
+#endif	// _BASOBJ_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index 2d9ded65fef1..2b03fb2c57aa 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class SfxItemSet;
 
 #include <hash_map>
 
-#define LINE_SEP_CR     0x0D
-#define LINE_SEP        0x0A
+#define LINE_SEP_CR		0x0D
+#define LINE_SEP		0x0A
 
 // Implementation: baside2b.cxx
 sal_Int32 searchEOL( const ::rtl::OUString& rStr, sal_Int32 fromIndex );
@@ -71,39 +71,39 @@ sal_Int32 searchEOL( const ::rtl::OUString& rStr, sal_Int32 fromIndex );
 
 struct BasicStatus
 {
-//  BOOL    bCompiled       : 1;
-    BOOL    bIsRunning      : 1;
-    BOOL    bError          : 1;
-    BOOL    bIsInReschedule : 1;
-    USHORT  nBasicFlags;
+//	BOOL	bCompiled		: 1;
+    BOOL	bIsRunning		: 1;
+    BOOL	bError			: 1;
+    BOOL	bIsInReschedule	: 1;
+    USHORT	nBasicFlags;
 
-    BasicStatus()   {
+    BasicStatus()	{
             bIsRunning = FALSE; bError = FALSE;
             nBasicFlags = 0; bIsInReschedule = FALSE; }
 };
 
 struct BreakPoint
 {
-    BOOL    bEnabled;
-    BOOL    bTemp;
-    ULONG   nLine;
-    ULONG   nStopAfter;
+    BOOL	bEnabled;
+    BOOL	bTemp;
+    ULONG 	nLine;
+    ULONG	nStopAfter;
     ULONG   nHitCount;
 
-    BreakPoint( ULONG nL )  { nLine = nL; nStopAfter = 0; nHitCount = 0; bEnabled = TRUE; bTemp = FALSE; }
+    BreakPoint( ULONG nL )	{ nLine = nL; nStopAfter = 0; nHitCount = 0; bEnabled = TRUE; bTemp = FALSE; }
 
 };
 
 class BasicDockingWindow : public DockingWindow
 {
-    Rectangle       aFloatingPosAndSize;
+    Rectangle		aFloatingPosAndSize;
 
 protected:
-    virtual BOOL    Docking( const Point& rPos, Rectangle& rRect );
-    virtual void    EndDocking( const Rectangle& rRect, BOOL bFloatMode );
+    virtual BOOL 	Docking( const Point& rPos, Rectangle& rRect );
+    virtual void	EndDocking( const Rectangle& rRect, BOOL bFloatMode );
     virtual void    ToggleFloatingMode();
-    virtual BOOL    PrepareToggleFloatingMode();
-    virtual void    StartDocking();
+    virtual BOOL	PrepareToggleFloatingMode();
+    virtual void	StartDocking();
 
 public:
     BasicDockingWindow( Window* pParent );
@@ -126,10 +126,10 @@ public:
 
     void transfer(BreakPointList & rList);
 
-    void        InsertSorted( BreakPoint* pBrk );
-    BreakPoint* FindBreakPoint( ULONG nLine );
-    void        AdjustBreakPoints( ULONG nLine, BOOL bInserted );
-    void        SetBreakPointsInBasic( SbModule* pModule );
+    void		InsertSorted( BreakPoint* pBrk );
+    BreakPoint*	FindBreakPoint( ULONG nLine );
+    void		AdjustBreakPoints( ULONG nLine, BOOL bInserted );
+    void		SetBreakPointsInBasic( SbModule* pModule );
     void        ResetHitCount();
 };
 
@@ -137,8 +137,8 @@ public:
 class TabBarSortHelper
 {
 public:
-    USHORT          nPageId;
-    String          aPageText;
+    USHORT			nPageId;
+    String			aPageText;
 
     bool operator<(const TabBarSortHelper& rComp) const { return (aPageText.CompareIgnoreCaseToAscii( rComp.aPageText ) == COMPARE_LESS); }
 };
@@ -146,23 +146,23 @@ public:
 class BasicIDETabBar : public TabBar
 {
 protected:
-    virtual void    MouseButtonDown( const MouseEvent& rMEvt );
-    virtual void    Command( const CommandEvent& rCEvt );
+    virtual void	MouseButtonDown( const MouseEvent& rMEvt );
+    virtual void	Command( const CommandEvent& rCEvt );
 
-    virtual long    AllowRenaming();
-    virtual void    EndRenaming();
+    virtual long	AllowRenaming();
+    virtual void	EndRenaming();
 
 public:
                     BasicIDETabBar( Window* pParent );
 
-    void            Sort();
+    void			Sort();
 };
 
-#define BASWIN_OK               0x00
-#define BASWIN_RUNNINGBASIC     0x01
-#define BASWIN_TOBEKILLED       0x02
-#define BASWIN_SUSPENDED        0x04
-#define BASWIN_INRESCHEDULE     0x08
+#define BASWIN_OK				0x00
+#define BASWIN_RUNNINGBASIC		0x01
+#define BASWIN_TOBEKILLED		0x02
+#define BASWIN_SUSPENDED		0x04
+#define BASWIN_INRESCHEDULE		0x08
 
 class Printer;
 class SfxUndoManager;
@@ -171,82 +171,82 @@ class BasicEntryDescriptor;
 class IDEBaseWindow : public Window
 {
 private:
-    ScrollBar*      pShellHScrollBar;
-    ScrollBar*      pShellVScrollBar;
+    ScrollBar*		pShellHScrollBar;
+    ScrollBar*		pShellVScrollBar;
 
     DECL_LINK( ScrollHdl, ScrollBar * );
-    BYTE            nStatus;
+    BYTE			nStatus;
 
     ScriptDocument      m_aDocument;
-    String              m_aLibName;
-    String              m_aName;
+    String			    m_aLibName;
+    String			    m_aName;
 
 protected:
-    virtual void    DoScroll( ScrollBar* pCurScrollBar );
+    virtual void	DoScroll( ScrollBar* pCurScrollBar );
 
 public:
                     TYPEINFO();
                     IDEBaseWindow( Window* pParent, const ScriptDocument& rDocument, String aLibName, String aName );
-    virtual         ~IDEBaseWindow();
+    virtual		 	~IDEBaseWindow();
 
-    void            Init();
-    virtual void    DoInit();
-    virtual void    Deactivating();
-    void            GrabScrollBars( ScrollBar* pHScroll, ScrollBar* pVScroll );
+    void			Init();
+    virtual void	DoInit();
+    virtual void	Deactivating();
+    void			GrabScrollBars( ScrollBar* pHScroll, ScrollBar* pVScroll );
 
-    ScrollBar*      GetHScrollBar() const { return pShellHScrollBar; }
-    ScrollBar*      GetVScrollBar() const { return pShellVScrollBar; }
+    ScrollBar*		GetHScrollBar()	const { return pShellHScrollBar; }
+    ScrollBar*		GetVScrollBar()	const { return pShellVScrollBar; }
 
-    virtual void    ExecuteCommand( SfxRequest& rReq );
-    virtual void    GetState( SfxItemSet& );
+    virtual void	ExecuteCommand( SfxRequest& rReq );
+    virtual void	GetState( SfxItemSet& );
     virtual long    Notify( NotifyEvent& rNEvt );
 
-    virtual void    StoreData();
-    virtual void    UpdateData();
-    virtual BOOL    CanClose();
-
+    virtual void	StoreData();
+    virtual void	UpdateData();
+    virtual BOOL 	CanClose();
+    
     // return number of pages to be printed
     virtual sal_Int32 countPages( Printer* pPrinter ) = 0;
     // print page
     virtual void printPage( sal_Int32 nPage, Printer* pPrinter ) = 0;
 
-    virtual String  GetTitle();
-    String          CreateQualifiedName();
+    virtual String	GetTitle();
+    String 			CreateQualifiedName();
     virtual BasicEntryDescriptor CreateEntryDescriptor() = 0;
 
-    virtual BOOL    IsModified();
+    virtual BOOL	IsModified();
     virtual BOOL    IsPasteAllowed();
 
-    virtual BOOL    AllowUndo();
+    virtual BOOL 	AllowUndo();
 
-    virtual void    SetReadOnly( BOOL bReadOnly );
+    virtual void	SetReadOnly( BOOL bReadOnly );
     virtual BOOL    IsReadOnly();
 
-    BYTE            GetStatus()             { return nStatus; }
-    void            SetStatus( BYTE n )     { nStatus = n; }
-    void            AddStatus( BYTE n )     { nStatus = nStatus | n; }
-    void            ClearStatus( BYTE n )   { nStatus = nStatus & ~n; }
+    BYTE			GetStatus()				{ return nStatus; }
+    void			SetStatus( BYTE n )		{ nStatus = n; }
+    void			AddStatus( BYTE n )		{ nStatus = nStatus | n; }
+    void			ClearStatus( BYTE n )	{ nStatus = nStatus & ~n; }
 
-    virtual Window* GetLayoutWindow();
+    virtual Window*	GetLayoutWindow();
 
-    virtual SfxUndoManager* GetUndoManager();
+    virtual SfxUndoManager*	GetUndoManager();
 
-    virtual USHORT  GetSearchOptions();
+    virtual USHORT	GetSearchOptions();
 
-    virtual void    BasicStarted();
-    virtual void    BasicStopped();
+    virtual void	BasicStarted();
+    virtual void	BasicStopped();
 
-    BOOL            IsSuspended() const
+    BOOL			IsSuspended() const
                         { return ( nStatus & BASWIN_SUSPENDED ) ? TRUE : FALSE; }
 
     const ScriptDocument&
                     GetDocument() const { return m_aDocument; }
-    void            SetDocument( const ScriptDocument& rDocument ) { m_aDocument = rDocument; }
+    void			SetDocument( const ScriptDocument& rDocument ) { m_aDocument = rDocument; }
     bool            IsDocument( const ScriptDocument& rDocument ) const { return rDocument == m_aDocument; }
-    const String&   GetLibName() const { return m_aLibName; }
-    void            SetLibName( const String& aLibName ) { m_aLibName = aLibName; }
-    const String&   GetName() const { return m_aName; }
-    void            SetName( const String& aName ) { m_aName = aName; }
+    const String&	GetLibName() const { return m_aLibName; }
+    void			SetLibName( const String& aLibName ) { m_aLibName = aLibName; }
+    const String&	GetName() const { return m_aName; }
+    void			SetName( const String& aName ) { m_aName = aName; }
 };
 
 class LibInfoKey
@@ -275,7 +275,7 @@ private:
     ScriptDocument      m_aDocument;
     String              m_aLibName;
     String              m_aCurrentName;
-    USHORT              m_nCurrentType;
+    USHORT              m_nCurrentType; 
 
 public:
     LibInfoItem( const ScriptDocument& rDocument, const String& rLibName, const String& rCurrentName, USHORT nCurrentType );
@@ -319,14 +319,14 @@ public:
 };
 
 void            CutLines( ::rtl::OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, BOOL bEraseTrailingEmptyLines = FALSE );
-String          CreateMgrAndLibStr( const String& rMgrName, const String& rLibName );
-ULONG           CalcLineCount( SvStream& rStream );
+String			CreateMgrAndLibStr( const String& rMgrName, const String& rLibName );
+ULONG			CalcLineCount( SvStream& rStream );
 
 BOOL            QueryReplaceMacro( const String& rName, Window* pParent = 0 );
-BOOL            QueryDelMacro( const String& rName, Window* pParent = 0 );
-BOOL            QueryDelDialog( const String& rName, Window* pParent = 0 );
-BOOL            QueryDelModule( const String& rName, Window* pParent = 0 );
-BOOL            QueryDelLib( const String& rName, BOOL bRef = FALSE, Window* pParent = 0 );
+BOOL			QueryDelMacro( const String& rName, Window* pParent = 0 );
+BOOL			QueryDelDialog( const String& rName, Window* pParent = 0 );
+BOOL			QueryDelModule( const String& rName, Window* pParent = 0 );
+BOOL			QueryDelLib( const String& rName, BOOL bRef = FALSE, Window* pParent = 0 );
 BOOL            QueryPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >& xLibContainer, const String& rLibName, String& rPassword, BOOL bRepeat = FALSE, BOOL bNewTitle = FALSE );
 
 class ModuleInfoHelper
@@ -338,6 +338,6 @@ public:
     static void getObjectName( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rLib, const String& rModName, String& rObjName );
     static sal_Int32 getModuleType(  const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rLib, const String& rModName );
 };
-#endif  // _BASTYPES_HXX
+#endif	// _BASTYPES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx
index 67cff8dc7232..e4afea26798a 100644
--- a/basctl/source/inc/dlged.hxx
+++ b/basctl/source/inc/dlged.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <tools/link.hxx>
-#include <tools/gen.hxx>
+#include <tools/gen.hxx> 
 #include <vcl/timer.hxx>
 #include <svl/hint.hxx>
 #include <svl/brdcst.hxx>
@@ -62,8 +62,8 @@ class DlgEdObj;
 class DlgEdHint: public SfxHint
 {
 private:
-    DlgEdHintKind   eHintKind;
-    DlgEdObj*       pDlgEdObj;
+    DlgEdHintKind	eHintKind;
+    DlgEdObj*		pDlgEdObj;
 
 public:
     TYPEINFO();
@@ -71,8 +71,8 @@ public:
     DlgEdHint( DlgEdHintKind eHint, DlgEdObj* pObj );
     virtual ~DlgEdHint();
 
-    DlgEdHintKind   GetKind() const { return eHintKind; }
-    DlgEdObj*       GetObject() const { return pDlgEdObj; }
+    DlgEdHintKind	GetKind() const	{ return eHintKind; }
+    DlgEdObj*		GetObject() const { return pDlgEdObj; }
 };
 
 
@@ -104,32 +104,32 @@ private:
     void Print( Printer* pPrinter, const String& rTitle );
 
 protected:
-    ScrollBar*          pHScroll;
-    ScrollBar*          pVScroll;
-    DlgEdModel*         pDlgEdModel;
-    DlgEdPage*          pDlgEdPage;
-    DlgEdView*          pDlgEdView;
-    DlgEdForm*          pDlgEdForm;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >     m_xUnoControlDialogModel;
+    ScrollBar*			pHScroll;
+    ScrollBar*			pVScroll;
+    DlgEdModel*			pDlgEdModel;
+    DlgEdPage*			pDlgEdPage;
+    DlgEdView*			pDlgEdView;
+    DlgEdForm*			pDlgEdForm;
+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >		m_xUnoControlDialogModel;
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >        m_xControlContainer;
-    ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor >       m_ClipboardDataFlavors;
-    ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor >       m_ClipboardDataFlavorsResource;
+    ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor >		m_ClipboardDataFlavors;
+    ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor >		m_ClipboardDataFlavorsResource;
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >  m_xSupplier;
-    DlgEdFactory*       pObjFac;
-    Window*             pWindow;
-    DlgEdFunc*          pFunc;
-    DlgEdMode           eMode;
-    USHORT              eActObj;
-    BOOL                bFirstDraw;
-    Size                aGridSize;
-    BOOL                bGridVisible;
-    BOOL                bGridSnap;
-    BOOL                bCreateOK;
-    Timer               aPaintTimer;
-    Rectangle           aPaintRect;
-    BOOL                bDialogModelChanged;
+    DlgEdFactory*		pObjFac;
+    Window*				pWindow;
+    DlgEdFunc*			pFunc;
+    DlgEdMode			eMode;
+    USHORT				eActObj;
+    BOOL				bFirstDraw;
+    Size				aGridSize;
+    BOOL				bGridVisible;
+    BOOL				bGridSnap;
+    BOOL				bCreateOK;
+    Timer				aPaintTimer;
+    Rectangle			aPaintRect;
+    BOOL				bDialogModelChanged;
     Timer               aMarkTimer;
-    long                mnPaintGuard;
+    long				mnPaintGuard;
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xDocument;
 
     DlgEditor(); // not implemented
@@ -137,8 +137,8 @@ public:
     DlgEditor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel );
     ~DlgEditor();
 
-    void            SetWindow( Window* pWindow );
-    Window*         GetWindow() const { return pWindow; }
+    void			SetWindow( Window* pWindow );
+    Window*			GetWindow() const { return pWindow; }
 
     /** returns the control container associated with our window
         @see GetWindow
@@ -147,59 +147,59 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >
                     GetWindowControlContainer();
 
-    void            SetDlgEdForm( DlgEdForm* pForm ) { pDlgEdForm = pForm; }
-    DlgEdForm*      GetDlgEdForm() const { return pDlgEdForm; }
+    void			SetDlgEdForm( DlgEdForm* pForm ) { pDlgEdForm = pForm; }
+    DlgEdForm*		GetDlgEdForm() const { return pDlgEdForm; }
 
-    void            SetScrollBars( ScrollBar* pHScroll, ScrollBar* pVScroll );
+    void			SetScrollBars( ScrollBar* pHScroll, ScrollBar* pVScroll );
     void            InitScrollBars();
-    ScrollBar*      GetHScroll() const { return pHScroll; }
-    ScrollBar*      GetVScroll() const { return pVScroll; }
-    void            DoScroll( ScrollBar* pActScroll );
-    void            UpdateScrollBars();
+    ScrollBar* 		GetHScroll() const { return pHScroll; }
+    ScrollBar*		GetVScroll() const { return pVScroll; }
+    void			DoScroll( ScrollBar* pActScroll );
+    void			UpdateScrollBars();
 
-    void            SetDialog( ::com::sun::star::uno::Reference<
+    void			SetDialog( ::com::sun::star::uno::Reference< 
                         ::com::sun::star::container::XNameContainer > xUnoControlDialogModel );
-    void            ResetDialog( void );
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > GetDialog() const
+    void			ResetDialog( void );
+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >	GetDialog() const 
                         {return m_xUnoControlDialogModel;}
 
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > const & GetNumberFormatsSupplier();
 
-    DlgEdModel*     GetModel()      const { return pDlgEdModel; }
-    DlgEdView*      GetView()       const { return pDlgEdView; }
-    DlgEdPage*      GetPage()       const { return pDlgEdPage; }
+    DlgEdModel*		GetModel() 		const { return pDlgEdModel; }
+    DlgEdView*		GetView() 	 	const { return pDlgEdView; }
+    DlgEdPage*		GetPage()		const { return pDlgEdPage; }
 
-    void            ShowDialog();
+    void			ShowDialog();
 
-    BOOL            UnmarkDialog();
-    BOOL            RemarkDialog();
+    BOOL			UnmarkDialog();
+    BOOL			RemarkDialog();
 
-    void            SetDialogModelChanged( BOOL bChanged = TRUE ) { bDialogModelChanged = bChanged; }
-    BOOL            IsDialogModelChanged() const { return bDialogModelChanged; }
+    void			SetDialogModelChanged( BOOL bChanged = TRUE ) { bDialogModelChanged = bChanged; }
+    BOOL			IsDialogModelChanged() const { return bDialogModelChanged; }
 
-    BOOL            IsModified() const;
-    void            ClearModifyFlag();
+    BOOL			IsModified() const;
+    void			ClearModifyFlag();
 
-    void            MouseButtonDown( const MouseEvent& rMEvt );
-    void            MouseButtonUp( const MouseEvent& rMEvt );
-    void            MouseMove( const MouseEvent& rMEvt );
-    void            Paint( const Rectangle& rRect );
-    BOOL            KeyInput( const KeyEvent& rKEvt );
+    void			MouseButtonDown( const MouseEvent& rMEvt );
+    void			MouseButtonUp( const MouseEvent& rMEvt );
+    void			MouseMove( const MouseEvent& rMEvt );
+    void			Paint( const Rectangle& rRect );
+    BOOL			KeyInput( const KeyEvent& rKEvt );
 
-    void            SetMode( DlgEdMode eMode );
-    void            SetInsertObj( USHORT eObj );
-    USHORT          GetInsertObj() const;
-    void            CreateDefaultObject();
-    DlgEdMode       GetMode() const { return eMode; }
-    BOOL            IsCreateOK() const { return bCreateOK; }
+    void 			SetMode( DlgEdMode eMode );
+    void			SetInsertObj( USHORT eObj );
+    USHORT    		GetInsertObj() const;
+    void			CreateDefaultObject();
+    DlgEdMode   	GetMode() const { return eMode; }
+    BOOL			IsCreateOK() const { return bCreateOK; }
 
-    void            Cut();
-    void            Copy();
-    void            Paste();
-    void            Delete();
+    void			Cut();
+    void			Copy();
+    void			Paste();
+    void			Delete();
     BOOL            IsPasteAllowed();
 
-    void            ShowProperties();
+    void			ShowProperties();
     void            UpdatePropertyBrowserDelayed();
 
     sal_Int32       countPages( Printer* pPrinter );
@@ -207,7 +207,7 @@ public:
 
     bool            AdjustPageSize();
 
-    bool            isInPaint() const { return mnPaintGuard > 0; }
+    bool			isInPaint() const { return mnPaintGuard > 0; }
 };
 
 #endif //_BASCTL_DLGED_HXX
diff --git a/basctl/source/inc/dlgedclip.hxx b/basctl/source/inc/dlgedclip.hxx
index 605b6ee87e34..24b2f93d4d3b 100644
--- a/basctl/source/inc/dlgedclip.hxx
+++ b/basctl/source/inc/dlgedclip.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ private:
 protected:
     virtual sal_Bool compareDataFlavors( const ::com::sun::star::datatransfer::DataFlavor& lFlavor, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
 
-public:
+public:	
     DlgEdTransferableImpl( const ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor >& aSeqFlavors, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aSeqData );
     virtual ~DlgEdTransferableImpl();
-
+    
     // XTransferable
-    virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL	getTransferData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() throw(::com::sun::star::uno::RuntimeException);
     virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) throw(::com::sun::star::uno::RuntimeException);
 
diff --git a/basctl/source/inc/dlgeddef.hxx b/basctl/source/inc/dlgeddef.hxx
index ae7926b9fb20..c207d363d940 100644
--- a/basctl/source/inc/dlgeddef.hxx
+++ b/basctl/source/inc/dlgeddef.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/basctl/source/inc/dlgedfac.hxx b/basctl/source/inc/dlgedfac.hxx
index 0b3debc5dbc2..742d171db58e 100644
--- a/basctl/source/inc/dlgedfac.hxx
+++ b/basctl/source/inc/dlgedfac.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/basctl/source/inc/dlgedfunc.hxx b/basctl/source/inc/dlgedfunc.hxx
index 740485c801c8..d5915663b174 100644
--- a/basctl/source/inc/dlgedfunc.hxx
+++ b/basctl/source/inc/dlgedfunc.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class DlgEdFunc /* : public LinkHdl */
 {
 protected:
     DlgEditor* pParent;
-    Timer        aScrollTimer;
+    Timer		 aScrollTimer;
 
     DECL_LINK( ScrollTimeout, Timer * );
-    void    ForceScroll( const Point& rPos );
+    void	ForceScroll( const Point& rPos );
 
 public:
     DlgEdFunc( DlgEditor* pParent );
@@ -81,7 +81,7 @@ public:
 class DlgEdFuncSelect : public DlgEdFunc
 {
 protected:
-    BOOL    bMarkAction;
+    BOOL	bMarkAction;
 
 public:
     DlgEdFuncSelect( DlgEditor* pParent );
diff --git a/basctl/source/inc/dlgedlist.hxx b/basctl/source/inc/dlgedlist.hxx
index 39b9473abba4..ced0cfdc1368 100644
--- a/basctl/source/inc/dlgedlist.hxx
+++ b/basctl/source/inc/dlgedlist.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ typedef ::cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertyChangeListene
 class DlgEdPropListenerImpl: public PropertyChangeListenerHelper
 {
 private:
-    DlgEdObj*       pDlgEdObj;
+    DlgEdObj*		pDlgEdObj;
 
 public:
     DlgEdPropListenerImpl(DlgEdObj* pObj);
@@ -67,7 +67,7 @@ typedef ::cppu::WeakImplHelper1< ::com::sun::star::container::XContainerListener
 class DlgEdEvtContListenerImpl: public ContainerListenerHelper
 {
 private:
-    DlgEdObj*       pDlgEdObj;
+    DlgEdObj*		pDlgEdObj;
 
 public:
     DlgEdEvtContListenerImpl(DlgEdObj* pObj);
diff --git a/basctl/source/inc/dlgedmod.hxx b/basctl/source/inc/dlgedmod.hxx
index f4abcaad49c3..e010e07b0a0e 100644
--- a/basctl/source/inc/dlgedmod.hxx
+++ b/basctl/source/inc/dlgedmod.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx
index ab8dbf3fa10e..bb85f7a55780 100644
--- a/basctl/source/inc/dlgedobj.hxx
+++ b/basctl/source/inc/dlgedobj.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,14 +57,14 @@ class DlgEdObj: public SdrUnoObj
     friend class DlgEdForm;
 
 private:
-    sal_Bool        bIsListening;
-    DlgEdForm*      pDlgEdForm;
+    sal_Bool		bIsListening;
+    DlgEdForm*		pDlgEdForm;
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener> m_xPropertyChangeListener;
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener>  m_xContainerListener;
 
 protected:
     DlgEdObj();
-    DlgEdObj(const ::rtl::OUString& rModelName,
+    DlgEdObj(const ::rtl::OUString& rModelName, 
              const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSFac);
 
     virtual void NbcMove( const Size& rSize );
@@ -77,19 +77,19 @@ protected:
     void StartListening();
     using SfxListener::EndListening;
     void EndListening(sal_Bool bRemoveListener = sal_True);
-    sal_Bool    isListening() const { return bIsListening; }
+    sal_Bool	isListening() const { return bIsListening; }
 
-    virtual bool TransformSdrToControlCoordinates(
-        sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn,
+    virtual bool TransformSdrToControlCoordinates( 
+        sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn, 
         sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut );
-    virtual bool TransformSdrToFormCoordinates(
-        sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn,
+    virtual bool TransformSdrToFormCoordinates( 
+        sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn, 
         sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut );
-    virtual bool TransformControlToSdrCoordinates(
-        sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn,
+    virtual bool TransformControlToSdrCoordinates( 
+        sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn, 
         sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut );
-    virtual bool TransformFormToSdrCoordinates(
-        sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn,
+    virtual bool TransformFormToSdrCoordinates( 
+        sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn, 
         sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut );
 
 public:
@@ -97,26 +97,26 @@ public:
 
     virtual ~DlgEdObj();
     virtual void SetPage(SdrPage* pNewPage);
-
+    
     virtual void SetDlgEdForm( DlgEdForm* pForm ) { pDlgEdForm = pForm; }
     virtual DlgEdForm* GetDlgEdForm() const { return pDlgEdForm; }
 
     virtual sal_uInt32 GetObjInventor() const;
     virtual sal_uInt16 GetObjIdentifier() const;
 
-    virtual SdrObject*  Clone() const;                                          // not working yet
-    virtual void        operator= (const SdrObject& rObj);                      // not working yet
-    virtual void clonedFrom(const DlgEdObj* _pSource);                          // not working yet
+    virtual SdrObject*	Clone() const;											// not working yet
+    virtual void		operator= (const SdrObject& rObj);						// not working yet
+    virtual void clonedFrom(const DlgEdObj* _pSource);							// not working yet
 
     // FullDrag support
     virtual SdrObject* getFullDragClone() const;
 
-    virtual sal_Bool        supportsService( const sal_Char* _pServiceName ) const;
-    virtual ::rtl::OUString GetDefaultName() const;
-    virtual ::rtl::OUString GetUniqueName() const;
+    virtual	sal_Bool		supportsService( const sal_Char* _pServiceName ) const;
+    virtual ::rtl::OUString	GetDefaultName() const;
+    virtual ::rtl::OUString	GetUniqueName() const;
 
-    virtual sal_Int32   GetStep() const;
-    virtual void        UpdateStep();
+    virtual sal_Int32	GetStep() const;
+    virtual	void		UpdateStep();
 
     virtual void SetDefaults();
     virtual void SetRectFromProps();
@@ -154,7 +154,7 @@ private:
     ::std::vector<DlgEdObj*> pChilds;
 
     mutable ::boost::optional< ::com::sun::star::awt::DeviceInfo >   mpDeviceInfo;
-
+    
 
 protected:
     DlgEdForm();
@@ -175,7 +175,7 @@ public:
     virtual void RemoveChild( DlgEdObj* pDlgEdObj );
     virtual ::std::vector<DlgEdObj*> GetChilds() const { return pChilds; }
 
-    virtual void UpdateStep();
+    virtual	void UpdateStep();
 
     virtual void SetRectFromProps();
     virtual void SetPropsFromRect();
diff --git a/basctl/source/inc/dlgedpage.hxx b/basctl/source/inc/dlgedpage.hxx
index ed8682c3339b..ab321ef1b120 100644
--- a/basctl/source/inc/dlgedpage.hxx
+++ b/basctl/source/inc/dlgedpage.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 DlgEdForm;
 class DlgEdPage : public SdrPage
 {
 private:
-    DlgEdForm*      pDlgEdForm;
+    DlgEdForm*		pDlgEdForm;
 
 public:
     TYPEINFO();
@@ -53,8 +53,8 @@ public:
     using SdrPage::Clone;
     virtual SdrPage* Clone() const;
 
-    void            SetDlgEdForm( DlgEdForm* pForm ) { pDlgEdForm = pForm; }
-    DlgEdForm*      GetDlgEdForm() const { return pDlgEdForm; }
+    void			SetDlgEdForm( DlgEdForm* pForm ) { pDlgEdForm = pForm; }
+    DlgEdForm*		GetDlgEdForm() const { return pDlgEdForm; }
 
     virtual SdrObject* SetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum);
 };
diff --git a/basctl/source/inc/dlgedview.hxx b/basctl/source/inc/dlgedview.hxx
index 08da25932227..5fedf6d4be05 100644
--- a/basctl/source/inc/dlgedview.hxx
+++ b/basctl/source/inc/dlgedview.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/basctl/source/inc/dlgresid.hrc b/basctl/source/inc/dlgresid.hrc
index 3499cd5ed7c6..64e9893c9d58 100644
--- a/basctl/source/inc/dlgresid.hrc
+++ b/basctl/source/inc/dlgresid.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,48 +28,48 @@
 #ifndef _BASCTL_DLGRESID_HRC
 #define _BASCTL_DLGRESID_HRC
 
-// include     -----------------------------------------------------------
+// include	   -----------------------------------------------------------
 
 #include <svl/solar.hrc>
 
 // Dialog Control Id's -----------------------------------------------------------
 
-#define RID_STR_CLASS_CONTROL               ( RID_DLG_START +   0 )
-#define RID_STR_CLASS_DIALOG                ( RID_DLG_START +   1 )
-#define RID_STR_CLASS_BUTTON                ( RID_DLG_START +   2 )
-#define RID_STR_CLASS_RADIOBUTTON           ( RID_DLG_START +   3 )
-#define RID_STR_CLASS_CHECKBOX              ( RID_DLG_START +   4 )
-#define RID_STR_CLASS_LISTBOX               ( RID_DLG_START +   5 )
-#define RID_STR_CLASS_COMBOBOX              ( RID_DLG_START +   6 )
-#define RID_STR_CLASS_GROUPBOX              ( RID_DLG_START +   7 )
-#define RID_STR_CLASS_EDIT                  ( RID_DLG_START +   8 )
-#define RID_STR_CLASS_FIXEDTEXT             ( RID_DLG_START +   9 )
-#define RID_STR_CLASS_IMAGECONTROL          ( RID_DLG_START +  10 )
-#define RID_STR_CLASS_PROGRESSBAR           ( RID_DLG_START +  11 )
-#define RID_STR_CLASS_SCROLLBAR             ( RID_DLG_START +  12 )
-#define RID_STR_CLASS_FIXEDLINE             ( RID_DLG_START +  13 )
-#define RID_STR_CLASS_DATEFIELD             ( RID_DLG_START +  14 )
-#define RID_STR_CLASS_TIMEFIELD             ( RID_DLG_START +  15 )
-#define RID_STR_CLASS_NUMERICFIELD          ( RID_DLG_START +  16 )
-#define RID_STR_CLASS_CURRENCYFIELD         ( RID_DLG_START +  17 )
-#define RID_STR_CLASS_FORMATTEDFIELD        ( RID_DLG_START +  18 )
-#define RID_STR_CLASS_PATTERNFIELD          ( RID_DLG_START +  19 )
-#define RID_STR_CLASS_FILECONTROL           ( RID_DLG_START +  20 )
-#define RID_STR_TRANSLATION_NOTLOCALIZED    ( RID_DLG_START +  21 )
-#define RID_STR_TRANSLATION_DEFAULT         ( RID_DLG_START +  22 )
-#define RID_STR_CLASS_TREECONTROL           ( RID_DLG_START +  23 )
+#define RID_STR_CLASS_CONTROL				( RID_DLG_START +   0 )
+#define RID_STR_CLASS_DIALOG				( RID_DLG_START +   1 )
+#define RID_STR_CLASS_BUTTON				( RID_DLG_START +   2 )
+#define RID_STR_CLASS_RADIOBUTTON			( RID_DLG_START +   3 )
+#define RID_STR_CLASS_CHECKBOX				( RID_DLG_START +   4 )
+#define RID_STR_CLASS_LISTBOX				( RID_DLG_START +   5 )
+#define RID_STR_CLASS_COMBOBOX				( RID_DLG_START +   6 )
+#define RID_STR_CLASS_GROUPBOX				( RID_DLG_START +   7 )
+#define RID_STR_CLASS_EDIT					( RID_DLG_START +   8 )
+#define RID_STR_CLASS_FIXEDTEXT				( RID_DLG_START +   9 )
+#define RID_STR_CLASS_IMAGECONTROL			( RID_DLG_START +  10 )
+#define RID_STR_CLASS_PROGRESSBAR			( RID_DLG_START +  11 )
+#define RID_STR_CLASS_SCROLLBAR				( RID_DLG_START +  12 )
+#define RID_STR_CLASS_FIXEDLINE				( RID_DLG_START +  13 )
+#define RID_STR_CLASS_DATEFIELD				( RID_DLG_START +  14 )
+#define RID_STR_CLASS_TIMEFIELD				( RID_DLG_START +  15 )
+#define RID_STR_CLASS_NUMERICFIELD			( RID_DLG_START +  16 )
+#define RID_STR_CLASS_CURRENCYFIELD			( RID_DLG_START +  17 )
+#define RID_STR_CLASS_FORMATTEDFIELD		( RID_DLG_START +  18 )
+#define RID_STR_CLASS_PATTERNFIELD			( RID_DLG_START +  19 )
+#define RID_STR_CLASS_FILECONTROL			( RID_DLG_START +  20 )
+#define RID_STR_TRANSLATION_NOTLOCALIZED	( RID_DLG_START +  21 )
+#define RID_STR_TRANSLATION_DEFAULT			( RID_DLG_START +  22 )
+#define RID_STR_CLASS_TREECONTROL			( RID_DLG_START +  23 )
 // Property Browser Headline Id's -----------------------------------------------------------
 
-#define RID_STR_BRWTITLE_PROPERTIES         ( RID_DLG_START +  60 )
-#define RID_STR_BRWTITLE_NO_PROPERTIES      ( RID_DLG_START +  61 )
-#define RID_STR_BRWTITLE_MULTISELECT        ( RID_DLG_START +  62 )
+#define RID_STR_BRWTITLE_PROPERTIES			( RID_DLG_START +  60 )
+#define RID_STR_BRWTITLE_NO_PROPERTIES		( RID_DLG_START +  61 )
+#define RID_STR_BRWTITLE_MULTISELECT		( RID_DLG_START +  62 )
 
 // Manage Language Dialogs
 
-#define RID_DLG_MANAGE_LANGUAGE             ( RID_DLG_START +  70 )
-#define RID_QRYBOX_LANGUAGE                 ( RID_DLG_START +  71 )
-#define RID_DLG_SETDEF_LANGUAGE             ( RID_DLG_START +  72 )
-#define RID_DLG_ADD_LANGUAGE                ( RID_DLG_START +  73 )
+#define RID_DLG_MANAGE_LANGUAGE				( RID_DLG_START +  70 )
+#define RID_QRYBOX_LANGUAGE					( RID_DLG_START +  71 )
+#define RID_DLG_SETDEF_LANGUAGE				( RID_DLG_START +  72 )
+#define RID_DLG_ADD_LANGUAGE				( RID_DLG_START +  73 )
 
 // -----------------------------------------------------------------------
 
diff --git a/basctl/source/inc/doceventnotifier.hxx b/basctl/source/inc/doceventnotifier.hxx
index bad9f29c515b..b991a12245ce 100644
--- a/basctl/source/inc/doceventnotifier.hxx
+++ b/basctl/source/inc/doceventnotifier.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/basctl/source/inc/docsignature.hxx b/basctl/source/inc/docsignature.hxx
index 941b76026041..3b8d01c169c4 100644
--- a/basctl/source/inc/docsignature.hxx
+++ b/basctl/source/inc/docsignature.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/basctl/source/inc/iderid.hxx b/basctl/source/inc/iderid.hxx
index f8560ad45d00..03324e9f2624 100644
--- a/basctl/source/inc/iderid.hxx
+++ b/basctl/source/inc/iderid.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/basctl/source/inc/localizationmgr.hxx b/basctl/source/inc/localizationmgr.hxx
index 7a61eeb132dc..e3e3f3e7196b 100644
--- a/basctl/source/inc/localizationmgr.hxx
+++ b/basctl/source/inc/localizationmgr.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class DlgEditor;
 class LocalizationMgr
 {
     ::com::sun::star::uno::Reference
-        < ::com::sun::star::resource::XStringResourceManager >  m_xStringResourceManager;
+        < ::com::sun::star::resource::XStringResourceManager >	m_xStringResourceManager;
 
-    BasicIDEShell*                                              m_pIDEShell;
+    BasicIDEShell*												m_pIDEShell;
 
     ScriptDocument                                              m_aDocument;
-    String                                                      m_aLibName;
+    String														m_aLibName;
 
-    ::com::sun::star::lang::Locale                              m_aLocaleBeforeBasicStart;
+    ::com::sun::star::lang::Locale								m_aLocaleBeforeBasicStart;
 
     enum HandleResourceMode
     {
@@ -141,7 +141,7 @@ public:
 
     static void copyResourceForDroppedDialog(
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > xDialogModel,
-        const ::rtl::OUString& aDialogName,
+        const ::rtl::OUString& aDialogName, 
         ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager > xStringResourceManager,
         ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceResolver > xSourceStringResolver );
 
diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx
index ef030b4bcdf1..a10a5600840a 100644
--- a/basctl/source/inc/managelang.hxx
+++ b/basctl/source/inc/managelang.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 LocalizationMgr;
 
 struct LanguageEntry
 {
-    String                          m_sLanguage;
-    ::com::sun::star::lang::Locale  m_aLocale;
-    bool                            m_bIsDefault;
+    String							m_sLanguage;
+    ::com::sun::star::lang::Locale	m_aLocale;
+    bool							m_bIsDefault;
 
     LanguageEntry( const String& _rLanguage,
                    const ::com::sun::star::lang::Locale& _rLocale,
@@ -58,32 +58,32 @@ extern bool localesAreEqual( const ::com::sun::star::lang::Locale& rLocaleLeft,
 class ManageLanguageDialog : public ModalDialog
 {
 private:
-    FixedText           m_aLanguageFT;
-    ListBox             m_aLanguageLB;
-    PushButton          m_aAddPB;
-    PushButton          m_aDeletePB;
-    PushButton          m_aMakeDefPB;
-    FixedText           m_aInfoFT;
+    FixedText       	m_aLanguageFT;
+    ListBox         	m_aLanguageLB;
+    PushButton     		m_aAddPB;
+    PushButton      	m_aDeletePB;
+    PushButton      	m_aMakeDefPB;
+    FixedText       	m_aInfoFT;
 
-    FixedLine           m_aBtnLine;
-    HelpButton          m_aHelpBtn;
-    OKButton            m_aCloseBtn;
+    FixedLine			m_aBtnLine;
+    HelpButton      	m_aHelpBtn;
+    OKButton      		m_aCloseBtn;
 
     LocalizationMgr*    m_pLocalizationMgr;
 
-    String              m_sDefLangStr;
-    String              m_sDeleteStr;
-    String              m_sCreateLangStr;
+    String				m_sDefLangStr;
+    String				m_sDeleteStr;
+    String				m_sCreateLangStr;
 
-    void                Init();
+    void				Init();
     void                CalcInfoSize();
-    void                FillLanguageBox();
-    void                ClearLanguageBox();
+    void				FillLanguageBox();
+    void				ClearLanguageBox();
 
-    DECL_LINK(          AddHdl, Button * );
-    DECL_LINK(          DeleteHdl, Button * );
-    DECL_LINK(          MakeDefHdl, Button * );
-    DECL_LINK(          SelectHdl, ListBox * );
+    DECL_LINK( 			AddHdl, Button * );
+    DECL_LINK( 			DeleteHdl, Button * );
+    DECL_LINK( 			MakeDefHdl, Button * );
+    DECL_LINK( 			SelectHdl, ListBox * );
 
 public:
     ManageLanguageDialog( Window* pParent, LocalizationMgr* _pLMgr );
@@ -98,22 +98,22 @@ private:
     SvxCheckListBox*    m_pCheckLangLB;
     FixedText           m_aInfoFT;
 
-    FixedLine           m_aBtnLine;
+    FixedLine		    m_aBtnLine;
     OKButton            m_aOKBtn;
-    CancelButton        m_aCancelBtn;
+    CancelButton   	    m_aCancelBtn;
     HelpButton          m_aHelpBtn;
 
-    bool                m_bIsDefaultMode;
+    bool				m_bIsDefaultMode;
     LocalizationMgr*    m_pLocalizationMgr;
 
-    void                FillLanguageBox();
+    void			    FillLanguageBox();
     void                CalcInfoSize();
 
 public:
     SetDefaultLanguageDialog( Window* pParent, LocalizationMgr* _pLMgr );
     ~SetDefaultLanguageDialog();
 
-    ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale >   GetLocales() const;
+    ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale >	GetLocales() const;
 };
 
 #endif //_BASCTL_MANAGELANG_HXX
diff --git a/basctl/source/inc/propbrw.hxx b/basctl/source/inc/propbrw.hxx
index 9e0e1e334b0f..9d869abe0c3c 100644
--- a/basctl/source/inc/propbrw.hxx
+++ b/basctl/source/inc/propbrw.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class SdrView;
 class PropBrw : public SfxFloatingWindow , public SfxListener, public SfxBroadcaster
 {
 private:
-    sal_Bool        m_bInitialStateChange;
+    sal_Bool		m_bInitialStateChange;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
                     m_xORB;
@@ -75,7 +75,7 @@ private:
                     m_xContextDocument;
 
 protected:
-    SdrView*        pView;
+    SdrView*		pView;
     virtual void Resize();
     virtual void FillInfo( SfxChildWinInfo& rInfo ) const;
     virtual sal_Bool Close();
@@ -105,7 +105,7 @@ public:
     // note: changing the Context document to an instance other than the one given in the ctor is not supported
     // currently
     void    Update( const SfxViewShell* _pShell );
-    SdrView*        GetCurView() const { return pView; }
+    SdrView*		GetCurView() const { return pView; }
 
 private:
     void    ImplUpdate( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxContextDocument, SdrView* pView );
diff --git a/basctl/source/inc/sbxitem.hxx b/basctl/source/inc/sbxitem.hxx
index a3b0c907caf8..2578e1d2ce7f 100644
--- a/basctl/source/inc/sbxitem.hxx
+++ b/basctl/source/inc/sbxitem.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,21 +31,21 @@
 #include "scriptdocument.hxx"
 #include <svl/poolitem.hxx>
 
-const USHORT BASICIDE_TYPE_UNKNOWN  =   0;
-const USHORT BASICIDE_TYPE_SHELL    =   1;
-const USHORT BASICIDE_TYPE_LIBRARY  =   2;
-const USHORT BASICIDE_TYPE_MODULE   =   3;
-const USHORT BASICIDE_TYPE_DIALOG   =   4;
-const USHORT BASICIDE_TYPE_METHOD   =   5;
+const USHORT BASICIDE_TYPE_UNKNOWN	=	0;
+const USHORT BASICIDE_TYPE_SHELL	=	1;
+const USHORT BASICIDE_TYPE_LIBRARY	=	2;
+const USHORT BASICIDE_TYPE_MODULE	=	3;
+const USHORT BASICIDE_TYPE_DIALOG	=	4;
+const USHORT BASICIDE_TYPE_METHOD	=	5;
 
 
 class SbxItem : public SfxPoolItem
 {
     ScriptDocument          m_aDocument;
-    String                  m_aLibName;
-    String                  m_aName;
-    String                  m_aMethodName;
-    USHORT                  m_nType;
+    String					m_aLibName;
+    String					m_aName;
+    String					m_aMethodName;
+    USHORT					m_nType; 
 
 public:
     TYPEINFO();
@@ -53,24 +53,24 @@ public:
     SbxItem( USHORT nWhich, const ScriptDocument& rDocument, const String& aLibName, const String& aName, const String& aMethodName, USHORT nType );
     SbxItem( const SbxItem& );
 
-    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual int             operator==( const SfxPoolItem& ) const;
+    virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
+    virtual int				operator==( const SfxPoolItem& ) const;
 
     const ScriptDocument&
                             GetDocument() const { return m_aDocument; }
-    void                    SetDocument( const ScriptDocument& rDocument ) { m_aDocument = rDocument; }
+    void					SetDocument( const ScriptDocument& rDocument ) { m_aDocument = rDocument; }
 
-    const String&           GetLibName() const { return m_aLibName; }
-    void                    SetLibName( const String& aLibName ) { m_aLibName = aLibName; }
+    const String&			GetLibName() const { return m_aLibName; }
+    void					SetLibName( const String& aLibName ) { m_aLibName = aLibName; }
 
-    const String&           GetName() const { return m_aName; }
-    void                    SetName( const String& aName ) { m_aName = aName; }
+    const String&			GetName() const { return m_aName; }
+    void					SetName( const String& aName ) { m_aName = aName; }
 
-    const String&           GetMethodName() const { return m_aMethodName; }
-    void                    SetMethodName( const String& aMethodName ) { m_aMethodName = aMethodName; }
+    const String&			GetMethodName() const { return m_aMethodName; }
+    void					SetMethodName( const String& aMethodName ) { m_aMethodName = aMethodName; }
 
-    USHORT                  GetType() const { return m_nType; }
-    void                    SetType( USHORT nType ) { m_nType = nType; }
+    USHORT					GetType() const { return m_nType; }
+    void					SetType( USHORT nType ) { m_nType = nType; }
 };
 
 
diff --git a/basctl/source/inc/scriptdocument.hxx b/basctl/source/inc/scriptdocument.hxx
index 5791971a57d8..f5ea8a0602e1 100644
--- a/basctl/source/inc/scriptdocument.hxx
+++ b/basctl/source/inc/scriptdocument.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/basctl/source/inc/svheader.hxx b/basctl/source/inc/svheader.hxx
index 152495d9ee8d..6cd1ebf66d88 100644
--- a/basctl/source/inc/svheader.hxx
+++ b/basctl/source/inc/svheader.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/basctl/uiconfig/basicide/toolbar/standardbar.xml b/basctl/uiconfig/basicide/toolbar/standardbar.xml
index 3e685264b75b..44a35f862733 100644
--- a/basctl/uiconfig/basicide/toolbar/standardbar.xml
+++ b/basctl/uiconfig/basicide/toolbar/standardbar.xml
@@ -14,7 +14,7 @@
  <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:helpid="helpid:5712"  />
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:Undo" toolbar:helpid="helpid:5701"  />
- <toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:helpid="helpid:5700"  />
+ <toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:helpid="helpid:5700"  /> 
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ObjectCatalog" toolbar:helpid="helpid:30774"  />
  <toolbar:toolbaritem xlink:href=".uno:ChooseMacro" toolbar:helpid="helpid:30770"  />
diff --git a/basctl/util/basctl.xml b/basctl/util/basctl.xml
index 62971a9033c8..ab9a324e315f 100644
--- a/basctl/util/basctl.xml
+++ b/basctl/util/basctl.xml
@@ -19,5 +19,5 @@
         <language>c++</language>
         <status value="beta"/>
         <supported-service>com.sun.star.drawing.AccessibleShape</supported-service>
-    </component-description>
+    </component-description>    
 </module-description>
diff --git a/basctl/util/hidother.hrc b/basctl/util/hidother.hrc
index 68bb57a274b3..209e5fe97ce3 100644
--- a/basctl/util/hidother.hrc
+++ b/basctl/util/hidother.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/basctl/util/hidother.src b/basctl/util/hidother.src
index ce2607b3296d..bf8e64f2d108 100644
--- a/basctl/util/hidother.src
+++ b/basctl/util/hidother.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR 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.
  *
  ************************************************************************/
-#include "../inc/helpid.hrc"            // HID_XXX
+#include "../inc/helpid.hrc"			// HID_XXX
 
-hidspecial HID_BASICIDE_PROP_BROWSER_LBOX   { HelpID = HID_BASICIDE_PROP_BROWSER_LBOX; };
-hidspecial HID_BASICIDE_PROP_BROWSER        { HelpID = HID_BASICIDE_PROP_BROWSER; };
-hidspecial HID_BASICIDE_OBJCAT_SHOW         { HelpID = HID_BASICIDE_OBJCAT_SHOW; };
-hidspecial HID_BASICIDE_OBJCAT_PROPS        { HelpID = HID_BASICIDE_OBJCAT_PROPS; };
-hidspecial HID_BASICIDE_OBJCAT_HELP         { HelpID = HID_BASICIDE_OBJCAT_HELP; };
-hidspecial HID_BASICIDE_MODULWINDOW         { HelpID = HID_BASICIDE_MODULWINDOW; };
-hidspecial HID_BASICIDE_DIALOGWINDOW        { HelpID = HID_BASICIDE_DIALOGWINDOW; };
-hidspecial HID_BASICIDE_EDITORWINDOW        { HelpID = HID_BASICIDE_EDITORWINDOW; };
-hidspecial HID_BASICIDE_BREAKPOINTWINDOW    { HelpID = HID_BASICIDE_BREAKPOINTWINDOW; };
-hidspecial HID_BASICIDE_WATCHWINDOW         { HelpID = HID_BASICIDE_WATCHWINDOW; };
-hidspecial HID_BASICIDE_STACKWINDOW         { HelpID = HID_BASICIDE_STACKWINDOW; };
-hidspecial HID_BASICIDE_TABBAR              { HelpID = HID_BASICIDE_TABBAR; };
-hidspecial HID_BASICIDE_WATCHWINDOW_LIST    { HelpID = HID_BASICIDE_WATCHWINDOW_LIST; };
-hidspecial HID_BASICIDE_STACKWINDOW_LIST    { HelpID = HID_BASICIDE_STACKWINDOW_LIST; };
-hidspecial HID_BASICIDE_ADDNEW_LANGUAGE     { HelpID = HID_BASICIDE_ADDNEW_LANGUAGE; };
+hidspecial HID_BASICIDE_PROP_BROWSER_LBOX	{ HelpID = HID_BASICIDE_PROP_BROWSER_LBOX; };
+hidspecial HID_BASICIDE_PROP_BROWSER		{ HelpID = HID_BASICIDE_PROP_BROWSER; };
+hidspecial HID_BASICIDE_OBJCAT_SHOW			{ HelpID = HID_BASICIDE_OBJCAT_SHOW; };
+hidspecial HID_BASICIDE_OBJCAT_PROPS		{ HelpID = HID_BASICIDE_OBJCAT_PROPS; };
+hidspecial HID_BASICIDE_OBJCAT_HELP			{ HelpID = HID_BASICIDE_OBJCAT_HELP; };
+hidspecial HID_BASICIDE_MODULWINDOW			{ HelpID = HID_BASICIDE_MODULWINDOW; };
+hidspecial HID_BASICIDE_DIALOGWINDOW		{ HelpID = HID_BASICIDE_DIALOGWINDOW; };
+hidspecial HID_BASICIDE_EDITORWINDOW		{ HelpID = HID_BASICIDE_EDITORWINDOW; };
+hidspecial HID_BASICIDE_BREAKPOINTWINDOW	{ HelpID = HID_BASICIDE_BREAKPOINTWINDOW; };
+hidspecial HID_BASICIDE_WATCHWINDOW			{ HelpID = HID_BASICIDE_WATCHWINDOW; };
+hidspecial HID_BASICIDE_STACKWINDOW			{ HelpID = HID_BASICIDE_STACKWINDOW; };
+hidspecial HID_BASICIDE_TABBAR				{ HelpID = HID_BASICIDE_TABBAR; };
+hidspecial HID_BASICIDE_WATCHWINDOW_LIST	{ HelpID = HID_BASICIDE_WATCHWINDOW_LIST; };
+hidspecial HID_BASICIDE_STACKWINDOW_LIST	{ HelpID = HID_BASICIDE_STACKWINDOW_LIST; };
+hidspecial HID_BASICIDE_ADDNEW_LANGUAGE		{ HelpID = HID_BASICIDE_ADDNEW_LANGUAGE; };
 
diff --git a/bean/com/sun/star/beans/ContainerFactory.java b/bean/com/sun/star/beans/ContainerFactory.java
index 493ea1cbc338..8d42c67ad946 100644
--- a/bean/com/sun/star/beans/ContainerFactory.java
+++ b/bean/com/sun/star/beans/ContainerFactory.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,7 +30,7 @@ package com.sun.star.beans;
 import java.awt.Container;
 
 /**
- * This interface reprecents an AWT container factory.
+ * This interface reprecents an AWT container factory. 
  *
  * @see OfficeBean
  * @deprecated
diff --git a/bean/com/sun/star/beans/JavaWindowPeerFake.java b/bean/com/sun/star/beans/JavaWindowPeerFake.java
index c89978c894c5..54ca0c1d8910 100644
--- a/bean/com/sun/star/beans/JavaWindowPeerFake.java
+++ b/bean/com/sun/star/beans/JavaWindowPeerFake.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 @@ import com.sun.star.awt.*;
     /** <p>Implementation of XSystemDependentWindowPeer (that's all we really need)</p>
      *  This method is called back from the OpenOffice.org toolkit to retrieve the system data.
      */
-    public Object getWindowHandle(/*IN*/byte[] ProcessId, /*IN*/short SystemType)
+    public Object getWindowHandle(/*IN*/byte[] ProcessId, /*IN*/short SystemType) 
         throws com.sun.star.uno.RuntimeException
     {
 
@@ -61,7 +61,7 @@ import com.sun.star.awt.*;
         }
         else return null;
     }
-
+    
     /** not really neaded.
      */
     public XToolkit getToolkit()
diff --git a/bean/com/sun/star/beans/LocalOfficeConnection.java b/bean/com/sun/star/beans/LocalOfficeConnection.java
index 11283066cc34..cb2d61f0fbea 100644
--- a/bean/com/sun/star/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/beans/LocalOfficeConnection.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
@@ -48,36 +48,36 @@ import com.sun.star.lib.util.NativeLibraryLoader;
 public class LocalOfficeConnection
     implements OfficeConnection
 {
-    public static final String      OFFICE_APP_NAME     = "soffice";
-    public static final String      OFFICE_LIB_NAME     = "officebean";
-    public static final String      OFFICE_ID_SUFFIX    = "_Office";
-
-    private Process             mProcess;
-    private ContainerFactory        mContainerFactory;
-    private XComponentContext       mContext;
-
-    private String              mURL;
-    private String              mProgramPath;
-    private String              mConnType;
-    private String              mPipe;
-    private String              mPort;
-    private String              mProtocol;
-    private String              mInitialObject;
-
-    private List                mComponents     = new Vector();
-
+    public static final String		OFFICE_APP_NAME		= "soffice";
+    public static final String		OFFICE_LIB_NAME		= "officebean";
+    public static final String		OFFICE_ID_SUFFIX	= "_Office";
+    
+    private Process				mProcess;
+    private ContainerFactory		mContainerFactory;
+    private XComponentContext		mContext;
+
+    private String				mURL;
+    private String				mProgramPath;
+    private String				mConnType;
+    private String				mPipe;
+    private String				mPort;
+    private String				mProtocol;
+    private String				mInitialObject;
+
+    private List				mComponents		= new Vector();
+        
     /**
      * Constructor.
-     * Sets up paths to the office application and native libraries if
-     * values are available in <code>OFFICE_PROP_FILE</code> in the user
+     * Sets up paths to the office application and native libraries if 
+     * values are available in <code>OFFICE_PROP_FILE</code> in the user 
      * home directory.<br />
-     * "com.sun.star.beans.path" - the office application directory;<br/>
+     * "com.sun.star.beans.path" - the office application directory;<br/> 
      * "com.sun.star.beans.libpath" - native libraries directory.
      */
     public LocalOfficeConnection()
-    {
+    {	
         // init member vars
-        try
+        try 
         {
             setUnoUrl( "uno:pipe,name=" + getPipeName() + ";urp;StarOffice.ServiceManager" );
         }
@@ -92,7 +92,7 @@ public class LocalOfficeConnection
 
     /**
      * Sets a connection URL.
-     * This implementation accepts a UNO URL with following format:<br />
+     * This implementation accepts a UNO URL with following format:<br /> 
      * <pre>
      * url    := uno:localoffice[,&lt;params&gt;];urp;StarOffice.ServiceManager
      * params := &lt;path&gt;[,&lt;pipe&gt;]
@@ -107,7 +107,7 @@ public class LocalOfficeConnection
     public void setUnoUrl(String url)
         throws java.net.MalformedURLException
     {
-        mURL    = null;
+        mURL	= null;
 
         String prefix = "uno:localoffice";
         if ( url.startsWith(prefix) )
@@ -130,25 +130,25 @@ public class LocalOfficeConnection
                     "Invalid UNO connection URL.");
             }
         }
-        mURL    = url;
+        mURL	= url;
     }
 
     /**
      * Sets an AWT container catory.
      *
-     * @param containerFactory This is a application provided AWT container
-     *  factory.
+     * @param containerFactory This is a application provided AWT container 
+     *	factory.
      */
     public void setContainerFactory(ContainerFactory containerFactory)
     {
-        mContainerFactory   = containerFactory;
+        mContainerFactory	= containerFactory;
     }
 
     /**
      * Retrives the UNO component context.
-     * Establishes a connection if necessary and initialises the
+     * Establishes a connection if necessary and initialises the  
      * UNO service manager if it has not already been initialised.
-     * This method can return <code>null</code> if it fails to connect
+     * This method can return <code>null</code> if it fails to connect 
      * to the office application.
      *
      * @return The office UNO component context.
@@ -162,8 +162,8 @@ public class LocalOfficeConnection
 
     /**
      * Creates an office window.
-     * The window is either a sub-class of java.awt.Canvas (local) or
-     * java.awt.Container (RVP).
+     * The window is either a sub-class of java.awt.Canvas (local) or 
+     * java.awt.Container (RVP). 
      *
      * @param container This is an AWT container.
      * @return The office window instance.
@@ -201,7 +201,7 @@ public class LocalOfficeConnection
     }
 
     /**
-     * Removes an event listener from the listener list.
+     * Removes an event listener from the listener list. 
      *
      * @param listener is a listener object.
      */
@@ -215,15 +215,15 @@ public class LocalOfficeConnection
      */
     private XComponentContext connect()
     {
-        try
+        try 
         {
             // create default local component context
             XComponentContext xLocalContext =
                 com.sun.star.comp.helper.Bootstrap.createInitialComponentContext(null);
-
+            
             // initial serviceManager
             XMultiComponentFactory xLocalServiceManager = xLocalContext.getServiceManager();
-
+                
             // create a urlresolver
             Object urlResolver  = xLocalServiceManager.createInstanceWithContext(
                 "com.sun.star.bridge.UnoUrlResolver", xLocalContext );
@@ -234,7 +234,7 @@ public class LocalOfficeConnection
 
             // try to connect to soffice
             Object aInitialObject = null;
-            try
+            try 
             {
                 aInitialObject = xUrlResolver.resolve( mURL );
             }
@@ -243,12 +243,12 @@ public class LocalOfficeConnection
                 // launch soffice
                 OfficeService aSOffice = new OfficeService();
                 aSOffice.startupService();
-
+        
                 // wait until soffice is started
                 long nMaxMillis = System.currentTimeMillis() + 1000*aSOffice.getStartupTime();
                 while ( aInitialObject == null )
                 {
-                    try
+                    try 
                     {
                         // try to connect to soffice
                         Thread.currentThread().sleep( 500 );
@@ -263,16 +263,16 @@ public class LocalOfficeConnection
                     }
                 }
             }
-            finally
-            {
+            finally 
+            { 
             }
-
+            
             // XComponentContext
             if( null != aInitialObject )
             {
                 XPropertySet xPropertySet = (XPropertySet)
                     UnoRuntime.queryInterface( XPropertySet.class, aInitialObject);
-                        Object xContext = xPropertySet.getPropertyValue("DefaultContext");
+                        Object xContext = xPropertySet.getPropertyValue("DefaultContext");            
                         XComponentContext xComponentContext = (XComponentContext) UnoRuntime.queryInterface(
                     XComponentContext.class, xContext);
                 return xComponentContext;
@@ -320,14 +320,14 @@ public class LocalOfficeConnection
      */
     private String getProgramPath()
     {
-        if (mProgramPath == null)
+        if (mProgramPath == null) 
         {
             // determine name of executable soffice
             String aExec = OFFICE_APP_NAME; // default for UNIX
             String aOS = System.getProperty("os.name");
 
             // running on Windows?
-            if (aOS.startsWith("Windows"))
+            if (aOS.startsWith("Windows")) 
                 aExec = OFFICE_APP_NAME + ".exe";
 
             // add other non-UNIX operating systems here
@@ -349,7 +349,7 @@ public class LocalOfficeConnection
 
     /**
      * Parses a connection URL.
-     * This method accepts a UNO URL with following format:<br />
+     * This method accepts a UNO URL with following format:<br /> 
      * <pre>
      * url    := uno:localoffice[,&lt;params&gt;];urp;StarOffice.NamingService
      * params := &lt;path&gt;[,&lt;pipe&gt;]
@@ -361,64 +361,64 @@ public class LocalOfficeConnection
      *
      * <h4>Examples</h4>
      * <ul>
-     *  <li>"uno:localoffice,pipe=xyz_Office,path=/opt/openoffice11/program;urp;StarOffice.ServiceManager";
-     *  <li>"uno:socket,host=localhost,port=8100;urp;StarOffice.ServiceManager";
+     * 	<li>"uno:localoffice,pipe=xyz_Office,path=/opt/openoffice11/program;urp;StarOffice.ServiceManager";
+     * 	<li>"uno:socket,host=localhost,port=8100;urp;StarOffice.ServiceManager";
      * </ul>
      *
      * @param url This is UNO URL which describes the type of a connection.
-     * @exception java.net.MalformedURLException when inappropreate URL was
-     *  provided.
+     * @exception java.net.MalformedURLException when inappropreate URL was 
+     *	provided.
      */
     private void parseUnoUrlWithOfficePath(String url, String prefix)
         throws java.net.MalformedURLException
     {
         // Extruct parameters.
-        int idx = url.indexOf(";urp;StarOffice.NamingService");
+        int	idx	= url.indexOf(";urp;StarOffice.NamingService");
         if (idx < 0)
             throw new java.net.MalformedURLException(
                 "Invalid UNO connection URL.");
-        String  params  = url.substring(prefix.length(), idx + 1);
+        String	params	= url.substring(prefix.length(), idx + 1);
 
         // Parse parameters.
-        String  name    = null;
-        String  path    = null;
-        String  pipe    = null;
-        char    ch;
-        int     state   = 0;
-        StringBuffer    buffer  = new StringBuffer();
+        String	name	= null;
+        String	path	= null;
+        String	pipe	= null;
+        char	ch;
+        int		state	= 0;
+        StringBuffer	buffer	= new StringBuffer();
         for(idx = 0; idx < params.length(); idx += 1) {
-            ch  = params.charAt(idx);
+            ch	= params.charAt(idx);
             switch (state) {
-            case 0: // initial state
+            case 0:	// initial state
                 switch(ch) {
                 case ',':
                     buffer.delete(0, buffer.length());
-                    state   = 1;
+                    state	= 1;
                     break;
 
                 case ';':
-                    state   = 7;
+                    state	= 7;
                     break;
 
                 default:
                     buffer.delete(0, buffer.length());
                     buffer.append(ch);
-                    state   = 1;
+                    state	= 1;
                     break;
                 }
                 break;
 
-            case 1: // parameter name
+            case 1:	// parameter name
                 switch(ch) {
                 case ' ':
                 case '=':
-                    name    = buffer.toString();
-                    state   = (ch == ' ')? 2: 3;
+                    name	= buffer.toString();
+                    state	= (ch == ' ')? 2: 3;
                     break;
 
                 case ',':
                 case ';':
-                    state   = -6;           // error: invalid name
+                    state	= -6;			// error: invalid name
                     break;
 
                 default:
@@ -427,22 +427,22 @@ public class LocalOfficeConnection
                 }
                 break;
 
-            case 2: // equal between the name and the value
+            case 2:	// equal between the name and the value
                 switch(ch) {
                 case '=':
-                    state   = 3;
+                    state	= 3;
                     break;
 
                 case ' ':
                     break;
 
                 default:
-                    state   = -1;           // error: missing '='
+                    state	= -1;			// error: missing '='
                     break;
                 }
                 break;
 
-            case 3: // value leading spaces
+            case 3:	// value leading spaces
                 switch(ch) {
                 case ' ':
                     break;
@@ -450,30 +450,30 @@ public class LocalOfficeConnection
                 default:
                     buffer.delete(0, buffer.length());
                     buffer.append(ch);
-                    state   = 4;
+                    state	= 4;
                     break;
                 }
                 break;
 
-            case 4: // value
+            case 4:	// value
                 switch(ch) {
                 case ' ':
                 case ',':
                 case ';':
-                    idx     -= 1;           // put back the last read character
-                    state   = 5;
+                    idx 	-= 1;			// put back the last read character
+                    state	= 5;
                     if (name.equals("path")) {
                         if (path == null)
-                            path    = buffer.toString();
+                            path	= buffer.toString();
                         else
-                            state   = -3;   // error: more then one 'path'
+                            state	= -3;	// error: more then one 'path'
                     } else if (name.equals("pipe")) {
                         if (pipe == null)
-                            pipe    = buffer.toString();
+                            pipe	= buffer.toString();
                         else
-                            state   = -4;   // error: more then one 'pipe'
+                            state	= -4;	// error: more then one 'pipe'
                     } else
-                        state   = -2;       // error: unknown parameter
+                        state	= -2;		// error: unknown parameter
                     buffer.delete(0, buffer.length());
                     break;
 
@@ -483,26 +483,26 @@ public class LocalOfficeConnection
                 }
                 break;
 
-            case 5: // a delimeter after the value
+            case 5:	// a delimeter after the value
                 switch(ch) {
                 case ' ':
                     break;
 
                 case ',':
-                    state   = 6;
+                    state	= 6;
                     break;
 
                 case ';':
-                    state   = 7;
+                    state	= 7;
                     break;
 
                 default:
-                    state   = -5;           // error: ' ' inside the value
+                    state	= -5;			// error: ' ' inside the value
                     break;
                 }
                 break;
 
-            case 6: // leading spaces before next parameter name
+            case 6:	// leading spaces before next parameter name
                 switch(ch) {
                 case ' ':
                     break;
@@ -510,7 +510,7 @@ public class LocalOfficeConnection
                 default:
                     buffer.delete(0, buffer.length());
                     buffer.append(ch);
-                    state   = 1;
+                    state	= 1;
                     break;
                 }
                 break;
@@ -532,7 +532,7 @@ public class LocalOfficeConnection
     }
 
     /* replaces each substring aSearch in aString by aReplace.
-
+    
         StringBuffer.replaceAll() is not avaialable in Java 1.3.x.
      */
     private static String replaceAll(String aString, String aSearch, String aReplace )
@@ -541,7 +541,7 @@ public class LocalOfficeConnection
 
         int nPos = aString.length();
         int nOfs = aSearch.length();
-
+        
         while ( ( nPos = aString.lastIndexOf( aSearch, nPos - 1 ) ) > -1 )
             aBuffer.replace( nPos, nPos+nOfs, aReplace );
 
@@ -558,8 +558,8 @@ public class LocalOfficeConnection
         aPipeName = replaceAll( aPipeName, "_", "%B7" );
         return replaceAll( replaceAll( java.net.URLEncoder.encode(aPipeName), "\\+", "%20" ), "%", "_" );
     }
-
-    /**
+    
+    /** 
      * @para This is an implementation of the native office service.
      * @deprecated
      */
@@ -572,8 +572,8 @@ public class LocalOfficeConnection
          * @return The identifier of the office service.
          */
         public String getIdentifier()
-        {
-            if ( mPipe == null)
+        { 
+            if ( mPipe == null) 
                 return getPipeName();
             else
                 return mPipe;
diff --git a/bean/com/sun/star/beans/LocalOfficeWindow.java b/bean/com/sun/star/beans/LocalOfficeWindow.java
index 7d4470415856..d6606664553b 100644
--- a/bean/com/sun/star/beans/LocalOfficeWindow.java
+++ b/bean/com/sun/star/beans/LocalOfficeWindow.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,27 +46,27 @@ import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XComponentContext;
 
 /**
- * This class represents a local office window.
+ * This class represents a local office window. 
  * @deprecated
  */
 public class LocalOfficeWindow
     extends java.awt.Canvas
     implements OfficeWindow, XEventListener
 {
-    private transient OfficeConnection  mConnection;
-    private transient XWindowPeer       mParentProxy;
-    private transient XWindowPeer       mWindow;
-    private boolean             bPeer = false;
+    private transient OfficeConnection	mConnection;
+    private transient XWindowPeer		mParentProxy;
+    private transient XWindowPeer		mWindow;
+    private boolean 			bPeer = false;
 
     /**
      * Construnctor.
      *
-     * @param connection The office connection object the window
-     *  belongs to.
+     * @param connection The office connection object the window 
+     *	belongs to.
      */
     /* package */ LocalOfficeWindow(OfficeConnection connection)
     {
-        mConnection = connection;
+        mConnection	= connection;
         mConnection.addEventListener((XEventListener)this);
     }
 
@@ -102,14 +102,14 @@ public class LocalOfficeWindow
     {
         // the window will be disposed by the framework
         mWindow = null;
-        mConnection = null;
+        mConnection	= null;
     }
 
     /**
     * Returns an AWT toolkit.
         */
        private XToolkit queryAWTToolkit()
-               throws com.sun.star.uno.Exception
+               throws com.sun.star.uno.Exception 
        {
             // Create a UNO toolkit.
             XMultiComponentFactory  compfactory;
@@ -126,7 +126,7 @@ public class LocalOfficeWindow
             else
                 return null;
        }
-
+ 
            /// called when system parent is available, reparents the bean window
     private void aquireSystemWindow()
     {
@@ -163,7 +163,7 @@ public class LocalOfficeWindow
 
        /// callback handler to get to know when we become visible
         //@deprecated
-       class ComponentEventHandler
+       class ComponentEventHandler 
                extends java.awt.event.ComponentAdapter
        {
         public void componentHidden( java.awt.event.ComponentEvent e)
@@ -194,14 +194,14 @@ public class LocalOfficeWindow
             aquireSystemWindow();
         else
             releaseSystemWindow();
-    }
-
+    }	
+     
        /** Factory method for a UNO AWT toolkit window as a child of this Java window.
     *
     */
        private XWindowPeer createUNOWindowPeer()
        {
-        try
+        try 
         {
             // get this windows native window type
                         int type = getNativeWindowSystemType();
@@ -229,9 +229,9 @@ public class LocalOfficeWindow
             desc.Parent = parentPeer;
             desc.Bounds = aRect;
             desc.WindowServiceName = "workwindow";
-            desc.WindowAttributes = (type == SystemDependent.SYSTEM_WIN32)
+            desc.WindowAttributes = (type == SystemDependent.SYSTEM_WIN32)	
                 ? WindowAttribute.SHOW : 0;
-            mWindow = queryAWTToolkit().createWindow(desc);
+            mWindow	= queryAWTToolkit().createWindow(desc);
 
             // to get notified when we become visible
             addComponentListener( new ComponentEventHandler() );
@@ -239,7 +239,7 @@ public class LocalOfficeWindow
             // set initial visibility
                         XWindow aWindow = (XWindow)UnoRuntime.queryInterface(XWindow.class, mWindow);
             aWindow.setVisible( bPeer );
-        }
+        } 
         catch (com.sun.star.uno.Exception exp) {
         }
 
diff --git a/bean/com/sun/star/beans/NativeConnection.java b/bean/com/sun/star/beans/NativeConnection.java
index 7cf2bcb581a5..786ffce4e2e2 100644
--- a/bean/com/sun/star/beans/NativeConnection.java
+++ b/bean/com/sun/star/beans/NativeConnection.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,6 +54,6 @@ import com.sun.star.connection.XConnection;
         return Description;
     }
 
-    private long    NativeHandle;
-    private String  Description;
+    private long	NativeHandle;
+    private String	Description;			
 }
diff --git a/bean/com/sun/star/beans/NativeService.java b/bean/com/sun/star/beans/NativeService.java
index ad7f73c29a0f..3a808b97839c 100644
--- a/bean/com/sun/star/beans/NativeService.java
+++ b/bean/com/sun/star/beans/NativeService.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,6 +31,6 @@ package com.sun.star.beans;
  */
 /* package */ interface NativeService {
     public String getIdentifier();
-    public void startupService() throws java.io.IOException;
+    public void	startupService() throws java.io.IOException;
     public int getStartupTime();
 }
diff --git a/bean/com/sun/star/beans/OfficeConnection.java b/bean/com/sun/star/beans/OfficeConnection.java
index 6d25015e87f1..438f42277330 100644
--- a/bean/com/sun/star/beans/OfficeConnection.java
+++ b/bean/com/sun/star/beans/OfficeConnection.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 com.sun.star.lang.XComponent;
 import com.sun.star.uno.XComponentContext;
 
 /**
- * This abstract class reprecents a connection to the office
+ * This abstract class reprecents a connection to the office 
  * application.
  * @deprecated
  */
@@ -51,14 +51,14 @@ public interface OfficeConnection
     /**
      * Sets an AWT container catory.
      *
-     * @param containerFactory This is a application provided AWT container
-     *  factory.
+     * @param containerFactory This is a application provided AWT container 
+     *	factory.
      */
     void setContainerFactory(ContainerFactory containerFactory);
 
     /**
      * Retrives the UNO component context.
-     * Establishes a connection if necessary and initialises the
+     * Establishes a connection if necessary and initialises the  
      * UNO service manager if it has not already been initialised.
      *
      * @return The office UNO component context.
@@ -67,9 +67,9 @@ public interface OfficeConnection
 
     /**
      * Creates an office window.
-     * The window is either a sub-class of java.awt.Canvas (local) or
-     * java.awt.Container (RVP).
-     *
+     * The window is either a sub-class of java.awt.Canvas (local) or 
+     * java.awt.Container (RVP). 
+     * 
      * This method does not add add the office window to its container.
      *
      * @param container This is an AWT container.
diff --git a/bean/com/sun/star/beans/OfficeWindow.java b/bean/com/sun/star/beans/OfficeWindow.java
index 0e7232bab617..f3efaedade7e 100644
--- a/bean/com/sun/star/beans/OfficeWindow.java
+++ b/bean/com/sun/star/beans/OfficeWindow.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 java.awt.Component;
 import com.sun.star.awt.XWindowPeer;
 
 /**
- * The concreate implementation of the OfficeWindow extends an
- * approperate type of visual component (java.awt.Canvas for local
+ * The concreate implementation of the OfficeWindow extends an 
+ * approperate type of visual component (java.awt.Canvas for local 
  * and java.awt.Container for remote).
  * @deprecated
  */
diff --git a/bean/com/sun/star/comp/beans/CallWatchThread.java b/bean/com/sun/star/comp/beans/CallWatchThread.java
index 1ab89337c74e..b25868d2156f 100644
--- a/bean/com/sun/star/comp/beans/CallWatchThread.java
+++ b/bean/com/sun/star/comp/beans/CallWatchThread.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/bean/com/sun/star/comp/beans/ContainerFactory.java b/bean/com/sun/star/comp/beans/ContainerFactory.java
index c7f084df5d8c..f622ee329aca 100644
--- a/bean/com/sun/star/comp/beans/ContainerFactory.java
+++ b/bean/com/sun/star/comp/beans/ContainerFactory.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,7 +30,7 @@ package com.sun.star.comp.beans;
 import java.awt.Container;
 
 /**
- * This interface reprecents an AWT container factory.
+ * This interface reprecents an AWT container factory. 
  *
  * @deprecated
  *
diff --git a/bean/com/sun/star/comp/beans/Controller.java b/bean/com/sun/star/comp/beans/Controller.java
index db99de7a5d5f..22e055630b73 100644
--- a/bean/com/sun/star/comp/beans/Controller.java
+++ b/bean/com/sun/star/comp/beans/Controller.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 Controller
     //==============================================================
     // com.sun.star.frame.XController
     //--------------------------------------------------------------
-
+    
     public void attachFrame( /*IN*/ com.sun.star.frame.XFrame xFrame )
     {
         xController.attachFrame( xFrame );
@@ -92,16 +92,16 @@ public class Controller
     //==============================================================
     // com.sun.star.frame.XDispatchProvider
     //--------------------------------------------------------------
-
-    public com.sun.star.frame.XDispatch queryDispatch(
-            /*IN*/ com.sun.star.util.URL aURL,
-            /*IN*/ String aTargetFrameName,
+    
+    public com.sun.star.frame.XDispatch queryDispatch( 
+            /*IN*/ com.sun.star.util.URL aURL, 
+            /*IN*/ String aTargetFrameName, 
             /*IN*/ int nSearchFlags )
     {
         return xDispatchProvider.queryDispatch( aURL, aTargetFrameName, nSearchFlags );
     }
 
-    public com.sun.star.frame.XDispatch[] queryDispatches(
+    public com.sun.star.frame.XDispatch[] queryDispatches( 
             /*IN*/ com.sun.star.frame.DispatchDescriptor[] aRequests )
     {
         return xDispatchProvider.queryDispatches( aRequests );
diff --git a/bean/com/sun/star/comp/beans/Frame.java b/bean/com/sun/star/comp/beans/Frame.java
index 59382eeaebb9..28f95bd80f8b 100644
--- a/bean/com/sun/star/comp/beans/Frame.java
+++ b/bean/com/sun/star/comp/beans/Frame.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,9 +33,9 @@ import com.sun.star.uno.UnoRuntime;
  *
  * @since OOo 2.0.0
  */
-public class Frame
+public class Frame 
     extends Wrapper
-    implements
+    implements 
         com.sun.star.frame.XFrame,
         com.sun.star.frame.XDispatchProvider,
         com.sun.star.frame.XDispatchProviderInterception
@@ -43,7 +43,7 @@ public class Frame
     private com.sun.star.frame.XFrame xFrame;
     private com.sun.star.frame.XDispatchProvider xDispatchProvider;
     private com.sun.star.frame.XDispatchProviderInterception xDispatchProviderInterception;
-
+    
     public Frame( com.sun.star.frame.XFrame xFrame )
     {
         super( xFrame );
@@ -59,7 +59,7 @@ public class Frame
     //==============================================================
     // com.sun.star.frame.XFrame
     //--------------------------------------------------------------
-
+    
     public void initialize( /*IN*/com.sun.star.awt.XWindow xWindow )
     {
         xFrame.initialize( xWindow );
@@ -148,16 +148,16 @@ public class Frame
     //==============================================================
     // com.sun.star.frame.XDispatchProvider
     //--------------------------------------------------------------
-
-    public com.sun.star.frame.XDispatch queryDispatch(
-            /*IN*/ com.sun.star.util.URL aURL,
-            /*IN*/ String aTargetFrameName,
+    
+    public com.sun.star.frame.XDispatch queryDispatch( 
+            /*IN*/ com.sun.star.util.URL aURL, 
+            /*IN*/ String aTargetFrameName, 
             /*IN*/ int nSearchFlags )
     {
         return xDispatchProvider.queryDispatch( aURL, aTargetFrameName, nSearchFlags );
     }
 
-    public com.sun.star.frame.XDispatch[] queryDispatches(
+    public com.sun.star.frame.XDispatch[] queryDispatches( 
             /*IN*/ com.sun.star.frame.DispatchDescriptor[] aRequests )
     {
         return xDispatchProvider.queryDispatches( aRequests );
@@ -166,14 +166,14 @@ public class Frame
     //==============================================================
     // com.sun.star.frame.XDispatchProviderInterception
     //--------------------------------------------------------------
-
-    public void registerDispatchProviderInterceptor(
+    
+    public void registerDispatchProviderInterceptor( 
             /*IN*/ com.sun.star.frame.XDispatchProviderInterceptor xInterceptor )
     {
         xDispatchProviderInterception.registerDispatchProviderInterceptor( xInterceptor );
     }
 
-    public void releaseDispatchProviderInterceptor(
+    public void releaseDispatchProviderInterceptor( 
             /*IN*/ com.sun.star.frame.XDispatchProviderInterceptor xInterceptor )
     {
         xDispatchProviderInterception.releaseDispatchProviderInterceptor( xInterceptor );
diff --git a/bean/com/sun/star/comp/beans/HasConnectionException.java b/bean/com/sun/star/comp/beans/HasConnectionException.java
index fcebebf9334f..475e4c69ce0a 100644
--- a/bean/com/sun/star/comp/beans/HasConnectionException.java
+++ b/bean/com/sun/star/comp/beans/HasConnectionException.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/bean/com/sun/star/comp/beans/InvalidArgumentException.java b/bean/com/sun/star/comp/beans/InvalidArgumentException.java
index b9e0690a86f4..03e9eea8b433 100644
--- a/bean/com/sun/star/comp/beans/InvalidArgumentException.java
+++ b/bean/com/sun/star/comp/beans/InvalidArgumentException.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/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java b/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java
index 75069385dd32..82ae588a3d4b 100644
--- a/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java
+++ b/bean/com/sun/star/comp/beans/JavaWindowPeerFake.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,21 +39,21 @@ import com.sun.star.awt.*;
 {
      protected int localSystemType;
     protected Any wrappedHandle;
-
+    
     /** Create the faked window peer.
      * @param _hWindow the system handle to the window.
      * @param _systemType specifies the system type.
      */
     public JavaWindowPeerFake(Any _hWindow, int _systemType)
     {
-        localSystemType = _systemType;
+        localSystemType = _systemType;        
         wrappedHandle = _hWindow;
     }
 
     /** <p>Implementation of XSystemDependentWindowPeer (that's all we really need)</p>
      *  This method is called back from the OpenOffice.org toolkit to retrieve the system data.
      */
-    public Object getWindowHandle(/*IN*/byte[] ProcessId, /*IN*/short SystemType)
+    public Object getWindowHandle(/*IN*/byte[] ProcessId, /*IN*/short SystemType) 
         throws com.sun.star.uno.RuntimeException
     {
         if (SystemType == localSystemType) {
@@ -61,7 +61,7 @@ import com.sun.star.awt.*;
         }
         else return null;
     }
-
+    
     /** not really neaded.
      */
     public XToolkit getToolkit()
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index 8467f1b75812..c645de536146 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.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
@@ -55,25 +55,25 @@ import com.sun.star.lib.util.NativeLibraryLoader;
 public class LocalOfficeConnection
     implements OfficeConnection
 {
-    public static final String      OFFICE_APP_NAME     = "soffice";
-    public static final String      OFFICE_LIB_NAME     = "officebean";
-    public static final String      OFFICE_ID_SUFFIX    = "_Office";
-
-    private static String           mProgramPath;
-
-    private Process             mProcess;
-    private ContainerFactory        mContainerFactory;
-    private XComponentContext       mContext;
-    private XBridge mBridge;
-
-    private String              mURL;
-    private String              mConnType;
-    private String              mPipe;
-    private String              mPort;
-    private String              mProtocol;
-    private String              mInitialObject;
-
-    private List                mComponents     = new Vector();
+    public static final String		OFFICE_APP_NAME		= "soffice";
+    public static final String		OFFICE_LIB_NAME		= "officebean";
+    public static final String		OFFICE_ID_SUFFIX	= "_Office";
+    
+    private static String			mProgramPath;
+
+    private Process				mProcess;
+    private ContainerFactory		mContainerFactory;
+    private XComponentContext		mContext;
+    private XBridge mBridge; 
+
+    private String				mURL;
+    private String				mConnType;
+    private String				mPipe;
+    private String				mPort;
+    private String				mProtocol;
+    private String				mInitialObject;
+
+    private List				mComponents		= new Vector();
 
     private static long m_nBridgeCounter = 0;
     //-------------------------------------------------------------------------
@@ -82,51 +82,51 @@ public class LocalOfficeConnection
         // preload shared libraries whichs import lips are linked to officebean
         if ( System.getProperty( "os.name" ).startsWith( "Windows" ) )
         {
-            try
+            try 
             {
                 NativeLibraryLoader.loadLibrary(LocalOfficeConnection.class.getClassLoader(), "msvcr70");
-            }
+            } 
             catch (Throwable e)
             {
                 // loading twice would fail
                 System.err.println( "cannot find msvcr70" );
-            }
+            } 
 
-            try
+            try 
             {
                 NativeLibraryLoader.loadLibrary(LocalOfficeConnection.class.getClassLoader(), "msvcr71");
-            }
+            } 
             catch (Throwable e)
             {
                 // loading twice would fail
                 System.err.println( "cannot find msvcr71" );
-            }
+            } 
 
-            try
+            try 
             {
                 NativeLibraryLoader.loadLibrary(LocalOfficeConnection.class.getClassLoader(), "uwinapi");
-            }
+            }	
             catch (Throwable e)
             {
                 // loading twice would fail
                 System.err.println( "cannot find uwinapi" );
-            }
+            } 
 
-            try
+            try 
             {
                 NativeLibraryLoader.loadLibrary(LocalOfficeConnection.class.getClassLoader(), "jawt");
-            }
+            }	
             catch (Throwable e)
             {
                 // loading twice would fail
                 System.err.println( "cannot find jawt" );
-            }
+            } 
         }
 
         // load shared library for JNI code
         NativeLibraryLoader.loadLibrary( LocalOfficeConnection.class.getClassLoader(), "officebean" );
     }
-
+        
     //-------------------------------------------------------------------------
     // debugging method
     private void dbgPrint( String aMessage )
@@ -136,16 +136,16 @@ public class LocalOfficeConnection
 
     /**
      * Constructor.
-     * Sets up paths to the office application and native libraries if
-     * values are available in <code>OFFICE_PROP_FILE</code> in the user
+     * Sets up paths to the office application and native libraries if 
+     * values are available in <code>OFFICE_PROP_FILE</code> in the user 
      * home directory.<br />
-     * "com.sun.star.beans.path" - the office application directory;<br/>
+     * "com.sun.star.beans.path" - the office application directory;<br/> 
      * "com.sun.star.beans.libpath" - native libraries directory.
      */
     public LocalOfficeConnection()
-    {
+    {	
         // init member vars
-        try
+        try 
         {
             setUnoUrl( "uno:pipe,name=" + getPipeName() + ";urp;StarOffice.ServiceManager" );
         }
@@ -155,7 +155,7 @@ public class LocalOfficeConnection
 
     /**
      * Sets a connection URL.
-     * This implementation accepts a UNO URL with following format:<br />
+     * This implementation accepts a UNO URL with following format:<br /> 
      * <pre>
      * url    := uno:localoffice[,&lt;params&gt;];urp;StarOffice.ServiceManager
      * params := &lt;path&gt;[,&lt;pipe&gt;]
@@ -170,7 +170,7 @@ public class LocalOfficeConnection
     public void setUnoUrl(String url)
         throws java.net.MalformedURLException
     {
-        mURL    = null;
+        mURL	= null;
 
         String prefix = "uno:localoffice";
         if ( url.startsWith(prefix) )
@@ -193,25 +193,25 @@ public class LocalOfficeConnection
                     "Invalid UNO connection URL.");
             }
         }
-        mURL    = url;
+        mURL	= url;
     }
 
     /**
      * Sets an AWT container catory.
      *
-     * @param containerFactory This is a application provided AWT container
-     *  factory.
+     * @param containerFactory This is a application provided AWT container 
+     *	factory.
      */
     public void setContainerFactory(ContainerFactory containerFactory)
     {
-        mContainerFactory   = containerFactory;
+        mContainerFactory	= containerFactory;
     }
 
     /**
      * Retrives the UNO component context.
-     * Establishes a connection if necessary and initialises the
+     * Establishes a connection if necessary and initialises the  
      * UNO service manager if it has not already been initialised.
-     * This method can return <code>null</code> if it fails to connect
+     * This method can return <code>null</code> if it fails to connect 
      * to the office application.
      *
      * @return The office UNO component context.
@@ -225,8 +225,8 @@ public class LocalOfficeConnection
 
     /**
      * Creates an office window.
-     * The window is either a sub-class of java.awt.Canvas (local) or
-     * java.awt.Container (RVP).
+     * The window is either a sub-class of java.awt.Canvas (local) or 
+     * java.awt.Container (RVP). 
      *
      * @param container This is an AWT container.
      * @return The office window instance.
@@ -249,9 +249,9 @@ public class LocalOfficeConnection
         }
         mComponents.clear();
 
-        //Terminate the bridge. It turned out that this is necessary for the bean
-        //to work properly when displayed in an applet within Internet Explorer.
-        //When navigating off the page which is showing  the applet and then going
+        //Terminate the bridge. It turned out that this is necessary for the bean 
+        //to work properly when displayed in an applet within Internet Explorer. 
+        //When navigating off the page which is showing  the applet and then going 
         //back to it, then the Java remote bridge is damaged. That is the Java threads
         //do not work properly anymore. Therefore when Applet.stop is called the connection
         //to the office including the bridge needs to be terminated.
@@ -259,11 +259,11 @@ public class LocalOfficeConnection
         {
             XComponent comp = (XComponent)UnoRuntime.queryInterface(
                     XComponent.class, mBridge);
-            if (comp != null)
+            if (comp != null) 
                comp.dispose();
             else
                 System.err.println("LocalOfficeConnection: could not dispose bridge!");
-
+            
             mBridge = null;
         }
 
@@ -282,7 +282,7 @@ public class LocalOfficeConnection
     }
 
     /**
-     * Removes an event listener from the listener list.
+     * Removes an event listener from the listener list. 
      *
      * @param listener is a listener object.
      */
@@ -296,18 +296,18 @@ public class LocalOfficeConnection
      */
     private XComponentContext connect()
     {
-        try
+        try 
         {
             // create default local component context
             XComponentContext xLocalContext =
                 com.sun.star.comp.helper.Bootstrap.createInitialComponentContext(null);
-
+            
             // initial serviceManager
             XMultiComponentFactory xLocalServiceManager = xLocalContext.getServiceManager();
-
+                
             // try to connect to soffice
             Object aInitialObject = null;
-            try
+            try 
             {
                 aInitialObject = resolve(xLocalContext, mURL);
             }
@@ -316,12 +316,12 @@ public class LocalOfficeConnection
                 // launch soffice
                 OfficeService aSOffice = new OfficeService();
                 aSOffice.startupService();
-
+        
                 // wait until soffice is started
                 long nMaxMillis = System.currentTimeMillis() + 1000*aSOffice.getStartupTime();
                 while ( aInitialObject == null )
                 {
-                    try
+                    try 
                     {
                         // try to connect to soffice
                         Thread.currentThread().sleep( 500 );
@@ -336,16 +336,16 @@ public class LocalOfficeConnection
                     }
                 }
             }
-            finally
-            {
+            finally 
+            { 
             }
-
+            
             // XComponentContext
             if( null != aInitialObject )
             {
                 XPropertySet xPropertySet = (XPropertySet)
                     UnoRuntime.queryInterface( XPropertySet.class, aInitialObject);
-                        Object xContext = xPropertySet.getPropertyValue("DefaultContext");
+                        Object xContext = xPropertySet.getPropertyValue("DefaultContext");            
                         XComponentContext xComponentContext = (XComponentContext) UnoRuntime.queryInterface(
                     XComponentContext.class, xContext);
                 return xComponentContext;
@@ -386,12 +386,12 @@ public class LocalOfficeConnection
         return null;
     }
 
-
+    
     //The function is copied and adapted from the UrlResolver.resolve.
-    //We cannot use the URLResolver because we need access to the bridge which has
+    //We cannot use the URLResolver because we need access to the bridge which has 
     //to be disposed when Applet.stop is called.
     private Object resolve(XComponentContext xLocalContext, String dcp)
-        throws com.sun.star.connection.NoConnectException,
+        throws com.sun.star.connection.NoConnectException, 
             com.sun.star.connection.ConnectionSetupException,
             com.sun.star.lang.IllegalArgumentException
     {
@@ -422,11 +422,11 @@ public class LocalOfficeConnection
 
         Object rootObject = null;
         XBridgeFactory xBridgeFactory= null;
-
+        
         XMultiComponentFactory xLocalServiceManager = xLocalContext.getServiceManager();
         try {
             xBridgeFactory = (XBridgeFactory)UnoRuntime.queryInterface(
-                    XBridgeFactory.class,
+                    XBridgeFactory.class, 
                     xLocalServiceManager.createInstanceWithContext(
                         "com.sun.star.bridge.BridgeFactory", xLocalContext));
         } catch (com.sun.star.uno.Exception e) {
@@ -440,13 +440,13 @@ public class LocalOfficeConnection
                             "com.sun.star.connection.Connector", xLocalContext);
                 } catch (com.sun.star.uno.Exception e) {
                     throw new com.sun.star.uno.RuntimeException(e.getMessage());
-                }
+                }               
                 XConnector connector_xConnector = (XConnector)UnoRuntime.queryInterface(XConnector.class, connector);
                 // connect to the server
                 XConnection xConnection = connector_xConnector.connect(conDcp);
                 // create the bridge name. This should not be necessary if we pass an
-                //empty string as bridge name into createBridge. Then we should always get
-                //a new bridge. This does not work because of (i51323). Therefore we
+                //empty string as bridge name into createBridge. Then we should always get 
+                //a new bridge. This does not work because of (i51323). Therefore we 
                 //create unique bridge names for the current process.
                 String sBridgeName = "OOoBean_private_bridge_" + String.valueOf(m_nBridgeCounter++);
                 try {
@@ -468,14 +468,14 @@ public class LocalOfficeConnection
      */
     static private String getProgramPath()
     {
-        if (mProgramPath == null)
+        if (mProgramPath == null) 
         {
             // determine name of executable soffice
             String aExec = OFFICE_APP_NAME; // default for UNIX
             String aOS = System.getProperty("os.name");
 
             // running on Windows?
-            if (aOS.startsWith("Windows"))
+            if (aOS.startsWith("Windows")) 
                 aExec = OFFICE_APP_NAME + ".exe";
 
             // add other non-UNIX operating systems here
@@ -484,7 +484,7 @@ public class LocalOfficeConnection
             // find soffice executable relative to this class's class loader:
             File path = NativeLibraryLoader.getResource(
                 LocalOfficeConnection.class.getClassLoader(), aExec);
-            if (path != null)
+            if (path != null) 
                 mProgramPath = path.getParent();
 
             // default is ""
@@ -496,7 +496,7 @@ public class LocalOfficeConnection
 
     /**
      * Parses a connection URL.
-     * This method accepts a UNO URL with following format:<br />
+     * This method accepts a UNO URL with following format:<br /> 
      * <pre>
      * url    := uno:localoffice[,&lt;params&gt;];urp;StarOffice.NamingService
      * params := &lt;path&gt;[,&lt;pipe&gt;]
@@ -508,64 +508,64 @@ public class LocalOfficeConnection
      *
      * <h4>Examples</h4>
      * <ul>
-     *  <li>"uno:localoffice,pipe=xyz_Office,path=/opt/openoffice11/program;urp;StarOffice.ServiceManager";
-     *  <li>"uno:socket,host=localhost,port=8100;urp;StarOffice.ServiceManager";
+     * 	<li>"uno:localoffice,pipe=xyz_Office,path=/opt/openoffice11/program;urp;StarOffice.ServiceManager";
+     * 	<li>"uno:socket,host=localhost,port=8100;urp;StarOffice.ServiceManager";
      * </ul>
      *
      * @param url This is UNO URL which describes the type of a connection.
-     * @exception java.net.MalformedURLException when inappropreate URL was
-     *  provided.
+     * @exception java.net.MalformedURLException when inappropreate URL was 
+     *	provided.
      */
     private void parseUnoUrlWithOfficePath(String url, String prefix)
         throws java.net.MalformedURLException
     {
         // Extruct parameters.
-        int idx = url.indexOf(";urp;StarOffice.NamingService");
+        int	idx	= url.indexOf(";urp;StarOffice.NamingService");
         if (idx < 0)
             throw new java.net.MalformedURLException(
                 "Invalid UNO connection URL.");
-        String  params  = url.substring(prefix.length(), idx + 1);
+        String	params	= url.substring(prefix.length(), idx + 1);
 
         // Parse parameters.
-        String  name    = null;
-        String  path    = null;
-        String  pipe    = null;
-        char    ch;
-        int     state   = 0;
-        StringBuffer    buffer  = new StringBuffer();
+        String	name	= null;
+        String	path	= null;
+        String	pipe	= null;
+        char	ch;
+        int		state	= 0;
+        StringBuffer	buffer	= new StringBuffer();
         for(idx = 0; idx < params.length(); idx += 1) {
-            ch  = params.charAt(idx);
+            ch	= params.charAt(idx);
             switch (state) {
-            case 0: // initial state
+            case 0:	// initial state
                 switch(ch) {
                 case ',':
                     buffer.delete(0, buffer.length());
-                    state   = 1;
+                    state	= 1;
                     break;
 
                 case ';':
-                    state   = 7;
+                    state	= 7;
                     break;
 
                 default:
                     buffer.delete(0, buffer.length());
                     buffer.append(ch);
-                    state   = 1;
+                    state	= 1;
                     break;
                 }
                 break;
 
-            case 1: // parameter name
+            case 1:	// parameter name
                 switch(ch) {
                 case ' ':
                 case '=':
-                    name    = buffer.toString();
-                    state   = (ch == ' ')? 2: 3;
+                    name	= buffer.toString();
+                    state	= (ch == ' ')? 2: 3;
                     break;
 
                 case ',':
                 case ';':
-                    state   = -6;           // error: invalid name
+                    state	= -6;			// error: invalid name
                     break;
 
                 default:
@@ -574,22 +574,22 @@ public class LocalOfficeConnection
                 }
                 break;
 
-            case 2: // equal between the name and the value
+            case 2:	// equal between the name and the value
                 switch(ch) {
                 case '=':
-                    state   = 3;
+                    state	= 3;
                     break;
 
                 case ' ':
                     break;
 
                 default:
-                    state   = -1;           // error: missing '='
+                    state	= -1;			// error: missing '='
                     break;
                 }
                 break;
 
-            case 3: // value leading spaces
+            case 3:	// value leading spaces
                 switch(ch) {
                 case ' ':
                     break;
@@ -597,30 +597,30 @@ public class LocalOfficeConnection
                 default:
                     buffer.delete(0, buffer.length());
                     buffer.append(ch);
-                    state   = 4;
+                    state	= 4;
                     break;
                 }
                 break;
 
-            case 4: // value
+            case 4:	// value
                 switch(ch) {
                 case ' ':
                 case ',':
                 case ';':
-                    idx     -= 1;           // put back the last read character
-                    state   = 5;
+                    idx 	-= 1;			// put back the last read character
+                    state	= 5;
                     if (name.equals("path")) {
                         if (path == null)
-                            path    = buffer.toString();
+                            path	= buffer.toString();
                         else
-                            state   = -3;   // error: more then one 'path'
+                            state	= -3;	// error: more then one 'path'
                     } else if (name.equals("pipe")) {
                         if (pipe == null)
-                            pipe    = buffer.toString();
+                            pipe	= buffer.toString();
                         else
-                            state   = -4;   // error: more then one 'pipe'
+                            state	= -4;	// error: more then one 'pipe'
                     } else
-                        state   = -2;       // error: unknown parameter
+                        state	= -2;		// error: unknown parameter
                     buffer.delete(0, buffer.length());
                     break;
 
@@ -630,26 +630,26 @@ public class LocalOfficeConnection
                 }
                 break;
 
-            case 5: // a delimeter after the value
+            case 5:	// a delimeter after the value
                 switch(ch) {
                 case ' ':
                     break;
 
                 case ',':
-                    state   = 6;
+                    state	= 6;
                     break;
 
                 case ';':
-                    state   = 7;
+                    state	= 7;
                     break;
 
                 default:
-                    state   = -5;           // error: ' ' inside the value
+                    state	= -5;			// error: ' ' inside the value
                     break;
                 }
                 break;
 
-            case 6: // leading spaces before next parameter name
+            case 6:	// leading spaces before next parameter name
                 switch(ch) {
                 case ' ':
                     break;
@@ -657,7 +657,7 @@ public class LocalOfficeConnection
                 default:
                     buffer.delete(0, buffer.length());
                     buffer.append(ch);
-                    state   = 1;
+                    state	= 1;
                     break;
                 }
                 break;
@@ -679,7 +679,7 @@ public class LocalOfficeConnection
     }
 
     /* replaces each substring aSearch in aString by aReplace.
-
+    
         StringBuffer.replaceAll() is not avaialable in Java 1.3.x.
      */
     private static String replaceAll(String aString, String aSearch, String aReplace )
@@ -688,7 +688,7 @@ public class LocalOfficeConnection
 
         int nPos = aString.length();
         int nOfs = aSearch.length();
-
+        
         while ( ( nPos = aString.lastIndexOf( aSearch, nPos - 1 ) ) > -1 )
             aBuffer.replace( nPos, nPos+nOfs, aReplace );
 
@@ -705,8 +705,8 @@ public class LocalOfficeConnection
         aPipeName = replaceAll( aPipeName, "_", "%B7" );
         return replaceAll( replaceAll( java.net.URLEncoder.encode(aPipeName), "+", "%20" ), "%", "_" );
     }
-
-    /**
+    
+    /** 
      * @para This is an implementation of the native office service.
      */
     private class OfficeService
@@ -718,8 +718,8 @@ public class LocalOfficeConnection
          * @return The identifier of the office service.
          */
         public String getIdentifier()
-        {
-            if ( mPipe == null)
+        { 
+            if ( mPipe == null) 
                 return getPipeName();
             else
                 return mPipe;
@@ -746,7 +746,7 @@ public class LocalOfficeConnection
             } catch (java.lang.SecurityException e)
             {
                 e.printStackTrace();
-            }
+            }                
            // create call with arguments
             String[] cmdArray = new String[nSizeCmdArray];
 
@@ -754,8 +754,8 @@ public class LocalOfficeConnection
             String unoPath = System.getenv("UNO_PATH");
             if (unoPath == null)
                 throw new java.io.IOException( "UNO_PATH environment variable is not set (required system path to the office program directory)" );
-
-//          cmdArray[0] = (new File(getProgramPath(), OFFICE_APP_NAME)).getPath();
+                
+//			cmdArray[0] = (new File(getProgramPath(), OFFICE_APP_NAME)).getPath();
             cmdArray[0] = (new File(unoPath, OFFICE_APP_NAME)).getPath();
             cmdArray[1] = "-nologo";
             cmdArray[2] = "-nodefault";
@@ -766,7 +766,7 @@ public class LocalOfficeConnection
                 cmdArray[3] = "-accept=socket,port=" + mPort + ";urp";
             else
                 throw new java.io.IOException( "not connection specified" );
-
+            
             if (sOption != null)
                 cmdArray[4] = sOption;
 
@@ -795,14 +795,14 @@ public class LocalOfficeConnection
     {
         java.io.InputStream m_in;
         java.io.PrintStream m_print;
-
+        
         public StreamProcessor(final java.io.InputStream in, final java.io.PrintStream out)
         {
             m_in = in;
             m_print = out;
             start();
         }
-
+        
         public void run() {
             java.io.BufferedReader r = new java.io.BufferedReader(
                 new java.io.InputStreamReader(m_in) );
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
index b7c7ccd16f41..b99f83c0c6c0 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeWindow.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,7 +49,7 @@ import com.sun.star.uno.Type;
 import com.sun.star.beans.NamedValue;
 
 /**
- * This class represents a local office window.
+ * This class represents a local office window. 
  *
  * @since OOo 2.0.0
  */
@@ -57,20 +57,20 @@ public class LocalOfficeWindow
     extends java.awt.Canvas
     implements OfficeWindow, XEventListener
 {
-    private transient OfficeConnection  mConnection;
-    private transient XWindowPeer       mParentProxy;
-    private transient XWindowPeer       mWindow;
-    private boolean             bPeer = false;
+    private transient OfficeConnection	mConnection;
+    private transient XWindowPeer		mParentProxy;
+    private transient XWindowPeer		mWindow;
+    private boolean 			bPeer = false;
 
     /**
      * Construnctor.
      *
-     * @param connection The office connection object the window
-     *  belongs to.
+     * @param connection The office connection object the window 
+     *	belongs to.
      */
     protected LocalOfficeWindow(OfficeConnection connection)
     {
-        mConnection = connection;
+        mConnection	= connection;
         mConnection.addEventListener((XEventListener)this);
     }
 
@@ -106,14 +106,14 @@ public class LocalOfficeWindow
     {
         // the window will be disposed by the framework
         mWindow = null;
-        mConnection = null;
+        mConnection	= null;
     }
 
     /**
     * Returns an AWT toolkit.
         */
        private XToolkit queryAWTToolkit()
-               throws com.sun.star.uno.Exception
+               throws com.sun.star.uno.Exception 
        {
             // Create a UNO toolkit.
             XMultiComponentFactory  compfactory;
@@ -130,7 +130,7 @@ public class LocalOfficeWindow
             else
                 return null;
        }
-
+ 
            /// called when system parent is available, reparents the bean window
     private synchronized void aquireSystemWindow()
     {
@@ -177,14 +177,14 @@ public class LocalOfficeWindow
             aquireSystemWindow();
         else
             releaseSystemWindow();
-    }
-
+    }	
+     
        /** Factory method for a UNO AWT toolkit window as a child of this Java window.
     *
     */
        private synchronized XWindowPeer createUNOWindowPeer()
        {
-        try
+        try 
         {
             // get this windows native window type
             int type = getNativeWindowSystemType();
@@ -212,15 +212,15 @@ public class LocalOfficeWindow
             desc.Parent = parentPeer;
             desc.Bounds = aRect;
             desc.WindowServiceName = "workwindow";
-            desc.WindowAttributes = (type == SystemDependent.SYSTEM_WIN32)
+            desc.WindowAttributes = (type == SystemDependent.SYSTEM_WIN32)	
                 ? WindowAttribute.SHOW : 0;
-            mWindow = queryAWTToolkit().createWindow(desc);
+            mWindow	= queryAWTToolkit().createWindow(desc);
 
 
             // set initial visibility
             XWindow aWindow = (XWindow)UnoRuntime.queryInterface(XWindow.class, mWindow);
             aWindow.setVisible( bPeer );
-        }
+        } 
         catch (com.sun.star.uno.Exception exp) {
         }
 
@@ -228,7 +228,7 @@ public class LocalOfficeWindow
     }
     /** We make sure that the office window is notified that the parent
      *  will be removed.
-     */
+     */   
     public void removeNotify()
     {
         try {
@@ -263,7 +263,7 @@ public class LocalOfficeWindow
     */
     protected Any getWrappedWindowHandle()
     {
-
+                
         NamedValue window = new NamedValue(
             "WINDOW", new Any(new Type(Long.class), new Long(getNativeWindow())));
         NamedValue xembed = new NamedValue(
diff --git a/bean/com/sun/star/comp/beans/NativeConnection.java b/bean/com/sun/star/comp/beans/NativeConnection.java
index ab8bd7b7bf01..d418d81f9d43 100644
--- a/bean/com/sun/star/comp/beans/NativeConnection.java
+++ b/bean/com/sun/star/comp/beans/NativeConnection.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
@@ -57,6 +57,6 @@ import com.sun.star.connection.XConnection;
         return Description;
     }
 
-    private long    NativeHandle;
-    private String  Description;
+    private long	NativeHandle;
+    private String	Description;			
 }
diff --git a/bean/com/sun/star/comp/beans/NativeService.java b/bean/com/sun/star/comp/beans/NativeService.java
index c28ca10a1901..b8faec55e715 100644
--- a/bean/com/sun/star/comp/beans/NativeService.java
+++ b/bean/com/sun/star/comp/beans/NativeService.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,6 +32,6 @@ package com.sun.star.comp.beans;
  */
 /* package */ interface NativeService {
     public String getIdentifier();
-    public void startupService() throws java.io.IOException;
+    public void	startupService() throws java.io.IOException;
     public int getStartupTime();
 }
diff --git a/bean/com/sun/star/comp/beans/NoConnectionException.java b/bean/com/sun/star/comp/beans/NoConnectionException.java
index a351983a7aad..c62c003d9efc 100644
--- a/bean/com/sun/star/comp/beans/NoConnectionException.java
+++ b/bean/com/sun/star/comp/beans/NoConnectionException.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,10 +27,10 @@
 
 package com.sun.star.comp.beans;
 
-/** This exception is called when a method is called which
+/**	This exception is called when a method is called which
      needs an established connection but no connection is
     established yet or anymore.
-
+ 
     @since OOo 2.0.0
  */
 public class NoConnectionException extends Exception
diff --git a/bean/com/sun/star/comp/beans/NoDocumentException.java b/bean/com/sun/star/comp/beans/NoDocumentException.java
index d9aa3b162bdd..cc73453bf8b8 100644
--- a/bean/com/sun/star/comp/beans/NoDocumentException.java
+++ b/bean/com/sun/star/comp/beans/NoDocumentException.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/bean/com/sun/star/comp/beans/OOoBean.java b/bean/com/sun/star/comp/beans/OOoBean.java
index b10becb3ce9a..8727ac8cc9e1 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.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 com.sun.star.uno.UnoRuntime;
 // @requirement FUNC.PERF.LOC/0.6
 // @requirement FUNC.PERF.FIX/0.6
 /** This is the basic JavaBean for all OOo application modules.
-
+  
     @requirement FUNC.RES.OTH/0.2
         No other resources are needed yet.
 
@@ -44,7 +44,7 @@ public class OOoBean
     // @requirement FUNC.BEAN.VIEW/0.4
     extends java.awt.Container
 
-    implements
+    implements 
         // @requirement FUNC.PER/0.2
         java.io.Externalizable
 {
@@ -54,12 +54,12 @@ public class OOoBean
     int nOOoCheckCycle =    1000;
 
     // This member contains the connection to an OOo instance if established.
-    private transient OfficeConnection      iConnection;
-    private transient EventListener         xConnectionListener;
+    private transient OfficeConnection		iConnection;
+    private transient EventListener			xConnectionListener;
 
     // @requirement FUNC.BEAN.VIEW/0.4
     // @requirement FUNC.BEAN.EDIT/0.4
-    // This member contains the OOo window
+    // This member contains the OOo window 
     // if a connection is established.
     // It is a child of the OOoBean canvas.
     private OfficeWindow xFrameWindow;
@@ -76,14 +76,14 @@ public class OOoBean
     // slot command execution environment
     private transient com.sun.star.frame.XDispatchProvider xDispatcher;
     private transient com.sun.star.util.XURLTransformer xURLTransformer;
-
+   
     // properties
     private boolean bIgnoreVisibility = false; // to show even if already visible
     private boolean bMenuBarVisible = true;
     private boolean bStandardBarVisible = true;
     private boolean bToolBarVisible = true;
     private boolean bStatusBarVisible = true;
-
+    
 
     // debugging method
     private void dbgPrint( String aMessage )
@@ -110,7 +110,7 @@ public class OOoBean
     }
 
     /** Generic constructor of the OOoBean.
-
+    
         Neither a connection is established nor any document loaded.
      */
     public OOoBean()
@@ -118,14 +118,14 @@ public class OOoBean
 
        // @requirement FUNC.CON.MULT/0.3
     /** Constructor for an OOoBean which uses a specific office connection.
-
+    
         The connection must be established but no document is loaded.
 
         @throws NoConnectionException
             if the connection is not established.
-
-        @deprecated Clients could use the getOOoConnection to obtain an OfficeConnection
-        and use it as argument in a constructor for another OOoBean instance. Calling
+        
+        @deprecated Clients could use the getOOoConnection to obtain an OfficeConnection 
+        and use it as argument in a constructor for another OOoBean instance. Calling 
         the dispose method of the OfficeConnection or the OOoBean's stopOOoConnection
         method would make all instances of OOoBean stop working.
      */
@@ -165,11 +165,11 @@ public class OOoBean
     }
 
     /** Sets the a connection to an OOo instance.
-
+    
         @internal
      */
     private synchronized void setOOoConnection( OfficeConnection iNewConnection )
-        throws  HasConnectionException, NoConnectionException
+        throws	HasConnectionException, NoConnectionException
     {
         // the connection cannot be exchanged
         if ( iConnection != null )
@@ -202,7 +202,7 @@ public class OOoBean
             if the specified connection cannot be established
      */
     public void startOOoConnection( String aConnectionURL )
-        throws  java.net.MalformedURLException,
+        throws	java.net.MalformedURLException,
             HasConnectionException,
             NoConnectionException
     {
@@ -215,9 +215,9 @@ public class OOoBean
     // @requirement FUNC.CON.CHK/0.7
     /** Returns true if this OOoBean is connected to an OOo instance,
         false otherwise.
-
-        @deprecated This method is not useful in a multithreaded environment. Then
-        all threads accessing the instance would have to be synchronized in order to
+        
+        @deprecated This method is not useful in a multithreaded environment. Then 
+        all threads accessing the instance would have to be synchronized in order to 
         make is method work. It is better
         to call OOoBean's methods and be prepared to catch a NoConnectionException.
      */
@@ -231,8 +231,8 @@ public class OOoBean
 
         If there was no connection yet or anymore, this method can be called
         anyway.
-
-        When the OOoBean is displayed in an applet by a web browser, then this
+     
+        When the OOoBean is displayed in an applet by a web browser, then this 
         method must be called from within java.applet.Applet.stop.
      */
     public synchronized void stopOOoConnection()
@@ -251,26 +251,26 @@ public class OOoBean
             iConnection = null;
             iExConnection.dispose();
         }
-
+        
     }
 
     // @requirement FUNC.CON.STOP/0.4 (via XComponent.dispose())
        // @requirement FUNC.CON.NTFY/0.4 (via XComponent.addEventListener())
     /** Returns the a connection to an OOo instance.
-
+    
         If no connection exists, a default connection will be created. An OfficeConnection
         can be used to register listeners of type com.sun.star.lang.EventListener,
         which are notified when the connection to the
         office dies. One should not call the dispose method, because this may result
-        in receiving com.sun.star.lang.DisposedExceptions when calling
+        in receiving com.sun.star.lang.DisposedExceptions when calling 
         {@link #stopOOoConnection stopOOoConnection} or other API methods. If other instances share the
         same connection then they will stop function properly, because they loose their
         connection as well. The recommended way to end the connection is
-        calling {@link #stopOOoConnection stopOOoConnection}.
+        calling {@link #stopOOoConnection stopOOoConnection}. 
 
         @throws NoConnectionException
             if no connection can be established
-
+     
      */
     public synchronized OfficeConnection getOOoConnection()
         throws NoConnectionException
@@ -285,8 +285,8 @@ public class OOoBean
             throw new NoConnectionException();
         return iConnection;
     }
-
-    /** Returns the service factory used by this OOoBean instance.
+    
+    /**	Returns the service factory used by this OOoBean instance.
 
         @throws NoConnectionException
             if no connection is established and no default connection can be established.
@@ -304,8 +304,8 @@ public class OOoBean
                 {
                     com.sun.star.lang.XMultiComponentFactory aFactory =
                         iConn.getComponentContext().getServiceManager();
-                    xServiceFactory = (com.sun.star.lang.XMultiServiceFactory)
-                        UnoRuntime.queryInterface(
+                    xServiceFactory	= (com.sun.star.lang.XMultiServiceFactory) 
+                        UnoRuntime.queryInterface( 
                             com.sun.star.lang.XMultiServiceFactory.class, aFactory );
                 }
             };
@@ -314,7 +314,7 @@ public class OOoBean
             catch ( java.lang.InterruptedException aExc )
             { throw new NoConnectionException(); }
             if ( xServiceFactory == null )
-                throw new NoConnectionException();
+                throw new NoConnectionException(); 
         }
 
         return xServiceFactory;
@@ -339,13 +339,13 @@ public class OOoBean
             catch ( com.sun.star.uno.Exception aExc )
             {} // TBD: what if no connection exists?
         }
-
+        
         return xDesktop;
     }
 
     /** Resets this bean to an empty document.
-
-       If a document is loaded and the content modified,
+      
+       If a document is loaded and the content modified, 
        the changes are dismissed.  Otherwise nothing happens.
 
        This method is intended to be overridden in derived classes.
@@ -354,17 +354,17 @@ public class OOoBean
        @param bClearStateToo
            Not only the document content but also the state of the bean,
         like visibility of child components is cleared.
-
+     
         @deprecated There is currently no way to dismiss changes, except for loading
         of the unchanged initial document. Furthermore it is unclear how derived classes
         handle this and what exactly their state is (e.g. what members make up their state).
         Calling this method on a derived class requires knowledge about their implementation.
         Therefore a deriving class should declare their own clearDocument if needed. Clients
-        should call the clearDocument of the deriving class or {@link #clear} which discards
+        should call the clearDocument of the deriving class or {@link #clear} which discards 
         the currently displayed document.
      */
     public synchronized void clearDocument( boolean bClearStateToo )
-        throws
+        throws 
             com.sun.star.util.CloseVetoException,
             NoConnectionException
     {
@@ -372,8 +372,8 @@ public class OOoBean
         clear();
     }
 
-    /** Resets the OOoBean to an empty status.
-
+    /** Resets the OOoBean to an empty status. 
+      
         Any loaded document is unloaded, no matter whether it is modified or not.
         After calling this method, the OOoBean has no office document and no frame
         anymore.  The connection will stay, though.
@@ -386,15 +386,15 @@ public class OOoBean
 
         try
         {
-            CallWatchThread aCallWatchThread =
+            CallWatchThread aCallWatchThread = 
                 new CallWatchThread( nOOoCallTimeOut, "clear" );
-            //By closing the frame we avoid that dialogs are displayed, for example when
+            //By closing the frame we avoid that dialogs are displayed, for example when 
             //the document is modified.
             com.sun.star.util.XCloseable xCloseable = (com.sun.star.util.XCloseable)
                 UnoRuntime.queryInterface( com.sun.star.util.XCloseable.class, aFrame );
             if ( xCloseable != null )
             {
-                try
+                try 
                 {
                     xCloseable.close(true);
                 }
@@ -402,7 +402,7 @@ public class OOoBean
                 { // a print job may be running
                 }
             }
-
+           
             aDocument = null;
             xDispatcher = null;
             aFrame = null;
@@ -425,7 +425,7 @@ public class OOoBean
                 try
                 {
                     com.sun.star.lang.XComponent xComp = (com.sun.star.lang.XComponent)
-                        UnoRuntime.queryInterface(
+                        UnoRuntime.queryInterface( 
                             com.sun.star.lang.XComponent.class, xURLTransformer );
                     if ( xComp != null )
                         xComp.dispose();
@@ -437,7 +437,7 @@ public class OOoBean
 
             xDesktop = null;
             xServiceFactory = null;
-
+            
             aCallWatchThread.cancel();
         }
         catch ( java.lang.InterruptedException aExc )
@@ -447,20 +447,20 @@ public class OOoBean
     // @requirement FUNC.PAR.LWP/0.4
     /** This method causes the office window to be displayed.
 
-        If no document is loaded and the instance is added to a Java container that
-        is showing, then this method needs not to be called. If later one of the methods
-        {@link #loadFromURL loadFromURL}, {@link #loadFromStream loadFromStream1},
+        If no document is loaded and the instance is added to a Java container that 
+        is showing, then this method needs not to be called. If later one of the methods 
+        {@link #loadFromURL loadFromURL}, {@link #loadFromStream loadFromStream1}, 
         or {@link #loadFromByteArray loadFromByteArray}
         is called, then the document is automatically displayed.
-
+     
         Should one of the load methods have been called before the Java container
-        was showing, then this method needs to be called after the container window
+        was showing, then this method needs to be called after the container window 
         was made visible (java.lang.Component.setVisible(true)).
         <p>
-        Another scenario is that a OOoBean contains a document and is removed
-        from a Java container and later added again. Then aquireSystemWindow needs
+        Another scenario is that a OOoBean contains a document and is removed 
+        from a Java container and later added again. Then aquireSystemWindow needs 
         to be called after the container window is displayed.
-
+     
         @throws SystemWindowException
             if no system window can be aquired.
 
@@ -468,7 +468,7 @@ public class OOoBean
             if the connection is not established.
      */
     public synchronized void aquireSystemWindow()
-        throws
+        throws 
             SystemWindowException,
 
             // @requirement FUNC.CON.LOST/0.2
@@ -483,14 +483,14 @@ public class OOoBean
             xFrameWindow.getAWTComponent().setVisible(true);
         doLayout();
     }
-
+    
     // @requirement FUNC.PAR.RWL/0.4
     // @estimation 16h
     /** This method must be called when the OOoBean before the
         sytem window may be released by it's parent AWT/Swing component.
 
-        This is the case when java.awt.Component.isDisplayable() returns
-        true.  This is definitely the case when the OOoBean is removed
+        This is the case when java.awt.Component.isDisplayable() returns 
+        true.  This is definitely the case when the OOoBean is removed 
         from it's parent container.
 
         @throws SystemWindowException
@@ -498,13 +498,13 @@ public class OOoBean
 
         @throws NoConnectionException
             if the connection is not established.
-
-        @deprecated When Component.removeNotify of the parent window of the actual
+     
+        @deprecated When Component.removeNotify of the parent window of the actual 
         office window is called, then the actions are performed for which this method
-        needed to be called previously.
+        needed to be called previously. 
      */
     public synchronized void releaseSystemWindow()
-        throws
+        throws 
             SystemWindowException,
 
             // @requirement FUNC.CON.LOST/0.2
@@ -515,14 +515,14 @@ public class OOoBean
 
         try { xFrameWindow.getAWTComponent().setVisible(false); }
         catch ( com.sun.star.lang.DisposedException aExc )
-        { throw new NoConnectionException(); }
+        { throw new NoConnectionException(); } 
     }
-
+    
        // @requirement FUNC.BEAN.LOAD/0.4
        // @requirement FUNC.CON.AUTO/0.3
     /** Loads the bean from the given URL.
-
-        If a document is already loaded and the content modified,
+      
+        If a document is already loaded and the content modified, 
         the changes are dismissed.
 
         If no connection exists, a default connection is established.
@@ -535,30 +535,30 @@ public class OOoBean
 
         @throws com.sun.star.lang.NoConnectionException
             if no connection can be established.
-
+            
         @throws com.sun.star.util.CloseVetoException
-            if the currently displayed document cannot be closed because it is
+            if the currently displayed document cannot be closed because it is 
             still be used, for example it is printed.
      */
-    public void loadFromURL(
-            final String aURL,
+    public void loadFromURL( 
+            final String aURL,  
             final com.sun.star.beans.PropertyValue aArguments[] )
-        throws
+        throws 
             // @requirement FUNC.CON.LOST/0.2
             NoConnectionException,
-            java.io.IOException,
+            java.io.IOException, 
             com.sun.star.lang.IllegalArgumentException,
             com.sun.star.util.CloseVetoException
     {
         dbgPrint( "loadFromURL()" );
          // try loading
-        try
+        try 
         {
             boolean bLoaded = false;
             while ( !bLoaded )
             {
                 // watch loading in a thread with a timeout (if OOo hangs)
-                CallWatchThread aCallWatchThread =
+                CallWatchThread aCallWatchThread = 
                     new CallWatchThread( nOOoStartTimeOut, "loadFromURL" );
 
                 try
@@ -577,29 +577,29 @@ public class OOoBean
                         add( xFrameWindow.getAWTComponent() );
                     }
 
-                    // create the document frame from UNO window.
+                    // create the document frame from UNO window. 
                     if ( aFrame == null )
                     {
                         // create the frame
-                        com.sun.star.awt.XWindow xWindow =
+                        com.sun.star.awt.XWindow xWindow = 
                             (com.sun.star.awt.XWindow) UnoRuntime.queryInterface(
                             com.sun.star.awt.XWindow.class, xFrameWindow.getUNOWindowPeer());
                         Object xFrame = xServiceFactory.createInstance( "com.sun.star.frame.Frame");
-                        aFrame = new Frame( (com.sun.star.frame.XFrame)UnoRuntime.queryInterface(
+                        aFrame = new Frame( (com.sun.star.frame.XFrame)UnoRuntime.queryInterface( 
                                 com.sun.star.frame.XFrame.class, xFrame ) );
                         aFrame.initialize( xWindow );
                         aFrame.setName( aFrame.toString() );
 
                         // register the frame at the desktop
-                        com.sun.star.frame.XFrames xFrames =
-                                ( (com.sun.star.frame.XFramesSupplier)UnoRuntime.queryInterface(
+                        com.sun.star.frame.XFrames xFrames = 
+                                ( (com.sun.star.frame.XFramesSupplier)UnoRuntime.queryInterface( 
                                 com.sun.star.frame.XFramesSupplier.class, getOOoDesktop() ) ).getFrames();
                         xFrames.append( aFrame );
                     }
 
                     // Initializes the slot command execution environment.
-                    xURLTransformer = (com.sun.star.util.XURLTransformer) UnoRuntime.queryInterface(
-                        com.sun.star.util.XURLTransformer.class,
+                    xURLTransformer	= (com.sun.star.util.XURLTransformer) UnoRuntime.queryInterface(
+                        com.sun.star.util.XURLTransformer.class, 
                         xServiceFactory.createInstance( "com.sun.star.util.URLTransformer") );
                     xDispatcher = (com.sun.star.frame.XDispatchProvider)UnoRuntime.queryInterface(
                         com.sun.star.frame.XDispatchProvider.class, aFrame );
@@ -609,8 +609,8 @@ public class OOoBean
                         UnoRuntime.queryInterface( com.sun.star.frame.XComponentLoader.class, aFrame );
                     if ( xLoader == null )
                     {
-                        throw new java.lang.RuntimeException(
-                            "com.sun.star.frame.Frame(" + aFrame +
+                        throw new java.lang.RuntimeException( 
+                            "com.sun.star.frame.Frame(" + aFrame + 
                                 ") without com.sun.star.frame.XComponentLoader" );
                     }
 
@@ -618,40 +618,40 @@ public class OOoBean
                     if ( aDocument != null )
                     {
                         try {
-                            aDocument.setModified(false);
+                            aDocument.setModified(false); 
                         } catch (com.sun.star.beans.PropertyVetoException ep) {
-                            //it dosn't make sense to throw the exception here. The interface does not
+                            //it dosn't make sense to throw the exception here. The interface does not 
                             //offer a way to add/remove respective listeners.
                         } catch (com.sun.star.lang.DisposedException ed) {
                             // can be disposed if user closed document via UI
                         }
-
+                        
                         com.sun.star.frame.XController xOldController = null;
                         if ( aFrame != null )
                             xOldController = aFrame.getController();
-
-                        try
+                        
+                        try 
                         {
 
                             if ( aFrame != null && xOldController != null )
                                 if (xOldController.suspend(true) == false)
                                     throw new com.sun.star.util.CloseVetoException(
                                             "Dokument is still being used and cannot be closed.", this);
-
-                        }
-                        catch (java.lang.IllegalStateException exp)
+                                    
+                        } 
+                        catch (java.lang.IllegalStateException exp) 
                         {}
                     }
-
+                                    
                     // load the document.
-                    com.sun.star.beans.PropertyValue aArgs[] =
-                        addArgument( aArguments, new com.sun.star.beans.PropertyValue(
-                            "MacroExecutionMode", -1,
+                    com.sun.star.beans.PropertyValue aArgs[] = 
+                        addArgument( aArguments, new com.sun.star.beans.PropertyValue( 
+                            "MacroExecutionMode", -1, 
                             new Short( com.sun.star.document.MacroExecMode.USE_CONFIG ),
                             com.sun.star.beans.PropertyState.DIRECT_VALUE ) );
                                     //String fn = aFRame.getName();
-
-                    com.sun.star.lang.XComponent xComponent = xLoader.loadComponentFromURL(
+                    
+                    com.sun.star.lang.XComponent xComponent = xLoader.loadComponentFromURL( 
                         aURL, /*aFrame.getName()*/"_self", 0, aArgs );
 
                     // nothing loaded?
@@ -669,7 +669,7 @@ public class OOoBean
                     // mDocumentURL = aURL; TBD: still needed?
 
                     // Get document's XModifiable interface if any.
-                    aDocument = new OfficeDocument(
+                    aDocument = new OfficeDocument( 
                         (com.sun.star.frame.XModel) UnoRuntime.queryInterface(
                         com.sun.star.frame.XModel.class, xComponent ) );
                     bLoaded = true;
@@ -693,9 +693,9 @@ public class OOoBean
 
                 aCallWatchThread.cancel();
                 if ( xServiceFactory == null )
-                    throw new NoConnectionException();
+                    throw new NoConnectionException(); 
             }
-            if ( iConnection == null )
+            if ( iConnection == null ) 
             {
                 throw new NoConnectionException();
             }
@@ -703,33 +703,33 @@ public class OOoBean
             applyToolVisibilities();
         }
         catch ( java.lang.InterruptedException aExc )
-        {
+        { 
             throw new NoConnectionException();
         }
     }
 
     /** Loads a document from a Java stream.
-
+      
            See loadFromURL() for further information.
      */
-    public void loadFromStream(
+    public void loadFromStream( 
             final java.io.InputStream iInStream,
             final com.sun.star.beans.PropertyValue aArguments[] )
-        throws
+        throws 
             // @requirement FUNC.CON.LOST/0.2
             NoConnectionException,
-            java.io.IOException,
+            java.io.IOException, 
             com.sun.star.lang.IllegalArgumentException,
             com.sun.star.util.CloseVetoException
     {
         // wrap Java stream into UNO stream
                 /*
-        com.sun.star.io.XInputStream xStream =
+        com.sun.star.io.XInputStream xStream = 
                 new com.sun.star.lib.uno.adapter.InputStreamToXInputStreamAdapter(
                     iInStream );
                  */
                  // copy stream....
-
+            
                  int s = 4096;
                  int r=0 ,n = 0;
                  byte[] buffer = new byte[s];
@@ -747,12 +747,12 @@ public class OOoBean
                     System.arraycopy(buffer, 0, newBuffer, 0, n);
                     buffer = newBuffer;
                 }
-                com.sun.star.io.XInputStream xStream =
+                com.sun.star.io.XInputStream xStream = 
                     new com.sun.star.lib.uno.adapter.ByteArrayToXInputStreamAdapter(buffer);
-
+        
         // add stream to arguments
-        com.sun.star.beans.PropertyValue[] aExtendedArguments =
-            addArgument( aArguments, new com.sun.star.beans.PropertyValue(
+        com.sun.star.beans.PropertyValue[] aExtendedArguments = 
+            addArgument( aArguments, new com.sun.star.beans.PropertyValue( 
                 "InputStream", -1, xStream, com.sun.star.beans.PropertyState.DIRECT_VALUE ) );
 
         // call normal load method
@@ -760,27 +760,27 @@ public class OOoBean
     }
 
     /** Loads a document from a byte array.
-
+      
            See loadFromURL() for further information.
      */
-    public void loadFromByteArray(
+    public void loadFromByteArray( 
             final byte aInBuffer[],
             final com.sun.star.beans.PropertyValue aArguments[] )
-        throws
+        throws 
             // @requirement FUNC.CON.LOST/0.2
             NoConnectionException,
-            java.io.IOException,
+            java.io.IOException, 
             com.sun.star.lang.IllegalArgumentException,
             com.sun.star.util.CloseVetoException
     {
         // wrap byte arrray into UNO stream
-        com.sun.star.io.XInputStream xStream =
+        com.sun.star.io.XInputStream xStream = 
                 new com.sun.star.lib.uno.adapter.ByteArrayToXInputStreamAdapter(
                     aInBuffer );
-
+        
         // add stream to arguments
-        com.sun.star.beans.PropertyValue[] aExtendedArguments =
-            addArgument( aArguments, new com.sun.star.beans.PropertyValue(
+        com.sun.star.beans.PropertyValue[] aExtendedArguments = 
+            addArgument( aArguments, new com.sun.star.beans.PropertyValue( 
                 "InputStream", -1, xStream, com.sun.star.beans.PropertyState.DIRECT_VALUE ) );
 
         // call normal load method
@@ -789,13 +789,13 @@ public class OOoBean
 
     /** Stores a document to the given URL.
         <p>
-        Due due a bug (50651) calling this method may cause the office to crash,
-        when at the same time the office writes a backup of the document. This bug
-        also affects {@link #storeToByteArray storeToByteArray} and
-        {@link #storeToStream storeToStream}. The workaround
+        Due due a bug (50651) calling this method may cause the office to crash, 
+        when at the same time the office writes a backup of the document. This bug 
+        also affects {@link #storeToByteArray storeToByteArray} and 
+        {@link #storeToStream storeToStream}. The workaround 
         is to start the office with the option -norestore, which disables the automatic
-        backup and recovery mechanism. OOoBean offers currently no supported way of providing
-        startup options for OOo. But it is possible to set a Java property when starting
+        backup and recovery mechanism. OOoBean offers currently no supported way of providing 
+        startup options for OOo. But it is possible to set a Java property when starting 
         Java, which is examined by OOoBean:
         <pre>
             java -Dcom.sun.star.officebean.Options=-norestore  ...
@@ -814,15 +814,15 @@ public class OOoBean
             if no connection is established.
 
         @throws NoDocumentException
-            if no document is loaded
+            if no document is loaded 
      */
-    public void storeToURL(
+    public void storeToURL( 
             final String aURL,
             final com.sun.star.beans.PropertyValue aArguments[] )
-        throws
+        throws 
             // @requirement FUNC.CON.LOST/0.2
             NoConnectionException,
-            java.io.IOException,
+            java.io.IOException, 
             com.sun.star.lang.IllegalArgumentException,
             NoDocumentException
     {
@@ -833,7 +833,7 @@ public class OOoBean
         try
         {
             // start runtime timeout
-            CallWatchThread aCallWatchThread =
+            CallWatchThread aCallWatchThread = 
                 new CallWatchThread( nOOoCallTimeOut, "storeToURL" );
 
             // store the document
@@ -849,18 +849,18 @@ public class OOoBean
     }
 
     /** Stores a document to a stream.
-
+      
            See {@link #storeToURL storeToURL} for further information.
         @see #storeToURL storeToURL
      */
-    public java.io.OutputStream storeToStream(
+    public java.io.OutputStream storeToStream( 
             java.io.OutputStream aOutStream,
             final com.sun.star.beans.PropertyValue aArguments[] )
-        throws
+        throws 
             // @requirement FUNC.CON.LOST/0.2
             NoConnectionException,
             NoDocumentException,
-            java.io.IOException,
+            java.io.IOException, 
             com.sun.star.lang.IllegalArgumentException
 
     {
@@ -868,10 +868,10 @@ public class OOoBean
         com.sun.star.lib.uno.adapter.OutputStreamToXOutputStreamAdapter aStream =
                 new com.sun.star.lib.uno.adapter.OutputStreamToXOutputStreamAdapter(
                     aOutStream );
-
+        
         // add stream to arguments
-        com.sun.star.beans.PropertyValue[] aExtendedArguments =
-            addArgument( aArguments, new com.sun.star.beans.PropertyValue(
+        com.sun.star.beans.PropertyValue[] aExtendedArguments = 
+            addArgument( aArguments, new com.sun.star.beans.PropertyValue( 
                 "OutputStream", -1, aStream, com.sun.star.beans.PropertyState.DIRECT_VALUE ) );
 
         // call normal store method
@@ -889,28 +889,28 @@ public class OOoBean
     }
 
     /** Stores a document to a byte array.
-
+      
            See {@link #storeToURL storeToURL} for further information.
         @see #storeToURL storeToURL
      */
-    public byte[] storeToByteArray(
+    public byte[] storeToByteArray( 
             byte aOutBuffer[],
             final com.sun.star.beans.PropertyValue aArguments[] )
-        throws
+        throws 
             // @requirement FUNC.CON.LOST/0.2
             NoConnectionException,
             NoDocumentException,
-            java.io.IOException,
+            java.io.IOException, 
             com.sun.star.lang.IllegalArgumentException
     {
         // wrap byte arrray into UNO stream
         com.sun.star.lib.uno.adapter.XOutputStreamToByteArrayAdapter aStream =
                 new com.sun.star.lib.uno.adapter.XOutputStreamToByteArrayAdapter(
                     aOutBuffer );
-
+        
         // add stream to arguments
-        com.sun.star.beans.PropertyValue[] aExtendedArguments =
-            addArgument( aArguments, new com.sun.star.beans.PropertyValue(
+        com.sun.star.beans.PropertyValue[] aExtendedArguments = 
+            addArgument( aArguments, new com.sun.star.beans.PropertyValue( 
                 "OutputStream", -1, aStream, com.sun.star.beans.PropertyState.DIRECT_VALUE ) );
 
         // call normal store method
@@ -929,9 +929,9 @@ public class OOoBean
 
     // @requirement FUNC.BEAN.PROG/0.5
     // @requirement API.SIM.SEAP/0.2
-    /** returns the <type scope="com::sun::star::frame">Frame</a>
+    /** returns the <type scope="com::sun::star::frame">Frame</a> 
         of the bean.
-
+     
         @returns
             a Java class which implements all interfaces which the service
         <type scope="com::sun::star::frame">Frame</a> implements.
@@ -946,12 +946,12 @@ public class OOoBean
      */
     public Frame getFrame()
 
-        throws
+        throws 
             NoConnectionException // @requirement FUNC.CON.LOST/0.2
     {
         if ( iConnection == null )
             throw new NoConnectionException();
-        return aFrame;
+        return aFrame; 
     }
 
        // @requirement FUNC.BEAN.PROG/0.5
@@ -983,12 +983,12 @@ public class OOoBean
     // @requirement FUNC.BEAN.STOR/0.4
     // @requirement FUNC.BEAN.PRNT/0.4
     // @requirement API.SIM.SEAP/0.2
-       /** returns the <type scope="com::sun::star::document::OfficeDocument">
+       /** returns the <type scope="com::sun::star::document::OfficeDocument"> 
         of the bean.
 
         @returns
             a Java class which implements all interfaces which the service
-        <type scope="com::sun::star::document">OfficeDocument</a>
+        <type scope="com::sun::star::document">OfficeDocument</a> 
         implements.
         Thus, methods can be called directly without queryInterface.
         This feature might be implemented by UNO or explicitely coded.
@@ -996,39 +996,39 @@ public class OOoBean
         @throws NoConnectionException
             if the connection is not established.
      */
-    public OfficeDocument getDocument()
+    public OfficeDocument getDocument() 
 
         // @requirement FUNC.CON.LOST/0.2
         throws NoConnectionException
     {
         if ( iConnection == null )
             throw new NoConnectionException();
-        return aDocument;
+        return aDocument; 
     }
 
-    /** Sets visibility of all tool bars known by this OOoBean version.
-
-         Initially all tool bars are visible.  By hiding all tool bars
-        utilizing this method, it is possible to turn just a subset of
-        tool bars on afterwards, no matter whether all available tool
+    /**	Sets visibility of all tool bars known by this OOoBean version.
+     
+         Initially all tool bars are visible.  By hiding all tool bars 
+        utilizing this method, it is possible to turn just a subset of 
+        tool bars on afterwards, no matter whether all available tool 
         bars are known or not.
         <p>
-        If an older OOoBean instance is used with a newer OOo instance,
+        If an older OOoBean instance is used with a newer OOo instance, 
         some tool bars might not be affected by this method.
         <p>
         If no connection is established or no document is loaded,
         the setting is memorized until a document is loaded.  Same
         is valid when the connection dies within this function call.
-
+     
         @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
         which can be obtained from a frame, to control toolbars. For example:
         <pre>
-com.sun.star.beans.XPropertySet xPropSet =
+com.sun.star.beans.XPropertySet xPropSet = 
   (com.sun.star.beans.XPropertySet) UnoRuntime.queryInterface(
     com.sun.star.beans.XPropertySet.class, aFrame );
-com.sun.star.frame.XLayoutManager xLayoutManager =
+com.sun.star.frame.XLayoutManager xLayoutManager = 
   (com.sun.star.frame.XLayoutManager) UnoRuntime.queryInterface(
-    com.sun.star.frame.XLayoutManager.class,
+    com.sun.star.frame.XLayoutManager.class, 
     xPropSet.getPropertyValue( "LayoutManager" ) );
 xLayoutManager.showElement("private:resource/menubar/menubar");
         </pre>
@@ -1044,10 +1044,10 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
     }
 
     //--------------------------------------------------------------------------
-    /** Applies all tool visiblities to the real thing.
-
+    /**	Applies all tool visiblities to the real thing.
+     
         @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
-        which can be obtained from a frame, to control toolbars. See also
+        which can be obtained from a frame, to control toolbars. See also 
         {@link #setAllBarsVisible setAllBarsVisible}.
      */
     protected void applyToolVisibilities()
@@ -1062,24 +1062,24 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
         bIgnoreVisibility = false;
     }
 
-    /** Helper method to set tool bar visibilty.
-
+    /**	Helper method to set tool bar visibilty.
+     
          @param bnewValue
             If false, the tool bar is disabled,
             If true, the tool bar is visible.
 
         @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
-        which can be obtained from a frame, to control toolbars. See also
+        which can be obtained from a frame, to control toolbars. See also 
         {@link #setAllBarsVisible}.
      */
     protected boolean setToolVisible( String aProperty, String aResourceURL,
         boolean bOldValue, boolean bNewValue )
-
+                
         throws
             java.lang.InterruptedException
     {
         // start runtime timeout
-        CallWatchThread aCallWatchThread =
+        CallWatchThread aCallWatchThread = 
             new CallWatchThread( nOOoCallTimeOut, "setToolVisible" );
 
         // Does a frame exist?
@@ -1087,14 +1087,14 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
         {
             if ( bIgnoreVisibility || bOldValue != bNewValue )
             {
-                try
+                try 
                 {
-                    com.sun.star.beans.XPropertySet xPropSet =
+                    com.sun.star.beans.XPropertySet xPropSet = 
                             (com.sun.star.beans.XPropertySet) UnoRuntime.queryInterface(
                             com.sun.star.beans.XPropertySet.class, aFrame );
-                    com.sun.star.frame.XLayoutManager xLayoutManager =
+                    com.sun.star.frame.XLayoutManager xLayoutManager = 
                             (com.sun.star.frame.XLayoutManager) UnoRuntime.queryInterface(
-                            com.sun.star.frame.XLayoutManager.class,
+                            com.sun.star.frame.XLayoutManager.class, 
                             xPropSet.getPropertyValue( "LayoutManager" ) );
                     if ( bNewValue )
                         xLayoutManager.showElement( aResourceURL );
@@ -1122,37 +1122,37 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
         return bNewValue;
     }
 
-    /** Sets the visibility of the menu bar.
-
+    /**	Sets the visibility of the menu bar.
+        
         Initially the menu bar is visible.
         <p>
-        If not connected or no document loaded, the value is stored
+        If not connected or no document loaded, the value is stored 
         and automatically applied to the document after it is loaded.
         Same is valid when the connection dies within this function call.
 
-         @param bVisible
+         @param bVisible 
             If false, the menu bar is disabled,
             If true, the menu bar is visible.
 
         @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
-        which can be obtained from a frame, to control toolbars. See also
+        which can be obtained from a frame, to control toolbars. See also 
         {@link #setAllBarsVisible}.
      */
     public void setMenuBarVisible(boolean bVisible)
     {
         try
         {
-            bMenuBarVisible = setToolVisible( "MenuBarVisible",
-                    "private:resource/menubar/menubar", bMenuBarVisible, bVisible );
+            bMenuBarVisible = setToolVisible( "MenuBarVisible", 
+                    "private:resource/menubar/menubar",	bMenuBarVisible, bVisible );    
         }
         catch ( java.lang.InterruptedException aExc )
-        {
-            bMenuBarVisible = bVisible;
+        { 
+            bMenuBarVisible = bVisible; 
         }
     }
 
       /** Returns the visibility of the menu bar.
-
+    
            This method works independently from a connetion or loaded document.
         If no connection is established or no document is loaded,
         this method just returns a memorized status.
@@ -1162,7 +1162,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
             false if the menu bar is hidden.
 
         @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
-        which can be obtained from a frame, to control toolbars. See also
+        which can be obtained from a frame, to control toolbars. See also 
         {@link #setAllBarsVisible}.
      */
     public boolean isMenuBarVisible()
@@ -1170,37 +1170,37 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
         return bMenuBarVisible;
     }
 
-    /** Sets the main function bar visibilty.
-
+    /**	Sets the main function bar visibilty.
+     
         Initially the standard bar is visible.
-
-        If not connected or no document loaded, the value is stored
+     
+        If not connected or no document loaded, the value is stored 
         and automatically applied to the document after it is loaded.
         Same is valid when the connection dies within this function call.
-
-         @param bVisible
+        
+         @param bVisible 
             If false, the main function bar is disabled,
             If true, the main function bar is visible.
-
+     
         @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
-        which can be obtained from a frame, to control toolbars. See also
-        {@link #setAllBarsVisible}.
+        which can be obtained from a frame, to control toolbars. See also 
+        {@link #setAllBarsVisible}.     
      */
     public void setStandardBarVisible(boolean bVisible)
     {
         try
         {
-            bStandardBarVisible = setToolVisible( "StandardBarVisible",
-                    "private:resource/toolbar/standardbar", bStandardBarVisible, bVisible );
+            bStandardBarVisible = setToolVisible( "StandardBarVisible", 
+                    "private:resource/toolbar/standardbar", bStandardBarVisible, bVisible );         
         }
         catch ( java.lang.InterruptedException aExc )
-        {
-            bMenuBarVisible = bVisible;
+        { 
+            bMenuBarVisible = bVisible; 
         }
     }
 
       /** Returns the visibility of the main function bar.
-
+    
            This method works independently from a connetion or loaded document.
         If no connection is established or no document is loaded,
         this method just returns a memorized status.
@@ -1210,45 +1210,45 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
             false if the main function bar is hidden.
 
         @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
-        which can be obtained from a frame, to control toolbars. See also
-        {@link #setAllBarsVisible}.
+        which can be obtained from a frame, to control toolbars. See also 
+        {@link #setAllBarsVisible}.     
     */
     public boolean isStandardBarVisible()
     {
         return bStandardBarVisible;
     }
 
-    /** Sets the tool function bar visibilty.
-
+    /**	Sets the tool function bar visibilty.
+     
         Initially the tool bar is visible.
-
-        If not connected or no document loaded, the value is stored
+     
+        If not connected or no document loaded, the value is stored 
         and automatically applied to the document after it is loaded.
         Same is valid when the connection dies within this function call.
-
-         @param bVisible
+        
+         @param bVisible 
             If false, the tool function bar is disabled,
             If true, the tool function bar is visible.
 
         @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
-        which can be obtained from a frame, to control toolbars. See also
-        {@link #setAllBarsVisible}.
+        which can be obtained from a frame, to control toolbars. See also 
+        {@link #setAllBarsVisible}.     
      */
     public void setToolBarVisible(boolean bVisible)
     {
-        try
+        try 
         {
-            bToolBarVisible = setToolVisible( "ToolBarVisible",
-                    "private:resource/toolbar/toolbar", bToolBarVisible, bVisible );
+            bToolBarVisible = setToolVisible( "ToolBarVisible", 
+                    "private:resource/toolbar/toolbar", bToolBarVisible, bVisible );            
         }
         catch ( java.lang.InterruptedException aExc )
-        {
+        { 
             bMenuBarVisible = bVisible;
         }
     }
 
       /** Returns the visibility of the tool function bar.
-
+    
            This method works independently from a connetion or loaded document.
         If no connection is established or no document is loaded,
         this method just returns a memorized status.
@@ -1258,45 +1258,45 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
             false if the tool function bar is hidden.
 
         @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
-        which can be obtained from a frame, to control toolbars. See also
-        {@link #setAllBarsVisible}.
+        which can be obtained from a frame, to control toolbars. See also 
+        {@link #setAllBarsVisible}.     
      */
     public boolean isToolBarVisible()
     {
         return bToolBarVisible;
     }
 
-    /** Sets the status function bar visibilty.
-
+    /**	Sets the status function bar visibilty.
+     
         Initially the status bar is visible.
-
-        If not connected or no document loaded, the value is stored
+     
+        If not connected or no document loaded, the value is stored 
         and automatically applied to the document after it is loaded.
         Same is valid when the connection dies within this function call.
-
-         @param bVisible
+        
+         @param bVisible 
             If false, the status function bar is disabled,
             If true, the status function bar is visible.
 
         @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
-        which can be obtained from a frame, to control toolbars. See also
-        {@link #setAllBarsVisible}.
+        which can be obtained from a frame, to control toolbars. See also 
+        {@link #setAllBarsVisible}.     
      */
     public void setStatusBarVisible(boolean bVisible)
     {
-        try
+        try 
         {
-            bStatusBarVisible = setToolVisible( "StatusBarVisible",
-                    "private:resource/statusbar/statusbar", bStatusBarVisible, bVisible );
+            bStatusBarVisible = setToolVisible( "StatusBarVisible", 
+                    "private:resource/statusbar/statusbar", bStatusBarVisible, bVisible );            
         }
         catch ( java.lang.InterruptedException aExc )
-        {
-            bMenuBarVisible = bVisible;
+        { 
+            bMenuBarVisible = bVisible; 
         }
     }
 
-      /**   Returns the visibility of the status function bar.
-
+      /**	Returns the visibility of the status function bar.
+    
            This method works independently from a connetion or loaded document.
         If no connection is established or no document is loaded,
         this method just returns a memorized status.
@@ -1306,8 +1306,8 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
             false if the status function bar is hidden.
 
         @deprecated Clients should use the service com.sun.star.frame.LayoutManager,
-        which can be obtained from a frame, to control toolbars. See also
-        {@link #setAllBarsVisible}.
+        which can be obtained from a frame, to control toolbars. See also 
+        {@link #setAllBarsVisible}.     
      */
     public boolean isStatusBarVisible()
     {
@@ -1317,14 +1317,14 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
     //===========================================================================
     // Helper Methods / Internal Methods
     //---------------------------------------------------------------------------
-
+    
     // general instance intializer
     {
         setLayout(new java.awt.BorderLayout());
     }
-
+    
     /**
-        @deprecated
+        @deprecated 
      */
     public void paint( java.awt.Graphics aGraphics )
     {
@@ -1339,7 +1339,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
         a new array is created, aArgument added and the new
         array returned.
     */
-    protected com.sun.star.beans.PropertyValue[] addArgument(
+    protected com.sun.star.beans.PropertyValue[] addArgument( 
                 com.sun.star.beans.PropertyValue aArguments[],
                 final com.sun.star.beans.PropertyValue aArgument )
     {
@@ -1362,7 +1362,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
         }
 
         // create extended arguments
-        com.sun.star.beans.PropertyValue[] aExtendedArguments =
+        com.sun.star.beans.PropertyValue[] aExtendedArguments = 
             new com.sun.star.beans.PropertyValue[ nNumArgs + 1 ];
 
         // copy current arguments
@@ -1379,19 +1379,19 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
     //===========================================================================
     // Helper Classes
     //---------------------------------------------------------------------------
-
+    
     /** Helper class to listen on the connection to learn when it dies.
-
+     
         @internal
      */
-    private class EventListener
+    private class EventListener 
         extends Thread
-        implements
+        implements 
             com.sun.star.lang.XEventListener,
             com.sun.star.frame.XTerminateListener
     {
         String aTag;
-
+        
         EventListener( String aTag )
             throws NoConnectionException
         {
@@ -1431,11 +1431,11 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
         public void disposing( /*IN*/ com.sun.star.lang.EventObject Source )
         {
             // empty the OOoBean and cut the connection
-            stopOOoConnection();
+            stopOOoConnection(); 
         }
 
         /// gets called when the user wants to terminate OOo
-           public void queryTermination( /*IN*/ com.sun.star.lang.EventObject Event )
+           public void queryTermination( /*IN*/ com.sun.star.lang.EventObject Event ) 
             throws com.sun.star.frame.TerminationVetoException
         {
             // disallow termination of OOo while a OOoBean exists
@@ -1446,32 +1446,32 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
         public void notifyTermination( /*IN*/ com.sun.star.lang.EventObject Event )
         {
             // empty the OOoBean and cut the connection
-            stopOOoConnection();
+            stopOOoConnection(); 
         }
 
-        /// watching the connection
+        /// watching the connection 
         public void run()
         {
             dbgPrint( "EventListener(" + aTag + ").run()" );
 
             // remote call might hang => watch try
-            CallWatchThread aCallWatchThread =
+            CallWatchThread aCallWatchThread = 
                 new CallWatchThread( nOOoCallTimeOut, "EventListener(" + aTag + ")" );
 
             // continue to trying to connect the OOo instance
             long n = 0;
-            while ( isInterrupted() == false
-                    && iConnection != null
+            while ( isInterrupted() == false 
+                    && iConnection != null 
                     && iConnection.getComponentContext() != null )
             {
                 dbgPrint( "EventListener(" + aTag + ").running() #" + ++n );
 
                 // still alive?
                 com.sun.star.lang.XMultiComponentFactory xServiceManager = null;
-                try
-                {
+                try 
+                { 
                     // an arbitrary (but cheap) call into OOo
-                    xServiceManager = iConnection.getComponentContext().getServiceManager();
+                    xServiceManager = iConnection.getComponentContext().getServiceManager(); 
 
                     // call successfully performed, restart watch for next loop
                     try
@@ -1492,8 +1492,8 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
                 }
 
                 // sleep
-                try {
-                        sleep(nOOoCheckCycle);
+                try { 
+                        sleep(nOOoCheckCycle); 
                 }
                 catch ( java.lang.InterruptedException aExc )
                 {
diff --git a/bean/com/sun/star/comp/beans/OfficeConnection.java b/bean/com/sun/star/comp/beans/OfficeConnection.java
index 9087b34fae47..85f480b9d621 100644
--- a/bean/com/sun/star/comp/beans/OfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/OfficeConnection.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 com.sun.star.lang.XComponent;
 import com.sun.star.uno.XComponentContext;
 
 /**
- * This abstract class reprecents a connection to the office
+ * This abstract class reprecents a connection to the office 
  * application.
 
     @deprecated
@@ -52,14 +52,14 @@ public interface OfficeConnection
     /**
      * Sets an AWT container catory.
      *
-     * @param containerFactory This is a application provided AWT container
-     *  factory.
+     * @param containerFactory This is a application provided AWT container 
+     *	factory.
      */
     void setContainerFactory(ContainerFactory containerFactory);
 
     /**
      * Retrives the UNO component context.
-     * Establishes a connection if necessary and initialises the
+     * Establishes a connection if necessary and initialises the  
      * UNO service manager if it has not already been initialised.
      *
      * @return The office UNO component context.
@@ -68,9 +68,9 @@ public interface OfficeConnection
 
     /**
      * Creates an office window.
-     * The window is either a sub-class of java.awt.Canvas (local) or
-     * java.awt.Container (RVP).
-     *
+     * The window is either a sub-class of java.awt.Canvas (local) or 
+     * java.awt.Container (RVP). 
+     * 
      * This method does not add add the office window to its container.
      *
      * @param container This is an AWT container.
diff --git a/bean/com/sun/star/comp/beans/OfficeDocument.java b/bean/com/sun/star/comp/beans/OfficeDocument.java
index 8e3a970bd03c..41676d1fdb10 100644
--- a/bean/com/sun/star/comp/beans/OfficeDocument.java
+++ b/bean/com/sun/star/comp/beans/OfficeDocument.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,7 +30,7 @@ package com.sun.star.comp.beans;
 import com.sun.star.uno.UnoRuntime;
 
 //==========================================================================
-/** Wrapper class for service OfficeDocument which emulates the upcoming
+/**	Wrapper class for service OfficeDocument which emulates the upcoming
      mode of automatic runtime Java classes to get rid of the need for
     queryInterface.
 
@@ -40,7 +40,7 @@ import com.sun.star.uno.UnoRuntime;
     @since OOo 2.0.0
  */
 public class OfficeDocument extends Wrapper
-    implements
+    implements 
         com.sun.star.frame.XModel,
         com.sun.star.util.XModifiable,
         com.sun.star.frame.XStorable,
@@ -57,13 +57,13 @@ public class OfficeDocument extends Wrapper
 
         this.xModel = xModel;
         this.xModifiable = (com.sun.star.util.XModifiable)
-            UnoRuntime.queryInterface(
+            UnoRuntime.queryInterface( 
                 com.sun.star.util.XModifiable.class, xModel );
         this.xPrintable = (com.sun.star.view.XPrintable)
-            UnoRuntime.queryInterface(
+            UnoRuntime.queryInterface( 
                 com.sun.star.view.XPrintable.class, xModel );
         this.xStorable = (com.sun.star.frame.XStorable)
-            UnoRuntime.queryInterface(
+            UnoRuntime.queryInterface( 
                 com.sun.star.frame.XStorable.class, xModel );
     }
 
@@ -71,7 +71,7 @@ public class OfficeDocument extends Wrapper
     // com.sun.star.frame.XModel
     //----------------------------------------------------------
 
-    public boolean attachResource( /*IN*/String aURL,
+    public boolean attachResource( /*IN*/String aURL, 
             /*IN*/com.sun.star.beans.PropertyValue[] aArguments )
     {
         return xModel.attachResource( aURL, aArguments );
@@ -87,13 +87,13 @@ public class OfficeDocument extends Wrapper
         return xModel.getArgs();
     }
 
-    public void connectController(
+    public void connectController( 
         /*IN*/ com.sun.star.frame.XController xController )
     {
         xModel.connectController( xController );
     }
 
-    public void disconnectController(
+    public void disconnectController( 
         /*IN*/ com.sun.star.frame.XController xController )
     {
         xModel.disconnectController( xController );
@@ -119,8 +119,8 @@ public class OfficeDocument extends Wrapper
         return xModel.getCurrentController();
     }
 
-    public void setCurrentController(
-        /*IN*/ com.sun.star.frame.XController xController )
+    public void setCurrentController( 
+        /*IN*/ com.sun.star.frame.XController xController ) 
         throws com.sun.star.container.NoSuchElementException
     {
         xModel.setCurrentController( xController );
@@ -156,7 +156,7 @@ public class OfficeDocument extends Wrapper
         return xModifiable.isModified();
     }
 
-    public void setModified( /*IN*/boolean bModified )
+    public void setModified( /*IN*/boolean bModified ) 
         throws com.sun.star.beans.PropertyVetoException
     {
         xModifiable.setModified( bModified );
@@ -171,13 +171,13 @@ public class OfficeDocument extends Wrapper
         return xPrintable.getPrinter();
     }
 
-    public void setPrinter( /*IN*/ com.sun.star.beans.PropertyValue[] aPrinter )
+    public void setPrinter( /*IN*/ com.sun.star.beans.PropertyValue[] aPrinter ) 
         throws com.sun.star.lang.IllegalArgumentException
     {
         xPrintable.setPrinter( aPrinter );
     }
 
-    public void print( /*IN*/ com.sun.star.beans.PropertyValue[] xOptions )
+    public void print( /*IN*/ com.sun.star.beans.PropertyValue[] xOptions ) 
         throws com.sun.star.lang.IllegalArgumentException
     {
         xPrintable.print( xOptions );
@@ -202,19 +202,19 @@ public class OfficeDocument extends Wrapper
         return xStorable.isReadonly();
     }
 
-    public void store(  )
+    public void store(  ) 
         throws com.sun.star.io.IOException
     {
         xStorable.store();
     }
 
-    public void storeAsURL( /*IN*/ String aURL, /*IN*/ com.sun.star.beans.PropertyValue[] aArguments )
+    public void storeAsURL( /*IN*/ String aURL, /*IN*/ com.sun.star.beans.PropertyValue[] aArguments ) 
         throws com.sun.star.io.IOException
     {
         xStorable.storeAsURL( aURL, aArguments );
     }
 
-    public void storeToURL( /*IN*/ String aURL, /*IN*/ com.sun.star.beans.PropertyValue[] aArguments )
+    public void storeToURL( /*IN*/ String aURL, /*IN*/ com.sun.star.beans.PropertyValue[] aArguments ) 
         throws com.sun.star.io.IOException
     {
         xStorable.storeToURL( aURL, aArguments );
diff --git a/bean/com/sun/star/comp/beans/OfficeWindow.java b/bean/com/sun/star/comp/beans/OfficeWindow.java
index 0b755ce58cc0..455fe66ca59b 100644
--- a/bean/com/sun/star/comp/beans/OfficeWindow.java
+++ b/bean/com/sun/star/comp/beans/OfficeWindow.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 java.awt.Component;
 import com.sun.star.awt.XWindowPeer;
 
 /**
- * The concreate implementation of the OfficeWindow extends an
- * approperate type of visual component (java.awt.Canvas for local
+ * The concreate implementation of the OfficeWindow extends an 
+ * approperate type of visual component (java.awt.Canvas for local 
  * and java.awt.Container for remote).
 
     @deprecated
diff --git a/bean/com/sun/star/comp/beans/SystemWindowException.java b/bean/com/sun/star/comp/beans/SystemWindowException.java
index 2742eac8c837..3748418a8842 100644
--- a/bean/com/sun/star/comp/beans/SystemWindowException.java
+++ b/bean/com/sun/star/comp/beans/SystemWindowException.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,7 +27,7 @@
 
 package com.sun.star.comp.beans;
 
-/** indicates that an operation needed a system window,
+/** indicates that an operation needed a system window, 
     but no system window was aquired yet.
 
     @see com.sun.star.comp.beans.OOoBean.aquireSystemWindow
diff --git a/bean/com/sun/star/comp/beans/Wrapper.java b/bean/com/sun/star/comp/beans/Wrapper.java
index b5b259752e5f..824a81266b61 100644
--- a/bean/com/sun/star/comp/beans/Wrapper.java
+++ b/bean/com/sun/star/comp/beans/Wrapper.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,23 +30,23 @@ package com.sun.star.comp.beans;
 import com.sun.star.uno.UnoRuntime;
 
 //==========================================================================
-/** Wrapper base class for UNO services which emulates the upcoming
+/**	Wrapper base class for UNO services which emulates the upcoming
      mode of automatic runtime Java classes to get rid of the need for
     queryInterface.
 
     Because its not worth the efford to create a runtime generated wrapper
     for this purpose, as it might be for OOo 2.0, you still have to use
     UnoRuntime.queryInterface() for interfaces which are optional or come
-    from a subclass.  But for non optional interfaces you can already
+    from a subclass.  But for non optional interfaces you can already 
     directly call their methods.
 
     This wrapper will only work for UNO objects via a bridge, not for
-    direct Java objects.
+    direct Java objects. 
 
     @since OOo 2.0.0
  */
 class Wrapper
-    implements
+    implements 
         com.sun.star.lib.uno.Proxy,
             // see the comment in com.sun.star.lib.uno.bridges.java_remote
             // .java_remote_bridge.mapInterfaceTo for the consequences of this
@@ -61,25 +61,25 @@ class Wrapper
     {
         xQueryInterface = (com.sun.star.uno.IQueryInterface) xProxy;
         xComponent = (com.sun.star.lang.XComponent)
-            UnoRuntime.queryInterface(
+            UnoRuntime.queryInterface( 
                 com.sun.star.lang.XComponent.class, xProxy );
     }
 
     //==============================================================
     // com.sun.star.uno.IQueryInterface
     //--------------------------------------------------------------
-
-    public String getOid()
+    
+    public String getOid() 
     {
         return xQueryInterface.getOid();
     }
 
-    public boolean isSame( Object aObject )
+    public boolean isSame( Object aObject ) 
     {
         return xQueryInterface.isSame( aObject );
     }
 
-    public Object queryInterface( com.sun.star.uno.Type aType )
+    public Object queryInterface( com.sun.star.uno.Type aType ) 
     {
 //System.err.println( "Wrapper::queryInterface(" + aType + ")" );
         return xQueryInterface.queryInterface( aType );
@@ -88,7 +88,7 @@ class Wrapper
     //==============================================================
     // com.sun.star.lang.XComponent
     //--------------------------------------------------------------
-
+    
     public void dispose(  )
     {
         xComponent.dispose();
diff --git a/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c b/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c
index 944c9ff5a38f..3e8e736463d3 100644
--- a/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c
+++ b/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.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
@@ -68,8 +68,8 @@ JNIEXPORT jlong JNICALL Java_com_sun_star_comp_beans_LocalOfficeWindow_getNative
 JNIEXPORT jint JNICALL Java_com_sun_star_beans_LocalOfficeWindow_getNativeWindowSystemType
   (JNIEnv * env, jobject obj_this)
 {
-    (void) env; /* avoid warning about unused parameter */
-    (void) obj_this; /* avoid warning about unused parameter */
+    (void) env; /* avoid warning about unused parameter */ 
+    (void) obj_this; /* avoid warning about unused parameter */ 
     return (SYSTEM_XWINDOW);
 }
 
@@ -83,8 +83,8 @@ JNIEXPORT jint JNICALL Java_com_sun_star_beans_LocalOfficeWindow_getNativeWindow
 JNIEXPORT jlong JNICALL Java_com_sun_star_beans_LocalOfficeWindow_getNativeWindow
   (JNIEnv * env, jobject obj_this)
 {
-    (void) env; /* avoid warning about unused parameter */
-    (void) obj_this; /* avoid warning about unused parameter */
+    (void) env; /* avoid warning about unused parameter */ 
+    (void) obj_this; /* avoid warning about unused parameter */ 
     return Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeWindow(env, obj_this);
 }
 
diff --git a/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c b/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c
index fc20f39283df..8badd673e722 100644
--- a/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c
+++ b/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.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,8 +75,8 @@ static void ThrowException(JNIEnv * env, char const * type, char const * msg) {
 JNIEXPORT jint JNICALL Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeWindowSystemType
   (JNIEnv * env, jobject obj_this)
 {
-    (void) env; /* avoid warning about unused parameter */
-    (void) obj_this; /* avoid warning about unused parameter */
+    (void) env; /* avoid warning about unused parameter */ 
+    (void) obj_this; /* avoid warning about unused parameter */ 
     return (SYSTEM_XWINDOW);
 }
 
@@ -106,23 +106,23 @@ JNIEXPORT jlong JNICALL Java_com_sun_star_comp_beans_LocalOfficeWindow_getNative
     result = JAWT_GetAWT(env, &awt);
     if (result == JNI_FALSE)
         ThrowException(env, "java/lang/RuntimeException", "JAWT_GetAWT failed");
-
+    
                                 /* Get the drawing surface */
     if ((ds = awt.GetDrawingSurface(env, obj_this)) == NULL)
         return 0L;
-
+        
     /* Lock the drawing surface */
     lock = ds->Lock(ds);
     if ( (lock & JAWT_LOCK_ERROR) != 0)
         ThrowException(env, "java/lang/RuntimeException",
                        "Could not get AWT drawing surface.");
-
+    
     /* Get the drawing surface info */
     dsi = ds->GetDrawingSurfaceInfo(ds);
 
     /* Get the platform-specific drawing info */
     dsi_x11 = (JAWT_X11DrawingSurfaceInfo*)dsi->platformInfo;
-
+    
     drawable = dsi_x11->drawable;
     display  = dsi_x11->display;
 
diff --git a/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c b/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c
index f7f86d8973b3..65f40b2fddce 100644
--- a/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c
+++ b/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.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/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
index c1be77fc2ba0..e09cadec76d0 100644
--- a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
+++ b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.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/bean/qa/complex/OOoBeanTest.java b/bean/qa/complex/OOoBeanTest.java
index 2d038e8b37af..791c3abaa5f5 100644
--- a/bean/qa/complex/OOoBeanTest.java
+++ b/bean/qa/complex/OOoBeanTest.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 @@ import java.awt.*;
 
 public class OOoBeanTest extends ComplexTestCase
 {
-
+    
     public String[] getTestMethodNames()
     {
         // TODO think about trigger of sub-tests from outside
@@ -89,7 +89,7 @@ public class OOoBeanTest extends ComplexTestCase
     {
         boolean ret = false;
         String os = System.getProperty("os.name");
-        if (os != null)
+        if (os != null) 
         {
             os = os.trim();
             if (os.indexOf("Win") == 0)
@@ -131,7 +131,7 @@ public class OOoBeanTest extends ComplexTestCase
 
     /** Sizing, painting
      */
-    public void test2() throws Exception
+    public void test2() throws Exception 
     {
         WriterFrame f = null;
         ScreenComparer capturer = null;
@@ -178,7 +178,7 @@ public class OOoBeanTest extends ComplexTestCase
                 f.setExtendedState(Frame.NORMAL);
                 Thread.sleep(getSleepTime(200));
                 if (f.checkUnoFramePosition() == false)
-                    failed("Sizing error: Frame set from maximized to normal.", true);
+                    failed("Sizing error: Frame set from maximized to normal.", true);                
                 capturer.grabTwo(f.getClientArea());
                 if (capturer.compare() == false)
                 {
@@ -195,14 +195,14 @@ public class OOoBeanTest extends ComplexTestCase
             Thread.sleep(getSleepTime(200));
             if (f.checkUnoFramePosition() == false)
                 failed("Sizing error: Frame moved.", true);
-
+                            
             capturer.grabTwo(f.getClientArea());
             if (capturer.compare() == false)
             {
                 failed("Painting error: Move frame to a different position.", true);
                 capturer.writeImages();
             }
-
+            
             //move Window down
             Dimension dim = Toolkit.getDefaultToolkit().getScreenSize();
             int maxY = dim.height - f.getBounds().height;
@@ -225,7 +225,7 @@ public class OOoBeanTest extends ComplexTestCase
             }
 
             //obscure the window and make it visible again
-
+            
             oldPosition = f.getBounds();
 
             Rectangle pos = new Rectangle(oldPosition.x - 50, oldPosition.y - 50,
@@ -276,7 +276,7 @@ public class OOoBeanTest extends ComplexTestCase
             f = new WriterFrame(100, 100, 500, 300, true);
             if (f.checkUnoFramePosition() == false)
                 failed("Sizing error.", true);
-
+            
         }
         finally
         {
@@ -332,7 +332,7 @@ public class OOoBeanTest extends ComplexTestCase
                 f.removeOOoBean();
                 f.addOOoBean();
             }
-
+            
             f.goToStart();
             f.pageDown();
             Thread.sleep(getSleepTime(200));
@@ -344,7 +344,7 @@ public class OOoBeanTest extends ComplexTestCase
                        "repeatedly to java.lang.Frame.", true);
                 capturer.writeImages();
             }
-
+            
             if (f.checkUnoFramePosition() == false)
                 failed("Sizing error.", true);
 
@@ -359,7 +359,7 @@ public class OOoBeanTest extends ComplexTestCase
     }
 
 
-    /** Test focus  (i49454). After repeatedly adding and removing the bean to a window
+    /** Test focus 	(i49454). After repeatedly adding and removing the bean to a window
      * it should still be possible to enter text in the window. This does not
      * work all the time on Windows. This is probably a timing problem. When using
      * Thread.sleep (position #1) then it should work.
@@ -380,7 +380,7 @@ public class OOoBeanTest extends ComplexTestCase
                 bean.loadFromURL("private:factory/swriter", null);
                 // #1
                 Thread.sleep(1000);
-
+                
                 StringBuffer buf = new StringBuffer(1000);
                 for (int i = 0; i < 1; i++)
                 {
@@ -393,7 +393,7 @@ public class OOoBeanTest extends ComplexTestCase
                     bean.aquireSystemWindow();
 //                    frame.validate();
                 }
-
+                
                 if (isWindows() == false)
                     Thread.sleep(5000);
 
@@ -401,7 +401,7 @@ public class OOoBeanTest extends ComplexTestCase
                 roby.keyPress(KeyEvent.VK_H);
                 roby.keyRelease(KeyEvent.VK_H);
                 buf.append("h");
-
+                
                 String s = getText(bean);
                 if ( ! s.equals(buf.toString()))
                 {
@@ -416,12 +416,12 @@ public class OOoBeanTest extends ComplexTestCase
                 {
                     Thread.sleep(2000);
                 }
-
+            
             } finally {
                 bean.stopOOoConnection();
                 frame.dispose();
             }
-        }
+        }   
     }
 
     /** Tests focus problem just like test6, but the implementation is a little
@@ -448,7 +448,7 @@ public class OOoBeanTest extends ComplexTestCase
                 Thread.sleep(1000);
                 StringBuffer buf = new StringBuffer(1000);
                 int i = 0;
-
+                
                 for (; i < 1; i++)
                 {
                 EventQueue q = Toolkit.getDefaultToolkit().getSystemEventQueue();
@@ -456,14 +456,14 @@ public class OOoBeanTest extends ComplexTestCase
                         public void run() {
                             try {
 
-                            bean.releaseSystemWindow();
+                            bean.releaseSystemWindow(); 
                             frame.remove(bean);
                             frame.validate();
 
                             } catch (Exception e) {
                                 e.printStackTrace();
                             }
-
+                            
                             }
                         });
                 // #2
@@ -480,11 +480,11 @@ public class OOoBeanTest extends ComplexTestCase
                             }
                             }
                         });
-
+                    
                 // #3
                 Thread.sleep(1000);
                 }
-
+                
                 if (isWindows() == false)
                     Thread.sleep(5000);
 
@@ -501,7 +501,7 @@ public class OOoBeanTest extends ComplexTestCase
                 roby.waitForIdle();
 
                 buf.append("h");
-                Thread.sleep(1000);
+                Thread.sleep(1000);                
                 String s = getText(bean);
                 System.out.println(" getText: " + s);
                 if ( ! s.equals(buf.toString()))
@@ -516,7 +516,7 @@ public class OOoBeanTest extends ComplexTestCase
                     roby.waitForIdle();
 
                     String sH = "h";
-                    Thread.sleep(1000);
+                    Thread.sleep(1000);                
                     String s2 = getText(bean);
 
                     if ( ! sH.equals(s2))
@@ -534,7 +534,7 @@ public class OOoBeanTest extends ComplexTestCase
                 {
                     //                   Thread.sleep(2000);
                 }
-
+            
             } finally {
                 bean.stopOOoConnection();
                 frame.dispose();
@@ -597,7 +597,7 @@ public class OOoBeanTest extends ComplexTestCase
             c.gridx = 0;
             c.gridy = 0;
             f.add(bp1, c);
-
+            
             c.gridx = 1;
             c.insets = new Insets(0, 0, 0, 0);
             f.add(bp2, c);
diff --git a/bean/qa/complex/ScreenComparer.java b/bean/qa/complex/ScreenComparer.java
index a2547a763c58..c169c45f4998 100644
--- a/bean/qa/complex/ScreenComparer.java
+++ b/bean/qa/complex/ScreenComparer.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
@@ -83,7 +83,7 @@ class ScreenComparer
     {
         grabOne(m_rect);
     }
-
+    
     public void grabOne(Rectangle r) throws Exception
     {
         java.awt.Robot robot = new java.awt.Robot();
@@ -94,7 +94,7 @@ class ScreenComparer
     {
         grabTwo(m_rect);
     }
-
+    
     public void grabTwo(Rectangle r) throws Exception
     {
         java.awt.Robot robot = new java.awt.Robot();
@@ -130,7 +130,7 @@ class ScreenComparer
                         pixel1 = m_img1.getRGB(x, y);
                     else
                         bOutOfRange = true;
-
+                    
                     if (x < w2 && y < h2)
                         pixel2 = m_img2.getRGB(x, y);
                     else
@@ -140,7 +140,7 @@ class ScreenComparer
                         m_imgDiff.setRGB(x, y, m_diffColor);
                     else
                         m_imgDiff.setRGB(x, y, pixel1);
-
+                    
                 }
             }
             return false;
@@ -179,7 +179,7 @@ class ScreenComparer
                     if (pixels1[offset] != pixels2[offset])
                     {
                         ret = ret && false;
-                        m_imgDiff.setRGB(x, y, m_diffColor);
+                        m_imgDiff.setRGB(x, y, m_diffColor); 
                     }
                     else
                     {
@@ -193,7 +193,7 @@ class ScreenComparer
 
     /** Writes Images to a location. The
      *  directory is determined by the java property OOoBean.Images
-     *
+     * 
      */
     public void writeImages() throws Exception
     {
@@ -228,6 +228,6 @@ class ScreenComparer
             System.out.println("Diff image: " + file1.getPath() + "\n");
         }
     }
-
+    
 }
 
diff --git a/bean/qa/complex/WriterFrame.java b/bean/qa/complex/WriterFrame.java
index b2aff726ad05..370662929868 100644
--- a/bean/qa/complex/WriterFrame.java
+++ b/bean/qa/complex/WriterFrame.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
@@ -73,7 +73,7 @@ class WriterFrame extends java.awt.Frame
             m_bean.aquireSystemWindow();
         }
     }
-
+    
     public WriterFrame() throws Exception
     {
         this(0, 0, 800, 400, false);
@@ -88,7 +88,7 @@ class WriterFrame extends java.awt.Frame
         com.sun.star.text.XText xText = myDoc.getText();
         com.sun.star.text.XTextCursor xTCursor = xText.createTextCursor();
         //inserting some Text
-        xText.insertString( xTCursor, s, false );
+        xText.insertString( xTCursor, s, false );  
     }
 
     public String getText() throws Exception
@@ -128,7 +128,7 @@ class WriterFrame extends java.awt.Frame
         xTViewCursor.gotoStart(false);
     }
 
-
+    
     public void pageDown() throws Exception
     {
         com.sun.star.frame.XModel xModel = (com.sun.star.frame.XModel)m_bean.getDocument();
@@ -146,7 +146,7 @@ class WriterFrame extends java.awt.Frame
 
     public Rectangle getClientArea()
     {
-
+        
         Insets i = getInsets();
         Rectangle r = getBounds();
         Rectangle rc = new Rectangle(r.x + i.left, r.y + i.top,
@@ -204,6 +204,6 @@ class WriterFrame extends java.awt.Frame
         m_bean.aquireSystemWindow();
         validate();
     }
-
+    
 }
 
diff --git a/bean/test/Test.java b/bean/test/Test.java
index 04f3a42132f9..84578f9f7599 100644
--- a/bean/test/Test.java
+++ b/bean/test/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
@@ -55,7 +55,7 @@ public class Test
                 public void windowClosing( java.awt.event.WindowEvent e){
                     b.stopOOoConnection();
                     System.exit(0);
-
+                    
                 }});
         }
         catch (Exception e)
diff --git a/bean/test/applet/oooapplet/OOoViewer.java b/bean/test/applet/oooapplet/OOoViewer.java
index c7c96b6a0ab8..8139b9ffa352 100644
--- a/bean/test/applet/oooapplet/OOoViewer.java
+++ b/bean/test/applet/oooapplet/OOoViewer.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,9 +42,9 @@ public class OOoViewer extends Applet {
     private OOoBean oBean;
 
     static private CustomURLClassLoader m_loader;
-
+    
     Object  m_objBean;
-
+    
     public void init() {
         try {
             if (m_loader == null) {
@@ -88,7 +88,7 @@ public class OOoViewer extends Applet {
         Method methLoad = beanClass.getMethod(
             "loadFromURL", new Class[] {
                 String.class, arProp.getClass() });
-
+        
         methLoad.invoke(m_objBean, new Object[] {"private:factory/swriter", null});
         } catch (ClassNotFoundException e) {
             e.printStackTrace();
@@ -102,9 +102,9 @@ public class OOoViewer extends Applet {
             e.printStackTrace();
         } catch (java.lang.NoSuchMethodException e) {
             e.printStackTrace();        }
-
-
-
+        
+        
+        
         validate();
     }
 
@@ -135,11 +135,11 @@ public class OOoViewer extends Applet {
 final class CustomURLClassLoader extends URLClassLoader {
 
     private Vector resourcePaths;
-
+    
     public CustomURLClassLoader( URL[] urls ) {
         super( urls );
     }
-
+    
     protected Class findClass( String name ) throws ClassNotFoundException {
         // This is only called via this.loadClass -> super.loadClass ->
         // this.findClass, after this.loadClass has already called
@@ -149,10 +149,10 @@ final class CustomURLClassLoader extends URLClassLoader {
     }
 
 
-
+    
     protected Class loadClass( String name, boolean resolve )
         throws ClassNotFoundException
-    {
+    {          
         Class c = findLoadedClass( name );
         if ( c == null ) {
             try {
@@ -179,12 +179,12 @@ final class CustomURLClassLoader extends URLClassLoader {
 
     public URL getResource(String name) {
         if (resourcePaths == null) return null;
-
+        
         URL result = super.getResource(name);
         if (result != null) {
             return result;
         }
-
+        
         URL u = null;
         URI uri = null;
         for (Enumeration e = resourcePaths.elements(); e.hasMoreElements();) {
diff --git a/crashrep/source/unx/main.cxx b/crashrep/source/unx/main.cxx
index 91bc98a96f17..6f559bbb762e 100644
--- a/crashrep/source/unx/main.cxx
+++ b/crashrep/source/unx/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
@@ -51,26 +51,26 @@
 
 typedef int SOCKET;
 
-#define closesocket     close
-#define SOCKET_ERROR    -1
+#define closesocket		close
+#define SOCKET_ERROR	-1
 
 #ifdef SOLARIS
 const char *basename( const char *filename )
 {
     const char *pSlash = strrchr( filename, '/' );
-
+    
     return pSlash ? pSlash + 1 : pSlash;
 }
 #endif
 
 using namespace std;
 
-static bool g_bNoUI = false;
+static bool	g_bNoUI = false;
 static bool g_bSendReport = false;
 static bool g_bLoadReport = false;
 
 static bool g_bDebugMode = false;
-static int  g_signal = 0;
+static int	g_signal = 0;
 
 static string g_strProductKey;
 static string g_strReportServer;
@@ -86,17 +86,17 @@ static char g_szStackFile[L_tmpnam] = "";
 static char g_szDescriptionFile[2048] = "";
 static char g_szReportFile[2048] = "";
 
-#define SO_CRASHREPORT_MAIL "so-report@sun.com"
-#define PSTACK_CMD          "pstack %d"
+#define SO_CRASHREPORT_MAIL	"so-report@sun.com"
+#define PSTACK_CMD			"pstack %d"
 
 #ifdef LINUX
-#define PMAP_CMD            "cat /proc/%d/maps"
+#define PMAP_CMD			"cat /proc/%d/maps"
 #else
-#define PMAP_CMD            "pmap %d"
+#define PMAP_CMD			"pmap %d"
 #endif
 
-#define REPORT_SERVER   (g_strReportServer.c_str())
-#define REPORT_PORT     g_uReportPort
+#define REPORT_SERVER	(g_strReportServer.c_str())
+#define REPORT_PORT		g_uReportPort
 
 static string getprogramdir()
 {
@@ -106,7 +106,7 @@ static string getprogramdir()
 static const char *getlocale()
 {
     const char * locale = getenv( "LC_ALL" );
-
+    
     if( NULL == locale )
         locale = getenv( "LC_CTYPE" );
 
@@ -115,7 +115,7 @@ static const char *getlocale()
 
     if( NULL == locale )
         locale = "C";
-
+        
     return locale;
 }
 
@@ -129,18 +129,18 @@ static const char *get_home_dir()
 static string trim_string( const string& rString )
 {
     string temp = rString;
-
+    
     while ( temp.length() && (temp[0] == ' ' || temp[0] == '\t') )
         temp.erase( 0, 1 );
-
-    string::size_type   len = temp.length();
-
+        
+    string::size_type	len = temp.length();
+    
     while ( len && (temp[len-1] == ' ' || temp[len-1] == '\t') )
     {
         temp.erase( len - 1, 1 );
         len = temp.length();
     }
-
+    
     return temp;
 }
 
@@ -185,10 +185,10 @@ static size_t fcopy( FILE *fpout, FILE *fpin )
 
 bool write_report( const hash_map< string, string >& rSettings )
 {
-    FILE    *fp = fopen( tmpnam( g_szReportFile ), "w" );
+    FILE	*fp = fopen( tmpnam( g_szReportFile ), "w" );
     const char *pszUserType = getenv( "STAROFFICE_USERTYPE" );
 
-    fprintf( fp,
+    fprintf( fp, 
        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
        "<!DOCTYPE errormail:errormail PUBLIC \"-//OpenOffice.org//DTD ErrorMail 1.0//EN\" \"errormail.dtd\">\n"
        "<errormail:errormail xmlns:errormail=\"http://openoffice.org/2002/errormail\" usertype=\"%s\">\n"
@@ -198,7 +198,7 @@ bool write_report( const hash_map< string, string >& rSettings )
        "<reportmail:attachment name=\"stack.txt\" media-type=\"text/plain\" class=\"pstack output\"/>\n"
        "</reportmail:mail>\n"
        "<officeinfo:officeinfo xmlns:officeinfo=\"http://openoffice.org/2002/officeinfo\" build=\"%s\" platform=\"%s\" language=\"%s\" exceptiontype=\"%d\" product=\"%s\" procpath=\"%s\"/>\n"
-       ,
+       , 
        pszUserType ? xml_encode( pszUserType ).c_str() : "",
        xml_encode(rSettings.find( "CONTACT" )->second).c_str(),
        xml_encode(rSettings.find( "EMAIL" )->second).c_str(),
@@ -211,10 +211,10 @@ bool write_report( const hash_map< string, string >& rSettings )
        xml_encode(getprogramdir()).c_str()
        );
 
-    struct utsname  info;
+    struct utsname	info;
 
     memset( &info, 0, sizeof(info) );
-    uname( &info );
+    uname( &info );	
 
     fprintf( fp,
        "<systeminfo:systeminfo xmlns:systeminfo=\"http://openoffice.org/2002/systeminfo\">\n"
@@ -245,24 +245,24 @@ bool write_report( const hash_map< string, string >& rSettings )
     fprintf( fp, "</errormail:errormail>\n" );
 
     fclose( fp );
-
+    
     return true;
 }
 
 
 bool write_description( const hash_map< string, string >& rSettings )
 {
-    bool    bSuccess = false;
-    FILE    *fp = fopen( tmpnam( g_szDescriptionFile ), "w" );
+    bool	bSuccess = false;
+    FILE	*fp = fopen( tmpnam( g_szDescriptionFile ), "w" );
 
     if ( fp )
-    {
+    {	
         bSuccess = true;
         fprintf( fp, "\xEF\xBB\xBF" );
         fprintf( fp, "%s\n", rSettings.find( "DESCRIPTION" )->second.c_str() );
         fclose( fp );
     }
-
+    
     return bSuccess;
 }
 
@@ -281,43 +281,43 @@ static void printSettings( const hash_map<string,string>& rSettings )
 bool save_crash_report( const string& rFileName, const hash_map< string, string >& /*rSettings*/ )
 {
     bool bSuccess = false;
-    FILE    *fpout = fopen( rFileName.c_str(), "w" );
-
+    FILE	*fpout = fopen( rFileName.c_str(), "w" );
+    
     if ( fpout )
     {
         FILE *fpin = fopen( g_szStackFile, "r" );
-
+        
         if ( fpin )
         {
-            char    buf[1024];
-
+            char	buf[1024];
+            
             while (fgets(buf, sizeof(buf), fpin) != NULL)
             {
                 fputs(buf, fpout);
             }
-
+            
             bSuccess = true;
-
+            
             fclose ( fpin );
         }
-
+        
         fclose( fpout );
     }
-
+    
     return bSuccess;
 }
 
-bool SendHTTPRequest(
-                FILE *fp,
-                const char *pszServer,
-                unsigned short uPort = 80,
-                const char *pszProxyServer = NULL,
+bool SendHTTPRequest( 
+                FILE *fp, 
+                const char *pszServer, 
+                unsigned short uPort = 80, 
+                const char *pszProxyServer = NULL, 
                 unsigned short uProxyPort = 8080 )
 {
     bool success = false;
 
     struct hostent *hp;
-
+    
     if ( pszProxyServer )
         hp = gethostbyname( pszProxyServer );
     else
@@ -325,7 +325,7 @@ bool SendHTTPRequest(
 
     if ( hp )
     {
-        SOCKET  s = socket( AF_INET, SOCK_STREAM, 0 );
+        SOCKET	s = socket( AF_INET, SOCK_STREAM, 0 );
 
         if ( s )
         {
@@ -348,7 +348,7 @@ bool SendHTTPRequest(
                 char buffer[2048];
 
                 if ( pszProxyServer )
-                    sprintf( buffer,
+                    sprintf( buffer, 
                     "POST http://%s:%d/soap/servlet/rpcrouter HTTP/1.0\r\n"
                         "Content-Type: text/xml; charset=\"utf-8\"\r\n"
                         "Content-Length: %d\r\n"
@@ -358,7 +358,7 @@ bool SendHTTPRequest(
                         static_cast<int>(length)
                         );
                 else
-                    sprintf( buffer,
+                    sprintf( buffer, 
                         "POST /soap/servlet/rpcrouter HTTP/1.0\r\n"
                         "Content-Type: text/xml; charset=\"utf-8\"\r\n"
                         "Content-Length: %d\r\n"
@@ -375,7 +375,7 @@ bool SendHTTPRequest(
                 if ( SOCKET_ERROR != send( s, buffer, strlen(buffer), 0 ) )
                 {
                     size_t nBytes;
-
+                    
                     do
                     {
                         nBytes = fread( buffer, 1, sizeof(buffer), fp );
@@ -439,10 +439,10 @@ static void WriteSOAPRequest( FILE *fp )
     fprintf( fp, "<body xsi:type=\"xsd:string\">This is an autogenerated crash report mail.</body>\n" );
     fprintf( fp, "<hash xsi:type=\"apache:Map\">\n" );
 
-    FILE    *fpin = fopen( g_szReportFile, "r" );
+    FILE	*fpin = fopen( g_szReportFile, "r" );
     if ( fpin )
     {
-        fprintf( fp,
+        fprintf( fp, 
             "<item>\n"
             "<key xsi:type=\"xsd:string\">reportmail.xml</key>\n"
             "<value xsi:type=\"xsd:string\"><![CDATA[" );
@@ -454,7 +454,7 @@ static void WriteSOAPRequest( FILE *fp )
     fpin = fopen( g_szDescriptionFile, "r" );
     if ( fpin )
     {
-        fprintf( fp,
+        fprintf( fp, 
             "<item>\n"
             "<key xsi:type=\"xsd:string\">description.txt</key>\n"
             "<value xsi:type=\"xsd:string\"><![CDATA[" );
@@ -466,7 +466,7 @@ static void WriteSOAPRequest( FILE *fp )
     fpin = fopen( g_szStackFile, "r" );
     if ( fpin )
     {
-        fprintf( fp,
+        fprintf( fp, 
             "<item>\n"
             "<key xsi:type=\"xsd:string\">stack.txt</key>\n"
             "<value xsi:type=\"xsd:string\"><![CDATA[" );
@@ -475,18 +475,18 @@ static void WriteSOAPRequest( FILE *fp )
         fclose( fpin );
     };
 
-    fprintf( fp,
+    fprintf( fp, 
         "</hash>\n"
         "</rds:submitReport>\n"
-        "</SOAP-ENV:Body>\n"
-        "</SOAP-ENV:Envelope>\n"
+        "</SOAP-ENV:Body>\n" 
+        "</SOAP-ENV:Envelope>\n" 
         );
 }
 
 struct RequestParams
 {
     bool    success;
-    FILE    *fpin;
+    FILE	*fpin;
     const char *pServer;
     unsigned short uPort;
     const char *pProxyServer;
@@ -515,16 +515,16 @@ bool send_crash_report( const hash_map< string, string >& rSettings )
 
     bool bSuccess = false;
 
-    FILE    *fptemp = tmpfile();
+    FILE	*fptemp = tmpfile();
     if ( fptemp )
     {
         WriteSOAPRequest( fptemp );
         fseek( fptemp, 0, SEEK_SET );
 
-        bSuccess = SendHTTPRequest(
-            fptemp,
-            REPORT_SERVER, REPORT_PORT,
-            bUseProxy ? pProxyServer : NULL,
+        bSuccess = SendHTTPRequest( 
+            fptemp, 
+            REPORT_SERVER, REPORT_PORT, 
+            bUseProxy ? pProxyServer : NULL, 
             uProxyPort ? uProxyPort : 8080
             );
 
@@ -534,27 +534,27 @@ bool send_crash_report( const hash_map< string, string >& rSettings )
 
     unlink( g_szDescriptionFile );
     unlink( g_szReportFile );
-
+    
     return bSuccess;
 }
 
 
 static bool append_file( const char *filename, string& rString )
 {
-    char    buf[1024];
-    bool    bSuccess = false;
-
+    char	buf[1024];	
+    bool	bSuccess = false;
+    
     FILE *fp = fopen( filename, "r" );
     if ( fp )
     {
         bSuccess = true;
-        while (fgets(buf, sizeof(buf), fp) != NULL)
+        while (fgets(buf, sizeof(buf), fp) != NULL) 
         {
             rString.append( buf );
         }
         fclose( fp );
     }
-
+    
     return true;
 }
 
@@ -562,9 +562,9 @@ string crash_get_details( const hash_map< string, string >& rSettings )
 {
     string aRet;
 
-    write_description( rSettings );
+    write_description( rSettings );	
     write_report( rSettings );
-
+        
     aRet.append( rSettings.find( "TITLE" )->second.c_str() );
     aRet.append( "\n\n" );
     append_file( g_szDescriptionFile, aRet );
@@ -575,7 +575,7 @@ string crash_get_details( const hash_map< string, string >& rSettings )
 
     unlink( g_szDescriptionFile );
     unlink( g_szReportFile );
-
+    
     return aRet;
 }
 
@@ -583,7 +583,7 @@ string crash_get_details( const hash_map< string, string >& rSettings )
 // ensure validity of program relative paths
 static void setup_program_dir( const char* progname )
 {
-    char    szCanonicProgPath[PATH_MAX];
+    char	szCanonicProgPath[PATH_MAX];
 
 
     if ( realpath( progname, szCanonicProgPath ) )
@@ -604,9 +604,9 @@ static void setup_program_dir( const char* progname )
 
 static long setup_commandline_arguments( int argc, char** argv, int *pSignal )
 {
-    long    pid = 0;
-    int     signal = 0;
-
+    long	pid = 0;
+    int		signal = 0;
+    
     for ( int n = 1; n < argc; n++ )
     {
         if ( 0 == strcmp( argv[n], "-p" ) )
@@ -652,22 +652,22 @@ static long setup_commandline_arguments( int argc, char** argv, int *pSignal )
         }
         else if ( argv[n] && strlen(argv[n]) )
         {
-            printf(
+            printf( 
                 "\n%s crash_report %s\n\n" \
                 "/?, -h[elp]          %s\n\n" \
                 "%-20s %s\n\n",
-                "%MSG_CMDLINE_USAGE%",
-                "%MSG_PARAM_PROCESSID%",
-                "%MSG_PARAM_HELP_DESCRIPTION%",
-                "%MSG_PARAM_PROCESSID%",
-                "%MSG_PARAM_PROCESSID_DESCRIPTION%"
+                "%MSG_CMDLINE_USAGE%", 
+                "%MSG_PARAM_PROCESSID%", 
+                "%MSG_PARAM_HELP_DESCRIPTION%", 
+                "%MSG_PARAM_PROCESSID%", 
+                "%MSG_PARAM_PROCESSID_DESCRIPTION%" 
                 );
             break;
         }
     }
 
     *pSignal = signal;
-
+    
     return pid;
 }
 
@@ -678,51 +678,51 @@ static bool read_line( FILE *fp, string& rLine )
     char szBuffer[1024];
     bool bSuccess = false;
     bool bEOL = false;
-    string  line;
-
+    string	line;
 
+        
     while ( !bEOL && fgets( szBuffer, sizeof(szBuffer), fp ) )
     {
-        int len = strlen(szBuffer);
-
+        int	len = strlen(szBuffer);
+        
         bSuccess = true;
-
+        
         while ( len && szBuffer[len - 1] == '\n' )
         {
             szBuffer[--len] = 0;
             bEOL = true;
         }
-
+            
         line.append( szBuffer );
     }
-
+    
     rLine = line;
     return bSuccess;
 }
 
 static string get_script_string( const char *pFileName, const char *pKeyName )
 {
-    FILE    *fp = fopen( pFileName, "r" );
-    string  retValue;
-
+    FILE	*fp = fopen( pFileName, "r" );
+    string	retValue;
+    
     if ( fp )
     {
         string line;
         string section;
-
+        
         while ( read_line( fp, line ) )
         {
             line = trim_string( line );
+            
 
-
-            string::size_type iEqualSign = line.find( '=', 0 );
+            string::size_type iEqualSign = line.find( '=', 0 ); 
 
             if ( iEqualSign != string::npos )
             {
-                string  keyname = line.substr( 0, iEqualSign );
+                string	keyname = line.substr( 0, iEqualSign );
                 keyname = trim_string( keyname );
-
-                string  value = line.substr( iEqualSign + 1, string::npos );
+                
+                string	value = line.substr( iEqualSign + 1, string::npos );
                 value = trim_string( value );
 
                 if ( value.length() && '\"' == value[0] )
@@ -734,7 +734,7 @@ static string get_script_string( const char *pFileName, const char *pKeyName )
                     if ( iQuotes != string::npos )
                         value.erase( iQuotes );
                 }
-
+                
                 if ( 0 == strcasecmp( keyname.c_str(), pKeyName ) )
                 {
                     retValue = value;
@@ -742,49 +742,49 @@ static string get_script_string( const char *pFileName, const char *pKeyName )
                 }
             }
         }
-
+        
         fclose( fp );
     }
-
+    
     return retValue;
 }
 
 static string get_profile_string( const char *pFileName, const char *pSectionName, const char *pKeyName, const char *pDefault = NULL )
 {
-    FILE    *fp = fopen( pFileName, "r" );
-    string  retValue = pDefault ? pDefault : "";
-
+    FILE	*fp = fopen( pFileName, "r" );
+    string	retValue = pDefault ? pDefault : "";
+    
     if ( fp )
     {
         string line;
         string section;
-
+        
         while ( read_line( fp, line ) )
         {
             line = trim_string( line );
-
+            
             if ( line.length() && line[0] == '[' )
             {
                 line.erase( 0, 1 );
                 string::size_type end = line.find( ']', 0 );
-
+                
                 if ( string::npos != end )
                     section = trim_string( line.substr( 0, end ) );
             }
             else
             {
 
-                string::size_type iEqualSign = line.find( '=', 0 );
+                string::size_type iEqualSign = line.find( '=', 0 ); 
 
                 if ( iEqualSign != string::npos )
                 {
-                    string  keyname = line.substr( 0, iEqualSign );
+                    string	keyname = line.substr( 0, iEqualSign );
                     keyname = trim_string( keyname );
-
-                    string  value = line.substr( iEqualSign + 1, string::npos );
+                    
+                    string	value = line.substr( iEqualSign + 1, string::npos );
                     value = trim_string( value );
-
-                    if (
+                    
+                    if ( 
                         0 == strcasecmp( section.c_str(), pSectionName ) &&
                         0 == strcasecmp( keyname.c_str(), pKeyName )
                          )
@@ -795,10 +795,10 @@ static string get_profile_string( const char *pFileName, const char *pSectionNam
                 }
             }
         }
-
+        
         fclose( fp );
     }
-
+    
     return retValue;
 }
 
@@ -814,13 +814,13 @@ static string get_environment_string( const char *pEnvName )
 
 static string read_from_file( const string& rFileName )
 {
-    string  content;
+    string	content;
     FILE *fp = fopen( rFileName.c_str(), "r" );
 
     if ( fp )
     {
-        char    buffer[256 + 1];
-        size_t  nBytesRead;
+        char	buffer[256 + 1];
+        size_t	nBytesRead;
 
         while( 0 != ( nBytesRead = fread( buffer, 1, sizeof(buffer) - 1,  fp ) ) )
         {
@@ -854,7 +854,7 @@ static void load_crash_data()
 static bool write_crash_data()
 {
     bool success = true;
-    string  sFile = get_home_dir();
+    string	sFile = get_home_dir();
 
     sFile += "/";
     sFile += string(XMLFILE);
@@ -863,7 +863,7 @@ static bool write_crash_data()
 
     if ( fp )
     {
-        FILE    *fpin = fopen( g_strXMLFileName.c_str(), "r" );
+        FILE	*fpin = fopen( g_strXMLFileName.c_str(), "r" );
 
         if ( fpin )
         {
@@ -883,7 +883,7 @@ static bool write_crash_data()
 
     if ( fp )
     {
-        FILE    *fpin = fopen( g_strChecksumFileName.c_str(), "r" );
+        FILE	*fpin = fopen( g_strChecksumFileName.c_str(), "r" );
 
         if ( fpin )
         {
@@ -915,7 +915,7 @@ static bool write_crash_data()
 static bool write_settings( const hash_map< string, string >& rSettings )
 {
     bool success = false;
-    string  sRCFile = get_home_dir();
+    string	sRCFile = get_home_dir();
 
     sRCFile += "/";
     sRCFile += string(RCFILE);
@@ -939,7 +939,7 @@ static bool write_settings( const hash_map< string, string >& rSettings )
 
 static void read_settings( hash_map< string, string >& rSettings )
 {
-    string  sRCFile = get_home_dir();
+    string	sRCFile = get_home_dir();
 
     sRCFile += "/";
     sRCFile += string(RCFILE);
@@ -955,7 +955,7 @@ static void read_settings( hash_map< string, string >& rSettings )
 
 static void read_settings_from_environment( hash_map< string, string >& rSettings )
 {
-    string  strEnv;
+    string	strEnv;
 
     strEnv = get_environment_string( "ERRORREPORT_RETURNADDRESS" );
     if ( strEnv.length() )
@@ -989,23 +989,23 @@ static void read_settings_from_environment( hash_map< string, string >& rSetting
         rSettings[ "TITLE" ] = strEnv;
 }
 
-static bool setup_version()
+static bool	setup_version()
 {
     if ( !getenv( "PRODUCTNAME" ) )
     {
         string productkey = get_profile_string( "bootstraprc", "Bootstrap", "ProductKey" );
-
+        
         g_strProductKey = productkey;
 
         if ( productkey.length() )
         {
             static string productname;
             static string productversion;
-            string::size_type   iSpace = productkey.find( ' ', 0 );
+            string::size_type	iSpace = productkey.find( ' ', 0 );
 
             if ( string::npos != iSpace )
             {
-                productname = productkey.substr( 0, iSpace );
+                productname = productkey.substr( 0, iSpace );	
                 productversion = productkey.substr( iSpace + 1, string::npos );
             }
             else
@@ -1013,13 +1013,13 @@ static bool setup_version()
 
             productname.insert( 0, "PRODUCTNAME=" );
             putenv( (char *)productname.c_str() );
-
+            
             productversion.insert( 0, "PRODUCTVERSION=" );
             putenv( (char *)productversion.c_str() );
         }
     }
-
-    g_buildid = get_profile_string( "versionrc", "Version", "BuildId" );
+    
+    g_buildid =	get_profile_string( "versionrc", "Version", "BuildId" );
     g_strDefaultLanguage = get_script_string( "instdb.ins", "DefaultLanguage"  );
 
     g_strReportServer = get_profile_string( "bootstraprc", "ErrorReport", "ErrorReportServer" );
@@ -1064,7 +1064,7 @@ int main( int argc, char** argv )
     if ( setup_version() )
     {
         /*long pid =*/ setup_commandline_arguments( argc, argv, &g_signal );
-
+        
         if ( g_bLoadReport )
         {
             load_crash_data();
@@ -1089,7 +1089,7 @@ int main( int argc, char** argv )
             write_crash_data();
             write_report( aDialogSettings );
 
-            string  sPreviewFile = get_home_dir();
+            string	sPreviewFile = get_home_dir();
             sPreviewFile += "/";
             sPreviewFile += string(PRVFILE);
 
@@ -1118,7 +1118,7 @@ int main( int argc, char** argv )
 
         return 0;
     }
-
+    
     return -1;
 }
 
diff --git a/crashrep/source/win32/base64.cpp b/crashrep/source/win32/base64.cpp
index 82d54fb4e16d..3f2e852377e5 100644
--- a/crashrep/source/win32/base64.cpp
+++ b/crashrep/source/win32/base64.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
@@ -25,7 +25,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 #include <stdio.h>
 #include <string.h>
 #include "base64.h"
@@ -50,7 +50,7 @@ extern "C" size_t base64_encode( FILE *fin, FILE *fout )
 
         if ( nBytes )
         {
-            unsigned long value =
+            unsigned long value = 
                 ((unsigned long)in_buffer[0]) << 16 |
                 ((unsigned long)in_buffer[1]) << 8 |
                 ((unsigned long)in_buffer[2]) << 0;
diff --git a/crashrep/source/win32/base64.h b/crashrep/source/win32/base64.h
index 241899563802..7133d40af7b7 100644
--- a/crashrep/source/win32/base64.h
+++ b/crashrep/source/win32/base64.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/crashrep/source/win32/resource.h b/crashrep/source/win32/resource.h
index 57befff2b8d7..c870e25787a2 100644
--- a/crashrep/source/win32/resource.h
+++ b/crashrep/source/win32/resource.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,32 +50,32 @@
 #define IDS_DONOT_SEND_BUTTON           116
 #define IDS_SHOW_REPORT_BUTTON          117
 #define IDS_SAVE_REPORT_BUTTON          118
-#define IDD_PREVIEW_FRAME               119
-#define IDS_ERROR_MSG_SIMPLE_MAPI       120
-#define IDS_ERROR_MSG_DISK_FULL         121
-#define IDS_OK_BUTTON                   122
-#define IDS_OPTIONS_BUTTON              123
-#define IDS_LABEL_EMAIL                 124
-#define IDD_OPTIONS_FRAME               125
-#define IDS_OPTIONS_CAPTION             126
-#define IDS_PROXY_SETTINGS_HEADER       127
-#define IDS_PROXY_SYSTEM                128
-#define IDS_PROXY_DIRECT                129
-#define IDS_PROXY_MANUAL                130
-#define IDS_LABEL_PROXYSERVER           131
-#define IDS_LABEL_PROXYPORT             132
-#define IDS_PROXY_DESCRIPTION           133
-#define IDS_ERROR_MSG_PROXY             134
-#define IDS_ERROR_MSG_NOCONNECT         135
-#define IDS_SENDING_REPORT_HEADER       136
-#define IDS_SENDING_REPORT_STATUS       137
+#define IDD_PREVIEW_FRAME				119
+#define	IDS_ERROR_MSG_SIMPLE_MAPI		120
+#define IDS_ERROR_MSG_DISK_FULL			121
+#define IDS_OK_BUTTON					122
+#define IDS_OPTIONS_BUTTON				123
+#define IDS_LABEL_EMAIL					124
+#define IDD_OPTIONS_FRAME				125
+#define	IDS_OPTIONS_CAPTION				126
+#define	IDS_PROXY_SETTINGS_HEADER		127
+#define	IDS_PROXY_SYSTEM				128
+#define	IDS_PROXY_DIRECT				129
+#define	IDS_PROXY_MANUAL				130
+#define	IDS_LABEL_PROXYSERVER			131
+#define	IDS_LABEL_PROXYPORT				132
+#define	IDS_PROXY_DESCRIPTION			133
+#define IDS_ERROR_MSG_PROXY				134
+#define IDS_ERROR_MSG_NOCONNECT			135
+#define IDS_SENDING_REPORT_HEADER		136
+#define IDS_SENDING_REPORT_STATUS		137
 #define IDS_SENDING_REPORT_STATUS_FINISHED 138
-#define IDD_SENDING_STATUS              139
+#define IDD_SENDING_STATUS				139
 #define IDS_WELCOME_BODY2               140
 #define IDS_WELCOME_BODY3               141
 #define IDS_ERROR_MSG_NOEMAILADDRESS    142
-#define IDS_MSG_CMDLINE_USAGE           143
-#define IDS_MSG_PARAM_PROCESSID         144
+#define IDS_MSG_CMDLINE_USAGE			143
+#define IDS_MSG_PARAM_PROCESSID			144
 #define IDS_MSG_PARAM_PROCESSID_DESCRIPTION 145
 #define IDS_MSG_PARAM_HELP_DESCRIPTION 146
 #define IDC_RICHEDIT_HEADER             1005
@@ -94,22 +94,22 @@
 #define IDC_EDIT3                       1018
 #define IDC_HEADER                      1019
 #define IDC_STATICBK                    1020
-#define IDC_EDIT_PREVIEW                1021
-#define IDC_EDIT_EMAIL                  1022
-#define IDC_OPTIONS                     1023
-#define IDC_PROXY_SETTINGS              1024
-#define IDC_RADIO_SYSTEM                1025
-#define IDC_RADIO_DIRECT                1026
-#define IDC_RADIO_MANUAL                1027
-#define IDC_LABEL_PROXYSERVER           1028
-#define IDC_LABEL_PROXYPORT             1029
-#define IDC_EDIT_PROXYSERVER            1030
-#define IDC_EDIT_PROXYPORT              1031
-#define IDC_LABEL_EMAIL                 1032
-#define IDC_PROXY_DESCRIPTION           1033
-#define IDC_SENDING_REPORT_STATUS       1034
+#define IDC_EDIT_PREVIEW				1021
+#define IDC_EDIT_EMAIL					1022
+#define IDC_OPTIONS						1023
+#define IDC_PROXY_SETTINGS				1024
+#define IDC_RADIO_SYSTEM				1025
+#define IDC_RADIO_DIRECT				1026
+#define IDC_RADIO_MANUAL				1027
+#define IDC_LABEL_PROXYSERVER			1028
+#define IDC_LABEL_PROXYPORT				1029
+#define IDC_EDIT_PROXYSERVER			1030
+#define IDC_EDIT_PROXYPORT				1031
+#define IDC_LABEL_EMAIL					1032
+#define IDC_PROXY_DESCRIPTION			1033
+#define IDC_SENDING_REPORT_STATUS		1034
 // Next default values for new objects
-//
+// 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NO_MFC                     1
diff --git a/crashrep/source/win32/soreport.cpp b/crashrep/source/win32/soreport.cpp
index f9b4e7ce3223..1dc3b02ec73f 100644
--- a/crashrep/source/win32/soreport.cpp
+++ b/crashrep/source/win32/soreport.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
@@ -46,17 +46,17 @@
 #define _UNICODE
 #include <tchar.h>
 
-#define _RICHEDIT_VER   0x0200
+#define _RICHEDIT_VER	0x0200
 #include <richedit.h>
 
 #if defined _MSC_VER
 #pragma warning(pop)
-#endif
+#endif 
 
 #if _RICHEDIT_VER >= 0x0200
-#define RICHEDIT    TEXT("riched20.dll")
+#define RICHEDIT	TEXT("riched20.dll")
 #else
-#define RICHEDIT    TEXT("riched32.dll")
+#define RICHEDIT	TEXT("riched32.dll")
 #endif
 
 #include <systools/win32/uwinapi.h>
@@ -80,9 +80,9 @@
 #include "resource.h"
 #include "base64.h"
 
-#define FORMATBUFSIZE   (8*1024)
+#define FORMATBUFSIZE	(8*1024)
 #define MAX_TEXT_BUFFER (32*1024-1)
-#define MAX_HOSTNAME    (1024)
+#define MAX_HOSTNAME	(1024)
 
 #ifdef __MINGW32__
 #include <imagehlp.h>
@@ -91,7 +91,7 @@
 #endif
 
 #ifdef _UNICODE
-#define tstring wstring
+#define tstring	wstring
 #else
 #define tstring string
 #endif
@@ -101,28 +101,28 @@ using namespace ::std;
 
 wstring  g_wstrProductKey;
 string  g_strDefaultLanguage;
-FILE    *g_fpStackFile = NULL;
-FILE    *g_fpChecksumFile = NULL;
-DWORD   g_dwExceptionCode = 0;
+FILE	*g_fpStackFile = NULL;
+FILE	*g_fpChecksumFile = NULL;
+DWORD	g_dwExceptionCode = 0;
 
-CHAR    g_szReportServerA[MAX_HOSTNAME] = "";
-USHORT  g_uReportPort = 80;
+CHAR	g_szReportServerA[MAX_HOSTNAME] = "";
+USHORT	g_uReportPort = 80;
 
-TCHAR   g_szBuildId[256] = TEXT("");
+TCHAR	g_szBuildId[256] = TEXT("");
 
-TCHAR   g_szDumpFileName[MAX_PATH] = TEXT("");
+TCHAR	g_szDumpFileName[MAX_PATH] = TEXT("");
 
-CHAR    g_szDumpFileNameA[MAX_PATH] = "";
-CHAR    g_szCommentFileNameA[MAX_PATH] = "";
-CHAR    g_szReportFileNameA[MAX_PATH] = "";
+CHAR	g_szDumpFileNameA[MAX_PATH] = "";
+CHAR	g_szCommentFileNameA[MAX_PATH] = "";
+CHAR	g_szReportFileNameA[MAX_PATH] = "";
 
 
-bool    g_bNoUserInterface = false;
-bool    g_bSendReport = false;
-bool    g_bLoadReport = false;
+bool	g_bNoUserInterface = false;
+bool	g_bSendReport = false;
+bool	g_bLoadReport = false;
 
-#define REPORT_SERVER   g_szReportServerA
-#define REPORT_PORT     g_uReportPort
+#define REPORT_SERVER	g_szReportServerA
+#define REPORT_PORT		g_uReportPort
 
 
 //***************************************************************************
@@ -134,8 +134,8 @@ static FILE *_xfopen( const _TCHAR *file, const _TCHAR *mode )
 #ifdef UNICODE
     if ( (LONG)GetVersion() < 0 )
     {
-        char    afile[MAX_PATH];
-        char    amode[16];
+        char	afile[MAX_PATH];
+        char	amode[16];
 
         WideCharToMultiByte( CP_ACP, 0, file, -1, afile, MAX_PATH, NULL, NULL );
         WideCharToMultiByte( CP_ACP, 0, mode, -1, amode, 16, NULL, NULL );
@@ -153,20 +153,20 @@ static FILE *_tmpfile(void)
 {
     FILE *fp = NULL;
 
-    TCHAR   szTempPath[MAX_PATH];
+    TCHAR	szTempPath[MAX_PATH];
 
     if ( GetTempPath( SAL_N_ELEMENTS(szTempPath), szTempPath ) )
     {
-        TCHAR   szFileName[MAX_PATH];
+        TCHAR	szFileName[MAX_PATH];
 
         if ( GetTempFileName( szTempPath, TEXT("CRT"), 0, szFileName ) )
         {
-            HANDLE  hFile =  CreateFile(
-                szFileName,
-                GENERIC_READ | GENERIC_WRITE,
-                0, NULL,
-                OPEN_EXISTING,
-                FILE_FLAG_DELETE_ON_CLOSE | FILE_ATTRIBUTE_NORMAL,
+            HANDLE	hFile =  CreateFile( 
+                szFileName, 
+                GENERIC_READ | GENERIC_WRITE, 
+                0, NULL, 
+                OPEN_EXISTING, 
+                FILE_FLAG_DELETE_ON_CLOSE | FILE_ATTRIBUTE_NORMAL, 
                 NULL );
 
             if ( IsValidHandle( hFile ) )
@@ -184,18 +184,18 @@ static FILE *_tmpfile(void)
 
 static BOOL GetCrashDataPath( LPTSTR szBuffer )
 {
-    ::rtl::OUString ustrValue = ::rtl::OUString::createFromAscii("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}");
+    ::rtl::OUString	ustrValue = ::rtl::OUString::createFromAscii("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}");
     ::rtl::Bootstrap::expandMacros( ustrValue );
 
     if ( ustrValue.getLength() )
     {
         ustrValue += ::rtl::OUString::createFromAscii("/user/crashdata");
 
-        ::osl::FileBase::RC result = ::osl::Directory::createPath( ustrValue );
+        ::osl::FileBase::RC	result = ::osl::Directory::createPath( ustrValue );
 
         if ( ::osl::FileBase::E_None == result || ::osl::FileBase::E_EXIST == result )
         {
-            ::rtl::OUString ustrPath;
+            ::rtl::OUString	ustrPath;
 
             result = ::osl::FileBase::getSystemPathFromFileURL( ustrValue, ustrPath );
             if (  ::osl::FileBase::E_None == result  )
@@ -212,8 +212,8 @@ static BOOL GetCrashDataPath( LPTSTR szBuffer )
 
 static FILE *_open_reportfile( LPCTSTR lpExt, LPCTSTR lpMode )
 {
-    FILE    *fp = NULL;
-    TCHAR   szAppDataPath[MAX_PATH] = _T("");
+    FILE	*fp = NULL;
+    TCHAR	szAppDataPath[MAX_PATH] = _T("");	
 
     if ( GetCrashDataPath( szAppDataPath ) )
     {
@@ -230,13 +230,13 @@ static FILE *_open_reportfile( LPCTSTR lpExt, LPCTSTR lpMode )
 
 struct CrashReportParams
 {
-    BOOL                fAllowContact;
-    tstring             sEmail;
-    tstring             sTitle;
-    tstring             sComment;
-    ULONG               uInternetConnection;
-    tstring             sProxyServer;
-    tstring             sProxyPort;
+    BOOL				fAllowContact;
+    tstring				sEmail;
+    tstring				sTitle;
+    tstring				sComment;
+    ULONG				uInternetConnection;
+    tstring				sProxyServer;
+    tstring				sProxyPort;
 
     CrashReportParams();
 
@@ -252,8 +252,8 @@ BOOL WriteCommentFile( LPCTSTR lpComment );
 
 LONG RegReadValue( HKEY hBaseKey, LPCTSTR lpSubKey, LPCTSTR lpValueName, LPVOID lpData, DWORD cbData )
 {
-    HKEY    hKey = NULL;
-    LONG    lResult;
+    HKEY	hKey = NULL;
+    LONG	lResult;
 
     lResult = RegOpenKeyEx( hBaseKey, lpSubKey, 0, KEY_QUERY_VALUE, &hKey );
 
@@ -270,8 +270,8 @@ LONG RegReadValue( HKEY hBaseKey, LPCTSTR lpSubKey, LPCTSTR lpValueName, LPVOID
 
 LONG RegWriteValue( HKEY hBaseKey, LPCTSTR lpSubKey, LPCTSTR lpValueName, DWORD dwType, LPCVOID lpData, DWORD cbData )
 {
-    HKEY    hKey = NULL;
-    LONG    lResult;
+    HKEY	hKey = NULL;
+    LONG	lResult;
 
     lResult = RegCreateKeyEx( hBaseKey, lpSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, NULL );
 
@@ -301,20 +301,20 @@ CrashReportParams::CrashReportParams()
 
 void CrashReportParams::ReadFromRegistry()
 {
-    TCHAR   szBuffer[2048];
+    TCHAR	szBuffer[2048];
 
-    if ( ERROR_SUCCESS == RegReadValue(
-        HKEY_CURRENT_USER,
+    if ( ERROR_SUCCESS == RegReadValue( 
+        HKEY_CURRENT_USER, 
         TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
         TEXT("HTTPProxyServer"),
         szBuffer,
         sizeof(szBuffer) ) )
         sProxyServer = szBuffer;
 
-    DWORD   dwProxyPort;
+    DWORD	dwProxyPort;
 
-    if ( ERROR_SUCCESS == RegReadValue(
-        HKEY_CURRENT_USER,
+    if ( ERROR_SUCCESS == RegReadValue( 
+        HKEY_CURRENT_USER, 
         TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
         TEXT("HTTPProxyPort"),
         &dwProxyPort,
@@ -324,23 +324,23 @@ void CrashReportParams::ReadFromRegistry()
         sProxyPort = szBuffer;
     }
 
-    if ( ERROR_SUCCESS == RegReadValue(
-        HKEY_CURRENT_USER,
+    if ( ERROR_SUCCESS == RegReadValue( 
+        HKEY_CURRENT_USER, 
         TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
         TEXT("ReturnAddress"),
         szBuffer,
         sizeof(szBuffer) ) )
         sEmail = szBuffer;
 
-    RegReadValue(
-        HKEY_CURRENT_USER,
+    RegReadValue( 
+        HKEY_CURRENT_USER, 
         TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
         TEXT("AllowContact"),
         &fAllowContact,
         sizeof(fAllowContact) );
 
-    RegReadValue(
-        HKEY_CURRENT_USER,
+    RegReadValue( 
+        HKEY_CURRENT_USER, 
         TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
         TEXT("HTTPConnection"),
         &uInternetConnection,
@@ -351,43 +351,43 @@ void CrashReportParams::ReadFromRegistry()
 
 void CrashReportParams::WriteToRegistry()
 {
-    RegWriteValue(
-        HKEY_CURRENT_USER,
-        TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
-        TEXT("HTTPProxyServer"), REG_SZ,
-        sProxyServer.c_str(),
+    RegWriteValue( 
+        HKEY_CURRENT_USER, 
+        TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"), 
+        TEXT("HTTPProxyServer"), REG_SZ, 
+        sProxyServer.c_str(), 
         sizeof(TCHAR) * (sProxyServer.length() + 1) );
 
     LPTSTR endptr = NULL;
     DWORD dwProxyPort = _tcstoul( sProxyPort.c_str(), &endptr, 10 );
 
-    RegWriteValue(
-        HKEY_CURRENT_USER,
-        TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
-        TEXT("HTTPProxyPort"), REG_DWORD,
-        &dwProxyPort,
+    RegWriteValue( 
+        HKEY_CURRENT_USER, 
+        TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"), 
+        TEXT("HTTPProxyPort"), REG_DWORD, 
+        &dwProxyPort, 
         sizeof(DWORD) );
 
-    RegWriteValue(
-        HKEY_CURRENT_USER,
-        TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
-        TEXT("AllowContact"), REG_DWORD,
-        &fAllowContact,
+    RegWriteValue( 
+        HKEY_CURRENT_USER, 
+        TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"), 
+        TEXT("AllowContact"), REG_DWORD, 
+        &fAllowContact, 
         sizeof(DWORD) );
 
 
-    RegWriteValue(
-        HKEY_CURRENT_USER,
-        TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
-        TEXT("HTTPConnection"), REG_DWORD,
-        &uInternetConnection,
+    RegWriteValue( 
+        HKEY_CURRENT_USER, 
+        TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"), 
+        TEXT("HTTPConnection"), REG_DWORD, 
+        &uInternetConnection, 
         sizeof(DWORD) );
 
-    RegWriteValue(
-        HKEY_CURRENT_USER,
-        TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
-        TEXT("ReturnAddress"), REG_SZ,
-        sEmail.c_str(),
+    RegWriteValue( 
+        HKEY_CURRENT_USER, 
+        TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"), 
+        TEXT("ReturnAddress"), REG_SZ, 
+        sEmail.c_str(), 
         sizeof(TCHAR) * (sEmail.length() + 1) );
 }
 
@@ -395,7 +395,7 @@ void CrashReportParams::WriteToRegistry()
 
 void CrashReportParams::ReadFromEnvironment()
 {
-    TCHAR   szBuffer[2048];
+    TCHAR	szBuffer[2048];
 
     DWORD dwResult = GetEnvironmentVariable( TEXT("ERRORREPORT_HTTPPROXYSERVER"), szBuffer, SAL_N_ELEMENTS(szBuffer) );
 
@@ -441,20 +441,20 @@ void CrashReportParams::ReadFromEnvironment()
 
         if ( fp )
         {
-            CHAR    aUTF8Buffer[256];
-            size_t  nBytesRead;
+            CHAR	aUTF8Buffer[256];
+            size_t	nBytesRead;
 
             sComment = TEXT("");
 
             while ( 0 != (nBytesRead = fread( aUTF8Buffer, sizeof(aUTF8Buffer[0]), SAL_N_ELEMENTS(aUTF8Buffer), fp )) )
             {
-                TCHAR   aBuffer[256+1];
+                TCHAR	aBuffer[256+1];
 
-                DWORD   dwCharacters = MultiByteToWideChar( CP_UTF8, 0, aUTF8Buffer, nBytesRead, aBuffer, SAL_N_ELEMENTS(aBuffer) - 1 );
+                DWORD	dwCharacters = MultiByteToWideChar( CP_UTF8, 0, aUTF8Buffer, nBytesRead, aBuffer, SAL_N_ELEMENTS(aBuffer) - 1 );
                 aBuffer[dwCharacters] = 0;
                 sComment += aBuffer;
             }
-
+            
             fclose( fp );
         }
     }
@@ -491,18 +491,18 @@ static BOOL WINAPI DeinitRichEdit()
 static string trim_string( const string& rString )
 {
     string temp = rString;
-
+    
     while ( temp.length() && temp[0] == ' ' || temp[0] == '\t' )
         temp.erase( 0, 1 );
-
-    string::size_type   len = temp.length();
-
+        
+    string::size_type	len = temp.length();
+    
     while ( len && temp[len-1] == ' ' || temp[len-1] == '\t' )
     {
         temp.erase( len - 1, 1 );
         len = temp.length();
     }
-
+    
     return temp;
 }
 
@@ -510,13 +510,13 @@ static string trim_string( const string& rString )
 
 static int LoadAndFormatString( HINSTANCE hInstance, UINT uID, LPTSTR lpBuffer, int nBufferMax )
 {
-    TCHAR   szBuffer[FORMATBUFSIZE];
-    TCHAR   szBuffer2[FORMATBUFSIZE];
+    TCHAR	szBuffer[FORMATBUFSIZE];
+    TCHAR	szBuffer2[FORMATBUFSIZE];
 
     LoadString( hInstance, uID, szBuffer, SAL_N_ELEMENTS(szBuffer) );
 
-    LPCTSTR src;
-    LPTSTR  dest;
+    LPCTSTR	src;
+    LPTSTR	dest;
     for ( dest = szBuffer2, src = szBuffer; *src; src++, dest++ )
     {
         switch ( *src )
@@ -556,7 +556,7 @@ static string wstring2utf8( const wstring &rString )
 {
     int nBufSize = WideCharToMultiByte( CP_UTF8, 0, rString.c_str(), -1, NULL, 0, NULL, FALSE );
 
-    LPSTR   pBuffer = (LPSTR)alloca( nBufSize );
+    LPSTR	pBuffer = (LPSTR)alloca( nBufSize );
 
     WideCharToMultiByte(  CP_UTF8, 0, rString.c_str(), -1, pBuffer, nBufSize, NULL, FALSE );
 
@@ -608,11 +608,11 @@ static size_t fcopy( FILE *fpin, FILE *fpout )
 
 static string GetModuleDirectory( HMODULE hModule )
 {
-    TCHAR   szModuleName[MAX_PATH] = TEXT("");
-    TCHAR   szDrive[_MAX_DRIVE];
-    TCHAR   szDir[_MAX_DIR];
-    TCHAR   szFName[_MAX_FNAME];
-    TCHAR   szExt[_MAX_EXT];
+    TCHAR	szModuleName[MAX_PATH] = TEXT("");
+    TCHAR	szDrive[_MAX_DRIVE];
+    TCHAR	szDir[_MAX_DIR];
+    TCHAR	szFName[_MAX_FNAME];
+    TCHAR	szExt[_MAX_EXT];
 
     if ( GetModuleFileName( hModule, szModuleName, MAX_PATH ) )
     {
@@ -620,7 +620,7 @@ static string GetModuleDirectory( HMODULE hModule )
         _tmakepath( szModuleName, szDrive, szDir, _T(""), _T("") );
     }
 
-    CHAR    szModuleNameUTF8[MAX_PATH] = "";
+    CHAR	szModuleNameUTF8[MAX_PATH] = "";
 
     WideCharToMultiByte( CP_UTF8, 0, szModuleName, -1, szModuleNameUTF8, SAL_N_ELEMENTS(szModuleNameUTF8), NULL, NULL );
     return string( szModuleNameUTF8 );
@@ -647,7 +647,7 @@ string GetFileName( const string& rFilePath )
 {
     string aName = rFilePath;
     size_t pos = aName.rfind( '\\' );
-
+    
     if ( string::npos != pos )
         return aName.substr( pos + 1 );
     else
@@ -658,31 +658,31 @@ string GetFileName( const string& rFilePath )
 
 BOOL WriteReportFile( CrashReportParams *pParams )
 {
-    BOOL    fSuccess = FALSE;
-    TCHAR   szTempPath[MAX_PATH];
+    BOOL	fSuccess = FALSE;
+    TCHAR	szTempPath[MAX_PATH];
 
     if ( GetTempPath( SAL_N_ELEMENTS(szTempPath), szTempPath ) )
     {
-        TCHAR   szFileName[MAX_PATH];
+        TCHAR	szFileName[MAX_PATH];
 
         if ( GetTempFileName( szTempPath, TEXT("RPM"), 0, szFileName ) )
         {
-            HANDLE  hFile =  CreateFile( szFileName, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL );
+            HANDLE	hFile =  CreateFile( szFileName, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL );
 
             if ( hFile )
             {
-                int fd = _open_osfhandle( (LONG)hFile, _O_TEXT );
-                FILE    *fp = _fdopen( fd, "w+t" );
-                CHAR    szTitle[1024] = "";
-                CHAR    szBuildId[1024] = "";
-                CHAR    szEmail[1024] = "";
+                int	fd = _open_osfhandle( (LONG)hFile, _O_TEXT );				
+                FILE	*fp = _fdopen( fd, "w+t" );
+                CHAR	szTitle[1024] = "";
+                CHAR	szBuildId[1024] = "";
+                CHAR	szEmail[1024] = "";
                 const char *pszUserType = getenv( "STAROFFICE_USERTYPE" );
 
                 WideCharToMultiByte( CP_UTF8, 0, pParams->sTitle.c_str(), -1, szTitle, sizeof(szTitle), NULL, NULL );
                 WideCharToMultiByte( CP_UTF8, 0, g_szBuildId, -1, szBuildId, sizeof(szBuildId), NULL, NULL );
                 WideCharToMultiByte( CP_UTF8, 0, pParams->sEmail.c_str(), -1, szEmail, sizeof(szEmail), NULL, NULL );
-
-                fprintf( fp,
+                
+                fprintf( fp, 
                     "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
                     "<!DOCTYPE errormail:errormail PUBLIC \"-//OpenOffice.org//DTD ErrorMail 1.0//EN\" \"errormail.dtd\">\n"
                     "<errormail:errormail xmlns:errormail=\"http://openoffice.org/2002/errormail\" usertype=\"%s\">\n"
@@ -701,7 +701,7 @@ BOOL WriteReportFile( CrashReportParams *pParams )
                     "<reportmail:attachment name=\"user.dmp\" media-type=\"application/octet-stream\" class=\"UserDump\"/>\n"
                     "</reportmail:mail>\n"
 
-                    "<officeinfo:officeinfo xmlns:officeinfo=\"http://openoffice.org/2002/officeinfo\" build=\"%s\" platform=\"%s\" language=\"%s\" procpath=\"%s\" exceptiontype=\"0x%08X\" product=\"%s\"/>\n",
+                    "<officeinfo:officeinfo xmlns:officeinfo=\"http://openoffice.org/2002/officeinfo\" build=\"%s\" platform=\"%s\" language=\"%s\" procpath=\"%s\" exceptiontype=\"0x%08X\" product=\"%s\"/>\n", 
                     szBuildId,
                     _INPATH,
                     xml_encode(g_strDefaultLanguage).c_str(),
@@ -710,7 +710,7 @@ BOOL WriteReportFile( CrashReportParams *pParams )
                     xml_encode(wstring2utf8(g_wstrProductKey)).c_str()
                     );
 
-                OSVERSIONINFO   VersionInfo;
+                OSVERSIONINFO	VersionInfo;
 
                 ZeroMemory( &VersionInfo, sizeof(VersionInfo) );
                 VersionInfo.dwOSVersionInfoSize = sizeof(VersionInfo );
@@ -757,8 +757,8 @@ BOOL WriteReportFile( CrashReportParams *pParams )
 
 static BOOL SaveDumpFile( HWND hwndOwner )
 {
-    OPENFILENAME    ofn;
-    TCHAR   szFileName[MAX_PATH] = TEXT("");
+    OPENFILENAME	ofn;
+    TCHAR	szFileName[MAX_PATH] = TEXT("");
 
     ZeroMemory( &ofn, sizeof(ofn) );
     ofn.lStructSize = sizeof(ofn);
@@ -791,10 +791,10 @@ static BOOL SetWindowRect( HWND hwnd, const RECT *lprc, BOOL fRepaint )
     return MoveWindow( hwnd, lprc->left, lprc->top, lprc->right - lprc->left, lprc->bottom - lprc->top, fRepaint );
 }
 
-#define GM_LOX  0x01
-#define GM_HIX  0x02
-#define GM_LOY  0x04
-#define GM_HIY  0x08
+#define GM_LOX	0x01
+#define GM_HIX	0x02
+#define GM_LOY	0x04
+#define GM_HIY	0x08
 
 static BOOL SetGrowMode( HWND hwnd, DWORD dwGrowMode )
 {
@@ -808,8 +808,8 @@ static DWORD GetGrowMode( HWND hwnd )
 
 static BOOL GrowWindow( HWND hwnd, LONG dxClient, LONG dyClient, BOOL fRepaint )
 {
-    DWORD   dwGrowMode = GetGrowMode( hwnd );
-    RECT    rc;
+    DWORD	dwGrowMode = GetGrowMode( hwnd );
+    RECT	rc;
 
     GetWindowRect( hwnd, &rc );
 
@@ -833,8 +833,8 @@ BOOL CALLBACK GrowChildWindows(
   LPARAM lParam   // application-defined value
 )
 {
-    LONG    cx = (SHORT)LOWORD( lParam );
-    LONG    cy = (SHORT)HIWORD( lParam );
+    LONG	cx = (SHORT)LOWORD( lParam );
+    LONG	cy = (SHORT)HIWORD( lParam );
 
     GrowWindow( hwnd, cx, cy, TRUE );
 
@@ -842,7 +842,7 @@ BOOL CALLBACK GrowChildWindows(
 }
 
 /*
-BOOL CALLBACK EnumChildProc(HWND hwndChild, LPARAM lParam)
+BOOL CALLBACK EnumChildProc(HWND hwndChild, LPARAM lParam) 
 {
     HFONT aFont = *((HFONT*) lParam);
     HDC hDC = GetDC( hwndChild );
@@ -858,27 +858,27 @@ void ApplySystemFont( HWND hwndDlg )
     if ( SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, sizeof( aNonClientMetrics ), &aNonClientMetrics, 0 ) )
     {
         HFONT aSysFont = CreateFontIndirectA( &aNonClientMetrics.lfMessageFont );
-        EnumChildWindows(hwndDlg, EnumChildProc, (LPARAM) &aSysFont);
+        EnumChildWindows(hwndDlg, EnumChildProc, (LPARAM) &aSysFont); 
     }
 }
 */
 
-BOOL CALLBACK PreviewDialogProc(
-    HWND hwndDlg,
-    UINT uMsg,
-    WPARAM wParam,
-    LPARAM lParam
+BOOL CALLBACK PreviewDialogProc( 
+    HWND hwndDlg, 
+    UINT uMsg, 
+    WPARAM wParam, 
+    LPARAM lParam 
     )
 {
-    static RECT rcClient;
+    static RECT	rcClient;
 
     switch ( uMsg )
     {
     case WM_SIZE:
         {
-        LONG    cx = LOWORD( lParam );
-        LONG    cy = HIWORD( lParam );
-        LONG    dxClient, dyClient;
+        LONG	cx = LOWORD( lParam );
+        LONG	cy = HIWORD( lParam );
+        LONG	dxClient, dyClient;
 
         dxClient = cx - rcClient.right;
         dyClient = cy - rcClient.bottom;
@@ -896,32 +896,32 @@ BOOL CALLBACK PreviewDialogProc(
 
             CrashReportParams *pParams = (CrashReportParams *)lParam;
 
-            TCHAR   szBuffer[256] = TEXT("");
-            HINSTANCE   hInstance = (HINSTANCE)GetWindowLong( hwndDlg, GWL_HINSTANCE );
-            HWND    hwndParent = (HWND)GetWindowLong( hwndDlg, GWL_HWNDPARENT );
-
+            TCHAR	szBuffer[256] = TEXT("");
+            HINSTANCE	hInstance = (HINSTANCE)GetWindowLong( hwndDlg, GWL_HINSTANCE );
+            HWND	hwndParent = (HWND)GetWindowLong( hwndDlg, GWL_HWNDPARENT );
+            
             GetWindowText( hwndParent, szBuffer, SAL_N_ELEMENTS(szBuffer) );
             SetWindowText( hwndDlg, szBuffer );
 
             LoadAndFormatString( hInstance, IDS_OK_BUTTON, szBuffer, SAL_N_ELEMENTS(szBuffer) );
             Button_SetText( GetDlgItem(hwndDlg, IDOK), szBuffer );
 
-            basic_string<TCHAR> aString;
+            basic_string<TCHAR>	aString;
 
             aString.append( pParams->sTitle );
             aString.append( _T("\r\n\r\n") );
             aString.append( pParams->sComment );
             aString.append( _T("\r\n---------- report ----------\r\n") );
 
-            FILE    *fp = fopen( g_szReportFileNameA, "r" );
+            FILE	*fp = fopen( g_szReportFileNameA, "r" );
 
             if ( fp )
             {
-                char    buf[1024];
+                char	buf[1024];
 
                 while ( fgets( buf, SAL_N_ELEMENTS(buf), fp ) != NULL )
                 {
-                    WCHAR   bufW[1024];
+                    WCHAR	bufW[1024];
 
                     MultiByteToWideChar( CP_UTF8, 0, buf, -1, bufW, SAL_N_ELEMENTS(bufW) );
 
@@ -937,8 +937,8 @@ BOOL CALLBACK PreviewDialogProc(
 
             if ( fp )
             {
-                unsigned char   buf[16];
-                int     count;
+                unsigned char	buf[16];
+                int		count;
 
                 do
                 {
@@ -948,7 +948,7 @@ BOOL CALLBACK PreviewDialogProc(
 
                     for ( i = 0; i < count; i++ )
                     {
-                        TCHAR   output[16];
+                        TCHAR	output[16];
 
                         _sntprintf( output, SAL_N_ELEMENTS(output), _T("%02X\x20"), buf[i] );
                         aString.append( output );
@@ -960,7 +960,7 @@ BOOL CALLBACK PreviewDialogProc(
 
                     for ( i = 0; i < count; i++ )
                     {
-                        TCHAR   output[2];
+                        TCHAR	output[2];
 
                         if ( (int)buf[i] >= 0x20 && (int)buf[i] <= 0x7F )
                             output[0] = (TCHAR)buf[i];
@@ -1002,12 +1002,12 @@ BOOL CALLBACK PreviewDialogProc(
 
 static void PreviewReport( HWND hwndParent, CrashReportParams *pParams )
 {
-    HINSTANCE   hInstance = (HINSTANCE)GetWindowLong(hwndParent, GWL_HINSTANCE );
+    HINSTANCE	hInstance = (HINSTANCE)GetWindowLong(hwndParent, GWL_HINSTANCE );
 
     WriteReportFile( pParams );
 
-    DialogBoxParam(
-        hInstance,
+    DialogBoxParam( 
+        hInstance, 
         MAKEINTRESOURCE(IDD_PREVIEW_FRAME),
         hwndParent,
         PreviewDialogProc,
@@ -1033,11 +1033,11 @@ void UpdateOptionsDialogControls( HWND hwndDlg )
 
 //***************************************************************************
 
-BOOL CALLBACK OptionsDialogProc(
-    HWND hwndDlg,
-    UINT uMsg,
-    WPARAM wParam,
-    LPARAM lParam
+BOOL CALLBACK OptionsDialogProc( 
+    HWND hwndDlg, 
+    UINT uMsg, 
+    WPARAM wParam, 
+    LPARAM lParam 
     )
 {
     static CrashReportParams *pParams;
@@ -1046,9 +1046,9 @@ BOOL CALLBACK OptionsDialogProc(
     {
     case WM_INITDIALOG:
         {
-            TCHAR   szBuffer[1024] = TEXT("");
-            HINSTANCE   hInstance = (HINSTANCE)GetWindowLong( hwndDlg, GWL_HINSTANCE );
-            //HWND  hwndParent = (HWND)GetWindowLong( hwndDlg, GWL_HWNDPARENT );
+            TCHAR	szBuffer[1024] = TEXT("");
+            HINSTANCE	hInstance = (HINSTANCE)GetWindowLong( hwndDlg, GWL_HINSTANCE );
+            //HWND	hwndParent = (HWND)GetWindowLong( hwndDlg, GWL_HWNDPARENT );
 
             pParams = (CrashReportParams *)lParam;
 
@@ -1084,10 +1084,10 @@ BOOL CALLBACK OptionsDialogProc(
 
             Button_SetCheck( GetDlgItem(hwndDlg, IDC_RADIO_SYSTEM + pParams->uInternetConnection), BST_CHECKED );
 
-            SendMessage(
-                GetDlgItem(hwndDlg, IDC_PROXY_DESCRIPTION),
-                EM_SETBKGNDCOLOR,
-                (WPARAM)FALSE,
+            SendMessage( 
+                GetDlgItem(hwndDlg, IDC_PROXY_DESCRIPTION), 
+                EM_SETBKGNDCOLOR, 
+                (WPARAM)FALSE, 
                 GetSysColor( COLOR_3DFACE ) );
             LoadAndFormatString( hInstance, IDS_PROXY_DESCRIPTION, szBuffer, SAL_N_ELEMENTS(szBuffer) );
             Edit_SetText( GetDlgItem(hwndDlg, IDC_PROXY_DESCRIPTION), szBuffer );
@@ -1137,10 +1137,10 @@ BOOL CALLBACK OptionsDialogProc(
 
 static void OptionsDialog( HWND hwndParent, CrashReportParams *pParams )
 {
-    HINSTANCE   hInstance = (HINSTANCE)GetWindowLong(hwndParent, GWL_HINSTANCE );
+    HINSTANCE	hInstance = (HINSTANCE)GetWindowLong(hwndParent, GWL_HINSTANCE );
 
-    if ( IDOK == DialogBoxParam(
-        hInstance,
+    if ( IDOK == DialogBoxParam( 
+        hInstance, 
         MAKEINTRESOURCE(IDD_OPTIONS_FRAME),
         hwndParent,
         OptionsDialogProc,
@@ -1153,30 +1153,30 @@ static void OptionsDialog( HWND hwndParent, CrashReportParams *pParams )
 
 void UpdateReportDialogControls( HWND hwndDlg )
 {
-    EnableWindow(
-        GetDlgItem(hwndDlg, IDC_EDIT_EMAIL),
+    EnableWindow( 
+        GetDlgItem(hwndDlg, IDC_EDIT_EMAIL), 
         Button_GetCheck(GetDlgItem(hwndDlg, IDC_ALLOW_CONTACT)) & BST_CHECKED ? TRUE : FALSE );
-    EnableWindow(
-        GetDlgItem(hwndDlg, IDC_LABEL_EMAIL),
+    EnableWindow( 
+        GetDlgItem(hwndDlg, IDC_LABEL_EMAIL), 
         Button_GetCheck(GetDlgItem(hwndDlg, IDC_ALLOW_CONTACT)) & BST_CHECKED ? TRUE : FALSE );
 }
 
 //***************************************************************************
 
-BOOL CALLBACK ReportDialogProc(
-    HWND hwndDlg,
-    UINT uMsg,
-    WPARAM wParam,
-    LPARAM
+BOOL CALLBACK ReportDialogProc( 
+    HWND hwndDlg, 
+    UINT uMsg, 
+    WPARAM wParam, 
+    LPARAM 
     )
 {
     switch ( uMsg )
     {
     case WM_INITDIALOG:
         {
-            CrashReportParams   *pParams = (CrashReportParams*)GetWindowLong( GetParent(hwndDlg), GWL_USERDATA );
-            HINSTANCE   hInstance = (HINSTANCE)GetWindowLong(hwndDlg, GWL_HINSTANCE );
-            TCHAR       szBuffer[FORMATBUFSIZE];
+            CrashReportParams	*pParams = (CrashReportParams*)GetWindowLong( GetParent(hwndDlg), GWL_USERDATA );
+            HINSTANCE	hInstance = (HINSTANCE)GetWindowLong(hwndDlg, GWL_HINSTANCE );
+            TCHAR		szBuffer[FORMATBUFSIZE];
 
             LoadAndFormatString( hInstance, IDS_REPORT_INTRO, szBuffer, SAL_N_ELEMENTS(szBuffer) );
             Static_SetText( GetDlgItem(hwndDlg, IDC_REPORT_INTRO), szBuffer );
@@ -1219,9 +1219,9 @@ BOOL CALLBACK ReportDialogProc(
     case WM_SHOWWINDOW:
         if ( (BOOL)wParam )
         {
-            HINSTANCE   hInstance = (HINSTANCE)GetWindowLong(hwndDlg, GWL_HINSTANCE );
-            CrashReportParams   *pParams = (CrashReportParams*)GetWindowLong( GetParent(hwndDlg), GWL_USERDATA );
-            TCHAR       szBuffer[FORMATBUFSIZE];
+            HINSTANCE	hInstance = (HINSTANCE)GetWindowLong(hwndDlg, GWL_HINSTANCE );
+            CrashReportParams	*pParams = (CrashReportParams*)GetWindowLong( GetParent(hwndDlg), GWL_USERDATA );
+            TCHAR		szBuffer[FORMATBUFSIZE];
 
             LoadAndFormatString( hInstance, IDS_REPORT_CAPTION, szBuffer, SAL_N_ELEMENTS(szBuffer) );
             SetWindowText( GetParent(hwndDlg), szBuffer );
@@ -1241,9 +1241,9 @@ BOOL CALLBACK ReportDialogProc(
             Edit_SetText( GetDlgItem(hwndDlg, IDC_EDIT_DESCRIPTION), pParams->sComment.c_str() );
 
             /*
-            SetWindowLong( GetDlgItem(GetParent(hwndDlg),IDFINISH), GWL_STYLE,
+            SetWindowLong( GetDlgItem(GetParent(hwndDlg),IDFINISH), GWL_STYLE, 
                 GetWindowLong( GetDlgItem(GetParent(hwndDlg),IDFINISH), GWL_STYLE) | BS_DEFPUSHBUTTON );
-            SetWindowLong( GetDlgItem(GetParent(hwndDlg),IDBACK), GWL_STYLE,
+            SetWindowLong( GetDlgItem(GetParent(hwndDlg),IDBACK), GWL_STYLE, 
                 GetWindowLong( GetDlgItem(GetParent(hwndDlg),IDBACK), GWL_STYLE) &~ BS_DEFPUSHBUTTON );
                 */
             SetFocus( GetDlgItem(hwndDlg,IDC_EDIT_TITLE) );
@@ -1254,9 +1254,9 @@ BOOL CALLBACK ReportDialogProc(
         {
         case IDC_SHOW_REPORT:
             {
-                TCHAR   szBuffer[32767];
+                TCHAR	szBuffer[32767];
 
-                CrashReportParams   *pParams = (CrashReportParams*)GetWindowLong( GetParent(hwndDlg), GWL_USERDATA );
+                CrashReportParams	*pParams = (CrashReportParams*)GetWindowLong( GetParent(hwndDlg), GWL_USERDATA );
 
                 pParams->fAllowContact = Button_GetCheck( GetDlgItem(hwndDlg, IDC_ALLOW_CONTACT) ) ? TRUE : FALSE;
 
@@ -1277,7 +1277,7 @@ BOOL CALLBACK ReportDialogProc(
             return TRUE;
         case IDC_OPTIONS:
             {
-                CrashReportParams   *pParams = (CrashReportParams*)GetWindowLong( GetParent(hwndDlg), GWL_USERDATA );
+                CrashReportParams	*pParams = (CrashReportParams*)GetWindowLong( GetParent(hwndDlg), GWL_USERDATA );
                 OptionsDialog( GetParent(hwndDlg), pParams );
             }
             return TRUE;
@@ -1301,17 +1301,17 @@ BOOL CALLBACK WelcomeDialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
     {
     case WM_INITDIALOG:
         {
-            HINSTANCE   hInstance = (HINSTANCE)GetWindowLong(hwndDlg, GWL_HINSTANCE );
-            HWND    hwndRichEdit = GetDlgItem(hwndDlg, IDC_RICHEDIT21);
-            TCHAR   szBuffer[FORMATBUFSIZE];
-            TCHAR   szBuffer2[FORMATBUFSIZE];
-            TCHAR   szURL[256];
-            TCHAR   szCaption[256];
-
-            SendMessage(
-                hwndRichEdit,
-                EM_SETBKGNDCOLOR,
-                (WPARAM)FALSE,
+            HINSTANCE	hInstance = (HINSTANCE)GetWindowLong(hwndDlg, GWL_HINSTANCE );
+            HWND	hwndRichEdit = GetDlgItem(hwndDlg, IDC_RICHEDIT21);
+            TCHAR	szBuffer[FORMATBUFSIZE];
+            TCHAR	szBuffer2[FORMATBUFSIZE];
+            TCHAR	szURL[256];
+            TCHAR	szCaption[256];
+
+            SendMessage( 
+                hwndRichEdit, 
+                EM_SETBKGNDCOLOR, 
+                (WPARAM)FALSE, 
                 GetSysColor( COLOR_3DFACE ) );
 
             SendMessage( hwndRichEdit, EM_SETEVENTMASK, 0, ENM_LINK );
@@ -1328,14 +1328,14 @@ BOOL CALLBACK WelcomeDialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 
             LoadAndFormatString( hInstance, IDS_WELCOME_CAPTION, szCaption, SAL_N_ELEMENTS(szCaption) );
             SetWindowText( GetParent(hwndDlg), szCaption );
-
+             
         }
         return TRUE;
     case WM_SHOWWINDOW:
         if ( (BOOL)wParam )
         {
-            HINSTANCE   hInstance = (HINSTANCE)GetWindowLong(hwndDlg, GWL_HINSTANCE );
-            TCHAR       szBuffer[FORMATBUFSIZE];
+            HINSTANCE	hInstance = (HINSTANCE)GetWindowLong(hwndDlg, GWL_HINSTANCE );
+            TCHAR		szBuffer[FORMATBUFSIZE];
 
             LoadAndFormatString( hInstance, IDS_WELCOME_CAPTION, szBuffer, SAL_N_ELEMENTS(szBuffer) );
             SetWindowText( GetParent(hwndDlg), szBuffer );
@@ -1355,16 +1355,16 @@ BOOL CALLBACK WelcomeDialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
         break;
     case WM_NOTIFY:
         {
-            LPNMHDR pnmh = (LPNMHDR)lParam;
-
+            LPNMHDR	pnmh = (LPNMHDR)lParam;
+            
             if ( pnmh->idFrom == IDC_RICHEDIT21 && pnmh->code == EN_LINK )
             {
-                ENLINK  *plink = (ENLINK*)lParam;
+                ENLINK	*plink = (ENLINK*)lParam;
 
                 if ( plink->msg == WM_LBUTTONUP )
                 {
-                    TCHAR   szBuffer[256];
-                    TEXTRANGE   range;
+                    TCHAR	szBuffer[256];
+                    TEXTRANGE	range;
 
                     range.chrg = plink->chrg;
                     range.lpstrText = szBuffer;
@@ -1380,43 +1380,43 @@ BOOL CALLBACK WelcomeDialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
     default:
         break;
     }
-
+    
     return FALSE;
 }
 //***************************************************************************
 
 BOOL CALLBACK DialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam )
 {
-    static  HWND    hwndPages[2] = { NULL };
-    static  int     iActualPage = 0;
+    static	HWND	hwndPages[2] = { NULL };
+    static	int		iActualPage = 0;
 
     switch ( uMsg )
     {
     case WM_INITDIALOG:
         {
-            HINSTANCE   hInstance = (HINSTANCE)GetWindowLong(hwndDlg, GWL_HINSTANCE );
-            TCHAR       szBuffer[FORMATBUFSIZE];
+            HINSTANCE	hInstance = (HINSTANCE)GetWindowLong(hwndDlg, GWL_HINSTANCE );
+            TCHAR		szBuffer[FORMATBUFSIZE];
 
             SetWindowLong( hwndDlg, GWL_USERDATA, (LONG)lParam );
-            hwndPages[0] = CreateDialog(
+            hwndPages[0] = CreateDialog( 
                 hInstance,
                 MAKEINTRESOURCE(IDD_WELCOME_PAGE),
                 hwndDlg,
                 WelcomeDialogProc );
 
-            hwndPages[1] = CreateDialog(
+            hwndPages[1] = CreateDialog( 
                 hInstance,
                 MAKEINTRESOURCE(IDD_REPORT_PAGE),
                 hwndDlg,
                 ReportDialogProc );
 
-            CHARFORMAT  chfmt;
+            CHARFORMAT	chfmt;
 
             chfmt.cbSize = sizeof(chfmt);
             chfmt.dwMask = CFM_BOLD;
             chfmt.dwEffects = CFE_BOLD;
 
-            SendMessage(
+            SendMessage( 
                 GetDlgItem(hwndDlg, IDC_HEADER),
                 EM_SETCHARFORMAT,
                 SCF_ALL,
@@ -1462,8 +1462,8 @@ BOOL CALLBACK DialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam
             return TRUE;
         case IDFINISH:
             {
-                TCHAR   szBuffer[32767];
-                CrashReportParams   *pParams = (CrashReportParams*)GetWindowLong( hwndDlg, GWL_USERDATA );
+                TCHAR	szBuffer[32767];
+                CrashReportParams	*pParams = (CrashReportParams*)GetWindowLong( hwndDlg, GWL_USERDATA );
 
                 pParams->fAllowContact = Button_GetCheck( GetDlgItem(hwndPages[1], IDC_ALLOW_CONTACT) ) ? TRUE : FALSE;
 
@@ -1478,7 +1478,7 @@ BOOL CALLBACK DialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam
 
                 if ( pParams->fAllowContact && !pParams->sEmail.length() )
                 {
-                    TCHAR   szMessage[MAX_TEXT_BUFFER];
+                    TCHAR	szMessage[MAX_TEXT_BUFFER];
 
                     LoadAndFormatString( GetModuleHandle(NULL), IDS_ERROR_MSG_NOEMAILADDRESS, szMessage, SAL_N_ELEMENTS(szMessage) );
 
@@ -1515,8 +1515,8 @@ BOOL CALLBACK DialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam
 //* Generate MD5 checksum
 //*****************************************************************************
 
-#define MAGIC_DESCRIPTION_FILLER    'x'
-#define MAGIC_DESCRIPTION_COUNT     80
+#define MAGIC_DESCRIPTION_FILLER	'x'
+#define MAGIC_DESCRIPTION_COUNT		80
 
 static void repatch_soffice_exe( void *pBuffer, size_t nBufSize )
 {
@@ -1575,7 +1575,7 @@ static void normalize_pe_image(sal_uInt8* buffer, size_t nBufferSize)
     const int PE_SIGNATURE_SIZE                 = 4;
     const int COFFHEADER_SIZE                   = 20;
     const int OFFSET_PE_OPTIONALHEADER_CHECKSUM = 64;
-
+    
     // Check the header part of the file buffer
     if (buffer[0] == 'M' && buffer[1] == 'Z')
     {
@@ -1592,7 +1592,7 @@ static void normalize_pe_image(sal_uInt8* buffer, size_t nBufferSize)
                 {
                     // Set timedatestamp and checksum fields to a normalized
                     // value to enforce the same MD5 checksum for identical
-                    // Windows  executables/libraries.
+                    // Windows	executables/libraries.
                     buffer[PEHeaderOffset+OFFSET_COFF_TIMEDATESTAMP] = 0;
                     buffer[PEHeaderOffset+OFFSET_COFF_TIMEDATESTAMP+1] = 0;
                     buffer[PEHeaderOffset+OFFSET_COFF_TIMEDATESTAMP+2] = 0;
@@ -1615,14 +1615,14 @@ static void normalize_pe_image(sal_uInt8* buffer, size_t nBufferSize)
 static sal_uInt32 calc_md5_checksum(  const char *filename, sal_uInt8 *pChecksum, sal_uInt32 nChecksumLen )
 {
     const int MINIMAL_FILESIZE = 512;
-
-    sal_uInt32  nBytesProcessed = 0;
+    
+    sal_uInt32	nBytesProcessed = 0;
 
     FILE *fp = fopen( filename, "rb" );
 
     if ( fp )
     {
-        long    nFileSize;
+        long	nFileSize;
 
         if ( 0 == fseek( fp, 0, SEEK_END ) && -1 != (nFileSize = ftell(fp)) )
         {
@@ -1630,7 +1630,7 @@ static sal_uInt32 calc_md5_checksum(  const char *filename, sal_uInt8 *pChecksum
 
             sal_uInt8 *pBuffer = new sal_uInt8[nFileSize];
             size_t nBytesRead = fread( pBuffer, 1, nFileSize, fp );
-
+            
             if ( sal::static_int_cast<long>(nBytesRead) == nFileSize )
             {
                 if ( 0 == stricmp( GetFileName(filename).c_str(), "soffice.bin" ) )
@@ -1640,7 +1640,7 @@ static sal_uInt32 calc_md5_checksum(  const char *filename, sal_uInt8 *pChecksum
 
                 rtlDigestError error = rtl_digest_MD5 (
                     pBuffer,   nBytesRead,
-                    pChecksum, nChecksumLen );
+                    pChecksum, nChecksumLen	);
 
                 if ( rtl_Digest_E_None == error )
                     nBytesProcessed = nBytesRead;
@@ -1659,7 +1659,7 @@ static sal_uInt32 calc_md5_checksum(  const char *filename, sal_uInt8 *pChecksum
 #if 0
 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, "rb" );
 
@@ -1669,14 +1669,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;
             }
 
@@ -1702,32 +1702,32 @@ static sal_uInt32 calc_md5_checksum( const char *filename, sal_uInt8 *pChecksum,
 
 static bool WriteStackFile( FILE *fout, hash_map< string, string >& rLibraries, DWORD dwProcessId, PEXCEPTION_POINTERS pExceptionPointers )
 {
-    bool    fSuccess = false;
+    bool	fSuccess = false;
 
     if ( fout && dwProcessId && pExceptionPointers )
     {
-        HANDLE  hProcess = OpenProcess( PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, dwProcessId );
+        HANDLE	hProcess = OpenProcess( PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, dwProcessId );
 
         if ( IsValidHandle(hProcess) )
         {
-            EXCEPTION_POINTERS  aExceptionPointers;
-            CONTEXT             aContextRecord;
+            EXCEPTION_POINTERS	aExceptionPointers;
+            CONTEXT				aContextRecord;
 
-            ReadProcessMemory(
-                hProcess,
-                pExceptionPointers,
-                &aExceptionPointers,
+            ReadProcessMemory( 
+                hProcess, 
+                pExceptionPointers, 
+                &aExceptionPointers, 
                 sizeof(aExceptionPointers),
                 NULL );
 
-            ReadProcessMemory(
-                hProcess,
-                aExceptionPointers.ContextRecord,
-                &aContextRecord,
+            ReadProcessMemory( 
+                hProcess, 
+                aExceptionPointers.ContextRecord, 
+                &aContextRecord, 
                 sizeof(aContextRecord),
                 NULL );
 
-            STACKFRAME  frame;
+            STACKFRAME	frame;
 
             ZeroMemory( &frame, sizeof(frame) );
             frame.AddrPC.Offset = aContextRecord.Eip;
@@ -1746,7 +1746,7 @@ static bool WriteStackFile( FILE *fout, hash_map< string, string >& rLibraries,
             {
                 fSuccess = true;
 
-                bSuccess = StackWalk( IMAGE_FILE_MACHINE_I386,
+                bSuccess = StackWalk( IMAGE_FILE_MACHINE_I386, 
                     hProcess,
                     NULL,
                     &frame,
@@ -1762,7 +1762,7 @@ static bool WriteStackFile( FILE *fout, hash_map< string, string >& rLibraries,
                     //       Unicode versions have a W postfix. There's no macro
                     //       that depends on define UNICODE
 
-                    IMAGEHLP_MODULE moduleInfo;
+                    IMAGEHLP_MODULE	moduleInfo;
 
                     ZeroMemory( &moduleInfo, sizeof(moduleInfo) );
                     moduleInfo.SizeOfStruct = sizeof(moduleInfo);
@@ -1771,9 +1771,9 @@ static bool WriteStackFile( FILE *fout, hash_map< string, string >& rLibraries,
                     {
                         rLibraries[ GetFileName( moduleInfo.LoadedImageName ).c_str() ] = moduleInfo.LoadedImageName;
 
-                        DWORD   dwRelOffset = 0;
-                        BYTE    symbolBuffer[sizeof(IMAGEHLP_SYMBOL) + 256 ];
-                        PIMAGEHLP_SYMBOL    pSymbol = (PIMAGEHLP_SYMBOL)symbolBuffer;
+                        DWORD	dwRelOffset = 0;
+                        BYTE	symbolBuffer[sizeof(IMAGEHLP_SYMBOL) + 256 ];
+                        PIMAGEHLP_SYMBOL	pSymbol = (PIMAGEHLP_SYMBOL)symbolBuffer;
 
                         ZeroMemory( symbolBuffer, sizeof(symbolBuffer) );
                         pSymbol->SizeOfStruct = sizeof(IMAGEHLP_SYMBOL);
@@ -1803,7 +1803,7 @@ static bool WriteStackFile( FILE *fout, hash_map< string, string >& rLibraries,
                     else
                         fprintf( fout, "<errormail:StackInfo pos=\"%d\" ip=\"0x%p\"/>\n",
                             frameNum,
-                            frame.AddrPC.Offset
+                            frame.AddrPC.Offset 
                             );
 
                     frameNum++;
@@ -1833,21 +1833,21 @@ bool WriteChecksumFile( FILE *fchksum, const hash_map< string, string >& rLibrar
 
         hash_map< string, string >::const_iterator iter;
 
-        for ( iter = rLibraries.begin();
-            iter != rLibraries.end();
+        for ( iter = rLibraries.begin(); 
+            iter != rLibraries.end(); 
             iter++ )
         {
             sal_uInt8 checksum[RTL_DIGEST_LENGTH_MD5];
-            sal_uInt32 nBytesProcessed = calc_md5_checksum(
-                iter->second.c_str(),
+            sal_uInt32 nBytesProcessed = calc_md5_checksum( 
+                iter->second.c_str(), 
                 checksum, sizeof(checksum) );
 
             if ( nBytesProcessed )
             {
                 fprintf( fchksum, "<errormail:Checksum sum=\"0x" );
                 for ( int i = 0; i < sizeof(checksum); fprintf( fchksum, "%02X", checksum[i++] ) );
-                fprintf( fchksum, "\" bytes=\"%d\" file=\"%s\"/>\n",
-                    nBytesProcessed,
+                fprintf( fchksum, "\" bytes=\"%d\" file=\"%s\"/>\n", 
+                    nBytesProcessed, 
                     GetFileName( iter->first ) );
             }
         }
@@ -1864,17 +1864,17 @@ bool WriteChecksumFile( FILE *fchksum, const hash_map< string, string >& rLibrar
 
 BOOL FindDumpFile()
 {
-    TCHAR   szFileName[MAX_PATH];
+    TCHAR	szFileName[MAX_PATH];
 
     if ( GetCrashDataPath( szFileName ) )
     {
         _tcscat( szFileName, _T("\\crashdat.dmp") );
 
-        HANDLE  hFile =  CreateFile(
-            szFileName,
-            GENERIC_READ,
-            0, NULL,
-            OPEN_EXISTING,
+        HANDLE	hFile =  CreateFile( 
+            szFileName, 
+            GENERIC_READ, 
+            0, NULL, 
+            OPEN_EXISTING, 
             FILE_ATTRIBUTE_NORMAL, NULL );
 
         if ( hFile )
@@ -1893,17 +1893,17 @@ BOOL FindDumpFile()
 
 BOOL WriteDumpFile( DWORD dwProcessId, PEXCEPTION_POINTERS pExceptionPointers, DWORD dwThreadId )
 {
-    BOOL    fSuccess = FALSE;
-    PMINIDUMP_EXCEPTION_INFORMATION lpExceptionParam = NULL;
-    MINIDUMP_EXCEPTION_INFORMATION  ExceptionParam;
+    BOOL	fSuccess = FALSE;
+    PMINIDUMP_EXCEPTION_INFORMATION	lpExceptionParam = NULL;
+    MINIDUMP_EXCEPTION_INFORMATION	ExceptionParam;
 
-    HMODULE hDbgHelp = LoadLibrary( _T("DBGHELP.DLL" ) );
-    MiniDumpWriteDump_PROC  pMiniDumpWriteDump = NULL;
+    HMODULE	hDbgHelp = LoadLibrary( _T("DBGHELP.DLL" ) );
+    MiniDumpWriteDump_PROC	pMiniDumpWriteDump = NULL;
 
     if ( hDbgHelp )
     {
         pMiniDumpWriteDump = (MiniDumpWriteDump_PROC)GetProcAddress( hDbgHelp, "MiniDumpWriteDump" );
-
+        
         if ( !pMiniDumpWriteDump )
         {
             FreeLibrary( hDbgHelp );
@@ -1914,26 +1914,26 @@ BOOL WriteDumpFile( DWORD dwProcessId, PEXCEPTION_POINTERS pExceptionPointers, D
     if ( !pMiniDumpWriteDump )
         return false;
 
-    HANDLE  hProcess = OpenProcess( PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, dwProcessId );
+    HANDLE	hProcess = OpenProcess( PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, dwProcessId );
 
     if ( IsValidHandle(hProcess) )
     {
-        TCHAR   szTempPath[MAX_PATH];
+        TCHAR	szTempPath[MAX_PATH];
 
-//      if ( GetTempPath( SAL_N_ELEMENTS(szTempPath), szTempPath ) )
+//		if ( GetTempPath( SAL_N_ELEMENTS(szTempPath), szTempPath ) )
         if ( GetCrashDataPath( szTempPath ) )
         {
-            TCHAR   szFileName[MAX_PATH];
+            TCHAR	szFileName[MAX_PATH];
 
-//          if ( GetTempFileName( szTempPath, TEXT("DMP"), 0, szFileName ) )
+//			if ( GetTempFileName( szTempPath, TEXT("DMP"), 0, szFileName ) )
             _tcscpy( szFileName, szTempPath );
             _tcscat( szFileName, _T("\\crashdat.dmp") );
             {
-                HANDLE  hFile =  CreateFile(
-                    szFileName,
-                    GENERIC_READ | GENERIC_WRITE,
-                    0, NULL,
-//                  OPEN_EXISTING,
+                HANDLE	hFile =  CreateFile( 
+                    szFileName, 
+                    GENERIC_READ | GENERIC_WRITE, 
+                    0, NULL, 
+//					OPEN_EXISTING, 
                     CREATE_ALWAYS,
                     FILE_ATTRIBUTE_NORMAL, NULL );
 
@@ -1945,21 +1945,21 @@ BOOL WriteDumpFile( DWORD dwProcessId, PEXCEPTION_POINTERS pExceptionPointers, D
                         ExceptionParam.ExceptionPointers = pExceptionPointers;
                         ExceptionParam.ClientPointers = TRUE;
 
-                        EXCEPTION_POINTERS  aExceptionPointers;
-                        EXCEPTION_RECORD    aExceptionRecord;
+                        EXCEPTION_POINTERS	aExceptionPointers;
+                        EXCEPTION_RECORD	aExceptionRecord;
 
-                        ReadProcessMemory(
-                            hProcess,
-                            pExceptionPointers,
-                            &aExceptionPointers,
+                        ReadProcessMemory( 
+                            hProcess, 
+                            pExceptionPointers, 
+                            &aExceptionPointers, 
                             sizeof(aExceptionPointers),
                             NULL );
 
 
                         ReadProcessMemory(
-                            hProcess,
-                            aExceptionPointers.ExceptionRecord,
-                            &aExceptionRecord,
+                            hProcess, 
+                            aExceptionPointers.ExceptionRecord, 
+                            &aExceptionRecord, 
                             sizeof(aExceptionRecord),
                             NULL );
 
@@ -1993,10 +1993,10 @@ BOOL WriteDumpFile( DWORD dwProcessId, PEXCEPTION_POINTERS pExceptionPointers, D
 
 static DWORD FindProcessForImage( LPCTSTR lpImagePath )
 {
-    DWORD   dwProcessId = 0;
-    DWORD   aProcesses[1024];
-    DWORD   dwSize = 0;
-    TCHAR   szShortImagePath[MAX_PATH];
+    DWORD	dwProcessId = 0;
+    DWORD	aProcesses[1024];
+    DWORD	dwSize = 0;
+    TCHAR	szShortImagePath[MAX_PATH];
 
     if ( GetShortPathName( lpImagePath, szShortImagePath, SAL_N_ELEMENTS(szShortImagePath) ) &&
         EnumProcesses( aProcesses, sizeof(aProcesses), &dwSize ) )
@@ -2005,15 +2005,15 @@ static DWORD FindProcessForImage( LPCTSTR lpImagePath )
 
         for ( unsigned i = 0; !dwProcessId && i < nProcesses; i++ )
         {
-            HANDLE  hProcess = OpenProcess( PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, aProcesses[i] );
+            HANDLE	hProcess = OpenProcess( PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, aProcesses[i] );
 
             if ( IsValidHandle(hProcess) )
             {
-                TCHAR   szModulePath[MAX_PATH+1];
+                TCHAR	szModulePath[MAX_PATH+1];
 
                 if ( GetModuleFileNameEx( hProcess, NULL, szModulePath, MAX_PATH ) )
                 {
-                    TCHAR   szShortModulePath[MAX_PATH];
+                    TCHAR	szShortModulePath[MAX_PATH];
 
                     if ( GetShortPathName( szModulePath, szShortModulePath, SAL_N_ELEMENTS(szShortModulePath) ) )
                     {
@@ -2033,10 +2033,10 @@ static DWORD FindProcessForImage( LPCTSTR lpImagePath )
 
 static bool ParseCommandArgs( LPDWORD pdwProcessId, PEXCEPTION_POINTERS* ppException, LPDWORD pdwThreadId )
 {
-    int     argc = __argc;
+    int		argc = __argc;
 #ifdef __MINGW32__
 #ifdef _UNICODE
-    TCHAR   **argv = reinterpret_cast<TCHAR **>(alloca((argc+1)*sizeof(WCHAR*)));
+    TCHAR	**argv = reinterpret_cast<TCHAR **>(alloca((argc+1)*sizeof(WCHAR*)));
     int *sizes = reinterpret_cast<int *>(alloca(argc*sizeof(int)));
     int argsize=0;
     char **ptr;
@@ -2049,7 +2049,7 @@ static bool ParseCommandArgs( LPDWORD pdwProcessId, PEXCEPTION_POINTERS* ppExcep
         ++ptr;
     }
     ++argsize;
-    TCHAR   *args = reinterpret_cast<TCHAR *>(alloca(argsize*sizeof(WCHAR)));
+    TCHAR	*args = reinterpret_cast<TCHAR *>(alloca(argsize*sizeof(WCHAR)));
     ptr=__argv;
     TCHAR *cptr=args;
     for (i = 0; i < argc; ++i)
@@ -2064,12 +2064,12 @@ static bool ParseCommandArgs( LPDWORD pdwProcessId, PEXCEPTION_POINTERS* ppExcep
     argv[i]=cptr;
     *cptr=0;
 #else
-    TCHAR   **argv = __argv;
+    TCHAR	**argv = __argv;
 #endif
 #else
-    TCHAR   **argv = __targv;
+    TCHAR	**argv = __targv;
 #endif
-    bool    bSuccess = true;
+    bool	bSuccess = true;
 
     for ( int argn = 1; bSuccess && argn < argc; argn++ )
     {
@@ -2082,18 +2082,18 @@ static bool ParseCommandArgs( LPDWORD pdwProcessId, PEXCEPTION_POINTERS* ppExcep
              0 == _tcsicmp( argv[argn], _T("--help") )
              )
         {
-            HINSTANCE   hInstance = GetModuleHandle(NULL);
-            TCHAR   szUsage[FORMATBUFSIZE];
-            TCHAR   szProcess[FORMATBUFSIZE];
-            TCHAR   szProcessDescription[FORMATBUFSIZE];
-            TCHAR   szHelpDescription[FORMATBUFSIZE];
+            HINSTANCE	hInstance = GetModuleHandle(NULL);
+            TCHAR	szUsage[FORMATBUFSIZE];
+            TCHAR	szProcess[FORMATBUFSIZE];
+            TCHAR	szProcessDescription[FORMATBUFSIZE];
+            TCHAR	szHelpDescription[FORMATBUFSIZE];
 
             LoadAndFormatString( hInstance, IDS_MSG_CMDLINE_USAGE, szUsage, SAL_N_ELEMENTS(szUsage) );
             LoadAndFormatString( hInstance, IDS_MSG_PARAM_PROCESSID, szProcess, SAL_N_ELEMENTS(szProcess) );
             LoadAndFormatString( hInstance, IDS_MSG_PARAM_PROCESSID_DESCRIPTION, szProcessDescription, SAL_N_ELEMENTS(szProcessDescription) );
             LoadAndFormatString( hInstance, IDS_MSG_PARAM_HELP_DESCRIPTION, szHelpDescription, SAL_N_ELEMENTS(szHelpDescription) );
 
-            _tprintf(
+            _tprintf( 
                 TEXT("\n%s: crashrep %s\n\n")
                 TEXT("/?, -h[elp]          %s\n\n")
                 TEXT("%-20s %s\n\n"),
@@ -2118,7 +2118,7 @@ static bool ParseCommandArgs( LPDWORD pdwProcessId, PEXCEPTION_POINTERS* ppExcep
             else
                 bSuccess = false;
         }
-        else if ( 0 == _tcsicmp( argv[argn], _T("-t") ) ||
+        else if ( 0 == _tcsicmp( argv[argn], _T("-t") ) || 
                   0 == _tcsicmp( argv[argn], _T("/t") ) )
         {
             if ( ++argn < argc )
@@ -2126,29 +2126,29 @@ static bool ParseCommandArgs( LPDWORD pdwProcessId, PEXCEPTION_POINTERS* ppExcep
             else
                 bSuccess = false;
         }
-        else if ( 0 == _tcsicmp( argv[argn], _T("-noui") ) ||
+        else if ( 0 == _tcsicmp( argv[argn], _T("-noui") ) || 
                   0 == _tcsicmp( argv[argn], _T("/noui") ) )
         {
             g_bNoUserInterface = true;
         }
-        else if ( 0 == _tcsicmp( argv[argn], _T("-send") ) ||
+        else if ( 0 == _tcsicmp( argv[argn], _T("-send") ) || 
                   0 == _tcsicmp( argv[argn], _T("/send") ) )
         {
             g_bSendReport = true;
         }
-        else if ( 0 == _tcsicmp( argv[argn], _T("-load") ) ||
+        else if ( 0 == _tcsicmp( argv[argn], _T("-load") ) || 
                   0 == _tcsicmp( argv[argn], _T("/load") ) )
         {
             g_bLoadReport = true;
         }
         else // treat parameter as image path
         {
-            TCHAR   szImagePath[MAX_PATH];
-            LPTSTR  lpImageName;
+            TCHAR	szImagePath[MAX_PATH];
+            LPTSTR	lpImageName;
 
             if ( GetFullPathName( argv[argn], MAX_PATH, szImagePath, &lpImageName ) )
             {
-                DWORD   dwProcessId = FindProcessForImage( szImagePath );
+                DWORD	dwProcessId = FindProcessForImage( szImagePath );
 
                 if ( dwProcessId )
                     *pdwProcessId = dwProcessId;
@@ -2160,12 +2160,12 @@ static bool ParseCommandArgs( LPDWORD pdwProcessId, PEXCEPTION_POINTERS* ppExcep
 
     if ( !*pdwProcessId && !g_bLoadReport )
     {
-        TCHAR   szImagePath[MAX_PATH];
-        LPTSTR  lpImageName;
+        TCHAR	szImagePath[MAX_PATH];
+        LPTSTR	lpImageName;
 
         if ( GetFullPathName( TEXT("soffice.exe"), MAX_PATH, szImagePath, &lpImageName ) )
         {
-            DWORD   dwProcessId = FindProcessForImage( szImagePath );
+            DWORD	dwProcessId = FindProcessForImage( szImagePath );
 
             if ( dwProcessId )
                 *pdwProcessId = dwProcessId;
@@ -2181,20 +2181,20 @@ static bool ParseCommandArgs( LPDWORD pdwProcessId, PEXCEPTION_POINTERS* ppExcep
 
 BOOL WriteCommentFile( LPCTSTR lpComment )
 {
-    BOOL    fSuccess = FALSE;
-    TCHAR   szTempPath[MAX_PATH];
+    BOOL	fSuccess = FALSE;
+    TCHAR	szTempPath[MAX_PATH];
 
     if ( GetTempPath( SAL_N_ELEMENTS(szTempPath), szTempPath ) )
     {
-        TCHAR   szFileName[MAX_PATH];
+        TCHAR	szFileName[MAX_PATH];
 
         if ( GetTempFileName( szTempPath, TEXT("CMT"), 0, szFileName ) )
         {
-            HANDLE  hFile =  CreateFile( szFileName, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL );
+            HANDLE	hFile =  CreateFile( szFileName, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL );
 
             if ( hFile )
             {
-                DWORD   dwBytesWritten;
+                DWORD	dwBytesWritten;
 
                 int needed = WideCharToMultiByte( CP_UTF8, 0, lpComment, -1, NULL, 0, NULL, NULL );
                 if ( needed )
@@ -2227,7 +2227,7 @@ static int _tsetenv( const _TCHAR *lpVar, const _TCHAR *lpValue )
     if ( !lpValue )
         lpValue = _T("");
 
-    _TCHAR  *envstr = (TCHAR *)alloca( (_tcslen( lpVar ) + _tcslen( lpValue ) + 2) * sizeof(_TCHAR) );
+    _TCHAR	*envstr = (TCHAR *)alloca( (_tcslen( lpVar ) + _tcslen( lpValue ) + 2) * sizeof(_TCHAR) );
 
     _tcscpy( envstr, lpVar );
     _tcscat( envstr, _T("=") );
@@ -2241,51 +2241,51 @@ static bool read_line( FILE *fp, string& rLine )
     char szBuffer[1024];
     bool bSuccess = false;
     bool bEOL = false;
-    string  line;
-
+    string	line;
 
+        
     while ( !bEOL && fgets( szBuffer, sizeof(szBuffer), fp ) )
     {
-        int len = strlen(szBuffer);
-
+        int	len = strlen(szBuffer);
+        
         bSuccess = true;
-
+        
         while ( len && szBuffer[len - 1] == '\n' )
         {
             szBuffer[--len] = 0;
             bEOL = true;
         }
-
+            
         line.append( szBuffer );
     }
-
+    
     rLine = line;
     return bSuccess;
 }
 
 static string get_script_string( const char *pFileName, const char *pKeyName )
 {
-    FILE    *fp = fopen( pFileName, "rt" );
-    string  retValue;
-
+    FILE	*fp = fopen( pFileName, "rt" );
+    string	retValue;
+    
     if ( fp )
     {
         string line;
         string section;
-
+        
         while ( read_line( fp, line ) )
         {
             line = trim_string( line );
+            
 
-
-            string::size_type iEqualSign = line.find( '=', 0 );
+            string::size_type iEqualSign = line.find( '=', 0 ); 
 
             if ( iEqualSign != string::npos )
             {
-                string  keyname = line.substr( 0, iEqualSign );
+                string	keyname = line.substr( 0, iEqualSign );
                 keyname = trim_string( keyname );
-
-                string  value = line.substr( sal::static_int_cast<string::size_type>(iEqualSign + 1) );
+                
+                string	value = line.substr( sal::static_int_cast<string::size_type>(iEqualSign + 1) );
                 value = trim_string( value );
 
                 if ( value.length() && '\"' == value[0] )
@@ -2297,7 +2297,7 @@ static string get_script_string( const char *pFileName, const char *pKeyName )
                     if ( iQuotes != string::npos )
                         value.erase( iQuotes );
                 }
-
+                
                 if ( 0 == stricmp( keyname.c_str(), pKeyName ) )
                 {
                     retValue = value;
@@ -2305,42 +2305,42 @@ static string get_script_string( const char *pFileName, const char *pKeyName )
                 }
             }
         }
-
+        
         fclose( fp );
     }
-
+    
     return retValue;
 }
 
 static bool ReadBootstrapParams( CrashReportParams &rParams )
 {
-    TCHAR   szBuffer[256] = TEXT("");
-    TCHAR   szModuleName[MAX_PATH];
-    TCHAR   szModuleVersionName[MAX_PATH];
-    TCHAR   szDrive[_MAX_DRIVE];
-    TCHAR   szDir[_MAX_DIR];
-    TCHAR   szFName[_MAX_FNAME];
-    TCHAR   szExt[_MAX_EXT];
-    TCHAR   szReportServer[MAX_HOSTNAME];
-    TCHAR   szReportPort[256];
-    bool    bSuccess = false;
+    TCHAR	szBuffer[256] = TEXT("");
+    TCHAR	szModuleName[MAX_PATH];
+    TCHAR	szModuleVersionName[MAX_PATH];
+    TCHAR	szDrive[_MAX_DRIVE];
+    TCHAR	szDir[_MAX_DIR];
+    TCHAR	szFName[_MAX_FNAME];
+    TCHAR	szExt[_MAX_EXT];
+    TCHAR	szReportServer[MAX_HOSTNAME];
+    TCHAR	szReportPort[256];
+    bool	bSuccess = false;
 
     GetModuleFileName( NULL, szModuleName, MAX_PATH );
     _tsplitpath( szModuleName, szDrive, szDir, szFName, szExt );
     _tmakepath( szModuleName, szDrive, szDir, _T("bootstrap"), _T(".ini") );
     _tmakepath( szModuleVersionName, szDrive, szDir, _T("version"), _T(".ini") );
 
-    if (
-        GetPrivateProfileString(
-        TEXT("Bootstrap"),
-        TEXT("ProductKey"),
-        TEXT("OpenOffice.org"),
-        szBuffer,
+    if ( 
+        GetPrivateProfileString( 
+        TEXT("Bootstrap"), 
+        TEXT("ProductKey"), 
+        TEXT("OpenOffice.org"), 
+        szBuffer, 
         SAL_N_ELEMENTS(szBuffer),
-        szModuleName )
+        szModuleName ) 
         )
     {
-        TCHAR   *pVersion = _tcschr( szBuffer, ' ' );
+        TCHAR	*pVersion = _tcschr( szBuffer, ' ' );
 
         g_wstrProductKey = szBuffer;
 
@@ -2360,10 +2360,10 @@ static bool ReadBootstrapParams( CrashReportParams &rParams )
             _tsetenv( TEXT("PRODUCTVERSION"), pVersion );
     }
 
-    GetPrivateProfileString(
-        TEXT("Version"),
-        TEXT("buildid"),
-        TEXT("unknown"),
+    GetPrivateProfileString( 
+        TEXT("Version"), 
+        TEXT("buildid"), 
+        TEXT("unknown"), 
         g_szBuildId, SAL_N_ELEMENTS(g_szBuildId),
         szModuleVersionName );
 
@@ -2395,7 +2395,7 @@ static bool ReadBootstrapParams( CrashReportParams &rParams )
         bSuccess = 0 != WideCharToMultiByte( CP_ACP, 0, szReportServer, -1, g_szReportServerA, SAL_N_ELEMENTS(g_szReportServerA), NULL, NULL );
     }
 
-    LPCTSTR lpEnvString;
+    LPCTSTR	lpEnvString;
 
     if ( 0 != (lpEnvString = _tgetenv( _T("ERRORREPORT_PROXYSERVER") )) )
         rParams.sProxyServer = lpEnvString;
@@ -2411,17 +2411,17 @@ static bool ReadBootstrapParams( CrashReportParams &rParams )
 
 //***************************************************************************
 
-bool SendHTTPRequest(
-                FILE *fp,
-                const char *pszServer,
-                unsigned short uPort = 80,
-                const char *pszProxyServer = NULL,
+bool SendHTTPRequest( 
+                FILE *fp, 
+                const char *pszServer, 
+                unsigned short uPort = 80, 
+                const char *pszProxyServer = NULL, 
                 unsigned short uProxyPort = 8080 )
 {
     bool success = false;
 
     struct hostent *hp;
-
+    
     if ( pszProxyServer )
         hp = gethostbyname( pszProxyServer );
     else
@@ -2429,7 +2429,7 @@ bool SendHTTPRequest(
 
     if ( hp )
     {
-        SOCKET  s = socket( AF_INET, SOCK_STREAM, 0 );
+        SOCKET	s = socket( AF_INET, SOCK_STREAM, 0 );
 
         if ( s )
         {
@@ -2452,7 +2452,7 @@ bool SendHTTPRequest(
                 char buffer[2048];
 
                 if ( pszProxyServer )
-                    sprintf( buffer,
+                    sprintf( buffer, 
                     "POST http://%s:%d/soap/servlet/rpcrouter HTTP/1.0\r\n"
                         "Content-Type: text/xml; charset=\"utf-8\"\r\n"
                         "Content-Length: %d\r\n"
@@ -2462,7 +2462,7 @@ bool SendHTTPRequest(
                         length
                         );
                 else
-                    sprintf( buffer,
+                    sprintf( buffer, 
                         "POST /soap/servlet/rpcrouter HTTP/1.0\r\n"
                         "Content-Type: text/xml; charset=\"utf-8\"\r\n"
                         "Content-Length: %d\r\n"
@@ -2473,7 +2473,7 @@ bool SendHTTPRequest(
                 if ( SOCKET_ERROR != send( s, buffer, strlen(buffer), 0 ) )
                 {
                     size_t nBytes;
-
+                    
                     do
                     {
                         nBytes = fread( buffer, 1, sizeof(buffer), fp );
@@ -2526,10 +2526,10 @@ static void WriteSOAPRequest( FILE *fp )
     fprintf( fp, "<body xsi:type=\"xsd:string\">This is an autogenerated crash report mail.</body>\n" );
     fprintf( fp, "<hash xsi:type=\"apache:Map\">\n" );
 
-    FILE    *fpin = fopen( g_szReportFileNameA, "r" );
+    FILE	*fpin = fopen( g_szReportFileNameA, "r" );
     if ( fpin )
     {
-        fprintf( fp,
+        fprintf( fp, 
             "<item>\n"
             "<key xsi:type=\"xsd:string\">reportmail.xml</key>\n"
             "<value xsi:type=\"xsd:string\"><![CDATA[" );
@@ -2541,7 +2541,7 @@ static void WriteSOAPRequest( FILE *fp )
     fpin = fopen( g_szCommentFileNameA, "r" );
     if ( fpin )
     {
-        fprintf( fp,
+        fprintf( fp, 
             "<item>\n"
             "<key xsi:type=\"xsd:string\">description.txt</key>\n"
             "<value xsi:type=\"xsd:string\"><![CDATA[" );
@@ -2561,7 +2561,7 @@ static void WriteSOAPRequest( FILE *fp )
             if ( base64_encode( fpin, fptemp ) )
             {
                 fseek( fptemp, 0, SEEK_SET );
-                fprintf( fp,
+                fprintf( fp, 
                     "<item>\n"
                     "<key xsi:type=\"xsd:string\">user.dmp</key>\n"
                     "<value xsi:type=\"xsd:string\">" );
@@ -2573,11 +2573,11 @@ static void WriteSOAPRequest( FILE *fp )
         fclose( fpin );
     }
 
-    fprintf( fp,
+    fprintf( fp, 
         "</hash>\n"
         "</rds:submitReport>\n"
-        "</SOAP-ENV:Body>\n"
-        "</SOAP-ENV:Envelope>\n"
+        "</SOAP-ENV:Body>\n" 
+        "</SOAP-ENV:Envelope>\n" 
         );
 }
 
@@ -2585,13 +2585,13 @@ static void WriteSOAPRequest( FILE *fp )
 
 struct RequestParams
 {
-    bool    success;
-    FILE    *fpin;
+    bool	success;
+    FILE	*fpin;
     const char *lpServer;
     unsigned short uPort;
     const char *lpProxyServer;
     unsigned short uProxyPort;
-    HWND    hwndStatus;
+    HWND	hwndStatus;
 };
 
 void _cdecl SendingThread( void *lpArgs )
@@ -2605,11 +2605,11 @@ void _cdecl SendingThread( void *lpArgs )
 
 //***************************************************************************
 
-BOOL CALLBACK SendingStatusDialogProc(
-    HWND hwndDlg,
-    UINT uMsg,
-    WPARAM wParam,
-    LPARAM lParam
+BOOL CALLBACK SendingStatusDialogProc( 
+    HWND hwndDlg, 
+    UINT uMsg, 
+    WPARAM wParam, 
+    LPARAM lParam 
     )
 {
     static RequestParams *pRequest = NULL;
@@ -2619,9 +2619,9 @@ BOOL CALLBACK SendingStatusDialogProc(
     {
     case WM_INITDIALOG:
         {
-            TCHAR   szBuffer[1024] = TEXT("");
-            HINSTANCE   hInstance = (HINSTANCE)GetWindowLong( hwndDlg, GWL_HINSTANCE );
-            //HWND  hwndParent = (HWND)GetWindowLong( hwndDlg, GWL_HWNDPARENT );
+            TCHAR	szBuffer[1024] = TEXT("");
+            HINSTANCE	hInstance = (HINSTANCE)GetWindowLong( hwndDlg, GWL_HINSTANCE );
+            //HWND	hwndParent = (HWND)GetWindowLong( hwndDlg, GWL_HWNDPARENT );
 
             pRequest = (RequestParams *)lParam;
 
@@ -2671,17 +2671,17 @@ bool SendCrashReport( HWND hwndParent, const CrashReportParams &rParams )
     {
     case 2:
         {
-            WideCharToMultiByte(
-                CP_ACP, 0, rParams.sProxyServer.c_str(), -1,
+            WideCharToMultiByte( 
+                CP_ACP, 0, rParams.sProxyServer.c_str(), -1, 
                 szProxyServer, sizeof(szProxyServer), NULL, NULL );
             uProxyPort = (unsigned short)_tcstoul( rParams.sProxyPort.c_str(), &endptr, 10 );
         }
         break;
     case 0:
         {
-            DWORD   dwProxyEnable = 0;
+            DWORD	dwProxyEnable = 0;
 
-            RegReadValue( HKEY_CURRENT_USER,
+            RegReadValue( HKEY_CURRENT_USER, 
                 TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings"),
                 TEXT("ProxyEnable"),
                 &dwProxyEnable,
@@ -2689,10 +2689,10 @@ bool SendCrashReport( HWND hwndParent, const CrashReportParams &rParams )
 
             if ( dwProxyEnable )
             {
-                TCHAR   tszProxyServers[1024] = TEXT("");
+                TCHAR	tszProxyServers[1024] = TEXT("");
 
-                if ( ERROR_SUCCESS == RegReadValue( HKEY_CURRENT_USER,
-                    TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings"),                TEXT("ProxyServer"),
+                if ( ERROR_SUCCESS == RegReadValue( HKEY_CURRENT_USER, 
+                    TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings"),				TEXT("ProxyServer"),
                     tszProxyServers,
                     sizeof(tszProxyServers) ) )
                 {
@@ -2708,7 +2708,7 @@ bool SendCrashReport( HWND hwndParent, const CrashReportParams &rParams )
                     if ( lpHttpEnd )
                         *lpHttpEnd = 0;
 
-                    char    szHTTPProxyServer[1024] = "";
+                    char	szHTTPProxyServer[1024] = "";
                     WideCharToMultiByte( CP_ACP, 0, lpHttpStart, -1, szHTTPProxyServer, sizeof(szHTTPProxyServer), NULL, NULL );
 
                     char *lpColon = strchr( szHTTPProxyServer, ':' );
@@ -2734,10 +2734,10 @@ bool SendCrashReport( HWND hwndParent, const CrashReportParams &rParams )
         break;
     }
 
-    FILE    *fptemp = _tmpfile();
+    FILE	*fptemp = _tmpfile();
     if ( fptemp )
     {
-        RequestParams   request;
+        RequestParams	request;
 
         request.success = false;
         request.fpin = fptemp;
@@ -2752,8 +2752,8 @@ bool SendCrashReport( HWND hwndParent, const CrashReportParams &rParams )
 
         if ( hwndParent )
         {
-            int retid = DialogBoxParam(
-                GetModuleHandle(NULL),
+            int retid = DialogBoxParam( 
+                GetModuleHandle(NULL), 
                 MAKEINTRESOURCE(IDD_SENDING_STATUS),
                 hwndParent,
                 SendingStatusDialogProc,
@@ -2766,7 +2766,7 @@ bool SendCrashReport( HWND hwndParent, const CrashReportParams &rParams )
             {
                 if ( !success )
                 {
-                    TCHAR   szMessage[1024];
+                    TCHAR	szMessage[1024];
 
                     LoadAndFormatString( GetModuleHandle(NULL), IDS_ERROR_MSG_PROXY, szMessage, SAL_N_ELEMENTS(szMessage) );
 
@@ -2774,8 +2774,8 @@ bool SendCrashReport( HWND hwndParent, const CrashReportParams &rParams )
                 }
                 else
                 {
-                    TCHAR   szMessage[1024];
-                    TCHAR   szTitle[1024];
+                    TCHAR	szMessage[1024];
+                    TCHAR	szTitle[1024];
 
                     LoadAndFormatString( GetModuleHandle(NULL), IDS_SENDING_REPORT_STATUS_FINISHED, szMessage, SAL_N_ELEMENTS(szMessage) );
                     LoadAndFormatString( GetModuleHandle(NULL), IDS_SENDING_REPORT_HEADER, szTitle, SAL_N_ELEMENTS(szTitle) );
@@ -2794,14 +2794,14 @@ bool SendCrashReport( HWND hwndParent, const CrashReportParams &rParams )
             success = request.success;
             if ( !success )
             {
-                TCHAR   szMessage[1024];
+                TCHAR	szMessage[1024];
 
                 LoadAndFormatString( GetModuleHandle(NULL), IDS_ERROR_MSG_PROXY, szMessage, SAL_N_ELEMENTS(szMessage) );
                 _ftprintf( stderr, _T("ERROR: %s\n"), szMessage );
             }
             else
             {
-                TCHAR   szMessage[1024];
+                TCHAR	szMessage[1024];
 
                 LoadAndFormatString( GetModuleHandle(NULL), IDS_SENDING_REPORT_STATUS_FINISHED, szMessage, SAL_N_ELEMENTS(szMessage) );
 
@@ -2812,7 +2812,7 @@ bool SendCrashReport( HWND hwndParent, const CrashReportParams &rParams )
     }
     else
     {
-        TCHAR   szMessage[1024];
+        TCHAR	szMessage[1024];
 
         LoadAndFormatString( GetModuleHandle(NULL), IDS_ERROR_MSG_DISK_FULL, szMessage, SAL_N_ELEMENTS(szMessage) );
 
@@ -2856,9 +2856,9 @@ int WINAPI _tWinMain( HINSTANCE hInstance, HINSTANCE, LPTSTR /*lpCmdLine*/, int
 
     osl_setCommandArgs( argc, argv );
 
-    PEXCEPTION_POINTERS pExceptionPointers = NULL;
-    DWORD               dwProcessId = 0;
-    DWORD               dwThreadId = 0;
+    PEXCEPTION_POINTERS	pExceptionPointers = NULL;
+    DWORD				dwProcessId = 0;
+    DWORD				dwThreadId = 0;
 
     WSADATA wsaData;
     WORD    wVersionRequested;
@@ -2866,15 +2866,15 @@ int WINAPI _tWinMain( HINSTANCE hInstance, HINSTANCE, LPTSTR /*lpCmdLine*/, int
     wVersionRequested = MAKEWORD(1, 1);
     WSAStartup(wVersionRequested, &wsaData);
 
-    CrashReportParams   Params;
+    CrashReportParams	Params;
 
     Params.ReadFromRegistry();
     Params.ReadFromEnvironment();
 
-    if ( ReadBootstrapParams( Params ) &&
+    if ( ReadBootstrapParams( Params ) && 
         ParseCommandArgs( &dwProcessId, &pExceptionPointers, &dwThreadId ) )
     {
-        bool    bGotDumpFile;
+        bool	bGotDumpFile;
 
         if ( g_bLoadReport )
             bGotDumpFile = FindDumpFile();
@@ -2902,7 +2902,7 @@ int WINAPI _tWinMain( HINSTANCE hInstance, HINSTANCE, LPTSTR /*lpCmdLine*/, int
                     g_fpStackFile = _open_reportfile( _T(".stk"), _T("w+b") );
                     g_fpChecksumFile = _open_reportfile( _T(".chk"), _T("w+b") );
 
-                    FILE    *fpUnsent = _open_reportfile( _T(".lck"), _T("w+b") );
+                    FILE	*fpUnsent = _open_reportfile( _T(".lck"), _T("w+b") );
                     if ( fpUnsent )
                     {
                         fprintf( fpUnsent, "Unsent\r\n" );
@@ -2914,11 +2914,11 @@ int WINAPI _tWinMain( HINSTANCE hInstance, HINSTANCE, LPTSTR /*lpCmdLine*/, int
                 WriteChecksumFile( g_fpChecksumFile, aLibraries );
                 WriteReportFile( &Params );
 
-                FILE    *fpPreview = _open_reportfile( _T(".prv"), _T("w+b") );
+                FILE	*fpPreview = _open_reportfile( _T(".prv"), _T("w+b") );
 
                 if ( fpPreview )
                 {
-                    FILE     *fp = fopen( g_szReportFileNameA, "rb" );
+                    FILE	 *fp = fopen( g_szReportFileNameA, "rb" );
                     if ( fp )
                     {
                         fcopy( fp, fpPreview );
@@ -2951,7 +2951,7 @@ int WINAPI _tWinMain( HINSTANCE hInstance, HINSTANCE, LPTSTR /*lpCmdLine*/, int
                     if ( SendCrashReport( NULL, Params ) )
                         exitcode = 0;
                 }
-
+            
 
                 if ( g_szReportFileNameA[0] )
                     DeleteFileA( g_szReportFileNameA );
diff --git a/cui/inc/pch/precompiled_cui.cxx b/cui/inc/pch/precompiled_cui.cxx
index 4d85e0351431..6fc161f77e6c 100644
--- a/cui/inc/pch/precompiled_cui.cxx
+++ b/cui/inc/pch/precompiled_cui.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index d55bb7b5afaf..2b361fbb3e38 100644
--- a/cui/inc/pch/precompiled_cui.hxx
+++ b/cui/inc/pch/precompiled_cui.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 8a3b81562bd2..6e9377ed64df 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -142,18 +142,18 @@ static USHORT __FAR_DATA KEYCODE_ARRAY[] =
     KEY_INSERT   ,
     KEY_DELETE   ,
 
-    KEY_OPEN        ,
-    KEY_CUT         ,
-    KEY_COPY        ,
-    KEY_PASTE       ,
-    KEY_UNDO        ,
-    KEY_REPEAT      ,
-    KEY_FIND        ,
-    KEY_PROPERTIES  ,
-    KEY_FRONT       ,
+    KEY_OPEN		,
+    KEY_CUT			,
+    KEY_COPY		,
+    KEY_PASTE		,
+    KEY_UNDO		,
+    KEY_REPEAT		,
+    KEY_FIND		,
+    KEY_PROPERTIES	,
+    KEY_FRONT		,
     KEY_CONTEXTMENU ,
-    KEY_MENU        ,
-    KEY_HELP        ,
+    KEY_MENU		,
+    KEY_HELP		,
 
     KEY_F1        | KEY_SHIFT,
     KEY_F2        | KEY_SHIFT,
@@ -733,12 +733,12 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxIt
     , aKeyBox                 (this   , CUI_RES(BOX_ACC_KEY             ))
     , aFunctionsGroup         (this   , CUI_RES(GRP_ACC_FUNCTIONS       ))
     , aLoadButton             (this   , CUI_RES(BTN_LOAD                ))
-    , aSaveButton             (this   , CUI_RES(BTN_SAVE                ))
-    , aResetButton            (this   , CUI_RES(BTN_RESET               ))
-    , aLoadAccelConfigStr             ( CUI_RES( STR_LOADACCELCONFIG ) )
-    , aSaveAccelConfigStr             ( CUI_RES( STR_SAVEACCELCONFIG ) )
-    , aFilterAllStr                   ( CUI_RES( STR_SFX_FILTERNAME_ALL ) )
-    , aFilterCfgStr                   ( CUI_RES( STR_FILTERNAME_CFG ) )
+    , aSaveButton 		      (this   , CUI_RES(BTN_SAVE                ))
+    , aResetButton		      (this   , CUI_RES(BTN_RESET               ))
+    , aLoadAccelConfigStr			  ( CUI_RES( STR_LOADACCELCONFIG ) )
+    , aSaveAccelConfigStr			  ( CUI_RES( STR_SAVEACCELCONFIG ) )
+    , aFilterAllStr					  ( CUI_RES( STR_SFX_FILTERNAME_ALL ) )
+    , aFilterCfgStr					  ( CUI_RES( STR_FILTERNAME_CFG ) )
     , m_bStylesInfoInitialized(sal_False)
     , m_xGlobal               ()
     , m_xModule               ()
@@ -1437,7 +1437,7 @@ String SfxAcceleratorConfigPage::GetFunctionName(KeyFuncType eType) const
         case KEYFUNC_OPEN :
             sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Open") ) );
             break;
-
+                
         case KEYFUNC_SAVE :
             sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Save") ) );
             break;
@@ -1521,7 +1521,7 @@ void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const String& rTi
 
     m_pFileDlg->SetTitle( rTitle );
 //  m_pFileDlg->SetDialogHelpId( bSave ? HID_CONFIG_SAVE : HID_CONFIG_LOAD );
-    m_pFileDlg->AddFilter( aFilterAllStr, DEFINE_CONST_UNICODE( FILEDIALOG_FILTER_ALL ) );
+    m_pFileDlg->AddFilter( aFilterAllStr, DEFINE_CONST_UNICODE( FILEDIALOG_FILTER_ALL ) ); 
     m_pFileDlg->AddFilter( aFilterCfgStr, DEFINE_CONST_UNICODE( "*.cfg" ) );
 
     Link aDlgClosedLink = bSave ? LINK( this, SfxAcceleratorConfigPage, SaveHdl )
diff --git a/cui/source/customize/acccfg.hrc b/cui/source/customize/acccfg.hrc
index be0771b83fc8..483d3ddb5733 100644
--- a/cui/source/customize/acccfg.hrc
+++ b/cui/source/customize/acccfg.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #define TXT_ACC_KEY 13
 #define BOX_ACC_KEY 14
 #define GRP_ACC_FUNCTIONS 15
-#define BTN_RESET   20
+#define BTN_RESET	20
 #define BTN_LOAD 40
 #define BTN_SAVE 41
 #define RB_OFFICE 44
diff --git a/cui/source/customize/acccfg.src b/cui/source/customize/acccfg.src
index 74188426a787..abbe08d84ce7 100644
--- a/cui/source/customize/acccfg.src
+++ b/cui/source/customize/acccfg.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 46296a3f6f1f..e48f65087a08 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ static const char ITEM_DESCRIPTOR_TYPE[]        = "Type";
 static const char ITEM_DESCRIPTOR_STYLE[]       = "Style";
 static const char ITEM_DESCRIPTOR_ISVISIBLE[]   = "IsVisible";
 static const char ITEM_DESCRIPTOR_RESOURCEURL[] = "ResourceURL";
-static const char ITEM_DESCRIPTOR_UINAME[]      = "UIName";
+static const char ITEM_DESCRIPTOR_UINAME[]		= "UIName";
 
 static const char ITEM_MENUBAR_URL[] = "private:resource/menubar/menubar";
 static const char ITEM_TOOLBAR_URL[] = "private:resource/toolbar/";
@@ -116,7 +116,7 @@ static const char CUSTOM_MENU_STR[] = "vnd.openoffice.org:CustomMenu";
 
 static const char __FAR_DATA pSeparatorStr[] =
     "----------------------------------";
-static const char __FAR_DATA pMenuSeparatorStr[]    = " | ";
+static const char __FAR_DATA pMenuSeparatorStr[]	= " | ";
 
 #ifdef _MSC_VER
 #pragma warning (disable:4355)
@@ -1169,14 +1169,14 @@ bool MenuSaveInData::LoadSubMenus(
     // Don't access non existing menu configuration!
     if ( !xMenuSettings.is() )
         return true;
-
+    
     for ( sal_Int32 nIndex = 0; nIndex < xMenuSettings->getCount(); nIndex++ )
     {
-        uno::Reference< container::XIndexAccess >   xSubMenu;
-        OUString                aCommandURL;
-        OUString                aHelpURL;
-        OUString                aLabel;
-        bool                    bIsUserDefined = TRUE;
+        uno::Reference< container::XIndexAccess >	xSubMenu;
+        OUString				aCommandURL;
+        OUString				aHelpURL;
+        OUString				aLabel;
+        bool					bIsUserDefined = TRUE;
 
         sal_uInt16 nType( css::ui::ItemType::DEFAULT );
 
@@ -1488,8 +1488,8 @@ SvxMenuEntriesListBox::SvxMenuEntriesListBox(
     SetHighlightRange();
     SetSelectionMode(SINGLE_SELECTION);
 
-    SetDragDropMode( SV_DRAGDROP_CTRL_MOVE  |
-                     SV_DRAGDROP_APP_COPY   |
+    SetDragDropMode( SV_DRAGDROP_CTRL_MOVE	|
+                     SV_DRAGDROP_APP_COPY	|
                      SV_DRAGDROP_ENABLE_TOP |
                      SV_DRAGDROP_APP_DROP);
 }
@@ -2398,12 +2398,12 @@ SvxMenuConfigPage::SvxMenuConfigPage(
         LINK( this, SvxMenuConfigPage, SelectMenuEntry ) );
 
     aMoveUpButton.SetClickHdl ( LINK( this, SvxConfigPage, MoveHdl) );
-    aMoveDownButton.SetClickHdl ( LINK( this, SvxConfigPage, MoveHdl) );
+    aMoveDownButton.SetClickHdl	( LINK( this, SvxConfigPage, MoveHdl) );
 
-    aNewTopLevelButton.SetClickHdl  (
+    aNewTopLevelButton.SetClickHdl	(
         LINK( this, SvxMenuConfigPage, NewMenuHdl ) );
 
-    aAddCommandsButton.SetClickHdl  (
+    aAddCommandsButton.SetClickHdl	(
         LINK( this, SvxMenuConfigPage, AddCommandsHdl ) );
 
     PopupMenu* pMenu = new PopupMenu( CUI_RES( MODIFY_MENU ) );
@@ -2938,7 +2938,7 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
 
     aMoveUpButton.SetClickHdl (
         LINK( this, SvxMainMenuOrganizerDialog, MoveHdl) );
-    aMoveDownButton.SetClickHdl (
+    aMoveDownButton.SetClickHdl	(
         LINK( this, SvxMainMenuOrganizerDialog, MoveHdl) );
 }
 
@@ -3364,14 +3364,14 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(
     aContentsListBox->SetSelectHdl(
         LINK( this, SvxToolbarConfigPage, SelectToolbarEntry ) );
 
-    aNewTopLevelButton.SetClickHdl  (
+    aNewTopLevelButton.SetClickHdl	(
         LINK( this, SvxToolbarConfigPage, NewToolbarHdl ) );
 
-    aAddCommandsButton.SetClickHdl  (
+    aAddCommandsButton.SetClickHdl	(
         LINK( this, SvxToolbarConfigPage, AddCommandsHdl ) );
 
     aMoveUpButton.SetClickHdl ( LINK( this, SvxToolbarConfigPage, MoveHdl) );
-    aMoveDownButton.SetClickHdl ( LINK( this, SvxToolbarConfigPage, MoveHdl) );
+    aMoveDownButton.SetClickHdl	( LINK( this, SvxToolbarConfigPage, MoveHdl) );
     // Always enable Up and Down buttons
     // added for issue i53677 by shizhoubo
     aMoveDownButton.Enable( TRUE );
@@ -4187,7 +4187,7 @@ bool EntrySort( SvxConfigEntry* a, SvxConfigEntry* b )
     return a->GetName().compareTo( b->GetName() ) < 0;
 }
 
-SvxEntries* ToolbarSaveInData::GetEntries()
+SvxEntries*	ToolbarSaveInData::GetEntries()
 {
     typedef ::std::hash_map< ::rtl::OUString,
                              bool,
@@ -4738,17 +4738,17 @@ bool ToolbarSaveInData::LoadToolbar(
     const uno::Reference< container::XIndexAccess >& xToolbarSettings,
     SvxConfigEntry* pParentData )
 {
-    SvxEntries*         pEntries            = pParentData->GetEntries();
+    SvxEntries*			pEntries			= pParentData->GetEntries();
 
     for ( sal_Int32 nIndex = 0; nIndex < xToolbarSettings->getCount(); nIndex++ )
     {
-        uno::Reference< container::XIndexAccess >   xSubMenu;
-        OUString                aCommandURL;
-        OUString                aHelpURL;
-        OUString                aLabel;
-        bool                    bIsUserDefined = TRUE;
-        sal_Bool                bIsVisible;
-        sal_Int32               nStyle;
+        uno::Reference< container::XIndexAccess >	xSubMenu;
+        OUString				aCommandURL;
+        OUString				aHelpURL;
+        OUString				aLabel;
+        bool					bIsUserDefined = TRUE;
+        sal_Bool				bIsVisible;
+        sal_Int32				nStyle;
 
         sal_uInt16 nType( css::ui::ItemType::DEFAULT );
 
@@ -5124,8 +5124,8 @@ void SvxToolbarEntriesListBox::BuildCheckBoxButtonImages( SvLBoxButtonData* pDat
     // in all color modes, like high contrast.
     const AllSettings& rSettings = Application::GetSettings();
 
-    VirtualDevice   aDev;
-    Size            aSize( 26, 20 );
+    VirtualDevice	aDev;
+    Size			aSize( 26, 20 );
 
     aDev.SetOutputSizePixel( aSize );
 
@@ -5133,12 +5133,12 @@ void SvxToolbarEntriesListBox::BuildCheckBoxButtonImages( SvLBoxButtonData* pDat
         CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DEFAULT ));
 
     // Fill button data struct with new images
-    pData->aBmps[SV_BMP_UNCHECKED]      = aImage;
-    pData->aBmps[SV_BMP_CHECKED]        = GetSizedImage( aDev, aSize, CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_CHECKED ));
-    pData->aBmps[SV_BMP_HICHECKED]      = GetSizedImage( aDev, aSize, CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_CHECKED | BUTTON_DRAW_PRESSED ));
-    pData->aBmps[SV_BMP_HIUNCHECKED]    = GetSizedImage( aDev, aSize, CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DEFAULT | BUTTON_DRAW_PRESSED));
-    pData->aBmps[SV_BMP_TRISTATE]       = GetSizedImage( aDev, aSize, Image() ); // Use tristate bitmaps to have no checkbox for separator entries
-    pData->aBmps[SV_BMP_HITRISTATE]     = GetSizedImage( aDev, aSize, Image() );
+    pData->aBmps[SV_BMP_UNCHECKED]		= aImage;
+    pData->aBmps[SV_BMP_CHECKED]		= GetSizedImage( aDev, aSize, CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_CHECKED ));
+    pData->aBmps[SV_BMP_HICHECKED]		= GetSizedImage( aDev, aSize, CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_CHECKED | BUTTON_DRAW_PRESSED ));
+    pData->aBmps[SV_BMP_HIUNCHECKED]	= GetSizedImage( aDev, aSize, CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DEFAULT | BUTTON_DRAW_PRESSED));
+    pData->aBmps[SV_BMP_TRISTATE]		= GetSizedImage( aDev, aSize, Image() ); // Use tristate bitmaps to have no checkbox for separator entries
+    pData->aBmps[SV_BMP_HITRISTATE]		= GetSizedImage( aDev, aSize, Image() );
 
     // Get image size
     m_aCheckBoxImageSizePixel = aImage.GetSizePixel();
@@ -5152,13 +5152,13 @@ Image SvxToolbarEntriesListBox::GetSizedImage(
 
     // Standard transparent color is light magenta as is won't be
     // used for other things
-    Color   aFillColor( COL_LIGHTMAGENTA );
+    Color	aFillColor( COL_LIGHTMAGENTA );
 
     // Position image at the center of (width-2),(height) rectangle.
     // We need 2 pixels to have a bigger border to the next button image
-    USHORT  nPosX = std::max( (USHORT) (((( aNewSize.Width() - 2 ) - aImage.GetSizePixel().Width() ) / 2 ) - 1), (USHORT) 0 );
-    USHORT  nPosY = std::max( (USHORT) (((( aNewSize.Height() - 2 ) - aImage.GetSizePixel().Height() ) / 2 ) + 1), (USHORT) 0 );
-    Point   aPos( nPosX > 0 ? nPosX : 0, nPosY > 0 ? nPosY : 0 );
+    USHORT	nPosX = std::max( (USHORT) (((( aNewSize.Width() - 2 ) - aImage.GetSizePixel().Width() ) / 2 ) - 1), (USHORT) 0 );
+    USHORT	nPosY = std::max( (USHORT) (((( aNewSize.Height() - 2 ) - aImage.GetSizePixel().Height() ) / 2 ) + 1), (USHORT) 0 );
+    Point	aPos( nPosX > 0 ? nPosX : 0, nPosY > 0 ? nPosY : 0 );
     aDev.SetFillColor( aFillColor );
     aDev.SetLineColor( aFillColor );
     aDev.DrawRect( Rectangle( Point(), aNewSize ));
@@ -5291,14 +5291,14 @@ BOOL SvxToolbarEntriesListBox::NotifyCopying(
 SvxNewToolbarDialog::SvxNewToolbarDialog(
     Window* pWindow, const String& rName )
     :
-    ModalDialog     ( pWindow, CUI_RES( MD_NEW_TOOLBAR ) ),
-    aFtDescription  ( this, CUI_RES( FT_NAME ) ),
-    aEdtName        ( this, CUI_RES( EDT_STRING ) ),
-    aSaveInText     ( this, CUI_RES( TXT_SAVEIN ) ),
-    aBtnOK          ( this, CUI_RES( BTN_OK ) ),
-    aBtnCancel      ( this, CUI_RES( BTN_CANCEL ) ),
-    aBtnHelp        ( this, CUI_RES( BTN_HELP ) ),
-    aSaveInListBox  ( this, CUI_RES( LB_SAVEIN ) )
+    ModalDialog		( pWindow, CUI_RES( MD_NEW_TOOLBAR ) ),
+    aFtDescription	( this, CUI_RES( FT_NAME ) ),
+    aEdtName		( this, CUI_RES( EDT_STRING ) ),
+    aSaveInText		( this, CUI_RES( TXT_SAVEIN ) ),
+    aBtnOK			( this, CUI_RES( BTN_OK ) ),
+    aBtnCancel		( this, CUI_RES( BTN_CANCEL ) ),
+    aBtnHelp		( this, CUI_RES( BTN_HELP ) ),
+    aSaveInListBox	( this, CUI_RES( LB_SAVEIN ) )
 {
     FreeResource();
 
@@ -5327,18 +5327,18 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow,
     const uno::Reference< css::ui::XImageManager >& rXImageManager,
     const uno::Reference< css::ui::XImageManager >& rXParentImageManager )
     :
-    ModalDialog          ( pWindow, CUI_RES( MD_ICONSELECTOR ) ),
-    aFtDescription       ( this, CUI_RES( FT_SYMBOLS ) ),
-    aTbSymbol            ( this, CUI_RES( TB_SYMBOLS ) ),
-    aFtNote              ( this, CUI_RES( FT_NOTE ) ),
-    aBtnOK               ( this, CUI_RES( BTN_OK ) ),
-    aBtnCancel           ( this, CUI_RES( BTN_CANCEL ) ),
-    aBtnHelp             ( this, CUI_RES( BTN_HELP ) ),
-    aBtnImport           ( this, CUI_RES( BTN_IMPORT ) ),
-    aBtnDelete           ( this, CUI_RES( BTN_DELETE ) ),
-    aFlSeparator         ( this, CUI_RES( FL_SEPARATOR ) ),
+    ModalDialog		     ( pWindow, CUI_RES( MD_ICONSELECTOR ) ),
+    aFtDescription	     ( this, CUI_RES( FT_SYMBOLS ) ),
+    aTbSymbol		     ( this, CUI_RES( TB_SYMBOLS ) ),
+    aFtNote			     ( this, CUI_RES( FT_NOTE ) ),
+    aBtnOK			     ( this, CUI_RES( BTN_OK ) ),
+    aBtnCancel		     ( this, CUI_RES( BTN_CANCEL ) ),
+    aBtnHelp		     ( this, CUI_RES( BTN_HELP ) ),
+    aBtnImport		     ( this, CUI_RES( BTN_IMPORT ) ),
+    aBtnDelete			 ( this, CUI_RES( BTN_DELETE ) ),
+    aFlSeparator		 ( this, CUI_RES( FL_SEPARATOR ) ),
     m_nNextId            ( 0 ),
-    m_xImageManager      ( rXImageManager ),
+    m_xImageManager	     ( rXImageManager ),
     m_xParentImageManager( rXParentImageManager )
 {
     FreeResource();
@@ -5976,7 +5976,7 @@ USHORT SvxIconReplacementDialog :: ShowDialog()
 SvxIconChangeDialog::SvxIconChangeDialog(
     Window *pWindow, const rtl::OUString& aMessage)
     :
-    ModalDialog            ( pWindow, CUI_RES( MD_ICONCHANGE ) ),
+    ModalDialog	           ( pWindow, CUI_RES( MD_ICONCHANGE ) ),
     aFImageInfo            (this, CUI_RES( FI_INFO ) ),
     aBtnOK                 (this, CUI_RES(MD_BTN_OK)),
     aDescriptionLabel      (this, CUI_RES(FTCHGE_DESCRIPTION)),
diff --git a/cui/source/customize/cfg.hrc b/cui/source/customize/cfg.hrc
index 74d7804dce8e..ff7d25e249e0 100644
--- a/cui/source/customize/cfg.hrc
+++ b/cui/source/customize/cfg.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,6 +100,6 @@
 //added for issue83555
 #define MD_ICONCHANGE (119 + CFG_OFFSET)
 #define FTCHGE_DESCRIPTION (120 + CFG_OFFSET)
-#define EDT_ADDR (121 + CFG_OFFSET)
+#define EDT_ADDR (121 + CFG_OFFSET)  
 #define MD_BTN_OK (122 + CFG_OFFSET)
 #define FI_INFO (123 + CFG_OFFSET)
diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src
index 0b2489557053..c6d7f7ab1c9b 100644
--- a/cui/source/customize/cfg.src
+++ b/cui/source/customize/cfg.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -632,10 +632,10 @@ ModalDialog MD_ICONSELECTOR
         Scroll = TRUE ;
         LineSpacing = TRUE ;
         Customize = FALSE ;
-    };
+    };       
     OKButton BTN_OK
     {
-        Pos = MAP_APPFONT ( 60 , 130 ) ;
+        Pos = MAP_APPFONT ( 60 , 130 ) ; 
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
         DefButton = TRUE ;
@@ -669,14 +669,14 @@ ModalDialog MD_ICONSELECTOR
     };
     FixedText FT_NOTE
     {
-        Pos = MAP_APPFONT ( 12 , 95 ) ;
+        Pos = MAP_APPFONT ( 12 , 95 ) ; 
         Size = MAP_APPFONT ( 200 , 24 ) ;
         Text [ de ] = "Hinweis:\nBitte beachten Sie das für einen erfolgreichen Import die Symbole eine Größe  von 16x16 Pixel haben müssen." ;
         Text [ en-US ] = "Note:\nThe size of an icon should be 16x16 pixel to achieve best quality. Different sized icons will be scaled automatically." ;
         Left = TRUE ;
         WordBreak = TRUE;
     };
-    FixedLine FL_SEPARATOR
+    FixedLine FL_SEPARATOR 
     {
         Pos = MAP_APPFONT ( 0, 120 );
         Size = MAP_APPFONT ( 240, 8 );
@@ -702,7 +702,7 @@ ModalDialog MD_ICONCHANGE
         Size = MAP_APPFONT ( 24 , 24 ) ;
         Fixed = Image
         {
-
+        
         };
     };
     FixedText FTCHGE_DESCRIPTION
@@ -711,7 +711,7 @@ ModalDialog MD_ICONCHANGE
         Size = MAP_APPFONT ( 200 , 50 ) ;
         Text [ en-US ] = "The files listed below could not be imported.\nThe file format could not be interpreted." ;
     };
-
+    
     MultiLineEdit EDT_ADDR
     {
         Pos = MAP_APPFONT ( 30 , 38) ;
@@ -723,7 +723,7 @@ ModalDialog MD_ICONCHANGE
     };
     OKButton MD_BTN_OK
     {
-        Pos = MAP_APPFONT ( 68 , 131 ) ;
+        Pos = MAP_APPFONT ( 68 , 131 ) ; 
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
         DefButton = TRUE ;
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 46f9576058e0..911892383d64 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -341,7 +341,7 @@ IMPL_LINK( SfxConfigFunctionListBox_Impl, TimerHdl, Timer*, pTimer)
 }
 
 void SfxConfigFunctionListBox_Impl::ClearAll()
-/*  Beschreibung
+/* 	Beschreibung
     L"oscht alle Eintr"age in der FunctionListBox, alle UserDaten und alle evtl.
     vorhandenen MacroInfos.
 */
@@ -378,7 +378,7 @@ void SfxConfigFunctionListBox_Impl::ClearAll()
 }
 
 SvLBoxEntry* SfxConfigFunctionListBox_Impl::GetEntry_Impl( const String& rName )
-/*  Beschreibung
+/* 	Beschreibung
     Ermittelt den SvLBoxEntry zu einem "ubergebenen String. Das setzt voraus, da\s
     die Namen eindeutig sind.
 */
@@ -395,7 +395,7 @@ SvLBoxEntry* SfxConfigFunctionListBox_Impl::GetEntry_Impl( const String& rName )
 }
 
 SvLBoxEntry* SfxConfigFunctionListBox_Impl::GetEntry_Impl( USHORT nId )
-/*  Beschreibung
+/* 	Beschreibung
     Ermittelt den SvLBoxEntry zu einer "ubergebenen Id.
 */
 {
@@ -412,7 +412,7 @@ SvLBoxEntry* SfxConfigFunctionListBox_Impl::GetEntry_Impl( USHORT nId )
 }
 
 SfxMacroInfo* SfxConfigFunctionListBox_Impl::GetMacroInfo()
-/*  Beschreibung
+/* 	Beschreibung
     Gibt die MacroInfo des selektierten Entry zur"uck ( sofern vorhanden ).
 */
 {
@@ -453,7 +453,7 @@ String SfxConfigFunctionListBox_Impl::GetCurLabel()
 }
 
 USHORT SfxConfigFunctionListBox_Impl::GetId( SvLBoxEntry *pEntry )
-/*  Beschreibung
+/*	Beschreibung
     Gibt die Ordnungsnummer ( SlotId oder Macro-Nummer ) des Eintrags zur"uck.
 */
 {
@@ -507,7 +507,7 @@ String SfxConfigFunctionListBox_Impl::GetHelpText( SvLBoxEntry *pEntry )
 }*/
 
 void SfxConfigFunctionListBox_Impl::FunctionSelected()
-/*  Beschreibung
+/*	Beschreibung
     Setzt die Balloonhelp zur"uck, da diese immer den Helptext des selektierten
     Entry anzeigen soll.
 */
@@ -673,7 +673,7 @@ void SfxConfigGroupListBox_Impl::SetStylesInfo(SfxStylesInfo_Impl* pStyles)
 }
 
 String SfxConfigGroupListBox_Impl::GetGroup()
-/*  Beschreibung
+/*	Beschreibung
     Gibt den Namen der selektierten Funktionsgruppe bzw. des selektierten
     Basics zur"uck.
 */
@@ -789,7 +789,7 @@ namespace
             if ( xContext.is() )
                 xScripts.set( xContext->getScriptContainer(), UNO_QUERY );
         }
-
+            
         return Reference< XModel >( xScripts, UNO_QUERY );
     }
 
@@ -923,10 +923,10 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
                 aAppBasTitle += aMacroName;
                 SvLBoxEntry *pEntry = InsertEntry( aAppBasTitle, 0 );
                 SfxGroupInfo_Impl *pInfo = new SfxGroupInfo_Impl( SFX_CFGGROUP_BASICMGR, 0, pAppBasicMgr );
-    //          aArr.Insert( pInfo, aArr.Count() );
+    //			aArr.Insert( pInfo, aArr.Count() );
                 pEntry->SetUserData( pInfo );
                 pEntry->EnableChildsOnDemand( TRUE );
-    //          Expand( pEntry );
+    //			Expand( pEntry );
             }
         }
 
@@ -1053,8 +1053,8 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
                             if (children[n]->getType() != browse::BrowseNodeTypes::SCRIPT  && bDisplay )
                             {
 
-//                                  We call acquire on the XBrowseNode so that it does not
-//                                  get autodestructed and become invalid when accessed later.
+//									We call acquire on the XBrowseNode so that it does not
+//									get autodestructed and become invalid when accessed later.
                                 theChild->acquire();
 
                                 SfxGroupInfo_Impl* pInfo =
@@ -1109,7 +1109,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
         pEntry->EnableChildsOnDemand( TRUE );
     }
 
-/*  {
+/*	{
         String sSymbols( String::CreateFromAscii("Symbols") );
         SvLBoxEntry *pEntry = InsertEntry( sSymbols, 0 );
         SfxGroupInfo_Impl *pInfo = new SfxGroupInfo_Impl( SFX_CFGGROUP_SPECIALCHARACTERS, 0, 0 ); // TODO last parameter should contain user data
@@ -1306,7 +1306,7 @@ SfxConfigGroupListBox_Impl::getDocumentModel( Reference< XComponentContext >& xC
 
 //-----------------------------------------------
 void SfxConfigGroupListBox_Impl::GroupSelected()
-/*  Beschreibung
+/*	Beschreibung
     Eine Funktionsgruppe oder eine Basicmodul wurde selektiert. Alle Funktionen bzw.
     Macros werden in der Functionlistbox anzeigt.
 */
@@ -1374,7 +1374,7 @@ void SfxConfigGroupListBox_Impl::GroupSelected()
                     pInf->SetHelpText( pMeth->GetInfo()->GetComment() );
                 USHORT nId = SFX_APP()->GetMacroConfig()->GetSlotId( pInf );
                 if ( !nId )
-                    break;      // Kein Slot mehr frei
+                    break; 		// Kein Slot mehr frei
 
                 SvLBoxEntry* pFuncEntry =
                     pFunctionListBox->InsertEntry( pMeth->GetName(), NULL );
@@ -1522,7 +1522,7 @@ BOOL SfxConfigGroupListBox_Impl::Expand( SvLBoxEntry* pParent )
 }
 
 void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
-/*  Beschreibung
+/*	Beschreibung
     Ein Basic oder eine Bibliothek werden ge"offnet
 */
 {
@@ -1610,7 +1610,7 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
                         {
                             bIsRootNode = TRUE;
                         }
-
+                        
                         /* To mimic current starbasic behaviour we
                         need to make sure that only the current document
                         is displayed in the config tree. Tests below
@@ -1633,7 +1633,7 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
                             if ( bIsRootNode )
                             {
                                 if ( !( (aName.equals(user) || aName.equals(share) || aName.equals(currentDocTitle) ) ) )
-                                    bDisplay=FALSE;
+                                    bDisplay=FALSE;							
                             }
                             if ( children[n].is() && children[n]->getType() != browse::BrowseNodeTypes::SCRIPT && bDisplay )
                             {
@@ -1723,7 +1723,7 @@ void SfxConfigGroupListBox_Impl::AddAndSelect( const SfxStringItem* , const SfxS
         String aCommand = String::CreateFromAscii(".uno:InsertSymbol?Symbols:string=");
         aCommand += pText->GetValue();
         pFunctionListBox->aArr.Insert( pGrpInfo, pFunctionListBox->aArr.Count() );
-        pGrpInfo->sCommand = aCommand;
+        pGrpInfo->sCommand = aCommand;	
         pGrpInfo->sLabel = String::CreateFromAscii("Symbols: ");
         pGrpInfo->sLabel += pText->GetValue();
         pFuncEntry->SetUserData( pGrpInfo );
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index 8a5d00fa6216..60219ef67409 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,18 +72,18 @@ SvxEventConfigPage::SvxEventConfigPage( Window *pParent, const SfxItemSet& rSet,
     _SvxMacroTabPage( pParent, CUI_RES(RID_SVXPAGE_EVENTS), rSet ),
     aSaveInText( this, CUI_RES( TXT_SAVEIN ) ),
     aSaveInListBox( this, CUI_RES( LB_SAVEIN ) ),
-    bAppConfig  ( TRUE )
+    bAppConfig	( TRUE )
 {
-    mpImpl->pStrEvent           = new String( CUI_RES( STR_EVENT ));
-    mpImpl->pAssignedMacro      = new String( CUI_RES( STR_ASSMACRO ));
-    mpImpl->pEventLB            = new _HeaderTabListBox( this, CUI_RES( LB_EVENT ));
-    mpImpl->pAssignFT           = new FixedText( this,  CUI_RES( FT_ASSIGN ));
-    mpImpl->pAssignPB           = new PushButton( this, CUI_RES( PB_ASSIGN ));
-    mpImpl->pDeletePB           = new PushButton( this, CUI_RES( PB_DELETE ));
-    mpImpl->pMacroImg           = new Image( CUI_RES( IMG_MACRO) );
-    mpImpl->pComponentImg       = new Image( CUI_RES( IMG_COMPONENT) );
-    mpImpl->pMacroImg_h         = new Image( CUI_RES( IMG_MACRO_H) );
-    mpImpl->pComponentImg_h     = new Image( CUI_RES( IMG_COMPONENT_H) );
+    mpImpl->pStrEvent			= new String( CUI_RES( STR_EVENT ));
+    mpImpl->pAssignedMacro		= new String( CUI_RES( STR_ASSMACRO ));
+    mpImpl->pEventLB			= new _HeaderTabListBox( this, CUI_RES( LB_EVENT ));
+    mpImpl->pAssignFT			= new FixedText( this,  CUI_RES( FT_ASSIGN ));
+    mpImpl->pAssignPB			= new PushButton( this, CUI_RES( PB_ASSIGN ));
+    mpImpl->pDeletePB			= new PushButton( this, CUI_RES( PB_DELETE ));
+    mpImpl->pMacroImg			= new Image( CUI_RES( IMG_MACRO) );
+    mpImpl->pComponentImg		= new Image( CUI_RES( IMG_COMPONENT) );
+    mpImpl->pMacroImg_h			= new Image( CUI_RES( IMG_MACRO_H) );
+    mpImpl->pComponentImg_h		= new Image( CUI_RES( IMG_COMPONENT_H) );
 
     FreeResource();
 
diff --git a/cui/source/customize/eventdlg.hrc b/cui/source/customize/eventdlg.hrc
index 8e482d83b97f..b75c0477687c 100644
--- a/cui/source/customize/eventdlg.hrc
+++ b/cui/source/customize/eventdlg.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <cuires.hrc>
 #include "macropg.hrc"
 
-#define TXT_SAVEIN      10
-#define LB_SAVEIN           11
+#define TXT_SAVEIN		10
+#define LB_SAVEIN			11
 
-#define MB_CONFIG   17
-#define CB_WARNING      18
+#define MB_CONFIG	17
+#define CB_WARNING		18
 #define CB_WARNING_ALWAYS 19
-#define GB_SAFETY       20
-#define ID_APP      21
-#define ID_DOC      22
+#define GB_SAFETY		20
+#define ID_APP		21
+#define ID_DOC		22
diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx
index c25fe2ae8d74..c5f32906ad3f 100644
--- a/cui/source/customize/eventdlg.hxx
+++ b/cui/source/customize/eventdlg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,16 +42,16 @@ class SvxMacroItem;
 
 class SvxEventConfigPage : public _SvxMacroTabPage
 {
-    FixedText                           aSaveInText;
-    ListBox                             aSaveInListBox;
+    FixedText							aSaveInText;
+    ListBox								aSaveInListBox;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace >   m_xAppEvents;
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace >   m_xDocumentEvents;
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifiable >         m_xDocumentModifiable;
 
-    BOOL            bAppConfig;
+    BOOL			bAppConfig;
 
-    DECL_LINK(      SelectHdl_Impl, ListBox* );
+    DECL_LINK(		SelectHdl_Impl, ListBox* );
 
     // Forbidden and not implemented.
     SvxEventConfigPage (const SvxEventConfigPage &);
@@ -66,8 +66,8 @@ public:
     void            LateInit( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame );
 
 protected:
-    virtual BOOL    FillItemSet( SfxItemSet& );
-    virtual void    Reset( const SfxItemSet& );
+    virtual BOOL	FillItemSet( SfxItemSet& );
+    virtual void	Reset( const SfxItemSet& );
     using _SvxMacroTabPage::Reset;
 
 private:
diff --git a/cui/source/customize/eventdlg.src b/cui/source/customize/eventdlg.src
index e8c0e21677ac..9bb68d6948b2 100644
--- a/cui/source/customize/eventdlg.src
+++ b/cui/source/customize/eventdlg.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ TabPage RID_SVXPAGE_EVENTS
         Pos = MAP_APPFONT ( 217, ROW0 ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_FIXEDTEXT_HEIGHT ) ;
         Text [ en-US ] = "Assign:" ;
-    };
+    }; 	
     PushButton PB_ASSIGN
     {
         Pos = MAP_APPFONT ( 217 , ROW0A ) ;
@@ -92,20 +92,20 @@ TabPage RID_SVXPAGE_EVENTS
     {
         ImageBitmap = Bitmap { File = "id018.png"; };
         MASKCOLOR
-    };
+    };	
     Image IMG_COMPONENT
     {
         ImageBitmap = Bitmap { File = "component_16.png"; };
         MASKCOLOR
-    };
+    };	
     Image IMG_MACRO_H
     {
         ImageBitmap = Bitmap { File = "idh018.png"; };
         MASKCOLOR
-    };
+    };	
     Image IMG_COMPONENT_H
     {
         ImageBitmap = Bitmap { File = "component_16_h.png"; };
         MASKCOLOR
-    };
+    };	
 };
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 5cb41f93a829..91aa5239a976 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -296,7 +296,7 @@ void _SvxMacroTabPage::InitResources()
     aDisplayNames.push_back( EventDisplayName( "OnPageCountChange",     RID_SVXSTR_EVENT_PAGECOUNTCHANGE ) );
     aDisplayNames.push_back( EventDisplayName( "OnSubComponentOpened",  RID_SVXSTR_EVENT_SUBCOMPONENT_OPENED ) );
     aDisplayNames.push_back( EventDisplayName( "OnSubComponentClosed",  RID_SVXSTR_EVENT_SUBCOMPONENT_CLOSED ) );
-//    aDisplayNames.push_back( EventDisplayName( "OnLayoutFinished",        RID_SVXSTR_EVENT_LAYOUT_FINISHED ) );
+//    aDisplayNames.push_back( EventDisplayName( "OnLayoutFinished",		RID_SVXSTR_EVENT_LAYOUT_FINISHED ) );
     aDisplayNames.push_back( EventDisplayName( "OnSelect",              RID_SVXSTR_EVENT_SELECTIONCHANGED ) );
     aDisplayNames.push_back( EventDisplayName( "OnDoubleClick",         RID_SVXSTR_EVENT_DOUBLECLICK ) );
     aDisplayNames.push_back( EventDisplayName( "OnRightClick",          RID_SVXSTR_EVENT_RIGHTCLICK ) );
@@ -844,17 +844,17 @@ Any _SvxMacroTabPage::GetPropsByName( const ::rtl::OUString& eventName, EventsHa
 SvxMacroTabPage::SvxMacroTabPage( Window* pParent, const Reference< frame::XFrame >& _rxDocumentFrame, const SfxItemSet& rSet, Reference< container::XNameReplace > xNameReplace, sal_uInt16 nSelectedIndex )
     : _SvxMacroTabPage( pParent, CUI_RES( RID_SVXPAGE_MACROASSIGN ), rSet )
 {
-    mpImpl->pStrEvent           = new String(                       CUI_RES( STR_EVENT ) );
-    mpImpl->pAssignedMacro      = new String(                       CUI_RES( STR_ASSMACRO ) );
-    mpImpl->pEventLB            = new _HeaderTabListBox( this,      CUI_RES( LB_EVENT ) );
-    mpImpl->pAssignFT           = new FixedText( this,              CUI_RES( FT_ASSIGN ) );
-    mpImpl->pAssignPB           = new PushButton( this,             CUI_RES( PB_ASSIGN ) );
-    mpImpl->pDeletePB           = new PushButton( this,             CUI_RES( PB_DELETE ) );
-    mpImpl->pAssignComponentPB  = new PushButton( this,         CUI_RES( PB_ASSIGN_COMPONENT ) );
-    mpImpl->pMacroImg           = new Image(                        CUI_RES(IMG_MACRO) );
-    mpImpl->pComponentImg       = new Image(                        CUI_RES(IMG_COMPONENT) );
-    mpImpl->pMacroImg_h         = new Image(                        CUI_RES(IMG_MACRO_H) );
-    mpImpl->pComponentImg_h     = new Image(                        CUI_RES(IMG_COMPONENT_H) );
+    mpImpl->pStrEvent           = new String(						CUI_RES( STR_EVENT ) );
+    mpImpl->pAssignedMacro      = new String(						CUI_RES( STR_ASSMACRO ) );
+    mpImpl->pEventLB            = new _HeaderTabListBox( this,		CUI_RES( LB_EVENT ) );
+    mpImpl->pAssignFT			= new FixedText( this,				CUI_RES( FT_ASSIGN ) );
+    mpImpl->pAssignPB           = new PushButton( this,				CUI_RES( PB_ASSIGN ) );
+    mpImpl->pDeletePB           = new PushButton( this,				CUI_RES( PB_DELETE ) );
+    mpImpl->pAssignComponentPB  = new PushButton( this,			CUI_RES( PB_ASSIGN_COMPONENT ) );
+    mpImpl->pMacroImg			= new Image(						CUI_RES(IMG_MACRO) );
+    mpImpl->pComponentImg		= new Image(						CUI_RES(IMG_COMPONENT) );
+    mpImpl->pMacroImg_h			= new Image(						CUI_RES(IMG_MACRO_H) );
+    mpImpl->pComponentImg_h		= new Image(						CUI_RES(IMG_COMPONENT_H) );
 
     FreeResource();
 
diff --git a/cui/source/customize/macropg.hrc b/cui/source/customize/macropg.hrc
index a7387e410432..dedb2db025c2 100644
--- a/cui/source/customize/macropg.hrc
+++ b/cui/source/customize/macropg.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,70 +32,70 @@
 #include <svtools/controldims.hrc>
 #endif
 
-#define     LB_EVENT                1
-#define     PB_ASSIGN               2
-#define     PB_DELETE               3
-#define     STR_EVENT               4
-#define     STR_ASSMACRO            5
-#define     FT_ASSIGN               6
-#define     PB_ASSIGN_COMPONENT     7
+#define 	LB_EVENT				1
+#define 	PB_ASSIGN				2
+#define 	PB_DELETE				3
+#define		STR_EVENT				4
+#define		STR_ASSMACRO			5
+#define 	FT_ASSIGN				6
+#define 	PB_ASSIGN_COMPONENT		7
 
 // Starting new IDs with 30 as eventdlg.hrc also includes this file
-#define     IMG_MACRO               30
-#define     IMG_COMPONENT           31
-#define     IMG_MACRO_H             32
-#define     IMG_COMPONENT_H         33
+#define		IMG_MACRO				30
+#define		IMG_COMPONENT			31
+#define		IMG_MACRO_H				32
+#define		IMG_COMPONENT_H			33
 
-#define     RID_PB_OK               41
-#define     RID_PB_CANCEL           42
-#define     RID_PB_HELP             43
-#define     FT_METHOD               44
-#define     EDIT_METHOD             45
+#define		RID_PB_OK				41
+#define		RID_PB_CANCEL			42
+#define		RID_PB_HELP				43
+#define		FT_METHOD				44
+#define		EDIT_METHOD				45
 
 
 // COL0<---------------WIDTH_1_2--------------->COL3<->COL4<----WIDTH4---->COL5
 //     <--WIDTH1-->COL1<-SPACE1->COL2<--WIDTH2->
 
-#define WIDTH_TP        260                                     // of whole tabpage
-#define COL5            (WIDTH_TP-RSC_SP_DLG_INNERBORDER_RIGHT)
-#define COL4            (COL5-RSC_CD_PUSHBUTTON_WIDTH)
-#define COL3            (COL4-RSC_SP_CTRL_X)
-#define COL0            (RSC_SP_TBPG_INNERBORDER_LEFT)
-#define WIDTH1_2        (COL3-COL0)                             // width of upper listbox
-#define SPACE1          4                                       // space between lower listboxes
-#define WIDTH1          ((WIDTH1_2-SPACE1)/2)                   // width of lower left listbox
-#define WIDTH2          (WIDTH1_2-WIDTH1-SPACE1)                // width of lower right listbox
-#define COL1            (COL0+WIDTH1)
-#define COL2            (COL1+SPACE1)
+#define	WIDTH_TP		260										// of whole tabpage
+#define	COL5			(WIDTH_TP-RSC_SP_DLG_INNERBORDER_RIGHT)
+#define	COL4			(COL5-RSC_CD_PUSHBUTTON_WIDTH)
+#define	COL3			(COL4-RSC_SP_CTRL_X)
+#define	COL0			(RSC_SP_TBPG_INNERBORDER_LEFT)
+#define	WIDTH1_2		(COL3-COL0)								// width of upper listbox
+#define SPACE1			4										// space between lower listboxes
+#define WIDTH1			((WIDTH1_2-SPACE1)/2)					// width of lower left listbox
+#define	WIDTH2			(WIDTH1_2-WIDTH1-SPACE1)				// width of lower right listbox
+#define COL1			(COL0+WIDTH1)
+#define	COL2			(COL1+SPACE1)
 
-#define HEIGHT0         158                                     // of upper listbox
-#define HEIGHT_TP       (HEIGHT0+6)                             // of whole tabpage
-#define ROW0            6                                       // more than RSC_SP_FLGR_INNERBORDER_TOP cause of bad design
-#define ROW0A           (ROW0+RSC_CD_FIXEDTEXT_HEIGHT+SPACE1)
-#define ROW1            (ROW0A+RSC_CD_PUSHBUTTON_HEIGHT)        // Assign button
-#define ROW2            (ROW1+RSC_SP_CTRL_GROUP_Y)
-#define ROW3            (ROW2+RSC_CD_PUSHBUTTON_HEIGHT)         // Assign component button
-#define ROW4            (ROW3+RSC_SP_CTRL_GROUP_Y)
-#define ROW5_REMOVE     (ROW4+RSC_SP_CTRL_GROUP_Y)              // Remove button
-#define ROW5            (ROW4+RSC_CD_DROPDOWN_HEIGHT)           // script type listbox (hidden)
-#define ROW6            (ROW0+HEIGHT0)
-#define ROW7            (ROW6+RSC_SP_CTRL_Y)
-#define HEIGHT_EXTRA7   (RSC_CD_FIXEDTEXT_HEIGHT)               // additional height for FT_LABEL4LB_MACROS
-#define ROW7A           (ROW7+HEIGHT_EXTRA7)
-#define ROW8            (ROW7+RSC_CD_FIXEDTEXT_HEIGHT+HEIGHT_EXTRA7)// label for lower listboxes (2 lines!)
-#define ROW9            (HEIGHT_TP-RSC_SP_TBPG_INNERBORDER_BOTTOM)
-#define HEIGHT8         (ROW9-ROW8)                             // of lower listboxes
+#define HEIGHT0			158										// of upper listbox
+#define HEIGHT_TP		(HEIGHT0+6)								// of whole tabpage
+#define	ROW0			6										// more than RSC_SP_FLGR_INNERBORDER_TOP cause of bad design
+#define	ROW0A			(ROW0+RSC_CD_FIXEDTEXT_HEIGHT+SPACE1)
+#define	ROW1			(ROW0A+RSC_CD_PUSHBUTTON_HEIGHT)		// Assign button
+#define	ROW2			(ROW1+RSC_SP_CTRL_GROUP_Y)
+#define	ROW3			(ROW2+RSC_CD_PUSHBUTTON_HEIGHT)			// Assign component button
+#define	ROW4			(ROW3+RSC_SP_CTRL_GROUP_Y)
+#define	ROW5_REMOVE		(ROW4+RSC_SP_CTRL_GROUP_Y)				// Remove button
+#define	ROW5			(ROW4+RSC_CD_DROPDOWN_HEIGHT)			// script type listbox (hidden)
+#define	ROW6			(ROW0+HEIGHT0)
+#define	ROW7			(ROW6+RSC_SP_CTRL_Y)
+#define	HEIGHT_EXTRA7	(RSC_CD_FIXEDTEXT_HEIGHT)				// additional height for FT_LABEL4LB_MACROS
+#define	ROW7A			(ROW7+HEIGHT_EXTRA7)
+#define	ROW8			(ROW7+RSC_CD_FIXEDTEXT_HEIGHT+HEIGHT_EXTRA7)// label for lower listboxes (2 lines!)
+#define	ROW9			(HEIGHT_TP-RSC_SP_TBPG_INNERBORDER_BOTTOM)
+#define	HEIGHT8			(ROW9-ROW8)								// of lower listboxes
 
-#define COMP_EDIT_WIDTH 100
-#define COMP_DIST_Y     6
-#define COMP_WIDTH      (COMP_EDIT_WIDTH+RSC_CD_PUSHBUTTON_WIDTH+3*COMP_DIST_Y)
-#define COMP_COL0       COMP_DIST_Y
-#define COMP_COL1       (COMP_COL0+COMP_EDIT_WIDTH+COMP_DIST_Y)
-#define COMP_ROW0       6
-#define COMP_ROW1       (COMP_ROW0+RSC_CD_PUSHBUTTON_HEIGHT+RSC_SP_CTRL_GROUP_Y)
-#define COMP_ROW2       (COMP_ROW1+RSC_CD_PUSHBUTTON_HEIGHT+2*RSC_SP_CTRL_GROUP_Y)
-#define COMP_ROWEDIT    (COMP_ROW0+RSC_CD_FIXEDTEXT_HEIGHT+2)
-#define COMP_HEIGHT     (COMP_ROW2+RSC_CD_PUSHBUTTON_HEIGHT+2*RSC_SP_CTRL_GROUP_Y)
+#define	COMP_EDIT_WIDTH	100
+#define	COMP_DIST_Y		6
+#define	COMP_WIDTH		(COMP_EDIT_WIDTH+RSC_CD_PUSHBUTTON_WIDTH+3*COMP_DIST_Y)
+#define	COMP_COL0		COMP_DIST_Y
+#define	COMP_COL1		(COMP_COL0+COMP_EDIT_WIDTH+COMP_DIST_Y)
+#define	COMP_ROW0		6
+#define	COMP_ROW1		(COMP_ROW0+RSC_CD_PUSHBUTTON_HEIGHT+RSC_SP_CTRL_GROUP_Y)
+#define	COMP_ROW2		(COMP_ROW1+RSC_CD_PUSHBUTTON_HEIGHT+2*RSC_SP_CTRL_GROUP_Y)
+#define	COMP_ROWEDIT	(COMP_ROW0+RSC_CD_FIXEDTEXT_HEIGHT+2)
+#define	COMP_HEIGHT		(COMP_ROW2+RSC_CD_PUSHBUTTON_HEIGHT+2*RSC_SP_CTRL_GROUP_Y)
 
 #endif
 
diff --git a/cui/source/customize/macropg.src b/cui/source/customize/macropg.src
index 10d9149233e0..6402587dc913 100644
--- a/cui/source/customize/macropg.src
+++ b/cui/source/customize/macropg.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 TabPage RID_SVXPAGE_MACROASSIGN
 {
-     // HelpID = HID_MACROASSIGN ;
+     //	HelpID = HID_MACROASSIGN ;
     Hide = TRUE ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
diff --git a/cui/source/customize/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx
index 0e527e5a7623..3701d5fc3175 100644
--- a/cui/source/customize/macropg_impl.hxx
+++ b/cui/source/customize/macropg_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
@@ -35,29 +35,29 @@ public:
                                     _SvxMacroTabPage_Impl( const SfxItemSet& rAttrSet );
                                     ~_SvxMacroTabPage_Impl();
 
-    FixedText*                      pAssignFT;
-    PushButton*                     pAssignPB;
-    PushButton*                     pAssignComponentPB;
-    PushButton*                     pDeletePB;
-    Image*                          pMacroImg;
-    Image*                          pComponentImg;
-    Image*                          pMacroImg_h;
-    Image*                          pComponentImg_h;
-    String*                         pStrEvent;
-    String*                         pAssignedMacro;
-    _HeaderTabListBox*              pEventLB;
-    BOOL                            bReadOnly;
-    BOOL                            bIDEDialogMode;
+    FixedText*						pAssignFT;
+    PushButton*						pAssignPB;
+    PushButton*						pAssignComponentPB;
+    PushButton*						pDeletePB;
+    Image*							pMacroImg;
+    Image*							pComponentImg;
+    Image*							pMacroImg_h;
+    Image*							pComponentImg_h;
+    String*							pStrEvent;
+    String*							pAssignedMacro;
+    _HeaderTabListBox*				pEventLB;
+    BOOL							bReadOnly;
+    BOOL							bIDEDialogMode;
 };
 
 class AssignComponentDialog : public ModalDialog
 {
 private:
-    FixedText       maMethodLabel;
-    Edit            maMethodEdit;
-    OKButton        maOKButton;
-    CancelButton    maCancelButton;
-    HelpButton      maHelpButton;
+    FixedText		maMethodLabel;
+    Edit			maMethodEdit;
+    OKButton		maOKButton;
+    CancelButton	maCancelButton;
+    HelpButton		maHelpButton;
 
     ::rtl::OUString maURL;
 
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index b52f8c29a6f3..d04aa0470738 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 "selector.hxx"
 #include <dialmgr.hxx>
 #include "selector.hrc"
-#include <svx/fmresids.hrc> // for RID_SVXIMG_...
+#include <svx/fmresids.hrc>	// for RID_SVXIMG_...
 #include <svx/dialmgr.hxx>  // for RID_SVXIMG_...
 #include <cuires.hrc>
 #include <sfx2/app.hxx>
@@ -316,7 +316,7 @@ namespace
             if ( xContext.is() )
                 xScripts.set( xContext->getScriptContainer(), UNO_QUERY );
         }
-
+            
         return Reference< XModel >( xScripts, UNO_QUERY );
     }
 
diff --git a/cui/source/customize/selector.hrc b/cui/source/customize/selector.hrc
index 78929c8c9de5..cfa1ff21f82b 100644
--- a/cui/source/customize/selector.hrc
+++ b/cui/source/customize/selector.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,13 +35,13 @@
 #define BTN_SELECTOR_HELP 8
 #define GRP_SELECTOR_DESCRIPTION 9
 #define TXT_SELECTOR_DESCRIPTION 10
-#define IMG_HARDDISK                   1
+#define IMG_HARDDISK                   1 
 #define IMG_HARDDISK_HC                2
-#define IMG_LIB                        3
+#define IMG_LIB                        3 
 #define IMG_LIB_HC                     4
-#define IMG_MACRO                      5
+#define IMG_MACRO                      5 
 #define IMG_MACRO_HC                   6
-#define IMG_DOC                        7
+#define IMG_DOC                        7 
 #define IMG_DOC_HC                     8
 
 #define STR_SELECTOR_ADD 310
diff --git a/cui/source/customize/selector.src b/cui/source/customize/selector.src
index cd4ea9dd5d12..f09f95661a5a 100644
--- a/cui/source/customize/selector.src
+++ b/cui/source/customize/selector.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -122,7 +122,7 @@ ModelessDialog RID_DLG_SCRIPTSELECTOR
     String STR_PRODMACROS
     {
         Text [ en-US ] = "%PRODUCTNAME Macros";
-    };
+    }; 
     Image IMG_HARDDISK
     {
         ImageBitmap = Bitmap { File = "harddisk_16.bmp" ; };
@@ -132,7 +132,7 @@ ModelessDialog RID_DLG_SCRIPTSELECTOR
     {
         ImageBitmap = Bitmap { File = "harddisk_16_h.bmp" ; };
         MASKCOLOR
-    };
+    }; 
     Image IMG_LIB
     {
         ImageBitmap = Bitmap { File = "im30820.png"; };
diff --git a/cui/source/dialogs/SpellAttrib.cxx b/cui/source/dialogs/SpellAttrib.cxx
index c4c55b9ebe1b..61f8f82a9547 100644
--- a/cui/source/dialogs/SpellAttrib.cxx
+++ b/cui/source/dialogs/SpellAttrib.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ TextAttrib*     SpellErrorAttrib::Clone() const
   -----------------------------------------------------------------------*/
 int SpellErrorAttrib::operator==( const TextAttrib& rAttr ) const
 {
-    return Which() == rAttr.Which() &&
+    return Which() == rAttr.Which() && 
             m_aSpellErrorDescription == static_cast<const SpellErrorAttrib&>(rAttr).m_aSpellErrorDescription;
 }
 /*-- 10.09.2003 14:27:43---------------------------------------------------
@@ -123,13 +123,13 @@ TextAttrib* SpellLanguageAttrib::Clone() const
   -----------------------------------------------------------------------*/
 int SpellLanguageAttrib::operator==( const TextAttrib& rAttr ) const
 {
-    return Which() == rAttr.Which() &&
+    return Which() == rAttr.Which() && 
             m_eLanguage == static_cast<const SpellLanguageAttrib&>(rAttr).m_eLanguage;
 }
 /*-- 31.10.2003 16:07:45---------------------------------------------------
 
   -----------------------------------------------------------------------*/
-SpellBackgroundAttrib::SpellBackgroundAttrib(const Color& rCol) :
+SpellBackgroundAttrib::SpellBackgroundAttrib(const Color& rCol) : 
     TextAttrib(TEXTATTR_SPELL_BACKGROUND),
     m_aBackgroundColor(rCol)
 {
@@ -167,7 +167,7 @@ TextAttrib* SpellBackgroundAttrib::Clone() const
   -----------------------------------------------------------------------*/
 int  SpellBackgroundAttrib::operator==( const TextAttrib& rAttr ) const
 {
-    return Which() == rAttr.Which() &&
+    return Which() == rAttr.Which() && 
             m_aBackgroundColor == static_cast<const SpellBackgroundAttrib&>(rAttr).m_aBackgroundColor;
 }
 
diff --git a/cui/source/dialogs/SpellAttrib.hxx b/cui/source/dialogs/SpellAttrib.hxx
index 72e69270239a..29bd5265c667 100644
--- a/cui/source/dialogs/SpellAttrib.hxx
+++ b/cui/source/dialogs/SpellAttrib.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include <tools/color.hxx>
 //namespace com{ namespace sun{ namespace star{ namespace linguistic2{
 //    class XSpellAlternatives;
-//}}}}
+//}}}}            
 
 #define TEXTATTR_SPELL_ERROR            (TEXTATTR_USER_START + 1)
 #define TEXTATTR_SPELL_LANGUAGE         (TEXTATTR_USER_START + 2)
@@ -58,8 +58,8 @@ struct SpellErrorDescription
 
     SpellErrorDescription() :
         bIsGrammarError( false ){}
-
-    SpellErrorDescription( bool bGrammar,
+    
+    SpellErrorDescription( bool bGrammar, 
                       const ::rtl::OUString& rText,
                       const ::com::sun::star::lang::Locale& rLocale,
                       const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSuggestions,
@@ -75,7 +75,7 @@ struct SpellErrorDescription
         sServiceName( rServiceName ),
         aSuggestions( rSuggestions )
         {
-            if( pDialogTitle )
+            if( pDialogTitle )    
                 sDialogTitle = *pDialogTitle;
             if( pExplanation )
                 sExplanation = *pExplanation;
@@ -85,16 +85,16 @@ struct SpellErrorDescription
 
     int operator==( const SpellErrorDescription& rDesc ) const
     {
-        return bIsGrammarError == rDesc.bIsGrammarError &&
-                sErrorText.equals( rDesc.sErrorText ) &&
+        return bIsGrammarError == rDesc.bIsGrammarError && 
+                sErrorText.equals( rDesc.sErrorText ) && 
                 aLocale.Language.equals( rDesc.aLocale.Language ) &&
                 aLocale.Country.equals( rDesc.aLocale.Country ) &&
                 aLocale.Variant.equals( rDesc.aLocale.Variant ) &&
-                aSuggestions == rDesc.aSuggestions &&
+                aSuggestions == rDesc.aSuggestions && 
                 xGrammarChecker == rDesc.xGrammarChecker &&
                 sDialogTitle.equals( rDesc.sDialogTitle ) &&
-                sExplanation.equals( rDesc.sExplanation ) &&
-                sRuleId == rDesc.sRuleId;
+                sExplanation.equals( rDesc.sExplanation ) && 
+                sRuleId == rDesc.sRuleId; 
     }
 };
 /* -----------------10.09.2003 14:23-----------------
@@ -104,10 +104,10 @@ class SpellErrorAttrib : public TextAttrib
 {
 public:
 
-private:
+private:        
     //com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellAlternatives> m_xAlternatives;
     SpellErrorDescription        m_aSpellErrorDescription;
-
+                            
                             //not accessible
                             SpellErrorAttrib();
 public:
@@ -118,7 +118,7 @@ public:
 
     const SpellErrorDescription& GetErrorDescription() const { return m_aSpellErrorDescription; }
 
-
+    
     virtual void            SetFont( Font& rFont ) const;
     virtual TextAttrib*     Clone() const;
     virtual int             operator==( const TextAttrib& rAttr ) const;
@@ -139,10 +139,10 @@ public:
                             ~SpellLanguageAttrib();
 
     LanguageType            GetLanguage() const {return m_eLanguage;}
-    void                    SetLanguage(LanguageType eLang)
+    void                    SetLanguage(LanguageType eLang) 
                                         {m_eLanguage = eLang;}
-
-
+    
+    
     virtual void            SetFont( Font& rFont ) const;
     virtual TextAttrib*     Clone() const;
     virtual int             operator==( const TextAttrib& rAttr ) const;
@@ -164,8 +164,8 @@ public:
 
     const   Color&          GetColor() const { return m_aBackgroundColor;}
     void                    SetColor( const Color& rNewCol ){m_aBackgroundColor = rNewCol;}
-
-
+    
+    
     virtual void            SetFont( Font& rFont ) const;
     virtual TextAttrib*     Clone() const;
     virtual int             operator==( const TextAttrib& rAttr ) const;
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 304407cdba07..e93307901f26 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::linguistic2;
 
-#define C2U(cChar)                  ::rtl::OUString::createFromAscii(cChar)
+#define C2U(cChar) 					::rtl::OUString::createFromAscii(cChar)
 // struct SpellDialog_Impl ---------------------------------------------
 
 struct SpellDialog_Impl
 {
-    Sequence< Reference< XDictionary >  >   aDics;
+    Sequence< Reference< XDictionary >  >	aDics;
 };
 // -----------------------------------------------------------------------
 //#define VENDOR_IMAGE_HEIGHT 44 //as specified
@@ -329,7 +329,7 @@ void SpellDialog::UpdateBoxes_Impl()
 
     LanguageType nAltLanguage = LANGUAGE_NONE;
     //String      aAltWord;
-    Sequence< ::rtl::OUString > aNewWords;
+    Sequence< ::rtl::OUString >	aNewWords;
     bool bIsGrammarError = false;
     if( pSpellErrorDescription )
     {
@@ -861,7 +861,7 @@ IMPL_LINK(SpellDialog, LanguageSelectHdl, SvxLanguageBox*, pBox)
 
 void SpellDialog::SetLanguage( sal_uInt16 nLang )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     wenn die Sprache im Thesaurus umgestellt wurde,
     muss auch hier die Sprache umgestellt werden.
@@ -899,7 +899,7 @@ void SpellDialog::SetTitle_Impl(LanguageType nLang)
         if( pSpellErrorDescription && pSpellErrorDescription->sServiceName.getLength() )
         {
             bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-            ::rtl::OUString sSuggestionImageUrl =
+            ::rtl::OUString sSuggestionImageUrl = 
                 SvtLinguConfig().GetSpellAndGrammarDialogImage( pSpellErrorDescription->sServiceName, bHighContrast );
             aVendorImageFI.SetImage( lcl_GetImageFromPngUrl( sSuggestionImageUrl ) );
             uno::Reference< lang::XServiceDisplayName > xDisplayName( pSpellErrorDescription->xGrammarChecker, uno::UNO_QUERY );
@@ -908,7 +908,7 @@ void SpellDialog::SetTitle_Impl(LanguageType nLang)
         }
         else
         {
-            bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
+            bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();            
             aVendorImageFI.SetImage( bHighContrast ? aVendorImageHC : aVendorImage );
         }
 
@@ -1159,7 +1159,7 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck)
     bool bRet = false;
     if(!bUseSavedSentence /*&& aSentenceED.IsModified()*/)
     {
-        //apply changes and ignored text parts
+        //apply changes and ignored text parts 
         rParent.ApplyChangedSentence(aSentenceED.CreateSpellPortions(true), bRecheck);
     }
     aSentenceED.ResetIgnoreErrorsAt();
@@ -1845,15 +1845,15 @@ void SentenceEditWindow_Impl::SetAlternatives( Reference< XSpellAlternatives> xA
     DBG_ASSERT(static_cast<const SpellErrorAttrib*>(
             GetTextEngine()->FindAttrib( aCursor, TEXTATTR_SPELL_ERROR)), "no error set?");
 
-    ::rtl::OUString aWord;
-    lang::Locale    aLocale;
-    uno::Sequence< ::rtl::OUString >    aAlts;
+    ::rtl::OUString	aWord;
+    lang::Locale	aLocale;
+    uno::Sequence< ::rtl::OUString >	aAlts;
     ::rtl::OUString sServiceName;
     if (xAlt.is())
     {
-        aWord   = xAlt->getWord();
-        aLocale = xAlt->getLocale();
-        aAlts   = xAlt->getAlternatives();
+        aWord	= xAlt->getWord();
+        aLocale	= xAlt->getLocale();
+        aAlts	= xAlt->getAlternatives();
         uno::Reference< container::XNamed > xNamed( xAlt, uno::UNO_QUERY );
         if (xNamed.is())
             sServiceName = xNamed->getName();
@@ -2002,18 +2002,18 @@ svx::SpellPortions SentenceEditWindow_Impl::CreateSpellPortions( bool bSetIgnore
             String aLeftOverText;
             for (ULONG i = 1;  i < nPara;  ++i)
             {
-                aLeftOverText.AppendAscii( "\x0a" );    // the manual line break...
+                aLeftOverText.AppendAscii( "\x0a" );	// the manual line break...
                 aLeftOverText += pTextEngine->GetText(i);
             }
             if (pError)
-            {   // we need to add a new portion containing the left-over text
+            {	// we need to add a new portion containing the left-over text
                 svx::SpellPortion aPortion2;
                 aPortion2.eLanguage = eLang;
                 aPortion2.sText = aLeftOverText;
                 aRet.push_back( aPortion2 );
             }
             else
-            {   // we just need to append the left-over text to the last portion (which had no errors)
+            {	// we just need to append the left-over text to the last portion (which had no errors)
                 aRet[ aRet.size() - 1 ].sText += aLeftOverText;
             }
         }
diff --git a/cui/source/dialogs/SpellDialog.hrc b/cui/source/dialogs/SpellDialog.hrc
index 5c9a82ffef0e..8cac9b8b3cc3 100644
--- a/cui/source/dialogs/SpellDialog.hrc
+++ b/cui/source/dialogs/SpellDialog.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/dialogs/SpellDialog.src b/cui/source/dialogs/SpellDialog.src
index 5a97025f02af..b91bea09861f 100644
--- a/cui/source/dialogs/SpellDialog.src
+++ b/cui/source/dialogs/SpellDialog.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
         Size = MAP_APPFONT ( 270, 21  ) ;
         Hide = TRUE;
     };
-
+    
     FixedText FT_LANGUAGE
     {
         Pos = MAP_APPFONT(  6, 8 );
diff --git a/cui/source/dialogs/charmap.hrc b/cui/source/dialogs/charmap.hrc
index 0b3aa3e09b49..644ea47b3a2b 100644
--- a/cui/source/dialogs/charmap.hrc
+++ b/cui/source/dialogs/charmap.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 // defines ------------------------------------------------------------------
 
-#define CT_SHOWSET      10
-#define FT_FONT         11
-#define LB_FONT         12
-#define CT_SHOWTEXT     13
-#define FT_SYMBOLE      14
-#define CT_SHOWCHAR     15
-#define FT_CHARCODE     16
-#define BTN_CHAR_OK     17
-#define BTN_CHAR_CANCEL 18
-#define BTN_CHAR_HELP   19
-#define BTN_DELETE      20
-#define FT_SUBSET       30
-#define LB_SUBSET       31
-#define ED_SHORTCUT     32
-#define BT_ASSIGN       33
-#define FT_ASSIGN       34
-#define CT_ASSIGN       35
+#define CT_SHOWSET		10
+#define FT_FONT			11
+#define LB_FONT			12
+#define CT_SHOWTEXT		13
+#define FT_SYMBOLE		14
+#define CT_SHOWCHAR		15
+#define FT_CHARCODE		16
+#define BTN_CHAR_OK	   	17
+#define BTN_CHAR_CANCEL	18
+#define BTN_CHAR_HELP	19
+#define BTN_DELETE		20
+#define FT_SUBSET		30
+#define LB_SUBSET		31
+#define ED_SHORTCUT		32
+#define BT_ASSIGN		33
+#define FT_ASSIGN		34
+#define CT_ASSIGN		35
 
 #endif
 
diff --git a/cui/source/dialogs/charmap.src b/cui/source/dialogs/charmap.src
index 02e2e728f412..835ab608aa87 100644
--- a/cui/source/dialogs/charmap.src
+++ b/cui/source/dialogs/charmap.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ ModalDialog RID_SVXDLG_CHARMAP
     HelpId = SID_CHARMAP ;
     SvLook = TRUE ;
     Text [ en-US ] = "Special Characters";
-/*  Size = MAP_APPFONT ( 297 , 169 ) ; */
+/*	Size = MAP_APPFONT ( 297 , 169 ) ; */
     Size = MAP_APPFONT ( 297 , 153 ) ;
     OutputSize = TRUE ;
     Moveable = TRUE ;
@@ -92,7 +92,7 @@ ModalDialog RID_SVXDLG_CHARMAP
     {
         HelpId = HID_CHARMAP_CTL_SHOWTEXT ;
         Pos = MAP_APPFONT ( 46 , 137 ) ;
-/*      Size = MAP_APPFONT ( 190 , 16 ) ; */
+/*		Size = MAP_APPFONT ( 190 , 16 ) ; */
         Size = MAP_APPFONT ( 244 , 16 ) ;
         Group = TRUE ;
     };
@@ -134,7 +134,7 @@ ModalDialog RID_SVXDLG_CHARMAP
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Delete";
     };
-/*
+/*	
     PushButton BT_ASSIGN
     {
         Pos = MAP_APPFONT ( 242 , 140 ) ;
@@ -153,7 +153,7 @@ ModalDialog RID_SVXDLG_CHARMAP
         Pos = MAP_APPFONT ( 60 , 156 ) ;
         Size = MAP_APPFONT ( 160 , 8 ) ;
     };
-*/
+*/	
 };
 
 // ********************************************************************** EOF
diff --git a/cui/source/dialogs/commonlingui.cxx b/cui/source/dialogs/commonlingui.cxx
index 9b23a1386963..949b62f558c2 100644
--- a/cui/source/dialogs/commonlingui.cxx
+++ b/cui/source/dialogs/commonlingui.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,17 +90,17 @@ __EXPORT SvxClickInfoCtr::~SvxClickInfoCtr()
 //-----------------------------------------------------------------------------
 SvxCommonLinguisticControl::SvxCommonLinguisticControl( ModalDialog* _pParent )
     :Window( _pParent, CUI_RES( RID_SVX_WND_COMMON_LINGU ) )
-    ,aWordText      ( this, CUI_RES( FT_WORD ) )
-    ,aAktWord       ( this, CUI_RES( FT_AKTWORD ) )
-    ,aNewWord       ( this, CUI_RES( FT_NEWWORD ) )
-    ,aNewWordED     ( this, CUI_RES( ED_NEWWORD ) )
-    ,aSuggestionFT  ( this, CUI_RES( FT_SUGGESTION ) )
+    ,aWordText		( this,	CUI_RES( FT_WORD ) )
+    ,aAktWord		( this,	CUI_RES( FT_AKTWORD ) )
+    ,aNewWord		( this,	CUI_RES( FT_NEWWORD ) )
+    ,aNewWordED		( this,	CUI_RES( ED_NEWWORD ) )
+    ,aSuggestionFT	( this, CUI_RES( FT_SUGGESTION ) )
     ,aIgnoreBtn     ( this, CUI_RES( BTN_IGNORE ) )
-    ,aIgnoreAllBtn  ( this, CUI_RES( BTN_IGNOREALL ) )
-    ,aChangeBtn     ( this, CUI_RES( BTN_CHANGE ) )
-    ,aChangeAllBtn  ( this, CUI_RES( BTN_CHANGEALL ) )
-    ,aOptionsBtn    ( this, CUI_RES( BTN_OPTIONS ) )
-    ,aStatusText    ( this, CUI_RES( FT_STATUS ) )
+    ,aIgnoreAllBtn	( this,	CUI_RES( BTN_IGNOREALL ) )
+    ,aChangeBtn		( this,	CUI_RES( BTN_CHANGE ) )
+    ,aChangeAllBtn	( this,	CUI_RES( BTN_CHANGEALL ) )
+    ,aOptionsBtn	( this, CUI_RES( BTN_OPTIONS ) )
+    ,aStatusText	( this, CUI_RES( FT_STATUS ) )
     ,aHelpBtn       ( this, CUI_RES( BTN_SPL_HELP ) )
     ,aCancelBtn     ( this, CUI_RES( BTN_SPL_CANCEL ) )
     ,aAuditBox      ( this, CUI_RES( GB_AUDIT ) )
@@ -116,7 +116,7 @@ SvxCommonLinguisticControl::SvxCommonLinguisticControl( ModalDialog* _pParent )
 }
 
 // -----------------------------------------------------------------------
-PushButton* SvxCommonLinguisticControl::implGetButton( ButtonType _eType  ) const
+PushButton*	SvxCommonLinguisticControl::implGetButton( ButtonType _eType  ) const
 {
     const PushButton* pButton = NULL;
     switch ( _eType )
@@ -150,13 +150,13 @@ void SvxCommonLinguisticControl::EnableButton( ButtonType _eType, sal_Bool _bEna
 // -----------------------------------------------------------------------
 void SvxCommonLinguisticControl::InsertControlGroup( Window& _rFirstGroupWindow, Window& _rLastGroupWindow, ControlGroup _eInsertAfter )
 {
-    Window* pInsertAfter = NULL;    // will be the last window of our own "undividable" group, after which we insert the foreign group
+    Window* pInsertAfter = NULL;	// will be the last window of our own "undividable" group, after which we insert the foreign group
     switch ( _eInsertAfter )
     {
-        case eLeftRightWords    : pInsertAfter = &aNewWordED; break;
-        case eSuggestionLabel   : pInsertAfter = &aSuggestionFT; break;
-        case eActionButtons     : pInsertAfter = &aChangeAllBtn; break;
-        case eDialogButtons     : pInsertAfter = &aCancelBtn; break;
+        case eLeftRightWords	: pInsertAfter = &aNewWordED; break;
+        case eSuggestionLabel	: pInsertAfter = &aSuggestionFT; break;
+        case eActionButtons		: pInsertAfter = &aChangeAllBtn; break;
+        case eDialogButtons		: pInsertAfter = &aCancelBtn; break;
     }
 
     // now loop through the remaining windows of the foreign group
diff --git a/cui/source/dialogs/commonlingui.hxx b/cui/source/dialogs/commonlingui.hxx
index 80edc1b73475..dee44a2f45a4 100644
--- a/cui/source/dialogs/commonlingui.hxx
+++ b/cui/source/dialogs/commonlingui.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,22 +44,22 @@
 class SvxClickInfoCtr: public Control
 {
 private:
-    FixedInfo                   aFixedInfo;
-    Link                        aActivateLink;
+    FixedInfo					aFixedInfo;
+    Link						aActivateLink;
 
 public:
     SvxClickInfoCtr( Window* pParent, const ResId& rResId );
     ~SvxClickInfoCtr();
 
-    virtual void        SetText( const XubString& rStr );
-    virtual XubString   GetText() const;
+    virtual void		SetText( const XubString& rStr );
+    virtual XubString	GetText() const;
 
-    void                SetActivateHdl( const Link& rLink ) { aActivateLink = rLink; }
-    const Link&         GetActivateHdl() const { return aActivateLink; }
+    void				SetActivateHdl( const Link& rLink ) { aActivateLink = rLink; }
+    const Link&			GetActivateHdl() const { return aActivateLink; }
 
 protected:
-    virtual void        MouseButtonDown( const MouseEvent& rMEvt );
-    virtual long        PreNotify( NotifyEvent& rNEvt );
+    virtual void		MouseButtonDown( const MouseEvent& rMEvt );
+    virtual long		PreNotify( NotifyEvent& rNEvt );
 
 };
 
@@ -86,13 +86,13 @@ protected:
     FixedText       aNewWord;
     Edit            aNewWordED;
 
-    FixedText       aSuggestionFT;
+    FixedText		aSuggestionFT;
 
     PushButton      aIgnoreBtn;
     PushButton      aIgnoreAllBtn;
     PushButton      aChangeBtn;
     PushButton      aChangeAllBtn;
-    PushButton      aOptionsBtn;
+    PushButton		aOptionsBtn;
 
     FixedInfo       aStatusText;
     HelpButton      aHelpBtn;
@@ -101,35 +101,35 @@ protected:
     GroupBox        aAuditBox;
 
 protected:
-    virtual void    Paint( const Rectangle& rRect );
+    virtual void	Paint( const Rectangle& rRect );
 
 private:
-    PushButton* implGetButton( ButtonType _eType  ) const;
+    PushButton*	implGetButton( ButtonType _eType  ) const;
 
 public:
     SvxCommonLinguisticControl( ModalDialog* _pParent );
 
     // handlers
-    inline void         SetResetWordHdl( const Link& _rLink )   { aAktWord.SetActivateHdl( _rLink ); }
-    inline const Link&  GetResetWordHdl() const                 { return aAktWord.GetActivateHdl(); }
+    inline void			SetResetWordHdl( const Link& _rLink )	{ aAktWord.SetActivateHdl( _rLink ); }
+    inline const Link&	GetResetWordHdl() const					{ return aAktWord.GetActivateHdl(); }
 
-    void    SetButtonHandler( ButtonType _eType, const Link& _rHandler );
-    void    EnableButton( ButtonType _eType, sal_Bool _bEnable );
+    void	SetButtonHandler( ButtonType _eType, const Link& _rHandler );
+    void	EnableButton( ButtonType _eType, sal_Bool _bEnable );
 
-    inline  PushButton*         GetButton( ButtonType _eType )          { return implGetButton( _eType  ); }
-    inline  const PushButton*   GetButton( ButtonType _eType ) const    { return implGetButton( _eType  ); }
+    inline	PushButton*			GetButton( ButtonType _eType )			{ return implGetButton( _eType  ); }
+    inline	const PushButton*	GetButton( ButtonType _eType ) const	{ return implGetButton( _eType  ); }
 
     // users of this class may want to insert own controls in some places, where the ordinary
     // Z-Order determined by construction time is not sufficient
     // Use the following methods for this
     enum ControlGroup // control groups in this window which cannot be devided (e.g. are adjacent in the Z order)
     {
-        eLeftRightWords,    // the controls for the two words (original and suggestion), including the labels
-        eSuggestionLabel,   // the label for the suggestion
-        eActionButtons,     // the group of "ignore(all)" / "change(all)" buttons
-        eDialogButtons      // the group of dialog control buttons (help and close)
+        eLeftRightWords,	// the controls for the two words (original and suggestion), including the labels
+        eSuggestionLabel,	// the label for the suggestion
+        eActionButtons,		// the group of "ignore(all)" / "change(all)" buttons
+        eDialogButtons		// the group of dialog control buttons (help and close)
     };
-    void    InsertControlGroup( Window& _rFirstGroupWindow, Window& _rLastGroupWindow, ControlGroup _eInsertAfter );
+    void	InsertControlGroup( Window& _rFirstGroupWindow, Window& _rLastGroupWindow, ControlGroup _eInsertAfter );
 
     /** enlarges the window
 
@@ -137,32 +137,32 @@ public:
         to the right, the dictionary list as well as the close/help buttons stick to the bottom of the
         window.
     */
-    void    Enlarge( sal_Int32 _nX, sal_Int32 _nY );
+    void	Enlarge( sal_Int32 _nX, sal_Int32 _nY );
 
     // control access methods
-    inline void     SetCurrentText( const String& _rText )  { aAktWord.SetText( _rText ); }
-    inline String   GetCurrentText( ) const                 { return aAktWord.GetText(); }
+    inline void		SetCurrentText( const String& _rText )	{ aAktWord.SetText( _rText ); }
+    inline String	GetCurrentText( ) const					{ return aAktWord.GetText(); }
 
-    inline void     SetStatusText( const String& _rText )   { aStatusText.SetText( _rText ); }
-    inline String   GetStatusText( ) const                  { return aStatusText.GetText(); }
+    inline void		SetStatusText( const String& _rText )	{ aStatusText.SetText( _rText ); }
+    inline String	GetStatusText( ) const					{ return aStatusText.GetText(); }
 
-    inline Edit&        GetWordInputControl()           { return aNewWordED; }
-    inline const Edit&  GetWordInputControl() const { return aNewWordED; }
+    inline Edit&		GetWordInputControl()			{ return aNewWordED; }
+    inline const Edit&	GetWordInputControl() const	{ return aNewWordED; }
 
     // returns the location (upper-left corner) of the group of action buttons
-    inline Point    GetActionButtonsLocation( ) const { return aIgnoreBtn.GetPosPixel(); }
+    inline Point	GetActionButtonsLocation( ) const { return aIgnoreBtn.GetPosPixel(); }
 
     // updates the help texts for the "change" and "change all" buttons according to the currently
     // entered texts
             void UpdateChangesHelp( const String& _rNewText );
-    inline  void UpdateChangesHelp( ) { UpdateChangesHelp( GetWordInputControl().GetText() ); }
+    inline	void UpdateChangesHelp( ) { UpdateChangesHelp( GetWordInputControl().GetText() ); }
 
     // updates the help texts for the "ignore" and "always ignore" buttons according to the currently
     // entered texts
             void UpdateIgnoreHelp( );
 
-    String          GetNewEditWord();
-    void            SetNewEditWord( const String& _rNew );
+    String			GetNewEditWord();
+    void			SetNewEditWord( const String& _rNew );
 };
 
 
diff --git a/cui/source/dialogs/commonlingui.src b/cui/source/dialogs/commonlingui.src
index 60a1eff0e14f..1fb25d8e4009 100644
--- a/cui/source/dialogs/commonlingui.src
+++ b/cui/source/dialogs/commonlingui.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 Window RID_SVX_WND_COMMON_LINGU
 {
-    DialogControl = TRUE;   // we want to tab out of this
+    DialogControl = TRUE;	// we want to tab out of this
     Hide = TRUE;
 
     FixedText FT_WORD
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 6348b73d4e14..a2794ad2a52d 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ SvxCharacterMap::SvxCharacterMap( Window* pParent, BOOL bOne, const SfxItemSet*
         bOne = pItem->GetValue();
 
     mpCharMapData =  new SvxCharMapData( this, bOne, &CUI_MGR() );
-
+    
     SFX_ITEMSET_ARG( pSet, pCharItem, SfxInt32Item, SID_ATTR_CHAR, FALSE );
     if ( pCharItem )
         SetChar( pCharItem->GetValue() );
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index 7cf48b0c1821..11b21f02a7df 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <svl/cjkoptions.hxx>
 #include <com/sun/star/i18n/TransliterationModules.hpp>
 #include <comphelper/processfactory.hxx>
-#include <svx/svxdlg.hxx>
+#include <svx/svxdlg.hxx> 
 #include <sal/macros.h>
 
 using namespace ::com::sun::star::uno;
@@ -56,7 +56,7 @@ using namespace ::svxform;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::util;
 
-#define MAX_HISTORY_ENTRIES     50
+#define MAX_HISTORY_ENTRIES		50
 
 //------------------------------------------------------------------------
 void FmSearchDialog::initCommon( const Reference< XResultSet >& _rxCursor )
@@ -132,9 +132,9 @@ FmSearchDialog::FmSearchDialog(Window* pParent, const UniString& sInitialText, c
     ,m_pbHelp                   (this, CUI_RES(1))
     ,m_sSearch                  ( m_pbSearchAgain.GetText() )
     ,m_sCancel                  ( Button::GetStandardText( BUTTON_CANCEL ) )
-    ,m_pPreSearchFocus( NULL )
+    ,m_pPreSearchFocus( NULL )                                      
     ,m_lnkContextSupplier(lnkContextSupplier)
-    ,m_pConfig( NULL )
+    ,m_pConfig( NULL )                                              
 {
     DBG_ASSERT(m_lnkContextSupplier.IsSet(), "FmSearchDialog::FmSearchDialog : have no ContextSupplier !");
 
@@ -163,7 +163,7 @@ FmSearchDialog::FmSearchDialog(Window* pParent, const UniString& sInitialText, c
     m_lbForm.SetSelectHdl(LINK(this, FmSearchDialog, OnContextSelection));
 
     if (m_arrContextFields.size() == 1)
-    {   // remove the context selection listbox and rearrange the controls accordingly
+    {	// remove the context selection listbox and rearrange the controls accordingly
         sal_Int32 nUpper = m_lbForm.GetPosPixel().Y();
         sal_Int32 nDifference = m_rbAllFields.GetPosPixel().Y() - nUpper;
 
@@ -192,7 +192,7 @@ FmSearchDialog::FmSearchDialog(Window* pParent, const UniString& sInitialText, c
     initCommon( fmscInitial.xCursor );
 
     if (fmscInitial.sFieldDisplayNames.Len() != 0)
-    {   // use the display names if supplied
+    {	// use the display names if supplied
         DBG_ASSERT(fmscInitial.sFieldDisplayNames.GetTokenCount() == fmscInitial.strUsedFields.GetTokenCount(),
             "FmSearchDialog::FmSearchDialog : invalid initial context description !");
         Init(fmscInitial.sFieldDisplayNames, sInitialText);
@@ -203,9 +203,9 @@ FmSearchDialog::FmSearchDialog(Window* pParent, const UniString& sInitialText, c
 
 //------------------------------------------------------------------------
 void FmSearchDialog::implMoveControls(
-            Control** _ppControls,
-            sal_Int32 _nControls,
-            sal_Int32 _nUp,
+            Control** _ppControls, 
+            sal_Int32 _nControls, 
+            sal_Int32 _nUp, 
             Control* /*_pToResize*/)
 {
     for (sal_Int32 i=0; i<_nControls; ++i)
@@ -345,7 +345,7 @@ IMPL_LINK(FmSearchDialog, OnClickedFieldRadios, Button*, pButton)
 IMPL_LINK(FmSearchDialog, OnClickedSearchAgain, Button*, EMPTYARG)
 {
     if (m_pbClose.IsEnabled())
-    {   // der Button hat die Funktion 'Suchen'
+    {	// der Button hat die Funktion 'Suchen'
         UniString strThisRoundText = m_cmbSearchText.GetText();
         // zur History dazu
         m_cmbSearchText.RemoveEntry(strThisRoundText);
@@ -379,7 +379,7 @@ IMPL_LINK(FmSearchDialog, OnClickedSearchAgain, Button*, EMPTYARG)
         }
     }
     else
-    {   // der Button hat die Fukntion 'Abbrechen'
+    {	// der Button hat die Fukntion 'Abbrechen'
         DBG_ASSERT(m_pSearchEngine->GetSearchMode() != SM_BRUTE, "FmSearchDialog, OnClickedSearchAgain : falscher Modus !");
             // der CancelButton wird normalerweise nur disabled, wenn ich in einem Thread oder mit Reschedule arbeite
         m_pSearchEngine->CancelSearch();
@@ -544,10 +544,10 @@ IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox*, pBox)
         m_aSoundsLikeCJKSettings.Enable(bChecked);
 
         // two other buttons which depend on this one
-        sal_Bool bEnable =  (   m_rbSearchForText.IsChecked()
-                            &&  !m_aSoundsLikeCJK.IsChecked()
+        sal_Bool bEnable =	(	m_rbSearchForText.IsChecked()
+                            &&	!m_aSoundsLikeCJK.IsChecked()
                             )
-                         || !SvtCJKOptions().IsJapaneseFindEnabled();
+                         ||	!SvtCJKOptions().IsJapaneseFindEnabled();
         m_cbCase.Enable(bEnable);
         m_aHalfFullFormsCJK.Enable(bEnable);
 
@@ -565,7 +565,7 @@ void FmSearchDialog::InitContext(sal_Int16 nContext)
     fmscContext.nContext = nContext;
 
 #ifdef DBG_UTIL
-    sal_uInt32 nResult =
+    sal_uInt32 nResult = 
 #endif
     m_lnkContextSupplier.Call(&fmscContext);
     DBG_ASSERT(nResult > 0, "FmSearchDialog::InitContext : ContextSupplier didn't give me any controls !");
@@ -619,7 +619,7 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable)
     if (!bEnable)
         EnableControlPaint(sal_False);
     else
-    {   // beim Enablen teste ich, ob der Timer fuer das delayed paint aktiv ist und stoppe ihn wenn noetig
+    {	// beim Enablen teste ich, ob der Timer fuer das delayed paint aktiv ist und stoppe ihn wenn noetig
         if (m_aDelayedPaint.IsActive())
             m_aDelayedPaint.Stop();
     }
@@ -629,7 +629,7 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable)
 
     if ( !bEnable )
     {
-        // if one of my children has the focus, remember it
+        // if one of my children has the focus, remember it 
         // 104332 - 2002-10-17 - fs@openoffice.org
         Window* pFocusWindow = Application::GetFocusWindow( );
         if ( pFocusWindow && IsChild( pFocusWindow ) )
@@ -646,23 +646,23 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable)
     if (m_pSearchEngine->GetSearchMode() != SM_BRUTE)
     {
         m_flSearchFor.Enable        (bEnable);
-        m_rbSearchForText.Enable    (bEnable);
-        m_rbSearchForNull.Enable    (bEnable);
-        m_rbSearchForNotNull.Enable (bEnable);
+        m_rbSearchForText.Enable	(bEnable);
+        m_rbSearchForNull.Enable	(bEnable);
+        m_rbSearchForNotNull.Enable	(bEnable);
         m_flWhere.Enable            (bEnable);
-        m_ftForm.Enable             (bEnable);
-        m_lbForm.Enable             (bEnable);
-        m_rbAllFields.Enable        (bEnable);
-        m_rbSingleField.Enable      (bEnable);
-        m_lbField.Enable            (bEnable && m_rbSingleField.IsChecked());
+        m_ftForm.Enable				(bEnable);
+        m_lbForm.Enable				(bEnable);
+        m_rbAllFields.Enable		(bEnable);
+        m_rbSingleField.Enable		(bEnable);
+        m_lbField.Enable			(bEnable && m_rbSingleField.IsChecked());
         m_flOptions.Enable          (bEnable);
-        m_cbBackwards.Enable        (bEnable);
-        m_cbStartOver.Enable        (bEnable);
-        m_pbClose.Enable            (bEnable);
-        EnableSearchForDependees    (bEnable);
+        m_cbBackwards.Enable		(bEnable);
+        m_cbStartOver.Enable		(bEnable);
+        m_pbClose.Enable			(bEnable);
+        EnableSearchForDependees	(bEnable);
 
         if ( !bEnable )
-        {   // this means we're preparing for starting a search
+        {	// this means we're preparing for starting a search
             // In this case, EnableSearchForDependees disabled the search button
             // But as we're about to use it for cancelling the search, we really need to enable it, again
             // 07.12.2001 - 95246 - fs@openoffice.org
@@ -677,7 +677,7 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable)
         EnableControlPaint(sal_True);
 
     if ( bEnable )
-    {   // restore focus
+    {	// restore focus
         // 104332 - 2002-10-17 - fs@openoffice.org
         if ( m_pPreSearchFocus )
         {
@@ -703,18 +703,18 @@ void FmSearchDialog::EnableSearchForDependees(sal_Bool bEnable)
 
     sal_Bool bEnableRedundants = !m_aSoundsLikeCJK.IsChecked() || !SvtCJKOptions().IsJapaneseFindEnabled();
 
-    m_cmbSearchText.Enable          (bEnable);
-    m_ftPosition.Enable             (bEnable && !m_cbWildCard.IsChecked());
-    m_cbWildCard.Enable             (bEnable && !m_cbRegular.IsChecked() && !m_cbApprox.IsChecked());
-    m_cbRegular.Enable              (bEnable && !m_cbWildCard.IsChecked() && !m_cbApprox.IsChecked());
-    m_cbApprox.Enable               (bEnable && !m_cbWildCard.IsChecked() && !m_cbRegular.IsChecked());
-    m_pbApproxSettings.Enable       (bEnable && m_cbApprox.IsChecked());
-    m_aHalfFullFormsCJK.Enable      (bEnable && bEnableRedundants);
-    m_aSoundsLikeCJK.Enable         (bEnable);
-    m_aSoundsLikeCJKSettings.Enable (bEnable && m_aSoundsLikeCJK.IsChecked());
-    m_lbPosition.Enable             (bEnable && !m_cbWildCard.IsChecked());
-    m_cbUseFormat.Enable            (bEnable);
-    m_cbCase.Enable                 (bEnable && bEnableRedundants);
+    m_cmbSearchText.Enable			(bEnable);
+    m_ftPosition.Enable				(bEnable && !m_cbWildCard.IsChecked());
+    m_cbWildCard.Enable				(bEnable && !m_cbRegular.IsChecked() && !m_cbApprox.IsChecked());
+    m_cbRegular.Enable				(bEnable && !m_cbWildCard.IsChecked() && !m_cbApprox.IsChecked());
+    m_cbApprox.Enable				(bEnable && !m_cbWildCard.IsChecked() && !m_cbRegular.IsChecked());
+    m_pbApproxSettings.Enable		(bEnable && m_cbApprox.IsChecked());
+    m_aHalfFullFormsCJK.Enable		(bEnable && bEnableRedundants);
+    m_aSoundsLikeCJK.Enable			(bEnable);
+    m_aSoundsLikeCJKSettings.Enable	(bEnable && m_aSoundsLikeCJK.IsChecked());
+    m_lbPosition.Enable				(bEnable && !m_cbWildCard.IsChecked());
+    m_cbUseFormat.Enable			(bEnable);
+    m_cbCase.Enable					(bEnable && bEnableRedundants);
 }
 
 //------------------------------------------------------------------------
@@ -833,8 +833,8 @@ void FmSearchDialog::LoadParams()
 {
     FmSearchParams aParams(m_pConfig->getParams());
 
-    const ::rtl::OUString* pHistory     =                   aParams.aHistory.getConstArray();
-    const ::rtl::OUString* pHistoryEnd  =   pHistory    +   aParams.aHistory.getLength();
+    const ::rtl::OUString* pHistory		=					aParams.aHistory.getConstArray();
+    const ::rtl::OUString* pHistoryEnd	=	pHistory	+	aParams.aHistory.getLength();
     for (; pHistory != pHistoryEnd; ++pHistory)
         m_cmbSearchText.InsertEntry( *pHistory );
 
@@ -874,7 +874,7 @@ void FmSearchDialog::LoadParams()
     LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(&m_cbCase);
     LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(&m_cbBackwards);
 
-    m_aHalfFullFormsCJK.Check( !aParams.isIgnoreWidthCJK( ) );  // BEWARE: this checkbox has a inverse semantics!
+    m_aHalfFullFormsCJK.Check( !aParams.isIgnoreWidthCJK( ) );	// BEWARE: this checkbox has a inverse semantics!
     m_aSoundsLikeCJK.Check( aParams.bSoundsLikeCJK );
     LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(&m_aHalfFullFormsCJK);
     LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(&m_aSoundsLikeCJK);
@@ -937,22 +937,22 @@ void FmSearchDialog::SaveParams() const
     for (sal_uInt16 i=0; i<m_cmbSearchText.GetEntryCount(); ++i, ++pHistory)
         *pHistory = m_cmbSearchText.GetEntry(i);
 
-    aCurrentSettings.sSingleSearchField         = m_lbField.GetSelectEntry();
-    aCurrentSettings.bAllFields                 = m_rbAllFields.IsChecked();
-    aCurrentSettings.nPosition                  = m_pSearchEngine->GetPosition();
-    aCurrentSettings.bUseFormatter              = m_pSearchEngine->GetFormatterUsing();
-    aCurrentSettings.setCaseSensitive           ( m_pSearchEngine->GetCaseSensitive() );
-    aCurrentSettings.bBackwards                 = !m_pSearchEngine->GetDirection();
-    aCurrentSettings.bWildcard                  = m_pSearchEngine->GetWildcard();
-    aCurrentSettings.bRegular                   = m_pSearchEngine->GetRegular();
-    aCurrentSettings.bApproxSearch              = m_pSearchEngine->GetLevenshtein();
-    aCurrentSettings.bLevRelaxed                = m_pSearchEngine->GetLevRelaxed();
-    aCurrentSettings.nLevOther                  = m_pSearchEngine->GetLevOther();
-    aCurrentSettings.nLevShorter                = m_pSearchEngine->GetLevShorter();
-    aCurrentSettings.nLevLonger                 = m_pSearchEngine->GetLevLonger();
-
-    aCurrentSettings.bSoundsLikeCJK             = m_pSearchEngine->GetTransliteration();
-    aCurrentSettings.setTransliterationFlags    ( m_pSearchEngine->GetTransliterationFlags() );
+    aCurrentSettings.sSingleSearchField			= m_lbField.GetSelectEntry();
+    aCurrentSettings.bAllFields					= m_rbAllFields.IsChecked();
+    aCurrentSettings.nPosition					= m_pSearchEngine->GetPosition();
+    aCurrentSettings.bUseFormatter				= m_pSearchEngine->GetFormatterUsing();
+    aCurrentSettings.setCaseSensitive			( m_pSearchEngine->GetCaseSensitive() );
+    aCurrentSettings.bBackwards					= !m_pSearchEngine->GetDirection();
+    aCurrentSettings.bWildcard					= m_pSearchEngine->GetWildcard();
+    aCurrentSettings.bRegular					= m_pSearchEngine->GetRegular();
+    aCurrentSettings.bApproxSearch				= m_pSearchEngine->GetLevenshtein();
+    aCurrentSettings.bLevRelaxed				= m_pSearchEngine->GetLevRelaxed();
+    aCurrentSettings.nLevOther					= m_pSearchEngine->GetLevOther();
+    aCurrentSettings.nLevShorter				= m_pSearchEngine->GetLevShorter();
+    aCurrentSettings.nLevLonger					= m_pSearchEngine->GetLevLonger();
+
+    aCurrentSettings.bSoundsLikeCJK				= m_pSearchEngine->GetTransliteration();
+    aCurrentSettings.setTransliterationFlags	( m_pSearchEngine->GetTransliterationFlags() );
 
     if (m_rbSearchForNull.IsChecked())
         aCurrentSettings.nSearchForType = 1;
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 26c13ee9fbfa..d1ff4513df3b 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ using namespace ::com::sun::star::uno;
 SearchThread::SearchThread( SearchProgress* pProgess,
                             TPGalleryThemeProperties* pBrowser,
                             const INetURLObject& rStartURL ) :
-        mpProgress  ( pProgess ),
-        mpBrowser   ( pBrowser ),
+        mpProgress	( pProgess ),
+        mpBrowser	( pBrowser ),
         maStartURL  ( rStartURL )
 {
 }
@@ -145,8 +145,8 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL,
 
     try
     {
-        ::com::sun::star::uno::Reference< XCommandEnvironment > xEnv;
-        Content aCnt( rStartURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv );
+        ::com::sun::star::uno::Reference< XCommandEnvironment >	xEnv;
+        Content	aCnt( rStartURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv );
         Sequence< OUString > aProps( 2 );
 
         aProps.getArray()[ 0 ] = OUString::createFromAscii( "IsFolder" );
@@ -228,7 +228,7 @@ SearchProgress::SearchProgress( Window* pParent, const INetURLObject& rStartURL
     aFtSearchType   ( this, CUI_RES( FT_SEARCH_TYPE ) ),
     aFLSearchType  ( this, CUI_RES( FL_SEARCH_TYPE ) ),
     aBtnCancel      ( this, CUI_RES( BTN_CANCEL ) ),
-    maSearchThread  ( this, (TPGalleryThemeProperties*) pParent, rStartURL )
+    maSearchThread	( this, (TPGalleryThemeProperties*) pParent, rStartURL )
 {
     FreeResource();
     aBtnCancel.SetClickHdl( LINK( this, SearchProgress, ClickCancelBtn ) );
@@ -281,8 +281,8 @@ void SearchProgress::StartExecuteModal( const Link& rEndDialogHdl )
 // --------------
 
 TakeThread::TakeThread( TakeProgress* pProgess, TPGalleryThemeProperties* pBrowser, List& rTakenList ) :
-        mpProgress  ( pProgess ),
-        mpBrowser   ( pBrowser ),
+        mpProgress	( pProgess ),
+        mpBrowser	( pBrowser ),
         mrTakenList ( rTakenList )
 {
 }
@@ -297,12 +297,12 @@ TakeThread::~TakeThread()
 
 void SAL_CALL TakeThread::run()
 {
-    String              aName;
-    INetURLObject       aURL;
-    USHORT              nEntries;
-    GalleryTheme*       pThm = mpBrowser->GetXChgData()->pTheme;
-    USHORT              nPos;
-    GalleryProgress*    pStatusProgress;
+    String				aName;
+    INetURLObject		aURL;
+    USHORT				nEntries;
+    GalleryTheme* 		pThm = mpBrowser->GetXChgData()->pTheme;
+    USHORT				nPos;
+    GalleryProgress*	pStatusProgress;
 
     {
         SolarMutexGuard aGuard;
@@ -383,7 +383,7 @@ IMPL_LINK( TakeProgress, ClickCancelBtn, void*, EMPTYARG )
 
 IMPL_LINK( TakeProgress, CleanUpHdl, void*, EMPTYARG )
 {
-    TPGalleryThemeProperties*   mpBrowser = (TPGalleryThemeProperties*) GetParent();
+    TPGalleryThemeProperties*	mpBrowser = (TPGalleryThemeProperties*) GetParent();
     ::std::bit_vector           aRemoveEntries( mpBrowser->aFoundList.Count(), false );
     ::std::vector< String >     aRemainingVector;
     sal_uInt32                  i, nCount;
@@ -457,11 +457,11 @@ void TakeProgress::StartExecuteModal( const Link& rEndDialogHdl )
 // ---------------------
 
 ActualizeProgress::ActualizeProgress( Window* pWindow, GalleryTheme* pThm ) :
-    ModalDialog             ( pWindow, CUI_RES( RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS ) ),
-    aFtActualizeFile        ( this, CUI_RES( FT_ACTUALIZE_FILE ) ),
+    ModalDialog				( pWindow, CUI_RES( RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS ) ),
+    aFtActualizeFile		( this, CUI_RES( FT_ACTUALIZE_FILE ) ),
     aFLActualizeProgress   ( this, CUI_RES( FL_ACTUALIZE_PROGRESS ) ),
-    aBtnCancel              ( this, CUI_RES( BTN_CANCEL ) ),
-    pTheme                  ( pThm )
+    aBtnCancel				( this, CUI_RES( BTN_CANCEL ) ),
+    pTheme					( pThm )
 {
     FreeResource();
     aBtnCancel.SetClickHdl( LINK( this, ActualizeProgress, ClickCancelBtn ) );
@@ -538,12 +538,12 @@ IMPL_LINK( ActualizeProgress, ActualizeHdl, INetURLObject*, pURL )
 // ---------------
 
 TitleDialog::TitleDialog( Window* pParent, const String& rOldTitle ) :
-    ModalDialog ( pParent, CUI_RES( RID_SVXDLG_GALLERY_TITLE ) ),
-    maOk        ( this, CUI_RES( BTN_OK ) ),
-    maCancel    ( this, CUI_RES( BTN_CANCEL ) ),
-    maHelp      ( this, CUI_RES( BTN_HELP ) ),
+    ModalDialog	( pParent, CUI_RES( RID_SVXDLG_GALLERY_TITLE ) ),
+    maOk		( this, CUI_RES( BTN_OK ) ),
+    maCancel	( this, CUI_RES( BTN_CANCEL ) ),
+    maHelp		( this, CUI_RES( BTN_HELP ) ),
     maFL       ( this, CUI_RES( FL_TITLE ) ),
-    maEdit      ( this, CUI_RES( EDT_TITLE ) )
+    maEdit		( this, CUI_RES( EDT_TITLE ) )
 {
     FreeResource();
     maEdit.SetText( rOldTitle );
@@ -555,12 +555,12 @@ TitleDialog::TitleDialog( Window* pParent, const String& rOldTitle ) :
 // -------------------
 
 GalleryIdDialog::GalleryIdDialog( Window* pParent, GalleryTheme* _pThm ) :
-            ModalDialog ( pParent, CUI_RES( RID_SVXDLG_GALLERY_THEMEID ) ),
-            aBtnOk      ( this, CUI_RES( BTN_OK ) ),
-            aBtnCancel  ( this, CUI_RES( BTN_CANCEL ) ),
+            ModalDialog	( pParent, CUI_RES( RID_SVXDLG_GALLERY_THEMEID ) ),
+            aBtnOk		( this, CUI_RES( BTN_OK ) ),
+            aBtnCancel	( this, CUI_RES( BTN_CANCEL ) ),
             aFLId      ( this, CUI_RES( FL_ID ) ),
-            aLbResName  ( this, CUI_RES( LB_RESNAME ) ),
-            pThm        ( _pThm )
+            aLbResName	( this, CUI_RES( LB_RESNAME ) ),
+            pThm		( _pThm )
 {
     FreeResource();
 
@@ -578,9 +578,9 @@ GalleryIdDialog::GalleryIdDialog( Window* pParent, GalleryTheme* _pThm ) :
 
 IMPL_LINK( GalleryIdDialog, ClickOkHdl, void*, EMPTYARG )
 {
-    Gallery*    pGal = pThm->GetParent();
-    const ULONG nId = GetId();
-    BOOL        bDifferentThemeExists = FALSE;
+    Gallery*	pGal = pThm->GetParent();
+    const ULONG	nId = GetId();
+    BOOL		bDifferentThemeExists = FALSE;
 
     for( ULONG i = 0, nCount = pGal->GetThemeCount(); i < nCount && !bDifferentThemeExists; i++ )
     {
@@ -614,7 +614,7 @@ IMPL_LINK( GalleryIdDialog, ClickOkHdl, void*, EMPTYARG )
 
 GalleryThemeProperties::GalleryThemeProperties( Window* pParent, ExchangeData* _pData, SfxItemSet* pItemSet  ) :
             SfxTabDialog    ( pParent, CUI_RES( RID_SVXTABDLG_GALLERYTHEME ), pItemSet ),
-            pData           ( _pData )
+            pData			( _pData )
 {
     FreeResource();
 
@@ -672,12 +672,12 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
 {
     pData = _pData;
 
-    GalleryTheme*       pThm = pData->pTheme;
+    GalleryTheme*		pThm = pData->pTheme;
     String              aOutStr( String::CreateFromInt32( pThm->GetObjectCount() ) );
     String              aObjStr( CUI_RES( RID_SVXSTR_GALLERYPROPS_OBJECT ) );
     String              aAccess;
-    String              aType( CUI_RES( RID_SVXSTR_GALLERYPROPS_GALTHEME ) );
-    BOOL                bReadOnly = pThm->IsReadOnly() && !pThm->IsImported();
+    String				aType( CUI_RES( RID_SVXSTR_GALLERYPROPS_GALTHEME ) );
+    BOOL				bReadOnly = pThm->IsReadOnly() && !pThm->IsImported();
 
     aEdtMSName.SetHelpId( HID_GALLERY_EDIT_MSNAME );
     aEdtMSName.SetText( pThm->GetName() );
@@ -750,7 +750,7 @@ SfxTabPage* TPGalleryThemeGeneral::Create( Window* pParent, const SfxItemSet& rS
 // ----------------------------
 
 TPGalleryThemeProperties::TPGalleryThemeProperties( Window* pWindow, const SfxItemSet& rSet ) :
-        SfxTabPage          ( pWindow, CUI_RES( RID_SVXTABPAGE_GALLERYTHEME_FILES ), rSet ),
+        SfxTabPage			( pWindow, CUI_RES( RID_SVXTABPAGE_GALLERYTHEME_FILES ), rSet ),
         aBtnSearch          ( this, CUI_RES(BTN_SEARCH ) ),
         aBtnTake            ( this, CUI_RES(BTN_TAKE ) ),
         aBtnTakeAll         ( this, CUI_RES(BTN_TAKEALL ) ),
@@ -855,13 +855,13 @@ SfxTabPage* TPGalleryThemeProperties::Create( Window* pParent, const SfxItemSet&
 
 void TPGalleryThemeProperties::FillFilterList()
 {
-    GraphicFilter*      pFilter = GraphicFilter::GetGraphicFilter();
-    String              aExt;
-    String              aName;
-    FilterEntry*        pFilterEntry;
-    FilterEntry*        pTestEntry;
-    sal_uInt16          i, nKeyCount;
-    BOOL                bInList;
+    GraphicFilter*		pFilter = GraphicFilter::GetGraphicFilter();
+    String				aExt;
+    String				aName;
+    FilterEntry*		pFilterEntry;
+    FilterEntry*		pTestEntry;
+    sal_uInt16 			i, nKeyCount;
+    BOOL				bInList;
 
     // graphic filters
     for( i = 0, nKeyCount = pFilter->GetImportFormatCount(); i < nKeyCount; i++ )
@@ -906,10 +906,10 @@ void TPGalleryThemeProperties::FillFilterList()
     }
 
     // media filters
-       static const ::rtl::OUString aWildcard( RTL_CONSTASCII_USTRINGPARAM( "*." ) );
-    ::avmedia::FilterNameVector     aFilters;
-    const ::rtl::OUString           aSeparator( RTL_CONSTASCII_USTRINGPARAM( ";" ) );
-    ::rtl::OUString                 aAllTypes;
+       static const ::rtl::OUString	aWildcard( RTL_CONSTASCII_USTRINGPARAM( "*." ) );
+    ::avmedia::FilterNameVector		aFilters;
+    const ::rtl::OUString			aSeparator( RTL_CONSTASCII_USTRINGPARAM( ";" ) );
+    ::rtl::OUString					aAllTypes;
 
     ::avmedia::MediaWindow::getMediaFilters( aFilters );
 
@@ -995,7 +995,7 @@ IMPL_LINK( TPGalleryThemeProperties, SelectFileTypeHdl, void *, EMPTYARG )
 
 void TPGalleryThemeProperties::SearchFiles()
 {
-    SearchProgress* pProgress = new SearchProgress( this, aURL );
+    SearchProgress*	pProgress = new SearchProgress( this, aURL );
 
     for( String* pStr = aFoundList.First(); pStr; pStr = aFoundList.Next() )
         delete pStr;
@@ -1038,7 +1038,7 @@ IMPL_LINK( TPGalleryThemeProperties, ClickSearchHdl, void *, EMPTYARG )
                 if ( xFolderPicker.is() )
                 {
 //                  svt::SetDialogHelpId( xFolderPicker, HID_GALLERY_NEWTHEME_FINDFILES );
-                    String  aDlgPathName( SvtPathOptions().GetGraphicPath() );
+                    String	aDlgPathName( SvtPathOptions().GetGraphicPath() );
                     xFolderPicker->setDisplayDirectory(aDlgPathName);
 
                     aPreviewTimer.Stop();
@@ -1148,7 +1148,7 @@ IMPL_LINK( TPGalleryThemeProperties, ClickTakeHdl, void*, EMPTYARG )
         if( !aLbxFound.GetSelectEntryCount() || !bEntriesFound )
         {
             SvxOpenGraphicDialog aDlg(String( RTL_CONSTASCII_USTRINGPARAM( "Gallery" ) ) );
-//          aDlg.SetDialogHelpId( HID_GALLERY_NEWTHEME_ADDFILES );
+//			aDlg.SetDialogHelpId( HID_GALLERY_NEWTHEME_ADDFILES );
             aDlg.EnableLink(sal_False);
             aDlg.AsLink(sal_False);
 
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index beb0774c7bd0..566ddd099992 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ void GraphicFilterDialog::PreviewWindow::Paint( const Rectangle& rRect )
 {
     Control::Paint( rRect );
 
-    const Size  aGrfSize( LogicToPixel( maGraphic.GetPrefSize(), maGraphic.GetPrefMapMode() ) );
-    const Size  aOutSize( GetOutputSizePixel() );
-    const Point aGrfPos( ( aOutSize.Width() - aGrfSize.Width() ) >> 1,
+    const Size	aGrfSize( LogicToPixel( maGraphic.GetPrefSize(), maGraphic.GetPrefMapMode() ) );
+    const Size	aOutSize( GetOutputSizePixel() );
+    const Point aGrfPos( ( aOutSize.Width() - aGrfSize.Width() ) >> 1, 
                          ( aOutSize.Height() - aGrfSize.Height() ) >> 1 );
 
     if( maGraphic.IsAnimated() )
@@ -90,22 +90,22 @@ void GraphicFilterDialog::PreviewWindow::SetGraphic( const Graphic& rGraphic )
 // -----------------------
 
 GraphicFilterDialog::GraphicFilterDialog( Window* pParent, const ResId& rResId, const Graphic& rGraphic ) :
-    ModalDialog     ( pParent, rResId ),
+    ModalDialog		( pParent, rResId ),
     maModifyHdl     ( LINK( this, GraphicFilterDialog, ImplModifyHdl ) ),
     mfScaleX        ( 0.0 ),
-    mfScaleY        ( 0.0 ),
-    maSizePixel     ( LogicToPixel( rGraphic.GetPrefSize(), rGraphic.GetPrefMapMode() ) ),
+    mfScaleY		( 0.0 ),
+    maSizePixel		( LogicToPixel( rGraphic.GetPrefSize(), rGraphic.GetPrefMapMode() ) ),
     maPreview       ( this, CUI_RES( CTL_PREVIEW ) ),
-    maFlParameter   ( this, CUI_RES( FL_PARAMETER ) ),
-    maBtnOK         ( this, CUI_RES( BTN_OK ) ),
-    maBtnCancel     ( this, CUI_RES( BTN_CANCEL ) ),
-    maBtnHelp       ( this, CUI_RES( BTN_HELP ) )
+    maFlParameter	( this, CUI_RES( FL_PARAMETER ) ),
+    maBtnOK			( this, CUI_RES( BTN_OK ) ),
+    maBtnCancel		( this, CUI_RES( BTN_CANCEL ) ),
+    maBtnHelp		( this, CUI_RES( BTN_HELP ) )
 {
-    const Size  aPreviewSize( maPreview.GetOutputSizePixel() );
-    Size        aGrfSize( maSizePixel );
+    const Size	aPreviewSize( maPreview.GetOutputSizePixel() );
+    Size		aGrfSize( maSizePixel );
 
     if( rGraphic.GetType() == GRAPHIC_BITMAP &&
-        aPreviewSize.Width() && aPreviewSize.Height() &&
+        aPreviewSize.Width() && aPreviewSize.Height() && 
         aGrfSize.Width() && aGrfSize.Height() )
     {
         const double fGrfWH = (double) aGrfSize.Width() / aGrfSize.Height();
@@ -175,11 +175,11 @@ IMPL_LINK( GraphicFilterDialog, ImplModifyHdl, void*, EMPTYARG )
 GraphicFilterMosaic::GraphicFilterMosaic( Window* pParent, const Graphic& rGraphic,
                                           USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges ) :
     GraphicFilterDialog( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_MOSAIC ), rGraphic ),
-    maFtWidth   ( this, CUI_RES( DLG_FILTERMOSAIC_FT_WIDTH ) ),
-    maMtrWidth  ( this, CUI_RES( DLG_FILTERMOSAIC_MTR_WIDTH ) ),
-    maFtHeight  ( this, CUI_RES( DLG_FILTERMOSAIC_FT_HEIGHT ) ),
+    maFtWidth	( this, CUI_RES( DLG_FILTERMOSAIC_FT_WIDTH ) ),
+    maMtrWidth	( this, CUI_RES( DLG_FILTERMOSAIC_MTR_WIDTH ) ),
+    maFtHeight	( this, CUI_RES( DLG_FILTERMOSAIC_FT_HEIGHT ) ),
     maMtrHeight ( this, CUI_RES( DLG_FILTERMOSAIC_MTR_HEIGHT ) ),
-    maCbxEdges  ( this, CUI_RES( DLG_FILTERMOSAIC_CBX_EDGES ) )
+    maCbxEdges	( this, CUI_RES( DLG_FILTERMOSAIC_CBX_EDGES ) )
 {
     FreeResource();
 
@@ -205,13 +205,13 @@ GraphicFilterMosaic::~GraphicFilterMosaic()
 
 // -----------------------------------------------------------------------------
 
-Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic,
+Graphic	GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic, 
                                                  double fScaleX, double fScaleY )
 {
-    Graphic         aRet;
-    const Size      aSize( Max( FRound( GetTileWidth() * fScaleX ), 1L ),
+    Graphic			aRet;
+    const Size		aSize( Max( FRound( GetTileWidth() * fScaleX ), 1L ), 
                            Max( FRound( GetTileHeight() * fScaleY ), 1L ) );
-    BmpFilterParam  aParam( aSize );
+    BmpFilterParam	aParam( aSize );
 
     if( rGraphic.IsAnimated() )
     {
@@ -247,10 +247,10 @@ Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic,
 
 GraphicFilterSolarize::GraphicFilterSolarize( Window* pParent, const Graphic& rGraphic,
                                               BYTE cGreyThreshold, BOOL bInvert ) :
-    GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_SOLARIZE ), rGraphic ),
-    maFtThreshold   ( this, CUI_RES( DLG_FILTERSOLARIZE_FT_THRESHOLD ) ),
-    maMtrThreshold  ( this, CUI_RES( DLG_FILTERSOLARIZE_MTR_THRESHOLD ) ),
-    maCbxInvert     ( this, CUI_RES( DLG_FILTERSOLARIZE_CBX_INVERT ) )
+    GraphicFilterDialog	( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_SOLARIZE ), rGraphic ),
+    maFtThreshold	( this, CUI_RES( DLG_FILTERSOLARIZE_FT_THRESHOLD ) ),
+    maMtrThreshold	( this, CUI_RES( DLG_FILTERSOLARIZE_MTR_THRESHOLD ) ),
+    maCbxInvert		( this, CUI_RES( DLG_FILTERSOLARIZE_CBX_INVERT ) )
 {
     FreeResource();
 
@@ -271,11 +271,11 @@ GraphicFilterSolarize::~GraphicFilterSolarize()
 
 // -----------------------------------------------------------------------------
 
-Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic,
+Graphic	GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic, 
                                                    double /*fScaleX*/, double /*fScaleY*/ )
 {
-    Graphic         aRet;
-    BmpFilterParam  aParam( GetGreyThreshold() );
+    Graphic			aRet;
+    BmpFilterParam	aParam( GetGreyThreshold() );
 
     if( rGraphic.IsAnimated() )
     {
@@ -311,9 +311,9 @@ Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic,
 
 GraphicFilterSepia::GraphicFilterSepia( Window* pParent, const Graphic& rGraphic,
                                         USHORT nSepiaPercent ) :
-    GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_SEPIA ), rGraphic ),
-    maFtSepia       ( this, CUI_RES( DLG_FILTERSEPIA_FT_SEPIA ) ),
-    maMtrSepia      ( this, CUI_RES( DLG_FILTERSEPIA_MTR_SEPIA ) )
+    GraphicFilterDialog	( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_SEPIA ), rGraphic ),
+    maFtSepia		( this, CUI_RES( DLG_FILTERSEPIA_FT_SEPIA ) ),
+    maMtrSepia		( this, CUI_RES( DLG_FILTERSEPIA_MTR_SEPIA ) )
 {
     FreeResource();
 
@@ -331,11 +331,11 @@ GraphicFilterSepia::~GraphicFilterSepia()
 
 // -----------------------------------------------------------------------------
 
-Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic,
+Graphic	GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic, 
                                                 double /*fScaleX*/, double /*fScaleY*/ )
 {
-    Graphic         aRet;
-    BmpFilterParam  aParam( GetSepiaPercent() );
+    Graphic			aRet;
+    BmpFilterParam	aParam( GetSepiaPercent() );
 
     if( rGraphic.IsAnimated() )
     {
@@ -361,9 +361,9 @@ Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic,
 
 GraphicFilterPoster::GraphicFilterPoster( Window* pParent, const Graphic& rGraphic,
                                           USHORT nPosterCount ) :
-    GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_POSTER ), rGraphic ),
-    maFtPoster      ( this, CUI_RES( DLG_FILTERPOSTER_FT_POSTER ) ),
-    maNumPoster     ( this, CUI_RES( DLG_FILTERPOSTER_NUM_POSTER ) )
+    GraphicFilterDialog	( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_POSTER ), rGraphic ),
+    maFtPoster		( this, CUI_RES( DLG_FILTERPOSTER_FT_POSTER ) ),
+    maNumPoster		( this, CUI_RES( DLG_FILTERPOSTER_NUM_POSTER ) )
 {
     FreeResource();
 
@@ -382,11 +382,11 @@ GraphicFilterPoster::~GraphicFilterPoster()
 
 // -----------------------------------------------------------------------------
 
-Graphic GraphicFilterPoster::GetFilteredGraphic( const Graphic& rGraphic,
+Graphic	GraphicFilterPoster::GetFilteredGraphic( const Graphic& rGraphic, 
                                                  double /*fScaleX*/, double /*fScaleY*/ )
 {
-    Graphic         aRet;
-    const USHORT    nPosterCount = GetPosterColorCount();
+    Graphic			aRet;
+    const USHORT	nPosterCount = GetPosterColorCount();
 
     if( rGraphic.IsAnimated() )
     {
@@ -424,9 +424,9 @@ void GraphicFilterEmboss::EmbossControl::MouseButtonDown( const MouseEvent& rEvt
 
 GraphicFilterEmboss::GraphicFilterEmboss( Window* pParent, const Graphic& rGraphic,
                                           RECT_POINT eLightSource ) :
-    GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_EMBOSS ), rGraphic ),
-    maFtLight       ( this, CUI_RES( DLG_FILTEREMBOSS_FT_LIGHT ) ),
-    maCtlLight      ( this, CUI_RES( DLG_FILTEREMBOSS_CTL_LIGHT ), eLightSource )
+    GraphicFilterDialog	( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_EMBOSS ), rGraphic ),
+    maFtLight		( this, CUI_RES( DLG_FILTEREMBOSS_FT_LIGHT ) ),
+    maCtlLight		( this, CUI_RES( DLG_FILTEREMBOSS_CTL_LIGHT ), eLightSource )
 {
     FreeResource();
 
@@ -442,24 +442,24 @@ GraphicFilterEmboss::~GraphicFilterEmboss()
 
 // -----------------------------------------------------------------------------
 
-Graphic GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic,
+Graphic	GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic, 
                                                  double /*fScaleX*/, double /*fScaleY*/ )
 {
-    Graphic aRet;
-    USHORT  nAzim, nElev;
+    Graphic	aRet;
+    USHORT	nAzim, nElev;
 
     switch( maCtlLight.GetActualRP() )
     {
-        default:       DBG_ERROR("svx::GraphicFilterEmboss::GetFilteredGraphic(), unknown Reference Point!" );
-        case( RP_LT ): nAzim = 4500,    nElev = 4500; break;
-        case( RP_MT ): nAzim = 9000,    nElev = 4500; break;
-        case( RP_RT ): nAzim = 13500,   nElev = 4500; break;
-        case( RP_LM ): nAzim = 0,       nElev = 4500; break;
-        case( RP_MM ): nAzim = 0,       nElev = 9000; break;
-        case( RP_RM ): nAzim = 18000,   nElev = 4500; break;
-        case( RP_LB ): nAzim = 31500,   nElev = 4500; break;
-        case( RP_MB ): nAzim = 27000,   nElev = 4500; break;
-        case( RP_RB ): nAzim = 22500,   nElev = 4500; break;
+        default:	   DBG_ERROR("svx::GraphicFilterEmboss::GetFilteredGraphic(), unknown Reference Point!" );
+        case( RP_LT ): nAzim = 4500,	nElev = 4500; break;
+        case( RP_MT ): nAzim = 9000,	nElev = 4500; break;
+        case( RP_RT ): nAzim = 13500,	nElev = 4500; break;
+        case( RP_LM ): nAzim = 0,		nElev = 4500; break;
+        case( RP_MM ): nAzim = 0,		nElev = 9000; break;
+        case( RP_RM ): nAzim = 18000,	nElev = 4500; break;
+        case( RP_LB ): nAzim = 31500,	nElev = 4500; break;
+        case( RP_MB ): nAzim = 27000,	nElev = 4500; break;
+        case( RP_RB ): nAzim = 22500,	nElev = 4500; break;
     }
 
     BmpFilterParam aParam( nAzim, nElev );
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index ba85929192f4..2359a4d2a2c4 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,9 +102,9 @@ void SvxHlinkCtrl::StateChanged( USHORT nSID, SfxItemState eState,
 |************************************************************************/
 
 SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings)
-:   IconChoiceDialog( pParent, CUI_RES ( RID_SVXDLG_NEWHYPERLINK ) ),
-    maCtrl          ( SID_HYPERLINK_GETLINK, *pBindings, this ),
-    mpBindings      ( pBindings ),
+:	IconChoiceDialog( pParent, CUI_RES ( RID_SVXDLG_NEWHYPERLINK ) ),
+    maCtrl			( SID_HYPERLINK_GETLINK, *pBindings, this ),
+    mpBindings		( pBindings ),
     mbReadOnly      ( sal_False ),
     mbIsHTMLDoc     ( sal_False )
 {
@@ -138,7 +138,7 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings)
     pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP ) );
 
     // all tab pages set -> create mnemonics
-    //  CreateIconTextAutoMnemonics();  #99671# not useful, because this is not what user expects when using mnemonics on the pages
+    //	CreateIconTextAutoMnemonics();	#99671# not useful, because this is not what user expects when using mnemonics on the pages
 
     // create itemset for tabpages
     mpItemSet = new SfxItemSet( SFX_APP()->GetPool(), SID_HYPERLINK_GETLINK,
@@ -201,7 +201,7 @@ void SvxHpLinkDlg::Move()
     {
         // Pos&Size of this dialog-window
         Point aDlgPos ( GetPosPixel () );
-        Size aDlgSize ( GetSizePixel () );
+        Size aDlgSize (	GetSizePixel () );
 
         // Size of Office-Main-Window
         Size aWindowSize( SFX_APP()->GetTopWindow()->GetSizePixel() );
diff --git a/cui/source/dialogs/cuiimapdlg.hrc b/cui/source/dialogs/cuiimapdlg.hrc
index 5be30abc13a7..8635f1bafde3 100644
--- a/cui/source/dialogs/cuiimapdlg.hrc
+++ b/cui/source/dialogs/cuiimapdlg.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 // ImapDlg-Dialoge
 
-#define FT_URLDESCRIPTION       1
-#define FT_URL1                 2
-#define FT_TARGET               3
-#define FT_NAME                 4
-#define FT_DESCRIPTION          5
-#define EDT_URLDESCRIPTION      1
-#define EDT_URL                 2
-#define EDT_NAME                3
-#define EDT_DESCRIPTION         4
-#define BTN_HELP1               1
-#define BTN_OK1                 2
+#define FT_URLDESCRIPTION		1
+#define FT_URL1					2
+#define FT_TARGET				3
+#define FT_NAME					4
+#define FT_DESCRIPTION			5
+#define EDT_URLDESCRIPTION		1
+#define EDT_URL					2
+#define EDT_NAME				3
+#define EDT_DESCRIPTION			4
+#define BTN_HELP1				1
+#define BTN_OK1					2
 #define BTN_CANCEL1             3
 #define FL_URL                  1
-#define CBB_TARGETS             1
+#define CBB_TARGETS				1
diff --git a/cui/source/dialogs/cuiimapdlg.src b/cui/source/dialogs/cuiimapdlg.src
index 9b60adf854ca..a7550bcf125e 100644
--- a/cui/source/dialogs/cuiimapdlg.src
+++ b/cui/source/dialogs/cuiimapdlg.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ ModalDialog RID_SVXDLG_IMAPURL
         DropDown = TRUE ;
         HScroll = TRUE ;
     };
-
+    
     FixedText FT_NAME
     {
         Pos = MAP_APPFONT ( 6 , 59 ) ;
@@ -122,7 +122,7 @@ ModalDialog RID_SVXDLG_IMAPURL
         Pos = MAP_APPFONT ( 0 , 160 ) ;
         Size = MAP_APPFONT ( 214 , 4 ) ;
     };
-
+    
     // Buttons
     HelpButton BTN_HELP1
     {
diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx
index 2da453213f5d..5ce727d08f36 100644
--- a/cui/source/dialogs/cuiimapwnd.cxx
+++ b/cui/source/dialogs/cuiimapwnd.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/help.hxx>
-#include <sfx2/sfxsids.hrc>
+#include <sfx2/sfxsids.hrc>	
 #define _ANIMATION
 #include "macroass.hxx"
 #include <svtools/imaprect.hxx>
@@ -60,7 +60,7 @@
 
 /*************************************************************************
 |*
-|*  URLDlg
+|*	URLDlg
 |*
 \************************************************************************/
 
diff --git a/cui/source/dialogs/cuitbxform.cxx b/cui/source/dialogs/cuitbxform.cxx
index 4d0f2d91d12f..9e0b89ffc9e6 100644
--- a/cui/source/dialogs/cuitbxform.cxx
+++ b/cui/source/dialogs/cuitbxform.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index ac6cdd178eae..d1f43b143a6e 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 \************************************************************************/
 
 SvxNameDialog::SvxNameDialog( Window* pWindow, const String& rName, const String& rDesc ) :
-    ModalDialog     ( pWindow, CUI_RES( RID_SVXDLG_NAME ) ),
-    aFtDescription      ( this, CUI_RES( FT_DESCRIPTION ) ),
-    aEdtName            ( this, CUI_RES( EDT_STRING ) ),
-    aBtnOK              ( this, CUI_RES( BTN_OK ) ),
-    aBtnCancel          ( this, CUI_RES( BTN_CANCEL ) ),
-    aBtnHelp            ( this, CUI_RES( BTN_HELP ) )
+    ModalDialog		( pWindow, CUI_RES( RID_SVXDLG_NAME ) ),
+    aFtDescription		( this, CUI_RES( FT_DESCRIPTION ) ),
+    aEdtName			( this, CUI_RES( EDT_STRING ) ),
+    aBtnOK				( this, CUI_RES( BTN_OK ) ),
+    aBtnCancel			( this, CUI_RES( BTN_CANCEL ) ),
+    aBtnHelp			( this, CUI_RES( BTN_HELP ) )
 {
     FreeResource();
 
@@ -93,10 +93,10 @@ IMPL_LINK(SvxNameDialog, ModifyHdl, Edit*, EMPTYARG)
 // Dialog for editing Object Name
 // plus uniqueness-callback-linkHandler
 
-SvxObjectNameDialog::SvxObjectNameDialog(
-    Window* pWindow,
+SvxObjectNameDialog::SvxObjectNameDialog( 
+    Window* pWindow, 
     const String& rName)
-:   ModalDialog(pWindow, CUI_RES(RID_SVXDLG_OBJECT_NAME)),
+:	ModalDialog(pWindow, CUI_RES(RID_SVXDLG_OBJECT_NAME)),
     aFtName(this, CUI_RES(NTD_FT_NAME)),
     aEdtName(this, CUI_RES(NTD_EDT_NAME)),
     aFlSeparator(this, CUI_RES(FL_SEPARATOR_A)),
@@ -129,11 +129,11 @@ IMPL_LINK(SvxObjectNameDialog, ModifyHdl, Edit*, EMPTYARG)
 // #i68101#
 // Dialog for editing Object Title and Description
 
-SvxObjectTitleDescDialog::SvxObjectTitleDescDialog(
-    Window* pWindow,
-    const String& rTitle,
+SvxObjectTitleDescDialog::SvxObjectTitleDescDialog( 
+    Window* pWindow, 
+    const String& rTitle, 
     const String& rDescription)
-:   ModalDialog(pWindow, CUI_RES(RID_SVXDLG_OBJECT_TITLE_DESC)),
+:	ModalDialog(pWindow, CUI_RES(RID_SVXDLG_OBJECT_TITLE_DESC)),
     aFtTitle(this, CUI_RES(NTD_FT_TITLE)),
     aEdtTitle(this, CUI_RES(NTD_EDT_TITLE)),
     aFtDescription(this, CUI_RES(NTD_FT_DESC)),
@@ -162,12 +162,12 @@ SvxObjectTitleDescDialog::SvxObjectTitleDescDialog(
 \************************************************************************/
 
 SvxMessDialog::SvxMessDialog( Window* pWindow, const String& rText, const String& rDesc, Image* pImg ) :
-    ModalDialog     ( pWindow, CUI_RES( RID_SVXDLG_MESSBOX ) ),
-    aFtDescription      ( this, CUI_RES( FT_DESCRIPTION ) ),
-    aBtn1               ( this, CUI_RES( BTN_1 ) ),
-    aBtn2               ( this, CUI_RES( BTN_2 ) ),
-    aBtnCancel          ( this, CUI_RES( BTN_CANCEL ) ),
-    aFtImage            ( this )
+    ModalDialog		( pWindow, CUI_RES( RID_SVXDLG_MESSBOX ) ),
+    aFtDescription		( this, CUI_RES( FT_DESCRIPTION ) ),
+    aBtn1				( this, CUI_RES( BTN_1 ) ),
+    aBtn2				( this, CUI_RES( BTN_2 ) ),
+    aBtnCancel			( this, CUI_RES( BTN_CANCEL ) ),
+    aFtImage			( this )
 {
     FreeResource();
 
diff --git a/cui/source/dialogs/dlgname.hrc b/cui/source/dialogs/dlgname.hrc
index 04e9377be619..be0f2ad84c6d 100644
--- a/cui/source/dialogs/dlgname.hrc
+++ b/cui/source/dialogs/dlgname.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,13 +34,13 @@
 #define BTN_2 2
 
 // #i68101#
-#define NTD_FT_NAME     2
-#define NTD_EDT_NAME    2
-#define NTD_FT_TITLE    3
-#define NTD_EDT_TITLE   3
-#define NTD_FT_DESC     4
-#define NTD_EDT_DESC    4
-#define FL_SEPARATOR_A  1
-#define FL_SEPARATOR_B  2
+#define NTD_FT_NAME		2
+#define NTD_EDT_NAME	2
+#define NTD_FT_TITLE	3
+#define NTD_EDT_TITLE	3
+#define NTD_FT_DESC		4
+#define NTD_EDT_DESC	4
+#define	FL_SEPARATOR_A	1
+#define	FL_SEPARATOR_B	2
 
 // eof
diff --git a/cui/source/dialogs/dlgname.src b/cui/source/dialogs/dlgname.src
index e3e961880dfc..ee29629dc054 100644
--- a/cui/source/dialogs/dlgname.src
+++ b/cui/source/dialogs/dlgname.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ ModalDialog RID_SVXDLG_OBJECT_NAME
         Size = MAP_APPFONT ( 168 , 12 ) ;
         TabStop = TRUE ;
     };
-
+    
     // divider
     FixedLine FL_SEPARATOR_A
     {
diff --git a/cui/source/dialogs/fmsearch.hrc b/cui/source/dialogs/fmsearch.hrc
index cfad011101c2..16936f81f9f6 100644
--- a/cui/source/dialogs/fmsearch.hrc
+++ b/cui/source/dialogs/fmsearch.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,58 +29,58 @@
 
 #include "svl/solar.hrc"
 
-#define RID_SVX_DLG_INPUTRECORDNO                   (RID_FORMS_START + 10)
-#define RID_SVX_DLG_SHOWGRIDCOLUMNS                 (RID_FORMS_START + 11)
-#define RID_SVXDLG_SEARCHFORM                       (RID_FORMS_START + 7)
+#define RID_SVX_DLG_INPUTRECORDNO					(RID_FORMS_START + 10)
+#define RID_SVX_DLG_SHOWGRIDCOLUMNS					(RID_FORMS_START + 11)
+#define RID_SVXDLG_SEARCHFORM						(RID_FORMS_START + 7)
 #define RID_STR_SEARCH_ANYWHERE                     (RID_FORMS_START +  85)
 #define RID_STR_SEARCH_BEGINNING                    (RID_FORMS_START +  86)
 #define RID_STR_SEARCH_END                          (RID_FORMS_START +  87)
 #define RID_STR_SEARCH_WHOLE                        (RID_FORMS_START +  88)
 #define RID_STR_FROM_TOP                            (RID_FORMS_START +  74)
 #define RID_STR_FROM_BOTTOM                         (RID_FORMS_START +  75)
-#define RID_SVXERR_SEARCH_NORECORD                  (RID_FORMS_START + 8)
-#define RID_SVXERR_SEARCH_GENERAL_ERROR             (RID_FORMS_START + 9)
+#define RID_SVXERR_SEARCH_NORECORD					(RID_FORMS_START + 8)
+#define RID_SVXERR_SEARCH_GENERAL_ERROR				(RID_FORMS_START + 9)
 #define RID_STR_OVERFLOW_FORWARD                    (RID_FORMS_START +  34)
 #define RID_STR_OVERFLOW_BACKWARD                   (RID_FORMS_START +  35)
 #define RID_STR_SEARCH_COUNTING                     (RID_FORMS_START +  76)
 
-#define FT_SEARCHTEXT       1
-#define FT_FORM             2
-#define FT_POSITION         3
-#define FT_RECORDLABEL      4
-#define FT_RECORD           5
-#define FT_HINT             6
+#define FT_SEARCHTEXT		1
+#define FT_FORM				2
+#define FT_POSITION			3
+#define FT_RECORDLABEL		4
+#define	FT_RECORD			5
+#define FT_HINT				6
 
 
-#define CMB_SEARCHTEXT      1
+#define CMB_SEARCHTEXT		1
 
-#define RB_ALLFIELDS        1
-#define RB_SINGLEFIELD      2
-#define RB_SEARCHFORTEXT    3
-#define RB_SEARCHFORNULL    4
-#define RB_SEARCHFORNOTNULL 5
+#define RB_ALLFIELDS		1
+#define RB_SINGLEFIELD		2
+#define RB_SEARCHFORTEXT	3
+#define RB_SEARCHFORNULL	4
+#define RB_SEARCHFORNOTNULL	5
 
-#define LB_FORM             1
-#define LB_FIELD            2
-#define LB_POSITION         3
+#define LB_FORM				1
+#define LB_FIELD			2
+#define LB_POSITION			3
 
-#define PB_APPROXSETTINGS       1
-#define PB_SEARCH               2
-#define PB_SOUNDSLIKESETTINGS   3
+#define PB_APPROXSETTINGS		1
+#define PB_SEARCH				2
+#define PB_SOUNDSLIKESETTINGS	3
 
 #define FL_SEARCHFOR            1
 #define FL_WHERE                        2
 #define FL_OPTIONS                      3
 #define FL_STATE                        4
 
-#define CB_USEFORMATTER     1
-#define CB_BACKWARD         2
-#define CB_STARTOVER        3
-#define CB_CASE             4
-#define CB_WILDCARD         5
-#define CB_REGULAR          6
-#define CB_APPROX           7
-#define CB_HALFFULLFORMS    8
-#define CB_SOUNDSLIKECJK    9
+#define	CB_USEFORMATTER		1
+#define CB_BACKWARD			2
+#define CB_STARTOVER		3
+#define CB_CASE				4
+#define CB_WILDCARD			5
+#define CB_REGULAR			6
+#define CB_APPROX			7
+#define CB_HALFFULLFORMS	8
+#define CB_SOUNDSLIKECJK	9
 
 #endif // _FMSEARCH_HRC
diff --git a/cui/source/dialogs/fmsearch.src b/cui/source/dialogs/fmsearch.src
index 186db5a48735..1b56c1634501 100644
--- a/cui/source/dialogs/fmsearch.src
+++ b/cui/source/dialogs/fmsearch.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src
index db0d4bbf3973..0b7601d5343f 100644
--- a/cui/source/dialogs/gallery.src
+++ b/cui/source/dialogs/gallery.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/dialogs/grfflt.hrc b/cui/source/dialogs/grfflt.hrc
index 94d7f8fe392f..eaafe3818c70 100644
--- a/cui/source/dialogs/grfflt.hrc
+++ b/cui/source/dialogs/grfflt.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,49 +32,49 @@
 // - Common -
 // ----------
 
-#define BTN_OK                              101
-#define BTN_CANCEL                          102
-#define BTN_HELP                            103
-#define CTL_PREVIEW                         105
-#define FL_PARAMETER                        106
-
-// --------------------
-// - DLG_FILTERMOSAIC -
-// --------------------
-
-#define DLG_FILTERMOSAIC_FT_WIDTH           1
-#define DLG_FILTERMOSAIC_MTR_WIDTH          2
-#define DLG_FILTERMOSAIC_FT_HEIGHT          3
-#define DLG_FILTERMOSAIC_MTR_HEIGHT         4
-#define DLG_FILTERMOSAIC_CBX_EDGES          5
+#define	BTN_OK								101
+#define	BTN_CANCEL							102
+#define	BTN_HELP							103
+#define CTL_PREVIEW							105
+#define FL_PARAMETER						106
+                                            
+// --------------------						
+// - DLG_FILTERMOSAIC -						
+// --------------------						
+                                            
+#define DLG_FILTERMOSAIC_FT_WIDTH			1
+#define DLG_FILTERMOSAIC_MTR_WIDTH			2
+#define DLG_FILTERMOSAIC_FT_HEIGHT			3
+#define DLG_FILTERMOSAIC_MTR_HEIGHT			4
+#define DLG_FILTERMOSAIC_CBX_EDGES			5
 
-// ----------------------
-// - DLG_FILTERSOLARIZE -
-// ----------------------
-
-#define DLG_FILTERSOLARIZE_FT_THRESHOLD     1
-#define DLG_FILTERSOLARIZE_MTR_THRESHOLD    2
-#define DLG_FILTERSOLARIZE_CBX_INVERT       3
+// ----------------------						
+// - DLG_FILTERSOLARIZE -						
+// ----------------------					
+                                            
+#define DLG_FILTERSOLARIZE_FT_THRESHOLD		1
+#define DLG_FILTERSOLARIZE_MTR_THRESHOLD	2
+#define DLG_FILTERSOLARIZE_CBX_INVERT		3
 
 // -------------------
-// - DLG_FILTERSEPIA -
+// - DLG_FILTERSEPIA -						
 // -------------------
-
-#define DLG_FILTERSEPIA_FT_SEPIA            1
-#define DLG_FILTERSEPIA_MTR_SEPIA           2
+                                            
+#define DLG_FILTERSEPIA_FT_SEPIA			1
+#define DLG_FILTERSEPIA_MTR_SEPIA			2
 
 // --------------------
-// - DLG_FILTERPOSTER -
+// - DLG_FILTERPOSTER -						
 // --------------------
-
-#define DLG_FILTERPOSTER_FT_POSTER          1
-#define DLG_FILTERPOSTER_NUM_POSTER         2
+                                            
+#define DLG_FILTERPOSTER_FT_POSTER			1
+#define DLG_FILTERPOSTER_NUM_POSTER			2
 
 // --------------------
-// - DLG_FILTEREMBOSS -
+// - DLG_FILTEREMBOSS -						
 // --------------------
-
-#define DLG_FILTEREMBOSS_FT_LIGHT           1
-#define DLG_FILTEREMBOSS_CTL_LIGHT          2
+                                            
+#define DLG_FILTEREMBOSS_FT_LIGHT			1
+#define DLG_FILTEREMBOSS_CTL_LIGHT			2
 
 #endif
diff --git a/cui/source/dialogs/grfflt.src b/cui/source/dialogs/grfflt.src
index fc1921b47cce..2c49939bcf41 100644
--- a/cui/source/dialogs/grfflt.src
+++ b/cui/source/dialogs/grfflt.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC
         Pos = MAP_APPFONT ( 104 , 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP ) ;
         Size = MAP_APPFONT ( 81, 73 ) ;
     };
-#define MA_Y0   3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP
+#define MA_Y0	3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP
     FixedText DLG_FILTERMOSAIC_FT_WIDTH
     {
         Pos = MAP_APPFONT ( 12, MA_Y0 ) ;
         Size = MAP_APPFONT ( 77, 10 ) ;
         Text [ en-US ] = "~Width" ;
     };
-#define MA_Y1   MA_Y0 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
+#define MA_Y1	MA_Y0 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
     MetricField DLG_FILTERMOSAIC_MTR_WIDTH
     {
         Border = TRUE ;
@@ -81,14 +81,14 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC
         Last = 999 ;
         SpinSize = 1 ;
     };
-#define MA_Y2   MA_Y1 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y
+#define MA_Y2	MA_Y1 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y
     FixedText DLG_FILTERMOSAIC_FT_HEIGHT
     {
         Pos = MAP_APPFONT ( 12, MA_Y2 ) ;
         Size = MAP_APPFONT ( 77, 10 ) ;
         Text [ en-US ] = "H~eight" ;
     };
-#define MA_Y3   MA_Y2 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
+#define MA_Y3	MA_Y2 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
     MetricField DLG_FILTERMOSAIC_MTR_HEIGHT
     {
         Border = TRUE ;
@@ -106,12 +106,12 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC
         Last = 999 ;
         SpinSize = 1 ;
     };
-#define MA_Y4   MA_Y3 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_Y
+#define MA_Y4	MA_Y3 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_Y
     CheckBox DLG_FILTERMOSAIC_CBX_EDGES
-    {
-        Pos = MAP_APPFONT ( 12, MA_Y4 ) ;
-        Size = MAP_APPFONT ( 91, 12 ) ;
-        TabStop = TRUE ;
+    {	
+        Pos = MAP_APPFONT ( 12, MA_Y4 ) ; 
+        Size = MAP_APPFONT ( 91, 12 ) ; 
+        TabStop = TRUE ; 
         Text [ en-US ] = "E~nhance edges" ;
     };
     OKButton BTN_OK
@@ -160,35 +160,35 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE
         Pos = MAP_APPFONT ( 104 , 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP ) ;
         Size = MAP_APPFONT ( 81, 73 ) ;
     };
-#define MA_Y5   3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP
+#define MA_Y5	3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP
     FixedText DLG_FILTERSOLARIZE_FT_THRESHOLD
     {
         Pos = MAP_APPFONT ( 12, MA_Y5 ) ;
         Size = MAP_APPFONT ( 77 , 10 ) ;
         Text [ en-US ] = "Threshold ~value" ;
     };
-#define MA_Y6   MA_Y5 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
+#define MA_Y6	MA_Y5 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
     MetricField DLG_FILTERSOLARIZE_MTR_THRESHOLD
     {
-        Border = TRUE ;
+        Border = TRUE ; 
         Pos = MAP_APPFONT ( 12 , MA_Y6 ) ;
         Size = MAP_APPFONT ( 35 , 12 ) ;
-        TabStop = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Maximum = 100 ;
-        StrictFormat = TRUE ;
-        Unit = FUNIT_CUSTOM ;
+        TabStop = TRUE ; 
+        Repeat = TRUE ; 
+        Spin = TRUE ; 
+        Maximum = 100 ; 
+        StrictFormat = TRUE ; 
+        Unit = FUNIT_CUSTOM ; 
         CustomUnitText = "%" ;
-        Last = 100 ;
-        SpinSize = 1 ;
+        Last = 100 ; 
+        SpinSize = 1 ; 
     };
-#define MA_Y7   MA_Y6 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y
+#define MA_Y7	MA_Y6 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y
     CheckBox DLG_FILTERSOLARIZE_CBX_INVERT
-    {
-        Pos = MAP_APPFONT ( 12, 46 ) ;
-        Size = MAP_APPFONT ( 77, 12 ) ;
-        TabStop = TRUE ;
+    {	
+        Pos = MAP_APPFONT ( 12, 46 ) ; 
+        Size = MAP_APPFONT ( 77, 12 ) ; 
+        TabStop = TRUE ; 
         Text [ en-US ] = "~Invert" ;
     };
     OKButton BTN_OK
@@ -237,31 +237,31 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA
         Pos = MAP_APPFONT ( 104 , 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP ) ;
         Size = MAP_APPFONT ( 81, 73 ) ;
     };
-#define MA_Y8   3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP
+#define MA_Y8	3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP
     FixedText DLG_FILTERSEPIA_FT_SEPIA
     {
         Pos = MAP_APPFONT ( 12 , MA_Y8 ) ;
         Size = MAP_APPFONT ( 77 , 10 ) ;
         Text [ en-US ] = "Aging degree" ;
     };
-#define MA_Y9   MA_Y8 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
+#define MA_Y9	MA_Y8 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
     MetricField DLG_FILTERSEPIA_MTR_SEPIA
     {
-        Border = TRUE ;
+        Border = TRUE ; 
         Pos = MAP_APPFONT ( 12 , MA_Y9 ) ;
         Size = MAP_APPFONT ( 35 , 12 ) ;
-        TabStop = TRUE ;
-        Right = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 1 ;
-        Maximum = 100 ;
-        StrictFormat = TRUE ;
-        Unit = FUNIT_CUSTOM ;
+        TabStop = TRUE ; 
+        Right = TRUE ; 
+        Repeat = TRUE ; 
+        Spin = TRUE ; 
+        Minimum = 1 ; 
+        Maximum = 100 ; 
+        StrictFormat = TRUE ; 
+        Unit = FUNIT_CUSTOM ; 
         CustomUnitText = "%" ;
-        First = 1 ;
-        Last = 100 ;
-        SpinSize = 1 ;
+        First = 1 ; 
+        Last = 100 ; 
+        SpinSize = 1 ; 
     };
     OKButton BTN_OK
     {
@@ -295,7 +295,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_POSTER
     Moveable = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 250, 100 ) ;
-
+    
     Text [ en-US ] = "Posterize" ;
 
     FixedLine FL_PARAMETER
@@ -309,28 +309,28 @@ ModalDialog RID_SVX_GRFFILTER_DLG_POSTER
         Pos = MAP_APPFONT ( 104 , 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP ) ;
         Size = MAP_APPFONT ( 81, 73 ) ;
     };
-#define MA_Y10  3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP
+#define MA_Y10	3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP
     FixedText DLG_FILTERPOSTER_FT_POSTER
     {
         Pos = MAP_APPFONT ( 12 , MA_Y10 ) ;
         Size = MAP_APPFONT ( 77 , 10 ) ;
         Text [ en-US ] = "Poster colors" ;
     };
-#define MA_Y11  MA_Y10 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
+#define MA_Y11	MA_Y10 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
     NumericField DLG_FILTERPOSTER_NUM_POSTER
     {
-        Border = TRUE ;
+        Border = TRUE ; 
         Pos = MAP_APPFONT ( 12 , MA_Y11 ) ;
         Size = MAP_APPFONT ( 35 , 12 ) ;
-        TabStop = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 2 ;
-        Maximum = 64 ;
-        StrictFormat = TRUE ;
-        First = 2 ;
-        Last = 64 ;
-        SpinSize = 1 ;
+        TabStop = TRUE ; 
+        Repeat = TRUE ; 
+        Spin = TRUE ; 
+        Minimum = 2 ; 
+        Maximum = 64 ; 
+        StrictFormat = TRUE ; 
+        First = 2 ; 
+        Last = 64 ; 
+        SpinSize = 1 ; 
     };
     OKButton BTN_OK
     {
@@ -359,8 +359,8 @@ ModalDialog RID_SVX_GRFFILTER_DLG_POSTER
 
 TabPage RID_SVX_GRFFILTER_DLG_EMBOSS_TAB
 {
-    Pos = MAP_APPFONT ( 0, 0 ) ;
-    Size = MAP_APPFONT ( 0, 0 ) ;
+    Pos = MAP_APPFONT ( 0, 0 ) ; 
+    Size = MAP_APPFONT ( 0, 0 ) ; 
 };
 
 ModalDialog RID_SVX_GRFFILTER_DLG_EMBOSS
@@ -372,7 +372,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_EMBOSS
     Size = MAP_APPFONT ( 250, 100 ) ;
 
     Text [ en-US ] = "Relief" ;
-
+    
     FixedLine FL_PARAMETER
     {
         Pos = MAP_APPFONT ( 6 , 3 ) ;
@@ -384,21 +384,21 @@ ModalDialog RID_SVX_GRFFILTER_DLG_EMBOSS
         Pos = MAP_APPFONT ( 104 , 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP ) ;
         Size = MAP_APPFONT ( 81, 73 ) ;
     };
-#define MA_Y12  3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP
+#define MA_Y12	3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP
     FixedText DLG_FILTEREMBOSS_FT_LIGHT
     {
         Pos = MAP_APPFONT ( 12 , MA_Y12 ) ;
         Size = MAP_APPFONT ( 77 , 10 ) ;
         Text [ en-US ] = "Light source" ;
     };
-#define MA_Y13  MA_Y12 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
+#define MA_Y13	MA_Y12 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
     Control DLG_FILTEREMBOSS_CTL_LIGHT
     {
         HelpID = HID_GRFFILTER_EMBOSS_LIGHT ;
-        Border = TRUE ;
+        Border = TRUE ; 
         Pos = MAP_APPFONT ( 12 , MA_Y13 ) ;
         Size = MAP_APPFONT ( 77 , 60 ) ;
-        TabStop = TRUE ;
+        TabStop = TRUE ; 
     };
     OKButton BTN_OK
     {
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index cb986f6dd1dd..2bd8dcd039be 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,9 +111,9 @@ namespace svx
         };
 
     protected:
-        const String        m_sPrimaryText;
-        const String        m_sSecondaryText;
-        const RubyPosition  m_ePosition;
+        const String		m_sPrimaryText;
+        const String		m_sSecondaryText;
+        const RubyPosition	m_ePosition;
 
     public:
         PseudoRubyText( const String& _rPrimary, const String& _rSecondary, const RubyPosition _ePosition );
@@ -136,9 +136,9 @@ namespace svx
     void PseudoRubyText::Paint( OutputDevice& _rDevice, const Rectangle& _rRect, USHORT _nTextStyle,
         Rectangle* _pPrimaryLocation, Rectangle* _pSecondaryLocation, ::vcl::ControlLayoutData* _pLayoutData )
     {
-        bool            bLayoutOnly  = NULL != _pLayoutData;
-        MetricVector*   pTextMetrics = bLayoutOnly ? &_pLayoutData->m_aUnicodeBoundRects : NULL;
-        String*         pDisplayText = bLayoutOnly ? &_pLayoutData->m_aDisplayText       : NULL;
+        bool			bLayoutOnly	 = NULL != _pLayoutData;
+        MetricVector*	pTextMetrics = bLayoutOnly ? &_pLayoutData->m_aUnicodeBoundRects : NULL;
+        String*			pDisplayText = bLayoutOnly ? &_pLayoutData->m_aDisplayText		 : NULL;
 
         Size aPlaygroundSize( _rRect.GetSize() );
 
@@ -225,7 +225,7 @@ namespace svx
     //=========================================================================
     //= RubyRadioButton
     //=========================================================================
-    class RubyRadioButton   :public RadioButton
+    class RubyRadioButton	:public RadioButton
                             ,protected PseudoRubyText
     {
         using svx::PseudoRubyText::Paint;
@@ -233,12 +233,12 @@ namespace svx
     public:
         RubyRadioButton(
             Window* _pParent,
-            const ResId& _rId,          // the text in the resource will be taken as primary text
-            const String& _rSecondary,  // this will be the secondary text which will be printed somewhat smaller
+            const ResId& _rId,			// the text in the resource will be taken as primary text
+            const String& _rSecondary,	// this will be the secondary text which will be printed somewhat smaller
             const PseudoRubyText::RubyPosition _ePosition );
 
     protected:
-        virtual void    Paint( const Rectangle& _rRect );
+        virtual void	Paint( const Rectangle& _rRect );
     };
 
     //-------------------------------------------------------------------------
@@ -261,7 +261,7 @@ namespace svx
         aImageSize.Height()  = CalcZoom( aImageSize.Height() );
 
         Rectangle aOverallRect( Point( 0, 0 ), GetOutputSizePixel() );
-        aOverallRect.Left() += aImageSize.Width() + 4;  // 4 is the separator between the image and the text
+        aOverallRect.Left() += aImageSize.Width() + 4;	// 4 is the separator between the image and the text
         // inflate the rect a little bit (because the VCL radio button does the same)
         Rectangle aTextRect( aOverallRect );
         ++aTextRect.Left(); --aTextRect.Right();
@@ -524,16 +524,16 @@ namespace svx
     HangulHanjaConversionDialog::HangulHanjaConversionDialog( Window* _pParent, HHC::ConversionDirection _ePrimaryDirection )
         :ModalDialog( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA ) )
         ,m_pPlayground( new SvxCommonLinguisticControl( this ) )
-        ,m_aFind            ( m_pPlayground.get(), CUI_RES( PB_FIND ) )
-        ,m_aSuggestions     ( m_pPlayground.get(), CUI_RES( CTL_SUGGESTIONS ) )
-        ,m_aFormat          ( m_pPlayground.get(), CUI_RES( FT_FORMAT ) )
+        ,m_aFind			( m_pPlayground.get(), CUI_RES( PB_FIND ) )
+        ,m_aSuggestions		( m_pPlayground.get(), CUI_RES( CTL_SUGGESTIONS ) )
+        ,m_aFormat			( m_pPlayground.get(), CUI_RES( FT_FORMAT ) )
         ,m_aSimpleConversion( m_pPlayground.get(), CUI_RES( RB_SIMPLE_CONVERSION ) )
-        ,m_aHangulBracketed ( m_pPlayground.get(), CUI_RES( RB_HANJA_HANGUL_BRACKETED ) )
-        ,m_aHanjaBracketed  ( m_pPlayground.get(), CUI_RES( RB_HANGUL_HANJA_BRACKETED ) )
-        ,m_aConversion      ( m_pPlayground.get(), CUI_RES( FT_CONVERSION ) )
-        ,m_aHangulOnly      ( m_pPlayground.get(), CUI_RES( CB_HANGUL_ONLY ) )
-        ,m_aHanjaOnly       ( m_pPlayground.get(), CUI_RES( CB_HANJA_ONLY ) )
-        ,m_aReplaceByChar   ( m_pPlayground.get(), CUI_RES( CB_REPLACE_BY_CHARACTER ) )
+        ,m_aHangulBracketed	( m_pPlayground.get(), CUI_RES( RB_HANJA_HANGUL_BRACKETED ) )
+        ,m_aHanjaBracketed	( m_pPlayground.get(), CUI_RES( RB_HANGUL_HANJA_BRACKETED ) )
+        ,m_aConversion		( m_pPlayground.get(), CUI_RES( FT_CONVERSION ) )
+        ,m_aHangulOnly		( m_pPlayground.get(), CUI_RES( CB_HANGUL_ONLY ) )
+        ,m_aHanjaOnly		( m_pPlayground.get(), CUI_RES( CB_HANJA_ONLY ) )
+        ,m_aReplaceByChar	( m_pPlayground.get(), CUI_RES( CB_REPLACE_BY_CHARACTER ) )
         ,m_pIgnoreNonPrimary( NULL )
         ,m_bDocumentMode( true )
     {
@@ -561,13 +561,13 @@ namespace svx
         Point aDistance = LogicToPixel( Point( 3, 0 ), MAP_APPFONT );
         sal_Int32 nTooLargeByPixels =
             // right margin of the word input control
-            (   m_pPlayground->GetWordInputControl().GetPosPixel().X()
-            +   m_pPlayground->GetWordInputControl().GetSizePixel().Width()
+            (	m_pPlayground->GetWordInputControl().GetPosPixel().X()
+            +	m_pPlayground->GetWordInputControl().GetSizePixel().Width()
             )
             // minus left margin of the find button
-            -   m_aFind.GetPosPixel().X()
+            -	m_aFind.GetPosPixel().X()
             // plus desired distance between the both
-            +   aDistance.X();
+            +	aDistance.X();
         // make the word input control smaller
         Size aSize = m_pPlayground->GetWordInputControl().GetSizePixel();
         aSize.Width() -= nTooLargeByPixels;
@@ -600,16 +600,16 @@ namespace svx
         m_pPlayground->SetButtonHandler( SvxCommonLinguisticControl::eOptions,
                                         LINK( this, HangulHanjaConversionDialog, OnOption ) );
         m_pPlayground->GetButton( SvxCommonLinguisticControl::eOptions )->Show();
-//      m_pPlayground->EnableButton( SvxCommonLinguisticControl::eOptions, true );
+//		m_pPlayground->EnableButton( SvxCommonLinguisticControl::eOptions, true );
 
         if ( editeng::HangulHanjaConversion::eHangulToHanja == _ePrimaryDirection )
         {
-//          m_aHanjaOnly.Enable( sal_False );
+//			m_aHanjaOnly.Enable( sal_False );
             m_pIgnoreNonPrimary = &m_aHangulOnly;
         }
         else
         {
-//          m_aHangulOnly.Enable( sal_False );
+//			m_aHangulOnly.Enable( sal_False );
             m_pIgnoreNonPrimary = &m_aHanjaOnly;
         }
 //        m_pIgnoreNonPrimary->Check();
@@ -779,7 +779,7 @@ namespace svx
 
     IMPL_LINK( HangulHanjaConversionDialog, OnOption, void*, EMPTYARG )
     {
-        HangulHanjaOptionsDialog        aOptDlg( this );
+        HangulHanjaOptionsDialog		aOptDlg( this );
         aOptDlg.Execute();
         m_aOptionsChangedLink.Call(this);
         return 0L;
@@ -815,7 +815,7 @@ namespace svx
         m_pPlayground->SetCurrentText( _rNewString );
 
         bool bOldDocumentMode = m_bDocumentMode;
-        m_bDocumentMode = _bOriginatesFromDocument; // before FillSuggestions!
+        m_bDocumentMode = _bOriginatesFromDocument;	// before FillSuggestions!
         FillSuggestions( _rSuggestions );
 
         m_pPlayground->EnableButton( SvxCommonLinguisticControl::eIgnoreAll, m_bDocumentMode );
@@ -894,8 +894,8 @@ namespace svx
     //-------------------------------------------------------------------------
     sal_Bool HangulHanjaConversionDialog::GetUseBothDirections( ) const
     {
-//      DBG_ASSERT( m_pIgnoreNonPrimary, "HangulHanjaConversionDialog::GetUseBothDirections: where's the check box pointer?" );
-//      return m_pIgnoreNonPrimary ? !m_pIgnoreNonPrimary->IsChecked( ) : sal_True;
+//		DBG_ASSERT( m_pIgnoreNonPrimary, "HangulHanjaConversionDialog::GetUseBothDirections: where's the check box pointer?" );
+//		return m_pIgnoreNonPrimary ? !m_pIgnoreNonPrimary->IsChecked( ) : sal_True;
         return !m_aHangulOnly.IsChecked() && !m_aHanjaOnly.IsChecked();
     }
 
@@ -983,20 +983,20 @@ namespace svx
 
         if( m_xConversionDictionaryList.is() )
         {
-            Reference< XNameContainer > xNameCont = m_xConversionDictionaryList->getDictionaryContainer();
-            Reference< XNameAccess >    xNameAccess = Reference< XNameAccess >( xNameCont, UNO_QUERY );
+            Reference< XNameContainer >	xNameCont = m_xConversionDictionaryList->getDictionaryContainer();
+            Reference< XNameAccess >	xNameAccess = Reference< XNameAccess >( xNameCont, UNO_QUERY );
             if( xNameAccess.is() )
             {
-                Sequence< ::rtl::OUString >     aDictNames( xNameAccess->getElementNames() );
+                Sequence< ::rtl::OUString >		aDictNames( xNameAccess->getElementNames() );
 
-                const ::rtl::OUString*          pDic = aDictNames.getConstArray();
-                sal_Int32                       nCount = aDictNames.getLength();
+                const ::rtl::OUString*			pDic = aDictNames.getConstArray();
+                sal_Int32						nCount = aDictNames.getLength();
 
-                sal_Int32                       i;
+                sal_Int32						i;
                 for( i = 0 ; i < nCount ; ++i )
                 {
-                    Any                                 aAny( xNameAccess->getByName( pDic[ i ] ) );
-                    Reference< XConversionDictionary >  xDic;
+                    Any									aAny( xNameAccess->getByName( pDic[ i ] ) );
+                    Reference< XConversionDictionary >	xDic;
                     if( ( aAny >>= xDic ) && xDic.is() )
                     {
                         if( LANGUAGE_KOREAN == SvxLocaleToLanguage( xDic->getLocale() ) )
@@ -1012,23 +1012,23 @@ namespace svx
 
     IMPL_LINK( HangulHanjaOptionsDialog, OkHdl, void*, EMPTYARG )
     {
-        sal_uInt32              nCnt = m_aDictList.size();
-        sal_uInt32              n = 0;
-        sal_uInt32              nActiveDics = 0;
-        Sequence< OUString >    aActiveDics;
+        sal_uInt32				nCnt = m_aDictList.size();
+        sal_uInt32				n = 0;
+        sal_uInt32				nActiveDics = 0;
+        Sequence< OUString >	aActiveDics;
 
         aActiveDics.realloc( nCnt );
-        OUString*               pActActiveDic = aActiveDics.getArray();
+        OUString*				pActActiveDic = aActiveDics.getArray();
 
         while( nCnt )
         {
-            Reference< XConversionDictionary >  xDict = m_aDictList[ n ];
-            SvLBoxEntry*                        pEntry = m_aDictsLB.SvTreeListBox::GetEntry( n );
+            Reference< XConversionDictionary >	xDict = m_aDictList[ n ];
+            SvLBoxEntry*						pEntry = m_aDictsLB.SvTreeListBox::GetEntry( n );
 
             DBG_ASSERT( xDict.is(), "-HangulHanjaOptionsDialog::OkHdl(): someone is evaporated..." );
             DBG_ASSERT( pEntry, "-HangulHanjaOptionsDialog::OkHdl(): no one there in list?" );
 
-            bool    bActive = m_aDictsLB.GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED;
+            bool	bActive = m_aDictsLB.GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED;
             xDict->setActive( bActive );
             Reference< util::XFlushable > xFlush( xDict, uno::UNO_QUERY );
             if( xFlush.is() )
@@ -1046,8 +1046,8 @@ namespace svx
 
         // save configuration
         aActiveDics.realloc( nActiveDics );
-        Any             aTmp;
-        SvtLinguConfig  aLngCfg;
+        Any				aTmp;
+        SvtLinguConfig	aLngCfg;
         aTmp <<= aActiveDics;
         aLngCfg.SetProperty( UPH_ACTIVE_CONVERSION_DICTIONARIES, aTmp );
 
@@ -1066,7 +1066,7 @@ namespace svx
 
     IMPL_LINK( HangulHanjaOptionsDialog, DictsLB_SelectHdl, void*, EMPTYARG )
     {
-        bool    bSel = m_aDictsLB.FirstSelected() != NULL;
+        bool	bSel = m_aDictsLB.FirstSelected() != NULL;
 
         m_aEditPB.Enable( bSel );
         m_aDeletePB.Enable( bSel );
@@ -1076,8 +1076,8 @@ namespace svx
 
     IMPL_LINK( HangulHanjaOptionsDialog, NewDictHdl, void*, EMPTYARG )
     {
-        String                      aName;
-        HangulHanjaNewDictDialog    aNewDlg( this );
+        String						aName;
+        HangulHanjaNewDictDialog	aNewDlg( this );
         aNewDlg.Execute();
         if( aNewDlg.GetName( aName ) )
         {
@@ -1085,7 +1085,7 @@ namespace svx
             {
                 try
                 {
-                    Reference< XConversionDictionary >  xDic =
+                    Reference< XConversionDictionary >	xDic =
                         m_xConversionDictionaryList->addNewDictionary( aName, SvxCreateLocale( LANGUAGE_KOREAN ), ConversionDictionaryType::HANGUL_HANJA );
 
                     if( xDic.is() )
@@ -1109,11 +1109,11 @@ namespace svx
 
     IMPL_LINK( HangulHanjaOptionsDialog, EditDictHdl, void*, EMPTYARG )
     {
-        SvLBoxEntry*    pEntry = m_aDictsLB.FirstSelected();
+        SvLBoxEntry*	pEntry = m_aDictsLB.FirstSelected();
         DBG_ASSERT( pEntry, "+HangulHanjaEditDictDialog::EditDictHdl(): call of edit should not be possible with no selection!" );
         if( pEntry )
         {
-            HangulHanjaEditDictDialog   aEdDlg( this, m_aDictList, m_aDictsLB.GetSelectEntryPos() );
+            HangulHanjaEditDictDialog	aEdDlg( this, m_aDictList, m_aDictsLB.GetSelectEntryPos() );
             aEdDlg.Execute();
         }
         return 0L;
@@ -1124,10 +1124,10 @@ namespace svx
         USHORT nSelPos = m_aDictsLB.GetSelectEntryPos();
         if( nSelPos != LISTBOX_ENTRY_NOTFOUND )
         {
-            Reference< XConversionDictionary >  xDic( m_aDictList[ nSelPos ] );
+            Reference< XConversionDictionary >	xDic( m_aDictList[ nSelPos ] );
             if( m_xConversionDictionaryList.is() && xDic.is() )
             {
-                Reference< XNameContainer >     xNameCont = m_xConversionDictionaryList->getDictionaryContainer();
+                Reference< XNameContainer >		xNameCont = m_xConversionDictionaryList->getDictionaryContainer();
                 if( xNameCont.is() )
                 {
                     try
@@ -1153,27 +1153,27 @@ namespace svx
     }
 
     HangulHanjaOptionsDialog::HangulHanjaOptionsDialog( Window* _pParent )
-        :ModalDialog            ( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA_OPT ) )
-        ,m_aUserdefdictFT       ( this, CUI_RES( FT_USERDEFDICT ) )
-        ,m_aDictsLB             ( this, CUI_RES( LB_DICTS ) )
-        ,m_aOptionsFL           ( this, CUI_RES( FL_OPTIONS ) )
-        ,m_aIgnorepostCB        ( this, CUI_RES( CB_IGNOREPOST ) )
-        ,m_aShowrecentlyfirstCB ( this, CUI_RES( CB_SHOWRECENTLYFIRST ) )
-        ,m_aAutoreplaceuniqueCB ( this, CUI_RES( CB_AUTOREPLACEUNIQUE ) )
-        ,m_aNewPB               ( this, CUI_RES( PB_HHO_NEW ) )
-        ,m_aEditPB              ( this, CUI_RES( PB_HHO_EDIT ) )
-        ,m_aDeletePB            ( this, CUI_RES( PB_HHO_DELETE ) )
-        ,m_aOkPB                ( this, CUI_RES( PB_HHO_OK ) )
-        ,m_aCancelPB            ( this, CUI_RES( PB_HHO_CANCEL ) )
-        ,m_aHelpPB              ( this, CUI_RES( PB_HHO_HELP ) )
-
-        ,m_pCheckButtonData     ( NULL )
+        :ModalDialog			( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA_OPT ) )
+        ,m_aUserdefdictFT		( this, CUI_RES( FT_USERDEFDICT ) )
+        ,m_aDictsLB				( this, CUI_RES( LB_DICTS ) )
+        ,m_aOptionsFL			( this, CUI_RES( FL_OPTIONS ) )
+        ,m_aIgnorepostCB		( this, CUI_RES( CB_IGNOREPOST ) )
+        ,m_aShowrecentlyfirstCB	( this, CUI_RES( CB_SHOWRECENTLYFIRST ) )
+        ,m_aAutoreplaceuniqueCB	( this, CUI_RES( CB_AUTOREPLACEUNIQUE ) )
+        ,m_aNewPB				( this, CUI_RES( PB_HHO_NEW ) )
+        ,m_aEditPB				( this, CUI_RES( PB_HHO_EDIT ) )
+        ,m_aDeletePB			( this, CUI_RES( PB_HHO_DELETE ) )
+        ,m_aOkPB				( this, CUI_RES( PB_HHO_OK ) )
+        ,m_aCancelPB			( this, CUI_RES( PB_HHO_CANCEL ) )
+        ,m_aHelpPB				( this, CUI_RES( PB_HHO_HELP ) )
+
+        ,m_pCheckButtonData		( NULL )
         ,m_xConversionDictionaryList( NULL )
     {
         m_aDictsLB.SetWindowBits( WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE );
         m_aDictsLB.SetSelectionMode( SINGLE_SELECTION );
         m_aDictsLB.SetHighlightRange();
-//      m_aDictsLB.SetHelpId( xxx );
+//		m_aDictsLB.SetHelpId( xxx );
         m_aDictsLB.SetSelectHdl( LINK( this, HangulHanjaOptionsDialog, DictsLB_SelectHdl ) );
         m_aDictsLB.SetDeselectHdl( LINK( this, HangulHanjaOptionsDialog, DictsLB_SelectHdl ) );
 
@@ -1184,9 +1184,9 @@ namespace svx
 
         FreeResource();
 
-        SvtLinguConfig  aLngCfg;
-        Any             aTmp;
-        bool            bVal = bool();
+        SvtLinguConfig	aLngCfg;
+        Any				aTmp;
+        bool			bVal = bool();
         aTmp = aLngCfg.GetProperty( UPH_IS_IGNORE_POST_POSITIONAL_WORD );
         if( aTmp >>= bVal )
             m_aIgnorepostCB.Check( bVal );
@@ -1204,8 +1204,8 @@ namespace svx
 
     HangulHanjaOptionsDialog::~HangulHanjaOptionsDialog()
     {
-        SvLBoxEntry*    pEntry = m_aDictsLB.First();
-        String*         pDel;
+        SvLBoxEntry*	pEntry = m_aDictsLB.First();
+        String*			pDel;
         while( pEntry )
         {
             pDel = ( String* ) pEntry->GetUserData();
@@ -1220,7 +1220,7 @@ namespace svx
 
     void HangulHanjaOptionsDialog::AddDict( const String& _rName, bool _bChecked )
     {
-        SvLBoxEntry*    pEntry = m_aDictsLB.SvTreeListBox::InsertEntry( _rName );
+        SvLBoxEntry*	pEntry = m_aDictsLB.SvTreeListBox::InsertEntry( _rName );
         m_aDictsLB.SetCheckButtonState( pEntry, _bChecked? SV_BUTTON_CHECKED : SV_BUTTON_UNCHECKED );
         pEntry->SetUserData( new String( _rName ) );
     }
@@ -1232,12 +1232,12 @@ namespace svx
 
     IMPL_LINK( HangulHanjaNewDictDialog, OKHdl, void*, EMPTYARG )
     {
-        String  aName( m_aDictNameED.GetText() );
+        String	aName( m_aDictNameED.GetText() );
 
         aName.EraseTrailingChars();
         m_bEntered = aName.Len() > 0;
         if( m_bEntered )
-            m_aDictNameED.SetText( aName );     // do this in case of trailing chars have been deleted
+            m_aDictNameED.SetText( aName );		// do this in case of trailing chars have been deleted
 
         EndDialog( RET_OK );
         return 0;
@@ -1245,7 +1245,7 @@ namespace svx
 
     IMPL_LINK( HangulHanjaNewDictDialog, ModifyHdl, void*, EMPTYARG )
     {
-        String  aName( m_aDictNameED.GetText() );
+        String	aName( m_aDictNameED.GetText() );
 
         aName.EraseTrailingChars();
         m_aOkBtn.Enable( aName.Len() > 0 );
@@ -1254,15 +1254,15 @@ namespace svx
     }
 
     HangulHanjaNewDictDialog::HangulHanjaNewDictDialog( Window* _pParent )
-        :ModalDialog    ( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA_NEWDICT ) )
-        ,m_aNewDictFL   ( this, CUI_RES( FL_NEWDICT ) )
-        ,m_aDictNameFT  ( this, CUI_RES( FT_DICTNAME ) )
-        ,m_aDictNameED  ( this, CUI_RES( ED_DICTNAME ) )
-        ,m_aOkBtn       ( this, CUI_RES( PB_NEWDICT_OK ) )
-        ,m_aCancelBtn   ( this, CUI_RES( PB_NEWDICT_ESC ) )
-        ,m_aHelpBtn     ( this, CUI_RES( PB_NEWDICT_HLP ) )
+        :ModalDialog	( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA_NEWDICT ) )
+        ,m_aNewDictFL	( this, CUI_RES( FL_NEWDICT ) )
+        ,m_aDictNameFT	( this, CUI_RES( FT_DICTNAME ) )
+        ,m_aDictNameED	( this, CUI_RES( ED_DICTNAME ) )
+        ,m_aOkBtn		( this, CUI_RES( PB_NEWDICT_OK ) )
+        ,m_aCancelBtn	( this, CUI_RES( PB_NEWDICT_ESC ) )
+        ,m_aHelpBtn		( this, CUI_RES( PB_NEWDICT_HLP ) )
 
-        ,m_bEntered     ( false )
+        ,m_bEntered		( false )
     {
         m_aOkBtn.SetClickHdl( LINK( this, HangulHanjaNewDictDialog, OKHdl ) );
 
@@ -1295,25 +1295,25 @@ namespace svx
     {
     private:
     protected:
-        sal_uInt16          m_nSize;
-        String**            m_ppElements;
-        sal_uInt16          m_nNumOfEntries;
-        sal_uInt16          m_nAct;
+        sal_uInt16			m_nSize;
+        String**			m_ppElements;
+        sal_uInt16			m_nNumOfEntries;
+        sal_uInt16			m_nAct;
 
-        const String*       _Next( void );
+        const String*		_Next( void );
     public:
                             SuggestionList( sal_uInt16 _nNumOfElements );
-        virtual             ~SuggestionList();
+        virtual				~SuggestionList();
 
-        bool                Set( const String& _rElement, sal_uInt16 _nNumOfElement );
-        bool                Reset( sal_uInt16 _nNumOfElement );
-        const String*       Get( sal_uInt16 _nNumOfElement ) const;
-        void                Clear( void );
+        bool				Set( const String& _rElement, sal_uInt16 _nNumOfElement );
+        bool				Reset( sal_uInt16 _nNumOfElement );
+        const String*		Get( sal_uInt16 _nNumOfElement ) const;
+        void				Clear( void );
 
-        const String*       First( void );
-        const String*       Next( void );
+        const String*		First( void );
+        const String*		Next( void );
 
-        inline sal_uInt16   GetCount( void ) const;
+        inline sal_uInt16	GetCount( void ) const;
     };
 
     inline sal_uInt16 SuggestionList::GetCount( void ) const
@@ -1331,8 +1331,8 @@ namespace svx
         m_ppElements = new String*[ m_nSize ];
         m_nAct = m_nNumOfEntries = 0;
 
-        String**    ppNull = m_ppElements;
-        sal_uInt16  n = _nNumOfElements;
+        String**	ppNull = m_ppElements;
+        sal_uInt16	n = _nNumOfElements;
         while( n )
         {
             *ppNull = NULL;
@@ -1348,10 +1348,10 @@ namespace svx
 
     bool SuggestionList::Set( const String& _rElement, sal_uInt16 _nNumOfElement )
     {
-        bool    bRet = _nNumOfElement < m_nSize;
+        bool	bRet = _nNumOfElement < m_nSize;
         if( bRet )
         {
-            String**    ppElem = m_ppElements + _nNumOfElement;
+            String**	ppElem = m_ppElements + _nNumOfElement;
             if( *ppElem )
                 **ppElem = _rElement;
             else
@@ -1366,10 +1366,10 @@ namespace svx
 
     bool SuggestionList::Reset( sal_uInt16 _nNumOfElement )
     {
-        bool    bRet = _nNumOfElement < m_nSize;
+        bool	bRet = _nNumOfElement < m_nSize;
         if( bRet )
         {
-            String**    ppElem = m_ppElements + _nNumOfElement;
+            String**	ppElem = m_ppElements + _nNumOfElement;
             if( *ppElem )
             {
                 delete *ppElem;
@@ -1383,7 +1383,7 @@ namespace svx
 
     const String* SuggestionList::Get( sal_uInt16 _nNumOfElement ) const
     {
-        const String*   pRet;
+        const String*	pRet;
 
         if( _nNumOfElement < m_nSize )
             pRet = m_ppElements[ _nNumOfElement ];
@@ -1397,8 +1397,8 @@ namespace svx
     {
         if( m_nNumOfEntries )
         {
-            String**    ppDel = m_ppElements;
-            sal_uInt16  nCnt = m_nSize;
+            String**	ppDel = m_ppElements;
+            sal_uInt16	nCnt = m_nSize;
             while( nCnt )
             {
                 if( *ppDel )
@@ -1417,7 +1417,7 @@ namespace svx
 
     const String* SuggestionList::_Next( void )
     {
-        const String*   pRet = NULL;
+        const String*	pRet = NULL;
         while( m_nAct < m_nSize && !pRet )
         {
             pRet = m_ppElements[ m_nAct ];
@@ -1436,7 +1436,7 @@ namespace svx
 
     const String* SuggestionList::Next( void )
     {
-        const String*   pRet;
+        const String*	pRet;
 
         if( m_nAct < m_nNumOfEntries )
         {
@@ -1452,7 +1452,7 @@ namespace svx
 
     bool SuggestionEdit::ShouldScroll( bool _bUp ) const
     {
-        bool    bRet = false;
+        bool	bRet = false;
 
         if( _bUp )
         {
@@ -1470,7 +1470,7 @@ namespace svx
 
     void SuggestionEdit::DoJump( bool _bUp )
     {
-        const Link&     rLoseFocusHdl = GetLoseFocusHdl();
+        const Link& 	rLoseFocusHdl = GetLoseFocusHdl();
         if( rLoseFocusHdl.IsSet() )
             rLoseFocusHdl.Call( this );
         m_rScrollBar.SetThumbPos( m_rScrollBar.GetThumbPos() + ( _bUp? -1 : 1 ) );
@@ -1493,16 +1493,16 @@ namespace svx
 
     long SuggestionEdit::PreNotify( NotifyEvent& rNEvt )
     {
-        long    nHandled = 0;
+        long	nHandled = 0;
         if( rNEvt.GetType() == EVENT_KEYINPUT )
         {
-            const KeyEvent*             pKEvt = rNEvt.GetKeyEvent();
-            const KeyCode&              rKeyCode = pKEvt->GetKeyCode();
-            USHORT                      nMod = rKeyCode.GetModifier();
-            USHORT                      nCode = rKeyCode.GetCode();
+            const KeyEvent*				pKEvt = rNEvt.GetKeyEvent();
+            const KeyCode&				rKeyCode = pKEvt->GetKeyCode();
+            USHORT						nMod = rKeyCode.GetModifier();
+            USHORT						nCode = rKeyCode.GetCode();
             if( nCode == KEY_TAB && ( !nMod || KEY_SHIFT == nMod ) )
             {
-                bool        bUp = KEY_SHIFT == nMod;
+                bool		bUp = KEY_SHIFT == nMod;
                 if( ShouldScroll( bUp ) )
                 {
                     DoJump( bUp );
@@ -1513,7 +1513,7 @@ namespace svx
             }
             else if( KEY_UP == nCode || KEY_DOWN == nCode )
             {
-                bool        bUp = KEY_UP == nCode;
+                bool		bUp = KEY_UP == nCode;
                 if( ShouldScroll( bUp ) )
                 {
                     DoJump( bUp );
@@ -1543,16 +1543,16 @@ namespace svx
 
     namespace
     {
-        bool GetConversions(    Reference< XConversionDictionary >  _xDict,
+        bool GetConversions(	Reference< XConversionDictionary >	_xDict,
                                 const OUString& _rOrg,
                                 Sequence< OUString >& _rEntries )
         {
-            bool    bRet = false;
+            bool	bRet = false;
             if( _xDict.is() && _rOrg.getLength() )
             {
                 try
                 {
-                    _rEntries = _xDict->getConversions( _rOrg,
+                    _rEntries = _xDict->getConversions(	_rOrg,
                                                         0,
                                                         _rOrg.getLength(),
                                                         ConversionDirection_FROM_LEFT,
@@ -1621,14 +1621,14 @@ namespace svx
     IMPL_LINK( HangulHanjaEditDictDialog, NewPBPushHdl, void*, EMPTYARG )
     {
         DBG_ASSERT( m_pSuggestions, "-HangulHanjaEditDictDialog::NewPBPushHdl(): no suggestions... search in hell..." );
-        Reference< XConversionDictionary >  xDict = m_rDictList[ m_nCurrentDict ];
+        Reference< XConversionDictionary >	xDict = m_rDictList[ m_nCurrentDict ];
         if( xDict.is() && m_pSuggestions )
         {
             //delete old entry
             bool bRemovedSomething = DeleteEntryFromDictionary( m_aOriginal, xDict );
 
-            OUString                aLeft( m_aOriginal );
-            const String*           pRight = m_pSuggestions->First();
+            OUString				aLeft( m_aOriginal );
+            const String*			pRight = m_pSuggestions->First();
             bool bAddedSomething = false;
             while( pRight )
             {
@@ -1663,12 +1663,12 @@ namespace svx
         bool bRemovedSomething = false;
         if( xDict.is() )
         {
-            OUString                aOrg( m_aOriginal );
-            Sequence< OUString >    aEntries;
+            OUString				aOrg( m_aOriginal );
+            Sequence< OUString >	aEntries;
             GetConversions( xDict, m_aOriginal, aEntries );
 
-            sal_uInt32  n = aEntries.getLength();
-            OUString*   pEntry = aEntries.getArray();
+            sal_uInt32	n = aEntries.getLength();
+            OUString*	pEntry = aEntries.getArray();
             while( n )
             {
                 try
@@ -1677,7 +1677,7 @@ namespace svx
                     bRemovedSomething = true;
                 }
                 catch( const NoSuchElementException& )
-                {   // can not be...
+                {	// can not be...
                 }
 
                 ++pEntry;
@@ -1722,12 +1722,12 @@ namespace svx
     void HangulHanjaEditDictDialog::UpdateOriginalLB( void )
     {
         m_aOriginalLB.Clear();
-        Reference< XConversionDictionary >  xDict = m_rDictList[ m_nCurrentDict ];
+        Reference< XConversionDictionary >	xDict = m_rDictList[ m_nCurrentDict ];
         if( xDict.is() )
         {
-            Sequence< OUString >    aEntries = xDict->getConversionEntries( ConversionDirection_FROM_LEFT );
-            sal_uInt32              n = aEntries.getLength();
-            OUString*               pEntry = aEntries.getArray();
+            Sequence< OUString >	aEntries = xDict->getConversionEntries( ConversionDirection_FROM_LEFT );
+            sal_uInt32				n = aEntries.getLength();
+            OUString*				pEntry = aEntries.getArray();
             while( n )
             {
                 m_aOriginalLB.InsertEntry( *pEntry );
@@ -1783,15 +1783,15 @@ namespace svx
         }
 
         m_aScrollSB.SetThumbPos( 0 );
-        UpdateScrollbar();              // will force edits to be filled new
+        UpdateScrollbar();				// will force edits to be filled new
     }
 
     void HangulHanjaEditDictDialog::SetEditText( Edit& _rEdit, sal_uInt16 _nEntryNum )
     {
-        String  aStr;
+        String	aStr;
         if( m_pSuggestions )
         {
-            const String*   p = m_pSuggestions->Get( _nEntryNum );
+            const String*	p = m_pSuggestions->Get( _nEntryNum );
             if( p )
                 aStr = *p;
         }
@@ -1803,7 +1803,7 @@ namespace svx
     {
         m_bModifiedSuggestions = true;
 
-        String  aTxt( _pEdit->GetText() );
+        String	aTxt( _pEdit->GetText() );
         sal_uInt16 nEntryNum = m_nTopPos + _nEntryOffset;
         if( aTxt.Len() == 0 )
         {
@@ -1823,26 +1823,26 @@ namespace svx
     }
 
     HangulHanjaEditDictDialog::HangulHanjaEditDictDialog( Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict )
-        :ModalDialog            ( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA_EDIT ) )
-        ,m_aEditHintText        ( CUI_RES( STR_EDITHINT ) )
-        ,m_rDictList            ( _rDictList )
-        ,m_nCurrentDict         ( 0xFFFFFFFF )
-        ,m_pSuggestions         ( NULL )
-        ,m_aBookFT              ( this, CUI_RES( FT_BOOK ) )
-        ,m_aBookLB              ( this, CUI_RES( LB_BOOK ) )
-        ,m_aOriginalFT          ( this, CUI_RES( FT_ORIGINAL ) )
-        ,m_aOriginalLB          ( this, CUI_RES( LB_ORIGINAL ) )
-        ,m_aSuggestionsFT       ( this, CUI_RES( FT_SUGGESTIONS ) )
-        ,m_aEdit1               ( this, CUI_RES( ED_1 ), m_aScrollSB, NULL, &m_aEdit2 )
-        ,m_aEdit2               ( this, CUI_RES( ED_2 ), m_aScrollSB, &m_aEdit1, &m_aEdit3 )
-        ,m_aEdit3               ( this, CUI_RES( ED_3 ), m_aScrollSB, &m_aEdit2, &m_aEdit4 )
-        ,m_aEdit4               ( this, CUI_RES( ED_4 ), m_aScrollSB, &m_aEdit3, NULL )
-        ,m_aScrollSB            ( this, CUI_RES( SB_SCROLL ) )
-        ,m_aNewPB               ( this, CUI_RES( PB_HHE_NEW ) )
-        ,m_aDeletePB            ( this, CUI_RES( PB_HHE_DELETE ) )
-        ,m_aHelpPB              ( this, CUI_RES( PB_HHE_HELP ) )
-        ,m_aClosePB             ( this, CUI_RES( PB_HHE_CLOSE ) )
-        ,m_nTopPos              ( 0 )
+        :ModalDialog			( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA_EDIT ) )
+        ,m_aEditHintText		( CUI_RES( STR_EDITHINT ) )
+        ,m_rDictList			( _rDictList )
+        ,m_nCurrentDict			( 0xFFFFFFFF )
+        ,m_pSuggestions			( NULL )
+        ,m_aBookFT				( this, CUI_RES( FT_BOOK ) )
+        ,m_aBookLB				( this, CUI_RES( LB_BOOK ) )
+        ,m_aOriginalFT			( this, CUI_RES( FT_ORIGINAL ) )
+        ,m_aOriginalLB			( this, CUI_RES( LB_ORIGINAL ) )
+        ,m_aSuggestionsFT		( this, CUI_RES( FT_SUGGESTIONS ) )
+        ,m_aEdit1				( this, CUI_RES( ED_1 ), m_aScrollSB, NULL, &m_aEdit2 )
+        ,m_aEdit2				( this, CUI_RES( ED_2 ), m_aScrollSB, &m_aEdit1, &m_aEdit3 )
+        ,m_aEdit3				( this, CUI_RES( ED_3 ), m_aScrollSB, &m_aEdit2, &m_aEdit4 )
+        ,m_aEdit4				( this, CUI_RES( ED_4 ), m_aScrollSB, &m_aEdit3, NULL )
+        ,m_aScrollSB			( this, CUI_RES( SB_SCROLL ) )
+        ,m_aNewPB				( this, CUI_RES( PB_HHE_NEW ) )
+        ,m_aDeletePB			( this, CUI_RES( PB_HHE_DELETE ) )
+        ,m_aHelpPB				( this, CUI_RES( PB_HHE_HELP ) )
+        ,m_aClosePB				( this, CUI_RES( PB_HHE_CLOSE ) )
+        ,m_nTopPos				( 0 )
         ,m_bModifiedSuggestions ( false )
         ,m_bModifiedOriginal    ( false )
     {
@@ -1859,12 +1859,12 @@ namespace svx
         #error number of suggestions should not under-run the value of 5
     #endif
 
-        Link    aScrLk( LINK( this, HangulHanjaEditDictDialog, ScrollHdl ) );
+        Link	aScrLk( LINK( this, HangulHanjaEditDictDialog, ScrollHdl ) );
         m_aScrollSB.SetScrollHdl( aScrLk );
         m_aScrollSB.SetEndScrollHdl( aScrLk );
         m_aScrollSB.SetRangeMin( 0 );
         m_aScrollSB.SetRangeMax( MAXNUM_SUGGESTIONS );
-        m_aScrollSB.SetPageSize( 4 );       // because we have 4 edits / page
+        m_aScrollSB.SetPageSize( 4 );		// because we have 4 edits / page
         m_aScrollSB.SetVisibleSize( 4 );
 
         m_aEdit1.SetModifyHdl( LINK( this, HangulHanjaEditDictDialog, EditModifyHdl1 ) );
@@ -1873,10 +1873,10 @@ namespace svx
         m_aEdit4.SetModifyHdl( LINK( this, HangulHanjaEditDictDialog, EditModifyHdl4 ) );
 
         m_aBookLB.SetSelectHdl( LINK( this, HangulHanjaEditDictDialog, BookLBSelectHdl ) );
-        sal_uInt32  nDictCnt = m_rDictList.size();
+        sal_uInt32	nDictCnt = m_rDictList.size();
         for( sal_uInt32 n = 0 ; n < nDictCnt ; ++n )
         {
-            Reference< XConversionDictionary >  xDic( m_rDictList[n] );
+            Reference< XConversionDictionary >	xDic( m_rDictList[n] );
             String aName;
             if(xDic.is())
                 aName = xDic->getName();
@@ -1897,7 +1897,7 @@ namespace svx
 
     void HangulHanjaEditDictDialog::UpdateScrollbar( void )
     {
-        sal_uInt16  nPos = sal_uInt16( m_aScrollSB.GetThumbPos() );
+        sal_uInt16	nPos = sal_uInt16( m_aScrollSB.GetThumbPos() );
         m_nTopPos = nPos;
 
         SetEditText( m_aEdit1, nPos++ );
@@ -1907,7 +1907,7 @@ namespace svx
     }
 
 //.............................................................................
-}   // namespace svx
+}	// namespace svx
 //.............................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/hangulhanjadlg.hrc b/cui/source/dialogs/hangulhanjadlg.hrc
index 817e3a17264a..d8ad70b21af0 100644
--- a/cui/source/dialogs/hangulhanjadlg.hrc
+++ b/cui/source/dialogs/hangulhanjadlg.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,33 +32,33 @@
 #endif
 
 // PushButton
-#define PB_FIND         1
+#define PB_FIND			1
 
 // Control
-#define CTL_SUGGESTIONS 1
+#define CTL_SUGGESTIONS	1
 
 // FixedText
-#define FT_FORMAT           1
-#define FT_RESIZE_ANCHOR    2
-#define FT_CONVERSION       3
+#define FT_FORMAT			1
+#define FT_RESIZE_ANCHOR	2
+#define FT_CONVERSION		3
 
 // RadioButton
-#define RB_SIMPLE_CONVERSION        1
-#define RB_HANJA_HANGUL_BRACKETED   2
-#define RB_HANGUL_HANJA_BRACKETED   3
-#define RB_HANGUL_HANJA_ABOVE       4
-#define RB_HANGUL_HANJA_BELOW       5
-#define RB_HANJA_HANGUL_ABOVE       6
-#define RB_HANJA_HANGUL_BELOW       7
+#define RB_SIMPLE_CONVERSION		1
+#define RB_HANJA_HANGUL_BRACKETED	2
+#define RB_HANGUL_HANJA_BRACKETED	3
+#define RB_HANGUL_HANJA_ABOVE		4
+#define RB_HANGUL_HANJA_BELOW		5
+#define RB_HANJA_HANGUL_ABOVE		6
+#define RB_HANJA_HANGUL_BELOW		7
 
 // CheckBox
-#define CB_REPLACE_BY_CHARACTER     1
-#define CB_HANGUL_ONLY              2
-#define CB_HANJA_ONLY               3
+#define CB_REPLACE_BY_CHARACTER		1
+#define CB_HANGUL_ONLY				2
+#define CB_HANJA_ONLY				3
 
 // String
-#define STR_HANGUL                  1
-#define STR_HANJA                   2
+#define STR_HANGUL					1
+#define STR_HANJA					2
 
 #define FT_WORD                     10
 #define FT_AKTWORD                  11
@@ -78,120 +78,120 @@
 
 // Hangul / Hanja Options Dialog
 
-#define FT_USERDEFDICT              1
-#define FL_OPTIONS                  2
+#define	FT_USERDEFDICT				1
+#define	FL_OPTIONS					2
 #define BTN_OPTIONS                 10
 
-#define LB_DICTS                    1
+#define	LB_DICTS					1
 
-#define CB_IGNOREPOST               1
-#define CB_SHOWRECENTLYFIRST        3
-#define CB_AUTOREPLACEUNIQUE        4
+#define CB_IGNOREPOST				1
+#define	CB_SHOWRECENTLYFIRST		3
+#define CB_AUTOREPLACEUNIQUE		4
 
-#define PB_HHO_NEW                  1
-#define PB_HHO_EDIT                 2
-#define PB_HHO_DELETE               3
-#define PB_HHO_OK                   4
-#define PB_HHO_CANCEL               5
-#define PB_HHO_HELP                 6
+#define	PB_HHO_NEW					1
+#define PB_HHO_EDIT					2
+#define	PB_HHO_DELETE				3
+#define	PB_HHO_OK					4
+#define	PB_HHO_CANCEL				5
+#define	PB_HHO_HELP					6
 
 // metrics
 
-#define HHO_DLGWIDTH                287
-#define HHx_DLGHIGHT                175
-#define HHO_COL_1                   RSC_SP_DLG_INNERBORDER_LEFT
-#define HHO_COL_1a                  (HHO_COL_1+3)
-#define HHO_COL_6                   (HHO_DLGWIDTH-6)
-#define HHO_COL_5                   (HHO_COL_6-50)
-#define HHO_COL_4                   (HHO_COL_5-12)
-#define HHO_COL_3                   (HHO_COL_4-50)
-#define HHO_COL_2                   (HHO_COL_3-6)
-
-#define HHO_ROW_1                   RSC_SP_DLG_INNERBORDER_TOP
-#define HHO_ROW_2                   (HHO_ROW_1+8+2)
-#define HHO_ROW_3                   (HHO_ROW_2+14)
-#define HHO_ROW_4                   (HHO_ROW_3+2)
-#define HHO_ROW_5                   (HHO_ROW_4+14)
-#define HHO_ROW_6                   (HHO_ROW_5+2)
-#define HHO_ROW_7                   (HHO_ROW_6+14)
-#define HHO_ROW_8                   (HHO_ROW_7+4)
-#define HHO_ROW_9                   (HHO_ROW_8+8+4)
-#define HHO_ROW_11                  (HHO_ROW_9+8+4)
-#define HHO_ROW_12                  (HHO_ROW_11+8+4)
-
-#define HHO_ROW_a1                  HHO_ROW_1
-#define HHO_ROW_a2                  (HHO_ROW_a1+14)
-#define HHO_ROW_a3                  (HHO_ROW_a2+2)
-#define HHO_ROW_a4                  (HHO_ROW_a3+14)
-#define HHO_ROW_a5                  (HHO_ROW_a4+4)
-#define HHO_ROW_a6                  (HHO_ROW_a5+14)
+#define	HHO_DLGWIDTH				287
+#define HHx_DLGHIGHT				175
+#define HHO_COL_1					RSC_SP_DLG_INNERBORDER_LEFT
+#define HHO_COL_1a					(HHO_COL_1+3)
+#define HHO_COL_6					(HHO_DLGWIDTH-6)
+#define HHO_COL_5					(HHO_COL_6-50)
+#define HHO_COL_4					(HHO_COL_5-12)
+#define HHO_COL_3					(HHO_COL_4-50)
+#define HHO_COL_2					(HHO_COL_3-6)
+
+#define HHO_ROW_1					RSC_SP_DLG_INNERBORDER_TOP
+#define HHO_ROW_2					(HHO_ROW_1+8+2)
+#define HHO_ROW_3					(HHO_ROW_2+14)
+#define HHO_ROW_4					(HHO_ROW_3+2)
+#define HHO_ROW_5					(HHO_ROW_4+14)
+#define HHO_ROW_6					(HHO_ROW_5+2)
+#define HHO_ROW_7					(HHO_ROW_6+14)
+#define HHO_ROW_8					(HHO_ROW_7+4)
+#define HHO_ROW_9					(HHO_ROW_8+8+4)
+#define HHO_ROW_11					(HHO_ROW_9+8+4)
+#define HHO_ROW_12					(HHO_ROW_11+8+4)
+
+#define	HHO_ROW_a1					HHO_ROW_1
+#define	HHO_ROW_a2					(HHO_ROW_a1+14)
+#define	HHO_ROW_a3					(HHO_ROW_a2+2)
+#define	HHO_ROW_a4					(HHO_ROW_a3+14)
+#define	HHO_ROW_a5					(HHO_ROW_a4+4)
+#define	HHO_ROW_a6					(HHO_ROW_a5+14)
 
 
 // Hangul / Hanja New Dictonary Dialog
-#define FL_NEWDICT                  1
+#define FL_NEWDICT					1
 
-#define FT_DICTNAME                 1
+#define FT_DICTNAME					1
 
-#define ED_DICTNAME                 1
+#define ED_DICTNAME					1
 
-#define PB_NEWDICT_OK               1
-#define PB_NEWDICT_ESC              2
-#define PB_NEWDICT_HLP              3
+#define PB_NEWDICT_OK				1
+#define PB_NEWDICT_ESC				2
+#define PB_NEWDICT_HLP				3
 
 
 // Hangul Hanja Edit Custom Dictionary Dialog
-#define MAXNUM_SUGGESTIONS          50
+#define MAXNUM_SUGGESTIONS			50
 
-#define STR_EDITHINT                1
+#define STR_EDITHINT				1
 
-#define FT_BOOK                     1
-#define FT_ORIGINAL                 2
-#define FT_SUGGESTIONS              3
+#define	FT_BOOK						1
+#define	FT_ORIGINAL					2
+#define	FT_SUGGESTIONS				3
 
-#define LB_BOOK                     1
-#define LB_ORIGINAL                 2
+#define LB_BOOK						1
+#define	LB_ORIGINAL					2
 
-#define PB_HHE_NEW                  1
-#define PB_HHE_DELETE               2
-#define PB_HHE_HELP                 3
-#define PB_HHE_CLOSE                4
+#define	PB_HHE_NEW					1
+#define	PB_HHE_DELETE				2
+#define PB_HHE_HELP					3
+#define	PB_HHE_CLOSE				4
 
-#define SB_SCROLL                   1
+#define	SB_SCROLL					1
 
-#define ED_1                        1
-#define ED_2                        2
-#define ED_3                        3
-#define ED_4                        4
+#define ED_1						1
+#define ED_2						2
+#define ED_3						3
+#define ED_4						4
 
 // metrics
 
-#define RSC_CD_VSCRLWIDTH           8       // vertical scroll bar width
-#define HHE_DLGWIDTH                HHO_DLGWIDTH
-#define HHE_COL_1                   RSC_SP_DLG_INNERBORDER_LEFT
-#define HHE_COL_6                   (HHE_DLGWIDTH-RSC_SP_DLG_INNERBORDER_RIGHT)
-#define HHE_COL_5                   (HHE_COL_6-RSC_CD_PUSHBUTTON_WIDTH)
-#define HHE_COL_4                   (HHE_COL_5-6)
-#define HHE_COL_3_2                 (HHE_COL_4-RSC_CD_VSCRLWIDTH)
-#define HHE_COL_3_1                 (HHE_COL_3_2-RSC_SP_CTRL_GROUP_X)
-#define HHE_COL_3_0                 (HHE_COL_3_2-RSC_CD_PUSHBUTTON_WIDTH)
-#define HHE_COL_2                   (HHE_COL_1+50)
-#define HHE_COL_3                   (HHE_COL_2+1)
-
-#define HHE_ROW_1                   RSC_SP_DLG_INNERBORDER_TOP
-#define HHE_ROW_2                   (HHE_ROW_1+2)
-#define HHE_ROW_3                   (HHE_ROW_2+12)
-#define HHE_ROW_4                   (HHE_ROW_3+12)
-#define HHE_ROW_5                   (HHE_ROW_4+8+2)
-#define HHE_ROW_6                   (HHE_ROW_5+12)
-#define HHE_ROW_7                   (HHE_ROW_6+2)
-#define HHE_ROW_8                   (HHE_ROW_7+2)
-#define HHE_ROW_9                   (HHE_ROW_6+12)
-#define HHE_ROW_10                  (HHE_ROW_8+RSC_SP_CTRL_GROUP_Y)
-#define HHE_ROW_11                  (HHE_ROW_10+8+2)
-#define HHE_ROW_12                  (HHE_ROW_11+4*12)
-#define HHE_ROW_14                  (HHx_DLGHIGHT-RSC_SP_DLG_INNERBORDER_BOTTOM)
-#define HHE_ROW_13                  (HHE_ROW_14-RSC_CD_PUSHBUTTON_HEIGHT)
-#define HHE_ROW_a1                  (HHE_ROW_5)
-#define HHE_ROW_a3                  (HHE_ROW_a1+RSC_CD_PUSHBUTTON_HEIGHT+2)
+#define RSC_CD_VSCRLWIDTH			8		// vertical scroll bar width
+#define	HHE_DLGWIDTH				HHO_DLGWIDTH
+#define HHE_COL_1					RSC_SP_DLG_INNERBORDER_LEFT
+#define HHE_COL_6					(HHE_DLGWIDTH-RSC_SP_DLG_INNERBORDER_RIGHT)
+#define HHE_COL_5					(HHE_COL_6-RSC_CD_PUSHBUTTON_WIDTH)
+#define HHE_COL_4					(HHE_COL_5-6)
+#define HHE_COL_3_2					(HHE_COL_4-RSC_CD_VSCRLWIDTH)
+#define HHE_COL_3_1					(HHE_COL_3_2-RSC_SP_CTRL_GROUP_X)
+#define HHE_COL_3_0					(HHE_COL_3_2-RSC_CD_PUSHBUTTON_WIDTH)
+#define HHE_COL_2					(HHE_COL_1+50)
+#define HHE_COL_3					(HHE_COL_2+1)
+
+#define HHE_ROW_1					RSC_SP_DLG_INNERBORDER_TOP
+#define HHE_ROW_2					(HHE_ROW_1+2)
+#define HHE_ROW_3					(HHE_ROW_2+12)
+#define HHE_ROW_4					(HHE_ROW_3+12)
+#define HHE_ROW_5					(HHE_ROW_4+8+2)
+#define HHE_ROW_6					(HHE_ROW_5+12)
+#define HHE_ROW_7					(HHE_ROW_6+2)
+#define HHE_ROW_8					(HHE_ROW_7+2)
+#define HHE_ROW_9					(HHE_ROW_6+12)
+#define HHE_ROW_10					(HHE_ROW_8+RSC_SP_CTRL_GROUP_Y)
+#define HHE_ROW_11					(HHE_ROW_10+8+2)
+#define HHE_ROW_12					(HHE_ROW_11+4*12)
+#define HHE_ROW_14					(HHx_DLGHIGHT-RSC_SP_DLG_INNERBORDER_BOTTOM)
+#define HHE_ROW_13					(HHE_ROW_14-RSC_CD_PUSHBUTTON_HEIGHT)
+#define HHE_ROW_a1					(HHE_ROW_5)
+#define HHE_ROW_a3					(HHE_ROW_a1+RSC_CD_PUSHBUTTON_HEIGHT+2)
 
 #endif // SVX_HANGUL_HANJA_DLG_HRC
diff --git a/cui/source/dialogs/hangulhanjadlg.src b/cui/source/dialogs/hangulhanjadlg.src
index 11e2fe415c38..46f52601f0e9 100644
--- a/cui/source/dialogs/hangulhanjadlg.src
+++ b/cui/source/dialogs/hangulhanjadlg.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -189,7 +189,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_OPT
     Text [ en-US ] = "Hangul/Hanja Options" ;
     Moveable = TRUE ;
     Closeable = TRUE ;
-
+    
     FixedText FT_USERDEFDICT
     {
         Pos = MAP_APPFONT ( HHO_COL_1 , HHO_ROW_1 ) ;
@@ -327,7 +327,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT
     Text [ en-US ] = "Edit Custom Dictionary" ;
     Moveable = TRUE ;
     Closeable = TRUE ;
-
+    
     String STR_EDITHINT
     {
         Text [ en-US ] = "[Enter text here]";
@@ -395,7 +395,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT
     ScrollBar SB_SCROLL
     {
         Pos = MAP_APPFONT ( HHE_COL_3_2 , HHE_ROW_11 ) ;
-        Size = MAP_APPFONT ( RSC_CD_VSCRLWIDTH , HHE_ROW_12 - HHE_ROW_11 ) ;    // height = 48
+        Size = MAP_APPFONT ( RSC_CD_VSCRLWIDTH , HHE_ROW_12 - HHE_ROW_11 ) ;	// height = 48
         VScroll = TRUE ;
         Drag = TRUE ;
     };
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index db9ab3647e41..b47d675ff67b 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,15 +113,15 @@ sal_Bool SvxHyperlinkNewDocTp::ImplGetURLObject( const String& rPath, const Stri
 |************************************************************************/
 
 SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( Window *pParent, const SfxItemSet& rItemSet)
-:   SvxHyperlinkTabPageBase ( pParent, CUI_RES( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT ), rItemSet ),
-    maGrpNewDoc     ( this, CUI_RES (GRP_NEWDOCUMENT) ),
-    maRbtEditNow    ( this, CUI_RES (RB_EDITNOW) ),
-    maRbtEditLater  ( this, CUI_RES (RB_EDITLATER) ),
-    maFtPath        ( this, CUI_RES (FT_PATH_NEWDOC) ),
-    maCbbPath       ( this, INET_PROT_FILE ),
-    maBtCreate      ( this, CUI_RES (BTN_CREATE) ),
-    maFtDocTypes    ( this, CUI_RES (FT_DOCUMENT_TYPES) ),
-    maLbDocTypes    ( this, CUI_RES (LB_DOCUMENT_TYPES) )
+:	SvxHyperlinkTabPageBase ( pParent, CUI_RES( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT ), rItemSet ),
+    maGrpNewDoc		( this, CUI_RES (GRP_NEWDOCUMENT) ),
+    maRbtEditNow	( this, CUI_RES (RB_EDITNOW) ),
+    maRbtEditLater	( this, CUI_RES (RB_EDITLATER) ),
+    maFtPath		( this, CUI_RES (FT_PATH_NEWDOC) ),
+    maCbbPath		( this, INET_PROT_FILE ),
+    maBtCreate		( this, CUI_RES (BTN_CREATE) ),
+    maFtDocTypes	( this, CUI_RES (FT_DOCUMENT_TYPES) ),
+    maLbDocTypes	( this, CUI_RES (LB_DOCUMENT_TYPES) )
 {
     // Set HC bitmaps and disable display of bitmap names.
     maBtCreate.SetModeImage( Image( CUI_RES( IMG_CREATE_HC ) ), BMP_COLOR_HIGHCONTRAST );
@@ -136,12 +136,12 @@ SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( Window *pParent, const SfxItemSet&
                                 LogicToPixel( Size ( 176 - COL_DIFF, 60), MAP_APPFONT ) );
     maCbbPath.Show();
     maCbbPath.SetBaseURL(SvtPathOptions().GetWorkPath());
-//  maCbbPath.SetHelpId( HID_HYPERDLG_DOC_PATH );
+//	maCbbPath.SetHelpId( HID_HYPERDLG_DOC_PATH );
 
     // set defaults
     maRbtEditNow.Check();
 
-    maBtCreate.SetClickHdl        ( LINK ( this, SvxHyperlinkNewDocTp, ClickNewHdl_Impl ) );
+    maBtCreate.SetClickHdl		  ( LINK ( this, SvxHyperlinkNewDocTp, ClickNewHdl_Impl ) );
 
     FillDocumentList ();
 }
@@ -172,7 +172,7 @@ void SvxHyperlinkNewDocTp::FillDlgFields ( String& /*aStrURL*/ )
 #define INTERNETSHORTCUT_TARGET_TAG   "Target"
 #define INTERNETSHORTCUT_FOLDER_TAG   "Folder"
 #define INTERNETSHORTCUT_URL_TAG      "URL"
-#define INTERNETSHORTCUT_ICONID_TAG   "IconIndex"
+#define INTERNETSHORTCUT_ICONID_TAG	  "IconIndex"
 
 void SvxHyperlinkNewDocTp::ReadURLFile( const String& rFile, String& rTitle, String& rURL, sal_Int32& rIconId, BOOL* pShowAsFolder )
 {
@@ -239,8 +239,8 @@ void SvxHyperlinkNewDocTp::FillDocumentList ()
         // Insert into listbox
         if ( aDocumentUrl.getLength() )
         {
-            if ( aDocumentUrl.equalsAscii( "private:factory/simpress?slot=6686" ) )             // SJ: #106216# do not start
-                aDocumentUrl = String( RTL_CONSTASCII_USTRINGPARAM( "private:factory/simpress" ) ); // the AutoPilot for impress
+            if ( aDocumentUrl.equalsAscii( "private:factory/simpress?slot=6686" ) )				// SJ: #106216# do not start
+                aDocumentUrl = String( RTL_CONSTASCII_USTRINGPARAM( "private:factory/simpress" ) );	// the AutoPilot for impress
 
             // insert private-url and default-extension as user-data
             const SfxFilter* pFilter = SfxFilter::GetDefaultFilterFromFactory( aDocumentUrl );
@@ -407,8 +407,8 @@ void SvxHyperlinkNewDocTp::DoApply ()
                                                                            &aFrame, &aReferer, 0L );
 
                     // save new doc
-                    const SfxViewFrameItem *pItem = PTR_CAST( SfxViewFrameItem, pReturn );  // SJ: pReturn is NULL if the Hyperlink
-                    if ( pItem )                                                            // creation is cancelled #106216#
+                    const SfxViewFrameItem *pItem = PTR_CAST( SfxViewFrameItem, pReturn );	// SJ: pReturn is NULL if the Hyperlink
+                    if ( pItem )															// creation is cancelled #106216#
                     {
                         pViewFrame = pItem->GetFrame();
                         if (pViewFrame)
@@ -452,18 +452,18 @@ void SvxHyperlinkNewDocTp::DoApply ()
 
 IMPL_LINK ( SvxHyperlinkNewDocTp, ClickNewHdl_Impl, void *, EMPTYARG )
 {
-    rtl::OUString                       aService( RTL_CONSTASCII_USTRINGPARAM( FOLDER_PICKER_SERVICE_NAME ) );
-    uno::Reference < XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
-    uno::Reference < XFolderPicker >            xFolderPicker( xFactory->createInstance( aService ), UNO_QUERY );
+    rtl::OUString						aService( RTL_CONSTASCII_USTRINGPARAM( FOLDER_PICKER_SERVICE_NAME ) );
+    uno::Reference < XMultiServiceFactory >	xFactory( ::comphelper::getProcessServiceFactory() );
+    uno::Reference < XFolderPicker >			xFolderPicker( xFactory->createInstance( aService ), UNO_QUERY );
 
-    String              aStrURL;
-    String              aTempStrURL( maCbbPath.GetText() );
+    String				aStrURL;
+    String				aTempStrURL( maCbbPath.GetText() );
     utl::LocalFileHelper::ConvertSystemPathToURL( aTempStrURL, maCbbPath.GetBaseURL(), aStrURL );
 
-    String              aStrPath = aStrURL;
-    BOOL                bZeroPath = ( aStrPath.Len() == 0 );
-    BOOL                bHandleFileName = bZeroPath;    // when path has length of 0, then the rest should always be handled
-                                                        //  as file name, otherwise we do not yet know
+    String				aStrPath = aStrURL;
+    BOOL				bZeroPath = ( aStrPath.Len() == 0 );
+    BOOL				bHandleFileName = bZeroPath;	// when path has length of 0, then the rest should always be handled
+                                                        //	as file name, otherwise we do not yet know
 
     if( bZeroPath )
         aStrPath = SvtPathOptions().GetWorkPath();
@@ -476,15 +476,15 @@ IMPL_LINK ( SvxHyperlinkNewDocTp, ClickNewHdl_Impl, void *, EMPTYARG )
     DisableClose( sal_False );
     if( ExecutableDialogResults::OK == nResult )
     {
-        sal_Char const  sSlash[] = "/";
+        sal_Char const	sSlash[] = "/";
 
-        INetURLObject   aURL( aStrURL, INET_PROT_FILE );
-        String          aStrName;
+        INetURLObject	aURL( aStrURL, INET_PROT_FILE );
+        String			aStrName;
         if( bHandleFileName )
             aStrName = bZeroPath? aTempStrURL : String(aURL.getName());
 
         maCbbPath.SetBaseURL( xFolderPicker->getDirectory() );
-        String          aStrTmp( xFolderPicker->getDirectory() );
+        String			aStrTmp( xFolderPicker->getDirectory() );
 
         if( aStrTmp.GetChar( aStrTmp.Len() - 1 ) != sSlash[0] )
             aStrTmp.AppendAscii( sSlash );
@@ -493,7 +493,7 @@ IMPL_LINK ( SvxHyperlinkNewDocTp, ClickNewHdl_Impl, void *, EMPTYARG )
         if( bHandleFileName )
             aStrTmp += aStrName;
 
-        INetURLObject   aNewURL( aStrTmp );
+        INetURLObject	aNewURL( aStrTmp );
 
         if( aStrName.Len() > 0 && aNewURL.getExtension().getLength() > 0 &&
             maLbDocTypes.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND )
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index 095e959cdca6..85298cac627b 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include "hyperdlg.hrc"
 #include "hlmarkwn_def.hxx"
 
-sal_Char __READONLY_DATA sHash[]                = "#";
-sal_Char __READONLY_DATA sFileScheme[]          = INET_FILE_SCHEME;
+sal_Char __READONLY_DATA sHash[]				= "#";
+sal_Char __READONLY_DATA sFileScheme[]			= INET_FILE_SCHEME;
 sal_Char __READONLY_DATA sNewsSRVScheme[] = "news://";
     // TODO news:// is nonsense
 sal_Char __READONLY_DATA sHTTPScheme[]    = INET_HTTP_SCHEME;
@@ -53,15 +53,15 @@ sal_Char __READONLY_DATA sHTTPScheme[]    = INET_HTTP_SCHEME;
 SvxHyperlinkDocTp::SvxHyperlinkDocTp ( Window *pParent, const SfxItemSet& rItemSet)
     : SvxHyperlinkTabPageBase ( pParent, CUI_RES( RID_SVXPAGE_HYPERLINK_DOCUMENT ), rItemSet ),
     maGrpDocument   ( this, CUI_RES (GRP_DOCUMENT) ),
-    maFtPath        ( this, CUI_RES (FT_PATH_DOC) ),
-    maCbbPath       ( this, INET_PROT_FILE ),
-    maBtFileopen    ( this, CUI_RES (BTN_FILEOPEN) ),
-    maGrpTarget     ( this, CUI_RES (GRP_TARGET) ),
-    maFtTarget      ( this, CUI_RES (FT_TARGET_DOC) ),
-    maEdTarget      ( this, CUI_RES (ED_TARGET_DOC) ),
-    maFtURL         ( this, CUI_RES (FT_URL) ),
-    maFtFullURL     ( this, CUI_RES (FT_FULL_URL) ),
-    maBtBrowse      ( this, CUI_RES (BTN_BROWSE) ),
+    maFtPath		( this, CUI_RES (FT_PATH_DOC) ),
+    maCbbPath		( this, INET_PROT_FILE ),
+    maBtFileopen	( this, CUI_RES (BTN_FILEOPEN) ),
+    maGrpTarget		( this, CUI_RES (GRP_TARGET) ),
+    maFtTarget		( this, CUI_RES (FT_TARGET_DOC) ),
+    maEdTarget		( this, CUI_RES (ED_TARGET_DOC) ),
+    maFtURL			( this, CUI_RES (FT_URL) ),
+    maFtFullURL		( this, CUI_RES (FT_FULL_URL) ),
+    maBtBrowse		( this, CUI_RES (BTN_BROWSE) ),
     mbMarkWndOpen   ( FALSE )
 {
     // Set HC bitmaps and disable display of bitmap names.
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index f0d3cf1878e8..0fb46b07dc01 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 "hyperdlg.hrc"
 #include "hlmarkwn_def.hxx"
 
-#define STD_DOC_SUBPATH     "internal"
-#define STD_DOC_NAME        "url_transfer.htm"
+#define STD_DOC_SUBPATH		"internal"
+#define STD_DOC_NAME		"url_transfer.htm"
 
 sal_Char __READONLY_DATA sAnonymous[]    = "anonymous";
 sal_Char __READONLY_DATA sHTTPScheme[]   = INET_HTTP_SCHEME;
@@ -57,18 +57,18 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent,
 :   SvxHyperlinkTabPageBase ( pParent, CUI_RES( RID_SVXPAGE_HYPERLINK_INTERNET ),
                               rItemSet ) ,
     maGrpLinkTyp           ( this, CUI_RES (GRP_LINKTYPE) ),
-    maRbtLinktypInternet    ( this, CUI_RES (RB_LINKTYP_INTERNET) ),
-    maRbtLinktypFTP         ( this, CUI_RES (RB_LINKTYP_FTP) ),
-    maRbtLinktypTelnet      ( this, CUI_RES (RB_LINKTYP_TELNET) ),
-    maFtTarget              ( this, CUI_RES (FT_TARGET_HTML) ),
-    maCbbTarget             ( this, INET_PROT_HTTP ),
-    maFtLogin               ( this, CUI_RES (FT_LOGIN) ),
-    maEdLogin               ( this, CUI_RES (ED_LOGIN) ),
-    maFtPassword            ( this, CUI_RES (FT_PASSWD) ),
-    maEdPassword            ( this, CUI_RES (ED_PASSWD) ),
-    maCbAnonymous           ( this, CUI_RES (CBX_ANONYMOUS) ),
-    maBtBrowse              ( this, CUI_RES (BTN_BROWSE) ),
-    maBtTarget              ( this, CUI_RES (BTN_TARGET) ),
+    maRbtLinktypInternet	( this, CUI_RES (RB_LINKTYP_INTERNET) ),
+    maRbtLinktypFTP			( this, CUI_RES (RB_LINKTYP_FTP) ),
+    maRbtLinktypTelnet		( this, CUI_RES (RB_LINKTYP_TELNET) ),
+    maFtTarget				( this, CUI_RES (FT_TARGET_HTML) ),
+    maCbbTarget				( this, INET_PROT_HTTP ),
+    maFtLogin				( this, CUI_RES (FT_LOGIN) ),
+    maEdLogin				( this, CUI_RES (ED_LOGIN) ),
+    maFtPassword			( this, CUI_RES (FT_PASSWD) ),
+    maEdPassword			( this, CUI_RES (ED_PASSWD) ),
+    maCbAnonymous			( this, CUI_RES (CBX_ANONYMOUS) ),
+    maBtBrowse				( this, CUI_RES (BTN_BROWSE) ),
+    maBtTarget				( this, CUI_RES (BTN_TARGET) ),
     mbMarkWndOpen           ( FALSE )
 {
     // Set HC bitmaps and display display of bitmap names.
@@ -121,10 +121,10 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent,
     maCbAnonymous.SetClickHdl       ( LINK ( this, SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl ) );
     maBtBrowse.SetClickHdl          ( LINK ( this, SvxHyperlinkInternetTp, ClickBrowseHdl_Impl ) );
     maBtTarget.SetClickHdl          ( LINK ( this, SvxHyperlinkInternetTp, ClickTargetHdl_Impl ) );
-    maEdLogin.SetModifyHdl          ( LINK ( this, SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl ) );
-    maCbbTarget.SetLoseFocusHdl     ( LINK ( this, SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl ) );
-    maCbbTarget.SetModifyHdl        ( LINK ( this, SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl ) );
-    maTimer.SetTimeoutHdl           ( LINK ( this, SvxHyperlinkInternetTp, TimeoutHdl_Impl ) );
+    maEdLogin.SetModifyHdl			( LINK ( this, SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl ) );
+    maCbbTarget.SetLoseFocusHdl		( LINK ( this, SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl ) );
+    maCbbTarget.SetModifyHdl		( LINK ( this, SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl ) );
+    maTimer.SetTimeoutHdl			( LINK ( this, SvxHyperlinkInternetTp, TimeoutHdl_Impl ) );
 }
 
 SvxHyperlinkInternetTp::~SvxHyperlinkInternetTp ()
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index b7d26c2cb378..034e19e4a4b7 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,10 +55,10 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( Window *pParent, const SfxItemSet& rIte
 :   SvxHyperlinkTabPageBase ( pParent, CUI_RES( RID_SVXPAGE_HYPERLINK_MAIL ),
                               rItemSet ),
     maGrpMailNews   ( this, CUI_RES (GRP_MAILNEWS) ),
-    maRbtMail       ( this, CUI_RES (RB_LINKTYP_MAIL) ),
-    maRbtNews       ( this, CUI_RES (RB_LINKTYP_NEWS) ),
-    maFtReceiver    ( this, CUI_RES (FT_RECEIVER) ),
-    maCbbReceiver   ( this, INET_PROT_MAILTO ),
+    maRbtMail		( this, CUI_RES (RB_LINKTYP_MAIL) ),
+    maRbtNews		( this, CUI_RES (RB_LINKTYP_NEWS) ),
+    maFtReceiver	( this, CUI_RES (FT_RECEIVER) ),
+    maCbbReceiver	( this, INET_PROT_MAILTO ),
     maBtAdrBook     ( this, CUI_RES (BTN_ADRESSBOOK) ),
     maFtSubject     ( this, CUI_RES (FT_SUBJECT) ),
     maEdSubject     ( this, CUI_RES (ED_SUBJECT) )
@@ -83,10 +83,10 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( Window *pParent, const SfxItemSet& rIte
     maRbtMail.Check ();
 
     // overload handlers
-    maRbtMail.SetClickHdl        ( LINK ( this, SvxHyperlinkMailTp, Click_SmartProtocol_Impl ) );
-    maRbtNews.SetClickHdl        ( LINK ( this, SvxHyperlinkMailTp, Click_SmartProtocol_Impl ) );
-    maBtAdrBook.SetClickHdl      ( LINK ( this, SvxHyperlinkMailTp, ClickAdrBookHdl_Impl ) );
-    maCbbReceiver.SetModifyHdl   ( LINK ( this, SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl) );
+    maRbtMail.SetClickHdl		 ( LINK ( this, SvxHyperlinkMailTp, Click_SmartProtocol_Impl ) );
+    maRbtNews.SetClickHdl		 ( LINK ( this, SvxHyperlinkMailTp, Click_SmartProtocol_Impl ) );
+    maBtAdrBook.SetClickHdl		 ( LINK ( this, SvxHyperlinkMailTp, ClickAdrBookHdl_Impl ) );
+    maCbbReceiver.SetModifyHdl	 ( LINK ( this, SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl) );
 
     if ( !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::E_SDATABASE ) )
         maBtAdrBook.Hide();
@@ -311,7 +311,7 @@ IMPL_LINK ( SvxHyperlinkMailTp, ClickAdrBookHdl_Impl, void *, EMPTYARG )
     }
 
 
-/*  uno::Reference< frame::XDispatchProvider > xProv( pViewFrame->GetFrame().GetFrameInterface(), uno::UNO_QUERY );
+/*	uno::Reference< frame::XDispatchProvider > xProv( pViewFrame->GetFrame().GetFrameInterface(), uno::UNO_QUERY );
     if ( xProv.is() )
     {
 !!! (pb) we need a new config item here
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 99b18e053783..30a6a9f959c0 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,11 +63,11 @@ using namespace ::rtl;
 
 struct TargetData
 {
-    OUString        aUStrLinkname;
-    BOOL        bIsTarget;
+    OUString		aUStrLinkname;
+    BOOL		bIsTarget;
 
     TargetData ( OUString aUStrLName, BOOL bTarget )
-        :   bIsTarget ( bTarget )
+        :	bIsTarget ( bTarget )
     {
         if ( bIsTarget )
             aUStrLinkname = aUStrLName;
@@ -77,13 +77,13 @@ struct TargetData
 
 //########################################################################
 //#                                                                      #
-//# Tree-Window                                                          #
+//# Tree-Window 														 #
 //#                                                                      #
 //########################################################################
 
 SvxHlmarkTreeLBox::SvxHlmarkTreeLBox( Window* pParent, const ResId& rResId )
-: SvTreeListBox ( pParent, rResId ),
-  mpParentWnd   ( (SvxHlinkDlgMarkWnd*) pParent )
+: SvTreeListBox	( pParent, rResId ),
+  mpParentWnd	( (SvxHlinkDlgMarkWnd*) pParent )
 {
     SetNodeDefaultImages();
 }
@@ -119,7 +119,7 @@ void SvxHlmarkTreeLBox::Paint( const Rectangle& rRect )
 
 //########################################################################
 //#                                                                      #
-//# Window-Class                                                         #
+//# Window-Class														 #
 //#                                                                      #
 //########################################################################
 
@@ -130,20 +130,20 @@ void SvxHlmarkTreeLBox::Paint( const Rectangle& rRect )
 |************************************************************************/
 
 SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd( SvxHyperlinkTabPageBase *pParent )
-:   ModalDialog( (Window*)pParent, CUI_RES ( RID_SVXFLOAT_HYPERLINK_MARKWND ) ),
+:	ModalDialog( (Window*)pParent, CUI_RES ( RID_SVXFLOAT_HYPERLINK_MARKWND ) ),
     maBtApply( this, CUI_RES (BT_APPLY) ),
     maBtClose( this, CUI_RES (BT_CLOSE) ),
     maLbTree ( this, CUI_RES (TLB_MARK) ),
     mbUserMoved ( FALSE ),
-    mbFirst     ( TRUE ),
-    mpParent    ( pParent ),
-    mnError     ( LERR_NOERROR )
+    mbFirst	    ( TRUE ),
+    mpParent	( pParent ),
+    mnError		( LERR_NOERROR )
 {
     FreeResource();
 
-    maBtApply.SetClickHdl       ( LINK ( this, SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl ) );
-    maBtClose.SetClickHdl       ( LINK ( this, SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl ) );
-    maLbTree.SetDoubleClickHdl  ( LINK ( this, SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl ) );
+    maBtApply.SetClickHdl		( LINK ( this, SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl ) );
+    maBtClose.SetClickHdl		( LINK ( this, SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl ) );
+    maLbTree.SetDoubleClickHdl	( LINK ( this, SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl ) );
 
     // Tree-ListBox mit Linien versehen
     maLbTree.SetWindowBits( WinBits( WB_TABSTOP | WB_BORDER | WB_HASLINES |
diff --git a/cui/source/dialogs/hlmarkwn.hrc b/cui/source/dialogs/hlmarkwn.hrc
index 1ac36dafa099..81222451262e 100644
--- a/cui/source/dialogs/hlmarkwn.hrc
+++ b/cui/source/dialogs/hlmarkwn.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,10 +25,10 @@
  *
  ************************************************************************/
 
-#define BT_APPLY    1
-#define BT_CLOSE    2
-#define TLB_MARK    3
+#define BT_APPLY	1
+#define BT_CLOSE	2
+#define TLB_MARK	3
 
-//#define HYPERLINK_BMP_EXPAND      301
-//#define HYPERLINK_BMP_COLLAPSE    302
+//#define HYPERLINK_BMP_EXPAND		301
+//#define HYPERLINK_BMP_COLLAPSE	302
 
diff --git a/cui/source/dialogs/hlmarkwn.src b/cui/source/dialogs/hlmarkwn.src
index 396e8cd573e0..5454312bf1b4 100644
--- a/cui/source/dialogs/hlmarkwn.src
+++ b/cui/source/dialogs/hlmarkwn.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index cc09d911be0c..bbe131c7c33f 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 ::ucbhelper;
 
 SvxFramesComboBox::SvxFramesComboBox ( Window* pParent, const ResId& rResId,
                                         SfxDispatcher* pDispatch )
-:   ComboBox (pParent, rResId)
+:	ComboBox (pParent, rResId)
 {
     TargetList* pList = new TargetList;
     SfxViewFrame* pViewFrame = pDispatch ? pDispatch->GetFrame() : 0;
@@ -88,9 +88,9 @@ SvxFramesComboBox::~SvxFramesComboBox ()
 {
 }
 //########################################################################
-//#                                                                      #
-//# ComboBox-Control for URL's with History and Autocompletion           #
-//#                                                                      #
+//#																		 #
+//# ComboBox-Control for URL's with History and Autocompletion			 #
+//#																		 #
 //########################################################################
 
 /*************************************************************************
@@ -100,9 +100,9 @@ SvxFramesComboBox::~SvxFramesComboBox ()
 |************************************************************************/
 
 SvxHyperURLBox::SvxHyperURLBox( Window* pParent, INetProtocol eSmart, BOOL bAddresses )
-: SvtURLBox         ( pParent, eSmart ),
+: SvtURLBox			( pParent, eSmart ),
   DropTargetHelper  ( this ),
-  mbAccessAddress   (bAddresses)
+  mbAccessAddress	(bAddresses)
 {
 }
 
@@ -113,7 +113,7 @@ sal_Int8 SvxHyperURLBox::AcceptDrop( const AcceptDropEvent& /* rEvt */ )
 
 sal_Int8 SvxHyperURLBox::ExecuteDrop( const ExecuteDropEvent& rEvt )
 {
-    TransferableDataHelper  aDataHelper( rEvt.maDropEvent.Transferable );
+    TransferableDataHelper	aDataHelper( rEvt.maDropEvent.Transferable );
     String                  aString;
     sal_Int8                nRet = DND_ACTION_NONE;
 
@@ -158,19 +158,19 @@ long SvxHyperURLBox::PreNotify( NotifyEvent& rNEvt )
 SvxHyperlinkTabPageBase::SvxHyperlinkTabPageBase ( Window *pParent,
                                                    const ResId &rResId,
                                                    const SfxItemSet& rItemSet )
-:   IconChoicePage          ( pParent, rResId, rItemSet ),
-    mpGrpMore               ( NULL ),
-    mpFtFrame               ( NULL ),
-    mpCbbFrame              ( NULL ),
-    mpFtForm                ( NULL ),
-    mpLbForm                ( NULL ),
-    mpFtIndication          ( NULL ),
-    mpEdIndication          ( NULL ),
-    mpFtText                ( NULL ),
-    mpEdText                ( NULL ),
-    mpBtScript              ( NULL ),
+:	IconChoicePage			( pParent, rResId, rItemSet ),
+    mpGrpMore				( NULL ),
+    mpFtFrame				( NULL ),
+    mpCbbFrame				( NULL ),
+    mpFtForm				( NULL ),
+    mpLbForm				( NULL ),
+    mpFtIndication			( NULL ),
+    mpEdIndication			( NULL ),
+    mpFtText				( NULL ),
+    mpEdText				( NULL ),
+    mpBtScript				( NULL ),
     mbIsCloseDisabled       ( sal_False ),
-    mpDialog                ( pParent ),
+    mpDialog				( pParent ),
     mbStdControlsInit       ( FALSE ),
     aEmptyStr()
 {
@@ -192,7 +192,7 @@ SvxHyperlinkTabPageBase::~SvxHyperlinkTabPageBase ()
         delete mpFtIndication;
         delete mpEdIndication;
         delete mpFtText;
-        delete mpEdText ;
+        delete mpEdText	;
         delete mpBtScript;
     }
 
@@ -218,16 +218,16 @@ void SvxHyperlinkTabPageBase::InitStdControls ()
 {
     if ( !mbStdControlsInit )
     {
-        mpGrpMore     = new FixedLine           ( this, ResId (GRP_MORE, *m_pResMgr) );
-        mpFtFrame     = new FixedText           ( this, ResId (FT_FRAME, *m_pResMgr) );
+        mpGrpMore	  = new FixedLine			( this, ResId (GRP_MORE, *m_pResMgr) );
+        mpFtFrame	  = new FixedText			( this, ResId (FT_FRAME, *m_pResMgr) );
         mpCbbFrame    = new SvxFramesComboBox   ( this, ResId (CB_FRAME, *m_pResMgr), GetDispatcher() );
-        mpFtForm      = new FixedText           ( this, ResId (FT_FORM, *m_pResMgr) );
-        mpLbForm      = new ListBox             ( this, ResId (LB_FORM, *m_pResMgr) );
-        mpFtIndication= new FixedText           ( this, ResId (FT_INDICATION, *m_pResMgr) );
-        mpEdIndication= new Edit                ( this, ResId (ED_INDICATION, *m_pResMgr) );
-        mpFtText      = new FixedText           ( this, ResId (FT_TEXT, *m_pResMgr) );
-        mpEdText      = new Edit                ( this, ResId (ED_TEXT, *m_pResMgr) );
-        mpBtScript    = new ImageButton         ( this, ResId (BTN_SCRIPT, *m_pResMgr) );
+        mpFtForm	  = new FixedText			( this, ResId (FT_FORM, *m_pResMgr) );
+        mpLbForm	  = new ListBox				( this, ResId (LB_FORM, *m_pResMgr) );
+        mpFtIndication= new FixedText			( this, ResId (FT_INDICATION, *m_pResMgr) );
+        mpEdIndication= new Edit				( this, ResId (ED_INDICATION, *m_pResMgr) );
+        mpFtText	  = new FixedText			( this, ResId (FT_TEXT, *m_pResMgr) );
+        mpEdText	  = new Edit				( this, ResId (ED_TEXT, *m_pResMgr) );
+        mpBtScript	  = new ImageButton			( this, ResId (BTN_SCRIPT, *m_pResMgr) );
 
         mpBtScript->SetClickHdl ( LINK ( this, SvxHyperlinkTabPageBase, ClickScriptHdl_Impl ) );
 
@@ -246,7 +246,7 @@ void SvxHyperlinkTabPageBase::InitStdControls ()
 
 BOOL SvxHyperlinkTabPageBase::MoveToExtraWnd( Point aNewPos, BOOL bDisConnectDlg )
 {
-    BOOL bReturn =  mpMarkWnd->MoveTo ( aNewPos );
+    BOOL bReturn = 	mpMarkWnd->MoveTo ( aNewPos );
 
     if( bDisConnectDlg )
         mpMarkWnd->ConnectToDialog( FALSE );
@@ -267,7 +267,7 @@ void SvxHyperlinkTabPageBase::ShowMarkWnd ()
     // Size of dialog-window in screen pixels
     Rectangle aDlgRect( mpDialog->GetWindowExtentsRelative( NULL ) );
     Point aDlgPos ( aDlgRect.TopLeft() );
-    Size aDlgSize ( mpDialog->GetSizePixel () );
+    Size aDlgSize (	mpDialog->GetSizePixel () );
 
     // Absolute size of the screen
     Rectangle aScreen( mpDialog->GetDesktopRectPixel() );
@@ -531,8 +531,8 @@ BOOL SvxHyperlinkTabPageBase::FileExists( const INetURLObject& rURL )
     {
         try
         {
-            Content     aCnt( rURL.GetMainURL( INetURLObject::NO_DECODE ), ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() );
-            ::rtl::OUString aTitle;
+            Content		aCnt( rURL.GetMainURL( INetURLObject::NO_DECODE ), ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() );
+            ::rtl::OUString	aTitle;
 
             aCnt.getPropertyValue( ::rtl::OUString::createFromAscii( "Title" ) ) >>= aTitle;
             bRet = ( aTitle.getLength() > 0 );
@@ -599,10 +599,10 @@ void SvxHyperlinkTabPageBase::GetDataFromCommonFields( String& aStrName,
                                              String& aStrIntName, String& aStrFrame,
                                              SvxLinkInsertMode& eMode )
 {
-    aStrIntName = mpEdText->GetText();
-    aStrName    = mpEdIndication->GetText();
-    aStrFrame   = mpCbbFrame->GetText();
-    eMode       = (SvxLinkInsertMode) (mpLbForm->GetSelectEntryPos()+1);
+    aStrIntName	= mpEdText->GetText();
+    aStrName	= mpEdIndication->GetText();
+    aStrFrame	= mpCbbFrame->GetText();
+    eMode		= (SvxLinkInsertMode) (mpLbForm->GetSelectEntryPos()+1);
     if( IsHTMLDoc() )
         eMode = (SvxLinkInsertMode) ( UINT16(eMode) | HLINK_HTMLMODE );
 }
@@ -662,8 +662,8 @@ BOOL SvxHyperlinkTabPageBase::FillItemSet( SfxItemSet& rOut)
 
 String SvxHyperlinkTabPageBase::CreateUiNameFromURL( const String& aStrURL )
 {
-    String          aStrUiURL;
-    INetURLObject   aURLObj( aStrURL );
+    String			aStrUiURL;
+    INetURLObject	aURLObj( aStrURL );
 
     switch(aURLObj.GetProtocol())
     {
@@ -673,7 +673,7 @@ String SvxHyperlinkTabPageBase::CreateUiNameFromURL( const String& aStrURL )
         case INET_PROT_FTP :
             {
                 //remove password from name
-                INetURLObject   aTmpURL(aURLObj);
+                INetURLObject	aTmpURL(aURLObj);
                 aTmpURL.SetPass(aEmptyStr);
                 aStrUiURL = aTmpURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS );
             }
diff --git a/cui/source/dialogs/hyperdlg.hrc b/cui/source/dialogs/hyperdlg.hrc
index 0228d65bf3d2..6d6c476dd0f2 100644
--- a/cui/source/dialogs/hyperdlg.hrc
+++ b/cui/source/dialogs/hyperdlg.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,74 +27,74 @@
 
 /* Tabpage : Hyperlink - Internet */
 
-#define GRP_LINKTYPE                1
-#define RB_LINKTYP_INTERNET         2
-#define RB_LINKTYP_FTP              3
-#define RB_LINKTYP_TELNET           4
-#define FT_TARGET_HTML              5
-#define CB_TARGET_HTML              6
-#define FT_LOGIN                    7
-#define ED_LOGIN                    8
-#define FT_PASSWD                   9
-#define ED_PASSWD                   10
-#define CBX_ANONYMOUS               11
-#define BTN_BROWSE                  12
-#define BTN_TARGET                  13
-#define IMG_BROWSE_HC               14
-#define IMG_TARGET_HC               15
+#define GRP_LINKTYPE				1
+#define RB_LINKTYP_INTERNET			2
+#define RB_LINKTYP_FTP				3
+#define RB_LINKTYP_TELNET			4
+#define FT_TARGET_HTML				5
+#define CB_TARGET_HTML				6
+#define FT_LOGIN					7
+#define ED_LOGIN					8
+#define FT_PASSWD					9
+#define ED_PASSWD					10
+#define CBX_ANONYMOUS				11
+#define BTN_BROWSE					12
+#define BTN_TARGET					13
+#define IMG_BROWSE_HC				14
+#define IMG_TARGET_HC				15
 
 /* Tabpage : Hyperlink - Mail & News */
 
-#define GRP_MAILNEWS                1
-#define RB_LINKTYP_MAIL             2
-#define RB_LINKTYP_NEWS             3
-#define FT_RECEIVER                 4
-#define CB_RECEIVER                 5
-#define FT_SUBJECT                  6
-#define ED_SUBJECT                  7
-#define BTN_ADRESSBOOK              8
-#define IMG_ADRESSBOOK_HC           9
+#define GRP_MAILNEWS				1
+#define RB_LINKTYP_MAIL				2
+#define RB_LINKTYP_NEWS				3
+#define FT_RECEIVER					4
+#define CB_RECEIVER					5
+#define	FT_SUBJECT					6
+#define ED_SUBJECT					7
+#define BTN_ADRESSBOOK				8
+#define IMG_ADRESSBOOK_HC			9
 
 /* Tabpage : Hyperlink - Document */
 
-#define GRP_DOCUMENT                1
-#define FT_PATH_DOC                 2
-#define CB_PATH_DOC                 3
-#define BTN_FILEOPEN                4
-#define GRP_TARGET                  5
-#define FT_TARGET_DOC               6
-#define ED_TARGET_DOC               7
-#define FT_URL                      8
-#define FT_FULL_URL                 9
-#define IMG_FILEOPEN_HC             10
+#define GRP_DOCUMENT				1
+#define FT_PATH_DOC					2
+#define CB_PATH_DOC					3
+#define BTN_FILEOPEN				4
+#define GRP_TARGET					5
+#define FT_TARGET_DOC				6
+#define ED_TARGET_DOC				7
+#define FT_URL						8
+#define FT_FULL_URL					9
+#define IMG_FILEOPEN_HC				10
 
 /* Tabpage : Hyperlink - New document */
 
-#define GRP_NEWDOCUMENT             1
-#define RB_EDITNOW                  2
-#define RB_EDITLATER                3
-#define FT_PATH_NEWDOC              4
-#define ED_PATH_NEWDOC              5
-#define FT_DOCUMENT_TYPES           6
-#define LB_DOCUMENT_TYPES           7
-#define BTN_CREATE                  8
-#define IMG_CREATE_HC               9
+#define GRP_NEWDOCUMENT				1
+#define RB_EDITNOW					2
+#define RB_EDITLATER				3
+#define FT_PATH_NEWDOC				4
+#define ED_PATH_NEWDOC				5
+#define FT_DOCUMENT_TYPES			6
+#define LB_DOCUMENT_TYPES			7
+#define BTN_CREATE					8
+#define IMG_CREATE_HC				9
 
 /* Tabpage-section : Hyperlink - more justifications */
 
-#define GRP_MORE                    30
-#define FT_FRAME                    31
-#define CB_FRAME                    32
-#define FT_FORM                     33
-#define LB_FORM                     34
-#define FT_INDICATION               35
-#define ED_INDICATION               36
-#define FT_TEXT                     37
-#define ED_TEXT                     38
-#define BTN_SCRIPT                  39
-#define IMG_SCRIPT_HC               40
+#define GRP_MORE					30
+#define FT_FRAME					31
+#define CB_FRAME					32
+#define FT_FORM						33
+#define LB_FORM						34
+#define FT_INDICATION				35
+#define ED_INDICATION				36
+#define FT_TEXT						37
+#define ED_TEXT						38
+#define BTN_SCRIPT					39
+#define IMG_SCRIPT_HC				40
 
-#define COL_OLD     54
-#define COL_2       63
-#define COL_DIFF    (COL_2 - COL_OLD)
+#define COL_OLD		54
+#define COL_2		63
+#define COL_DIFF	(COL_2 - COL_OLD)
 
diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src
index 4ed7d1419bba..614c3a41ba66 100644
--- a/cui/source/dialogs/hyperdlg.src
+++ b/cui/source/dialogs/hyperdlg.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 "helpid.hrc"
 #include "hyperdlg.hrc"
 
-#define MASKCOLOR   MaskColor = Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; };
+#define MASKCOLOR	MaskColor = Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; };
 #define HYPERDLG_IMGBUTTON_HEIGHT RSC_CD_PUSHBUTTON_HEIGHT+2
 
 /*************************************************************************
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index 7f9bede9aedc..45c438ea2fd5 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ public:
     HyphenEdit_Impl( Window* pParent, const ResId& rResId );
 
 protected:
-    virtual void    KeyInput( const KeyEvent &rKEvt );
+    virtual void 	KeyInput( const KeyEvent &rKEvt );
 };
 
 
@@ -75,7 +75,7 @@ HyphenEdit_Impl::HyphenEdit_Impl( Window* pParent, const ResId& rResId ) :
 
 void HyphenEdit_Impl::KeyInput( const KeyEvent& rKEvt )
 {
-//  sal_uInt16 nMod  = rKEvt.GetKeyCode().GetModifier();
+//	sal_uInt16 nMod  = rKEvt.GetKeyCode().GetModifier();
     sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode();
 
     switch ( nCode )
@@ -94,7 +94,7 @@ void HyphenEdit_Impl::KeyInput( const KeyEvent& rKEvt )
             Edit::KeyInput(rKEvt);
             break;
         default:
-            Control::KeyInput( rKEvt ); // An den Dialog weiterleiten
+            Control::KeyInput( rKEvt );	// An den Dialog weiterleiten
             break;
     }
 }
@@ -106,7 +106,7 @@ struct SvxHyphenWordDialog_Impl
 {
     SvxHyphenWordDialog *       m_pDialog;
 //    Window *                    m_pParent;
-
+    
     FixedText           aWordFT;
     HyphenEdit_Impl     aWordEdit;
     ImageButton         aLeftBtn;
@@ -151,9 +151,9 @@ struct SvxHyphenWordDialog_Impl
     DECL_LINK( GetFocusHdl_Impl, Edit* );
 
 
-    SvxHyphenWordDialog_Impl(
+    SvxHyphenWordDialog_Impl( 
             SvxHyphenWordDialog * pDialog,
-            const String &rWord,
+            const String &rWord, 
             LanguageType nLang,
             uno::Reference< linguistic2::XHyphenator >  &xHyphen,
             SvxSpellWrapper* pWrapper );
@@ -161,9 +161,9 @@ struct SvxHyphenWordDialog_Impl
 };
 
 
-SvxHyphenWordDialog_Impl::SvxHyphenWordDialog_Impl(
+SvxHyphenWordDialog_Impl::SvxHyphenWordDialog_Impl( 
         SvxHyphenWordDialog * pDialog,
-        const String &rWord,
+        const String &rWord, 
         LanguageType nLang,
         uno::Reference< linguistic2::XHyphenator >  &xHyphen,
         SvxSpellWrapper* pWrapper ) :
@@ -197,7 +197,7 @@ SvxHyphenWordDialog_Impl::SvxHyphenWordDialog_Impl(
     xHyphenator    = xHyphen;
     pHyphWrapper   = pWrapper;
 
-    uno::Reference< linguistic2::XHyphenatedWord >  xHyphWord( pHyphWrapper ?
+    uno::Reference< linguistic2::XHyphenatedWord >  xHyphWord( pHyphWrapper ? 
             pHyphWrapper->GetLast() : NULL, uno::UNO_QUERY );
     DBG_ASSERT( xHyphWord.is(), "hyphenation result missing" );
     if (xHyphWord.is())
@@ -209,7 +209,7 @@ SvxHyphenWordDialog_Impl::SvxHyphenWordDialog_Impl(
 
     InitControls_Impl();
     aWordEdit.GrabFocus();
-
+    
     aLeftBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog_Impl, Left_Impl ) );
     aRightBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog_Impl, Right_Impl ) );
     aOkBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog_Impl, CutHdl_Impl ) );
@@ -219,11 +219,11 @@ SvxHyphenWordDialog_Impl::SvxHyphenWordDialog_Impl(
     aCancelBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog_Impl, CancelHdl_Impl ) );
     aWordEdit.SetGetFocusHdl( LINK( this, SvxHyphenWordDialog_Impl, GetFocusHdl_Impl ) );
 }
-
+    
 
 SvxHyphenWordDialog_Impl::~SvxHyphenWordDialog_Impl()
 {
-}
+}    
 
 
 void SvxHyphenWordDialog_Impl::EnableLRBtn_Impl()
@@ -264,7 +264,7 @@ String SvxHyphenWordDialog_Impl::EraseUnusableHyphens_Impl(
     // returns a String showing only those hyphen positions which will result
     // in a line break if hyphenation is done there
     // 1) we will need to discard all hyphenation positions at th end that
-    // will not result in a line break where the text to the left still fits
+    // will not result in a line break where the text to the left still fits 
     // on the line.
     // 2) since as from OOo 3.2 '-' are part of a word an thus text like
     // 'multi-line-editor' is regarded as single word we also need to discard those
@@ -272,11 +272,11 @@ String SvxHyphenWordDialog_Impl::EraseUnusableHyphens_Impl(
     // the rightmost valid hyphenation position according to 1)
     //
     // Example:
-    // If the possible hyphenation position in 'multi-line-editor' are to eb marked
+    // If the possible hyphenation position in 'multi-line-editor' are to eb marked 
     // by '=' then the text will look like this 'mul=ti-line-ed=it=or'.
     // If now the first line is only large enough for 'multi-line-edi' we need to discard
-    // the last possible hyphnation point because of 1). The the right most valid
-    // hyphenation position is "ed=itor". The first '-' left of this position is
+    // the last possible hyphnation point because of 1). The the right most valid 
+    // hyphenation position is "ed=itor". The first '-' left of this position is 
     // "line-ed", thus because of 2) we now need to discard all possible hyphneation
     // positions to the left of that as well. Thus in the end leaving us with just
     // 'multi-line-ed=itor' as return value for this function. (Just one valid hyphenation
@@ -516,7 +516,7 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, HyphenateAllHdl_Impl, Button *, EMPTYARG /*
             uno::Reference< beans::XPropertySet >  xProp( SvxGetLinguPropertySet() );
             const rtl::OUString aName( rtl::OUString::createFromAscii( "IsHyphAuto" ) );
             uno::Any aAny;
-
+        
             aAny <<= sal_True;
             xProp->setPropertyValue( aName, aAny );
 
@@ -531,10 +531,10 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, HyphenateAllHdl_Impl, Button *, EMPTYARG /*
         {
             (void) e;
             DBG_ASSERT( 0, "Hyphenate All failed" );
-        }
+        }    
     }
     return 0;
-}
+}    
 
 
 IMPL_LINK( SvxHyphenWordDialog_Impl, DeleteHdl_Impl, Button *, EMPTYARG )
@@ -604,15 +604,15 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, GetFocusHdl_Impl, Edit *, EMPTYARG )
     return 0;
 }
 
-
+    
 // class SvxHyphenWordDialog ---------------------------------------------
 
-SvxHyphenWordDialog::SvxHyphenWordDialog(
+SvxHyphenWordDialog::SvxHyphenWordDialog( 
     const String &rWord, LanguageType nLang,
     Window* pParent,
     uno::Reference< linguistic2::XHyphenator >  &xHyphen,
     SvxSpellWrapper* pWrapper ) :
-
+    
     SfxModalDialog( pParent, CUI_RES( RID_SVXDLG_HYPHENATE ) )
 {
     m_pImpl = std::auto_ptr< SvxHyphenWordDialog_Impl >(
@@ -630,7 +630,7 @@ SvxHyphenWordDialog::SvxHyphenWordDialog(
 
 SvxHyphenWordDialog::~SvxHyphenWordDialog()
 {
-}
+}    
 
 
 void SvxHyphenWordDialog::SetWindowTitle( LanguageType nLang )
diff --git a/cui/source/dialogs/hyphen.hrc b/cui/source/dialogs/hyphen.hrc
index f76e2aa75770..ba195caeb3ab 100755
--- a/cui/source/dialogs/hyphen.hrc
+++ b/cui/source/dialogs/hyphen.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 // defines ------------------------------------------------------------------
 
-#define ED_WORD             10
-#define BTN_LEFT            11
-#define BTN_RIGHT           12
+#define ED_WORD				10
+#define BTN_LEFT			11
+#define BTN_RIGHT			12
 #define FT_WORD             13
 #define FL_BOTTOM           14
 
-#define BTN_HYPH_CONTINUE   20
-#define BTN_HYPH_DELETE     21
-#define BTN_HYPH_CUT        22
-#define BTN_HYPH_CANCEL     23
-#define BTN_HYPH_HELP       24
+#define BTN_HYPH_CONTINUE	20
+#define BTN_HYPH_DELETE		21
+#define BTN_HYPH_CUT		22
+#define BTN_HYPH_CANCEL		23
+#define BTN_HYPH_HELP		24
 #define BTN_HYPH_ALL        25
 
 #endif
diff --git a/cui/source/dialogs/hyphen.src b/cui/source/dialogs/hyphen.src
index f10e94626f31..f90048a61823 100755
--- a/cui/source/dialogs/hyphen.src
+++ b/cui/source/dialogs/hyphen.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 140338916149..034ef6bc2183 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,8 +60,8 @@ int IconcDlgCmpUS_Impl( const void* p1, const void* p2 )
 }
 
 // some stuff for easier changes for SvtViewOptions
-static const sal_Char*      pViewOptDataName = "dialog data";
-#define VIEWOPT_DATANAME    ::rtl::OUString::createFromAscii( pViewOptDataName )
+static const sal_Char*		pViewOptDataName = "dialog data";
+#define VIEWOPT_DATANAME	::rtl::OUString::createFromAscii( pViewOptDataName )
 
 static inline void SetViewOptUserItem( SvtViewOptions& rOpt, const String& rData )
 {
@@ -92,11 +92,11 @@ static inline String GetViewOptUserItem( const SvtViewOptions& rOpt )
 
 IconChoicePage::IconChoicePage( Window *pParent, const ResId &rResId,
                                 const SfxItemSet &rAttrSet )
-:   TabPage                   ( pParent, rResId ),
-    pSet                      ( &rAttrSet ),
-    bHasExchangeSupport       ( FALSE ),
-    pDialog                   ( NULL ),
-    bStandard                 ( FALSE )
+:	TabPage					  ( pParent, rResId ),
+    pSet					  ( &rAttrSet ),
+    bHasExchangeSupport		  ( FALSE ),
+    pDialog					  ( NULL ),
+    bStandard				  ( FALSE )
 {
     SetStyle ( GetStyle()  | WB_DIALOGCONTROL | WB_HIDE );
 }
@@ -269,7 +269,7 @@ void IconChoicePage::DataChanged( const DataChangedEvent& rDCEvt )
 IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId,
                                      const EIconChoicePos ePos,
                                      const SfxItemSet *pItemSet )//, BOOL bEditFmt, const String *pUserButtonText = 0 )
-:   ModalDialog         ( pParent, rResId ),
+: 	ModalDialog			( pParent, rResId ),
     meChoicePos     ( ePos ),
     maIconCtrl      ( this, WB_3DLOOK | WB_ICON | WB_BORDER |
                             WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME |
@@ -277,9 +277,9 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId,
     mnCurrentPageId ( USHRT_MAX ),
 
     aOKBtn          ( this, WB_DEFBUTTON ),
-    aCancelBtn      ( this, WB_DEFBUTTON ),
-    aHelpBtn        ( this ),
-    aResetBtn       ( this ),
+    aCancelBtn		( this, WB_DEFBUTTON ),
+    aHelpBtn		( this ),
+    aResetBtn		( this ),
     pSet            ( pItemSet ),
     pOutSet         ( NULL ),
     pExampleSet     ( NULL ),
@@ -287,9 +287,9 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId,
     nResId          ( rResId.GetId() ),
 
     bHideResetBtn   ( FALSE ),
-    bModal          ( FALSE ),
-    bInOK           ( FALSE ),
-    bModified       ( FALSE ),
+    bModal			( FALSE ),
+    bInOK			( FALSE ),
+    bModified		( FALSE ),
     bItemsReset     ( FALSE )
 {
     // IconChoiceCtrl-Settings
@@ -311,7 +311,7 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId,
     }
 
     // Buttons
-    aOKBtn.SetClickHdl   ( LINK( this, IconChoiceDialog, OkHdl ) );
+    aOKBtn.SetClickHdl	 ( LINK( this, IconChoiceDialog, OkHdl ) );
     aOKBtn.SetHelpId( HID_ICCDIALOG_OK_BTN );
     aCancelBtn.SetHelpId( HID_ICCDIALOG_CANCEL_BTN );
     aResetBtn.SetClickHdl( LINK( this, IconChoiceDialog, ResetHdl ) );
@@ -331,15 +331,15 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId,
 IconChoiceDialog ::IconChoiceDialog ( SfxViewFrame *pViewFrame, Window* pParent, const ResId &rResId,
                    const SfxItemSet * = 0, BOOL bEditFmt = FALSE,
                    const String *pUserButtonText = 0 )
-:   meChoicePos     ( PosLeft ),    // Default erst ma Links
-    maIconCtrl      ( this, Die_Winbits ),
-    aOKBtn          ( this ),
-    pUserBtn        ( pUserButtonText? new PushButton(this): 0 ),
-    aCancelBtn      ( this ),
-    aHelpBtn        ( this ),
-    aResetBtn       ( this ),
-    aBaseFmtBtn     ( this ),
-    mnCurrentPageId ( 0 )
+: 	meChoicePos		( PosLeft ),	// Default erst ma Links
+    maIconCtrl		( this, Die_Winbits ),
+    aOKBtn			( this ),
+    pUserBtn		( pUserButtonText? new PushButton(this): 0 ),
+    aCancelBtn		( this ),
+    aHelpBtn		( this ),
+    aResetBtn		( this ),
+    aBaseFmtBtn		( this ),
+    mnCurrentPageId	( 0 )
 {
     FreeResource();
 }
@@ -382,7 +382,7 @@ IconChoiceDialog ::~IconChoiceDialog ()
     }
 
     // remove Pagelist
-/*  for ( i=0; i<maPageList.Count(); i++ )
+/*	for ( i=0; i<maPageList.Count(); i++ )
     {
         IconChoicePageData* pData = (IconChoicePageData*)maPageList.GetObject ( i );
 
@@ -429,7 +429,7 @@ SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( USHORT nId, const String&
     pData->bOnDemand = bItemsOnDemand;
 
     USHORT *pId = new USHORT ( nId );
-    SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.InsertEntry( rIconText, rChoiceIcon );
+    SvxIconChoiceCtrlEntry*	pEntry = maIconCtrl.InsertEntry( rIconText, rChoiceIcon );
     pEntry->SetUserData ( (void*) pId );
     return pEntry;
 }
@@ -450,7 +450,7 @@ SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( USHORT nId, const String&
     pData->bOnDemand = bItemsOnDemand;
 
     USHORT *pId = new USHORT ( nId );
-    SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.InsertEntry( rIconText, rChoiceIcon, rChoiceIconHC );
+    SvxIconChoiceCtrlEntry*	pEntry = maIconCtrl.InsertEntry( rIconText, rChoiceIcon, rChoiceIconHC );
     pEntry->SetUserData ( (void*) pId );
     return pEntry;
 }
@@ -625,10 +625,10 @@ void IconChoiceDialog::ShowPage( USHORT nId )
 |
 \**********************************************************************/
 
-#define ICONCTRL_WIDTH_PIXEL       110
-#define ICONCTRL_HEIGHT_PIXEL       75
-#define MINSIZE_BUTTON_WIDTH        70
-#define MINSIZE_BUTTON_HEIGHT       22
+#define ICONCTRL_WIDTH_PIXEL	   110
+#define ICONCTRL_HEIGHT_PIXEL	    75
+#define MINSIZE_BUTTON_WIDTH		70
+#define MINSIZE_BUTTON_HEIGHT		22
 
 void IconChoiceDialog::Resize()
 {
@@ -1145,7 +1145,7 @@ void IconChoiceDialog::SetInputSet( const SfxItemSet* pInSet )
 
 // -----------------------------------------------------------------------
 
-//  Liefert die Pages, die ihre Sets onDemand liefern, das OutputItemSet.
+//	Liefert die Pages, die ihre Sets onDemand liefern, das OutputItemSet.
 const SfxItemSet* IconChoiceDialog::GetOutputItemSet ( USHORT nId )
 {
     IconChoicePageData * pData = GetPageData ( nId );
@@ -1361,7 +1361,7 @@ short IconChoiceDialog::Ok()
     if ( !pOutSet )
     {
         if ( !pExampleSet && pSet )
-            pOutSet = pSet->Clone( FALSE ); // ohne Items
+            pOutSet = pSet->Clone( FALSE );	// ohne Items
         else if ( pExampleSet )
             pOutSet = new SfxItemSet( *pExampleSet );
     }
diff --git a/cui/source/dialogs/iconcdlg.src b/cui/source/dialogs/iconcdlg.src
index c7d7d029b0df..6bcca8ba2f82 100644
--- a/cui/source/dialogs/iconcdlg.src
+++ b/cui/source/dialogs/iconcdlg.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 7ffcd1eefe98..cf5a0d59883f 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx
index 588b105d26d5..80e41147e022 100644
--- a/cui/source/dialogs/insrc.cxx
+++ b/cui/source/dialogs/insrc.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/dialogs/insrc.hrc b/cui/source/dialogs/insrc.hrc
index 2583ade5619f..0c780df36bd9 100644
--- a/cui/source/dialogs/insrc.hrc
+++ b/cui/source/dialogs/insrc.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR 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.
  *
  ************************************************************************/
-#define FT_COUNT    1
-#define ED_COUNT    2
+#define FT_COUNT	1
+#define ED_COUNT	2
 #define FL_INS          3
 
-#define CB_POS_BEFORE   10
-#define CB_POS_AFTER    11
+#define CB_POS_BEFORE	10
+#define CB_POS_AFTER	11
 #define FL_POS                  12
 
-#define STR_ROW         20
-#define STR_COL         21
+#define STR_ROW			20
+#define STR_COL			21
 
-#define BT_OK       100
-#define BT_CANCEL   101
-#define BT_HELP     102
+#define BT_OK 		100
+#define BT_CANCEL 	101
+#define BT_HELP 	102
diff --git a/cui/source/dialogs/insrc.src b/cui/source/dialogs/insrc.src
index 69f934a29049..6139dcd37898 100644
--- a/cui/source/dialogs/insrc.src
+++ b/cui/source/dialogs/insrc.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 26f08b73e2f0..13230b7fd851 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #define _SVSTDARR_USHORTS
 #include <svl/svstdarr.hxx>
 
-#define MAX_FILENAME    18
-#define MAX_LINKNAME    18
-#define MAX_TYPENAME    15
-#define MAX_UPDATENAME  10
+#define MAX_FILENAME	18
+#define MAX_LINKNAME	18
+#define MAX_TYPENAME	15
+#define MAX_UPDATENAME	10
 
 #define FILEOBJECT ( OBJECT_CLIENT_FILE & ~OBJECT_CLIENT_SO )
 
@@ -70,7 +70,7 @@ SV_DECL_IMPL_REF_LIST(SvBaseLink,SvBaseLink*)
 
 // Achtung im Code wird dieses Array direkt (0, 1, ...) indiziert
 static long nTabs[] =
-    {   4, // Number of Tabs
+    {	4, // Number of Tabs
         0, 77, 144, 209
     };
 
@@ -143,9 +143,9 @@ SvBaseLinksDlg::~SvBaseLinksDlg()
 /*************************************************************************
 |*    SvBaseLinksDlg::Handler()
 |*
-|*    Beschreibung
-|*    Ersterstellung    MM 14.06.94
-|*    Letzte Aenderung  JP 30.05.95
+|*	  Beschreibung
+|*	  Ersterstellung	MM 14.06.94
+|*	  Letzte Aenderung	JP 30.05.95
 *************************************************************************/
 IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox )
 {
@@ -637,7 +637,7 @@ void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, USHORT nPos, sal_Bool
     INetURLObject aPath( sFileNm, INET_PROT_FILE );
     String aFileName = aPath.getName();
     aFileName = INetURLObject::decode(aFileName, INET_HEX_ESCAPE, INetURLObject::DECODE_UNAMBIGUOUS);
-
+    
     if( aFileName.Len() > aTxt.Len() )
         aTxt = aFileName;
     else if( aTxt.Search( aFileName, aTxt.Len() - aFileName.Len() ) == STRING_NOTFOUND )
diff --git a/cui/source/dialogs/multifil.cxx b/cui/source/dialogs/multifil.cxx
index 3470d22188c2..b08265991d99 100644
--- a/cui/source/dialogs/multifil.cxx
+++ b/cui/source/dialogs/multifil.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index ffdc3834dc6c..b51f723279fa 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,8 +56,8 @@ using namespace ::com::sun::star::uno;
 
 struct MultiPath_Impl
 {
-    BOOL    bEmptyAllowed;
-    BOOL    bIsClassPathMode;
+    BOOL	bEmptyAllowed;
+    BOOL	bIsClassPathMode;
     bool    bIsRadioButtonMode;
 
     MultiPath_Impl( BOOL bAllowed ) :
@@ -198,11 +198,11 @@ SvxMultiPathDialog::SvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed ) :
     aRadioLB    ( this, CUI_RES( LB_RADIOBUTTON ) ),
     aRadioFT    ( this, CUI_RES( FT_RADIOBUTTON ) ),
     aAddBtn     ( this, CUI_RES( BTN_ADD_MULTIPATH ) ),
-    aDelBtn     ( this, CUI_RES( BTN_DEL_MULTIPATH ) ),
-    aOKBtn      ( this, CUI_RES( BTN_MULTIPATH_OK ) ),
-    aCancelBtn  ( this, CUI_RES( BTN_MULTIPATH_CANCEL ) ),
-    aHelpButton ( this, CUI_RES( BTN_MULTIPATH_HELP ) ),
-    pImpl       ( new MultiPath_Impl( bEmptyAllowed ) )
+    aDelBtn		( this, CUI_RES( BTN_DEL_MULTIPATH ) ),
+    aOKBtn		( this, CUI_RES( BTN_MULTIPATH_OK ) ),
+    aCancelBtn	( this, CUI_RES( BTN_MULTIPATH_CANCEL ) ),
+    aHelpButton	( this, CUI_RES( BTN_MULTIPATH_HELP ) ),
+    pImpl		( new MultiPath_Impl( bEmptyAllowed ) )
 
 {
     static long aStaticTabs[]= { 2, 0, 12 };
diff --git a/cui/source/dialogs/multipat.hrc b/cui/source/dialogs/multipat.hrc
index 0bfda7212fb8..8d9a19fbee98 100644
--- a/cui/source/dialogs/multipat.hrc
+++ b/cui/source/dialogs/multipat.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/dialogs/multipat.src b/cui/source/dialogs/multipat.src
index 987867492e13..45695d850b75 100644
--- a/cui/source/dialogs/multipat.src
+++ b/cui/source/dialogs/multipat.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/dialogs/newtabledlg.cxx b/cui/source/dialogs/newtabledlg.cxx
index cdd36aeb1b1b..3e0c69e74265 100644
--- a/cui/source/dialogs/newtabledlg.cxx
+++ b/cui/source/dialogs/newtabledlg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/dialogs/newtabledlg.hrc b/cui/source/dialogs/newtabledlg.hrc
index 2357a4b1a280..b75c16a8611c 100644
--- a/cui/source/dialogs/newtabledlg.hrc
+++ b/cui/source/dialogs/newtabledlg.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/dialogs/newtabledlg.src b/cui/source/dialogs/newtabledlg.src
index 4bbbd564edd1..67e64254c7b2 100644
--- a/cui/source/dialogs/newtabledlg.src
+++ b/cui/source/dialogs/newtabledlg.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ ModalDialog RID_SVX_NEWTABLE_DLG
     Moveable = TRUE ;
     Size = MAP_APPFONT ( 181 , 6+15+15+15+14+6 ) ;
     Text [ en-US ] = "Insert Table" ;
-
+    
     FixedText FT_COLUMNS
     {
         Pos = MAP_APPFONT ( 6 , 8 ) ;
@@ -84,7 +84,7 @@ ModalDialog RID_SVX_NEWTABLE_DLG
         Pos = MAP_APPFONT ( 6 , 6+15+15+15 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
-    };
+    };	
     OKButton BTN_OK
     {
         Pos = MAP_APPFONT ( 69 , 6+15+15+15 ) ;
diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx
index f218fdd2557a..0878eb1a8430 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 PasswordReenterEdit_Impl : public Edit
     // disallow use of copy c-tor and assignment operator
     PasswordReenterEdit_Impl( const PasswordReenterEdit_Impl & );
     PasswordReenterEdit_Impl & operator = ( const PasswordReenterEdit_Impl & );
-
+    
 public:
     PasswordReenterEdit_Impl( Window * pParent, const ResId &rResId );
     virtual ~PasswordReenterEdit_Impl();
@@ -65,14 +65,14 @@ public:
     virtual void        Paint( const Rectangle& rRect );
 };
 
-
+    
 PasswordReenterEdit_Impl::PasswordReenterEdit_Impl( Window * pParent, const ResId &rResId ) :
     Edit( pParent, rResId )
 {
-// currently the spec does not want to display this text anymore...
+// currently the spec does not want to display this text anymore...    
 //    m_aDefaultTxt = String( CUI_RES( STR_PASSWD_MUST_BE_CONFIRMED ) );
 }
-
+    
 
 PasswordReenterEdit_Impl::~PasswordReenterEdit_Impl()
 {
@@ -101,7 +101,7 @@ void PasswordReenterEdit_Impl::Paint( const Rectangle& rRect )
     else
         Edit::Paint( rRect );
 }
-
+    
 
 //////////////////////////////////////////////////////////////////////
 
@@ -132,22 +132,22 @@ struct PasswordToOpenModifyDialog_Impl
     String                      m_aTwoMismatch;
     String                      m_aInvalidStateForOkButton;
     String                      m_aInvalidStateForOkButton_v2;
-
+    
     bool                        m_bIsPasswordToModify;
 
-
+    
 //    DECL_LINK( ModifyHdl, Edit * );
     DECL_LINK( OkBtnClickHdl, OKButton * );
 
-    PasswordToOpenModifyDialog_Impl( PasswordToOpenModifyDialog * pParent,
+    PasswordToOpenModifyDialog_Impl( PasswordToOpenModifyDialog * pParent, 
             sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify );
     ~PasswordToOpenModifyDialog_Impl();
 };
 
 
-PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl(
+PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( 
         PasswordToOpenModifyDialog * pParent,
-        sal_uInt16 nMinPasswdLen,
+        sal_uInt16 nMinPasswdLen, 
         sal_uInt16 nMaxPasswdLen,
         bool bIsPasswordToModify ) :
     m_pParent( pParent ),
@@ -175,7 +175,7 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl(
     m_aInvalidStateForOkButton_v2( CUI_RES( STR_INVALID_STATE_FOR_OK_BUTTON_V2 ) ),
     m_bIsPasswordToModify( bIsPasswordToModify )
 {
-/*
+/*    
     const sal_Bool bHighContrast = pParent->GetSettings().GetStyleSettings().GetHighContrastMode();
     const Image aImage( CUI_RES( bHighContrast ? IMG_PASSWD_MATCH_HC : IMG_PASSWD_MATCH ) );
     m_aPasswdToOpenMatchFI.SetImage( aImage );
@@ -216,7 +216,7 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl(
         m_aMoreFewerOptionsBTN.Hide( TRUE );
 }
 
-
+    
 PasswordToOpenModifyDialog_Impl::~PasswordToOpenModifyDialog_Impl()
 {
 }
@@ -241,7 +241,7 @@ IMPL_LINK( PasswordToOpenModifyDialog_Impl, ModifyHdl, Edit *, EMPTYARG /*pEdit*
 
 //    m_aPasswdToOpenMatchFI.Enable( bToOpenMatch && !bBothEmpty );
 //    m_aPasswdToModifyMatchFI.Enable( bToModifyMatch && !bBothEmpty );
-
+    
     return 0;
 }
 #endif
@@ -249,12 +249,12 @@ IMPL_LINK( PasswordToOpenModifyDialog_Impl, ModifyHdl, Edit *, EMPTYARG /*pEdit*
 
 IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, EMPTYARG /*pBtn*/ )
 {
-    bool bInvalidState = !m_aOpenReadonlyCB.IsChecked() &&
-            m_aPasswdToOpenED.GetText().Len() == 0 &&
+    bool bInvalidState = !m_aOpenReadonlyCB.IsChecked() && 
+            m_aPasswdToOpenED.GetText().Len() == 0 && 
             m_aPasswdToModifyED.GetText().Len() == 0;
     if (bInvalidState)
     {
-        ErrorBox aErrorBox( m_pParent, WB_OK,
+        ErrorBox aErrorBox( m_pParent, WB_OK, 
             m_bIsPasswordToModify? m_aInvalidStateForOkButton : m_aInvalidStateForOkButton_v2 );
         aErrorBox.Execute();
     }
@@ -267,7 +267,7 @@ IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, EMPTYARG
         {
             ErrorBox aErrorBox( m_pParent, WB_OK, nMismatch == 1 ? m_aOneMismatch : m_aTwoMismatch );
             aErrorBox.Execute();
-
+        
             Edit &rEdit = !bToOpenMatch? m_aPasswdToOpenED : m_aPasswdToModifyED;
             PasswordReenterEdit_Impl &rRepeatEdit = !bToOpenMatch? m_aReenterPasswdToOpenED : m_aReenterPasswdToModifyED;
             String aEmpty;
@@ -282,56 +282,56 @@ IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, EMPTYARG
                 m_aReenterPasswdToOpenED.SetText( aEmpty );
                 m_aPasswdToModifyED.SetText( aEmpty );
                 m_aReenterPasswdToModifyED.SetText( aEmpty );
-            }
+            }    
             rEdit.GrabFocus();
         }
         else
         {
             m_pParent->EndDialog( RET_OK );
         }
-    }
-
+    }    
+  
     return 0;
 }
 
 //////////////////////////////////////////////////////////////////////
 
 
-PasswordToOpenModifyDialog::PasswordToOpenModifyDialog(
-        Window * pParent,
-        sal_uInt16 nMinPasswdLen,
+PasswordToOpenModifyDialog::PasswordToOpenModifyDialog( 
+        Window * pParent, 
+        sal_uInt16 nMinPasswdLen, 
         sal_uInt16 nMaxPasswdLen,
         bool bIsPasswordToModify ) :
     SfxModalDialog( pParent, CUI_RES( RID_DLG_PASSWORD_TO_OPEN_MODIFY ) )
 {
-    m_pImpl = std::auto_ptr< PasswordToOpenModifyDialog_Impl >(
+    m_pImpl = std::auto_ptr< PasswordToOpenModifyDialog_Impl >( 
             new PasswordToOpenModifyDialog_Impl( this, nMinPasswdLen, nMaxPasswdLen, bIsPasswordToModify ) );
-
+    
     FreeResource();
-}
+}    
 
 
 PasswordToOpenModifyDialog::~PasswordToOpenModifyDialog()
 {
-}
+}    
 
 
 String PasswordToOpenModifyDialog::GetPasswordToOpen() const
 {
-    const bool bPasswdOk =
+    const bool bPasswdOk = 
             m_pImpl->m_aPasswdToOpenED.GetText().Len() > 0 &&
             m_pImpl->m_aPasswdToOpenED.GetText() == m_pImpl->m_aReenterPasswdToOpenED.GetText();
     return bPasswdOk ? m_pImpl->m_aPasswdToOpenED.GetText() : String();
-}
+}    
 
 
 String PasswordToOpenModifyDialog::GetPasswordToModify() const
 {
-    const bool bPasswdOk =
+    const bool bPasswdOk = 
             m_pImpl->m_aPasswdToModifyED.GetText().Len() > 0 &&
             m_pImpl->m_aPasswdToModifyED.GetText() == m_pImpl->m_aReenterPasswdToModifyED.GetText();
     return bPasswdOk ? m_pImpl->m_aPasswdToModifyED.GetText() : String();
-}
+}    
 
 
 bool PasswordToOpenModifyDialog::IsRecommendToOpenReadonly() const
diff --git a/cui/source/dialogs/passwdomdlg.hrc b/cui/source/dialogs/passwdomdlg.hrc
index 522e4edf1da2..9ce3dab168e7 100755
--- a/cui/source/dialogs/passwdomdlg.hrc
+++ b/cui/source/dialogs/passwdomdlg.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/dialogs/passwdomdlg.src b/cui/source/dialogs/passwdomdlg.src
index edb84813d387..355051cba753 100755
--- a/cui/source/dialogs/passwdomdlg.src
+++ b/cui/source/dialogs/passwdomdlg.src
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 
 #include <cuires.hrc>
 #include "passwdomdlg.hrc"
@@ -47,7 +47,7 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY
         Size = MAP_APPFONT( 165, 8 );
         Text [ en-US ] = "File encryption password";
     };
-
+  
     FixedText FT_PASSWD_TO_OPEN
     {
         Pos = MAP_APPFONT( 6, 17 );
@@ -103,7 +103,7 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY
         Pos = MAP_APPFONT( 0, 117 );
         Size = MAP_APPFONT( 171, 8 );
     };
-
+  
     MoreButton BTN_MORE_FEWER_OPTIONS
     {
         HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_MORE;
@@ -193,7 +193,7 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY
     {
         Text [ en-US ] = "More ~Options" ;
     };
-
+    
     String STR_FEWER_OPTIONS
     {
         Text [ en-US ] = "Fewer ~Options" ;
@@ -213,12 +213,12 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY
     {
         Text [ en-US ] = "Please enter a password to open or to modify, or check the open read-only option to continue." ;
     };
-/*
+/*    
     Image IMG_PASSWD_MATCH
     {
         ImageBitmap = Bitmap { File = "apply.png"; };
     };
-
+    
     Image IMG_PASSWD_MATCH_HC
     {
         ImageBitmap = Bitmap { File = "apply_h.png"; };
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index 90b3c1a8211e..517e778d1822 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -161,7 +161,7 @@ ULONG SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
         ::com::sun::star::datatransfer::DataFlavor aFlavor( *aIter );
         SotFormatStringId nFormat = (*aIter++).mnSotId;
 
-        String* pName = (String*) aSupplementTable.Get( nFormat );
+        String*	pName = (String*) aSupplementTable.Get( nFormat );
         String aName;
 
 #ifdef WNT
diff --git a/cui/source/dialogs/plfilter.cxx b/cui/source/dialogs/plfilter.cxx
index de3a7ae9a09c..da079a8f95c5 100644
--- a/cui/source/dialogs/plfilter.cxx
+++ b/cui/source/dialogs/plfilter.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index ab4fdb0d3f1f..40ae4d89dbed 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <unotools/useroptions.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <comphelper/processfactory.hxx>
-#include <svx/svxids.hrc>   // SID_ATTR_...
+#include <svx/svxids.hrc>	// SID_ATTR_...
 #include <svx/dialogs.hrc>  // RID_SVXDLG_POSTIT
 
 #define _SVX_POSTDLG_CXX
@@ -73,22 +73,22 @@ SvxPostItDialog::SvxPostItDialog( Window* pParent,
 
     aPostItFL       ( this, CUI_RES( FL_POSTIT ) ),
     aLastEditLabelFT( this, CUI_RES( FT_LASTEDITLABEL ) ),
-    aLastEditFT     ( this, CUI_RES( FT_LASTEDIT ) ),
-    aEditFT         ( this, CUI_RES( FT_EDIT ) ),
-    aEditED         ( this, CUI_RES( ED_EDIT ) ),
+    aLastEditFT 	( this, CUI_RES( FT_LASTEDIT ) ),
+    aEditFT 		( this, CUI_RES( FT_EDIT ) ),
+    aEditED 		( this, CUI_RES( ED_EDIT ) ),
     aAuthorFT       ( this, CUI_RES( FT_AUTHOR) ),
     aAuthorBtn      ( this, CUI_RES( BTN_AUTHOR ) ),
     aOKBtn          ( this, CUI_RES( BTN_POST_OK ) ),
-    aCancelBtn      ( this, CUI_RES( BTN_POST_CANCEL ) ),
+    aCancelBtn		( this, CUI_RES( BTN_POST_CANCEL ) ),
     aHelpBtn        ( this, CUI_RES( BTN_POST_HELP ) ),
     aPrevBtn        ( this, CUI_RES( BTN_PREV ) ),
-    aNextBtn        ( this, CUI_RES( BTN_NEXT ) ),
+    aNextBtn		( this, CUI_RES( BTN_NEXT ) ),
 
-    rSet        ( rCoreSet ),
-    pOutSet     ( 0 )
+    rSet		( rCoreSet ),
+    pOutSet 	( 0 )
 
 {
-    if (bRedline)   // HelpIDs fuer Redlining
+    if (bRedline)	// HelpIDs fuer Redlining
     {
         SetHelpId(HID_REDLINING_DLG);
         aEditED.SetHelpId(HID_REDLINING_EDIT);
@@ -106,7 +106,7 @@ SvxPostItDialog::SvxPostItDialog( Window* pParent,
     aEditED.SetFont( aFont );
 
     BOOL bNew = TRUE;
-    USHORT nWhich            = 0;
+    USHORT nWhich			 = 0;
 
     if ( !bPrevNext )
     {
diff --git a/cui/source/dialogs/postdlg.hrc b/cui/source/dialogs/postdlg.hrc
index c0df97b971e2..c0272127de3c 100644
--- a/cui/source/dialogs/postdlg.hrc
+++ b/cui/source/dialogs/postdlg.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,22 +29,22 @@
 
 // defines ------------------------------------------------------------------
 
-#define FT_LASTEDITLABEL    10
-#define FT_LASTEDIT         11
+#define	FT_LASTEDITLABEL	10
+#define	FT_LASTEDIT			11
 #define FT_EDIT                         12
-#define ED_EDIT             13
+#define	ED_EDIT				13
 #define FL_POSTIT                       14
-#define BTN_PREV            15
-#define BTN_NEXT            16
-#define BTN_AUTHOR          17
+#define	BTN_PREV			15
+#define	BTN_NEXT 			16
+#define	BTN_AUTHOR			17
 #define FT_AUTHOR           18
 
-#define STR_NOTIZ_EDIT      20
-#define STR_NOTIZ_INSERT    21
+#define STR_NOTIZ_EDIT		20
+#define STR_NOTIZ_INSERT	21
 
-#define BTN_POST_OK         30
-#define BTN_POST_CANCEL     31
-#define BTN_POST_HELP       32
+#define	BTN_POST_OK	   		30
+#define	BTN_POST_CANCEL		31
+#define	BTN_POST_HELP		32
 
 
 #endif
diff --git a/cui/source/dialogs/postdlg.src b/cui/source/dialogs/postdlg.src
index 904319d45355..c05b45134204 100644
--- a/cui/source/dialogs/postdlg.src
+++ b/cui/source/dialogs/postdlg.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 9d44e12f55f1..c9996a44c0fe 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -2,7 +2,7 @@
 /**********************************************************************
  *
  * DO NOT ALTER 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,12 +99,12 @@ SFTreeListBox::SFTreeListBox( Window* pParent, const ResId& rResId ) :
 {
     FreeResource();
     SetSelectionMode( SINGLE_SELECTION );
-
+    
     SetWindowBits( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL |
                    WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HIDESELECTION |
                    WB_HASLINES | WB_HASLINESATROOT );
     SetNodeDefaultImages();
-
+    
     nMode = 0xFF;    // Alles
 }
 
@@ -124,8 +124,8 @@ void SFTreeListBox::delUserData( SvLBoxEntry* pEntry )
         {
             delete pUserData;
             // TBD seem to get a Select event on node that is remove ( below )
-            // so need to be able to detect that this node is not to be
-            // processed in order to do this, setting userData to NULL ( must
+            // so need to be able to detect that this node is not to be 
+            // processed in order to do this, setting userData to NULL ( must 
             // be a better way to do this )
             pUserData = 0;
             pEntry->SetUserData( pUserData );
@@ -142,7 +142,7 @@ void SFTreeListBox::deleteTree( SvLBoxEntry* pEntry )
     {
         SvLBoxEntry* pNextEntry = NextSibling( pEntry );
         deleteTree( pEntry );
-        GetModel()->Remove( pEntry );
+        GetModel()->Remove( pEntry );    
         pEntry = pNextEntry;
     }
 }
@@ -162,7 +162,7 @@ void SFTreeListBox::deleteAllTree()
             GetModel()->Remove( pEntry );
             pEntry = pNextEntry;
         }
-    }
+    }    
 }
 
 void SFTreeListBox::Init( const ::rtl::OUString& language  )
@@ -176,8 +176,8 @@ void SFTreeListBox::Init( const ::rtl::OUString& language  )
 
     Sequence< Reference< browse::XBrowseNode > > children;
 
-    ::rtl::OUString userStr = ::rtl::OUString::createFromAscii("user");
-    ::rtl::OUString shareStr = ::rtl::OUString::createFromAscii("share");
+    ::rtl::OUString userStr = ::rtl::OUString::createFromAscii("user");    
+    ::rtl::OUString shareStr = ::rtl::OUString::createFromAscii("share");    
 
     ::rtl::OUString singleton = ::rtl::OUString::createFromAscii(
         "/singletons/com.sun.star.script.browse.theBrowseNodeFactory" );
@@ -197,7 +197,7 @@ void SFTreeListBox::Init( const ::rtl::OUString& language  )
             browse::BrowseNodeFactoryViewTypes::MACROORGANIZER ) );
 
         if (  rootNode.is() && rootNode->hasChildNodes() == sal_True )
-        {
+        {            
             children = rootNode->getChildNodes();
         }
     }
@@ -207,7 +207,7 @@ void SFTreeListBox::Init( const ::rtl::OUString& language  )
             ::rtl::OUStringToOString(
                 e.Message , RTL_TEXTENCODING_ASCII_US ).pData->buffer );
         // TODO exception handling
-    }
+    }        
 
     Reference<XModel> xDocumentModel;
     for ( sal_Int32 n = 0; n < children.getLength(); n++ )
@@ -244,7 +244,7 @@ void SFTreeListBox::Init( const ::rtl::OUString& language  )
                 Sequence<beans::PropertyValue> moduleDescr;
                 try{
                     ::rtl::OUString appModule = xModuleManager->identify( xDocumentModel );
-                    xModuleConfig->getByName(appModule) >>= moduleDescr;
+                    xModuleConfig->getByName(appModule) >>= moduleDescr; 
                 } catch(const uno::Exception&)
                     {}
 
@@ -264,18 +264,18 @@ void SFTreeListBox::Init( const ::rtl::OUString& language  )
         }
 
         ::rtl::OUString lang( language );
-        Reference< browse::XBrowseNode > langEntries =
+        Reference< browse::XBrowseNode > langEntries = 
             getLangNodeFromRootNode( children[ n ], lang );
 
         /*SvLBoxEntry* pBasicManagerRootEntry =*/
             insertEntry( uiName, app ? IMG_HARDDISK : IMG_DOCUMENT,
-                0, true, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_SFROOT, langEntries, xDocumentModel )), factoryURL );
+                0, true, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_SFROOT, langEntries, xDocumentModel )), factoryURL );    
     }
 
     SetUpdateMode( TRUE );
 }
 
-Reference< XInterface  >
+Reference< XInterface  > 
 SFTreeListBox::getDocumentModel( Reference< XComponentContext >& xCtx, ::rtl::OUString& docName )
 {
     Reference< XInterface > xModel;
@@ -307,7 +307,7 @@ SFTreeListBox::getDocumentModel( Reference< XComponentContext >& xCtx, ::rtl::OU
     return xModel;
 }
 
-Reference< browse::XBrowseNode >
+Reference< browse::XBrowseNode > 
 SFTreeListBox::getLangNodeFromRootNode( Reference< browse::XBrowseNode >& rootNode, ::rtl::OUString& language )
 {
     Reference< browse::XBrowseNode > langNode;
@@ -321,8 +321,8 @@ SFTreeListBox::getLangNodeFromRootNode( Reference< browse::XBrowseNode >& rootNo
             {
                 langNode = children[ n ];
                 break;
-            }
-        }
+            }    
+        } 
     }
     catch ( Exception& )
     {
@@ -349,20 +349,20 @@ void SFTreeListBox:: RequestSubEntries( SvLBoxEntry* pRootEntry, Reference< ::co
     {
         // if we catch an exception in getChildNodes then no entries are added
     }
-
+    
     for ( sal_Int32 n = 0; n < children.getLength(); n++ )
     {
         ::rtl::OUString name( children[ n ]->getName() );
         if (  children[ n ]->getType() !=  browse::BrowseNodeTypes::SCRIPT)
         {
-            insertEntry( name, IMG_LIB, pRootEntry, true, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_SCRIPTCONTAINER, children[ n ],model )));
+            insertEntry( name, IMG_LIB, pRootEntry, true, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_SCRIPTCONTAINER, children[ n ],model ))); 
         }
         else
         {
             if ( children[ n ]->getType() == browse::BrowseNodeTypes::SCRIPT )
             {
-                insertEntry( name, IMG_MACRO, pRootEntry, false, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_METHOD, children[ n ],model )));
-
+                insertEntry( name, IMG_MACRO, pRootEntry, false, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_METHOD, children[ n ],model ))); 
+                
             }
         }
     }
@@ -421,7 +421,7 @@ SvLBoxEntry * SFTreeListBox::insertEntry(
     {
         aImage = m_hdImage;
         aHCImage = m_hdImage_hc;
-    }
+    } 
     else if( nBitmap == IMG_LIB )
     {
         aImage = m_libImage;
@@ -460,7 +460,7 @@ void __EXPORT SFTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
     {
         node = userData->GetNode();
         model = userData->GetModel();
-        RequestSubEntries( pEntry, node, model );
+        RequestSubEntries( pEntry, node, model );    
         userData->setLoaded();
     }
 }
@@ -565,7 +565,7 @@ SvxScriptOrgDialog::SvxScriptOrgDialog( Window* pParent, ::rtl::OUString languag
         m_createDupStr( CUI_RES ( RID_SVXSTR_CREATEFAILEDDUP ) ),
         m_createErrTitleStr( CUI_RES( RID_SVXSTR_CREATEFAILED_TITLE ) ),
         m_renameErrStr( CUI_RES ( RID_SVXSTR_RENAMEFAILED ) ),
-        m_renameErrTitleStr( CUI_RES( RID_SVXSTR_RENAMEFAILED_TITLE ) )
+        m_renameErrTitleStr( CUI_RES( RID_SVXSTR_RENAMEFAILED_TITLE ) ) 
 {
 
     // must be a neater way to deal with the strings than as above
@@ -604,22 +604,22 @@ short SvxScriptOrgDialog::Execute()
 
     SfxObjectShell *pDoc = SfxObjectShell::GetFirst();
 
-    // force load of MSPs for all documents
-    while ( pDoc )
+    // force load of MSPs for all documents    
+    while ( pDoc )    
     {
-        Reference< provider::XScriptProviderSupplier > xSPS =
+        Reference< provider::XScriptProviderSupplier > xSPS = 
             Reference< provider::XScriptProviderSupplier >
                                         ( pDoc->GetModel(), UNO_QUERY );
         if ( xSPS.is() )
         {
-            Reference< provider::XScriptProvider > ScriptProvider =
+            Reference< provider::XScriptProvider > ScriptProvider = 
             xSPS->getScriptProvider();
         }
-
+            
         pDoc = SfxObjectShell::GetNext(*pDoc);
     }
     aScriptsBox.ExpandAllTrees();
-
+    
     Window* pPrevDlgParent = Application::GetDefDialogParent();
     Application::SetDefDialogParent( this );
     short nRet = ModalDialog::Execute();
@@ -637,20 +637,20 @@ void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node )
     {
         if ( node->getType() == browse::BrowseNodeTypes::SCRIPT)
         {
-            aRunButton.Enable();
+            aRunButton.Enable(); 
         }
         else
         {
-            aRunButton.Disable();
+            aRunButton.Disable(); 
         }
         Reference< beans::XPropertySet > xProps( node, UNO_QUERY );
-
+    
         if ( !xProps.is() )
         {
             aEditButton.Disable();
             aDelButton.Disable();
             aCreateButton.Disable();
-            aRunButton.Disable();
+            aRunButton.Disable(); 
             return;
         }
 
@@ -698,14 +698,14 @@ void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node )
         {
             aRenameButton.Disable();
         }
-    }
+    }    
     else
     {
         // no node info available, disable all configurable actions
         aDelButton.Disable();
         aCreateButton.Disable();
         aEditButton.Disable();
-        aRunButton.Disable();
+        aRunButton.Disable(); 
         aRenameButton.Disable();
     }
 }
@@ -739,7 +739,7 @@ IMPL_LINK( SvxScriptOrgDialog, ScriptSelectHdl, SvTreeListBox *, pBox )
               node = userData->GetNode();
         CheckButtons( node );
     }
-
+    
     return 0;
 }
 
@@ -750,7 +750,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton )
         StoreCurrentSelection();
         EndDialog( 0 );
     }
-    if ( pButton == &aEditButton ||
+    if ( pButton == &aEditButton ||  
             pButton == &aCreateButton ||
             pButton == &aDelButton ||
             pButton == &aRunButton ||
@@ -778,7 +778,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton )
                 {
                     return 0;
                 }
-
+                
                 if ( pButton == &aRunButton )
                 {
                     ::rtl::OUString tmpString;
@@ -887,7 +887,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton )
                     renameEntry( pEntry );
                 }
             }
-        }
+        }            
     }
     return 0;
 }
@@ -897,7 +897,7 @@ Reference< browse::XBrowseNode > SvxScriptOrgDialog::getBrowseNode( SvLBoxEntry*
     Reference< browse::XBrowseNode > node;
     if ( pEntry )
     {
-        SFEntry* userData = (SFEntry*)pEntry->GetUserData();
+        SFEntry* userData = (SFEntry*)pEntry->GetUserData();        
         if ( userData )
         {
             node = userData->GetNode();
@@ -912,7 +912,7 @@ Reference< XModel > SvxScriptOrgDialog::getModel( SvLBoxEntry* pEntry )
     Reference< XModel > model;
     if ( pEntry )
     {
-        SFEntry* userData = (SFEntry*)pEntry->GetUserData();
+        SFEntry* userData = (SFEntry*)pEntry->GetUserData();        
         if ( userData )
         {
             model = userData->GetModel();
@@ -922,7 +922,7 @@ Reference< XModel > SvxScriptOrgDialog::getModel( SvLBoxEntry* pEntry )
     return model;
 }
 
-Reference< XInterface  >
+Reference< XInterface  > 
 SvxScriptOrgDialog::getDocumentModel( Reference< XComponentContext >& xCtx, ::rtl::OUString& docName )
 {
     Reference< XInterface > xModel;
@@ -960,13 +960,13 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry )
     Reference< browse::XBrowseNode >  aChildNode;
     Reference< browse::XBrowseNode > node = getBrowseNode( pEntry );
     Reference< script::XInvocation > xInv( node, UNO_QUERY );
-
+    
     if ( xInv.is() )
     {
         ::rtl::OUString aNewName;
         ::rtl::OUString aNewStdName;
         USHORT nMode = INPUTMODE_NEWLIB;
-        if( aScriptsBox.GetModel()->GetDepth( pEntry ) == 0 )
+        if( aScriptsBox.GetModel()->GetDepth( pEntry ) == 0 ) 
         {
             aNewStdName = ::rtl::OUString::createFromAscii( "Library" ) ;
         }
@@ -979,7 +979,7 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry )
         //String aNewStdName( ResId( STR_STDMODULENAME ) );
         BOOL bValid = FALSE;
         USHORT i = 1;
-
+        
         Sequence< Reference< browse::XBrowseNode > > childNodes;
         // no children => ok to create Parcel1 or Script1 without checking
         try
@@ -1087,20 +1087,20 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry )
                 ::rtl::OUStringToOString(
                     e.Message, RTL_TEXTENCODING_ASCII_US ).pData->buffer );
         }
-    }
+    }                
     if ( aChildNode.is() )
     {
         String aChildName = aChildNode->getName();
         SvLBoxEntry* pNewEntry = NULL;
 
-
+            
         ::rtl::OUString name( aChildName );
         Reference<XModel> xDocumentModel = getModel( pEntry );
 
         // ISSUE do we need to remove all entries for parent
         // to achieve sort? Just need to determine position
         // SvTreeListBox::InsertEntry can take position arg
-        // -- Basic doesn't do this on create.
+        // -- Basic doesn't do this on create. 
         // Suppose we could avoid this too. -> created nodes are
         // not in alphabetical order
         if ( aChildNode->getType() == browse::BrowseNodeTypes::SCRIPT )
@@ -1210,7 +1210,7 @@ void SvxScriptOrgDialog::renameEntry( SvLBoxEntry* pEntry )
                 ::rtl::OUStringToOString(
                     e.Message, RTL_TEXTENCODING_ASCII_US ).pData->buffer );
         }
-    }
+    }                
     if ( aChildNode.is() )
     {
         aScriptsBox.SetEntryText( pEntry, aChildNode->getName() );
@@ -1259,12 +1259,12 @@ void SvxScriptOrgDialog::deleteEntry( SvLBoxEntry* pEntry )
                 ::rtl::OUStringToOString(
                     e.Message, RTL_TEXTENCODING_ASCII_US ).pData->buffer );
         }
-    }
-
+    }        
+    
     if ( result == sal_True )
     {
         aScriptsBox.deleteTree( pEntry );
-        aScriptsBox.GetModel()->Remove( pEntry );
+        aScriptsBox.GetModel()->Remove( pEntry );    
     }
     else
     {
@@ -1372,11 +1372,11 @@ void SvxScriptOrgDialog::RestorePreviousSelection()
     aScriptsBox.SetCurEntry( pEntry );
 }
 
-BOOL SFTreeListBox::dialogSort1( Reference< browse::XBrowseNode > node1,
+BOOL SFTreeListBox::dialogSort1( Reference< browse::XBrowseNode > node1, 
     Reference< browse::XBrowseNode > node2 )
 {
-    ::rtl::OUString userStr = ::rtl::OUString::createFromAscii("user");
-    ::rtl::OUString shareStr = ::rtl::OUString::createFromAscii("share");
+    ::rtl::OUString userStr = ::rtl::OUString::createFromAscii("user");    
+    ::rtl::OUString shareStr = ::rtl::OUString::createFromAscii("share");    
     if( node1->getName().equals( userStr ) )
         return true;
     if( node2->getName().equals( userStr ) )
@@ -1388,7 +1388,7 @@ BOOL SFTreeListBox::dialogSort1( Reference< browse::XBrowseNode > node1,
     return dialogSort2( node1, node2 );
 }
 
-BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
+BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, 
     Reference< browse::XBrowseNode > node2 )
 {
     return ( node1->getName().compareTo( node2->getName() ) < 0 );
@@ -1400,7 +1400,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
     const ::rtl::OUString& value )
 {
     sal_Int32 pos = source.indexOf( token );
-
+                                                                                
     if ( pos != -1 && value.getLength() != 0 )
     {
         return source.replaceAt( pos, token.getLength(), value );
@@ -1455,7 +1455,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
     ::rtl::OUString unknown = ::rtl::OUString::createFromAscii( "UNKNOWN" );
     ::rtl::OUString language = unknown;
     ::rtl::OUString script = unknown;
-    ::rtl::OUString line = unknown;
+    ::rtl::OUString line = unknown; 
     ::rtl::OUString type = ::rtl::OUString();
     ::rtl::OUString message = eScriptError.Message;
 
@@ -1501,7 +1501,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
     ::rtl::OUString line = unknown;
     ::rtl::OUString type = unknown;
     ::rtl::OUString message = eScriptException.Message;
-
+    
     if ( eScriptException.language.getLength() != 0 )
     {
         language = eScriptException.language;
@@ -1543,10 +1543,10 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
     ::rtl::OUString unformatted = String(
         CUI_RES( RID_SVXSTR_FRAMEWORK_ERROR_RUNNING ) );
 
-    ::rtl::OUString language =
+    ::rtl::OUString language = 
         ::rtl::OUString::createFromAscii( "UNKNOWN" );
 
-    ::rtl::OUString script =
+    ::rtl::OUString script = 
         ::rtl::OUString::createFromAscii( "UNKNOWN" );
 
     ::rtl::OUString message;
@@ -1565,10 +1565,10 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
             CUI_RES(  RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED ) );
         message =  ReplaceString(
             message, ::rtl::OUString::createFromAscii( "%LANGUAGENAME" ), language );
-
+ 
     }
     else
-    {
+    { 
         message = sError.Message;
     }
     return FormatErrorString(
@@ -1596,7 +1596,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
 ::rtl::OUString GetErrorMessage( const com::sun::star::uno::Any& aException )
 {
     ::rtl::OUString exType;
-    if ( aException.getValueType() ==
+    if ( aException.getValueType() == 
          ::getCppuType( (const reflection::InvocationTargetException* ) NULL ) )
     {
         reflection::InvocationTargetException ite;
@@ -1615,12 +1615,12 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
             ite.TargetException >>= scriptException;
             return GetErrorMessage( scriptException );
         }
-        else
+        else 
         {
             // Unknown error, shouldn't happen
             // OSL_ASSERT(...)
         }
-
+        
     }
     else if ( aException.getValueType() == ::getCppuType( ( const provider::ScriptFrameworkErrorException* ) NULL ) )
     {
@@ -1628,7 +1628,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
         provider::ScriptFrameworkErrorException sfe;
         aException >>= sfe;
         return GetErrorMessage( sfe );
-
+       
     }
     // unknown exception
     Exception e;
@@ -1638,9 +1638,9 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
         return GetErrorMessage( rte );
     }
 
-    aException >>= e;
+    aException >>= e; 
     return GetErrorMessage( e );
-
+    
 }
 
 SvxScriptErrorDialog::SvxScriptErrorDialog(
diff --git a/cui/source/dialogs/scriptdlg.hrc b/cui/source/dialogs/scriptdlg.hrc
index 95ba3ddf38c2..3fb0118b04f9 100644
--- a/cui/source/dialogs/scriptdlg.hrc
+++ b/cui/source/dialogs/scriptdlg.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,18 +29,18 @@
 
 #include <svl/solar.hrc>
 
-#define SCRIPTDLG_OFFSET        400
+#define SCRIPTDLG_OFFSET		400
 
 // ScriptOrgDialog
-#define SF_TXT_SCRIPTS                  1
-#define SF_CTRL_SCRIPTSBOX              2
-#define SF_PB_RUN                       3
-#define SF_PB_CLOSE                     4
-#define SF_PB_CREATE                    5
-#define SF_PB_EDIT                      6
-#define SF_PB_RENAME                    7
-#define SF_PB_DEL                       8
-#define SF_PB_HELP                      9
+#define SF_TXT_SCRIPTS				    1
+#define SF_CTRL_SCRIPTSBOX  			2
+#define SF_PB_RUN						3
+#define SF_PB_CLOSE					    4
+#define SF_PB_CREATE					5
+#define SF_PB_EDIT						6
+#define SF_PB_RENAME					7
+#define SF_PB_DEL						8
+#define SF_PB_HELP						9
 
 #define IMG_HARDDISK                    1
 #define IMG_HARDDISK_HC                 2
@@ -51,7 +51,7 @@
 #define IMG_DOCUMENT                    7
 #define IMG_DOCUMENT_HC                 8
 
-#define RID_IMGLST_OBJECTS              ( RID_BASICIDE_START +  7 )
+#define RID_IMGLST_OBJECTS				( RID_BASICIDE_START +  7 )
 #define RID_IMGLST_OBJECTS_HC (RID_BASICIDE_START + 13)
 
 // NewObjectDialog
@@ -67,9 +67,9 @@
 #define STR_RENAME                      19
 
 // Others
-/*
+/* 
 Please be aware that these strings are global resources, don't use self-defined values!
-You have to use the RID_SVXSTART macro do avoid ID clashes with other resource files. Sfx2 delivers
+You have to use the RID_SVXSTART macro do avoid ID clashes with other resource files. Sfx2 delivers 
 some of its own resource files to svx - where they are added to svx resource file!!
 */
 
@@ -77,4 +77,4 @@ some of its own resource files to svx - where they are added to svx resource fil
 #define STR_PRODMACROS                  33
 
 
-#endif  // _SCRIPTDLG_HRC
+#endif	// _SCRIPTDLG_HRC
diff --git a/cui/source/dialogs/scriptdlg.src b/cui/source/dialogs/scriptdlg.src
index 67a81376d662..292c862fe924 100644
--- a/cui/source/dialogs/scriptdlg.src
+++ b/cui/source/dialogs/scriptdlg.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/dialogs/sdrcelldlg.cxx b/cui/source/dialogs/sdrcelldlg.cxx
index 9686e04b57aa..01ea9b9aebe2 100644
--- a/cui/source/dialogs/sdrcelldlg.cxx
+++ b/cui/source/dialogs/sdrcelldlg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 SvxFormatCellsDialog::SvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel )
 : SfxTabDialog        ( pParent, CUI_RES( RID_SVX_FORMAT_CELLS_DLG ), pAttr )
-, mrOutAttrs            ( *pAttr )
+, mrOutAttrs			( *pAttr )
 , mpColorTab           ( pModel->GetColorTable() )
 , mpGradientList       ( pModel->GetGradientList() )
 , mpHatchingList       ( pModel->GetHatchList() )
@@ -54,7 +54,7 @@ SvxFormatCellsDialog::SvxFormatCellsDialog( Window* pParent, const SfxItemSet* p
     AddTabPage( RID_SVXPAGE_CHAR_EFFECTS );
     AddTabPage( RID_SVXPAGE_BORDER );
     AddTabPage( RID_SVXPAGE_AREA );
-
+    
 /*
     SvtCJKOptions aCJKOptions;
     if( aCJKOptions.IsAsianTypographyEnabled() )
@@ -80,11 +80,11 @@ void SvxFormatCellsDialog::PageCreated( USHORT nId, SfxTabPage &rPage )
             ( (SvxAreaTabPage&) rPage ).SetPageType( PT_AREA );
             ( (SvxAreaTabPage&) rPage ).SetDlgType( 1 );
             ( (SvxAreaTabPage&) rPage ).SetPos( 0 );
-//          ( (SvxAreaTabPage&) rPage ).SetAreaTP( &mbAreaTP );
-//          ( (SvxAreaTabPage&) rPage ).SetGrdChgd( &mnGradientListState );
-//          ( (SvxAreaTabPage&) rPage ).SetHtchChgd( &mnHatchingListState );
-//          ( (SvxAreaTabPage&) rPage ).SetBmpChgd( &mnBitmapListState );
-//          ( (SvxAreaTabPage&) rPage ).SetColorChgd( &mnColorTableState );
+//			( (SvxAreaTabPage&) rPage ).SetAreaTP( &mbAreaTP );
+//			( (SvxAreaTabPage&) rPage ).SetGrdChgd( &mnGradientListState );
+//			( (SvxAreaTabPage&) rPage ).SetHtchChgd( &mnHatchingListState );
+//			( (SvxAreaTabPage&) rPage ).SetBmpChgd( &mnBitmapListState );
+//			( (SvxAreaTabPage&) rPage ).SetColorChgd( &mnColorTableState );
             ( (SvxAreaTabPage&) rPage ).Construct();
             // ActivatePage() wird das erste mal nicht gerufen
             ( (SvxAreaTabPage&) rPage ).ActivatePage( mrOutAttrs );
diff --git a/cui/source/dialogs/sdrcelldlg.src b/cui/source/dialogs/sdrcelldlg.src
index c3ece3326544..cef68d3acf5b 100644
--- a/cui/source/dialogs/sdrcelldlg.src
+++ b/cui/source/dialogs/sdrcelldlg.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx
index 4ed267d614d4..aaee4e77cb4d 100644
--- a/cui/source/dialogs/showcols.cxx
+++ b/cui/source/dialogs/showcols.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #define CUIFM_PROP_LABEL  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Label" ) )
 
 //==========================================================================
-//  FmShowColsDialog
+//	FmShowColsDialog
 //==========================================================================
 DBG_NAME(FmShowColsDialog)
 //--------------------------------------------------------------------------
diff --git a/cui/source/dialogs/showcols.src b/cui/source/dialogs/showcols.src
index 465591e8f0a0..f4d124d1795b 100644
--- a/cui/source/dialogs/showcols.src
+++ b/cui/source/dialogs/showcols.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx
index b2574fdb1e37..39fda7fcf393 100644
--- a/cui/source/dialogs/splitcelldlg.cxx
+++ b/cui/source/dialogs/splitcelldlg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ SvxSplitTableDlg::SvxSplitTableDlg( Window *pParent, bool bIsTableVertical, long
         String sTmp(maHorzBox.GetText());
         maHorzBox.SetText(maVertBox.GetText());
         maHorzBox.SetModeRadioImage(maVertBox.GetModeRadioImage());
-        maVertBox.SetText(sTmp);
-        maVertBox.SetModeRadioImage(aTmpImg);
+        maVertBox.SetText(sTmp);    
+        maVertBox.SetModeRadioImage(aTmpImg);    
     }
 }
 
diff --git a/cui/source/dialogs/splitcelldlg.hrc b/cui/source/dialogs/splitcelldlg.hrc
index 143f4685abe4..1cf6e5b449bd 100644
--- a/cui/source/dialogs/splitcelldlg.hrc
+++ b/cui/source/dialogs/splitcelldlg.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,11 +24,11 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#define FT_COUNT    1
-#define ED_COUNT    2
+#define FT_COUNT	1
+#define ED_COUNT	2
 #define FL_COUNT    3
 
-#define RB_HORZ     10
+#define RB_HORZ		10
 #define CB_PROP     11
 #define RB_VERT     12
 #define FL_DIR      12
@@ -36,7 +36,7 @@
 #define BMP_SPLIT_VERT 13
 #define BMP_SPLIT_HORZ 14
 
-#define BT_OK       100
-#define BT_CANCEL   101
-#define BT_HELP     102
+#define BT_OK		100
+#define BT_CANCEL	101
+#define BT_HELP		102
 
diff --git a/cui/source/dialogs/splitcelldlg.src b/cui/source/dialogs/splitcelldlg.src
index 5326ca2d0e4d..ea5cbc7d108b 100644
--- a/cui/source/dialogs/splitcelldlg.src
+++ b/cui/source/dialogs/splitcelldlg.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ ModalDialog RID_SVX_SPLITCELLDLG
     Size = MAP_APPFONT ( 169 , 108 ) ;
     Text [ en-US ] = "Split Cells" ;
     Moveable = TRUE ;
-
+    
     OKButton BT_OK
     {
         Pos = MAP_APPFONT ( 115 , 6 ) ;
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index 85a4b8a9a02c..a37865dbaed5 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ void SvxSearchFormatDialog::PageCreated( USHORT nId, SfxTabPage& rPage )
     {
         case RID_SVXPAGE_CHAR_NAME:
         {
-            const FontList* pAppFontList = 0;
+            const FontList*	pAppFontList = 0;
             SfxObjectShell* pSh = SfxObjectShell::Current();
 
             if ( pSh )
@@ -144,7 +144,7 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent,
     aAttrFL ( this, CUI_RES( FL_ATTR ) ),
     aAttrLB ( this, CUI_RES( LB_ATTR ) ),
     aOKBtn  ( this, CUI_RES( BTN_ATTR_OK ) ),
-    aEscBtn ( this, CUI_RES( BTN_ATTR_CANCEL ) ),
+    aEscBtn	( this, CUI_RES( BTN_ATTR_CANCEL ) ),
     aHelpBtn( this, CUI_RES( BTN_ATTR_HELP ) ),
 
     rList( rLst )
@@ -183,7 +183,7 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent,
             }
 
             // item resources are in svx
-            sal_uInt32 nId  = aAttrNames.FindIndex( nSlot );
+            sal_uInt32 nId  = aAttrNames.FindIndex( nSlot );		
             SvLBoxEntry* pEntry = NULL;
             if ( RESARRAY_INDEX_NOTFOUND != nId )
                 pEntry = aAttrLB.SvTreeListBox::InsertEntry( aAttrNames.GetString(nId) );
@@ -268,16 +268,16 @@ SvxSearchSimilarityDialog::SvxSearchSimilarityDialog
 
     aFixedLine  ( this, CUI_RES( FL_SIMILARITY ) ),
     aOtherTxt   ( this, CUI_RES( FT_OTHER ) ),
-    aOtherFld   ( this, CUI_RES( NF_OTHER   ) ),
+    aOtherFld	( this, CUI_RES( NF_OTHER	) ),
     aLongerTxt  ( this, CUI_RES( FT_LONGER ) ),
     aLongerFld  ( this, CUI_RES( NF_LONGER ) ),
     aShorterTxt ( this, CUI_RES( FT_SHORTER ) ),
-    aShorterFld ( this, CUI_RES( NF_SHORTER ) ),
+    aShorterFld	( this, CUI_RES( NF_SHORTER ) ),
     aRelaxBox   ( this, CUI_RES( CB_RELAX ) ),
 
-    aOKBtn      ( this, CUI_RES( BTN_ATTR_OK ) ),
-    aEscBtn     ( this, CUI_RES( BTN_ATTR_CANCEL ) ),
-    aHelpBtn    ( this, CUI_RES( BTN_ATTR_HELP ) )
+    aOKBtn		( this, CUI_RES( BTN_ATTR_OK ) ),
+    aEscBtn		( this, CUI_RES( BTN_ATTR_CANCEL ) ),
+    aHelpBtn	( this, CUI_RES( BTN_ATTR_HELP ) )
 
 {
     FreeResource();
diff --git a/cui/source/dialogs/srchxtra.hrc b/cui/source/dialogs/srchxtra.hrc
index 5df6d9bd4767..939b1a96554a 100644
--- a/cui/source/dialogs/srchxtra.hrc
+++ b/cui/source/dialogs/srchxtra.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/dialogs/srchxtra.src b/cui/source/dialogs/srchxtra.src
index 04265a6d6726..d18c3c4cf2cf 100644
--- a/cui/source/dialogs/srchxtra.src
+++ b/cui/source/dialogs/srchxtra.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/dialogs/svuidlg.hrc b/cui/source/dialogs/svuidlg.hrc
index 8add126a33c7..38b89df77fec 100644
--- a/cui/source/dialogs/svuidlg.hrc
+++ b/cui/source/dialogs/svuidlg.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,104 +31,104 @@
 #define TB_LINKS                32014
 
 // gemeinsame Id's
-#define CB_DISPLAY_AS_ICON     12
-#define FI_DISPLAY             13
+#define CB_DISPLAY_AS_ICON	   12
+#define FI_DISPLAY			   13
 #define PB_CHANGE_ICON         14
 
-#define STR_AUTOLINK                            32006
-#define STR_MANUALLINK                          32007
-#define STR_BROKENLINK                          32008
-#define STR_GRAPHICLINK                         32009
-#define STR_BUTTONCLOSE                         32010
-#define STR_CLOSELINKMSG                        32011
-#define STR_CLOSELINKMSG_MULTI                  32024
-#define STR_WAITINGLINK                         32028
-#define STR_EDIT_APPLET                         32029
+#define STR_AUTOLINK							32006
+#define STR_MANUALLINK							32007
+#define STR_BROKENLINK							32008
+#define STR_GRAPHICLINK 						32009
+#define STR_BUTTONCLOSE 						32010
+#define STR_CLOSELINKMSG						32011
+#define STR_CLOSELINKMSG_MULTI					32024
+#define STR_WAITINGLINK		   					32028
+#define STR_EDIT_APPLET							32029
 
 
-#define FL_CHOICE              15
-#define LB_INSERT_LIST          7
+#define FL_CHOICE			   15
+#define LB_INSERT_LIST			7
 
-#define MD_PASTE_OBJECT     32001
-#define S_OBJECT               1
-#define RB_PASTE               20
-#define RB_PASTE_LINK          21
-#define FT_OBJECT_SOURCE       22
-#define FT_SOURCE              23
+#define MD_PASTE_OBJECT 	32001
+#define S_OBJECT			   1
+#define RB_PASTE			   20
+#define RB_PASTE_LINK		   21
+#define FT_OBJECT_SOURCE	   22
+#define FT_SOURCE			   23
 
 #define MD_UPDATE_BASELINKS 32002
-#define LB_LINKS               30
-#define FT_FILES               31
-#define FT_LINKS               32
-#define FT_TYPE                33
-#define FT_STATUS              34
-#define PB_UPDATE_NOW          35
-#define PB_OPEN_SOURCE         36
-#define PB_CHANGE_SOURCE       37
-#define PB_BREAK_LINK          38
-#define FT_SOURCE2             39
-#define FT_TYPE2               40
-#define FT_UPDATE              41
-#define RB_AUTOMATIC           42
-#define RB_MANUAL              43
+#define LB_LINKS			   30
+#define FT_FILES			   31
+#define FT_LINKS			   32
+#define FT_TYPE 			   33
+#define FT_STATUS			   34
+#define PB_UPDATE_NOW		   35
+#define PB_OPEN_SOURCE		   36
+#define PB_CHANGE_SOURCE	   37
+#define PB_BREAK_LINK		   38
+#define FT_SOURCE2			   39
+#define FT_TYPE2			   40
+#define FT_UPDATE			   41
+#define RB_AUTOMATIC		   42
+#define RB_MANUAL			   43
 #define FT_FULL_SOURCE_NAME    44
-#define FT_FULL_TYPE_NAME      45
-#define GB_LINK                46
-#define FT_FILES2              47
-#define FT_FULL_FILE_NAME      48
+#define FT_FULL_TYPE_NAME	   45
+#define GB_LINK 			   46
+#define FT_FILES2			   47
+#define FT_FULL_FILE_NAME	   48
 
-#define MD_LINKEDIT            32004
+#define MD_LINKEDIT 		   32004
 #define ED_FULL_SOURCE_NAME    1
 
-#define ED_FILEPATH             10
-#define BTN_FILEPATH            11
-#define CB_FILELINK             12
+#define ED_FILEPATH				10
+#define BTN_FILEPATH			11
+#define CB_FILELINK				12
 
-#define MD_INSERT_OBJECT_PLUGIN 32008
-#define ED_FILEURL              10
-#define BTN_FILEURL             11
-#define GB_FILEURL              12
-#define ED_PLUGINS_OPTIONS      20
-#define GB_PLUGINS_OPTIONS      21
+#define MD_INSERT_OBJECT_PLUGIN	32008
+#define ED_FILEURL				10
+#define BTN_FILEURL				11
+#define GB_FILEURL				12
+#define ED_PLUGINS_OPTIONS		20
+#define GB_PLUGINS_OPTIONS		21
 
-#define MD_INSERT_OBJECT_APPLET 32009
-#define FT_CLASSFILE            10
-#define ED_CLASSFILE            11
-#define FT_CLASSLOCATION        12
-#define ED_CLASSLOCATION        12
-#define BTN_CLASS               13
-#define GB_CLASS                14
-#define ED_APPLET_OPTIONS       20
-#define GB_APPLET_OPTIONS       21
+#define MD_INSERT_OBJECT_APPLET	32009
+#define FT_CLASSFILE			10
+#define ED_CLASSFILE			11
+#define FT_CLASSLOCATION		12
+#define ED_CLASSLOCATION		12
+#define BTN_CLASS				13
+#define GB_CLASS				14
+#define ED_APPLET_OPTIONS		20
+#define GB_APPLET_OPTIONS		21
 
-#define MD_INSERT_OLEOBJECT     32010
-#define RB_NEW_OBJECT           10
-#define RB_OBJECT_FROMFILE      11
-#define LB_OBJECTTYPE           12
-#define GB_OBJECT               13
-#define STR_FILE                14
+#define MD_INSERT_OLEOBJECT		32010
+#define RB_NEW_OBJECT			10
+#define RB_OBJECT_FROMFILE		11
+#define LB_OBJECTTYPE			12
+#define GB_OBJECT				13
+#define STR_FILE				14
 
 #define MD_INSERT_OBJECT_IFRAME 32011
-#define FT_FRAMENAME                    3
-#define ED_FRAMENAME                    4
-#define FT_URL                          5
-#define ED_URL                          6
-#define BT_FILEOPEN                     7
-#define NM_MARGINHEIGHT                 8
-#define FT_MARGINHEIGHT                 9
-#define NM_MARGINWIDTH                  10
-#define FT_MARGINWIDTH                  11
-#define GB_MARGIN                       12
-#define RB_SCROLLINGON                  13
-#define RB_SCROLLINGOFF                 14
-#define RB_SCROLLINGAUTO                15
-#define GB_SCROLLING                    16
-#define GB_BORDER                       17
-#define RB_FRMBORDER_ON                 18
-#define RB_FRMBORDER_INHERIT            19
-#define RB_FRMBORDER_OFF                20
-#define CB_MARGINWIDTHDEFAULT           21
-#define CB_MARGINHEIGHTDEFAULT          22
+#define FT_FRAMENAME					3
+#define ED_FRAMENAME					4
+#define FT_URL							5
+#define ED_URL							6
+#define BT_FILEOPEN						7
+#define NM_MARGINHEIGHT					8
+#define FT_MARGINHEIGHT					9
+#define NM_MARGINWIDTH					10
+#define FT_MARGINWIDTH					11
+#define GB_MARGIN						12
+#define RB_SCROLLINGON					13
+#define RB_SCROLLINGOFF					14
+#define RB_SCROLLINGAUTO				15
+#define GB_SCROLLING					16
+#define GB_BORDER						17
+#define RB_FRMBORDER_ON					18
+#define RB_FRMBORDER_INHERIT			19
+#define RB_FRMBORDER_OFF				20
+#define CB_MARGINWIDTHDEFAULT			21
+#define CB_MARGINHEIGHTDEFAULT			22
 #define FL_SEP_LEFT                     46
 #define FL_SEP_RIGHT                    47
 
diff --git a/cui/source/dialogs/svuidlg.src b/cui/source/dialogs/svuidlg.src
index 74a8eae82274..5cb13c897b1e 100644
--- a/cui/source/dialogs/svuidlg.src
+++ b/cui/source/dialogs/svuidlg.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ ModalDialog MD_PASTE_OBJECT
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Moveable = TRUE ;
-    Size = MAP_APPFONT ( 282 , 135 ) ;  // 12 under listbox
+    Size = MAP_APPFONT ( 282 , 135 ) ;	// 12 under listbox
     Text [ en-US ] = "Paste Special" ;
     FixedText FT_SOURCE
     {
diff --git a/cui/source/dialogs/tbxform.src b/cui/source/dialogs/tbxform.src
index 9e9d2fb6eb03..a5f43aae673c 100644
--- a/cui/source/dialogs/tbxform.src
+++ b/cui/source/dialogs/tbxform.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index d62d0d98d63e..70063438d3a6 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,23 +105,23 @@ static void GetReplaceEditString( String &rText )
 }
 
 // class LookUpComboBox_Impl --------------------------------------------------
-
-LookUpComboBox_Impl::LookUpComboBox_Impl(
+    
+LookUpComboBox_Impl::LookUpComboBox_Impl( 
     Window *pParent, const ResId &rResId, SvxThesaurusDialog_Impl &rImpl ) :
     ComboBox        (pParent, rResId),
     m_rDialogImpl( rImpl )
 {
     m_aModifyTimer.SetTimeoutHdl( LINK( this, LookUpComboBox_Impl, ModifyTimer_Hdl ) );
     m_aModifyTimer.SetTimeout( 500 );
-
+    
     EnableAutocomplete( FALSE );
 }
-
+    
 
 LookUpComboBox_Impl::~LookUpComboBox_Impl()
 {
 }
-
+    
 
 void LookUpComboBox_Impl::Modify()
 {
@@ -138,18 +138,18 @@ IMPL_LINK( LookUpComboBox_Impl, ModifyTimer_Hdl, Timer *, EMPTYARG /*pTimer*/ )
 
 
 // class ReplaceEdit_Impl --------------------------------------------------
-
-ReplaceEdit_Impl::ReplaceEdit_Impl(
+    
+ReplaceEdit_Impl::ReplaceEdit_Impl( 
     Window *pParent, const ResId &rResId ) :
     Edit        (pParent, rResId)
 {
 }
-
+    
 
 ReplaceEdit_Impl::~ReplaceEdit_Impl()
 {
 }
-
+    
 
 void ReplaceEdit_Impl::Modify()
 {
@@ -163,17 +163,17 @@ void ReplaceEdit_Impl::SetText( const XubString& rStr )
     Modify();
 }
 
-
+    
 void ReplaceEdit_Impl::SetText( const XubString& rStr, const Selection& rNewSelection )
 {
     Edit::SetText( rStr, rNewSelection );
     Modify();
-}
+}    
 
 
 // class ThesaurusAlternativesCtrl_Impl ----------------------------------
 
-AlternativesString_Impl::AlternativesString_Impl(
+AlternativesString_Impl::AlternativesString_Impl( 
     ThesaurusAlternativesCtrl_Impl &rControl,
     SvLBoxEntry* pEntry, USHORT nFlags, const String& rStr ) :
     //
@@ -182,8 +182,8 @@ AlternativesString_Impl::AlternativesString_Impl(
 {
 }
 
-void AlternativesString_Impl::Paint(
-    const Point& rPos,
+void AlternativesString_Impl::Paint( 
+    const Point& rPos, 
     SvLBox& rDev, USHORT,
     SvLBoxEntry* pEntry )
 {
@@ -204,9 +204,9 @@ void AlternativesString_Impl::Paint(
 }
 
 
-ThesaurusAlternativesCtrl_Impl::ThesaurusAlternativesCtrl_Impl(
+ThesaurusAlternativesCtrl_Impl::ThesaurusAlternativesCtrl_Impl( 
         Window* pParent,
-        SvxThesaurusDialog_Impl &rImpl ) :
+        SvxThesaurusDialog_Impl &rImpl ) : 
     SvxCheckListBox( pParent, CUI_RES( CT_THES_ALTERNATIVES ) ),
     m_rDialogImpl( rImpl )
 {
@@ -228,8 +228,8 @@ void ThesaurusAlternativesCtrl_Impl::ClearExtraData()
 }
 
 
-void ThesaurusAlternativesCtrl_Impl::SetExtraData(
-    const SvLBoxEntry *pEntry,
+void ThesaurusAlternativesCtrl_Impl::SetExtraData( 
+    const SvLBoxEntry *pEntry, 
     const AlternativesExtraData &rData )
 {
     if (!pEntry)
@@ -243,7 +243,7 @@ void ThesaurusAlternativesCtrl_Impl::SetExtraData(
 }
 
 
-AlternativesExtraData * ThesaurusAlternativesCtrl_Impl::GetExtraData(
+AlternativesExtraData * ThesaurusAlternativesCtrl_Impl::GetExtraData( 
     const SvLBoxEntry *pEntry )
 {
     AlternativesExtraData *pRes = NULL;
@@ -263,14 +263,14 @@ SvLBoxEntry * ThesaurusAlternativesCtrl_Impl::AddEntry( sal_Int32 nVal, const St
         aText = String::CreateFromInt32( nVal );
         aText += A2S( ". " );
     }
-    pEntry->AddItem( new SvLBoxString( pEntry, 0, String() ) ); // add empty column
+    pEntry->AddItem( new SvLBoxString( pEntry, 0, String() ) );	// add empty column
     aText += rText;
     pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0 ) );  // otherwise crash
     pEntry->AddItem( new AlternativesString_Impl( *this, pEntry, 0, aText ) );
 
     SetExtraData( pEntry, AlternativesExtraData( rText, bIsHeader ) );
     GetModel()->Insert( pEntry );
-
+    
     if (bIsHeader)
         GetViewDataEntry( pEntry )->SetSelectable( false );
 
@@ -288,7 +288,7 @@ void ThesaurusAlternativesCtrl_Impl::KeyInput( const KeyEvent& rKEvt )
         m_rDialogImpl.AlternativesDoubleClickHdl_Impl( this ); // look up current selected entry
     else if (GetEntryCount())
         SvxCheckListBox::KeyInput( rKEvt );
-}
+}    
 
 
 void ThesaurusAlternativesCtrl_Impl::Paint( const Rectangle& rRect )
@@ -296,11 +296,11 @@ void ThesaurusAlternativesCtrl_Impl::Paint( const Rectangle& rRect )
     if (!m_rDialogImpl.m_bWordFound)
     {
 /*        Push( PUSH_FONT );
-
+        
         Font aFont( GetFont() );
         aFont.SetHeight( 2 * aFont.GetHeight() );
         SetFont( aFont );
-*/
+*/        
         Size aTextSize( GetTextWidth( m_rDialogImpl.aErrStr ), GetTextHeight() );
         aTextSize  = LogicToPixel( aTextSize );
         Point aPos;
@@ -308,13 +308,13 @@ void ThesaurusAlternativesCtrl_Impl::Paint( const Rectangle& rRect )
         aPos.Y() += GetSizePixel().Height() / 2 /*- aTextSize.Height() / 2*/;
         aPos = PixelToLogic( aPos );
         DrawText( aPos, m_rDialogImpl.aErrStr );
-
+        
 //        Pop();
     }
     else
         SvxCheckListBox::Paint( rRect );
 }
-
+    
 
 // struct SvxThesaurusDialog_Impl ----------------------------------------
 
@@ -342,7 +342,7 @@ SvxThesaurusDialog_Impl::SvxThesaurusDialog_Impl( SvxThesaurusDialog * pDialog )
     m_bWordFound( false )
 {
     // note: FreeResource must only be called in the c-tor of SvxThesaurusDialog
-
+    
     aReplaceEdit.SetButton( &aReplaceBtn );
 
     aLeftBtn.SetClickHdl( LINK( this, SvxThesaurusDialog_Impl, LeftBtnHdl_Impl ) );
@@ -398,7 +398,7 @@ bool SvxThesaurusDialog_Impl::UpdateAlternativesBox_Impl()
     const uno::Reference< linguistic2::XMeaning > *pMeanings = aMeanings.getConstArray();
 
     m_pAlternativesCT->SetUpdateMode( FALSE );
-
+    
     // clear old user data of control before creating new ones via AddEntry below
     m_pAlternativesCT->ClearExtraData();
 
@@ -411,7 +411,7 @@ bool SvxThesaurusDialog_Impl::UpdateAlternativesBox_Impl()
         const OUString *pSynonyms = aSynonyms.getConstArray();
         DBG_ASSERT( rMeaningTxt.getLength() > 0, "meaning with empty text" );
         DBG_ASSERT( nSynonyms > 0, "meaning without synonym" );
-
+        
         m_pAlternativesCT->AddEntry( i + 1, rMeaningTxt, true );
         for (sal_Int32 k = 0;  k < nSynonyms;  ++k)
             m_pAlternativesCT->AddEntry( -1, pSynonyms[k], false );
@@ -420,7 +420,7 @@ bool SvxThesaurusDialog_Impl::UpdateAlternativesBox_Impl()
     m_pAlternativesCT->SetUpdateMode( TRUE );
 
     return nMeanings > 0;
-}
+}    
 
 
 void SvxThesaurusDialog_Impl::LookUp( const String &rText )
@@ -428,7 +428,7 @@ void SvxThesaurusDialog_Impl::LookUp( const String &rText )
     if (rText != aWordCB.GetText()) // avoid moving of the cursor if the text is the same
         aWordCB.SetText( rText );
     LookUp_Impl();
-}
+}    
 
 
 IMPL_LINK( SvxThesaurusDialog_Impl, LeftBtnHdl_Impl, Button *, pBtn )
@@ -468,7 +468,7 @@ void SvxThesaurusDialog_Impl::LookUp_Impl()
     String aText( aWordCB.GetText() );
 
     aLookUpText = OUString( aText );
-    if (aLookUpText.getLength() > 0 &&
+    if (aLookUpText.getLength() > 0 && 
             (aLookUpHistory.size() == 0 || aLookUpText != aLookUpHistory.top()))
         aLookUpHistory.push( aLookUpText );
 
@@ -507,7 +507,7 @@ IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesSelectHdl_Impl, SvxCheckListBox
         String aStr;
         if (pData && !pData->IsHeader())
         {
-            aStr = pData->GetText();
+            aStr = pData->GetText(); 
             GetReplaceEditString( aStr );
         }
         aReplaceEdit.SetText( aStr );
@@ -525,16 +525,16 @@ IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesDoubleClickHdl_Impl, SvxCheckLis
         String aStr;
         if (pData && !pData->IsHeader())
         {
-            aStr = pData->GetText();
+            aStr = pData->GetText(); 
             GetReplaceEditString( aStr );
         }
-
+        
         aWordCB.SetText( aStr );
         if (aStr.Len() > 0)
             LookUp_Impl();
     }
 
-    //! workaround to set the selection since calling SelectEntryPos within
+    //! workaround to set the selection since calling SelectEntryPos within 
     //! the double click handler does not work
     Application::PostUserEvent( STATIC_LINK( this, SvxThesaurusDialog_Impl, SelectFirstHdl_Impl ), pBox );
     return 0;
@@ -554,10 +554,10 @@ IMPL_STATIC_LINK( SvxThesaurusDialog_Impl, SelectFirstHdl_Impl, SvxCheckListBox
 static Image lcl_GetImageFromPngUrl( const OUString &rFileUrl )
 {
     Image aRes;
-
+    
     OUString aTmp;
     osl::FileBase::getSystemPathFromFileURL( rFileUrl, aTmp );
-
+    
     Graphic aGraphic;
     const String aFilterName( RTL_CONSTASCII_USTRINGPARAM( IMP_PNG ) );
     if( GRFILTER_OK == GraphicFilter::LoadGraphic( aTmp, aFilterName, aGraphic, NULL, NULL ) )
@@ -579,7 +579,7 @@ static String lcl_GetThesImplName( const lang::Locale &rLocale )
         xLngMgr = uno::Reference< linguistic2::XLinguServiceManager >( xMSF->createInstance(
                 OUString( RTL_CONSTASCII_USTRINGPARAM(
                     "com.sun.star.linguistic2.LinguServiceManager" ))), uno::UNO_QUERY_THROW );
-
+    
         DBG_ASSERT( xLngMgr.is(), "LinguServiceManager missing" );
         if (xLngMgr.is())
         {
@@ -589,22 +589,22 @@ static String lcl_GetThesImplName( const lang::Locale &rLocale )
             DBG_ASSERT( aServiceNames.getLength() <= 1, "more than one thesaurus found. Should not be possible" );
             if (aServiceNames.getLength() == 1)
                 aRes = aServiceNames[0];
-        }
+        }    
     }
-    catch (uno::Exception &e)
+    catch (uno::Exception &e)    
     {
         (void) e;
         DBG_ASSERT( 0, "failed to get thesaurus" );
-    }
-
+    }    
+    
     return aRes;
 }
-
+    
 
 void SvxThesaurusDialog_Impl::UpdateVendorImage()
 {
     m_pDialog->SetUpdateMode( sal_False );
-
+    
     SvtLinguConfig aCfg;
     if (aCfg.HasVendorImages( "ThesaurusDialogImage" ))
     {
@@ -619,15 +619,15 @@ void SvxThesaurusDialog_Impl::UpdateVendorImage()
             aImage = bHC ? aVendorDefaultImageHC : aVendorDefaultImage;
         aVendorImageFI.SetImage( aImage );
     }
-
+    
     m_pDialog->SetUpdateMode( sal_True );
 }
 
-
+    
 IMPL_STATIC_LINK( SvxThesaurusDialog_Impl, VendorImageInitHdl, SvxThesaurusDialog_Impl *, EMPTYARG )
 {
     pThis->m_pDialog->SetUpdateMode( sal_False );
-
+    
     SvtLinguConfig aCfg;
     if (aCfg.HasVendorImages( "ThesaurusDialogImage" ))
     {
@@ -676,20 +676,20 @@ IMPL_STATIC_LINK( SvxThesaurusDialog_Impl, VendorImageInitHdl, SvxThesaurusDialo
         pThis->m_pDialog->SetSizePixel( aDlgSize );
         pThis->m_pDialog->Invalidate();
     }
-
+    
     pThis->UpdateVendorImage();
     pThis->m_pDialog->SetUpdateMode( sal_True );
-
+    
     return 0;
 };
 
 
 // class SvxThesaurusDialog ----------------------------------------------
 
-SvxThesaurusDialog::SvxThesaurusDialog(
-    Window* pParent,
+SvxThesaurusDialog::SvxThesaurusDialog( 
+    Window* pParent, 
     uno::Reference< linguistic2::XThesaurus >  xThes,
-    const String &rWord,
+    const String &rWord, 
     LanguageType nLanguage ) :
 
     SvxStandardDialog( pParent, CUI_RES( RID_SVXDLG_THESAURUS ) )
@@ -738,7 +738,7 @@ SvxThesaurusDialog::SvxThesaurusDialog(
     m_pImpl->aLangMBtn.SetPopupMenu( pMenu );
 
     SetWindowTitle( nLanguage );
-
+    
     // disable controls if service is missing
     if (!m_pImpl->xThesaurus.is())
         Enable( sal_False );
@@ -763,7 +763,7 @@ void SvxThesaurusDialog::SetWindowTitle( LanguageType nLanguage )
 
 
 String SvxThesaurusDialog::GetWord()
-{
+{ 
     return m_pImpl->aReplaceEdit.GetText();
 }
 
diff --git a/cui/source/dialogs/thesdlg.hrc b/cui/source/dialogs/thesdlg.hrc
index 994c933246de..46e122723e81 100755
--- a/cui/source/dialogs/thesdlg.hrc
+++ b/cui/source/dialogs/thesdlg.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 // defines ---------------------------------------------------------------
 
 #define BTN_LEFT                 9
-#define BTN_THES_OK             10
-#define BTN_THES_CANCEL         11
+#define BTN_THES_OK	   			10
+#define BTN_THES_CANCEL			11
 #define MB_LANGUAGE             12
-#define BTN_THES_HELP           13
-#define FT_WORD                 15
+#define BTN_THES_HELP			13
+#define FT_WORD					15
 #define CB_WORD                 16
-#define FT_REPL                 21
-#define ED_REPL                 22
+#define FT_REPL					21
+#define ED_REPL					22
 #define FL_VAR                  23
 #define FT_THES_ALTERNATIVES    24
 #define CT_THES_ALTERNATIVES    25
diff --git a/cui/source/dialogs/thesdlg.src b/cui/source/dialogs/thesdlg.src
index 6c6a6444b33d..058435d3f378 100755
--- a/cui/source/dialogs/thesdlg.src
+++ b/cui/source/dialogs/thesdlg.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR 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.
  *
  ************************************************************************/
-
+ 
 #include "cuires.hrc"
 #include "thesdlg.hrc"
 #include "helpid.hrc"
 #include <svx/svxids.hrc> // SID_THESAURUS
-
+ 
 
  // RID_SVXDLG_THES -------------------------------------------------------
 ModalDialog RID_SVXDLG_THESAURUS
@@ -47,7 +47,7 @@ ModalDialog RID_SVXDLG_THESAURUS
         Size = MAP_APPFONT ( 235, 0  ) ;    // correct size will be applied at runtime
         Hide = TRUE;
     };
-
+    
     ImageButton BTN_LEFT
     {
         Pos = MAP_APPFONT ( 5 , 15 ) ;
@@ -66,7 +66,7 @@ ModalDialog RID_SVXDLG_THESAURUS
     {
         DropDown = TRUE ;
         Pos = MAP_APPFONT ( 24 , 16 ) ;
-        Size = MAP_APPFONT ( 141 , 60 ) ;   // have drop down space for several lines
+        Size = MAP_APPFONT ( 141 , 60 ) ;   // have drop down space for several lines 
     };
     MenuButton MB_LANGUAGE
     {
@@ -74,7 +74,7 @@ ModalDialog RID_SVXDLG_THESAURUS
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~Language" ;
     };
-
+    
     FixedText FT_THES_ALTERNATIVES
     {
         Pos = MAP_APPFONT ( 5 , 33 ) ;
diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx
index d72b8625e3ea..573eaed1c2fe 100644
--- a/cui/source/dialogs/thesdlg_impl.hxx
+++ b/cui/source/dialogs/thesdlg_impl.hxx
@@ -86,7 +86,7 @@ public:
     // ComboBox
     virtual void        Modify();
 };
-
+    
 // class ReplaceEdit_Impl --------------------------------------------------
 
 class ReplaceEdit_Impl : public Edit
@@ -108,12 +108,12 @@ public:
     virtual void        SetText( const XubString& rStr );
     virtual void        SetText( const XubString& rStr, const Selection& rNewSelection );
 };
-
+    
 // class ThesaurusAlternativesCtrl_Impl ----------------------------------
 
 class AlternativesExtraData
 {
-    String  sText;
+    String	sText;
     bool    bHeader;
 
 public:
@@ -123,7 +123,7 @@ public:
         bHeader(bIsHeader)
         {
         }
-
+    
     bool  IsHeader() const          { return bHeader; }
     const String& GetText() const   { return sText; }
 };
@@ -141,7 +141,7 @@ public:
 };
 
 
-class ThesaurusAlternativesCtrl_Impl :
+class ThesaurusAlternativesCtrl_Impl : 
     public SvxCheckListBox
 {
     SvxThesaurusDialog_Impl &   m_rDialogImpl;
@@ -189,17 +189,17 @@ struct SvxThesaurusDialog_Impl
     OKButton                aReplaceBtn;
     CancelButton            aCancelBtn;
 
-    String          aErrStr;
+    String			aErrStr;
     Image           aVendorDefaultImage;
     Image           aVendorDefaultImageHC;
 
-    uno::Reference< linguistic2::XThesaurus >   xThesaurus;
+    uno::Reference< linguistic2::XThesaurus >	xThesaurus;
     OUString                aLookUpText;
     LanguageType            nLookUpLanguage;
     std::stack< OUString >  aLookUpHistory;
     bool                    m_bWordFound;
 
-
+    
     // Handler
     DECL_LINK( LeftBtnHdl_Impl, Button * );
     DECL_LINK( LanguageHdl_Impl, MenuButton * );
@@ -210,14 +210,14 @@ struct SvxThesaurusDialog_Impl
 
     DECL_STATIC_LINK( SvxThesaurusDialog_Impl, SelectFirstHdl_Impl, SvxCheckListBox * );
     DECL_STATIC_LINK( SvxThesaurusDialog_Impl, VendorImageInitHdl, SvxThesaurusDialog_Impl * );
-
-
+    
+    
     SvxThesaurusDialog_Impl( SvxThesaurusDialog * pDialog );
     ~SvxThesaurusDialog_Impl();
 
-    uno::Sequence< uno::Reference< linguistic2::XMeaning > > SAL_CALL
+    uno::Sequence< uno::Reference< linguistic2::XMeaning > > SAL_CALL 
             queryMeanings_Impl( ::rtl::OUString& rTerm, const lang::Locale& rLocale, const beans::PropertyValues& rProperties ) throw(lang::IllegalArgumentException, uno::RuntimeException);
-
+    
     bool    UpdateAlternativesBox_Impl();
     void    UpdateVendorImage();
     void    LookUp( const String &rText );
diff --git a/cui/source/dialogs/winpluginlib.cpp b/cui/source/dialogs/winpluginlib.cpp
index c7f0e0af1d61..a8e8a3abac2c 100644
--- a/cui/source/dialogs/winpluginlib.cpp
+++ b/cui/source/dialogs/winpluginlib.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
@@ -38,7 +38,7 @@
 #include <stdio.h>
 
 
-#define SO_PATH_SIZE        4096
+#define SO_PATH_SIZE		4096 
 #define MOZ_PLUGIN_DLL_NAME "npsopluginmi.dll"
 extern "C" {
 int lc_isInstalled(const  char* realFilePath)
@@ -62,7 +62,7 @@ int lc_isInstalled(const  char* realFilePath)
         RegCloseKey(hKeySoftware);
         if( ret == ERROR_FILE_NOT_FOUND)
             return 1;
-        else
+        else 
             return -1;
     }
     ret = RegOpenKeyEx(hMozillaPlugins,  "@sun.com/npsopluginmi;version=1.0",  0,  KEY_READ, &hStarOffice);
@@ -71,16 +71,16 @@ int lc_isInstalled(const  char* realFilePath)
         RegCloseKey(hMozillaPlugins);
         if( ret == ERROR_FILE_NOT_FOUND)
             return 1;
-        else
+        else 
             return -1;
     }
-
-    if((realFilePath == NULL) || (strlen(realFilePath) == 0) || (strlen(realFilePath) >= SO_PATH_SIZE))
-        ret = -1;
+    
+    if((realFilePath == NULL) || (strlen(realFilePath) == 0) || (strlen(realFilePath) >= SO_PATH_SIZE)) 
+        ret = -1;	    
     else{
-        sprintf(sSoPath,"%s", realFilePath);
+        sprintf(sSoPath,"%s", realFilePath);    
         ret = 0;
-    }
+    } 
     //ret =  GetCurrentDirectory( SO_PATH_SIZE, sSoPath);
     //ret = GetEnvironmentVariable("prog", sSoPath, SO_PATH_SIZE);
     // GetCurrentDirectory return the char number of the string
@@ -97,10 +97,10 @@ int lc_isInstalled(const  char* realFilePath)
         else
             ret = -1;
     }
-    else
+    else 
         ret = -1;
-    RegCloseKey(hStarOffice);
-    RegCloseKey(hMozillaPlugins);
+    RegCloseKey(hStarOffice);	
+    RegCloseKey(hMozillaPlugins);	
     RegCloseKey(hKeySoftware);
     return ret;
 }
@@ -124,7 +124,7 @@ int lc_uninstallPlugin(const  char*)
         RegCloseKey(hKeySoftware);
         if( ret == ERROR_FILE_NOT_FOUND)
             return 0;
-        else
+        else 
             return -1;
     }
 
@@ -134,7 +134,7 @@ int lc_uninstallPlugin(const  char*)
         RegCloseKey(hMozillaPlugins);
         if( ret == ERROR_FILE_NOT_FOUND)
             return 0;
-        else
+        else 
             return -1;
     }
     RegCloseKey(hStarOffice);
@@ -167,43 +167,43 @@ int lc_installPlugin(const  char* realFilePath)
     }
     ret = RegOpenKeyEx(hKeySoftware,  "MozillaPlugins",  0,  KEY_READ|KEY_WRITE, &hMozillaPlugins);
     if(ret != ERROR_SUCCESS){
-        RegCreateKeyEx(hKeySoftware,
-            "MozillaPlugins",
-            0,
-            NULL,
-            REG_OPTION_NON_VOLATILE,
-            KEY_READ|KEY_WRITE,
+        RegCreateKeyEx(hKeySoftware,  
+            "MozillaPlugins",  
+            0,  
+            NULL,  
+            REG_OPTION_NON_VOLATILE, 
+            KEY_READ|KEY_WRITE, 
             NULL,
             &hMozillaPlugins,
             &sState);
     }
 
-    ret = RegCreateKeyEx(hMozillaPlugins,
-        "@sun.com/npsopluginmi;version=1.0",
-        0,
-        NULL,
-        REG_OPTION_NON_VOLATILE,
-        KEY_READ|KEY_WRITE,
+    ret = RegCreateKeyEx(hMozillaPlugins,  
+        "@sun.com/npsopluginmi;version=1.0",  
+        0,  
+        NULL,  
+        REG_OPTION_NON_VOLATILE, 
+        KEY_READ|KEY_WRITE, 
         NULL,
-        &hStarOffice,
+        &hStarOffice, 
         &sState);
     if(ret != ERROR_SUCCESS){
         RegCloseKey(hKeySoftware);
         RegCloseKey(hMozillaPlugins);
         return -1;
     }
-
+    
     RegFlushKey(hStarOffice);
     RegFlushKey(hMozillaPlugins);
-
-
-    if((realFilePath == NULL) || (strlen(realFilePath) == 0) || (strlen(realFilePath) >= SO_PATH_SIZE))
-        ret = -1;
+    
+    
+    if((realFilePath == NULL) || (strlen(realFilePath) == 0) || (strlen(realFilePath) >= SO_PATH_SIZE)) 
+        ret = -1;	    
     else{
-        sprintf(sSoPath,"%s", realFilePath);
-        ret = 0;
+        sprintf(sSoPath,"%s", realFilePath); 
+        ret = 0; 
     }
-
+       
     //ret =  GetCurrentDirectory( SO_PATH_SIZE, sSoPath);
     // GetCurrentDirectory return the char number of the string
     if(ret == 0){
@@ -213,7 +213,7 @@ int lc_installPlugin(const  char* realFilePath)
         else
             ret = -1;
     }
-    else
+    else 
         ret = -1;
     RegFlushKey(hStarOffice);
     RegFlushKey(hMozillaPlugins);
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 38a03773c7f7..04fe71d5d9b1 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <svx/viewlayoutitem.hxx>
 #include <dialmgr.hxx>
 #include <svx/zoom_def.hxx>
-#include <svx/dialogs.hrc>  // RID_SVXDLG_ZOOM
+#include <svx/dialogs.hrc>	// RID_SVXDLG_ZOOM
 #include <layout/layout-pre.hxx>
 
 #if ENABLE_LAYOUT
@@ -66,7 +66,7 @@ static USHORT pRanges[] =
     0
 };
 
-#define SPECIAL_FACTOR  ((USHORT)0xFFFF)
+#define SPECIAL_FACTOR	((USHORT)0xFFFF)
 
 // class SvxZoomDialog ---------------------------------------------------
 
@@ -211,11 +211,11 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) :
     aBottomFl       ( this, CUI_RES( FL_BOTTOM ) ),
     aOKBtn          ( this, CUI_RES( BTN_ZOOM_OK ) ),
     aCancelBtn      ( this, CUI_RES( BTN_ZOOM_CANCEL ) ),
-    aHelpBtn        ( this, CUI_RES( BTN_ZOOM_HELP ) ),
+    aHelpBtn	    ( this, CUI_RES( BTN_ZOOM_HELP ) ),
 
-    rSet        ( rCoreSet ),
+    rSet		( rCoreSet ),
     pOutSet     ( NULL ),
-    bModified   ( FALSE )
+    bModified	( FALSE )
 
 {
 #if ENABLE_LAYOUT
diff --git a/cui/source/dialogs/zoom.hrc b/cui/source/dialogs/zoom.hrc
index 49412ad085f0..0fb3a8afc6c5 100644
--- a/cui/source/dialogs/zoom.hrc
+++ b/cui/source/dialogs/zoom.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/dialogs/zoom.src b/cui/source/dialogs/zoom.src
index 8137b1c7bb89..54b995f3ddd7 100644
--- a/cui/source/dialogs/zoom.src
+++ b/cui/source/dialogs/zoom.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/factory/cuiexp.cxx b/cui/source/factory/cuiexp.cxx
index 4dfc3b19b88f..11a370c782e7 100644
--- a/cui/source/factory/cuiexp.cxx
+++ b/cui/source/factory/cuiexp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/factory/cuiresmgr.cxx b/cui/source/factory/cuiresmgr.cxx
index a7f9d20d9d4d..86f3064e09d7 100644
--- a/cui/source/factory/cuiresmgr.cxx
+++ b/cui/source/factory/cuiresmgr.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 7683eb0bcd81..ededf9174058 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include "hangulhanjadlg.hxx" //add for HangulHanjaConversionDialog
 #include "showcols.hxx" //add for FmShowColsDialog
 #include "zoom.hxx" //add for SvxZoomDialog
-#include "cuigaldlg.hxx"        //add for Gallery 6 Dialogs and 1 TabPage
-#include "cuiimapwnd.hxx"       //add for URLDlg
-#include "hlmarkwn.hxx"     //add for SvxHlinkDlgMarkWnd
-#include "srchxtra.hxx"     //add for SvxSearchFormatDialog
+#include "cuigaldlg.hxx"		//add for Gallery 6 Dialogs and 1 TabPage
+#include "cuiimapwnd.hxx"		//add for URLDlg
+#include "hlmarkwn.hxx"		//add for SvxHlinkDlgMarkWnd
+#include "srchxtra.hxx"		//add for SvxSearchFormatDialog
 #include "transfrm.hxx" //add for SvxTransformTabDialog
 #include "bbdlg.hxx" //add for SvxBorderBackgroundDlg
 #include "cuisrchdlg.hxx" //add for SvxJSearchOptionsDialog
@@ -70,13 +70,13 @@
 #include "multifil.hxx" //add for SvxMultiFileDialog
 #include "cuihyperdlg.hxx" //add for SvxHpLinkDlg
 #include "cuifmsearch.hxx" //add  for FmSearchDialog
-#include "cuigrfflt.hxx"    //add for GraphicFilterDialog
+#include "cuigrfflt.hxx"	//add for GraphicFilterDialog
 #include "cuitabarea.hxx" //add for SvxAreaTabDialog
 #include "cuitabline.hxx" //add for SvxLineTabDialog
 #include "measure.hxx" //add for SvxMeasureDialog
 #include "connect.hxx" //add for SvxConnectionDialog
 #include "dbregister.hxx" // add for DatabaseRegistrationDialog
-#include "cuioptgenrl.hxx"  //add for SvxGeneralTabPage
+#include "cuioptgenrl.hxx"	//add for SvxGeneralTabPage
 #include "optasian.hxx"
 #include "insdlg.hxx"
 #include "pastedlg.hxx"
@@ -123,7 +123,7 @@ IMPL_ABSTDLG_BASE(AbstractFmShowColsDialog_Impl);
 IMPL_ABSTDLG_BASE(AbstractHyphenWordDialog_Impl)
 IMPL_ABSTDLG_BASE(AbstractThesaurusDialog_Impl)
 
-AbstractSvxZoomDialog_Impl::~AbstractSvxZoomDialog_Impl()                                       \
+AbstractSvxZoomDialog_Impl::~AbstractSvxZoomDialog_Impl()                    					\
 {
     delete pDlg;
 }
@@ -341,11 +341,11 @@ void AbstractHangulHanjaConversionDialog_Impl::SetCurrentString(
 {
      pDlg->SetCurrentString(_rNewString,_rSuggestions,_bOriginatesFromDocument);
 }
-String   AbstractHangulHanjaConversionDialog_Impl::GetCurrentString( ) const
+String	 AbstractHangulHanjaConversionDialog_Impl::GetCurrentString( ) const
 {
     return pDlg->GetCurrentString();
 }
-editeng::HangulHanjaConversion::ConversionFormat     AbstractHangulHanjaConversionDialog_Impl::GetConversionFormat( ) const
+editeng::HangulHanjaConversion::ConversionFormat	 AbstractHangulHanjaConversionDialog_Impl::GetConversionFormat( ) const
 {
     return pDlg->GetConversionFormat();
 }
@@ -355,7 +355,7 @@ void AbstractHangulHanjaConversionDialog_Impl::FocusSuggestion( )
     pDlg->FocusSuggestion();
 }
 
-String  AbstractHangulHanjaConversionDialog_Impl::GetCurrentSuggestion( ) const
+String	AbstractHangulHanjaConversionDialog_Impl::GetCurrentSuggestion( ) const
 {
     return pDlg->GetCurrentSuggestion();
 }
@@ -370,7 +370,7 @@ sal_uInt16 AbstractThesaurusDialog_Impl::GetLanguage() const
     return pDlg->GetLanguage();
 };
 
-Window* AbstractThesaurusDialog_Impl::GetWindow()
+Window*	AbstractThesaurusDialog_Impl::GetWindow()
 {
     return pDlg;
 }
@@ -385,7 +385,7 @@ void AbstractHyphenWordDialog_Impl::SelRight()
     pDlg->SelRight();
 }
 
-Window* AbstractHyphenWordDialog_Impl::GetWindow()
+Window*	AbstractHyphenWordDialog_Impl::GetWindow()
 {
     return pDlg;
 }
@@ -486,7 +486,7 @@ void AbstractSearchProgress_Impl::SetDirectory( const INetURLObject& rURL )
 {
      pDlg->SetDirectory( rURL );
 }
-PLinkStub   AbstractSearchProgress_Impl::GetLinkStubCleanUpHdl()
+PLinkStub	AbstractSearchProgress_Impl::GetLinkStubCleanUpHdl()
 {
     return SearchProgress::LinkStubCleanUpHdl;
 }
@@ -506,7 +506,7 @@ void AbstractTakeProgress_Impl::SetFile( const INetURLObject& rURL )
      pDlg->SetFile( rURL );
 }
 
-PLinkStub   AbstractTakeProgress_Impl::GetLinkStubCleanUpHdl()
+PLinkStub	AbstractTakeProgress_Impl::GetLinkStubCleanUpHdl()
 {
     return TakeProgress::LinkStubCleanUpHdl;
 }
@@ -989,7 +989,7 @@ Window * AbstractSvxPostItDialog_Impl::GetWindow()
 String AbstractPasswordToOpenModifyDialog_Impl::GetPasswordToOpen() const
 {
     return pDlg->GetPasswordToOpen();
-}
+}    
 String AbstractPasswordToOpenModifyDialog_Impl::GetPasswordToModify() const
 {
     return pDlg->GetPasswordToModify();
@@ -1138,7 +1138,7 @@ AbstractSvxCaptionDialog*       AbstractDialogFactory_Impl::CreateCaptionDialog(
     return new AbstractSvxCaptionDialog_Impl( pDlg );
 }
 
-AbstractSvxDistributeDialog*    AbstractDialogFactory_Impl::CreateSvxDistributeDialog(Window* pParent,
+AbstractSvxDistributeDialog* 	AbstractDialogFactory_Impl::CreateSvxDistributeDialog(Window* pParent,
                                             const SfxItemSet& rAttr,
                                             SvxDistributeHorizontal eHor ,
                                             SvxDistributeVertical eVer)
@@ -1154,7 +1154,7 @@ AbstractHangulHanjaConversionDialog* AbstractDialogFactory_Impl::CreateHangulHan
     return new AbstractHangulHanjaConversionDialog_Impl( pDlg );
 }
 
-AbstractThesaurusDialog* AbstractDialogFactory_Impl::CreateThesaurusDialog( Window* pParent,
+AbstractThesaurusDialog* AbstractDialogFactory_Impl::CreateThesaurusDialog( Window* pParent, 
                                 ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus >  xThesaurus,
                                 const String &rWord, sal_Int16 nLanguage )
 {
@@ -1346,7 +1346,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabItemDialog( Window* p
     return 0;
 }
 
-VclAbstractDialog*      AbstractDialogFactory_Impl::CreateSvxSearchAttributeDialog( Window* pParent,
+VclAbstractDialog* 		AbstractDialogFactory_Impl::CreateSvxSearchAttributeDialog( Window* pParent,
                                             SearchAttrItemList& rLst,
                                             const USHORT* pWhRanges )
 {
@@ -1448,7 +1448,7 @@ AbstractSvxNewDictionaryDialog * AbstractDialogFactory_Impl::CreateSvxNewDiction
     return 0;
 }
 
-VclAbstractDialog*      AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialog( Window* pParent,
+VclAbstractDialog* 		AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialog( Window* pParent,
                                             const String& rName,
                                             ::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl,
                                             sal_uInt32 nResId )
@@ -1812,17 +1812,17 @@ CreateTabPage AbstractDialogFactory_Impl::GetTabPageCreatorFunc( USHORT nId )
     return 0;
 }
 
-CreateSvxDistributePage AbstractDialogFactory_Impl::GetSvxDistributePageCreatorFunc()
+CreateSvxDistributePage	AbstractDialogFactory_Impl::GetSvxDistributePageCreatorFunc()
 {
     return SvxDistributePage::Create;
 }
 
-DialogGetRanges AbstractDialogFactory_Impl::GetDialogGetRangesFunc( USHORT nId )
+DialogGetRanges	AbstractDialogFactory_Impl::GetDialogGetRangesFunc( USHORT nId )
 {
         switch ( nId )
     {
         case RID_SVXDLG_POSTIT:
-            return SvxPostItDialog::GetRanges;  //add for SvxPostItDialog
+            return SvxPostItDialog::GetRanges;	//add for SvxPostItDialog
         default:
             break;
     }
@@ -1953,7 +1953,7 @@ SvxAbstractSplittTableDialog* AbstractDialogFactory_Impl::CreateSvxSplittTableDi
     return new SvxSplitTableDlg( pParent, bIsTableVertical, nMaxVertical, nMaxHorizontal );
 }
 
-SvxAbstractNewTableDialog* AbstractDialogFactory_Impl::CreateSvxNewTableDialog( Window* pParent )
+SvxAbstractNewTableDialog* AbstractDialogFactory_Impl::CreateSvxNewTableDialog( Window* pParent ) 
 {
     return new SvxNewTableDialog( pParent );
 }
@@ -1969,13 +1969,13 @@ SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Wind
     return new SvxInsRowColDlg( pParent, bCol, nHelpId );
 }
 
-AbstractPasswordToOpenModifyDialog * AbstractDialogFactory_Impl::CreatePasswordToOpenModifyDialog(
+AbstractPasswordToOpenModifyDialog * AbstractDialogFactory_Impl::CreatePasswordToOpenModifyDialog( 
     Window * pParent,
     sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify )
 {
     PasswordToOpenModifyDialog * pDlg = new PasswordToOpenModifyDialog( pParent, nMinPasswdLen, nMaxPasswdLen, bIsPasswordToModify );
     return new AbstractPasswordToOpenModifyDialog_Impl( pDlg );
-}
+}    
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 09659128b47a..30e2da2f98ae 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #define _CUI_DLGFACT_HXX
 
 // include ---------------------------------------------------------------
-#include <svx/svxdlg.hxx>
+#include <svx/svxdlg.hxx> 
 #include <com/sun/star/container/XNameReplace.hpp>
 
 #include "tools/link.hxx"
@@ -72,24 +72,24 @@ class HangulHanjaConversionDialog;
 }
 using namespace svx;
 
-#define DECL_ABSTDLG_BASE(Class,DialogClass)        \
-    DialogClass*        pDlg;                       \
-public:                                             \
-                    Class( DialogClass* p)          \
-                     : pDlg(p)                      \
+#define DECL_ABSTDLG_BASE(Class,DialogClass)		\
+    DialogClass* 		pDlg;                   	\
+public:												\
+                    Class( DialogClass* p)			\
+                     : pDlg(p)						\
                      {}                             \
-    virtual         ~Class();                       \
-    virtual short   Execute() ;
-//  virtual void    Show( BOOL bVisible = TRUE, USHORT nFlags = 0 )
+    virtual			~Class();               		\
+    virtual	short	Execute() ;
+//	virtual void	Show( BOOL bVisible = TRUE, USHORT nFlags = 0 )
 
-#define IMPL_ABSTDLG_BASE(Class)                    \
-Class::~Class()                                     \
+#define IMPL_ABSTDLG_BASE(Class)					\
+Class::~Class()                    					\
 {                                                   \
-    delete pDlg;                                    \
-}                                                   \
+    delete pDlg;                                 	\
+}													\
 short Class::Execute()                             \
 {                                                   \
-    return pDlg->Execute();                         \
+    return pDlg->Execute();                      	\
 }
 
 //for GalleryThemeProperties begin
@@ -124,23 +124,23 @@ class VclAbstractRefreshableDialog_Impl : public VclAbstractRefreshableDialog
 class AbstractSfxDialog_Impl : public SfxAbstractDialog
 {
     DECL_ABSTDLG_BASE(AbstractSfxDialog_Impl,SfxModalDialog)
-    virtual const SfxItemSet*   GetOutputItemSet() const;
+    virtual const SfxItemSet* 	GetOutputItemSet() const;
 
         //From class Window.
-    virtual void        SetText( const XubString& rStr );
-    virtual String      GetText() const ;
+    virtual void		SetText( const XubString& rStr ); 
+    virtual String   	GetText() const ;
 };
 
 class AbstractTabDialog_Impl : public SfxAbstractTabDialog
 {
     DECL_ABSTDLG_BASE(AbstractTabDialog_Impl,SfxTabDialog)
-    virtual void                SetCurPageId( USHORT nId );
-    virtual const SfxItemSet*   GetOutputItemSet() const;
-    virtual const USHORT*       GetInputRanges( const SfxItemPool& pItem ); //add by CHINA001
-    virtual void                SetInputSet( const SfxItemSet* pInSet );   //add by CHINA001
+    virtual void				SetCurPageId( USHORT nId );
+    virtual const SfxItemSet* 	GetOutputItemSet() const;
+    virtual const USHORT*		GetInputRanges( const SfxItemPool& pItem );	//add by CHINA001
+    virtual void				SetInputSet( const SfxItemSet* pInSet );   //add by CHINA001
         //From class Window.
-    virtual void        SetText( const XubString& rStr ); //add by CHINA001
-    virtual String      GetText() const; //add by CHINA001
+    virtual void		SetText( const XubString& rStr ); //add by CHINA001
+    virtual String   	GetText() const; //add by CHINA001
 };
 
 //for SvxDistributeDialog begin
@@ -158,47 +158,47 @@ public:
 class AbstractHangulHanjaConversionDialog_Impl: public AbstractHangulHanjaConversionDialog
 {
     DECL_ABSTDLG_BASE(AbstractHangulHanjaConversionDialog_Impl,HangulHanjaConversionDialog)
-    virtual void    EndDialog(long nResult = 0);
+    virtual void	EndDialog(long nResult = 0);
     virtual void    EnableRubySupport( sal_Bool _bVal );
-    virtual void    SetByCharacter( sal_Bool _bByCharacter ) ;
-    virtual void    SetConversionDirectionState( sal_Bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection );
-    virtual void    SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType );
-    virtual void    SetOptionsChangedHdl( const Link& _rHdl );
-    virtual void    SetIgnoreHdl( const Link& _rHdl );
-    virtual void    SetIgnoreAllHdl( const Link& _rHdl ) ;
-    virtual void    SetChangeHdl( const Link& _rHdl ) ;
-    virtual void    SetChangeAllHdl( const Link& _rHdl ) ;
-    virtual void    SetClickByCharacterHdl( const Link& _rHdl ) ;
-    virtual void    SetConversionFormatChangedHdl( const Link& _rHdl ) ;
-    virtual void    SetFindHdl( const Link& _rHdl );
-    virtual sal_Bool        GetUseBothDirections( ) const;
+    virtual void 	SetByCharacter( sal_Bool _bByCharacter ) ;
+    virtual void	SetConversionDirectionState( sal_Bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection );
+    virtual void 	SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType );
+    virtual void	SetOptionsChangedHdl( const Link& _rHdl );
+    virtual void	SetIgnoreHdl( const Link& _rHdl );
+    virtual void	SetIgnoreAllHdl( const Link& _rHdl ) ;
+    virtual void	SetChangeHdl( const Link& _rHdl ) ;
+    virtual void	SetChangeAllHdl( const Link& _rHdl ) ;
+    virtual void	SetClickByCharacterHdl( const Link& _rHdl ) ;
+    virtual void	SetConversionFormatChangedHdl( const Link& _rHdl ) ;
+    virtual void	SetFindHdl( const Link& _rHdl );
+    virtual sal_Bool		GetUseBothDirections( ) const;
     virtual editeng::HangulHanjaConversion::ConversionDirection    GetDirection( editeng::HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const;
-    virtual void    SetCurrentString(
+    virtual void	SetCurrentString(
                     const String& _rNewString,
                     const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rSuggestions,
                     bool _bOriginatesFromDocument = true
                 );
-    virtual String  GetCurrentString( ) const ;
+    virtual String	GetCurrentString( ) const ;
     virtual editeng::HangulHanjaConversion::ConversionFormat    GetConversionFormat( ) const ;
-    virtual void    FocusSuggestion( );
-    virtual String  GetCurrentSuggestion( ) const;
+    virtual void	FocusSuggestion( );
+    virtual String	GetCurrentSuggestion( ) const;
 };
 
 class AbstractThesaurusDialog_Impl : public AbstractThesaurusDialog
 {
     DECL_ABSTDLG_BASE(AbstractThesaurusDialog_Impl,SvxThesaurusDialog)
-    virtual String      GetWord();
-    virtual sal_uInt16  GetLanguage() const;
-    virtual Window*     GetWindow();
+    virtual String		GetWord();
+    virtual sal_uInt16	GetLanguage() const;
+    virtual Window*		GetWindow();
 };
 
 
 class AbstractHyphenWordDialog_Impl: public AbstractHyphenWordDialog
 {
     DECL_ABSTDLG_BASE(AbstractHyphenWordDialog_Impl,SvxHyphenWordDialog)
-    virtual void    SelLeft();
-    virtual void    SelRight();
-    virtual Window* GetWindow();
+    virtual void	SelLeft();
+    virtual void	SelRight();
+    virtual Window*	GetWindow();
 };
 
 // for FmShowColsDialog begin
@@ -206,7 +206,7 @@ class FmShowColsDialog;
 class AbstractFmShowColsDialog_Impl : public AbstractFmShowColsDialog
 {
     DECL_ABSTDLG_BASE(AbstractFmShowColsDialog_Impl,FmShowColsDialog)
-     virtual void   SetColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>& xCols);
+     virtual void 	SetColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>& xCols);
 };
 //for FmShowColsDialog end
 
@@ -216,9 +216,9 @@ class SvxZoomDialog;
 class AbstractSvxZoomDialog_Impl : public AbstractSvxZoomDialog
 {
     DECL_ABSTDLG_BASE(AbstractSvxZoomDialog_Impl,SvxZoomDialog)
-    virtual void    SetLimits( USHORT nMin, USHORT nMax );
-    virtual void    HideButton( USHORT nBtnId );
-    virtual const SfxItemSet*   GetOutputItemSet() const ;
+    virtual void	SetLimits( USHORT nMin, USHORT nMax );
+    virtual void	HideButton( USHORT nBtnId );
+    virtual const SfxItemSet*	GetOutputItemSet() const ;
 
 };
 //for SvxZoomDialog end
@@ -244,12 +244,12 @@ class AbstractSpellDialog_Impl : public AbstractSpellDialog
 //STRIP001 AbstractSvxSpellCheckDialog_Impl ( SvxSpellCheckDialog* p)
 //STRIP001 : pDlg(p)
 //STRIP001 {}
-//STRIP001 virtual  USHORT          Execute() ;
-//STRIP001 virtual  void SetNewEditWord( const String& _rNew ) ;
+//STRIP001 virtual	USHORT			Execute() ;
+//STRIP001 virtual	void SetNewEditWord( const String& _rNew ) ;
 //STRIP001 virtual void SetLanguage( sal_uInt16 nLang ) ;
 //STRIP001 virtual void HideAutoCorrect() ;
-//STRIP001 virtual String   GetNewEditWord();
-//STRIP001 virtual void SetNewEditWord( const String& _rNew );
+//STRIP001 virtual String	GetNewEditWord();
+//STRIP001 virtual void	SetNewEditWord( const String& _rNew );
 //STRIP001 }
 //for SvxSpellCheckDialog end
 
@@ -261,9 +261,9 @@ class AbstractSearchProgress_Impl : public AbstractSearchProgress
     DECL_ABSTDLG_BASE(AbstractSearchProgress_Impl,SearchProgress)
     virtual void        Update() ;
     virtual void        Sync() ;
-    virtual void    SetFileType( const String& rType ) ;
-    virtual void    SetDirectory( const INetURLObject& rURL ) ;
-    virtual PLinkStub   GetLinkStubCleanUpHdl() ;
+    virtual void 	SetFileType( const String& rType ) ;
+    virtual void 	SetDirectory( const INetURLObject& rURL ) ;
+    virtual PLinkStub	GetLinkStubCleanUpHdl() ;
 
 };
 //for SearchProgress end
@@ -275,8 +275,8 @@ class AbstractTakeProgress_Impl : public AbstractTakeProgress
     DECL_ABSTDLG_BASE(AbstractTakeProgress_Impl,TakeProgress)
     virtual void        Update() ;
     virtual void        Sync() ;
-    virtual void        SetFile( const INetURLObject& rURL ) ;
-    virtual PLinkStub   GetLinkStubCleanUpHdl() ;
+    virtual void 		SetFile( const INetURLObject& rURL ) ;
+    virtual PLinkStub	GetLinkStubCleanUpHdl() ;
 
 };
 //for TakeProgress end
@@ -286,7 +286,7 @@ class TitleDialog;
 class AbstractTitleDialog_Impl : public AbstractTitleDialog
 {
     DECL_ABSTDLG_BASE(AbstractTitleDialog_Impl,TitleDialog)
-    virtual String  GetTitle() const ;
+    virtual String	GetTitle() const ;
 
 };
 //for TitleDialog end
@@ -308,7 +308,7 @@ class GalleryIdDialog;
 class AbstractGalleryIdDialog_Impl : public AbstractGalleryIdDialog
 {
     DECL_ABSTDLG_BASE(AbstractGalleryIdDialog_Impl,GalleryIdDialog)
-    virtual ULONG   GetId() const ;
+    virtual ULONG	GetId() const ;
 
 };
 //for GalleryIdDialog end
@@ -318,11 +318,11 @@ class URLDlg;
 class AbstractURLDlg_Impl :public AbstractURLDlg
 {
     DECL_ABSTDLG_BASE(AbstractURLDlg_Impl,URLDlg)
-    virtual String      GetURL() const;
-    virtual String      GetAltText() const;
-    virtual String      GetDesc() const;
-    virtual String      GetTarget() const;
-    virtual String      GetName() const;
+    virtual String		GetURL() const;
+    virtual String		GetAltText() const;
+    virtual String		GetDesc() const;
+    virtual String		GetTarget() const;
+    virtual String		GetName() const;
 };
 //for URLDlg end
 
@@ -331,16 +331,16 @@ class SvxHlinkDlgMarkWnd;
 class AbstractSvxHlinkDlgMarkWnd_Impl : public AbstractSvxHlinkDlgMarkWnd
 {
     DECL_ABSTDLG_BASE(AbstractSvxHlinkDlgMarkWnd_Impl,SvxHlinkDlgMarkWnd)
-    virtual void                Hide( USHORT nFlags = 0 );
-    virtual BOOL                IsVisible() const ;
-    virtual void                Invalidate( USHORT nFlags = 0 );
-    virtual void                SetSizePixel( const Size& rNewSize );
-    virtual Size                GetSizePixel() const;
-    virtual BOOL                MoveTo ( Point aNewPos )const;
-    virtual BOOL                ConnectToDialog( BOOL bDoit = TRUE )const;
-    virtual void                RefreshTree ( String aStrURL ) ;
-    virtual void                SelectEntry ( String aStrMark );
-    virtual USHORT              SetError( USHORT nError) ;
+    virtual void				Hide( USHORT nFlags = 0 );
+    virtual BOOL				IsVisible() const ;
+    virtual void				Invalidate( USHORT nFlags = 0 );
+    virtual void				SetSizePixel( const Size& rNewSize );
+    virtual Size				GetSizePixel() const;
+    virtual BOOL				MoveTo ( Point aNewPos )const;
+    virtual BOOL				ConnectToDialog( BOOL bDoit = TRUE )const;
+    virtual void				RefreshTree ( String aStrURL ) ;
+    virtual void				SelectEntry ( String aStrMark );
+    virtual USHORT				SetError( USHORT nError) ;
 
 };
 //for SvxHlinkDlgMarkWnd end
@@ -350,10 +350,10 @@ class SvxSearchSimilarityDialog;
 class AbstractSvxSearchSimilarityDialog_Impl :public AbstractSvxSearchSimilarityDialog
 {
     DECL_ABSTDLG_BASE(AbstractSvxSearchSimilarityDialog_Impl,SvxSearchSimilarityDialog)
-    virtual USHORT              GetOther();
-    virtual USHORT              GetShorter();
-    virtual USHORT              GetLonger();
-    virtual BOOL                IsRelaxed();
+    virtual USHORT				GetOther();
+    virtual USHORT				GetShorter();
+    virtual USHORT				GetLonger();
+    virtual BOOL 				IsRelaxed();
 };
 //for SvxSearchSimilarityDialog end
 
@@ -362,7 +362,7 @@ class SvxJSearchOptionsDialog;
 class AbstractSvxJSearchOptionsDialog_Impl :public AbstractSvxJSearchOptionsDialog
 {
     DECL_ABSTDLG_BASE(AbstractSvxJSearchOptionsDialog_Impl,SvxJSearchOptionsDialog)
-    virtual INT32           GetTransliterationFlags() const;
+    virtual INT32			GetTransliterationFlags() const;
 };
 //for SvxJSearchOptionsDialog end
 
@@ -457,7 +457,7 @@ class SvxMessDialog;
 class AbstractSvxMessDialog_Impl :public AbstractSvxMessDialog
 {
     DECL_ABSTDLG_BASE(AbstractSvxMessDialog_Impl,SvxMessDialog)
-    virtual void    SetButtonText( USHORT nBtnId, const String& rNewTxt );
+    virtual void	SetButtonText( USHORT nBtnId, const String& rNewTxt );
 };
 //for SvxMessDialog end
 
@@ -466,8 +466,8 @@ class SvxMultiPathDialog;
 class AbstractSvxMultiPathDialog_Impl :public AbstractSvxMultiPathDialog
 {
     DECL_ABSTDLG_BASE(AbstractSvxMultiPathDialog_Impl,SvxMultiPathDialog)
-    virtual String          GetPath() const;
-    virtual void            SetPath( const String& rPath );
+    virtual String			GetPath() const;
+    virtual void			SetPath( const String& rPath );
     virtual void            EnableRadioButtonMode();
     virtual void            SetTitle( const String& rNewTitle );
 };
@@ -478,12 +478,12 @@ class SvxMultiFileDialog;
 class AbstractSvxMultiFileDialog_Impl :public AbstractSvxMultiFileDialog
 {
     DECL_ABSTDLG_BASE(AbstractSvxMultiFileDialog_Impl,SvxMultiFileDialog)
-    virtual String          GetFiles() const ;
-    virtual void            SetFiles( const String& rPath ) ;
+    virtual String			GetFiles() const ;
+    virtual void			SetFiles( const String& rPath ) ;
     //from SvxMultiPathDialog
-    virtual String          GetPath() const;
-    virtual void            SetPath( const String& rPath );
-    virtual void            SetClassPathMode();
+    virtual String			GetPath() const;
+    virtual void			SetPath( const String& rPath );
+    virtual void			SetClassPathMode();
     virtual void            EnableRadioButtonMode();
     virtual void            SetTitle( const String& rNewTitle );
     //From Class Window
@@ -518,7 +518,7 @@ class GraphicFilterDialog;
 class AbstractGraphicFilterDialog_Impl :public AbstractGraphicFilterDialog
 {
     DECL_ABSTDLG_BASE(AbstractGraphicFilterDialog_Impl,GraphicFilterDialog)
-    virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY );
+    virtual Graphic	GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY );
 };
 //for GraphicFilterDialog end
 
@@ -527,14 +527,14 @@ class SvxAreaTabDialog;
 class AbstractSvxAreaTabDialog_Impl :public AbstractSvxAreaTabDialog
 {
     DECL_ABSTDLG_BASE(AbstractSvxAreaTabDialog_Impl,SvxAreaTabDialog)
-    virtual void                SetCurPageId( USHORT nId );
-    virtual const SfxItemSet*   GetOutputItemSet() const;
-    virtual const USHORT*       GetInputRanges( const SfxItemPool& pItem );
-    virtual void                SetInputSet( const SfxItemSet* pInSet );
+    virtual void				SetCurPageId( USHORT nId );
+    virtual const SfxItemSet* 	GetOutputItemSet() const;
+    virtual const USHORT*		GetInputRanges( const SfxItemPool& pItem );
+    virtual void				SetInputSet( const SfxItemSet* pInSet );
         //From class Window.
-    virtual void        SetText( const XubString& rStr );
-    virtual String      GetText() const;
-    virtual void     DontDeleteColorTable() ;
+    virtual void		SetText( const XubString& rStr );
+    virtual String   	GetText() const;
+    virtual void	 DontDeleteColorTable() ;
 };
 //add for SvxAreaTabDialog end
 
@@ -569,19 +569,19 @@ class SvxPostItDialog;
 class AbstractSvxPostItDialog_Impl :public AbstractSvxPostItDialog
 {
     DECL_ABSTDLG_BASE( AbstractSvxPostItDialog_Impl, SvxPostItDialog )
-    virtual void                SetText( const XubString& rStr );  //From class Window
+    virtual void				SetText( const XubString& rStr );  //From class Window
     virtual const SfxItemSet*   GetOutputItemSet() const;
     virtual void                SetPrevHdl( const Link& rLink ) ;
     virtual void                SetNextHdl( const Link& rLink ) ;
-    virtual void                EnableTravel(BOOL bNext, BOOL bPrev) ;
-    virtual String              GetNote() ;
-    virtual void                SetNote(const String& rTxt) ;
-    virtual void                ShowLastAuthor(const String& rAuthor, const String& rDate) ;
-    virtual void                DontChangeAuthor() ;
-    virtual void                HideAuthor() ;
-    virtual void                SetReadonlyPostIt(BOOL bDisable) ;
-    virtual BOOL                IsOkEnabled() const  ;
-    virtual Window *            GetWindow();
+    virtual void				EnableTravel(BOOL bNext, BOOL bPrev) ;
+    virtual String				GetNote() ;
+    virtual void				SetNote(const String& rTxt) ;
+    virtual void				ShowLastAuthor(const String& rAuthor, const String& rDate) ;
+    virtual void				DontChangeAuthor() ;
+    virtual void				HideAuthor() ;
+    virtual void				SetReadonlyPostIt(BOOL bDisable) ;
+    virtual BOOL 				IsOkEnabled() const  ;
+    virtual Window *			GetWindow();
 private:
     Link aNextHdl;
     Link aPrevHdl;
@@ -595,7 +595,7 @@ class PasswordToOpenModifyDialog;
 class AbstractPasswordToOpenModifyDialog_Impl : public AbstractPasswordToOpenModifyDialog
 {
     DECL_ABSTDLG_BASE( AbstractPasswordToOpenModifyDialog_Impl, PasswordToOpenModifyDialog )
-
+    
     virtual String  GetPasswordToOpen() const;
     virtual String  GetPasswordToModify() const;
     virtual bool    IsRecommendToOpenReadonly() const;
@@ -608,45 +608,45 @@ class AbstractPasswordToOpenModifyDialog_Impl : public AbstractPasswordToOpenMod
 class AbstractDialogFactory_Impl : public SvxAbstractDialogFactory
 {
 public:
-    virtual VclAbstractDialog*          CreateVclDialog( Window* pParent, sal_uInt32 nResId );
-    virtual VclAbstractDialog*          CreateSfxDialog( Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId );
-    virtual SfxAbstractDialog*          CreateSfxDialog( sal_uInt32 nResId,
+    virtual VclAbstractDialog* 			CreateVclDialog( Window* pParent, sal_uInt32 nResId );
+    virtual VclAbstractDialog* 			CreateSfxDialog( Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId );
+    virtual SfxAbstractDialog*			CreateSfxDialog( sal_uInt32 nResId,
                                             Window* pParent,
                                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xViewFrame,
                                             const SfxItemSet* pAttrSet=0 );
-    virtual SfxAbstractDialog*          CreateSfxDialog( Window* pParent,
+    virtual SfxAbstractDialog*			CreateSfxDialog( Window* pParent,
                                             const SfxItemSet& rAttr,
                                             const SdrView* pView,
                                             sal_uInt32 nResId );
-    virtual SfxAbstractDialog*              CreateSfxDialog( Window* pParent, //add for SvxMeasureDialog & SvxConnectionDialog
+    virtual SfxAbstractDialog*				CreateSfxDialog( Window* pParent, //add for SvxMeasureDialog & SvxConnectionDialog
                                                                         const SfxItemSet& rAttr,
                                     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame,
                                                                         sal_uInt32 nResId
                                                                         );
     virtual VclAbstractDialog*          CreateFrameDialog( Window* pParent, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rxFrame, sal_uInt32 nResId, const String& rParameter );
-    virtual SfxAbstractTabDialog*       CreateTabDialog( sal_uInt32 nResId,
+    virtual SfxAbstractTabDialog*		CreateTabDialog( sal_uInt32 nResId,
                                             Window* pParent,
                                             const SfxItemSet* pAttrSet,
                                             SfxViewFrame* pViewFrame,
                                             bool bEditFmt=false,
                                             const String *pUserButtonText=0 );
-    virtual SfxAbstractTabDialog*       CreateTabDialog( sal_uInt32 nResId,
+    virtual SfxAbstractTabDialog*		CreateTabDialog( sal_uInt32 nResId,
                                             Window* pParent,
                                             const SfxItemSet* pAttrSet,
                                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xViewFrame,
                                             bool bEditFmt=false,
                                             const String *pUserButtonText=0 );
-    virtual SfxAbstractTabDialog*       CreateTextTabDialog( Window* pParent,
+    virtual SfxAbstractTabDialog* 		CreateTextTabDialog( Window* pParent,
                                             const SfxItemSet* pAttrSet,
                                             SdrView* pView,
                                             SdrModel* pModel=0 ); //add for SvxTextTabDialog
-    virtual SfxAbstractTabDialog*       CreateTabItemDialog( Window* pParent,
+    virtual SfxAbstractTabDialog*		CreateTabItemDialog( Window* pParent,
                                             const SfxItemSet& rSet,
                                             sal_uInt32 nResId); //add by CHINA001
     virtual AbstractSvxCaptionDialog*   CreateCaptionDialog( Window* pParent,
                                             const SdrView* pView,
-                                            USHORT nAnchorTypes = 0 );      //add for SvxCaptionTabDialog CHINA001
-    virtual AbstractSvxDistributeDialog*    CreateSvxDistributeDialog(Window* pParent,
+                                            USHORT nAnchorTypes = 0 );		//add for SvxCaptionTabDialog CHINA001
+    virtual	AbstractSvxDistributeDialog* 	CreateSvxDistributeDialog(Window* pParent,
                                             const SfxItemSet& rAttr,
                                             SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone,
                                             SvxDistributeVertical eVer = SvxDistributeVerticalNone);
@@ -660,10 +660,10 @@ public:
 
    virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent,  //add for HangulHanjaConversionDialog CHINA001
                                             editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection );
-    virtual AbstractThesaurusDialog*        CreateThesaurusDialog( Window*, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus >  xThesaurus,
+    virtual AbstractThesaurusDialog*		CreateThesaurusDialog( Window*, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus >  xThesaurus,
                                                 const String &rWord, sal_Int16 nLanguage );
 
-    virtual AbstractHyphenWordDialog*       CreateHyphenWordDialog( Window*,
+    virtual AbstractHyphenWordDialog*		CreateHyphenWordDialog( Window*, 
                                                 const String &rWord, LanguageType nLang,
                                                 ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator >  &xHyphen,
                                                 SvxSpellWrapper* pWrapper );
@@ -695,9 +695,9 @@ public:
 //STRIP001    SvxSpellWrapper* pWrapper,
 //STRIP001    sal_uInt32 nResId);
     virtual VclAbstractRefreshableDialog * CreateActualizeProgressDialog( Window* pParent, GalleryTheme* pThm );
-    virtual AbstractSearchProgress * CreateSearchProgressDialog( Window* pParent,
+    virtual AbstractSearchProgress * CreateSearchProgressDialog( Window* pParent, 
                                             const INetURLObject& rStartURL);
-    virtual AbstractTakeProgress * CreateTakeProgressDialog( Window* pParent );
+    virtual AbstractTakeProgress * CreateTakeProgressDialog( Window* pParent );  
     virtual AbstractTitleDialog * CreateTitleDialog( Window* pParent,  //add for TitleDialog
                                              const String& rOldText);
     virtual AbstractGalleryIdDialog * CreateGalleryIdDialog( Window* pParent,  //add for SvxZoomDialog
@@ -711,7 +711,7 @@ public:
                                             TargetList& rTargetList );
     virtual AbstractSvxHlinkDlgMarkWnd* CreateSvxHlinkDlgMarkWndDialog( SvxHyperlinkTabPageBase* pParent, sal_uInt32 nResId ); //add for SvxHlinkDlgMarkWnd
 
-    virtual VclAbstractDialog*      CreateSvxSearchAttributeDialog( Window* pParent,
+    virtual VclAbstractDialog* 		CreateSvxSearchAttributeDialog( Window* pParent,
                                             SearchAttrItemList& rLst,
                                             const USHORT* pWhRanges);
     virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( Window* pParent,
@@ -726,61 +726,61 @@ public:
     virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( Window* pParent,
                                             ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 >  &xSpl,
                                             sal_uInt32 nResId ); //add for SvxNewDictionaryDialog
-    virtual VclAbstractDialog *     CreateSvxEditDictionaryDialog( Window* pParent,
+    virtual VclAbstractDialog *		CreateSvxEditDictionaryDialog( Window* pParent,
                                             const String& rName,
                                             ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl,
                                             sal_uInt32 nResId);//add for SvxEditDictionaryDialog
-    virtual AbstractSvxNameDialog *     CreateSvxNameDialog( Window* pParent,
+    virtual AbstractSvxNameDialog *		CreateSvxNameDialog( Window* pParent,
                                             const String& rName, const String& rDesc );
     // #i68101#
     virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(Window* pParent, const String& rName );
     virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(Window* pParent, const String& rTitle, const String& rDescription);
 
-    virtual AbstractSvxMessDialog *         CreateSvxMessDialog( Window* pParent, sal_uInt32 nResId,
+    virtual AbstractSvxMessDialog *			CreateSvxMessDialog( Window* pParent, sal_uInt32 nResId,
                                             const String& rText, const String& rDesc,
                                             Image* pImg = NULL ); //add for SvxMessDialog
-    virtual AbstractSvxMultiPathDialog *    CreateSvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ); //add for SvxMultiPathDialog
-    virtual AbstractSvxMultiFileDialog *    CreateSvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ); //add for SvxMultiFileDialog
-    virtual AbstractSvxHpLinkDlg *          CreateSvxHpLinkDlg (Window* pParent,  //add for SvxHpLink
+    virtual AbstractSvxMultiPathDialog *	CreateSvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ); //add for SvxMultiPathDialog
+    virtual AbstractSvxMultiFileDialog *	CreateSvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ); //add for SvxMultiFileDialog
+    virtual AbstractSvxHpLinkDlg *			CreateSvxHpLinkDlg (Window* pParent,  //add for SvxHpLink
                                             SfxBindings* pBindings,
                                             sal_uInt32 nResId);
-    virtual AbstractFmSearchDialog*         CreateFmSearchDialog(Window* pParent, //add for FmSearchDialog
+    virtual AbstractFmSearchDialog* 		CreateFmSearchDialog(Window* pParent, //add for FmSearchDialog
                                                         const String& strInitialText,
                                                         const ::std::vector< String >& _rContexts,
                                                         sal_Int16 nInitialContext,
                                                         const Link& lnkContextSupplier);
-    virtual AbstractGraphicFilterDialog *   CreateGraphicFilterEmboss (Window* pParent,  //add for GraphicFilterEmboss
+    virtual AbstractGraphicFilterDialog *	CreateGraphicFilterEmboss (Window* pParent,  //add for GraphicFilterEmboss
                                             const Graphic& rGraphic,
                                             RECT_POINT eLightSource, sal_uInt32 nResId);
-    virtual AbstractGraphicFilterDialog *   CreateGraphicFilterPosterSepia (Window* pParent,  //add for GraphicFilterPoster & GraphicFilterSepia
+    virtual AbstractGraphicFilterDialog *	CreateGraphicFilterPosterSepia (Window* pParent,  //add for GraphicFilterPoster & GraphicFilterSepia
                                             const Graphic& rGraphic,
                                             USHORT nCount,
                                             sal_uInt32 nResId);
-    virtual AbstractGraphicFilterDialog *   CreateGraphicFilterSolarize (Window* pParent,  //add for GraphicFilterSolarize
+    virtual AbstractGraphicFilterDialog *	CreateGraphicFilterSolarize (Window* pParent,  //add for GraphicFilterSolarize
                                             const Graphic& rGraphic,
                                             BYTE nGreyThreshold, BOOL bInvert, sal_uInt32 nResId);
-    virtual AbstractGraphicFilterDialog *   CreateGraphicFilterMosaic (Window* pParent,  //add for GraphicFilterMosaic
+    virtual AbstractGraphicFilterDialog *	CreateGraphicFilterMosaic (Window* pParent,  //add for GraphicFilterMosaic
                                             const Graphic& rGraphic,
                                             USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges, sal_uInt32 nResId);
-    virtual AbstractSvxAreaTabDialog*       CreateSvxAreaTabDialog( Window* pParent,//add for SvxAreaTabDialog
+    virtual AbstractSvxAreaTabDialog* 		CreateSvxAreaTabDialog( Window* pParent,//add for SvxAreaTabDialog
                                                             const SfxItemSet* pAttr,
                                                             SdrModel* pModel,
                                                             const SdrView* pSdrView = NULL ); //add for SvxAreaTabDialog
-    virtual SfxAbstractTabDialog*           CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add for SvxLineTabDialog
+    virtual SfxAbstractTabDialog*			CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add for SvxLineTabDialog
                                                                  SdrModel* pModel,
                                                                  const SdrObject* pObj = NULL,
                                                                 BOOL bHasObj = TRUE );
-    virtual AbstractSvxPostItDialog*        CreateSvxPostItDialog( Window* pParent, //add for SvxPostItDialog
+    virtual AbstractSvxPostItDialog*		CreateSvxPostItDialog( Window* pParent, //add for SvxPostItDialog
                                                                         const SfxItemSet& rCoreSet,
                                                                         BOOL bPrevNext = FALSE, BOOL bRedline = FALSE );
 
     // For TabPage
-    virtual CreateTabPage               GetTabPageCreatorFunc( USHORT nId );
-    virtual CreateSvxDistributePage     GetSvxDistributePageCreatorFunc();
+    virtual CreateTabPage				GetTabPageCreatorFunc( USHORT nId );
+    virtual CreateSvxDistributePage		GetSvxDistributePageCreatorFunc();
 
-    virtual GetTabPageRanges            GetTabPageRangesFunc( USHORT nId );
-    virtual DialogGetRanges         GetDialogGetRangesFunc( USHORT nId ); //add for SvxPostItDialog
-    virtual VclAbstractDialog*          CreateSvxScriptOrgDialog( Window* pParent, const String& rLanguage );
+    virtual GetTabPageRanges			GetTabPageRangesFunc( USHORT nId );
+    virtual DialogGetRanges			GetDialogGetRangesFunc( USHORT nId ); //add for SvxPostItDialog
+    virtual VclAbstractDialog*    		CreateSvxScriptOrgDialog( Window* pParent, const String& rLanguage );
 
     virtual AbstractScriptSelectorDialog*
         CreateScriptSelectorDialog(
@@ -792,7 +792,7 @@ public:
     virtual VclAbstractDialog* CreateScriptErrorDialog(
             Window* pParent, ::com::sun::star::uno::Any aException);
 
-    virtual VclAbstractDialog*  CreateSvxMacroAssignDlg(
+    virtual VclAbstractDialog*  CreateSvxMacroAssignDlg( 
                 Window* _pParent,
                 const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxDocumentFrame,
                 const bool _bUnoDialogMode,
diff --git a/cui/source/factory/init.cxx b/cui/source/factory/init.cxx
index 46c91735b739..2b145e202251 100644
--- a/cui/source/factory/init.cxx
+++ b/cui/source/factory/init.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/inc/ControlFocusHelper.hxx b/cui/source/inc/ControlFocusHelper.hxx
index 882a80318b8a..70789226a9b1 100644
--- a/cui/source/inc/ControlFocusHelper.hxx
+++ b/cui/source/inc/ControlFocusHelper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 class SvxControlFocusHelper : public Control
 {
 private:
-    Control*        m_pFocusCtrl;
+    Control*		m_pFocusCtrl;
 
 public:
     SvxControlFocusHelper( Window* pParent, const ResId& rId ) :
         Control( pParent, rId ), m_pFocusCtrl( NULL ) {}
 
-    void            SetFocusControl( Control* pCtrl ) { m_pFocusCtrl = pCtrl; }
+    void			SetFocusControl( Control* pCtrl ) { m_pFocusCtrl = pCtrl; }
 
-    virtual long    Notify( NotifyEvent& rNEvt );
+    virtual long	Notify( NotifyEvent& rNEvt );
 };
 
-#endif  // SVX_CONTROLL_FUCUS_HELPER_HXX
+#endif	// SVX_CONTROLL_FUCUS_HELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index cd7fa148462d..f10b52e065a3 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ private:
     bool            m_bIsUndoEditMode;
 
     Link            m_aModifyLink;
-
+    
     void            CallModifyLink() {m_aModifyLink.Call(this);}
 
     SpellDialog*    GetSpellDialog() const {return (SpellDialog*)GetParent();}
@@ -93,28 +93,28 @@ public:
                     ~SentenceEditWindow_Impl();
 
     void            SetModifyHdl(const Link& rLink) { m_aModifyLink = rLink;}
-
+    
     void            SetAttrib( const TextAttrib& rAttr, ULONG nPara, USHORT nStart, USHORT nEnd );
     void            SetText( const String& rStr );
-
-    bool            MarkNextError( bool bIgnoreCurrentError );
+    
+    bool            MarkNextError( bool bIgnoreCurrentError );            
     void            ChangeMarkedWord(const String& rNewWord, LanguageType eLanguage);
     void            MoveErrorMarkTo(USHORT nErrorStart, USHORT nErrorEnd, bool bGrammar);
     String          GetErrorText() const;
     void            RestoreCurrentError();
-
+    
     void            SetAlternatives(
                         com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellAlternatives> );
-
+    
     const SpellErrorDescription* GetAlternatives();
 
 
     void            ResetModified()   { GetTextEngine()->SetModified(FALSE); m_bIsUndoEditMode = false;}
     BOOL            IsModified() const              { return GetTextEngine()->IsModified(); }
-
+    
     bool            IsUndoEditMode() const { return m_bIsUndoEditMode;}
     void            SetUndoEditMode(bool bSet);
-
+    
     svx::SpellPortions  CreateSpellPortions( bool bSetIgnoreFlag ) const;
 
     void            ResetUndo();
@@ -135,15 +135,15 @@ class SpellDialogChildWindow;
 class ExplainButton : public PushButton
 {
     String              m_sExplanation;
-
+    
     virtual void        RequestHelp( const HelpEvent& rHEvt );
     virtual void        Click();
-public:
+public: 
     ExplainButton( Window* pParent, const ResId& rResId ) : PushButton( pParent, rResId ){}
-    ~ExplainButton();
+    ~ExplainButton();    
     void                SetExplanation( const String& rText ) {m_sExplanation = rText;}
     bool                HasExplanation() { return m_sExplanation.Len() > 0;}
-
+    
 };
 
 class SpellDialog : public SfxModelessDialog
@@ -152,23 +152,23 @@ class SpellDialog : public SfxModelessDialog
 
     friend class SentenceEditWindow_Impl;
 private:
-
+    
     FixedImage      aVendorImageFI;
-
+    
     FixedText       aLanguageFT;
     SvxLanguageBox  aLanguageLB;
-
+    
     FixedText           aNotInDictFT;
-    SentenceEditWindow_Impl  aSentenceED;
-
+    SentenceEditWindow_Impl  aSentenceED; 
+    
     FixedText       aSuggestionFT;
     ListBox         aSuggestionLB;
-
+    
     PushButton      aIgnorePB;
     PushButton      aIgnoreAllPB;
     PushButton      aIgnoreRulePB;
     MenuButton      aAddToDictMB;
-
+    
     PushButton      aChangePB;
     PushButton      aChangeAllPB;
     ExplainButton   aExplainPB;
@@ -193,20 +193,20 @@ private:
     const String    m_sTitleSpelling;
     const String    m_sTitleSpellingGrammar;
     const String    m_sTitleSpellingGrammarVendor;
-
+    
     Size            aOldWordEDSize;
     Link            aDialogUndoLink;
-
+    
     bool            bModified;
     bool            bFocusLocked;
-
+    
     svx::SpellDialogChildWindow& rParent;
     svx::SpellPortions           m_aSavedSentence;
 
     SpellDialog_Impl* pImpl;
     ::com::sun::star::uno::Reference<
-        ::com::sun::star::linguistic2::XSpellChecker1 >     xSpell;
-    LanguageType        nOldLang;
+        ::com::sun::star::linguistic2::XSpellChecker1 > 	xSpell;
+    LanguageType		nOldLang;
 
     DECL_LINK( ChangeHdl, Button * );
     DECL_LINK( ChangeAllHdl, Button * );
@@ -222,7 +222,7 @@ private:
     DECL_LINK( DialogUndoHdl, SpellUndoAction_Impl* );
 
     DECL_STATIC_LINK( SpellDialog, InitHdl, SpellDialog * );
-
+    
     void            StartSpellOptDlg_Impl();
     void            InitUserDicts();
     void            UpdateBoxes_Impl();
@@ -231,30 +231,30 @@ private:
     void            LockFocusChanges( bool bLock ) {bFocusLocked = bLock;}
     void            Impl_Restore();
 
-    void            SetSelectedLang_Impl( LanguageType nLang );
-    LanguageType    GetSelectedLang_Impl() const;
+    void			SetSelectedLang_Impl( LanguageType nLang );
+    LanguageType	GetSelectedLang_Impl() const;
 
     /** Retrieves the next sentence.
      */
     bool            GetNextSentence_Impl(bool bUseSavedSentence, bool bRechek /*for rechecking the curretn sentence*/);
-    /** Corrects all errors that have been selected to be changed always
+    /** Corrects all errors that have been selected to be changed always 
      */
     bool            ApplyChangeAllList_Impl(SpellPortions& rSentence, bool& bHasReplaced);
-    void            SetTitle_Impl(LanguageType nLang);
+    void            SetTitle_Impl(LanguageType nLang); 
 
-protected:
+protected:     
     virtual void    Paint( const Rectangle& rRect );
     virtual long    Notify( NotifyEvent& rNEvt );
 
 public:
-    SpellDialog(
+    SpellDialog( 
         svx::SpellDialogChildWindow* pChildWindow,
         Window * pParent,
         SfxBindings* pBindings);
     ~SpellDialog();
 
-    void            SetLanguage( sal_uInt16 nLang );
-    virtual sal_Bool    Close();
+    void			SetLanguage( sal_uInt16 nLang );
+    virtual sal_Bool	Close();
 
     void            InvalidateDialog();
 };
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index 85b51cefaf28..55b35cd652af 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,12 +73,12 @@ class SfxAcceleratorConfigPage;
 
 class SfxAccCfgTabListBox_Impl : public SvTabListBox
 {
-    SfxAcceleratorConfigPage*   m_pAccelConfigPage;
+    SfxAcceleratorConfigPage*	m_pAccelConfigPage;
 
-    void                        KeyInput( const KeyEvent &rKEvt );
+    void 						KeyInput( const KeyEvent &rKEvt );
 
 protected:
-    virtual void                InitEntry( SvLBoxEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind eButtonKind );
+    virtual void				InitEntry( SvLBoxEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind eButtonKind );
 
 public:
                                 SfxAccCfgTabListBox_Impl(
@@ -89,7 +89,7 @@ public:
                                     m_pAccelConfigPage( pAccelConfigPage )
                                 {}
 
-    void                        ReplaceEntry( USHORT nPos, const String &rStr );
+    void 						ReplaceEntry( USHORT nPos, const String &rStr );
 };
 
 // class SfxAcceleratorConfigPage ----------------------------------------
@@ -131,31 +131,31 @@ class SfxAcceleratorConfigPage : public SfxTabPage
 {
     friend class SfxAccCfgTabListBox_Impl;
 private:
-    const SfxMacroInfoItem*         m_pMacroInfoItem;
-    const SfxStringItem*            m_pStringItem;
-    const SfxStringItem*            m_pFontItem;
+    const SfxMacroInfoItem*			m_pMacroInfoItem;
+    const SfxStringItem*			m_pStringItem;
+    const SfxStringItem*			m_pFontItem;
     sfx2::FileDialogHelper*         m_pFileDlg;
 
-    SfxAccCfgTabListBox_Impl        aEntriesBox;
+    SfxAccCfgTabListBox_Impl		aEntriesBox;
     FixedLine                       aKeyboardGroup;
-     RadioButton                        aOfficeButton;
-    RadioButton                     aModuleButton;
-    PushButton                      aChangeButton;
-    PushButton                      aRemoveButton;
-    FixedText                       aGroupText;
+     RadioButton						aOfficeButton;
+    RadioButton						aModuleButton;
+    PushButton         				aChangeButton;
+    PushButton         				aRemoveButton;
+    FixedText          				aGroupText;
     SfxConfigGroupListBox_Impl*     pGroupLBox;
-    FixedText                       aFunctionText;
-    SfxConfigFunctionListBox_Impl*  pFunctionBox;
-    FixedText                       aKeyText;
-    SvTreeListBox                   aKeyBox;
+    FixedText          				aFunctionText;
+    SfxConfigFunctionListBox_Impl*	pFunctionBox;
+    FixedText          				aKeyText;
+    SvTreeListBox     				aKeyBox;
     FixedLine                       aFunctionsGroup;
-    PushButton                      aLoadButton;
-    PushButton                      aSaveButton;
-    PushButton                      aResetButton;
-    String              aLoadAccelConfigStr;
-    String              aSaveAccelConfigStr;
-    String              aFilterAllStr;
-    String              aFilterCfgStr;
+    PushButton						aLoadButton;
+    PushButton						aSaveButton;
+    PushButton		   				aResetButton;
+    String				aLoadAccelConfigStr;
+    String				aSaveAccelConfigStr;
+    String				aFilterAllStr;
+    String				aFilterCfgStr;
     SfxStylesInfo_Impl              m_aStylesInfo;
     sal_Bool                        m_bStylesInfoInitialized;
 
@@ -170,42 +170,42 @@ private:
     ::rtl::OUString m_sModuleShortName;
     ::rtl::OUString m_sModuleUIName;
 
-    DECL_LINK(                  ChangeHdl, Button * );
-    DECL_LINK(                  RemoveHdl, Button * );
-    DECL_LINK(                  SelectHdl, Control * );
-    DECL_LINK(                  Save, Button * );
-    DECL_LINK(                  Load, Button * );
-    DECL_LINK(                  Default, PushButton * );
-    DECL_LINK(                  RadioHdl, RadioButton* );
+    DECL_LINK( 					ChangeHdl, Button * );
+    DECL_LINK( 					RemoveHdl, Button * );
+    DECL_LINK( 					SelectHdl, Control * );
+    DECL_LINK( 					Save, Button * );
+    DECL_LINK( 					Load, Button * );
+    DECL_LINK( 					Default, PushButton * );
+    DECL_LINK(					RadioHdl, RadioButton* );
 
     DECL_LINK(                  LoadHdl, sfx2::FileDialogHelper* );
     DECL_LINK(                  SaveHdl, sfx2::FileDialogHelper* );
 
     String                      GetLabel4Command(const String& sCommand);
     void                        InitAccCfg();
-    KeyCode                     MapPosToKeyCode( USHORT nPos ) const;
-    USHORT                      MapKeyCodeToPos( const KeyCode &rCode ) const;
-    String                      GetFunctionName( KeyFuncType eType ) const;
+    KeyCode 					MapPosToKeyCode( USHORT nPos ) const;
+    USHORT  					MapKeyCodeToPos( const KeyCode &rCode ) const;
+    String  					GetFunctionName( KeyFuncType eType ) const;
     css::uno::Reference< css::frame::XModel > SearchForAlreadyLoadedDoc(const String& sName);
     void                        StartFileDialog( WinBits nBits, const String& rTitle );
 
-    void                        Init(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr);
-    void                        ResetConfig();
+    void 						Init(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr);
+    void 						ResetConfig();
 
-    void                        CreateCustomItems( SvLBoxEntry* pEntry, const String& aCol1, const String& aCol2 );
+    void						CreateCustomItems( SvLBoxEntry* pEntry, const String& aCol1, const String& aCol2 );
 
 public:
                                 SfxAcceleratorConfigPage( Window *pParent, const SfxItemSet& rItemSet );
-    virtual                     ~SfxAcceleratorConfigPage();
+    virtual 					~SfxAcceleratorConfigPage();
 
-    virtual BOOL                FillItemSet( SfxItemSet& );
-    virtual void                Reset( const SfxItemSet& );
+    virtual BOOL				FillItemSet( SfxItemSet& );
+    virtual void				Reset( const SfxItemSet& );
 
-    void                        SelectMacro(const SfxMacroInfoItem*);
+    void						SelectMacro(const SfxMacroInfoItem*);
     void                        Apply(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr);
     void                        CopySource2Target(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& xSourceAccMgr,
                                                   const css::uno::Reference< css::ui::XAcceleratorConfiguration >& xTargetAccMgr);
-    static SfxTabPage*          Create( Window* pParent, const SfxItemSet& rAttrSet );
+    static SfxTabPage*			Create( Window* pParent, const SfxItemSet& rAttrSet );
 };
 
 
@@ -237,7 +237,7 @@ class SfxAcceleratorConfigDialog : public ModalDialog
     PushButton         aRemoveButton;
     SfxAcceleratorConfigListBox aEntriesBox;
     FixedText          aDescriptionTextText;
-    FixedText          aDescriptionInfoText;
+    FixedText		   aDescriptionInfoText;
     FixedLine          aKeyboardGroup;
     FixedText          aGroupText;
     ListBox            aGroupLBox;
@@ -273,7 +273,7 @@ public:
         Window* pParent,
         const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame,
         const SfxItemSet& rSet );
-    virtual ~SvxShortcutAssignDlg();
+    virtual	~SvxShortcutAssignDlg();
 };
 
 
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index 6d005eba6774..0d0ce6aa8b04 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index d11df2b971cf..b93998a2a9f9 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class SmartTagMgr;
 
 class OfaAutoCorrDlg : public SfxTabDialog
 {
-    FixedText       aLanguageFT;
-    SvxLanguageBox  aLanguageLB;
+    FixedText		aLanguageFT;
+    SvxLanguageBox	aLanguageLB;
 
     DECL_LINK(SelectLanguageHdl, ListBox*);
 public:
 
     OfaAutoCorrDlg(Window* pParent, const SfxItemSet *pSet );
 
-    void    EnableLanguage(BOOL bEnable)
-            {   aLanguageFT.Enable(bEnable);
+    void	EnableLanguage(BOOL bEnable)
+            {	aLanguageFT.Enable(bEnable);
                 aLanguageLB.Enable(bEnable);}
 
 };
@@ -78,8 +78,8 @@ class OfaACorrCheckListBox : public SvxSimpleTable
     using SvTreeListBox::SetCheckButtonState;
 
     protected:
-        virtual void    SetTabs();
-        virtual void    HBarClick();
+        virtual void	SetTabs();
+        virtual void	HBarClick();
         virtual void    KeyInput( const KeyEvent& rKEvt );
 
     public:
@@ -90,10 +90,10 @@ class OfaACorrCheckListBox : public SvxSimpleTable
         inline void SetUserData(ULONG nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); }
         inline ULONG GetSelectEntryPos() { return GetModel()->GetAbsPos(FirstSelected()); }
 
-        BOOL            IsChecked(ULONG nPos, USHORT nCol = 0);
-        void            CheckEntryPos(ULONG nPos, USHORT nCol, BOOL bChecked);
-        SvButtonState   GetCheckButtonState( SvLBoxEntry*, USHORT nCol ) const;
-        void            SetCheckButtonState( SvLBoxEntry*, USHORT nCol, SvButtonState );
+        BOOL			IsChecked(ULONG nPos, USHORT nCol = 0);
+        void			CheckEntryPos(ULONG nPos, USHORT nCol, BOOL bChecked);
+        SvButtonState	GetCheckButtonState( SvLBoxEntry*, USHORT nCol ) const;
+        void			SetCheckButtonState( SvLBoxEntry*, USHORT nCol, SvButtonState );
 };
 
 // class OfaAutocorrOptionsPage ------------------------------------------
@@ -104,29 +104,29 @@ class OfaAutocorrOptionsPage : public SfxTabPage
     using TabPage::ActivatePage;
 
 private:
-    SvxCheckListBox aCheckLB;
-
-    String      sInput;
-    String      sDoubleCaps;
-    String      sStartCap;
-    String      sBoldUnderline;
-    String      sURL;
-    String      sNoDblSpaces;
-    String      sDash;
+    SvxCheckListBox	aCheckLB;
+
+    String		sInput;
+    String		sDoubleCaps;
+    String		sStartCap;
+    String		sBoldUnderline;
+    String		sURL;
+    String		sNoDblSpaces;
+    String		sDash;
     String      sNonBrkSpace;
-    String      sFirst;
+    String		sFirst;
     String      sAccidentalCaps;
 
 public:
                         OfaAutocorrOptionsPage( Window* pParent, const SfxItemSet& rSet );
                         ~OfaAutocorrOptionsPage();
 
-    static SfxTabPage*  Create( Window* pParent,
+    static SfxTabPage*	Create( Window* pParent,
                                 const SfxItemSet& rAttrSet);
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
-    virtual void        ActivatePage( const SfxItemSet& );
+    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	void 		Reset( const SfxItemSet& rSet );
+    virtual void		ActivatePage( const SfxItemSet& );
 
 };
 
@@ -136,45 +136,45 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
 {
     using TabPage::ActivatePage;
 
-    OfaACorrCheckListBox    aCheckLB;
-    PushButton      aEditPB;
-    FixedText       aHeader1Expl;
-    FixedText       aHeader2Expl;
-
-    String          sHeader1;
-    String          sHeader2;
-
-    String          sDeleteEmptyPara;
-    String          sUseReplaceTbl;
-    String          sCptlSttWord;
-    String          sCptlSttSent;
-    String          sUserStyle;
-    String          sBullet;
-    String          sByInputBullet;
-    String          sBoldUnder;
-    String          sNoDblSpaces;
+    OfaACorrCheckListBox	aCheckLB;
+    PushButton		aEditPB;
+    FixedText		aHeader1Expl;
+    FixedText		aHeader2Expl;
+
+    String			sHeader1;
+    String			sHeader2;
+
+    String			sDeleteEmptyPara;
+    String			sUseReplaceTbl;
+    String			sCptlSttWord;
+    String			sCptlSttSent;
+    String			sUserStyle;
+    String			sBullet;
+    String			sByInputBullet;
+    String			sBoldUnder;
+    String			sNoDblSpaces;
     String          sCorrectCapsLock;
-    String          sDetectURL;
+    String			sDetectURL;
     String          sDash;
     String          sNonBrkSpace;
-    String          sOrdinal;
-    String          sRightMargin;
-    String          sNum;
-    String          sBorder;
-    String          sTable;
-    String          sReplaceTemplates;
-    String          sDelSpaceAtSttEnd;
-    String          sDelSpaceBetweenLines;
+    String			sOrdinal;
+    String			sRightMargin;
+    String			sNum;
+    String			sBorder;
+    String			sTable;
+    String			sReplaceTemplates;
+    String			sDelSpaceAtSttEnd;
+    String			sDelSpaceBetweenLines;
 
-    String          sMargin;
-    String          sBulletChar;
-    String          sByInputBulletChar;
+    String			sMargin;
+    String			sBulletChar;
+    String			sByInputBulletChar;
 
-    Font            aBulletFont;
-    Font            aByInputBulletFont;
-    USHORT          nPercent;
+    Font			aBulletFont;
+    Font 			aByInputBulletFont;
+    USHORT			nPercent;
 
-    SvLBoxButtonData*   pCheckButtonData;
+    SvLBoxButtonData*	pCheckButtonData;
 
         DECL_LINK(SelectHdl, OfaACorrCheckListBox*);
         DECL_LINK(EditHdl, PushButton*);
@@ -190,27 +190,27 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
                                 const SfxItemSet& rAttrSet);
         virtual BOOL        FillItemSet( SfxItemSet& rSet );
         virtual void        Reset( const SfxItemSet& rSet );
-        virtual void        ActivatePage( const SfxItemSet& );
+        virtual void		ActivatePage( const SfxItemSet& );
 };
 
 // class AutoCorrEdit ----------------------------------------------------
 
 class AutoCorrEdit : public Edit
 {
-    Link    aActionLink;
-    BOOL    bSpaces;
+    Link 	aActionLink;
+    BOOL 	bSpaces;
 
     public:
                     AutoCorrEdit(Window* pParent, const ResId& rResId) :
                         Edit(pParent, rResId), bSpaces(FALSE){}
 
-    void            SetActionHdl( const Link& rLink )
+    void 			SetActionHdl( const Link& rLink )
                                 { aActionLink = rLink;}
 
-    void            SetSpaces(BOOL bSet)
+    void 			SetSpaces(BOOL bSet)
                                 {bSpaces = bSet;}
 
-    virtual void    KeyInput( const KeyEvent& rKEvent );
+    virtual void	KeyInput( const KeyEvent& rKEvent );
 };
 
 // class OfaAutocorrReplacePage ------------------------------------------
@@ -225,34 +225,34 @@ class OfaAutocorrReplacePage : public SfxTabPage
         using TabPage::DeactivatePage;
 
 private:
-        CheckBox        aTextOnlyCB;
+        CheckBox		aTextOnlyCB;
         FixedText       aShortFT;
-        AutoCorrEdit    aShortED;
+        AutoCorrEdit 	aShortED;
         FixedText       aReplaceFT;
-        AutoCorrEdit    aReplaceED;
-        SvTabListBox    aReplaceTLB;
-        PushButton      aNewReplacePB;
-        PushButton      aDeleteReplacePB;
+        AutoCorrEdit 	aReplaceED;
+        SvTabListBox 	aReplaceTLB;
+        PushButton 		aNewReplacePB;
+        PushButton 		aDeleteReplacePB;
 
-        String          sModify;
-        String          sNew;
+        String			sModify;
+        String			sNew;
 
-        SvStringsISortDtor*     pFormatText;
-        DoubleStringTable       aDoubleStringTable;
-        CollatorWrapper*        pCompareClass;
+        SvStringsISortDtor* 	pFormatText;
+        DoubleStringTable		aDoubleStringTable;
+        CollatorWrapper* 		pCompareClass;
         CharClass*              pCharClass;
-        LanguageType            eLang;
+        LanguageType 			eLang;
 
-        BOOL            bHasSelectionText;
-        BOOL            bFirstSelect:1;
-        BOOL            bReplaceEditChanged:1;
-        BOOL            bSWriter:1;
+        BOOL			bHasSelectionText;
+        BOOL			bFirstSelect:1;
+        BOOL			bReplaceEditChanged:1;
+        BOOL			bSWriter:1;
 
         DECL_LINK(SelectHdl, SvTabListBox*);
         DECL_LINK(NewDelHdl, PushButton*);
         DECL_LINK(ModifyHdl, Edit*);
 
-        void            RefillReplaceBox(BOOL bFromReset, //Box mit neuer Sprache fuellen
+        void 			RefillReplaceBox(BOOL bFromReset, //Box mit neuer Sprache fuellen
                                         LanguageType eOldLanguage,
                                         LanguageType eNewLanguage);
 
@@ -260,15 +260,15 @@ public:
                         OfaAutocorrReplacePage( Window* pParent, const SfxItemSet& rSet );
                         ~OfaAutocorrReplacePage();
 
-    static SfxTabPage*  Create( Window* pParent,
+    static SfxTabPage*	Create( Window* pParent,
                                 const SfxItemSet& rAttrSet);
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
-    virtual void        ActivatePage( const SfxItemSet& );
-    virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
+    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	void 		Reset( const SfxItemSet& rSet );
+    virtual void		ActivatePage( const SfxItemSet& );
+    virtual int			DeactivatePage( SfxItemSet* pSet = 0 );
 
-    void                SetLanguage(LanguageType eSet);
+    void				SetLanguage(LanguageType eSet);
 };
 
 // class OfaAutocorrExceptPage ---------------------------------------------
@@ -283,43 +283,43 @@ class OfaAutocorrExceptPage : public SfxTabPage
     using TabPage::DeactivatePage;
 
 private:
-        FixedLine       aAbbrevFL;
-        AutoCorrEdit    aAbbrevED;
-        ListBox         aAbbrevLB;
-        PushButton      aNewAbbrevPB;
-        PushButton      aDelAbbrevPB;
+        FixedLine		aAbbrevFL;
+        AutoCorrEdit	aAbbrevED;
+        ListBox			aAbbrevLB;
+        PushButton		aNewAbbrevPB;
+        PushButton		aDelAbbrevPB;
         CheckBox        aAutoAbbrevCB;
 
-        FixedLine       aDoubleCapsFL;
-        AutoCorrEdit    aDoubleCapsED;
-        ListBox         aDoubleCapsLB;
-        PushButton      aNewDoublePB;
-        PushButton      aDelDoublePB;
+        FixedLine		aDoubleCapsFL;
+        AutoCorrEdit	aDoubleCapsED;
+        ListBox			aDoubleCapsLB;
+        PushButton		aNewDoublePB;
+        PushButton		aDelDoublePB;
         CheckBox        aAutoCapsCB;
 
-        StringsTable    aStringsTable;
+        StringsTable	aStringsTable;
         CollatorWrapper* pCompareClass;
-        LanguageType    eLang;
+        LanguageType 	eLang;
 
     DECL_LINK(NewDelHdl, PushButton*);
     DECL_LINK(SelectHdl, ListBox*);
     DECL_LINK(ModifyHdl, Edit*);
 
-    void            RefillReplaceBoxes(BOOL bFromReset, //Box mit neuer Sprache fuellen
+    void 			RefillReplaceBoxes(BOOL bFromReset, //Box mit neuer Sprache fuellen
                                         LanguageType eOldLanguage,
                                         LanguageType eNewLanguage);
 public:
                         OfaAutocorrExceptPage( Window* pParent, const SfxItemSet& rSet );
                         ~OfaAutocorrExceptPage();
 
-    static SfxTabPage*  Create( Window* pParent,
+    static SfxTabPage*	Create( Window* pParent,
                                 const SfxItemSet& rAttrSet);
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
-    virtual void        ActivatePage( const SfxItemSet& );
-    virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
-    void                SetLanguage(LanguageType eSet);
+    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	void 		Reset( const SfxItemSet& rSet );
+    virtual void		ActivatePage( const SfxItemSet& );
+    virtual int			DeactivatePage( SfxItemSet* pSet = 0 );
+    void				SetLanguage(LanguageType eSet);
 
 };
 
@@ -331,54 +331,54 @@ class OfaQuoteTabPage : public SfxTabPage
 
 private:
     // For anything but writer
-    SvxCheckListBox aCheckLB;
+    SvxCheckListBox	aCheckLB;
 
     // Just for writer
-    OfaACorrCheckListBox    aSwCheckLB;
-    String          sHeader1;
-    String          sHeader2;
-
+    OfaACorrCheckListBox	aSwCheckLB;	
+    String			sHeader1;
+    String			sHeader2;
+    
     String          sNonBrkSpace;
     String          sOrdinal;
+    
+    SvLBoxButtonData*	pCheckButtonData;
 
-    SvLBoxButtonData*   pCheckButtonData;
-
-    FixedLine   aSingleFL;
+    FixedLine	aSingleFL;
     CheckBox    aSingleTypoCB;
-    FixedText   aSglStartQuoteFT;
+    FixedText	aSglStartQuoteFT;
     PushButton  aSglStartQuotePB;
-    FixedText   aSglStartExFT;
-    FixedText   aSglEndQuoteFT;
-    PushButton  aSglEndQuotePB;
-    FixedText   aSglEndExFT;
-    PushButton  aSglStandardPB;
+    FixedText	aSglStartExFT;
+    FixedText	aSglEndQuoteFT;
+    PushButton	aSglEndQuotePB;
+    FixedText	aSglEndExFT;
+    PushButton	aSglStandardPB;
 
-    FixedLine   aDoubleFL;
+    FixedLine	aDoubleFL;
     CheckBox    aTypoCB;
-    FixedText   aStartQuoteFT;
+    FixedText	aStartQuoteFT;
     PushButton  aStartQuotePB;
-    FixedText   aDblStartExFT;
-    FixedText   aEndQuoteFT;
-    PushButton  aEndQuotePB;
-    FixedText   aDblEndExFT;
-    PushButton  aDblStandardPB;
+    FixedText	aDblStartExFT;
+    FixedText	aEndQuoteFT;
+    PushButton	aEndQuotePB;
+    FixedText	aDblEndExFT;
+    PushButton	aDblStandardPB;
 
-    String      sStartQuoteDlg;
-    String      sEndQuoteDlg;
+    String		sStartQuoteDlg;
+    String		sEndQuoteDlg;
 
-    String      sStandard;
+    String 		sStandard;
 
 
-    sal_UCS4    cSglStartQuote;
-    sal_UCS4    cSglEndQuote;
+    sal_UCS4	cSglStartQuote;
+    sal_UCS4	cSglEndQuote;
 
-    sal_UCS4    cStartQuote;
-    sal_UCS4    cEndQuote;
+    sal_UCS4	cStartQuote;
+    sal_UCS4	cEndQuote;
 
     DECL_LINK( QuoteHdl, PushButton* );
     DECL_LINK( StdQuoteHdl, PushButton* );
 
-    String              ChangeStringExt_Impl( sal_UCS4 );
+    String 				ChangeStringExt_Impl( sal_UCS4 );
 
     SvLBoxEntry* CreateEntry(String& rTxt, USHORT nCol);
 
@@ -386,12 +386,12 @@ private:
 public:
                         ~OfaQuoteTabPage();
 
-    static SfxTabPage*  Create( Window* pParent,
+    static SfxTabPage*	Create( Window* pParent,
                                 const SfxItemSet& rAttrSet);
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
-    virtual void        ActivatePage( const SfxItemSet& );
+    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	void 		Reset( const SfxItemSet& rSet );
+    virtual void		ActivatePage( const SfxItemSet& );
 };
 
 // class OfaAutoCompleteTabPage ---------------------------------------------
@@ -420,15 +420,15 @@ class OfaAutoCompleteTabPage : public SfxTabPage
     //--removed--CheckBox        aCBEndless;//
 
     FixedText       aFTExpandKey;
-    ListBox         aDCBExpandKey;
+    ListBox 		aDCBExpandKey;
     FixedText       aFTMinWordlen;
     NumericField    aNFMinWordlen;
     FixedText       aFTMaxEntries;
     NumericField    aNFMaxEntries;
     AutoCompleteMultiListBox    aLBEntries;
-    PushButton                  aPBEntries;
-    SvStringsISortDtor*         pAutoCmpltList;
-    USHORT                      nAutoCmpltListCnt;
+    PushButton					aPBEntries;
+    SvStringsISortDtor* 		pAutoCmpltList;
+    USHORT 						nAutoCmpltListCnt;
 
     DECL_LINK( CheckHdl, CheckBox* );
 
@@ -437,12 +437,12 @@ class OfaAutoCompleteTabPage : public SfxTabPage
 public:
                         virtual ~OfaAutoCompleteTabPage();
 
-    static SfxTabPage*  Create( Window* pParent,
+    static SfxTabPage*	Create( Window* pParent,
                                 const SfxItemSet& rAttrSet);
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
-    virtual void        ActivatePage( const SfxItemSet& );
+    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	void 		Reset( const SfxItemSet& rSet );
+    virtual void		ActivatePage( const SfxItemSet& );
 
     void CopyToClipboard() const;
     DECL_LINK( DeleteHdl, PushButton* );
@@ -459,23 +459,23 @@ class OfaSmartTagOptionsTabPage : public SfxTabPage
     using TabPage::ActivatePage;
 
 private:
-
+    
     // controls
-    CheckBox                m_aMainCB;
-    SvxCheckListBox         m_aSmartTagTypesLB;
-    PushButton              m_aPropertiesPB;
-    FixedText               m_aTitleFT;
+    CheckBox				m_aMainCB;
+    SvxCheckListBox			m_aSmartTagTypesLB;
+    PushButton				m_aPropertiesPB;
+    FixedText				m_aTitleFT;
 
     // construction via Create()
-    OfaSmartTagOptionsTabPage( Window* pParent, const SfxItemSet& rSet );
-
+    OfaSmartTagOptionsTabPage( Window* pParent,	const SfxItemSet& rSet );
+    
     /** Inserts items into m_aSmartTagTypesLB
-
+    
         Reads out the smart tag types supported by the SmartTagMgr and
         inserts the associated strings into the list box.
     */
     void FillListBox( const SmartTagMgr& rSmartTagMgr );
-
+    
     /** Clears the m_aSmartTagTypesLB
     */
     void ClearListBox();
@@ -486,7 +486,7 @@ private:
         check box.
     */
     DECL_LINK( CheckHdl, CheckBox* );
-
+    
     /** Handler for the push button
 
         Calls the displayPropertyPage function of the smart tag recognizer
@@ -500,16 +500,16 @@ private:
         smart tag types list box changes.
     */
     DECL_LINK( SelectHdl, SvxCheckListBox* );
-
+    
 public:
 
     virtual ~OfaSmartTagOptionsTabPage();
 
-    static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet);
+    static SfxTabPage*	Create( Window* pParent, const SfxItemSet& rAttrSet);
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
-    virtual void        ActivatePage( const SfxItemSet& );
+    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	void 		Reset( const SfxItemSet& rSet );
+    virtual void		ActivatePage( const SfxItemSet& );
 };
 
 #endif // _OFA_AUTOCDLG_CXX
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index ce6eccbfa78f..9ec0548b8e30 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ public:
     void                ShowTblControl(); // fuer den Writer (Zellen/Zeilen/Tabelle)
     void                ShowParaControl(BOOL bCharOnly = FALSE); // fuer den Writer (Absatz/Zeichen)
     void                EnableTransparency(BOOL bColor, BOOL bGraphic);
-    virtual void        PageCreated (SfxAllItemSet aSet); //add CHINA001
+    virtual void		PageCreated (SfxAllItemSet aSet); //add CHINA001
 protected:
     virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
 
@@ -82,7 +82,7 @@ private:
     ~SvxBackgroundTabPage();
 
     // Hintergrundfarbe ------------------------------------
-    Control                 aBorderWin;
+    Control					aBorderWin;
     ValueSet                aBackgroundColorSet;
     FixedLine               aBackgroundColorBox;
     BackgroundPreviewImpl*  pPreviewWin1;
@@ -115,14 +115,14 @@ private:
 
     FixedText               aTblDesc;
     ListBox                 aTblLBox;
-    ListBox                 aParaLBox;
+    ListBox					aParaLBox;
 
     //------------------------------------------------------
-    Color       aBgdColor;
-    USHORT      nHtmlMode;
-    BOOL        bAllowShowSelector  : 1;
-    BOOL        bIsGraphicValid     : 1;
-    BOOL        bLinkOnly           : 1;
+    Color		aBgdColor;
+    USHORT		nHtmlMode;
+    BOOL        bAllowShowSelector	: 1;
+    BOOL        bIsGraphicValid		: 1;
+    BOOL		bLinkOnly			: 1;
     BOOL        bResized            : 1;
     BOOL        bColTransparency    : 1;
     BOOL        bGraphTransparency  : 1;
@@ -134,9 +134,9 @@ private:
     SvxOpenGraphicDialog* pImportDlg;
 
     // Items fuer Sw-Tabelle muessen gesammelt werden
-    SvxBackgroundTable_Impl*    pTableBck_Impl;
+    SvxBackgroundTable_Impl*	pTableBck_Impl;
     // auch fuer die Absatzvorlage
-    SvxBackgroundPara_Impl* pParaBck_Impl;
+    SvxBackgroundPara_Impl*	pParaBck_Impl;
 
 #ifdef _SVX_BACKGRND_CXX
     void                FillColorValueSets_Impl();
@@ -146,10 +146,10 @@ private:
     void                RaiseLoadError_Impl();
     void                SetGraphicPosition_Impl( SvxGraphicPosition ePos );
     SvxGraphicPosition  GetGraphicPosition_Impl();
-    void                FillControls_Impl(const SvxBrushItem& rBgdAttr,
+    void				FillControls_Impl(const SvxBrushItem& rBgdAttr,
                                             const String& rUserData);
-    BOOL                FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, USHORT nSlot);
-    void                ResetFromWallpaperItem( const SfxItemSet& rSet );
+    BOOL 				FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, USHORT nSlot);
+    void				ResetFromWallpaperItem( const SfxItemSet& rSet );
 
     DECL_LINK( LoadTimerHdl_Impl, Timer* );
     DECL_LINK( SelectHdl_Impl, ListBox* );
diff --git a/cui/source/inc/bbdlg.hxx b/cui/source/inc/bbdlg.hxx
index 73f3bc66a122..08bb80b17d2e 100644
--- a/cui/source/inc/bbdlg.hxx
+++ b/cui/source/inc/bbdlg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,23 +33,23 @@
 #include <sfx2/tabdlg.hxx>
 
 /*--------------------------------------------------------------------
-    Beschreibung:   Border Background Pages buendeln
+    Beschreibung:	Border Background Pages buendeln
  --------------------------------------------------------------------*/
 
 class SvxBorderBackgroundDlg: public SfxTabDialog
 {
 public:
-    SvxBorderBackgroundDlg( Window *pParent,
+    SvxBorderBackgroundDlg(	Window *pParent,
                             const SfxItemSet& rCoreSet,
                             BOOL bEnableSelector = FALSE );
 
     ~SvxBorderBackgroundDlg();
 
 protected:
-    virtual void    PageCreated( USHORT nPageId, SfxTabPage& rTabPage );
+    virtual void 	PageCreated( USHORT nPageId, SfxTabPage& rTabPage );
 
 private:
-    BOOL    bEnableBackgroundSelector; // fuer Border/Background-Dlg
+    BOOL	bEnableBackgroundSelector; // fuer Border/Background-Dlg
 };
 
 
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index 7b4e7fab3b62..48ef3eef690f 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,17 +51,17 @@ class SvxBorderTabPage : public SfxTabPage
     using TabPage::DeactivatePage;
 
 public:
-    static SfxTabPage*  Create( Window* pParent,
+    static SfxTabPage*	Create( Window* pParent,
                                 const SfxItemSet& rAttrSet);
-    static USHORT*      GetRanges();
+    static USHORT*		GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& rCoreAttrs );
-    virtual void        Reset( const SfxItemSet& );
+    virtual	BOOL		FillItemSet( SfxItemSet& rCoreAttrs );
+    virtual	void		Reset( const SfxItemSet& );
 
-    void                HideShadowControls();
-    virtual void        PageCreated (SfxAllItemSet aSet); //add CHINA001
+    void				HideShadowControls();
+    virtual void		PageCreated (SfxAllItemSet aSet); //add CHINA001
 protected:
-    virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
+    virtual int			DeactivatePage( SfxItemSet* pSet = 0 );
     virtual void        DataChanged( const DataChangedEvent& rDCEvt );
 
 private:
@@ -69,38 +69,38 @@ private:
     ~SvxBorderTabPage();
 
     // Controls
-    FixedLine           aFlBorder;
+    FixedLine			aFlBorder;
     FixedText           aDefaultFT;
     ValueSet            aWndPresets;
     FixedText           aUserDefFT;
     svx::FrameSelector  aFrameSel;
 
     FixedLine           aFlSep1;
-    FixedLine           aFlLine;
+    FixedLine			aFlLine;
     FixedText           aStyleFT;
     LineListBox         aLbLineStyle;
     FixedText           aColorFT;
-    ColorListBox        aLbLineColor;
+    ColorListBox		aLbLineColor;
 
     FixedLine           aFlSep2;
-    FixedLine           aDistanceFL;
-    FixedText           aLeftFT;
-    MetricField         aLeftMF;
-    FixedText           aRightFT;
-    MetricField         aRightMF;
-    FixedText           aTopFT;
-    MetricField         aTopMF;
-    FixedText           aBottomFT;
-    MetricField         aBottomMF;
-    CheckBox            aSynchronizeCB;
-
-    FixedLine           aFlShadow;
-    FixedText           aFtShadowPos;
-    ValueSet            aWndShadows;
-    FixedText           aFtShadowSize;
-    MetricField         aEdShadowSize;
-    FixedText           aFtShadowColor;
-    ColorListBox        aLbShadowColor;
+    FixedLine			aDistanceFL;
+    FixedText 			aLeftFT;
+    MetricField			aLeftMF;
+    FixedText 			aRightFT;
+    MetricField			aRightMF;
+    FixedText 			aTopFT;
+    MetricField			aTopMF;
+    FixedText 			aBottomFT;
+    MetricField			aBottomMF;
+    CheckBox			aSynchronizeCB;
+
+    FixedLine			aFlShadow;
+    FixedText			aFtShadowPos;
+    ValueSet			aWndShadows;
+    FixedText			aFtShadowSize;
+    MetricField			aEdShadowSize;
+    FixedText			aFtShadowColor;
+    ColorListBox		aLbShadowColor;
 
     //properties - "Merge with next paragraph" in Writer
     FixedLine           aPropertiesFL;
@@ -114,8 +114,8 @@ private:
     ImageList           aBorderImgLstH;
     ImageList           aBorderImgLst;
 
-    long                nMinValue;  // minimum distance
-    int                 nSWMode;    // table, textframe, paragraph
+    long				nMinValue;	// minimum distance
+    int             	nSWMode;	// table, textframe, paragraph
 
     bool                mbHorEnabled;       /// true = Inner horizontal border enabled.
     bool                mbVerEnabled;       /// true = Inner vertical border enabled.
@@ -123,7 +123,7 @@ private:
     bool                mbBLTREnabled;      /// true = Bottom-left to top-right border enabled.
     bool                mbUseMarginItem;
 
-    static BOOL         bSync;
+    static BOOL 		bSync;
 
 #ifdef _SVX_BORDER_CXX
     // Handler
@@ -143,7 +143,7 @@ private:
     void                FillValueSets();
 
     // Filler
-    void                FillLineListBox_Impl();
+    void				FillLineListBox_Impl();
 
     // Setzen von einzelnen Frame-/Core-Linien
     void                ResetFrameLine_Impl( svx::FrameBorderType eBorder,
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 5a84b2a98c14..ccc45bba70d0 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 #define _SVSTDARR_USHORTS
 #define _SVSTDARR_STRINGSDTOR
-#include <svl/svstdarr.hxx>     // SvUShorts
+#include <svl/svstdarr.hxx>		// SvUShorts
 #include <sfx2/minarray.hxx>
 #include <sfx2/tabdlg.hxx>
 #include <vector>
@@ -78,8 +78,8 @@ public:
 
     void                        ActivateTabPage( USHORT );
 
-    virtual void                PageCreated( USHORT nId, SfxTabPage &rPage );
-    virtual short               Ok();
+    virtual void				PageCreated( USHORT nId, SfxTabPage &rPage );
+    virtual short				Ok();
 
     void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame);
 };
@@ -88,10 +88,10 @@ class SaveInData : public ImageProvider
 {
 private:
 
-    bool        bModified;
+    bool		bModified;
 
-    bool        bDocConfig;
-    bool        bReadOnly;
+    bool		bDocConfig;
+    bool		bReadOnly;
 
     ::com::sun::star::uno::Reference
         < com::sun::star::ui::XUIConfigurationManager > m_xCfgMgr;
@@ -137,7 +137,7 @@ public:
     ::com::sun::star::uno::Reference
         < ::com::sun::star::ui::XUIConfigurationManager >
             GetParentConfigManager() { return m_xParentCfgMgr; };
-
+    
     ::com::sun::star::uno::Reference
         < ::com::sun::star::ui::XImageManager >
             GetImageManager() { return m_xImgMgr; };
@@ -172,13 +172,13 @@ class MenuSaveInData : public SaveInData
 {
 private:
 
-    rtl::OUString               m_aMenuResourceURL;
-    rtl::OUString               m_aDescriptorContainer;
+    rtl::OUString				m_aMenuResourceURL;
+    rtl::OUString				m_aDescriptorContainer;
 
     ::com::sun::star::uno::Reference
         < com::sun::star::container::XIndexAccess > m_xMenuSettings;
 
-    SvxConfigEntry* pRootEntry;
+    SvxConfigEntry*	pRootEntry;
 
     // static holder of the default menu data
     static MenuSaveInData* pDefaultData;
@@ -186,9 +186,9 @@ private:
     static void SetDefaultData( MenuSaveInData* pData ) {pDefaultData = pData;}
     static MenuSaveInData* GetDefaultData() { return pDefaultData; }
 
-    void        Apply( bool bDefault );
+    void		Apply( bool bDefault );
 
-    void        Apply(
+    void		Apply(
         SvxConfigEntry* pRootEntry,
         com::sun::star::uno::Reference<
             com::sun::star::container::XIndexContainer >& rNewMenuBar,
@@ -196,14 +196,14 @@ private:
             com::sun::star::lang::XSingleComponentFactory >& rFactory,
         SvLBoxEntry *pParent = NULL );
 
-    void        ApplyMenu(
+    void		ApplyMenu(
         com::sun::star::uno::Reference<
             com::sun::star::container::XIndexContainer >& rNewMenuBar,
         com::sun::star::uno::Reference<
             com::sun::star::lang::XSingleComponentFactory >& rFactory,
         SvxConfigEntry *pMenuData = NULL );
 
-    bool        LoadSubMenus(
+    bool		LoadSubMenus(
         const ::com::sun::star::uno::Reference<
             com::sun::star::container::XIndexAccess >& xMenuBarSettings,
         const rtl::OUString& rBaseTitle, SvxConfigEntry* pParentData );
@@ -221,12 +221,12 @@ public:
     ~MenuSaveInData();
 
     // methods inherited from SaveInData
-    SvxEntries*         GetEntries();
-    void                SetEntries( SvxEntries* );
-    bool                HasURL( const rtl::OUString& URL ) { (void)URL; return FALSE; }
-    bool                HasSettings() { return m_xMenuSettings.is(); }
-    void                Reset();
-    bool                Apply();
+    SvxEntries*			GetEntries();
+    void				SetEntries( SvxEntries* );
+    bool				HasURL( const rtl::OUString& URL ) { (void)URL; return FALSE; }
+    bool				HasSettings() { return m_xMenuSettings.is(); }
+    void				Reset();
+    bool				Apply();
 };
 
 class SvxConfigEntry
@@ -234,28 +234,28 @@ class SvxConfigEntry
 private:
 
     // common properties
-    USHORT                      nId;
-    ::rtl::OUString             aHelpText;
-    ::rtl::OUString             aLabel;
-    ::rtl::OUString             aCommand;
-    ::rtl::OUString             aHelpURL;
+    USHORT						nId;
+    ::rtl::OUString  			aHelpText;
+    ::rtl::OUString				aLabel;
+    ::rtl::OUString				aCommand;
+    ::rtl::OUString				aHelpURL;
 
     bool                        bPopUp;
     bool                        bStrEdited;
-    bool                        bIsUserDefined;
-    bool                        bIsMain;
-    bool                        bIsDeletable;
-    bool                        bIsMovable;
+    bool						bIsUserDefined;
+    bool						bIsMain;
+    bool						bIsDeletable;
+    bool						bIsMovable;
     bool                        bIsParentData;
 
     // toolbar specific properties
-    bool                        bIsVisible;
-    sal_Int32                   nStyle;
+    bool						bIsVisible;
+    sal_Int32					nStyle;
 
     ::com::sun::star::uno::Reference<
         ::com::sun::star::graphic::XGraphic > xBackupGraphic;
 
-    SvxEntries                  *pEntries;
+    SvxEntries					*pEntries;
 
 public:
 
@@ -271,7 +271,7 @@ public:
                     bool bParentData = FALSE );
 
     SvxConfigEntry()
-        :
+        :	
             nId( 0 ),
             bPopUp( FALSE ),
             bStrEdited( FALSE ),
@@ -285,46 +285,46 @@ public:
 
     ~SvxConfigEntry();
 
-    const ::rtl::OUString&      GetCommand() const { return aCommand; }
-    void    SetCommand( const String& rCmd ) { aCommand = rCmd; }
+    const ::rtl::OUString&		GetCommand() const { return aCommand; }
+    void	SetCommand( const String& rCmd ) { aCommand = rCmd; }
 
-    const ::rtl::OUString&      GetName() const { return aLabel; }
-    void    SetName( const String& rStr ) { aLabel = rStr; bStrEdited = TRUE; }
-    bool    HasChangedName() const { return bStrEdited; }
+    const ::rtl::OUString& 		GetName() const { return aLabel; }
+    void	SetName( const String& rStr ) { aLabel = rStr; bStrEdited = TRUE; }
+    bool	HasChangedName() const { return bStrEdited; }
 
-    const ::rtl::OUString&      GetHelpText() ;
-    void    SetHelpText( const String& rStr ) { aHelpText = rStr; }
+    const ::rtl::OUString&		GetHelpText() ;
+    void	SetHelpText( const String& rStr ) { aHelpText = rStr; }
 
-    const ::rtl::OUString&      GetHelpURL() const { return aHelpURL; }
-    void    SetHelpURL( const String& rStr ) { aHelpURL = rStr; }
+    const ::rtl::OUString&		GetHelpURL() const { return aHelpURL; }
+    void	SetHelpURL( const String& rStr ) { aHelpURL = rStr; }
 
-    void    SetPopup( bool bOn = TRUE ) { bPopUp = bOn; }
-    bool    IsPopup() const { return bPopUp; }
+    void	SetPopup( bool bOn = TRUE ) { bPopUp = bOn; }
+    bool	IsPopup() const { return bPopUp; }
 
-    void    SetUserDefined( bool bOn = TRUE ) { bIsUserDefined = bOn; }
-    bool    IsUserDefined() const { return bIsUserDefined; }
+    void	SetUserDefined( bool bOn = TRUE ) { bIsUserDefined = bOn; }
+    bool	IsUserDefined() const { return bIsUserDefined; }
 
-    bool    IsBinding() const { return !bPopUp; }
-    bool    IsSeparator() const { return nId == 0; }
+    bool	IsBinding() const { return !bPopUp; }
+    bool	IsSeparator() const { return nId == 0; }
 
-    SvxEntries* GetEntries() const { return pEntries; }
-    void    SetEntries( SvxEntries* entries ) { pEntries = entries; }
-    bool    HasEntries() const { return pEntries != NULL; }
+    SvxEntries*	GetEntries() const { return pEntries; }
+    void	SetEntries( SvxEntries* entries ) { pEntries = entries; }
+    bool	HasEntries() const { return pEntries != NULL; }
 
-    void    SetMain( bool bValue = TRUE ) { bIsMain = bValue; }
-    bool    IsMain() { return bIsMain; }
+    void	SetMain( bool bValue = TRUE ) { bIsMain = bValue; }
+    bool	IsMain() { return bIsMain; }
 
     void    SetParentData( bool bValue = TRUE ) { bIsParentData = bValue; }
     bool    IsParentData() { return bIsParentData; }
 
-    bool    IsMovable();
-    bool    IsDeletable();
-    bool    IsRenamable();
+    bool	IsMovable();
+    bool	IsDeletable();
+    bool	IsRenamable();
 
-    void    SetVisible( bool b ) { bIsVisible = b; }
-    bool    IsVisible() const { return bIsVisible; }
+    void	SetVisible( bool b ) { bIsVisible = b; }
+    bool	IsVisible() const { return bIsVisible; }
 
-    void    SetBackupGraphic(
+    void	SetBackupGraphic(
         ::com::sun::star::uno::Reference<
             ::com::sun::star::graphic::XGraphic > graphic )
                 { xBackupGraphic = graphic; }
@@ -334,10 +334,10 @@ public:
             GetBackupGraphic()
                 { return xBackupGraphic; }
 
-    bool    IsIconModified() { return xBackupGraphic.is(); }
+    bool	IsIconModified() { return xBackupGraphic.is(); }
 
-    sal_Int32   GetStyle() { return nStyle; }
-    void        SetStyle( sal_Int32 style ) { nStyle = style; }
+    sal_Int32	GetStyle() { return nStyle; }
+    void		SetStyle( sal_Int32 style ) { nStyle = style; }
 
     com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >
         GetProperties(
@@ -348,38 +348,38 @@ public:
 class SvxMenuEntriesListBox : public SvTreeListBox
 {
 private:
-    SvxConfigPage*      pPage;
+    SvxConfigPage*		pPage;
 
 protected:
-    bool                m_bIsInternalDrag;
+    bool				m_bIsInternalDrag;
 
 public:
     SvxMenuEntriesListBox( Window*, const ResId& );
     ~SvxMenuEntriesListBox();
 
-    virtual sal_Int8    AcceptDrop( const AcceptDropEvent& rEvt );
+    virtual sal_Int8	AcceptDrop( const AcceptDropEvent& rEvt );
 
-    virtual BOOL        NotifyAcceptDrop( SvLBoxEntry* pEntry );
+    virtual BOOL    	NotifyAcceptDrop( SvLBoxEntry* pEntry );
 
-    virtual BOOL        NotifyMoving( SvLBoxEntry*, SvLBoxEntry*,
+    virtual BOOL    	NotifyMoving( SvLBoxEntry*, SvLBoxEntry*,
                                       SvLBoxEntry*&, ULONG& );
 
-    virtual BOOL        NotifyCopying( SvLBoxEntry*, SvLBoxEntry*,
+    virtual BOOL		NotifyCopying( SvLBoxEntry*, SvLBoxEntry*,
                                        SvLBoxEntry*&, ULONG&);
 
-    virtual DragDropMode    NotifyStartDrag(
+    virtual DragDropMode	NotifyStartDrag(
         TransferDataContainer&, SvLBoxEntry* );
 
-    virtual void        DragFinished( sal_Int8 );
+    virtual void		DragFinished( sal_Int8 );
 
-    void                KeyInput( const KeyEvent& rKeyEvent );
+    void 				KeyInput( const KeyEvent& rKeyEvent );
 };
 
 class SvxDescriptionEdit : public ExtMultiLineEdit
 {
 private:
     Rectangle           m_aRealRect;
-
+    
 public:
     SvxDescriptionEdit( Window* pParent, const ResId& _rId );
     inline ~SvxDescriptionEdit() {}
@@ -392,8 +392,8 @@ class SvxConfigPage : public SfxTabPage
 {
 private:
 
-    bool                                bInitialised;
-    SaveInData*                         pCurrentSaveInData;
+    bool								bInitialised;
+    SaveInData*							pCurrentSaveInData;
 
     DECL_LINK(  SelectSaveInLocation, ListBox * );
     DECL_LINK(  AsyncInfoMsg, String* );
@@ -405,34 +405,34 @@ protected:
 
     // the top section of the tab page where top level menus and toolbars
     //  are displayed in a listbox
-    FixedLine                           aTopLevelSeparator;
-    FixedText                           aTopLevelLabel;
-    ListBox                             aTopLevelListBox;
-    PushButton                          aNewTopLevelButton;
-    MenuButton                          aModifyTopLevelButton;
+    FixedLine							aTopLevelSeparator;
+    FixedText							aTopLevelLabel;
+    ListBox								aTopLevelListBox;
+    PushButton							aNewTopLevelButton;
+    MenuButton							aModifyTopLevelButton;
 
     // the contents section where the contents of the selected
     // menu or toolbar are displayed
-    FixedLine                           aContentsSeparator;
-    FixedText                           aContentsLabel;
-    SvTreeListBox*                      aContentsListBox;
+    FixedLine							aContentsSeparator;
+    FixedText							aContentsLabel;
+    SvTreeListBox*						aContentsListBox;
 
-    PushButton                          aAddCommandsButton;
-    MenuButton                          aModifyCommandButton;
+    PushButton							aAddCommandsButton;
+    MenuButton							aModifyCommandButton;
 
-    ImageButton                         aMoveUpButton;
-    ImageButton                         aMoveDownButton;
+    ImageButton							aMoveUpButton;
+    ImageButton							aMoveDownButton;
 
-    FixedText                           aSaveInText;
-    ListBox                             aSaveInListBox;
+    FixedText							aSaveInText;
+    ListBox								aSaveInListBox;
 
     FixedText                           aDescriptionLabel;
     SvxDescriptionEdit                  aDescriptionField;
 
-    SvxScriptSelectorDialog*            pSelectorDlg;
+    SvxScriptSelectorDialog*			pSelectorDlg;
 
     // the ResourceURL to select when opening the dialog
-    rtl::OUString                       m_aURLToSelect;
+    rtl::OUString						m_aURLToSelect;
 
     ::com::sun::star::uno::Reference
         < ::com::sun::star::frame::XFrame > m_xFrame;
@@ -450,49 +450,49 @@ protected:
         const rtl::OUString& aModuleId,
         bool docConfig ) = 0;
 
-    virtual void            Init() = 0;
-    virtual void            UpdateButtonStates() = 0;
-    virtual short           QueryReset() = 0;
+    virtual void			Init() = 0;
+    virtual void			UpdateButtonStates() = 0;
+    virtual short			QueryReset() = 0;
 
-    void            PositionContentsListBox();
+    void			PositionContentsListBox();
 
-    SvLBoxEntry*    InsertEntry(        SvxConfigEntry* pNewEntryData,
+    SvLBoxEntry*	InsertEntry(		SvxConfigEntry* pNewEntryData,
                                         SvLBoxEntry* pTarget = NULL,
                                         bool bFront = FALSE );
 
-    void            AddSubMenusToUI(    const String& rBaseTitle,
+    void			AddSubMenusToUI(	const String& rBaseTitle,
                                         SvxConfigEntry* pParentData );
 
-    SvLBoxEntry*    InsertEntryIntoUI ( SvxConfigEntry* pNewEntryData,
+    SvLBoxEntry*	InsertEntryIntoUI ( SvxConfigEntry* pNewEntryData,
                                         ULONG nPos = LIST_APPEND );
 
-    SvxEntries*     FindParentForChild( SvxEntries* pParentEntries,
+    SvxEntries*		FindParentForChild( SvxEntries* pParentEntries,
                                         SvxConfigEntry* pChildData );
 
-    void            ReloadTopLevelListBox( SvxConfigEntry* pSelection = NULL );
+    void			ReloadTopLevelListBox( SvxConfigEntry* pSelection = NULL );
 
 public:
 
-    static bool     CanConfig( const ::rtl::OUString& rModuleId );
+    static bool		CanConfig( const ::rtl::OUString& rModuleId );
 
-    SaveInData*     GetSaveInData() { return pCurrentSaveInData; }
+    SaveInData*		GetSaveInData() { return pCurrentSaveInData; }
 
-    SvLBoxEntry*    AddFunction( SvLBoxEntry* pTarget = NULL,
+    SvLBoxEntry*	AddFunction( SvLBoxEntry* pTarget = NULL,
                                  bool bFront = FALSE,
                                  bool bAllowDuplicates = FALSE );
 
-    virtual void    MoveEntry( bool bMoveUp );
+    virtual void	MoveEntry( bool bMoveUp );
 
-    bool            MoveEntryData(  SvLBoxEntry* pSourceEntry,
+    bool			MoveEntryData(	SvLBoxEntry* pSourceEntry,
                                     SvLBoxEntry* pTargetEntry );
 
-    BOOL            FillItemSet( SfxItemSet& );
-    void            Reset( const SfxItemSet& );
+    BOOL			FillItemSet( SfxItemSet& );
+    void			Reset( const SfxItemSet& );
 
-    virtual bool    DeleteSelectedContent() = 0;
-    virtual void    DeleteSelectedTopLevel() = 0;
+    virtual bool	DeleteSelectedContent() = 0;
+    virtual void	DeleteSelectedTopLevel() = 0;
 
-    SvxConfigEntry* GetTopLevelSelection()
+    SvxConfigEntry*	GetTopLevelSelection()
     {
         return (SvxConfigEntry*) aTopLevelListBox.GetEntryData(
             aTopLevelListBox.GetSelectEntryPos() );
@@ -524,11 +524,11 @@ private:
     DECL_LINK( AddCommandsHdl, Button * );
     DECL_LINK( AddFunctionHdl, SvxScriptSelectorDialog * );
 
-    void            Init();
-    void            UpdateButtonStates();
-    short           QueryReset();
-    bool            DeleteSelectedContent();
-    void            DeleteSelectedTopLevel();
+    void			Init();
+    void			UpdateButtonStates();
+    short			QueryReset();
+    bool			DeleteSelectedContent();
+    void			DeleteSelectedTopLevel();
 
 public:
     SvxMenuConfigPage( Window *pParent, const SfxItemSet& rItemSet );
@@ -545,19 +545,19 @@ public:
 
 class SvxMainMenuOrganizerDialog : public ModalDialog
 {
-    FixedText       aMenuNameText;
-    Edit            aMenuNameEdit;
-    FixedText       aMenuListText;
-    SvTreeListBox   aMenuListBox;
-    ImageButton     aMoveUpButton;
-    ImageButton     aMoveDownButton;
-    OKButton        aOKButton;
-    CancelButton    aCloseButton;
-    HelpButton      aHelpButton;
-
-    SvxEntries*     pEntries;
-    SvLBoxEntry*    pNewMenuEntry;
-    bool            bModified;
+    FixedText		aMenuNameText;
+    Edit			aMenuNameEdit;
+    FixedText		aMenuListText;
+    SvTreeListBox	aMenuListBox;
+    ImageButton		aMoveUpButton;
+    ImageButton		aMoveDownButton;
+    OKButton		aOKButton;
+    CancelButton	aCloseButton;
+    HelpButton		aHelpButton;
+
+    SvxEntries*		pEntries;
+    SvLBoxEntry*	pNewMenuEntry;
+    bool			bModified;
 
     void UpdateButtonStates();
 
@@ -572,27 +572,27 @@ public:
 
     ~SvxMainMenuOrganizerDialog ();
 
-    SvxEntries*     GetEntries();
-    void            SetEntries( SvxEntries* );
-    SvxConfigEntry* GetSelectedEntry();
+    SvxEntries* 	GetEntries();
+    void 			SetEntries( SvxEntries* );
+    SvxConfigEntry*	GetSelectedEntry();
 };
 
 class SvxToolbarEntriesListBox : public SvxMenuEntriesListBox
 {
-    Size            m_aCheckBoxImageSizePixel;
-    Link            m_aChangedListener;
-    SvLBoxButtonData*   m_pButtonData;
-    BOOL            m_bHiContrastMode;
-    SvxConfigPage*  pPage;
+    Size			m_aCheckBoxImageSizePixel;
+    Link			m_aChangedListener;
+    SvLBoxButtonData*	m_pButtonData;
+    BOOL			m_bHiContrastMode;
+    SvxConfigPage*	pPage;
 
-    void            ChangeVisibility( SvLBoxEntry* pEntry );
+    void			ChangeVisibility( SvLBoxEntry* pEntry );
 
 protected:
 
-    virtual void    CheckButtonHdl();
-    virtual void    DataChanged( const DataChangedEvent& rDCEvt );
-    void            BuildCheckBoxButtonImages( SvLBoxButtonData* );
-    Image           GetSizedImage(
+    virtual void	CheckButtonHdl();
+    virtual void	DataChanged( const DataChangedEvent& rDCEvt );
+    void			BuildCheckBoxButtonImages( SvLBoxButtonData* );
+    Image			GetSizedImage(
         VirtualDevice& aDev, const Size& aNewSize, const Image& aImage );
 
 public:
@@ -602,21 +602,21 @@ public:
 
     ~SvxToolbarEntriesListBox();
 
-    void            SetChangedListener( const Link& aChangedListener )
+    void			SetChangedListener( const Link& aChangedListener )
         { m_aChangedListener = aChangedListener; }
 
-    const Link&     GetChangedListener() const { return m_aChangedListener; }
+    const Link&		GetChangedListener() const { return m_aChangedListener; }
 
-    Size            GetCheckBoxPixelSize() const
+    Size			GetCheckBoxPixelSize() const
         { return m_aCheckBoxImageSizePixel; }
 
-    virtual BOOL    NotifyMoving(
+    virtual BOOL	NotifyMoving(
         SvLBoxEntry*, SvLBoxEntry*, SvLBoxEntry*&, ULONG& );
 
-    virtual BOOL    NotifyCopying(
+    virtual BOOL	NotifyCopying(
         SvLBoxEntry*, SvLBoxEntry*, SvLBoxEntry*&, ULONG&);
 
-    void            KeyInput( const KeyEvent& rKeyEvent );
+    void 			KeyInput( const KeyEvent& rKeyEvent );
 };
 
 class SvxToolbarConfigPage : public SvxConfigPage
@@ -632,23 +632,23 @@ private:
     DECL_LINK( AddFunctionHdl, SvxScriptSelectorDialog * );
     DECL_LINK( MoveHdl, Button * );
 
-    void            UpdateButtonStates();
-    short           QueryReset();
-    void            Init();
-    bool            DeleteSelectedContent();
-    void            DeleteSelectedTopLevel();
+    void			UpdateButtonStates();
+    short			QueryReset();
+    void			Init();
+    bool			DeleteSelectedContent();
+    void			DeleteSelectedTopLevel();
 
 public:
     SvxToolbarConfigPage( Window *pParent, const SfxItemSet& rItemSet );
     ~SvxToolbarConfigPage();
 
-    SvLBoxEntry*    AddFunction( SvLBoxEntry* pTarget = NULL,
+    SvLBoxEntry*	AddFunction( SvLBoxEntry* pTarget = NULL,
                                              bool bFront = FALSE,
                                              bool bAllowDuplicates = TRUE );
 
-    void            MoveEntry( bool bMoveUp );
+    void			MoveEntry( bool bMoveUp );
 
-    SaveInData*     CreateSaveInData(
+    SaveInData*		CreateSaveInData(
         const ::com::sun::star::uno::Reference <
             ::com::sun::star::ui::XUIConfigurationManager >&,
         const ::com::sun::star::uno::Reference <
@@ -661,18 +661,18 @@ class ToolbarSaveInData : public SaveInData
 {
 private:
 
-    SvxConfigEntry*                                pRootEntry;
-    rtl::OUString                                  m_aDescriptorContainer;
+    SvxConfigEntry*	                               pRootEntry;
+    rtl::OUString	                               m_aDescriptorContainer;
 
     ::com::sun::star::uno::Reference
         < com::sun::star::container::XNameAccess > m_xPersistentWindowState;
 
-    bool        LoadToolbar(
+    bool		LoadToolbar(
         const ::com::sun::star::uno::Reference<
             com::sun::star::container::XIndexAccess >& xToolBarSettings,
         SvxConfigEntry* pParentData );
 
-    void        ApplyToolbar(
+    void		ApplyToolbar(
         com::sun::star::uno::Reference<
             com::sun::star::container::XIndexContainer >& rNewToolbarBar,
         com::sun::star::uno::Reference<
@@ -691,41 +691,41 @@ public:
 
     ~ToolbarSaveInData();
 
-    void            CreateToolbar( SvxConfigEntry* pToolbar );
-    void            RestoreToolbar( SvxConfigEntry* pToolbar );
-    void            RemoveToolbar( SvxConfigEntry* pToolbar );
-    void            ApplyToolbar( SvxConfigEntry* pToolbar );
-    void            ReloadToolbar( const rtl::OUString& rURL );
+    void			CreateToolbar( SvxConfigEntry* pToolbar );
+    void 			RestoreToolbar( SvxConfigEntry* pToolbar );
+    void 			RemoveToolbar( SvxConfigEntry* pToolbar );
+    void 			ApplyToolbar( SvxConfigEntry* pToolbar );
+    void 			ReloadToolbar( const rtl::OUString& rURL );
 
-    rtl::OUString   GetSystemUIName( const rtl::OUString& rResourceURL );
+    rtl::OUString	GetSystemUIName( const rtl::OUString& rResourceURL );
 
-    sal_Int32       GetSystemStyle( const rtl::OUString& rResourceURL );
+    sal_Int32		GetSystemStyle( const rtl::OUString& rResourceURL );
 
-    void            SetSystemStyle(
+    void			SetSystemStyle(
         const rtl::OUString& rResourceURL, sal_Int32 nStyle );
 
-    void            SetSystemStyle(
+    void			SetSystemStyle(
         ::com::sun::star::uno::Reference
             < ::com::sun::star::frame::XFrame > xFrame,
         const rtl::OUString& rResourceURL, sal_Int32 nStyle );
 
-    SvxEntries*     GetEntries();
-    void            SetEntries( SvxEntries* );
-    bool            HasSettings();
-    bool            HasURL( const rtl::OUString& rURL );
-    void            Reset();
-    bool            Apply();
+    SvxEntries*		GetEntries();
+    void 			SetEntries( SvxEntries* );
+    bool			HasSettings();
+    bool			HasURL( const rtl::OUString& rURL );
+    void			Reset();
+    bool			Apply();
 };
 
 class SvxNewToolbarDialog : public ModalDialog
 {
 private:
-    FixedText       aFtDescription;
-    Edit            aEdtName;
-    FixedText       aSaveInText;
-    OKButton        aBtnOK;
-    CancelButton    aBtnCancel;
-    HelpButton      aBtnHelp;
+    FixedText		aFtDescription;
+    Edit			aEdtName;
+    FixedText		aSaveInText;
+    OKButton		aBtnOK;
+    CancelButton	aBtnCancel;
+    HelpButton		aBtnHelp;
 
     Link            aCheckNameHdl;
 
@@ -734,7 +734,7 @@ private:
 public:
     SvxNewToolbarDialog( Window* pWindow, const String& rName );
 
-    ListBox         aSaveInListBox;
+    ListBox			aSaveInListBox;
 
     void    GetName( rtl::OUString& rName ){rName = aEdtName.GetText();}
 
@@ -751,18 +751,18 @@ public:
 class SvxIconSelectorDialog : public ModalDialog
 {
 private:
-    FixedText       aFtDescription;
-    ToolBox         aTbSymbol;
-    FixedText       aFtNote;
-    OKButton        aBtnOK;
-    CancelButton    aBtnCancel;
-    HelpButton      aBtnHelp;
-    PushButton      aBtnImport;
-    PushButton      aBtnDelete;
+    FixedText		aFtDescription;
+    ToolBox			aTbSymbol;
+    FixedText		aFtNote;
+    OKButton		aBtnOK;
+    CancelButton	aBtnCancel;
+    HelpButton		aBtnHelp;
+    PushButton		aBtnImport;
+    PushButton      aBtnDelete; 
     FixedLine       aFlSeparator;
     sal_uInt16      m_nNextId;
 
-    sal_Int32       m_nExpectedSize;
+    sal_Int32		m_nExpectedSize;
 
     ::com::sun::star::uno::Reference<
         ::com::sun::star::ui::XImageManager > m_xImageManager;
@@ -771,13 +771,13 @@ private:
         ::com::sun::star::ui::XImageManager > m_xParentImageManager;
 
     ::com::sun::star::uno::Reference<
-        ::com::sun::star::ui::XImageManager > m_xImportedImageManager;
+        ::com::sun::star::ui::XImageManager > m_xImportedImageManager; 
 
     ::com::sun::star::uno::Reference<
         ::com::sun::star::graphic::XGraphicProvider > m_xGraphProvider;
-
+    
     bool ReplaceGraphicItem( const ::rtl::OUString& aURL );
-
+    
     bool ImportGraphic( const ::rtl::OUString& aURL );
 
     void ImportGraphics(
@@ -792,8 +792,8 @@ public:
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::ui::XImageManager >& rXImageManager,
         const ::com::sun::star::uno::Reference<
-            ::com::sun::star::ui::XImageManager >& rXParentImageManager
-            );
+            ::com::sun::star::ui::XImageManager >& rXParentImageManager 
+            ); 
 
     ~SvxIconSelectorDialog();
 
@@ -802,19 +802,19 @@ public:
 
     DECL_LINK( SelectHdl, ToolBox * );
     DECL_LINK( ImportHdl, PushButton * );
-    DECL_LINK( DeleteHdl, PushButton * );
+    DECL_LINK( DeleteHdl, PushButton * ); 
 };
 
 class SvxIconReplacementDialog : public MessBox
 {
 public:
-    SvxIconReplacementDialog(
-        Window *pWindow,
+    SvxIconReplacementDialog( 
+        Window *pWindow, 
         const rtl::OUString& aMessage,
         bool aYestoAll);
 
-    SvxIconReplacementDialog(
-        Window *pWindow,
+    SvxIconReplacementDialog( 
+        Window *pWindow, 
         const rtl::OUString& aMessage );
 
     rtl::OUString ReplaceIconName( const rtl::OUString& );
@@ -824,8 +824,8 @@ public:
 class SvxIconChangeDialog : public ModalDialog
 {
 private:
-    FixedImage      aFImageInfo;
-    OKButton        aBtnOK;
+    FixedImage		aFImageInfo;
+    OKButton		aBtnOK;
     FixedText         aDescriptionLabel;
     SvxDescriptionEdit aLineEditDescription;
 public:
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index db8d4740b054..7d14afebacf8 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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/script/browse/XBrowseNode.hpp>
 
 #define _SVSTDARR_STRINGSDTOR
-#include <svl/svstdarr.hxx>
+#include <svl/svstdarr.hxx>		
 
 #include <vcl/timer.hxx>
 #include <svtools/svtabbx.hxx>
@@ -110,10 +110,10 @@ struct SfxStylesInfo_Impl
 
 struct SfxGroupInfo_Impl
 {
-    USHORT      nKind;
-    USHORT      nOrd;
-    void*       pObject;
-    BOOL        bWasOpened;
+    USHORT 		nKind;
+    USHORT 		nOrd;
+    void*		pObject;
+    BOOL		bWasOpened;
     String      sCommand;
     String      sLabel;
 
@@ -143,7 +143,7 @@ public:
     SvLBoxEntry*  GetEntry_Impl( USHORT nId );
     SvLBoxEntry*  GetEntry_Impl( const String& );
     USHORT        GetId( SvLBoxEntry *pEntry );
-    using Window::GetHelpText;
+    using Window::GetHelpText;  
     String        GetHelpText( SvLBoxEntry *pEntry );
     USHORT        GetCurId() { return GetId( FirstSelected() ); }
     String        GetCurCommand();
@@ -156,7 +156,7 @@ public:
 struct SvxConfigGroupBoxResource_Impl;
 class SfxConfigGroupListBox_Impl : public SvTreeListBox
 {
-    SvxConfigGroupBoxResource_Impl* pImp;
+    SvxConfigGroupBoxResource_Impl*	pImp;
     //SfxSlotPool*                    pSlotPool;
     SfxConfigFunctionListBox_Impl*  pFunctionListBox;
     SfxGroupInfoArr_Impl            aArr;
@@ -191,7 +191,7 @@ protected:
 
 public:
     SfxConfigGroupListBox_Impl ( Window* pParent,
-                                 const ResId&,
+                                 const ResId&, 
                                  ULONG nConfigMode = 0 );
     ~SfxConfigGroupListBox_Impl();
     void                ClearAll();
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 494d77bf7f13..49169b084ea7 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,43 +44,43 @@ class FontList;
 
 // -----------------------------------------------------------------------
 
-#define DISABLE_CASEMAP             ((USHORT)0x0001)
-#define DISABLE_WORDLINE            ((USHORT)0x0002)
-#define DISABLE_BLINK               ((USHORT)0x0004)
-#define DISABLE_UNDERLINE_COLOR     ((USHORT)0x0008)
+#define DISABLE_CASEMAP				((USHORT)0x0001)
+#define DISABLE_WORDLINE			((USHORT)0x0002)
+#define DISABLE_BLINK				((USHORT)0x0004)
+#define DISABLE_UNDERLINE_COLOR		((USHORT)0x0008)
 
-#define DISABLE_LANGUAGE            ((USHORT)0x0010)
-#define DISABLE_HIDE_LANGUAGE       ((USHORT)0x0020)
+#define DISABLE_LANGUAGE			((USHORT)0x0010)
+#define DISABLE_HIDE_LANGUAGE		((USHORT)0x0020)
 
 // class SvxCharBasePage -------------------------------------------------
 
 class SvxCharBasePage : public SfxTabPage
 {
 protected:
-    SvxFontPrevWindow   m_aPreviewWin;
-    FixedInfo           m_aFontTypeFT;
+    SvxFontPrevWindow	m_aPreviewWin;
+    FixedInfo			m_aFontTypeFT;
 
-    BOOL                m_bPreviewBackgroundToCharacter;
+    BOOL				m_bPreviewBackgroundToCharacter;
 
                         SvxCharBasePage( Window* pParent, const ResId& rResIdTabPage, const SfxItemSet&,
                                             USHORT nResIdPrewievWin, USHORT nResIdFontTypeFT );
-    virtual             ~SvxCharBasePage();
+    virtual				~SvxCharBasePage();
 
-    void                SetPrevFontSize( const SfxItemSet& rSet, USHORT nSlot, SvxFont& rFont );
-    void                SetPrevFont( const SfxItemSet& rSet, USHORT nSlot, SvxFont& rFont );
-    void                SetPrevFontStyle( const SfxItemSet& rSet, USHORT nSlotPosture, USHORT nSlotWeight, SvxFont& rFont ); // posture/weight
-    void                SetPrevFontWidthScale( const SfxItemSet& rSet );
+    void				SetPrevFontSize( const SfxItemSet& rSet, USHORT nSlot, SvxFont& rFont );
+    void				SetPrevFont( const SfxItemSet& rSet, USHORT nSlot, SvxFont& rFont );
+    void				SetPrevFontStyle( const SfxItemSet& rSet, USHORT nSlotPosture, USHORT nSlotWeight, SvxFont& rFont ); // posture/weight
+    void				SetPrevFontWidthScale( const SfxItemSet& rSet );
 
-    void                SetPrevFontEscapement( BYTE nProp, BYTE nEscProp, short nEsc );
+    void				SetPrevFontEscapement( BYTE nProp, BYTE nEscProp, short nEsc );
 
-    inline SvxFont&     GetPreviewFont();
-    inline SvxFont&     GetPreviewCJKFont();
-    inline SvxFont&     GetPreviewCTLFont();
+    inline SvxFont&		GetPreviewFont();
+    inline SvxFont&		GetPreviewCJKFont();
+    inline SvxFont&		GetPreviewCTLFont();
 
 public:
     using SfxTabPage::ActivatePage;
     using SfxTabPage::DeactivatePage;
-
+    
     virtual void        ActivatePage( const SfxItemSet& rSet );
 //    virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
 
@@ -128,12 +128,12 @@ private:
     FixedText*          m_pColorFT;
     ColorListBox*       m_pColorLB;
 
-    SvxCharNamePage_Impl*   m_pImpl;
+    SvxCharNamePage_Impl*	m_pImpl;
 
                         SvxCharNamePage( Window* pParent, const SfxItemSet& rSet );
 
-    void                Initialize();
-    const FontList*     GetFontList() const;
+    void				Initialize();
+    const FontList*		GetFontList() const;
     void                UpdatePreview_Impl();
     void                FillStyleBox_Impl( const FontNameBox* rBox );
     void                FillSizeBox_Impl( const FontNameBox* rBox );
@@ -153,19 +153,19 @@ private:
         Ctl
     };
 
-    void                Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp );
-    BOOL                FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp );
-    void                ResetColor_Impl( const SfxItemSet& rSet );
-    BOOL                FillItemSetColor_Impl( SfxItemSet& rSet );
+    void				Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp );
+    BOOL				FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp );
+    void				ResetColor_Impl( const SfxItemSet& rSet );
+    BOOL				FillItemSetColor_Impl( SfxItemSet& rSet );
 
-    DECL_LINK(          UpdateHdl_Impl, Timer* );
-    DECL_LINK(          FontModifyHdl_Impl, void* );
-    DECL_LINK(          ColorBoxSelectHdl_Impl, ColorListBox* );
+    DECL_LINK( 			UpdateHdl_Impl, Timer* );
+    DECL_LINK(			FontModifyHdl_Impl, void* );
+    DECL_LINK( 			ColorBoxSelectHdl_Impl, ColorListBox* );
 
 public:
     using SfxTabPage::ActivatePage;
     using SfxTabPage::DeactivatePage;
-
+    
     virtual void        ActivatePage( const SfxItemSet& rSet );
     virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
 
@@ -180,12 +180,12 @@ public:
 
     void                SetFontList( const SvxFontListItem& rItem );
     void                EnableRelativeMode();
-    void                EnableSearchMode();
+    void				EnableSearchMode();
     //                  the writer uses SID_ATTR_BRUSH as font background
     void                SetPreviewBackgroundToCharacter();
 
     void                DisableControls( USHORT nDisable );
-    virtual void        PageCreated (SfxAllItemSet aSet);
+    virtual void		PageCreated (SfxAllItemSet aSet); 
 };
 
 // class SvxCharEffectsPage ----------------------------------------------
@@ -194,64 +194,64 @@ class SvxCharEffectsPage : public SvxCharBasePage
 {
 
 private:
-    FixedText           m_aFontColorFT;
-    ColorListBox        m_aFontColorLB;
+    FixedText			m_aFontColorFT;
+    ColorListBox		m_aFontColorLB;
 
-    FixedText           m_aEffectsFT;
-    SvxCheckListBox     m_aEffectsLB;
+    FixedText			m_aEffectsFT;
+    SvxCheckListBox		m_aEffectsLB;
 
-    ListBox             m_aEffects2LB;
+    ListBox				m_aEffects2LB;
 
     FixedText           m_aReliefFT;
     ListBox             m_aReliefLB;
 
     TriStateBox         m_aOutlineBtn;
-    TriStateBox         m_aShadowBtn;
-    TriStateBox         m_aBlinkingBtn;
+    TriStateBox			m_aShadowBtn;
+    TriStateBox			m_aBlinkingBtn;
     TriStateBox         m_aHiddenBtn;
 
-    FixedLine           m_aVerticalLine;
+    FixedLine			m_aVerticalLine;
 
-    FixedText           m_aOverlineFT;
-    ListBox             m_aOverlineLB;
-    FixedText           m_aOverlineColorFT;
-    ColorListBox        m_aOverlineColorLB;
+    FixedText			m_aOverlineFT;
+    ListBox				m_aOverlineLB;
+    FixedText			m_aOverlineColorFT;
+    ColorListBox		m_aOverlineColorLB;
 
-    FixedText           m_aStrikeoutFT;
-    ListBox             m_aStrikeoutLB;
+    FixedText			m_aStrikeoutFT;
+    ListBox				m_aStrikeoutLB;
 
-    FixedText           m_aUnderlineFT;
-    ListBox             m_aUnderlineLB;
-    FixedText           m_aUnderlineColorFT;
-    ColorListBox        m_aUnderlineColorLB;
+    FixedText			m_aUnderlineFT;
+    ListBox				m_aUnderlineLB;
+    FixedText			m_aUnderlineColorFT;
+    ColorListBox		m_aUnderlineColorLB;
 
-    CheckBox            m_aIndividualWordsBtn;
+    CheckBox			m_aIndividualWordsBtn;
 
-    FixedLine           m_aAsianLine;
+    FixedLine			m_aAsianLine;
 
-    FixedText           m_aEmphasisFT;
-    ListBox             m_aEmphasisLB;
+    FixedText			m_aEmphasisFT;
+    ListBox				m_aEmphasisLB;
 
-    FixedText           m_aPositionFT;
-    ListBox             m_aPositionLB;
+    FixedText			m_aPositionFT;
+    ListBox				m_aPositionLB;
 
-    USHORT              m_nHtmlMode;
+    USHORT				m_nHtmlMode;
 
-    String              m_aTransparentColorName;
+    String				m_aTransparentColorName;
 
                         SvxCharEffectsPage( Window* pParent, const SfxItemSet& rSet );
 
-    void                Initialize();
+    void				Initialize();
     void                UpdatePreview_Impl();
     void                SetCaseMap_Impl( SvxCaseMap eCaseMap );
-    void                ResetColor_Impl( const SfxItemSet& rSet );
-    BOOL                FillItemSetColor_Impl( SfxItemSet& rSet );
+    void				ResetColor_Impl( const SfxItemSet& rSet );
+    BOOL				FillItemSetColor_Impl( SfxItemSet& rSet );
 
-    DECL_LINK(          SelectHdl_Impl, ListBox* );
+    DECL_LINK(			SelectHdl_Impl, ListBox* );
     DECL_LINK(          CbClickHdl_Impl, CheckBox* );
     DECL_LINK(          TristClickHdl_Impl, TriStateBox* );
-    DECL_LINK(          UpdatePreview_Impl, ListBox* );
-    DECL_LINK(          ColorBoxSelectHdl_Impl, ColorListBox* );
+    DECL_LINK(			UpdatePreview_Impl, ListBox* );
+    DECL_LINK( 			ColorBoxSelectHdl_Impl, ColorListBox* );
 
 public:
 //    using SfxTabPage::ActivatePage;
@@ -271,7 +271,7 @@ public:
     void                EnableFlash();
     //                  the writer uses SID_ATTR_BRUSH as font background
     void                SetPreviewBackgroundToCharacter();
-    virtual void        PageCreated (SfxAllItemSet aSet);
+    virtual void		PageCreated (SfxAllItemSet aSet); 
 };
 
 // class SvxCharPositionPage ---------------------------------------------
@@ -280,60 +280,60 @@ class SvxCharPositionPage : public SvxCharBasePage
 {
 
 private:
-    FixedLine           m_aPositionLine;
-    RadioButton         m_aHighPosBtn;
-    RadioButton         m_aNormalPosBtn;
-    RadioButton         m_aLowPosBtn;
-    FixedText           m_aHighLowFT;
-    MetricField         m_aHighLowEdit;
-    CheckBox            m_aHighLowRB;
-    FixedText           m_aFontSizeFT;
-    MetricField         m_aFontSizeEdit;
-    FixedLine           m_aRotationScalingFL;
-    FixedLine           m_aScalingFL;
-    RadioButton         m_a0degRB;
-    RadioButton         m_a90degRB;
-    RadioButton         m_a270degRB;
-    CheckBox            m_aFitToLineCB;
-    FixedText           m_aScaleWidthFT;
-    MetricField         m_aScaleWidthMF;
-
-    FixedLine           m_aKerningLine;
-    ListBox             m_aKerningLB;
-    FixedText           m_aKerningFT;
-    MetricField         m_aKerningEdit;
-    CheckBox            m_aPairKerningBtn;
+    FixedLine			m_aPositionLine;
+    RadioButton			m_aHighPosBtn;
+    RadioButton			m_aNormalPosBtn;
+    RadioButton			m_aLowPosBtn;
+    FixedText			m_aHighLowFT;
+    MetricField			m_aHighLowEdit;
+    CheckBox			m_aHighLowRB;
+    FixedText			m_aFontSizeFT;
+    MetricField			m_aFontSizeEdit;
+    FixedLine			m_aRotationScalingFL;
+    FixedLine			m_aScalingFL;
+    RadioButton			m_a0degRB;
+    RadioButton			m_a90degRB;
+    RadioButton			m_a270degRB;
+    CheckBox			m_aFitToLineCB;
+    FixedText			m_aScaleWidthFT;
+    MetricField			m_aScaleWidthMF;
+
+    FixedLine			m_aKerningLine;
+    ListBox				m_aKerningLB;
+    FixedText			m_aKerningFT;
+    MetricField			m_aKerningEdit;
+    CheckBox			m_aPairKerningBtn;
 
     short               m_nSuperEsc;
     short               m_nSubEsc;
 
-    UINT16              m_nScaleWidthItemSetVal;
-    UINT16              m_nScaleWidthInitialVal;
+    UINT16				m_nScaleWidthItemSetVal;
+    UINT16				m_nScaleWidthInitialVal;
 
     BYTE                m_nSuperProp;
     BYTE                m_nSubProp;
 
                         SvxCharPositionPage( Window* pParent, const SfxItemSet& rSet );
 
-    void                Initialize();
+    void				Initialize();
     void                UpdatePreview_Impl( BYTE nProp, BYTE nEscProp, short nEsc );
     void                SetEscapement_Impl( USHORT nEsc );
 
-    DECL_LINK(          PositionHdl_Impl, RadioButton* );
-    DECL_LINK(          RotationHdl_Impl, RadioButton* );
-    DECL_LINK(          FontModifyHdl_Impl, MetricField* );
-    DECL_LINK(          AutoPositionHdl_Impl, CheckBox* );
-    DECL_LINK(          FitToLineHdl_Impl, CheckBox* );
-    DECL_LINK(          KerningSelectHdl_Impl, ListBox* );
-    DECL_LINK(          KerningModifyHdl_Impl, MetricField* );
-    DECL_LINK(          PairKerningHdl_Impl, CheckBox* );
-    DECL_LINK(          LoseFocusHdl_Impl, MetricField* );
-    DECL_LINK(          ScaleWidthModifyHdl_Impl, MetricField* );
+    DECL_LINK(			PositionHdl_Impl, RadioButton* );
+    DECL_LINK(			RotationHdl_Impl, RadioButton* );
+    DECL_LINK(			FontModifyHdl_Impl, MetricField* );
+    DECL_LINK(			AutoPositionHdl_Impl, CheckBox* );
+    DECL_LINK(			FitToLineHdl_Impl, CheckBox* );
+    DECL_LINK(			KerningSelectHdl_Impl, ListBox* );
+    DECL_LINK(			KerningModifyHdl_Impl, MetricField* );
+    DECL_LINK( 			PairKerningHdl_Impl, CheckBox* );
+    DECL_LINK(			LoseFocusHdl_Impl, MetricField* );
+    DECL_LINK(			ScaleWidthModifyHdl_Impl, MetricField* );
 
 public:
     using SfxTabPage::ActivatePage;
     using SfxTabPage::DeactivatePage;
-
+    
     virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
     virtual void        ActivatePage( const SfxItemSet& rSet );
 
@@ -346,7 +346,7 @@ public:
     virtual void        FillUserData();
     //                  the writer uses SID_ATTR_BRUSH as font background
     void                SetPreviewBackgroundToCharacter();
-    virtual void        PageCreated (SfxAllItemSet aSet);
+    virtual void		PageCreated (SfxAllItemSet aSet); 
 };
 
 // class SvxCharTwoLinesPage ---------------------------------------------
@@ -354,32 +354,32 @@ public:
 class SvxCharTwoLinesPage : public SvxCharBasePage
 {
 private:
-    FixedLine           m_aSwitchOnLine;
-    CheckBox            m_aTwoLinesBtn;
+    FixedLine			m_aSwitchOnLine;
+    CheckBox			m_aTwoLinesBtn;
 
-    FixedLine           m_aEncloseLine;
-    FixedText           m_aStartBracketFT;
-    ListBox             m_aStartBracketLB;
-    FixedText           m_aEndBracketFT;
-    ListBox             m_aEndBracketLB;
+    FixedLine			m_aEncloseLine;
+    FixedText			m_aStartBracketFT;
+    ListBox				m_aStartBracketLB;
+    FixedText			m_aEndBracketFT;
+    ListBox				m_aEndBracketLB;
 
-    USHORT              m_nStartBracketPosition;
-    USHORT              m_nEndBracketPosition;
+    USHORT				m_nStartBracketPosition;
+    USHORT				m_nEndBracketPosition;
 
                         SvxCharTwoLinesPage( Window* pParent, const SfxItemSet& rSet );
 
-    void                UpdatePreview_Impl();
-    void                Initialize();
-    void                SelectCharacter( ListBox* pBox );
-    void                SetBracket( sal_Unicode cBracket, BOOL bStart );
+    void				UpdatePreview_Impl();
+    void				Initialize();
+    void				SelectCharacter( ListBox* pBox );
+    void				SetBracket( sal_Unicode cBracket, BOOL bStart );
 
-    DECL_LINK(          TwoLinesHdl_Impl, CheckBox* );
-    DECL_LINK(          CharacterMapHdl_Impl, ListBox* );
+    DECL_LINK( 			TwoLinesHdl_Impl, CheckBox* );
+    DECL_LINK(			CharacterMapHdl_Impl, ListBox* );
 
 public:
     using SfxTabPage::ActivatePage;
     using SfxTabPage::DeactivatePage;
-
+    
     virtual void        ActivatePage( const SfxItemSet& rSet );
     virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
 
@@ -391,7 +391,7 @@ public:
     virtual BOOL        FillItemSet( SfxItemSet& rSet );
     //                  the writer uses SID_ATTR_BRUSH as font background
     void                SetPreviewBackgroundToCharacter();
-    virtual void        PageCreated (SfxAllItemSet aSet);
+    virtual void		PageCreated (SfxAllItemSet aSet); 
 };
 
 #endif // #ifndef _SVX_CHARDLG_HXX
diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx
index 8bceb90b7ff4..7ffbcee8dabc 100644
--- a/cui/source/inc/connect.hxx
+++ b/cui/source/inc/connect.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,36 +49,36 @@ class SdrView;
 class SvxConnectionPage : public SfxTabPage
 {
 private:
-    FixedText           aFtType;
-    ListBox             aLbType;
-
-    FixedLine           aFlDelta;
-    FixedText           aFtLine1;
-    MetricField         aMtrFldLine1;
-    FixedText           aFtLine2;
-    MetricField         aMtrFldLine2;
-    FixedText           aFtLine3;
-    MetricField         aMtrFldLine3;
-
-    FixedLine           aFlDistance;
-    FixedText           aFtHorz1;
-    MetricField         aMtrFldHorz1;
-    FixedText           aFtVert1;
-    MetricField         aMtrFldVert1;
-    FixedText           aFtHorz2;
-    MetricField         aMtrFldHorz2;
-    FixedText           aFtVert2;
-    MetricField         aMtrFldVert2;
-
-    SvxXConnectionPreview   aCtlPreview;
-
-    const SfxItemSet&   rOutAttrs;
-    SfxItemSet          aAttrSet;
-    const SdrView*      pView;
-    SfxMapUnit          eUnit;
+    FixedText   		aFtType;
+    ListBox 			aLbType;
+
+    FixedLine			aFlDelta;
+    FixedText			aFtLine1;
+    MetricField			aMtrFldLine1;
+    FixedText			aFtLine2;
+    MetricField			aMtrFldLine2;
+    FixedText			aFtLine3;
+    MetricField			aMtrFldLine3;
+
+    FixedLine			aFlDistance;
+    FixedText			aFtHorz1;
+    MetricField			aMtrFldHorz1;
+    FixedText			aFtVert1;
+    MetricField			aMtrFldVert1;
+    FixedText			aFtHorz2;
+    MetricField			aMtrFldHorz2;
+    FixedText			aFtVert2;
+    MetricField			aMtrFldVert2;
+
+    SvxXConnectionPreview	aCtlPreview;
+
+    const SfxItemSet&	rOutAttrs;
+    SfxItemSet			aAttrSet;
+    const SdrView*		pView;
+    SfxMapUnit			eUnit;
 
 #ifdef _SVX_CONNECT_CXX
-    void                FillTypeLB();
+    void 				FillTypeLB();
 
                         DECL_LINK( ChangeAttrHdl_Impl, void * );
 #endif
@@ -88,15 +88,15 @@ public:
     SvxConnectionPage( Window* pWindow, const SfxItemSet& rInAttrs );
     ~SvxConnectionPage();
 
-    static SfxTabPage*  Create( Window*, const SfxItemSet& );
-    static  USHORT*     GetRanges();
+    static SfxTabPage* 	Create( Window*, const SfxItemSet& );
+    static  USHORT*	    GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& );
-    virtual void        Reset( const SfxItemSet & );
+    virtual BOOL 		FillItemSet( SfxItemSet& );
+    virtual void 		Reset( const SfxItemSet & );
 
-    void         Construct();
-    void         SetView( const SdrView* pSdrView ) { pView = pSdrView; }
-    virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
+    void 		 Construct();
+    void		 SetView( const SdrView* pSdrView ) { pView = pSdrView; }
+    virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 
 };
 
 /*************************************************************************
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index 987759813c27..4a3113836008 100644
--- a/cui/source/inc/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <vcl/ctrl.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
+#include <vcl/fixed.hxx> 
+#include <vcl/lstbox.hxx> 
 #include <sfx2/basedlgs.hxx>
 #include <svx/charmap.hxx>
 
@@ -94,7 +94,7 @@ friend class SvxCharacterMap;
     CancelButton    aCancelBtn;
     HelpButton      aHelpBtn;
     PushButton      aDeleteBtn;
-//    PushButton        aAssignBtn;
+//    PushButton		aAssignBtn;
     FixedText       aFontText;
     ListBox         aFontLB;
     FixedText       aSubsetText;
@@ -102,7 +102,7 @@ friend class SvxCharacterMap;
     FixedText       aSymbolText;
     SvxShowText     aShowChar;
     FixedText       aCharCodeText;
-//  FixedText       aAssignText;
+//	FixedText		aAssignText;
     Font            aFont;
     BOOL            bOne;
     const SubsetMap* pSubsetMap;
@@ -137,10 +137,10 @@ public:
 
     String          GetCharacters() const;
 
-    virtual short   Execute();
+    virtual short	Execute();
 };
 
 #endif
-
+ 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx
index 52e3663707aa..d204247af943 100644
--- a/cui/source/inc/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,59 +68,59 @@ class FmSearchDialog : public ModalDialog
 
     // meine ganzen Controls
     FixedLine       m_flSearchFor;
-    RadioButton     m_rbSearchForText;
-    RadioButton     m_rbSearchForNull;
-    RadioButton     m_rbSearchForNotNull;
-    ComboBox        m_cmbSearchText;
+    RadioButton		m_rbSearchForText;
+    RadioButton		m_rbSearchForNull;
+    RadioButton		m_rbSearchForNotNull;
+    ComboBox		m_cmbSearchText;
     FixedLine       m_flWhere;
-    FixedText       m_ftForm;
-    ListBox         m_lbForm;
-    RadioButton     m_rbAllFields;
-    RadioButton     m_rbSingleField;
-    ListBox         m_lbField;
+    FixedText		m_ftForm;
+    ListBox			m_lbForm;
+    RadioButton		m_rbAllFields;
+    RadioButton		m_rbSingleField;
+    ListBox			m_lbField;
     FixedLine       m_flOptions;
-    FixedText       m_ftPosition;
-    ListBox         m_lbPosition;
-    CheckBox        m_cbUseFormat;
-    CheckBox        m_cbCase;
-    CheckBox        m_cbBackwards;
-    CheckBox        m_cbStartOver;
-    CheckBox        m_cbWildCard;
-    CheckBox        m_cbRegular;
-    CheckBox        m_cbApprox;
-    PushButton      m_pbApproxSettings;
-    CheckBox        m_aHalfFullFormsCJK;
-    CheckBox        m_aSoundsLikeCJK;
-    PushButton      m_aSoundsLikeCJKSettings;
+    FixedText		m_ftPosition;
+    ListBox			m_lbPosition;
+    CheckBox		m_cbUseFormat;
+    CheckBox		m_cbCase;
+    CheckBox		m_cbBackwards;
+    CheckBox		m_cbStartOver;
+    CheckBox		m_cbWildCard;
+    CheckBox		m_cbRegular;
+    CheckBox		m_cbApprox;
+    PushButton		m_pbApproxSettings;
+    CheckBox		m_aHalfFullFormsCJK;
+    CheckBox		m_aSoundsLikeCJK;
+    PushButton		m_aSoundsLikeCJKSettings;
     FixedLine       m_flState;
-    FixedText       m_ftRecordLabel;
-    FixedText       m_ftRecord;
-    FixedText       m_ftHint;
-    PushButton      m_pbSearchAgain;
-    CancelButton    m_pbClose;
-    HelpButton      m_pbHelp;
+    FixedText		m_ftRecordLabel;
+    FixedText		m_ftRecord;
+    FixedText		m_ftHint;
+    PushButton		m_pbSearchAgain;
+    CancelButton	m_pbClose;
+    HelpButton		m_pbHelp;
     String          m_sSearch;
     String          m_sCancel;
 
-    Window*         m_pPreSearchFocus;
+    Window*			m_pPreSearchFocus;
 
-    Link    m_lnkFoundHandler;          // Handler fuer "gefunden"
-    Link    m_lnkCanceledNotFoundHdl;   // Handler fuer Positionierung des Cursors
+    Link	m_lnkFoundHandler;			// Handler fuer "gefunden"
+    Link	m_lnkCanceledNotFoundHdl;	// Handler fuer Positionierung des Cursors
 
-    Link    m_lnkContextSupplier;       // fuer Suche in verschiedenen Kontexten
+    Link	m_lnkContextSupplier;		// fuer Suche in verschiedenen Kontexten
 
     // ein Array, in dem ich mir fuer jeden Kontext das aktuell selektierte Feld merke
     ::std::vector<String> m_arrContextFields;
 
     // fuer die eigentliche Arbeit ...
-    FmSearchEngine* m_pSearchEngine;
+    FmSearchEngine*	m_pSearchEngine;
 
-    Timer           m_aDelayedPaint;
+    Timer			m_aDelayedPaint;
         // siehe EnableSearchUI
 
-    ::svxform::FmSearchConfigItem*      m_pConfig;
+    ::svxform::FmSearchConfigItem*		m_pConfig;
 public:
-    /** hiermit kann in verschiedenen Saetzen von Feldern gesucht werden. Es gibt eine Reihe von Kontexten, deren Namen in
+    /**	hiermit kann in verschiedenen Saetzen von Feldern gesucht werden. Es gibt eine Reihe von Kontexten, deren Namen in
         strContexts stehen (getrennt durch ';'), der Benutzer kann einen davon auswaehlen.
         Wenn der Benutzer einen Kontext auswaehlt, wird lnkContextSupplier aufgerufen, er bekommt einen Zeiger auf eine
         FmSearchContext-Struktur, die gefuellt werden muss.
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 6254a9150038..6a418c0546c5 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class TPGalleryThemeProperties;
 
 struct FilterEntry
 {
-    String  aFilterName;
+    String	aFilterName;
 };
 
 // ----------------
@@ -76,15 +76,15 @@ class SearchThread : public ::osl::Thread
 {
 private:
 
-    SearchProgress*             mpProgress;
-    TPGalleryThemeProperties*   mpBrowser;
-    INetURLObject               maStartURL;
+    SearchProgress*				mpProgress;
+    TPGalleryThemeProperties*	mpBrowser;
+    INetURLObject				maStartURL;
 
-    void                        ImplSearch( const INetURLObject& rStartURL,
+    void						ImplSearch( const INetURLObject& rStartURL,
                                             const ::std::vector< String >& rFormats,
                                             BOOL bRecursive );
 
-    virtual void SAL_CALL       run();
+    virtual void SAL_CALL		run();
     virtual void SAL_CALL       onTerminated();
 
 public:
@@ -92,7 +92,7 @@ public:
                                 SearchThread( SearchProgress* pProgess,
                                               TPGalleryThemeProperties* pBrowser,
                                               const INetURLObject& rStartURL );
-    virtual                     ~SearchThread();
+    virtual						~SearchThread();
 };
 
 // ------------------
@@ -103,15 +103,15 @@ class SearchProgress : public ModalDialog
 {
 private:
 
-    FixedText           aFtSearchDir;
+    FixedText			aFtSearchDir;
     FixedLine           aFLSearchDir;
-    FixedText           aFtSearchType;
+    FixedText			aFtSearchType;
     FixedLine           aFLSearchType;
-    CancelButton        aBtnCancel;
-    SearchThread        maSearchThread;
+    CancelButton		aBtnCancel;
+    SearchThread		maSearchThread;
 
                         DECL_LINK( ClickCancelBtn, void* );
-    void                Terminate();
+    void				Terminate();
 
 public:
                         SearchProgress( Window* pParent, const INetURLObject& rStartURL );
@@ -119,10 +119,10 @@ public:
 
                         DECL_LINK( CleanUpHdl, void* );
 
-    virtual short       Execute();
+    virtual short		Execute();
     virtual void        StartExecuteModal( const Link& rEndDialogHdl );
-    void                SetFileType( const String& rType ) { aFtSearchType.SetText( rType ); }
-    void                SetDirectory( const INetURLObject& rURL ) { aFtSearchDir.SetText( GetReducedString( rURL, 30 ) ); }
+    void 				SetFileType( const String& rType ) { aFtSearchType.SetText( rType ); }
+    void 				SetDirectory( const INetURLObject& rURL ) { aFtSearchDir.SetText( GetReducedString( rURL, 30 ) ); }
 };
 
 // --------------
@@ -133,11 +133,11 @@ class TakeThread : public ::osl::Thread
 {
 private:
 
-    TakeProgress*               mpProgress;
-    TPGalleryThemeProperties*   mpBrowser;
-    List&                       mrTakenList;
+    TakeProgress*				mpProgress;
+    TPGalleryThemeProperties*	mpBrowser;
+    List&						mrTakenList;
 
-    virtual void SAL_CALL       run();
+    virtual void SAL_CALL		run();
     virtual void SAL_CALL       onTerminated();
 
 public:
@@ -154,14 +154,14 @@ class TakeProgress : public ModalDialog
 {
 private:
 
-    FixedText           aFtTakeFile;
+    FixedText			aFtTakeFile;
     FixedLine           aFLTakeProgress;
-    CancelButton        aBtnCancel;
-    TakeThread          maTakeThread;
-    List                maTakenList;
+    CancelButton		aBtnCancel;
+    TakeThread			maTakeThread;
+    List				maTakenList;
 
                         DECL_LINK( ClickCancelBtn, void* );
-    void                Terminate();
+    void				Terminate();
 
 public:
 
@@ -170,8 +170,8 @@ public:
 
                         DECL_LINK( CleanUpHdl, void* );
 
-    void                SetFile( const INetURLObject& rURL ) { aFtTakeFile.SetText( GetReducedString( rURL, 30 ) ); }
-    virtual short       Execute();
+    void 				SetFile( const INetURLObject& rURL ) { aFtTakeFile.SetText( GetReducedString( rURL, 30 ) ); }
+    virtual short		Execute();
     virtual void        StartExecuteModal( const Link& rEndDialogHdl );
 };
 
@@ -183,12 +183,12 @@ class ActualizeProgress : public ModalDialog
 {
 private:
 
-    FixedText           aFtActualizeFile;
+    FixedText			aFtActualizeFile;
     FixedLine           aFLActualizeProgress;
-    CancelButton        aBtnCancel;
-    Timer*              pTimer;
-    GalleryTheme*       pTheme;
-    GalleryProgress     aStatusProgress;
+    CancelButton		aBtnCancel;
+    Timer*				pTimer;
+    GalleryTheme*		pTheme;
+    GalleryProgress		aStatusProgress;
 
                         DECL_LINK( ClickCancelBtn, void* );
                         DECL_LINK( TimeoutHdl, Timer* );
@@ -198,7 +198,7 @@ public:
                         ActualizeProgress( Window* pWindow, GalleryTheme* pThm );
                         ~ActualizeProgress() {};
 
-    virtual short       Execute();
+    virtual short		Execute();
 };
 
 // ---------------
@@ -209,16 +209,16 @@ class TitleDialog : public ModalDialog
 {
 private:
 
-    OKButton            maOk;
-    CancelButton        maCancel;
-    HelpButton          maHelp;
+    OKButton			maOk;
+    CancelButton		maCancel;
+    HelpButton			maHelp;
     FixedLine           maFL;
-    Edit                maEdit;
+    Edit				maEdit;
 
 public:
 
                         TitleDialog( Window* pParent, const String& rOldText );
-    String              GetTitle() const { return maEdit.GetText(); }
+    String				GetTitle() const { return maEdit.GetText(); }
 };
 
 // -------------------
@@ -229,11 +229,11 @@ class GalleryIdDialog : public ModalDialog
 {
 private:
 
-    OKButton        aBtnOk;
-    CancelButton    aBtnCancel;
+    OKButton		aBtnOk;
+    CancelButton	aBtnCancel;
     FixedLine       aFLId;
-    ListBox         aLbResName;
-    GalleryTheme*   pThm;
+    ListBox			aLbResName;
+    GalleryTheme*	pThm;
 
                     DECL_LINK( ClickOkHdl, void* );
                     DECL_LINK( ClickResNameHdl, void* );
@@ -243,7 +243,7 @@ public:
                     GalleryIdDialog( Window* pParent, GalleryTheme* pThm );
                     ~GalleryIdDialog() {}
 
-    ULONG           GetId() const { return aLbResName.GetSelectEntryPos(); }
+    ULONG			GetId() const { return aLbResName.GetSelectEntryPos(); }
 };
 
 // --------------------------
@@ -252,9 +252,9 @@ public:
 
 class GalleryThemeProperties : public SfxTabDialog
 {
-    ExchangeData*   pData;
+    ExchangeData*	pData;
 
-    virtual void    PageCreated( USHORT nId, SfxTabPage &rPage );
+    virtual void	PageCreated( USHORT nId, SfxTabPage &rPage );
 
 public:
 
@@ -270,21 +270,21 @@ class TPGalleryThemeGeneral : public SfxTabPage
 {
 private:
 
-    FixedImage          aFiMSImage;
-    Edit                aEdtMSName;
-    FixedLine           aFlMSGeneralFirst;
-    FixedText           aFtMSType;
-    FixedText           aFtMSShowType;
-    FixedText           aFtMSPath;
-    FixedText           aFtMSShowPath;
-    FixedText           aFtMSContent;
-    FixedText           aFtMSShowContent;
-    FixedLine           aFlMSGeneralSecond;
-    FixedText           aFtMSChangeDate;
-    FixedText           aFtMSShowChangeDate;
-    ExchangeData*       pData;
-
-    virtual void        Reset( const SfxItemSet& ) {}
+    FixedImage			aFiMSImage;
+    Edit				aEdtMSName;
+    FixedLine			aFlMSGeneralFirst;
+    FixedText			aFtMSType;
+    FixedText			aFtMSShowType;
+    FixedText			aFtMSPath;
+    FixedText			aFtMSShowPath;
+    FixedText			aFtMSContent;
+    FixedText			aFtMSShowContent;
+    FixedLine			aFlMSGeneralSecond;
+    FixedText			aFtMSChangeDate;
+    FixedText			aFtMSShowChangeDate;
+    ExchangeData*		pData;
+
+    virtual void		Reset( const SfxItemSet& ) {}
     virtual BOOL        FillItemSet( SfxItemSet& rSet );
 
 
@@ -293,10 +293,10 @@ public:
                         TPGalleryThemeGeneral( Window* pParent, const SfxItemSet& rSet );
                         ~TPGalleryThemeGeneral() {}
 
-    void                SetXChgData( ExchangeData* pData );
-    const ExchangeData* GetXChgData() const { return pData; }
+    void				SetXChgData( ExchangeData* pData );
+    const ExchangeData*	GetXChgData() const { return pData; }
 
-    static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
+    static SfxTabPage*	Create( Window* pParent, const SfxItemSet& rSet );
 };
 
 // ----------------------------
@@ -309,28 +309,28 @@ class TPGalleryThemeProperties : public SfxTabPage
     friend class TakeProgress;
     friend class TakeThread;
 
-    PushButton          aBtnSearch;
-    PushButton          aBtnTake;
-    PushButton          aBtnTakeAll;
-    CheckBox            aCbxPreview;
-    ComboBox            aCbbFileType;
-    MultiListBox        aLbxFound;
-    FixedText           aFtFileType;
-    GalleryPreview      aWndPreview;
-
-    ExchangeData*       pData;
-    StringList          aFoundList;
-    List                aFilterEntryList;
-    Timer               aPreviewTimer;
-    String              aLastFilterName;
-    String              aPreviewString;
-    INetURLObject       aURL;
-    USHORT              nCurFilterPos;
-    USHORT              nFirstExtFilterPos;
-    BOOL                bEntriesFound;
-    BOOL                bInputAllowed;
-    BOOL                bTakeAll;
-    BOOL                bSearchRecursive;
+    PushButton			aBtnSearch;
+    PushButton			aBtnTake;
+    PushButton			aBtnTakeAll;
+    CheckBox			aCbxPreview;
+    ComboBox			aCbbFileType;
+    MultiListBox		aLbxFound;
+    FixedText			aFtFileType;
+    GalleryPreview		aWndPreview;
+
+    ExchangeData*		pData;
+    StringList			aFoundList;
+    List				aFilterEntryList;
+    Timer				aPreviewTimer;
+    String				aLastFilterName;
+    String				aPreviewString;
+    INetURLObject		aURL;
+    USHORT				nCurFilterPos;
+    USHORT				nFirstExtFilterPos;
+    BOOL				bEntriesFound;
+    BOOL				bInputAllowed;
+    BOOL				bTakeAll;
+    BOOL				bSearchRecursive;
 
     ::com::sun::star::uno::Reference< ::svt::DialogClosedListener >                  xDialogListener;
     ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer >             xMediaPlayer;
@@ -338,12 +338,12 @@ class TPGalleryThemeProperties : public SfxTabPage
 
     virtual void        Reset( const SfxItemSet& /*rSet*/ ) {}
     virtual BOOL        FillItemSet( SfxItemSet& /*rSet*/ ) { return TRUE; }
-    ::rtl::OUString     addExtension( const ::rtl::OUString&, const ::rtl::OUString& );
-    void                FillFilterList();
+    ::rtl::OUString 	addExtension( const ::rtl::OUString&, const ::rtl::OUString& );
+    void				FillFilterList();
 
-    void                SearchFiles();
-    void                TakeFiles();
-    void                DoPreview();
+    void				SearchFiles();
+    void 				TakeFiles();
+    void				DoPreview();
 
                         DECL_LINK( ClickPreviewHdl, void* );
                         DECL_LINK( ClickCloseBrowserHdl, void* );
@@ -362,12 +362,12 @@ public:
                         TPGalleryThemeProperties( Window* pWindow, const SfxItemSet& rSet );
                         ~TPGalleryThemeProperties();
 
-    void                SetXChgData( ExchangeData* pData );
-    const ExchangeData* GetXChgData() const { return pData; }
+    void				SetXChgData( ExchangeData* pData );
+    const ExchangeData*	GetXChgData() const { return pData; }
 
     void                StartSearchFiles( const String& _rFolderURL, short _nDlgResult );
 
-    static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
+    static SfxTabPage*	Create( Window* pParent, const SfxItemSet& rSet );
 };
 
 #endif // _CUI_GALDLG_HXX_
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index ac1bf38ad904..ed17fa9501e0 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 // - Error codes -
 // ---------------
 
-#define SVX_GRAPHICFILTER_ERRCODE_NONE              0x00000000
-#define SVX_GRAPHICFILTER_UNSUPPORTED_GRAPHICTYPE   0x00000001
-#define SVX_GRAPHICFILTER_UNSUPPORTED_SLOT          0x00000002
+#define SVX_GRAPHICFILTER_ERRCODE_NONE				0x00000000
+#define SVX_GRAPHICFILTER_UNSUPPORTED_GRAPHICTYPE	0x00000001
+#define SVX_GRAPHICFILTER_UNSUPPORTED_SLOT			0x00000002
 
 // --------------------
 // - SvxGraphicFilter -
@@ -60,8 +60,8 @@ class SvxGraphicFilter
 {
 public:
 
-    static ULONG    ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject );
-    static void     DisableGraphicFilterSlots( SfxItemSet& rSet );
+    static ULONG	ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject );
+    static void		DisableGraphicFilterSlots( SfxItemSet& rSet );
 };
 */
 // -----------------------
@@ -75,47 +75,47 @@ private:
     class PreviewWindow : public Control
     {
     private:
+        
+        GraphicObject	maGraphic;
 
-        GraphicObject   maGraphic;
-
-        virtual void    Paint( const Rectangle& rRect );
+        virtual void	Paint( const Rectangle& rRect );
 
     public:
 
                         PreviewWindow( Window* pParent, const ResId& rResId );
                         ~PreviewWindow();
 
-        void            SetGraphic( const Graphic& rGraphic );
+        void			SetGraphic( const Graphic& rGraphic );
     };
 
 private:
 
-    Timer           maTimer;
-    Link            maModifyHdl;
-    Graphic         maGraphic;
-    double          mfScaleX;
-    double          mfScaleY;
-    Size            maSizePixel;
-    PreviewWindow   maPreview;
-    FixedLine       maFlParameter;
-    OKButton        maBtnOK;
-    CancelButton    maBtnCancel;
-    HelpButton      maBtnHelp;
+    Timer			maTimer;
+    Link			maModifyHdl;
+    Graphic			maGraphic;
+    double			mfScaleX;
+    double			mfScaleY;
+    Size			maSizePixel;
+    PreviewWindow	maPreview;
+    FixedLine		maFlParameter;
+    OKButton		maBtnOK;
+    CancelButton	maBtnCancel;
+    HelpButton		maBtnHelp;
 
                     DECL_LINK( ImplPreviewTimeoutHdl, Timer* pTimer );
                     DECL_LINK( ImplModifyHdl, void* p );
 
 protected:
 
-    const Link&     GetModifyHdl() const { return maModifyHdl; }
-    const Size&     GetGraphicSizePixel() const { return maSizePixel; }
-
-public:
+    const Link&		GetModifyHdl() const { return maModifyHdl; }
+    const Size&		GetGraphicSizePixel() const { return maSizePixel; }
 
+public:				
+                    
                     GraphicFilterDialog( Window* pParent, const ResId& rResId, const Graphic& rGraphic );
                     ~GraphicFilterDialog();
 
-    virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) = 0;
+    virtual Graphic	GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) = 0;
 };
 
 // -----------------------
@@ -126,11 +126,11 @@ class GraphicFilterMosaic : public GraphicFilterDialog
 {
 private:
 
-    FixedText       maFtWidth;
-    MetricField     maMtrWidth;
-    FixedText       maFtHeight;
-    MetricField     maMtrHeight;
-    CheckBox        maCbxEdges;
+    FixedText		maFtWidth;
+    MetricField		maMtrWidth;
+    FixedText		maFtHeight;
+    MetricField		maMtrHeight;
+    CheckBox		maCbxEdges;
 
 public:
 
@@ -138,10 +138,10 @@ public:
                                          USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges );
                     ~GraphicFilterMosaic();
 
-    virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY );
-    long            GetTileWidth() const { return static_cast<long>(maMtrWidth.GetValue()); }
-    long            GetTileHeight() const { return static_cast<long>(maMtrHeight.GetValue()); }
-    BOOL            IsEnhanceEdges() const { return maCbxEdges.IsChecked(); }
+    virtual Graphic	GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY );
+    long			GetTileWidth() const { return static_cast<long>(maMtrWidth.GetValue()); }
+    long			GetTileHeight() const { return static_cast<long>(maMtrHeight.GetValue()); }
+    BOOL			IsEnhanceEdges() const { return maCbxEdges.IsChecked(); }
 };
 
 // -------------------------
@@ -152,9 +152,9 @@ class GraphicFilterSolarize : public GraphicFilterDialog
 {
 private:
 
-    FixedText       maFtThreshold;
-    MetricField     maMtrThreshold;
-    CheckBox        maCbxInvert;
+    FixedText		maFtThreshold;
+    MetricField		maMtrThreshold;
+    CheckBox		maCbxInvert;
 
 public:
 
@@ -162,9 +162,9 @@ public:
                                            BYTE nGreyThreshold, BOOL bInvert );
                     ~GraphicFilterSolarize();
 
-    virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY );
-    BYTE            GetGreyThreshold() const { return( (BYTE) FRound( maMtrThreshold.GetValue() * 2.55 ) ); }
-    BOOL            IsInvert() const { return maCbxInvert.IsChecked(); }
+    virtual Graphic	GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY );
+    BYTE			GetGreyThreshold() const { return( (BYTE) FRound( maMtrThreshold.GetValue() * 2.55 ) ); }
+    BOOL			IsInvert() const { return maCbxInvert.IsChecked(); }
 };
 
 // ----------------------
@@ -175,8 +175,8 @@ class GraphicFilterSepia : public GraphicFilterDialog
 {
 private:
 
-    FixedText       maFtSepia;
-    MetricField     maMtrSepia;
+    FixedText		maFtSepia;
+    MetricField		maMtrSepia;
 
 public:
 
@@ -184,8 +184,8 @@ public:
                                         USHORT nSepiaPercent );
                     ~GraphicFilterSepia();
 
-    virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY );
-    USHORT          GetSepiaPercent() const
+    virtual Graphic	GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY );
+    USHORT			GetSepiaPercent() const
     { return sal::static_int_cast< USHORT >(maMtrSepia.GetValue()); }
 };
 
@@ -197,8 +197,8 @@ class GraphicFilterPoster : public GraphicFilterDialog
 {
 private:
 
-    FixedText       maFtPoster;
-    NumericField    maNumPoster;
+    FixedText		maFtPoster;
+    NumericField	maNumPoster;
 
 public:
 
@@ -206,8 +206,8 @@ public:
                                          USHORT nPosterColorCount );
                     ~GraphicFilterPoster();
 
-    virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY );
-    USHORT          GetPosterColorCount() const { return( (USHORT) maNumPoster.GetValue() ); }
+    virtual Graphic	GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY );
+    USHORT			GetPosterColorCount() const { return( (USHORT) maNumPoster.GetValue() ); }
 };
 
 // -----------------------
@@ -222,22 +222,22 @@ private:
     {
     private:
 
-        Link            maModifyHdl;
+        Link			maModifyHdl;
 
-        virtual void    MouseButtonDown( const MouseEvent& rEvt );
+        virtual void	MouseButtonDown( const MouseEvent& rEvt );
 
     public:
 
-                        EmbossControl( Window* pParent, const ResId& rResId, RECT_POINT eRectPoint ) :
+                        EmbossControl( Window* pParent, const ResId& rResId, RECT_POINT eRectPoint ) : 
                             SvxRectCtl( pParent, rResId ) { SetActualRP( eRectPoint ); }
-
-        void            SetModifyHdl( const Link& rHdl ) { maModifyHdl = rHdl; }
+    
+        void			SetModifyHdl( const Link& rHdl ) { maModifyHdl = rHdl; }
     };
 
 private:
 
-    FixedText       maFtLight;
-    EmbossControl   maCtlLight;
+    FixedText		maFtLight;
+    EmbossControl	maCtlLight;
 
 public:
 
@@ -245,8 +245,8 @@ public:
                                          RECT_POINT eLightSource );
                     ~GraphicFilterEmboss();
 
-    virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY );
-    RECT_POINT      GetLightSource() const { return maCtlLight.GetActualRP(); }
+    virtual Graphic	GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY );
+    RECT_POINT		GetLightSource() const { return maCtlLight.GetActualRP(); }
 };
 
 #endif
diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx
index c183473da03b..43d25a2b7c63 100644
--- a/cui/source/inc/cuihyperdlg.hxx
+++ b/cui/source/inc/cuihyperdlg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class SvxHlinkCtrl : public SfxControllerItem
 {
 private :
     SvxHpLinkDlg *pParent;
-
+    
     SfxStatusForwarder aOnlineForwarder;
     SfxStatusForwarder aRdOnlyForwarder;
 
 public :
     SvxHlinkCtrl( USHORT nId, SfxBindings & rBindings, SvxHpLinkDlg* pDlg);
 
-    virtual void    StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void	StateChanged( USHORT nSID, SfxItemState eState,
                                 const SfxPoolItem* pState );
 };
 
@@ -72,43 +72,43 @@ public :
 class SvxHpLinkDlg : public IconChoiceDialog
 {
 private:
-    SvxHlinkCtrl        maCtrl;         // Controler
-    SfxBindings*        mpBindings;
-    SfxItemSet*         mpItemSet;
-
-    sal_Bool            mbDummy1    : 1;
-    sal_Bool            mbDummy2    : 1;
-    sal_Bool            mbDummy3    : 1;
-    sal_Bool            mbDummy4    : 1;
-    sal_Bool            mbDummy5    : 1;
-    sal_Bool            mbGrabFocus : 1;
-    sal_Bool            mbReadOnly  : 1;
-    sal_Bool            mbIsHTMLDoc : 1;
+    SvxHlinkCtrl		maCtrl;			// Controler
+    SfxBindings*		mpBindings;
+    SfxItemSet*			mpItemSet;
+
+    sal_Bool			mbDummy1    : 1;
+    sal_Bool			mbDummy2    : 1;
+    sal_Bool			mbDummy3    : 1;
+    sal_Bool			mbDummy4    : 1;
+    sal_Bool			mbDummy5    : 1;
+    sal_Bool			mbGrabFocus : 1;
+    sal_Bool			mbReadOnly  : 1;
+    sal_Bool			mbIsHTMLDoc : 1;
 
     void*               mpDummy1;
     void*               mpDummy2;
 
     DECL_LINK (ClickApplyHdl_Impl, void * );
     DECL_LINK (ClickCloseHdl_Impl, void * );
-
+ 
 protected:
-    virtual BOOL            Close();
-    virtual void            Move();
+    virtual BOOL			Close();
+    virtual void			Move();
 
-//    virtual long          PreNotify( NotifyEvent& rNEvt );
+//    virtual long			PreNotify( NotifyEvent& rNEvt );
 public:
     SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings );
     ~SvxHpLinkDlg ();
 
     virtual void            PageCreated( USHORT nId, IconChoicePage& rPage );
 
-    USHORT                  SetPage( SvxHyperlinkItem* pItem );
-    void                    EnableInetBrowse( sal_Bool bEnable = sal_True );
-    void                    SetReadOnlyMode( sal_Bool bReadOnly = sal_False );
-    inline BOOL     IsHTMLDoc() const { return mbIsHTMLDoc; }
+    USHORT					SetPage( SvxHyperlinkItem* pItem );
+    void					EnableInetBrowse( sal_Bool bEnable = sal_True );
+    void					SetReadOnlyMode( sal_Bool bReadOnly = sal_False );
+    inline BOOL		IsHTMLDoc() const { return mbIsHTMLDoc; }
 
-    inline SfxBindings*     GetBindings() const { return mpBindings; };
-    inline SfxDispatcher*   GetDispatcher() const { return mpBindings->GetDispatcher(); }
+    inline SfxBindings*		GetBindings() const { return mpBindings; };
+    inline SfxDispatcher*	GetDispatcher() const { return mpBindings->GetDispatcher(); }
 };
 
 
diff --git a/cui/source/inc/cuiimapwnd.hxx b/cui/source/inc/cuiimapwnd.hxx
index fa0bfeb1ad64..b12c86ce3088 100644
--- a/cui/source/inc/cuiimapwnd.hxx
+++ b/cui/source/inc/cuiimapwnd.hxx
@@ -23,20 +23,20 @@
 
 class URLDlg : public ModalDialog
 {
-    FixedText           maFtURL;
-    Edit                maEdtURL;
-    FixedText           maFtTarget;
-    ComboBox            maCbbTargets;
-    FixedText           maFtName;
-    Edit                maEdtName;
-    FixedText           maFtAlternativeText;
-    Edit                maEdtAlternativeText;
-    FixedText           maFtDescription;
-    MultiLineEdit       maEdtDescription;
+    FixedText			maFtURL;
+    Edit				maEdtURL;
+    FixedText			maFtTarget;
+    ComboBox			maCbbTargets;
+    FixedText			maFtName;
+    Edit				maEdtName;
+    FixedText			maFtAlternativeText;
+    Edit				maEdtAlternativeText;
+    FixedText			maFtDescription;
+    MultiLineEdit		maEdtDescription;
     FixedLine           maFlURL;
-    HelpButton          maBtnHelp;
-    OKButton            maBtnOk;
-    CancelButton        maBtnCancel;
+    HelpButton			maBtnHelp;
+    OKButton			maBtnOk;
+    CancelButton		maBtnCancel;
 
 public:
 
@@ -45,13 +45,13 @@ public:
                                 const String& rTarget, const String& rName,
                                 TargetList& rTargetList );
 
-    String              GetURL() const { return maEdtURL.GetText(); }
-    String              GetAltText() const { return maEdtAlternativeText.GetText(); }
-    String              GetDesc() const { return maEdtDescription.GetText(); }
-    String              GetTarget() const { return maCbbTargets.GetText(); }
-    String              GetName() const { return maEdtName.GetText(); }
+    String				GetURL() const { return maEdtURL.GetText(); }
+    String				GetAltText() const { return maEdtAlternativeText.GetText(); }
+    String				GetDesc() const { return maEdtDescription.GetText(); }
+    String				GetTarget() const { return maCbbTargets.GetText(); }
+    String				GetName() const { return maEdtName.GetText(); }
 };
 
-#endif
+#endif 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx
index e96e639c05ef..855cee4e01d3 100644
--- a/cui/source/inc/cuioptgenrl.hxx
+++ b/cui/source/inc/cuioptgenrl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,39 +69,39 @@ class SvxGeneralTabPage : public SfxTabPage
     using TabPage::DeactivatePage;
 private:
     FixedLine           aAddrFrm;
-    FixedText           aCompanyLbl;
+    FixedText 			aCompanyLbl;
     SvxUserEdit         aCompanyEdit;
-    FixedText           aNameLbl;
-    FixedText           aNameLblRuss;
-    FixedText           aNameLblEastern;
+    FixedText 			aNameLbl;
+    FixedText 			aNameLblRuss;
+    FixedText 			aNameLblEastern;
     SvxUserEdit         aFirstName;
     SvxUserEdit         aFatherName;
     SvxUserEdit         aName;
     SvxUserEdit         aShortName;
-    FixedText           aStreetLbl;
-    FixedText           aStreetLblRuss;
+    FixedText 			aStreetLbl;
+    FixedText 			aStreetLblRuss;
     SvxUserEdit         aStreetEdit;
     SvxUserEdit         aApartmentNrEdit;
-    FixedText           aCityLbl;
+    FixedText 			aCityLbl;
     SvxUserEdit         aPLZEdit;
     SvxUserEdit         aCityEdit;
     SvxUserEdit         aUsCityEdit;
     SvxUserEdit         aUsStateEdit;
     SvxUserEdit         aUsZipEdit;
-    FixedText           aCountryLbl;
+    FixedText			aCountryLbl;
     SvxUserEdit         aCountryEdit;
-    FixedText           aTitlePosLbl;
+    FixedText 			aTitlePosLbl;
     SvxUserEdit         aTitleEdit;
     SvxUserEdit         aPositionEdit;
-    FixedText           aPhoneLbl;
+    FixedText 			aPhoneLbl;
     SvxUserEdit         aTelPrivEdit;
     SvxUserEdit         aTelCompanyEdit;
-    FixedText           aFaxMailLbl;
+    FixedText 			aFaxMailLbl;
     SvxUserEdit         aFaxEdit;
     SvxUserEdit         aEmailEdit;
-    CheckBox            aUseDataCB;
+    CheckBox			aUseDataCB;
 
-    GeneralTabPage_Impl*    pImpl;
+    GeneralTabPage_Impl*	pImpl;
 
 #ifdef _SVX_OPTGENRL_CXX
     DECL_LINK( ModifyHdl_Impl, Edit * );
@@ -111,16 +111,16 @@ private:
 #endif
 
 protected:
-    virtual int         DeactivatePage( SfxItemSet* pSet );
+    virtual int			DeactivatePage( SfxItemSet* pSet );
 
 public:
     SvxGeneralTabPage( Window* pParent, const SfxItemSet& rSet );
     ~SvxGeneralTabPage();
 
-    static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
+    static SfxTabPage*	Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	void 		Reset( const SfxItemSet& rSet );
 };
 
 #endif // #ifndef _SVX_CUIOPTGENRL_HXX
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 023d9281de94..eb5c21f2d8a6 100755
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 // tab pages
 // used in "dialogs"
-#define RID_SVX_FORMAT_CELLS_DLG            ( RID_SVX_START + 42 )
+#define RID_SVX_FORMAT_CELLS_DLG			( RID_SVX_START + 42 )
 
 // used in "tabpages"
-#define RID_SVXDLG_TEXT                     (RID_SVX_START + 183)
+#define RID_SVXDLG_TEXT                  	(RID_SVX_START + 183)
 #define RID_SVXDLG_TRANSFORM                (RID_SVX_START +  45)
 #define RID_SVXDLG_LINE                     (RID_SVX_START +  50)
 #define RID_SVXDLG_BBDLG                    (RID_SVX_START +  40)
 #define RID_SVXDLG_CAPTION                  (RID_SVX_START + 151)
 #define RID_SVXDLG_AREA                     (RID_SVX_START +  55)
-#define RID_SVXSTRARY_PAPERSIZE_STD         (RID_SVX_START + 142)
-#define RID_SVXSTRARY_PAPERSIZE_DRAW        (RID_SVX_START + 143)
+#define RID_SVXSTRARY_PAPERSIZE_STD			(RID_SVX_START + 142)
+#define RID_SVXSTRARY_PAPERSIZE_DRAW		(RID_SVX_START + 143)
 #define RID_SVXSTR_TABLE_PRESET_NONE        (RID_SVX_START + 969)
 #define RID_SVXSTR_TABLE_PRESET_ONLYOUTER   (RID_SVX_START + 970)
 #define RID_SVXSTR_TABLE_PRESET_OUTERHORI   (RID_SVX_START + 971)
@@ -76,8 +76,8 @@
 #define RID_SVXSTR_PAGEDIR_RTL_VERT         (RID_SVX_START + 967)
 #define RID_SVXSTR_PAGEDIR_LTR_VERT         (RID_SVX_START + 968)
 #define RID_STR_EDIT_GRAPHIC                (RID_SVX_START + 509)
-#define RID_SVXIMG_LOAD_H                   (RID_SVX_START + 283)
-#define RID_SVXIMG_SAVE_H                   (RID_SVX_START + 284)
+#define RID_SVXIMG_LOAD_H					(RID_SVX_START + 283)
+#define RID_SVXIMG_SAVE_H					(RID_SVX_START + 284)
 
 #define RID_SVXSTR_DESC_GRADIENT            (RID_SVX_START + 163)
 #define RID_SVXSTR_ASK_DEL_GRADIENT         (RID_SVX_START + 165)
@@ -108,23 +108,23 @@
 
 // autocor
 #define RID_OFAPAGE_AUTOCOMPLETE_OPTIONS (RID_OFA_START + 119)
-#define RID_OFAPAGE_AUTOCORR_OPTIONS    (RID_OFA_START + 102)
-#define RID_OFAPAGE_AUTOFMT_APPLY       (RID_OFA_START + 110)
-#define RID_OFAPAGE_AUTOCORR_REPLACE    (RID_OFA_START + 103)
-#define RID_OFAPAGE_AUTOCORR_EXCEPT     (RID_OFA_START + 104)
-#define RID_OFAPAGE_AUTOCORR_QUOTE      (RID_OFA_START + 109)
-#define RID_OFADLG_PRCNT_SET            (RID_OFA_START + 111)
+#define RID_OFAPAGE_AUTOCORR_OPTIONS 	(RID_OFA_START + 102)
+#define RID_OFAPAGE_AUTOFMT_APPLY 		(RID_OFA_START + 110)
+#define RID_OFAPAGE_AUTOCORR_REPLACE 	(RID_OFA_START + 103)
+#define RID_OFAPAGE_AUTOCORR_EXCEPT 	(RID_OFA_START + 104)
+#define RID_OFAPAGE_AUTOCORR_QUOTE 		(RID_OFA_START + 109)
+#define RID_OFADLG_PRCNT_SET			(RID_OFA_START + 111)
 
 // options
-#define RID_SVXSTR_DIAGRAM_ROW                              (RID_SVX_START + 1162)
-#define RID_OFAPAGE_CONNPOOLOPTIONS     (RID_OFA_START + 122)
+#define RID_SVXSTR_DIAGRAM_ROW								(RID_SVX_START + 1162)
+#define RID_OFAPAGE_CONNPOOLOPTIONS		(RID_OFA_START + 122)
 #define QUERY_DELETE_CONFIRM                    (RID_SVX_START + 1110)
-#define RID_SVXPAGE_JSEARCH_OPTIONS         (RID_SVX_START +  840)
-#define DLG_DOCUMENTLINK                (RID_OFA_START + 124)
+#define RID_SVXPAGE_JSEARCH_OPTIONS			(RID_SVX_START +  840)
+#define DLG_DOCUMENTLINK				(RID_OFA_START + 124)
 #define STR_LINKEDDOC_DOESNOTEXIST              (RID_SVX_START + 1111)
 #define STR_LINKEDDOC_NO_SYSTEM_FILE                        (RID_SVX_START + 1169)
 #define STR_NAME_CONFLICT                       (RID_SVX_START + 1112)
-#define RID_SVX_FONT_SUBSTITUTION           (RID_SVX_START + 18)
+#define RID_SVX_FONT_SUBSTITUTION			(RID_SVX_START + 18)
 
 // treeopt
 #define RID_SVXPAGE_COLOR                   (RID_SVX_START +  60)
@@ -136,27 +136,27 @@
 #define RID_IMGLIST_TREEOPT_HC          (RID_OFA_START + 175)
 #define RID_RIDER_SLL_SITE              (RID_OFA_START + 100)//?
 #define RID_RIDER_SLL_PERSONAL          (RID_OFA_START + 101)//?
-#define RID_OFADLG_OPTIONS_TREE_HINT    (RID_OFA_START + 118)//?
+#define RID_OFADLG_OPTIONS_TREE_HINT	(RID_OFA_START + 118)//?
 
 // options
 #define RID_SVXDLG_WEBCONNECTION_INFO       (RID_SVX_START + 301)
 #define RID_SVXDLG_SECURITY_OPTIONS         (RID_SVX_START + 300)
 #define RID_SVXPAGE_ONLINEUPDATE            (RID_SVX_START + 298)
-#define OFA_TP_MEMORY                   (RID_OFA_START + 250)
-#define RID_SVXPAGE_INET_SECURITY           (RID_SVX_START + 200)
-#define RID_SVXPAGE_INET_SEARCH             (RID_SVX_START + 160)
+#define OFA_TP_MEMORY					(RID_OFA_START + 250)
+#define RID_SVXPAGE_INET_SECURITY	  		(RID_SVX_START + 200)
+#define RID_SVXPAGE_INET_SEARCH				(RID_SVX_START + 160)
 #define RID_SVXPAGE_INET_PROXY              (RID_SVX_START + 157)
 #define RID_SVXPAGE_INET_MAIL               (RID_SVX_START + 155)
-#define RID_SVXPAGE_INET_MOZPLUGIN          (RID_SVX_START + 2161)
-#define RID_OFAPAGE_HTMLOPT             (RID_OFA_START + 100)
-#define OFA_TP_LANGUAGES                (RID_OFA_START + 205)
-#define OFA_TP_MISC                     (RID_OFA_START + 200)
-#define OFA_TP_VIEW                     (RID_OFA_START + 202)
-#define RID_OFAPAGE_MSFILTEROPT         (RID_OFA_START + 120)
-#define RID_OFAPAGE_MSFILTEROPT2        (RID_OFA_START + 121)
+#define RID_SVXPAGE_INET_MOZPLUGIN			(RID_SVX_START + 2161)
+#define RID_OFAPAGE_HTMLOPT				(RID_OFA_START + 100)
+#define OFA_TP_LANGUAGES				(RID_OFA_START + 205)
+#define OFA_TP_MISC						(RID_OFA_START + 200)
+#define OFA_TP_VIEW						(RID_OFA_START + 202)
+#define RID_OFAPAGE_MSFILTEROPT			(RID_OFA_START + 120)
+#define RID_OFAPAGE_MSFILTEROPT2		(RID_OFA_START + 121)
 #define RID_OFAPAGE_SMARTTAG_OPTIONS    (RID_OFA_START + 125)
-#define RID_SVXPAGE_OPTIONS_CTL             (RID_SVX_START + 252)
-#define RID_SVXPAGE_OPTIONS_JAVA            (RID_SVX_START + 253)
+#define RID_SVXPAGE_OPTIONS_CTL				(RID_SVX_START + 252)
+#define RID_SVXPAGE_OPTIONS_JAVA			(RID_SVX_START + 253)
 #define RID_SVXPAGE_ACCESSIBILITYCONFIG     (RID_SVX_START + 250)
 #define RID_SVXPAGE_ASIAN_LAYOUT            (RID_SVX_START + 246)
 #define RID_OPTPAGE_CHART_DEFCOLORS         (RID_SVX_START + 299)
@@ -166,25 +166,25 @@
 #define RID_SVXSTR_COLOR_CONFIG_SAVE2       (RID_SVX_START + 854)
 #define RID_SVXSTR_COLOR_CONFIG_DELETE      (RID_SVX_START + 855)
 #define RID_SVXSTR_OPT_DOUBLE_DICTS         (RID_SVX_START + 320)
-#define RID_SVX_MSGBOX_LANGUAGE_RESTART     ( RID_SVX_START +  2 )
-#define RID_SVXERR_OPT_PROXYPORTS           (RID_SVX_START + 224)
-#define RID_SVXDLG_OPT_JAVASCRIPT_DISABLE   (RID_SVX_START + 225)
-#define RID_SVXDLG_JAVA_PARAMETER           (RID_SVX_START + 254)
-#define RID_SVXDLG_JAVA_CLASSPATH           (RID_SVX_START + 255)
-#define RID_SVXERR_JRE_NOT_RECOGNIZED       (RID_SVX_START + 256)
-#define RID_SVXERR_JRE_FAILED_VERSION       (RID_SVX_START + 257)
-#define RID_SVX_MSGBOX_JAVA_RESTART         ( RID_SVX_START +  0 )
-#define RID_SVX_MSGBOX_JAVA_RESTART2        ( RID_SVX_START +  1 )
-#define RID_SVXDLG_LNG_ED_NUM_PREBREAK      (RID_SVX_START +  830)
-#define RID_SVXDLG_EDIT_MODULES             (RID_SVX_START +  831)
+#define RID_SVX_MSGBOX_LANGUAGE_RESTART		( RID_SVX_START +  2 )
+#define RID_SVXERR_OPT_PROXYPORTS			(RID_SVX_START + 224)
+#define RID_SVXDLG_OPT_JAVASCRIPT_DISABLE	(RID_SVX_START + 225)
+#define RID_SVXDLG_JAVA_PARAMETER			(RID_SVX_START + 254)
+#define RID_SVXDLG_JAVA_CLASSPATH			(RID_SVX_START + 255)
+#define RID_SVXERR_JRE_NOT_RECOGNIZED		(RID_SVX_START + 256)
+#define RID_SVXERR_JRE_FAILED_VERSION		(RID_SVX_START + 257)
+#define RID_SVX_MSGBOX_JAVA_RESTART			( RID_SVX_START +  0 )
+#define RID_SVX_MSGBOX_JAVA_RESTART2		( RID_SVX_START +  1 )
+#define RID_SVXDLG_LNG_ED_NUM_PREBREAK		(RID_SVX_START +  830)
+#define RID_SVXDLG_EDIT_MODULES				(RID_SVX_START +  831)
 #define RID_SVXSTR_PATH_NAME_START          (RID_SVX_START + 1003)
 #define RID_SVXDLG_FILTER_WARNING           (RID_SVX_START + 248)
 #define RID_SVXBMP_LOCK                     (RID_SVX_START + 118)
 #define RID_SVXBMP_LOCK_HC                  (RID_SVX_START + 119)
 #define RID_SVXSTR_READONLY_CONFIG_TIP      (RID_SVX_START + 1026)
-#define RID_SVXQB_CHANGEDATA                (RID_SVX_START + 214)       //?
-#define RID_SVXERR_OPT_DOUBLEPATHS          (RID_SVX_START + 208)       //?
-#define RID_SVXSTR_KEY_AUTOCORRECT_DIR      (RID_SVX_START + 1004)  //?
+#define RID_SVXQB_CHANGEDATA				(RID_SVX_START + 214)		//?
+#define RID_SVXERR_OPT_DOUBLEPATHS			(RID_SVX_START + 208)		//?
+#define RID_SVXSTR_KEY_AUTOCORRECT_DIR      (RID_SVX_START + 1004)	//?
 #define RID_SVXSTR_KEY_DICTIONARY_PATH      (RID_SVX_START + 1010)//?
 #define RID_SVXSTR_KEY_LINGUISTIC_DIR       (RID_SVX_START + 1016)//?
 #define RID_SVXSTR_KEY_USERCONFIG_PATH      (RID_SVX_START + 1023)//?
@@ -209,8 +209,8 @@
 #define RID_SVXSTR_KEY_USERDICTIONARY_DIR   (RID_SVX_START + 1025)//?
 
 // dialogs
-#define RID_SVX_WND_COMMON_LINGU            ( RID_SVX_START +  0 )
-#define RID_SVX_GRFFILTER_DLG_EMBOSS_TAB    (RID_SVX_START + 337)
+#define RID_SVX_WND_COMMON_LINGU			( RID_SVX_START +  0 )
+#define RID_SVX_GRFFILTER_DLG_EMBOSS_TAB	(RID_SVX_START + 337)
 #define RID_SVXDLG_SEARCHATTR               (RID_SVX_START +  22)
 #define RID_SVXDLG_HYPHENATE                (RID_SVX_START +  30)
 #define RID_SVXDLG_THESAURUS                (RID_SVX_START +  31)
@@ -218,82 +218,82 @@
 #define RID_SVXSTR_HMERR_CHECKINSTALL       (RID_SVX_START +  94)
 
 // hyperlink dialog
-#define RID_SVXDLG_NEWHYPERLINK             (RID_SVX_START + 227)
-#define RID_SVXBMP_HLINETTP_H               (RID_SVX_START + 272)
-#define RID_SVXBMP_HLMAILTP_H               (RID_SVX_START + 273)
-#define RID_SVXBMP_HLDOCTP_H                (RID_SVX_START + 274)
-#define RID_SVXBMP_HLDOCNTP_H               (RID_SVX_START + 275)
-#define RID_SVXBMP_HLINETTP                 (RID_SVX_START + 556)
-#define RID_SVXBMP_HLMAILTP                 (RID_SVX_START + 557)
-#define RID_SVXBMP_HLDOCTP                  (RID_SVX_START + 558)
-#define RID_SVXBMP_HLDOCNTP                 (RID_SVX_START + 559)
-#define RID_SVXPAGE_HYPERLINK_INTERNET      (RID_SVX_START + 228)
-#define RID_SVXPAGE_HYPERLINK_MAIL          (RID_SVX_START + 229)
-#define RID_SVXPAGE_HYPERLINK_DOCUMENT      (RID_SVX_START + 230)
-#define RID_SVXPAGE_HYPERLINK_NEWDOCUMENT   (RID_SVX_START + 231)
-#define RID_SVXSTR_HYPERDLG_HLINETTP        (RID_SVX_START + 581)
-#define RID_SVXSTR_HYPERDLG_HLINETTP_HELP   (RID_SVX_START + 582)
-#define RID_SVXSTR_HYPERDLG_HLMAILTP        (RID_SVX_START + 583)
-#define RID_SVXSTR_HYPERDLG_HLMAILTP_HELP   (RID_SVX_START + 584)
-#define RID_SVXSTR_HYPERDLG_HLDOCTP         (RID_SVX_START + 585)
-#define RID_SVXSTR_HYPERDLG_HLDOCTP_HELP    (RID_SVX_START + 586)
-#define RID_SVXSTR_HYPERDLG_HLDOCNTP        (RID_SVX_START + 587)
-#define RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP   (RID_SVX_START + 588)
-#define RID_SVXSTR_HYPDLG_APPLYBUT          (RID_SVX_START + 548)
-#define RID_SVXSTR_HYPDLG_CLOSEBUT          (RID_SVX_START + 549)
+#define RID_SVXDLG_NEWHYPERLINK				(RID_SVX_START + 227)
+#define RID_SVXBMP_HLINETTP_H				(RID_SVX_START + 272)
+#define RID_SVXBMP_HLMAILTP_H				(RID_SVX_START + 273)
+#define RID_SVXBMP_HLDOCTP_H				(RID_SVX_START + 274)
+#define RID_SVXBMP_HLDOCNTP_H				(RID_SVX_START + 275)
+#define RID_SVXBMP_HLINETTP					(RID_SVX_START + 556)
+#define RID_SVXBMP_HLMAILTP					(RID_SVX_START + 557)
+#define RID_SVXBMP_HLDOCTP					(RID_SVX_START + 558)
+#define RID_SVXBMP_HLDOCNTP					(RID_SVX_START + 559)
+#define RID_SVXPAGE_HYPERLINK_INTERNET		(RID_SVX_START + 228)
+#define RID_SVXPAGE_HYPERLINK_MAIL			(RID_SVX_START + 229)
+#define RID_SVXPAGE_HYPERLINK_DOCUMENT		(RID_SVX_START + 230)
+#define RID_SVXPAGE_HYPERLINK_NEWDOCUMENT	(RID_SVX_START + 231)
+#define RID_SVXSTR_HYPERDLG_HLINETTP		(RID_SVX_START + 581)
+#define RID_SVXSTR_HYPERDLG_HLINETTP_HELP	(RID_SVX_START + 582)
+#define RID_SVXSTR_HYPERDLG_HLMAILTP		(RID_SVX_START + 583)
+#define RID_SVXSTR_HYPERDLG_HLMAILTP_HELP	(RID_SVX_START + 584)
+#define RID_SVXSTR_HYPERDLG_HLDOCTP			(RID_SVX_START + 585)
+#define RID_SVXSTR_HYPERDLG_HLDOCTP_HELP 	(RID_SVX_START + 586)
+#define RID_SVXSTR_HYPERDLG_HLDOCNTP		(RID_SVX_START + 587)
+#define RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP	(RID_SVX_START + 588)
+#define RID_SVXSTR_HYPDLG_APPLYBUT			(RID_SVX_START + 548)
+#define RID_SVXSTR_HYPDLG_CLOSEBUT			(RID_SVX_START + 549)
 #define RID_SVXSTR_HYPDLG_NOVALIDFILENAME   (RID_SVX_START + 553)
-#define RID_SVXSTR_HYPERDLG_QUERYOVERWRITE  (RID_SVX_START +  815)
+#define RID_SVXSTR_HYPERDLG_QUERYOVERWRITE	(RID_SVX_START +  815)
 #define RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES  (RID_SVX_START + 800)
 #define RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN (RID_SVX_START + 801)
-#define RID_SVXFLOAT_HYPERLINK_MARKWND      (RID_SVX_START + 232)
-#define RID_SVXSTR_HYPDLG_MACROACT1         (RID_SVX_START + 550)
-#define RID_SVXSTR_HYPDLG_MACROACT2         (RID_SVX_START + 551)
-#define RID_SVXSTR_HYPDLG_MACROACT3         (RID_SVX_START + 552)
-#define RID_SVXSTR_HYPERDLG_FORM_BUTTON     (RID_SVX_START +  813)
-#define RID_SVXSTR_HYPERDLG_FROM_TEXT       (RID_SVX_START +  814)
+#define RID_SVXFLOAT_HYPERLINK_MARKWND		(RID_SVX_START + 232)
+#define RID_SVXSTR_HYPDLG_MACROACT1			(RID_SVX_START + 550)
+#define RID_SVXSTR_HYPDLG_MACROACT2			(RID_SVX_START + 551)
+#define RID_SVXSTR_HYPDLG_MACROACT3			(RID_SVX_START + 552)
+#define RID_SVXSTR_HYPERDLG_FORM_BUTTON		(RID_SVX_START +  813)
+#define RID_SVXSTR_HYPERDLG_FROM_TEXT		(RID_SVX_START +  814)
 
 // imap dialog
-#define RID_SVX_IMAPDLG_START               (RID_SVX_START + 100)
-#define RID_SVXDLG_IMAPURL                  (RID_SVX_IMAPDLG_START + 2)
+#define	RID_SVX_IMAPDLG_START				(RID_SVX_START + 100)			
+#define RID_SVXDLG_IMAPURL					(RID_SVX_IMAPDLG_START + 2)
 
 // name dialog
 #define RID_SVXDLG_NAME                     (RID_SVX_START +  62)
 #define RID_SVXDLG_MESSBOX                  (RID_SVX_START +  63)
-#define RID_SVXDLG_OBJECT_NAME              (RID_SVX_START +  64)
+#define RID_SVXDLG_OBJECT_NAME				(RID_SVX_START +  64)
 #define RID_SVXDLG_OBJECT_TITLE_DESC        (RID_SVX_START +  67)
 
 // hangulhanja
-#define RID_SVX_MDLG_HANGULHANJA            (RID_SVX_START +  1 )
-#define RID_SVX_MDLG_HANGULHANJA_OPT        ( RID_SVX_START +  4 )
-#define RID_SVX_MDLG_HANGULHANJA_EDIT       ( RID_SVX_START +  5 )
-#define RID_SVX_MDLG_HANGULHANJA_NEWDICT    ( RID_SVX_START +  6 )
+#define RID_SVX_MDLG_HANGULHANJA			(RID_SVX_START +  1 )
+#define RID_SVX_MDLG_HANGULHANJA_OPT		( RID_SVX_START +  4 )
+#define RID_SVX_MDLG_HANGULHANJA_EDIT		( RID_SVX_START +  5 )
+#define RID_SVX_MDLG_HANGULHANJA_NEWDICT	( RID_SVX_START +  6 )
 
 // icon choice
-#define RID_SVXSTR_ICONCHOICEDLG_RESETBUT   (RID_SVX_START + 580)
+#define RID_SVXSTR_ICONCHOICEDLG_RESETBUT	(RID_SVX_START + 580)
 
 // insert rows&cols
-#define DLG_INS_ROW_COL                     (RID_SVX_START + 156)
+#define DLG_INS_ROW_COL						(RID_SVX_START + 156)
 
 // SvxMultiFileDialog
-#define RID_SVXSTR_FILE_TITLE               (RID_SVX_START + 482)
-#define RID_SVXSTR_FILE_HEADLINE            (RID_SVX_START + 483)
-#define RID_SVXSTR_ARCHIVE_TITLE            (RID_SVX_START + 484)
-#define RID_SVXSTR_ARCHIVE_HEADLINE         (RID_SVX_START + 485)
-#define RID_SVXSTR_MULTIFILE_DBL_ERR        (RID_SVX_START + 486)
+#define RID_SVXSTR_FILE_TITLE				(RID_SVX_START + 482)
+#define	RID_SVXSTR_FILE_HEADLINE			(RID_SVX_START + 483)
+#define RID_SVXSTR_ARCHIVE_TITLE			(RID_SVX_START + 484)
+#define	RID_SVXSTR_ARCHIVE_HEADLINE			(RID_SVX_START + 485)
+#define RID_SVXSTR_MULTIFILE_DBL_ERR		(RID_SVX_START + 486)
 
 // password to open/modify dialog
 #define RID_DLG_PASSWORD_TO_OPEN_MODIFY     (RID_SVX_START + 500)
 
 // multi path dialog
-#define RID_SVXDLG_MULTIPATH                (RID_SVX_START + 201)
-#define RID_MULTIPATH_DBL_ERR               (RID_SVX_START + 207)
+#define RID_SVXDLG_MULTIPATH               	(RID_SVX_START + 201)
+#define RID_MULTIPATH_DBL_ERR              	(RID_SVX_START + 207)
 
 // new table dialog
-#define RID_SVX_NEWTABLE_DLG                ( RID_SVX_START + 44 )
+#define RID_SVX_NEWTABLE_DLG				( RID_SVX_START + 44 )
 
 // script organizer
 #define RID_DLG_SCRIPTORGANIZER             (RID_SVX_START + 258)
-#define RID_DLG_NEWLIB                      (RID_SVX_START + 290)
+#define RID_DLG_NEWLIB						(RID_SVX_START + 290)
 #define RID_SVXSTR_DELQUERY                 (RID_SVX_START + 1027)
 #define RID_SVXSTR_DELQUERY_TITLE           (RID_SVX_START + 1028)
 #define RID_SVXSTR_DELFAILED                (RID_SVX_START + 1029)
@@ -321,10 +321,10 @@
 #define RID_SVXDLG_SPELLCHECK               (RID_SVX_START +  32)
 
 // split cells
-#define RID_SVX_SPLITCELLDLG                ( RID_SVX_START + 43 )
+#define RID_SVX_SPLITCELLDLG				( RID_SVX_START + 43 )
 
 // searching
-#define RID_SVXDLG_SEARCHSIMILARITY         (RID_SVX_START +  23)
+#define RID_SVXDLG_SEARCHSIMILARITY			(RID_SVX_START +  23)
 
 // customize
 
@@ -333,7 +333,7 @@
 #define RID_SVXPAGE_KEYBOARD                (RID_SVX_START + 293)
 #define RID_SVXPAGE_TOOLBARS                (RID_SVX_START + 294)
 #define RID_SVXPAGE_EVENTS                  (RID_SVX_START + 295)
-#define RID_SVXPAGE_CONFIGGROUPBOX          (RID_SVX_START + 304)
+#define RID_SVXPAGE_CONFIGGROUPBOX		    (RID_SVX_START + 304)
 #define RID_SVXDLG_ASSIGNCOMPONENT          (RID_SVX_START + 297)
 #define RID_DLG_SCRIPTSELECTOR              (RID_SVX_START + 259)
 #define RID_SVXSTR_NEW_MENU                 (RID_SVX_START + 1039)
@@ -343,10 +343,10 @@
 #define RID_SVXSTR_SUBMENU_NAME                 (RID_SVX_START + 1049)
 #define RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION (RID_SVX_START + 1050)
 #define RID_SVXSTR_IMPORT_ICON_ERROR            (RID_SVX_START + 1117)
-#define RID_SVXSTR_DELETE_ICON_CONFIRM                      (RID_SVX_START + 1163) //added for issue73355
-#define RID_SVXSTR_REPLACE_ICON_WARNING                     (RID_SVX_START + 1164) //added for issue73355
-#define RID_SVXSTR_REPLACE_ICON_CONFIRM                     (RID_SVX_START + 1165) //added for issue73355
-#define RID_SVXSTR_YESTOALL                                 (RID_SVX_START + 1166) //added for issue73355
+#define RID_SVXSTR_DELETE_ICON_CONFIRM						(RID_SVX_START + 1163) //added for issue73355
+#define RID_SVXSTR_REPLACE_ICON_WARNING						(RID_SVX_START + 1164) //added for issue73355
+#define RID_SVXSTR_REPLACE_ICON_CONFIRM						(RID_SVX_START + 1165) //added for issue73355
+#define RID_SVXSTR_YESTOALL									(RID_SVX_START + 1166) //added for issue73355
 #define RID_SVXSTR_PRODUCTNAME_TOOLBARS         (RID_SVX_START + 1042)
 #define RID_SVXSTR_TOOLBAR                      (RID_SVX_START + 1043)
 #define RID_SVXSTR_TOOLBAR_CONTENT              (RID_SVX_START + 1044)
@@ -360,7 +360,7 @@
 #define RID_SVXSTR_RENAME_TOOLBAR                           (RID_SVX_START + 1137)
 #define RID_SVXSTR_EVENT_STARTAPP               (RID_SVX_START + 1051)
 #define RID_SVXSTR_EVENT_CLOSEAPP               (RID_SVX_START + 1052)
-#define RID_SVXSTR_EVENT_NEWDOC                 (RID_SVX_START + 1053)
+#define RID_SVXSTR_EVENT_NEWDOC					(RID_SVX_START + 1053)
 #define RID_SVXSTR_EVENT_CLOSEDOC               (RID_SVX_START + 1054)
 #define RID_SVXSTR_EVENT_PREPARECLOSEDOC        (RID_SVX_START + 1055)
 #define RID_SVXSTR_EVENT_OPENDOC                (RID_SVX_START + 1056)
@@ -409,24 +409,24 @@
 #define RID_SVXSTR_EVENT_RESETTED               (RID_SVX_START + 1099)
 #define RID_SVXSTR_EVENT_SUBCOMPONENT_OPENED                (RID_SVX_START + 1170)
 #define RID_SVXSTR_EVENT_SUBCOMPONENT_CLOSED                (RID_SVX_START + 1171)
-#define RID_SVXSTR_EVENT_CREATEDOC                          (RID_SVX_START + 1172)
-#define RID_SVXSTR_EVENT_LOADDOCFINISHED                    (RID_SVX_START + 1173)
-#define RID_SVXSTR_EVENT_SAVEDOCFAILED                      (RID_SVX_START + 1174)
-#define RID_SVXSTR_EVENT_SAVEASDOCFAILED                    (RID_SVX_START + 1175)
-#define RID_SVXSTR_EVENT_COPYTODOC                          (RID_SVX_START + 1176)
-#define RID_SVXSTR_EVENT_COPYTODOCDONE                      (RID_SVX_START + 1177)
-#define RID_SVXSTR_EVENT_COPYTODOCFAILED                    (RID_SVX_START + 1178)
-#define RID_SVXSTR_EVENT_VIEWCREATED                        (RID_SVX_START + 1179)
-#define RID_SVXSTR_EVENT_PREPARECLOSEVIEW                   (RID_SVX_START + 1180)
-#define RID_SVXSTR_EVENT_CLOSEVIEW                          (RID_SVX_START + 1181)
-#define RID_SVXSTR_EVENT_TITLECHANGED                       (RID_SVX_START + 1182)
-#define RID_SVXSTR_EVENT_MODECHANGED                        (RID_SVX_START + 1183)
-#define RID_SVXSTR_EVENT_VISAREACHANGED                     (RID_SVX_START + 1184)
-#define RID_SVXSTR_EVENT_STORAGECHANGED                     (RID_SVX_START + 1185)
-#define RID_SVXSTR_EVENT_MAILMERGE_END                      (RID_SVX_START + 1186)
-#define RID_SVXSTR_EVENT_FIELDMERGE                         (RID_SVX_START + 1187)
-#define RID_SVXSTR_EVENT_FIELDMERGE_FINISHED                (RID_SVX_START + 1188)
-#define RID_SVXSTR_EVENT_LAYOUT_FINISHED                    (RID_SVX_START + 1189)
+#define RID_SVXSTR_EVENT_CREATEDOC							(RID_SVX_START + 1172)
+#define RID_SVXSTR_EVENT_LOADDOCFINISHED					(RID_SVX_START + 1173)
+#define RID_SVXSTR_EVENT_SAVEDOCFAILED						(RID_SVX_START + 1174)
+#define RID_SVXSTR_EVENT_SAVEASDOCFAILED					(RID_SVX_START + 1175)
+#define RID_SVXSTR_EVENT_COPYTODOC							(RID_SVX_START + 1176)
+#define RID_SVXSTR_EVENT_COPYTODOCDONE						(RID_SVX_START + 1177)
+#define RID_SVXSTR_EVENT_COPYTODOCFAILED					(RID_SVX_START + 1178)
+#define RID_SVXSTR_EVENT_VIEWCREATED						(RID_SVX_START + 1179)
+#define RID_SVXSTR_EVENT_PREPARECLOSEVIEW					(RID_SVX_START + 1180)
+#define RID_SVXSTR_EVENT_CLOSEVIEW							(RID_SVX_START + 1181)
+#define RID_SVXSTR_EVENT_TITLECHANGED						(RID_SVX_START + 1182)
+#define RID_SVXSTR_EVENT_MODECHANGED						(RID_SVX_START + 1183)
+#define RID_SVXSTR_EVENT_VISAREACHANGED						(RID_SVX_START + 1184)
+#define RID_SVXSTR_EVENT_STORAGECHANGED						(RID_SVX_START + 1185)
+#define RID_SVXSTR_EVENT_MAILMERGE_END						(RID_SVX_START + 1186)
+#define RID_SVXSTR_EVENT_FIELDMERGE							(RID_SVX_START + 1187)
+#define RID_SVXSTR_EVENT_FIELDMERGE_FINISHED				(RID_SVX_START + 1188)
+#define RID_SVXSTR_EVENT_LAYOUT_FINISHED					(RID_SVX_START + 1189)
 
 // For now, keep new IDs unique only within cui.
 // Later, cui should perhaps get an own range of IDs.
diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx
index 6f6718f55378..e4f9fc294f4f 100644
--- a/cui/source/inc/cuisrchdlg.hxx
+++ b/cui/source/inc/cuisrchdlg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class SvxJSearchOptionsPage;
 
 class SvxJSearchOptionsDialog : public SfxSingleTabDialog
 {
-    INT32                   nInitialTlFlags;
+    INT32					nInitialTlFlags;
     SvxJSearchOptionsPage  *pPage;
 
     // disallow copy-constructor and assignment-operator for now
@@ -65,10 +65,10 @@ public:
     virtual ~SvxJSearchOptionsDialog();
 
     // Window
-    virtual void    Activate();
+    virtual void	Activate();
 
-    INT32           GetTransliterationFlags() const;
-    void            SetTransliterationFlags( INT32 nSettings );
+    INT32			GetTransliterationFlags() const;
+    void 			SetTransliterationFlags( INT32 nSettings );
 };
 
 #endif
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index bc7c024fd35e..fa61e02680f5 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class SvxAreaTabDialog : public SfxTabDialog
 {
 private:
     SdrModel*           mpDrawModel;
-//  const SdrView*      mpView;
+//	const SdrView*		mpView;
 
     XColorTable*        mpColorTab;
     XColorTable*        mpNewColorTab;
@@ -81,29 +81,29 @@ public:
                       const SdrView* pSdrView = NULL );
     ~SvxAreaTabDialog();
 
-    void                 SetNewColorTable( XColorTable* pColTab )
+    void            	 SetNewColorTable( XColorTable* pColTab )
                             { mpNewColorTab = pColTab; }
-    XColorTable*         GetNewColorTable() const { return mpNewColorTab; }
-    const XColorTable*   GetColorTable() const { return mpColorTab; }
+    XColorTable*    	 GetNewColorTable() const { return mpNewColorTab; }
+    const XColorTable*	 GetColorTable() const { return mpColorTab; }
 
-    void                 SetNewGradientList( XGradientList* pGrdLst)
+    void            	 SetNewGradientList( XGradientList* pGrdLst)
                             { mpNewGradientList = pGrdLst; }
-    XGradientList*       GetNewGradientList() const
+    XGradientList*  	 GetNewGradientList() const
                             { return mpNewGradientList; }
     const XGradientList* GetGradientList() const { return mpGradientList; }
 
-    void                 SetNewHatchingList( XHatchList* pHtchLst)
+    void				 SetNewHatchingList( XHatchList* pHtchLst)
                             { mpNewHatchingList = pHtchLst; }
-    XHatchList*          GetNewHatchingList() const
+    XHatchList*     	 GetNewHatchingList() const
                             { return mpNewHatchingList; }
-    const XHatchList*    GetHatchingList() const { return mpHatchingList; }
+    const XHatchList*	 GetHatchingList() const { return mpHatchingList; }
 
-    void                 SetNewBitmapList( XBitmapList* pBmpLst)
+    void				 SetNewBitmapList( XBitmapList* pBmpLst)
                             { mpNewBitmapList = pBmpLst; }
-    XBitmapList*         GetNewBitmapList() const { return mpNewBitmapList; }
-    const XBitmapList*   GetBitmapList() const { return mpBitmapList; }
+    XBitmapList*		 GetNewBitmapList() const { return mpNewBitmapList; }
+    const XBitmapList*	 GetBitmapList() const { return mpBitmapList; }
 
-    void                 DontDeleteColorTable() { mbDeleteColorTable = FALSE; }
+    void				 DontDeleteColorTable() { mbDeleteColorTable = FALSE; }
 };
 
 /*************************************************************************
@@ -122,8 +122,8 @@ class SvxTransparenceTabPage : public SvxTabPage
 
     //CHINA001 UINT16*             pPageType;
     //CHINA001 UINT16*             pDlgType;
-    UINT16             nPageType; //add CHINA001
-    UINT16             nDlgType;  //add CHINA001
+    UINT16             nPageType; //add CHINA001 
+    UINT16             nDlgType;  //add CHINA001 
 
     // main selection
     FixedLine           aFlProp;
@@ -153,7 +153,7 @@ class SvxTransparenceTabPage : public SvxTabPage
     // preview
     SvxXRectPreview     aCtlBitmapPreview;
     SvxXRectPreview     aCtlXRectPreview;
-    BOOL                bBitmap;
+    BOOL				bBitmap;
 
     XOutdevItemPool*    pXPool;
     XFillAttrSetItem    aXFillAttr;
@@ -190,9 +190,9 @@ public:
 
     //CHINA001 void SetPageType(UINT16 *pInType) { pPageType = pInType; }
     //CHINA001 void SetDlgType(UINT16* pInType) { pDlgType = pInType; }
-    void SetPageType(UINT16 nInType) { nPageType = nInType; } //add CHINA001
-    void SetDlgType(UINT16 nInType) { nDlgType = nInType; }//add CHINA001
-    virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
+    void SetPageType(UINT16 nInType) { nPageType = nInType; } //add CHINA001 
+    void SetDlgType(UINT16 nInType) { nDlgType = nInType; }//add CHINA001 
+    virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 
 };
 
 /*************************************************************************
@@ -220,28 +220,28 @@ private:
     FixedLine           aFlStepCount;
     NumericField        aNumFldStepCount;
 
-    CheckBox            aCbxHatchBckgrd;
+    CheckBox			aCbxHatchBckgrd;
     ColorLB             aLbHatchBckgrdColor;
 
     FixedLine           aFlSize;
-    TriStateBox         aTsbOriginal;
-    TriStateBox         aTsbScale;
-    FixedText           aFtXSize;
-    MetricField         aMtrFldXSize;
-    FixedText           aFtYSize;
-    MetricField         aMtrFldYSize;
+    TriStateBox			aTsbOriginal;
+    TriStateBox			aTsbScale;
+    FixedText			aFtXSize;
+    MetricField			aMtrFldXSize;
+    FixedText			aFtYSize;
+    MetricField			aMtrFldYSize;
     FixedLine           aFlPosition;
-    SvxRectCtl          aCtlPosition;
-    FixedText           aFtXOffset;
-    MetricField         aMtrFldXOffset;
-    FixedText           aFtYOffset;
-    MetricField         aMtrFldYOffset;
+    SvxRectCtl			aCtlPosition;
+    FixedText			aFtXOffset;
+    MetricField			aMtrFldXOffset;
+    FixedText			aFtYOffset;
+    MetricField			aMtrFldYOffset;
     TriStateBox         aTsbTile;
     TriStateBox         aTsbStretch;
     FixedLine           aFlOffset;
-    RadioButton         aRbtRow;
-    RadioButton         aRbtColumn;
-    MetricField         aMtrFldOffset;
+    RadioButton			aRbtRow;
+    RadioButton			aRbtColumn;
+    MetricField			aMtrFldOffset;
 
     SvxXRectPreview     aCtlXRectPreview;
 
@@ -261,9 +261,9 @@ private:
     //CHINA001 USHORT*             pPageType;
     //CHINA001 USHORT*             pDlgType;
     //CHINA001 USHORT*             pPos;
-    UINT16 nPageType; //add CHINA001
-    UINT16 nDlgType;//add CHINA001
-    UINT16 nPos; //add CHINA001
+    UINT16 nPageType; //add CHINA001 
+    UINT16 nDlgType;//add CHINA001 
+    UINT16 nPos; //add CHINA001 
 
     BOOL*               pbAreaTP;
 
@@ -271,8 +271,8 @@ private:
     XFillAttrSetItem    aXFillAttr;
     SfxItemSet&         rXFSet;
 
-    SfxMapUnit          ePoolUnit;
-    FieldUnit           eFUnit;
+    SfxMapUnit			ePoolUnit;
+    FieldUnit			eFUnit;
 
 #ifdef _SVX_TPAREA_CXX
     DECL_LINK( SelectDialogTypeHdl_Impl, ListBox * );
@@ -287,7 +287,7 @@ private:
     DECL_LINK( ToggleHatchBckgrdColorHdl_Impl, void * );
     DECL_LINK( ClickBitmapHdl_Impl, void * );
     DECL_LINK( ModifyBitmapHdl_Impl, void * );
-//  DECL_LINK( ModifyTransparentHdl_Impl, void * );
+//	DECL_LINK( ModifyTransparentHdl_Impl, void * );
     DECL_LINK( ModifyStepCountHdl_Impl, void * );
     DECL_LINK( ModifyTileHdl_Impl, void * );
     DECL_LINK( ClickScaleHdl_Impl, void * );
@@ -299,14 +299,14 @@ public:
     void    Construct();
 
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
-    static  USHORT*     GetRanges();
+    static  USHORT*	    GetRanges();
 
     virtual BOOL FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
     virtual void ActivatePage( const SfxItemSet& rSet );
     virtual int  DeactivatePage( SfxItemSet* pSet );
     virtual void PointChanged( Window* pWindow, RECT_POINT eRP );
-
+    
     void    SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
     void    SetGradientList( XGradientList* pGrdLst)
                 { pGradientList = pGrdLst; }
@@ -315,13 +315,13 @@ public:
     void    SetBitmapList( XBitmapList* pBmpLst) { pBitmapList = pBmpLst; }
 
     //CHINA001 void    SetPageType( USHORT* pInType ) { pPageType = pInType; }
-    void    SetPageType( UINT16 nInType ) { nPageType = nInType; } //add CHINA001
+    void    SetPageType( UINT16 nInType ) { nPageType = nInType; } //add CHINA001 
     //CHINA001 void    SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
-    void    SetDlgType( UINT16 nInType ) { nDlgType = nInType; }//add CHINA001
+    void    SetDlgType( UINT16 nInType ) { nDlgType = nInType; }//add CHINA001 
     //CHINA001 void    SetPos( USHORT* pInPos ) { pPos = pInPos; }
-    void    SetPos( UINT16 nInPos ) { nPos = nInPos; }//add CHINA001
+    void    SetPos( UINT16 nInPos ) { nPos = nInPos; }//add CHINA001 
     void    SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; }
-    virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
+    virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 
     void    SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
     void    SetGrdChgd( ChangeType* pIn ) { pnGradientListState = pIn; }
     void    SetHtchChgd( ChangeType* pIn ) { pnHatchingListState = pIn; }
@@ -350,24 +350,24 @@ private:
     ColorLB             aLbShadowColor;
     FixedText           aFtTransparent;
     MetricField         aMtrTransparent;
-    SvxXShadowPreview   aCtlXRectPreview;
+    SvxXShadowPreview	aCtlXRectPreview;
 
     const SfxItemSet&   rOutAttrs;
     RECT_POINT          eRP;
 
     XColorTable*        pColorTab;
     ChangeType*         pnColorTableState;
-    UINT16              nPageType;  //add CHINA001
-    UINT16              nDlgType;   //add CHINA001
+    UINT16				nPageType;	//add CHINA001 
+    UINT16				nDlgType;	//add CHINA001 
     USHORT*             pPos;
     BOOL*               pbAreaTP;
 
-    BOOL                bDisable;
+    BOOL				bDisable;
 
     XOutdevItemPool*    pXPool;
     XFillAttrSetItem    aXFillAttr;
     SfxItemSet&         rXFSet;
-    SfxMapUnit          ePoolUnit;
+    SfxMapUnit			ePoolUnit;
 
 #ifdef _SVX_TPSHADOW_CXX
     DECL_LINK( ClickShadowHdl_Impl, void * );
@@ -379,7 +379,7 @@ public:
 
     void    Construct();
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
-    static  USHORT*     GetRanges();
+    static  USHORT*	    GetRanges();
 
     virtual BOOL FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
@@ -388,14 +388,14 @@ public:
     virtual void PointChanged( Window* pWindow, RECT_POINT eRP );
 
     void    SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
-//CHINA001  void    SetPageType( USHORT* pInType ) { pPageType = pInType; }
-//CHINA001  void    SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
-    void    SetPageType( UINT16 nInType ) { nPageType = nInType; } //add CHINA001
-    void    SetDlgType( UINT16 nInType ) { nDlgType = nInType; }    //add CHINA001
+//CHINA001	void    SetPageType( USHORT* pInType ) { pPageType = pInType; }
+//CHINA001	void    SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
+    void    SetPageType( UINT16 nInType ) { nPageType = nInType; } //add CHINA001 
+    void    SetDlgType( UINT16 nInType ) { nDlgType = nInType; }	//add CHINA001 
     void    SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; }
     void    SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
-    virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
-    void    DisablePage( BOOL bIn ) { bDisable = bIn; }
+    virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 
+    void	DisablePage( BOOL bIn ) { bDisable = bIn; }
 };
 
 /*************************************************************************
@@ -540,7 +540,7 @@ private:
     XFillAttrSetItem    aXFillAttr;
     SfxItemSet&         rXFSet;
 
-    SfxMapUnit          ePoolUnit;
+    SfxMapUnit			ePoolUnit;
 
 #ifdef _SVX_TPHATCH_CXX
     DECL_LINK( ChangeHatchHdl_Impl, void * );
@@ -580,7 +580,7 @@ public:
     void    SetHtchChgd( ChangeType* pIn ) { pnHatchingListState = pIn; }
     void    SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
 
-    virtual void        DataChanged( const DataChangedEvent& rDCEvt );
+    virtual void		DataChanged( const DataChangedEvent& rDCEvt );
 };
 
 /*************************************************************************
@@ -681,7 +681,7 @@ public:
             Return a label control that provides a name for the specified
             control.
     */
-    virtual Window* GetParentLabeledBy( const Window* pLabeled ) const;
+    virtual Window*	GetParentLabeledBy( const Window* pLabeled ) const;
 };
 
 /*************************************************************************
@@ -745,7 +745,7 @@ private:
 
     ColorModel          eCM;
 
-    Color               aAktuellColor;
+    Color				aAktuellColor;
 
 #ifdef _SVX_TPCOLOR_CXX
     void    ConvertColorValues (Color& rColor, ColorModel eModell);
@@ -756,18 +756,18 @@ private:
 
     void    FillValueSet_Impl( ValueSet& rVs );
     //-----------------------------------------------------------------------------------------------------
-    DECL_LINK( ClickAddHdl_Impl, void * );      // Button 'Hinzufuegen'
-    DECL_LINK( ClickModifyHdl_Impl, void * );   // Button 'Aendern'
-    DECL_LINK( ClickDeleteHdl_Impl, void * );   // Button 'loeschen'
-    DECL_LINK( ClickWorkOnHdl_Impl, void * );   // Button 'Bearbeiten'
-
-    DECL_LINK( SelectColorLBHdl_Impl, void * ); // Farbe aus Listbox auswählen
-    DECL_LINK( SelectValSetHdl_Impl, void * );  // Farbe aus Farbpalette (links) auswählen
-    DECL_LINK( SelectColorModelHdl_Impl, void * );  // Auswahl Listbox 'Farbmodell'
+    DECL_LINK( ClickAddHdl_Impl, void * );		// Button 'Hinzufuegen'
+    DECL_LINK( ClickModifyHdl_Impl, void * );	// Button 'Aendern'
+    DECL_LINK( ClickDeleteHdl_Impl, void * );	// Button 'loeschen'
+    DECL_LINK( ClickWorkOnHdl_Impl, void * );	// Button 'Bearbeiten'
+
+    DECL_LINK( SelectColorLBHdl_Impl, void * );	// Farbe aus Listbox auswählen
+    DECL_LINK( SelectValSetHdl_Impl, void * );	// Farbe aus Farbpalette (links) auswählen
+    DECL_LINK( SelectColorModelHdl_Impl, void * );	// Auswahl Listbox 'Farbmodell'
     long ChangeColorHdl_Impl( void* p );
-    DECL_LINK( ModifiedHdl_Impl, void * );      // Inhalt der Farbwerte-Felder wurde verändert
-    DECL_LINK( ClickLoadHdl_Impl, void * );     // Button 'Farbtabelle laden'
-    DECL_LINK( ClickSaveHdl_Impl, void * );     // Button 'Farbtabelle sichern'
+    DECL_LINK( ModifiedHdl_Impl, void * );		// Inhalt der Farbwerte-Felder wurde verändert
+    DECL_LINK( ClickLoadHdl_Impl, void * );		// Button 'Farbtabelle laden'
+    DECL_LINK( ClickSaveHdl_Impl, void * );		// Button 'Farbtabelle sichern'
 
     long CheckChanges_Impl();
 #endif
@@ -793,7 +793,7 @@ public:
 
     void    SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
 
-    void    SetDeleteColorTable( BOOL bIn ) { bDeleteColorTable = bIn; }
+    void	SetDeleteColorTable( BOOL bIn ) { bDeleteColorTable = bIn; }
 
     virtual void FillUserData();
 };
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index efb22b2ff607..03e83ab0dcc4 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ public:
     XLineEndList*       GetNewLineEndList() const { return pNewLineEndList; }
     const XLineEndList* GetLineEndList() const { return pLineEndList; }
 
-    void                SetNewColorTable( XColorTable* pColTab ) { mpNewColorTab = pColTab; }
+    void				SetNewColorTable( XColorTable* pColTab ) { mpNewColorTab = pColTab; }
     XColorTable*        GetNewColorTable() const { return mpNewColorTab; }
     const XColorTable*  GetColorTable() const { return pColorTab; }
 };
@@ -134,27 +134,27 @@ private:
 
     //#58425# Symbole auf einer Linie (z.B. StarChart) ->
     SdrObjList*         pSymbolList; //a list of symbols to be shown in menu. Symbol at position SID_ATTR_SYMBOLTYPE is to be shown in preview. The list position is to be used cyclic.
-    bool                bNewSize;
-    Graphic             aAutoSymbolGraphic; //a graphic to be displayed in the preview in case that an automatic symbol is choosen
-    long                nNumMenuGalleryItems;
-    long                nSymbolType;
+    bool				bNewSize;
+    Graphic				aAutoSymbolGraphic; //a graphic to be displayed in the preview in case that an automatic symbol is choosen
+    long				nNumMenuGalleryItems;
+    long				nSymbolType;
     SfxItemSet*         pSymbolAttr; //attributes for the shown symbols; only necessary if not equal to line properties
-    FixedLine           aFlSymbol;
+    FixedLine			aFlSymbol;
     MenuButton          aSymbolMB;
     FixedText           aSymbolWidthFT;
-    MetricField         aSymbolWidthMF;
-    FixedText           aSymbolHeightFT;
-    MetricField         aSymbolHeightMF;
-    CheckBox            aSymbolRatioCB;
-    List                aGrfNames;
-    List                aGrfBrushItems;
-    String              sNumCharFmtName;
-    BOOL                bLastWidthModified;
-    Size                aSymbolLastSize;
-    Graphic             aSymbolGraphic;
-    Size                aSymbolSize;
-    BOOL                bSymbols;
-
+    MetricField			aSymbolWidthMF;
+    FixedText			aSymbolHeightFT;
+    MetricField			aSymbolHeightMF;
+    CheckBox			aSymbolRatioCB;
+    List				aGrfNames;
+    List				aGrfBrushItems;
+    String				sNumCharFmtName;
+    BOOL				bLastWidthModified;
+    Size				aSymbolLastSize;
+    Graphic				aSymbolGraphic;
+    Size				aSymbolSize;
+    BOOL				bSymbols;
+    
     const SfxItemSet&   rOutAttrs;
     RECT_POINT          eRP;
     BOOL                bObjSelected;
@@ -174,16 +174,16 @@ private:
     ChangeType*         pnLineEndListState;
     ChangeType*         pnDashListState;
     ChangeType*         pnColorTableState;
-    UINT16             nPageType; //add CHINA001
-    UINT16             nDlgType; //add CHINA001
+    UINT16             nPageType; //add CHINA001 
+    UINT16             nDlgType; //add CHINA001 
     USHORT*             pPosDashLb;
     USHORT*             pPosLineEndLb;
 
     SfxMapUnit          ePoolUnit;
 
     // #63083#
-    INT32               nActLineWidth;
-
+    INT32				nActLineWidth;
+    
     //Handler für Gallery-Popup-Menue-Button + Size
     DECL_LINK( GraphicHdl_Impl, MenuButton * );
     DECL_LINK( MenuCreateHdl_Impl, MenuButton * );
@@ -235,15 +235,15 @@ public:
     void    SetObjSelected( BOOL bHasObj ) { bObjSelected = bHasObj; }
 
     void    SetPageType( UINT16 nInType ) { nPageType = nInType; }//CHINA001 void    SetPageType( USHORT* pInType ) { pPageType = pInType; }
-    void    SetDlgType( UINT16 nInType ) { nDlgType = nInType; }    //CHINA001 void    SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
+    void    SetDlgType( UINT16 nInType ) { nDlgType = nInType; }	//CHINA001 void    SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
     void    SetPosDashLb( USHORT* pInPos ) { pPosDashLb = pInPos; }
     void    SetPosLineEndLb( USHORT* pInPos ) { pPosLineEndLb = pInPos; }
 
     void    SetLineEndChgd( ChangeType* pIn ) { pnLineEndListState = pIn; }
     void    SetDashChgd( ChangeType* pIn ) { pnDashListState = pIn; }
-    void    SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
+    void	SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
 
-    virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
+    virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 
     virtual void    DataChanged( const DataChangedEvent& rDCEvt );
 };
 
diff --git a/cui/source/inc/cuitbxform.hxx b/cui/source/inc/cuitbxform.hxx
index e2b992dbfc72..ff6381487922 100644
--- a/cui/source/inc/cuitbxform.hxx
+++ b/cui/source/inc/cuitbxform.hxx
@@ -13,10 +13,10 @@
 class FmInputRecordNoDialog : public ModalDialog
 {
 public:
-    FixedText       m_aLabel;
-    NumericField    m_aRecordNo;
-    OKButton        m_aOk;
-    CancelButton    m_aCancel;
+    FixedText		m_aLabel;
+    NumericField	m_aRecordNo;
+    OKButton		m_aOk;
+    CancelButton	m_aCancel;
 
 public:
     FmInputRecordNoDialog(Window * pParent);
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index 2ae0bd775304..0f642c16b07a 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace svx
     {
     private:
         FixedLine           aStdBox;
-        FixedText           aTypeText;
-        FixedText           aPathText;
-        SvxControlFocusHelper   aPathCtrl;
-        PushButton          m_aNew;
-        PushButton          m_aEdit;
-        PushButton          m_aDelete;
-
-        HeaderBar*          pHeaderBar;
-        ::svx::OptHeaderTabListBox* pPathBox;
-        SvLBoxEntry*        m_pCurEntry;
-        ULONG               m_nOldCount;
-        BOOL                m_bModified;
+        FixedText			aTypeText;
+        FixedText			aPathText;
+        SvxControlFocusHelper	aPathCtrl;
+        PushButton			m_aNew;
+        PushButton			m_aEdit;
+        PushButton      	m_aDelete;
+
+        HeaderBar*			pHeaderBar;
+        ::svx::OptHeaderTabListBox*	pPathBox;
+        SvLBoxEntry*		m_pCurEntry;
+        ULONG				m_nOldCount;
+        BOOL				m_bModified;
 
 #ifdef SVX_DBREGISTER_HXX
         DECL_LINK( NewHdl, void * );
@@ -79,25 +79,25 @@ namespace svx
 
 
         /** inserts a new entry in the tablistbox
-            @param  _sName
+            @param	_sName
                 The name of the entry.
-            @param  _sLocation
+            @param	_sLocation
                 The location of the file.
         */
         void insertNewEntry( const ::rtl::OUString& _sName,const ::rtl::OUString& _sLocation, const bool bReadOnly );
 
         /** opens the LinkDialog to create a register pair
-            @param  _sOldName
+            @param	_sOldName
                 The old name of the entry may be empty.
-            @param  _sOldLocation
+            @param	_sOldLocation
                 The old location of the entry may be empty.
-            @param  _pEntry
+            @param	_pEntry
                 The entry to remove if the entry will be changed
         */
         void openLinkDialog(const String& _sOldName,const String& _sOldLocation,SvLBoxEntry* _pEntry = NULL);
 
         /** opens a file pciker to select a database file
-            @param  _sLocation
+            @param	_sLocation
                 If set, the file picker use it as default directory
             @return
                 the location of the database file
@@ -109,11 +109,11 @@ namespace svx
         DbRegistrationOptionsPage( Window* pParent, const SfxItemSet& rSet );
         virtual ~DbRegistrationOptionsPage();
 
-        static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
-        static USHORT*      GetRanges();
+        static SfxTabPage*	Create( Window* pParent, const SfxItemSet& rSet );
+        static USHORT*		GetRanges();
 
-        virtual BOOL        FillItemSet( SfxItemSet& rSet );
-        virtual void        Reset( const SfxItemSet& rSet );
+        virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+        virtual	void 		Reset( const SfxItemSet& rSet );
         virtual void        FillUserData();
     };
 
@@ -148,11 +148,11 @@ namespace svx
         DatabaseRegistrationDialog( Window* pParent, const SfxItemSet& rAttr );
         ~DatabaseRegistrationDialog();
 
-        virtual short   Execute();
+        virtual short	Execute();
     };
 
 //........................................................................
-}   // namespace svx
+}	// namespace svx
 //........................................................................
 
 #endif // SVX_DBREGISTER_HXX
diff --git a/cui/source/inc/defdlgname.hxx b/cui/source/inc/defdlgname.hxx
index 39913eaba94a..f2b340a4ed23 100644
--- a/cui/source/inc/defdlgname.hxx
+++ b/cui/source/inc/defdlgname.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 // define ----------------------------------------------------------------
 
-#define MESS_BTN_1  ((USHORT)0)
-#define MESS_BTN_2  ((USHORT)1)
+#define MESS_BTN_1	((USHORT)0)
+#define MESS_BTN_2	((USHORT)1)
 
 // const -----------------------------------------------------------------
 
-const short  RET_BTN_1  = 100;
-const short  RET_BTN_2  = 101;
+const short  RET_BTN_1	= 100;
+const short  RET_BTN_2	= 101;
 
 #endif
 
diff --git a/cui/source/inc/dialmgr.hxx b/cui/source/inc/dialmgr.hxx
index 4d5f4f115931..637c561160a2 100644
--- a/cui/source/inc/dialmgr.hxx
+++ b/cui/source/inc/dialmgr.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 class ResMgr;
 struct CuiResMgr
 {
-    static ResMgr*      GetResMgr();
+    static ResMgr*		GetResMgr();
 };
 
-#define CUI_MGR()   (*CuiResMgr::GetResMgr())
-#define CUI_RES(i)      ResId(i,CUI_MGR())
-#define CUI_RESSTR(i)   UniString(ResId(i,CUI_MGR()))
-#define CUI_RESSSTR(i)  String(ResId(i,CUI_MGR()))
+#define CUI_MGR()	(*CuiResMgr::GetResMgr())
+#define CUI_RES(i)		ResId(i,CUI_MGR())
+#define CUI_RESSTR(i)	UniString(ResId(i,CUI_MGR()))
+#define CUI_RESSSTR(i)	String(ResId(i,CUI_MGR()))
 
 #endif
 
diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx
index 641d00342eee..936a560adc7e 100644
--- a/cui/source/inc/dlgname.hxx
+++ b/cui/source/inc/dlgname.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,11 +46,11 @@
 class SvxNameDialog : public ModalDialog
 {
 private:
-    FixedText       aFtDescription;
-    Edit            aEdtName;
-    OKButton        aBtnOK;
-    CancelButton    aBtnCancel;
-    HelpButton      aBtnHelp;
+    FixedText		aFtDescription;
+    Edit			aEdtName;
+    OKButton		aBtnOK;
+    CancelButton	aBtnCancel;
+    HelpButton		aBtnHelp;
 
     Link            aCheckNameHdl;
 #if _SOLAR__PRIVATE
@@ -96,16 +96,16 @@ class SvxObjectNameDialog : public ModalDialog
 {
 private:
     // name
-    FixedText       aFtName;
-    Edit            aEdtName;
+    FixedText		aFtName;
+    Edit			aEdtName;
 
     // separator
-    FixedLine       aFlSeparator;
+    FixedLine		aFlSeparator;
 
     // buttons
-    HelpButton      aBtnHelp;
-    OKButton        aBtnOK;
-    CancelButton    aBtnCancel;
+    HelpButton		aBtnHelp;
+    OKButton		aBtnOK;
+    CancelButton	aBtnCancel;
 
     // callback link for name uniqueness
     Link            aCheckNameHdl;
@@ -140,20 +140,20 @@ class SvxObjectTitleDescDialog : public ModalDialog
 {
 private:
     // title
-    FixedText       aFtTitle;
-    Edit            aEdtTitle;
+    FixedText		aFtTitle;
+    Edit			aEdtTitle;
 
     // description
-    FixedText       aFtDescription;
-    MultiLineEdit   aEdtDescription;
+    FixedText		aFtDescription;
+    MultiLineEdit	aEdtDescription;
 
     // separator
-    FixedLine       aFlSeparator;
+    FixedLine		aFlSeparator;
 
     // buttons
-    HelpButton      aBtnHelp;
-    OKButton        aBtnOK;
-    CancelButton    aBtnCancel;
+    HelpButton		aBtnHelp;
+    OKButton		aBtnOK;
+    CancelButton	aBtnCancel;
 
 public:
     // constructor
@@ -174,12 +174,12 @@ public:
 class SvxMessDialog : public ModalDialog
 {
 private:
-    FixedText       aFtDescription;
-    PushButton      aBtn1;
-    PushButton      aBtn2;
-    CancelButton    aBtnCancel;
-    FixedImage      aFtImage;
-    Image*          pImage;
+    FixedText		aFtDescription;
+    PushButton		aBtn1;
+    PushButton		aBtn2;
+    CancelButton	aBtnCancel;
+    FixedImage		aFtImage;
+    Image*			pImage;
 #if _SOLAR__PRIVATE
     DECL_LINK( Button1Hdl, Button * );
     DECL_LINK( Button2Hdl, Button * );
@@ -188,7 +188,7 @@ public:
     SvxMessDialog( Window* pWindow, const String& rText, const String& rDesc, Image* pImg = NULL );
     ~SvxMessDialog();
 
-    void    SetButtonText( USHORT nBtnId, const String& rNewTxt );
+    void	SetButtonText( USHORT nBtnId, const String& rNewTxt );
 };
 
 
diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx
index 7c38ffa7c5c5..ad60687fc9cd 100644
--- a/cui/source/inc/dstribut.hxx
+++ b/cui/source/inc/dstribut.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,29 +62,29 @@ enum SvxDistributeVertical
 
 class SvxDistributePage : public SvxTabPage
 {
-    SvxDistributeHorizontal     meDistributeHor;
-    SvxDistributeVertical       meDistributeVer;
-
-    FixedLine                   maFlHorizontal      ;
-    RadioButton                 maBtnHorNone        ;
-    RadioButton                 maBtnHorLeft        ;
-    RadioButton                 maBtnHorCenter      ;
-    RadioButton                 maBtnHorDistance    ;
-    RadioButton                 maBtnHorRight       ;
-    FixedImage                  maHorLow            ;
-    FixedImage                  maHorCenter         ;
-    FixedImage                  maHorDistance       ;
-    FixedImage                  maHorHigh           ;
-    FixedLine                   maFlVertical        ;
-    RadioButton                 maBtnVerNone        ;
-    RadioButton                 maBtnVerTop         ;
-    RadioButton                 maBtnVerCenter      ;
-    RadioButton                 maBtnVerDistance    ;
-    RadioButton                 maBtnVerBottom      ;
-    FixedImage                  maVerLow            ;
-    FixedImage                  maVerCenter         ;
-    FixedImage                  maVerDistance       ;
-    FixedImage                  maVerHigh           ;
+    SvxDistributeHorizontal		meDistributeHor;
+    SvxDistributeVertical		meDistributeVer;
+
+    FixedLine					maFlHorizontal		;
+    RadioButton					maBtnHorNone		;
+    RadioButton					maBtnHorLeft		;
+    RadioButton					maBtnHorCenter		;
+    RadioButton					maBtnHorDistance	;
+    RadioButton					maBtnHorRight		;
+    FixedImage					maHorLow			;
+    FixedImage					maHorCenter			;
+    FixedImage					maHorDistance		;
+    FixedImage					maHorHigh			;
+    FixedLine					maFlVertical		;
+    RadioButton					maBtnVerNone		;
+    RadioButton					maBtnVerTop			;
+    RadioButton					maBtnVerCenter		;
+    RadioButton					maBtnVerDistance	;
+    RadioButton					maBtnVerBottom		;
+    FixedImage					maVerLow			;
+    FixedImage					maVerCenter			;
+    FixedImage					maVerDistance		;
+    FixedImage					maVerHigh			;
 
 public:
     SvxDistributePage(Window* pWindow, const SfxItemSet& rInAttrs,
@@ -109,7 +109,7 @@ public:
 
 class SvxDistributeDialog : public SfxSingleTabDialog
 {
-    SvxDistributePage*          mpPage;
+    SvxDistributePage*			mpPage;
 
 public:
     SvxDistributeDialog(Window* pParent, const SfxItemSet& rAttr,
diff --git a/cui/source/inc/gallery.hrc b/cui/source/inc/gallery.hrc
index c9d6729be447..7d6c71e2d213 100644
--- a/cui/source/inc/gallery.hrc
+++ b/cui/source/inc/gallery.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,33 +27,33 @@
 #include <cuires.hrc>
 
 // Gallery-TabDialoge/-TabPages
-#define RID_SVXTABDLG_GALLERY                   (RID_CUI_GALLERY_START )
-#define RID_SVXTABDLG_GALLERYTHEME              (RID_CUI_GALLERY_START + 2)
-#define RID_SVXDLG_GALLERY_TITLE                (RID_CUI_GALLERY_START + 82)
+#define RID_SVXTABDLG_GALLERY					(RID_CUI_GALLERY_START )
+#define RID_SVXTABDLG_GALLERYTHEME				(RID_CUI_GALLERY_START + 2)
+#define RID_SVXDLG_GALLERY_TITLE				(RID_CUI_GALLERY_START + 82)
 
-#define RID_SVXTABPAGE_GALLERY_GENERAL          (RID_CUI_GALLERY_START + 1)
-#define RID_SVXTABPAGE_GALLERYTHEME_FILES       (RID_CUI_GALLERY_START + 4)
+#define RID_SVXTABPAGE_GALLERY_GENERAL			(RID_CUI_GALLERY_START + 1)
+#define RID_SVXTABPAGE_GALLERYTHEME_FILES		(RID_CUI_GALLERY_START + 4)
 
 // Dialoge
-#define RID_SVXDLG_GALLERY_SEARCH_PROGRESS      (RID_CUI_GALLERY_START + 6)
-#define RID_SVXDLG_GALLERY_TAKE_PROGRESS        (RID_CUI_GALLERY_START + 7)
+#define RID_SVXDLG_GALLERY_SEARCH_PROGRESS		(RID_CUI_GALLERY_START + 6)
+#define RID_SVXDLG_GALLERY_TAKE_PROGRESS		(RID_CUI_GALLERY_START + 7)
 #define RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS   (RID_CUI_GALLERY_START + 8)
-#define RID_SVXDLG_GALLERY_THEMEID              (RID_CUI_GALLERY_START + 9)
+#define RID_SVXDLG_GALLERY_THEMEID				(RID_CUI_GALLERY_START + 9)
 
 // Gallery-Strings
-#define RID_SVXSTR_GALLERY_NOFILES              (RID_CUI_GALLERY_START + 12)
-#define RID_SVXSTR_GALLERY_SEARCH               (RID_CUI_GALLERY_START + 30)
-#define RID_SVXSTR_GALLERYPROPS_OBJECT          (RID_CUI_GALLERY_START + 39)
-#define RID_SVXSTR_GALLERYPROPS_GALTHEME        (RID_CUI_GALLERY_START + 40)
-#define RID_SVXSTR_GALLERY_READONLY             (RID_CUI_GALLERY_START + 43)
-#define RID_SVXSTR_GALLERY_ALLFILES             (RID_CUI_GALLERY_START + 44)
-#define RID_SVXSTR_GALLERY_ID_EXISTS            (RID_CUI_GALLERY_START + 81)
+#define RID_SVXSTR_GALLERY_NOFILES				(RID_CUI_GALLERY_START + 12)
+#define RID_SVXSTR_GALLERY_SEARCH				(RID_CUI_GALLERY_START + 30)
+#define RID_SVXSTR_GALLERYPROPS_OBJECT			(RID_CUI_GALLERY_START + 39)
+#define RID_SVXSTR_GALLERYPROPS_GALTHEME		(RID_CUI_GALLERY_START + 40)
+#define RID_SVXSTR_GALLERY_READONLY				(RID_CUI_GALLERY_START + 43)
+#define RID_SVXSTR_GALLERY_ALLFILES				(RID_CUI_GALLERY_START + 44)
+#define RID_SVXSTR_GALLERY_ID_EXISTS			(RID_CUI_GALLERY_START + 81)
 
 // Images
-#define RID_SVXBMP_THEME_NORMAL_BIG             (RID_CUI_GALLERY_START + 49)
-#define RID_SVXBMP_THEME_IMPORTED_BIG           (RID_CUI_GALLERY_START + 51)
-#define RID_SVXBMP_THEME_READONLY_BIG           (RID_CUI_GALLERY_START + 53)
-#define RID_SVXBMP_THEME_DEFAULT_BIG            (RID_CUI_GALLERY_START + 55)
+#define RID_SVXBMP_THEME_NORMAL_BIG				(RID_CUI_GALLERY_START + 49)
+#define RID_SVXBMP_THEME_IMPORTED_BIG			(RID_CUI_GALLERY_START + 51)
+#define RID_SVXBMP_THEME_READONLY_BIG			(RID_CUI_GALLERY_START + 53)
+#define RID_SVXBMP_THEME_DEFAULT_BIG			(RID_CUI_GALLERY_START + 55)
 
 // lokale Defines
 #define BTN_OK 1
@@ -80,22 +80,22 @@
 #define FL_ACTUALIZE_PROGRESS 1
 #define FT_ACTUALIZE_FILE 1
 #define FL_ID                  1
-#define LB_RESNAME      1
-#define EDT_TITLE       20
+#define LB_RESNAME		1
+#define EDT_TITLE		20
 #define FL_TITLE               21
 
 // Gallery-TabDialog
-#define FI_MS_IMAGE 1
+#define	FI_MS_IMAGE 1
 #define EDT_MS_NAME 1
-#define FL_MS_GENERAL_FIRST 1
-#define FT_MS_TYPE 2
-#define FT_MS_SHOW_TYPE 3
-#define FT_MS_PATH 4
-#define FT_MS_SHOW_PATH 5
-#define FT_MS_CONTENT 6
-#define FT_MS_SHOW_CONTENT 7
-#define FL_MS_GENERAL_SECOND 2
-#define FT_MS_CHANGEDATE 10
-#define FT_MS_SHOW_CHANGEDATE 11
+#define	FL_MS_GENERAL_FIRST 1
+#define	FT_MS_TYPE 2
+#define	FT_MS_SHOW_TYPE 3
+#define	FT_MS_PATH 4
+#define	FT_MS_SHOW_PATH 5
+#define	FT_MS_CONTENT 6
+#define	FT_MS_SHOW_CONTENT 7
+#define	FL_MS_GENERAL_SECOND 2
+#define	FT_MS_CHANGEDATE 10
+#define	FT_MS_SHOW_CHANGEDATE 11
 
 
diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx
index 769937bcc75f..7cfffdd79270 100644
--- a/cui/source/inc/grfpage.hxx
+++ b/cui/source/inc/grfpage.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,66 +44,66 @@ class SvxGrfCropPage : public SfxTabPage
 
     class SvxCropExample : public Window
     {
-        Size        aFrameSize;
-        Point       aTopLeft, aBottomRight;
-        Graphic     aGrf;
+        Size 		aFrameSize;
+        Point 		aTopLeft, aBottomRight;
+        Graphic		aGrf;
 
     public:
         SvxCropExample( Window* pPar, const ResId& rResId );
 
         virtual void Paint( const Rectangle& rRect );
 
-        void SetTopLeft( const Point& rNew )    { aTopLeft = rNew; }
-        void SetTop( long nVal )                { aTopLeft.X() = nVal; }
-        void SetBottom( long nVal )             { aBottomRight.X() = nVal; }
-        void SetLeft( long nVal )               { aTopLeft.Y() = nVal; }
-        void SetRight( long nVal)               { aBottomRight.Y() = nVal; }
-        void SetBottomRight(const Point& rNew ) { aBottomRight = rNew; }
+        void SetTopLeft( const Point& rNew )	{ aTopLeft = rNew; }
+        void SetTop( long nVal )				{ aTopLeft.X() = nVal; }
+        void SetBottom( long nVal )				{ aBottomRight.X() = nVal; }
+        void SetLeft( long nVal )				{ aTopLeft.Y() = nVal; }
+        void SetRight( long nVal)				{ aBottomRight.Y() = nVal; }
+        void SetBottomRight(const Point& rNew )	{ aBottomRight = rNew; }
         void SetFrameSize( const Size& rSz );
-        void SetGraphic( const Graphic& rGrf )  { aGrf = rGrf; }
-        const Graphic& GetGraphic() const       { return aGrf; }
+        void SetGraphic( const Graphic& rGrf )	{ aGrf = rGrf; }
+        const Graphic& GetGraphic() const		{ return aGrf; }
     };
 
     FixedLine       aCropFL;
-    RadioButton     aZoomConstRB;
-    RadioButton     aSizeConstRB;
-    FixedText       aLeftFT;
-    MetricField     aLeftMF;
-    FixedText       aRightFT;
-    MetricField     aRightMF;
-    FixedText       aTopFT;
-    MetricField     aTopMF;
-    FixedText       aBottomFT;
-    MetricField     aBottomMF;
+    RadioButton		aZoomConstRB;
+    RadioButton		aSizeConstRB;
+    FixedText		aLeftFT;
+    MetricField    	aLeftMF;
+    FixedText		aRightFT;
+    MetricField    	aRightMF;
+    FixedText		aTopFT;
+    MetricField    	aTopMF;
+    FixedText		aBottomFT;
+    MetricField    	aBottomMF;
 
     FixedLine       aZoomFL;
-    FixedText       aWidthZoomFT;
-    MetricField     aWidthZoomMF;
-    FixedText       aHeightZoomFT;
-    MetricField     aHeightZoomMF;
+    FixedText		aWidthZoomFT;
+    MetricField    	aWidthZoomMF;
+    FixedText		aHeightZoomFT;
+    MetricField    	aHeightZoomMF;
 
     FixedLine       aSizeFL;
-    FixedText       aWidthFT;
-    MetricField     aWidthMF;
-    FixedText       aHeightFT;
-    MetricField     aHeightMF;
-    FixedText       aOrigSizeFT;
-    PushButton      aOrigSizePB;
+    FixedText		aWidthFT;
+    MetricField    	aWidthMF;
+    FixedText		aHeightFT;
+    MetricField    	aHeightMF;
+    FixedText		aOrigSizeFT;
+    PushButton		aOrigSizePB;
 
     // Example
-    SvxCropExample  aExampleWN;
+    SvxCropExample	aExampleWN;
 
 
-    Timer           aTimer;
-    String          aGraphicName;
-    Size            aOrigSize;
-    Size            aPageSize;
-    const MetricField*  pLastCropField;
-    long            nOldWidth;
-    long            nOldHeight;
-    BOOL            bReset;
-    BOOL            bInitialized;
-    BOOL            bSetOrigSize;
+    Timer			aTimer;
+    String 			aGraphicName;
+    Size			aOrigSize;
+    Size 			aPageSize;
+    const MetricField* 	pLastCropField;
+    long			nOldWidth;
+    long			nOldHeight;
+    BOOL			bReset;
+    BOOL			bInitialized;
+    BOOL			bSetOrigSize;
 
 
     SvxGrfCropPage( Window *pParent, const SfxItemSet &rSet );
@@ -117,12 +117,12 @@ class SvxGrfCropPage : public SfxTabPage
     DECL_LINK( OrigSizeHdl, PushButton * );
     DECL_LINK( Timeout, Timer * );
 
-    void            CalcZoom();
-    void            CalcMinMaxBorder();
-    void            GraphicHasChanged(BOOL bFound);
-    virtual void    ActivatePage(const SfxItemSet& rSet);
+    void 			CalcZoom();
+    void			CalcMinMaxBorder();
+    void			GraphicHasChanged(BOOL bFound);
+    virtual void 	ActivatePage(const SfxItemSet& rSet);
 
-    Size            GetGrfOrigSize( const Graphic& ) const;
+    Size			GetGrfOrigSize( const Graphic& ) const;
 public:
     static SfxTabPage *Create( Window *pParent, const SfxItemSet &rSet );
 
diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx
index 1771cbc192e3..e3e469656063 100644
--- a/cui/source/inc/hangulhanjadlg.hxx
+++ b/cui/source/inc/hangulhanjadlg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <svtools/valueset.hxx>
 
 #include <vector>
-#include <memory>   // for auto_ptr
+#include <memory>	// for auto_ptr
 
 class SvxCommonLinguisticControl;
 //.............................................................................
@@ -79,7 +79,7 @@ namespace svx
         void SelectEntryPos( USHORT nPos );
 
         USHORT GetEntryCount() const;
-
+        
         XubString GetEntry( USHORT nPos ) const;
         XubString GetSelectEntry() const;
 
@@ -106,7 +106,7 @@ namespace svx
         SuggestionSet m_aValueSet;
         ListBox       m_aListBox;
 
-        Link          m_aSelectLink;
+        Link		  m_aSelectLink;
         bool          m_bInSelectionUpdate;
     };
 
@@ -114,77 +114,77 @@ namespace svx
     {
     private:
         ::std::auto_ptr< SvxCommonLinguisticControl >
-                    m_pPlayground;                  // order matters: before all other controls!
+                    m_pPlayground;					// order matters: before all other controls!
 
-        PushButton      m_aFind;
+        PushButton		m_aFind;
         SuggestionDisplay   m_aSuggestions;
-        FixedText       m_aFormat;
-        RadioButton     m_aSimpleConversion;
-        RadioButton     m_aHangulBracketed;
-        RadioButton     m_aHanjaBracketed;
-        ::std::auto_ptr< RadioButton >  m_pHanjaAbove;
-        ::std::auto_ptr< RadioButton >  m_pHanjaBelow;
-        ::std::auto_ptr< RadioButton >  m_pHangulAbove;
-        ::std::auto_ptr< RadioButton >  m_pHangulBelow;
-        FixedText       m_aConversion;
-        CheckBox        m_aHangulOnly;
-        CheckBox        m_aHanjaOnly;
-        CheckBox        m_aReplaceByChar;
-
-        CheckBox*       m_pIgnoreNonPrimary;
-        bool            m_bDocumentMode;
+        FixedText		m_aFormat;
+        RadioButton		m_aSimpleConversion;
+        RadioButton		m_aHangulBracketed;
+        RadioButton		m_aHanjaBracketed;
+        ::std::auto_ptr< RadioButton >	m_pHanjaAbove;
+        ::std::auto_ptr< RadioButton >	m_pHanjaBelow;
+        ::std::auto_ptr< RadioButton >	m_pHangulAbove;
+        ::std::auto_ptr< RadioButton >	m_pHangulBelow;
+        FixedText		m_aConversion;
+        CheckBox		m_aHangulOnly;
+        CheckBox		m_aHanjaOnly;
+        CheckBox		m_aReplaceByChar;
+
+        CheckBox*		m_pIgnoreNonPrimary;
+        bool			m_bDocumentMode;
                             // are we working for a document? This is normally true, but in case
                             // the user uses the "find" functionality, we switch to working
                             // with what the user entered, which then does not have any relation to
                             // the document anymore. Some functionality must be disabled then
 
-        Link            m_aOptionsChangedLink;
-        Link            m_aClickByCharacterLink;
+        Link			m_aOptionsChangedLink;
+        Link			m_aClickByCharacterLink;
 
     public:
-        HangulHanjaConversionDialog(
-                Window* _pParent,
+        HangulHanjaConversionDialog( 
+                Window* _pParent, 
                 editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection );
         ~HangulHanjaConversionDialog( );
 
     public:
-        void    SetOptionsChangedHdl( const Link& _rHdl );
-        void    SetIgnoreHdl( const Link& _rHdl );
-        void    SetIgnoreAllHdl( const Link& _rHdl );
-        void    SetChangeHdl( const Link& _rHdl );
-        void    SetChangeAllHdl( const Link& _rHdl );
-        void    SetOptionsHdl( const Link& _rHdl );
-
-        void    SetClickByCharacterHdl( const Link& _rHdl );
-        void    SetConversionFormatChangedHdl( const Link& _rHdl );
-        void    SetFindHdl( const Link& _rHdl );
-
-        String  GetCurrentString( ) const;
-        void    SetCurrentString(
+        void	SetOptionsChangedHdl( const Link& _rHdl );
+        void	SetIgnoreHdl( const Link& _rHdl );
+        void	SetIgnoreAllHdl( const Link& _rHdl );
+        void	SetChangeHdl( const Link& _rHdl );
+        void	SetChangeAllHdl( const Link& _rHdl );
+        void	SetOptionsHdl( const Link& _rHdl );
+
+        void	SetClickByCharacterHdl( const Link& _rHdl );
+        void	SetConversionFormatChangedHdl( const Link& _rHdl );
+        void	SetFindHdl( const Link& _rHdl );
+
+        String	GetCurrentString( ) const;
+        void	SetCurrentString(
                     const String& _rNewString,
                     const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rSuggestions,
                     bool _bOriginatesFromDocument = true
                 );
 
-        void    FocusSuggestion( );
+        void	FocusSuggestion( );
 
         // retrieves the current suggestion
-        String  GetCurrentSuggestion( ) const;
+        String	GetCurrentSuggestion( ) const;
 
         void        SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType );
         editeng::HangulHanjaConversion::ConversionFormat    GetConversionFormat( ) const;
 
-        void            SetByCharacter( sal_Bool _bByCharacter );
-        sal_Bool        GetByCharacter( ) const;
+        void			SetByCharacter( sal_Bool _bByCharacter );
+        sal_Bool		GetByCharacter( ) const;
 
-        void            SetConversionDirectionState( sal_Bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection );
+        void			SetConversionDirectionState( sal_Bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection );
 
         // should text which does not match the primary conversion direction be ignored?
-        sal_Bool        GetUseBothDirections( ) const;
-
+        sal_Bool		GetUseBothDirections( ) const;
+        
         // get current conversion direction to use
         // (return argument if GetUseBothDirections is true)
-        editeng::HangulHanjaConversion::ConversionDirection GetDirection( editeng::HangulHanjaConversion::ConversionDirection eDefaultDirection ) const;
+        editeng::HangulHanjaConversion::ConversionDirection	GetDirection( editeng::HangulHanjaConversion::ConversionDirection eDefaultDirection ) const;
 
         // enables or disbales the checkboxes for ruby formatted replacements
         void            EnableRubySupport( sal_Bool bVal );
@@ -196,7 +196,7 @@ namespace svx
         DECL_LINK( OnSuggestionSelected, void* );
         DECL_LINK( OnConversionDirectionClicked, CheckBox* );
         DECL_LINK( ClickByCharacterHdl, CheckBox* );
-
+        
         // fill the suggestion list box with suggestions for the actual input
         void FillSuggestions( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rSuggestions );
     };
@@ -207,22 +207,22 @@ namespace svx
     class HangulHanjaOptionsDialog : public ModalDialog
     {
     private:
-        FixedText           m_aUserdefdictFT;
-        SvxCheckListBox     m_aDictsLB;
-        FixedLine           m_aOptionsFL;
-        CheckBox            m_aIgnorepostCB;
-        CheckBox            m_aShowrecentlyfirstCB;
-        CheckBox            m_aAutoreplaceuniqueCB;
-        PushButton          m_aNewPB;
-        PushButton          m_aEditPB;
-        PushButton          m_aDeletePB;
-        OKButton            m_aOkPB;
-        CancelButton        m_aCancelPB;
-        HelpButton          m_aHelpPB;
-
-        SvLBoxButtonData*   m_pCheckButtonData;
-
-        HHDictList          m_aDictList;
+        FixedText			m_aUserdefdictFT;
+        SvxCheckListBox		m_aDictsLB;
+        FixedLine			m_aOptionsFL;
+        CheckBox			m_aIgnorepostCB;
+        CheckBox			m_aShowrecentlyfirstCB;
+        CheckBox			m_aAutoreplaceuniqueCB;
+        PushButton			m_aNewPB;
+        PushButton			m_aEditPB;
+        PushButton			m_aDeletePB;
+        OKButton			m_aOkPB;
+        CancelButton		m_aCancelPB;
+        HelpButton			m_aHelpPB;
+
+        SvLBoxButtonData*	m_pCheckButtonData;
+
+        HHDictList			m_aDictList;
         ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XConversionDictionaryList > m_xConversionDictionaryList;
 
         DECL_LINK( OkHdl, void* );
@@ -234,35 +234,35 @@ namespace svx
         DECL_LINK( EditDictHdl, void* );
         DECL_LINK( DeleteDictHdl, void* );
 
-        void                Init( void );       // reads settings from core and init controls
+        void				Init( void );		// reads settings from core and init controls
     public:
                             HangulHanjaOptionsDialog( Window* _pParent );
-        virtual             ~HangulHanjaOptionsDialog();
+        virtual				~HangulHanjaOptionsDialog();
 
-        void                AddDict( const String& _rName, bool _bChecked );
+        void				AddDict( const String& _rName, bool _bChecked );
     };
 
 
     class HangulHanjaNewDictDialog : public ModalDialog
     {
     private:
-        FixedLine           m_aNewDictFL;
-        FixedText           m_aDictNameFT;
-        Edit                m_aDictNameED;
-        OKButton            m_aOkBtn;
-        CancelButton        m_aCancelBtn;
-        HelpButton          m_aHelpBtn;
+        FixedLine			m_aNewDictFL;
+        FixedText			m_aDictNameFT;
+        Edit				m_aDictNameED;
+        OKButton			m_aOkBtn;
+        CancelButton		m_aCancelBtn;
+        HelpButton			m_aHelpBtn;
 
-        bool                m_bEntered;
+        bool				m_bEntered;
 
         DECL_LINK( OKHdl, void* );
         DECL_LINK( ModifyHdl, void* );
     protected:
     public:
                             HangulHanjaNewDictDialog( Window* _pParent );
-        virtual             ~HangulHanjaNewDictDialog();
+        virtual				~HangulHanjaNewDictDialog();
 
-        bool                GetName( String& _rRetName ) const;
+        bool				GetName( String& _rRetName ) const;
     };
 
 
@@ -271,49 +271,49 @@ namespace svx
     class SuggestionEdit : public Edit
     {
     private:
-        SuggestionEdit*     m_pPrev;
-        SuggestionEdit*     m_pNext;
-        ScrollBar&          m_rScrollBar;
+        SuggestionEdit*		m_pPrev;
+        SuggestionEdit*		m_pNext;
+        ScrollBar&			m_rScrollBar;
 
-        bool                ShouldScroll( bool _bUp ) const;
-        void                DoJump( bool _bUp );
+        bool				ShouldScroll( bool _bUp ) const;
+        void				DoJump( bool _bUp );
     public:
                             SuggestionEdit( Window* pParent, const ResId& rResId,
                                     ScrollBar& _rScrollBar,
                                     SuggestionEdit* _pPrev, SuggestionEdit* _pNext );
-        virtual             ~SuggestionEdit();
-        virtual long        PreNotify( NotifyEvent& rNEvt );
+        virtual				~SuggestionEdit();
+        virtual long		PreNotify( NotifyEvent& rNEvt );
     };
 
 
     class HangulHanjaEditDictDialog : public ModalDialog
     {
     private:
-        const String    m_aEditHintText;
-        HHDictList&     m_rDictList;
-        sal_uInt32      m_nCurrentDict;
-
-        String          m_aOriginal;
-        SuggestionList* m_pSuggestions;
-
-        FixedText       m_aBookFT;
-        ListBox         m_aBookLB;
-        FixedText       m_aOriginalFT;
-        ComboBox        m_aOriginalLB;
-        FixedText       m_aSuggestionsFT;
-        SuggestionEdit  m_aEdit1;
-        SuggestionEdit  m_aEdit2;
-        SuggestionEdit  m_aEdit3;
-        SuggestionEdit  m_aEdit4;
-        ScrollBar       m_aScrollSB;
-        PushButton      m_aNewPB;
-        PushButton      m_aDeletePB;
-        HelpButton      m_aHelpPB;
-        CancelButton    m_aClosePB;
-
-        sal_uInt16      m_nTopPos;
+        const String	m_aEditHintText;
+        HHDictList&		m_rDictList;
+        sal_uInt32		m_nCurrentDict;
+
+        String			m_aOriginal;
+        SuggestionList*	m_pSuggestions;
+
+        FixedText		m_aBookFT;
+        ListBox			m_aBookLB;
+        FixedText		m_aOriginalFT;
+        ComboBox		m_aOriginalLB;
+        FixedText		m_aSuggestionsFT;
+        SuggestionEdit	m_aEdit1;
+        SuggestionEdit	m_aEdit2;
+        SuggestionEdit	m_aEdit3;
+        SuggestionEdit	m_aEdit4;
+        ScrollBar		m_aScrollSB;
+        PushButton		m_aNewPB;
+        PushButton		m_aDeletePB;
+        HelpButton		m_aHelpPB;
+        CancelButton	m_aClosePB;
+
+        sal_uInt16		m_nTopPos;
         bool            m_bModifiedSuggestions;
-        bool            m_bModifiedOriginal;
+        bool			m_bModifiedOriginal;
 
         DECL_LINK( OriginalModifyHdl, void* );
         DECL_LINK( ScrollHdl, void* );
@@ -321,31 +321,31 @@ namespace svx
         DECL_LINK( EditModifyHdl2, Edit* );
         DECL_LINK( EditModifyHdl3, Edit* );
         DECL_LINK( EditModifyHdl4, Edit* );
-
+        
         DECL_LINK( BookLBSelectHdl, void* );
         DECL_LINK( NewPBPushHdl, void* );
         DECL_LINK( DeletePBPushHdl, void* );
 
-        void            InitEditDictDialog( sal_uInt32 _nSelDict );
-        void            UpdateOriginalLB( void );
-        void            UpdateSuggestions( void );
+        void			InitEditDictDialog( sal_uInt32 _nSelDict );
+        void			UpdateOriginalLB( void );
+        void			UpdateSuggestions( void );
         void            UpdateButtonStates();
+                        
+        void			SetEditText( Edit& _rEdit, sal_uInt16 _nEntryNum );
+        void			EditModify( Edit* _pEdit, sal_uInt8 _nEntryOffset );
+        void			EditFocusLost( Edit* _pEdit, sal_uInt8 _nEntryOffset );
 
-        void            SetEditText( Edit& _rEdit, sal_uInt16 _nEntryNum );
-        void            EditModify( Edit* _pEdit, sal_uInt8 _nEntryOffset );
-        void            EditFocusLost( Edit* _pEdit, sal_uInt8 _nEntryOffset );
-
-        bool            DeleteEntryFromDictionary( const ::rtl::OUString& rEntry, const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XConversionDictionary >& xDict );
+        bool			DeleteEntryFromDictionary( const ::rtl::OUString& rEntry, const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XConversionDictionary >& xDict );
 
     public:
                         HangulHanjaEditDictDialog( Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict );
                         ~HangulHanjaEditDictDialog();
 
-        void            UpdateScrollbar( void );
+        void			UpdateScrollbar( void );
     };
 
 //.............................................................................
-}   // namespace svx
+}	// namespace svx
 //.............................................................................
 
 #endif // SVX_HANGUL_HANJA_HXX
diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx
index 426bd39e69b4..7ef6d4971820 100644
--- a/cui/source/inc/headertablistbox.hxx
+++ b/cui/source/inc/headertablistbox.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,23 +36,23 @@
 class _HeaderTabListBox : public Control
 {
 private:
-    SvHeaderTabListBox          maListBox;
-    HeaderBar                   maHeaderBar;
+    SvHeaderTabListBox			maListBox;
+    HeaderBar					maHeaderBar;
 protected:
     DECL_LINK( HeaderEndDrag_Impl, HeaderBar* );
-    virtual long                Notify( NotifyEvent& rNEvt );
+    virtual long				Notify( NotifyEvent& rNEvt );
 public:
                                 _HeaderTabListBox( Window* pParent, const ResId& rId );
-    virtual                     ~_HeaderTabListBox();
+    virtual						~_HeaderTabListBox();
 
-    inline SvHeaderTabListBox&  GetListBox( void );
-    inline HeaderBar&           GetHeaderBar( void );
+    inline SvHeaderTabListBox&	GetListBox( void );
+    inline HeaderBar&			GetHeaderBar( void );
 
-    void                        ConnectElements( void );
+    void						ConnectElements( void );
                                     // should be called after all manipulations on elements are done
                                     // calcs real sizes depending on sizes of this
-    void                        Show( BOOL bVisible = TRUE, USHORT nFlags = 0 );    // same meaning as Windows::Show()
-    void                        Enable( bool bEnable = true, bool bChild = true );  // same meaning as Windows::Enable()
+    void						Show( BOOL bVisible = TRUE, USHORT nFlags = 0 );	// same meaning as Windows::Show()
+    void						Enable( bool bEnable = true, bool bChild = true );	// same meaning as Windows::Enable()
 };
 
 inline SvHeaderTabListBox& _HeaderTabListBox::GetListBox( void )
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 6607c5aee4db..5b25f37fdea3 100755
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 // Help-Ids --------------------------------------------------------------
 
-#define HID_OPTIONS_COLOR                           (HID_CUI_START +   1)
-#define HID_OPTIONS_SAVE                            (HID_CUI_START +   2)
-#define HID_OPTIONS_PATH                            (HID_CUI_START +   3)
-#define HID_OPTIONS_GENERAL                         (HID_CUI_START +   4)
-#define HID_OPTIONS_LINGU                           (HID_CUI_START +   5)
-#define HID_OPTIONS_SPELL                           (HID_CUI_START +   6)
-#define HID_OPTIONS_DICT_NEW                        (HID_CUI_START +   7)
-#define HID_OPTIONS_DICT_EDIT                       (HID_CUI_START +   8)
-#define HID_OPTIONS_INET                            (HID_CUI_START +   9)
-#define HID_OPTIONS_CHART_DEFCOLORS                 (HID_CUI_START +  10)
-#define HID_OPTIONS_CTL                             (HID_CUI_START +  11)
-#define HID_OPTIONS_PROXY                           (HID_CUI_START +  12)
-#define HID_OPTIONS_SEARCH                          (HID_CUI_START +  13)
-#define HID_OPTIONS_MAIL                            (HID_CUI_START +  14)
-#define HID_OPTIONS_ASIAN_LAYOUT                    (HID_CUI_START +  15)
+#define HID_OPTIONS_COLOR							(HID_CUI_START +   1)
+#define HID_OPTIONS_SAVE							(HID_CUI_START +   2)
+#define HID_OPTIONS_PATH							(HID_CUI_START +   3)
+#define HID_OPTIONS_GENERAL							(HID_CUI_START +   4)
+#define HID_OPTIONS_LINGU							(HID_CUI_START +   5)
+#define HID_OPTIONS_SPELL							(HID_CUI_START +   6)
+#define HID_OPTIONS_DICT_NEW						(HID_CUI_START +   7)
+#define HID_OPTIONS_DICT_EDIT						(HID_CUI_START +   8)
+#define HID_OPTIONS_INET							(HID_CUI_START +   9)
+#define HID_OPTIONS_CHART_DEFCOLORS             	(HID_CUI_START +  10)
+#define HID_OPTIONS_CTL								(HID_CUI_START +  11)
+#define HID_OPTIONS_PROXY       					(HID_CUI_START +  12)
+#define HID_OPTIONS_SEARCH      					(HID_CUI_START +  13)
+#define HID_OPTIONS_MAIL							(HID_CUI_START +  14)
+#define HID_OPTIONS_ASIAN_LAYOUT                	(HID_CUI_START +  15)
 #define HID_CLB_EDIT_MODULES_DICS                   (HID_CUI_START +  16)
 #define HID_CLB_EDIT_MODULES_MODULES                (HID_CUI_START +  17)
 #define HID_CLB_LINGU_MODULES                       (HID_CUI_START +  18)
@@ -177,37 +177,37 @@
 #define HID_SVX_CONFIG_TOOLBAR                      (HID_CUI_START + 141)
 #define HID_SVX_CONFIG_TOOLBAR_CONTENTS             (HID_CUI_START + 142)
 #define HID_SELECTOR_COMMANDS                       (HID_CUI_START + 143)
-#define HID_GALLERY_EDIT_MSNAME                     (HID_CUI_START + 144)
+#define HID_GALLERY_EDIT_MSNAME						(HID_CUI_START + 144)
 #define HID_SVX_CONFIG_MENU                         (HID_CUI_START + 145)
 #define HID_SVX_CONFIG_MENU_CONTENTS                (HID_CUI_START + 146)
-#define HID_GALLERY_NEWTHEME_FINDFILES              (HID_CUI_START + 147)
-#define HID_GALLERY_NEWTHEME_ADDFILES               (HID_CUI_START + 148)
+#define	HID_GALLERY_NEWTHEME_FINDFILES				(HID_CUI_START + 147)
+#define	HID_GALLERY_NEWTHEME_ADDFILES				(HID_CUI_START + 148)
 #define HID_HANGULDLG_BUTTON_OPTIONS                (HID_CUI_START + 149)
-#define HID_HANGULDLG_BUTTON_CLOSE                  (HID_CUI_START + 150)
-#define HID_HANGULDLG_BUTTON_IGNORE                 (HID_CUI_START + 151)
-#define HID_HANGULDLG_BUTTON_IGNOREALL              (HID_CUI_START + 152)
-#define HID_HANGULDLG_BUTTON_CHANGE                 (HID_CUI_START + 153)
-#define HID_HANGULDLG_BUTTON_CHANGEALL              (HID_CUI_START + 154)
-#define HID_OFA_FONT_SUBSTITUTION                   (HID_CUI_START + 155)
-#define HID_HANGULDLG_EDIT_NEWWORD                  (HID_CUI_START + 156)
-#define HID_OFA_SUBST_APPLY                         (HID_CUI_START + 157)
-#define HID_OFA_SUBST_DELETE                        (HID_CUI_START + 158)
-#define HID_SPLDLG_BUTTON_CLOSE                     (HID_CUI_START + 159)
-#define HID_SPLDLG_BUTTON_IGNORE                    (HID_CUI_START + 160)
-#define HID_SPLDLG_BUTTON_IGNOREALL                 (HID_CUI_START + 161)
+#define HID_HANGULDLG_BUTTON_CLOSE              	(HID_CUI_START + 150)
+#define HID_HANGULDLG_BUTTON_IGNORE             	(HID_CUI_START + 151)
+#define HID_HANGULDLG_BUTTON_IGNOREALL          	(HID_CUI_START + 152)
+#define HID_HANGULDLG_BUTTON_CHANGE             	(HID_CUI_START + 153)
+#define HID_HANGULDLG_BUTTON_CHANGEALL          	(HID_CUI_START + 154)
+#define HID_OFA_FONT_SUBSTITUTION   				(HID_CUI_START + 155)
+#define HID_HANGULDLG_EDIT_NEWWORD              	(HID_CUI_START + 156)
+#define HID_OFA_SUBST_APPLY   						(HID_CUI_START + 157)
+#define HID_OFA_SUBST_DELETE   						(HID_CUI_START + 158)
+#define HID_SPLDLG_BUTTON_CLOSE                 	(HID_CUI_START + 159)
+#define HID_SPLDLG_BUTTON_IGNORE                	(HID_CUI_START + 160)
+#define HID_SPLDLG_BUTTON_IGNOREALL             	(HID_CUI_START + 161)
 #define HID_SPLDLG_BUTTON_CHANGE                    (HID_CUI_START + 162)
-#define HID_SPLDLG_BUTTON_CHANGEALL                 (HID_CUI_START + 163)
-#define HID_SPLDLG_BUTTON_EXPLAIN                   (HID_CUI_START + 164)
-#define HID_CHARMAP_CTL_SHOWSET                     (HID_CUI_START + 165)
-#define HID_CHARMAP_CTL_SHOWTEXT                    (HID_CUI_START + 166)
-#define HID_CHARMAP_CTL_SHOWCHAR                    (HID_CUI_START + 167)
-#define HID_DLG_NAME                                (HID_CUI_START + 168)
-#define HID_DLG_MESSBOX                             (HID_CUI_START + 169)
+#define HID_SPLDLG_BUTTON_CHANGEALL             	(HID_CUI_START + 163)
+#define HID_SPLDLG_BUTTON_EXPLAIN               	(HID_CUI_START + 164)
+#define HID_CHARMAP_CTL_SHOWSET					 	(HID_CUI_START + 165)
+#define HID_CHARMAP_CTL_SHOWTEXT					(HID_CUI_START + 166)
+#define HID_CHARMAP_CTL_SHOWCHAR					(HID_CUI_START + 167)
+#define HID_DLG_NAME								(HID_CUI_START + 168)
+#define HID_DLG_MESSBOX								(HID_CUI_START + 169)
 #define HID_HANGULDLG_SUGGESTIONS                   (HID_CUI_START + 170)
 #define HID_HANGULDLG_SUGGESTIONS_GRID              (HID_CUI_START + 171)
 #define HID_HANGULDLG_SUGGESTIONS_LIST              (HID_CUI_START + 172)
-#define HID_DLG_OBJECT_NAME                         (HID_CUI_START + 173)
-#define HID_DLG_OBJECT_TITLE_DESC                   (HID_CUI_START + 174)
+#define HID_DLG_OBJECT_NAME							(HID_CUI_START + 173)
+#define HID_DLG_OBJECT_TITLE_DESC					(HID_CUI_START + 174)
 #define HID_SVX_CONFIG_MENU_ORGANIZER               (HID_CUI_START + 175)
 #define HID_SVX_CONFIG_ICON_SELECTOR                (HID_CUI_START + 176)
 #define HID_SVX_CONFIG_NAME_SUBMENU                 (HID_CUI_START + 177)
@@ -222,151 +222,151 @@
 #define HID_SVX_MODIFY_TOOLBAR_ITEM                 (HID_CUI_START + 186)
 #define HID_SVX_SAVE_IN                             (HID_CUI_START + 187)
 #define HID_OPTIONS_MULTIPATH_LIST                  (HID_CUI_START + 188)
-#define HID_FM_DLG_SEARCH                           (HID_CUI_START + 189)
-#define HID_SEARCH_TEXT                             (HID_CUI_START + 190)
-#define HID_SEARCH_ALLFIELDS                        (HID_CUI_START + 191)
-#define HID_GALLERY_PROPERTIES_GENERAL              (HID_CUI_START + 192)
-#define HID_SEARCH_FIELDSELECTION                   (HID_CUI_START + 193)
-#define HID_SEARCH_POSITION                         (HID_CUI_START + 194)
-#define HID_SEARCH_FORMATTER                        (HID_CUI_START + 195)
-#define HID_SEARCH_CASE                             (HID_CUI_START + 196)
-#define HID_SEARCH_BACKWARD                         (HID_CUI_START + 197)
-#define HID_SEARCH_STARTOVER                        (HID_CUI_START + 198)
-#define HID_SEARCH_WILDCARD                         (HID_CUI_START + 199)
-#define HID_SEARCH_REGULAR                          (HID_CUI_START + 200)
-#define HID_SEARCH_APPROX                           (HID_CUI_START + 201)
-#define HID_SEARCH_APPROXSETTINGS                   (HID_CUI_START + 202)
-#define HID_SEARCH_BTN_SEARCH                       (HID_CUI_START + 203)
-#define HID_SEARCH_BTN_CLOSE                        (HID_CUI_START + 204)
-#define HID_GALLERY_BROWSER                         (HID_CUI_START + 205)
-#define HID_GALLERY_SEARCH                          (HID_CUI_START + 206)
-#define HID_GALLERY_APPLY                           (HID_CUI_START + 207)
+#define HID_FM_DLG_SEARCH							(HID_CUI_START + 189)
+#define HID_SEARCH_TEXT								(HID_CUI_START + 190)
+#define HID_SEARCH_ALLFIELDS						(HID_CUI_START + 191)
+#define HID_GALLERY_PROPERTIES_GENERAL				(HID_CUI_START + 192)
+#define HID_SEARCH_FIELDSELECTION					(HID_CUI_START + 193)
+#define HID_SEARCH_POSITION							(HID_CUI_START + 194)
+#define HID_SEARCH_FORMATTER						(HID_CUI_START + 195)
+#define HID_SEARCH_CASE								(HID_CUI_START + 196)
+#define HID_SEARCH_BACKWARD							(HID_CUI_START + 197)
+#define HID_SEARCH_STARTOVER						(HID_CUI_START + 198)
+#define HID_SEARCH_WILDCARD							(HID_CUI_START + 199)
+#define HID_SEARCH_REGULAR							(HID_CUI_START + 200)
+#define HID_SEARCH_APPROX							(HID_CUI_START + 201)
+#define HID_SEARCH_APPROXSETTINGS					(HID_CUI_START + 202)
+#define HID_SEARCH_BTN_SEARCH						(HID_CUI_START + 203)
+#define HID_SEARCH_BTN_CLOSE						(HID_CUI_START + 204)
+#define HID_GALLERY_BROWSER							(HID_CUI_START + 205)
+#define HID_GALLERY_SEARCH							(HID_CUI_START + 206)
+#define HID_GALLERY_APPLY							(HID_CUI_START + 207)
 #define HID_SPLDLG_BUTTON_IGNORERULE                (HID_CUI_START + 208)
-#define HID_CONFIG_ACCEL                            (HID_CUI_START + 209)
-#define HID_ACCELCONFIG_LISTBOX                     (HID_CUI_START + 210)
-#define HID_CONFIGGROUP_ACC_LISTBOX                 (HID_CUI_START + 211)
-#define HID_CONFIGFUNCTION_ACC_LISTBOX              (HID_CUI_START + 212)
-#define HID_MACRO_LB_EVENT                          (HID_CUI_START + 213)
-#define HID_MACRO_GROUP                             (HID_CUI_START + 214)
-#define HID_MACRO_MACROS                            (HID_CUI_START + 215)
-#define HID_DIALOG_HANGULHANJA                      (HID_CUI_START + 216)
+#define HID_CONFIG_ACCEL							(HID_CUI_START + 209)
+#define HID_ACCELCONFIG_LISTBOX						(HID_CUI_START + 210)
+#define HID_CONFIGGROUP_ACC_LISTBOX					(HID_CUI_START + 211)
+#define HID_CONFIGFUNCTION_ACC_LISTBOX				(HID_CUI_START + 212)
+#define HID_MACRO_LB_EVENT							(HID_CUI_START + 213)
+#define HID_MACRO_GROUP								(HID_CUI_START + 214)
+#define HID_MACRO_MACROS							(HID_CUI_START + 215)
+#define HID_DIALOG_HANGULHANJA						(HID_CUI_START + 216)
 #define HID_HANGULHANJA_OPT_DLG                     (HID_CUI_START + 217)
 #define HID_HANGULHANJA_NEWDICT_DLG                 (HID_CUI_START + 218)
 #define HID_HANGULHANJA_EDIT_DLG                    (HID_CUI_START + 219)
 #define HID_HANGULHANJA_OPT_DICTS_LB                (HID_CUI_START + 220)
-#define HID_MULTIPATH                               (HID_CUI_START + 221)
-#define HID_SCRIPTORG_DIALOG                        (HID_CUI_START + 222)
+#define HID_MULTIPATH  								(HID_CUI_START + 221)
+#define HID_SCRIPTORG_DIALOG          				(HID_CUI_START + 222)
 #define HID_SCRIPTSBOX                              (HID_CUI_START + 223)
-#define HID_SPELLCHECK                              (HID_CUI_START + 224)
-#define HID_TPSIZE_CTRL                             (HID_CUI_START + 225)
-#define HID_TPROTATION_CTRL1                        (HID_CUI_START + 226)
-#define HID_TPROTATION_CTRL2                        (HID_CUI_START + 227)
-#define HID_TRANS_ANGLE                             (HID_CUI_START + 228)
-#define HID_TPPOSITION_CTRL                         (HID_CUI_START + 229)
-#define HID_NUMBERFORMAT_LB_FORMAT                  (HID_CUI_START + 230)
+#define HID_SPELLCHECK								(HID_CUI_START + 224)
+#define HID_TPSIZE_CTRL 							(HID_CUI_START + 225)
+#define HID_TPROTATION_CTRL1 						(HID_CUI_START + 226)
+#define HID_TPROTATION_CTRL2 						(HID_CUI_START + 227)
+#define HID_TRANS_ANGLE								(HID_CUI_START + 228)
+#define HID_TPPOSITION_CTRL 						(HID_CUI_START + 229)
+#define HID_NUMBERFORMAT_LB_FORMAT					(HID_CUI_START + 230)
 #define HID_NUMBERFORMAT_WND_NUMBER_PREVIEW         (HID_CUI_START + 231)
-#define HID_TRANS_SLANT                             (HID_CUI_START + 232)
-#define HID_TPHATCH_CTRL                            (HID_CUI_START + 233)
-#define HID_SEARCHATTR_CTL_ATTR                     (HID_CUI_START + 234)
-#define HID_NUMBERFORMAT_TBI_INFO                   (HID_CUI_START + 235)
-#define HID_SEARCHATTR                              (HID_CUI_START + 236)
-#define HID_ALIGNMENT_CTR_DIAL                      (HID_CUI_START + 237)
-#define HID_ALIGNMENT_CTR_BORDER_LOCK               (HID_CUI_START + 238)
-#define HID_SEARCHSIMILARITY                        (HID_CUI_START + 239)
-#define UID_SEARCH_RECORDSTATUS                     (HID_CUI_START + 240)
-#define HID_OFAPAGE_AUTOCORR_CLB                    (HID_CUI_START + 241)
-#define HID_AUTOCORR_LANGUAGE                       (HID_CUI_START + 242)
-#define HID_OFAPAGE_AUTOFORMAT_CLB                  (HID_CUI_START + 243)
-#define HID_TPCOLOR_RGB_1                           (HID_CUI_START + 244)
-#define HID_TPCOLOR_RGB_2                           (HID_CUI_START + 245)
-#define HID_TPCOLOR_RGB_3                           (HID_CUI_START + 246)
-#define HID_TPCOLOR_CMYK_1                          (HID_CUI_START + 247)
-#define HID_TPCOLOR_CMYK_2                          (HID_CUI_START + 248)
-#define HID_TPCOLOR_CMYK_3                          (HID_CUI_START + 249)
-#define HID_ALIGNMENT                               (HID_CUI_START + 250)
-#define HID_OFAPAGE_AUTOCORR_OPTIONS                (HID_CUI_START + 251)
-#define HID_OFAPAGE_AUTOFMT_OPTIONS                 (HID_CUI_START + 252)
-#define HID_OFAPAGE_AUTOCORR_REPLACE                (HID_CUI_START + 253)
-#define HID_OFACTL_AUTOCORR_REPLACE                 (HID_CUI_START + 254)
-#define HID_OFAPAGE_AUTOCORR_EXCEPT                 (HID_CUI_START + 255)
-#define HID_OFAPAGE_AUTOCORR_QUOTE                  (HID_CUI_START + 256)
-#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS            (HID_CUI_START + 257)
-#define HID_BACKGROUND                              (HID_CUI_START + 258)
-#define HID_BACKGROUND_CTL_BGDCOLORSET              (HID_CUI_START + 259)
-#define HID_BACKGROUND_CTL_POSITION                 (HID_CUI_START + 260)
-#define HID_BORDER                                  (HID_CUI_START + 261)
-#define HID_BORDER_CTL_PRESETS                      (HID_CUI_START + 262)
-#define HID_BORDER_CTL_SHADOWS                      (HID_CUI_START + 263)
-#define HID_PAGE_CONNECTION                         (HID_CUI_START + 264)
-#define HID_PAGE_CONNECTION_CTL_PREVIEW             (HID_CUI_START + 265)
-#define HID_PAGE_DISTRIBUTE                         (HID_CUI_START + 266)
-#define HID_SVXPAGE_GRFCROP                         (HID_CUI_START + 267)
-#define HID_CAPTION                                 (HID_CUI_START + 268)
-#define HID_CAPTION_CTL_TYPE                        (HID_CUI_START + 269)
-#define HID_PAGE_MEASURE                            (HID_CUI_START + 270)
-#define HID_MEASURE_CTL_POSITION                    (HID_CUI_START + 271)
-#define HID_NUMBERFORMAT                            (HID_CUI_START + 272)
-#define HID_NUMBERFORMAT_TBI_ADD                    (HID_CUI_START + 273)
-#define HID_NUMBERFORMAT_TBI_REMOVE                 (HID_CUI_START + 274)
-#define HID_FORMAT_PAGE                             (HID_CUI_START + 275)
-#define HID_REDLINING_DLG                           (HID_CUI_START + 276)
-#define HID_REDLINING_EDIT                          (HID_CUI_START + 277)
-#define HID_REDLINING_PREV                          (HID_CUI_START + 278)
-#define HID_REDLINING_NEXT                          (HID_CUI_START + 279)
-#define HID_FORMAT_PARAGRAPH_STD                    (HID_CUI_START + 280)
-#define HID_VALUESET_SINGLENUM                      (HID_CUI_START + 281)
-#define HID_VALUESET_BULLET                         (HID_CUI_START + 282)
-#define HID_VALUESET_NUM                            (HID_CUI_START + 283)
-#define HID_VALUESET_NUMBMP                         (HID_CUI_START + 284)
-#define HID_SVXPAGE_PICK_NUM                        (HID_CUI_START + 285)
-#define HID_SVXPAGE_PICK_SINGLE_NUM                 (HID_CUI_START + 286)
-#define HID_SVXPAGE_PICK_BMP                        (HID_CUI_START + 287)
-#define HID_SVXPAGE_PICK_BULLET                     (HID_CUI_START + 288)
-#define HID_SVXPAGE_NUM_OPTIONS                     (HID_CUI_START + 289)
-#define HID_SVXPAGE_NUM_POSITION                    (HID_CUI_START + 290)
-#define HID_MEASURE_CTL_PREVIEW                     (HID_CUI_START + 291)
-#define HID_FORMAT_PARAGRAPH_EXT                    (HID_CUI_START + 292)
-#define HID_FORMAT_PARAGRAPH_ALIGN                  (HID_CUI_START + 293)
-#define HID_SVXPAGE_PARA_ASIAN                      (HID_CUI_START + 294)
+#define HID_TRANS_SLANT								(HID_CUI_START + 232)
+#define HID_TPHATCH_CTRL							(HID_CUI_START + 233)
+#define HID_SEARCHATTR_CTL_ATTR						(HID_CUI_START + 234)
+#define HID_NUMBERFORMAT_TBI_INFO					(HID_CUI_START + 235)
+#define HID_SEARCHATTR								(HID_CUI_START + 236)
+#define HID_ALIGNMENT_CTR_DIAL						(HID_CUI_START + 237)
+#define HID_ALIGNMENT_CTR_BORDER_LOCK				(HID_CUI_START + 238)
+#define HID_SEARCHSIMILARITY						(HID_CUI_START + 239)
+#define UID_SEARCH_RECORDSTATUS						(HID_CUI_START + 240)
+#define HID_OFAPAGE_AUTOCORR_CLB					(HID_CUI_START + 241)
+#define HID_AUTOCORR_LANGUAGE						(HID_CUI_START + 242)
+#define HID_OFAPAGE_AUTOFORMAT_CLB					(HID_CUI_START + 243)
+#define HID_TPCOLOR_RGB_1     						(HID_CUI_START + 244)
+#define HID_TPCOLOR_RGB_2     						(HID_CUI_START + 245)
+#define HID_TPCOLOR_RGB_3     						(HID_CUI_START + 246)
+#define HID_TPCOLOR_CMYK_1    						(HID_CUI_START + 247)
+#define HID_TPCOLOR_CMYK_2    						(HID_CUI_START + 248)
+#define HID_TPCOLOR_CMYK_3    						(HID_CUI_START + 249)
+#define HID_ALIGNMENT								(HID_CUI_START + 250)
+#define HID_OFAPAGE_AUTOCORR_OPTIONS    			(HID_CUI_START + 251)
+#define HID_OFAPAGE_AUTOFMT_OPTIONS					(HID_CUI_START + 252)
+#define HID_OFAPAGE_AUTOCORR_REPLACE    			(HID_CUI_START + 253)
+#define HID_OFACTL_AUTOCORR_REPLACE					(HID_CUI_START + 254)
+#define HID_OFAPAGE_AUTOCORR_EXCEPT     			(HID_CUI_START + 255)
+#define HID_OFAPAGE_AUTOCORR_QUOTE      			(HID_CUI_START + 256)
+#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS			(HID_CUI_START + 257)
+#define HID_BACKGROUND								(HID_CUI_START + 258)
+#define HID_BACKGROUND_CTL_BGDCOLORSET				(HID_CUI_START + 259)
+#define HID_BACKGROUND_CTL_POSITION					(HID_CUI_START + 260)
+#define HID_BORDER									(HID_CUI_START + 261)
+#define HID_BORDER_CTL_PRESETS						(HID_CUI_START + 262)
+#define HID_BORDER_CTL_SHADOWS						(HID_CUI_START + 263)
+#define HID_PAGE_CONNECTION 						(HID_CUI_START + 264)
+#define HID_PAGE_CONNECTION_CTL_PREVIEW				(HID_CUI_START + 265)
+#define HID_PAGE_DISTRIBUTE							(HID_CUI_START + 266)
+#define HID_SVXPAGE_GRFCROP							(HID_CUI_START + 267)
+#define HID_CAPTION									(HID_CUI_START + 268)
+#define HID_CAPTION_CTL_TYPE						(HID_CUI_START + 269)
+#define HID_PAGE_MEASURE							(HID_CUI_START + 270)
+#define HID_MEASURE_CTL_POSITION					(HID_CUI_START + 271)
+#define HID_NUMBERFORMAT							(HID_CUI_START + 272)
+#define HID_NUMBERFORMAT_TBI_ADD   					(HID_CUI_START + 273)
+#define HID_NUMBERFORMAT_TBI_REMOVE					(HID_CUI_START + 274)
+#define HID_FORMAT_PAGE								(HID_CUI_START + 275)
+#define HID_REDLINING_DLG							(HID_CUI_START + 276)
+#define HID_REDLINING_EDIT							(HID_CUI_START + 277)
+#define HID_REDLINING_PREV							(HID_CUI_START + 278)
+#define HID_REDLINING_NEXT							(HID_CUI_START + 279)
+#define HID_FORMAT_PARAGRAPH_STD					(HID_CUI_START + 280)
+#define HID_VALUESET_SINGLENUM						(HID_CUI_START + 281)
+#define HID_VALUESET_BULLET                     	(HID_CUI_START + 282)
+#define HID_VALUESET_NUM                        	(HID_CUI_START + 283)
+#define HID_VALUESET_NUMBMP                     	(HID_CUI_START + 284)
+#define HID_SVXPAGE_PICK_NUM                    	(HID_CUI_START + 285)
+#define HID_SVXPAGE_PICK_SINGLE_NUM             	(HID_CUI_START + 286)
+#define HID_SVXPAGE_PICK_BMP                    	(HID_CUI_START + 287)
+#define HID_SVXPAGE_PICK_BULLET                 	(HID_CUI_START + 288)
+#define HID_SVXPAGE_NUM_OPTIONS                 	(HID_CUI_START + 289)
+#define HID_SVXPAGE_NUM_POSITION                	(HID_CUI_START + 290)
+#define HID_MEASURE_CTL_PREVIEW						(HID_CUI_START + 291)
+#define HID_FORMAT_PARAGRAPH_EXT					(HID_CUI_START + 292)
+#define HID_FORMAT_PARAGRAPH_ALIGN					(HID_CUI_START + 293)
+#define HID_SVXPAGE_PARA_ASIAN                  	(HID_CUI_START + 294)
 #define HID_SVXPAGE_SWPOSSIZE                       (HID_CUI_START + 295)
-#define HID_AREA_TRANSPARENCE                       (HID_CUI_START + 296)
-#define HID_AREA_AREA                               (HID_CUI_START + 297)
-#define HID_AREA_SHADOW                             (HID_CUI_START + 298)
-#define HID_AREA_HATCH                              (HID_CUI_START + 299)
-#define HID_AREA_BITMAP                             (HID_CUI_START + 300)
-#define HID_TPSHADOW_CTRL                           (HID_CUI_START + 301)
-#define HID_AREA_GRADIENT                           (HID_CUI_START + 302)
-#define HID_LINE_ENDDEF                             (HID_CUI_START + 303)
-#define HID_LINE_LINE                               (HID_CUI_START + 304)
-#define HID_LINE_DEF                                (HID_CUI_START + 305)
-#define HID_SPELLDLG_SETWORD                        (HID_CUI_START + 306)
-#define HID_TABULATOR                               (HID_CUI_START + 307)
-#define HID_PAGE_TEXTATTR                           (HID_CUI_START + 308)
-#define HID_TEXTATTR_CTL_POSITION                   (HID_CUI_START + 309)
-#define HID_TRANS_POSITION_SIZE                     (HID_CUI_START + 310)
+#define HID_AREA_TRANSPARENCE						(HID_CUI_START + 296)
+#define HID_AREA_AREA								(HID_CUI_START + 297)
+#define HID_AREA_SHADOW 							(HID_CUI_START + 298)
+#define HID_AREA_HATCH								(HID_CUI_START + 299)
+#define HID_AREA_BITMAP	 							(HID_CUI_START + 300)
+#define HID_TPSHADOW_CTRL   						(HID_CUI_START + 301)
+#define HID_AREA_GRADIENT							(HID_CUI_START + 302)
+#define HID_LINE_ENDDEF								(HID_CUI_START + 303)
+#define HID_LINE_LINE								(HID_CUI_START + 304)
+#define HID_LINE_DEF								(HID_CUI_START + 305)
+#define HID_SPELLDLG_SETWORD						(HID_CUI_START + 306)
+#define HID_TABULATOR								(HID_CUI_START + 307)
+#define HID_PAGE_TEXTATTR							(HID_CUI_START + 308)
+#define HID_TEXTATTR_CTL_POSITION					(HID_CUI_START + 309)
+#define HID_TRANS_POSITION_SIZE     	            (HID_CUI_START + 310)
 #define HID_HYPHENATE                               (HID_CUI_START + 311)
-#define HID_SVXPAGE_CHAR_NAME                       (HID_CUI_START + 312)
-#define HID_SVXPAGE_CHAR_EFFECTS                    (HID_CUI_START + 313)
-#define HID_SVXPAGE_CHAR_POSITION                   (HID_CUI_START + 314)
-#define HID_HYPERLINK_INTERNET                      (HID_CUI_START + 315)
-#define HID_HYPERLINK_MAIL                          (HID_CUI_START + 316)
-#define HID_HYPERLINK_DOCUMENT                      (HID_CUI_START + 317)
-#define HID_HYPERLINK_NEWDOCUMENT                   (HID_CUI_START + 318)
-#define HID_HYPERLINK_MARKWND                       (HID_CUI_START + 319)
-#define HID_ICCDIALOG_RESET_BTN                     (HID_CUI_START + 320)
-#define HID_ICCDIALOG_CHOICECTRL                    (HID_CUI_START + 321)
-#define HID_HYPERDLG_INET_PATH                      (HID_CUI_START + 322)
-#define HID_HYPERDLG_MAIL_PATH                      (HID_CUI_START + 323)
-#define HID_HYPERDLG_DOC_PATH                       (HID_CUI_START + 324)
-#define HID_ICCDIALOG_OK_BTN                        (HID_CUI_START + 325)
-#define HID_ICCDIALOG_CANCEL_BTN                    (HID_CUI_START + 326)
-#define HID_HYPERLINK_MARKWND_APPLY                 (HID_CUI_START + 327)
-#define HID_HYPERLINK_MARKWND_CLOSE                 (HID_CUI_START + 328)
-#define HID_HYPERLINK_MARKWND_TREE                  (HID_CUI_START + 329)
-#define HID_SVXPAGE_CHAR_TWOLINES                   (HID_CUI_START + 330)
-#define HID_GRFFILTER_EMBOSS_LIGHT                  (HID_CUI_START + 331)
-#define HID_PASTE_DLG                               (HID_CUI_START + 333)
-#define HID_LINKDLG_TABLB                           (HID_CUI_START + 334)
+#define HID_SVXPAGE_CHAR_NAME						(HID_CUI_START + 312)
+#define HID_SVXPAGE_CHAR_EFFECTS					(HID_CUI_START + 313)
+#define HID_SVXPAGE_CHAR_POSITION					(HID_CUI_START + 314)
+#define HID_HYPERLINK_INTERNET						(HID_CUI_START + 315)
+#define HID_HYPERLINK_MAIL							(HID_CUI_START + 316)
+#define HID_HYPERLINK_DOCUMENT						(HID_CUI_START + 317)
+#define HID_HYPERLINK_NEWDOCUMENT					(HID_CUI_START + 318)
+#define HID_HYPERLINK_MARKWND						(HID_CUI_START + 319)
+#define HID_ICCDIALOG_RESET_BTN						(HID_CUI_START + 320)
+#define HID_ICCDIALOG_CHOICECTRL					(HID_CUI_START + 321)
+#define HID_HYPERDLG_INET_PATH						(HID_CUI_START + 322)
+#define HID_HYPERDLG_MAIL_PATH						(HID_CUI_START + 323)
+#define HID_HYPERDLG_DOC_PATH						(HID_CUI_START + 324)
+#define HID_ICCDIALOG_OK_BTN						(HID_CUI_START + 325)
+#define HID_ICCDIALOG_CANCEL_BTN					(HID_CUI_START + 326)
+#define HID_HYPERLINK_MARKWND_APPLY					(HID_CUI_START + 327)
+#define HID_HYPERLINK_MARKWND_CLOSE					(HID_CUI_START + 328)
+#define HID_HYPERLINK_MARKWND_TREE					(HID_CUI_START + 329)
+#define HID_SVXPAGE_CHAR_TWOLINES					(HID_CUI_START + 330)
+#define HID_GRFFILTER_EMBOSS_LIGHT					(HID_CUI_START + 331)
+#define HID_PASTE_DLG								(HID_CUI_START + 333)
+#define HID_LINKDLG_TABLB							(HID_CUI_START + 334)
 #define HID_MACRO_HEADERTABLISTBOX                  (HID_CUI_START + 335)
 #define HID_GALLERY_ENTER_TITLE                     (HID_CUI_START + 336)
 #define HID_GALLERY_TITLE_EDIT                      (HID_CUI_START + 337)
diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx
index 0bd7309fd953..4501a602e5d5 100644
--- a/cui/source/inc/hldocntp.hxx
+++ b/cui/source/inc/hldocntp.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 class SvxHyperlinkNewDocTp : public SvxHyperlinkTabPageBase
 {
 private:
-    FixedLine           maGrpNewDoc;
-    RadioButton         maRbtEditNow;
-    RadioButton         maRbtEditLater;
-    FixedText           maFtPath;
-    SvxHyperURLBox      maCbbPath;
-    ImageButton         maBtCreate;
-    FixedText           maFtDocTypes;
-    ListBox             maLbDocTypes;
+    FixedLine			maGrpNewDoc;
+    RadioButton			maRbtEditNow;
+    RadioButton			maRbtEditLater;
+    FixedText			maFtPath;
+    SvxHyperURLBox		maCbbPath;
+    ImageButton			maBtCreate;
+    FixedText			maFtDocTypes;
+    ListBox				maLbDocTypes;
 
     sal_Bool            ImplGetURLObject( const String& rPath, const String& rBase, INetURLObject& aURLObject ) const;
-    void                FillDocumentList ();
+    void				FillDocumentList ();
 
-    DECL_LINK (ClickNewHdl_Impl          , void * );        // Button : New
+    DECL_LINK (ClickNewHdl_Impl			 , void * );		// Button : New
 
     Image GetImage( USHORT nId );
     void ReadURLFile( const String& rFile, String& rTitle, String& rURL, sal_Int32& rIconId, BOOL* pShowAsFolder);//, String* pFrame, String* pOpenAs, String* pDefTempl, String* pDefURL );
@@ -59,8 +59,8 @@ private:
 
 protected:
     void FillDlgFields     ( String& aStrURL );
-    void GetCurentItemData ( String& aStrURL, String& aStrName,
-                             String& aStrIntName, String& aStrFrame,
+    void GetCurentItemData ( String& aStrURL, String& aStrName, 
+                             String& aStrIntName, String& aStrFrame, 
                              SvxLinkInsertMode& eMode );
 
 public:
@@ -69,10 +69,10 @@ public:
 
     static  IconChoicePage* Create( Window* pWindow, const SfxItemSet& rItemSet );
 
-    virtual BOOL        AskApply ();
-    virtual void        DoApply ();
+    virtual BOOL		AskApply ();
+    virtual void		DoApply ();
 
-    virtual void        SetInitFocus();
+    virtual void		SetInitFocus();
 };
 
 
diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx
index a8e3df5e3a2d..3f657aab474b 100644
--- a/cui/source/inc/hldoctp.hxx
+++ b/cui/source/inc/hldoctp.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,45 +39,45 @@
 class SvxHyperlinkDocTp : public SvxHyperlinkTabPageBase
 {
 private:
-    FixedLine           maGrpDocument;
-    FixedText           maFtPath;
-    SvxHyperURLBox      maCbbPath;
-    ImageButton         maBtFileopen;
+    FixedLine			maGrpDocument;
+    FixedText			maFtPath;
+    SvxHyperURLBox		maCbbPath;
+    ImageButton			maBtFileopen;
 
-    FixedLine           maGrpTarget;
-    FixedText           maFtTarget;
-    Edit                maEdTarget;
-    FixedText           maFtURL;
-    FixedText           maFtFullURL;
-    ImageButton         maBtBrowse;
+    FixedLine			maGrpTarget;
+    FixedText			maFtTarget;
+    Edit				maEdTarget;
+    FixedText			maFtURL;
+    FixedText			maFtFullURL;
+    ImageButton			maBtBrowse;
 
-    String              maStrURL;
+    String				maStrURL;
 
-    BOOL                mbMarkWndOpen;
+    BOOL				mbMarkWndOpen;
 
-    DECL_LINK (ClickFileopenHdl_Impl  , void * );       // Button : Fileopen
-    DECL_LINK (ClickTargetHdl_Impl    , void * );       // Button : Target
+    DECL_LINK (ClickFileopenHdl_Impl  , void * );		// Button : Fileopen
+    DECL_LINK (ClickTargetHdl_Impl    , void * );		// Button : Target
 
-    DECL_LINK (ModifiedPathHdl_Impl  , void * );        // Contens of combobox "Path" modified
-    DECL_LINK (ModifiedTargetHdl_Impl, void * );        // Contens of editfield "Target" modified
+    DECL_LINK (ModifiedPathHdl_Impl	 , void * );		// Contens of combobox "Path" modified
+    DECL_LINK (ModifiedTargetHdl_Impl, void * );		// Contens of editfield "Target" modified
 
-    DECL_LINK (LostFocusPathHdl_Impl,  void * );        // Combobox "path" lost its focus
+    DECL_LINK (LostFocusPathHdl_Impl,  void * );		// Combobox "path" lost its focus
 
-    DECL_LINK (TimeoutHdl_Impl      ,  Timer * );       // Handler for timer -timeout
+    DECL_LINK (TimeoutHdl_Impl      ,  Timer * );		// Handler for timer -timeout
 
-    enum EPathType { Type_Unknown, Type_Invalid,
-                     Type_ExistsFile, Type_File,
+    enum EPathType { Type_Unknown, Type_Invalid, 
+                     Type_ExistsFile, Type_File, 
                      Type_ExistsDir, Type_Dir };
     EPathType GetPathType ( String& aStrPath );
 
 protected:
     void FillDlgFields     ( String& aStrURL );
-    void GetCurentItemData ( String& aStrURL, String& aStrName,
-                             String& aStrIntName, String& aStrFrame,
+    void GetCurentItemData ( String& aStrURL, String& aStrName, 
+                             String& aStrIntName, String& aStrFrame, 
                              SvxLinkInsertMode& eMode );
     virtual BOOL   ShouldOpenMarkWnd () {return mbMarkWndOpen;}
     virtual void   SetMarkWndShouldOpen (BOOL bOpen) {mbMarkWndOpen=bOpen;}
-    String GetCurrentURL    ();
+    String GetCurrentURL 	();
 
 public:
     SvxHyperlinkDocTp ( Window *pParent, const SfxItemSet& rItemSet);
@@ -85,9 +85,9 @@ public:
 
     static  IconChoicePage* Create( Window* pWindow, const SfxItemSet& rItemSet );
 
-    virtual void        SetMarkStr ( String& aStrMark );
+    virtual void		SetMarkStr ( String& aStrMark );
 
-    virtual void        SetInitFocus();
+    virtual void		SetInitFocus();
 };
 
 
diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx
index ae784cd339ad..01c474e60c0b 100644
--- a/cui/source/inc/hlinettp.hxx
+++ b/cui/source/inc/hlinettp.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,36 +41,36 @@
 class SvxHyperlinkInternetTp : public SvxHyperlinkTabPageBase
 {
 private:
-    FixedLine           maGrpLinkTyp;
+    FixedLine			maGrpLinkTyp;
     RadioButton         maRbtLinktypInternet;
     RadioButton         maRbtLinktypFTP;
     RadioButton         maRbtLinktypTelnet;
     FixedText           maFtTarget;
-    SvxHyperURLBox      maCbbTarget;
-    FixedText           maFtLogin;
-    Edit                maEdLogin;
-    FixedText           maFtPassword;
-    Edit                maEdPassword;
-    CheckBox            maCbAnonymous;
-    ImageButton         maBtBrowse;
-    ImageButton         maBtTarget;
+    SvxHyperURLBox		maCbbTarget;
+    FixedText			maFtLogin;
+    Edit				maEdLogin;
+    FixedText			maFtPassword;
+    Edit				maEdPassword;
+    CheckBox			maCbAnonymous;
+    ImageButton			maBtBrowse;
+    ImageButton			maBtTarget;
 
-    String              maStrOldUser;
-    String              maStrOldPassword;
+    String				maStrOldUser;
+    String				maStrOldPassword;
 
-    BOOL                mbMarkWndOpen;
+    BOOL				mbMarkWndOpen;
 
-    String              maStrStdDocURL;
+    String				maStrStdDocURL;
 
-    DECL_LINK (Click_SmartProtocol_Impl  , void * );        // Radiobutton clicked: Type Internet, FTP or Telnet
-    DECL_LINK (ClickAnonymousHdl_Impl    , void * );        // Checkbox : Anonymer Benutzer
-    DECL_LINK (ClickBrowseHdl_Impl       , void * );        // Button : Browse
-    DECL_LINK (ClickTargetHdl_Impl       , void * );        // Button : Ziel
-    DECL_LINK (ModifiedLoginHdl_Impl     , void * );        // Contens of editfield "Login" modified
-    DECL_LINK (LostFocusTargetHdl_Impl   , void * );        // Combobox "Target" lost its focus
-    DECL_LINK (ModifiedTargetHdl_Impl    , void * );        // Contens of editfield "Target" modified
+    DECL_LINK (Click_SmartProtocol_Impl  , void * );	    // Radiobutton clicked: Type Internet, FTP or Telnet
+    DECL_LINK (ClickAnonymousHdl_Impl    , void * );		// Checkbox : Anonymer Benutzer
+    DECL_LINK (ClickBrowseHdl_Impl       , void * );		// Button : Browse
+    DECL_LINK (ClickTargetHdl_Impl       , void * );		// Button : Ziel
+    DECL_LINK (ModifiedLoginHdl_Impl     , void * );		// Contens of editfield "Login" modified
+    DECL_LINK (LostFocusTargetHdl_Impl   , void * );		// Combobox "Target" lost its focus
+    DECL_LINK (ModifiedTargetHdl_Impl    , void * );		// Contens of editfield "Target" modified
 
-    DECL_LINK (TimeoutHdl_Impl           , Timer * );       // Handler for timer -timeout
+    DECL_LINK (TimeoutHdl_Impl           , Timer * );		// Handler for timer -timeout
 
 
     void    SetScheme( const String& aScheme );
@@ -85,9 +85,9 @@ private:
     void   RefreshMarkWindow();
 
 protected:
-    virtual void FillDlgFields     ( String& aStrURL );
-    virtual void GetCurentItemData ( String& aStrURL, String& aStrName,
-                                     String& aStrIntName, String& aStrFrame,
+    virtual void FillDlgFields	   ( String& aStrURL );
+    virtual void GetCurentItemData ( String& aStrURL, String& aStrName, 
+                                     String& aStrIntName, String& aStrFrame, 
                                      SvxLinkInsertMode& eMode );
     virtual BOOL ShouldOpenMarkWnd () {return ( mbMarkWndOpen && maRbtLinktypInternet.IsChecked() );}
     virtual void SetMarkWndShouldOpen (BOOL bOpen) {mbMarkWndOpen=bOpen;}
@@ -98,10 +98,10 @@ public:
 
     static  IconChoicePage* Create( Window* pWindow, const SfxItemSet& rItemSet );
 
-    virtual void        SetMarkStr ( String& aStrMark );
-    virtual void        SetOnlineMode( BOOL bEnable );
+    virtual void		SetMarkStr ( String& aStrMark );
+    virtual void		SetOnlineMode( BOOL bEnable );
 
-    virtual void        SetInitFocus();
+    virtual void		SetInitFocus();
 };
 
 
diff --git a/cui/source/inc/hlmailtp.hxx b/cui/source/inc/hlmailtp.hxx
index a7bc2fe012f3..ea0bda235b83 100644
--- a/cui/source/inc/hlmailtp.hxx
+++ b/cui/source/inc/hlmailtp.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,18 +39,18 @@
 class SvxHyperlinkMailTp : public SvxHyperlinkTabPageBase
 {
 private:
-    FixedLine           maGrpMailNews;
-    RadioButton         maRbtMail;
-    RadioButton         maRbtNews;
-    FixedText           maFtReceiver;
-    SvxHyperURLBox      maCbbReceiver;
-    ImageButton         maBtAdrBook;
-    FixedText           maFtSubject;
-    Edit                maEdSubject;
+    FixedLine			maGrpMailNews;
+    RadioButton			maRbtMail;
+    RadioButton			maRbtNews;
+    FixedText			maFtReceiver;
+    SvxHyperURLBox		maCbbReceiver;
+    ImageButton			maBtAdrBook;
+    FixedText			maFtSubject;
+    Edit				maEdSubject;
 
-    DECL_LINK (Click_SmartProtocol_Impl, void * );      // Radiobutton clicked: Type EMAIl or News
-    DECL_LINK (ClickAdrBookHdl_Impl  , void * );        // Button : Address book
-    DECL_LINK (ModifiedReceiverHdl_Impl, void * );      // Combobox "receiver" modified
+    DECL_LINK (Click_SmartProtocol_Impl, void * );		// Radiobutton clicked: Type EMAIl or News
+    DECL_LINK (ClickAdrBookHdl_Impl  , void * );		// Button : Address book
+    DECL_LINK (ModifiedReceiverHdl_Impl, void * );		// Combobox "receiver" modified
 
     void    SetScheme( const String& aScheme );
     void    RemoveImproperProtocol(const String& aProperScheme);
@@ -61,8 +61,8 @@ private:
 
 protected:
     virtual void FillDlgFields     ( String& aStrURL );
-    virtual void GetCurentItemData ( String& aStrURL, String& aStrName,
-                                     String& aStrIntName, String& aStrFrame,
+    virtual void GetCurentItemData ( String& aStrURL, String& aStrName, 
+                                     String& aStrIntName, String& aStrFrame, 
                                      SvxLinkInsertMode& eMode );
 
 public:
@@ -71,7 +71,7 @@ public:
 
     static  IconChoicePage* Create( Window* pWindow, const SfxItemSet& rItemSet );
 
-    virtual void        SetInitFocus();
+    virtual void		SetInitFocus();
 };
 
 
diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx
index 024637e77991..f3f1156aba74 100644
--- a/cui/source/inc/hlmarkwn.hxx
+++ b/cui/source/inc/hlmarkwn.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include <vcl/button.hxx>
 #include <svtools/svtreebx.hxx>
 
-#include "hlmarkwn_def.hxx" //ADD CHINA001
+#include "hlmarkwn_def.hxx" //ADD CHINA001 
 class SvxHyperlinkTabPageBase;
 
 //########################################################################
 //#                                                                      #
-//# Tree-Window                                                          #
+//# Tree-Window 														 #
 //#                                                                      #
 //########################################################################
 
@@ -58,7 +58,7 @@ public:
 
 //########################################################################
 //#                                                                      #
-//# Window-Class                                                         #
+//# Window-Class														 #
 //#                                                                      #
 //########################################################################
 
@@ -67,19 +67,19 @@ class SvxHlinkDlgMarkWnd : public ModalDialog //FloatingWindow
 private:
     friend class SvxHlmarkTreeLBox;
 
-    PushButton      maBtApply;
-    PushButton      maBtClose;
-    //SvTreeListBox maLbTree;
+    PushButton		maBtApply;
+    PushButton		maBtClose;
+    //SvTreeListBox	maLbTree;
     SvxHlmarkTreeLBox maLbTree;
 
-    BOOL            mbUserMoved;
-    BOOL            mbFirst;
+    BOOL			mbUserMoved;
+    BOOL			mbFirst;
 
     SvxHyperlinkTabPageBase* mpParent;
 
-    String          maStrLastURL;
+    String			maStrLastURL;
 
-    USHORT          mnError;
+    USHORT			mnError;
 
 protected:
     BOOL RefreshFromDoc( ::rtl::OUString aURL );
@@ -107,6 +107,6 @@ public:
 };
 
 
-#endif  // _SVX_BKWND_HYPERLINK_HXX
+#endif	// _SVX_BKWND_HYPERLINK_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/hlmarkwn_def.hxx b/cui/source/inc/hlmarkwn_def.hxx
index b6de42439f3b..f44e6c12ffb4 100644
--- a/cui/source/inc/hlmarkwn_def.hxx
+++ b/cui/source/inc/hlmarkwn_def.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 _SVX_BKWND_HYPERLINK_DEF_HXX
 #define _SVX_BKWND_HYPERLINK_DEF_HXX
 
-#define LERR_NOERROR        0
-#define LERR_NOENTRIES      1
-#define LERR_DOCNOTOPEN     2
+#define LERR_NOERROR		0
+#define LERR_NOENTRIES		1
+#define LERR_DOCNOTOPEN		2
 
 #endif
 
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index f93f5f346c9e..be491bf041e7 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 _SVX_TABBASE_HYPERLINK_HXX
 #define _SVX_TABBASE_HYPERLINK_HXX
 
-#define INET_TELNET_SCHEME      "telnet://"
+#define INET_TELNET_SCHEME		"telnet://"
 
 #include <sfx2/app.hxx>
 #include <sfx2/tabdlg.hxx>
@@ -83,7 +83,7 @@ class SvxHyperURLBox : public SvtURLBox, public DropTargetHelper
 private:
     BOOL   mbAccessAddress;
 
-//  String GetAllEmailNamesFromDragItem( USHORT nItem );
+//	String GetAllEmailNamesFromDragItem( USHORT nItem );
 
 protected:
 
@@ -110,15 +110,15 @@ class SvxHyperlinkTabPageBase : public IconChoicePage
 {
 private:
     FixedLine           *mpGrpMore;
-    FixedText           *mpFtFrame;
-    SvxFramesComboBox   *mpCbbFrame;
-    FixedText           *mpFtForm;
-    ListBox             *mpLbForm;
-    FixedText           *mpFtIndication;
-    Edit                *mpEdIndication;
-    FixedText           *mpFtText;
-    Edit                *mpEdText;
-    ImageButton         *mpBtScript;
+    FixedText			*mpFtFrame;
+    SvxFramesComboBox	*mpCbbFrame;
+    FixedText			*mpFtForm;
+    ListBox				*mpLbForm;
+    FixedText			*mpFtIndication;
+    Edit				*mpEdIndication;
+    FixedText			*mpFtText;
+    Edit				*mpEdText;
+    ImageButton			*mpBtScript;
 
     sal_Bool            mbIsCloseDisabled;
 
@@ -126,13 +126,13 @@ private:
                         mxDocumentFrame;
 
 protected:
-    Window*             mpDialog;
+    Window*				mpDialog;
 
-    BOOL                mbStdControlsInit;
+    BOOL				mbStdControlsInit;
 
-    String              maStrInitURL;
+    String				maStrInitURL;
 
-    Timer               maTimer;
+    Timer				maTimer;
 
     SvxHlinkDlgMarkWnd* mpMarkWnd;
 
@@ -144,15 +144,15 @@ protected:
                                          SvxLinkInsertMode& eMode ) = 0;
     virtual String CreateUiNameFromURL( const String& aStrURL );
 
-    void         GetDataFromCommonFields( String& aStrName,
+    void		 GetDataFromCommonFields( String& aStrName,
                                           String& aStrIntName, String& aStrFrame,
                                           SvxLinkInsertMode& eMode );
 
-    DECL_LINK (ClickScriptHdl_Impl, void * );       // Button : Script
+    DECL_LINK (ClickScriptHdl_Impl, void * );		// Button : Script
 
-    String              aEmptyStr;
+    String				aEmptyStr;
 
-    BOOL            FileExists( const INetURLObject& rURL );
+    BOOL			FileExists( const INetURLObject& rURL );
     static String   GetSchemeFromURL( String aStrURL );
 
     inline void     DisableClose( sal_Bool _bDisable ) { mbIsCloseDisabled = _bDisable; }
@@ -179,10 +179,10 @@ public:
     virtual void Reset( const SfxItemSet& );
     virtual BOOL FillItemSet( SfxItemSet& );
     virtual void ActivatePage( const SfxItemSet& rItemSet );
-    virtual int  DeactivatePage( SfxItemSet* pSet = 0 );
+    virtual int	 DeactivatePage( SfxItemSet* pSet = 0 );
 
     BOOL IsMarkWndVisible ()      { return ((Window*)mpMarkWnd)->IsVisible(); }
-    Size GetSizeExtraWnd ()       { return ( mpMarkWnd->GetSizePixel() ); }
+    Size GetSizeExtraWnd ()		  { return ( mpMarkWnd->GetSizePixel() ); }
     BOOL MoveToExtraWnd ( Point aNewPos, BOOL bDisConnectDlg = FALSE );
 
     virtual void        ActivatePage();
@@ -194,7 +194,7 @@ protected:
     virtual void SetMarkWndShouldOpen(BOOL bOpen);
 
     void ShowMarkWnd ();
-    void HideMarkWnd ()           { ( ( Window* ) mpMarkWnd )->Hide(); }
+    void HideMarkWnd ()	          { ( ( Window* ) mpMarkWnd )->Hide(); }
     void InvalidateMarkWnd ()     { ( ( Window* ) mpMarkWnd )->Invalidate(); }
 
     SfxDispatcher* GetDispatcher() const;
diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx
index 2cdad5523d4f..6bf036962bc1 100644
--- a/cui/source/inc/hyphen.hxx
+++ b/cui/source/inc/hyphen.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 38725c02ecb7..bc82c8d30cb0 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include <tools/list.hxx>
 #include <tools/string.hxx>
 
-#define CTRLS_OFFSET        3
-#define BUTTON_DISTANCE     8
-#define RET_USER        100
-#define RET_USER_CANCEL 101
+#define CTRLS_OFFSET		3
+#define BUTTON_DISTANCE		8
+#define RET_USER 		100
+#define RET_USER_CANCEL	101
 
 // forward-declarations
 struct IconChoicePageData;
@@ -51,7 +51,7 @@ class IconChoicePage;
 
 // Create-Function
 typedef IconChoicePage* (*CreatePage)(Window *pParent, const SfxItemSet &rAttrSet);
-typedef USHORT*         (*GetPageRanges)(); // liefert internationale Which-Wert
+typedef USHORT*		    (*GetPageRanges)(); // liefert internationale Which-Wert
 
 // page-list
 DECLARE_LIST( IconChoicePageList, IconChoicePageData * )
@@ -67,21 +67,21 @@ enum EIconChoicePos { PosLeft, PosRight, PosTop, PosBottom };
 
 struct IconChoicePageData
 {
-    USHORT nId;                  // Die ID
-    CreatePage fnCreatePage;     // Pointer auf die Factory
+    USHORT nId;					 // Die ID
+    CreatePage fnCreatePage;	 // Pointer auf die Factory
     GetPageRanges fnGetRanges;// Pointer auf die Ranges-Funktion
-    IconChoicePage* pPage;       // die TabPage selber
-    BOOL bOnDemand;              // Flag: ItemSet onDemand
-    BOOL bRefresh;               // Flag: Seite mu\s neu initialisiert werden
+    IconChoicePage* pPage;		 // die TabPage selber
+    BOOL bOnDemand;				 // Flag: ItemSet onDemand
+    BOOL bRefresh; 				 // Flag: Seite mu\s neu initialisiert werden
 
     // Konstruktor
     IconChoicePageData( USHORT Id, CreatePage fnPage, GetPageRanges fnRanges, BOOL bDemand )
-        : nId           ( Id ),
-          fnCreatePage  ( fnPage ),
-          fnGetRanges   ( fnRanges ),
-          pPage         ( NULL ),
-          bOnDemand     ( bDemand ),
-          bRefresh      ( FALSE )
+        : nId			( Id ),
+          fnCreatePage	( fnPage ),
+          fnGetRanges	( fnRanges ),
+          pPage			( NULL ),
+          bOnDemand		( bDemand ),
+          bRefresh		( FALSE )
     {}
 };
 
@@ -97,40 +97,40 @@ class IconChoicePage : public TabPage
     using TabPage::DeactivatePage;
 
 private :
-    const SfxItemSet*   pSet;
-    String              aUserString;
-    BOOL                bHasExchangeSupport;
-    IconChoiceDialog*   pDialog;
-    BOOL                bStandard;
+    const SfxItemSet*	pSet;
+    String				aUserString;
+    BOOL				bHasExchangeSupport;
+    IconChoiceDialog*	pDialog;
+    BOOL				bStandard;
 
-    void                SetDialog( IconChoiceDialog* pNew ) { pDialog = pNew; }
-    IconChoiceDialog*   GetDialog() const { return pDialog; }
+    void				SetDialog( IconChoiceDialog* pNew ) { pDialog = pNew; }
+    IconChoiceDialog*	GetDialog() const { return pDialog; }
 
-    void                SetInputSet( const SfxItemSet* pNew ) { pSet = pNew; }
+    void				SetInputSet( const SfxItemSet* pNew ) { pSet = pNew; }
 
-    void                ImplInitSettings();
+    void				ImplInitSettings();
 
 protected :
     IconChoicePage( Window *pParent, const ResId &, const SfxItemSet &rAttrSet );
 
-    USHORT              GetSlot( USHORT nWhich ) const  { return pSet->GetPool()->GetSlotId( nWhich ); }
-    USHORT              GetWhich( USHORT nSlot ) const  { return pSet->GetPool()->GetWhich( nSlot ); }
-    const SfxPoolItem*  GetOldItem( const SfxItemSet& rSet, USHORT nSlot );
-    const SfxPoolItem*  GetExchangeItem( const SfxItemSet& rSet, USHORT nSlot );
+    USHORT				GetSlot( USHORT nWhich ) const	{ return pSet->GetPool()->GetSlotId( nWhich ); }
+    USHORT				GetWhich( USHORT nSlot ) const	{ return pSet->GetPool()->GetWhich( nSlot ); }
+    const SfxPoolItem* 	GetOldItem( const SfxItemSet& rSet, USHORT nSlot );
+    const SfxPoolItem* 	GetExchangeItem( const SfxItemSet& rSet, USHORT nSlot );
 
 public :
     virtual             ~IconChoicePage();
 
-    const SfxItemSet&   GetItemSet() const { return *pSet; }
+    const SfxItemSet&	GetItemSet() const { return *pSet; }
 
-    virtual BOOL        FillItemSet( SfxItemSet& ) = 0;
-    virtual void        Reset( const SfxItemSet& ) = 0;
+    virtual BOOL		FillItemSet( SfxItemSet& ) = 0;
+    virtual void		Reset( const SfxItemSet& ) = 0;
 
-    BOOL                HasExchangeSupport() const              { return bHasExchangeSupport; }
-    void                SetExchangeSupport( BOOL bNew = TRUE )  { bHasExchangeSupport = bNew; }
+    BOOL				HasExchangeSupport() const				{ return bHasExchangeSupport; }
+    void				SetExchangeSupport( BOOL bNew = TRUE )	{ bHasExchangeSupport = bNew; }
 
     enum {
-        KEEP_PAGE = 0x0000,     // Fehlerbehandlung; Seite nicht wechseln
+        KEEP_PAGE = 0x0000,		// Fehlerbehandlung; Seite nicht wechseln
             // 2. F"ullen eines ItemSets f"ur die Aktualilsierung
             // "ubergeordneter Beispiele; dieser Pointer kann immer
             // NULL sein!!
@@ -139,18 +139,18 @@ public :
         REFRESH_SET = 0x0002
     };
 
-    virtual void        ActivatePage( const SfxItemSet& );
-    virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
-    void                SetUserData(const String& rString)  { aUserString = rString; }
-    String              GetUserData() { return aUserString; }
-    virtual void        FillUserData();
-    virtual BOOL        IsReadOnly() const;
+    virtual void		ActivatePage( const SfxItemSet& );
+    virtual int			DeactivatePage( SfxItemSet* pSet = 0 );
+    void				SetUserData(const String& rString)	{ aUserString = rString; }
+    String				GetUserData() { return aUserString; }
+    virtual void		FillUserData();
+    virtual BOOL		IsReadOnly() const;
     virtual sal_Bool    QueryClose();
 
     static const SfxPoolItem* GetItem( const SfxItemSet& rSet, USHORT nSlot );
 
-    void                StateChanged( StateChangedType nType );
-    void                DataChanged( const DataChangedEvent& rDCEvt );
+    void				StateChanged( StateChangedType nType );
+    void				DataChanged( const DataChangedEvent& rDCEvt );
 };
 
 /**********************************************************************
@@ -164,63 +164,63 @@ class IconChoiceDialog : public ModalDialog
 private :
     friend class IconChoicePage;
 
-    EIconChoicePos          meChoicePos;    // Position des IconChoiceCtrl's
-    IconChoicePageList      maPageList;     // Liste von PageData-Pointer
+    EIconChoicePos			meChoicePos;    // Position des IconChoiceCtrl's
+    IconChoicePageList		maPageList;		// Liste von PageData-Pointer
 
-    SvtIconChoiceCtrl       maIconCtrl;     // DAS IconChoice-Control
+    SvtIconChoiceCtrl		maIconCtrl;		// DAS IconChoice-Control
 
-    USHORT                  mnCurrentPageId;    // Id der aktuell sichtbaren Page
+    USHORT					mnCurrentPageId;	// Id der aktuell sichtbaren Page
 
     // Buttons
-    OKButton                aOKBtn;
-    CancelButton            aCancelBtn;
-    HelpButton              aHelpBtn;
-    PushButton              aResetBtn;
+    OKButton				aOKBtn;
+    CancelButton			aCancelBtn;
+    HelpButton				aHelpBtn;
+    PushButton				aResetBtn;
 
-    const SfxItemSet*       pSet;
-    SfxItemSet*             pOutSet;
-    SfxItemSet*             pExampleSet;
-    USHORT*                 pRanges;
+    const SfxItemSet*		pSet;
+    SfxItemSet*				pOutSet;
+    SfxItemSet*				pExampleSet;
+    USHORT*					pRanges;
 
-    sal_uInt32              nResId;
+    sal_uInt32				nResId;
 
-    BOOL                    bHideResetBtn;
-    BOOL                    bModal;
-    BOOL                    bInOK;
-    BOOL                    bModified;
-    BOOL                    bItemsReset;
+    BOOL					bHideResetBtn;
+    BOOL					bModal;
+    BOOL					bInOK;
+    BOOL					bModified;
+    BOOL					bItemsReset;
 
     DECL_LINK ( ChosePageHdl_Impl, void * );
-    DECL_LINK ( OkHdl,             Button * );
+    DECL_LINK ( OkHdl,			   Button * );
     DECL_LINK ( ResetHdl,          Button * );
-    DECL_LINK ( CancelHdl,         Button * );
+    DECL_LINK ( CancelHdl,		   Button * );
 
-    IconChoicePageData*     GetPageData ( USHORT nId );
-    void                    Start_Impl();
-    BOOL                    OK_Impl();
+    IconChoicePageData*		GetPageData ( USHORT nId );
+    void					Start_Impl();
+    BOOL					OK_Impl();
 
-    void                    SetPosSizeCtrls ( BOOL bInit = FALSE );
-    void                    SetPosSizePages ( USHORT nId );
+    void					SetPosSizeCtrls ( BOOL bInit = FALSE );
+    void					SetPosSizePages ( USHORT nId );
 
-    void                    FocusOnIcon ( USHORT nId );
+    void					FocusOnIcon ( USHORT nId );
 
 protected :
-    void                    ShowPageImpl ( IconChoicePageData* pData );
-    void                    HidePageImpl ( IconChoicePageData* pData );
+    void					ShowPageImpl ( IconChoicePageData* pData );
+    void					HidePageImpl ( IconChoicePageData* pData );
 
     virtual void            PageCreated( USHORT nId, IconChoicePage& rPage );
-    virtual SfxItemSet*     CreateInputItemSet( USHORT nId );
-    inline SfxItemSet*      GetInputSetImpl() { return (SfxItemSet*)pSet; }
-    inline IconChoicePage*  GetTabPage( USHORT nPageId )
+    virtual SfxItemSet*		CreateInputItemSet( USHORT nId );
+    inline SfxItemSet*		GetInputSetImpl() { return (SfxItemSet*)pSet; }
+    inline IconChoicePage*	GetTabPage( USHORT nPageId )
                                 { return ( GetPageData (nPageId)->pPage?GetPageData (nPageId)->pPage:NULL); }
-    const SfxItemSet*       GetRefreshedSet();
+    const SfxItemSet*		GetRefreshedSet();
 
-    void                    ActivatePageImpl ();
-    BOOL                    DeActivatePageImpl ();
-    void                    ResetPageImpl ();
+    void					ActivatePageImpl ();
+    BOOL					DeActivatePageImpl ();
+    void					ResetPageImpl ();
 
-    short                   Ok();
-    BOOL                    IsInOK() const;
+    short					Ok();
+    BOOL					IsInOK() const;
 
 public :
 
@@ -233,55 +233,55 @@ public :
     ///////////////////////////////////////////////////////////////////////////////////
     // virtuelle Methoden
     //
-    virtual void        Paint( const Rectangle& rRect );
-    virtual void        Resize();
+    virtual void		Paint( const Rectangle& rRect );
+    virtual void		Resize();
 
     ///////////////////////////////////////////////////////////////////////////////////
     // Schnittstelle
     //
 
-    SvxIconChoiceCtrlEntry* AddTabPage(
+    SvxIconChoiceCtrlEntry*	AddTabPage(
         USHORT nId, const String& rIconText, const Image& rChoiceIcon,
         CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = NULL /* NULL allowed*/,
         BOOL bItemsOnDemand = FALSE, ULONG nPos = LIST_APPEND );
 
-    SvxIconChoiceCtrlEntry* AddTabPage(
+    SvxIconChoiceCtrlEntry*	AddTabPage(
         USHORT nId, const String& rIconText, const Image& rChoiceIcon, const Image& rChoiceIconHC,
         CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = NULL /* NULL allowed*/,
         BOOL bItemsOnDemand = FALSE, ULONG nPos = LIST_APPEND );
 
-    void                RemoveTabPage( USHORT nId );
+    void				RemoveTabPage( USHORT nId );
 
-    void                SetCurPageId( USHORT nId ) { mnCurrentPageId = nId; FocusOnIcon( nId ); }
-    USHORT              GetCurPageId() const       { return mnCurrentPageId; }
-    void                ShowPage( USHORT nId );
+    void				SetCurPageId( USHORT nId ) { mnCurrentPageId = nId; FocusOnIcon( nId ); }
+    USHORT				GetCurPageId() const       { return mnCurrentPageId; }
+    void				ShowPage( USHORT nId );
 
                         // liefert ggf. per Map konvertierte lokale Slots
-    const USHORT*       GetInputRanges( const SfxItemPool& );
-    void                SetInputSet( const SfxItemSet* pInSet );
-    const SfxItemSet*   GetOutputItemSet() const { return pOutSet; }
-    const SfxItemSet*   GetOutputItemSet( USHORT nId );
-    int                 FillOutputItemSet();
-
-    const OKButton&     GetOKButton() const { return aOKBtn; }
-    OKButton&           GetOKButton() { return aOKBtn; }
+    const USHORT*		GetInputRanges( const SfxItemPool& );
+    void				SetInputSet( const SfxItemSet* pInSet );
+    const SfxItemSet*	GetOutputItemSet() const { return pOutSet; }
+    const SfxItemSet*	GetOutputItemSet( USHORT nId );
+    int					FillOutputItemSet();
+
+    const OKButton& 	GetOKButton() const { return aOKBtn; }
+    OKButton&			GetOKButton() { return aOKBtn; }
     const CancelButton& GetCancelButton() const { return aCancelBtn; }
-    CancelButton&       GetCancelButton() { return aCancelBtn; }
-    const HelpButton&   GetHelpButton() const { return aHelpBtn; }
-    HelpButton&         GetHelpButton() { return aHelpBtn; }
+    CancelButton&		GetCancelButton() { return aCancelBtn; }
+    const HelpButton&	GetHelpButton() const { return aHelpBtn; }
+    HelpButton&			GetHelpButton() { return aHelpBtn; }
 
-    void                RemoveResetButton();
+    void				RemoveResetButton();
 
-    short               Execute();
-    void                Start( BOOL bShow = TRUE );
+    short				Execute();
+    void				Start( BOOL bShow = TRUE );
     sal_Bool            QueryClose();
 
-    const SfxItemSet*   GetExampleSet() const { return pExampleSet; }
+    const SfxItemSet*	GetExampleSet() const { return pExampleSet; }
 
-    void                SetCtrlColor ( const Color& rColor );
-    EIconChoicePos      SetCtrlPos   ( const EIconChoicePos& rPos );
+    void				SetCtrlColor ( const Color& rColor );
+    EIconChoicePos		SetCtrlPos   ( const EIconChoicePos& rPos );
 
-    void                CreateIconTextAutoMnemonics( void );
+    void				CreateIconTextAutoMnemonics( void );
 };
 
 #endif //_ICCDLG_HXX
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index 6959cb8b3233..f001efcd63a9 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <vcl/field.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/lstbox.hxx>
-#include <svtools/svmedit.hxx>  // MultiLineEdit
+#include <svtools/svmedit.hxx>	// MultiLineEdit
 #include <comphelper/embeddedobjectcontainer.hxx>
 
 class INetURLObject;
@@ -90,7 +90,7 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl
     BOOL                IsCreateNew() const { return aRbNewObject.IsChecked(); }
 
 public:
-    static void         FillObjectServerList( SvObjectServerList* );
+    static void			FillObjectServerList( SvObjectServerList* );
 
                         SvInsertOleDlg( Window* pParent,
                             const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage,
@@ -171,29 +171,29 @@ public:
 class SfxInsertFloatingFrameDialog : public InsertObjectDialog_Impl
 {
 private:
-    FixedText               aFTName;
-    Edit                    aEDName;
-    FixedText               aFTURL;
-    Edit                    aEDURL;
-    PushButton              aBTOpen;
-
-    RadioButton             aRBScrollingOn;
-    RadioButton             aRBScrollingOff;
-    RadioButton             aRBScrollingAuto;
+    FixedText           	aFTName;
+    Edit		        	aEDName;
+    FixedText	        	aFTURL;
+    Edit		        	aEDURL;
+    PushButton				aBTOpen;
+
+    RadioButton		    	aRBScrollingOn;
+    RadioButton		    	aRBScrollingOff;
+    RadioButton		    	aRBScrollingAuto;
     FixedLine               aFLScrolling;
 
     FixedLine               aFLSepLeft;
     RadioButton             aRBFrameBorderOn;
-    RadioButton             aRBFrameBorderOff;
+    RadioButton 	    	aRBFrameBorderOff;
     FixedLine               aFLFrameBorder;
 
     FixedLine               aFLSepRight;
     FixedText               aFTMarginWidth;
-    NumericField            aNMMarginWidth;
-    CheckBox                aCBMarginWidthDefault;
-    FixedText               aFTMarginHeight;
-    NumericField            aNMMarginHeight;
-    CheckBox                aCBMarginHeightDefault;
+    NumericField	    	aNMMarginWidth;
+    CheckBox				aCBMarginWidthDefault;
+    FixedText		    	aFTMarginHeight;
+    NumericField	    	aNMMarginHeight;
+    CheckBox				aCBMarginHeightDefault;
     FixedLine               aFLMargin;
 
     OKButton aOKButton1;
diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx
index 22bb9771e0dc..7552d919d952 100644
--- a/cui/source/inc/insrc.hxx
+++ b/cui/source/inc/insrc.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public ModalDialog
 {
-    FixedText       aCount;
-    NumericField    aCountEdit;
+    FixedText 		aCount;
+    NumericField 	aCountEdit;
     FixedLine        aInsFL;
 
-    RadioButton     aBeforeBtn;
-    RadioButton     aAfterBtn;
+    RadioButton 	aBeforeBtn;
+    RadioButton 	aAfterBtn;
     FixedLine        aPosFL;
 
-    String          aRow;
-    String          aCol;
+    String 			aRow;
+    String 			aCol;
 
-    OKButton        aOKBtn;
-    CancelButton    aCancelBtn;
-    HelpButton      aHelpBtn;
+    OKButton 		aOKBtn;
+    CancelButton 	aCancelBtn;
+    HelpButton 		aHelpBtn;
 
     bool            bColumn;
 
diff --git a/cui/source/inc/internationaloptions.hxx b/cui/source/inc/internationaloptions.hxx
index a4372d52ddbe..52f2bbb1a1a4 100644
--- a/cui/source/inc/internationaloptions.hxx
+++ b/cui/source/inc/internationaloptions.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 offapp
     {
     private:
         struct IMPL;
-        IMPL*               m_pImpl;
+        IMPL*				m_pImpl;
 
     protected:
                             InternationalOptionsPage( Window* _pParent, const SfxItemSet& _rAttrSet );
 
-        virtual BOOL        FillItemSet( SfxItemSet& _rSet );
-        virtual void        Reset( const SfxItemSet& _rSet );
+        virtual BOOL		FillItemSet( SfxItemSet& _rSet );
+        virtual void		Reset( const SfxItemSet& _rSet );
 
     public:
-        virtual             ~InternationalOptionsPage();
+        virtual				~InternationalOptionsPage();
 
-        static SfxTabPage*  CreateSd( Window* _pParent, const SfxItemSet& _rAttrSet );
-        static SfxTabPage*  CreateSc( Window* _pParent, const SfxItemSet& _rAttrSet );
+        static SfxTabPage*	CreateSd( Window* _pParent, const SfxItemSet& _rAttrSet );
+        static SfxTabPage*	CreateSc( Window* _pParent, const SfxItemSet& _rAttrSet );
     };
 
-}   // /namespace offapp
+}	// /namespace offapp
 
 #endif
 
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index c4c9254a0894..2bc88101752d 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,65 +45,65 @@ const sal_uInt16 CAPTYPE_BITMAPS_COUNT = 3;
 class SvxCaptionTabPage : public SfxTabPage
 {
 private:
-    ValueSet        aCT_CAPTTYPE;
-    FixedText       aFT_ABSTAND;
-    MetricField     aMF_ABSTAND;
-    FixedText       aFT_WINKEL;
-    ListBox         aLB_WINKEL;
-    FixedText       aFT_ANSATZ;
-    ListBox         aLB_ANSATZ;
-    FixedText       aFT_UM;
-    MetricField     aMF_ANSATZ;
-    FixedText       aFT_ANSATZ_REL;
-    ListBox         aLB_ANSATZ_REL;
-    FixedText       aFT_LAENGE;
-    MetricField     aMF_LAENGE;
-    CheckBox        aCB_LAENGE;
-
-    Image*          mpBmpCapTypes[CAPTYPE_BITMAPS_COUNT];
-    Image*          mpBmpCapTypesH[CAPTYPE_BITMAPS_COUNT];
-
-    String          aStrHorzList;
-    String          aStrVertList;
-
-    short           nCaptionType;
-    BOOL            bFixedAngle;
-    INT32           nFixedAngle;
-    INT32           nGap;
-    short           nEscDir;
-    BOOL            bEscRel;
-    INT32           nEscAbs;
-    INT32           nEscRel;
-    INT32           nLineLen;
-    BOOL            bFitLineLen;
-
-    USHORT          nAnsatzRelPos;
-    USHORT          nAnsatzTypePos;
-    USHORT          nWinkelTypePos;
+    ValueSet		aCT_CAPTTYPE;
+    FixedText		aFT_ABSTAND;
+    MetricField		aMF_ABSTAND;
+    FixedText		aFT_WINKEL;
+    ListBox			aLB_WINKEL;
+    FixedText		aFT_ANSATZ;
+    ListBox			aLB_ANSATZ;
+    FixedText		aFT_UM;
+    MetricField		aMF_ANSATZ;
+    FixedText		aFT_ANSATZ_REL;
+    ListBox			aLB_ANSATZ_REL;
+    FixedText		aFT_LAENGE;
+    MetricField		aMF_LAENGE;
+    CheckBox		aCB_LAENGE;
+
+    Image*			mpBmpCapTypes[CAPTYPE_BITMAPS_COUNT];
+    Image*			mpBmpCapTypesH[CAPTYPE_BITMAPS_COUNT];
+
+    String			aStrHorzList;
+    String			aStrVertList;
+
+    short			nCaptionType;
+    BOOL			bFixedAngle;
+    INT32			nFixedAngle;
+    INT32			nGap;
+    short			nEscDir;
+    BOOL			bEscRel;
+    INT32			nEscAbs;
+    INT32			nEscRel;
+    INT32			nLineLen;
+    BOOL			bFitLineLen;
+
+    USHORT			nAnsatzRelPos;
+    USHORT			nAnsatzTypePos;
+    USHORT			nWinkelTypePos;
 
 #ifdef _SVX_LABDLG_CXX
-    void            SetupAnsatz_Impl( USHORT nType );
-    void            SetupType_Impl( USHORT nType );
+    void			SetupAnsatz_Impl( USHORT nType );
+    void			SetupType_Impl( USHORT nType );
     DECL_LINK( AnsatzSelectHdl_Impl, ListBox * );
     DECL_LINK( AnsatzRelSelectHdl_Impl, ListBox * );
     DECL_LINK( LineOptHdl_Impl, Button * );
     DECL_LINK( SelectCaptTypeHdl_Impl, void * );
 #endif
 
-    const SfxItemSet&   rOutAttrs;
-    const SdrView*      pView;
+    const SfxItemSet&	rOutAttrs;
+    const SdrView*		pView;
 
 public:
     SvxCaptionTabPage( Window* pParent, const SfxItemSet& rInAttrs  );
     virtual ~SvxCaptionTabPage();
 
-    static SfxTabPage*  Create( Window*, const SfxItemSet& );
-    static USHORT*      GetRanges();
+    static SfxTabPage*	Create( Window*, const SfxItemSet& );
+    static USHORT*		GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& );
-    virtual void        Reset( const SfxItemSet & );
-    void                Construct();
-    void                SetView( const SdrView* pSdrView )
+    virtual BOOL 		FillItemSet( SfxItemSet& );
+    virtual void 		Reset( const SfxItemSet & );
+    void				Construct();
+    void				SetView( const SdrView* pSdrView )
                             { pView = pSdrView; }
 
     virtual void DataChanged( const DataChangedEvent& rDCEvt );
@@ -115,12 +115,12 @@ public:
 class SvxCaptionTabDialog : public SfxTabDialog
 {
 private:
-//  const SfxItemSet&   rOutAttrs;
-    const SdrView*      pView;
-    USHORT              nAnchorCtrls;
+//	const SfxItemSet&	rOutAttrs;
+    const SdrView*		pView;
+    USHORT				nAnchorCtrls;
 
     Link                aValidateLink;
-
+    
     virtual void        PageCreated( USHORT nId, SfxTabPage &rPage );
 
 public:
@@ -129,8 +129,8 @@ public:
                                     USHORT nAnchorTypes = 0 );
 
             ~SvxCaptionTabDialog();
-
-            //link for the Writer to validate positions
+            
+            //link for the Writer to validate positions 
             void SetValidateFramePosLink( const Link& rLink );
 };
 
diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index bcc0fd74625b..0a55ce429235 100644
--- a/cui/source/inc/linkdlg.hxx
+++ b/cui/source/inc/linkdlg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include <vcl/edit.hxx>
 #include <vcl/lstbox.hxx>
 
-#include <svtools/svmedit.hxx>  // MultiLineEdit
+#include <svtools/svmedit.hxx>	// MultiLineEdit
 #include <svtools/svtabbx.hxx>  // MultiLineEdit
 
 /********************** SvUpdateLinksDialog ******************************
@@ -80,7 +80,7 @@ class SvBaseLinksDlg : public ModalDialog
     String aStrCloselinkmsgMulti;
     String aStrWaitinglink;
     sfx2::LinkManager*  pLinkMgr;
-    BOOL            bHtmlMode;
+    BOOL 			bHtmlMode;
     SvTabListBox aTbLinks;
     Timer aUpdateTimer;
 
@@ -101,27 +101,27 @@ class SvBaseLinksDlg : public ModalDialog
     void InsertEntry( const sfx2::SvBaseLink& rLink, USHORT nPos = LISTBOX_APPEND, sal_Bool bSelect = sal_False);
 #endif
 
-    void StartUpdateTimer()         { aUpdateTimer.Start(); }
+    void StartUpdateTimer()			{ aUpdateTimer.Start(); }
 
-    SvTabListBox&     Links()       { return aTbLinks; }
-    FixedText&      FileName()      { return aFtFullFileName; }
-    FixedText&      SourceName()    { return aFtFullSourceName; }
-    FixedText&      TypeName()      { return aFtFullTypeName; }
-    RadioButton&    Automatic()     { return aRbAutomatic; }
-    RadioButton&    Manual()        { return aRbManual; }
-    PushButton&     UpdateNow()     { return aPbUpdateNow; }
-    PushButton&     OpenSource()    { return aPbOpenSource; }
-    PushButton&     ChangeSource()  { return aPbChangeSource; }
-    PushButton&     BreakLink()     { return aPbBreakLink; }
+    SvTabListBox&	  Links()		{ return aTbLinks; }
+    FixedText&		FileName()		{ return aFtFullFileName; }
+    FixedText&		SourceName()	{ return aFtFullSourceName; }
+    FixedText&		TypeName()		{ return aFtFullTypeName; }
+    RadioButton&	Automatic() 	{ return aRbAutomatic; }
+    RadioButton&	Manual()		{ return aRbManual; }
+    PushButton& 	UpdateNow() 	{ return aPbUpdateNow; }
+    PushButton& 	OpenSource()	{ return aPbOpenSource; }
+    PushButton& 	ChangeSource()	{ return aPbChangeSource; }
+    PushButton& 	BreakLink() 	{ return aPbBreakLink; }
 
-    String&         Autolink()      { return aStrAutolink; }
-    String&         Manuallink()    { return aStrManuallink; }
-    String&         Brokenlink()    { return aStrBrokenlink; }
-    String&         Graphiclink()   { return aStrGraphiclink; }
-    String&         Buttonclose()   { return aStrButtonclose; }
-    String&         Closelinkmsg()  { return aStrCloselinkmsg; }
-    String&         CloselinkmsgMulti() { return aStrCloselinkmsgMulti; }
-    String&         Waitinglink()   { return aStrWaitinglink; }
+    String& 		Autolink()		{ return aStrAutolink; }
+    String& 		Manuallink()	{ return aStrManuallink; }
+    String& 		Brokenlink()	{ return aStrBrokenlink; }
+    String& 		Graphiclink()	{ return aStrGraphiclink; }
+    String& 		Buttonclose()	{ return aStrButtonclose; }
+    String& 		Closelinkmsg()	{ return aStrCloselinkmsg; }
+    String& 		CloselinkmsgMulti()	{ return aStrCloselinkmsgMulti; }
+    String& 		Waitinglink()	{ return aStrWaitinglink; }
     void SetManager( sfx2::LinkManager* );
 
 public:
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index 7b8330f31db6..236d974d257c 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class _SfxMacroTabPage_Impl;
 
 class _SfxMacroTabPage : public SfxTabPage
 {
-    SvxMacroTableDtor           aTbl;
+    SvxMacroTableDtor			aTbl;
     DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox * );
     DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox * );
     DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectMacro_Impl, ListBox * );
@@ -65,41 +65,41 @@ class _SfxMacroTabPage : public SfxTabPage
     DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, TimeOut_Impl, Timer* );
 
 protected:
-    _SfxMacroTabPage_Impl*      mpImpl;
+    _SfxMacroTabPage_Impl*		mpImpl;
 
                                 _SfxMacroTabPage( Window* pParent, const ResId& rId, const SfxItemSet& rItemSet );
 
-    void                        InitAndSetHandler();
-    void                        FillEvents();
-    void                        FillMacroList();
-    void                        EnableButtons( const String& rLanguage );
+    void						InitAndSetHandler();
+    void						FillEvents();
+    void						FillMacroList();
+    void						EnableButtons( const String& rLanguage );
 
 public:
 
-    virtual                     ~_SfxMacroTabPage();
+    virtual						~_SfxMacroTabPage();
 
-    void                        AddEvent( const String & rEventName, USHORT nEventId );
+    void						AddEvent( const String & rEventName, USHORT nEventId );
 
-    const SvxMacroTableDtor&    GetMacroTbl() const;
-    void                        SetMacroTbl( const SvxMacroTableDtor& rTbl );
-    void                        ClearMacroTbl();
+    const SvxMacroTableDtor&	GetMacroTbl() const;
+    void						SetMacroTbl( const SvxMacroTableDtor& rTbl );
+    void						ClearMacroTbl();
 
-    virtual void                ScriptChanged( const String& rLanguage );
-    virtual void                PageCreated (SfxAllItemSet aSet);
+    virtual void				ScriptChanged( const String& rLanguage );
+    virtual void				PageCreated (SfxAllItemSet aSet);
 
     // zum setzen / abfragen der Links
-    void                        SetGetRangeLink( FNGetRangeHdl pFn );
-    FNGetRangeHdl               GetGetRangeLink() const;
-    void                        SetGetMacrosOfRangeLink( FNGetMacrosOfRangeHdl pFn );
-    FNGetMacrosOfRangeHdl       GetGetMacrosOfRangeLink() const;
+    void						SetGetRangeLink( FNGetRangeHdl pFn );
+    FNGetRangeHdl				GetGetRangeLink() const;
+    void						SetGetMacrosOfRangeLink( FNGetMacrosOfRangeHdl pFn );
+    FNGetMacrosOfRangeHdl		GetGetMacrosOfRangeLink() const;
 
     // --------- Erben aus der Basis -------------
-    virtual BOOL                FillItemSet( SfxItemSet& rSet );
-    virtual void                Reset( const SfxItemSet& rSet );
+    virtual	BOOL				FillItemSet( SfxItemSet& rSet );
+    virtual	void				Reset( const SfxItemSet& rSet );
 
-    void                        SetReadOnly( BOOL bSet );
-    BOOL                        IsReadOnly() const;
-    void                        SelectEvent( const String& rEventName, USHORT nEventId );
+    void						SetReadOnly( BOOL bSet );
+    BOOL						IsReadOnly() const;
+    void						SelectEvent( const String& rEventName, USHORT nEventId );
 };
 
 inline const SvxMacroTableDtor& _SfxMacroTabPage::GetMacroTbl() const
@@ -138,7 +138,7 @@ public:
         Window* pParent,
         const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame,
         const SfxItemSet& rSet );
-    virtual ~SfxMacroAssignDlg();
+    virtual	~SfxMacroAssignDlg();
 };
 
 #endif
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index c469410c4247..afdd26a01aef 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class _SvxMacroTabPage : public SfxTabPage
 
 #endif
 protected:
-    _SvxMacroTabPage_Impl*      mpImpl;
+    _SvxMacroTabPage_Impl*		mpImpl;
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > m_xAppEvents;
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > m_xDocEvents;
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifiable > m_xModifiable;
@@ -89,24 +89,24 @@ protected:
 
                                 _SvxMacroTabPage( Window* pParent, const ResId& rId, const SfxItemSet& rItemSet );
 
-    void                        EnableButtons( const String& rLanguage );
-    ::com::sun::star::uno::Any  GetPropsByName( const ::rtl::OUString& eventName, EventsHash& eventsHash );
+    void						EnableButtons( const String& rLanguage );
+    ::com::sun::star::uno::Any 	GetPropsByName( const ::rtl::OUString& eventName, EventsHash& eventsHash );
     ::std::pair< ::rtl::OUString, ::rtl::OUString > GetPairFromAny( ::com::sun::star::uno::Any aAny );
 
 public:
 
-    virtual                     ~_SvxMacroTabPage();
+    virtual						~_SvxMacroTabPage();
     void                        InitResources();
 
-    void                        InitAndSetHandler( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xAppEvents, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xDocEvents, ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifiable > xModifiable );
-    virtual BOOL                FillItemSet( SfxItemSet& rSet );
-
+    void						InitAndSetHandler( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xAppEvents, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xDocEvents, ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifiable > xModifiable );
+    virtual	BOOL				FillItemSet( SfxItemSet& rSet );
+    
     using SfxTabPage::Reset;
-    virtual void                Reset();
+    virtual	void				Reset();
 
-    void                        DisplayAppEvents( bool appEvents);
-    void                        SetReadOnly( BOOL bSet );
-    BOOL                        IsReadOnly() const;
+    void						DisplayAppEvents( bool appEvents);
+    void						SetReadOnly( BOOL bSet );
+    BOOL						IsReadOnly() const;
 };
 
 class SvxMacroTabPage : public _SvxMacroTabPage
@@ -124,7 +124,7 @@ public:
 
 // class SvxMacroAssignDlg --------------------------------------------------
 
-typedef USHORT* (*GetTabPageRanges)(); // liefert internationale Which-Werte
+typedef USHORT*	(*GetTabPageRanges)(); // liefert internationale Which-Werte
 
 class SvxMacroAssignSingleTabDialog : public SfxModalDialog
 {
@@ -133,24 +133,24 @@ public:
 
     virtual             ~SvxMacroAssignSingleTabDialog();
 
-    void                SetTabPage( SfxTabPage* pTabPage );
-    // SfxTabPage*          GetTabPage() const { return pPage; }
+    void				SetTabPage( SfxTabPage* pTabPage );
+    // SfxTabPage*			GetTabPage() const { return pPage; }
 
-    // OKButton*            GetOKButton() const { return pOKBtn; }
-    // CancelButton*        GetCancelButton() const { return pCancelBtn; }
+    // OKButton*			GetOKButton() const { return pOKBtn; }
+    // CancelButton*		GetCancelButton() const { return pCancelBtn; }
 
 private:
     SfxViewFrame*       pFrame;
 
-    FixedLine*          pFixedLine;
+    FixedLine*			pFixedLine;
 
-    OKButton*           pOKBtn;
-    CancelButton*       pCancelBtn;
-    HelpButton*         pHelpBtn;
+    OKButton*			pOKBtn;
+    CancelButton*		pCancelBtn;
+    HelpButton*			pHelpBtn;
 
-    SfxTabPage*         pPage;
-    const SfxItemSet*   pOptions;
-    SfxItemSet*         pOutSet;
+    SfxTabPage*			pPage;
+    const SfxItemSet*	pOptions;
+    SfxItemSet*			pOutSet;
 
 #if _SOLAR__PRIVATE
     DECL_DLLPRIVATE_LINK( OKHdl_Impl, Button * );
@@ -168,7 +168,7 @@ public:
         const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace >& xNameReplace,
         sal_uInt16 nSelectedIndex
     );
-    virtual ~SvxMacroAssignDlg();
+    virtual	~SvxMacroAssignDlg();
 };
 
 #endif
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index 035232349443..db01be96c4a8 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,43 +48,43 @@ class SvxMeasurePage : public SvxTabPage
 {
 private:
 
-    FixedLine           aFlLine;
-    FixedText           aFtLineDist;
-    MetricField         aMtrFldLineDist;
-    FixedText           aFtHelplineOverhang;
-    MetricField         aMtrFldHelplineOverhang;
-    FixedText           aFtHelplineDist;
-    MetricField         aMtrFldHelplineDist;
-    FixedText           aFtHelpline1Len;
-    MetricField         aMtrFldHelpline1Len;
-    FixedText           aFtHelpline2Len;
-    MetricField         aMtrFldHelpline2Len;
-    TriStateBox         aTsbBelowRefEdge;
-    FixedText           aFtDecimalPlaces;
-    MetricField         aMtrFldDecimalPlaces;
-
-    FixedLine           aFlLabel;
+    FixedLine			aFlLine;
+    FixedText			aFtLineDist;
+    MetricField			aMtrFldLineDist;
+    FixedText			aFtHelplineOverhang;
+    MetricField			aMtrFldHelplineOverhang;
+    FixedText			aFtHelplineDist;
+    MetricField			aMtrFldHelplineDist;
+    FixedText			aFtHelpline1Len;
+    MetricField			aMtrFldHelpline1Len;
+    FixedText			aFtHelpline2Len;
+    MetricField			aMtrFldHelpline2Len;
+    TriStateBox 		aTsbBelowRefEdge;
+    FixedText			aFtDecimalPlaces;
+    MetricField			aMtrFldDecimalPlaces;
+
+    FixedLine			aFlLabel;
     FixedText           aFtPosition;
-    SvxRectCtl          aCtlPosition;
-    TriStateBox         aTsbAutoPosV;
-    TriStateBox         aTsbAutoPosH;
-    TriStateBox         aTsbShowUnit;
-    ListBox             aLbUnit;
-    TriStateBox         aTsbParallel;
+    SvxRectCtl			aCtlPosition;
+    TriStateBox 		aTsbAutoPosV;
+    TriStateBox 		aTsbAutoPosH;
+    TriStateBox 		aTsbShowUnit;
+    ListBox				aLbUnit;
+    TriStateBox 		aTsbParallel;
 
-    SvxXMeasurePreview  aCtlPreview;
+    SvxXMeasurePreview	aCtlPreview;
 
     FixedLine           aFlVert;
 
-    const SfxItemSet&   rOutAttrs;
-    SfxItemSet          aAttrSet;
-    const SdrView*      pView;
-    SfxMapUnit          eUnit;
+    const SfxItemSet&	rOutAttrs;
+    SfxItemSet			aAttrSet;
+    const SdrView*		pView;
+    SfxMapUnit			eUnit;
 
-    BOOL                bPositionModified;
+    BOOL				bPositionModified;
 
 #ifdef _SVX_MEASURE_CXX
-    void                FillUnitLB();
+    void 				FillUnitLB();
 
     DECL_LINK( ClickAutoPosHdl_Impl, void * );
     DECL_LINK( ChangeAttrHdl_Impl, void * );
@@ -95,17 +95,17 @@ public:
     SvxMeasurePage( Window* pWindow, const SfxItemSet& rInAttrs );
     ~SvxMeasurePage();
 
-    static SfxTabPage*  Create( Window*, const SfxItemSet& );
-    static  USHORT*     GetRanges();
+    static SfxTabPage* 	Create( Window*, const SfxItemSet& );
+    static  USHORT*	    GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& );
-    virtual void        Reset( const SfxItemSet & );
+    virtual BOOL 		FillItemSet( SfxItemSet& );
+    virtual void 		Reset( const SfxItemSet & );
 
-    virtual void        PointChanged( Window* pWindow, RECT_POINT eRP );
+    virtual void 		PointChanged( Window* pWindow, RECT_POINT eRP );
 
-    void         Construct();
-    void         SetView( const SdrView* pSdrView ) { pView = pSdrView; }
-    virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
+    void 		 Construct();
+    void		 SetView( const SdrView* pSdrView ) { pView = pSdrView; }
+    virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 
 };
 
 /*************************************************************************
diff --git a/cui/source/inc/multifil.hxx b/cui/source/inc/multifil.hxx
index 83f35568516c..26c496902c8a 100644
--- a/cui/source/inc/multifil.hxx
+++ b/cui/source/inc/multifil.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class SvxMultiFileDialog : public SvxMultiPathDialog
 private:
     // #97807# -------------------------------------
     std::map< String, ::ucbhelper::Content >   aFileContentMap;
-
+    
     DECL_LINK( AddHdl_Impl, PushButton * );
     DECL_LINK( DelHdl_Impl, PushButton * );
 
@@ -51,8 +51,8 @@ public:
     SvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed = FALSE );
     ~SvxMultiFileDialog();
 
-    String  GetFiles() const { return SvxMultiPathDialog::GetPath(); }
-    void    SetFiles( const String& rPath ) { SvxMultiPathDialog::SetPath(rPath); aDelBtn.Enable(); }
+    String	GetFiles() const { return SvxMultiPathDialog::GetPath(); }
+    void	SetFiles( const String& rPath ) { SvxMultiPathDialog::SetPath(rPath); aDelBtn.Enable(); }
 };
 
 
diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx
index 6a79ccbcecd7..71395e271b19 100644
--- a/cui/source/inc/multipat.hxx
+++ b/cui/source/inc/multipat.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 // different delimiter for Unix (:) and Windows (;)
 
 #ifdef UNX
-#define CLASSPATH_DELIMITER ':'
+#define CLASSPATH_DELIMITER	':'
 #else
-#define CLASSPATH_DELIMITER ';'
+#define CLASSPATH_DELIMITER	';'
 #endif
 
 // forward ---------------------------------------------------------------
@@ -66,7 +66,7 @@ protected:
     CancelButton                aCancelBtn;
     HelpButton                  aHelpButton;
 
-    MultiPath_Impl* pImpl;
+    MultiPath_Impl*	pImpl;
 
     DECL_LINK( AddHdl_Impl, PushButton * );
     DECL_LINK( DelHdl_Impl, PushButton * );
@@ -77,10 +77,10 @@ public:
     SvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed = FALSE );
     ~SvxMultiPathDialog();
 
-    String          GetPath() const;
-    void            SetPath( const String& rPath );
-    void            SetClassPathMode();
-    sal_Bool        IsClassPathMode() const;
+    String			GetPath() const;
+    void			SetPath( const String& rPath );
+    void			SetClassPathMode();
+    sal_Bool		IsClassPathMode() const;
     void            EnableRadioButtonMode();
 };
 
diff --git a/cui/source/inc/newtabledlg.hxx b/cui/source/inc/newtabledlg.hxx
index 82432585851e..03afebbfd5b1 100644
--- a/cui/source/inc/newtabledlg.hxx
+++ b/cui/source/inc/newtabledlg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 class SvxNewTableDialog : public SvxAbstractNewTableDialog, public ModalDialog
 {
 private:
-    FixedText           maFtColumns;
-    NumericField        maNumColumns;
-    FixedText           maFtRows;
-    NumericField        maNumRows;
+    FixedText   		maFtColumns;
+    NumericField		maNumColumns;
+    FixedText   		maFtRows;
+    NumericField		maNumRows;
 
-    FixedLine           maFlSep;
-    HelpButton          maHelpButton;
-    OKButton            maOkButton;
-    CancelButton        maCancelButton;
+    FixedLine			maFlSep;
+    HelpButton			maHelpButton;
+    OKButton			maOkButton;
+    CancelButton		maCancelButton;
 
 public:
     SvxNewTableDialog( Window* pWindow );
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index 12cac90278d6..255eb4dba53f 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,12 +42,12 @@
 #include <svx/langbox.hxx>
 #include <svx/fontlb.hxx>
 
-//CHINA001 #define SVX_NUMVAL_STANDARD      -1234.12345678901234
-//CHINA001 #define SVX_NUMVAL_CURRENCY      -1234
-//CHINA001 #define SVX_NUMVAL_PERCENT       -0.1295
-//CHINA001 #define SVX_NUMVAL_TIME      36525.5678935185
-//CHINA001 #define SVX_NUMVAL_DATE      36525.5678935185
-//CHINA001 #define SVX_NUMVAL_BOOLEAN       1
+//CHINA001 #define SVX_NUMVAL_STANDARD		-1234.12345678901234
+//CHINA001 #define SVX_NUMVAL_CURRENCY		-1234
+//CHINA001 #define SVX_NUMVAL_PERCENT		-0.1295
+//CHINA001 #define SVX_NUMVAL_TIME 		36525.5678935185
+//CHINA001 #define SVX_NUMVAL_DATE 		36525.5678935185
+//CHINA001 #define SVX_NUMVAL_BOOLEAN 		1
 
 //------------------------------------------------------------------------
 
@@ -59,15 +59,15 @@ class SvxNumberInfoItem;
 class SvxNumberPreviewImpl : public Window
 {
 private:
-    String          aPrevStr;
-    Color           aPrevCol;
+    String			aPrevStr;
+    Color			aPrevCol;
 
-    void            InitSettings( BOOL bForeground, BOOL bBackground );
+    void			InitSettings( BOOL bForeground, BOOL bBackground );
 
 protected:
-    virtual void    Paint( const Rectangle& rRect );
-    virtual void    StateChanged( StateChangedType nStateChange );
-    virtual void    DataChanged( const DataChangedEvent& rDCEvt );
+    virtual void	Paint( const Rectangle& rRect );
+    virtual void	StateChanged( StateChangedType nStateChange );
+    virtual void	DataChanged( const DataChangedEvent& rDCEvt );
 
 public:
     SvxNumberPreviewImpl( Window* pParent, const ResId& rResId );
@@ -93,83 +93,83 @@ public:
 #  define SfxTabPage ::SfxTabPage
 #endif
 
-    static SfxTabPage*      Create( Window* pParent,
+    static SfxTabPage*		Create( Window* pParent,
                                     const SfxItemSet& rAttrSet );
-    static USHORT*          GetRanges();
+    static USHORT*			GetRanges();
 
-    virtual BOOL            FillItemSet( SfxItemSet& rSet );
-    virtual void            Reset( const SfxItemSet& rSet );
-    virtual int             DeactivatePage  ( SfxItemSet* pSet = NULL );
+    virtual	BOOL 			FillItemSet( SfxItemSet& rSet );
+    virtual	void 			Reset( const SfxItemSet& rSet );
+    virtual int 			DeactivatePage	( SfxItemSet* pSet = NULL );
 
-    void                    SetInfoItem( const SvxNumberInfoItem& rItem );
-    void                    SetNumberFormatList( const SvxNumberInfoItem& rItem )
+    void					SetInfoItem( const SvxNumberInfoItem& rItem );
+    void					SetNumberFormatList( const SvxNumberInfoItem& rItem )
                                 { SetInfoItem( rItem ); }
 
-    void                    SetOkHdl( const Link& rOkHandler );
-    void                    HideLanguage(BOOL nFlag=TRUE);
-    virtual long            PreNotify( NotifyEvent& rNEvt );
-    virtual void            PageCreated (SfxAllItemSet aSet); //add CHINA001
+    void					SetOkHdl( const Link& rOkHandler );
+    void					HideLanguage(BOOL nFlag=TRUE);
+    virtual long			PreNotify( NotifyEvent& rNEvt );
+    virtual void			PageCreated (SfxAllItemSet aSet); //add CHINA001
 private:
-    SvxNumberFormatTabPage( Window* pParent,
+    SvxNumberFormatTabPage( Window*	pParent,
                             const SfxItemSet& rCoreAttrs );
-    FixedText               aFtCategory;
-    ListBox                 aLbCategory;
-    FixedText               aFtFormat;
-    ListBox                 aLbCurrency;
-    SvxFontListBox          aLbFormat;
-    FixedText               aFtLanguage;
-    SvxLanguageBox          aLbLanguage;
+    FixedText				aFtCategory;
+    ListBox					aLbCategory;
+    FixedText				aFtFormat;
+    ListBox					aLbCurrency;
+    SvxFontListBox			aLbFormat;
+    FixedText				aFtLanguage;
+    SvxLanguageBox			aLbLanguage;
     CheckBox                aCbSourceFormat;
 
-    FixedText               aFtDecimals;
-    NumericField            aEdDecimals;
-    FixedText               aFtLeadZeroes;
-    NumericField            aEdLeadZeroes;
-    CheckBox                aBtnNegRed;
-    CheckBox                aBtnThousand;
+    FixedText				aFtDecimals;
+    NumericField			aEdDecimals;
+    FixedText				aFtLeadZeroes;
+    NumericField			aEdLeadZeroes;
+    CheckBox				aBtnNegRed;
+    CheckBox				aBtnThousand;
     FixedLine               aFlOptions;
 
-    FixedText               aFtEdFormat;
-    Edit                    aEdFormat;
-    ImageButton             aIbAdd;
-    ImageButton             aIbInfo;
-    ImageButton             aIbRemove;
+    FixedText				aFtEdFormat;
+    Edit					aEdFormat;
+    ImageButton				aIbAdd;
+    ImageButton				aIbInfo;
+    ImageButton				aIbRemove;
 
-    FixedText               aFtComment;
-    Edit                    aEdComment;
-    Timer                   aResetWinTimer;
+    FixedText				aFtComment;
+    Edit					aEdComment;
+    Timer					aResetWinTimer;
 
-    SvxNumberPreviewImpl    aWndPreview;
+    SvxNumberPreviewImpl	aWndPreview;
 
-    SvxNumberInfoItem*      pNumItem;
-    SvxNumberFormatShell*   pNumFmtShell;
-    ULONG                   nInitFormat;
-    Link                    fnOkHdl;
+    SvxNumberInfoItem*		pNumItem;
+    SvxNumberFormatShell* 	pNumFmtShell;
+    ULONG					nInitFormat;
+    Link					fnOkHdl;
 
-    BOOL                    bNumItemFlag; //Fuer Handling mit DocShell
-    BOOL                    bOneAreaFlag;
-    short                   nFixedCategory;
+    BOOL					bNumItemFlag; //Fuer Handling mit DocShell
+    BOOL					bOneAreaFlag;
+    short					nFixedCategory;
 
-    long                    nCatHeight;
+    long					nCatHeight;
 
-    long                    nCurFormatY;
-    long                    nCurFormatHeight;
-    long                    nStdFormatY;
-    long                    nStdFormatHeight;
+    long					nCurFormatY;
+    long					nCurFormatHeight;
+    long					nStdFormatY;
+    long					nStdFormatHeight;
     LocalizedString sAutomaticEntry;
 
-    Window*                 pLastActivWindow;
+    Window*					pLastActivWindow;
 
 #ifdef _SVX_NUMFMT_CXX
-    void    Init_Impl();
-    void    FillCurrencyBox();
-    void    FillFormatListBox_Impl( SvxDelStrgs& rEntries );
-    void    UpdateOptions_Impl( BOOL bCheckCatChange );
-    void    UpdateFormatListBox_Impl( USHORT bCat, BOOL bUpdateEdit );
-    void    DeleteEntryList_Impl( SvxDelStrgs& rEntries );
-    void    Obstructing();
+    void 	Init_Impl();
+    void	FillCurrencyBox();
+    void 	FillFormatListBox_Impl( SvxDelStrgs& rEntries );
+    void 	UpdateOptions_Impl( BOOL bCheckCatChange );
+    void	UpdateFormatListBox_Impl( USHORT bCat, BOOL bUpdateEdit );
+    void	DeleteEntryList_Impl( SvxDelStrgs& rEntries );
+    void	Obstructing();
     void    EnableBySourceFormat_Impl();
-    void    SetCategory( USHORT nPos );
+    void	SetCategory( USHORT nPos );
     String  GetExpColorString( Color*& rpPreviewColor, const String& aFormatStr, short nTmpCatPos );
     void    MakePreviewText( const String& rFormat );
     void    ChangePreviewText( USHORT nPos );
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index c56001f196f5..af53605cb1e7 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,12 +55,12 @@ class SvxBrushItem;
 
 struct SvxNumSettings_Impl
 {
-    short           nNumberType;
-    short           nParentNumbering;
-    rtl::OUString   sPrefix;
-    rtl::OUString   sSuffix;
-    rtl::OUString   sBulletChar;
-    rtl::OUString   sBulletFont;
+    short			nNumberType;
+    short 			nParentNumbering;
+    rtl::OUString	sPrefix;
+    rtl::OUString	sSuffix;
+    rtl::OUString	sBulletChar;
+    rtl::OUString	sBulletFont;
     SvxNumSettings_Impl() :
         nNumberType(0),
         nParentNumbering(0)
@@ -79,16 +79,16 @@ class SvxSingleNumPickTabPage : public SfxTabPage
     using TabPage::DeactivatePage;
 
     FixedLine               aValuesFL;
-    SvxNumValueSet*         pExamplesVS;
-    SvxNumSettingsArr_Impl  aNumSettingsArr;
-    SvxNumRule*             pActNum;
-    SvxNumRule*             pSaveNum;
-    USHORT                  nActNumLvl;
-    BOOL                    bModified   : 1;
-    BOOL                    bPreset     : 1;
+    SvxNumValueSet* 		pExamplesVS;
+    SvxNumSettingsArr_Impl	aNumSettingsArr;
+    SvxNumRule* 			pActNum;
+    SvxNumRule* 			pSaveNum;
+    USHORT					nActNumLvl;
+    BOOL					bModified 	: 1;
+    BOOL					bPreset		: 1;
 
-    String              sNumCharFmtName;
-    USHORT              nNumItemId;
+    String				sNumCharFmtName;
+    USHORT 				nNumItemId;
 
     protected:
         DECL_LINK( NumSelectHdl_Impl, ValueSet*);
@@ -99,15 +99,15 @@ class SvxSingleNumPickTabPage : public SfxTabPage
                                const SfxItemSet& rSet);
         ~SvxSingleNumPickTabPage();
 
-    static SfxTabPage*  Create( Window* pParent,
+    static SfxTabPage*	Create( Window* pParent,
                                 const SfxItemSet& rAttrSet);
 
-    virtual void        ActivatePage(const SfxItemSet& rSet);
-    virtual int         DeactivatePage(SfxItemSet *pSet);
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual void 		ActivatePage(const SfxItemSet& rSet);
+    virtual int 		DeactivatePage(SfxItemSet *pSet);
+    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	void 		Reset( const SfxItemSet& rSet );
 
-    void                SetNumCharFmtName(const String& rName){sNumCharFmtName = rName;}
+    void				SetNumCharFmtName(const String& rName){sNumCharFmtName = rName;}
 };
 
 /*-----------------07.02.97 11.36-------------------
@@ -120,15 +120,15 @@ class SvxBulletPickTabPage : public SfxTabPage
     using TabPage::DeactivatePage;
 
     FixedLine           aValuesFL;
-    SvxNumValueSet*     pExamplesVS;
-    SvxNumRule*         pActNum;
-    SvxNumRule*         pSaveNum;
-    USHORT              nActNumLvl;
-    BOOL                bModified   : 1;
-    BOOL                bPreset     : 1;
-    USHORT              nNumItemId;
-
-    String              sBulletCharFmtName;
+    SvxNumValueSet*		pExamplesVS;
+    SvxNumRule* 		pActNum;
+    SvxNumRule* 		pSaveNum;
+    USHORT 				nActNumLvl;
+    BOOL				bModified 	: 1;
+    BOOL				bPreset		: 1;
+    USHORT 				nNumItemId;
+
+    String				sBulletCharFmtName;
     protected:
         DECL_LINK(NumSelectHdl_Impl, ValueSet*);
         DECL_LINK( DoubleClickHdl_Impl, ValueSet* );
@@ -137,16 +137,16 @@ class SvxBulletPickTabPage : public SfxTabPage
                                const SfxItemSet& rSet);
         ~SvxBulletPickTabPage();
 
-    static SfxTabPage*  Create( Window* pParent,
+    static SfxTabPage*	Create( Window* pParent,
                                 const SfxItemSet& rAttrSet);
 
-    virtual void        ActivatePage(const SfxItemSet& rSet);
-    virtual int         DeactivatePage(SfxItemSet *pSet);
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual void 		ActivatePage(const SfxItemSet& rSet);
+    virtual int 		DeactivatePage(SfxItemSet *pSet);
+    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	void 		Reset( const SfxItemSet& rSet );
 
-    void                SetCharFmtName(const String& rName){sBulletCharFmtName = rName;}
-    virtual void        PageCreated(SfxAllItemSet aSet); // add CHINA001
+    void				SetCharFmtName(const String& rName){sBulletCharFmtName = rName;}
+    virtual void 		PageCreated(SfxAllItemSet aSet); // add CHINA001
 };
 
 /*-----------------07.02.97 11.36-------------------
@@ -160,18 +160,18 @@ class SvxNumPickTabPage : public SfxTabPage
     using TabPage::DeactivatePage;
 
     FixedLine           aValuesFL;
-    SvxNumValueSet*     pExamplesVS;
-    String              sNumCharFmtName;
-    String              sBulletCharFmtName;
+    SvxNumValueSet*		pExamplesVS;
+    String				sNumCharFmtName;
+    String				sBulletCharFmtName;
 
-    SvxNumSettingsArr_Impl  aNumSettingsArrays[NUM_VALUSET_COUNT];  // wird mit den fuenf Formaten initialisiert
+    SvxNumSettingsArr_Impl	aNumSettingsArrays[NUM_VALUSET_COUNT];	// wird mit den fuenf Formaten initialisiert
 
-    SvxNumRule*         pActNum;
-    SvxNumRule*         pSaveNum;
-    USHORT              nActNumLvl;
-    USHORT              nNumItemId;
-    BOOL                bModified   : 1;
-    BOOL                bPreset     : 1;
+    SvxNumRule* 		pActNum;
+    SvxNumRule* 		pSaveNum;
+    USHORT 				nActNumLvl;
+    USHORT 				nNumItemId;
+    BOOL				bModified 	: 1;
+    BOOL				bPreset		: 1;
 
 
     protected:
@@ -183,18 +183,18 @@ class SvxNumPickTabPage : public SfxTabPage
                                const SfxItemSet& rSet);
         ~SvxNumPickTabPage();
 
-    static SfxTabPage*  Create( Window* pParent,
+    static SfxTabPage*	Create( Window* pParent,
                                 const SfxItemSet& rAttrSet);
 
-    virtual void        ActivatePage(const SfxItemSet& rSet);
-    virtual int         DeactivatePage(SfxItemSet *pSet);
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual void 		ActivatePage(const SfxItemSet& rSet);
+    virtual int 		DeactivatePage(SfxItemSet *pSet);
+    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	void 		Reset( const SfxItemSet& rSet );
 
-    void                SetCharFmtNames(const String& rCharName, const String& rBulName)
-                            {   sNumCharFmtName = rCharName;
+    void				SetCharFmtNames(const String& rCharName, const String& rBulName)
+                            {	sNumCharFmtName = rCharName;
                                 sBulletCharFmtName = rBulName;}
-    virtual void        PageCreated(SfxAllItemSet aSet); // add CHINA001
+    virtual void 		PageCreated(SfxAllItemSet aSet); // add CHINA001
 };
 
 /*-----------------12.02.97 07.42-------------------
@@ -206,20 +206,20 @@ class SvxBitmapPickTabPage : public SfxTabPage
     using TabPage::DeactivatePage;
 
     FixedLine           aValuesFL;
-    SvxBmpNumValueSet*  pExamplesVS;
-    FixedText           aErrorText;
-    CheckBox            aLinkedCB;
+    SvxBmpNumValueSet* 	pExamplesVS;
+    FixedText			aErrorText;
+    CheckBox			aLinkedCB;
 
-    List                aGrfNames;
-    String              sNumCharFmtName;
+    List				aGrfNames;
+    String				sNumCharFmtName;
 
-    SvxNumRule*         pActNum;
-    SvxNumRule*         pSaveNum;
-    USHORT              nActNumLvl;
-    USHORT              nNumItemId;
-    SfxMapUnit          eCoreUnit;
-    BOOL                bModified   : 1;
-    BOOL                bPreset     : 1;
+    SvxNumRule* 		pActNum;
+    SvxNumRule* 		pSaveNum;
+    USHORT 				nActNumLvl;
+    USHORT 				nNumItemId;
+    SfxMapUnit			eCoreUnit;
+    BOOL				bModified 	: 1;
+    BOOL				bPreset		: 1;
 
     protected:
         DECL_LINK( NumSelectHdl_Impl, ValueSet*);
@@ -231,15 +231,15 @@ class SvxBitmapPickTabPage : public SfxTabPage
                                const SfxItemSet& rSet);
         ~SvxBitmapPickTabPage();
 
-    static SfxTabPage*  Create( Window* pParent,
+    static SfxTabPage*	Create( Window* pParent,
                                 const SfxItemSet& rAttrSet);
 
-    virtual void        ActivatePage(const SfxItemSet& rSet);
-    virtual int         DeactivatePage(SfxItemSet *pSet);
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual void 		ActivatePage(const SfxItemSet& rSet);
+    virtual int 		DeactivatePage(SfxItemSet *pSet);
+    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	void 		Reset( const SfxItemSet& rSet );
 
-    void                SetNumCharFmtName(const String& rName){sNumCharFmtName = rName;}
+    void				SetNumCharFmtName(const String& rName){sNumCharFmtName = rName;}
 };
 
 /*-----------------01.12.97 16:13-------------------
@@ -252,71 +252,71 @@ class SvxNumOptionsTabPage : public SfxTabPage
 
     FixedLine       aFormatFL;
     FixedText       aLevelFT;
-    MultiListBox    aLevelLB;
+    MultiListBox	aLevelLB;
 
     FixedText       aFmtFT;
-    ListBox         aFmtLB;
-    FixedText       aPrefixFT;
-    Edit            aPrefixED;
-    FixedText       aSuffixFT;
-    Edit            aSuffixED;
-    FixedText       aCharFmtFT;
-    ListBox         aCharFmtLB;
-    FixedText       aBulColorFT;
-    ColorListBox    aBulColLB;
-    FixedText       aBulRelSizeFT;
-    MetricField     aBulRelSizeMF;
+    ListBox     	aFmtLB;
+    FixedText   	aPrefixFT;
+    Edit        	aPrefixED;
+    FixedText   	aSuffixFT;
+    Edit        	aSuffixED;
+    FixedText		aCharFmtFT;
+    ListBox			aCharFmtLB;
+    FixedText		aBulColorFT;
+    ColorListBox	aBulColLB;
+    FixedText 		aBulRelSizeFT;
+    MetricField		aBulRelSizeMF;
     FixedText       aAllLevelFT;
-    NumericField    aAllLevelNF;
+    NumericField	aAllLevelNF;
     FixedText       aStartFT;
     NumericField    aStartED;
     PushButton      aBulletPB;
-    FixedText       aAlignFT;
-    ListBox         aAlignLB;
-    FixedText       aBitmapFT;
+    FixedText		aAlignFT;
+    ListBox			aAlignLB;
+    FixedText 		aBitmapFT;
     MenuButton      aBitmapMB;
-    FixedText       aSizeFT;
-    MetricField     aWidthMF;
-    FixedText       aMultFT;
-    MetricField     aHeightMF;
-    CheckBox        aRatioCB;
-    FixedText       aOrientFT;
-    ListBox         aOrientLB;
+    FixedText 		aSizeFT;
+    MetricField		aWidthMF;
+    FixedText		aMultFT;
+    MetricField		aHeightMF;
+    CheckBox		aRatioCB;
+    FixedText		aOrientFT;
+    ListBox			aOrientLB;
 
     FixedLine       aSameLevelFL;
-    CheckBox        aSameLevelCB;
+    CheckBox		aSameLevelCB;
 
-    String          sNumCharFmtName;
-    String          sBulletCharFmtName;
+    String 			sNumCharFmtName;
+    String 			sBulletCharFmtName;
 
     Timer           aInvalidateTimer;
 
-    SvxNumberingPreview*    pPreviewWIN;
+    SvxNumberingPreview*	pPreviewWIN;
 
-    SvxNumRule*         pActNum;
-    SvxNumRule*         pSaveNum;
+    SvxNumRule* 		pActNum;
+    SvxNumRule* 		pSaveNum;
 
-    Size                aInitSize[SVX_MAX_NUM];
+    Size				aInitSize[SVX_MAX_NUM];
 
-    BOOL                bLastWidthModified  : 1;
-    BOOL                bModified           : 1;
-    BOOL                bPreset             : 1;
-    BOOL                bAutomaticCharStyles: 1;
-    BOOL                bHTMLMode           : 1;
-    BOOL                bMenuButtonInitialized : 1;
+    BOOL				bLastWidthModified 	: 1;
+    BOOL				bModified 			: 1;
+    BOOL				bPreset				: 1;
+    BOOL				bAutomaticCharStyles: 1;
+    BOOL 				bHTMLMode 			: 1;
+    BOOL				bMenuButtonInitialized : 1;
 
-    List                aGrfNames;
-    Font                aActBulletFont;
-    String              sBullet;
-    String              sStartWith;
+    List				aGrfNames;
+    Font            	aActBulletFont;
+    String				sBullet;
+    String				sStartWith;
 
-    BYTE                nBullet;
-    USHORT              nActNumLvl;
-    USHORT              nNumItemId;
-    SfxMapUnit          eCoreUnit;
+    BYTE            	nBullet;
+    USHORT				nActNumLvl;
+    USHORT 				nNumItemId;
+    SfxMapUnit			eCoreUnit;
 
-    void                InitControls();
-    void                SwitchNumberType( BYTE nType, BOOL bBmp = FALSE );
+    void				InitControls();
+    void				SwitchNumberType( BYTE nType, BOOL bBmp = FALSE );
     void                CheckForStartValue_Impl(sal_uInt16 nNumberingType);
 
         DECL_LINK( NumberTypeSelectHdl_Impl, ListBox * );
@@ -342,25 +342,25 @@ class SvxNumOptionsTabPage : public SfxTabPage
                                const SfxItemSet& rSet);
         ~SvxNumOptionsTabPage();
 
-    static SfxTabPage*  Create( Window* pParent,
+    static SfxTabPage*	Create( Window* pParent,
                                 const SfxItemSet& rAttrSet);
 
-    virtual void        ActivatePage(const SfxItemSet& rSet);
-    virtual int         DeactivatePage(SfxItemSet *pSet);
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual void 		ActivatePage(const SfxItemSet& rSet);
+    virtual int 		DeactivatePage(SfxItemSet *pSet);
+    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	void 		Reset( const SfxItemSet& rSet );
 
-//???   void                SetWrtShell(SwWrtShell* pSh);
-    void                SetCharFmts(const String& rNumName, const String& rBulletName )
+//???	void				SetWrtShell(SwWrtShell* pSh);
+    void				SetCharFmts(const String& rNumName, const String& rBulletName )
                                 {
                                     sNumCharFmtName = rNumName;
                                     sBulletCharFmtName = rBulletName;
                                 }
-    void                SetMetric(FieldUnit eSet);
+    void				SetMetric(FieldUnit eSet);
 
-    ListBox&            GetCharFmtListBox() {return aCharFmtLB;}
-    void                SetModified(BOOL bRepaint = TRUE);
-    virtual void        PageCreated(SfxAllItemSet aSet); // add CHINA001
+    ListBox&			GetCharFmtListBox() {return aCharFmtLB;}
+    void				SetModified(BOOL bRepaint = TRUE);
+    virtual void 		PageCreated(SfxAllItemSet aSet); // add CHINA001
 };
 
 /*-----------------03.12.97 10:18-------------------
@@ -377,15 +377,15 @@ class SvxNumPositionTabPage : public SfxTabPage
 
     // former set of controls shown for numbering rules containing list level
     // attributes in SvxNumberFormat::SvxNumPositionAndSpaceMode == LABEL_WIDTH_AND_POSITION
-    FixedText           aDistBorderFT;
-    MetricField         aDistBorderMF;
-    CheckBox            aRelativeCB;
-    FixedText           aIndentFT;
-    MetricField         aIndentMF;
-    FixedText           aDistNumFT;
-    MetricField         aDistNumMF;
-    FixedText           aAlignFT;
-    ListBox             aAlignLB;
+    FixedText       	aDistBorderFT;
+    MetricField			aDistBorderMF;
+    CheckBox			aRelativeCB;
+    FixedText			aIndentFT;
+    MetricField			aIndentMF;
+    FixedText       	aDistNumFT;
+    MetricField			aDistNumMF;
+    FixedText			aAlignFT;
+    ListBox				aAlignLB;
     // <--
 
     // new set of controls shown for numbering rules containing list level
@@ -402,23 +402,23 @@ class SvxNumPositionTabPage : public SfxTabPage
     MetricField         aIndentAtMF;
     // <--
 
-    PushButton          aStandardPB;
+    PushButton			aStandardPB;
 
 #if OSL_DEBUG_LEVEL > 1
-    FixedText*          pDebugFixedText;
+    FixedText* 			pDebugFixedText;
 #endif
     SvxNumberingPreview* pPreviewWIN;
 
-    SvxNumRule*         pActNum;
-    SvxNumRule*         pSaveNum;
+    SvxNumRule* 		pActNum;
+    SvxNumRule* 		pSaveNum;
 
-    USHORT              nActNumLvl;
-    USHORT              nNumItemId;
-    SfxMapUnit          eCoreUnit;
+    USHORT				nActNumLvl;
+    USHORT 				nNumItemId;
+    SfxMapUnit			eCoreUnit;
 
-    BOOL                bModified           : 1;
-    BOOL                bPreset             : 1;
-    BOOL                bInInintControl     : 1;  //Modify-Fehler umgehen, soll ab 391 behoben sein
+    BOOL				bModified 			: 1;
+    BOOL				bPreset				: 1;
+    BOOL				bInInintControl		: 1;  //Modify-Fehler umgehen, soll ab 391 behoben sein
     bool                bLabelAlignmentPosAndSpaceModeActive;
 
     void                InitControls();
@@ -442,17 +442,17 @@ public:
                                const SfxItemSet& rSet);
         ~SvxNumPositionTabPage();
 
-    virtual void        ActivatePage(const SfxItemSet& rSet);
-    virtual int         DeactivatePage(SfxItemSet *pSet);
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual void 		ActivatePage(const SfxItemSet& rSet);
+    virtual int 		DeactivatePage(SfxItemSet *pSet);
+    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	void 		Reset( const SfxItemSet& rSet );
 
-    static SfxTabPage*  Create( Window* pParent,
+    static SfxTabPage*	Create( Window* pParent,
                                 const SfxItemSet& rAttrSet);
 
-    void                SetMetric(FieldUnit eSet);
-    void                SetModified(BOOL bRepaint = TRUE);
-    virtual void        PageCreated(SfxAllItemSet aSet); // add CHINA001
+    void				SetMetric(FieldUnit eSet);
+    void				SetModified(BOOL bRepaint = TRUE);
+    virtual void 		PageCreated(SfxAllItemSet aSet); // add CHINA001
 };
 
 #endif
diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx
index ac558573f048..50c903c3000f 100644
--- a/cui/source/inc/optasian.hxx
+++ b/cui/source/inc/optasian.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ struct SvxAsianLayoutPage_Impl;
 class SvxAsianLayoutPage : public SfxTabPage
 {
     FixedLine    aKerningGB;
-    RadioButton aCharKerningRB;
-    RadioButton aCharPunctKerningRB;
+    RadioButton	aCharKerningRB;
+    RadioButton	aCharPunctKerningRB;
 
     FixedLine    aCharDistGB;
-    RadioButton aNoCompressionRB;
-    RadioButton aPunctCompressionRB;
-    RadioButton aPunctKanaCompressionRB;
+    RadioButton	aNoCompressionRB;
+    RadioButton	aPunctCompressionRB;
+    RadioButton	aPunctKanaCompressionRB;
 
     FixedLine    aStartEndGB;
 
-    FixedText       aLanguageFT;
-    SvxLanguageBox  aLanguageLB;
-    CheckBox        aStandardCB;
+    FixedText  		aLanguageFT;
+    SvxLanguageBox	aLanguageLB;
+    CheckBox   		aStandardCB;
 
-    FixedText   aStartFT;
-    Edit        aStartED;
-    FixedText   aEndFT;
-    Edit        aEndED;
-    FixedText   aHintFT;
+    FixedText	aStartFT;
+    Edit		aStartED;
+    FixedText	aEndFT;
+    Edit		aEndED;
+    FixedText	aHintFT;
 
     SvxAsianLayoutPage_Impl* pImpl;
 
@@ -70,10 +70,10 @@ public:
 
     virtual ~SvxAsianLayoutPage();
 
-    static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
+    static SfxTabPage*	Create( Window* pParent, const SfxItemSet& rAttrSet );
     static UINT16*      GetRanges();
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	void 		Reset( const SfxItemSet& rSet );
 };
 
 #endif
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index ca1d0f395344..79632c91a10b 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,17 +62,17 @@ namespace linguistic2{
 class SvxNewDictionaryDialog : public ModalDialog
 {
 private:
-    FixedText           aNameText;
-    Edit                aNameEdit;
-    FixedText           aLanguageText;
-    SvxLanguageBox      aLanguageLB;
-    CheckBox            aExceptBtn;
+    FixedText			aNameText;
+    Edit				aNameEdit;
+    FixedText			aLanguageText;
+    SvxLanguageBox		aLanguageLB;
+    CheckBox			aExceptBtn;
     FixedLine            aNewDictBox;
-    OKButton            aOKBtn;
-    CancelButton        aCancelBtn;
-    HelpButton          aHelpBtn;
+    OKButton			aOKBtn;
+    CancelButton		aCancelBtn;
+    HelpButton			aHelpBtn;
     ::com::sun::star::uno::Reference<
-        ::com::sun::star::linguistic2::XSpellChecker1 >     xSpell;
+        ::com::sun::star::linguistic2::XSpellChecker1 > 	xSpell;
     ::com::sun::star::uno::Reference<
         ::com::sun::star::linguistic2::XDictionary >    xNewDic;
 
@@ -95,20 +95,20 @@ public:
 
 class SvxDictEdit : public Edit
 {
-    Link    aActionLink;
-    sal_Bool    bSpaces;
+    Link 	aActionLink;
+    sal_Bool 	bSpaces;
 
     public:
                     SvxDictEdit(Window* pParent, const ResId& rResId) :
                         Edit(pParent, rResId), bSpaces(sal_False){}
 
-    void            SetActionHdl( const Link& rLink )
+    void 			SetActionHdl( const Link& rLink )
                                 { aActionLink = rLink;}
 
-    void            SetSpaces(sal_Bool bSet)
+    void 			SetSpaces(sal_Bool bSet)
                                 {bSpaces = bSet;}
 
-    virtual void    KeyInput( const KeyEvent& rKEvent );
+    virtual void	KeyInput( const KeyEvent& rKEvent );
 };
 
 // class SvxEditDictionaryDialog -----------------------------------------
@@ -117,37 +117,37 @@ class SvxEditDictionaryDialog : public ModalDialog
 {
 private:
 
-    FixedText               aBookFT;
-    ListBox                 aAllDictsLB;
-    FixedText               aLangFT;
-    SvxLanguageBox          aLangLB;
-
-    FixedText               aWordFT;
-    SvxDictEdit             aWordED;
-    FixedText               aReplaceFT;
-    SvxDictEdit             aReplaceED;
-    SvTabListBox            aWordsLB;
-    PushButton              aNewReplacePB;
-    PushButton              aDeletePB;
+    FixedText				aBookFT;
+    ListBox					aAllDictsLB;
+    FixedText				aLangFT;
+    SvxLanguageBox			aLangLB;
+
+    FixedText				aWordFT;
+    SvxDictEdit				aWordED;
+    FixedText				aReplaceFT;
+    SvxDictEdit				aReplaceED;
+    SvTabListBox 			aWordsLB;
+    PushButton 				aNewReplacePB;
+    PushButton 				aDeletePB;
     FixedLine                aEditDictsBox;
 
-    CancelButton            aCloseBtn;
-    HelpButton              aHelpBtn;
-    String                  sModify;
-    String                  sNew;
-    DecorationView          aDecoView;
+    CancelButton			aCloseBtn;
+    HelpButton				aHelpBtn;
+    String					sModify;
+    String					sNew;
+    DecorationView			aDecoView;
 
     ::com::sun::star::uno::Sequence<
         ::com::sun::star::uno::Reference<
-            ::com::sun::star::linguistic2::XDictionary >  > aDics;  //! snapshot copy to work on
+            ::com::sun::star::linguistic2::XDictionary >  >	aDics;	//! snapshot copy to work on
     ::com::sun::star::uno::Reference<
-        ::com::sun::star::linguistic2::XSpellChecker1 >     xSpell;
+        ::com::sun::star::linguistic2::XSpellChecker1 >		xSpell;
 
-    short               nOld;
-    long                nWidth;
-    sal_Bool            bFirstSelect;
-    sal_Bool            bDoNothing;
-    BOOL                bDicIsReadonly;
+    short				nOld;
+    long				nWidth;
+    sal_Bool			bFirstSelect;
+    sal_Bool			bDoNothing;
+    BOOL				bDicIsReadonly;
 
 #ifdef _SVX_OPTDICT_CXX
     DECL_LINK( SelectBookHdl_Impl, ListBox * );
@@ -157,20 +157,20 @@ private:
     DECL_LINK(ModifyHdl, Edit*);
 
 
-    void            ShowWords_Impl( sal_uInt16 nId );
-    void            SetLanguage_Impl( ::com::sun::star::util::Language nLanguage );
-    sal_Bool            IsDicReadonly_Impl() const { return bDicIsReadonly; }
-    void            SetDicReadonly_Impl( ::com::sun::star::uno::Reference<
+    void			ShowWords_Impl( sal_uInt16 nId );
+    void			SetLanguage_Impl( ::com::sun::star::util::Language nLanguage );
+    sal_Bool			IsDicReadonly_Impl() const { return bDicIsReadonly; }
+    void			SetDicReadonly_Impl( ::com::sun::star::uno::Reference<
                             ::com::sun::star::linguistic2::XDictionary >  &xDic );
 
-    void            RemoveDictEntry(SvLBoxEntry* pEntry);
-    USHORT          GetLBInsertPos(const String &rDicWord);
+    void			RemoveDictEntry(SvLBoxEntry* pEntry);
+    USHORT			GetLBInsertPos(const String &rDicWord);
 
 #endif
 
 protected:
 
-    virtual void    Paint( const Rectangle& rRect );
+    virtual void	Paint( const Rectangle& rRect );
 
 public:
     SvxEditDictionaryDialog( Window* pParent,
diff --git a/cui/source/inc/optimprove.hxx b/cui/source/inc/optimprove.hxx
index 532a9fcc68d7..91b8a6b9e524 100644
--- a/cui/source/inc/optimprove.hxx
+++ b/cui/source/inc/optimprove.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index 303ca2558ae3..9bc198eb05c6 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,35 +57,35 @@ class SvxLinguData_Impl;
 
 // define ----------------------------------------------------------------
 
-#define GROUP_MODULES   ((sal_uInt16)0x0008)
+#define GROUP_MODULES	((sal_uInt16)0x0008)
 
 // forward ---------------------------------------------------------------
 
 class SvxEditModulesDlg : public ModalDialog
 {
     FixedLine           aModulesFL;
-    FixedText           aLanguageFT;
-    SvxLanguageBox      aLanguageLB;
+    FixedText			aLanguageFT;
+    SvxLanguageBox		aLanguageLB;
 
-    SvxCheckListBox     aModulesCLB;
-    PushButton          aPrioUpPB;
-    PushButton          aPrioDownPB;
-    PushButton          aBackPB;
+    SvxCheckListBox		aModulesCLB;
+    PushButton			aPrioUpPB;
+    PushButton			aPrioDownPB;
+    PushButton			aBackPB;
     svt::FixedHyperlink aMoreDictsLink;
 
     FixedLine           aButtonsFL;
     HelpButton          aHelpPB;
     OKButton            aClosePB;
 
-    String              sSpell;
-    String              sHyph;
-    String              sThes;
+    String 				sSpell;
+    String 				sHyph;
+    String 				sThes;
     String              sGrammar;
 
     SvxLinguData_Impl*  pDefaultLinguData;
-    SvxLinguData_Impl&  rLinguData;
+    SvxLinguData_Impl& 	rLinguData;
 
-    SvLBoxButtonData*   pCheckButtonData;
+    SvLBoxButtonData*	pCheckButtonData;
 
     SvLBoxEntry*    CreateEntry(String& rTxt, USHORT nCol);
 
@@ -102,7 +102,7 @@ class SvxEditModulesDlg : public ModalDialog
 
 public:
     SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData);
-    virtual ~SvxEditModulesDlg();
+    virtual	~SvxEditModulesDlg();
 };
 
 // class SvxLinguTabPage -------------------------------------------------
@@ -111,46 +111,46 @@ class SvxLinguTabPage : public SfxTabPage
 {
 private:
     FixedLine           aLinguisticFL;
-    FixedText           aLinguModulesFT;
-    SvxCheckListBox     aLinguModulesCLB;
-    PushButton          aLinguModulesEditPB;
+    FixedText			aLinguModulesFT;
+    SvxCheckListBox		aLinguModulesCLB;
+    PushButton			aLinguModulesEditPB;
     FixedText           aLinguDicsFT;
     SvxCheckListBox     aLinguDicsCLB;
     PushButton          aLinguDicsNewPB;
     PushButton          aLinguDicsEditPB;
     PushButton          aLinguDicsDelPB;
-    FixedText           aLinguOptionsFT;
-    SvxCheckListBox     aLinguOptionsCLB;
-    PushButton          aLinguOptionsEditPB;
+    FixedText			aLinguOptionsFT;
+    SvxCheckListBox		aLinguOptionsCLB;
+    PushButton			aLinguOptionsEditPB;
     svt::FixedHyperlink aMoreDictsLink;
 
-    String              sCapitalWords;
-    String              sWordsWithDigits;
-    String              sCapitalization;
-    String              sSpellSpecial;
-    String              sSpellAuto;
+    String				sCapitalWords;
+    String				sWordsWithDigits;
+    String				sCapitalization;
+    String				sSpellSpecial;
+    String				sSpellAuto;
     String              sGrammarAuto;
-    String              sNumMinWordlen;
-    String              sNumPreBreak;
-    String              sNumPostBreak;
-    String              sHyphAuto;
-    String              sHyphSpecial;
+    String				sNumMinWordlen;
+    String				sNumPreBreak;
+    String				sNumPostBreak;
+    String				sHyphAuto;
+    String				sHyphSpecial;
 
     com::sun::star::uno::Reference<
-        com::sun::star::beans::XPropertySet >   xProp;
+        com::sun::star::beans::XPropertySet >	xProp;
 
     com::sun::star::uno::Reference<
-        com::sun::star::linguistic2::XDictionaryList >      xDicList;
+        com::sun::star::linguistic2::XDictionaryList >		xDicList;
     com::sun::star::uno::Sequence<
         com::sun::star::uno::Reference<
-            com::sun::star::linguistic2::XDictionary > >    aDics;
+            com::sun::star::linguistic2::XDictionary > >	aDics;
 
-    SvLBoxButtonData*   pCheckButtonData;
+    SvLBoxButtonData*	pCheckButtonData;
 
-    SvxLinguData_Impl*  pLinguData;
+    SvxLinguData_Impl* 	pLinguData;
 
     SvxLinguTabPage( Window* pParent, const SfxItemSet& rCoreSet );
-    SvLBoxEntry*    CreateEntry(String& rTxt, USHORT nCol);
+    SvLBoxEntry*	CreateEntry(String& rTxt, USHORT nCol);
 
     void    AddDicBoxEntry( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, USHORT nIdx );
     ULONG   GetDicUserData( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, USHORT nIdx );
@@ -168,14 +168,14 @@ private:
 #endif
 
 public:
-    virtual             ~SvxLinguTabPage();
-    static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
-    static sal_uInt16*  GetRanges();
+    virtual				~SvxLinguTabPage();
+    static SfxTabPage*	Create( Window* pParent, const SfxItemSet& rSet );
+    static sal_uInt16*	GetRanges();
 
-    virtual sal_Bool    FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual	sal_Bool 	FillItemSet( SfxItemSet& rSet );
+    virtual	void 		Reset( const SfxItemSet& rSet );
 
-    void                HideGroups( sal_uInt16 nGrp );
+    void				HideGroups( sal_uInt16 nGrp );
 };
 
 #endif
diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx
index ab72fe4a4773..98706556cc78 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,15 +64,15 @@ class SvxPathTabPage : public SfxTabPage
 {
 private:
     FixedLine           aStdBox;
-    FixedText           aTypeText;
-    FixedText           aPathText;
+    FixedText			aTypeText;
+    FixedText			aPathText;
     SvxControlFocusHelper aPathCtrl;
-    PushButton          aStandardBtn;
-    PushButton          aPathBtn;
+    PushButton			aStandardBtn;
+    PushButton      	aPathBtn;
 
-    HeaderBar*                  pHeaderBar;
-    ::svx::OptHeaderTabListBox* pPathBox;
-    OptPath_Impl*               pImpl;
+    HeaderBar*					pHeaderBar;
+    ::svx::OptHeaderTabListBox*	pPathBox;
+    OptPath_Impl*				pImpl;
 
     ::com::sun::star::uno::Reference< ::svt::DialogClosedListener > xDialogListener;
     ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFolderPicker > xFolderPicker;
@@ -99,11 +99,11 @@ public:
     SvxPathTabPage( Window* pParent, const SfxItemSet& rSet );
     ~SvxPathTabPage();
 
-    static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
-    static USHORT*      GetRanges();
+    static SfxTabPage*	Create( Window* pParent, const SfxItemSet& rSet );
+    static USHORT*		GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	void 		Reset( const SfxItemSet& rSet );
     virtual void        FillUserData();
 };
 
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index 8fba32b2bbd1..c5b9ccaa72c8 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 //CHINA001 enum SvxModeType
 //CHINA001 {
-//CHINA001  SVX_PAGE_MODE_STANDARD,
-//CHINA001  SVX_PAGE_MODE_CENTER,
-//CHINA001  SVX_PAGE_MODE_PRESENTATION
+//CHINA001 	SVX_PAGE_MODE_STANDARD,
+//CHINA001 	SVX_PAGE_MODE_CENTER,
+//CHINA001 	SVX_PAGE_MODE_PRESENTATION
 //CHINA001 };
 
 // class SvxPageDescPage -------------------------------------------------
@@ -85,8 +85,8 @@
         <SvxLRSpaceItem>:       <SID_ATTR_LRSPACE>
 */
 
-struct  SvxPage_Impl;
-typedef USHORT MarginPosition;
+struct	SvxPage_Impl;
+typedef	USHORT MarginPosition;
 
 class SvxPageDescPage : public SfxTabPage
 {
@@ -109,8 +109,8 @@ class SvxPageDescPage : public SfxTabPage
 
     SvxPageWindow       aBspWin;
 
-    FixedText                   aTextFlowLbl;
-    svx::FrameDirectionListBox  aTextFlowBox;
+    FixedText           		aTextFlowLbl;
+    svx::FrameDirectionListBox	aTextFlowBox;
 
     FixedText           aPaperTrayLbl;
     ListBox             aPaperTrayBox;
@@ -130,7 +130,7 @@ class SvxPageDescPage : public SfxTabPage
     FixedLine           aLayoutFL;
     FixedText           aPageText;
     ListBox             aLayoutBox;
-    FixedText           aNumberFormatText;
+    FixedText			aNumberFormatText;
     ListBox             aNumberFormatBox;
 
     FixedLine           aBottomSeparatorFl;
@@ -144,26 +144,26 @@ class SvxPageDescPage : public SfxTabPage
     CheckBox            aAdaptBox;
 
     //Register Writer
-    CheckBox            aRegisterCB;
-    FixedText           aRegisterFT;
-    ListBox             aRegisterLB;
+    CheckBox			aRegisterCB;
+    FixedText			aRegisterFT;
+    ListBox				aRegisterLB;
 
-    String              sStandardRegister;
+    String				sStandardRegister;
 
     String              aInsideText;
     String              aOutsideText;
     String              aLeftText;
     String              aRightText;
-    String              aPrintRangeQueryText;
+    String				aPrintRangeQueryText;
 
-    long                nFirstLeftMargin;
-    long                nFirstRightMargin;
-    long                nFirstTopMargin;
-    long                nFirstBottomMargin;
-    long                nLastLeftMargin;
-    long                nLastRightMargin;
-    long                nLastTopMargin;
-    long                nLastBottomMargin;
+    long				nFirstLeftMargin;
+    long				nFirstRightMargin;
+    long				nFirstTopMargin;
+    long				nFirstBottomMargin;
+    long				nLastLeftMargin;
+    long				nLastRightMargin;
+    long				nLastTopMargin;
+    long				nLastBottomMargin;
 
     Size                aMaxSize;
     BOOL                bLandscape;
@@ -172,43 +172,43 @@ class SvxPageDescPage : public SfxTabPage
     Paper               ePaperStart;
     Paper               ePaperEnd;
 
-    SvxPage_Impl*       pImpl;
+    SvxPage_Impl*		pImpl;
 
 #ifdef _SVX_PAGE_CXX
     void                Init_Impl();
-    DECL_LINK(          LayoutHdl_Impl, ListBox* );
-    DECL_LINK(          PaperBinHdl_Impl, ListBox* );
-    DECL_LINK(          SwapOrientation_Impl, RadioButton* );
+    DECL_LINK( 			LayoutHdl_Impl, ListBox* );
+    DECL_LINK( 			PaperBinHdl_Impl, ListBox* );
+    DECL_LINK( 			SwapOrientation_Impl, RadioButton* );
     void                SwapFirstValues_Impl( bool bSet );
-    DECL_LINK(          BorderModify_Impl, MetricField* );
+    DECL_LINK( 			BorderModify_Impl, MetricField* );
     void                InitHeadFoot_Impl( const SfxItemSet& rSet );
-    DECL_LINK(          CenterHdl_Impl, CheckBox* );
+    DECL_LINK( 			CenterHdl_Impl, CheckBox* );
     void                UpdateExample_Impl( bool bResetbackground = false );
 
     // Papiergroesse
-    DECL_LINK(          PaperSizeSelect_Impl, ListBox* );
-    DECL_LINK(          PaperSizeModify_Impl, Edit* );
+    DECL_LINK(			PaperSizeSelect_Impl, ListBox* );
+    DECL_LINK(			PaperSizeModify_Impl, Edit* );
 
-    DECL_LINK(          FrameDirectionModify_Impl, ListBox* );
+    DECL_LINK(			FrameDirectionModify_Impl, ListBox* );
 
     // Hintergrund
     void                ResetBackground_Impl( const SfxItemSet& rSet );
 
     // Grenzwerte
-    DECL_LINK(          RangeHdl_Impl, Edit* );
+    DECL_LINK(			RangeHdl_Impl, Edit* );
     void                CalcMargin_Impl();
 
     // Registerhaltigkeit
-    DECL_LINK(          RegisterModify, CheckBox * );
+    DECL_LINK(			RegisterModify, CheckBox * );
 
     // page direction
     /** Disables vertical page direction entries in the text flow listbox. */
     void                DisableVerticalPageDir();
 
-    bool                IsPrinterRangeOverflow( MetricField& rField, long nFirstMargin,
+    bool				IsPrinterRangeOverflow( MetricField& rField, long nFirstMargin,
                                                 long nLastMargin, MarginPosition nPos );
-    void                CheckMarginEdits( bool _bClear );
-    bool                IsMarginOutOfRange();
+    void				CheckMarginEdits( bool _bClear );
+    bool				IsMarginOutOfRange();
 #endif
 
     SvxPageDescPage( Window* pParent, const SfxItemSet& rSet );
@@ -231,8 +231,8 @@ public:
     void                SetPaperFormatRanges( Paper eStart, Paper eEnd )
                             { ePaperStart = eStart, ePaperEnd = eEnd; }
 
-    void                SetCollectionList(const List* pList);
-    virtual void        PageCreated (SfxAllItemSet aSet); //add CHINA001
+    void				SetCollectionList(const List* pList);
+    virtual void		PageCreated (SfxAllItemSet aSet); //add CHINA001
 };
 
 #endif // #ifndef _SVX_PAGE_HXX
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 579ea4a4a6ad..ccca337aff9c 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <vcl/button.hxx>
 #include <vcl/fixed.hxx>
 #include <sfx2/tabdlg.hxx>
-#include <svx/relfld.hxx>       // SvxRelativeField
-#include <svx/paraprev.hxx>     // Preview
+#include <svx/relfld.hxx>		// SvxRelativeField
+#include <svx/paraprev.hxx>		// Preview
 #include <svx/frmdirlbox.hxx>
 #include <vcl/lstbox.hxx>
 #include <svx/flagsdef.hxx>
@@ -52,7 +52,7 @@ class SvxParagraphControllerItem;
 
 // class SvxStdParagraphTabPage ------------------------------------------
 
-/*  {k:\svx\prototyp\dialog\parastd.bmp}
+/* 	{k:\svx\prototyp\dialog\parastd.bmp}
 
     [Beschreibung]
     Mit dieser TabPage koennen Standard-Attribute eines Absatzes eingestellt
@@ -73,49 +73,49 @@ private:
     SvxStdParagraphTabPage( Window* pParent, const SfxItemSet& rSet );
 
     // Einzug
-    FixedText               aLeftLabel;
-    SvxRelativeField        aLeftIndent;
+    FixedText				aLeftLabel;
+    SvxRelativeField		aLeftIndent;
 
-    FixedText               aRightLabel;
-    SvxRelativeField        aRightIndent;
+    FixedText				aRightLabel;
+    SvxRelativeField		aRightIndent;
 
-    FixedText               aFLineLabel;
-    SvxRelativeField        aFLineIndent;
-    CheckBox                aAutoCB;
+    FixedText				aFLineLabel;
+    SvxRelativeField		aFLineIndent;
+    CheckBox				aAutoCB;
 
     FixedLine               aIndentFrm;
 
     // Abstaende
-    FixedText               aTopLabel;
-    SvxRelativeField        aTopDist;
-    FixedText               aBottomLabel;
-    SvxRelativeField        aBottomDist;
+    FixedText				aTopLabel;
+    SvxRelativeField		aTopDist;
+    FixedText				aBottomLabel;
+    SvxRelativeField		aBottomDist;
     FixedLine               aDistFrm;
 
     // Zeilenabstand
-    ListBox                 aLineDist;
-    FixedText               aLineDistAtLabel;
-    MetricField             aLineDistAtPercentBox;
-    MetricField             aLineDistAtMetricBox;
+    ListBox					aLineDist;
+    FixedText				aLineDistAtLabel;
+    MetricField				aLineDistAtPercentBox;
+    MetricField				aLineDistAtMetricBox;
     FixedLine               aLineDistFrm;
-    String                  sAbsDist;
-    SvxParaPrevWindow       aExampleWin;
+    String 					sAbsDist;
+    SvxParaPrevWindow		aExampleWin;
 
     //Registerhaltigkeit - nur Writer
-    CheckBox                aRegisterCB;
+    CheckBox				aRegisterCB;
     FixedLine               aRegisterFL;
 
-    Edit*                   pActLineDistFld;
-    long                    nAbst;
-    long                    nWidth;
-    long                    nMinFixDist;
-    BOOL                    bRelativeMode;
+    Edit*					pActLineDistFld;
+    long					nAbst;
+    long					nWidth;
+    long 					nMinFixDist;
+    BOOL					bRelativeMode;
     BOOL                    bNegativeIndents;
 
 #ifdef _SVX_PARAGRPH_CXX
-    void                    SetLineSpacing_Impl( const SvxLineSpacingItem& rAttr );
-    void                    Init_Impl();
-    void                    UpdateExample_Impl( BOOL bAll = FALSE );
+    void					SetLineSpacing_Impl( const SvxLineSpacingItem& rAttr );
+    void					Init_Impl();
+    void					UpdateExample_Impl( BOOL bAll = FALSE );
 
     DECL_LINK( LineDistHdl_Impl, ListBox* );
     DECL_LINK( ModifyHdl_Impl, SvxRelativeField* );
@@ -123,26 +123,26 @@ private:
 #endif
 
 protected:
-    virtual int             DeactivatePage( SfxItemSet* pSet = 0 );
+    virtual int				DeactivatePage( SfxItemSet* pSet = 0 );
 
 public:
     DECL_LINK( ELRLoseFocusHdl, Edit* );
 
-    static SfxTabPage*      Create( Window* pParent, const SfxItemSet& rSet );
-    static USHORT*          GetRanges();
+    static SfxTabPage*		Create( Window* pParent, const SfxItemSet& rSet );
+    static USHORT*			GetRanges();
 
-    virtual BOOL            FillItemSet( SfxItemSet& rSet );
-    virtual void            Reset( const SfxItemSet& rSet );
+    virtual BOOL			FillItemSet( SfxItemSet& rSet );
+    virtual void			Reset( const SfxItemSet& rSet );
 
 
-    void                    SetPageWidth( USHORT nPageWidth );
-    void                    SetMaxDistance( USHORT nMaxDist );
-    void                    EnableRelativeMode();
-    void                    EnableRegisterMode();
-    void                    EnableAutoFirstLine();
-    void                    EnableAbsLineDist(long nMinTwip);
-    void                    EnableNegativeMode();
-    virtual void            PageCreated(SfxAllItemSet aSet); // add CHINA001
+    void					SetPageWidth( USHORT nPageWidth );
+    void					SetMaxDistance( USHORT nMaxDist );
+    void					EnableRelativeMode();
+    void 					EnableRegisterMode();
+    void					EnableAutoFirstLine();
+    void					EnableAbsLineDist(long nMinTwip);
+    void					EnableNegativeMode();
+    virtual void 			PageCreated(SfxAllItemSet aSet); // add CHINA001
 };
 
 // class SvxParaAlignTabPage ------------------------------------------------
@@ -154,55 +154,55 @@ class SvxParaAlignTabPage : public SfxTabPage
     // Ausrichtung
     FixedLine               aAlignFrm;
     RadioButton             aLeft;
-    RadioButton             aRight;
-    RadioButton             aCenter;
-    RadioButton             aJustify;
-    FixedText               aLastLineFT;
-    ListBox                 aLastLineLB;
-    CheckBox                aExpandCB;
+    RadioButton				aRight;
+    RadioButton				aCenter;
+    RadioButton				aJustify;
+    FixedText				aLastLineFT;
+    ListBox				    aLastLineLB;
+    CheckBox				aExpandCB;
 
     CheckBox                aSnapToGridCB;
 
     //preview
-    SvxParaPrevWindow       aExampleWin;
+    SvxParaPrevWindow		aExampleWin;
     //vertical alignment
     FixedLine               aVertAlignFL;
 
     FixedText               aVertAlignFT;
     ListBox                 aVertAlignLB;
 
-    FixedLine                   aPropertiesFL;
-    FixedText                   aTextDirectionFT;
-    svx::FrameDirectionListBox  aTextDirectionLB;
+    FixedLine               	aPropertiesFL;
+    FixedText               	aTextDirectionFT;
+    svx::FrameDirectionListBox	aTextDirectionLB;
 
 #ifdef _SVX_PARAGRPH_CXX
-    DECL_LINK(              AlignHdl_Impl, RadioButton* );
-    DECL_LINK(              LastLineHdl_Impl, ListBox* );
-    DECL_LINK(              TextDirectionHdl_Impl, ListBox* );
+    DECL_LINK( 				AlignHdl_Impl, RadioButton* );
+    DECL_LINK( 				LastLineHdl_Impl, ListBox* );
+    DECL_LINK( 				TextDirectionHdl_Impl, ListBox* );
 
-    void                    UpdateExample_Impl( BOOL bAll = FALSE );
+    void					UpdateExample_Impl( BOOL bAll = FALSE );
 #endif
 
                             SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSet );
-    virtual                 ~SvxParaAlignTabPage();
+    virtual					~SvxParaAlignTabPage();
 
 protected:
-    virtual int             DeactivatePage( SfxItemSet* pSet = 0 );
+    virtual int				DeactivatePage( SfxItemSet* pSet = 0 );
 
 public:
-    static SfxTabPage*      Create( Window* pParent, const SfxItemSet& rSet );
-    static USHORT*          GetRanges();
+    static SfxTabPage*		Create( Window* pParent, const SfxItemSet& rSet );
+    static USHORT*			GetRanges();
 
-    virtual BOOL            FillItemSet( SfxItemSet& rSet );
-    virtual void            Reset( const SfxItemSet& rSet );
+    virtual BOOL			FillItemSet( SfxItemSet& rSet );
+    virtual void			Reset( const SfxItemSet& rSet );
 
-    void                    EnableJustifyExt();
-    virtual void            PageCreated(SfxAllItemSet aSet); // add CHINA001
+    void					EnableJustifyExt();
+    virtual void 			PageCreated(SfxAllItemSet aSet); // add CHINA001
 };
 
 // class SvxExtParagraphTabPage ------------------------------------------
 
-/*  {k:\svx\prototyp\dialog\paraext.bmp}
+/*	{k:\svx\prototyp\dialog\paraext.bmp}
 
     [Beschreibung]
     Mit dieser TabPage koennen Spezial-Attribute eines Absatzes eingestellt
@@ -221,65 +221,65 @@ class SvxExtParagraphTabPage: public SfxTabPage
     using TabPage::DeactivatePage;
 
 public:
-    virtual             ~SvxExtParagraphTabPage();
+    virtual				~SvxExtParagraphTabPage();
 
-    static SfxTabPage*  Create( Window* pParent,
+    static SfxTabPage*	Create(	Window* pParent,
                                 const SfxItemSet& rSet );
-    static USHORT*      GetRanges();
+    static USHORT*		GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual BOOL		FillItemSet( SfxItemSet& rSet );
+    virtual void		Reset( const SfxItemSet& rSet );
 
-    void                DisablePageBreak();
+    void				DisablePageBreak();
 
 protected:
-    virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
+    virtual int			DeactivatePage( SfxItemSet* pSet = 0 );
 
 private:
                         SvxExtParagraphTabPage( Window* pParent, const SfxItemSet& rSet );
 
     // Silbentrennung
-    TriStateBox         aHyphenBox;
-    FixedText           aBeforeText;
-    NumericField        aExtHyphenBeforeBox;
-//  FixedText           aHyphenBeforeLabel;
-    FixedText           aAfterText;
-    NumericField        aExtHyphenAfterBox;
-//  FixedText           aHyphenAfterLabel;
-    FixedText           aMaxHyphenLabel;
+    TriStateBox			aHyphenBox;
+    FixedText			aBeforeText;
+    NumericField		aExtHyphenBeforeBox;
+//	FixedText			aHyphenBeforeLabel;
+    FixedText			aAfterText;
+    NumericField		aExtHyphenAfterBox;
+//	FixedText			aHyphenAfterLabel;
+    FixedText     		aMaxHyphenLabel;
     NumericField        aMaxHyphenEdit;
     FixedLine           aExtFL;
 
     // Seitenumbruch
-    FixedLine           aBreaksFL;
-    TriStateBox         aPageBreakBox;
+    FixedLine			aBreaksFL;
+    TriStateBox			aPageBreakBox;
     FixedText           aBreakTypeFT;
     ListBox             aBreakTypeLB;
     FixedText           aBreakPositionFT;
     ListBox             aBreakPositionLB;
-    TriStateBox         aApplyCollBtn;
-    ListBox             aApplyCollBox;
+    TriStateBox			aApplyCollBtn;
+    ListBox				aApplyCollBox;
     FixedText           aPagenumText;
-    NumericField        aPagenumEdit;
+    NumericField       	aPagenumEdit;
 
     FixedLine           aExtendFL;
 
     // Absatzteilung
-    TriStateBox         aKeepTogetherBox;
-    TriStateBox         aKeepParaBox;
+    TriStateBox			aKeepTogetherBox;
+    TriStateBox			aKeepParaBox;
 
     // Witwen/Waisen
-    TriStateBox         aOrphanBox;
-    NumericField        aOrphanRowNo;
-    FixedText           aOrphanRowLabel;
+    TriStateBox			aOrphanBox;
+    NumericField       	aOrphanRowNo;
+    FixedText			aOrphanRowLabel;
 
-    TriStateBox         aWidowBox;
-    NumericField        aWidowRowNo;
-    FixedText           aWidowRowLabel;
+    TriStateBox			aWidowBox;
+    NumericField       	aWidowRowNo;
+    FixedText			aWidowRowLabel;
 
     BOOL                bPageBreak;
-    BOOL                bHtmlMode;
-    USHORT              nStdPos;
+    BOOL				bHtmlMode;
+    USHORT				nStdPos;
 
 #ifdef _SVX_PARAGRPH_CXX
     DECL_LINK( PageBreakHdl_Impl, TriStateBox* );
@@ -291,7 +291,7 @@ private:
     DECL_LINK( PageBreakPosHdl_Impl, ListBox* );
     DECL_LINK( PageBreakTypeHdl_Impl, ListBox* );
 #endif
-    virtual void            PageCreated(SfxAllItemSet aSet); // add CHINA001
+    virtual void 			PageCreated(SfxAllItemSet aSet); // add CHINA001
 };
 /* -----------------------------29.11.00 11:33--------------------------------
 
@@ -300,10 +300,10 @@ class SvxAsianTabPage : public SfxTabPage
 {
     FixedLine       aOptionsFL;
 
-    TriStateBox     aForbiddenRulesCB;
-    TriStateBox     aHangingPunctCB;
+    TriStateBox		aForbiddenRulesCB;
+    TriStateBox		aHangingPunctCB;
 
-    TriStateBox     aScriptSpaceCB;
+    TriStateBox		aScriptSpaceCB;
 
     SvxAsianTabPage( Window* pParent, const SfxItemSet& rSet );
 
@@ -314,12 +314,12 @@ public:
     ~SvxAsianTabPage();
 
 
-    static SfxTabPage*  Create( Window* pParent,
+    static SfxTabPage*	Create(	Window* pParent,
                                 const SfxItemSet& rSet );
-    static USHORT*      GetRanges();
+    static USHORT*		GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual BOOL		FillItemSet( SfxItemSet& rSet );
+    virtual void		Reset( const SfxItemSet& rSet );
 
 };
 
diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx
index 27e964c5b28a..3b9258462ce9 100644
--- a/cui/source/inc/passwdomdlg.hxx
+++ b/cui/source/inc/passwdomdlg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ struct PasswordToOpenModifyDialog_Impl;
 class PasswordToOpenModifyDialog : public SfxModalDialog
 {
     std::auto_ptr< PasswordToOpenModifyDialog_Impl >  m_pImpl;
-
+    
     // disallow use of copy c-tor and assignment operator
     PasswordToOpenModifyDialog( const PasswordToOpenModifyDialog & );
     PasswordToOpenModifyDialog & operator = ( const PasswordToOpenModifyDialog & );
-
+    
 public:
-    PasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen,
-            sal_uInt16 nMaxPasswdLen /* 0 -> no max len enforced */,
+    PasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, 
+            sal_uInt16 nMaxPasswdLen /* 0 -> no max len enforced */, 
             bool bIsPasswordToModify );
     virtual ~PasswordToOpenModifyDialog();
 
diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx
index 924edae728a5..2686287776b1 100644
--- a/cui/source/inc/pastedlg.hxx
+++ b/cui/source/inc/pastedlg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,22 +61,22 @@ class SvPasteObjectDialog : public ModalDialog
     CancelButton aCancelButton1;
     HelpButton aHelpButton1;
     String aSObject;
-    Table           aSupplementTable;
-    SvGlobalName    aObjClassName;
-    String          aObjName;
-    USHORT          nAspect;
-    BOOL            bLink;
+    Table       	aSupplementTable;
+    SvGlobalName	aObjClassName;
+    String			aObjName;
+    USHORT      	nAspect;
+    BOOL        	bLink;
 
-    ListBox&        ObjectLB()      { return aLbInsertList; }
-    FixedText&      ObjectSource()  { return aFtObjectSource; }
-    RadioButton&    PasteLink()     { return aRbPasteLink; }
-    CheckBox&       AsIconBox()     { return aCbDisplayAsIcon; }
+    ListBox&		ObjectLB()		{ return aLbInsertList; }
+    FixedText&		ObjectSource()	{ return aFtObjectSource; }
+    RadioButton&	PasteLink()		{ return aRbPasteLink; }
+    CheckBox&		AsIconBox()		{ return aCbDisplayAsIcon; }
 
-    const String&   GetObjString()  { return aSObject; }
-    void            SelectObject();
+    const String& 	GetObjString()	{ return aSObject; }
+    void			SelectObject();
     DECL_LINK( SelectHdl, ListBox * );
     DECL_LINK( DoubleClickHdl, ListBox * );
-    void            SetDefault();
+    void        	SetDefault();
     USHORT      GetAspect() const { return nAspect; }
     BOOL        ShouldLink() const { return bLink; }
 
diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx
index 4648fd3a0a0c..4fda9c7699cb 100644
--- a/cui/source/inc/postdlg.hxx
+++ b/cui/source/inc/postdlg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,20 +69,20 @@ public:
     void                SetNextHdl( const Link& rLink )
                             { aNextHdlLink = rLink; }
 
-    void                EnableTravel(BOOL bNext, BOOL bPrev);
-    inline String       GetNote() { return aEditED.GetText(); }
-    inline void         SetNote(const String& rTxt) { aEditED.SetText(rTxt); }
+    void				EnableTravel(BOOL bNext, BOOL bPrev);
+    inline String		GetNote() { return aEditED.GetText(); }
+    inline void			SetNote(const String& rTxt) { aEditED.SetText(rTxt); }
 
-    void                ShowLastAuthor(const String& rAuthor, const String& rDate);
-    inline void         DontChangeAuthor()  { aAuthorBtn.Enable(FALSE); }
-    inline void         HideAuthor()        { aAuthorBtn.Hide(); }
-    inline void         SetReadonlyPostIt(BOOL bDisable)
+    void				ShowLastAuthor(const String& rAuthor, const String& rDate);
+    inline void			DontChangeAuthor()	{ aAuthorBtn.Enable(FALSE); }
+    inline void			HideAuthor()		{ aAuthorBtn.Hide(); }
+    inline void			SetReadonlyPostIt(BOOL bDisable)
                             {
                                 aOKBtn.Enable( !bDisable );
                                 aEditED.SetReadOnly( bDisable );
                                 aAuthorBtn.Enable( !bDisable );
                             }
-    inline BOOL         IsOkEnabled() const { return aOKBtn.IsEnabled(); }
+    inline BOOL 		IsOkEnabled() const { return aOKBtn.IsEnabled(); }
 
 private:
     FixedLine           aPostItFL;
diff --git a/cui/source/inc/radiobtnbox.hxx b/cui/source/inc/radiobtnbox.hxx
index 0a67dcf9fd95..50296e172a58 100644
--- a/cui/source/inc/radiobtnbox.hxx
+++ b/cui/source/inc/radiobtnbox.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index 685de4367180..a8ce19ba1cf6 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,37 +46,37 @@
 
 #include <hash_map>
 
-#define OBJTYPE_BASICMANAGER    1L
-//#define OBJTYPE_LIB               2L
-//#define OBJTYPE_MODULE            3L
-#define OBJTYPE_METHOD          2L
-//#define OBJTYPE_METHODINOBJ       5L
-//#define OBJTYPE_OBJECT            6L
-//#define OBJTYPE_SUBOBJ            7L
-//#define OBJTYPE_PROPERTY      8L
-#define OBJTYPE_SCRIPTCONTAINER     3L
-#define OBJTYPE_SFROOT      4L
-
-#define BROWSEMODE_MODULES      0x01
-#define BROWSEMODE_SUBS         0x02
-#define BROWSEMODE_OBJS         0x04
-#define BROWSEMODE_PROPS        0x08
-#define BROWSEMODE_SUBOBJS      0x10
-
-#define INPUTMODE_NEWLIB        1
-#define INPUTMODE_NEWMACRO      2
-#define INPUTMODE_RENAME        3
-
-typedef ::std::hash_map < ::rtl::OUString, ::rtl::OUString ,
+#define OBJTYPE_BASICMANAGER	1L
+//#define OBJTYPE_LIB				2L
+//#define OBJTYPE_MODULE			3L
+#define OBJTYPE_METHOD			2L
+//#define OBJTYPE_METHODINOBJ		5L
+//#define OBJTYPE_OBJECT			6L
+//#define OBJTYPE_SUBOBJ			7L
+//#define OBJTYPE_PROPERTY		8L
+#define OBJTYPE_SCRIPTCONTAINER		3L
+#define OBJTYPE_SFROOT		4L
+
+#define BROWSEMODE_MODULES		0x01
+#define BROWSEMODE_SUBS			0x02
+#define BROWSEMODE_OBJS			0x04
+#define BROWSEMODE_PROPS		0x08
+#define BROWSEMODE_SUBOBJS		0x10
+
+#define INPUTMODE_NEWLIB		1
+#define INPUTMODE_NEWMACRO		2
+#define INPUTMODE_RENAME		3
+
+typedef ::std::hash_map < ::rtl::OUString, ::rtl::OUString , 
     ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > Selection_hash;
 
 class SFEntry;
 
 class SFTreeListBox : public SvTreeListBox
 {
-   friend class SvxScriptOrgDialog;
+   friend class SvxScriptOrgDialog; 
 private:
-    USHORT          nMode;
+    USHORT			nMode;
     Image m_hdImage;
     Image m_hdImage_hc;
     Image m_libImage;
@@ -95,33 +95,33 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface  > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName );
 
 protected:
-    void                    ExpandTree( SvLBoxEntry* pRootEntry );
-    virtual void            RequestingChilds( SvLBoxEntry* pParent );
-    virtual void            ExpandedHdl();
-    SvLBoxEntry*            FindEntry( SvLBoxEntry* pParent, const String& rText, BYTE nType );
-    virtual long            ExpandingHdl();
-    static BOOL             dialogSort1( com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node1,
+    void 					ExpandTree( SvLBoxEntry* pRootEntry );
+    virtual void			RequestingChilds( SvLBoxEntry* pParent );
+    virtual void 			ExpandedHdl();
+    SvLBoxEntry* 			FindEntry( SvLBoxEntry* pParent, const String& rText, BYTE nType );
+    virtual long			ExpandingHdl();
+    static BOOL             dialogSort1( com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node1, 
             com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node2 );
-    static BOOL             dialogSort2( com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node1,
+    static BOOL             dialogSort2( com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node1, 
             com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node2 );
 
 public:
-    void                    Init( const ::rtl::OUString& language );
-    void  RequestSubEntries(  SvLBoxEntry* pRootEntry, ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node,
+    void 					Init( const ::rtl::OUString& language );
+    void  RequestSubEntries(  SvLBoxEntry* pRootEntry, ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node, 
                               ::com::sun::star::uno::Reference< com::sun::star::frame::XModel>& model  );
                     SFTreeListBox( Window* pParent, const ResId& rRes );
                     ~SFTreeListBox();
 
-    void            UpdateEntries();
+    void			UpdateEntries();
 
-    void            ExpandAllTrees();
+    void			ExpandAllTrees();
 
 
 
     SvLBoxEntry * insertEntry(String const & rText, USHORT nBitmap,
                               SvLBoxEntry * pParent,
                               bool bChildrenOnDemand,
-                              std::auto_ptr< SFEntry > aUserData,
+                              std::auto_ptr< SFEntry > aUserData, 
                               ::rtl::OUString factoryURL );
     SvLBoxEntry * insertEntry(String const & rText, USHORT nBitmap,
                               SvLBoxEntry * pParent,
@@ -134,54 +134,54 @@ public:
 class InputDialog : public ModalDialog
 {
 private:
-    FixedText       aText;
-    Edit            aEdit;
-    OKButton        aOKButton;
-    CancelButton    aCancelButton;
+    FixedText		aText;
+    Edit			aEdit;
+    OKButton		aOKButton;
+    CancelButton	aCancelButton;
 
 public:
     InputDialog( Window * pParent, USHORT nMode );
                 ~InputDialog();
 
-    String      GetObjectName() const { return aEdit.GetText(); }
-    void        SetObjectName( const String& rName ) { aEdit.SetText( rName ); aEdit.SetSelection( Selection( 0, rName.Len() ) );}
+    String		GetObjectName() const { return aEdit.GetText(); }
+    void		SetObjectName( const String& rName ) { aEdit.SetText( rName ); aEdit.SetSelection( Selection( 0, rName.Len() ) );}
 };
 
 class SFEntry
 {
 private:
-    BYTE            nType;
+    BYTE			nType;
     bool            loaded;
-        ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > nodes;
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > model;
+        ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > nodes;   
+        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > model;   
     SFEntry(){}
 public:
-                    SFEntry( BYTE nT )              { nType = nT; loaded=false; }
-                    SFEntry( BYTE nT,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& entryNodes ,
+                    SFEntry( BYTE nT )				{ nType = nT; loaded=false; }
+                    SFEntry( BYTE nT, 
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& entryNodes , 
                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& entryModel) { nType = nT; nodes = entryNodes; loaded=false; model = entryModel; }
                     SFEntry( const SFEntry& r ) { nType = r.nType; nodes = r.nodes; loaded = r.loaded; }
-    virtual         ~SFEntry() {}
+    virtual 		~SFEntry() {}
     ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > GetNode() { return nodes ;}
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetModel() { return model ;};
-    BYTE            GetType() const                     { return nType; }
-    bool            isLoaded() const                    { return loaded; }
-    void            setLoaded()                         { loaded=true; }
+    BYTE			GetType() const 					{ return nType; }
+    bool			isLoaded() const 					{ return loaded; }
+    void			setLoaded()                         { loaded=true; }
 };
 
 class SvxScriptOrgDialog : public SfxModalDialog
 {
 protected:
-    FixedText               aScriptsTxt;
-    SFTreeListBox           aScriptsBox;
+    FixedText 				aScriptsTxt;
+    SFTreeListBox		    aScriptsBox;
 
-    PushButton              aRunButton;
-    CancelButton            aCloseButton;
-    PushButton              aCreateButton;
-    PushButton              aEditButton;
-    PushButton              aRenameButton;
-    PushButton              aDelButton;
-    HelpButton              aHelpButton;
+    PushButton				aRunButton;
+    CancelButton 			aCloseButton;
+    PushButton 				aCreateButton;
+    PushButton				aEditButton;
+    PushButton				aRenameButton;
+    PushButton				aDelButton;
+    HelpButton				aHelpButton;
 
     ::rtl::OUString         m_sLanguage;
     static Selection_hash   m_lastSelection;
@@ -200,22 +200,22 @@ protected:
     DECL_LINK( MacroDoubleClickHdl, SvTreeListBox * );
     DECL_LINK( ScriptSelectHdl, SvTreeListBox * );
     DECL_LINK( ButtonHdl, Button * );
-    BOOL                getBoolProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xProps, ::rtl::OUString& propName );
-    void                CheckButtons(  ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node );
-
+    BOOL 	            getBoolProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xProps, ::rtl::OUString& propName );
+    void				CheckButtons(  ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node );
+    
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface  > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName );
-
+    
     void        createEntry( SvLBoxEntry* pEntry );
     void        renameEntry( SvLBoxEntry* pEntry );
     void        deleteEntry( SvLBoxEntry* pEntry );
     ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >
-                getBrowseNode( SvLBoxEntry* pEntry );
+                getBrowseNode( SvLBoxEntry* pEntry ); 
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getModel( SvLBoxEntry* pEntry );
-    void        EnableButton( Button& rButton, BOOL bEnable );
+    void	    EnableButton( Button& rButton, BOOL bEnable );
     String      getListOfChildren( ::com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node, int depth );
     void        StoreCurrentSelection();
     void        RestorePreviousSelection();
-    //String                GetInfo( SbxVariable* pVar );
+    //String				GetInfo( SbxVariable* pVar );
 
 public:
                     // prob need another arg in the ctor
@@ -223,7 +223,7 @@ public:
                     SvxScriptOrgDialog( Window* pParent, ::rtl::OUString language );
                     ~SvxScriptOrgDialog();
 
-    virtual short   Execute();
+    virtual short	Execute();
 
     //DECL_LINK( ActivatePageHdl, TabControl * );
 };
@@ -243,7 +243,7 @@ public:
 
     ~SvxScriptErrorDialog();
 
-    short           Execute();
+    short			Execute();
 };
 
 #endif // _SCRIPTDLG_HXX
diff --git a/cui/source/inc/sdrcelldlg.hxx b/cui/source/inc/sdrcelldlg.hxx
index 645a45da7d61..5a1e0166c577 100644
--- a/cui/source/inc/sdrcelldlg.hxx
+++ b/cui/source/inc/sdrcelldlg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 SdrModel;
 class SvxFormatCellsDialog : public SfxTabDialog
 {
 private:
-    const SfxItemSet&   mrOutAttrs;
+    const SfxItemSet&	mrOutAttrs;
 
     XColorTable*        mpColorTab;
     XGradientList*      mpGradientList;
diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx
index 5ea0be27a980..fa1e6b840cb7 100644
--- a/cui/source/inc/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 #define _SVSTDARR_USHORTS
 #define _SVSTDARR_STRINGSDTOR
-#include <svl/svstdarr.hxx>     // SvUShorts
+#include <svl/svstdarr.hxx>		// SvUShorts
 #include <sfx2/minarray.hxx>
 
 #define SVX_CFGGROUP_FUNCTION 1
@@ -51,13 +51,13 @@
 
 struct SvxGroupInfo_Impl
 {
-    USHORT          nKind;
-    USHORT          nOrd;
+    USHORT 		    nKind;
+    USHORT 		    nOrd;
     ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >
                     xBrowseNode;
     ::rtl::OUString sURL;
     ::rtl::OUString sHelpText;
-    BOOL            bWasOpened;
+    BOOL		    bWasOpened;
 
     SvxGroupInfo_Impl( USHORT n, USHORT nr )
         :nKind( n )
@@ -104,44 +104,44 @@ public:
 class SvxConfigFunctionListBox_Impl : public SvTreeListBox
 {
 friend class SvxConfigGroupListBox_Impl;
-    Timer                           aTimer;
-    SvLBoxEntry*                    pCurEntry;
-    SvxGroupInfoArr_Impl            aArr;
-    SvLBoxEntry*                    m_pDraggingEntry;
+    Timer							aTimer;
+    SvLBoxEntry*					pCurEntry;
+    SvxGroupInfoArr_Impl			aArr;
+    SvLBoxEntry*					m_pDraggingEntry;
 
-    DECL_LINK(                      TimerHdl, Timer* );
-    virtual void                    MouseMove( const MouseEvent& rMEvt );
+    DECL_LINK(						TimerHdl, Timer* );
+    virtual void 					MouseMove( const MouseEvent& rMEvt );
 
 public:
                                     SvxConfigFunctionListBox_Impl( Window*, const ResId& );
                                     ~SvxConfigFunctionListBox_Impl();
-    void                            ClearAll();
-    SvLBoxEntry*                    GetEntry_Impl( USHORT nId );
-    SvLBoxEntry*                    GetEntry_Impl( const String& );
-    USHORT                          GetId( SvLBoxEntry *pEntry );
-    String                          GetHelpText( SvLBoxEntry *pEntry );
+    void							ClearAll();
+    SvLBoxEntry*					GetEntry_Impl( USHORT nId );
+    SvLBoxEntry*					GetEntry_Impl( const String& );
+    USHORT							GetId( SvLBoxEntry *pEntry );
+    String							GetHelpText( SvLBoxEntry *pEntry );
     using Window::GetHelpText;
-    USHORT                          GetCurId()
+    USHORT							GetCurId()
                                     { return GetId( FirstSelected() ); }
-    SvLBoxEntry*                    GetLastSelectedEntry();
-    void                            FunctionSelected();
+    SvLBoxEntry*					GetLastSelectedEntry();
+    void							FunctionSelected();
 
     // drag n drop methods
-    virtual sal_Int8    AcceptDrop( const AcceptDropEvent& rEvt );
+    virtual sal_Int8	AcceptDrop( const AcceptDropEvent& rEvt );
 
-    virtual DragDropMode    NotifyStartDrag(
+    virtual DragDropMode	NotifyStartDrag(
         TransferDataContainer&, SvLBoxEntry* );
 
-    virtual void        DragFinished( sal_Int8 );
+    virtual void		DragFinished( sal_Int8 );
 };
 
 class SvxConfigGroupListBox_Impl : public SvTreeListBox
 {
-    SvxGroupInfoArr_Impl            aArr;
+    SvxGroupInfoArr_Impl			aArr;
     bool                            m_bShowSlots;
 
-    SvxConfigFunctionListBox_Impl*  pFunctionListBox;
-    ImageProvider*                  m_pImageProvider;
+    SvxConfigFunctionListBox_Impl*	pFunctionListBox;
+    ImageProvider*					m_pImageProvider;
 
     ::com::sun::star::uno::Reference
         < ::com::sun::star::frame::XFrame > m_xFrame;
@@ -170,8 +170,8 @@ private:
     );
 
 protected:
-    virtual void    RequestingChilds( SvLBoxEntry *pEntry);
-    virtual BOOL    Expand( SvLBoxEntry* pParent );
+    virtual void	RequestingChilds( SvLBoxEntry *pEntry);
+    virtual BOOL	Expand( SvLBoxEntry* pParent );
     using SvListView::Expand;
 
 public:
@@ -184,40 +184,40 @@ public:
 
             ~SvxConfigGroupListBox_Impl();
 
-    void    Init();
-    void    Open( SvLBoxEntry*, BOOL );
-    void    ClearAll();
-    void    GroupSelected();
+    void	Init();
+    void	Open( SvLBoxEntry*, BOOL );
+    void	ClearAll();
+    void	GroupSelected();
 
-    void    SetFunctionListBox( SvxConfigFunctionListBox_Impl *pBox )
+    void 	SetFunctionListBox( SvxConfigFunctionListBox_Impl *pBox )
         { pFunctionListBox = pBox; }
 
-    void    SetImageProvider( ImageProvider* provider )
+    void	SetImageProvider( ImageProvider* provider )
         { m_pImageProvider = provider; }
 };
 
 class SvxScriptSelectorDialog : public ModelessDialog
 {
-    FixedText                       aDialogDescription;
-    FixedText                       aGroupText;
-    SvxConfigGroupListBox_Impl      aCategories;
-    FixedText                       aFunctionText;
-    SvxConfigFunctionListBox_Impl   aCommands;
-    OKButton                        aOKButton;
-    CancelButton                    aCancelButton;
-    HelpButton                      aHelpButton;
-    FixedLine                       aDescription;
-    FixedText                       aDescriptionText;
-
-    BOOL                            m_bShowSlots;
-    Link                            m_aAddHdl;
+    FixedText						aDialogDescription;
+    FixedText						aGroupText;
+    SvxConfigGroupListBox_Impl 		aCategories;
+    FixedText						aFunctionText;
+    SvxConfigFunctionListBox_Impl	aCommands;
+    OKButton						aOKButton;
+    CancelButton					aCancelButton;
+    HelpButton						aHelpButton;
+    FixedLine						aDescription;
+    FixedText						aDescriptionText;
+
+    BOOL							m_bShowSlots;
+    Link							m_aAddHdl;
 
     DECL_LINK( ClickHdl, Button * );
     DECL_LINK( SelectHdl, Control* );
     DECL_LINK( FunctionDoubleClickHdl, Control* );
 
-    void                                UpdateUI();
-    void                                ResizeControls();
+    void								UpdateUI();
+    void								ResizeControls();
 
 public:
 
@@ -230,18 +230,18 @@ public:
 
     ~SvxScriptSelectorDialog ( );
 
-    void        SetAddHdl( const Link& rLink ) { m_aAddHdl = rLink; }
-    const Link& GetAddHdl() const { return m_aAddHdl; }
+    void		SetAddHdl( const Link& rLink ) { m_aAddHdl = rLink; }
+    const Link&	GetAddHdl() const { return m_aAddHdl; }
 
-    void        SetImageProvider( ImageProvider* provider )
+    void		SetImageProvider( ImageProvider* provider )
         { aCategories.SetImageProvider( provider ); }
 
-    USHORT      GetSelectedId();
-    String      GetScriptURL() const;
-    String      GetSelectedDisplayName();
-    String      GetSelectedHelpText();
-    void        SetRunLabel();
-    void        SetDialogDescription(const String& rDescription);
+    USHORT		GetSelectedId();
+    String		GetScriptURL() const;
+    String		GetSelectedDisplayName();
+    String		GetSelectedHelpText();
+    void		SetRunLabel();
+    void		SetDialogDescription(const String& rDescription);
 };
 
 #endif
diff --git a/cui/source/inc/showcols.hxx b/cui/source/inc/showcols.hxx
index cb0dd228daba..d65987548a8b 100644
--- a/cui/source/inc/showcols.hxx
+++ b/cui/source/inc/showcols.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,17 +39,17 @@
 #include <com/sun/star/container/XIndexContainer.hpp>
 
 //==========================================================================
-//  FmShowColsDialog
+//	FmShowColsDialog
 //==========================================================================
 
 class FmShowColsDialog : public ModalDialog
 {
-    ListBox         m_aList;
-    FixedText       m_aLabel;
-    OKButton        m_aOK;
-    CancelButton    m_aCancel;
+    ListBox			m_aList;
+    FixedText		m_aLabel;
+    OKButton		m_aOK;
+    CancelButton	m_aCancel;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >   m_xColumns;
+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > 	m_xColumns;
 
 public:
     FmShowColsDialog( Window* pParent );
diff --git a/cui/source/inc/splitcelldlg.hxx b/cui/source/inc/splitcelldlg.hxx
index e451ddba36cc..5f3ddaab2805 100644
--- a/cui/source/inc/splitcelldlg.hxx
+++ b/cui/source/inc/splitcelldlg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 class SvxSplitTableDlg : public SvxAbstractSplittTableDialog, public SvxStandardDialog
 {
-    FixedText           maCountLbl;
-    NumericField        maCountEdit;
+    FixedText 			maCountLbl;
+    NumericField 		maCountEdit;
     FixedLine           maCountFL;
-    ImageRadioButton    maHorzBox;
+    ImageRadioButton 	maHorzBox;
     ImageRadioButton    maVertBox;
     CheckBox            maPropCB;
     FixedLine           maDirFL;
-    OKButton            maOKBtn;
-    CancelButton        maCancelBtn;
-    HelpButton          maHelpBtn;
+    OKButton 			maOKBtn;
+    CancelButton 		maCancelBtn;
+    HelpButton 			maHelpBtn;
 
-    long                mnMaxVertical;
-    long                mnMaxHorizontal;
+    long				mnMaxVertical;
+    long				mnMaxHorizontal;
 protected:
     virtual void Apply();
 
diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx
index bbb01fe9dbf2..093183223b5e 100644
--- a/cui/source/inc/srchxtra.hxx
+++ b/cui/source/inc/srchxtra.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,10 +46,10 @@ public:
     ~SvxSearchFormatDialog();
 
 protected:
-    virtual void    PageCreated( USHORT nId, SfxTabPage &rPage );
+    virtual void 	PageCreated( USHORT nId, SfxTabPage &rPage );
 
 private:
-    FontList*       pFontList;
+    FontList*		pFontList;
 };
 
 // class SvxSearchFormatDialog -------------------------------------------
@@ -62,13 +62,13 @@ public:
 
 private:
     FixedText           aAttrFL;
-    SvxCheckListBox     aAttrLB;
+    SvxCheckListBox		aAttrLB;
 
-    OKButton            aOKBtn;
-    CancelButton        aEscBtn;
-    HelpButton          aHelpBtn;
+    OKButton			aOKBtn;
+    CancelButton		aEscBtn;
+    HelpButton			aHelpBtn;
 
-    SearchAttrItemList& rList;
+    SearchAttrItemList&	rList;
 
     DECL_LINK( OKHdl, Button * );
 };
@@ -79,29 +79,29 @@ class SvxSearchSimilarityDialog : public ModalDialog
 {
 private:
     FixedLine           aFixedLine;
-    FixedText           aOtherTxt;
-    NumericField        aOtherFld;
-    FixedText           aLongerTxt;
-    NumericField        aLongerFld;
-    FixedText           aShorterTxt;
-    NumericField        aShorterFld;
-    CheckBox            aRelaxBox;
-
-    OKButton            aOKBtn;
-    CancelButton        aEscBtn;
-    HelpButton          aHelpBtn;
+    FixedText			aOtherTxt;
+    NumericField		aOtherFld;
+    FixedText			aLongerTxt;
+    NumericField		aLongerFld;
+    FixedText			aShorterTxt;
+    NumericField		aShorterFld;
+    CheckBox			aRelaxBox;
+
+    OKButton			aOKBtn;
+    CancelButton		aEscBtn;
+    HelpButton			aHelpBtn;
 
 public:
-    SvxSearchSimilarityDialog(  Window* pParent,
+    SvxSearchSimilarityDialog( 	Window* pParent,
                                 BOOL bRelax,
                                 USHORT nOther,
                                 USHORT nShorter,
                                 USHORT nLonger );
 
-    USHORT  GetOther()      { return (USHORT)aOtherFld.GetValue(); }
-    USHORT  GetShorter()    { return (USHORT)aShorterFld.GetValue(); }
-    USHORT  GetLonger()     { return (USHORT)aLongerFld.GetValue(); }
-    BOOL    IsRelaxed()     { return aRelaxBox.IsChecked(); }
+    USHORT	GetOther() 		{ return (USHORT)aOtherFld.GetValue(); }
+    USHORT	GetShorter() 	{ return (USHORT)aShorterFld.GetValue(); }
+    USHORT	GetLonger()		{ return (USHORT)aLongerFld.GetValue(); }
+    BOOL 	IsRelaxed()		{ return aRelaxBox.IsChecked(); }
 };
 
 
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index 79d63daa8b9f..c20c3531332f 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,18 +46,18 @@ class TabWin_Impl;
 // define ----------------------------------------------------------------
 
 // Bitfelder f"ur DisableControls()
-//CHINA001 #define TABTYPE_LEFT     0x0001
-//CHINA001 #define TABTYPE_RIGHT        0x0002
-//CHINA001 #define TABTYPE_CENTER       0x0004
-//CHINA001 #define TABTYPE_DEZIMAL      0x0008
-//CHINA001 #define TABTYPE_ALL          0x000F
-//CHINA001
-//CHINA001 #define TABFILL_NONE     0x0010
-//CHINA001 #define TABFILL_POINT        0x0020
-//CHINA001 #define TABFILL_DASHLINE     0x0040
-//CHINA001 #define TABFILL_SOLIDLINE    0x0080
-//CHINA001 #define TABFILL_SPECIAL      0x0100
-//CHINA001 #define TABFILL_ALL          0x01F0
+//CHINA001 #define TABTYPE_LEFT		0x0001
+//CHINA001 #define TABTYPE_RIGHT		0x0002
+//CHINA001 #define TABTYPE_CENTER		0x0004
+//CHINA001 #define TABTYPE_DEZIMAL		0x0008
+//CHINA001 #define TABTYPE_ALL			0x000F
+//CHINA001 
+//CHINA001 #define TABFILL_NONE		0x0010
+//CHINA001 #define TABFILL_POINT		0x0020
+//CHINA001 #define TABFILL_DASHLINE		0x0040
+//CHINA001 #define TABFILL_SOLIDLINE	0x0080
+//CHINA001 #define TABFILL_SPECIAL		0x0100
+//CHINA001 #define TABFILL_ALL			0x01F0
 
 // class SvxTabulatorTabPage ---------------------------------------------
 /*
@@ -80,64 +80,64 @@ class SvxTabulatorTabPage : public SfxTabPage
 public:
     ~SvxTabulatorTabPage();
 
-    static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
-    static USHORT*      GetRanges();
+    static SfxTabPage* 	Create( Window* pParent, const SfxItemSet& rSet );
+    static USHORT*		GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual void 		Reset( const SfxItemSet& rSet );
 
-    void                DisableControls( const USHORT nFlag );
+    void				DisableControls( const USHORT nFlag );
 
 protected:
-    virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
+    virtual int			DeactivatePage( SfxItemSet* pSet = 0 );
 
 private:
     SvxTabulatorTabPage( Window* pParent, const SfxItemSet& rSet );
 
     // Tabulatoren und Positionen
-    MetricBox       aTabBox;
+    MetricBox		aTabBox;
     FixedLine       aTabLabel;
     FixedLine       aTabLabelVert;
 
     // TabType
-    RadioButton     aLeftTab;
-    RadioButton     aRightTab;
-    RadioButton     aCenterTab;
-    RadioButton     aDezTab;
-
-    TabWin_Impl*    pLeftWin;
-    TabWin_Impl*    pRightWin;
-    TabWin_Impl*    pCenterWin;
-    TabWin_Impl*    pDezWin;
-
-    FixedText       aDezCharLabel;
-    Edit            aDezChar;
+    RadioButton		aLeftTab;
+    RadioButton		aRightTab;
+    RadioButton		aCenterTab;
+    RadioButton		aDezTab;
+
+    TabWin_Impl*	pLeftWin;
+    TabWin_Impl*	pRightWin;
+    TabWin_Impl*	pCenterWin;
+    TabWin_Impl*	pDezWin;
+
+    FixedText		aDezCharLabel;
+    Edit			aDezChar;
     FixedLine       aTabTypeLabel;
 
     // Fuellzeichen
-    RadioButton     aNoFillChar;
-    RadioButton     aFillPoints;
-    RadioButton     aFillDashLine ;
-    RadioButton     aFillSolidLine;
-    RadioButton     aFillSpecial;
-    Edit            aFillChar;
+    RadioButton		aNoFillChar;
+    RadioButton		aFillPoints;
+    RadioButton		aFillDashLine ;
+    RadioButton		aFillSolidLine;
+    RadioButton		aFillSpecial;
+    Edit			aFillChar;
     FixedLine       aFillLabel;
 
     // Buttons
-    PushButton      aNewBtn;
-    PushButton      aDelAllBtn;
-    PushButton      aDelBtn;
+    PushButton		aNewBtn;
+    PushButton		aDelAllBtn;
+    PushButton		aDelBtn;
 
     // lokale Variablen, interne Funktionen
-    SvxTabStop      aAktTab;
-    SvxTabStopItem  aNewTabs;
-    long            nDefDist;
-    FieldUnit       eDefUnit;
-    BOOL            bCheck;
+    SvxTabStop     	aAktTab;
+    SvxTabStopItem	aNewTabs;
+    long			nDefDist;
+    FieldUnit		eDefUnit;
+    BOOL			bCheck;
 
 #ifdef _SVX_TABSTPGE_CXX
-    void            InitTabPos_Impl( USHORT nPos = 0 );
-    void            SetFillAndTabType_Impl();
+    void 			InitTabPos_Impl( USHORT nPos = 0 );
+    void 			SetFillAndTabType_Impl();
 
     // Handler
     DECL_LINK( NewHdl_Impl, Button* );
@@ -152,7 +152,7 @@ private:
     DECL_LINK( GetFillCharHdl_Impl, Edit* );
     DECL_LINK( GetDezCharHdl_Impl, Edit* );
 #endif
-    virtual void            PageCreated(SfxAllItemSet aSet); // add CHINA001
+    virtual void 			PageCreated(SfxAllItemSet aSet); // add CHINA001
 };
 
 #endif // #ifndef _SVX_TABSTPGE_HXX
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index 427e94e26870..0c6961db7855 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,36 +48,36 @@ class SdrView;
 class SvxTextAnimationPage : public SfxTabPage
 {
 private:
-    FixedLine           aFlEffect;
-    FixedText           aFtEffects;
-    ListBox             aLbEffect;
-    //ValueSet          aCtlEffect;
-    FixedText           aFtDirection;
-    ImageButton         aBtnUp;
-    ImageButton         aBtnLeft;
-    ImageButton         aBtnRight;
-    ImageButton         aBtnDown;
-
-    FixedLine           aFlProperties;
-    TriStateBox         aTsbStartInside;
-    TriStateBox         aTsbStopInside;
-
-    FixedText           aFtCount;
-    TriStateBox         aTsbEndless;
-    NumericField        aNumFldCount;
-
-    FixedText           aFtAmount;
-    TriStateBox         aTsbPixel;
-    MetricField         aMtrFldAmount;
-
-    FixedText           aFtDelay;
-    TriStateBox         aTsbAuto;
-    MetricField         aMtrFldDelay;
-
-    const SfxItemSet&   rOutAttrs;
-    SdrTextAniKind      eAniKind;
-    FieldUnit           eFUnit;
-    SfxMapUnit          eUnit;
+    FixedLine			aFlEffect;
+    FixedText			aFtEffects;
+    ListBox				aLbEffect;
+    //ValueSet			aCtlEffect;
+    FixedText			aFtDirection;	
+    ImageButton			aBtnUp;
+    ImageButton			aBtnLeft;
+    ImageButton			aBtnRight;
+    ImageButton			aBtnDown;
+
+    FixedLine			aFlProperties;	
+    TriStateBox			aTsbStartInside;
+    TriStateBox			aTsbStopInside;
+
+    FixedText			aFtCount;
+    TriStateBox			aTsbEndless;
+    NumericField		aNumFldCount;
+
+    FixedText			aFtAmount;
+    TriStateBox			aTsbPixel;
+    MetricField			aMtrFldAmount;
+
+    FixedText			aFtDelay;
+    TriStateBox			aTsbAuto;
+    MetricField			aMtrFldDelay;
+
+    const SfxItemSet&	rOutAttrs;
+    SdrTextAniKind		eAniKind;
+    FieldUnit			eFUnit;
+    SfxMapUnit			eUnit;
 
 #ifdef _SVX_TEXTANIM_CXX
     DECL_LINK( SelectEffectHdl_Impl, void * );
@@ -86,8 +86,8 @@ private:
     DECL_LINK( ClickPixelHdl_Impl, void * );
     DECL_LINK( ClickDirectionHdl_Impl, ImageButton * );
 
-    void                SelectDirection( SdrTextAniDirection nValue );
-    USHORT              GetSelectedDirection();
+    void				SelectDirection( SdrTextAniDirection nValue );
+    USHORT				GetSelectedDirection();
 #endif
 
 public:
@@ -95,13 +95,13 @@ public:
     SvxTextAnimationPage( Window* pWindow, const SfxItemSet& rInAttrs );
     ~SvxTextAnimationPage();
 
-    static SfxTabPage*  Create( Window*, const SfxItemSet& );
-    static  USHORT*     GetRanges();
+    static SfxTabPage* 	Create( Window*, const SfxItemSet& );
+    static  USHORT*	    GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& );
-    virtual void        Reset( const SfxItemSet & );
+    virtual BOOL 		FillItemSet( SfxItemSet& );
+    virtual void 		Reset( const SfxItemSet & );
 
-    void         Construct();
+    void 		 Construct();
 };
 
 /*************************************************************************
@@ -112,10 +112,10 @@ public:
 class SvxTextTabDialog : public SfxTabDialog
 {
 private:
-    const SfxItemSet&   rOutAttrs;
-    const SdrView*      pView;
+    const SfxItemSet&	rOutAttrs;
+    const SdrView*		pView;
 
-    virtual void        PageCreated( USHORT nId, SfxTabPage &rPage );
+    virtual void		PageCreated( USHORT nId, SfxTabPage &rPage );
 
 public:
 
diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx
index 258477dc5a5e..a8314998b0ca 100644
--- a/cui/source/inc/textattr.hxx
+++ b/cui/source/inc/textattr.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,36 +48,36 @@ class SdrView;
 class SvxTextAttrPage : public SvxTabPage
 {
 private:
-    FixedLine           aFlText;
+    FixedLine			aFlText;
     TriStateBox         aTsbAutoGrowWidth;
     TriStateBox         aTsbAutoGrowHeight;
-    TriStateBox         aTsbFitToSize;
-    TriStateBox         aTsbContour;
+    TriStateBox			aTsbFitToSize;
+    TriStateBox			aTsbContour;
     TriStateBox         aTsbWordWrapText;
     TriStateBox         aTsbAutoGrowSize;
 
 
-    FixedLine           aFlDistance;
-    FixedText           aFtLeft;
-    MetricField         aMtrFldLeft;
-    FixedText           aFtRight;
-    MetricField         aMtrFldRight;
-    FixedText           aFtTop;
-    MetricField         aMtrFldTop;
-    FixedText           aFtBottom;
-    MetricField         aMtrFldBottom;
+    FixedLine			aFlDistance;
+    FixedText			aFtLeft;
+    MetricField			aMtrFldLeft;
+    FixedText			aFtRight;
+    MetricField			aMtrFldRight;
+    FixedText			aFtTop;
+    MetricField			aMtrFldTop;
+    FixedText			aFtBottom;
+    MetricField			aMtrFldBottom;
 
-    FixedLine           aFlSeparator;
+    FixedLine			aFlSeparator;
 
-    FixedLine           aFlPosition;
-    SvxRectCtl          aCtlPosition;
-    TriStateBox         aTsbFullWidth;
+    FixedLine			aFlPosition;
+    SvxRectCtl			aCtlPosition;
+    TriStateBox			aTsbFullWidth;
 
-    const SfxItemSet&   rOutAttrs;
-    const SdrView*      pView;
+    const SfxItemSet&	rOutAttrs;
+    const SdrView*		pView;
 
-    BOOL                bAutoGrowSizeEnabled;
-    BOOL                bContourEnabled;
+    BOOL				bAutoGrowSizeEnabled;
+    BOOL				bContourEnabled;
     BOOL                bAutoGrowWidthEnabled;
     BOOL                bAutoGrowHeightEnabled;
     BOOL                bWordWrapTextEnabled;
@@ -98,16 +98,16 @@ public:
     SvxTextAttrPage( Window* pWindow, const SfxItemSet& rInAttrs );
     ~SvxTextAttrPage();
 
-    static SfxTabPage*  Create( Window*, const SfxItemSet& );
-    static  USHORT*     GetRanges();
+    static SfxTabPage* 	Create( Window*, const SfxItemSet& );
+    static  USHORT*	    GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& );
-    virtual void        Reset( const SfxItemSet & );
+    virtual BOOL 		FillItemSet( SfxItemSet& );
+    virtual void 		Reset( const SfxItemSet & );
 
-    virtual void        PointChanged( Window* pWindow, RECT_POINT eRP );
+    virtual void 		PointChanged( Window* pWindow, RECT_POINT eRP );
 
-    void         Construct();
-    void         SetView( const SdrView* pSdrView ) { pView = pSdrView; }
+    void 		 Construct();
+    void		 SetView( const SdrView* pSdrView ) { pView = pSdrView; }
     virtual void         PageCreated(SfxAllItemSet aSet);
 };
 
diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx
index 8a3dc22d1715..6ea7bc591abc 100644
--- a/cui/source/inc/thesdlg.hxx
+++ b/cui/source/inc/thesdlg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 8c427bef17d1..6083a0d56928 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ const USHORT SVX_OBJ_NOPROTECT = 0x0200;
 class SvxTransformTabDialog : public SfxTabDialog
 {
 private:
-    const SdrView*      pView;
+    const SdrView*		pView;
 
-    USHORT              nAnchorCtrls;
+    USHORT				nAnchorCtrls;
     Link                aValidateLink;
 
-    virtual void        PageCreated( USHORT nId, SfxTabPage &rPage );
+    virtual void		PageCreated( USHORT nId, SfxTabPage &rPage );
 
 public:
 
@@ -70,8 +70,8 @@ public:
                             const SdrView* pView,
                             USHORT nAnchorTypes = 0);
             ~SvxTransformTabDialog();
-
-            //link for the Writer to validate positions
+            
+            //link for the Writer to validate positions 
             void SetValidateFramePosLink( const Link& rLink );
 };
 
@@ -88,60 +88,60 @@ class SvxPositionSizeTabPage : public SvxTabPage
 
 private:
     // position
-    FixedLine           maFlPosition;
-    FixedText           maFtPosX;
-    MetricField         maMtrPosX;
-    FixedText           maFtPosY;
-    MetricField         maMtrPosY;
-    FixedText           maFtPosReference;
-    SvxRectCtl          maCtlPos;
+    FixedLine			maFlPosition;
+    FixedText			maFtPosX;
+    MetricField			maMtrPosX;
+    FixedText			maFtPosY;
+    MetricField			maMtrPosY;
+    FixedText			maFtPosReference;
+    SvxRectCtl			maCtlPos;
 
     // size
-    FixedLine           maFlSize;
-    FixedText           maFtWidth;
-    MetricField         maMtrWidth;
-    FixedText           maFtHeight;
-    MetricField         maMtrHeight;
-    CheckBox            maCbxScale;
-    FixedText           maFtSizeReference;
-    SvxRectCtl          maCtlSize;
+    FixedLine			maFlSize;
+    FixedText			maFtWidth;
+    MetricField			maMtrWidth;
+    FixedText			maFtHeight;
+    MetricField			maMtrHeight;
+    CheckBox   			maCbxScale;
+    FixedText			maFtSizeReference;
+    SvxRectCtl			maCtlSize;
 
     // protect
-    FixedLine           maFlProtect;
-    TriStateBox         maTsbPosProtect;
-    TriStateBox         maTsbSizeProtect;
+    FixedLine			maFlProtect;
+    TriStateBox			maTsbPosProtect;
+    TriStateBox			maTsbSizeProtect;
 
     // adjust
-    FixedLine           maFlAdjust;
+    FixedLine			maFlAdjust;
     TriStateBox         maTsbAutoGrowWidth;
     TriStateBox         maTsbAutoGrowHeight;
 
-    FixedLine           maFlDivider;
+    FixedLine			maFlDivider;
 
 private:
-    const SfxItemSet&   mrOutAttrs;
+    const SfxItemSet&	mrOutAttrs;
 
-    const SdrView*      mpView;
+    const SdrView*		mpView;
 
     // #i75273#
-    basegfx::B2DRange   maRange;
-    basegfx::B2DRange   maWorkRange;
-    basegfx::B2DPoint   maAnchor;
-
-    SfxMapUnit          mePoolUnit;
-    FieldUnit           meDlgUnit;
-    MapUnit             meMapUnit;
-    TriState            mnProtectSizeState;
-    bool                mbPageDisabled;
-    bool                mbProtectDisabled;
-    bool                mbSizeDisabled;
-    bool                mbAdjustDisabled;
+    basegfx::B2DRange	maRange;
+    basegfx::B2DRange	maWorkRange;
+    basegfx::B2DPoint	maAnchor;
+
+    SfxMapUnit			mePoolUnit;
+    FieldUnit			meDlgUnit;
+    MapUnit				meMapUnit;
+    TriState			mnProtectSizeState;
+    bool				mbPageDisabled;
+    bool				mbProtectDisabled;
+    bool				mbSizeDisabled;
+    bool				mbAdjustDisabled;
 
     // frome size
     // #i75273#
-    double              mfOldWidth;
-    double              mfOldHeight;
-    RECT_POINT          meRP;
+    double				mfOldWidth;
+    double				mfOldHeight;
+    RECT_POINT			meRP;
 
     //------------------------------------
 #if _SOLAR__PRIVATE
@@ -162,15 +162,15 @@ private:
     DECL_LINK( ClickSizeProtectHdl, void * );
     DECL_LINK( ClickAutoHdl, void * );
 
-    void        SetMaxSize( Rectangle aRect );
-    Rectangle   GetRect();
+    void		SetMaxSize( Rectangle aRect );
+    Rectangle	GetRect();
 #endif
 
 public:
     SvxPositionSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs  );
 
     static SfxTabPage* Create( Window*, const SfxItemSet& );
-    static USHORT*     GetRanges();
+    static USHORT*	   GetRanges();
 
     virtual BOOL FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
@@ -180,16 +180,16 @@ public:
 
     virtual void PointChanged( Window* pWindow, RECT_POINT eRP );
 
-    void         Construct();
-    void         SetView( const SdrView* pSdrView ) { mpView = pSdrView; }
+    void 		 Construct();
+    void		 SetView( const SdrView* pSdrView ) { mpView = pSdrView; }
 
 //  void         ShowAnchorCtrls(USHORT nAnchorCtrls); // Writer-spezifische Controls anzeigen
     virtual void FillUserData();
 
-    void        DisableResize();
-    void        DisableProtect();
+    void		DisableResize();
+    void		DisableProtect();
 
-    void        UpdateControlStates();
+    void 		UpdateControlStates();
 };
 
 /*************************************************************************
@@ -203,30 +203,30 @@ class SvxAngleTabPage : public SvxTabPage
     using TabPage::DeactivatePage;
 
 private:
-    FixedLine           aFlPosition;
-    FixedText           aFtPosX;
-    MetricField         aMtrPosX;
-    FixedText           aFtPosY;
-    MetricField         aMtrPosY;
-    FixedText           aFtPosPresets;
-    SvxRectCtl          aCtlRect;
-
-    FixedLine           aFlAngle;
-    FixedText           aFtAngle;
-    MetricField         aMtrAngle;
-    FixedText           aFtAnglePresets;
-    SvxRectCtl          aCtlAngle;
-
-    const SfxItemSet&   rOutAttrs;
-    const SdrView*      pView;
+    FixedLine			aFlPosition;
+    FixedText			aFtPosX;
+    MetricField			aMtrPosX;
+    FixedText			aFtPosY;
+    MetricField			aMtrPosY;
+    FixedText			aFtPosPresets;
+    SvxRectCtl			aCtlRect;
+
+    FixedLine			aFlAngle;
+    FixedText			aFtAngle;
+    MetricField			aMtrAngle;
+    FixedText			aFtAnglePresets;
+    SvxRectCtl			aCtlAngle;
+
+    const SfxItemSet&	rOutAttrs;
+    const SdrView*		pView;
 
     // #i75273#
-    basegfx::B2DRange   maRange;
-    basegfx::B2DPoint   maAnchor;
+    basegfx::B2DRange	maRange;
+    basegfx::B2DPoint	maAnchor;
 
-    SfxMapUnit          ePoolUnit;
-    FieldUnit           eDlgUnit;
-    MapUnit             eMapUnit;
+    SfxMapUnit			ePoolUnit;
+    FieldUnit			eDlgUnit;
+    MapUnit				eMapUnit;
     //------------------------------------
 #if _SOLAR__PRIVATE
     DECL_LINK( ModifiedHdl, void * );
@@ -235,7 +235,7 @@ public:
          SvxAngleTabPage( Window* pParent, const SfxItemSet& rInAttrs  );
 
     static SfxTabPage* Create( Window*, const SfxItemSet& );
-    static USHORT*     GetRanges();
+    static USHORT*	   GetRanges();
 
     virtual BOOL FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
@@ -245,8 +245,8 @@ public:
 
     virtual void PointChanged( Window* pWindow, RECT_POINT eRP );
 
-    void         Construct();
-    void         SetView( const SdrView* pSdrView ) { pView = pSdrView; }
+    void 		 Construct();
+    void		 SetView( const SdrView* pSdrView ) { pView = pSdrView; }
 };
 
 /*************************************************************************
@@ -260,31 +260,31 @@ class SvxSlantTabPage : public SvxTabPage
     using TabPage::DeactivatePage;
 
 private:
-    FixedLine           aFlRadius;
-    FixedText           aFtRadius;
-    MetricField         aMtrRadius;
-    //TriStateBox           aTsbVertical;
-    FixedLine           aFlAngle;
-    FixedText           aFtAngle;
-    MetricField         aMtrAngle;
-    //SvxRectCtl            aCtlAngle;
+    FixedLine			aFlRadius;
+    FixedText			aFtRadius;
+    MetricField			aMtrRadius;
+    //TriStateBox			aTsbVertical;
+    FixedLine			aFlAngle;
+    FixedText			aFtAngle;
+    MetricField			aMtrAngle;
+    //SvxRectCtl			aCtlAngle;
 
-    const SfxItemSet&   rOutAttrs;
+    const SfxItemSet&	rOutAttrs;
 
-    const SdrView*      pView;
+    const SdrView*		pView;
 
     // #i75273#
-    basegfx::B2DRange   maRange;
+    basegfx::B2DRange	maRange;
 
-    SfxMapUnit          ePoolUnit;
-    FieldUnit           eDlgUnit;
-    MapUnit             eMapUnit;
+    SfxMapUnit			ePoolUnit;
+    FieldUnit			eDlgUnit;
+    MapUnit				eMapUnit;
     //------------------------------------
 public:
          SvxSlantTabPage( Window* pParent, const SfxItemSet& rInAttrs  );
 
     static SfxTabPage* Create( Window*, const SfxItemSet& );
-    static USHORT*     GetRanges();
+    static USHORT*	   GetRanges();
 
     virtual BOOL FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
@@ -294,8 +294,8 @@ public:
 
     virtual void PointChanged( Window* pWindow, RECT_POINT eRP );
 
-    void         Construct();
-    void         SetView( const SdrView* pSdrView ) { pView = pSdrView; }
+    void 		 Construct();
+    void		 SetView( const SdrView* pSdrView ) { pView = pSdrView; }
 };
 
 
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index 35f51d7b0183..27c13d5fdba4 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class OfaOptionsTreeListBox : public SvTreeListBox
     using  SvListView::Collapse;
 
 private:
-    BOOL            bInCollapse;
+    BOOL 			bInCollapse;
 
 public:
     OfaOptionsTreeListBox(Window* pParent, const ResId& rResId) :
         SvTreeListBox( pParent, rResId ), bInCollapse(FALSE) {}
 
     virtual BOOL    Collapse( SvLBoxEntry* pParent );
-    BOOL            IsInCollapse()const {return bInCollapse;}
+    BOOL			IsInCollapse()const {return bInCollapse;}
 };
 
 // struct OrderedEntry ---------------------------------------------------
@@ -177,40 +177,40 @@ typedef std::vector< ExtensionsTabPage* > VectorOfPages;
 class OfaTreeOptionsDialog : public SfxModalDialog
 {
 private:
-    OKButton        aOkPB;
+    OKButton		aOkPB;
     CancelButton    aCancelPB;
-    HelpButton      aHelpPB;
-    PushButton      aBackPB;
+    HelpButton 		aHelpPB;
+    PushButton 		aBackPB;
 
-    FixedBorder     aHiddenGB;
-    FixedText       aPageTitleFT;
-    FixedLine       aLine1FL;
-    FixedText       aHelpFT;
-    FixedImage      aHelpImg;
+    FixedBorder		aHiddenGB;
+    FixedText 		aPageTitleFT;
+    FixedLine		aLine1FL;
+    FixedText		aHelpFT;
+    FixedImage 		aHelpImg;
 
     ImageList       aPageImages;
     ImageList       aPageImagesHC;
 
-    ResStringArray  aHelpTextsArr;
+    ResStringArray	aHelpTextsArr;
 
-    OfaOptionsTreeListBox   aTreeLB;
+    OfaOptionsTreeListBox	aTreeLB;
 
-    String          sTitle;
-    String          sNotLoadedError;
+    String 			sTitle;
+    String			sNotLoadedError;
 
     SvLBoxEntry*    pCurrentPageEntry;
 
     // for the ColorTabPage
-    SfxItemSet*     pColorPageItemSet;
-    XColorTable*    pColorTab;
-    USHORT          nChangeType;
-    USHORT          nUnknownType;
-    USHORT          nUnknownPos;
-    BOOL            bIsAreaTP;
-
-    BOOL            bForgetSelection;
-    BOOL            bExternBrowserActive;
-    BOOL            bImageResized;
+    SfxItemSet*		pColorPageItemSet;
+    XColorTable*	pColorTab;
+    USHORT			nChangeType;
+    USHORT 			nUnknownType;
+    USHORT			nUnknownPos;
+    BOOL			bIsAreaTP;
+
+    BOOL			bForgetSelection;
+    BOOL			bExternBrowserActive;
+    BOOL			bImageResized;
     bool            bInSelectHdl_Impl;
     bool            bIsFromExtensionManager;
 
@@ -224,11 +224,11 @@ private:
 
     static LastPageSaver*   pLastPageSaver;
 
-    SfxItemSet*     CreateItemSet( USHORT nId );
-    void            ApplyItemSet( USHORT nId, const SfxItemSet& rSet );
+    SfxItemSet*		CreateItemSet( USHORT nId );
+    void			ApplyItemSet( USHORT nId, const SfxItemSet& rSet );
     void            InitTreeAndHandler();
     void            Initialize( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& _xFrame );
-    void            ResizeTreeLB( void );   // resizes dialog so that treelistbox has no horizontal scroll bar
+    void			ResizeTreeLB( void );	// resizes dialog so that treelistbox has no horizontal scroll bar
 
     void            LoadExtensionOptions( const rtl::OUString& rExtensionId );
     rtl::OUString   GetModuleIdentifier( const com::sun::star::uno::Reference<
@@ -284,34 +284,34 @@ public:
 
 class OfaPageResource : public Resource
 {
-    ResStringArray      aGeneralDlgAry;
-    ResStringArray      aInetDlgAry;
+    ResStringArray		aGeneralDlgAry;
+    ResStringArray	 	aInetDlgAry;
     ResStringArray      aLangDlgAry;
     ResStringArray      aTextDlgAry;
-    ResStringArray      aHTMLDlgAry;
-    ResStringArray      aCalcDlgAry;
-    ResStringArray      aStarMathDlgAry;
-    ResStringArray      aImpressDlgAry;
-    ResStringArray      aDrawDlgAry;
-    ResStringArray      aChartDlgAry;
-    ResStringArray      aFilterDlgAry;
-    ResStringArray      aDatasourcesDlgAry;
+    ResStringArray		aHTMLDlgAry;
+    ResStringArray		aCalcDlgAry;
+    ResStringArray		aStarMathDlgAry;
+    ResStringArray		aImpressDlgAry;
+    ResStringArray		aDrawDlgAry;
+    ResStringArray		aChartDlgAry;
+    ResStringArray		aFilterDlgAry;
+    ResStringArray		aDatasourcesDlgAry;
 
 public:
     OfaPageResource();
 
-    ResStringArray& GetGeneralArray()       {return aGeneralDlgAry;}
-    ResStringArray& GetInetArray()          {return aInetDlgAry;}
-    ResStringArray& GetLangArray()          {return aLangDlgAry;}
-    ResStringArray& GetTextArray()          {return aTextDlgAry;}
-    ResStringArray& GetHTMLArray()          {return aHTMLDlgAry;}
-    ResStringArray& GetCalcArray()          {return aCalcDlgAry;}
-    ResStringArray& GetStarMathArray()      {return aStarMathDlgAry;}
-    ResStringArray& GetImpressArray()       {return aImpressDlgAry;}
-    ResStringArray& GetDrawArray()          {return aDrawDlgAry;}
-    ResStringArray& GetChartArray()         {return aChartDlgAry;}
-    ResStringArray& GetFilterArray()        {return aFilterDlgAry;}
-    ResStringArray& GetDatasourcesArray()   {return aDatasourcesDlgAry;}
+    ResStringArray& GetGeneralArray() 		{return aGeneralDlgAry;}
+    ResStringArray& GetInetArray() 			{return aInetDlgAry;}
+    ResStringArray& GetLangArray()			{return aLangDlgAry;}
+    ResStringArray& GetTextArray() 			{return aTextDlgAry;}
+    ResStringArray& GetHTMLArray() 			{return aHTMLDlgAry;}
+    ResStringArray& GetCalcArray() 			{return aCalcDlgAry;}
+    ResStringArray& GetStarMathArray()		{return aStarMathDlgAry;}
+    ResStringArray& GetImpressArray() 		{return aImpressDlgAry;}
+    ResStringArray& GetDrawArray() 			{return aDrawDlgAry;}
+    ResStringArray& GetChartArray()			{return aChartDlgAry;}
+    ResStringArray& GetFilterArray() 		{return aFilterDlgAry;}
+    ResStringArray& GetDatasourcesArray()	{return aDatasourcesDlgAry;}
 };
 
 // class ExtensionsTabPage -----------------------------------------------
diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx
index 87fbb8a2f74d..88d3d44793ae 100644
--- a/cui/source/inc/zoom.hxx
+++ b/cui/source/inc/zoom.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ private:
     FixedLine           aZoomFl;
     RadioButton         aOptimalBtn;
     RadioButton         aWholePageBtn;
-    RadioButton         aPageWidthBtn;
+    RadioButton 		aPageWidthBtn;
     RadioButton         a100Btn;
     RadioButton         aUserBtn;
-    MetricField         aUserEdit;
+    MetricField 		aUserEdit;
 
     FixedLine           aViewLayoutFl;
     RadioButton         aAutomaticBtn;
@@ -58,12 +58,12 @@ private:
 
     FixedLine           aBottomFl;
     OKButton            aOKBtn;
-    CancelButton        aCancelBtn;
-    HelpButton          aHelpBtn;
+    CancelButton		aCancelBtn;
+    HelpButton			aHelpBtn;
 
-    const SfxItemSet&   rSet;
-    SfxItemSet*         pOutSet;
-    BOOL                bModified;
+    const SfxItemSet&	rSet;
+    SfxItemSet*			pOutSet;
+    BOOL				bModified;
 
 #ifdef _SVX_ZOOM_CXX
     DECL_LINK( UserHdl, RadioButton* );
@@ -78,16 +78,16 @@ public:
     SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet );
     ~SvxZoomDialog();
 
-    static USHORT*      GetRanges();
-    const SfxItemSet*   GetOutputItemSet() const { return pOutSet; }
+    static USHORT*		GetRanges();
+    const SfxItemSet*	GetOutputItemSet() const { return pOutSet; }
 
-    USHORT              GetFactor() const;
-    void                SetFactor( USHORT nNewFactor, USHORT nBtnId = 0 );
+    USHORT				GetFactor() const;
+    void				SetFactor( USHORT nNewFactor, USHORT nBtnId = 0 );
 
-    void                SetButtonText( USHORT nBtnId, const String& aNewTxt );
-    void                HideButton( USHORT nBtnId );
-    void                SetLimits( USHORT nMin, USHORT nMax );
-    void                SetSpinSize( USHORT nNewSpin );
+    void				SetButtonText( USHORT nBtnId, const String& aNewTxt );
+    void				HideButton( USHORT nBtnId );
+    void				SetLimits( USHORT nMin, USHORT nMax );
+    void				SetSpinSize( USHORT nNewSpin );
 };
 
 #include <layout/layout-post.hxx>
diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx
index e80e1fd867a7..a9e916c0cc63 100644
--- a/cui/source/options/cfgchart.cxx
+++ b/cui/source/options/cfgchart.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx
index 6e9eaf40fa4d..fdfff88fe6fe 100644
--- a/cui/source/options/cfgchart.hxx
+++ b/cui/source/options/cfgchart.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,8 +70,8 @@ public:
 class SvxChartOptions : public ::utl::ConfigItem
 {
 private:
-    SvxChartColorTable      maDefColors;
-    BOOL                    mbIsInitialized;
+    SvxChartColorTable		maDefColors;
+    BOOL					mbIsInitialized;
 
     ::com::sun::star::uno::Sequence< ::rtl::OUString >
                             maPropertyNames;
@@ -84,10 +84,10 @@ public:
     SvxChartOptions();
     virtual ~SvxChartOptions();
 
-    const SvxChartColorTable&   GetDefaultColors();
-    void                        SetDefaultColors( const SvxChartColorTable& aCol );
+    const SvxChartColorTable&	GetDefaultColors();
+    void						SetDefaultColors( const SvxChartColorTable& aCol );
 
-    virtual void                Commit();
+    virtual void				Commit();
     virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames);
 };
 
@@ -101,9 +101,9 @@ public:
     SvxChartColorTableItem( USHORT nWhich, const SvxChartColorTable& );
     SvxChartColorTableItem( const SvxChartColorTableItem& );
 
-    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual int             operator==( const SfxPoolItem& ) const;
-    void                    SetOptions( SvxChartOptions* pOpts ) const;
+    virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
+    virtual int 			operator==( const SfxPoolItem& ) const;
+    void					SetOptions( SvxChartOptions* pOpts ) const;
 
     const SvxChartColorTable & GetColorTable() const ;
     SvxChartColorTable &       GetColorTable();
@@ -113,6 +113,6 @@ private:
     SvxChartColorTable      m_aColorTable;
 };
 
-#endif  // _SVX_CFGCHART_HXX
+#endif	// _SVX_CFGCHART_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/connpoolconfig.cxx b/cui/source/options/connpoolconfig.cxx
index 6caab1652ff1..41366d10314e 100644
--- a/cui/source/options/connpoolconfig.cxx
+++ b/cui/source/options/connpoolconfig.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace offapp
         DriverPoolingSettings aSettings;
         // first get all the drivers register at the driver manager
         ODriverEnumeration aEnumDrivers;
-        for (   ODriverEnumeration::const_iterator aLoopDrivers = aEnumDrivers.begin();
+        for	(	ODriverEnumeration::const_iterator aLoopDrivers = aEnumDrivers.begin();
                 aLoopDrivers != aEnumDrivers.end();
                 ++aLoopDrivers
             )
@@ -134,7 +134,7 @@ namespace offapp
             // look if we (resp. the driver manager) know this driver
             // doing O(n) search here, which is expensive, but this doesn't matter in this small case ...
              DriverPoolingSettings::iterator aLookup;
-             for    (   aLookup = aSettings.begin();
+             for	(	aLookup = aSettings.begin();
                     aLookup != aSettings.end();
                     ++aLookup
                 )
@@ -142,7 +142,7 @@ namespace offapp
                     break;
 
             if (aLookup == aSettings.end())
-            {   // do not know the driver - add it
+            {	// do not know the driver - add it
                 aSettings.push_back(DriverPooling(sThisDriverName, sal_False, 120));
 
                 // and the position of the new entry
@@ -192,7 +192,7 @@ namespace offapp
             OConfigurationNode aThisDriverSettings;
 
             const DriverPoolingSettings& rNewSettings = pDriverSettings->getSettings();
-            for (   DriverPoolingSettings::const_iterator aLoop = rNewSettings.begin();
+            for (	DriverPoolingSettings::const_iterator aLoop = rNewSettings.begin();
                     aLoop != rNewSettings.end();
                     ++aLoop
                 )
@@ -218,7 +218,7 @@ namespace offapp
     }
 
 //........................................................................
-}   // namespace offapp
+}	// namespace offapp
 //........................................................................
 
 
diff --git a/cui/source/options/connpoolconfig.hxx b/cui/source/options/connpoolconfig.hxx
index f834f2e90f03..774c5a744f68 100644
--- a/cui/source/options/connpoolconfig.hxx
+++ b/cui/source/options/connpoolconfig.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 offapp
     };
 
 //........................................................................
-}   // namespace offapp
+}	// namespace offapp
 //........................................................................
 
 #endif // _OFFAPP_CONNPOOLCONFIG_HXX_
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index 9c37502c5ff4..c476a9b3c84a 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace offapp
     {
         using Window::Update;
     protected:
-        DriverPoolingSettings                   m_aSavedSettings;
-        DriverPoolingSettings                   m_aSettings;
-        DriverPoolingSettings::const_iterator   m_aSeekRow;
+        DriverPoolingSettings					m_aSavedSettings;
+        DriverPoolingSettings					m_aSettings;
+        DriverPoolingSettings::const_iterator	m_aSeekRow;
 
-        String                                  m_sYes;
-        String                                  m_sNo;
+        String									m_sYes;
+        String									m_sNo;
 
-        Link                                    m_aRowChangeHandler;
+        Link									m_aRowChangeHandler;
 
     public:
         DriverListControl( Window* _pParent, const ResId& _rId);
 
-        virtual void Init();
+        virtual	void Init();
                 void Update(const DriverPoolingSettings& _rSettings);
         virtual String GetCellText( long nRow, USHORT nColId ) const;
 
@@ -75,12 +75,12 @@ namespace offapp
 
         const DriverPooling* getCurrentRow() const;
         DriverPooling* getCurrentRow();
-        void                                    updateCurrentRow();
+        void									updateCurrentRow();
 
         const DriverPoolingSettings& getSettings() const { return m_aSettings; }
 
-        void        saveValue()             { m_aSavedSettings = m_aSettings; }
-        sal_Bool    isModified() const;
+        void		saveValue()				{ m_aSavedSettings = m_aSettings; }
+        sal_Bool	isModified() const;
 
     protected:
         virtual void InitController( ::svt::CellControllerRef& rController, long nRow, USHORT nCol );
@@ -107,7 +107,7 @@ namespace offapp
 
     //--------------------------------------------------------------------
     DriverListControl::DriverListControl( Window* _pParent, const ResId& _rId)
-//      :DriverListControl_Base(_pParent, _rId, DBBF_NOROWPICTURE, BROWSER_AUTO_VSCROLL | BROWSER_AUTO_HSCROLL | BROWSER_COLUMNSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL | BROWSER_HIDESELECT | BROWSER_CURSOR_WO_FOCUS)
+//		:DriverListControl_Base(_pParent, _rId, DBBF_NOROWPICTURE, BROWSER_AUTO_VSCROLL | BROWSER_AUTO_HSCROLL | BROWSER_COLUMNSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL | BROWSER_HIDESELECT | BROWSER_CURSOR_WO_FOCUS)
         :DriverListControl_Base(_pParent, _rId, EBBF_NOROWPICTURE, BROWSER_AUTO_VSCROLL | BROWSER_AUTO_HSCROLL | BROWSER_HIDECURSOR | BROWSER_AUTOSIZE_LASTCOL)
         ,m_aSeekRow(m_aSettings.end())
         ,m_sYes(ResId(STR_YES,*_rId.GetResMgr()))
@@ -331,15 +331,15 @@ namespace offapp
     //--------------------------------------------------------------------
     ConnectionPoolOptionsPage::ConnectionPoolOptionsPage(Window* _pParent, const SfxItemSet& _rAttrSet)
         :SfxTabPage(_pParent, CUI_RES(RID_OFAPAGE_CONNPOOLOPTIONS ), _rAttrSet)
-        ,m_aFrame               (this,              CUI_RES(FL_POOLING))
-        ,m_aEnablePooling       (this,      CUI_RES(CB_POOL_CONNS))
-        ,m_aDriversLabel        (this,      CUI_RES(FT_DRIVERS))
+        ,m_aFrame				(this,				CUI_RES(FL_POOLING))
+        ,m_aEnablePooling		(this,		CUI_RES(CB_POOL_CONNS))
+        ,m_aDriversLabel		(this,		CUI_RES(FT_DRIVERS))
         ,m_pDriverList(new DriverListControl(this, CUI_RES(CTRL_DRIVER_LIST)))
-        ,m_aDriverLabel         (this,      CUI_RES(FT_DRIVERLABEL))
-        ,m_aDriver              (this,      CUI_RES(FT_DRIVER))
-        ,m_aDriverPoolingEnabled(this,      CUI_RES(CB_DRIVERPOOLING))
-        ,m_aTimeoutLabel        (this,      CUI_RES(FT_TIMEOUT))
-        ,m_aTimeout             (this,      CUI_RES(NF_TIMEOUT))
+        ,m_aDriverLabel			(this,		CUI_RES(FT_DRIVERLABEL))
+        ,m_aDriver				(this,		CUI_RES(FT_DRIVER))
+        ,m_aDriverPoolingEnabled(this,		CUI_RES(CB_DRIVERPOOLING))
+        ,m_aTimeoutLabel		(this,		CUI_RES(FT_TIMEOUT))
+        ,m_aTimeout				(this,		CUI_RES(NF_TIMEOUT))
     {
         m_pDriverList->Init();
         m_pDriverList->Show();
@@ -444,7 +444,7 @@ namespace offapp
         m_aTimeout.Enable(bValidRow);
 
         if (!bValidRow)
-        {   // positioned on an invalid row
+        {	// positioned on an invalid row
             m_aDriver.SetText(String());
         }
         else
@@ -502,7 +502,7 @@ namespace offapp
     }
 
 //........................................................................
-}   // namespace offapp
+}	// namespace offapp
 //........................................................................
 
 
diff --git a/cui/source/options/connpooloptions.hrc b/cui/source/options/connpooloptions.hrc
index ec12b61b8aea..88b36f0ed40e 100644
--- a/cui/source/options/connpooloptions.hrc
+++ b/cui/source/options/connpooloptions.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,21 +28,21 @@
 #ifndef _OFFAPP_CONNPOOLOPTIONS_HRC_
 #define _OFFAPP_CONNPOOLOPTIONS_HRC_
 
-#define FL_POOLING               1
-#define CB_POOL_CONNS            2
-#define FT_DRIVERS               3
-#define CTRL_DRIVER_LIST         4
-#define FT_DRIVERLABEL           5
-#define FT_DRIVER                6
-#define CB_DRIVERPOOLING         7
-#define FT_TIMEOUT               8
-#define NF_TIMEOUT               9
+#define FL_POOLING				 1
+#define CB_POOL_CONNS			 2
+#define FT_DRIVERS				 3
+#define CTRL_DRIVER_LIST		 4
+#define FT_DRIVERLABEL			 5
+#define FT_DRIVER				 6
+#define CB_DRIVERPOOLING		 7
+#define FT_TIMEOUT				 8
+#define NF_TIMEOUT				 9
 
-#define STR_DRIVER_NAME         1
-#define STR_POOLED_FLAG         2
-#define STR_POOL_TIMEOUT        3
-#define STR_YES                 4
-#define STR_NO                  5
+#define STR_DRIVER_NAME			1
+#define STR_POOLED_FLAG			2
+#define STR_POOL_TIMEOUT		3
+#define STR_YES					4
+#define STR_NO					5
 
 #endif // _OFFAPP_CONNPOOLOPTIONS_HRC_
 
diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx
index 9b4e58255575..0f3bea310045 100644
--- a/cui/source/options/connpooloptions.hxx
+++ b/cui/source/options/connpooloptions.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,30 +50,30 @@ namespace offapp
         using TabPage::ActivatePage;
 
     protected:
-        FixedLine               m_aFrame;
-        CheckBox                m_aEnablePooling;
-        FixedText               m_aDriversLabel;
-        DriverListControl*      m_pDriverList;
-        FixedText               m_aDriverLabel;
-        FixedText               m_aDriver;
-        CheckBox                m_aDriverPoolingEnabled;
-        FixedText               m_aTimeoutLabel;
-        NumericField            m_aTimeout;
+        FixedLine				m_aFrame;
+        CheckBox				m_aEnablePooling;
+        FixedText				m_aDriversLabel;
+        DriverListControl*		m_pDriverList;
+        FixedText				m_aDriverLabel;
+        FixedText				m_aDriver;
+        CheckBox				m_aDriverPoolingEnabled;
+        FixedText				m_aTimeoutLabel;
+        NumericField			m_aTimeout;
 
     protected:
         ConnectionPoolOptionsPage(Window* _pParent, const SfxItemSet& _rAttrSet);
 
     public:
-        static SfxTabPage*  Create(Window* _pParent, const SfxItemSet& _rAttrSet);
+        static SfxTabPage*	Create(Window* _pParent, const SfxItemSet& _rAttrSet);
 
         ~ConnectionPoolOptionsPage();
 
     protected:
-        virtual long        Notify( NotifyEvent& _rNEvt );
+        virtual long		Notify( NotifyEvent& _rNEvt );
 
-        virtual BOOL        FillItemSet(SfxItemSet& _rSet);
-        virtual void        Reset(const SfxItemSet& _rSet);
-        virtual void        ActivatePage( const SfxItemSet& _rSet);
+        virtual BOOL		FillItemSet(SfxItemSet& _rSet);
+        virtual void		Reset(const SfxItemSet& _rSet);
+        virtual void		ActivatePage( const SfxItemSet& _rSet);
 
     protected:
         DECL_LINK( OnEnabledDisabled, const CheckBox* );
@@ -85,7 +85,7 @@ namespace offapp
     };
 
 //........................................................................
-}   // namespace offapp
+}	// namespace offapp
 //........................................................................
 
 #endif // _OFFAPP_CONNPOOLOPTIONS_HXX_
diff --git a/cui/source/options/connpooloptions.src b/cui/source/options/connpooloptions.src
index 08e4f2043a40..cd4cad5f1d6e 100644
--- a/cui/source/options/connpooloptions.src
+++ b/cui/source/options/connpooloptions.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include "connpooloptions.hrc"
 #include <cuires.hrc>
 
-#define PAGE_SIZE_X     260
-#define PAGE_SIZE_Y     185
+#define PAGE_SIZE_X		260
+#define PAGE_SIZE_Y		185
 
-#define LIST_SIZE_Y     100
+#define LIST_SIZE_Y		100
 
 TabPage RID_OFAPAGE_CONNPOOLOPTIONS
 {
-     // HelpId = ;
+     //	HelpId = ;
     OutputSize = TRUE ;
     Size = MAP_APPFONT ( PAGE_SIZE_X, PAGE_SIZE_Y ) ;
     SVLook = TRUE ;
diff --git a/cui/source/options/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx
index 8c32ad12f40d..f3756627ea07 100644
--- a/cui/source/options/connpoolsettings.cxx
+++ b/cui/source/options/connpoolsettings.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace offapp
     //--------------------------------------------------------------------
     sal_Bool DriverPooling::operator == (const DriverPooling& _rR) const
     {
-        return  (sName == _rR.sName)
-            &&  (bEnabled == _rR.bEnabled)
-            &&  (nTimeoutSeconds == _rR.nTimeoutSeconds);
+        return	(sName == _rR.sName)
+            &&	(bEnabled == _rR.bEnabled)
+            &&	(nTimeoutSeconds == _rR.nTimeoutSeconds);
     }
 
     //====================================================================
@@ -115,7 +115,7 @@ namespace offapp
     //--------------------------------------------------------------------
 
 //........................................................................
-}   // namespace offapp
+}	// namespace offapp
 //........................................................................
 
 
diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx
index a347d1588c4e..8534d2f8b525 100644
--- a/cui/source/options/connpoolsettings.hxx
+++ b/cui/source/options/connpoolsettings.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace offapp
     //====================================================================
     struct DriverPooling
     {
-        String              sName;
-        sal_Bool            bEnabled;
-        sal_Int32           nTimeoutSeconds;
+        String				sName;
+        sal_Bool			bEnabled;
+        sal_Int32			nTimeoutSeconds;
 
         DriverPooling();
         DriverPooling( const String& _rName, sal_Bool _bEnabled, const sal_Int32 _nTimeout );
@@ -61,22 +61,22 @@ namespace offapp
     {
     protected:
         DECLARE_STL_VECTOR( DriverPooling, DriverSettings );
-        DriverSettings      m_aDrivers;
+        DriverSettings		m_aDrivers;
 
     public:
-        typedef ConstDriverSettingsIterator const_iterator;
-        typedef DriverSettingsIterator      iterator;
+        typedef ConstDriverSettingsIterator	const_iterator;
+        typedef DriverSettingsIterator		iterator;
 
     public:
         DriverPoolingSettings();
 
         sal_Int32 size() const { return m_aDrivers.size(); }
 
-        const_iterator  begin() const   { return m_aDrivers.begin(); }
-        const_iterator  end() const     { return m_aDrivers.end(); }
+        const_iterator	begin() const	{ return m_aDrivers.begin(); }
+        const_iterator	end() const		{ return m_aDrivers.end(); }
 
-        iterator        begin()     { return m_aDrivers.begin(); }
-        iterator        end()       { return m_aDrivers.end(); }
+        iterator		begin()		{ return m_aDrivers.begin(); }
+        iterator		end()		{ return m_aDrivers.end(); }
 
         void push_back(const DriverPooling& _rElement) { m_aDrivers.push_back(_rElement); }
     };
@@ -87,7 +87,7 @@ namespace offapp
     class DriverPoolingSettingsItem : public SfxPoolItem
     {
     protected:
-        DriverPoolingSettings   m_aSettings;
+        DriverPoolingSettings	m_aSettings;
 
     public:
         TYPEINFO();
@@ -97,11 +97,11 @@ namespace offapp
         virtual int              operator==( const SfxPoolItem& ) const;
         virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
 
-        const DriverPoolingSettings& getSettings() const    { return m_aSettings; }
+        const DriverPoolingSettings& getSettings() const	{ return m_aSettings; }
     };
 
 //........................................................................
-}   // namespace offapp
+}	// namespace offapp
 //........................................................................
 
 #endif // _OFFAPP_CONNPOOLSETTINGS_HXX_
diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx
index 40f0158404cc..50644fb8d6e7 100644
--- a/cui/source/options/cuisrchdlg.cxx
+++ b/cui/source/options/cuisrchdlg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 #include <cuires.hrc>
 
-#define ITEMID_SETITEM      0
+#define	ITEMID_SETITEM		0
 
 #include <svl/srchitem.hxx>
 #include <svx/pageitem.hxx>
@@ -66,12 +66,12 @@
 SvxJSearchOptionsDialog::SvxJSearchOptionsDialog(
             Window *pParent,
             const SfxItemSet& rOptionsSet, INT32 nInitialFlags ) :
-    SfxSingleTabDialog  ( pParent, rOptionsSet, RID_SVXPAGE_JSEARCH_OPTIONS ),
+    SfxSingleTabDialog	( pParent, rOptionsSet, RID_SVXPAGE_JSEARCH_OPTIONS ),
     nInitialTlFlags( nInitialFlags )
 {
     pPage = (SvxJSearchOptionsPage *)
                     SvxJSearchOptionsPage::Create( this, rOptionsSet );
-    SetTabPage( pPage );    //! implicitly calls pPage->Reset(...)!
+    SetTabPage( pPage );	//! implicitly calls pPage->Reset(...)!
     pPage->EnableSaveOptions( FALSE );
 }
 
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index bc856f37ad20..1730276ca208 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include "dbregisterednamesconfig.hxx"
 #include <svx/dialogs.hrc>
 
-#define TAB_WIDTH1      80
+#define TAB_WIDTH1		80
 #define TAB_WIDTH_MIN   10
-#define TAB_WIDTH2      1000
+#define TAB_WIDTH2		1000
 #define ITEMID_TYPE       1
 #define ITEMID_PATH       2
 //........................................................................
@@ -119,18 +119,18 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( Window* pParent, const Sfx
 
     SfxTabPage( pParent, CUI_RES( RID_SFXPAGE_DBREGISTER), rSet ),
 
-    aStdBox         ( this, CUI_RES( GB_STD ) ),
-    aTypeText       ( this, CUI_RES( FT_TYPE ) ),
-    aPathText       ( this, CUI_RES( FT_PATH ) ),
-    aPathCtrl       ( this, CUI_RES( LB_PATH ) ),
-    m_aNew          ( this, CUI_RES( BTN_NEW ) ),
-    m_aEdit         ( this, CUI_RES( BTN_EDIT ) ),
-    m_aDelete       ( this, CUI_RES( BTN_DELETE ) ),
-    pHeaderBar      ( NULL ),
-    pPathBox        ( NULL ),
-    m_pCurEntry     ( NULL ),
-    m_nOldCount     ( 0 ),
-    m_bModified     ( FALSE )
+    aStdBox			( this, CUI_RES( GB_STD ) ),
+    aTypeText		( this, CUI_RES( FT_TYPE ) ),
+    aPathText		( this, CUI_RES( FT_PATH ) ),
+    aPathCtrl		( this, CUI_RES( LB_PATH ) ),
+    m_aNew			( this, CUI_RES( BTN_NEW ) ),
+    m_aEdit			( this, CUI_RES( BTN_EDIT ) ),
+    m_aDelete		( this, CUI_RES( BTN_DELETE ) ),
+    pHeaderBar		( NULL ),
+    pPathBox		( NULL ),
+    m_pCurEntry		( NULL ),
+    m_nOldCount		( 0 ),
+    m_bModified		( FALSE )
 {
     m_aNew.SetClickHdl( LINK( this, DbRegistrationOptionsPage, NewHdl ) );
     m_aEdit.SetClickHdl( LINK( this, DbRegistrationOptionsPage, EditHdl ) );
@@ -195,7 +195,7 @@ DbRegistrationOptionsPage::~DbRegistrationOptionsPage()
 
 // -----------------------------------------------------------------------
 
-SfxTabPage* DbRegistrationOptionsPage::Create( Window* pParent,
+SfxTabPage*	DbRegistrationOptionsPage::Create( Window* pParent,
                                     const SfxItemSet& rAttrSet )
 {
     return ( new DbRegistrationOptionsPage( pParent, rAttrSet ) );
@@ -258,7 +258,7 @@ void DbRegistrationOptionsPage::Reset( const SfxItemSet& rSet )
         HeaderEndDrag_Impl( NULL );
         // Sortierrichtung restaurieren
         BOOL bUp = (BOOL)(USHORT)aUserData.GetToken(1).ToInt32();
-        HeaderBarItemBits nBits = pHeaderBar->GetItemBits(ITEMID_TYPE);
+        HeaderBarItemBits nBits	= pHeaderBar->GetItemBits(ITEMID_TYPE);
 
         if ( bUp )
         {
@@ -281,7 +281,7 @@ void DbRegistrationOptionsPage::FillUserData()
 {
     String aUserData = String::CreateFromInt32( pHeaderBar->GetItemSize( ITEMID_TYPE ) );
     aUserData += ';';
-    HeaderBarItemBits nBits = pHeaderBar->GetItemBits( ITEMID_TYPE );
+    HeaderBarItemBits nBits	= pHeaderBar->GetItemBits( ITEMID_TYPE );
     BOOL bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW );
     aUserData += bUp ? '1' : '0';
     SetUserData( aUserData );
@@ -334,7 +334,7 @@ IMPL_LINK( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar )
     if ( pBar && pBar->GetCurItemId() != ITEMID_TYPE )
         return 0;
 
-    HeaderBarItemBits nBits = pHeaderBar->GetItemBits(ITEMID_TYPE);
+    HeaderBarItemBits nBits	= pHeaderBar->GetItemBits(ITEMID_TYPE);
     BOOL bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW );
     SvSortMode eMode = SortAscending;
 
@@ -519,7 +519,7 @@ IMPL_LINK( DbRegistrationOptionsPage, NameValidator, String*, _pName )
     return 1L;
 }
 //........................................................................
-}   // namespace svx
+}	// namespace svx
 //........................................................................
 
 
diff --git a/cui/source/options/dbregister.hrc b/cui/source/options/dbregister.hrc
index 492913c0a251..eb53ca07f22e 100644
--- a/cui/source/options/dbregister.hrc
+++ b/cui/source/options/dbregister.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #define SVX_DBREGISTER_HRC
 // defines ---------------------------------------------------------------
 
-#define FT_TYPE                 10
-#define FT_PATH                 11
-#define LB_PATH                 12
-#define BTN_NEW             13
-#define BTN_EDIT            14
-#define GB_STD                  15
+#define FT_TYPE 	 			10
+#define FT_PATH 	 			11
+#define LB_PATH 	 			12
+#define BTN_NEW	 			13
+#define BTN_EDIT 			14
+#define GB_STD		 			15
 #define IMG_LOCK                16
 #define IMG_LOCK_HC             17
-#define BTN_DELETE              18
+#define BTN_DELETE				18
 
 #endif // SVX_DBREGISTER_HRC
 
diff --git a/cui/source/options/dbregister.src b/cui/source/options/dbregister.src
index 444d4faac22d..7da53884d465 100644
--- a/cui/source/options/dbregister.src
+++ b/cui/source/options/dbregister.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/options/dbregisterednamesconfig.cxx b/cui/source/options/dbregisterednamesconfig.cxx
index 9505cb52e9c5..064533ac1889 100644
--- a/cui/source/options/dbregisterednamesconfig.cxx
+++ b/cui/source/options/dbregisterednamesconfig.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace svx
                 aContext.createComponent( "com.sun.star.sdb.DatabaseContext" ), UNO_QUERY_THROW );
 
             const DatabaseRegistrations& rNewRegistrations = pRegistrations->getRegistrations();
-            for (   DatabaseRegistrations::const_iterator reg = rNewRegistrations.begin();
+            for (	DatabaseRegistrations::const_iterator reg = rNewRegistrations.begin();
                     reg != rNewRegistrations.end();
                     ++reg
                 )
@@ -139,7 +139,7 @@ namespace svx
     }
 
 //........................................................................
-}   // namespace svx
+}	// namespace svx
 //........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/dbregisterednamesconfig.hxx b/cui/source/options/dbregisterednamesconfig.hxx
index 8bda35b4f0d1..1754d4c810a8 100644
--- a/cui/source/options/dbregisterednamesconfig.hxx
+++ b/cui/source/options/dbregisterednamesconfig.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 svx
     };
 
 //........................................................................
-}   // namespace svx
+}	// namespace svx
 //........................................................................
 
 #endif // SVX_DBREGISTEREDNAMESCONFIG_HXX
diff --git a/cui/source/options/dbregistersettings.cxx b/cui/source/options/dbregistersettings.cxx
index 97c9cf0b2587..9950f059b659 100644
--- a/cui/source/options/dbregistersettings.cxx
+++ b/cui/source/options/dbregistersettings.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 svx
     //--------------------------------------------------------------------
 
 //........................................................................
-}   // namespace svx
+}	// namespace svx
 //........................................................................
 
 
diff --git a/cui/source/options/dbregistersettings.hxx b/cui/source/options/dbregistersettings.hxx
index 4b096ecf4543..531eac7a08fa 100644
--- a/cui/source/options/dbregistersettings.hxx
+++ b/cui/source/options/dbregistersettings.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace svx
     //====================================================================
     class DatabaseMapItem : public SfxPoolItem
     {
-    protected:
+    protected:		
         DatabaseRegistrations   m_aRegistrations;
 
     public:
@@ -90,7 +90,7 @@ namespace svx
     };
 
 //........................................................................
-}   // namespace svx
+}	// namespace svx
 //........................................................................
 #endif // SVX_DBREGISTERSETTING_HXX
 
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index f2fcf7aa2550..b0abcdaa129b 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,11 +59,11 @@ namespace svx
         ,m_aURL             (this, CUI_RES(CMB_URL))
         ,m_aBrowseFile      (this, CUI_RES(PB_BROWSEFILE))
         ,m_aNameLabel       (this, CUI_RES(FT_NAME))
-        ,m_aName            (this, CUI_RES(ET_NAME))
+        ,m_aName			(this, CUI_RES(ET_NAME))
         ,m_aBottomLine      (this, CUI_RES(FL_BOTTOM))
-        ,m_aOK              (this, CUI_RES(BTN_OK))
+        ,m_aOK				(this, CUI_RES(BTN_OK))
         ,m_aCancel          (this, CUI_RES(BTN_CANCEL))
-        ,m_aHelp            (this, CUI_RES(BTN_HELP))
+        ,m_aHelp			(this, CUI_RES(BTN_HELP))
         ,m_bCreatingNew(_bCreateNew)
     {
         String sText = String( CUI_RES( m_bCreatingNew ? STR_NEW_LINK : STR_EDIT_LINK ) );
@@ -83,7 +83,7 @@ namespace svx
 
         validate();
 
-        //  m_aURL.SetHelpId( HID_DOCLINKEDIT_URL );
+        //	m_aURL.SetHelpId( HID_DOCLINKEDIT_URL );
         m_aURL.SetDropDownLineCount( 5 );
     }
 
@@ -105,7 +105,7 @@ namespace svx
     //------------------------------------------------------------------
     void ODocumentLinkDialog::validate( )
     {
-
+        
         m_aOK.Enable( (0 != m_aName.GetText().Len()) && ( 0 != m_aURL.GetText().Len() ) );
     }
 
@@ -156,7 +156,7 @@ namespace svx
                 sMsg.SearchAndReplaceAscii("$file$", sCurrentText);
                 InfoBox aError(this, sMsg);
                 aError.Execute();
-
+                
                 m_aName.SetSelection(Selection(0,sCurrentText.Len()));
                 m_aName.GrabFocus();
                 return 0L;
@@ -190,7 +190,7 @@ namespace svx
             return 0L;
 
         if (0 == m_aName.GetText().Len())
-        {   // default the name to the base of the chosen URL
+        {	// default the name to the base of the chosen URL
             INetURLObject aParser;
 
             aParser.SetSmartProtocol(INET_PROT_FILE);
@@ -220,7 +220,7 @@ namespace svx
     }
 
 //......................................................................
-}   // namespace svx
+}	// namespace svx
 //......................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/doclinkdialog.hrc b/cui/source/options/doclinkdialog.hrc
index cdcc636a78ad..2ad812e7348a 100644
--- a/cui/source/options/doclinkdialog.hrc
+++ b/cui/source/options/doclinkdialog.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 _SVX_DOCLINKDIALOG_HRC_
 #define _SVX_DOCLINKDIALOG_HRC_
 
-#define FT_NAME         1
-#define FT_URL          2
+#define FT_NAME			1
+#define FT_URL			2
 
-#define ET_NAME         1
+#define ET_NAME			1
 
-#define CMB_URL         1
+#define CMB_URL			1
 
-#define PB_BROWSEFILE   1
+#define PB_BROWSEFILE	1
 
-#define BTN_OK          1
-#define BTN_CANCEL      1
-#define BTN_HELP        1
+#define BTN_OK			1
+#define BTN_CANCEL		1
+#define BTN_HELP		1
 
-#define FL_BOTTOM       1
+#define FL_BOTTOM		1
 
-#define STR_EDIT_LINK       1
-#define STR_NEW_LINK        2
+#define STR_EDIT_LINK		1
+#define STR_NEW_LINK		2
 
 #endif // _SVX_DOCLINKDIALOG_HRC_
 
diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx
index 044fba2d37d4..298d15c99817 100644
--- a/cui/source/options/doclinkdialog.hxx
+++ b/cui/source/options/doclinkdialog.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,20 +49,20 @@ namespace svx
     class ODocumentLinkDialog : public ModalDialog
     {
     protected:
-        FixedText               m_aURLLabel;
-        ::svt::OFileURLControl  m_aURL;
-        PushButton              m_aBrowseFile;
-        FixedText               m_aNameLabel;
-        Edit                    m_aName;
+        FixedText				m_aURLLabel;
+        ::svt::OFileURLControl	m_aURL;
+        PushButton				m_aBrowseFile;
+        FixedText				m_aNameLabel;
+        Edit					m_aName;		
 
-        FixedLine               m_aBottomLine;
-        OKButton                m_aOK;
-        CancelButton            m_aCancel;
-        HelpButton              m_aHelp;
+        FixedLine				m_aBottomLine;
+        OKButton				m_aOK;
+        CancelButton			m_aCancel;
+        HelpButton				m_aHelp;
 
-        sal_Bool                m_bCreatingNew;
+        sal_Bool				m_bCreatingNew;
 
-        Link                    m_aNameValidator;
+        Link					m_aNameValidator;
 
     public:
         ODocumentLinkDialog( Window* _pParent, sal_Bool _bCreateNew );
@@ -70,11 +70,11 @@ namespace svx
         // name validation has to be done by an external instance
         // the validator link gets a pointer to a String, and should return 0 if the string is not
         // acceptable
-        void    setNameValidator( const Link& _rValidator ) { m_aNameValidator = _rValidator; }
-        Link    getNameValidator( ) const { return m_aNameValidator; }
+        void	setNameValidator( const Link& _rValidator ) { m_aNameValidator = _rValidator; }
+        Link	getNameValidator( ) const { return m_aNameValidator; }
 
-        void    set( const  String& _rName, const   String& _rURL );
-        void    get(        String& _rName,         String& _rURL ) const;
+        void	set( const	String& _rName, const	String& _rURL );
+        void	get(		String& _rName,			String& _rURL ) const;
 
     protected:
         DECL_LINK( OnTextModified, Control* );
@@ -85,7 +85,7 @@ namespace svx
     };
 
 //......................................................................
-}   // namespace svx
+}	// namespace svx
 //......................................................................
 
 #endif // _SVX_DOCLINKDIALOG_HXX_
diff --git a/cui/source/options/doclinkdialog.src b/cui/source/options/doclinkdialog.src
index f61f23092f37..eb3dadcdeeae 100644
--- a/cui/source/options/doclinkdialog.src
+++ b/cui/source/options/doclinkdialog.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,32 +30,32 @@
 #include "doclinkdialog.hrc"
 #endif
 
-#define DIALOG_SIZE_X       200
-#define DIALOG_SIZE_Y       94
-#define BUTTON_SIZE_X       50
-#define BUTTON_SIZE_Y       14
+#define DIALOG_SIZE_X		200
+#define DIALOG_SIZE_Y		94
+#define BUTTON_SIZE_X		50
+#define BUTTON_SIZE_Y		14
 
-#define LABEL_WIDTH         50
+#define LABEL_WIDTH			50
 
-#define HEIGHT_LABEL         8
-#define HEIGHT_EDIT         12
+#define HEIGHT_LABEL		 8
+#define HEIGHT_EDIT			12
 
-#define LINE_1_Y            6
-#define LINE_2_Y            LINE_1_Y + HEIGHT_EDIT + 4
-#define OFFSET_Y            6
+#define LINE_1_Y			6
+#define LINE_2_Y			LINE_1_Y + HEIGHT_EDIT + 4
+#define OFFSET_Y			6
 
 ModalDialog DLG_DOCUMENTLINK
 {
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( DIALOG_SIZE_X , DIALOG_SIZE_Y ) ;
-
+    
     Moveable = TRUE ;
     Closeable = TRUE ;
-
+    
     FixedText FT_URL
     {
-
+        
         Pos = MAP_APPFONT ( 6, LINE_1_Y ) ;
         Size = MAP_APPFONT ( DIALOG_SIZE_X - 6, HEIGHT_LABEL ) ;
         Group = TRUE;
@@ -95,7 +95,7 @@ ModalDialog DLG_DOCUMENTLINK
         TabStop = TRUE ;
         Border = TRUE ;
     };
-
+    
     FixedLine FL_BOTTOM
     {
         Pos = MAP_APPFONT ( 4, LINE_1_Y + 4*OFFSET_Y + 2*HEIGHT_LABEL + BUTTON_SIZE_Y + HEIGHT_EDIT - 6);
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index e9da5da794db..617c18f35100 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,23 +42,23 @@
 
 /*********************************************************************/
 /*                                                                   */
-/*  TabPage Fontersetzung                                            */
+/* 	TabPage Fontersetzung                                            */
 /*                                                                   */
 /*********************************************************************/
 
-#define CBCOL_FIRST     0
-#define CBCOL_SECOND    1
-#define CBCOL_BOTH      2
+#define CBCOL_FIRST		0
+#define CBCOL_SECOND	1
+#define CBCOL_BOTH		2
 
 SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent,
                                 const SfxItemSet& rSet ) :
     SfxTabPage(pParent, CUI_RES(RID_SVX_FONT_SUBSTITUTION), rSet),
-    aUseTableCB         (this,  CUI_RES(CB_USETABLE)),
+    aUseTableCB 		(this,	CUI_RES(CB_USETABLE)),
     aFont1FT            (this,  CUI_RES(FT_FONT1)),
-    aFont1CB            (this,  CUI_RES(CB_FONT1)),
-    aFont2FT            (this,  CUI_RES(FT_FONT2)),
-    aFont2CB            (this,  CUI_RES(CB_FONT2)),
-    aNewDelTBX          (this,  CUI_RES(TBX_SUBSTNEWDEL)),
+    aFont1CB			(this,	CUI_RES(CB_FONT1)),
+    aFont2FT			(this,	CUI_RES(FT_FONT2)),
+    aFont2CB			(this,	CUI_RES(CB_FONT2)),
+    aNewDelTBX			(this,	CUI_RES(TBX_SUBSTNEWDEL)),
     aCheckLB            (this,  CUI_RES(CLB_SUBSTITUTES)),
 
     aSourceViewFontsFL (this,  CUI_RES(FL_SOURCEVIEW  )),
@@ -68,16 +68,16 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent,
     aFontHeightFT      (this,  CUI_RES(FT_FONTHEIGHT  )),
     aFontHeightLB      (this,  CUI_RES(LB_FONTHEIGHT  )),
 
-    aImageList          (CUI_RES(IL_ICON)),
+    aImageList			(CUI_RES(IL_ICON)),
 
     sAutomatic          (CUI_RES( STR_AUTOMATIC  )),
     pConfig(new SvtFontSubstConfig),
     pSourceViewConfig(new utl::SourceViewConfig),
 
-    sHeader1            (CUI_RES( STR_HEADER1       )),
-    sHeader2            (CUI_RES( STR_HEADER2       )),
-    sHeader3            (CUI_RES( STR_HEADER3       )),
-    sHeader4            (CUI_RES( STR_HEADER4       )),
+    sHeader1			(CUI_RES( STR_HEADER1		)),
+    sHeader2			(CUI_RES( STR_HEADER2		)),
+    sHeader3			(CUI_RES( STR_HEADER3		)),
+    sHeader4			(CUI_RES( STR_HEADER4		)),
 
     sFontGroup          ("FontSubstitution"),
     pCheckButtonData(0)
@@ -171,7 +171,7 @@ SvLBoxEntry* SvxFontSubstTabPage::CreateEntry(String& rFont1, String& rFont2)
     if( !pCheckButtonData )
         pCheckButtonData = new SvLBoxButtonData( &aCheckLB );
 
-    pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0));    // Sonst Puff!
+    pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0));	// Sonst Puff!
 
     pEntry->AddItem( new SvLBoxButton( pEntry,
                                            SvLBoxButtonKind_enabledCheckbox, 0,
@@ -415,7 +415,7 @@ void SvxFontSubstTabPage::CheckEnable()
         sEntry += '\t';
         sEntry += aFont2CB.GetText();
 
-/*      if (!aFont1CB.GetText().Len() || !aFont2CB.GetText().Len() ||
+/*		if (!aFont1CB.GetText().Len() || !aFont2CB.GetText().Len() ||
             aFont1CB.GetText() == aFont2CB.GetText() ||
             aCheckLB.GetEntryPos(sEntry) != 0xffffffff ||
             (pEntry != 0 && aCheckLB.NextSelected(pEntry) != 0))
diff --git a/cui/source/options/fontsubs.hrc b/cui/source/options/fontsubs.hrc
index e23bcf2365a3..73830cf2b00f 100644
--- a/cui/source/options/fontsubs.hrc
+++ b/cui/source/options/fontsubs.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 // defines ------------------------------------------------------------------
 
 #define CLB_SUBSTITUTES         1
-#define FT_FONT1                2
+#define FT_FONT1				2
 #define CB_FONT1                3
 #define FT_FONT2                4
 #define CB_FONT2                5
@@ -46,8 +46,8 @@
 #define STR_HEADER3             12
 #define STR_HEADER4             13
 
-#define IL_ICON                 20
-#define CB_USETABLE             21
+#define IL_ICON					20
+#define CB_USETABLE				21
 
 #define FL_SOURCEVIEW           22
 #define FT_FONTNAME             23
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index ddae7a3af68e..e02bb70bc9d4 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,22 +49,22 @@ class SvxFontSubstCheckListBox : public SvxSimpleTable
     using SvTreeListBox::SetCheckButtonState;
 
     protected:
-        virtual void    SetTabs();
+        virtual void	SetTabs();
         virtual void    KeyInput( const KeyEvent& rKEvt );
 
     public:
         SvxFontSubstCheckListBox(Window* pParent, const ResId& rResId ) :
             SvxSimpleTable( pParent, rResId ){}
 
-        inline void     *GetUserData(ULONG nPos) { return GetEntry(nPos)->GetUserData(); }
-        inline void     SetUserData(ULONG nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); }
+        inline void 	*GetUserData(ULONG nPos) { return GetEntry(nPos)->GetUserData(); }
+        inline void		SetUserData(ULONG nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); }
 
-        BOOL            IsChecked(ULONG nPos, USHORT nCol = 0);
-        BOOL            IsChecked(SvLBoxEntry* pEntry, USHORT nCol = 0);
-        void            CheckEntryPos(ULONG nPos, USHORT nCol, BOOL bChecked);
-        void            CheckEntry(SvLBoxEntry* pEntry, USHORT nCol, BOOL bChecked);
-        SvButtonState   GetCheckButtonState( SvLBoxEntry*, USHORT nCol ) const;
-        void            SetCheckButtonState( SvLBoxEntry*, USHORT nCol, SvButtonState );
+        BOOL			IsChecked(ULONG nPos, USHORT nCol = 0);
+        BOOL			IsChecked(SvLBoxEntry* pEntry, USHORT nCol = 0);
+        void			CheckEntryPos(ULONG nPos, USHORT nCol, BOOL bChecked);
+        void			CheckEntry(SvLBoxEntry* pEntry, USHORT nCol, BOOL bChecked);
+        SvButtonState	GetCheckButtonState( SvLBoxEntry*, USHORT nCol ) const;
+        void			SetCheckButtonState( SvLBoxEntry*, USHORT nCol, SvButtonState );
 };
 
 // class SvxFontSubstTabPage ----------------------------------------------------
@@ -72,12 +72,12 @@ class SvtFontSubstConfig;
 namespace svt {class SourceViewConfig;}
 class SvxFontSubstTabPage : public SfxTabPage
 {
-    CheckBox                    aUseTableCB;
+    CheckBox					aUseTableCB;
     FixedText                   aFont1FT;
-    FontNameBox                 aFont1CB;
-    FixedText                   aFont2FT;
-    FontNameBox                 aFont2CB;
-    ToolBox                     aNewDelTBX;
+    FontNameBox					aFont1CB;
+    FixedText					aFont2FT;
+    FontNameBox					aFont2CB;
+    ToolBox						aNewDelTBX;
     SvxFontSubstCheckListBox    aCheckLB;
 
     FixedLine                   aSourceViewFontsFL;
@@ -90,24 +90,24 @@ class SvxFontSubstTabPage : public SfxTabPage
     ImageList                   aImageList;
     String                      sAutomatic;
 
-    SvtFontSubstConfig*         pConfig;
+    SvtFontSubstConfig*			pConfig;
     utl::SourceViewConfig*      pSourceViewConfig;
 
-    String          sHeader1;
-    String          sHeader2;
-    String          sHeader3;
-    String          sHeader4;
+    String			sHeader1;
+    String			sHeader2;
+    String			sHeader3;
+    String			sHeader4;
 
-    Color           aTextColor;
-    ByteString      sFontGroup;
+    Color			aTextColor;
+    ByteString		sFontGroup;
 
-    SvLBoxButtonData*   pCheckButtonData;
+    SvLBoxButtonData*	pCheckButtonData;
 
     DECL_LINK(SelectHdl, Window *pWin = 0);
     DECL_LINK(NonPropFontsHdl, CheckBox* pBox);
 
-    SvLBoxEntry*    CreateEntry(String& rFont1, String& rFont2);
-    void            CheckEnable();
+    SvLBoxEntry*	CreateEntry(String& rFont1, String& rFont2);
+    void			CheckEnable();
 
 
     SvxFontSubstTabPage( Window* pParent, const SfxItemSet& rSet );
diff --git a/cui/source/options/fontsubs.src b/cui/source/options/fontsubs.src
index 1b5f3298913e..0d4bce1c9c88 100644
--- a/cui/source/options/fontsubs.src
+++ b/cui/source/options/fontsubs.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/options/internationaloptions.cxx b/cui/source/options/internationaloptions.cxx
index 9166eabe3996..96afb1a701e4 100644
--- a/cui/source/options/internationaloptions.cxx
+++ b/cui/source/options/internationaloptions.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,33 +42,33 @@ namespace offapp
 
     struct InternationalOptionsPage::IMPL
     {
-        FixedLine           m_aFL_DefaultTextDirection;
-        RadioButton         m_aRB_TxtDirLeft2Right;
-        RadioButton         m_aRB_TxtDirRight2Left;
-        FixedLine           m_aFL_SheetView;
-        CheckBox            m_aCB_ShtVwRight2Left;
-        CheckBox            m_aCB_ShtVwCurrentDocOnly;
+        FixedLine			m_aFL_DefaultTextDirection;
+        RadioButton			m_aRB_TxtDirLeft2Right;
+        RadioButton			m_aRB_TxtDirRight2Left;
+        FixedLine			m_aFL_SheetView;
+        CheckBox			m_aCB_ShtVwRight2Left;
+        CheckBox			m_aCB_ShtVwCurrentDocOnly;
 
-        BOOL                m_bEnable_SheetView_Opt : 1;
+        BOOL				m_bEnable_SheetView_Opt : 1;
 
-        inline              IMPL( Window* _pParent );
+        inline				IMPL( Window* _pParent );
 
-        inline void         EnableOption_SheetView( BOOL _bEnable = TRUE );
-        void                ShowOption_SheetView( BOOL _bShow = TRUE );
+        inline void			EnableOption_SheetView( BOOL _bEnable = TRUE );
+        void				ShowOption_SheetView( BOOL _bShow = TRUE );
 
-        BOOL                FillItemSet( SfxItemSet& _rSet );
-        void                Reset( const SfxItemSet& _rSet );
+        BOOL				FillItemSet( SfxItemSet& _rSet );
+        void				Reset( const SfxItemSet& _rSet );
     };
 
     inline InternationalOptionsPage::IMPL::IMPL( Window* _pParent ) :
-        m_aFL_DefaultTextDirection  ( _pParent, CUI_RES( FL_DEFTXTDIRECTION ) )
-        ,m_aRB_TxtDirLeft2Right     ( _pParent, CUI_RES( RB_TXTDIR_LEFT2RIGHT ) )
-        ,m_aRB_TxtDirRight2Left     ( _pParent, CUI_RES( RB_TXTDIR_RIGHT2LEFT ) )
-        ,m_aFL_SheetView            ( _pParent, CUI_RES( FL_SHEETVIEW ) )
-        ,m_aCB_ShtVwRight2Left      ( _pParent, CUI_RES( CB_SHTVW_RIGHT2LEFT ) )
-        ,m_aCB_ShtVwCurrentDocOnly  ( _pParent, CUI_RES( CB_SHTVW_CURRENTDOCONLY ) )
-
-        ,m_bEnable_SheetView_Opt    ( FALSE )
+        m_aFL_DefaultTextDirection	( _pParent,	CUI_RES( FL_DEFTXTDIRECTION ) )
+        ,m_aRB_TxtDirLeft2Right		( _pParent,	CUI_RES( RB_TXTDIR_LEFT2RIGHT ) )
+        ,m_aRB_TxtDirRight2Left		( _pParent, CUI_RES( RB_TXTDIR_RIGHT2LEFT ) )
+        ,m_aFL_SheetView			( _pParent, CUI_RES( FL_SHEETVIEW ) )
+        ,m_aCB_ShtVwRight2Left		( _pParent, CUI_RES( CB_SHTVW_RIGHT2LEFT ) )
+        ,m_aCB_ShtVwCurrentDocOnly	( _pParent, CUI_RES( CB_SHTVW_CURRENTDOCONLY ) )
+
+        ,m_bEnable_SheetView_Opt	( FALSE )
     {
         ShowOption_SheetView( m_bEnable_SheetView_Opt );
     }
@@ -95,14 +95,14 @@ namespace offapp
         DBG_ASSERT( _rSet.GetPool(), "-InternationalOptionsPage::FillItemSet(): no pool gives rums!" );
 
         // handling of DefaultTextDirection stuff
-        _rSet.Put(  SfxBoolItem(    _rSet.GetPool()->GetWhich( SID_ATTR_PARA_LEFT_TO_RIGHT ),
+        _rSet.Put(	SfxBoolItem(	_rSet.GetPool()->GetWhich( SID_ATTR_PARA_LEFT_TO_RIGHT ),
                                     m_aRB_TxtDirLeft2Right.IsChecked() ),
                     SID_ATTR_PARA_LEFT_TO_RIGHT );
 
         // handling of SheetView stuff
-//      if( m_bEnable_SheetView_Opt )
-//      {
-//      }
+//		if( m_bEnable_SheetView_Opt )
+//		{
+//		}
 
         return TRUE;
     }
@@ -110,26 +110,26 @@ namespace offapp
     void InternationalOptionsPage::IMPL::Reset( const SfxItemSet& _rSet )
     {
         // handling of DefaultTextDirection stuff
-        const SfxBoolItem*  pLeft2RightItem = static_cast< const SfxBoolItem* >( GetItem( _rSet, SID_ATTR_PARA_LEFT_TO_RIGHT ) );
+        const SfxBoolItem*	pLeft2RightItem = static_cast< const SfxBoolItem* >( GetItem( _rSet, SID_ATTR_PARA_LEFT_TO_RIGHT ) );
 
         DBG_ASSERT( pLeft2RightItem, "+InternationalOptionsPage::Reset(): SID_ATTR_PARA_LEFT_TO_RIGHT not set!" );
 
-        BOOL                bLeft2Right = pLeft2RightItem? pLeft2RightItem->GetValue() : TRUE;
+        BOOL				bLeft2Right = pLeft2RightItem? pLeft2RightItem->GetValue() : TRUE;
         m_aRB_TxtDirLeft2Right.Check( bLeft2Right );
 
         // handling of SheetView stuff
-//      if( m_bEnable_SheetView_Opt )
-//      {
-//          m_aCB_ShtVwRight2Left.Check( FALSE );
+//		if( m_bEnable_SheetView_Opt )
+//		{
+//			m_aCB_ShtVwRight2Left.Check( FALSE );
 //
-//          m_aCB_ShtVwCurrentDocOnly.Check( FALSE );
-//      }
+//			m_aCB_ShtVwCurrentDocOnly.Check( FALSE );
+//		}
     }
 
     InternationalOptionsPage::InternationalOptionsPage( Window* _pParent, const SfxItemSet& _rAttrSet ) :
-        SfxTabPage  ( _pParent, CUI_RES( RID_OFA_TP_INTERNATIONAL ), _rAttrSet )
+        SfxTabPage	( _pParent, CUI_RES( RID_OFA_TP_INTERNATIONAL ), _rAttrSet )
 
-        ,m_pImpl    ( new IMPL( this ) )
+        ,m_pImpl	( new IMPL( this ) )
     {
         FreeResource();
     }
@@ -141,8 +141,8 @@ namespace offapp
 
     SfxTabPage* InternationalOptionsPage::CreateSc( Window* _pParent, const SfxItemSet& _rAttrSet )
     {
-        InternationalOptionsPage*   p = new InternationalOptionsPage( _pParent, _rAttrSet );
-//      p->m_pImpl->EnableOption_SheetView();
+        InternationalOptionsPage*	p = new InternationalOptionsPage( _pParent, _rAttrSet );
+//		p->m_pImpl->EnableOption_SheetView();
         return p;
     }
 
@@ -161,6 +161,6 @@ namespace offapp
         m_pImpl->Reset( _rSet );
     }
 
-}   // /namespace offapp
+}	// /namespace offapp
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/internationaloptions.hrc b/cui/source/options/internationaloptions.hrc
index 14e3ebb4c525..13d17f01be8d 100644
--- a/cui/source/options/internationaloptions.hrc
+++ b/cui/source/options/internationaloptions.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,42 +31,42 @@
 #include <svtools/controldims.hrc>
 
 // general sizes
-#define PAGE_SIZE_X                 260
-#define PAGE_SIZE_Y                 185
+#define PAGE_SIZE_X					260
+#define PAGE_SIZE_Y					185
 
 // x-positions
-#define COL_0                       RSC_SP_TBPG_INNERBORDER_LEFT
-#define COL_1                       (COL_0 + RSC_SP_FLGR_SPACE_X)
-#define COL_2                       (COL_1 + RSC_SP_CHK_TEXTINDENT)
-#define COL_LAST                    (PAGE_SIZE_X - RSC_SP_TBPG_INNERBORDER_RIGHT)
+#define	COL_0						RSC_SP_TBPG_INNERBORDER_LEFT
+#define	COL_1						(COL_0 + RSC_SP_FLGR_SPACE_X)
+#define	COL_2						(COL_1 + RSC_SP_CHK_TEXTINDENT)
+#define COL_LAST					(PAGE_SIZE_X - RSC_SP_TBPG_INNERBORDER_RIGHT)
 
 // heights
-#define HEIGHT_FL                   RSC_CD_FIXEDLINE_HEIGHT
-#define HEIGHT_RB                   RSC_CD_RADIOBUTTON_HEIGHT
-#define HEIGHT_CB                   RSC_CD_CHECKBOX_HEIGHT
+#define HEIGHT_FL					RSC_CD_FIXEDLINE_HEIGHT
+#define	HEIGHT_RB					RSC_CD_RADIOBUTTON_HEIGHT
+#define	HEIGHT_CB					RSC_CD_CHECKBOX_HEIGHT
 
 // vertical spacing
-#define SPACE_FL_NEXTCTRL_Y         RSC_SP_CTRL_DESC_Y
+#define	SPACE_FL_NEXTCTRL_Y			RSC_SP_CTRL_DESC_Y
 
 // y-positions
-#define ROW_0                       RSC_SP_TBPG_INNERBORDER_TOP
-#define ROW_1                       (ROW_0 + HEIGHT_FL + SPACE_FL_NEXTCTRL_Y)
-#define ROW_2                       (ROW_1 + HEIGHT_RB + RSC_SP_CTRL_GROUP_Y)
-#define ROW_3                       (ROW_2 + HEIGHT_RB + RSC_SP_FLGR_SPACE_Y)
-#define ROW_4                       (ROW_3 + HEIGHT_FL + SPACE_FL_NEXTCTRL_Y)
-#define ROW_5                       (ROW_4 + HEIGHT_CB + RSC_SP_CTRL_GROUP_Y)
+#define	ROW_0						RSC_SP_TBPG_INNERBORDER_TOP
+#define	ROW_1						(ROW_0 + HEIGHT_FL + SPACE_FL_NEXTCTRL_Y)
+#define	ROW_2						(ROW_1 + HEIGHT_RB + RSC_SP_CTRL_GROUP_Y)
+#define	ROW_3						(ROW_2 + HEIGHT_RB + RSC_SP_FLGR_SPACE_Y)
+#define	ROW_4						(ROW_3 + HEIGHT_FL + SPACE_FL_NEXTCTRL_Y)
+#define	ROW_5						(ROW_4 + HEIGHT_CB + RSC_SP_CTRL_GROUP_Y)
 
 // misc calculation makros
-#define WIDTH2END( startcol )       (COL_LAST - startcol)
+#define WIDTH2END( startcol )		(COL_LAST - startcol)
 
 
 // resource IDs
-#define FL_DEFTXTDIRECTION          1
-#define RB_TXTDIR_LEFT2RIGHT        2
-#define RB_TXTDIR_RIGHT2LEFT        3
-#define FL_SHEETVIEW                4
-#define CB_SHTVW_RIGHT2LEFT         5
-#define CB_SHTVW_CURRENTDOCONLY     6
+#define FL_DEFTXTDIRECTION			1
+#define	RB_TXTDIR_LEFT2RIGHT		2
+#define	RB_TXTDIR_RIGHT2LEFT		3
+#define	FL_SHEETVIEW				4
+#define	CB_SHTVW_RIGHT2LEFT			5
+#define	CB_SHTVW_CURRENTDOCONLY		6
 
 #endif
 
diff --git a/cui/source/options/internationaloptions.src b/cui/source/options/internationaloptions.src
index 3acd1ac2766c..9e804b34ee7a 100644
--- a/cui/source/options/internationaloptions.src
+++ b/cui/source/options/internationaloptions.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx
index 63cb9bcc0d3e..7b514df507d5 100644
--- a/cui/source/options/optHeaderTabListbox.cxx
+++ b/cui/source/options/optHeaderTabListbox.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/options/optHeaderTabListbox.hxx b/cui/source/options/optHeaderTabListbox.hxx
index 30c0fe9ddde8..b09ebd4bfcd4 100644
--- a/cui/source/options/optHeaderTabListbox.hxx
+++ b/cui/source/options/optHeaderTabListbox.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx
index 02678936e05e..b0e92a28a597 100644
--- a/cui/source/options/optaccessibility.cxx
+++ b/cui/source/options/optaccessibility.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,39 +39,39 @@
 
 static void MovePosY( Window& _rWin, long _nDelta )
 {
-    Point   aPoint = _rWin.GetPosPixel();
+    Point	aPoint = _rWin.GetPosPixel();
     aPoint.Y() += _nDelta;
-
+    
     _rWin.SetPosPixel( aPoint );
 }
 
 struct SvxAccessibilityOptionsTabPage_Impl
 {
-    SvtAccessibilityOptions     m_aConfig;
+    SvtAccessibilityOptions 	m_aConfig;
     SvxAccessibilityOptionsTabPage_Impl()
             : m_aConfig(){}
 };
 
 SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage( Window* pParent, const SfxItemSet& rSet )
     :SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_ACCESSIBILITYCONFIG ), rSet)
-    ,m_aMiscellaneousLabel      (this, CUI_RES(FL_MISCELLANEOUS     ))
-    ,m_aAccessibilityTool       (this, CUI_RES(CB_ACCESSIBILITY_TOOL    ))
-    ,m_aTextSelectionInReadonly (this, CUI_RES(CB_TEXTSELECTION     ))
-    ,m_aAnimatedGraphics        (this, CUI_RES(CB_ANIMATED_GRAPHICS ))
-    ,m_aAnimatedTexts           (this, CUI_RES(CB_ANIMATED_TEXTS        ))
-    ,m_aTipHelpCB               (this, CUI_RES(CB_TIPHELP               ))
-    ,m_aTipHelpNF               (this, CUI_RES(NF_TIPHELP               ))
-    ,m_aTipHelpFT               (this, CUI_RES(FT_TIPHELP               ))
-    ,m_aHCOptionsLabel          (this, CUI_RES(FL_HC_OPTIONS            ))
-    ,m_aAutoDetectHC            (this, CUI_RES(CB_AUTO_DETECT_HC        ))
-    ,m_aAutomaticFontColor      (this, CUI_RES(CB_AUTOMATIC_FONT_COLOR))
-    ,m_aPagePreviews            (this, CUI_RES(CB_PAGE_PREVIEWS       ))
+    ,m_aMiscellaneousLabel		(this, CUI_RES(FL_MISCELLANEOUS		))
+    ,m_aAccessibilityTool		(this, CUI_RES(CB_ACCESSIBILITY_TOOL	))
+    ,m_aTextSelectionInReadonly	(this, CUI_RES(CB_TEXTSELECTION		))
+    ,m_aAnimatedGraphics		(this, CUI_RES(CB_ANIMATED_GRAPHICS	))
+    ,m_aAnimatedTexts			(this, CUI_RES(CB_ANIMATED_TEXTS		))
+    ,m_aTipHelpCB				(this, CUI_RES(CB_TIPHELP				))
+    ,m_aTipHelpNF				(this, CUI_RES(NF_TIPHELP				))
+    ,m_aTipHelpFT				(this, CUI_RES(FT_TIPHELP				))
+    ,m_aHCOptionsLabel			(this, CUI_RES(FL_HC_OPTIONS			))
+    ,m_aAutoDetectHC			(this, CUI_RES(CB_AUTO_DETECT_HC		))
+    ,m_aAutomaticFontColor		(this, CUI_RES(CB_AUTOMATIC_FONT_COLOR))
+    ,m_aPagePreviews			(this, CUI_RES(CB_PAGE_PREVIEWS       ))
     ,m_pImpl(new SvxAccessibilityOptionsTabPage_Impl)
 {
     FreeResource();
     m_aTipHelpCB.SetClickHdl(LINK(this, SvxAccessibilityOptionsTabPage, TipHelpHdl));
 
-    long nHeightDelta = 0;      // to correct positions _under_ m_aAccessibilityTool
+    long nHeightDelta = 0;		// to correct positions _under_ m_aAccessibilityTool
 
 #ifdef UNX
     {
@@ -97,7 +97,7 @@ SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage( Window* pParent,
 #endif
 
     if( nHeightDelta )
-    {   //adjust positions of controls under m_aAccessibilityTool
+    {	//adjust positions of controls under m_aAccessibilityTool
         Size aSize = m_aAccessibilityTool.LogicToPixel( Size( 0, nHeightDelta ), MAP_APPFONT );
         nHeightDelta = aSize.Height();
 
@@ -119,7 +119,7 @@ SvxAccessibilityOptionsTabPage::~SvxAccessibilityOptionsTabPage()
     delete m_pImpl;
 }
 
-SfxTabPage* SvxAccessibilityOptionsTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage*	SvxAccessibilityOptionsTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
 {
     return new SvxAccessibilityOptionsTabPage(pParent, rAttrSet);
 }
@@ -133,7 +133,7 @@ BOOL SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet& )
     m_pImpl->m_aConfig.SetHelpTipSeconds( (short)m_aTipHelpNF.GetValue() );
     m_pImpl->m_aConfig.SetIsAllowAnimatedGraphics( m_aAnimatedGraphics.IsChecked() );
     m_pImpl->m_aConfig.SetIsAllowAnimatedText( m_aAnimatedTexts.IsChecked() );
-    m_pImpl->m_aConfig.SetIsAutomaticFontColor( m_aAutomaticFontColor.IsChecked() );
+    m_pImpl->m_aConfig.SetIsAutomaticFontColor(	m_aAutomaticFontColor.IsChecked() );
     m_pImpl->m_aConfig.SetSelectionInReadonly( m_aTextSelectionInReadonly.IsChecked());
     m_pImpl->m_aConfig.SetAutoDetectSystemHC( m_aAutoDetectHC.IsChecked());
 
@@ -156,15 +156,15 @@ void SvxAccessibilityOptionsTabPage::Reset( const SfxItemSet& )
 {
     //set controls from aConfig.Get...
 
-    m_aPagePreviews.Check(            m_pImpl->m_aConfig.GetIsForPagePreviews() );
-    EnableTipHelp(                    m_pImpl->m_aConfig.GetIsHelpTipsDisappear() );
-    m_aTipHelpNF.SetValue(            m_pImpl->m_aConfig.GetHelpTipSeconds() );
-    m_aAnimatedGraphics.Check(        m_pImpl->m_aConfig.GetIsAllowAnimatedGraphics() );
-    m_aAnimatedTexts.Check(           m_pImpl->m_aConfig.GetIsAllowAnimatedText() );
-    m_aAutomaticFontColor.Check(      m_pImpl->m_aConfig.GetIsAutomaticFontColor() );
-//  m_aSystemFont.Check(              m_pImpl->m_aConfig.GetIsSystemFont() );
+    m_aPagePreviews.Check(			  m_pImpl->m_aConfig.GetIsForPagePreviews() );
+    EnableTipHelp(					  m_pImpl->m_aConfig.GetIsHelpTipsDisappear() );
+    m_aTipHelpNF.SetValue(			  m_pImpl->m_aConfig.GetHelpTipSeconds() );
+    m_aAnimatedGraphics.Check(		  m_pImpl->m_aConfig.GetIsAllowAnimatedGraphics() );
+    m_aAnimatedTexts.Check(			  m_pImpl->m_aConfig.GetIsAllowAnimatedText() );
+    m_aAutomaticFontColor.Check(	  m_pImpl->m_aConfig.GetIsAutomaticFontColor() );
+//	m_aSystemFont.Check(			  m_pImpl->m_aConfig.GetIsSystemFont() );
     m_aTextSelectionInReadonly.Check( m_pImpl->m_aConfig.IsSelectionInReadonly() );
-    m_aAutoDetectHC.Check(            m_pImpl->m_aConfig.GetAutoDetectSystemHC() );
+    m_aAutoDetectHC.Check(			  m_pImpl->m_aConfig.GetAutoDetectSystemHC() );
 
 
     AllSettings aAllSettings = Application::GetSettings();
diff --git a/cui/source/options/optaccessibility.hrc b/cui/source/options/optaccessibility.hrc
index 35c02cc3e756..acb1d37ac932 100644
--- a/cui/source/options/optaccessibility.hrc
+++ b/cui/source/options/optaccessibility.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,44 +31,44 @@
 
 // defines for positions and sizes
 
-#define GB_WIDTH                248
-#define CB_WIDTH                240
-#define EDIT_WIDTH              25
+#define GB_WIDTH				248
+#define CB_WIDTH				240
+#define EDIT_WIDTH				25
 
-#define COL0                    6
-#define COL1                    (COL0+6)
-#define COL2                    (COL1+10)
-#define COL3                    (COL1+(CB_WIDTH * 2/3))
-#define COL4                    (COL3+EDIT_WIDTH+RSC_SP_CTRL_DESC_X)
+#define COL0					6
+#define COL1					(COL0+6)
+#define COL2					(COL1+10)
+#define COL3					(COL1+(CB_WIDTH * 2/3))
+#define COL4					(COL3+EDIT_WIDTH+RSC_SP_CTRL_DESC_X)
 
 #define UNIT_WIDTH              (COL1+CB_WIDTH-COL4)
 
-#define ROWSPACE                RSC_SP_CTRL_DESC_Y
-#define LINESPACE               1
-#define GROUPSPACE              RSC_SP_CTRL_DESC_Y + 2
-#define ROWA_0                  3
-#define ROWA_1                  ( ROWA_0 + RSC_CD_FIXEDLINE_HEIGHT      + ROWSPACE )
-#define ROWA_2                  ( ROWA_1 + RSC_CD_CHECKBOX_HEIGHT       + ROWSPACE )
-#define ROWA_3                  ( ROWA_2 + RSC_CD_CHECKBOX_HEIGHT       + ROWSPACE )
-#define ROWA_4                  ( ROWA_3 + RSC_CD_CHECKBOX_HEIGHT       + ROWSPACE )
-#define ROWA_5                  ( ROWA_4 + RSC_CD_CHECKBOX_HEIGHT       + ROWSPACE )
+#define ROWSPACE				RSC_SP_CTRL_DESC_Y
+#define	LINESPACE				1
+#define GROUPSPACE				RSC_SP_CTRL_DESC_Y + 2
+#define ROWA_0					3
+#define ROWA_1					( ROWA_0 + RSC_CD_FIXEDLINE_HEIGHT		+ ROWSPACE )
+#define ROWA_2					( ROWA_1 + RSC_CD_CHECKBOX_HEIGHT		+ ROWSPACE )
+#define ROWA_3                  ( ROWA_2 + RSC_CD_CHECKBOX_HEIGHT		+ ROWSPACE )
+#define ROWA_4                  ( ROWA_3 + RSC_CD_CHECKBOX_HEIGHT		+ ROWSPACE )
+#define ROWA_5                  ( ROWA_4 + RSC_CD_CHECKBOX_HEIGHT		+ ROWSPACE )
 
-#define ROWB_0                  ( ROWA_5 + RSC_CD_TEXTBOX_HEIGHT        + ROWSPACE + GROUPSPACE )
-#define ROWB_1                  ( ROWB_0 + RSC_CD_FIXEDLINE_HEIGHT      + ROWSPACE )
-#define ROWB_2                  ( ROWB_1 + RSC_CD_CHECKBOX_HEIGHT       + ROWSPACE )
-#define ROWB_3                  ( ROWB_2 + RSC_CD_CHECKBOX_HEIGHT       + ROWSPACE )
+#define ROWB_0					( ROWA_5 + RSC_CD_TEXTBOX_HEIGHT		+ ROWSPACE + GROUPSPACE )
+#define ROWB_1					( ROWB_0 + RSC_CD_FIXEDLINE_HEIGHT		+ ROWSPACE )
+#define ROWB_2                  ( ROWB_1 + RSC_CD_CHECKBOX_HEIGHT		+ ROWSPACE )
+#define ROWB_3                  ( ROWB_2 + RSC_CD_CHECKBOX_HEIGHT		+ ROWSPACE )
 
-#define WHOLE_HEIGHT            185
+#define WHOLE_HEIGHT			185
 #define LASTTEXT_HEIGHT         (WHOLE_HEIGHT-ROWB_8)
-#define OFFS_TEXTBOX_FIXEDTEXT(base)    (base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)
-#define DIFF(v1,v2)             (v2-v1)
-#define SUM(v1,v2)              (v2+v1)
+#define OFFS_TEXTBOX_FIXEDTEXT(base)	(base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)
+#define DIFF(v1,v2)				(v2-v1)
+#define SUM(v1,v2)				(v2+v1)
 
 //
 
-#define FL_MISCELLANEOUS        1
+#define FL_MISCELLANEOUS	 	1
 #define CB_PAGE_PREVIEWS        2
-#define FL_HC_OPTIONS           3
+#define FL_HC_OPTIONS			3
 #define CB_TIPHELP              4
 #define NF_TIPHELP              5
 #define FT_TIPHELP              6
@@ -78,7 +78,7 @@
 #define CB_SYSTEM_FONT          10
 #define CB_ACCESSIBILITY_TOOL   11
 #define CB_TEXTSELECTION        12
-#define CB_AUTO_DETECT_HC       13
+#define CB_AUTO_DETECT_HC		13
 
 #endif
 
diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx
index 3e3b0deafaba..3fbd5da0db26 100644
--- a/cui/source/options/optaccessibility.hxx
+++ b/cui/source/options/optaccessibility.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 struct SvxAccessibilityOptionsTabPage_Impl;
 class SvxAccessibilityOptionsTabPage : public SfxTabPage
 {
-    FixedLine       m_aMiscellaneousLabel;      // FL_MISCELLANEOUS
-    CheckBox        m_aAccessibilityTool;       // CB_ACCESSIBILITY_TOOL
-    CheckBox        m_aTextSelectionInReadonly; // CB_TEXTSELECTION
-    CheckBox        m_aAnimatedGraphics;        // CB_ANIMATED_GRAPHICS
-    CheckBox        m_aAnimatedTexts;           // CB_ANIMATED_TEXTS
-    CheckBox        m_aTipHelpCB;               // CB_TIPHELP
-    NumericField    m_aTipHelpNF;               // NF_TIPHELP
-    FixedText       m_aTipHelpFT;               // FT_TIPHELP
-    FixedLine       m_aHCOptionsLabel;          // FL_HC_OPTIONS
-    CheckBox        m_aAutoDetectHC;            // CB_AUTO_DETECT_HC
-    CheckBox        m_aAutomaticFontColor;      // CB_AUTOMATIC_FONT_COLOR
-    CheckBox        m_aPagePreviews;            // CB_PAGEPREVIEWS
+    FixedLine    	m_aMiscellaneousLabel;		// FL_MISCELLANEOUS
+    CheckBox   		m_aAccessibilityTool;		// CB_ACCESSIBILITY_TOOL
+    CheckBox        m_aTextSelectionInReadonly;	// CB_TEXTSELECTION
+    CheckBox   		m_aAnimatedGraphics;		// CB_ANIMATED_GRAPHICS
+    CheckBox   		m_aAnimatedTexts;			// CB_ANIMATED_TEXTS
+    CheckBox   		m_aTipHelpCB;				// CB_TIPHELP
+    NumericField	m_aTipHelpNF;				// NF_TIPHELP
+    FixedText  		m_aTipHelpFT;				// FT_TIPHELP
+    FixedLine    	m_aHCOptionsLabel;			// FL_HC_OPTIONS
+    CheckBox		m_aAutoDetectHC;			// CB_AUTO_DETECT_HC
+    CheckBox   		m_aAutomaticFontColor;		// CB_AUTOMATIC_FONT_COLOR
+    CheckBox        m_aPagePreviews;			// CB_PAGEPREVIEWS
 
     DECL_LINK(TipHelpHdl, CheckBox*);
     void EnableTipHelp(sal_Bool bCheck);
@@ -57,9 +57,9 @@ public:
 
     virtual ~SvxAccessibilityOptionsTabPage();
 
-    static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    static SfxTabPage*	Create( Window* pParent, const SfxItemSet& rAttrSet );
+    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	void 		Reset( const SfxItemSet& rSet );
 };
 
 #endif
diff --git a/cui/source/options/optaccessibility.src b/cui/source/options/optaccessibility.src
index 4d7e1985d838..36a4cad6372c 100644
--- a/cui/source/options/optaccessibility.src
+++ b/cui/source/options/optaccessibility.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 154ccb9d59d0..713751937dc2 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,8 +62,8 @@ const sal_Char cCharacterCompressionType[] = "CharacterCompressionType";
 
 struct SvxForbiddenChars_Impl
 {
-    sal_Bool                bRemoved;
-    ForbiddenCharacters*    pCharacters;
+    sal_Bool 				bRemoved;
+    ForbiddenCharacters*	pCharacters;
 };
 
 DECLARE_TABLE( _SvxForbiddenCharacterTable_Impl, SvxForbiddenChars_Impl* )
@@ -79,18 +79,18 @@ public:
 
 struct SvxAsianLayoutPage_Impl
 {
-    SvxAsianConfig  aConfig;
+    SvxAsianConfig 	aConfig;
         SvxAsianLayoutPage_Impl() :
             aConfig(sal_False){}
 
-    Reference< XForbiddenCharacters >   xForbidden;
+    Reference< XForbiddenCharacters > 	xForbidden;
     Reference< XPropertySet >           xPrSet;
     Reference< XPropertySetInfo >       xPrSetInfo;
     SvxForbiddenCharacterTable_Impl     aChangedLanguagesTbl;
 
-    sal_Bool                hasForbiddenCharacters(LanguageType eLang);
+    sal_Bool				hasForbiddenCharacters(LanguageType eLang);
     SvxForbiddenChars_Impl* getForbiddenCharacters(LanguageType eLang);
-    void                    addForbiddenCharacters(LanguageType eLang, ForbiddenCharacters* pForbidden);
+    void					addForbiddenCharacters(LanguageType eLang, ForbiddenCharacters* pForbidden);
 };
 /* -----------------------------24.01.01 14:50--------------------------------
 
@@ -106,7 +106,7 @@ SvxForbiddenCharacterTable_Impl::~SvxForbiddenCharacterTable_Impl()
 /* -----------------------------24.01.01 14:50--------------------------------
 
  ---------------------------------------------------------------------------*/
-sal_Bool    SvxAsianLayoutPage_Impl::hasForbiddenCharacters(LanguageType eLang)
+sal_Bool	SvxAsianLayoutPage_Impl::hasForbiddenCharacters(LanguageType eLang)
 {
     return 0 != aChangedLanguagesTbl.Get(eLang);
 }
@@ -150,22 +150,22 @@ static LanguageType eLastUsedLanguageTypeForForbiddenCharacters = USHRT_MAX;
 
 SvxAsianLayoutPage::SvxAsianLayoutPage( Window* pParent, const SfxItemSet& rSet ) :
     SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_ASIAN_LAYOUT ), rSet),
-    aKerningGB(             this, CUI_RES(GB_KERNING            )),
-    aCharKerningRB(         this, CUI_RES(RB_CHAR_KERNING       )),
-    aCharPunctKerningRB(    this, CUI_RES(RB_CHAR_PUNCT     )),
-    aCharDistGB(            this, CUI_RES(GB_CHAR_DIST      )),
-    aNoCompressionRB(       this, CUI_RES(RB_NO_COMP            )),
-    aPunctCompressionRB(    this, CUI_RES(RB_PUNCT_COMP     )),
-     aPunctKanaCompressionRB(this, CUI_RES(RB_PUNCT_KANA_COMP   )),
-    aStartEndGB(            this, CUI_RES(GB_START_END      )),
-    aLanguageFT(            this, CUI_RES(FT_LANGUAGE           )),
-    aLanguageLB(            this, CUI_RES(LB_LANGUAGE           )),
-    aStandardCB(            this, CUI_RES(CB_STANDARD           )),
-    aStartFT(               this, CUI_RES(FT_START          )),
-    aStartED(               this, CUI_RES(ED_START          )),
-    aEndFT(                 this, CUI_RES(FT_END                )),
-    aEndED(                 this, CUI_RES(ED_END                )),
-    aHintFT(                this, CUI_RES(FT_HINT               )),
+    aKerningGB(				this, CUI_RES(GB_KERNING			)),
+    aCharKerningRB(			this, CUI_RES(RB_CHAR_KERNING		)),
+    aCharPunctKerningRB(	this, CUI_RES(RB_CHAR_PUNCT		)),
+    aCharDistGB(			this, CUI_RES(GB_CHAR_DIST		)),
+    aNoCompressionRB(		this, CUI_RES(RB_NO_COMP			)),
+    aPunctCompressionRB(	this, CUI_RES(RB_PUNCT_COMP		)),
+     aPunctKanaCompressionRB(this, CUI_RES(RB_PUNCT_KANA_COMP	)),
+    aStartEndGB(			this, CUI_RES(GB_START_END		)),
+    aLanguageFT(			this, CUI_RES(FT_LANGUAGE			)),
+    aLanguageLB(			this, CUI_RES(LB_LANGUAGE			)),
+    aStandardCB(			this, CUI_RES(CB_STANDARD			)),
+    aStartFT(				this, CUI_RES(FT_START			)),
+    aStartED(				this, CUI_RES(ED_START			)),
+    aEndFT(					this, CUI_RES(FT_END				)),
+    aEndED(					this, CUI_RES(ED_END				)),
+    aHintFT(				this, CUI_RES(FT_HINT				)),
     pImpl(new SvxAsianLayoutPage_Impl)
 {
     FreeResource();
@@ -188,7 +188,7 @@ SvxAsianLayoutPage::~SvxAsianLayoutPage()
 /*-- 09.01.01 13:29:02---------------------------------------------------
 
   -----------------------------------------------------------------------*/
-SfxTabPage* SvxAsianLayoutPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage*	SvxAsianLayoutPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
 {
     return new SvxAsianLayoutPage(pParent, rAttrSet);
 }
@@ -258,7 +258,7 @@ void SvxAsianLayoutPage::Reset( const SfxItemSet& )
 {
     SfxViewFrame* pCurFrm = SfxViewFrame::Current();
     SfxObjectShell* pDocSh = pCurFrm ? pCurFrm->GetObjectShell() : 0;
-    Reference< XModel > xModel;
+    Reference< XModel >	xModel;
     if(pDocSh)
         xModel = pDocSh->GetModel();
     Reference<XMultiServiceFactory> xFact(xModel, UNO_QUERY);
@@ -303,7 +303,7 @@ void SvxAsianLayoutPage::Reset( const SfxItemSet& )
         aEndFT.Enable(FALSE);
         aEndED.Enable(FALSE);
         aHintFT.Enable(FALSE);
-    }
+    }        
     if(bKernWesternText)
         aCharKerningRB.Check(TRUE);
     else
@@ -442,12 +442,12 @@ IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit*, pEdit)
                 ForbiddenCharacters aSet;
                 aSet.beginLine = sStart;
                 aSet.endLine = sEnd;
-//              pImpl->xForbidden->setForbiddenCharacters( aLocale, aSet );
+//				pImpl->xForbidden->setForbiddenCharacters( aLocale, aSet );
                 pImpl->addForbiddenCharacters(eSelectLanguage, &aSet);
             }
             else
                 pImpl->addForbiddenCharacters(eSelectLanguage, 0);
-//              pImpl->xForbidden->removeForbiddenCharacters( aLocale );
+//				pImpl->xForbidden->removeForbiddenCharacters( aLocale );
         }
         catch(Exception&)
         {
diff --git a/cui/source/options/optasian.hrc b/cui/source/options/optasian.hrc
index 4dfa4d2f82b5..089b8a616116 100644
--- a/cui/source/options/optasian.hrc
+++ b/cui/source/options/optasian.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,23 +27,23 @@
 #ifndef _SVX_OPTASIAN_HRC
 #define _SVX_OPTASIAN_HRC
 
-#define GB_KERNING              1
-#define RB_CHAR_KERNING         2
-#define RB_CHAR_PUNCT           3
-#define GB_CHAR_DIST            4
-#define RB_NO_COMP              5
-#define RB_PUNCT_COMP           6
+#define GB_KERNING			 	1
+#define RB_CHAR_KERNING		    2
+#define RB_CHAR_PUNCT		    3
+#define GB_CHAR_DIST		    4
+#define RB_NO_COMP			    5
+#define RB_PUNCT_COMP		    6
 #define RB_PUNCT_KANA_COMP      7
-#define GB_START_END            8
-#define CB_STANDARD             9
+#define GB_START_END		    8
+#define CB_STANDARD			    9
 
-#define FT_LANGUAGE             11
-#define LB_LANGUAGE             12
-#define FT_START                13
-#define ED_START                14
-#define FT_END                  15
-#define ED_END                  16
-#define FT_HINT                 17
+#define FT_LANGUAGE			    11
+#define LB_LANGUAGE			    12
+#define FT_START			    13
+#define ED_START			    14
+#define FT_END				    15
+#define ED_END				    16
+#define FT_HINT				    17
 
 #endif
 
diff --git a/cui/source/options/optasian.src b/cui/source/options/optasian.src
index c9a2c9606c98..ee735f9069a4 100644
--- a/cui/source/options/optasian.src
+++ b/cui/source/options/optasian.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 509313d4c719..cc7dc50db9b7 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,11 +58,11 @@ SvxDefaultColorOptPage::SvxDefaultColorOptPage( Window* pParent, const SfxItemSe
 
     SfxTabPage( pParent, CUI_RES( RID_OPTPAGE_CHART_DEFCOLORS ), rInAttrs ),
 
-    aGbChartColors  ( this, CUI_RES( FL_CHART_COLOR_LIST ) ),
-    aLbChartColors  ( this, CUI_RES( LB_CHART_COLOR_LIST ) ),
-    aGbColorBox     ( this, CUI_RES( FL_COLOR_BOX ) ),
-    aValSetColorBox ( this, CUI_RES( CT_COLOR_BOX ) ),
-    aPBDefault      ( this, CUI_RES( PB_RESET_TO_DEFAULT ) )
+    aGbChartColors	( this, CUI_RES( FL_CHART_COLOR_LIST ) ),
+    aLbChartColors	( this, CUI_RES( LB_CHART_COLOR_LIST ) ),
+    aGbColorBox		( this, CUI_RES( FL_COLOR_BOX ) ),
+    aValSetColorBox	( this, CUI_RES( CT_COLOR_BOX ) ),
+    aPBDefault		( this, CUI_RES( PB_RESET_TO_DEFAULT ) )
 {
     FreeResource();
 
@@ -160,7 +160,7 @@ long SvxDefaultColorOptPage::GetColorIndex( const Color& rCol )
         long nCount = pColorTab->Count();
         XColorEntry* pColorEntry;
 
-        for( long i = nCount - 1; i >= 0; i-- )         // default chart colors are at the end of the table
+        for( long i = nCount - 1; i >= 0; i-- )			// default chart colors are at the end of the table
         {
             pColorEntry = pColorTab->GetColor( i );
             if( pColorEntry && pColorEntry->GetColor() == rCol )
@@ -203,13 +203,13 @@ IMPL_LINK( SvxDefaultColorOptPage, ListClickedHdl, ChartColorLB*,  pColorList )
 
     long nIndex = GetColorIndex( aCol );
 
-    if( nIndex == -1 )      // not found
+    if( nIndex == -1 )		// not found
     {
         aValSetColorBox.SetNoSelection();
     }
     else
     {
-        aValSetColorBox.SelectItem( (USHORT)nIndex + 1 );       // ValueSet is 1-based
+        aValSetColorBox.SelectItem( (USHORT)nIndex + 1 );		// ValueSet is 1-based
     }
 
     return 0L;
@@ -229,7 +229,7 @@ IMPL_LINK( SvxDefaultColorOptPage, BoxClickedHdl, ValueSet*, EMPTYARG )
         aLbChartColors.Modify( & aEntry, nIdx );
         pColorConfig->ReplaceColorByIndex( nIdx, aEntry );
 
-        aLbChartColors.SelectEntryPos( nIdx );  // reselect entry
+        aLbChartColors.SelectEntryPos( nIdx );	// reselect entry
     }
 
     return 0L;
diff --git a/cui/source/options/optchart.hrc b/cui/source/options/optchart.hrc
index d2e1a312e15d..0fee26854759 100644
--- a/cui/source/options/optchart.hrc
+++ b/cui/source/options/optchart.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 // tab page for setting the default colors used for new charts
 
-#define FL_CHART_COLOR_LIST     1
-#define LB_CHART_COLOR_LIST     2
+#define FL_CHART_COLOR_LIST		1
+#define LB_CHART_COLOR_LIST		2
 
-#define FL_COLOR_BOX            3
-#define CT_COLOR_BOX            4
+#define FL_COLOR_BOX			3
+#define CT_COLOR_BOX			4
 
-#define PB_RESET_TO_DEFAULT     5
+#define PB_RESET_TO_DEFAULT		5
 
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index efbb14086588..f5001aa85c6b 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ public:
 class SvxDefaultColorOptPage : public SfxTabPage
 {
 private:
-    FixedLine               aGbChartColors;
-    ChartColorLB            aLbChartColors;
-    FixedLine               aGbColorBox;
-    ValueSet                aValSetColorBox;
-    PushButton              aPBDefault;
+    FixedLine       		aGbChartColors;
+    ChartColorLB			aLbChartColors;
+    FixedLine       		aGbColorBox;
+    ValueSet				aValSetColorBox;
+    PushButton				aPBDefault;
 
-    SvxChartOptions*        pChartOptions;
-    SvxChartColorTableItem* pColorConfig;
-    XColorTable*            pColorTab;
+    SvxChartOptions*		pChartOptions;
+    SvxChartColorTableItem*	pColorConfig;
+    XColorTable*			pColorTab;
 
     DECL_LINK( ResetToDefaults, void * );
     DECL_LINK( ListClickedHdl, ChartColorLB * );
@@ -77,7 +77,7 @@ public:
     SvxDefaultColorOptPage( Window* pParent, const SfxItemSet& rInAttrs );
     virtual ~SvxDefaultColorOptPage();
 
-    void    Construct();
+    void	Construct();
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rInAttrs );
     virtual BOOL        FillItemSet( SfxItemSet& rOutAttrs );
diff --git a/cui/source/options/optchart.src b/cui/source/options/optchart.src
index 374828b329c1..32a7aaa7b11c 100644
--- a/cui/source/options/optchart.src
+++ b/cui/source/options/optchart.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,38 +33,38 @@
 
 TabPage RID_OPTPAGE_CHART_DEFCOLORS
 {
-    HelpID  = HID_OPTIONS_CHART_DEFCOLORS;
-    Size    = MAP_APPFONT ( 260 , 185 ) ;
-    Hide    = TRUE;
+    HelpID	= HID_OPTIONS_CHART_DEFCOLORS;
+    Size	= MAP_APPFONT ( 260 , 185 ) ;
+    Hide	= TRUE;
     Text [ en-US ] = "Default Colors";
     FixedLine FL_CHART_COLOR_LIST
     {
-        Pos     = MAP_APPFONT ( 6 , 3  ) ;
+        Pos		= MAP_APPFONT ( 6 , 3  ) ;
         Size    = MAP_APPFONT ( 80 , 8 ) ;
         Text [ en-US ] = "Chart colors";
         Text [ x-comment ] = " ";
     };
     ListBox LB_CHART_COLOR_LIST
     {
-        Border      = TRUE;
-        Pos         = MAP_APPFONT ( 12 , 15  );
-        Size        = MAP_APPFONT ( 68 , 152 );
-        DropDown    = FALSE;
-        TabStop     = TRUE ;
+        Border		= TRUE;
+        Pos			= MAP_APPFONT ( 12 , 15  );
+        Size		= MAP_APPFONT ( 68 , 152 );
+        DropDown	= FALSE;
+        TabStop		= TRUE ;
     };
     FixedLine FL_COLOR_BOX
     {
-        Pos     = MAP_APPFONT ( 92 , 3  ) ;
+        Pos		= MAP_APPFONT ( 92 , 3  ) ;
         Size    = MAP_APPFONT ( 106 , 8 ) ;
         Text [ en-US ] = "Color table" ;
         Text [ x-comment ] = " ";
     };
     Control CT_COLOR_BOX
     {
-        Border      = TRUE;
-        Pos         = MAP_APPFONT ( 98 , 15  );
-        Size        = MAP_APPFONT ( 94 , 152 );
-        TabStop     = TRUE ;
+        Border		= TRUE;
+        Pos			= MAP_APPFONT ( 98 , 15  );
+        Size		= MAP_APPFONT ( 94 , 152 );
+        TabStop		= TRUE ;
     };
     PushButton PB_RESET_TO_DEFAULT
     {
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index f13f6f659cc1..3ea5678ec8b0 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 ::svtools;
 #define GROUP_CALC      3
 #define GROUP_DRAW      4
 #define GROUP_BASIC     5
-#define GROUP_SQL       6
+#define GROUP_SQL		6
 
 class SvxExtFixedText_Impl : public FixedText
 {
@@ -228,13 +228,13 @@ class ColorConfigWindow_Impl : public Window
     ColorListBox    aSQLCommentLB;
     Window          aSQLCommentWN;
 
-    ::std::vector< SvxExtFixedText_Impl*>   aChapters;
-    ::std::vector< Window* >                aChapterWins;
-    ::std::vector< FixedText* >             aFixedTexts;
-    ::std::vector< CheckBox* >              aCheckBoxes;
-    ::std::vector< ColorListBox* >          aColorBoxes;
-    ::std::vector< Window* >                aWindows; // [ColorConfigEntryCount]
-    ::std::vector< ::boost::shared_ptr<SvxExtFixedText_Impl> >  m_aExtensionTitles;
+    ::std::vector< SvxExtFixedText_Impl*>	aChapters;
+    ::std::vector< Window* >				aChapterWins;
+    ::std::vector< FixedText* >				aFixedTexts;
+    ::std::vector< CheckBox* >				aCheckBoxes;
+    ::std::vector< ColorListBox* >			aColorBoxes;
+    ::std::vector< Window* >				aWindows; // [ColorConfigEntryCount]
+    ::std::vector< ::boost::shared_ptr<SvxExtFixedText_Impl> >	m_aExtensionTitles;
 
     SvtModuleOptions    m_aModuleOptions;
 
@@ -581,14 +581,14 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
     aFixedTexts[BASICSTRING     ] = &aBasicStringFT;
     aFixedTexts[BASICOPERATOR   ] = &aBasicOperatorFT;
     aFixedTexts[BASICKEYWORD    ] = &aBasicKeywordFT;
-    aFixedTexts[BASICERROR      ] = &aBasicErrorFT;
-    aFixedTexts[SQLIDENTIFIER   ] = &aSQLIdentifierFT;
-    aFixedTexts[SQLNUMBER       ] = &aSQLNumberFT;
-    aFixedTexts[SQLSTRING       ] = &aSQLStringFT;
-    aFixedTexts[SQLOPERATOR     ] = &aSQLOperatorFT;
-    aFixedTexts[SQLKEYWORD      ] = &aSQLKeywordFT;
-    aFixedTexts[SQLPARAMETER    ] = &aSQLParameterFT;
-    aFixedTexts[SQLCOMMENT      ] = &aSQLCommentFT;
+    aFixedTexts[BASICERROR		] = &aBasicErrorFT;
+    aFixedTexts[SQLIDENTIFIER	] = &aSQLIdentifierFT;
+    aFixedTexts[SQLNUMBER		] = &aSQLNumberFT;
+    aFixedTexts[SQLSTRING		] = &aSQLStringFT;
+    aFixedTexts[SQLOPERATOR		] = &aSQLOperatorFT;
+    aFixedTexts[SQLKEYWORD		] = &aSQLKeywordFT;
+    aFixedTexts[SQLPARAMETER	] = &aSQLParameterFT;
+    aFixedTexts[SQLCOMMENT		] = &aSQLCommentFT;
 
     aColorBoxes[DOCCOLOR            ] = &aDocColorLB             ;
     aColorBoxes[DOCBOUNDARIES       ] = &aDocBoundLB             ;
@@ -620,20 +620,20 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
     aColorBoxes[CALCREFERENCE       ] = &aCalcReferenceLB        ;
     aColorBoxes[CALCNOTESBACKGROUND     ] = &aCalcNotesBackLB            ;
     aColorBoxes[DRAWGRID            ] = &aDrawGridLB             ;
-    aColorBoxes[BASICIDENTIFIER     ] = &aBasicIdentifierLB;
-    aColorBoxes[BASICCOMMENT        ] = &aBasicCommentLB;
-    aColorBoxes[BASICNUMBER         ] = &aBasicNumberLB;
-    aColorBoxes[BASICSTRING         ] = &aBasicStringLB;
-    aColorBoxes[BASICOPERATOR       ] = &aBasicOperatorLB;
-    aColorBoxes[BASICKEYWORD        ] = &aBasicKeywordLB;
-    aColorBoxes[BASICERROR          ] = &aBasicErrorLB;
-    aColorBoxes[SQLIDENTIFIER       ] = &aSQLIdentifierLB;
-    aColorBoxes[SQLNUMBER           ] = &aSQLNumberLB;
-    aColorBoxes[SQLSTRING           ] = &aSQLStringLB;
-    aColorBoxes[SQLOPERATOR         ] = &aSQLOperatorLB;
-    aColorBoxes[SQLKEYWORD          ] = &aSQLKeywordLB;
-    aColorBoxes[SQLPARAMETER        ] = &aSQLParameterLB;
-    aColorBoxes[SQLCOMMENT          ] = &aSQLCommentLB;
+    aColorBoxes[BASICIDENTIFIER		] = &aBasicIdentifierLB;
+    aColorBoxes[BASICCOMMENT		] = &aBasicCommentLB;
+    aColorBoxes[BASICNUMBER			] = &aBasicNumberLB;
+    aColorBoxes[BASICSTRING			] = &aBasicStringLB;
+    aColorBoxes[BASICOPERATOR		] = &aBasicOperatorLB;
+    aColorBoxes[BASICKEYWORD		] = &aBasicKeywordLB;
+    aColorBoxes[BASICERROR			] = &aBasicErrorLB;
+    aColorBoxes[SQLIDENTIFIER		] = &aSQLIdentifierLB;
+    aColorBoxes[SQLNUMBER			] = &aSQLNumberLB;
+    aColorBoxes[SQLSTRING			] = &aSQLStringLB;
+    aColorBoxes[SQLOPERATOR			] = &aSQLOperatorLB;
+    aColorBoxes[SQLKEYWORD			] = &aSQLKeywordLB;
+    aColorBoxes[SQLPARAMETER		] = &aSQLParameterLB;
+    aColorBoxes[SQLCOMMENT			] = &aSQLCommentLB;
 
     aWindows[DOCCOLOR            ] = &aDocColorWN             ;
     aWindows[DOCBOUNDARIES       ] = &aDocBoundWN             ;
@@ -672,13 +672,13 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
     aWindows[BASICOPERATOR       ] = &aBasicOperatorWN;
     aWindows[BASICKEYWORD        ] = &aBasicKeywordWN;
     aWindows[BASICERROR          ] = &aBasicErrorWN;
-    aWindows[SQLIDENTIFIER       ] = &aSQLIdentifierWN;
-    aWindows[SQLNUMBER           ] = &aSQLNumberWN;
-    aWindows[SQLSTRING           ] = &aSQLStringWN;
-    aWindows[SQLOPERATOR         ] = &aSQLOperatorWN;
-    aWindows[SQLKEYWORD          ] = &aSQLKeywordWN;
-    aWindows[SQLPARAMETER        ] = &aSQLParameterWN;
-    aWindows[SQLCOMMENT          ] = &aSQLCommentWN;
+    aWindows[SQLIDENTIFIER		 ] = &aSQLIdentifierWN;
+    aWindows[SQLNUMBER			 ] = &aSQLNumberWN;
+    aWindows[SQLSTRING			 ] = &aSQLStringWN;
+    aWindows[SQLOPERATOR	     ] = &aSQLOperatorWN;
+    aWindows[SQLKEYWORD		     ] = &aSQLKeywordWN;
+    aWindows[SQLPARAMETER	     ] = &aSQLParameterWN;
+    aWindows[SQLCOMMENT		     ] = &aSQLCommentWN;
 
     aChapters.push_back(&aGeneralFT); aChapterWins.push_back(&aGeneralBackWN);
     aChapters.push_back(&aWriterFT);  aChapterWins.push_back(&aWriterBackWN);
@@ -961,8 +961,8 @@ class ColorConfigCtrl_Impl : public Control
     String                  sPreview;
     ColorConfigWindow_Impl  aScrollWindow;
 
-    EditableColorConfig*            pColorConfig;
-    EditableExtendedColorConfig*    pExtColorConfig;
+    EditableColorConfig*			pColorConfig;
+    EditableExtendedColorConfig*	pExtColorConfig;
 
     long            nScrollPos;
 
@@ -1329,7 +1329,7 @@ IMPL_LINK(ColorConfigCtrl_Impl, ColorHdl, ColorListBox*, pBox)
             }
             else
             {
-                Color aColor = pBox->GetSelectEntryColor();     // #i14869# no Color&, 'cause it's a ref to a temp object on the stack!
+                Color aColor = pBox->GetSelectEntryColor();		// #i14869# no Color&, 'cause it's a ref to a temp object on the stack!
                 aColorEntry.nColor = aColor.GetColor();
                 if(aScrollWindow.aWindows[i])
                     aScrollWindow.aWindows[i]->SetBackground(Wallpaper(aColor));
@@ -1354,7 +1354,7 @@ IMPL_LINK(ColorConfigCtrl_Impl, ColorHdl, ColorListBox*, pBox)
             if(pBox && aScrollWindow.aColorBoxes[i] == pBox)
             {
                 ExtendedColorConfigValue aColorEntry = pExtColorConfig->GetComponentColorConfigValue(sComponentName,k);
-                Color aColor = pBox->GetSelectEntryColor();     // #i14869# no Color&, 'cause it's a ref to a temp object on the stack!
+                Color aColor = pBox->GetSelectEntryColor();		// #i14869# no Color&, 'cause it's a ref to a temp object on the stack!
                 aColorEntry.setColor(aColor.GetColor());
                 if( !pBox->GetSelectEntryPos() ) // auto color
                 {
diff --git a/cui/source/options/optcolor.hrc b/cui/source/options/optcolor.hrc
index d8bb17b54e39..37478e098c6a 100644
--- a/cui/source/options/optcolor.hrc
+++ b/cui/source/options/optcolor.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,7 +163,7 @@
 #define LB_BASICERROR              164
 #define WN_BASICERROR              165
 
-#define FT_SQL_COMMAND           173
+#define FT_SQL_COMMAND			 173
 #define FT_SQLIDENTIFIER         174
 #define LB_SQLIDENTIFIER         175
 #define WN_SQLIDENTIFIER         176
@@ -182,26 +182,26 @@
 #define FT_SQLPARAMETER          189
 #define LB_SQLPARAMETER          190
 #define WN_SQLPARAMETER          191
-#define FT_SQLCOMMENT            192
-#define LB_SQLCOMMENT            193
-#define WN_SQLCOMMENT            194
-
-#define ST_EXTENSION                166
-
-
-
-#define _FT_WIDTH               120
-#define _LINE_HEIGHT            15
-#define _FT_HEIGHT              10
-#define _CB_WIDTH               130
-#define _FT_XPOS                14
-#define _CB_XPOS                6
-#define _LB_XPOS                139
-#define _LB_WIDTH               50
-#define _LB_HEIGHT              50
-#define _WN_WIDTH               30
-#define _WN_HEIGHT              12
-#define _WN_XPOS                195
+#define FT_SQLCOMMENT	         192
+#define LB_SQLCOMMENT			 193
+#define WN_SQLCOMMENT			 194
+
+#define ST_EXTENSION				166
+
+
+
+#define _FT_WIDTH				120
+#define _LINE_HEIGHT			15
+#define _FT_HEIGHT				10
+#define _CB_WIDTH				130
+#define _FT_XPOS				14
+#define _CB_XPOS				6
+#define _LB_XPOS				139
+#define _LB_WIDTH				50
+#define _LB_HEIGHT				50
+#define _WN_WIDTH				30
+#define _WN_HEIGHT				12
+#define _WN_XPOS				195
 
 #define FT_SMARTTAGS                    168
 #define LB_SMARTTAGS                    169
diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx
index 1f31a3da6420..f72338b68456 100644
--- a/cui/source/options/optcolor.hxx
+++ b/cui/source/options/optcolor.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,12 +68,12 @@ public:
     SvxColorOptionsTabPage( Window* pParent, const SfxItemSet& rSet );
     ~SvxColorOptionsTabPage(  );
 
-    static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
+    static SfxTabPage*	Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	void 		Reset( const SfxItemSet& rSet );
 
-    virtual int         DeactivatePage( SfxItemSet* pSet );
+    virtual int  		DeactivatePage( SfxItemSet* pSet );
     virtual void        FillUserData();
 
 };
diff --git a/cui/source/options/optcolor.src b/cui/source/options/optcolor.src
index 5b4a58bd59c4..b2e9c1513584 100644
--- a/cui/source/options/optcolor.src
+++ b/cui/source/options/optcolor.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,24 +111,24 @@ TabPage RID_SVXPAGE_COLORCONFIG
 
 // misc defines to shorten defining of standard elements
 // standard sizes
-#define FT_SEP_SIZE                     Size = MAP_APPFONT ( _FT_WIDTH , 8 )
-#define FT_SIZE                         Size = MAP_APPFONT ( _FT_WIDTH , _FT_HEIGHT )
-#define LB_SIZE                         Size = MAP_APPFONT ( _LB_WIDTH , _LB_HEIGHT )
-#define WN_SIZE                         Size = MAP_APPFONT ( _WN_WIDTH , _WN_HEIGHT )
-#define CB_SIZE                         Size = MAP_APPFONT ( _CB_WIDTH , _FT_HEIGHT )
+#define FT_SEP_SIZE						Size = MAP_APPFONT ( _FT_WIDTH , 8 )
+#define FT_SIZE							Size = MAP_APPFONT ( _FT_WIDTH , _FT_HEIGHT )
+#define LB_SIZE							Size = MAP_APPFONT ( _LB_WIDTH , _LB_HEIGHT )
+#define WN_SIZE							Size = MAP_APPFONT ( _WN_WIDTH , _WN_HEIGHT )
+#define CB_SIZE							Size = MAP_APPFONT ( _CB_WIDTH , _FT_HEIGHT )
 
 // combination of position and size
-#define POS_SIZE( POSX, LINENUM, CONTRL_SIZE )  Pos = MAP_APPFONT ( POSX , LINENUM * _LINE_HEIGHT ) ; CONTRL_SIZE
+#define POS_SIZE( POSX, LINENUM, CONTRL_SIZE )	Pos = MAP_APPFONT ( POSX , LINENUM * _LINE_HEIGHT ) ; CONTRL_SIZE
 
 // ... for special types
-#define FT_SEP_POS_SIZE( LINENUM )      POS_SIZE( 14, LINENUM, FT_SEP_SIZE )
-#define FT_POS_SIZE( LINENUM )          POS_SIZE( _FT_XPOS, LINENUM, FT_SIZE )
-#define LB_POS_SIZE( LINENUM )          POS_SIZE( _LB_XPOS, LINENUM, LB_SIZE )
-#define WN_POS_SIZE( LINENUM )          POS_SIZE( _WN_XPOS, LINENUM, WN_SIZE )
-#define CB_POS_SIZE( LINENUM )          POS_SIZE( _CB_XPOS, LINENUM, CB_SIZE )
+#define FT_SEP_POS_SIZE( LINENUM )		POS_SIZE( 14, LINENUM, FT_SEP_SIZE )
+#define	FT_POS_SIZE( LINENUM )			POS_SIZE( _FT_XPOS, LINENUM, FT_SIZE )
+#define	LB_POS_SIZE( LINENUM )			POS_SIZE( _LB_XPOS, LINENUM, LB_SIZE )
+#define WN_POS_SIZE( LINENUM )			POS_SIZE( _WN_XPOS, LINENUM, WN_SIZE )
+#define CB_POS_SIZE( LINENUM )			POS_SIZE( _CB_XPOS, LINENUM, CB_SIZE )
 
 // combination of a listbox (color chooser) and window (color preview)
-#define LB_WN( ID_POST, LINENUM )       ListBox LB_#ID_POST{LB_POS_SIZE(LINENUM);DropDown=TRUE;};Window WN_#ID_POST{WN_POS_SIZE(LINENUM);Border=TRUE;};
+#define LB_WN( ID_POST, LINENUM )		ListBox LB_#ID_POST{LB_POS_SIZE(LINENUM);DropDown=TRUE;};Window WN_#ID_POST{WN_POS_SIZE(LINENUM);Border=TRUE;};
 
             OutputSize = TRUE ;
             Pos = MAP_APPFONT ( 0 , 10 ) ;
@@ -430,55 +430,55 @@ TabPage RID_SVXPAGE_COLORCONFIG
                 Text [ en-US ] = "Error";
             };
             LB_WN( BASICERROR, 42 )
-
+            
             FixedText FT_SQL_COMMAND
             {
                 FT_SEP_POS_SIZE( 43 );
                 Text [ en-US ] = "SQL Syntax Highlighting";
             };
-
+            
             FixedText FT_SQLIDENTIFIER
             {
                 FT_POS_SIZE( 44 );
                 Text [ en-US ] = "Identifier";
             };
             LB_WN( SQLIDENTIFIER, 44 )
-
+            
             FixedText FT_SQLNUMBER
             {
                 FT_POS_SIZE( 45 );
                 Text [ en-US ] = "Number";
             };
             LB_WN( SQLNUMBER, 45 )
-
+            
             FixedText FT_SQLSTRING
             {
                 FT_POS_SIZE( 46 );
                 Text [ en-US ] = "String";
             };
             LB_WN( SQLSTRING, 46 )
-
+            
             FixedText FT_SQLOPERATOR
             {
                 FT_POS_SIZE( 47 );
                 Text [ en-US ] = "Operator";
             };
             LB_WN( SQLOPERATOR, 47 )
-
+            
             FixedText FT_SQLKEYWORD
             {
                 FT_POS_SIZE( 48 );
                 Text [ en-US ] = "Keyword";
             };
             LB_WN( SQLKEYWORD, 48 )
-
+            
             FixedText FT_SQLPARAMETER
             {
                 FT_POS_SIZE( 49 );
                 Text [ en-US ] = "Parameter";
             };
             LB_WN( SQLPARAMETER, 49 )
-
+            
             FixedText FT_SQLCOMMENT
             {
                 FT_POS_SIZE( 50 );
diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index 0096b032cfa7..a4bebf70b9f7 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ IMPL_LINK( SvxCTLOptionsPage, SequenceCheckingCB_Hdl, void*, EMPTYARG )
     m_aTypeReplaceCB.Enable( bIsSequenceChecking );
     // #i48117#: by default restricted and type&replace have to be switched on
     if(bIsSequenceChecking)
-    {
+    {        
         m_aTypeReplaceCB.Check( sal_True );
         m_aRestrictedCB.Check( sal_True );
     }
@@ -54,17 +54,17 @@ SvxCTLOptionsPage::SvxCTLOptionsPage( Window* pParent, const SfxItemSet& rSet )
 
     SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_OPTIONS_CTL ), rSet ),
 
-    m_aSequenceCheckingFL   ( this, CUI_RES( FL_SEQUENCECHECKING ) ),
-    m_aSequenceCheckingCB   ( this, CUI_RES( CB_SEQUENCECHECKING ) ),
-    m_aRestrictedCB         ( this, CUI_RES( CB_RESTRICTED ) ),
+    m_aSequenceCheckingFL	( this, CUI_RES( FL_SEQUENCECHECKING ) ),
+    m_aSequenceCheckingCB	( this, CUI_RES( CB_SEQUENCECHECKING ) ),
+    m_aRestrictedCB			( this, CUI_RES( CB_RESTRICTED ) ),
     m_aTypeReplaceCB        ( this, CUI_RES( CB_TYPE_REPLACE ) ),
-    m_aCursorControlFL      ( this, CUI_RES( FL_CURSORCONTROL ) ),
-    m_aMovementFT           ( this, CUI_RES( FT_MOVEMENT ) ),
-    m_aMovementLogicalRB    ( this, CUI_RES( RB_MOVEMENT_LOGICAL ) ),
-    m_aMovementVisualRB     ( this, CUI_RES( RB_MOVEMENT_VISUAL ) ),
-    m_aGeneralFL            ( this, CUI_RES( FL_GENERAL ) ),
-    m_aNumeralsFT           ( this, CUI_RES( FT_NUMERALS ) ),
-    m_aNumeralsLB           ( this, CUI_RES( LB_NUMERALS ) )
+    m_aCursorControlFL		( this, CUI_RES( FL_CURSORCONTROL ) ),
+    m_aMovementFT			( this, CUI_RES( FT_MOVEMENT ) ),
+    m_aMovementLogicalRB	( this, CUI_RES( RB_MOVEMENT_LOGICAL ) ),
+    m_aMovementVisualRB		( this, CUI_RES( RB_MOVEMENT_VISUAL ) ),
+    m_aGeneralFL			( this, CUI_RES( FL_GENERAL ) ),
+    m_aNumeralsFT			( this, CUI_RES( FT_NUMERALS ) ),
+    m_aNumeralsLB			( this, CUI_RES( LB_NUMERALS ) )
 
 {
     FreeResource();
@@ -78,7 +78,7 @@ SvxCTLOptionsPage::~SvxCTLOptionsPage()
 {
 }
 // -----------------------------------------------------------------------------
-SfxTabPage* SvxCTLOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage*	SvxCTLOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
 {
     return new SvxCTLOptionsPage( pParent, rAttrSet );
 }
diff --git a/cui/source/options/optctl.hrc b/cui/source/options/optctl.hrc
index 1bdea7bb44c8..d3dcd14d8ade 100644
--- a/cui/source/options/optctl.hrc
+++ b/cui/source/options/optctl.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 #include <svtools/controldims.hrc>
 
-#define FL_SEQUENCECHECKING     10
-#define CB_SEQUENCECHECKING     11
-#define CB_RESTRICTED           12
+#define FL_SEQUENCECHECKING		10
+#define CB_SEQUENCECHECKING		11
+#define CB_RESTRICTED			12
 #define CB_TYPE_REPLACE         13
 
-#define FL_CURSORCONTROL        20
-#define FT_MOVEMENT             21
-#define RB_MOVEMENT_LOGICAL     22
-#define RB_MOVEMENT_VISUAL      23
+#define FL_CURSORCONTROL		20
+#define FT_MOVEMENT				21
+#define RB_MOVEMENT_LOGICAL		22
+#define RB_MOVEMENT_VISUAL		23
 
-#define FL_GENERAL              30
-#define FT_NUMERALS             31
-#define LB_NUMERALS             32
+#define FL_GENERAL				30
+#define FT_NUMERALS				31
+#define LB_NUMERALS				32
 
-#define EXTRA_SPACE_Y           16
-#define ROW_0                   (RSC_SP_TBPG_INNERBORDER_TOP)
-#define ROW_1                   (ROW_0+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_SPACE_Y)
-#define ROW_2                   (ROW_1+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y)
-#define ROW_3                   (ROW_2+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_Y+EXTRA_SPACE_Y)
-#define ROW_4                   (ROW_3+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_SPACE_Y)
-#define ROW_5                   (ROW_4+(RSC_CD_RADIOBUTTON_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)
-#define ROW_6                   (ROW_5+RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_Y+EXTRA_SPACE_Y)
-#define ROW_7                   (ROW_6+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_SPACE_Y)
-#define ROW_8                   (ROW_7+(RSC_CD_DROPDOWN_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)
+#define EXTRA_SPACE_Y			16
+#define ROW_0					(RSC_SP_TBPG_INNERBORDER_TOP)
+#define ROW_1					(ROW_0+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_SPACE_Y)
+#define ROW_2					(ROW_1+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y)
+#define ROW_3					(ROW_2+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_Y+EXTRA_SPACE_Y)
+#define ROW_4					(ROW_3+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_SPACE_Y)
+#define ROW_5					(ROW_4+(RSC_CD_RADIOBUTTON_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)
+#define ROW_6					(ROW_5+RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_Y+EXTRA_SPACE_Y)
+#define ROW_7					(ROW_6+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_SPACE_Y)
+#define ROW_8					(ROW_7+(RSC_CD_DROPDOWN_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)
 
 #endif // #ifndef _SVX_OPTCTL_HRC
 
diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx
index a3b455478750..218193bdd973 100644
--- a/cui/source/options/optctl.hxx
+++ b/cui/source/options/optctl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 class SvxCTLOptionsPage : public SfxTabPage
 {
 private:
-    FixedLine           m_aSequenceCheckingFL;
-    CheckBox            m_aSequenceCheckingCB;
-    CheckBox            m_aRestrictedCB;
+    FixedLine			m_aSequenceCheckingFL;
+    CheckBox			m_aSequenceCheckingCB;
+    CheckBox			m_aRestrictedCB;
     CheckBox            m_aTypeReplaceCB;
 
-    FixedLine           m_aCursorControlFL;
-    FixedText           m_aMovementFT;
-    RadioButton         m_aMovementLogicalRB;
-    RadioButton         m_aMovementVisualRB;
+    FixedLine			m_aCursorControlFL;
+    FixedText			m_aMovementFT;
+    RadioButton			m_aMovementLogicalRB;
+    RadioButton			m_aMovementVisualRB;
 
-    FixedLine           m_aGeneralFL;
-    FixedText           m_aNumeralsFT;
-    ListBox             m_aNumeralsLB;
+    FixedLine			m_aGeneralFL;
+    FixedText			m_aNumeralsFT;
+    ListBox				m_aNumeralsLB;
 
     DECL_LINK( SequenceCheckingCB_Hdl, void* );
 
@@ -60,9 +60,9 @@ public:
 
     virtual ~SvxCTLOptionsPage();
 
-    static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    static SfxTabPage*	Create( Window* pParent, const SfxItemSet& rAttrSet );
+    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	void 		Reset( const SfxItemSet& rSet );
 };
 
 #endif // #ifndef _SVX_OPTCTL_HXX
diff --git a/cui/source/options/optctl.src b/cui/source/options/optctl.src
index defc62c95011..2da8925a5959 100644
--- a/cui/source/options/optctl.src
+++ b/cui/source/options/optctl.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index b3e6e7ccba64..42d0d05e7fc4 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 CDE_RESULT cmpDicEntry_Impl( const String &rText1, const String &rText2 )
     if (rText1 == rText2)
         eRes = CDE_EQUAL;
     else
-    {   // similar = equal up to trailing '.' and hyphenation positions
+    {	// similar = equal up to trailing '.' and hyphenation positions
         // marked with '='
         if (getNormDicEntry_Impl( rText1 ) == getNormDicEntry_Impl( rText2 ))
             eRes = CDE_SIMILAR;
@@ -102,15 +102,15 @@ SvxNewDictionaryDialog::SvxNewDictionaryDialog( Window* pParent,
 
     ModalDialog( pParent, CUI_RES( RID_SFXDLG_NEWDICT ) ),
 
-    aNameText       ( this, CUI_RES( FT_DICTNAME ) ),
-    aNameEdit       ( this, CUI_RES( ED_DICTNAME ) ),
-    aLanguageText   ( this, CUI_RES( FT_DICTLANG ) ),
-    aLanguageLB     ( this, CUI_RES( LB_DICTLANG ) ),
-    aExceptBtn      ( this, CUI_RES( BTN_EXCEPT ) ),
-    aNewDictBox     ( this, CUI_RES( GB_NEWDICT ) ),
-    aOKBtn          ( this, CUI_RES( BTN_NEWDICT_OK ) ),
-    aCancelBtn      ( this, CUI_RES( BTN_NEWDICT_ESC ) ),
-    aHelpBtn        ( this, CUI_RES( BTN_NEWDICT_HLP ) ),
+    aNameText		( this, CUI_RES( FT_DICTNAME ) ),
+    aNameEdit		( this, CUI_RES( ED_DICTNAME ) ),
+    aLanguageText	( this, CUI_RES( FT_DICTLANG ) ),
+    aLanguageLB		( this, CUI_RES( LB_DICTLANG ) ),
+    aExceptBtn		( this, CUI_RES( BTN_EXCEPT ) ),
+    aNewDictBox		( this, CUI_RES( GB_NEWDICT ) ),
+    aOKBtn			( this, CUI_RES( BTN_NEWDICT_OK ) ),
+    aCancelBtn		( this, CUI_RES( BTN_NEWDICT_ESC ) ),
+    aHelpBtn		( this, CUI_RES( BTN_NEWDICT_HLP ) ),
     xSpell( xSpl )
 {
     // Handler installieren
@@ -227,23 +227,23 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog(
 
     ModalDialog( pParent, CUI_RES( RID_SFXDLG_EDITDICT ) ),
 
-    aBookFT         ( this, CUI_RES( FT_BOOK ) ),
-    aAllDictsLB     ( this, CUI_RES( LB_ALLDICTS ) ),
-    aLangFT         ( this, CUI_RES( FT_DICTLANG ) ),
-    aLangLB         ( this, CUI_RES( LB_DICTLANG ) ),
-    aWordFT         ( this, CUI_RES( FT_WORD ) ),
-    aWordED         ( this, CUI_RES( ED_WORD ) ),
-    aReplaceFT      ( this, CUI_RES( FT_REPLACE ) ),
-    aReplaceED      ( this, CUI_RES( ED_REPLACE ) ),
-    aWordsLB        ( this, CUI_RES( TLB_REPLACE ) ),
-    aNewReplacePB   ( this, CUI_RES( PB_NEW_REPLACE ) ),
-    aDeletePB       ( this, CUI_RES( PB_DELETE_REPLACE ) ),
-    aEditDictsBox   ( this, CUI_RES( GB_EDITDICTS ) ),
-    aCloseBtn       ( this, CUI_RES( BTN_EDITCLOSE ) ),
-    aHelpBtn        ( this, CUI_RES( BTN_EDITHELP ) ),
-    sModify         (CUI_RES(STR_MODIFY)),
-    sNew            (aNewReplacePB.GetText()),
-    aDecoView       ( this),
+    aBookFT			( this, CUI_RES( FT_BOOK ) ),
+    aAllDictsLB		( this, CUI_RES( LB_ALLDICTS ) ),
+    aLangFT			( this, CUI_RES( FT_DICTLANG ) ),
+    aLangLB			( this, CUI_RES( LB_DICTLANG ) ),
+    aWordFT			( this, CUI_RES( FT_WORD ) ),
+    aWordED			( this, CUI_RES( ED_WORD ) ),
+    aReplaceFT		( this, CUI_RES( FT_REPLACE ) ),
+    aReplaceED		( this, CUI_RES( ED_REPLACE ) ),
+    aWordsLB		( this, CUI_RES( TLB_REPLACE ) ),
+    aNewReplacePB	( this, CUI_RES( PB_NEW_REPLACE ) ),
+    aDeletePB		( this, CUI_RES( PB_DELETE_REPLACE ) ),
+    aEditDictsBox	( this, CUI_RES( GB_EDITDICTS ) ),
+    aCloseBtn		( this, CUI_RES( BTN_EDITCLOSE ) ),
+    aHelpBtn		( this, CUI_RES( BTN_EDITHELP ) ),
+    sModify			(CUI_RES(STR_MODIFY)),
+    sNew			(aNewReplacePB.GetText()),
+    aDecoView		( this),
     xSpell          ( xSpl ),
     nOld            ( NOACTDICT ),
     bFirstSelect    (sal_True),
@@ -324,7 +324,7 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog(
         SetDicReadonly_Impl(xDic);
         sal_Bool bEnable = !IsDicReadonly_Impl();
         aNewReplacePB   .Enable( sal_False );
-        aDeletePB       .Enable( sal_False );
+        aDeletePB		.Enable( sal_False );
         aLangFT.Enable( bEnable );
         aLangLB.Enable( bEnable );
         ShowWords_Impl( nPos );
@@ -333,7 +333,7 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog(
     else
     {
         aNewReplacePB.Disable();
-        aDeletePB    .Disable();
+        aDeletePB	 .Disable();
     }
     FreeResource();
 }
@@ -366,8 +366,8 @@ void SvxEditDictionaryDialog::SetDicReadonly_Impl(
     if (xDic.is())
     {
         Reference< frame::XStorable >  xStor( xDic, UNO_QUERY );
-        if (   !xStor.is()              // non persistent dictionary
-            || !xStor->hasLocation()    // not yet persistent
+        if (   !xStor.is() 				// non persistent dictionary
+            || !xStor->hasLocation()	// not yet persistent
             || !xStor->isReadonly() )
         {
             bDicIsReadonly = sal_False;
@@ -400,7 +400,7 @@ USHORT SvxEditDictionaryDialog::GetLBInsertPos(const String &rDicWord)
         if( COMPARE_LESS == eCmpRes )
             break;
     }
-    if (j < aWordsLB.GetEntryCount())   // entry found?
+    if (j < aWordsLB.GetEntryCount())	// entry found?
         nPos = j;
 
     return nPos;
@@ -415,7 +415,7 @@ void SvxEditDictionaryDialog::RemoveDictEntry(SvLBoxEntry* pEntry)
         String sTmpShort(aWordsLB.GetEntryText(pEntry, 0));
 
         Reference< XDictionary >  xDic = aDics.getConstArray()[ nLBPos ];
-        if (xDic->remove( sTmpShort ))  // sal_True on success
+        if (xDic->remove( sTmpShort ))	// sal_True on success
         {
             aWordsLB.GetModel()->Remove(pEntry);
         }
@@ -431,7 +431,7 @@ IMPL_LINK( SvxEditDictionaryDialog, SelectBookHdl_Impl, ListBox *, EMPTYARG )
     if ( nPos != LISTBOX_ENTRY_NOTFOUND )
     {
         aNewReplacePB.Enable( sal_False );
-        aDeletePB    .Enable( sal_False );
+        aDeletePB	 .Enable( sal_False );
         // Dictionary anzeigen
         ShowWords_Impl( nPos );
         // enable or disable new and delete button according to file attributes
@@ -547,7 +547,7 @@ void SvxEditDictionaryDialog::ShowWords_Impl( sal_uInt16 nId )
 
     if (aWordsLB.GetEntryCount())
     {
-        aWordED   .SetText( aWordsLB.GetEntryText(0LU, 0) );
+        aWordED	  .SetText( aWordsLB.GetEntryText(0LU, 0) );
         aReplaceED.SetText( aWordsLB.GetEntryText(0LU, 1) );
     }
 
@@ -576,7 +576,7 @@ IMPL_LINK(SvxEditDictionaryDialog, SelectHdl, SvTabListBox*, pBox)
         // entries in the list box should exactly correspond to those from the
         // dictionary. Thus:
         aNewReplacePB.Enable(sal_False);
-        aDeletePB    .Enable( sal_True && !IsDicReadonly_Impl() );
+        aDeletePB	 .Enable( sal_True && !IsDicReadonly_Impl() );
     }
     return 0;
 };
@@ -596,7 +596,7 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn)
         aReplaceED.SetText(aStr);
         aDeletePB.Disable();
 
-        RemoveDictEntry(pEntry);    // remove entry from dic and list-box
+        RemoveDictEntry(pEntry);	// remove entry from dic and list-box
     }
     if(pBtn == &aNewReplacePB || aNewReplacePB.IsEnabled())
     {
@@ -690,9 +690,9 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt)
     xub_StrLen nWordLen=rEntry.Len();
     const String& rRepString = aReplaceED.GetText();
 
-    BOOL bEnableNewReplace  = FALSE;
-    BOOL bEnableDelete      = FALSE;
-    String aNewReplaceText  = sNew;
+    BOOL bEnableNewReplace	= FALSE;
+    BOOL bEnableDelete		= FALSE;
+    String aNewReplaceText	= sNew;
 
     if(pEdt == &aWordED)
     {
@@ -761,9 +761,9 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt)
     {
         String aReplaceText;
         String aWordText;
-        if (pFirstSel)  // a aWordsLB entry is selected
+        if (pFirstSel)	// a aWordsLB entry is selected
         {
-            aWordText    = aWordsLB.GetEntryText( pFirstSel, 0 );
+            aWordText	 = aWordsLB.GetEntryText( pFirstSel, 0 );
              aReplaceText = aWordsLB.GetEntryText( pFirstSel, 1 );
 
             aNewReplaceText = sModify;
@@ -778,7 +778,7 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt)
 
     aNewReplacePB.SetText( aNewReplaceText );
     aNewReplacePB.Enable( bEnableNewReplace && !IsDicReadonly_Impl() );
-    aDeletePB    .Enable( bEnableDelete     && !IsDicReadonly_Impl() );
+    aDeletePB	 .Enable( bEnableDelete     && !IsDicReadonly_Impl() );
 
     return 0;
 }
diff --git a/cui/source/options/optdict.hrc b/cui/source/options/optdict.hrc
index e7233f2b67ef..e2f7bb1d5b01 100644
--- a/cui/source/options/optdict.hrc
+++ b/cui/source/options/optdict.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 // defines ------------------------------------------------------------------
 
-#define FT_DICTNAME     10
-#define ED_DICTNAME     11
-#define FT_DICTLANG     12
-#define LB_DICTLANG     13
-#define BTN_EXCEPT      14
-#define GB_NEWDICT      15
+#define FT_DICTNAME 	10
+#define ED_DICTNAME 	11
+#define FT_DICTLANG 	12
+#define LB_DICTLANG 	13
+#define BTN_EXCEPT 		14
+#define GB_NEWDICT 		15
 
-#define BTN_NEWDICT_OK  20
+#define BTN_NEWDICT_OK 	20
 #define BTN_NEWDICT_ESC 21
 #define BTN_NEWDICT_HLP 22
 
-#define FT_BOOK             30
-#define FT_CONTENT          31
-#define LB_ALLDICTS         32
-#define GB_EDITDICTS        34
-#define FT_WORD             35
-#define ED_WORD             36
-#define FT_REPLACE          37
-#define ED_REPLACE          38
-#define PB_NEW_REPLACE      39
-#define PB_DELETE_REPLACE   40
-#define TLB_REPLACE         41
-#define STR_MODIFY          42
+#define FT_BOOK 			30
+#define FT_CONTENT	 		31
+#define LB_ALLDICTS 		32
+#define GB_EDITDICTS 		34
+#define FT_WORD				35
+#define ED_WORD				36
+#define FT_REPLACE			37
+#define ED_REPLACE			38
+#define PB_NEW_REPLACE		39
+#define PB_DELETE_REPLACE	40
+#define TLB_REPLACE			41
+#define STR_MODIFY			42
 
-#define BTN_EDITCLOSE   50
-#define BTN_EDITNEW     51
-#define BTN_EDITCHANGE  52
-#define BTN_EDITREMOVE  53
-#define BTN_EDITHELP    54
+#define BTN_EDITCLOSE 	50
+#define BTN_EDITNEW		51
+#define BTN_EDITCHANGE	52
+#define BTN_EDITREMOVE 	53
+#define BTN_EDITHELP 	54
 
 
 
diff --git a/cui/source/options/optdict.src b/cui/source/options/optdict.src
index b5d31ce90fe9..11d33db1732a 100644
--- a/cui/source/options/optdict.src
+++ b/cui/source/options/optdict.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 7a03329d209f..e4bfc2423189 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ enum MSFltrPg2_CheckBoxEntries {
     InvalidCBEntry
 };
 
-#define CBCOL_FIRST     0
-#define CBCOL_SECOND    1
+#define CBCOL_FIRST		0
+#define CBCOL_SECOND 	1
 
 // -----------------------------------------------------------------------
 
 OfaMSFilterTabPage::OfaMSFilterTabPage(Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_MSFILTEROPT ), rSet ),
-    aMSWordGB       ( this, CUI_RES( GB_WORD        ) ),
-    aWBasicCodeCB   ( this, CUI_RES( CB_WBAS_CODE ) ),
+    aMSWordGB		( this, CUI_RES( GB_WORD	    ) ),
+    aWBasicCodeCB	( this, CUI_RES( CB_WBAS_CODE ) ),
     aWBasicWbctblCB ( this, CUI_RES( CB_WBAS_WBCTBL ) ),
-    aWBasicStgCB    ( this, CUI_RES( CB_WBAS_STG  ) ),
+    aWBasicStgCB	( this, CUI_RES( CB_WBAS_STG  ) ),
     aMSExcelGB      ( this, CUI_RES( GB_EXCEL     ) ),
     aEBasicCodeCB   ( this, CUI_RES( CB_EBAS_CODE ) ),
     aEBasicExectblCB( this, CUI_RES( CB_EBAS_EXECTBL ) ),
@@ -87,7 +87,7 @@ IMPL_LINK( OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl, CheckBox*, EMPTYARG
     return 0;
 }
 
-SfxTabPage* OfaMSFilterTabPage::Create( Window* pParent,
+SfxTabPage*	OfaMSFilterTabPage::Create( Window* pParent,
                                         const SfxItemSet& rAttrSet )
 {
     return new OfaMSFilterTabPage( pParent, rAttrSet );
@@ -157,15 +157,15 @@ void OfaMSFilterTabPage::Reset( const SfxItemSet& )
 OfaMSFilterTabPage2::OfaMSFilterTabPage2( Window* pParent,
                                         const SfxItemSet& rSet )
     : SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_MSFILTEROPT2 ), rSet ),
-    aCheckLB            ( this, CUI_RES( CLB_SETTINGS   )),
-    aHeader1FT          ( this, CUI_RES( FT_HEADER1_EXPLANATION )),
+    aCheckLB			( this, CUI_RES( CLB_SETTINGS	)),
+    aHeader1FT			( this, CUI_RES( FT_HEADER1_EXPLANATION )),
     aHeader2FT          ( this, CUI_RES( FT_HEADER2_EXPLANATION )),
     sHeader1            ( CUI_RES( ST_HEADER1 )),
     sHeader2            ( CUI_RES( ST_HEADER2 )),
-    sChgToFromMath      ( CUI_RES( ST_CHG_MATH  )),
-    sChgToFromWriter    ( CUI_RES( ST_CHG_WRITER )),
-    sChgToFromCalc      ( CUI_RES( ST_CHG_CALC )),
-    sChgToFromImpress   ( CUI_RES( ST_CHG_IMPRESS )),
+    sChgToFromMath		( CUI_RES( ST_CHG_MATH	)),
+    sChgToFromWriter	( CUI_RES( ST_CHG_WRITER )),
+    sChgToFromCalc		( CUI_RES( ST_CHG_CALC )),
+    sChgToFromImpress	( CUI_RES( ST_CHG_IMPRESS )),
     pCheckButtonData(0)
 {
     FreeResource();
@@ -187,7 +187,7 @@ OfaMSFilterTabPage2::~OfaMSFilterTabPage2()
     delete pCheckButtonData;
 }
 
-SfxTabPage* OfaMSFilterTabPage2::Create( Window* pParent,
+SfxTabPage*	OfaMSFilterTabPage2::Create( Window* pParent,
                                 const SfxItemSet& rAttrSet )
 {
     return new OfaMSFilterTabPage2( pParent, rAttrSet );
@@ -203,21 +203,21 @@ BOOL OfaMSFilterTabPage2::FillItemSet( SfxItemSet& )
         BOOL (SvtFilterOptions:: *FnIs)() const;
         void (SvtFilterOptions:: *FnSet)( BOOL bFlag );
     } aChkArr[] = {
-        { Math,     &SvtFilterOptions::IsMathType2Math,
-                        &SvtFilterOptions::SetMathType2Math },
-        { Math,     &SvtFilterOptions::IsMath2MathType,
+        { Math, 	&SvtFilterOptions::IsMathType2Math,
+                        &SvtFilterOptions::SetMathType2Math	},
+        { Math, 	&SvtFilterOptions::IsMath2MathType,
                         &SvtFilterOptions::SetMath2MathType },
-        { Writer,   &SvtFilterOptions::IsWinWord2Writer,
+        { Writer,	&SvtFilterOptions::IsWinWord2Writer,
                         &SvtFilterOptions::SetWinWord2Writer },
-        { Writer,   &SvtFilterOptions::IsWriter2WinWord,
+        { Writer, 	&SvtFilterOptions::IsWriter2WinWord,
                         &SvtFilterOptions::SetWriter2WinWord },
-        { Calc,     &SvtFilterOptions::IsExcel2Calc,
+        { Calc, 	&SvtFilterOptions::IsExcel2Calc,
                         &SvtFilterOptions::SetExcel2Calc },
-        { Calc,     &SvtFilterOptions::IsCalc2Excel,
+        { Calc, 	&SvtFilterOptions::IsCalc2Excel,
                         &SvtFilterOptions::SetCalc2Excel },
-        { Impress,  &SvtFilterOptions::IsPowerPoint2Impress,
+        { Impress, 	&SvtFilterOptions::IsPowerPoint2Impress,
                         &SvtFilterOptions::SetPowerPoint2Impress },
-        { Impress,  &SvtFilterOptions::IsImpress2PowerPoint,
+        { Impress, 	&SvtFilterOptions::IsImpress2PowerPoint,
                         &SvtFilterOptions::SetImpress2PowerPoint },
         { InvalidCBEntry, 0, 0 }
     };
diff --git a/cui/source/options/optfltr.hrc b/cui/source/options/optfltr.hrc
index a9411b576674..40204b717a42 100644
--- a/cui/source/options/optfltr.hrc
+++ b/cui/source/options/optfltr.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 // defines ------------------------------------------------------------------
 
-#define GB_WORD         1
+#define GB_WORD			1
 #define GB_EXCEL        2
 #define GB_PPOINT       3
 
@@ -40,16 +40,16 @@
 #define CB_EBAS_STG     5
 #define CB_PBAS_CODE    6
 #define CB_PBAS_STG     7
-#define CB_WBAS_WBCTBL  8
+#define CB_WBAS_WBCTBL	8
 
 #define CLB_SETTINGS    1
 #define ST_CHG_MATH     1
 #define ST_CHG_WRITER   2
 #define ST_CHG_CALC     3
-#define ST_CHG_IMPRESS  4
-#define ST_HEADER1      5
+#define ST_CHG_IMPRESS	4
+#define ST_HEADER1		5
 #define ST_HEADER2      6
-#define FT_HEADER1_EXPLANATION  1
+#define FT_HEADER1_EXPLANATION	1
 #define FT_HEADER2_EXPLANATION  2
 
 #endif
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index 466ab25a2c54..695863f06fc9 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 class OfaMSFilterTabPage : public SfxTabPage
 {
     FixedLine       aMSWordGB;
-    CheckBox        aWBasicCodeCB;
-    CheckBox        aWBasicWbctblCB;
-    CheckBox        aWBasicStgCB;
+    CheckBox		aWBasicCodeCB;
+    CheckBox		aWBasicWbctblCB;
+    CheckBox		aWBasicStgCB;
     FixedLine       aMSExcelGB;
-    CheckBox        aEBasicCodeCB;
-    CheckBox        aEBasicExectblCB;
-    CheckBox        aEBasicStgCB;
+    CheckBox		aEBasicCodeCB;
+    CheckBox		aEBasicExectblCB;
+    CheckBox		aEBasicStgCB;
     FixedLine       aMSPPointGB;
-    CheckBox        aPBasicCodeCB;
-    CheckBox        aPBasicStgCB;
+    CheckBox		aPBasicCodeCB;
+    CheckBox		aPBasicStgCB;
 
     OfaMSFilterTabPage( Window* pParent, const SfxItemSet& rSet );
     virtual ~OfaMSFilterTabPage();
@@ -57,11 +57,11 @@ class OfaMSFilterTabPage : public SfxTabPage
     DECL_LINK( LoadExcelBasicCheckHdl_Impl, CheckBox* );
 public:
 
-    static SfxTabPage*  Create( Window* pParent,
+    static SfxTabPage*	Create( Window* pParent,
                                 const SfxItemSet& rAttrSet );
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	void 		Reset( const SfxItemSet& rSet );
 };
 
 class OfaMSFilterTabPage2 : public SfxTabPage
@@ -74,10 +74,10 @@ class OfaMSFilterTabPage2 : public SfxTabPage
 
         void            CheckEntryPos(ULONG nPos, USHORT nCol, BOOL bChecked);
         SvButtonState   GetCheckButtonState( SvLBoxEntry*, USHORT nCol ) const;
-        void            SetCheckButtonState( SvLBoxEntry*, USHORT nCol, SvButtonState );
+        void			SetCheckButtonState( SvLBoxEntry*, USHORT nCol, SvButtonState );
     protected:
-        virtual void    SetTabs();
-        virtual void    HBarClick();
+        virtual void	SetTabs();
+        virtual void	HBarClick();
         virtual void    KeyInput( const KeyEvent& rKEvt );
 
     public:
@@ -92,7 +92,7 @@ class OfaMSFilterTabPage2 : public SfxTabPage
            sChgToFromWriter,
            sChgToFromCalc,
            sChgToFromImpress;
-    SvLBoxButtonData*   pCheckButtonData;
+    SvLBoxButtonData*	pCheckButtonData;
 
     OfaMSFilterTabPage2( Window* pParent, const SfxItemSet& rSet );
     virtual ~OfaMSFilterTabPage2();
@@ -104,8 +104,8 @@ public:
 
     static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	void 		Reset( const SfxItemSet& rSet );
 };
 
 
diff --git a/cui/source/options/optfltr.src b/cui/source/options/optfltr.src
index b586bb454503..60b1e4d727bd 100644
--- a/cui/source/options/optfltr.src
+++ b/cui/source/options/optfltr.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 // RID_OFAPAGE_MSFILTEROPT -----------------------------------------------------
 TabPage RID_OFAPAGE_MSFILTEROPT
 {
-     // HelpId = ;
+     //	HelpId = ;
     OutputSize = TRUE ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
     SVLook = TRUE ;
@@ -119,7 +119,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
 // RID_OFAPAGE_MSFILTEROPT2 -----------------------------------------------------
 TabPage RID_OFAPAGE_MSFILTEROPT2
 {
-     // HelpId = ;
+     //	HelpId = ;
     OutputSize = TRUE ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
     SVLook = TRUE ;
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 2cf7c77ddaf7..36090d189948 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -115,7 +115,7 @@ using ::rtl::OUString;
 
 #define C2U(cChar) OUString::createFromAscii(cChar)
 
-#define MAX_PROGRAM_ENTRIES     3
+#define MAX_PROGRAM_ENTRIES		3
 
 // class OfaMiscTabPage --------------------------------------------------
 
@@ -197,26 +197,26 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
 
     SfxTabPage( pParent, CUI_RES( OFA_TP_MISC ), rSet ),
 
-    aHelpFL             ( this, CUI_RES( FL_HELP ) ),
-    aToolTipsCB         ( this, CUI_RES( CB_TOOLTIP ) ),
-    aExtHelpCB          ( this, CUI_RES( CB_EXTHELP ) ),
-    aHelpAgentCB        ( this, CUI_RES( CB_HELPAGENT ) ),
-    aHelpAgentResetBtn  ( this, CUI_RES( PB_HELPAGENT_RESET ) ),
-    aHelpFormatFT       ( this, CUI_RES( FT_HELPFORMAT ) ),
-    aHelpFormatLB       ( this, CUI_RES( LB_HELPFORMAT ) ),
-    aFileDlgFL          ( this, CUI_RES( FL_FILEDLG ) ),
+    aHelpFL				( this, CUI_RES( FL_HELP ) ),
+    aToolTipsCB			( this, CUI_RES( CB_TOOLTIP ) ),
+    aExtHelpCB			( this, CUI_RES( CB_EXTHELP ) ),
+    aHelpAgentCB		( this, CUI_RES( CB_HELPAGENT ) ),
+    aHelpAgentResetBtn	( this, CUI_RES( PB_HELPAGENT_RESET ) ),
+    aHelpFormatFT		( this, CUI_RES( FT_HELPFORMAT ) ),
+    aHelpFormatLB		( this, CUI_RES( LB_HELPFORMAT ) ),
+    aFileDlgFL			( this, CUI_RES( FL_FILEDLG ) ),
     aFileDlgROImage     ( this, CUI_RES( FI_FILEDLG_RO ) ),
-    aFileDlgCB          ( this, CUI_RES( CB_FILEDLG ) ),
-    aODMADlgCB          ( this, CUI_RES( CB_ODMADLG ) ),
-    aPrintDlgFL         ( this, CUI_RES( FL_PRINTDLG ) ),
-    aPrintDlgCB         ( this, CUI_RES( CB_PRINTDLG ) ),
-    aDocStatusFL        ( this, CUI_RES( FL_DOCSTATUS ) ),
-    aDocStatusCB        ( this, CUI_RES( CB_DOCSTATUS ) ),
+    aFileDlgCB			( this, CUI_RES( CB_FILEDLG ) ),
+    aODMADlgCB			( this, CUI_RES( CB_ODMADLG ) ),
+    aPrintDlgFL			( this, CUI_RES( FL_PRINTDLG ) ),
+    aPrintDlgCB			( this, CUI_RES( CB_PRINTDLG ) ),
+    aDocStatusFL		( this, CUI_RES( FL_DOCSTATUS ) ),
+    aDocStatusCB		( this, CUI_RES( CB_DOCSTATUS ) ),
     aSaveAlwaysCB       ( this, CUI_RES( CB_SAVE_ALWAYS ) ),
-    aTwoFigureFL        ( this, CUI_RES( FL_TWOFIGURE ) ),
-    aInterpretFT        ( this, CUI_RES( FT_INTERPRET ) ),
-    aYearValueField     ( this, CUI_RES( NF_YEARVALUE ) ),
-    aToYearFT           ( this, CUI_RES( FT_TOYEAR ) ),
+    aTwoFigureFL		( this, CUI_RES( FL_TWOFIGURE ) ),
+    aInterpretFT		( this, CUI_RES( FT_INTERPRET ) ),
+    aYearValueField		( this, CUI_RES( NF_YEARVALUE ) ),
+    aToYearFT			( this, CUI_RES( FT_TOYEAR ) ),
     aExperimentalCB     ( this, CUI_RES( CB_EXPERIMENTAL ) )
 {
     FreeResource();
@@ -373,7 +373,7 @@ OfaMiscTabPage::~OfaMiscTabPage()
 
 // -----------------------------------------------------------------------
 
-SfxTabPage* OfaMiscTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage*	OfaMiscTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
 {
     return new OfaMiscTabPage( pParent, rAttrSet );
 }
@@ -740,12 +740,12 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) :
     aIconSizeStyleFT    ( this, CUI_RES( FT_ICONSIZESTYLE ) ),
     aIconSizeLB              ( this, CUI_RES( LB_ICONSIZE ) ),
     aIconStyleLB        ( this, CUI_RES( LB_ICONSTYLE ) ),
-    m_aSystemFont               (this, CUI_RES( CB_SYSTEM_FONT ) ),
+    m_aSystemFont				(this, CUI_RES( CB_SYSTEM_FONT ) ),
 #if defined( UNX )
-    aFontAntiAliasing   ( this, CUI_RES( CB_FONTANTIALIASING )),
-    aAAPointLimitLabel  ( this, CUI_RES( FT_POINTLIMIT_LABEL )),
-    aAAPointLimit       ( this, CUI_RES( NF_AA_POINTLIMIT )),
-    aAAPointLimitUnits  ( this, CUI_RES( FT_POINTLIMIT_UNIT )),
+    aFontAntiAliasing	( this, CUI_RES( CB_FONTANTIALIASING )),
+    aAAPointLimitLabel	( this, CUI_RES( FT_POINTLIMIT_LABEL )),
+    aAAPointLimit		( this, CUI_RES( NF_AA_POINTLIMIT )),
+    aAAPointLimitUnits	( this, CUI_RES( FT_POINTLIMIT_UNIT )),
 #endif
     aMenuFL             ( this, CUI_RES( FL_MENU ) ),
     aMenuIconsFT        ( this, CUI_RES( FT_MENU_ICONS )),
@@ -755,7 +755,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) :
     aFontHistoryCB      ( this, CUI_RES( CB_FONT_HISTORY ) ),
     aRenderingFL        ( this, CUI_RES( FL_RENDERING ) ),
     aUseHardwareAccell  ( this, CUI_RES( CB_USE_HARDACCELL ) ),
-    aUseAntiAliase      ( this, CUI_RES( CB_USE_ANTIALIASE ) ),
+    aUseAntiAliase		( this, CUI_RES( CB_USE_ANTIALIASE ) ),
     aMouseFL            ( this, CUI_RES( FL_MOUSE ) ),
     aMousePosFT         ( this, CUI_RES( FT_MOUSEPOS ) ),
     aMousePosLB         ( this, CUI_RES( LB_MOUSEPOS ) ),
@@ -786,7 +786,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) :
     sLabel.EraseAllChars('~');
 
     sal_Int32 nLabelWidth = aAAPointLimitLabel.GetTextWidth( sLabel );
-    nLabelWidth += 3;   // small gap
+    nLabelWidth += 3;	// small gap
     // pixels to move both controls to the left
     Size aSize = aAAPointLimitLabel.GetSizePixel();
     sal_Int32 nMoveLeft = aSize.Width() - nLabelWidth;
@@ -815,7 +815,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) :
     };
 
     // temporaryly create the checkbox for the anti aliasing (we need to to determine it's pos)
-    CheckBox* pFontAntiAliasing = new CheckBox( this, CUI_RES( CB_FONTANTIALIASING ) );
+    CheckBox* pFontAntiAliasing	= new CheckBox( this, CUI_RES( CB_FONTANTIALIASING ) );
     sal_Int32 nMoveUp = aMenuFL.GetPosPixel().Y() - pFontAntiAliasing->GetPosPixel().Y();
     DELETEZ( pFontAntiAliasing );
 
@@ -922,7 +922,7 @@ IMPL_LINK( OfaViewTabPage, OnSelectionToggled, void*, NOTINTERESTEDIN )
 
 --------------------------------------------------*/
 
-SfxTabPage* OfaViewTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage*	OfaViewTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
 {
     return new OfaViewTabPage(pParent, rAttrSet);
 }
@@ -1088,7 +1088,7 @@ BOOL OfaViewTabPage::FillItemSet( SfxItemSet& )
         }
     }
 
-    SvtAccessibilityOptions     aAccessibilityOptions;
+    SvtAccessibilityOptions 	aAccessibilityOptions;
     if( aAccessibilityOptions.GetIsSystemFont() != m_aSystemFont.IsChecked() &&
         m_aSystemFont.IsEnabled() )
     {
@@ -1241,16 +1241,16 @@ void OfaViewTabPage::Reset( const SfxItemSet& )
  ---------------------------------------------------------------------------*/
 class LangConfigItem_Impl : public ConfigItem
 {
-    Any         aValue;
-    OUString    aPropertyName;
+    Any 		aValue;
+    OUString	aPropertyName;
 public:
     LangConfigItem_Impl(const OUString& rTree, const OUString& rProperty);
     ~LangConfigItem_Impl();
 
-    virtual void            Commit();
+    virtual void			Commit();
 
-    const Any&  GetValue() const {return aValue;}
-    void        SetValue(Any& rValue)  {aValue = rValue; SetModified();}
+    const Any& 	GetValue() const {return aValue;}
+    void 		SetValue(Any& rValue)  {aValue = rValue; SetModified();}
 };
 /* -----------------------------23.11.00 15:06--------------------------------
 
@@ -1311,7 +1311,7 @@ static Sequence< OUString > seqInstalledLanguages;
 
 OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSet ) :
     SfxTabPage( pParent, CUI_RES( OFA_TP_LANGUAGES ), rSet ),
-    aUILanguageGB(this,         CUI_RES(FL_UI_LANG      )),
+    aUILanguageGB(this, 		CUI_RES(FL_UI_LANG		)),
     aLocaleSettingFI(this,      CUI_RES(FI_LOCALESETTING)),
     aUserInterfaceFT(this,      CUI_RES(FT_USERINTERFACE)),
     aUserInterfaceLB(this,      CUI_RES(LB_USERINTERFACE)),
@@ -1322,17 +1322,17 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe
     aDecimalSeparatorCB(this,   CUI_RES(CB_DECIMALSEPARATOR)),
     aCurrencyFT( this,          CUI_RES(FT_CURRENCY       )),
     aCurrencyLB( this,          CUI_RES(LB_CURRENCY       )),
-    aLinguLanguageGB(this,      CUI_RES(FL_LINGU_LANG       )),
+    aLinguLanguageGB(this, 		CUI_RES(FL_LINGU_LANG		)),
     aWesternLanguageFI(this,    CUI_RES(FI_WEST_LANG      )),
     aWesternLanguageFT(this,    CUI_RES(FT_WEST_LANG      )),
-    aWesternLanguageLB(this,    CUI_RES(LB_WEST_LANG        )),
+    aWesternLanguageLB(this, 	CUI_RES(LB_WEST_LANG		)),
     aAsianLanguageFI(this,      CUI_RES(FI_ASIAN_LANG     )),
     aAsianLanguageFT(this,      CUI_RES(FT_ASIAN_LANG     )),
-    aAsianLanguageLB(this,      CUI_RES(LB_ASIAN_LANG       )),
+    aAsianLanguageLB(this, 		CUI_RES(LB_ASIAN_LANG		)),
     aComplexLanguageFI(this,    CUI_RES(FI_COMPLEX_LANG   )),
     aComplexLanguageFT(this,    CUI_RES(FT_COMPLEX_LANG   )),
-    aComplexLanguageLB(this,    CUI_RES(LB_COMPLEX_LANG )),
-    aCurrentDocCB(this,         CUI_RES(CB_CURRENT_DOC  )),
+    aComplexLanguageLB(this, 	CUI_RES(LB_COMPLEX_LANG	)),
+    aCurrentDocCB(this, 		CUI_RES(CB_CURRENT_DOC	)),
     aEnhancedFL(this,           CUI_RES(FL_ENHANCED    )),
     aAsianSupportFI(this,       CUI_RES(FI_ASIANSUPPORT   )),
     aAsianSupportCB(this,       CUI_RES(CB_ASIANSUPPORT   )),
@@ -1476,7 +1476,7 @@ OfaLanguagesTabPage::~OfaLanguagesTabPage()
 /*-- 23.11.00 13:06:40---------------------------------------------------
 
   -----------------------------------------------------------------------*/
-SfxTabPage* OfaLanguagesTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage*	OfaLanguagesTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
 {
     return new OfaLanguagesTabPage(pParent, rAttrSet);
 }
@@ -1959,7 +1959,7 @@ namespace
         else
             _rCB.Check( _bOldValue );
 // #i15082# do not call SaveValue() in running dialog...
-//      _rCB.SaveValue();
+//		_rCB.SaveValue();
         _rCB.Enable( !_bNewValue );
     }
 }
diff --git a/cui/source/options/optgdlg.hrc b/cui/source/options/optgdlg.hrc
index 5e54e0bfafe7..4247de3e77ac 100644
--- a/cui/source/options/optgdlg.hrc
+++ b/cui/source/options/optgdlg.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,51 +32,51 @@
 
 #define ENABLE_HELP_FORMATTING 0
 
-#define WHOLE_WIDTH             248
-#define EDIT_WIDTH              30
-#define UNIT_WIDTH              40
-
-#define COLSPACE                RSC_SP_CTRL_DESC_X
-#define COL0                    6
-#define COL1                    (COL0+6)
-#define COL2                    (COL1+10)
-#define COL3                    (COL2+100)
-#define COL4                    (COL3+COLSPACE)
-#define COL5                    (COL4+EDIT_WIDTH)
-#define COL6                    (COL5+COLSPACE)
-
-#define ROWSPACE                RSC_SP_CTRL_DESC_Y
-#define ROW0                    3
-#define ROW1                    (ROW0 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
+#define WHOLE_WIDTH				248
+#define EDIT_WIDTH				30
+#define UNIT_WIDTH				40
+
+#define COLSPACE				RSC_SP_CTRL_DESC_X
+#define COL0					6
+#define COL1					(COL0+6)
+#define COL2					(COL1+10)
+#define COL3					(COL2+100)
+#define COL4					(COL3+COLSPACE)
+#define COL5					(COL4+EDIT_WIDTH)
+#define COL6					(COL5+COLSPACE)
+
+#define ROWSPACE				RSC_SP_CTRL_DESC_Y
+#define ROW0					3
+#define ROW1					(ROW0 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
 #if ENABLE_HELP_FORMATTING
-#define ROW2                    (ROW1 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
+#define ROW2					(ROW1 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
 #else
-#define ROW2                    (ROW1)
+#define ROW2					(ROW1)
 #endif
-#define ROW3                    (ROW2 +RSC_CD_DROPDOWN_HEIGHT+ROWSPACE)
-#define ROW4                    (ROW3 +RSC_CD_PUSHBUTTON_HEIGHT+ROWSPACE)
-#define ROW5                    (ROW4 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
-#define ROW6                    (ROW5 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
-#define ROW7                    (ROW6 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
-#define ROW8                    (ROW7 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
-#define ROW9                    (ROW8 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
-#define ROW10                   (ROW9 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
-#define ROW11                   (ROW10+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
-#define ROW12                   (ROW11+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
-#define ROW13                   (ROW12+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
-#define ROW14                   (ROW13+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
-#define ROW15                   (ROW14+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
-
-#define DIFF(v1,v2)                     (v2-v1)
-#define OFFS_TEXTBOX_FIXEDTEXT(base)    (base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)
-//#define OFFS_PUSHBUTTON_FIXEDTEXT(base)   (base+(RSC_CD_PUSHBUTTON_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)
+#define ROW3					(ROW2 +RSC_CD_DROPDOWN_HEIGHT+ROWSPACE)
+#define ROW4					(ROW3 +RSC_CD_PUSHBUTTON_HEIGHT+ROWSPACE)
+#define ROW5					(ROW4 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
+#define ROW6					(ROW5 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
+#define ROW7 					(ROW6 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
+#define ROW8    				(ROW7 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
+#define ROW9    				(ROW8 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
+#define ROW10   				(ROW9 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
+#define ROW11					(ROW10+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
+#define ROW12					(ROW11+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
+#define ROW13					(ROW12+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
+#define ROW14					(ROW13+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
+#define ROW15					(ROW14+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
+
+#define DIFF(v1,v2)						(v2-v1)
+#define OFFS_TEXTBOX_FIXEDTEXT(base)	(base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)
+//#define OFFS_PUSHBUTTON_FIXEDTEXT(base)	(base+(RSC_CD_PUSHBUTTON_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)
 
 #define ROW_MF_SCALING          (13)
 #define ROW_FT_ICONSIZESTYLE    (ROW_MF_SCALING+RSC_CD_DROPDOWN_HEIGHT+ROWSPACE)
 #define ROW_LB_ICONSIZESTYLE    (ROW_FT_ICONSIZESTYLE+RSC_CD_FIXEDTEXT_HEIGHT+ROWSPACE)
 #define ROW_CB_SYSTEM_FONT      (ROW_LB_ICONSIZESTYLE+RSC_CD_DROPDOWN_HEIGHT+ROWSPACE)
 #define ROW_CB_FONTANTIALIASING (ROW_CB_SYSTEM_FONT+ (2 * RSC_CD_FIXEDLINE_HEIGHT) +ROWSPACE)
-#define ROW_NF_AA_POINTLIMIT    (ROW_CB_FONTANTIALIASING+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
+#define ROW_NF_AA_POINTLIMIT	(ROW_CB_FONTANTIALIASING+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
 
 #define ROW_FL_MENU             (ROW_NF_AA_POINTLIMIT+RSC_CD_DROPDOWN_HEIGHT+RSC_SP_FLGR_SPACE_X)
 #define ROW_FT_MENU_ICONS       (ROW_FL_MENU + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE)
@@ -99,20 +99,20 @@
 #define ROW_LB_MOUSEMIDDLE      (ROW_FT_MOUSEMIDDLE + RSC_CD_FIXEDTEXT_HEIGHT + ROWSPACE)
 
 // #i97672#
-#define ROW_FL_SELECTION        (ROW_LB_MOUSEMIDDLE + RSC_CD_DROPDOWN_HEIGHT + RSC_SP_FLGR_SPACE_X)
+#define ROW_FL_SELECTION		(ROW_LB_MOUSEMIDDLE + RSC_CD_DROPDOWN_HEIGHT + RSC_SP_FLGR_SPACE_X)
 #define ROW_CB_SELECTION        (ROW_FL_SELECTION + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE)
 
 // tabpage general -------------------------------------------------------
 
-#define FL_HELP                     10
-#define CB_TOOLTIP                  11
-#define CB_EXTHELP                  12
-#define CB_HELPAGENT                13
-#define PB_HELPAGENT_RESET          14
-#define FT_HELPFORMAT               15
-#define LB_HELPFORMAT               16
-#define FT_EXPERIMENTAL             17
-#define CB_EXPERIMENTAL             18
+#define FL_HELP						10
+#define CB_TOOLTIP					11
+#define CB_EXTHELP					12
+#define CB_HELPAGENT				13
+#define PB_HELPAGENT_RESET			14
+#define FT_HELPFORMAT				15
+#define LB_HELPFORMAT				16
+#define FT_EXPERIMENTAL				17
+#define CB_EXPERIMENTAL				18
 
 //#define FL_FILEDLG                 20
 //#define CB_FILEDLG                 21
@@ -120,70 +120,70 @@
 //#define FL_DOCSTATUS               30
 //#define CB_DOCSTATUS               31
 
-#define FL_TWOFIGURE                40
-#define FT_INTERPRET                41
-#define NF_YEARVALUE                42
-#define FT_TOYEAR                   43
+#define FL_TWOFIGURE				40
+#define FT_INTERPRET				41
+#define NF_YEARVALUE				42
+#define FT_TOYEAR					43
 #define FL_PRINTDLG                 44
 #define CB_PRINTDLG                 45
 
 // tabpage view ----------------------------------------------------------
 // #i95644# 10 .. 14 freed, may be reused
 
-#define FL_USERINTERFACE            20
-#define FT_WINDOWSIZE               21
-#define MF_WINDOWSIZE               22
+#define FL_USERINTERFACE			20
+#define FT_WINDOWSIZE				21
+#define MF_WINDOWSIZE				22
 
-#define FL_MOUSE                    30
-#define LB_MOUSEPOS                 31
-#define FT_MOUSEPOS                 32
-#define FT_MOUSEMIDDLE              33
-#define LB_MOUSEMIDDLE              34
+#define FL_MOUSE					30
+#define LB_MOUSEPOS					31
+#define FT_MOUSEPOS					32
+#define FT_MOUSEMIDDLE				33
+#define LB_MOUSEMIDDLE				34
 
-#define FT_MENU_ICONS               40
-#define LB_MENU_ICONS               41
-#define FL_MENU                     42
-#define FL_FONTLISTS                43
+#define FT_MENU_ICONS				40
+#define LB_MENU_ICONS				41
+#define FL_MENU						42
+#define FL_FONTLISTS				43
 
-#define LB_ICONSIZE                 54
-#define FT_ICONSIZESTYLE            55
-#define LB_ICONSTYLE                56
-#define CB_SYSTEM_FONT              57
-#define STR_ICONSIZE                58
+#define LB_ICONSIZE					54
+#define FT_ICONSIZESTYLE			55
+#define LB_ICONSTYLE				56
+#define CB_SYSTEM_FONT				57
+#define STR_ICONSIZE		        58
 
-#define CB_FONT_SHOW                60
-#define CB_FONT_HISTORY             62
+#define CB_FONT_SHOW				60
+#define CB_FONT_HISTORY				62
 
-#define CB_FONTANTIALIASING         63
-#define NF_AA_POINTLIMIT            64
-#define FT_POINTLIMIT_LABEL         65
-#define FT_POINTLIMIT_UNIT          66
+#define CB_FONTANTIALIASING			63
+#define NF_AA_POINTLIMIT			64
+#define FT_POINTLIMIT_LABEL			65
+#define FT_POINTLIMIT_UNIT			66
 
 #define FL_RENDERING                67
 #define CB_USE_HARDACCELL           68
-#define CB_USE_ANTIALIASE           69
+#define CB_USE_ANTIALIASE			69
 
 // #i97672#
-#define FL_SELECTION                70
-#define CB_SELECTION                71
-#define MF_SELECTION                72
+#define FL_SELECTION				70
+#define CB_SELECTION				71
+#define MF_SELECTION				72
 
 // tabpage languages -----------------------------------------------------
 
-#define FL_UI_LANG              1
+#define FL_UI_LANG		   		1
 #define FT_UI_LANG              2
 #define LB_UI_LANG              3
-#define FL_LINGU_LANG           4
-#define FT_WEST_LANG            5
-#define LB_WEST_LANG            6
-#define FT_ASIAN_LANG           7
-#define LB_ASIAN_LANG           8
+#define FL_LINGU_LANG		    4
+#define FT_WEST_LANG		    5
+#define LB_WEST_LANG		    6
+#define FT_ASIAN_LANG		    7
+#define LB_ASIAN_LANG		    8
 #define FT_COMPLEX_LANG         9
 #define LB_COMPLEX_LANG         10
-#define CB_CURRENT_DOC          11
+#define CB_CURRENT_DOC	        11
 #define FL_ENHANCED             12
 #define CB_ASIANSUPPORT         13
-#define CB_CTLSUPPORT           15
+#define CB_CTLSUPPORT         	15
 #define FT_LOCALESETTING        16
 #define LB_LOCALESETTING        17
 #define FT_CURRENCY             18
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 72402ce7f7ed..013a454865af 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 OfaMiscTabPage : public SfxTabPage
     using TabPage::DeactivatePage;
 private:
     FixedLine           aHelpFL;
-    CheckBox            aToolTipsCB;
+    CheckBox			aToolTipsCB;
     CheckBox            aExtHelpCB;
     CheckBox            aHelpAgentCB;
     PushButton          aHelpAgentResetBtn;
@@ -89,10 +89,10 @@ public:
     OfaMiscTabPage( Window* pParent, const SfxItemSet& rSet );
     ~OfaMiscTabPage();
 
-    static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
+    static SfxTabPage*	Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	void 		Reset( const SfxItemSet& rSet );
 };
 
 // class OfaViewTabPage --------------------------------------------------
@@ -107,13 +107,13 @@ private:
     FixedText       aIconSizeStyleFT;
     ListBox         aIconSizeLB;
     ListBox         aIconStyleLB;
-    CheckBox        m_aSystemFont;
+    CheckBox   		m_aSystemFont;
 
 #if defined( UNX )
-    CheckBox        aFontAntiAliasing;
-    FixedText       aAAPointLimitLabel;
-    NumericField    aAAPointLimit;
-    FixedText       aAAPointLimitUnits;
+    CheckBox		aFontAntiAliasing;
+    FixedText		aAAPointLimitLabel;
+    NumericField	aAAPointLimit;
+    FixedText		aAAPointLimitUnits;
 #endif
 
     FixedLine       aMenuFL;
@@ -121,34 +121,34 @@ private:
     ListBox         aMenuIconsLB;
 
     FixedLine       aFontListsFL;
-    CheckBox        aFontShowCB;
+    CheckBox		aFontShowCB;
     CheckBox        aFontHistoryCB;
 
     FixedLine       aRenderingFL;
     CheckBox        aUseHardwareAccell;
     CheckBox        aUseAntiAliase;
 
-    FixedLine       aMouseFL;
-    FixedText       aMousePosFT;
-    ListBox         aMousePosLB;
-    FixedText       aMouseMiddleFT;
-    ListBox         aMouseMiddleLB;
+    FixedLine		aMouseFL;
+    FixedText		aMousePosFT;
+    ListBox			aMousePosLB;
+    FixedText		aMouseMiddleFT;
+    ListBox			aMouseMiddleLB;
 
     // #i97672#
     FixedLine       maSelectionFL;
     CheckBox        maSelectionCB;
     MetricField     maSelectionMF;
 
-    UINT16          nSizeLB_InitialSelection;
-    UINT16          nStyleLB_InitialSelection;
-    BOOL            bSfxSymbolsAuto;
+    UINT16			nSizeLB_InitialSelection;
+    UINT16			nStyleLB_InitialSelection;
+    BOOL			bSfxSymbolsAuto;
 
     // item ID for the given icon theme
     // might be zero when the theme is not installed and the item is removed
-    ULONG           aIconStyleItemId[STYLE_SYMBOLS_THEMES_MAX];
-    SvtTabAppearanceCfg*    pAppearanceCfg;
-    CanvasSettings*         pCanvasSettings;
-    SvtOptionsDrawinglayer* mpDrawinglayerOpt;
+    ULONG			aIconStyleItemId[STYLE_SYMBOLS_THEMES_MAX];
+    SvtTabAppearanceCfg*	pAppearanceCfg;
+    CanvasSettings*			pCanvasSettings;
+    SvtOptionsDrawinglayer*	mpDrawinglayerOpt;
 
 #if defined( UNX )
     DECL_LINK( OnAntialiasingToggled, void* );
@@ -160,10 +160,10 @@ public:
     OfaViewTabPage( Window* pParent, const SfxItemSet& rSet );
     ~OfaViewTabPage();
 
-    static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
+    static SfxTabPage*	Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	void 		Reset( const SfxItemSet& rSet );
 };
 /* -----------------------------23.11.00 13:04--------------------------------
 
@@ -185,14 +185,14 @@ class OfaLanguagesTabPage : public SfxTabPage
 
     FixedLine       aLinguLanguageGB;
     ReadOnlyImage   aWesternLanguageFI;
-    FixedText       aWesternLanguageFT;
-    SvxLanguageBox  aWesternLanguageLB;
+    FixedText		aWesternLanguageFT;
+    SvxLanguageBox	aWesternLanguageLB;
     ReadOnlyImage   aAsianLanguageFI;
-    FixedText       aAsianLanguageFT;
-    SvxLanguageBox  aAsianLanguageLB;
+    FixedText		aAsianLanguageFT;
+    SvxLanguageBox	aAsianLanguageLB;
     ReadOnlyImage   aComplexLanguageFI;
-    FixedText       aComplexLanguageFT;
-    SvxLanguageBox  aComplexLanguageLB;
+    FixedText		aComplexLanguageFT;
+    SvxLanguageBox	aComplexLanguageLB;
     CheckBox        aCurrentDocCB;
     FixedLine       aEnhancedFL;
     ReadOnlyImage   aAsianSupportFI;
@@ -203,7 +203,7 @@ class OfaLanguagesTabPage : public SfxTabPage
     const String    sDecimalSeparatorLabel;
 
     sal_Bool        m_bOldAsian;
-    sal_Bool        m_bOldCtl;
+    sal_Bool		m_bOldCtl;
     LanguageConfig_Impl*    pLangConfig;
 
     rtl::OUString m_sUserLocaleValue;
@@ -215,10 +215,10 @@ public:
     OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSet );
     ~OfaLanguagesTabPage();
 
-    static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
+    static SfxTabPage*	Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	void 		Reset( const SfxItemSet& rSet );
 };
 #endif // #ifndef _OFA_OPTGDLG_HXX
 
diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src
index 1d5971ccad32..f2aff1885d39 100644
--- a/cui/source/options/optgdlg.src
+++ b/cui/source/options/optgdlg.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index c5901e3d007c..5105fe03c9b2 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,20 +53,20 @@
 
 struct GeneralTabPage_Impl
 {
-    BOOL    mbStreetEnabled;
-    BOOL    mbPLZEnabled;
-    BOOL    mbCityEnabled;
-    BOOL    mbUsCityEnabled;
-    BOOL    mbUsZipEnabled;
+    BOOL	mbStreetEnabled;
+    BOOL	mbPLZEnabled;
+    BOOL	mbCityEnabled;
+    BOOL	mbUsCityEnabled;
+    BOOL	mbUsZipEnabled;
 
-    String  maQueryStr;
+    String	maQueryStr;
 
     GeneralTabPage_Impl() :
-        mbStreetEnabled ( FALSE ),
-        mbPLZEnabled    ( FALSE ),
-        mbCityEnabled   ( FALSE ),
-        mbUsCityEnabled ( FALSE ),
-        mbUsZipEnabled  ( FALSE ) {}
+        mbStreetEnabled	( FALSE ),
+        mbPLZEnabled	( FALSE ),
+        mbCityEnabled	( FALSE ),
+        mbUsCityEnabled	( FALSE ),
+        mbUsZipEnabled	( FALSE ) {}
 };
 
 // -----------------------------------------------------------------------
@@ -94,7 +94,7 @@ SvxGeneralTabPage::SvxGeneralTabPage( Window* pParent, const SfxItemSet& rCoreSe
 
     SfxTabPage( pParent, CUI_RES(RID_SFXPAGE_GENERAL), rCoreSet ),
 
-    aAddrFrm        ( this, CUI_RES( GB_ADDRESS ) ),
+    aAddrFrm		( this, CUI_RES( GB_ADDRESS ) ),
     aCompanyLbl     ( this, CUI_RES( FT_COMPANY ), true ),
     aCompanyEdit    ( this, CUI_RES( ED_COMPANY ), INDEX_NOTSET, &aCompanyLbl ),
     aNameLbl        ( this, CUI_RES( FT_NAME ), true ),
@@ -125,8 +125,8 @@ SvxGeneralTabPage::SvxGeneralTabPage( Window* pParent, const SfxItemSet& rCoreSe
     aFaxMailLbl     ( this, CUI_RES( FT_FAXMAIL ), true ),
     aFaxEdit        ( this, CUI_RES( ED_FAX ), 0, &aFaxMailLbl ),
     aEmailEdit      ( this, CUI_RES( ED_EMAIL ), 1, &aFaxMailLbl ),
-    aUseDataCB      ( this, CUI_RES( CB_USEDATA ) ),
-    pImpl           ( new GeneralTabPage_Impl )
+    aUseDataCB		( this, CUI_RES( CB_USEDATA ) ),
+    pImpl			( new GeneralTabPage_Impl )
 
 {
     LanguageType eLang = Application::GetSettings().GetUILanguage();
@@ -257,7 +257,7 @@ SvxGeneralTabPage::~SvxGeneralTabPage()
 
 //------------------------------------------------------------------------
 
-SfxTabPage* SvxGeneralTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage*	SvxGeneralTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
 {
     return ( new SvxGeneralTabPage( pParent, rAttrSet ) );
 }
@@ -309,11 +309,11 @@ void SvxGeneralTabPage::Reset( const SfxItemSet& rSet )
 
         switch ( nField )
         {
-            case COMPANY_EDIT:      aCompanyEdit.GrabFocus(); break;
+            case COMPANY_EDIT:		aCompanyEdit.GrabFocus(); break;
             case FIRSTNAME_EDIT:    aFirstName.GrabFocus(); break;
-            case LASTNAME_EDIT:     aName.GrabFocus(); break;
-            case STREET_EDIT:       aStreetEdit.GrabFocus(); break;
-            case COUNTRY_EDIT:      aCountryEdit.GrabFocus(); break;
+            case LASTNAME_EDIT:		aName.GrabFocus(); break;
+            case STREET_EDIT:		aStreetEdit.GrabFocus(); break;
+            case COUNTRY_EDIT:		aCountryEdit.GrabFocus(); break;
             case PLZ_EDIT:
                 if ( aPLZEdit.IsVisible() )
                     aPLZEdit.GrabFocus();
@@ -332,14 +332,14 @@ void SvxGeneralTabPage::Reset( const SfxItemSet& rSet )
                 else
                     aCityEdit.GrabFocus();
                 break;
-            case TITLE_EDIT:        aTitleEdit.GrabFocus(); break;
-            case POSITION_EDIT:     aPositionEdit.GrabFocus(); break;
-            case SHORTNAME_EDIT:    aShortName.GrabFocus(); break;
-            case TELPRIV_EDIT:      aTelPrivEdit.GrabFocus(); break;
-            case TELCOMPANY_EDIT:   aTelCompanyEdit.GrabFocus(); break;
-            case FAX_EDIT:          aFaxEdit.GrabFocus(); break;
-            case EMAIL_EDIT:        aEmailEdit.GrabFocus(); break;
-            default:                aCompanyEdit.GrabFocus();
+            case TITLE_EDIT:		aTitleEdit.GrabFocus(); break;
+            case POSITION_EDIT:		aPositionEdit.GrabFocus(); break;
+            case SHORTNAME_EDIT:	aShortName.GrabFocus(); break;
+            case TELPRIV_EDIT:		aTelPrivEdit.GrabFocus(); break;
+            case TELCOMPANY_EDIT:	aTelCompanyEdit.GrabFocus(); break;
+            case FAX_EDIT:			aFaxEdit.GrabFocus(); break;
+            case EMAIL_EDIT:		aEmailEdit.GrabFocus(); break;
+            default:				aCompanyEdit.GrabFocus();
         }
     }
 
diff --git a/cui/source/options/optgenrl.hrc b/cui/source/options/optgenrl.hrc
index ed4afd2e803d..444c11291f03 100644
--- a/cui/source/options/optgenrl.hrc
+++ b/cui/source/options/optgenrl.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,54 +29,54 @@
 
 // defines ------------------------------------------------------------------
 
-#define FT_COMPANY      10
-#define ED_COMPANY      11
-#define FT_NAME         12
-#define FT_NAME_RUSS    13
-#define ED_FATHERNAME   14
-#define ED_FIRSTNAME    15
-#define ED_NAME         16
-#define ED_SHORTNAME    17
-#define FT_STREET       18
-#define FT_STREET_RUSS  19
-#define ED_STREET       20
-#define ED_APARTMENTNR  21
-#define FT_CITY         22
-#define ED_PLZ          23
-#define ED_CITY         24
-#define ED_US_CITY      25
-#define ED_US_STATE     26
-#define ED_US_ZIPCODE   27
-#define FT_COUNTRY      28
-#define ED_COUNTRY      29
-#define FT_TITLEPOS     30
-#define ED_TITLE        31
-#define ED_POSITION     32
-#define FT_PHONE        33
-#define ED_TELPRIVAT    34
-#define ED_TELCOMPANY   35
-#define FT_FAXMAIL      36
-#define ED_FAX          37
-#define ED_EMAIL        38
-#define GB_ADDRESS      39
-#define CB_USEDATA      40
-#define FT_NAME_EASTERN     41
+#define FT_COMPANY		10
+#define ED_COMPANY		11
+#define FT_NAME			12
+#define FT_NAME_RUSS	13
+#define ED_FATHERNAME	14
+#define ED_FIRSTNAME	15
+#define ED_NAME			16
+#define ED_SHORTNAME	17
+#define FT_STREET		18
+#define FT_STREET_RUSS	19
+#define ED_STREET		20
+#define ED_APARTMENTNR	21
+#define FT_CITY			22
+#define ED_PLZ			23
+#define ED_CITY			24
+#define ED_US_CITY		25
+#define ED_US_STATE		26
+#define ED_US_ZIPCODE	27
+#define FT_COUNTRY		28
+#define ED_COUNTRY		29
+#define FT_TITLEPOS		30
+#define ED_TITLE		31
+#define ED_POSITION		32
+#define FT_PHONE		33
+#define ED_TELPRIVAT	34
+#define ED_TELCOMPANY	35
+#define FT_FAXMAIL		36
+#define ED_FAX			37
+#define ED_EMAIL		38
+#define GB_ADDRESS		39
+#define CB_USEDATA		40
+#define FT_NAME_EASTERN		41
 
-#define STR_US_STATE    10
-#define STR_QUERY_REG   11
+#define STR_US_STATE	10
+#define STR_QUERY_REG	11
 
 // Positionierungshilfen f"ur den Dialog
 
-#define HSPACE      2
-#define VSPACE      3
-#define LINEH       12
-#define FLINEH      8
-#define LEFT        12
+#define HSPACE		2
+#define VSPACE		3
+#define LINEH		12
+#define FLINEH		8
+#define	LEFT		12
 #define MID         100
-#define RIGHT       248
-#define TOP         10
-#define LINE(y)     (14+y*15)
-#define FLINE(y)    (16+y*15)
+#define RIGHT		248
+#define TOP			10
+#define LINE(y)		(14+y*15)
+#define FLINE(y)	(16+y*15)
 #define NAMELEN     74
 
 #endif // #ifndef _SVX_OPTGENRL_HRC
diff --git a/cui/source/options/optgenrl.src b/cui/source/options/optgenrl.src
index 6f5fff55892d..fd4a0176ac24 100644
--- a/cui/source/options/optgenrl.src
+++ b/cui/source/options/optgenrl.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index c8c52f8126f9..1d3c45e65410 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,46 +48,46 @@ const USHORT aPosToExportArr[] =
     HTML_CFG_WRITER
 };
 
-//#define DEPRECATED_ENTRY  0xFFFF
+//#define DEPRECATED_ENTRY	0xFFFF
 
 const USHORT aExportToPosArr[] =
 {
-    0,  //HTML 3.2
-    1,  //MS Internet Explorer 4.0
-    3,  //StarWriter
-    2   //Netscape Navigator 4.0
+    0,	//HTML 3.2
+    1,	//MS Internet Explorer 4.0
+    3,	//StarWriter
+    2	//Netscape Navigator 4.0
 };
 // -----------------------------------------------------------------------
 
 OfaHtmlTabPage::OfaHtmlTabPage(Window* pParent, const SfxItemSet& rSet) :
         SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_HTMLOPT ), rSet ),
-    aFontSizeGB     ( this, CUI_RES( GB_FONTSIZE       ) ),
-    aSize1FT        ( this, CUI_RES( FT_SIZE1          ) ),
-    aSize1NF        ( this, CUI_RES( NF_SIZE1          ) ),
-    aSize2FT        ( this, CUI_RES( FT_SIZE2          ) ),
-    aSize2NF        ( this, CUI_RES( NF_SIZE2          ) ),
-    aSize3FT        ( this, CUI_RES( FT_SIZE3          ) ),
-    aSize3NF        ( this, CUI_RES( NF_SIZE3          ) ),
-    aSize4FT        ( this, CUI_RES( FT_SIZE4          ) ),
-    aSize4NF        ( this, CUI_RES( NF_SIZE4          ) ),
-    aSize5FT        ( this, CUI_RES( FT_SIZE5          ) ),
-    aSize5NF        ( this, CUI_RES( NF_SIZE5          ) ),
-    aSize6FT        ( this, CUI_RES( FT_SIZE6          ) ),
-    aSize6NF        ( this, CUI_RES( NF_SIZE6          ) ),
-    aSize7FT        ( this, CUI_RES( FT_SIZE7          ) ),
-    aSize7NF        ( this, CUI_RES( NF_SIZE7          ) ),
-    aImportGB       ( this, CUI_RES( GB_IMPORT     ) ),
-    aNumbersEnglishUSCB ( this, CUI_RES( CB_NUMBERS_ENGLISH_US ) ),
-    aUnknownTagCB   ( this, CUI_RES( CB_UNKNOWN_TAGS ) ),
+    aFontSizeGB		( this, CUI_RES( GB_FONTSIZE	   ) ),
+    aSize1FT        ( this, CUI_RES( FT_SIZE1	       ) ),
+    aSize1NF        ( this, CUI_RES( NF_SIZE1	       ) ),
+    aSize2FT        ( this, CUI_RES( FT_SIZE2	       ) ),
+    aSize2NF        ( this, CUI_RES( NF_SIZE2	       ) ),
+    aSize3FT        ( this, CUI_RES( FT_SIZE3	       ) ),
+    aSize3NF        ( this, CUI_RES( NF_SIZE3	       ) ),
+    aSize4FT        ( this, CUI_RES( FT_SIZE4	       ) ),
+    aSize4NF        ( this, CUI_RES( NF_SIZE4	       ) ),
+    aSize5FT        ( this, CUI_RES( FT_SIZE5	       ) ),
+    aSize5NF        ( this, CUI_RES( NF_SIZE5	       ) ),
+    aSize6FT        ( this, CUI_RES( FT_SIZE6	       ) ),
+    aSize6NF        ( this, CUI_RES( NF_SIZE6	       ) ),
+    aSize7FT        ( this, CUI_RES( FT_SIZE7	       ) ),
+    aSize7NF        ( this, CUI_RES( NF_SIZE7	       ) ),
+    aImportGB       ( this, CUI_RES( GB_IMPORT	   ) ),
+    aNumbersEnglishUSCB	( this, CUI_RES( CB_NUMBERS_ENGLISH_US ) ),
+    aUnknownTagCB	( this, CUI_RES( CB_UNKNOWN_TAGS ) ),
     aIgnoreFontNamesCB( this, CUI_RES( CB_IGNORE_FONTNAMES ) ),
-    aExportGB       ( this, CUI_RES( GB_EXPORT       ) ),
+    aExportGB		( this, CUI_RES( GB_EXPORT       ) ),
     aExportLB       ( this, CUI_RES( LB_EXPORT       ) ),
     aStarBasicCB    ( this, CUI_RES( CB_STARBASIC    ) ),
     aStarBasicWarningCB(this, CUI_RES( CB_STARBASIC_WARNING    ) ),
     aPrintExtensionCB( this,CUI_RES(CB_PRINT_EXTENSION )),
     aSaveGrfLocalCB ( this, CUI_RES( CB_LOCAL_GRF    ) ),
-    aCharSetFT      ( this, CUI_RES( FT_CHARSET      ) ),
-    aCharSetLB      ( this, CUI_RES( LB_CHARSET      ) )
+    aCharSetFT		( this, CUI_RES( FT_CHARSET      ) ),
+    aCharSetLB		( this, CUI_RES( LB_CHARSET      ) )
 
 {
     FreeResource();
@@ -126,7 +126,7 @@ OfaHtmlTabPage::~OfaHtmlTabPage()
 
 --------------------------------------------------*/
 
-SfxTabPage* OfaHtmlTabPage::Create( Window* pParent,
+SfxTabPage*	OfaHtmlTabPage::Create( Window* pParent,
                                 const SfxItemSet& rAttrSet )
 {
     return new OfaHtmlTabPage(pParent, rAttrSet);
@@ -203,10 +203,10 @@ void OfaHtmlTabPage::Reset( const SfxItemSet& )
     aIgnoreFontNamesCB.Check(pHtmlOpt->IsIgnoreFontFamily());
     USHORT nExport = pHtmlOpt->GetExportMode();
     if( nExport >= ( sizeof( aExportToPosArr ) / sizeof( USHORT ) ) )
-        nExport = 4;    // default for bad config entry is NS 4.0
+        nExport = 4;	// default for bad config entry is NS 4.0
     USHORT nPosArr = aExportToPosArr[ nExport ];
-//  if( nPosArr == DEPRECATED_ENTRY )
-//      nPosArr = aExportToPosArr[ 4 ];     // again: NS 4.0 is default
+//	if( nPosArr == DEPRECATED_ENTRY )
+//		nPosArr = aExportToPosArr[ 4 ];		// again: NS 4.0 is default
     aExportLB.SelectEntryPos( nPosArr );
     aExportLB.SaveValue();
 
diff --git a/cui/source/options/opthtml.hrc b/cui/source/options/opthtml.hrc
index 480bffb10b07..dd01f9b122bf 100644
--- a/cui/source/options/opthtml.hrc
+++ b/cui/source/options/opthtml.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 // defines ------------------------------------------------------------------
 
-#define GB_FONTSIZE             1
-#define FT_SIZE1                2
-#define NF_SIZE1                3
-#define FT_SIZE2                4
-#define NF_SIZE2                5
-#define FT_SIZE3                6
-#define NF_SIZE3                7
-#define FT_SIZE4                8
-#define NF_SIZE4                9
-#define FT_SIZE5                10
-#define NF_SIZE5                11
-#define FT_SIZE6                12
-#define NF_SIZE6                13
-#define FT_SIZE7                14
-#define NF_SIZE7                15
-#define GB_IMPORT               20
-#define CB_UNKNOWN_TAGS         21
-#define CB_IGNORE_FONTNAMES     22
+#define GB_FONTSIZE				1
+#define FT_SIZE1				2
+#define NF_SIZE1				3
+#define FT_SIZE2				4
+#define NF_SIZE2				5
+#define FT_SIZE3				6
+#define NF_SIZE3				7
+#define FT_SIZE4				8
+#define NF_SIZE4				9
+#define FT_SIZE5				10
+#define NF_SIZE5				11
+#define FT_SIZE6				12
+#define NF_SIZE6				13
+#define FT_SIZE7				14
+#define NF_SIZE7				15
+#define GB_IMPORT				20
+#define CB_UNKNOWN_TAGS			21
+#define CB_IGNORE_FONTNAMES		22
 #define CB_NUMBERS_ENGLISH_US   23
 
-#define GB_EXPORT               30
-#define CB_STARBASIC            31
-#define CB_STARBASIC_WARNING    32
+#define GB_EXPORT				30
+#define CB_STARBASIC			31
+#define CB_STARBASIC_WARNING	32
 
-#define CB_LOCAL_GRF            37
-#define CB_PRINT_EXTENSION      38
-#define LB_EXPORT               39
-#define FT_CHARSET              40
-#define LB_CHARSET              41
+#define CB_LOCAL_GRF			37
+#define CB_PRINT_EXTENSION		38
+#define LB_EXPORT				39
+#define FT_CHARSET 		   		40
+#define LB_CHARSET				41
 
 #endif
 
diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx
index 7785398741d8..e1f76bebf83b 100644
--- a/cui/source/options/opthtml.hxx
+++ b/cui/source/options/opthtml.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,33 +39,33 @@
 class OfaHtmlTabPage : public SfxTabPage
 {
     FixedLine       aFontSizeGB;
-    FixedText       aSize1FT;
+    FixedText		aSize1FT;
     NumericField    aSize1NF;
-    FixedText       aSize2FT;
+    FixedText		aSize2FT;
     NumericField    aSize2NF;
-    FixedText       aSize3FT;
+    FixedText		aSize3FT;
     NumericField    aSize3NF;
-    FixedText       aSize4FT;
+    FixedText		aSize4FT;
     NumericField    aSize4NF;
-    FixedText       aSize5FT;
+    FixedText		aSize5FT;
     NumericField    aSize5NF;
-    FixedText       aSize6FT;
+    FixedText		aSize6FT;
     NumericField    aSize6NF;
-    FixedText       aSize7FT;
+    FixedText		aSize7FT;
     NumericField    aSize7NF;
 
     FixedLine       aImportGB;
     CheckBox        aNumbersEnglishUSCB;
-    CheckBox        aUnknownTagCB;
-    CheckBox        aIgnoreFontNamesCB;
+    CheckBox		aUnknownTagCB;
+    CheckBox		aIgnoreFontNamesCB;
 
     FixedLine       aExportGB;
-    ListBox         aExportLB;
-    CheckBox        aStarBasicCB;
-    CheckBox        aStarBasicWarningCB;
-    CheckBox        aPrintExtensionCB;
-    CheckBox        aSaveGrfLocalCB;
-    FixedText       aCharSetFT;
+    ListBox			aExportLB;
+    CheckBox		aStarBasicCB;
+    CheckBox		aStarBasicWarningCB;
+    CheckBox		aPrintExtensionCB;
+    CheckBox		aSaveGrfLocalCB;
+    FixedText		aCharSetFT;
     SvxTextEncodingBox aCharSetLB;
 
     DECL_LINK(ExportHdl_Impl, ListBox*);
@@ -75,11 +75,11 @@ class OfaHtmlTabPage : public SfxTabPage
     virtual ~OfaHtmlTabPage();
 public:
 
-    static SfxTabPage*  Create( Window* pParent,
+    static SfxTabPage*	Create( Window* pParent,
                                 const SfxItemSet& rAttrSet );
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	void 		Reset( const SfxItemSet& rSet );
 
 };
 
diff --git a/cui/source/options/opthtml.src b/cui/source/options/opthtml.src
index 60db286b192d..715be82d2c8e 100644
--- a/cui/source/options/opthtml.src
+++ b/cui/source/options/opthtml.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
  // RID_OFAPAGE_HTMLOPT -----------------------------------------------------
 TabPage RID_OFAPAGE_HTMLOPT
 {
-     // HelpId = ;
+     //	HelpId = ;
     OutputSize = TRUE ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
     SVLook = TRUE ;
diff --git a/cui/source/options/optimprove.cxx b/cui/source/options/optimprove.cxx
index 5c1aefd3eb1b..4feabdd51221 100644
--- a/cui/source/options/optimprove.cxx
+++ b/cui/source/options/optimprove.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/options/optimprove.hrc b/cui/source/options/optimprove.hrc
index 024e5d5aae4a..c7f191fe0d69 100644
--- a/cui/source/options/optimprove.hrc
+++ b/cui/source/options/optimprove.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/options/optimprove.src b/cui/source/options/optimprove.src
index c389b38cddfa..5012f55cc43f 100644
--- a/cui/source/options/optimprove.src
+++ b/cui/source/options/optimprove.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/options/optimprove2.cxx b/cui/source/options/optimprove2.cxx
index ceed7015dba6..707a37764a8e 100644
--- a/cui/source/options/optimprove2.cxx
+++ b/cui/source/options/optimprove2.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 6143c3211b18..546b3392c33e 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,25 +117,25 @@ using ::rtl::OUString;
 // different delimiter for Unix (:) and Windows (;)
 
 #ifdef UNX
-#define CLASSPATH_DELIMITER ':'
+#define CLASSPATH_DELIMITER	':'
 #else
-#define CLASSPATH_DELIMITER ';'
+#define CLASSPATH_DELIMITER	';'
 #endif
 
 // static ----------------------------------------------------------------
 
 #define C2U(cChar) OUString::createFromAscii(cChar)
 
-#define INET_SEARCH_TOKEN   '"'
-#define RET_ALL             ((short)200)
+#define INET_SEARCH_TOKEN 	'"'
+#define RET_ALL				((short)200)
 #define CFG_READONLY_DEFAULT    FALSE
 
 #include <sal/config.h>
 
 SV_IMPL_PTRARR( SfxFilterPtrArr, SfxFilterPtr )
 
-const char* SEARCHENGINE_INI    = "srcheng.ini";
-const char* SEARCHENGINE_GROUP  = "SearchEngines-$(vlang)";
+const char* SEARCHENGINE_INI	= "srcheng.ini";
+const char* SEARCHENGINE_GROUP	= "SearchEngines-$(vlang)";
 
 // -----------------------------------------------------------------------
 
@@ -220,7 +220,7 @@ void SvxNoSpaceEdit::Modify()
 /********************************************************************/
 /********************************************************************/
 /*                                                                  */
-/*  SvxProxyTabPage                                                 */
+/* 	SvxProxyTabPage                                                 */
 /*                                                                  */
 /*                                                                  */
 /********************************************************************/
@@ -233,12 +233,12 @@ SvxProxyTabPage::SvxProxyTabPage(Window* pParent, const SfxItemSet& rSet ) :
     aProxyModeFT  (this, CUI_RES(FT_PROXYMODE)),
     aProxyModeLB  (this, CUI_RES(LB_PROXYMODE)),
 
-    aHttpProxyFT      (this, CUI_RES( FT_HTTP_PROXY   )),
+    aHttpProxyFT      (this, CUI_RES( FT_HTTP_PROXY	  )),
     aHttpProxyED      (this, CUI_RES( ED_HTTP_PROXY     )),
     aHttpPortFT       (this, CUI_RES( FT_HTTP_PORT      )),
     aHttpPortED       (this, CUI_RES( ED_HTTP_PORT      ), TRUE),
 
-    aHttpsProxyFT      (this, CUI_RES( FT_HTTPS_PROXY     )),
+    aHttpsProxyFT      (this, CUI_RES( FT_HTTPS_PROXY	  )),
     aHttpsProxyED      (this, CUI_RES( ED_HTTPS_PROXY     )),
     aHttpsPortFT       (this, CUI_RES( FT_HTTPS_PORT      )),
     aHttpsPortED       (this, CUI_RES( ED_HTTPS_PORT      ), TRUE),
@@ -318,7 +318,7 @@ SvxProxyTabPage::~SvxProxyTabPage()
 
 --------------------------------------------------*/
 
-SfxTabPage* SvxProxyTabPage::Create(Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage*	SvxProxyTabPage::Create(Window* pParent, const SfxItemSet& rAttrSet )
 {
     return new SvxProxyTabPage(pParent, rAttrSet);
 }
@@ -719,7 +719,7 @@ IMPL_LINK( SvxProxyTabPage, LoseFocusHdl_Impl, Edit *, pEdit )
 /********************************************************************/
 /********************************************************************/
 /*                                                                  */
-/*  SvxSearchTabPage                                                */
+/* 	SvxSearchTabPage                                                */
 /*                                                                  */
 /*                                                                  */
 /********************************************************************/
@@ -729,28 +729,28 @@ SvxSearchTabPage::SvxSearchTabPage(Window* pParent, const SfxItemSet& rSet ) :
 
     SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_INET_SEARCH ), rSet ),
 
-    aSearchGB       ( this, CUI_RES( GB_SEARCH ) ),
-    aSearchLB       ( this, CUI_RES( LB_SEARCH ) ),
-    aSearchNameFT   ( this, CUI_RES( FT_SEARCH_NAME ) ),
-    aSearchNameED   ( this, CUI_RES( ED_SEARCH_NAME ) ),
-    aSearchFT       ( this, CUI_RES( FT_SEARCH ) ),
-    aAndRB          ( this, CUI_RES( RB_AND ) ),
-    aOrRB           ( this, CUI_RES( RB_OR ) ),
-    aExactRB        ( this, CUI_RES( RB_EXACT ) ),
-
-    aURLFT          ( this, CUI_RES( FT_URL ) ),
-    aURLED          ( this, CUI_RES( ED_URL ) ),
-
-    aPostFixFT      ( this, CUI_RES( FT_POSTFIX ) ),
-    aPostFixED      ( this, CUI_RES( ED_POSTFIX ) ),
-    aSeparatorFT    ( this, CUI_RES( FT_SEPARATOR ) ),
-    aSeparatorED    ( this, CUI_RES( ED_SEPARATOR ) ),
-    aCaseFT         ( this, CUI_RES( FT_CASE ) ),
-    aCaseED         ( this, CUI_RES( ED_CASE ) ),
-
-    aNewPB          ( this, CUI_RES( PB_NEW ) ),
-    aAddPB          ( this, CUI_RES( PB_ADD ) ),
-    aChangePB       ( this, CUI_RES( PB_CHANGE ) ),
+    aSearchGB		( this, CUI_RES( GB_SEARCH ) ),
+    aSearchLB		( this, CUI_RES( LB_SEARCH ) ),
+    aSearchNameFT	( this, CUI_RES( FT_SEARCH_NAME ) ),
+    aSearchNameED	( this, CUI_RES( ED_SEARCH_NAME ) ),
+    aSearchFT		( this, CUI_RES( FT_SEARCH ) ),
+    aAndRB			( this, CUI_RES( RB_AND ) ),
+    aOrRB			( this, CUI_RES( RB_OR ) ),
+    aExactRB		( this, CUI_RES( RB_EXACT ) ),
+
+    aURLFT			( this, CUI_RES( FT_URL ) ),
+    aURLED			( this, CUI_RES( ED_URL ) ),
+
+    aPostFixFT		( this, CUI_RES( FT_POSTFIX ) ),
+    aPostFixED		( this, CUI_RES( ED_POSTFIX ) ),
+    aSeparatorFT	( this, CUI_RES( FT_SEPARATOR ) ),
+    aSeparatorED	( this, CUI_RES( ED_SEPARATOR ) ),
+    aCaseFT			( this, CUI_RES( FT_CASE ) ),
+    aCaseED			( this, CUI_RES( ED_CASE ) ),
+
+    aNewPB			( this, CUI_RES( PB_NEW ) ),
+    aAddPB			( this, CUI_RES( PB_ADD ) ),
+    aChangePB		( this, CUI_RES( PB_CHANGE ) ),
     aDeletePB       ( this, CUI_RES( PB_DELETE ) ),
 
     sModifyMsg(CUI_RES(MSG_MODIFY))
@@ -787,7 +787,7 @@ SvxSearchTabPage::~SvxSearchTabPage()
 }
 // -----------------------------------------------------------------------
 
-SfxTabPage* SvxSearchTabPage::Create(Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage*	SvxSearchTabPage::Create(Window* pParent, const SfxItemSet& rAttrSet )
 {
     return new SvxSearchTabPage(pParent, rAttrSet);
 }
@@ -1138,7 +1138,7 @@ IMPL_LINK( SvxSearchTabPage, SearchPartHdl_Impl, RadioButton *, EMPTYARG )
 /********************************************************************/
 /********************************************************************/
 /*                                                                  */
-/*  SvxOtherTabPage                                                 */
+/* 	SvxOtherTabPage                                                 */
 /*                                                                  */
 /********************************************************************/
 /********************************************************************/
@@ -1151,8 +1151,8 @@ SvxPatternField::SvxPatternField( Window* pParent, const ResId& rResId ) :
 
     PatternField( pParent, rResId ),
 
-    sMsg233 ( ResId( ST_MSG_233 ) ),
-    sMsg255 ( ResId( ST_MSG_255 ) )
+    sMsg233	( ResId( ST_MSG_233 ) ),
+    sMsg255	( ResId( ST_MSG_255 ) )
 
 {
     FreeResource();
@@ -1226,7 +1226,7 @@ SvxPatternField::SvxPatternField( Window* pParent, const ResId& rResId ) :
 long SvxPatternField::Notify( NotifyEvent& rNEvt )
 {
     return PatternField::Notify( rNEvt );
-/*! long nHandled = 0;
+/*!	long nHandled = 0;
 
     if ( rNEvt.GetType() == EVENT_KEYUP )
     {
@@ -1243,27 +1243,27 @@ long SvxPatternField::Notify( NotifyEvent& rNEvt )
 class JavaScriptDisableQueryBox_Impl : public ModalDialog
 {
 private:
-    FixedImage      aImage;
-    FixedText       aWarningFT;
-    CheckBox        aDisableCB;
-    OKButton        aYesBtn;
-    CancelButton    aNoBtn;
+    FixedImage		aImage;
+    FixedText		aWarningFT;
+    CheckBox		aDisableCB;
+    OKButton		aYesBtn;
+    CancelButton	aNoBtn;
 
 public:
     JavaScriptDisableQueryBox_Impl( Window* pParent );
 
-    BOOL        IsWarningDisabled() const { return aDisableCB.IsChecked(); }
+    BOOL		IsWarningDisabled() const { return aDisableCB.IsChecked(); }
 };
 
 JavaScriptDisableQueryBox_Impl::JavaScriptDisableQueryBox_Impl( Window* pParent ) :
 
     ModalDialog( pParent, CUI_RES( RID_SVXDLG_OPT_JAVASCRIPT_DISABLE ) ),
 
-    aImage      ( this, CUI_RES( IMG_JSCPT_WARNING ) ),
-    aWarningFT  ( this, CUI_RES( FT_JSCPT_WARNING ) ),
-    aDisableCB  ( this, CUI_RES( CB_JSCPT_DISABLE ) ),
-    aYesBtn     ( this, CUI_RES( BTN_JSCPT_YES ) ),
-    aNoBtn      ( this, CUI_RES( BTN_JSCPT_NO ) )
+    aImage		( this, CUI_RES( IMG_JSCPT_WARNING ) ),
+    aWarningFT	( this, CUI_RES( FT_JSCPT_WARNING ) ),
+    aDisableCB	( this, CUI_RES( CB_JSCPT_DISABLE ) ),
+    aYesBtn		( this, CUI_RES( BTN_JSCPT_YES ) ),
+    aNoBtn		( this, CUI_RES( BTN_JSCPT_NO ) )
 
 {
     FreeResource();
@@ -1316,7 +1316,7 @@ void SvxScriptExecListBox::RequestHelp( const HelpEvent& rHEvt )
 /********************************************************************/
 
 SvxSecurityTabPage::SvxSecurityTabPage( Window* pParent, const SfxItemSet& rSet )
-    :SfxTabPage         ( pParent, CUI_RES( RID_SVXPAGE_INET_SECURITY ), rSet )
+    :SfxTabPage			( pParent, CUI_RES( RID_SVXPAGE_INET_SECURITY ), rSet )
 
     ,maSecurityOptionsFL( this, CUI_RES( FL_SEC_SECURITYOPTIONS ) )
     ,maSecurityOptionsFI( this, CUI_RES( FI_SEC_SECURITYOPTIONS ) )
@@ -1650,7 +1650,7 @@ namespace
 {
 /*    bool Enable( const SvtSecurityOptions& _rOpt, SvtSecurityOptions::EOption _eOpt, Control& _rCtrl, FixedImage& _rImg )
     {
-        bool    b = _rOpt.IsOptionEnabled( _eOpt );
+        bool	b = _rOpt.IsOptionEnabled( _eOpt );
         _rCtrl.Enable( b );
         _Img.Show( !b );
         return b;
@@ -1715,8 +1715,8 @@ void SvxSecurityTabPage::Reset( const SfxItemSet& )
 //added by jmeng begin
 MozPluginTabPage::MozPluginTabPage(Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_INET_MOZPLUGIN ), rSet ),
-    aMSWordGB       ( this, CUI_RES( GB_MOZPLUGIN       ) ),
-    aWBasicCodeCB   ( this, CUI_RES( CB_MOZPLUGIN_CODE ) )
+    aMSWordGB		( this, CUI_RES( GB_MOZPLUGIN	    ) ),
+    aWBasicCodeCB	( this, CUI_RES( CB_MOZPLUGIN_CODE ) )
 {
     FreeResource();
 }
@@ -1725,7 +1725,7 @@ MozPluginTabPage::~MozPluginTabPage()
 {
 }
 
-SfxTabPage* MozPluginTabPage::Create( Window* pParent,
+SfxTabPage*	MozPluginTabPage::Create( Window* pParent,
                                         const SfxItemSet& rAttrSet )
 {
     return new MozPluginTabPage( pParent, rAttrSet );
@@ -1920,7 +1920,7 @@ public:
     MailerProgramCfg_Impl();
     virtual ~MailerProgramCfg_Impl();
 
-    virtual void    Commit();
+    virtual void	Commit();
     virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames);
 };
 
@@ -2019,7 +2019,7 @@ SvxEMailTabPage::SvxEMailTabPage(Window* pParent, const SfxItemSet& rSet) :
     aMailerURLFT(this,      CUI_RES(FT_MAILERURL      )),
     aMailerURLED(this,      CUI_RES(ED_MAILERURL      )),
     aMailerURLPB(this,      CUI_RES(PB_MAILERURL      )),
-    m_sDefaultFilterName(   CUI_RES(STR_DEFAULT_FILENAME        )),
+    m_sDefaultFilterName(	CUI_RES(STR_DEFAULT_FILENAME		)),
     pImpl(new SvxEMailTabPage_Impl)
 {
     FreeResource();
diff --git a/cui/source/options/optinet2.hrc b/cui/source/options/optinet2.hrc
index 1bd09225ac9b..75f9445eb542 100755
--- a/cui/source/options/optinet2.hrc
+++ b/cui/source/options/optinet2.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 // Proxy ------------------------------------------------------------------
 #define GB_SETTINGS                 1
-#define FT_PROXYMODE                2
+#define FT_PROXYMODE 				2
 #define LB_PROXYMODE                2
-#define FT_HTTP_PROXY               3
+#define FT_HTTP_PROXY				3
 #define ED_HTTP_PROXY               3
 #define FT_HTTP_PORT                4
 #define ED_HTTP_PORT                4
@@ -51,18 +51,18 @@
 #define ED_NOPROXYFOR               11
 #define ED_NOPROXYDESC              12
 #define ST_PROXY_FROM_BROWSER       13
-#define FT_HTTPS_PROXY              14
+#define FT_HTTPS_PROXY				14
 #define ED_HTTPS_PROXY              14
 #define FT_HTTPS_PORT               15
 #define ED_HTTPS_PORT               15
 
 // Search ------------------------------------------------------------------
-#define GB_SEARCH                   40
-#define LB_SEARCH                   40
-#define FT_SEARCH_NAME              41
-#define ED_SEARCH_NAME              41
-#define FT_SEARCH                   42
-#define RB_AND                      43
+#define GB_SEARCH	                40
+#define LB_SEARCH	                40
+#define FT_SEARCH_NAME	            41
+#define ED_SEARCH_NAME	            41
+#define FT_SEARCH	                42
+#define RB_AND		                43
 #define RB_OR                       44
 #define RB_EXACT                    45
 #define FT_URL                      46
@@ -73,34 +73,34 @@
 #define ED_SEPARATOR                48
 #define FT_CASE                     49
 #define ED_CASE                     49
-#define PB_CHANGE                   53
-#define PB_DELETE                   54
-#define PB_ADD                      55
-#define PB_NEW                      56
+#define PB_CHANGE	                53
+#define PB_DELETE	                54
+#define PB_ADD		                55
+#define PB_NEW						56
 #define MSG_MODIFY                  57
 
 // Protocols  --------------------------------------------------------------
-#define GB_DNS                      105
+#define GB_DNS						105
 #define RB_DNS_AUTO                 106
 #define RB_DNS_MANUAL               107
 #define ED_DNS                      107
 
-#define ST_MSG_255_0                111
-#define ST_MSG_255_1                112
+#define ST_MSG_255_0				111
+#define ST_MSG_255_1				112
 
 // Site Certificate --------------------------------------------------------
-#define GB_SITECERT                 120
-#define LB_SITECERT                 121
-#define LB_FILTERCERT               122
-#define PB_EDIT_CERT                123
-#define PB_DELETE_CERT              124
+#define GB_SITECERT					120
+#define LB_SITECERT					121
+#define LB_FILTERCERT				122
+#define PB_EDIT_CERT				123
+#define PB_DELETE_CERT				124
 
 // personal Certificate ----------------------------------------------------
-#define GB_PERSCERT                 130
-#define LB_PERSCERT                 131
-#define PB_NEW_PERSCERT             132
-#define PB_INFO_PERSCERT            133
-#define PB_DELETE_PERSCERT          134
+#define GB_PERSCERT					130
+#define LB_PERSCERT					131
+#define PB_NEW_PERSCERT				132
+#define PB_INFO_PERSCERT	 		133
+#define PB_DELETE_PERSCERT			134
 
 // Security  -------------------------------------------------------------
 
@@ -145,12 +145,12 @@
 
 // Defines - JavaScriptDisableQueryBox_Impl -------------------------------
 
-#define IMG_JSCPT_WARNING           220
-#define FT_JSCPT_WARNING            221
-#define CB_JSCPT_DISABLE            222
-#define GB_JSCPT_WARNING            223
-#define BTN_JSCPT_YES               224
-#define BTN_JSCPT_NO                225
+#define IMG_JSCPT_WARNING			220
+#define FT_JSCPT_WARNING			221
+#define CB_JSCPT_DISABLE			222
+#define GB_JSCPT_WARNING			223
+#define BTN_JSCPT_YES				224
+#define BTN_JSCPT_NO				225
 
 // Defines - SvxEMailTabPage_Impl
 #define FL_MAIL                     1
@@ -161,8 +161,8 @@
 #define STR_DEFAULT_FILENAME        6
 
 // plugin
-#define GB_MOZPLUGIN    1
-#define CB_MOZPLUGIN_CODE   2
+#define GB_MOZPLUGIN	1
+#define CB_MOZPLUGIN_CODE	2
 
 
 #endif // #ifndef _SVX_OPTINET_HRC
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index 9b7e5b20acbc..bdd1bfb8d8af 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class SfxFilter;
 class SvtInetOptions;
 
 #ifndef SV_NODIALOG
-#define PROXY_CONTROLS  23
-#define CACHE_CONTROLS  20
-#define INET_SEARCH     19
+#define PROXY_CONTROLS 	23
+#define CACHE_CONTROLS 	20
+#define INET_SEARCH 	19
 
 #if defined(OS2)
 #define TYPE_CONTROLS  20
@@ -71,14 +71,14 @@ namespace uno = ::com::sun::star::uno;
 class SvxNoSpaceEdit : public Edit
 {
 private:
-    BOOL            bOnlyNumeric;
+    BOOL			bOnlyNumeric;
 
 public:
     SvxNoSpaceEdit(Window* pParent, ResId rResId, BOOL bNum = FALSE ) :
         Edit( pParent, rResId ), bOnlyNumeric( bNum ) {}
 
-    virtual void    KeyInput( const KeyEvent& rKEvent );
-    virtual void    Modify();
+    virtual void	KeyInput( const KeyEvent& rKEvent );
+    virtual void	Modify();
 };
 
 typedef SfxFilter* SfxFilterPtr;
@@ -91,28 +91,28 @@ class SvxProxyTabPage : public SfxTabPage
 private:
     FixedLine       aOptionGB;
 
-    FixedText       aProxyModeFT;
-    ListBox         aProxyModeLB;
+    FixedText 		aProxyModeFT;
+    ListBox			aProxyModeLB;
 
-    FixedText       aHttpProxyFT;
-    SvxNoSpaceEdit  aHttpProxyED;
-    FixedText       aHttpPortFT;
-    SvxNoSpaceEdit  aHttpPortED;
+    FixedText		aHttpProxyFT;
+    SvxNoSpaceEdit	aHttpProxyED;
+    FixedText		aHttpPortFT;
+    SvxNoSpaceEdit 	aHttpPortED;
 
-    FixedText       aHttpsProxyFT;
-    SvxNoSpaceEdit  aHttpsProxyED;
-    FixedText       aHttpsPortFT;
-    SvxNoSpaceEdit  aHttpsPortED;
+    FixedText		aHttpsProxyFT;
+    SvxNoSpaceEdit	aHttpsProxyED;
+    FixedText		aHttpsPortFT;
+    SvxNoSpaceEdit 	aHttpsPortED;
 
 
-    FixedText       aFtpProxyFT;
-    SvxNoSpaceEdit  aFtpProxyED;
-    FixedText       aFtpPortFT;
-    SvxNoSpaceEdit  aFtpPortED;
+    FixedText		aFtpProxyFT;
+    SvxNoSpaceEdit	aFtpProxyED;
+    FixedText		aFtpPortFT;
+    SvxNoSpaceEdit 	aFtpPortED;
 
-    FixedText       aNoProxyForFT;
-    Edit            aNoProxyForED;
-    FixedText       aNoProxyDescFT;
+    FixedText		aNoProxyForFT;
+    Edit			aNoProxyForED;
+    FixedText		aNoProxyDescFT;
 
     String          sFromBrowser;
 
@@ -142,9 +142,9 @@ private:
     virtual ~SvxProxyTabPage();
 
 public:
-    static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    static SfxTabPage*	Create( Window* pParent, const SfxItemSet& rAttrSet );
+    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	void 		Reset( const SfxItemSet& rSet );
 };
 
 // class SvxSearchTabPage ------------------------------------------------
@@ -156,31 +156,31 @@ class SvxSearchTabPage : public SfxTabPage
 
 private:
     FixedLine       aSearchGB;
-    ListBox         aSearchLB;
-    FixedText       aSearchNameFT;
-    SvxNoSpaceEdit  aSearchNameED;
-
-    FixedText       aSearchFT;
-    RadioButton     aAndRB;
-    RadioButton     aOrRB;
-    RadioButton     aExactRB;
-
-    FixedText       aURLFT;
-    SvxNoSpaceEdit  aURLED;
-
-    FixedText       aPostFixFT;
-    SvxNoSpaceEdit  aPostFixED;
-    FixedText       aSeparatorFT;
-    SvxNoSpaceEdit  aSeparatorED;
-    FixedText       aCaseFT;
-    ListBox         aCaseED;
-
-    PushButton      aNewPB;
-    PushButton      aAddPB;
-    PushButton      aChangePB;
-    PushButton      aDeletePB;
-
-    String          sLastSelectedEntry;
+    ListBox			aSearchLB;
+    FixedText		aSearchNameFT;
+    SvxNoSpaceEdit	aSearchNameED;
+
+    FixedText		aSearchFT;
+    RadioButton		aAndRB;
+    RadioButton		aOrRB;
+    RadioButton		aExactRB;
+
+    FixedText		aURLFT;
+    SvxNoSpaceEdit	aURLED;
+
+    FixedText		aPostFixFT;
+    SvxNoSpaceEdit	aPostFixED;
+    FixedText		aSeparatorFT;
+    SvxNoSpaceEdit	aSeparatorED;
+    FixedText		aCaseFT;
+    ListBox	 		aCaseED;
+
+    PushButton		aNewPB;
+    PushButton		aAddPB;
+    PushButton		aChangePB;
+    PushButton		aDeletePB;
+
+    String 			sLastSelectedEntry;
     String          sModifyMsg;
 
     SvxSearchConfig     aSearchConfig;
@@ -200,15 +200,15 @@ private:
 
     virtual void        ActivatePage( const SfxItemSet& rSet );
     virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
-    BOOL                ConfirmLeave( const String& rStringSelection );   //add by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00)
+    BOOL				ConfirmLeave( const String& rStringSelection );   //add by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00)
 
     SvxSearchTabPage( Window* pParent, const SfxItemSet& rSet );
     virtual ~SvxSearchTabPage();
 
 public:
-    static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    static SfxTabPage*	Create( Window* pParent, const SfxItemSet& rAttrSet );
+    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	void 		Reset( const SfxItemSet& rSet );
 };
 
 // #98647# class SvxScriptExecListBox ------------------------------------
@@ -262,27 +262,27 @@ private:
     DECL_LINK(          MasterPasswordCBHdl, void* );
     DECL_LINK(          ShowPasswordsHdl, PushButton* );
     DECL_LINK(          MacroSecPBHdl, void* );
-
+    
     void                InitControls();
 
                 SvxSecurityTabPage( Window* pParent, const SfxItemSet& rSet );
-    virtual     ~SvxSecurityTabPage();
+    virtual 	~SvxSecurityTabPage();
 
 protected:
     virtual void        ActivatePage( const SfxItemSet& rSet );
     virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
 
 public:
-    static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    static SfxTabPage*	Create( Window* pParent, const SfxItemSet& rAttrSet );
+    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	void 		Reset( const SfxItemSet& rSet );
 };
 
 //added by jmeng begin
 class MozPluginTabPage : public SfxTabPage
 {
     FixedLine       aMSWordGB;
-    CheckBox        aWBasicCodeCB;
+    CheckBox		aWBasicCodeCB;
 
     BOOL isInstalled(void);
     BOOL installPlugin(void);
@@ -293,11 +293,11 @@ class MozPluginTabPage : public SfxTabPage
 
 public:
 
-    static SfxTabPage*  Create( Window* pParent,
+    static SfxTabPage*	Create( Window* pParent,
                                 const SfxItemSet& rAttrSet );
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	void 		Reset( const SfxItemSet& rSet );
 
 };
 //added by jmeng end
@@ -330,10 +330,10 @@ public:
     SvxEMailTabPage( Window* pParent, const SfxItemSet& rSet );
     ~SvxEMailTabPage();
 
-    static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
+    static SfxTabPage*	Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	void 		Reset( const SfxItemSet& rSet );
 };
 
 #endif // #ifndef _SVX_OPTINET_HXX
diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src
index 9023dfa52394..848cdc27869f 100755
--- a/cui/source/options/optinet2.src
+++ b/cui/source/options/optinet2.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,9 +115,9 @@ TabPage RID_SVXPAGE_INET_PROXY
         Border = TRUE ;
     };
 
-    #define FT_PORT_WIDTH       37
-    #define ED_PORT_WIDTH       20
-    #define ED_PORT_COL         229
+    #define FT_PORT_WIDTH		37
+    #define ED_PORT_WIDTH		20
+    #define ED_PORT_COL			229
 
     FixedText FT_HTTP_PORT
     {
@@ -420,7 +420,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
 
 /************************************************************************/
 /*                                                                      */
-/*  Scripting                                                           */
+/*  Scripting		                                                    */
 /*                                                                      */
 /************************************************************************/
 
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 3d905fc2c779..a59f88802fd8 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 // define ----------------------------------------------------------------
 
-#define CLASSPATH_DELIMITER SAL_PATHSEPARATOR
-#define STRIM( s )          s.EraseLeadingChars().EraseTrailingChars()
-#define BUTTON_BORDER       2
-#define RESET_TIMEOUT       300
+#define CLASSPATH_DELIMITER	SAL_PATHSEPARATOR
+#define STRIM( s )			s.EraseLeadingChars().EraseTrailingChars()
+#define BUTTON_BORDER		2
+#define	RESET_TIMEOUT		300
 
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::ucb;
@@ -149,24 +149,24 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet
 
     SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_OPTIONS_JAVA ), rSet ),
 
-    m_aJavaLine         ( this, CUI_RES( FL_JAVA ) ),
-    m_aJavaEnableCB     ( this, CUI_RES( CB_JAVA_ENABLE ) ),
-    m_aJavaFoundLabel   ( this, CUI_RES( FT_JAVA_FOUND ) ),
-    m_aJavaList         ( this, CUI_RES( LB_JAVA ) ),
-    m_aJavaPathText     ( this, CUI_RES( FT_JAVA_PATH ) ),
-    m_aAddBtn           ( this, CUI_RES( PB_ADD ) ),
-    m_aParameterBtn     ( this, CUI_RES( PB_PARAMETER ) ),
-    m_aClassPathBtn     ( this, CUI_RES( PB_CLASSPATH ) ),
-
-    m_pParamDlg         ( NULL ),
-    m_pPathDlg          ( NULL ),
-    m_parJavaInfo       ( NULL ),
-    m_parParameters     ( NULL ),
-    m_pClassPath        ( NULL ),
-    m_nInfoSize         ( 0 ),
-    m_nParamSize        ( 0 ),
-    m_sInstallText      (       CUI_RES( STR_INSTALLED_IN ) ),
-    m_sAccessibilityText(       CUI_RES( STR_ACCESSIBILITY ) ),
+    m_aJavaLine			( this, CUI_RES( FL_JAVA ) ),
+    m_aJavaEnableCB		( this, CUI_RES( CB_JAVA_ENABLE ) ),
+    m_aJavaFoundLabel	( this, CUI_RES( FT_JAVA_FOUND ) ),
+    m_aJavaList			( this, CUI_RES( LB_JAVA ) ),
+    m_aJavaPathText		( this, CUI_RES( FT_JAVA_PATH ) ),
+    m_aAddBtn			( this, CUI_RES( PB_ADD ) ),
+    m_aParameterBtn		( this, CUI_RES( PB_PARAMETER ) ),
+    m_aClassPathBtn		( this, CUI_RES( PB_CLASSPATH ) ),
+
+    m_pParamDlg			( NULL ),
+    m_pPathDlg			( NULL ),
+    m_parJavaInfo		( NULL ),
+    m_parParameters		( NULL ),
+    m_pClassPath		( NULL ),
+    m_nInfoSize			( 0 ),
+    m_nParamSize		( 0 ),
+    m_sInstallText		( 		CUI_RES( STR_INSTALLED_IN ) ),
+    m_sAccessibilityText(		CUI_RES( STR_ACCESSIBILITY ) ),
     m_sAddDialogText    (       CUI_RES( STR_ADDDLGTEXT ) ),
 
     xDialogListener     ( new ::svt::DialogClosedListener() )
@@ -650,7 +650,7 @@ void SvxJavaOptionsPage::AddFolder( const ::rtl::OUString& _rFolder )
 
 // -----------------------------------------------------------------------
 
-SfxTabPage* SvxJavaOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage*	SvxJavaOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
 {
     return ( new SvxJavaOptionsPage( pParent, rAttrSet ) );
 }
@@ -678,7 +678,7 @@ BOOL SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
         bModified = TRUE;
     }
 
-    if ( m_pPathDlg )
+    if ( m_pPathDlg	)
     {
         ::rtl::OUString sPath( m_pPathDlg->GetClassPath() );
         if ( m_pPathDlg->GetOldPath() != String( sPath ) )
@@ -775,17 +775,17 @@ SvxJavaParameterDlg::SvxJavaParameterDlg( Window* pParent ) :
 
     ModalDialog( pParent, CUI_RES( RID_SVXDLG_JAVA_PARAMETER ) ),
 
-    m_aParameterLabel   ( this, CUI_RES( FT_PARAMETER ) ),
-    m_aParameterEdit    ( this, CUI_RES( ED_PARAMETER ) ),
-    m_aAssignBtn        ( this, CUI_RES( PB_ASSIGN ) ),
-    m_aAssignedLabel    ( this, CUI_RES( FT_ASSIGNED ) ),
-    m_aAssignedList     ( this, CUI_RES( LB_ASSIGNED ) ),
-    m_aExampleText      ( this, CUI_RES( FT_EXAMPLE ) ),
-    m_aRemoveBtn        ( this, CUI_RES( PB_REMOVE ) ),
-    m_aButtonsLine      ( this, CUI_RES( FL_BUTTONS ) ),
-    m_aOKBtn            ( this, CUI_RES( PB_PARAMETER_OK ) ),
-    m_aCancelBtn        ( this, CUI_RES( PB_PARAMETER_ESC ) ),
-    m_aHelpBtn          ( this, CUI_RES( PB_PARAMETER_HLP ) )
+    m_aParameterLabel	( this, CUI_RES( FT_PARAMETER ) ),
+    m_aParameterEdit	( this, CUI_RES( ED_PARAMETER ) ),
+    m_aAssignBtn		( this, CUI_RES( PB_ASSIGN ) ),
+    m_aAssignedLabel	( this, CUI_RES( FT_ASSIGNED ) ),
+    m_aAssignedList		( this, CUI_RES( LB_ASSIGNED ) ),
+    m_aExampleText		( this, CUI_RES( FT_EXAMPLE ) ),
+    m_aRemoveBtn		( this, CUI_RES( PB_REMOVE ) ),
+    m_aButtonsLine		( this, CUI_RES( FL_BUTTONS ) ),
+    m_aOKBtn			( this, CUI_RES( PB_PARAMETER_OK ) ),
+    m_aCancelBtn		( this, CUI_RES( PB_PARAMETER_ESC ) ),
+    m_aHelpBtn			( this, CUI_RES( PB_PARAMETER_HLP ) )
 
 {
     FreeResource();
@@ -885,7 +885,7 @@ short SvxJavaParameterDlg::Execute()
 
 // -----------------------------------------------------------------------
 
-Sequence< ::rtl::OUString > SvxJavaParameterDlg::GetParameters() const
+Sequence< ::rtl::OUString >	SvxJavaParameterDlg::GetParameters() const
 {
     USHORT nCount = m_aAssignedList.GetEntryCount();
     Sequence< ::rtl::OUString > aParamList( nCount );
@@ -915,15 +915,15 @@ SvxJavaClassPathDlg::SvxJavaClassPathDlg( Window* pParent ) :
 
     ModalDialog( pParent, CUI_RES( RID_SVXDLG_JAVA_CLASSPATH ) ),
 
-    m_aPathLabel        ( this, CUI_RES( FT_PATH ) ),
-    m_aPathList         ( this, CUI_RES( LB_PATH ) ),
-    m_aAddArchiveBtn    ( this, CUI_RES( PB_ADDARCHIVE ) ),
-    m_aAddPathBtn       ( this, CUI_RES( PB_ADDPATH ) ),
-    m_aRemoveBtn        ( this, CUI_RES( PB_REMOVE_PATH ) ),
-    m_aButtonsLine      ( this, CUI_RES( FL_PATH_BUTTONS ) ),
-    m_aOKBtn            ( this, CUI_RES( PB_PATH_OK ) ),
-    m_aCancelBtn        ( this, CUI_RES( PB_PATH_ESC ) ),
-    m_aHelpBtn          ( this, CUI_RES( PB_PATH_HLP ) )
+    m_aPathLabel		( this, CUI_RES( FT_PATH ) ),
+    m_aPathList			( this, CUI_RES( LB_PATH ) ),
+    m_aAddArchiveBtn	( this, CUI_RES( PB_ADDARCHIVE ) ),
+    m_aAddPathBtn		( this, CUI_RES( PB_ADDPATH ) ),
+    m_aRemoveBtn		( this, CUI_RES( PB_REMOVE_PATH ) ),
+    m_aButtonsLine		( this, CUI_RES( FL_PATH_BUTTONS ) ),
+    m_aOKBtn			( this, CUI_RES( PB_PATH_OK ) ),
+    m_aCancelBtn		( this, CUI_RES( PB_PATH_ESC ) ),
+    m_aHelpBtn			( this, CUI_RES( PB_PATH_HLP ) )
 
 {
     FreeResource();
diff --git a/cui/source/options/optjava.hrc b/cui/source/options/optjava.hrc
index 425cd2ca6d65..23da073e05ba 100644
--- a/cui/source/options/optjava.hrc
+++ b/cui/source/options/optjava.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,53 +31,53 @@
 
 // class SvxJavaOptionsPage ----------------------------------------------
 
-#define FL_JAVA             10
-#define CB_JAVA_ENABLE      11
-#define FT_JAVA_FOUND       12
-#define LB_JAVA             13
-#define FT_JAVA_PATH        14
+#define FL_JAVA				10
+#define CB_JAVA_ENABLE		11
+#define FT_JAVA_FOUND		12
+#define LB_JAVA				13
+#define FT_JAVA_PATH		14
 
-#define PB_ADD              20
-#define PB_PARAMETER        21
-#define PB_CLASSPATH        22
+#define PB_ADD				20
+#define PB_PARAMETER		21
+#define PB_CLASSPATH		22
 
-#define STR_INSTALLED_IN    30
-#define STR_ACCESSIBILITY   31
-#define STR_ADDDLGTEXT      32
+#define STR_INSTALLED_IN	30
+#define STR_ACCESSIBILITY	31
+#define STR_ADDDLGTEXT		32
 
-#define STR_HEADER_VENDOR   40
-#define STR_HEADER_VERSION  41
-#define STR_HEADER_FEATURES 42
+#define STR_HEADER_VENDOR	40
+#define STR_HEADER_VERSION	41
+#define STR_HEADER_FEATURES	42
 
 // class SvxJavaParameterDlg ---------------------------------------------
 
-#define FT_PARAMETER        10
-#define ED_PARAMETER        11
-#define PB_ASSIGN           12
+#define FT_PARAMETER		10
+#define ED_PARAMETER		11
+#define PB_ASSIGN			12
 
-#define FT_ASSIGNED         20
-#define LB_ASSIGNED         21
-#define FT_EXAMPLE          22
-#define PB_REMOVE           23
+#define FT_ASSIGNED			20
+#define LB_ASSIGNED			21
+#define FT_EXAMPLE			22
+#define PB_REMOVE			23
 
-#define FL_BUTTONS          30
-#define PB_PARAMETER_OK     31
-#define PB_PARAMETER_ESC    32
-#define PB_PARAMETER_HLP    33
+#define FL_BUTTONS			30
+#define PB_PARAMETER_OK		31
+#define PB_PARAMETER_ESC	32
+#define PB_PARAMETER_HLP	33
 
 // class SvxJavaClassPathDlg ---------------------------------------------
 
-#define FT_PATH             10
-#define LB_PATH             11
+#define FT_PATH				10
+#define LB_PATH				11
 
-#define PB_ADDARCHIVE       20
-#define PB_ADDPATH          21
-#define PB_REMOVE_PATH      22
+#define PB_ADDARCHIVE		20
+#define PB_ADDPATH			21
+#define PB_REMOVE_PATH		22
 
-#define FL_PATH_BUTTONS     30
-#define PB_PATH_OK          31
-#define PB_PATH_ESC         32
-#define PB_PATH_HLP         33
+#define FL_PATH_BUTTONS		30
+#define PB_PATH_OK			31
+#define PB_PATH_ESC			32
+#define PB_PATH_HLP			33
 
 #endif // #ifndef _SVX_OPTJAVA_HRC
 
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index ac03588b9697..db6606e0b3f1 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 typedef struct _JavaInfo JavaInfo;
 
-class   SvxJavaParameterDlg;
-class   SvxJavaClassPathDlg;
+class	SvxJavaParameterDlg;
+class	SvxJavaClassPathDlg;
 
 // class SvxJavaTable ----------------------------------------------------
 
@@ -54,19 +54,19 @@ class SvxJavaTable : public SvxSimpleTable
 {
     using SvxSimpleTable::SetTabs;
 private:
-    Point               m_aCurMousePoint;
+    Point				m_aCurMousePoint;
 
 protected:
-    virtual void        SetTabs();
+    virtual void		SetTabs();
     virtual void        MouseButtonUp( const MouseEvent& _rMEvt );
-    virtual void        KeyInput( const KeyEvent& rKEvt );
+    virtual void		KeyInput( const KeyEvent& rKEvt );
 
 public:
     SvxJavaTable( Window* _pParent, const ResId& _rId );
     ~SvxJavaTable();
 
 
-    inline Point        GetCurMousePoint() { return m_aCurMousePoint; }
+    inline Point		GetCurMousePoint() { return m_aCurMousePoint; }
 };
 
 // class SvxJavaOptionsPage ----------------------------------------------
@@ -83,18 +83,18 @@ private:
     PushButton                  m_aParameterBtn;
     PushButton                  m_aClassPathBtn;
 
-    SvxJavaParameterDlg*    m_pParamDlg;
-    SvxJavaClassPathDlg*    m_pPathDlg;
+    SvxJavaParameterDlg*	m_pParamDlg;
+    SvxJavaClassPathDlg*	m_pPathDlg;
 
-    JavaInfo**              m_parJavaInfo;
-    rtl_uString**           m_parParameters;
-    rtl_uString*            m_pClassPath;
-    sal_Int32               m_nInfoSize;
-    sal_Int32               m_nParamSize;
-    String                  m_sInstallText;
-    String                  m_sAccessibilityText;
-    String                  m_sAddDialogText;
-    Timer                   m_aResetTimer;
+    JavaInfo**				m_parJavaInfo;
+    rtl_uString**			m_parParameters;
+    rtl_uString*			m_pClassPath;
+    sal_Int32				m_nInfoSize;
+    sal_Int32				m_nParamSize;
+    String					m_sInstallText;
+    String					m_sAccessibilityText;
+    String					m_sAddDialogText;
+    Timer					m_aResetTimer;
 
     ::std::vector< JavaInfo* >
                             m_aAddedInfos;
@@ -102,33 +102,33 @@ private:
     ::com::sun::star::uno::Reference< ::svt::DialogClosedListener > xDialogListener;
     ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFolderPicker > xFolderPicker;
 
-    DECL_LINK(              EnableHdl_Impl, CheckBox * );
-    DECL_LINK(              CheckHdl_Impl, SvxSimpleTable * );
-    DECL_LINK(              SelectHdl_Impl, SvxSimpleTable * );
-    DECL_LINK(              AddHdl_Impl, PushButton * );
-    DECL_LINK(              ParameterHdl_Impl, PushButton * );
-    DECL_LINK(              ClassPathHdl_Impl, PushButton * );
+    DECL_LINK(				EnableHdl_Impl, CheckBox * );
+    DECL_LINK(				CheckHdl_Impl, SvxSimpleTable * );
+    DECL_LINK( 				SelectHdl_Impl, SvxSimpleTable * );
+    DECL_LINK(				AddHdl_Impl, PushButton * );
+    DECL_LINK(				ParameterHdl_Impl, PushButton * );
+    DECL_LINK(				ClassPathHdl_Impl, PushButton * );
     DECL_LINK(              ResetHdl_Impl, Timer * );
 
     DECL_LINK(              StartFolderPickerHdl, void * );
     DECL_LINK(              DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent* );
 
-    void                    ClearJavaInfo();
-    void                    ClearJavaList();
-    void                    LoadJREs();
-    void                    AddJRE( JavaInfo* _pInfo );
-    void                    HandleCheckEntry( SvLBoxEntry* _pEntry );
+    void					ClearJavaInfo();
+    void					ClearJavaList();
+    void					LoadJREs();
+    void					AddJRE( JavaInfo* _pInfo );
+    void					HandleCheckEntry( SvLBoxEntry* _pEntry );
     void                    AddFolder( const ::rtl::OUString& _rFolder );
 
 public:
     SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet );
     ~SvxJavaOptionsPage();
 
-    static SfxTabPage*      Create( Window* pParent, const SfxItemSet& rSet );
+    static SfxTabPage*		Create( Window* pParent, const SfxItemSet& rSet );
 
-    virtual BOOL            FillItemSet( SfxItemSet& rSet );
-    virtual void            Reset( const SfxItemSet& rSet );
-    virtual void            FillUserData();
+    virtual	BOOL 			FillItemSet( SfxItemSet& rSet );
+    virtual	void 			Reset( const SfxItemSet& rSet );
+    virtual void        	FillUserData();
 };
 
 // class SvxJavaParameterDlg ---------------------------------------------
@@ -136,27 +136,27 @@ public:
 class SvxJavaParameterDlg : public ModalDialog
 {
 private:
-    FixedText               m_aParameterLabel;
-    Edit                    m_aParameterEdit;
-    PushButton              m_aAssignBtn;
-
-    FixedText               m_aAssignedLabel;
-    ListBox                 m_aAssignedList;
-    FixedText               m_aExampleText;
-    PushButton              m_aRemoveBtn;
-
-    FixedLine               m_aButtonsLine;
-    OKButton                m_aOKBtn;
-    CancelButton            m_aCancelBtn;
-    HelpButton              m_aHelpBtn;
-
-    DECL_LINK(              ModifyHdl_Impl, Edit * );
-    DECL_LINK(              AssignHdl_Impl, PushButton * );
-    DECL_LINK(              SelectHdl_Impl, ListBox * );
-    DECL_LINK(              DblClickHdl_Impl, ListBox * );
-    DECL_LINK(              RemoveHdl_Impl, PushButton * );
-
-    inline void             EnableRemoveButton()
+    FixedText				m_aParameterLabel;
+    Edit			   		m_aParameterEdit;
+    PushButton				m_aAssignBtn;
+
+    FixedText				m_aAssignedLabel;
+    ListBox					m_aAssignedList;
+    FixedText				m_aExampleText;
+    PushButton				m_aRemoveBtn;
+
+    FixedLine				m_aButtonsLine;
+    OKButton				m_aOKBtn;
+    CancelButton	   		m_aCancelBtn;
+    HelpButton				m_aHelpBtn;
+
+    DECL_LINK(				ModifyHdl_Impl, Edit * );
+    DECL_LINK(				AssignHdl_Impl, PushButton * );
+    DECL_LINK(				SelectHdl_Impl, ListBox * );
+    DECL_LINK(				DblClickHdl_Impl, ListBox * );
+    DECL_LINK(				RemoveHdl_Impl, PushButton * );
+
+    inline void				EnableRemoveButton()
                                 { m_aRemoveBtn.Enable(
                                     m_aAssignedList.GetSelectEntryPos()
                                     != LISTBOX_ENTRY_NOTFOUND ); }
@@ -166,7 +166,7 @@ public:
     SvxJavaParameterDlg( Window* pParent );
     ~SvxJavaParameterDlg();
 
-    virtual short           Execute();
+    virtual short			Execute();
 
     ::com::sun::star::uno::Sequence< ::rtl::OUString > GetParameters() const;
     void SetParameters( ::com::sun::star::uno::Sequence< ::rtl::OUString >& rParams );
@@ -177,25 +177,25 @@ public:
 class SvxJavaClassPathDlg : public ModalDialog
 {
 private:
-    FixedText               m_aPathLabel;
-    ListBox                 m_aPathList;
-    PushButton              m_aAddArchiveBtn;
-    PushButton              m_aAddPathBtn;
-    PushButton              m_aRemoveBtn;
+    FixedText				m_aPathLabel;
+    ListBox					m_aPathList;
+    PushButton				m_aAddArchiveBtn;
+    PushButton				m_aAddPathBtn;
+    PushButton				m_aRemoveBtn;
 
-    FixedLine               m_aButtonsLine;
-    OKButton                m_aOKBtn;
-    CancelButton            m_aCancelBtn;
-    HelpButton              m_aHelpBtn;
+    FixedLine				m_aButtonsLine;
+    OKButton				m_aOKBtn;
+    CancelButton			m_aCancelBtn;
+    HelpButton				m_aHelpBtn;
 
-    String                  m_sOldPath;
+    String					m_sOldPath;
 
-    DECL_LINK(              AddArchiveHdl_Impl, PushButton * );
-    DECL_LINK(              AddPathHdl_Impl, PushButton * );
-    DECL_LINK(              RemoveHdl_Impl, PushButton * );
-    DECL_LINK(              SelectHdl_Impl, ListBox * );
+    DECL_LINK(				AddArchiveHdl_Impl, PushButton * );
+    DECL_LINK(				AddPathHdl_Impl, PushButton * );
+    DECL_LINK(				RemoveHdl_Impl, PushButton * );
+    DECL_LINK(				SelectHdl_Impl, ListBox * );
 
-    bool                    IsPathDuplicate( const String& _rPath );
+    bool					IsPathDuplicate( const String& _rPath );
     inline void             EnableRemoveButton()
                                 { m_aRemoveBtn.Enable(
                                     m_aPathList.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ); }
@@ -204,11 +204,11 @@ public:
     SvxJavaClassPathDlg( Window* pParent );
     ~SvxJavaClassPathDlg();
 
-    inline const String&    GetOldPath() const { return m_sOldPath; }
-    inline void             SetFocus() { m_aPathList.GrabFocus(); }
+    inline const String&	GetOldPath() const { return m_sOldPath; }
+    inline void				SetFocus() { m_aPathList.GrabFocus(); }
 
-    String                  GetClassPath() const;
-    void                    SetClassPath( const String& _rPath );
+    String					GetClassPath() const;
+    void					SetClassPath( const String& _rPath );
 };
 
 #endif // #ifndef _SVX_OPTJAVA_HXX
diff --git a/cui/source/options/optjava.src b/cui/source/options/optjava.src
index 0d55fd6f64f8..c8306b7b8bfb 100644
--- a/cui/source/options/optjava.src
+++ b/cui/source/options/optjava.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx
index 0be75792e2df..abdae39ff4cc 100644
--- a/cui/source/options/optjsearch.cxx
+++ b/cui/source/options/optjsearch.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,26 +44,26 @@ using namespace com::sun::star::i18n;
 SvxJSearchOptionsPage::SvxJSearchOptionsPage( Window* pParent, const SfxItemSet& rSet ) :
     SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_JSEARCH_OPTIONS ), rSet ),
 
-    aTreatAsEqual               ( this, CUI_RES( FL_TREAT_AS_EQUAL ) ),
-    aMatchCase                  ( this, CUI_RES( CB_MATCH_CASE ) ),
-    aMatchFullHalfWidth         ( this, CUI_RES( CB_MATCH_FULL_HALF_WIDTH ) ),
-    aMatchHiraganaKatakana      ( this, CUI_RES( CB_MATCH_HIRAGANA_KATAKANA ) ),
-    aMatchContractions          ( this, CUI_RES( CB_MATCH_CONTRACTIONS ) ),
-    aMatchMinusDashChoon        ( this, CUI_RES( CB_MATCH_MINUS_DASH_CHOON ) ),
-    aMatchRepeatCharMarks       ( this, CUI_RES( CB_MATCH_REPEAT_CHAR_MARKS ) ),
-    aMatchVariantFormKanji      ( this, CUI_RES( CB_MATCH_VARIANT_FORM_KANJI ) ),
-    aMatchOldKanaForms          ( this, CUI_RES( CB_MATCH_OLD_KANA_FORMS ) ),
-    aMatchDiziDuzu              ( this, CUI_RES( CB_MATCH_DIZI_DUZU ) ),
-    aMatchBavaHafa              ( this, CUI_RES( CB_MATCH_BAVA_HAFA ) ),
-    aMatchTsithichiDhizi        ( this, CUI_RES( CB_MATCH_TSITHICHI_DHIZI ) ),
-    aMatchHyuiyuByuvyu          ( this, CUI_RES( CB_MATCH_HYUFYU_BYUVYU ) ),
-    aMatchSesheZeje             ( this, CUI_RES( CB_MATCH_SESHE_ZEJE ) ),
-    aMatchIaiya                 ( this, CUI_RES( CB_MATCH_IAIYA ) ),
-    aMatchKiku                  ( this, CUI_RES( CB_MATCH_KIKU ) ),
+    aTreatAsEqual				( this, CUI_RES( FL_TREAT_AS_EQUAL ) ),
+    aMatchCase					( this, CUI_RES( CB_MATCH_CASE ) ),
+    aMatchFullHalfWidth			( this, CUI_RES( CB_MATCH_FULL_HALF_WIDTH ) ),
+    aMatchHiraganaKatakana		( this, CUI_RES( CB_MATCH_HIRAGANA_KATAKANA ) ),
+    aMatchContractions			( this, CUI_RES( CB_MATCH_CONTRACTIONS ) ),
+    aMatchMinusDashChoon		( this, CUI_RES( CB_MATCH_MINUS_DASH_CHOON ) ),
+    aMatchRepeatCharMarks		( this, CUI_RES( CB_MATCH_REPEAT_CHAR_MARKS ) ),
+    aMatchVariantFormKanji		( this, CUI_RES( CB_MATCH_VARIANT_FORM_KANJI ) ),
+    aMatchOldKanaForms			( this, CUI_RES( CB_MATCH_OLD_KANA_FORMS ) ),
+    aMatchDiziDuzu				( this, CUI_RES( CB_MATCH_DIZI_DUZU ) ),
+    aMatchBavaHafa				( this, CUI_RES( CB_MATCH_BAVA_HAFA ) ),
+    aMatchTsithichiDhizi		( this, CUI_RES( CB_MATCH_TSITHICHI_DHIZI ) ),
+    aMatchHyuiyuByuvyu			( this, CUI_RES( CB_MATCH_HYUFYU_BYUVYU ) ),
+    aMatchSesheZeje				( this, CUI_RES( CB_MATCH_SESHE_ZEJE ) ),
+    aMatchIaiya					( this, CUI_RES( CB_MATCH_IAIYA ) ),
+    aMatchKiku					( this, CUI_RES( CB_MATCH_KIKU ) ),
     aMatchProlongedSoundMark    ( this, CUI_RES( CB_MATCH_PROLONGED_SOUNDMARK ) ),
     aIgnore                     ( this, CUI_RES( FL_IGNORE ) ),
-    aIgnorePunctuation          ( this, CUI_RES( CB_IGNORE_PUNCTUATION ) ),
-    aIgnoreWhitespace           ( this, CUI_RES( CB_IGNORE_WHITESPACES ) ),
+    aIgnorePunctuation			( this, CUI_RES( CB_IGNORE_PUNCTUATION ) ),
+    aIgnoreWhitespace			( this, CUI_RES( CB_IGNORE_WHITESPACES ) ),
     aIgnoreMiddleDot            ( this, CUI_RES( CB_IGNORE_MIDDLE_DOT ) )
 {
     FreeResource();
@@ -116,13 +116,13 @@ void SvxJSearchOptionsPage::SetTransliterationFlags( INT32 nSettings )
     bVal = 0 != (nSettings & TransliterationModules_ignoreKiKuFollowedBySa_ja_JP);
     aMatchKiku               .Check( bVal );
     bVal = 0 != (nSettings & TransliterationModules_ignoreSeparator_ja_JP);
-    aIgnorePunctuation       .Check( bVal );
+    aIgnorePunctuation		 .Check( bVal );
     bVal = 0 != (nSettings & TransliterationModules_ignoreSpace_ja_JP);
-    aIgnoreWhitespace        .Check( bVal );
+    aIgnoreWhitespace		 .Check( bVal );
     bVal = 0 != (nSettings & TransliterationModules_ignoreProlongedSoundMark_ja_JP);
     aMatchProlongedSoundMark.Check( bVal );
     bVal = 0 != (nSettings & TransliterationModules_ignoreMiddleDot_ja_JP);
-    aIgnoreMiddleDot         .Check( bVal );
+    aIgnoreMiddleDot		 .Check( bVal );
 
     nTransliterationFlags = nSettings;
 }
@@ -181,48 +181,48 @@ void SvxJSearchOptionsPage::Reset( const SfxItemSet& )
 
     // read settings from configuration
     aMatchCase               .Check(!aOpt.IsMatchCase() );  //! treat as equal uppercase/lowercase
-    aMatchFullHalfWidth      .Check( aOpt.IsMatchFullHalfWidthForms() );
-    aMatchHiraganaKatakana   .Check( aOpt.IsMatchHiraganaKatakana() );
-    aMatchContractions       .Check( aOpt.IsMatchContractions() );
-    aMatchMinusDashChoon     .Check( aOpt.IsMatchMinusDashChoon() );
-    aMatchRepeatCharMarks    .Check( aOpt.IsMatchRepeatCharMarks() );
-    aMatchVariantFormKanji   .Check( aOpt.IsMatchVariantFormKanji() );
-    aMatchOldKanaForms       .Check( aOpt.IsMatchOldKanaForms() );
-    aMatchDiziDuzu           .Check( aOpt.IsMatchDiziDuzu() );
-    aMatchBavaHafa           .Check( aOpt.IsMatchBavaHafa() );
-    aMatchTsithichiDhizi     .Check( aOpt.IsMatchTsithichiDhizi() );
-    aMatchHyuiyuByuvyu       .Check( aOpt.IsMatchHyuiyuByuvyu() );
-    aMatchSesheZeje          .Check( aOpt.IsMatchSesheZeje() );
-    aMatchIaiya              .Check( aOpt.IsMatchIaiya() );
-    aMatchKiku               .Check( aOpt.IsMatchKiku() );
-    aIgnorePunctuation       .Check( aOpt.IsIgnorePunctuation() );
-    aIgnoreWhitespace        .Check( aOpt.IsIgnoreWhitespace() );
+    aMatchFullHalfWidth		 .Check( aOpt.IsMatchFullHalfWidthForms() );
+    aMatchHiraganaKatakana	 .Check( aOpt.IsMatchHiraganaKatakana() );
+    aMatchContractions		 .Check( aOpt.IsMatchContractions() );
+    aMatchMinusDashChoon	 .Check( aOpt.IsMatchMinusDashChoon() );
+    aMatchRepeatCharMarks	 .Check( aOpt.IsMatchRepeatCharMarks() );
+    aMatchVariantFormKanji	 .Check( aOpt.IsMatchVariantFormKanji() );
+    aMatchOldKanaForms		 .Check( aOpt.IsMatchOldKanaForms() );
+    aMatchDiziDuzu			 .Check( aOpt.IsMatchDiziDuzu() );
+    aMatchBavaHafa			 .Check( aOpt.IsMatchBavaHafa() );
+    aMatchTsithichiDhizi	 .Check( aOpt.IsMatchTsithichiDhizi() );
+    aMatchHyuiyuByuvyu		 .Check( aOpt.IsMatchHyuiyuByuvyu() );
+    aMatchSesheZeje			 .Check( aOpt.IsMatchSesheZeje() );
+    aMatchIaiya				 .Check( aOpt.IsMatchIaiya() );
+    aMatchKiku				 .Check( aOpt.IsMatchKiku() );
+    aIgnorePunctuation		 .Check( aOpt.IsIgnorePunctuation() );
+    aIgnoreWhitespace		 .Check( aOpt.IsIgnoreWhitespace() );
     aMatchProlongedSoundMark .Check( aOpt.IsIgnoreProlongedSoundMark() );
-    aIgnoreMiddleDot         .Check( aOpt.IsIgnoreMiddleDot() );
+    aIgnoreMiddleDot		 .Check( aOpt.IsIgnoreMiddleDot() );
 
     nTransliterationFlags = GetTransliterationFlags_Impl();
     DBG_ASSERT( nTransliterationFlags == aOpt.GetTransliterationFlags(),
             "Transliteration settings different" );
 
-    aMatchCase               .SaveValue();
-    aMatchFullHalfWidth      .SaveValue();
-    aMatchHiraganaKatakana   .SaveValue();
-    aMatchContractions       .SaveValue();
-    aMatchMinusDashChoon     .SaveValue();
-    aMatchRepeatCharMarks    .SaveValue();
-    aMatchVariantFormKanji   .SaveValue();
-    aMatchOldKanaForms       .SaveValue();
-    aMatchDiziDuzu           .SaveValue();
-    aMatchBavaHafa           .SaveValue();
-    aMatchTsithichiDhizi     .SaveValue();
-    aMatchHyuiyuByuvyu       .SaveValue();
-    aMatchSesheZeje          .SaveValue();
-    aMatchIaiya              .SaveValue();
-    aMatchKiku               .SaveValue();
-    aIgnorePunctuation       .SaveValue();
-    aIgnoreWhitespace        .SaveValue();
+    aMatchCase				 .SaveValue();
+    aMatchFullHalfWidth		 .SaveValue();
+    aMatchHiraganaKatakana	 .SaveValue();
+    aMatchContractions		 .SaveValue();
+    aMatchMinusDashChoon	 .SaveValue();
+    aMatchRepeatCharMarks	 .SaveValue();
+    aMatchVariantFormKanji	 .SaveValue();
+    aMatchOldKanaForms		 .SaveValue();
+    aMatchDiziDuzu			 .SaveValue();
+    aMatchBavaHafa			 .SaveValue();
+    aMatchTsithichiDhizi	 .SaveValue();
+    aMatchHyuiyuByuvyu		 .SaveValue();
+    aMatchSesheZeje			 .SaveValue();
+    aMatchIaiya				 .SaveValue();
+    aMatchKiku				 .SaveValue();
+    aIgnorePunctuation		 .SaveValue();
+    aIgnoreWhitespace		 .SaveValue();
     aMatchProlongedSoundMark .SaveValue();
-    aIgnoreMiddleDot         .SaveValue();
+    aIgnoreMiddleDot		 .SaveValue();
 }
 
 
diff --git a/cui/source/options/optjsearch.hrc b/cui/source/options/optjsearch.hrc
index e1c2b8d24306..40024df86272 100644
--- a/cui/source/options/optjsearch.hrc
+++ b/cui/source/options/optjsearch.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
  *
  ************************************************************************/
 
-#define FL_TREAT_AS_EQUAL                   100
+#define FL_TREAT_AS_EQUAL					100
 #define CB_MATCH_CASE                       101
 #define CB_MATCH_FULL_HALF_WIDTH            102
 #define CB_MATCH_HIRAGANA_KATAKANA          103
@@ -42,9 +42,9 @@
 #define CB_MATCH_IAIYA                      114
 #define CB_MATCH_KIKU                       115
 
-#define FL_IGNORE                           200
+#define FL_IGNORE							200
 #define CB_IGNORE_PUNCTUATION               201
 #define CB_IGNORE_WHITESPACES               202
 #define CB_MATCH_PROLONGED_SOUNDMARK        203
-#define CB_IGNORE_MIDDLE_DOT                204
+#define CB_IGNORE_MIDDLE_DOT				204
 
diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx
index 5ec12621cd40..3b2a51b158e9 100644
--- a/cui/source/options/optjsearch.hxx
+++ b/cui/source/options/optjsearch.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,32 +41,32 @@ class SfxItemSet;
 class SvxJSearchOptionsPage : public SfxTabPage
 {
 private:
-    FixedLine   aTreatAsEqual;
-    CheckBox    aMatchCase;
-    CheckBox    aMatchFullHalfWidth;
-    CheckBox    aMatchHiraganaKatakana;
-    CheckBox    aMatchContractions;
-    CheckBox    aMatchMinusDashChoon;
-    CheckBox    aMatchRepeatCharMarks;
-    CheckBox    aMatchVariantFormKanji;
-    CheckBox    aMatchOldKanaForms;
-    CheckBox    aMatchDiziDuzu;
-    CheckBox    aMatchBavaHafa;
-    CheckBox    aMatchTsithichiDhizi;
-    CheckBox    aMatchHyuiyuByuvyu;
-    CheckBox    aMatchSesheZeje;
-    CheckBox    aMatchIaiya;
-    CheckBox    aMatchKiku;
+    FixedLine	aTreatAsEqual;
+    CheckBox	aMatchCase;
+    CheckBox	aMatchFullHalfWidth;
+    CheckBox	aMatchHiraganaKatakana;
+    CheckBox	aMatchContractions;
+    CheckBox	aMatchMinusDashChoon;
+    CheckBox	aMatchRepeatCharMarks;
+    CheckBox	aMatchVariantFormKanji;
+    CheckBox	aMatchOldKanaForms;
+    CheckBox	aMatchDiziDuzu;
+    CheckBox	aMatchBavaHafa;
+    CheckBox	aMatchTsithichiDhizi;
+    CheckBox	aMatchHyuiyuByuvyu;
+    CheckBox	aMatchSesheZeje;
+    CheckBox	aMatchIaiya;
+    CheckBox	aMatchKiku;
     CheckBox    aMatchProlongedSoundMark;
     FixedLine   aIgnore;
-    CheckBox    aIgnorePunctuation;
-    CheckBox    aIgnoreWhitespace;
+    CheckBox	aIgnorePunctuation;
+    CheckBox	aIgnoreWhitespace;
     CheckBox    aIgnoreMiddleDot;
 
-    INT32       nTransliterationFlags;
-    BOOL        bSaveOptions;
+    INT32		nTransliterationFlags;
+    BOOL		bSaveOptions;
 
-    INT32               GetTransliterationFlags_Impl();
+    INT32				GetTransliterationFlags_Impl();
 
 protected:
                         SvxJSearchOptionsPage( Window* pParent, const SfxItemSet& rSet );
@@ -79,11 +79,11 @@ public:
     virtual void        Reset( const SfxItemSet& rSet );
     virtual BOOL        FillItemSet( SfxItemSet& rSet );
 
-    BOOL                IsSaveOptions() const           { return bSaveOptions; }
-    void                EnableSaveOptions( BOOL bVal )  { bSaveOptions = bVal; }
+    BOOL				IsSaveOptions() const			{ return bSaveOptions; }
+    void				EnableSaveOptions( BOOL bVal )	{ bSaveOptions = bVal; }
 
-    INT32               GetTransliterationFlags() const { return nTransliterationFlags; }
-    void                SetTransliterationFlags( INT32 nSettings );
+    INT32				GetTransliterationFlags() const	{ return nTransliterationFlags; }
+    void				SetTransliterationFlags( INT32 nSettings );
 };
 
 //////////////////////////////////////////////////////////////////////
diff --git a/cui/source/options/optjsearch.src b/cui/source/options/optjsearch.src
index 98963647e9c4..074f3a6b1bd9 100644
--- a/cui/source/options/optjsearch.src
+++ b/cui/source/options/optjsearch.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 84b080fcf395..746abd72a039 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -95,9 +95,9 @@ namespace css = com::sun::star;
 
 #define C2U(cChar) OUString::createFromAscii(cChar)
 #define SVX_MAX_USERDICTS 20
-#define CBCOL_FIRST     0
-#define CBCOL_SECOND    1
-#define CBCOL_BOTH      2
+#define CBCOL_FIRST		0
+#define CBCOL_SECOND	1
+#define CBCOL_BOTH		2
 
 static const sal_Char cSpell[]   = SN_SPELLCHECKER;
 static const sal_Char cGrammar[] = SN_GRAMMARCHECKER;
@@ -225,7 +225,7 @@ class ModuleUserData_Impl
     BOOL bIsChecked;
     BYTE nType;
     BYTE nIndex;
-    String  sImplName;
+    String	sImplName;
 
 public:
     ModuleUserData_Impl( String sImpName, BOOL bIsParent, BOOL bChecked, BYTE nSetType, BYTE nSetIndex ) :
@@ -252,20 +252,20 @@ public:
 //
 class DicUserData
 {
-    ULONG   nVal;
+    ULONG	nVal;
 
 public:
     DicUserData( ULONG nUserData ) : nVal( nUserData ) {}
     DicUserData( USHORT nEID,
                  BOOL bChecked, BOOL bEditable, BOOL bDeletable );
 
-    ULONG   GetUserData() const         { return nVal; }
-    USHORT  GetEntryId() const          { return (USHORT)(nVal >> 16); }
-    BOOL    IsChecked() const           { return (BOOL)(nVal >>  8) & 0x01; }
-    BOOL    IsEditable() const          { return (BOOL)(nVal >>  9) & 0x01; }
-    BOOL    IsDeletable() const         { return (BOOL)(nVal >> 10) & 0x01; }
+    ULONG	GetUserData() const			{ return nVal; }
+    USHORT	GetEntryId() const			{ return (USHORT)(nVal >> 16); }
+    BOOL	IsChecked() const			{ return (BOOL)(nVal >>  8) & 0x01; }
+    BOOL	IsEditable() const			{ return (BOOL)(nVal >>  9) & 0x01; }
+    BOOL	IsDeletable() const			{ return (BOOL)(nVal >> 10) & 0x01; }
 
-    void    SetChecked( BOOL bVal );
+    void	SetChecked( BOOL bVal );
 };
 
 
@@ -274,10 +274,10 @@ DicUserData::DicUserData(
         BOOL bChecked, BOOL bEditable, BOOL bDeletable )
 {
     DBG_ASSERT( nEID < 65000, "Entry Id out of range" );
-    nVal =  ((ULONG)(0xFFFF & nEID)         << 16) |
-            ((ULONG)(bChecked ? 1 : 0)      <<  8) |
-            ((ULONG)(bEditable ? 1 : 0)     <<  9) |
-            ((ULONG)(bDeletable ? 1 : 0)    << 10);
+    nVal =  ((ULONG)(0xFFFF & nEID)			<< 16) |
+            ((ULONG)(bChecked ? 1 : 0)		<<  8) |
+            ((ULONG)(bEditable ? 1 : 0)		<<  9) |
+            ((ULONG)(bDeletable ? 1 : 0)	<< 10);
 }
 
 
@@ -342,21 +342,21 @@ void BrwStringDic_Impl::Paint( const Point& rPos, SvLBox& rDev, USHORT,
 
 class OptionsBreakSet : public ModalDialog
 {
-    OKButton        aOKPB;
-    CancelButton    aCancelPB;
+    OKButton 		aOKPB;
+    CancelButton	aCancelPB;
     FixedLine       aValFL;
-    NumericField    aValNF;
+    NumericField	aValNF;
 
 public:
     OptionsBreakSet(Window* pParent, int nRID) :
             ModalDialog(pParent, CUI_RES(RID_SVXDLG_LNG_ED_NUM_PREBREAK )),
-            aOKPB       (this, CUI_RES(BT_OK_PREBREAK)),
-            aCancelPB   (this, CUI_RES(BT_CANCEL_PREBREAK)),
+            aOKPB		(this, CUI_RES(BT_OK_PREBREAK)),
+            aCancelPB	(this, CUI_RES(BT_CANCEL_PREBREAK)),
             aValFL      (this, CUI_RES(FL_NUMVAL_PREBREAK)),
-            aValNF      (this, CUI_RES(ED_PREBREAK))
+            aValNF		(this, CUI_RES(ED_PREBREAK))
     {
-        DBG_ASSERT( STR_NUM_PRE_BREAK_DLG   == nRID ||
-                    STR_NUM_POST_BREAK_DLG  == nRID ||
+        DBG_ASSERT( STR_NUM_PRE_BREAK_DLG   == nRID	||
+                    STR_NUM_POST_BREAK_DLG  == nRID	||
                     STR_NUM_MIN_WORDLEN_DLG == nRID, "unexpected RID" );
 
         if (nRID != -1)
@@ -364,7 +364,7 @@ public:
         FreeResource();
     }
 
-    NumericField&   GetNumericFld() { return aValNF; }
+    NumericField& 	GetNumericFld()	{ return aValNF; }
 };
 
 
@@ -391,17 +391,17 @@ enum EID_OPTIONS
 //  It is used to get the respective property name.
 static const char * aEidToPropName[] =
 {
-    UPN_IS_SPELL_AUTO,              // EID_SPELL_AUTO
+    UPN_IS_SPELL_AUTO,				// EID_SPELL_AUTO
     UPN_IS_GRAMMAR_AUTO,            // EID_GRAMMAR_AUTO
-    UPN_IS_SPELL_UPPER_CASE,        // EID_CAPITAL_WORDS
-    UPN_IS_SPELL_WITH_DIGITS,       // EID_WORDS_WITH_DIGITS
+    UPN_IS_SPELL_UPPER_CASE,		// EID_CAPITAL_WORDS
+    UPN_IS_SPELL_WITH_DIGITS,		// EID_WORDS_WITH_DIGITS
     UPN_IS_SPELL_CAPITALIZATION,    // EID_CAPITALIZATION
-    UPN_IS_SPELL_SPECIAL,           // EID_SPELL_SPECIAL
-    UPN_HYPH_MIN_WORD_LENGTH,       // EID_NUM_MIN_WORDLEN,
-    UPN_HYPH_MIN_LEADING,           // EID_NUM_PRE_BREAK
-    UPN_HYPH_MIN_TRAILING,          // EID_NUM_POST_BREAK
-    UPN_IS_HYPH_AUTO,               // EID_HYPH_AUTO
-    UPN_IS_HYPH_SPECIAL             // EID_HYPH_SPECIAL
+    UPN_IS_SPELL_SPECIAL,			// EID_SPELL_SPECIAL
+    UPN_HYPH_MIN_WORD_LENGTH,		// EID_NUM_MIN_WORDLEN,
+    UPN_HYPH_MIN_LEADING,			// EID_NUM_PRE_BREAK
+    UPN_HYPH_MIN_TRAILING,			// EID_NUM_POST_BREAK
+    UPN_IS_HYPH_AUTO,				// EID_HYPH_AUTO
+    UPN_IS_HYPH_SPECIAL				// EID_HYPH_SPECIAL
 };
 
 
@@ -415,9 +415,9 @@ static inline String lcl_GetPropertyName( EID_OPTIONS eEntryId )
 
 class OptionsUserData
 {
-    ULONG   nVal;
+    ULONG	nVal;
 
-    void    SetModified();
+    void	SetModified();
 
 public:
     OptionsUserData( ULONG nUserData ) : nVal( nUserData ) {}
@@ -425,16 +425,16 @@ public:
                      BOOL bHasNV, USHORT nNumVal,
                      BOOL bCheckable, BOOL bChecked );
 
-    ULONG   GetUserData() const         { return nVal; }
-    USHORT  GetEntryId() const          { return (USHORT)(nVal >> 16); }
-    BOOL    HasNumericValue() const     { return (BOOL)(nVal >> 10) & 0x01; }
-    USHORT  GetNumericValue() const     { return (USHORT)(nVal & 0xFF); }
-    BOOL    IsChecked() const           { return (BOOL)(nVal >> 8) & 0x01; }
-    BOOL    IsCheckable() const         { return (BOOL)(nVal >> 9) & 0x01; }
-    BOOL    IsModified() const          { return (BOOL)(nVal >> 11) & 0x01; }
+    ULONG	GetUserData() const			{ return nVal; }
+    USHORT	GetEntryId() const			{ return (USHORT)(nVal >> 16); }
+    BOOL	HasNumericValue() const		{ return (BOOL)(nVal >> 10) & 0x01; }
+    USHORT	GetNumericValue() const		{ return (USHORT)(nVal & 0xFF); }
+    BOOL	IsChecked() const			{ return (BOOL)(nVal >> 8) & 0x01; }
+    BOOL	IsCheckable() const			{ return (BOOL)(nVal >> 9) & 0x01; }
+    BOOL	IsModified() const			{ return (BOOL)(nVal >> 11) & 0x01; }
 
-    void    SetChecked( BOOL bVal );
-    void    SetNumericValue( BYTE nNumVal );
+    void	SetChecked( BOOL bVal );
+    void	SetNumericValue( BYTE nNumVal );
 };
 
 OptionsUserData::OptionsUserData( USHORT nEID,
@@ -443,10 +443,10 @@ OptionsUserData::OptionsUserData( USHORT nEID,
 {
     DBG_ASSERT( nEID < 65000, "Entry Id out of range" );
     DBG_ASSERT( nNumVal < 256, "value out of range" );
-    nVal =  ((ULONG)(0xFFFF & nEID)         << 16) |
-            ((ULONG)(bHasNV ? 1 : 0)        << 10) |
-            ((ULONG)(bCheckable ? 1 : 0)    <<  9) |
-            ((ULONG)(bChecked ? 1 : 0)      <<  8) |
+    nVal =  ((ULONG)(0xFFFF & nEID)			<< 16) |
+            ((ULONG)(bHasNV ? 1 : 0)		<< 10) |
+            ((ULONG)(bCheckable ? 1 : 0)	<<  9) |
+            ((ULONG)(bChecked ? 1 : 0)		<<  8) |
             ((ULONG)(0xFF & nNumVal));
 }
 
@@ -462,7 +462,7 @@ void OptionsUserData::SetChecked( BOOL bVal )
 
 void OptionsUserData::SetNumericValue( BYTE nNumVal )
 {
-//  DBG_ASSERT( nNumVal < 256, "value out of range" );
+//	DBG_ASSERT( nNumVal < 256, "value out of range" );
     if (HasNumericValue()  &&  (GetNumericValue() != nNumVal))
     {
         nVal &= 0xffffff00;
@@ -503,8 +503,8 @@ void BrwString_Impl::Paint( const Point& rPos, SvLBox& rDev, USHORT,
         Font aFont( aOldFont );
         aFont.SetWeight( WEIGHT_BOLD );
 
-//      BOOL bFett = TRUE;
-//      USHORT nPos = 0;
+//		BOOL bFett = TRUE;
+//		USHORT nPos = 0;
         //??? das untere byte aus dem user data in string wandeln
         OptionsUserData aData( (ULONG) pEntry->GetUserData() );
         if(aData.HasNumericValue())
@@ -515,8 +515,8 @@ void BrwString_Impl::Paint( const Point& rPos, SvLBox& rDev, USHORT,
             rDev.DrawText( aNewPos, sTxt );
         }
 
-//          if( STRING_NOTFOUND != nPos )
-//              aNewPos.X() += rDev.GetTextWidth( sTxt );
+//			if( STRING_NOTFOUND != nPos )
+//				aNewPos.X() += rDev.GetTextWidth( sTxt );
 
         rDev.SetFont( aOldFont );
     }
@@ -526,16 +526,16 @@ void BrwString_Impl::Paint( const Point& rPos, SvLBox& rDev, USHORT,
 
 struct ServiceInfo_Impl
 {
-    OUString                    sDisplayName;
-    OUString                    sSpellImplName;
-    OUString                    sHyphImplName;
-    OUString                    sThesImplName;
+    OUString					sDisplayName;
+    OUString					sSpellImplName;
+    OUString					sHyphImplName;
+    OUString					sThesImplName;
     OUString                    sGrammarImplName;
     uno::Reference< XSpellChecker >     xSpell;
     uno::Reference< XHyphenator >       xHyph;
     uno::Reference< XThesaurus >        xThes;
-    uno::Reference< XProofreader >      xGrammar;
-    BOOL                        bConfigured;
+    uno::Reference< XProofreader >   	xGrammar;
+    BOOL						bConfigured;
 
     ServiceInfo_Impl() : bConfigured(sal_False) {}
 };
@@ -549,7 +549,7 @@ typedef std::map< INT16 /*LanguageType*/, Sequence< OUString > >    LangImplName
 class SvxLinguData_Impl
 {
     //contains services and implementation names sorted by implementation names
-    ServiceInfoArr                      aDisplayServiceArr;
+    ServiceInfoArr			   			aDisplayServiceArr;
     ULONG                               nDisplayServices;
 
     Sequence< Locale >                  aAllServiceLocales;
@@ -789,7 +789,7 @@ SvxLinguData_Impl::SvxLinguData_Impl() :
 
         //read spell checker
         Sequence< OUString > aSpellNames = xLinguSrvcMgr->getAvailableServices(
-                        C2U(cSpell),    Locale() );
+                        C2U(cSpell),	Locale() );
         const OUString* pSpellNames = aSpellNames.getConstArray();
 
         sal_Int32 nIdx;
@@ -839,7 +839,7 @@ SvxLinguData_Impl::SvxLinguData_Impl() :
 
         //read hyphenator
         Sequence< OUString > aHyphNames = xLinguSrvcMgr->getAvailableServices(
-                        C2U(cHyph), Locale() );
+                        C2U(cHyph),	Locale() );
         const OUString* pHyphNames = aHyphNames.getConstArray();
         for(nIdx = 0; nIdx < aHyphNames.getLength(); nIdx++)
         {
@@ -863,7 +863,7 @@ SvxLinguData_Impl::SvxLinguData_Impl() :
 
         //read thesauri
         Sequence< OUString > aThesNames = xLinguSrvcMgr->getAvailableServices(
-                        C2U(cThes),     Locale() );
+                        C2U(cThes),		Locale() );
         const OUString* pThesNames = aThesNames.getConstArray();
         for(nIdx = 0; nIdx < aThesNames.getLength(); nIdx++)
         {
@@ -1105,9 +1105,9 @@ void SvxLinguData_Impl::Reconfigure( const OUString &rDisplayName, BOOL bEnable
 
 // class SvxLinguTabPage -------------------------------------------------
 
-#define CBCOL_FIRST     0
-#define CBCOL_SECOND    1
-#define CBCOL_BOTH      2
+#define CBCOL_FIRST		0
+#define CBCOL_SECOND	1
+#define CBCOL_BOTH		2
 
 SvxLinguTabPage::SvxLinguTabPage( Window* pParent,
                                   const SfxItemSet& rSet ):
@@ -1115,31 +1115,31 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent,
     SfxTabPage( pParent, CUI_RES( RID_SFXPAGE_LINGU ), rSet ),
 
     aLinguisticFL       ( this, CUI_RES( FL_LINGUISTIC ) ),
-    aLinguModulesFT     ( this, CUI_RES( FT_LINGU_MODULES ) ),
-    aLinguModulesCLB    ( this, CUI_RES( CLB_LINGU_MODULES ) ),
-    aLinguModulesEditPB ( this, CUI_RES( PB_LINGU_MODULES_EDIT ) ),
+    aLinguModulesFT		( this, CUI_RES( FT_LINGU_MODULES ) ),
+    aLinguModulesCLB	( this, CUI_RES( CLB_LINGU_MODULES ) ),
+    aLinguModulesEditPB	( this, CUI_RES( PB_LINGU_MODULES_EDIT ) ),
     aLinguDicsFT        ( this, CUI_RES( FT_LINGU_DICS ) ),
     aLinguDicsCLB       ( this, CUI_RES( CLB_LINGU_DICS ) ),
     aLinguDicsNewPB     ( this, CUI_RES( PB_LINGU_DICS_NEW_DIC ) ),
     aLinguDicsEditPB    ( this, CUI_RES( PB_LINGU_DICS_EDIT_DIC ) ),
     aLinguDicsDelPB     ( this, CUI_RES( PB_LINGU_DICS_DEL_DIC ) ),
-    aLinguOptionsFT     ( this, CUI_RES( FT_LINGU_OPTIONS ) ),
-    aLinguOptionsCLB    ( this, CUI_RES( CLB_LINGU_OPTIONS ) ),
+    aLinguOptionsFT		( this, CUI_RES( FT_LINGU_OPTIONS ) ),
+    aLinguOptionsCLB	( this, CUI_RES( CLB_LINGU_OPTIONS ) ),
     aLinguOptionsEditPB ( this, CUI_RES( PB_LINGU_OPTIONS_EDIT ) ),
     aMoreDictsLink      ( this, CUI_RES( FT_LINGU_OPTIONS_MOREDICTS ) ),
-    sCapitalWords       ( CUI_RES( STR_CAPITAL_WORDS ) ),
-    sWordsWithDigits    ( CUI_RES( STR_WORDS_WITH_DIGITS ) ),
-    sCapitalization     ( CUI_RES( STR_CAPITALIZATION ) ),
-    sSpellSpecial       ( CUI_RES( STR_SPELL_SPECIAL ) ),
-    sSpellAuto          ( CUI_RES( STR_SPELL_AUTO ) ),
+    sCapitalWords		( CUI_RES( STR_CAPITAL_WORDS ) ),
+    sWordsWithDigits	( CUI_RES( STR_WORDS_WITH_DIGITS ) ),
+    sCapitalization		( CUI_RES( STR_CAPITALIZATION ) ),
+    sSpellSpecial		( CUI_RES( STR_SPELL_SPECIAL ) ),
+    sSpellAuto			( CUI_RES( STR_SPELL_AUTO ) ),
     sGrammarAuto        ( CUI_RES( STR_GRAMMAR_AUTO ) ),
-    sNumMinWordlen      ( CUI_RES( STR_NUM_MIN_WORDLEN ) ),
-    sNumPreBreak        ( CUI_RES( STR_NUM_PRE_BREAK ) ),
-    sNumPostBreak       ( CUI_RES( STR_NUM_POST_BREAK ) ),
-    sHyphAuto           ( CUI_RES( STR_HYPH_AUTO ) ),
-    sHyphSpecial        ( CUI_RES( STR_HYPH_SPECIAL ) ),
+    sNumMinWordlen  	( CUI_RES( STR_NUM_MIN_WORDLEN ) ),
+    sNumPreBreak		( CUI_RES( STR_NUM_PRE_BREAK ) ),
+    sNumPostBreak		( CUI_RES( STR_NUM_POST_BREAK ) ),
+    sHyphAuto			( CUI_RES( STR_HYPH_AUTO ) ),
+    sHyphSpecial		( CUI_RES( STR_HYPH_SPECIAL ) ),
 
-    pLinguData          ( NULL )
+    pLinguData			( NULL )
 {
     pCheckButtonData = NULL;
 
@@ -1498,7 +1498,7 @@ void SvxLinguTabPage::UpdateDicBox_Impl()
     aLinguDicsCLB.SetUpdateMode(FALSE);
     aLinguDicsCLB.Clear();
 
-    INT32 nDics  = aDics.getLength();
+    INT32 nDics	 = aDics.getLength();
     const uno::Reference< XDictionary > *pDic = aDics.getConstArray();
     for (INT32 i = 0;  i < nDics;  ++i)
     {
@@ -1547,7 +1547,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet )
 
 
     //
-    //  get data from configuration
+    //	get data from configuration
     //
 
     SvtLinguConfig aLngCfg;
@@ -1562,7 +1562,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet )
     BOOL  bVal  = FALSE;
     ULONG nUserData = 0;
 
-    pEntry = CreateEntry( sSpellAuto,       CBCOL_FIRST );
+    pEntry = CreateEntry( sSpellAuto,		CBCOL_FIRST );
     aLngCfg.GetProperty( C2U(UPN_IS_SPELL_AUTO) ) >>= bVal;
     const SfxPoolItem* pItem = GetItem( rSet, SID_AUTOSPELL_CHECK );
     if (pItem)
@@ -1582,35 +1582,35 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet )
     pModel->Insert( pEntry );
     lcl_SetCheckButton( pEntry, bVal );
 
-    pEntry = CreateEntry( sCapitalWords,    CBCOL_FIRST );
+    pEntry = CreateEntry( sCapitalWords,	CBCOL_FIRST );
     aLngCfg.GetProperty( C2U(UPN_IS_SPELL_UPPER_CASE) ) >>= bVal;
     nUserData = OptionsUserData( EID_CAPITAL_WORDS, FALSE, 0, TRUE, bVal).GetUserData();
     pEntry->SetUserData( (void *)nUserData );
     pModel->Insert( pEntry );
     lcl_SetCheckButton( pEntry, bVal );
 
-    pEntry = CreateEntry( sWordsWithDigits, CBCOL_FIRST );
+    pEntry = CreateEntry( sWordsWithDigits,	CBCOL_FIRST );
     aLngCfg.GetProperty( C2U(UPN_IS_SPELL_WITH_DIGITS) ) >>= bVal;
     nUserData = OptionsUserData( EID_WORDS_WITH_DIGITS, FALSE, 0, TRUE, bVal).GetUserData();
     pEntry->SetUserData( (void *)nUserData );
     pModel->Insert( pEntry );
     lcl_SetCheckButton( pEntry, bVal );
 
-    pEntry = CreateEntry( sCapitalization,  CBCOL_FIRST );
+    pEntry = CreateEntry( sCapitalization,	CBCOL_FIRST );
     aLngCfg.GetProperty( C2U(UPN_IS_SPELL_CAPITALIZATION) ) >>= bVal;
     nUserData = OptionsUserData( EID_CAPITALIZATION, FALSE, 0, TRUE, bVal).GetUserData();
     pEntry->SetUserData( (void *)nUserData );
     pModel->Insert( pEntry );
     lcl_SetCheckButton( pEntry, bVal );
 
-    pEntry = CreateEntry( sSpellSpecial,    CBCOL_FIRST );
+    pEntry = CreateEntry( sSpellSpecial,	CBCOL_FIRST );
     aLngCfg.GetProperty( C2U(UPN_IS_SPELL_SPECIAL) ) >>= bVal;
     nUserData = OptionsUserData( EID_SPELL_SPECIAL, FALSE, 0, TRUE, bVal).GetUserData();
     pEntry->SetUserData( (void *)nUserData );
     pModel->Insert( pEntry );
     lcl_SetCheckButton( pEntry, bVal );
 
-    pEntry = CreateEntry( sNumMinWordlen,   CBCOL_SECOND );
+    pEntry = CreateEntry( sNumMinWordlen,	CBCOL_SECOND );
     aLngCfg.GetProperty( C2U(UPN_HYPH_MIN_WORD_LENGTH) ) >>= nVal;
     nUserData = OptionsUserData( EID_NUM_MIN_WORDLEN, TRUE, (USHORT)nVal, FALSE, FALSE).GetUserData();
     pEntry->SetUserData( (void *)nUserData );
@@ -1621,7 +1621,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet )
     if ( rSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_SET )
         pHyp = &( (const SfxHyphenRegionItem &) rSet.Get( nWhich ) );
 
-    pEntry = CreateEntry( sNumPreBreak,     CBCOL_SECOND );
+    pEntry = CreateEntry( sNumPreBreak,		CBCOL_SECOND );
     aLngCfg.GetProperty( C2U(UPN_HYPH_MIN_LEADING) ) >>= nVal;
     if (pHyp)
         nVal = (INT16) pHyp->GetMinLead();
@@ -1629,7 +1629,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet )
     pEntry->SetUserData( (void *)nUserData );
     pModel->Insert( pEntry );
 
-    pEntry = CreateEntry( sNumPostBreak,    CBCOL_SECOND );
+    pEntry = CreateEntry( sNumPostBreak,	CBCOL_SECOND );
     aLngCfg.GetProperty( C2U(UPN_HYPH_MIN_TRAILING) ) >>= nVal;
     if (pHyp)
         nVal = (INT16) pHyp->GetMinTrail();
@@ -1637,14 +1637,14 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet )
     pEntry->SetUserData( (void *)nUserData );
     pModel->Insert( pEntry );
 
-    pEntry = CreateEntry( sHyphAuto,        CBCOL_FIRST );
+    pEntry = CreateEntry( sHyphAuto,		CBCOL_FIRST );
     aLngCfg.GetProperty( C2U(UPN_IS_HYPH_AUTO) ) >>= bVal;
     nUserData = OptionsUserData( EID_HYPH_AUTO, FALSE, 0, TRUE, bVal).GetUserData();
     pEntry->SetUserData( (void *)nUserData );
     pModel->Insert( pEntry );
     lcl_SetCheckButton( pEntry, bVal );
 
-    pEntry = CreateEntry( sHyphSpecial,     CBCOL_FIRST );
+    pEntry = CreateEntry( sHyphSpecial,		CBCOL_FIRST );
     aLngCfg.GetProperty( C2U(UPN_IS_HYPH_SPECIAL) ) >>= bVal;
     nUserData = OptionsUserData( EID_HYPH_SPECIAL, FALSE, 0, TRUE, bVal).GetUserData();
     pEntry->SetUserData( (void *)nUserData );
@@ -1884,8 +1884,8 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn )
                 int nRID = -1;
                 switch (aData.GetEntryId())
                 {
-                    case EID_NUM_PRE_BREAK  : nRID = STR_NUM_PRE_BREAK_DLG; break;
-                    case EID_NUM_POST_BREAK : nRID = STR_NUM_POST_BREAK_DLG; break;
+                    case EID_NUM_PRE_BREAK	: nRID = STR_NUM_PRE_BREAK_DLG; break;
+                    case EID_NUM_POST_BREAK	: nRID = STR_NUM_POST_BREAK_DLG; break;
                     case EID_NUM_MIN_WORDLEN: nRID = STR_NUM_MIN_WORDLEN_DLG; break;
                     default:
                         DBG_ERROR( "unexpected case" );
@@ -1963,8 +1963,8 @@ SvLBoxEntry* SvxLinguTabPage::CreateEntry( String& rTxt, USHORT nCol )
     if (CBCOL_FIRST == nCol)
         pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData ) );
     if (CBCOL_SECOND == nCol)
-        pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) );    // Leerspalte
-    pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0));    // Sonst Puff!
+        pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) );	// Leerspalte
+    pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0));	// Sonst Puff!
     pEntry->AddItem( new BrwString_Impl( pEntry, 0, rTxt ) );
 
     return pEntry;
@@ -2130,8 +2130,8 @@ SvLBoxEntry* SvxEditModulesDlg::CreateEntry( String& rTxt, USHORT nCol )
     if (CBCOL_FIRST == nCol)
         pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData ) );
     if (CBCOL_SECOND == nCol)
-        pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) );    // Leerspalte
-    pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0));    // Sonst Puff!
+        pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) );	// Leerspalte
+    pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0));	// Sonst Puff!
     pEntry->AddItem( new BrwStringDic_Impl( pEntry, 0, rTxt ) );
 
     return pEntry;
@@ -2152,7 +2152,7 @@ IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvxCheckListBox *, pBox )
             ModuleUserData_Impl* pData = (ModuleUserData_Impl*)pEntry->GetUserData();
             if(!pData->IsParent() && pData->GetType() != TYPE_HYPH)
             {
-                USHORT  nCurPos = pBox->GetSelectEntryPos();
+                USHORT	nCurPos = pBox->GetSelectEntryPos();
                 if(nCurPos < pBox->GetEntryCount() - 1)
                 {
                     bDisableDown = ((ModuleUserData_Impl*)pBox->
@@ -2233,7 +2233,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
     Locale aCurLocale;
     SvxLanguageToLocale(aCurLocale, eCurLanguage);
     SvLBoxTreeList *pModel = aModulesCLB.GetModel();
-//  uno::Reference<XLinguServiceManager>&   xMgr = rLinguData.GetManager();
+//	uno::Reference<XLinguServiceManager>&   xMgr = rLinguData.GetManager();
 
     if (pBox)
     {
@@ -2299,7 +2299,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
     aModulesCLB.Clear();
     if(LANGUAGE_DONTKNOW != eCurLanguage)
     {
-//      sal_Int32 nEntryPos = 1;
+//		sal_Int32 nEntryPos = 1;
 
         ULONG n;
         ServiceInfo_Impl* pInfo;
@@ -2307,7 +2307,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
         //
         // spellchecker entries
         //
-        SvLBoxEntry* pEntry = CreateEntry( sSpell,  CBCOL_SECOND );
+        SvLBoxEntry* pEntry = CreateEntry( sSpell,	CBCOL_SECOND );
         ModuleUserData_Impl* pUserData = new ModuleUserData_Impl(
                                          String(), TRUE, FALSE, TYPE_SPELL, 0 );
         pEntry->SetUserData( (void *)pUserData );
@@ -2316,11 +2316,11 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
         Sequence< OUString > aNames( rLinguData.GetSortedImplNames( eCurLanguage, TYPE_SPELL ) );
         const OUString *pName = aNames.getConstArray();
         ULONG nNames = (ULONG) aNames.getLength();
-        sal_Int32 nLocalIndex = 0;  // index relative to parent
+        sal_Int32 nLocalIndex = 0;	// index relative to parent
         for (n = 0;  n < nNames;  ++n)
         {
             OUString aImplName;
-            BOOL     bIsSuppLang = FALSE;
+            BOOL	 bIsSuppLang = FALSE;
 
             pInfo = rLinguData.GetInfoByImplName( pName[n] );
             if (pInfo)
@@ -2338,7 +2338,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
                 const bool bHasLang = rTable.count( eCurLanguage );
                 if (!bHasLang)
                 {
-                    DBG_WARNING( "language entry missing" );    // only relevant if all languages found should be supported
+                    DBG_WARNING( "language entry missing" );	// only relevant if all languages found should be supported
                 }
                 const bool bCheck = bHasLang && lcl_SeqGetEntryPos( rTable[ eCurLanguage ], aImplName ) >= 0;
                 lcl_SetCheckButton( pNewEntry, bCheck );
@@ -2396,7 +2396,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
         //
         // hyphenator entries
         //
-        pEntry = CreateEntry( sHyph,    CBCOL_SECOND );
+        pEntry = CreateEntry( sHyph,	CBCOL_SECOND );
         pUserData = new ModuleUserData_Impl( String(), TRUE, FALSE, TYPE_HYPH, 0 );
         pEntry->SetUserData( (void *)pUserData );
         pModel->Insert( pEntry );
@@ -2408,7 +2408,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
         for (n = 0;  n < nNames;  ++n)
         {
             OUString aImplName;
-            BOOL     bIsSuppLang = FALSE;
+            BOOL	 bIsSuppLang = FALSE;
 
             pInfo = rLinguData.GetInfoByImplName( pName[n] );
             if (pInfo)
@@ -2426,7 +2426,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
                 const bool bHasLang = rTable.count( eCurLanguage );
                 if (!bHasLang)
                 {
-                    DBG_WARNING( "language entry missing" );    // only relevant if all languages found should be supported
+                    DBG_WARNING( "language entry missing" );	// only relevant if all languages found should be supported
                 }
                 const bool bCheck = bHasLang && lcl_SeqGetEntryPos( rTable[ eCurLanguage ], aImplName ) >= 0;
                 lcl_SetCheckButton( pNewEntry, bCheck );
@@ -2440,7 +2440,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
         //
         // thesaurus entries
         //
-        pEntry = CreateEntry( sThes,    CBCOL_SECOND );
+        pEntry = CreateEntry( sThes,	CBCOL_SECOND );
         pUserData = new ModuleUserData_Impl( String(), TRUE, FALSE, TYPE_THES, 0 );
         pEntry->SetUserData( (void *)pUserData );
         pModel->Insert( pEntry );
@@ -2452,7 +2452,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
         for (n = 0;  n < nNames;  ++n)
         {
             OUString aImplName;
-            BOOL     bIsSuppLang = FALSE;
+            BOOL	 bIsSuppLang = FALSE;
 
             pInfo = rLinguData.GetInfoByImplName( pName[n] );
             if (pInfo)
@@ -2470,7 +2470,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
                 const bool bHasLang = rTable.count( eCurLanguage );
                 if (!bHasLang)
                 {
-                    DBG_WARNING( "language entry missing" );    // only relevant if all languages found should be supported
+                    DBG_WARNING( "language entry missing" );	// only relevant if all languages found should be supported
                 }
                 const bool bCheck = bHasLang && lcl_SeqGetEntryPos( rTable[ eCurLanguage ], aImplName ) >= 0;
                 lcl_SetCheckButton( pNewEntry, bCheck );
@@ -2491,7 +2491,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
 IMPL_LINK( SvxEditModulesDlg, UpDownHdl_Impl, PushButton *, pBtn )
 {
     sal_Bool bUp = &aPrioUpPB == pBtn;
-    USHORT  nCurPos = aModulesCLB.GetSelectEntryPos();
+    USHORT	nCurPos = aModulesCLB.GetSelectEntryPos();
     SvLBoxEntry* pEntry;
     if (nCurPos != LISTBOX_ENTRY_NOTFOUND  &&
         0 != (pEntry = aModulesCLB.GetEntry(nCurPos)))
diff --git a/cui/source/options/optlingu.hrc b/cui/source/options/optlingu.hrc
index 6a73b7321235..9121c68a5eed 100644
--- a/cui/source/options/optlingu.hrc
+++ b/cui/source/options/optlingu.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 #define FL_LINGUISTIC           101
 
-#define FT_LINGU_MODULES        111
-#define CLB_LINGU_MODULES       112
-#define PB_LINGU_MODULES_EDIT   113
+#define FT_LINGU_MODULES		111
+#define CLB_LINGU_MODULES		112
+#define PB_LINGU_MODULES_EDIT	113
 
 #define FT_LINGU_OPTIONS            121
 #define CLB_LINGU_OPTIONS           122
 #define PB_LINGU_OPTIONS_EDIT       123
 #define FT_LINGU_OPTIONS_MOREDICTS  124
 
-#define STR_CAPITAL_WORDS       201
-#define STR_WORDS_WITH_DIGITS   202
-#define STR_CAPITALIZATION      203
-#define STR_SPELL_SPECIAL       204
-#define STR_SPELL_AUTO          206
-#define STR_NUM_PRE_BREAK       209
-#define STR_NUM_POST_BREAK      210
-#define STR_HYPH_AUTO           211
-#define STR_HYPH_SPECIAL        212
-#define STR_NUM_MIN_WORDLEN     213
+#define STR_CAPITAL_WORDS		201
+#define STR_WORDS_WITH_DIGITS	202
+#define STR_CAPITALIZATION		203
+#define STR_SPELL_SPECIAL		204
+#define STR_SPELL_AUTO			206
+#define STR_NUM_PRE_BREAK		209
+#define STR_NUM_POST_BREAK		210
+#define STR_HYPH_AUTO			211
+#define STR_HYPH_SPECIAL		212
+#define STR_NUM_MIN_WORDLEN		213
 
-#define STR_NUM_PRE_BREAK_DLG   214
-#define STR_NUM_POST_BREAK_DLG  215
-#define STR_NUM_MIN_WORDLEN_DLG 216
+#define STR_NUM_PRE_BREAK_DLG	214
+#define STR_NUM_POST_BREAK_DLG	215
+#define STR_NUM_MIN_WORDLEN_DLG	216
 
 #define STR_GRAMMAR_AUTO        217
 
-#define STR_WARNING             63
+#define STR_WARNING				63
 
 #define PB_OK                               70
 #define PB_HELP                             72
@@ -71,7 +71,7 @@
 #define ED_PREBREAK                         308
 #define PB_EDIT_MODULES_PRIO_UP             309
 #define PB_EDIT_MODULES_PRIO_DOWN           310
-#define PB_EDIT_MODULES_PRIO_BACK           311
+#define PB_EDIT_MODULES_PRIO_BACK			311
 
 #define FT_LINGU_DICS                       312
 #define CLB_LINGU_DICS                      313
diff --git a/cui/source/options/optlingu.src b/cui/source/options/optlingu.src
index be0378f171e8..3b94571b0219 100644
--- a/cui/source/options/optlingu.src
+++ b/cui/source/options/optlingu.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index 4dcba55284bb..2ed0af30e287 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ using namespace ::rtl;
 using namespace ::sfx2;
 
 
-#define NF2BYTES        104857.6                        // 2^20/10, used for aNfGraphicObjectCache-unit -> Byte
-#define BYTES2NF        (1.0/NF2BYTES)                  // 10/2^20
+#define NF2BYTES		104857.6						// 2^20/10, used for aNfGraphicObjectCache-unit -> Byte
+#define BYTES2NF		(1.0/NF2BYTES)					// 10/2^20
 
 
 inline long OfaMemoryOptionsPage::GetNfGraphicCacheVal( void ) const
@@ -128,8 +128,8 @@ OfaMemoryOptionsPage::OfaMemoryOptionsPage(Window* pParent, const SfxItemSet& rS
     SfxTabPage( pParent, CUI_RES( OFA_TP_MEMORY ), rSet ),
 
     aUndoBox                ( this, CUI_RES( GB_UNDO ) ),
-    aUndoText               ( this, CUI_RES( FT_UNDO ) ),
-    aUndoEdit               ( this, CUI_RES( ED_UNDO ) ),
+    aUndoText			    ( this,	CUI_RES( FT_UNDO ) ),
+    aUndoEdit			    ( this,	CUI_RES( ED_UNDO ) ),
     aGbGraphicCache         ( this, CUI_RES( GB_GRAPHICCACHE ) ),
     aFtGraphicCache         ( this, CUI_RES( FT_GRAPHICCACHE ) ),
     aNfGraphicCache         ( this, CUI_RES( NF_GRAPHICCACHE ) ),
@@ -173,7 +173,7 @@ OfaMemoryOptionsPage::~OfaMemoryOptionsPage()
 
 // -----------------------------------------------------------------------
 
-SfxTabPage* OfaMemoryOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage*	OfaMemoryOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
 {
     return new OfaMemoryOptionsPage( pParent, rAttrSet );
 }
@@ -230,7 +230,7 @@ void OfaMemoryOptionsPage::Reset( const SfxItemSet& rSet )
     aUndoEdit.SaveValue();
 
     // GraphicCache
-    long    n = aCacheOptions.GetGraphicManagerTotalCacheSize();
+    long	n = aCacheOptions.GetGraphicManagerTotalCacheSize();
     SetNfGraphicCacheVal( n );
     SetNfGraphicObjectCacheVal( Min( static_cast<sal_Int32>(GetNfGraphicCacheVal()), aCacheOptions.GetGraphicManagerObjectCacheSize() ) );
 
@@ -260,7 +260,7 @@ void OfaMemoryOptionsPage::Reset( const SfxItemSet& rSet )
 
 IMPL_LINK( OfaMemoryOptionsPage, GraphicCacheConfigHdl, NumericField*, EMPTYARG )
 {
-    long    n = GetNfGraphicCacheVal();
+    long	n = GetNfGraphicCacheVal();
     SetNfGraphicObjectCacheMax( n );
     SetNfGraphicObjectCacheLast( n );
 
diff --git a/cui/source/options/optmemory.hrc b/cui/source/options/optmemory.hrc
index 52fb7ed7c2d1..134a321263d0 100644
--- a/cui/source/options/optmemory.hrc
+++ b/cui/source/options/optmemory.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,56 +31,56 @@
 
 // defines for positions and sizes ---------------------------------------
 
-#define WHOLE_WIDTH             248
+#define WHOLE_WIDTH				248
 
-#define COLSPACE                RSC_SP_CTRL_DESC_X
-#define COL0                    6
-#define COL1                    (COL0+6)
-#define COL2                    (COL1+140)          // width text before control
-#define COL3                    (COL2+COLSPACE)
-#define COL4                    (COL3+30)           // width control
-#define COL5                    (COL4+COLSPACE)
-#define COL6                    (WHOLE_WIDTH)       // width text after control (unit)
+#define COLSPACE				RSC_SP_CTRL_DESC_X
+#define COL0					6
+#define COL1					(COL0+6)
+#define COL2					(COL1+140)			// width text before control
+#define COL3					(COL2+COLSPACE)
+#define COL4					(COL3+30)			// width control
+#define COL5					(COL4+COLSPACE)
+#define COL6					(WHOLE_WIDTH)		// width text after control (unit)
 
-#define ROWSPACE                RSC_SP_CTRL_DESC_Y
-#define ROW0                    3
-#define ROW1                    ( ROW0+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE )
-#define ROW2                    ( ROW1+RSC_CD_TEXTBOX_HEIGHT+ROWSPACE )
-#define ROW3                    ( ROW2+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE )
-#define ROW4                    ( ROW3+RSC_CD_TEXTBOX_HEIGHT+ROWSPACE )
-#define ROW5                    ( ROW4+RSC_CD_TEXTBOX_HEIGHT+ROWSPACE )
-#define ROW6                    ( ROW5+RSC_CD_TEXTBOX_HEIGHT+ROWSPACE )
-#define ROW7                    ( ROW6+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE )
-#define ROW8                    ( ROW7+RSC_CD_TEXTBOX_HEIGHT+ROWSPACE )
-#define ROW9                    ( ROW8+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE )
+#define ROWSPACE				RSC_SP_CTRL_DESC_Y
+#define ROW0					3
+#define ROW1					( ROW0+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE )
+#define ROW2					( ROW1+RSC_CD_TEXTBOX_HEIGHT+ROWSPACE )
+#define ROW3					( ROW2+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE )
+#define ROW4					( ROW3+RSC_CD_TEXTBOX_HEIGHT+ROWSPACE )
+#define ROW5					( ROW4+RSC_CD_TEXTBOX_HEIGHT+ROWSPACE )
+#define ROW6					( ROW5+RSC_CD_TEXTBOX_HEIGHT+ROWSPACE )
+#define ROW7					( ROW6+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE )
+#define ROW8					( ROW7+RSC_CD_TEXTBOX_HEIGHT+ROWSPACE )
+#define ROW9					( ROW8+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE )
 
-#define DIFF(v1,v2)             (v2-v1)
-#define OFFS_TEXTBOX_FIXEDTEXT(base)    (base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)
+#define DIFF(v1,v2)				(v2-v1)
+#define OFFS_TEXTBOX_FIXEDTEXT(base)	(base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)
 
-#define WIDTH1                  DIFF( COL1, COL2 )
-#define WIDTH2                  DIFF( COL3, COL4 )
-#define WIDTH3                  DIFF( COL5, COL6 )
+#define WIDTH1					DIFF( COL1, COL2 )
+#define WIDTH2					DIFF( COL3, COL4 )
+#define WIDTH3					DIFF( COL5, COL6 )
 // tabpage memory --------------------------------------------------------
 
-#define GB_UNDO                         10
-#define FT_UNDO                         11
-#define ED_UNDO                         12
-#define GB_GRAPHICCACHE                 13
-#define FT_GRAPHICCACHE                 14
-#define FT_GRAPHICCACHE_UNIT            15
-#define FT_GRAPHICOBJECTCACHE_UNIT      16
-#define FT_GRAPHICOBJECTTIME_UNIT       17
-#define NF_GRAPHICCACHE                 18
-#define FT_GRAPHICOBJECTCACHE           19
-#define NF_GRAPHICOBJECTCACHE           20
-#define FT_GRAPHICOBJECTTIME            21
-#define TF_GRAPHICOBJECTTIME            22
-#define GB_OLECACHE                     23
-#define FT_OLECACHE                     24
-#define NF_OLECACHE                     25
-#define FL_QUICKLAUNCH                  26
-#define CB_QUICKLAUNCH                  27
-#define STR_QUICKLAUNCH_UNX                 28
+#define GB_UNDO							10
+#define FT_UNDO							11
+#define ED_UNDO							12
+#define GB_GRAPHICCACHE					13
+#define FT_GRAPHICCACHE					14
+#define FT_GRAPHICCACHE_UNIT			15
+#define FT_GRAPHICOBJECTCACHE_UNIT		16
+#define FT_GRAPHICOBJECTTIME_UNIT		17
+#define NF_GRAPHICCACHE					18
+#define FT_GRAPHICOBJECTCACHE			19
+#define NF_GRAPHICOBJECTCACHE			20
+#define FT_GRAPHICOBJECTTIME			21
+#define TF_GRAPHICOBJECTTIME			22
+#define GB_OLECACHE						23
+#define FT_OLECACHE						24
+#define NF_OLECACHE                 	25
+#define FL_QUICKLAUNCH					26
+#define CB_QUICKLAUNCH					27
+#define STR_QUICKLAUNCH_UNX 				28
 
 #endif // #ifndef _OFA_OPTMEMORY_HRC
 
diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx
index 8068ab53aaca..0abf60e662ea 100644
--- a/cui/source/options/optmemory.hxx
+++ b/cui/source/options/optmemory.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <vcl/fixed.hxx>
 #include <sfx2/tabdlg.hxx>
 #include <svx/langbox.hxx>
-#define FOLDERWEBVIEW_DEFAULTFILE   "folder.so"
+#define FOLDERWEBVIEW_DEFAULTFILE	"folder.so"
 
 // class OfaMiscTabPage --------------------------------------------------
 
@@ -43,36 +43,36 @@ class OfaMemoryOptionsPage : public SfxTabPage
     using SfxTabPage::DeactivatePage;
 private:
     FixedLine           aUndoBox;
-    FixedText           aUndoText;
-    NumericField        aUndoEdit;
+    FixedText			aUndoText;
+    NumericField		aUndoEdit;
 
     FixedLine           aGbGraphicCache;
-    FixedText           aFtGraphicCache;
-    NumericField        aNfGraphicCache;
+    FixedText			aFtGraphicCache;
+    NumericField		aNfGraphicCache;
     FixedText           aFtGraphicCacheUnit;
-    FixedText           aFtGraphicObjectCache;
-    NumericField        aNfGraphicObjectCache;
+    FixedText			aFtGraphicObjectCache;
+    NumericField		aNfGraphicObjectCache;
     FixedText           aFtGraphicObjectCacheUnit;
-    FixedText           aFtGraphicObjectTime;
-    TimeField           aTfGraphicObjectTime;
+    FixedText			aFtGraphicObjectTime;
+    TimeField			aTfGraphicObjectTime;
     FixedText           aFtGraphicObjectTimeUnit;
 
     FixedLine           aGbOLECache;
-    FixedText           aFtOLECache;
-    NumericField        aNfOLECache;
+    FixedText			aFtOLECache;
+    NumericField		aNfOLECache;
 
     FixedLine           aQuickLaunchFL;
     CheckBox            aQuickLaunchCB;
 
     DECL_LINK( GraphicCacheConfigHdl, NumericField* );
 
-    inline long         GetNfGraphicCacheVal( void ) const;                 // returns # of Bytes
-    inline void         SetNfGraphicCacheVal( long nSizeInBytes );
+    inline long			GetNfGraphicCacheVal( void ) const;					// returns # of Bytes
+    inline void			SetNfGraphicCacheVal( long nSizeInBytes );
 
-    long                GetNfGraphicObjectCacheVal( void ) const;           // returns # of Bytes
-    void                SetNfGraphicObjectCacheVal( long nSizeInBytes );
-    inline void         SetNfGraphicObjectCacheMax( long nSizeInBytes );
-    inline void         SetNfGraphicObjectCacheLast( long nSizeInBytes );
+    long				GetNfGraphicObjectCacheVal( void ) const;			// returns # of Bytes
+    void				SetNfGraphicObjectCacheVal( long nSizeInBytes );
+    inline void			SetNfGraphicObjectCacheMax( long nSizeInBytes );
+    inline void			SetNfGraphicObjectCacheLast( long nSizeInBytes );
 protected:
     virtual int         DeactivatePage( SfxItemSet* pSet = NULL );
 
@@ -80,10 +80,10 @@ public:
     OfaMemoryOptionsPage( Window* pParent, const SfxItemSet& rSet );
     ~OfaMemoryOptionsPage();
 
-    static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
+    static SfxTabPage*	Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	void 		Reset( const SfxItemSet& rSet );
 };
 
 
diff --git a/cui/source/options/optmemory.src b/cui/source/options/optmemory.src
index 557fa6a8d960..37f4563e66e9 100644
--- a/cui/source/options/optmemory.src
+++ b/cui/source/options/optmemory.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 5a4f22495629..8b6b8f64af51 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 ---------------------------------------------------------------
 
-#include <svx/svxdlg.hxx>
+#include <svx/svxdlg.hxx> 
 #include <tools/shl.hxx>
 #include <vcl/msgbox.hxx>
 #include <sfx2/filedlghelper.hxx>
@@ -76,9 +76,9 @@ using namespace svx;
 
 // define ----------------------------------------------------------------
 
-#define TAB_WIDTH1      80
+#define TAB_WIDTH1		80
 #define TAB_WIDTH_MIN   10
-#define TAB_WIDTH2      1000
+#define TAB_WIDTH2		1000
 #define ITEMID_TYPE       1
 #define ITEMID_PATH       2
 
@@ -87,7 +87,7 @@ using namespace svx;
 #define POSTFIX_WRITABLE    String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "_writable" ) )
 #define POSTFIX_READONLY    String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "_readonly" ) )
 #define VAR_ONE             String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "%1" ) )
-#define IODLG_CONFIGNAME    String(DEFINE_CONST_UNICODE("FilePicker_Save"))
+#define IODLG_CONFIGNAME	String(DEFINE_CONST_UNICODE("FilePicker_Save"))
 
 // struct OptPath_Impl ---------------------------------------------------
 
@@ -218,14 +218,14 @@ SvxPathTabPage::SvxPathTabPage( Window* pParent, const SfxItemSet& rSet ) :
 
     SfxTabPage( pParent, CUI_RES( RID_SFXPAGE_PATH ), rSet ),
 
-    aStdBox         ( this, CUI_RES( GB_STD ) ),
-    aTypeText       ( this, CUI_RES( FT_TYPE ) ),
-    aPathText       ( this, CUI_RES( FT_PATH ) ),
-    aPathCtrl       ( this, CUI_RES( LB_PATH ) ),
-    aStandardBtn    ( this, CUI_RES( BTN_STANDARD ) ),
-    aPathBtn        ( this, CUI_RES( BTN_PATH ) ),
-    pHeaderBar      ( NULL ),
-    pPathBox        ( NULL ),
+    aStdBox			( this, CUI_RES( GB_STD ) ),
+    aTypeText		( this, CUI_RES( FT_TYPE ) ),
+    aPathText		( this, CUI_RES( FT_PATH ) ),
+    aPathCtrl		( this, CUI_RES( LB_PATH ) ),
+    aStandardBtn	( this, CUI_RES( BTN_STANDARD ) ),
+    aPathBtn		( this, CUI_RES( BTN_PATH ) ),
+    pHeaderBar		( NULL ),
+    pPathBox		( NULL ),
     pImpl           ( new OptPath_Impl( CUI_RES(IMG_LOCK), CUI_RES(IMG_LOCK_HC) ) ),
     xDialogListener ( new ::svt::DialogClosedListener() )
 
@@ -291,7 +291,7 @@ SvxPathTabPage::~SvxPathTabPage()
 
 // -----------------------------------------------------------------------
 
-SfxTabPage* SvxPathTabPage::Create( Window* pParent,
+SfxTabPage*	SvxPathTabPage::Create( Window* pParent,
                                     const SfxItemSet& rAttrSet )
 {
     return ( new SvxPathTabPage( pParent, rAttrSet ) );
@@ -374,7 +374,7 @@ void SvxPathTabPage::Reset( const SfxItemSet& )
         HeaderEndDrag_Impl( NULL );
         // Sortierrichtung restaurieren
         BOOL bUp = (BOOL)(USHORT)aUserData.GetToken(1).ToInt32();
-        HeaderBarItemBits nBits = pHeaderBar->GetItemBits(ITEMID_TYPE);
+        HeaderBarItemBits nBits	= pHeaderBar->GetItemBits(ITEMID_TYPE);
 
         if ( bUp )
         {
@@ -398,7 +398,7 @@ void SvxPathTabPage::FillUserData()
 {
     String aUserData = String::CreateFromInt32( pHeaderBar->GetItemSize( ITEMID_TYPE ) );
     aUserData += ';';
-    HeaderBarItemBits nBits = pHeaderBar->GetItemBits( ITEMID_TYPE );
+    HeaderBarItemBits nBits	= pHeaderBar->GetItemBits( ITEMID_TYPE );
     BOOL bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW );
     aUserData += bUp ? '1' : '0';
     SetUserData( aUserData );
@@ -408,7 +408,7 @@ void SvxPathTabPage::FillUserData()
 
 IMPL_LINK( SvxPathTabPage, PathSelect_Impl, svx::OptHeaderTabListBox *, EMPTYARG )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
 */
 
@@ -640,7 +640,7 @@ IMPL_LINK( SvxPathTabPage, PathHdl_Impl, PushButton *, EMPTYARG )
             xFolderPicker = ::com::sun::star::uno::Reference< XFolderPicker >(
                 xFactory->createInstance( aService ), UNO_QUERY );
 
-//          svt::SetDialogHelpId( xFolderPicker, HID_OPTIONS_PATHS_SELECTFOLDER );
+//			svt::SetDialogHelpId( xFolderPicker, HID_OPTIONS_PATHS_SELECTFOLDER );
 
             INetURLObject aURL( sWritable, INET_PROT_FILE );
             xFolderPicker->setDisplayDirectory( aURL.GetMainURL( INetURLObject::NO_DECODE ) );
@@ -673,7 +673,7 @@ IMPL_LINK( SvxPathTabPage, HeaderSelect_Impl, HeaderBar*, pBar )
     if ( pBar && pBar->GetCurItemId() != ITEMID_TYPE )
         return 0;
 
-    HeaderBarItemBits nBits = pHeaderBar->GetItemBits(ITEMID_TYPE);
+    HeaderBarItemBits nBits	= pHeaderBar->GetItemBits(ITEMID_TYPE);
     BOOL bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW );
     SvSortMode eMode = SortAscending;
 
diff --git a/cui/source/options/optpath.hrc b/cui/source/options/optpath.hrc
index c32919308842..bb7abf2c4284 100644
--- a/cui/source/options/optpath.hrc
+++ b/cui/source/options/optpath.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 // defines ---------------------------------------------------------------
 
-#define FT_TYPE                 10
-#define FT_PATH                 11
-#define LB_PATH                 12
-#define BTN_PATH                13
-#define BTN_STANDARD            14
-#define GB_STD                  15
+#define FT_TYPE 	 			10
+#define FT_PATH 	 			11
+#define LB_PATH 	 			12
+#define BTN_PATH	 			13
+#define BTN_STANDARD 			14
+#define GB_STD		 			15
 #define IMG_LOCK                16
 #define IMG_LOCK_HC             17
 #define STR_MULTIPATHDLG        18
diff --git a/cui/source/options/optpath.src b/cui/source/options/optpath.src
index 6b02abb5764a..22e4557204eb 100644
--- a/cui/source/options/optpath.src
+++ b/cui/source/options/optpath.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ TabPage RID_SFXPAGE_PATH
     {
         Pos = MAP_APPFONT ( 115 , 165 ) ;
         Size = MAP_APPFONT ( 65 , 14 ) ;
-        Text [ en-US ] = "~Default" ;
+        Text [ en-US ] = "~Default" ; 
     };
     FixedLine GB_STD
     {
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 261390df80c5..8ca887306f99 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class SvxAlienFilterWarningConfig_Impl : public utl::ConfigItem
         SvxAlienFilterWarningConfig_Impl();
         ~SvxAlienFilterWarningConfig_Impl();
 
-    virtual void            Commit();
+    virtual void			Commit();
 
     void                    ResetWarning()
                             {
@@ -206,7 +206,7 @@ SfxSaveTabPage::SfxSaveTabPage( Window* pParent, const SfxItemSet& rCoreSet ) :
     aBackupFI           ( this, CUI_RES( FI_BACKUP ) ),
     aBackupCB           ( this, CUI_RES( BTN_BACKUP ) ),
     aAutoSaveCB         ( this, CUI_RES( BTN_AUTOSAVE ) ),
-    aAutoSaveEdit       ( this, CUI_RES( ED_AUTOSAVE ) ),
+    aAutoSaveEdit		( this,	CUI_RES( ED_AUTOSAVE ) ),
     aMinuteFT           ( this, CUI_RES( FT_MINUTE ) ),
     aRelativeFsysCB     ( this, CUI_RES( BTN_RELATIVE_FSYS ) ),
     aRelativeInetCB     ( this, CUI_RES( BTN_RELATIVE_INET ) ),
@@ -319,7 +319,7 @@ SfxSaveTabPage::~SfxSaveTabPage()
 
 // -----------------------------------------------------------------------
 
-SfxTabPage* SfxSaveTabPage::Create( Window* pParent,
+SfxTabPage*	SfxSaveTabPage::Create( Window* pParent,
                                     const SfxItemSet& rAttrSet )
 {
     return ( new SfxSaveTabPage( pParent, rAttrSet ) );
@@ -584,13 +584,13 @@ void SfxSaveTabPage::Reset( const SfxItemSet& )
                     String sReplace;
                     switch(nData)
                     {
-                        case  APP_WRITER        : sReplace = C2U("com.sun.star.text.TextDocument");  break;
-                        case  APP_WRITER_WEB    : sReplace = C2U("com.sun.star.text.WebDocument");   break;
+                        case  APP_WRITER     	: sReplace = C2U("com.sun.star.text.TextDocument");  break;
+                        case  APP_WRITER_WEB 	: sReplace = C2U("com.sun.star.text.WebDocument");   break;
                         case  APP_WRITER_GLOBAL : sReplace = C2U("com.sun.star.text.GlobalDocument");   break;
-                        case  APP_CALC          : sReplace = C2U("com.sun.star.sheet.SpreadsheetDocument");break;
-                        case  APP_IMPRESS       : sReplace = C2U("com.sun.star.presentation.PresentationDocument");break;
-                        case  APP_DRAW          : sReplace = C2U("com.sun.star.drawing.DrawingDocument");break;
-                        case  APP_MATH          : sReplace = C2U("com.sun.star.formula.FormulaProperties");break;
+                        case  APP_CALC       	: sReplace = C2U("com.sun.star.sheet.SpreadsheetDocument");break;
+                        case  APP_IMPRESS    	: sReplace = C2U("com.sun.star.presentation.PresentationDocument");break;
+                        case  APP_DRAW       	: sReplace = C2U("com.sun.star.drawing.DrawingDocument");break;
+                        case  APP_MATH       	: sReplace = C2U("com.sun.star.formula.FormulaProperties");break;
                         default: DBG_ERROR("illegal user data");
                     }
                     String sTmp(sCommand);
@@ -676,7 +676,7 @@ void SfxSaveTabPage::Reset( const SfxItemSet& )
     aSizeOptimizationCB.SaveValue();
     aAutoSaveCB.SaveValue();
     aAutoSaveEdit.SaveValue();
-//  aAutoSavePromptBtn.SaveValue();
+//	aAutoSavePromptBtn.SaveValue();
 
     aRelativeFsysCB.SaveValue();
     aRelativeInetCB.SaveValue();
@@ -693,14 +693,14 @@ IMPL_LINK( SfxSaveTabPage, AutoClickHdl_Impl, CheckBox *, pBox )
         {
             aAutoSaveEdit.Enable();
             aMinuteFT.Enable();
-//          aAutoSavePromptBtn.Enable();
+//			aAutoSavePromptBtn.Enable();
             aAutoSaveEdit.GrabFocus();
         }
         else
         {
             aAutoSaveEdit.Disable();
             aMinuteFT.Disable();
-//          aAutoSavePromptBtn.Disable();
+//			aAutoSavePromptBtn.Disable();
         }
     }
     return 0;
diff --git a/cui/source/options/optsave.hrc b/cui/source/options/optsave.hrc
index 4cbdc0e2db4b..6ded85c61a3c 100644
--- a/cui/source/options/optsave.hrc
+++ b/cui/source/options/optsave.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index 519438a245b6..1a258d1d7109 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,12 +96,12 @@ public:
     SvxSaveTabPage( Window* pParent, const SfxItemSet& rSet );
     virtual ~SvxSaveTabPage();
 
-    static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
+    static SfxTabPage*	Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	void 		Reset( const SfxItemSet& rSet );
 };
 
-#endif  // #ifndef _SVX_OPTSAVE_HXX
+#endif	// #ifndef _SVX_OPTSAVE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src
index 36fc60e94435..1a44118d6779 100644
--- a/cui/source/options/optsave.src
+++ b/cui/source/options/optsave.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/options/optspell.hrc b/cui/source/options/optspell.hrc
index c2f71de15d69..446b2adbb8ab 100644
--- a/cui/source/options/optspell.hrc
+++ b/cui/source/options/optspell.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 // defines ---------------------------------------------------------------
 
-#define BTN_OK      10
-#define BTN_CANCEL  11
-#define BTN_BOOK    12
+#define BTN_OK		10
+#define BTN_CANCEL	11
+#define BTN_BOOK	12
 
-#define LB_BOOK     20
-#define GB_BOOK     21
+#define LB_BOOK		20
+#define GB_BOOK		21
 
-#define BTN_CAPS    30
-#define BTN_NUMS    31
-#define BTN_UPLOW   32
-#define GB_AUDIT    33
+#define BTN_CAPS	30
+#define BTN_NUMS	31
+#define BTN_UPLOW	32
+#define GB_AUDIT	33
 
 
diff --git a/cui/source/options/optspell.src b/cui/source/options/optspell.src
index e4241d4e4bb4..bd242a87d0d7 100644
--- a/cui/source/options/optspell.src
+++ b/cui/source/options/optspell.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 131e3bbda5d9..ca1a9acc10b9 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage( Window* pParent, const SfxItemSe
 
     // dynamical length of the PushButtons
     CalcButtonWidth();
-
+    
     m_aLastCheckedTemplate = m_aLastChecked.GetText();
 
     UpdateLastCheckedText();
@@ -137,7 +137,7 @@ void SvxOnlineUpdateTabPage::UpdateLastCheckedText()
 
         Date  aDate;
         Time  aTime;
-
+        
         lastCheckedTV.Seconds = (sal_uInt32) lastChecked;
         osl_getLocalTimeFromSystemTime( &lastCheckedTV, &lastCheckedTV );
 
@@ -168,7 +168,7 @@ void SvxOnlineUpdateTabPage::UpdateLastCheckedText()
         sal_Int32 nIndex = aText.indexOf( UNISTRING( "%DATE%" ) );
         if ( nIndex != -1 )
             aText = aText.replaceAt( nIndex, 6, aDateStr );
-
+    
         nIndex = aText.indexOf( UNISTRING( "%TIME%" ) );
         if ( nIndex != -1 )
             aText = aText.replaceAt( nIndex, 6, aTimeStr );
diff --git a/cui/source/options/optupdt.hrc b/cui/source/options/optupdt.hrc
index d301aa07319f..9848f6383579 100644
--- a/cui/source/options/optupdt.hrc
+++ b/cui/source/options/optupdt.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx
index 516b83e08b4c..e394105ca704 100644
--- a/cui/source/options/optupdt.hxx
+++ b/cui/source/options/optupdt.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,17 +53,17 @@ private:
     FixedText           m_aLastChecked;
     rtl::OUString       m_aNeverChecked;
     rtl::OUString       m_aLastCheckedTemplate;
-
+    
     DECL_LINK(  FileDialogHdl_Impl, PushButton* ) ;
     DECL_LINK(  CheckNowHdl_Impl, PushButton* ) ;
     DECL_LINK(  AutoCheckHdl_Impl, CheckBox* ) ;
-
+    
     void        CalcButtonWidth();
-
+    
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > m_xUpdateAccess;
 
-    void                    UpdateLastCheckedText();
-
+    void                    UpdateLastCheckedText(); 
+    
 public:
     SvxOnlineUpdateTabPage( Window* pParent, const SfxItemSet& rSet );
     ~SvxOnlineUpdateTabPage();
diff --git a/cui/source/options/optupdt.src b/cui/source/options/optupdt.src
index 094e23c2e60a..f71273c5a0e0 100644
--- a/cui/source/options/optupdt.src
+++ b/cui/source/options/optupdt.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,19 +54,19 @@ TabPage RID_SVXPAGE_ONLINEUPDATE
     RadioButton RB_EVERYDAY
     {
         Pos = MAP_APPFONT ( 18, 27 ) ;
-        Size = MAP_APPFONT ( 160, 10 ) ;
+        Size = MAP_APPFONT ( 160, 10 ) ;        
         Text [ en-US ] = "Every Da~y" ;
     };
     RadioButton RB_EVERYWEEK
     {
         Pos = MAP_APPFONT ( 18, 40 ) ;
-        Size = MAP_APPFONT ( 160, 10 ) ;
+        Size = MAP_APPFONT ( 160, 10 ) ;        
         Text [ en-US ] = "Every ~Week" ;
     };
     RadioButton RB_EVERYMONTH
     {
         Pos = MAP_APPFONT ( 18, 53 ) ;
-        Size = MAP_APPFONT ( 160, 10 ) ;
+        Size = MAP_APPFONT ( 160, 10 ) ;        
         Text [ en-US ] = "Every ~Month" ;
     };
     FixedText FT_LASTCHECKED
diff --git a/cui/source/options/radiobtnbox.cxx b/cui/source/options/radiobtnbox.cxx
index 4b7debb7a549..a1cf73cb7795 100644
--- a/cui/source/options/radiobtnbox.cxx
+++ b/cui/source/options/radiobtnbox.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/options/readonlyimage.cxx b/cui/source/options/readonlyimage.cxx
index 0a301c05eb89..a40d7b71a2fd 100644
--- a/cui/source/options/readonlyimage.cxx
+++ b/cui/source/options/readonlyimage.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 ReadOnlyImage::RequestHelp( const HelpEvent& rHEvt )
 
         String aStr(ReadOnlyImage::GetHelpTip());
         if ( Help::IsBalloonHelpEnabled() )
-            Help::ShowBalloon( this, rHEvt.GetMousePosPixel(), aScreenRect,
+            Help::ShowBalloon( this, rHEvt.GetMousePosPixel(), aScreenRect, 
             aStr );
         else if ( Help::IsQuickHelpEnabled() )
             Help::ShowQuickHelp( this, aScreenRect, aStr );
diff --git a/cui/source/options/readonlyimage.hxx b/cui/source/options/readonlyimage.hxx
index 460d744433d0..d10b492e9e3a 100644
--- a/cui/source/options/readonlyimage.hxx
+++ b/cui/source/options/readonlyimage.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class ReadOnlyImage : public FixedImage
 public:
     ReadOnlyImage(Window* pParent, const ResId rResId);
     ~ReadOnlyImage();
-
+    
     virtual void        RequestHelp( const HelpEvent& rHEvt );
     static const String& GetHelpTip();
 
-};
-#endif  //
+};            
+#endif  // 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/readonlyimage.src b/cui/source/options/readonlyimage.src
index bd63c32771e7..d489e7c6a444 100644
--- a/cui/source/options/readonlyimage.src
+++ b/cui/source/options/readonlyimage.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/options/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx
index f092c3d3f72e..91075daea50c 100644
--- a/cui/source/options/sdbcdriverenum.cxx
+++ b/cui/source/options/sdbcdriverenum.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 offapp
     class ODriverEnumerationImpl
     {
     protected:
-        ::std::vector< ::rtl::OUString >    m_aImplNames;
+        ::std::vector< ::rtl::OUString >	m_aImplNames;
 
     public:
         ODriverEnumerationImpl();
@@ -124,7 +124,7 @@ namespace offapp
     }
 
 //........................................................................
-}   // namespace offapp
+}	// namespace offapp
 //........................................................................
 
 
diff --git a/cui/source/options/sdbcdriverenum.hxx b/cui/source/options/sdbcdriverenum.hxx
index 1b57ba0bef9c..c84cfb9d26ae 100644
--- a/cui/source/options/sdbcdriverenum.hxx
+++ b/cui/source/options/sdbcdriverenum.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace offapp
     class ODriverEnumeration
     {
     private:
-        ODriverEnumerationImpl* m_pImpl;
+        ODriverEnumerationImpl*	m_pImpl;
 
     public:
         ODriverEnumeration() throw();
         ~ODriverEnumeration() throw();
         typedef ::std::vector< ::rtl::OUString >::const_iterator const_iterator;
 
-        const_iterator  begin() const throw();
-        const_iterator  end() const throw();
+        const_iterator	begin() const throw();
+        const_iterator	end() const throw();
         sal_Int32 size() const throw();
     };
 
 //........................................................................
-}   // namespace offapp
+}	// namespace offapp
 //........................................................................
 
 #endif // _OFFMGR_SDBCDRIVERENUMERATION_HXX_
diff --git a/cui/source/options/securityoptions.cxx b/cui/source/options/securityoptions.cxx
index da088606c9e3..6330807565d4 100644
--- a/cui/source/options/securityoptions.cxx
+++ b/cui/source/options/securityoptions.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/options/securityoptions.hrc b/cui/source/options/securityoptions.hrc
index 8b657b3a22fd..39359de061ef 100644
--- a/cui/source/options/securityoptions.hrc
+++ b/cui/source/options/securityoptions.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/options/securityoptions.hxx b/cui/source/options/securityoptions.hxx
index dd833da0cf8f..3a607b332dd3 100644
--- a/cui/source/options/securityoptions.hxx
+++ b/cui/source/options/securityoptions.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/options/securityoptions.src b/cui/source/options/securityoptions.src
index de7d7b23dc37..cff58746cb48 100644
--- a/cui/source/options/securityoptions.src
+++ b/cui/source/options/securityoptions.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index df35f40fa435..241909ece8db 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include <svx/dialogs.hrc>
 
 #ifndef _SVX_LANGITEM_HXX
-#define ITEMID_LANGUAGE SID_ATTR_CHAR_LANGUAGE
+#define	ITEMID_LANGUAGE SID_ATTR_CHAR_LANGUAGE
 #include <editeng/langitem.hxx>
 #endif
 
@@ -154,15 +154,15 @@ using namespace ::com::sun::star::util;
 #endif
 
 #define HINT_TIMEOUT            200
-#define SELECT_FIRST_TIMEOUT    0
-#define SELECT_TIMEOUT          300
-#define COLORPAGE_UNKNOWN       ((sal_uInt16)0xFFFF)
+#define SELECT_FIRST_TIMEOUT	0
+#define SELECT_TIMEOUT			300
+#define COLORPAGE_UNKNOWN		((sal_uInt16)0xFFFF)
 #define EXPAND_PROTOCOL         "vnd.sun.star.expand:"
 
 LastPageSaver* OfaTreeOptionsDialog::pLastPageSaver = NULL;
 
 // some stuff for easier changes for SvtViewOptions
-static const sal_Char*      pViewOptDataName = "page data";
+static const sal_Char*		pViewOptDataName = "page data";
 #define VIEWOPT_DATANAME    rtl::OUString::createFromAscii( pViewOptDataName )
 
 static XOutdevItemPool* mpStaticXOutdevItemPool = 0L;
@@ -337,47 +337,47 @@ void MailMergeCfg_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUStri
 }
 
 //typedef SfxTabPage* (*FNCreateTabPage)( Window *pParent, const SfxItemSet &rAttrSet );
-SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet )
+SfxTabPage*	CreateGeneralTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet )
 {
     CreateTabPage fnCreate = 0;
     switch(nId)
     {
-        case RID_SFXPAGE_SAVE:                      fnCreate = &SvxSaveTabPage::Create; break;
-        case RID_SFXPAGE_PATH:                      fnCreate = &SvxPathTabPage::Create; break;
-        case RID_SFXPAGE_GENERAL:                   fnCreate = &SvxGeneralTabPage::Create; break;
-        case RID_SFXPAGE_PRINTOPTIONS:              fnCreate = &SfxCommonPrintOptionsTabPage::Create; break;
-        case OFA_TP_LANGUAGES:                      fnCreate = &OfaLanguagesTabPage::Create; break;
-        case RID_SFXPAGE_LINGU:                     fnCreate = &SvxLinguTabPage::Create; break;
-        case RID_SVXPAGE_COLOR:                     fnCreate = &SvxColorTabPage::Create; break;
-        case OFA_TP_VIEW:                           fnCreate = &OfaViewTabPage::Create; break;
-        case OFA_TP_MISC:                           fnCreate = &OfaMiscTabPage::Create; break;
-        case OFA_TP_MEMORY:                         fnCreate = &OfaMemoryOptionsPage::Create; break;
-        case RID_SVXPAGE_ASIAN_LAYOUT:              fnCreate = &SvxAsianLayoutPage::Create; break;
-        case RID_SVX_FONT_SUBSTITUTION:             fnCreate = &SvxFontSubstTabPage::Create; break;
-        case RID_SVXPAGE_INET_PROXY:                fnCreate = &SvxProxyTabPage::Create; break;
-        case RID_SVXPAGE_INET_SEARCH:               fnCreate = &SvxSearchTabPage::Create; break;
-        case RID_SVXPAGE_INET_SECURITY:             fnCreate = &SvxSecurityTabPage::Create; break;
-        case RID_SVXPAGE_INET_MAIL:                 fnCreate = &SvxEMailTabPage::Create; break;
-        case RID_SVXPAGE_COLORCONFIG:               fnCreate = &SvxColorOptionsTabPage::Create; break;
-        case RID_OFAPAGE_HTMLOPT:                   fnCreate = &OfaHtmlTabPage::Create; break;
-        case SID_OPTFILTER_MSOFFICE:                fnCreate = &OfaMSFilterTabPage::Create; break;
-        case RID_OFAPAGE_MSFILTEROPT2:              fnCreate = &OfaMSFilterTabPage2::Create; break;
-        case RID_SVXPAGE_JSEARCH_OPTIONS:           fnCreate = &SvxJSearchOptionsPage::Create ; break;
-        case SID_SB_CONNECTIONPOOLING:              fnCreate = &::offapp::ConnectionPoolOptionsPage::Create; break;
-        case SID_SB_DBREGISTEROPTIONS:              fnCreate = &::svx::DbRegistrationOptionsPage::Create; break;
-        case RID_SVXPAGE_ACCESSIBILITYCONFIG:       fnCreate = &SvxAccessibilityOptionsTabPage::Create; break;
-        case RID_SVXPAGE_SSO:                       fnCreate = GetSSOCreator(); break;
-        case RID_SVXPAGE_OPTIONS_CTL:               fnCreate = &SvxCTLOptionsPage::Create ; break;
+        case RID_SFXPAGE_SAVE:						fnCreate = &SvxSaveTabPage::Create; break;
+        case RID_SFXPAGE_PATH:						fnCreate = &SvxPathTabPage::Create; break;
+        case RID_SFXPAGE_GENERAL:					fnCreate = &SvxGeneralTabPage::Create; break;
+        case RID_SFXPAGE_PRINTOPTIONS:				fnCreate = &SfxCommonPrintOptionsTabPage::Create; break;
+        case OFA_TP_LANGUAGES:						fnCreate = &OfaLanguagesTabPage::Create; break;
+        case RID_SFXPAGE_LINGU:						fnCreate = &SvxLinguTabPage::Create; break;
+        case RID_SVXPAGE_COLOR:						fnCreate = &SvxColorTabPage::Create; break;
+        case OFA_TP_VIEW:							fnCreate = &OfaViewTabPage::Create; break;
+        case OFA_TP_MISC:							fnCreate = &OfaMiscTabPage::Create; break;
+        case OFA_TP_MEMORY:							fnCreate = &OfaMemoryOptionsPage::Create; break;
+        case RID_SVXPAGE_ASIAN_LAYOUT:				fnCreate = &SvxAsianLayoutPage::Create; break;
+        case RID_SVX_FONT_SUBSTITUTION:				fnCreate = &SvxFontSubstTabPage::Create; break;
+        case RID_SVXPAGE_INET_PROXY:				fnCreate = &SvxProxyTabPage::Create; break;
+        case RID_SVXPAGE_INET_SEARCH:				fnCreate = &SvxSearchTabPage::Create; break;
+        case RID_SVXPAGE_INET_SECURITY:				fnCreate = &SvxSecurityTabPage::Create; break;
+        case RID_SVXPAGE_INET_MAIL:					fnCreate = &SvxEMailTabPage::Create; break;
+        case RID_SVXPAGE_COLORCONFIG:				fnCreate = &SvxColorOptionsTabPage::Create; break;
+        case RID_OFAPAGE_HTMLOPT:					fnCreate = &OfaHtmlTabPage::Create; break;
+        case SID_OPTFILTER_MSOFFICE:				fnCreate = &OfaMSFilterTabPage::Create; break;
+        case RID_OFAPAGE_MSFILTEROPT2:				fnCreate = &OfaMSFilterTabPage2::Create; break;
+        case RID_SVXPAGE_JSEARCH_OPTIONS:			fnCreate = &SvxJSearchOptionsPage::Create ; break;
+        case SID_SB_CONNECTIONPOOLING:				fnCreate = &::offapp::ConnectionPoolOptionsPage::Create; break;
+        case SID_SB_DBREGISTEROPTIONS:				fnCreate = &::svx::DbRegistrationOptionsPage::Create; break;
+        case RID_SVXPAGE_ACCESSIBILITYCONFIG:		fnCreate = &SvxAccessibilityOptionsTabPage::Create; break;
+        case RID_SVXPAGE_SSO:						fnCreate = GetSSOCreator(); break;
+        case RID_SVXPAGE_OPTIONS_CTL:				fnCreate = &SvxCTLOptionsPage::Create ; break;
         //added by jmeng begin
-        case RID_SVXPAGE_INET_MOZPLUGIN:            fnCreate = &MozPluginTabPage::Create; break;
+        case RID_SVXPAGE_INET_MOZPLUGIN:			fnCreate = &MozPluginTabPage::Create; break;
         //added by jmeng end
-        case RID_SVXPAGE_OPTIONS_JAVA:              fnCreate = &SvxJavaOptionsPage::Create ; break;
-        case RID_SVXPAGE_ONLINEUPDATE:              fnCreate = &SvxOnlineUpdateTabPage::Create; break;
-        case RID_OPTPAGE_CHART_DEFCOLORS:           fnCreate = &SvxDefaultColorOptPage::Create; break;
+        case RID_SVXPAGE_OPTIONS_JAVA:				fnCreate = &SvxJavaOptionsPage::Create ; break;
+        case RID_SVXPAGE_ONLINEUPDATE:				fnCreate = &SvxOnlineUpdateTabPage::Create; break;
+        case RID_OPTPAGE_CHART_DEFCOLORS:			fnCreate = &SvxDefaultColorOptPage::Create; break;
         case RID_SVXPAGE_IMPROVEMENT:               fnCreate = &SvxImprovementOptionsPage::Create; break;
     }
 
-    SfxTabPage* pRet = fnCreate ? (*fnCreate)( pParent, rSet ) : NULL;
+    SfxTabPage*	pRet = fnCreate ? (*fnCreate)( pParent, rSet ) : NULL;
     return pRet;
 }
 
@@ -697,9 +697,9 @@ OptionsPageInfo* OfaTreeOptionsDialog::AddTabPage(
 }
 
 /* -----------------11.02.99 10:02-------------------
- *  der ItemSet* geht in den Besitz des Dialogs
+ *	der ItemSet* geht in den Besitz des Dialogs
  * --------------------------------------------------*/
-sal_uInt16  OfaTreeOptionsDialog::AddGroup(const String& rGroupName,
+sal_uInt16	OfaTreeOptionsDialog::AddGroup(const String& rGroupName,
                                         SfxShell* pCreateShell,
                                         SfxModule* pCreateModule,
                                         sal_uInt16 nDialogId )
@@ -1023,7 +1023,7 @@ void OfaTreeOptionsDialog::ActivateLastSelection()
 /* -----------------22.02.99 08:52-------------------
  *
  * --------------------------------------------------*/
-long    OfaTreeOptionsDialog::Notify( NotifyEvent& rNEvt )
+long	OfaTreeOptionsDialog::Notify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == EVENT_KEYINPUT )
     {
@@ -1203,7 +1203,7 @@ IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG )
                     }
                 }
 
-//              if ( pPageInfo->nPageId != RID_OPTPAGE_CHART_DEFCOLORS )
+//				if ( pPageInfo->nPageId != RID_OPTPAGE_CHART_DEFCOLORS )
                 {
                     if(!pGroupInfo->m_pInItemSet)
                         pGroupInfo->m_pInItemSet = pGroupInfo->m_pShell
@@ -1494,7 +1494,7 @@ BOOL EnableSSO( void )
                           theBackendServiceTypeValue );
 
     BOOL bSSOEnabled =
-        ( theOfflineValue == theDefaultOfflineValue                     &&
+        ( theOfflineValue == theDefaultOfflineValue						&&
           ( theServerTypeValue.getLength() == 0 ||
           theServerTypeValue == rtl::OUString::createFromAscii( "uno" ) ) &&
           theBackendServiceTypeValue ==
@@ -1527,10 +1527,10 @@ CreateTabPage GetSSOCreator( void )
     return theSymbol;
 }
 
-SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
+SfxItemSet*	OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
 {
     Reference< XPropertySet >  xProp( SvxGetLinguPropertySet() );
-    SfxItemSet* pRet = 0;
+    SfxItemSet*	pRet = 0;
     switch(nId)
     {
         case SID_GENERAL_OPTIONS:
@@ -1548,7 +1548,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
             SFX_APP()->GetOptions(aOptSet);
             pRet->Put(aOptSet);
 
-            utl::MiscCfg    aMisc;
+            utl::MiscCfg	aMisc;
             const SfxPoolItem* pItem;
             SfxViewFrame* pViewFrame = SfxViewFrame::Current();
             if ( pViewFrame )
@@ -1589,7 +1589,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
             pRet->Put(SfxSpellCheckItem( xSpell, SID_ATTR_SPELL ));
             SfxHyphenRegionItem aHyphen( SID_ATTR_HYPHENREGION );
 
-            sal_Int16   nMinLead  = 2,
+            sal_Int16 	nMinLead  = 2,
                         nMinTrail = 2;
             if (xProp.is())
             {
@@ -1683,7 +1683,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet
     {
         case SID_GENERAL_OPTIONS:
         {
-            utl::MiscCfg    aMisc;
+            utl::MiscCfg	aMisc;
             const SfxPoolItem* pItem;
             SfxItemSet aOptSet(SFX_APP()->GetPool(), SID_ATTR_QUICKLAUNCHER, SID_ATTR_QUICKLAUNCHER );
             aOptSet.Put(rSet);
@@ -1692,7 +1692,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet
             // Dispatcher neu holen, weil SetOptions() ggf. den Dispatcher zerst"ort hat
             SfxViewFrame *pViewFrame = SfxViewFrame::Current();
 // -------------------------------------------------------------------------
-//          Year2000 auswerten
+//			Year2000 auswerten
 // -------------------------------------------------------------------------
             USHORT nY2K = USHRT_MAX;
             if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_YEAR2000, sal_False, &pItem ) )
@@ -1708,7 +1708,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet
             }
 
 // -------------------------------------------------------------------------
-//          Drucken auswerten
+//			Drucken auswerten
 // -------------------------------------------------------------------------
             if(SFX_ITEM_SET == rSet.GetItemState(SID_PRINTER_NOTFOUND_WARN, sal_False, &pItem))
                 aMisc.SetNotFoundWarning(((const SfxBoolItem*)pItem)->GetValue());
@@ -1720,7 +1720,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet
                 aMisc.SetPaperOrientationWarning(0 !=  (pFlag->GetValue() & SFX_PRINTER_CHG_ORIENTATION ));
             }
 // -------------------------------------------------------------------------
-//          evaluate help options
+//			evaluate help options
 // -------------------------------------------------------------------------
             if ( SvtHelpOptions().IsHelpTips() != Help::IsQuickHelpEnabled() )
                 SvtHelpOptions().IsHelpTips() ? Help::EnableQuickHelp() : Help::DisableQuickHelp();
@@ -2206,27 +2206,27 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
             if ( nPageId == RID_SVXPAGE_INET_MOZPLUGIN )
                 continue;
 #endif
-#ifdef LINUX
-            // Disable Mozilla Plug-in tab-page on Linux if we find a
-            // globally installed plugin
-            if ( nPageId == RID_SVXPAGE_INET_MOZPLUGIN ) {
-                struct stat sb;
-                char *p;
-                bool bHaveSystemWidePlugin = false;
-                char mozpaths[]="/usr/lib/mozilla/plugins/libnpsoplugin.so:/usr/lib/firefox/plugins/libnpsoplugin.so:/usr/lib/mozilla-firefox/plugins/libnpsoplugin.so:/usr/lib/iceweasel/plugins/libnpsoplugin.so:/usr/lib/iceape/plugins/libnpsoplugin.so:/usr/lib/browser-plugins/libnpsoplugin.so:/usr/lib64/browser-plugins/libnpsoplugin.so";
-
-                p = strtok(mozpaths, ":");
-                while (p != NULL) {
-                    if (stat(p, &sb) != -1) {
-                         bHaveSystemWidePlugin = true;
-                         break;
-                    }
-                    p = strtok(NULL, ":");
-                }
-
-                if (bHaveSystemWidePlugin == true)
-                    continue;
-            }
+#ifdef LINUX                                                                  
+            // Disable Mozilla Plug-in tab-page on Linux if we find a         
+            // globally installed plugin                                      
+            if ( nPageId == RID_SVXPAGE_INET_MOZPLUGIN ) {                     
+                struct stat sb;                                               
+                char *p;                                                       
+                bool bHaveSystemWidePlugin = false;                           
+                char mozpaths[]="/usr/lib/mozilla/plugins/libnpsoplugin.so:/usr/lib/firefox/plugins/libnpsoplugin.so:/usr/lib/mozilla-firefox/plugins/libnpsoplugin.so:/usr/lib/iceweasel/plugins/libnpsoplugin.so:/usr/lib/iceape/plugins/libnpsoplugin.so:/usr/lib/browser-plugins/libnpsoplugin.so:/usr/lib64/browser-plugins/libnpsoplugin.so";  
+                                                                               
+                p = strtok(mozpaths, ":");                                     
+                while (p != NULL) {                                            
+                    if (stat(p, &sb) != -1) {                                  
+                         bHaveSystemWidePlugin = true;                         
+                         break;                                                
+                    }                                                          
+                    p = strtok(NULL, ":");                                     
+                }                                                             
+                                                                               
+                if (bHaveSystemWidePlugin == true)                            
+                    continue;                                                  
+            }                                                                   
 #endif
             AddTabPage( nPageId, rInetArray.GetString(i), nGroup );
         }
@@ -2242,7 +2242,7 @@ namespace
 {
     void MoveControl( Control& _rCtrl, long _nDeltaPixel )
     {
-        Point   aPt( _rCtrl.GetPosPixel() );
+        Point	aPt( _rCtrl.GetPosPixel() );
         aPt.X() += _nDeltaPixel;
         _rCtrl.SetPosPixel( aPt );
     }
@@ -2257,10 +2257,10 @@ void OfaTreeOptionsDialog::ResizeTreeLB( void )
     const long  nIndent0 = PixelToLogic( Size( 28, 0 ) ).Width();
     const long  nIndent1 = PixelToLogic( Size( 52, 0 ) ).Width();
 
-    SvTreeList*         pTreeList = aTreeLB.GetModel();
+    SvTreeList*			pTreeList = aTreeLB.GetModel();
     DBG_ASSERT( pTreeList, "-OfaTreeOptionsDialog::ResizeTreeLB(): no model, no cookies!" );
 
-    SvListEntry*        pEntry = pTreeList->First();
+    SvListEntry*		pEntry = pTreeList->First();
     while( pEntry )
     {
         long n = aTreeLB.GetTextWidth( aTreeLB.GetEntryText( static_cast< SvLBoxEntry* >( pEntry ) ) );
@@ -2272,14 +2272,14 @@ void OfaTreeOptionsDialog::ResizeTreeLB( void )
         pEntry = pTreeList->Next( pEntry, &nDepth );
     }
 
-    nDelta = LogicToPixel( Size( nDelta + 3, 0 ) ).Width();         // + extra space [logic]
-    nDelta += GetSettings().GetStyleSettings().GetScrollBarSize();  // + scroll bar, in case it's needed
+    nDelta = LogicToPixel( Size( nDelta + 3, 0 ) ).Width();			// + extra space [logic]
+    nDelta += GetSettings().GetStyleSettings().GetScrollBarSize();	// + scroll bar, in case it's needed
 
     if( nDelta > nMax )
         nDelta = nMax;
 
     // starting resizing with this
-    Size            aSize( GetSizePixel() );
+    Size			aSize( GetSizePixel() );
     aSize.Width() += nDelta;
     SetSizePixel( aSize );
 
diff --git a/cui/source/options/treeopt.hrc b/cui/source/options/treeopt.hrc
index 88e9697ce38b..ea8da73a270a 100644
--- a/cui/source/options/treeopt.hrc
+++ b/cui/source/options/treeopt.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 #include <svtools/controldims.hrc>
 
-#define PB_OK                   1
-#define PB_CANCEL               2
-#define PB_HELP                 3
-#define PB_BACK                 4
-#define TLB_PAGES               5
+#define PB_OK  					1
+#define PB_CANCEL       		2
+#define PB_HELP         		3
+#define PB_BACK         		4
+#define TLB_PAGES				5
 #define FT_HELPTEXT             6
 #define STR_HELPTEXTS           7
-#define IMG_LIST                8
+#define IMG_LIST				8
 #define IMG_HELP                9
-#define FT_PAGE_TITLE           10
+#define FT_PAGE_TITLE			10
 #define FL_LINE_1               11
 
-#define BMP_ROOT_CLOSED         17
+#define BMP_ROOT_CLOSED			17
 #define BMP_ROOT_OPENED         18
 #define FB_BORDER               19
 
-#define IMG_HINT                20
-#define FT_HINT                 21
-#define CB_DISABLE              22
-#define BTN_HINT                23
-#define ST_LOAD_ERROR           24
+#define IMG_HINT				20
+#define FT_HINT					21
+#define CB_DISABLE				22
+#define BTN_HINT				23
+#define ST_LOAD_ERROR			24
 
 #define STR_GENERAL_PAGES_START 1
-#define STR_GENERAL             (STR_GENERAL_PAGES_START)
+#define STR_GENERAL				(STR_GENERAL_PAGES_START)
 #define STR_MISC_PAGE           (STR_GENERAL_PAGES_START + 1)
 #define STR_DESKTOP_PAGE        (STR_GENERAL_PAGES_START + 2)
 #define STR_VIEW_PAGE           (STR_GENERAL_PAGES_START + 3)
@@ -67,34 +67,34 @@
 
 // metrics
 
-#define WIDTH_PAGEFRAME         263
-#define HEIGHT_PAGEFRAME        191
-#define WIDTH_IMG_HELP          25
-#define HEIGHT_IMG_HELP         30
+#define WIDTH_PAGEFRAME			263
+#define HEIGHT_PAGEFRAME		191
+#define WIDTH_IMG_HELP			25
+#define HEIGHT_IMG_HELP			30
 
-#define COL_1                   (RSC_SP_DLG_INNERBORDER_LEFT)
-#define COL_2                   (COL_1+0)
-#define COL_3                   (COL_2+RSC_SP_GRP_SPACE_X)
-#define COL_11                  (COL_3+WIDTH_PAGEFRAME)
-#define COL_12                  (COL_11+RSC_SP_DLG_INNERBORDER_RIGHT)
-#define COL_10                  (COL_11-RSC_CD_PUSHBUTTON_WIDTH)
-#define COL_9                   (COL_10-RSC_SP_CTRL_GROUP_X)
-#define COL_8                   (COL_9-RSC_CD_PUSHBUTTON_WIDTH)
-#define COL_7                   (COL_8-RSC_SP_CTRL_GROUP_X)
-#define COL_6                   (COL_7-RSC_CD_PUSHBUTTON_WIDTH)
-#define COL_5                   (COL_6-RSC_SP_CTRL_GROUP_X)
-#define COL_4                   (COL_5-RSC_CD_PUSHBUTTON_WIDTH)
-#define COL_3_1                 (COL_3+RSC_SP_TBPG_INNERBORDER_LEFT)
-#define COL_3_3                 (COL_3_1+WIDTH_IMG_HELP)
-#define COL_3_5                 (COL_11-RSC_SP_TBPG_INNERBORDER_RIGHT)
+#define COL_1					(RSC_SP_DLG_INNERBORDER_LEFT)
+#define COL_2					(COL_1+0)
+#define COL_3					(COL_2+RSC_SP_GRP_SPACE_X)
+#define COL_11					(COL_3+WIDTH_PAGEFRAME)
+#define COL_12					(COL_11+RSC_SP_DLG_INNERBORDER_RIGHT)
+#define COL_10					(COL_11-RSC_CD_PUSHBUTTON_WIDTH)
+#define COL_9					(COL_10-RSC_SP_CTRL_GROUP_X)
+#define COL_8					(COL_9-RSC_CD_PUSHBUTTON_WIDTH)
+#define COL_7					(COL_8-RSC_SP_CTRL_GROUP_X)
+#define COL_6					(COL_7-RSC_CD_PUSHBUTTON_WIDTH)
+#define COL_5					(COL_6-RSC_SP_CTRL_GROUP_X)
+#define COL_4					(COL_5-RSC_CD_PUSHBUTTON_WIDTH)
+#define COL_3_1					(COL_3+RSC_SP_TBPG_INNERBORDER_LEFT)
+#define COL_3_3					(COL_3_1+WIDTH_IMG_HELP)
+#define COL_3_5					(COL_11-RSC_SP_TBPG_INNERBORDER_RIGHT)
 
-#define ROW_1                   (RSC_SP_DLG_INNERBORDER_TOP)
-#define ROW_2                   (ROW_1+HEIGHT_PAGEFRAME)
-#define ROW_3                   (ROW_2+RSC_SP_CTRL_GROUP_Y)
-#define ROW_4                   (ROW_3+RSC_CD_PUSHBUTTON_HEIGHT)
-#define ROW_5                   (ROW_4+RSC_SP_DLG_INNERBORDER_BOTTOM)
-#define ROW_1_1                 (ROW_1+2)
-#define ROW_1_2                 (ROW_1+12)
-#define ROW_1_3                 (ROW_1_1+HEIGHT_IMG_HELP+2)
-#define ROW_1_4                 (ROW_1_3+8)
+#define ROW_1					(RSC_SP_DLG_INNERBORDER_TOP)
+#define ROW_2					(ROW_1+HEIGHT_PAGEFRAME)
+#define ROW_3					(ROW_2+RSC_SP_CTRL_GROUP_Y)
+#define ROW_4					(ROW_3+RSC_CD_PUSHBUTTON_HEIGHT)
+#define ROW_5					(ROW_4+RSC_SP_DLG_INNERBORDER_BOTTOM)
+#define ROW_1_1					(ROW_1+2)
+#define ROW_1_2					(ROW_1+12)
+#define ROW_1_3					(ROW_1_1+HEIGHT_IMG_HELP+2)
+#define ROW_1_4					(ROW_1_3+8)
 
diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src
index cb9c3767baa4..62f1c29b8e77 100644
--- a/cui/source/options/treeopt.src
+++ b/cui/source/options/treeopt.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -202,7 +202,7 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES
             < "Basic Fonts (Asian)" ;RID_SW_TP_STD_FONT_CJK       ; > ;
             < "Basic Fonts (CTL)" ;      RID_SW_TP_STD_FONT_CTL       ; > ;
             < "Print" ;       RID_SW_TP_OPTPRINT_PAGE  ; > ;
-            < "Table" ;         RID_SW_TP_OPTTABLE_PAGE  ; > ;
+            < "Table" ;  		RID_SW_TP_OPTTABLE_PAGE  ; > ;
             < "Changes" ;    RID_SW_TP_REDLINE_OPT    ; > ;
             < "Compatibility" ; RID_SW_TP_OPTCOMPATIBILITY_PAGE    ; > ;
             < "AutoCaption" ; RID_SW_TP_OPTCAPTION_PAGE ; > ;
@@ -217,9 +217,9 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES
             < "View" ;       RID_SW_TP_HTML_CONTENT_OPT      ;> ;
             < "Formatting Aids" ;        RID_SW_TP_HTML_OPTSHDWCRSR    ; > ;
             < "Grid" ;        RID_SW_TP_HTML_OPTGRID_PAGE ; > ;
-            < "Print" ;         RID_SW_TP_HTML_OPTPRINT_PAGE  ; > ;
-            < "Table" ;         RID_SW_TP_HTML_OPTTABLE_PAGE  ; > ;
-            < "Background" ;    RID_SW_TP_BACKGROUND  ; > ;
+            < "Print" ;  		RID_SW_TP_HTML_OPTPRINT_PAGE  ; > ;
+            < "Table" ;  		RID_SW_TP_HTML_OPTTABLE_PAGE  ; > ;
+            < "Background" ;  	RID_SW_TP_BACKGROUND  ; > ;
         };
     };
     StringArray SID_SM_EDITOPTIONS
@@ -235,16 +235,16 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES
         ItemList [ en-US ] =
         {
             < "%PRODUCTNAME Calc" ; 0; > ;
-            < "General" ;           SID_SC_TP_LAYOUT            ;> ;
-            < "View" ;          SID_SC_TP_CONTENT           ;> ;
-            < "International" ;     RID_OFA_TP_INTERNATIONAL    ;> ;
-            < "Calculate" ;         SID_SC_TP_CALC              ;> ;
+            < "General" ;			SID_SC_TP_LAYOUT			;> ;
+            < "View" ;			SID_SC_TP_CONTENT			;> ;
+            < "International" ;		RID_OFA_TP_INTERNATIONAL	;> ;
+            < "Calculate" ;			SID_SC_TP_CALC				;> ;
             < "Formula" ;       SID_SC_TP_FORMULA ;> ;
-            < "Sort Lists" ;        SID_SC_TP_USERLISTS         ;> ;
-            < "Changes" ;       SID_SC_TP_CHANGES           ;> ;
+            < "Sort Lists" ;		SID_SC_TP_USERLISTS			;> ;
+            < "Changes" ;		SID_SC_TP_CHANGES			;> ;
             < "Compatibility" ; SID_SC_TP_COMPATIBILITY ;> ;
-            < "Grid" ;          SID_SC_TP_GRID              ;> ;
-            < "Print" ;         RID_SC_TP_PRINT             ;> ;
+            < "Grid" ;			SID_SC_TP_GRID				;> ;
+            < "Print" ;			RID_SC_TP_PRINT				;> ;
         };
     };
     StringArray SID_SD_EDITOPTIONS
@@ -252,10 +252,10 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES
         ItemList [ en-US ] =
         {
             < "%PRODUCTNAME Impress" ; 0; > ;
-            < "General";            SID_SI_TP_MISC                  ; > ;
-            < "View" ;          SID_SI_TP_CONTENTS              ; > ;
-            < "Grid" ;          SID_SI_TP_SNAP                  ; > ;
-            < "Print" ;         SID_SI_TP_PRINT                 ; > ;
+            < "General";			SID_SI_TP_MISC					; > ;
+            < "View" ;			SID_SI_TP_CONTENTS				; > ;
+            < "Grid" ;			SID_SI_TP_SNAP					; > ;
+            < "Print" ;			SID_SI_TP_PRINT					; > ;
         };
     };
     StringArray SID_SD_GRAPHIC_OPTIONS
@@ -263,10 +263,10 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES
         ItemList [ en-US ] =
         {
             < "%PRODUCTNAME Draw" ; 0; > ;
-            < "General" ;           SID_SD_TP_MISC              ; > ;
-            < "View" ;          SID_SD_TP_CONTENTS          ; > ;
-            < "Grid" ;          SID_SD_TP_SNAP              ; > ;
-            < "Print" ;             SID_SD_TP_PRINT             ; > ;
+            < "General" ;			SID_SD_TP_MISC				; > ;
+            < "View" ;			SID_SD_TP_CONTENTS			; > ;
+            < "Grid" ;			SID_SD_TP_SNAP				; > ;
+            < "Print" ; 	 		SID_SD_TP_PRINT				; > ;
         };
     };
     StringArray SID_SCH_EDITOPTIONS
@@ -274,7 +274,7 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES
         ItemList [ en-US ] =
         {
             < "Charts" ; 0; > ;
-            < "Default Colors" ;        RID_OPTPAGE_CHART_DEFCOLORS ; > ;
+            < "Default Colors" ; 	 	RID_OPTPAGE_CHART_DEFCOLORS ; > ;
         };
     };
     StringArray SID_FILTER_DLG
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index 2c9a7ebbdd7c..1bf84960b642 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -202,7 +202,7 @@ void WebConnectionInfoDialog::FillPasswordList()
             uno::Sequence< task::UrlRecord > aURLEntries = xPasswdContainer->getAllPersistent( xInteractionHandler );
             sal_Int32 nCount = 0;
             for ( sal_Int32 nURLInd = 0; nURLInd < aURLEntries.getLength(); nURLInd++ )
-            {
+            {    
                 for ( sal_Int32 nUserInd = 0; nUserInd < aURLEntries[nURLInd].UserList.getLength(); nUserInd++ )
                 {
                     ::rtl::OUString aUIEntry( aURLEntries[nURLInd].Url );
@@ -216,10 +216,10 @@ void WebConnectionInfoDialog::FillPasswordList()
             // remember pos of first url container entry.
             m_nPos = nCount;
 
-            uno::Reference< task::XUrlContainer > xUrlContainer(
+            uno::Reference< task::XUrlContainer > xUrlContainer( 
                 xPasswdContainer, uno::UNO_QUERY_THROW );
 
-            uno::Sequence< rtl::OUString > aUrls
+            uno::Sequence< rtl::OUString > aUrls 
                 = xUrlContainer->getUrls( sal_True /* OnlyPersistent */ );
 
             for ( sal_Int32 nURLIdx = 0; nURLIdx < aUrls.getLength(); nURLIdx++ )
@@ -249,7 +249,7 @@ IMPL_LINK( WebConnectionInfoDialog, RemovePasswordHdl, PushButton*, EMPTYARG )
 
             uno::Reference< task::XPasswordContainer > xPasswdContainer(
                 comphelper::getProcessServiceFactory()->createInstance(
-                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
+                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
                         "com.sun.star.task.PasswordContainer" ) ) ),
                 uno::UNO_QUERY_THROW );
 
@@ -260,7 +260,7 @@ IMPL_LINK( WebConnectionInfoDialog, RemovePasswordHdl, PushButton*, EMPTYARG )
             }
             else
             {
-                uno::Reference< task::XUrlContainer > xUrlContainer(
+                uno::Reference< task::XUrlContainer > xUrlContainer( 
                     xPasswdContainer, uno::UNO_QUERY_THROW );
                 xUrlContainer->removeUrl( aURL );
             }
@@ -280,20 +280,20 @@ IMPL_LINK( WebConnectionInfoDialog, RemoveAllPasswordsHdl, PushButton*, EMPTYARG
     {
         uno::Reference< task::XPasswordContainer > xPasswdContainer(
             comphelper::getProcessServiceFactory()->createInstance(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
+                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
                     "com.sun.star.task.PasswordContainer" ) ) ),
             uno::UNO_QUERY_THROW );
 
         // should the master password be requested before?
         xPasswdContainer->removeAllPersistent();
 
-        uno::Reference< task::XUrlContainer > xUrlContainer(
+        uno::Reference< task::XUrlContainer > xUrlContainer( 
             xPasswdContainer, uno::UNO_QUERY_THROW );
-        uno::Sequence< rtl::OUString > aUrls
+        uno::Sequence< rtl::OUString > aUrls 
             = xUrlContainer->getUrls( sal_True /* OnlyPersistent */ );
         for ( sal_Int32 nURLIdx = 0; nURLIdx < aUrls.getLength(); nURLIdx++ )
-            xUrlContainer->removeUrl( aUrls[ nURLIdx ] );
-
+            xUrlContainer->removeUrl( aUrls[ nURLIdx ] );  
+        
         m_aPasswordsLB.Clear();
     }
     catch( uno::Exception& )
@@ -313,15 +313,15 @@ IMPL_LINK( WebConnectionInfoDialog, ChangePasswordHdl, PushButton*, EMPTYARG )
             ::rtl::OUString aURL = m_aPasswordsLB.GetEntryText( pEntry, 0 );
             ::rtl::OUString aUserName = m_aPasswordsLB.GetEntryText( pEntry, 1 );
 
-            ::comphelper::DocPasswordRequest* pPasswordRequest
+            ::comphelper::DocPasswordRequest* pPasswordRequest 
                   = new ::comphelper::DocPasswordRequest(
-                      ::comphelper::DocPasswordRequestType_STANDARD,
+                      ::comphelper::DocPasswordRequestType_STANDARD, 
                       task::PasswordRequestMode_PASSWORD_CREATE, aURL );
             uno::Reference< task::XInteractionRequest > rRequest( pPasswordRequest );
 
             uno::Reference< task::XInteractionHandler > xInteractionHandler(
                 comphelper::getProcessServiceFactory()->createInstance(
-                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
+                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
                         "com.sun.star.task.InteractionHandler" ) ) ),
                 uno::UNO_QUERY_THROW );
             xInteractionHandler->handle( rRequest );
@@ -334,10 +334,10 @@ IMPL_LINK( WebConnectionInfoDialog, ChangePasswordHdl, PushButton*, EMPTYARG )
 
                 uno::Reference< task::XPasswordContainer > xPasswdContainer(
                     comphelper::getProcessServiceFactory()->createInstance(
-                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
+                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
                             "com.sun.star.task.PasswordContainer" ) ) ),
                     uno::UNO_QUERY_THROW );
-                xPasswdContainer->addPersistent(
+                xPasswdContainer->addPersistent( 
                     aURL, aUserName, aPasswd, xInteractionHandler );
             }
         }
@@ -361,7 +361,7 @@ IMPL_LINK( WebConnectionInfoDialog, EntrySelectedHdl, void*, EMPTYARG )
     {
         m_aRemoveBtn.Enable( TRUE );
 
-        // url container entries (-> use system credentials) have
+        // url container entries (-> use system credentials) have 
         // no password
         sal_Int32 nPos = (sal_Int32)(sal_IntPtr)pEntry->GetUserData();
         m_aChangeBtn.Enable( nPos < m_nPos );
diff --git a/cui/source/options/webconninfo.hrc b/cui/source/options/webconninfo.hrc
index 85cbf35afc2d..1b1bcf53dcf1 100644
--- a/cui/source/options/webconninfo.hrc
+++ b/cui/source/options/webconninfo.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx
index bf2b0003922d..47faba097434 100644
--- a/cui/source/options/webconninfo.hxx
+++ b/cui/source/options/webconninfo.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/options/webconninfo.src b/cui/source/options/webconninfo.src
index 68560c1ecaa7..17494aa985a8 100644
--- a/cui/source/options/webconninfo.src
+++ b/cui/source/options/webconninfo.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 91dd75b57d83..6e7511dbfd52 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/tabpages/align.hrc b/cui/source/tabpages/align.hrc
index f58e9ac221bc..1a38c86bd451 100644
--- a/cui/source/tabpages/align.hrc
+++ b/cui/source/tabpages/align.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 // image list for ValueSets:
 #define IL_LOCK_BMPS                1100
-#define IL_LOCK_BMPS_HC             1101
+#define IL_LOCK_BMPS_HC				1101
 #define IID_BOTTOMLOCK              1
 #define IID_TOPLOCK                 2
 #define IID_CELLLOCK                3
diff --git a/cui/source/tabpages/align.src b/cui/source/tabpages/align.src
index d7d267991073..efe36314904e 100644
--- a/cui/source/tabpages/align.src
+++ b/cui/source/tabpages/align.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 10797c780615..e1ddae065a1c 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,8 +87,8 @@ static ::com::sun::star::uno::Reference<
 
 OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) :
     SfxTabDialog(pParent, CUI_RES( RID_OFA_AUTOCORR_DLG ), _pSet),
-    aLanguageFT(    this, CUI_RES(FT_LANG         )),
-    aLanguageLB(    this, CUI_RES(LB_LANG             ))
+    aLanguageFT(    this, CUI_RES(FT_LANG 		  )),
+    aLanguageLB(    this, CUI_RES(LB_LANG    		  ))
 {
     BOOL bShowSWOptions = FALSE;
     BOOL bOpenSmartTagOptions = FALSE;
@@ -133,14 +133,14 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) :
 
     AddTabPage(RID_OFAPAGE_AUTOCORR_REPLACE, OfaAutocorrReplacePage::Create, 0);
     AddTabPage(RID_OFAPAGE_AUTOCORR_EXCEPT,  OfaAutocorrExceptPage::Create, 0);
-    AddTabPage(RID_OFAPAGE_AUTOCORR_QUOTE,   OfaQuoteTabPage::Create, 0);
+    AddTabPage(RID_OFAPAGE_AUTOCORR_QUOTE, 	 OfaQuoteTabPage::Create, 0);
 
     // initialize languages
     //! LANGUAGE_NONE is displayed as '[All]' and the LanguageType
     //! will be set to LANGUAGE_DONTKNOW
     sal_Int16 nLangList = LANG_LIST_WESTERN;
-
-    if( SvtLanguageOptions().IsCTLFontEnabled() )
+    
+    if( SvtLanguageOptions().IsCTLFontEnabled() ) 
         nLangList |= LANG_LIST_CTL;
     aLanguageLB.SetLanguageList( nLangList, TRUE, TRUE );
     aLanguageLB.SelectLanguage( LANGUAGE_NONE );
@@ -202,7 +202,7 @@ IMPL_LINK(OfaAutoCorrDlg, SelectLanguageHdl, ListBox*, pBox)
     //alte Einstellungen speichern und neu fuellen
     if(eNewLang != eLastDialogLanguage)
     {
-        USHORT  nPageId = GetCurPageId();
+        USHORT	nPageId = GetCurPageId();
         if(RID_OFAPAGE_AUTOCORR_REPLACE == nPageId)
             ((OfaAutocorrReplacePage*)GetTabPage( nPageId ))->SetLanguage(eNewLang);
         else if(RID_OFAPAGE_AUTOCORR_EXCEPT == nPageId)
@@ -217,15 +217,15 @@ IMPL_LINK(OfaAutoCorrDlg, SelectLanguageHdl, ListBox*, pBox)
 OfaAutocorrOptionsPage::OfaAutocorrOptionsPage( Window* pParent,
                                                 const SfxItemSet& rSet ) :
     SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_OPTIONS ), rSet),
-    aCheckLB            (this, CUI_RES(CLB_SETTINGS )),
+    aCheckLB			(this, CUI_RES(CLB_SETTINGS	)),
 
-    sInput              (CUI_RES(ST_USE_REPLACE     )),
+    sInput    			(CUI_RES(ST_USE_REPLACE		)),
     sDoubleCaps         (CUI_RES(ST_CPTL_STT_WORD     )),
     sStartCap           (CUI_RES(ST_CPTL_STT_SENT     )),
     sBoldUnderline      (CUI_RES(ST_BOLD_UNDER        )),
     sURL                (CUI_RES(ST_DETECT_URL        )),
     sNoDblSpaces        (CUI_RES(STR_NO_DBL_SPACES    )),
-    sDash               (CUI_RES(ST_DASH              )),
+    sDash    			(CUI_RES(ST_DASH              )),
     sAccidentalCaps     (CUI_RES(ST_CORRECT_ACCIDENTAL_CAPS_LOCK))
 {
     FreeResource();
@@ -247,7 +247,7 @@ OfaAutocorrOptionsPage::~OfaAutocorrOptionsPage()
 --------------------------------------------------*/
 
 
-SfxTabPage* OfaAutocorrOptionsPage::Create( Window* pParent,
+SfxTabPage*	OfaAutocorrOptionsPage::Create( Window* pParent,
                                 const SfxItemSet& rSet)
 {
     return new OfaAutocorrOptionsPage(pParent, rSet);
@@ -263,13 +263,13 @@ BOOL OfaAutocorrOptionsPage::FillItemSet( SfxItemSet& )
     long nFlags = pAutoCorrect->GetFlags();
 
     USHORT nPos = 0;
-    pAutoCorrect->SetAutoCorrFlag(Autocorrect,          aCheckLB.IsChecked(nPos++));
-    pAutoCorrect->SetAutoCorrFlag(CptlSttWrd,           aCheckLB.IsChecked(nPos++));
-    pAutoCorrect->SetAutoCorrFlag(CptlSttSntnc,         aCheckLB.IsChecked(nPos++));
-    pAutoCorrect->SetAutoCorrFlag(ChgWeightUnderl,      aCheckLB.IsChecked(nPos++));
-    pAutoCorrect->SetAutoCorrFlag(SetINetAttr,          aCheckLB.IsChecked(nPos++));
-    pAutoCorrect->SetAutoCorrFlag(ChgToEnEmDash,        aCheckLB.IsChecked(nPos++));
-    pAutoCorrect->SetAutoCorrFlag(IgnoreDoubleSpace,    aCheckLB.IsChecked(nPos++));
+    pAutoCorrect->SetAutoCorrFlag(Autocorrect, 			aCheckLB.IsChecked(nPos++));
+    pAutoCorrect->SetAutoCorrFlag(CptlSttWrd, 			aCheckLB.IsChecked(nPos++));
+    pAutoCorrect->SetAutoCorrFlag(CptlSttSntnc, 		aCheckLB.IsChecked(nPos++));
+    pAutoCorrect->SetAutoCorrFlag(ChgWeightUnderl,		aCheckLB.IsChecked(nPos++));
+    pAutoCorrect->SetAutoCorrFlag(SetINetAttr, 			aCheckLB.IsChecked(nPos++));
+    pAutoCorrect->SetAutoCorrFlag(ChgToEnEmDash,		aCheckLB.IsChecked(nPos++));
+    pAutoCorrect->SetAutoCorrFlag(IgnoreDoubleSpace,	aCheckLB.IsChecked(nPos++));
     pAutoCorrect->SetAutoCorrFlag(CorrectCapsLock,      aCheckLB.IsChecked(nPos++));
 
     BOOL bReturn = nFlags != pAutoCorrect->GetFlags();
@@ -285,7 +285,7 @@ BOOL OfaAutocorrOptionsPage::FillItemSet( SfxItemSet& )
 /* -----------------23.11.98 16:15-------------------
  *
  * --------------------------------------------------*/
-void    OfaAutocorrOptionsPage::ActivatePage( const SfxItemSet& )
+void	OfaAutocorrOptionsPage::ActivatePage( const SfxItemSet& )
 {
     ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(FALSE);
 }
@@ -333,8 +333,8 @@ void OfaAutocorrOptionsPage::Reset( const SfxItemSet& )
 
 struct ImpUserData
 {
-    String  *pString;
-    Font*   pFont;
+    String 	*pString;
+    Font* 	pFont;
 
     ImpUserData(String* pText, Font* pFnt)
         { pString = pText; pFont = pFnt;}
@@ -343,28 +343,28 @@ struct ImpUserData
 
 /*********************************************************************/
 /*                                                                   */
-/*  Dialog fuer Prozenteinstellung                                   */
+/*	Dialog fuer Prozenteinstellung                                   */
 /*                                                                   */
 /*********************************************************************/
 
 class OfaAutoFmtPrcntSet : public ModalDialog
 {
-    OKButton        aOKPB;
-    CancelButton    aCancelPB;
-    FixedLine       aPrcntFL;
-    MetricField     aPrcntMF;
+    OKButton 		aOKPB;
+    CancelButton	aCancelPB;
+    FixedLine		aPrcntFL;
+    MetricField		aPrcntMF;
 
     public:
         OfaAutoFmtPrcntSet(Window* pParent) :
             ModalDialog(pParent, CUI_RES(RID_OFADLG_PRCNT_SET)),
-                aOKPB(this,         CUI_RES(BT_OK)),
-                aCancelPB(this,     CUI_RES(BT_CANCEL)),
-                aPrcntFL(this,      CUI_RES(FL_PRCNT)),
-                aPrcntMF(this,  CUI_RES(ED_RIGHT_MARGIN))
+                aOKPB(this, 		CUI_RES(BT_OK)),
+                aCancelPB(this, 	CUI_RES(BT_CANCEL)),
+                aPrcntFL(this, 		CUI_RES(FL_PRCNT)),
+                aPrcntMF(this, 	CUI_RES(ED_RIGHT_MARGIN))
             {
                 FreeResource();
             }
-    MetricField&    GetPrcntFld(){return aPrcntMF;}
+    MetricField& 	GetPrcntFld(){return aPrcntMF;}
 };
 
 
@@ -432,13 +432,13 @@ void __EXPORT OfaImpBrwString::Paint( const Point& rPos, SvLBox& rDev, USHORT /*
 
 /*********************************************************************/
 /*                                                                   */
-/*  TabPage Autoformat anwenden                                      */
+/* 	TabPage Autoformat anwenden			                             */
 /*                                                                   */
 /*********************************************************************/
 
-#define CBCOL_FIRST     0
-#define CBCOL_SECOND    1
-#define CBCOL_BOTH      2
+#define CBCOL_FIRST		0
+#define CBCOL_SECOND	1
+#define CBCOL_BOTH		2
 
 enum OfaAutoFmtOptions
 {
@@ -465,32 +465,32 @@ enum OfaAutoFmtOptions
 OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent,
                                 const SfxItemSet& rSet ) :
     SfxTabPage(pParent, CUI_RES(RID_OFAPAGE_AUTOFMT_APPLY), rSet),
-    aCheckLB            (this,  CUI_RES(CLB_SETTINGS)),
-    aEditPB             (this,  CUI_RES(PB_EDIT)),
-    aHeader1Expl        (this,  CUI_RES(FT_HEADER1_EXPLANATION)),
-    aHeader2Expl        (this,  CUI_RES(FT_HEADER2_EXPLANATION)),
-    sHeader1            (CUI_RES( STR_HEADER1       )),
-    sHeader2            (CUI_RES( STR_HEADER2       )),
-    sDeleteEmptyPara    (CUI_RES( ST_DEL_EMPTY_PARA)),
-    sUseReplaceTbl      (CUI_RES(   ST_USE_REPLACE  )),
-    sCptlSttWord        (CUI_RES(   ST_CPTL_STT_WORD)),
-    sCptlSttSent        (CUI_RES(   ST_CPTL_STT_SENT)),
-    sUserStyle          (CUI_RES(   ST_USER_STYLE   )),
-    sBullet             (CUI_RES(   ST_BULLET       )),
-    sBoldUnder          (CUI_RES(   ST_BOLD_UNDER   )),
-    sNoDblSpaces        (CUI_RES(   STR_NO_DBL_SPACES)),
+    aCheckLB			(this,	CUI_RES(CLB_SETTINGS)),
+    aEditPB				(this, 	CUI_RES(PB_EDIT)),
+    aHeader1Expl		(this, 	CUI_RES(FT_HEADER1_EXPLANATION)),
+    aHeader2Expl		(this, 	CUI_RES(FT_HEADER2_EXPLANATION)),
+    sHeader1			(CUI_RES( STR_HEADER1		)),
+    sHeader2			(CUI_RES( STR_HEADER2		)),
+    sDeleteEmptyPara	(CUI_RES( ST_DEL_EMPTY_PARA)),
+    sUseReplaceTbl		(CUI_RES(	ST_USE_REPLACE  )),
+    sCptlSttWord		(CUI_RES(	ST_CPTL_STT_WORD)),
+    sCptlSttSent		(CUI_RES(	ST_CPTL_STT_SENT)),
+    sUserStyle			(CUI_RES(	ST_USER_STYLE   )),
+    sBullet				(CUI_RES(	ST_BULLET       )),
+    sBoldUnder			(CUI_RES(	ST_BOLD_UNDER   )),
+    sNoDblSpaces		(CUI_RES(	STR_NO_DBL_SPACES)),
     sCorrectCapsLock    (CUI_RES(   ST_CORRECT_ACCIDENTAL_CAPS_LOCK)),
-    sDetectURL          (CUI_RES(   ST_DETECT_URL   )),
-    sDash               (CUI_RES(   ST_DASH         )),
-    sRightMargin        (CUI_RES(   ST_RIGHT_MARGIN )),
-    sNum                (CUI_RES(   STR_NUM         )),
-    sBorder             (CUI_RES(   STR_BORDER      )),
-    sTable              (CUI_RES(   STR_TABLE       )),
-    sReplaceTemplates   (CUI_RES(   STR_REPLACE_TEMPLATES)),
-    sDelSpaceAtSttEnd   (CUI_RES(   STR_DEL_SPACES_AT_STT_END)),
+    sDetectURL			(CUI_RES(	ST_DETECT_URL   )),
+    sDash				(CUI_RES(	ST_DASH         )),
+    sRightMargin		(CUI_RES(	ST_RIGHT_MARGIN	)),
+    sNum				(CUI_RES(	STR_NUM			)),
+    sBorder				(CUI_RES(	STR_BORDER		)),
+    sTable				(CUI_RES(	STR_TABLE		)),
+    sReplaceTemplates   (CUI_RES(	STR_REPLACE_TEMPLATES)),
+    sDelSpaceAtSttEnd	(CUI_RES(	STR_DEL_SPACES_AT_STT_END)),
     sDelSpaceBetweenLines(CUI_RES(STR_DEL_SPACES_BETWEEN_LINES)),
 
-    nPercent        ( 50 ),
+    nPercent		( 50 ),
     pCheckButtonData( NULL )
 
 {
@@ -525,7 +525,7 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent,
 /*                                                                   */
 /*********************************************************************/
 
-SvLBoxEntry* OfaSwAutoFmtOptionsPage::CreateEntry(String& rTxt, USHORT nCol)
+SvLBoxEntry* OfaSwAutoFmtOptionsPage::CreateEntry(String& rTxt, USHORT nCol) 
 {
     SvLBoxEntry* pEntry = new SvLBoxEntry;
 
@@ -535,16 +535,16 @@ SvLBoxEntry* OfaSwAutoFmtOptionsPage::CreateEntry(String& rTxt, USHORT nCol)
         aCheckLB.SetCheckButtonData( pCheckButtonData );
     }
 
-    pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0));    // Sonst Puff!
+    pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0));	// Sonst Puff!
 
     String sEmpty;
     if (nCol == CBCOL_SECOND)
-        pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) );    // Leerspalte
+        pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) );	// Leerspalte
     else
         pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData ) );
 
     if (nCol == CBCOL_FIRST)
-        pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) );    // Leerspalte
+        pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) );	// Leerspalte
     else
         pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData ) );
     pEntry->AddItem( new OfaImpBrwString( pEntry, 0, rTxt ) );
@@ -698,7 +698,7 @@ BOOL OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet&  )
 /* -----------------23.11.98 16:15-------------------
  *
  * --------------------------------------------------*/
-void    OfaSwAutoFmtOptionsPage::ActivatePage( const SfxItemSet& )
+void	OfaSwAutoFmtOptionsPage::ActivatePage( const SfxItemSet& )
 {
     ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(FALSE);
 }
@@ -719,47 +719,47 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& )
 
     // Die folgenden Eintraege muessen in der selben Reihenfolge, wie im
     // OfaAutoFmtOptions-enum eingefuegt werden!
-    aCheckLB.GetModel()->Insert(CreateEntry(sUseReplaceTbl,     CBCOL_BOTH  ));
-    aCheckLB.GetModel()->Insert(CreateEntry(sCptlSttWord,       CBCOL_BOTH  ));
-    aCheckLB.GetModel()->Insert(CreateEntry(sCptlSttSent,       CBCOL_BOTH  ));
-    aCheckLB.GetModel()->Insert(CreateEntry(sBoldUnder,         CBCOL_BOTH  ));
-    aCheckLB.GetModel()->Insert(CreateEntry(sDetectURL,         CBCOL_BOTH  ));
-    aCheckLB.GetModel()->Insert(CreateEntry(sDash,              CBCOL_BOTH  ));
-    aCheckLB.GetModel()->Insert(CreateEntry(sDelSpaceAtSttEnd,  CBCOL_BOTH  ));
+    aCheckLB.GetModel()->Insert(CreateEntry(sUseReplaceTbl,		CBCOL_BOTH	));
+    aCheckLB.GetModel()->Insert(CreateEntry(sCptlSttWord,		CBCOL_BOTH	));
+    aCheckLB.GetModel()->Insert(CreateEntry(sCptlSttSent,		CBCOL_BOTH	));
+    aCheckLB.GetModel()->Insert(CreateEntry(sBoldUnder,			CBCOL_BOTH	));
+    aCheckLB.GetModel()->Insert(CreateEntry(sDetectURL,			CBCOL_BOTH	));
+    aCheckLB.GetModel()->Insert(CreateEntry(sDash,				CBCOL_BOTH  ));
+    aCheckLB.GetModel()->Insert(CreateEntry(sDelSpaceAtSttEnd,	CBCOL_BOTH  ));
     aCheckLB.GetModel()->Insert(CreateEntry(sDelSpaceBetweenLines, CBCOL_BOTH  ));
 
-    aCheckLB.GetModel()->Insert(CreateEntry(sNoDblSpaces,       CBCOL_SECOND));
+    aCheckLB.GetModel()->Insert(CreateEntry(sNoDblSpaces,		CBCOL_SECOND));
     aCheckLB.GetModel()->Insert(CreateEntry(sCorrectCapsLock,   CBCOL_SECOND));
-    aCheckLB.GetModel()->Insert(CreateEntry(sNum,               CBCOL_SECOND));
-    aCheckLB.GetModel()->Insert(CreateEntry(sBorder,            CBCOL_SECOND));
-    aCheckLB.GetModel()->Insert(CreateEntry(sTable,             CBCOL_SECOND));
-    aCheckLB.GetModel()->Insert(CreateEntry(sReplaceTemplates,  CBCOL_SECOND));
-    aCheckLB.GetModel()->Insert(CreateEntry(sDeleteEmptyPara,   CBCOL_FIRST ));
-    aCheckLB.GetModel()->Insert(CreateEntry(sUserStyle,         CBCOL_FIRST ));
-    aCheckLB.GetModel()->Insert(CreateEntry(sBullet,            CBCOL_FIRST ));
-    aCheckLB.GetModel()->Insert(CreateEntry(sRightMargin,       CBCOL_FIRST ));
-
-    aCheckLB.CheckEntryPos( USE_REPLACE_TABLE,  CBCOL_FIRST,    pOpt->bAutoCorrect );
-    aCheckLB.CheckEntryPos( USE_REPLACE_TABLE,  CBCOL_SECOND,   0 != (nFlags & Autocorrect));
-    aCheckLB.CheckEntryPos( CORR_UPPER,         CBCOL_FIRST,    pOpt->bCptlSttWrd );
-    aCheckLB.CheckEntryPos( CORR_UPPER,         CBCOL_SECOND,   0 != (nFlags & CptlSttWrd) );
-    aCheckLB.CheckEntryPos( BEGIN_UPPER,        CBCOL_FIRST,    pOpt->bCptlSttSntnc );
-    aCheckLB.CheckEntryPos( BEGIN_UPPER,        CBCOL_SECOND,   0 != (nFlags & CptlSttSntnc) );
-    aCheckLB.CheckEntryPos( BOLD_UNDERLINE,     CBCOL_FIRST,    pOpt->bChgWeightUnderl );
-    aCheckLB.CheckEntryPos( BOLD_UNDERLINE,     CBCOL_SECOND,   0 != (nFlags & ChgWeightUnderl) );
-    aCheckLB.CheckEntryPos( IGNORE_DBLSPACE,    CBCOL_SECOND,   0 != (nFlags & IgnoreDoubleSpace) );
+    aCheckLB.GetModel()->Insert(CreateEntry(sNum,				CBCOL_SECOND));
+    aCheckLB.GetModel()->Insert(CreateEntry(sBorder,			CBCOL_SECOND));
+    aCheckLB.GetModel()->Insert(CreateEntry(sTable,				CBCOL_SECOND));
+    aCheckLB.GetModel()->Insert(CreateEntry(sReplaceTemplates,	CBCOL_SECOND));
+    aCheckLB.GetModel()->Insert(CreateEntry(sDeleteEmptyPara,	CBCOL_FIRST	));
+    aCheckLB.GetModel()->Insert(CreateEntry(sUserStyle,			CBCOL_FIRST	));
+    aCheckLB.GetModel()->Insert(CreateEntry(sBullet,			CBCOL_FIRST	));
+    aCheckLB.GetModel()->Insert(CreateEntry(sRightMargin,		CBCOL_FIRST	));
+
+    aCheckLB.CheckEntryPos( USE_REPLACE_TABLE, 	CBCOL_FIRST,	pOpt->bAutoCorrect );
+    aCheckLB.CheckEntryPos( USE_REPLACE_TABLE,	CBCOL_SECOND,	0 != (nFlags & Autocorrect));
+    aCheckLB.CheckEntryPos( CORR_UPPER,			CBCOL_FIRST,	pOpt->bCptlSttWrd );
+    aCheckLB.CheckEntryPos( CORR_UPPER,			CBCOL_SECOND,	0 != (nFlags & CptlSttWrd) );
+    aCheckLB.CheckEntryPos( BEGIN_UPPER,		CBCOL_FIRST,	pOpt->bCptlSttSntnc );
+    aCheckLB.CheckEntryPos( BEGIN_UPPER,		CBCOL_SECOND,	0 != (nFlags & CptlSttSntnc) );
+    aCheckLB.CheckEntryPos( BOLD_UNDERLINE,		CBCOL_FIRST,	pOpt->bChgWeightUnderl );
+    aCheckLB.CheckEntryPos( BOLD_UNDERLINE,		CBCOL_SECOND,	0 != (nFlags & ChgWeightUnderl) );
+    aCheckLB.CheckEntryPos( IGNORE_DBLSPACE,	CBCOL_SECOND,	0 != (nFlags & IgnoreDoubleSpace) );
     aCheckLB.CheckEntryPos( CORRECT_CAPS_LOCK,  CBCOL_SECOND,   0 != (nFlags & CorrectCapsLock) );
-    aCheckLB.CheckEntryPos( DETECT_URL,         CBCOL_FIRST,    pOpt->bSetINetAttr );
-    aCheckLB.CheckEntryPos( DETECT_URL,         CBCOL_SECOND,   0 != (nFlags & SetINetAttr) );
-    aCheckLB.CheckEntryPos( REPLACE_DASHES,     CBCOL_FIRST,    pOpt->bChgToEnEmDash );
-    aCheckLB.CheckEntryPos( REPLACE_DASHES,     CBCOL_SECOND,   0 != (nFlags & ChgToEnEmDash) );
-    aCheckLB.CheckEntryPos( DEL_SPACES_AT_STT_END,      CBCOL_FIRST,    pOpt->bAFmtDelSpacesAtSttEnd );
-    aCheckLB.CheckEntryPos( DEL_SPACES_AT_STT_END,      CBCOL_SECOND,   pOpt->bAFmtByInpDelSpacesAtSttEnd );
-    aCheckLB.CheckEntryPos( DEL_SPACES_BETWEEN_LINES,   CBCOL_FIRST,    pOpt->bAFmtDelSpacesBetweenLines );
-    aCheckLB.CheckEntryPos( DEL_SPACES_BETWEEN_LINES,   CBCOL_SECOND,   pOpt->bAFmtByInpDelSpacesBetweenLines );
-    aCheckLB.CheckEntryPos( DEL_EMPTY_NODE,     CBCOL_FIRST,    pOpt->bDelEmptyNode );
-    aCheckLB.CheckEntryPos( REPLACE_USER_COLL,  CBCOL_FIRST,    pOpt->bChgUserColl );
-    aCheckLB.CheckEntryPos( REPLACE_BULLETS,    CBCOL_FIRST,    pOpt->bChgEnumNum );
+    aCheckLB.CheckEntryPos( DETECT_URL,			CBCOL_FIRST,	pOpt->bSetINetAttr );
+    aCheckLB.CheckEntryPos( DETECT_URL,			CBCOL_SECOND,	0 != (nFlags & SetINetAttr) );
+    aCheckLB.CheckEntryPos( REPLACE_DASHES,		CBCOL_FIRST,	pOpt->bChgToEnEmDash );
+    aCheckLB.CheckEntryPos( REPLACE_DASHES,		CBCOL_SECOND,	0 != (nFlags & ChgToEnEmDash) );
+    aCheckLB.CheckEntryPos( DEL_SPACES_AT_STT_END,		CBCOL_FIRST,	pOpt->bAFmtDelSpacesAtSttEnd );
+    aCheckLB.CheckEntryPos( DEL_SPACES_AT_STT_END,		CBCOL_SECOND,	pOpt->bAFmtByInpDelSpacesAtSttEnd );
+    aCheckLB.CheckEntryPos( DEL_SPACES_BETWEEN_LINES,	CBCOL_FIRST,	pOpt->bAFmtDelSpacesBetweenLines );
+    aCheckLB.CheckEntryPos( DEL_SPACES_BETWEEN_LINES,	CBCOL_SECOND,	pOpt->bAFmtByInpDelSpacesBetweenLines );
+    aCheckLB.CheckEntryPos( DEL_EMPTY_NODE,		CBCOL_FIRST,	pOpt->bDelEmptyNode );
+    aCheckLB.CheckEntryPos( REPLACE_USER_COLL,	CBCOL_FIRST,	pOpt->bChgUserColl );
+    aCheckLB.CheckEntryPos( REPLACE_BULLETS,	CBCOL_FIRST,	pOpt->bChgEnumNum );
 
     aBulletFont = pOpt->aBulletFont;
     sBulletChar = pOpt->cBullet;
@@ -773,7 +773,7 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& )
     pUserData = new ImpUserData(&sMargin, 0);
     aCheckLB.SetUserData( MERGE_SINGLE_LINE_PARA, pUserData );
 
-    aCheckLB.CheckEntryPos( APPLY_NUMBERING,    CBCOL_SECOND,   pOpt->bSetNumRule );
+    aCheckLB.CheckEntryPos( APPLY_NUMBERING,	CBCOL_SECOND,	pOpt->bSetNumRule );
 
     aByInputBulletFont = pOpt->aByInputBulletFont;
     sByInputBulletChar = pOpt->cByInputBullet;
@@ -781,9 +781,9 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& )
     aCheckLB.SetUserData( APPLY_NUMBERING , pUserData2 );
 
     aCheckLB.CheckEntryPos( MERGE_SINGLE_LINE_PARA, CBCOL_FIRST, pOpt->bRightMargin );
-    aCheckLB.CheckEntryPos( INSERT_BORDER,      CBCOL_SECOND,   pOpt->bSetBorder );
-    aCheckLB.CheckEntryPos( CREATE_TABLE,       CBCOL_SECOND,   pOpt->bCreateTable );
-    aCheckLB.CheckEntryPos( REPLACE_STYLES,     CBCOL_SECOND,   pOpt->bReplaceStyles );
+    aCheckLB.CheckEntryPos( INSERT_BORDER,		CBCOL_SECOND,	pOpt->bSetBorder );
+    aCheckLB.CheckEntryPos( CREATE_TABLE,		CBCOL_SECOND,	pOpt->bCreateTable );
+    aCheckLB.CheckEntryPos( REPLACE_STYLES,		CBCOL_SECOND,	pOpt->bReplaceStyles );
 
     aCheckLB.SetUpdateMode(TRUE);
 }
@@ -972,9 +972,9 @@ void    OfaACorrCheckListBox::KeyInput( const KeyEvent& rKEvt )
  * --------------------------------------------------*/
 struct DoubleString
 {
-    String  sShort;
-    String  sLong;
-    void*   pUserData; // CheckBox -> form. Text Bool -> Selektionstext
+    String 	sShort;
+    String 	sLong;
+    void* 	pUserData; // CheckBox -> form. Text Bool -> Selektionstext
 };
 typedef DoubleString* DoubleStringPtr;
 SV_DECL_PTRARR_DEL(DoubleStringArray, DoubleStringPtr, 4, 4)
@@ -1004,10 +1004,10 @@ OfaAutocorrReplacePage::OfaAutocorrReplacePage( Window* pParent,
     SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_REPLACE ), rSet),
     aTextOnlyCB(    this, CUI_RES(CB_TEXT_ONLY      )),
     aShortFT  (     this, CUI_RES(FT_SHORT          )),
-    aShortED  (     this, CUI_RES(ED_SHORT          )),
-    aReplaceFT(     this, CUI_RES(FT_REPLACE        )),
-    aReplaceED(     this, CUI_RES(ED_REPLACE        )),
-    aReplaceTLB(    this, CUI_RES(TLB_REPLACE       )),
+    aShortED  ( 	this, CUI_RES(ED_SHORT          )),
+    aReplaceFT( 	this, CUI_RES(FT_REPLACE        )),
+    aReplaceED( 	this, CUI_RES(ED_REPLACE        )),
+    aReplaceTLB( 	this, CUI_RES(TLB_REPLACE       )),
     aNewReplacePB(  this, CUI_RES(PB_NEW_REPLACE    )),
     aDeleteReplacePB(this,CUI_RES(PB_DELETE_REPLACE )),
     sModify(CUI_RES(STR_MODIFY)),
@@ -1061,7 +1061,7 @@ OfaAutocorrReplacePage::~OfaAutocorrReplacePage()
 
 --------------------------------------------------*/
 
-SfxTabPage* OfaAutocorrReplacePage::Create( Window* pParent,
+SfxTabPage*	OfaAutocorrReplacePage::Create( Window* pParent,
                                 const SfxItemSet& rSet)
 {
     return new OfaAutocorrReplacePage(pParent, rSet);
@@ -1069,7 +1069,7 @@ SfxTabPage* OfaAutocorrReplacePage::Create( Window* pParent,
 /* -----------------20.11.98 13:26-------------------
  *
  * --------------------------------------------------*/
-void    OfaAutocorrReplacePage::ActivatePage( const SfxItemSet& )
+void	OfaAutocorrReplacePage::ActivatePage( const SfxItemSet& )
 {
     if(eLang != eLastDialogLanguage)
         SetLanguage(eLastDialogLanguage);
@@ -1597,18 +1597,18 @@ void lcl_ClearTable(StringsTable& rTable)
 OfaAutocorrExceptPage::OfaAutocorrExceptPage( Window* pParent,
                                                 const SfxItemSet& rSet ) :
     SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_EXCEPT ), rSet),
-    aAbbrevFL       (this, CUI_RES(FL_ABBREV         )),
-    aAbbrevED       (this, CUI_RES(ED_ABBREV         )),
-    aAbbrevLB       (this, CUI_RES(LB_ABBREV         )),
-    aNewAbbrevPB    (this, CUI_RES(PB_NEWABBREV  )),
-    aDelAbbrevPB    (this, CUI_RES(PB_DELABBREV  )),
-    aAutoAbbrevCB   (this, CUI_RES(CB_AUTOABBREV     )),
-    aDoubleCapsFL   (this, CUI_RES(FL_DOUBLECAPS     )),
-    aDoubleCapsED   (this, CUI_RES(ED_DOUBLE_CAPS    )),
-    aDoubleCapsLB   (this, CUI_RES(LB_DOUBLE_CAPS    )),
+    aAbbrevFL    	(this, CUI_RES(FL_ABBREV		 )),
+    aAbbrevED       (this, CUI_RES(ED_ABBREV		 )),
+    aAbbrevLB    	(this, CUI_RES(LB_ABBREV		 )),
+    aNewAbbrevPB    (this, CUI_RES(PB_NEWABBREV	 )),
+    aDelAbbrevPB    (this, CUI_RES(PB_DELABBREV	 )),
+    aAutoAbbrevCB   (this, CUI_RES(CB_AUTOABBREV	 )),
+    aDoubleCapsFL   (this, CUI_RES(FL_DOUBLECAPS	 )),
+    aDoubleCapsED   (this, CUI_RES(ED_DOUBLE_CAPS	 )),
+    aDoubleCapsLB   (this, CUI_RES(LB_DOUBLE_CAPS	 )),
     aNewDoublePB    (this, CUI_RES(PB_NEWDOUBLECAPS)),
-    aDelDoublePB    (this, CUI_RES(PB_DELDOUBLECAPS)),
-    aAutoCapsCB     (this, CUI_RES(CB_AUTOCAPS   )),
+    aDelDoublePB 	(this, CUI_RES(PB_DELDOUBLECAPS)),
+    aAutoCapsCB   	(this, CUI_RES(CB_AUTOCAPS	 )),
     eLang(eLastDialogLanguage)
 {
     FreeResource();
@@ -1647,7 +1647,7 @@ OfaAutocorrExceptPage::~OfaAutocorrExceptPage()
 
 --------------------------------------------------*/
 
-SfxTabPage* OfaAutocorrExceptPage::Create( Window* pParent,
+SfxTabPage*	OfaAutocorrExceptPage::Create( Window* pParent,
                                 const SfxItemSet& rSet)
 {
     return new OfaAutocorrExceptPage(pParent, rSet);
@@ -1655,7 +1655,7 @@ SfxTabPage* OfaAutocorrExceptPage::Create( Window* pParent,
 /* -----------------20.11.98 13:26-------------------
  *
  * --------------------------------------------------*/
-void    OfaAutocorrExceptPage::ActivatePage( const SfxItemSet& )
+void	OfaAutocorrExceptPage::ActivatePage( const SfxItemSet& )
 {
     if(eLang != eLastDialogLanguage)
         SetLanguage(eLastDialogLanguage);
@@ -1883,8 +1883,8 @@ void OfaAutocorrExceptPage::Reset( const SfxItemSet& )
 {
     SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect();
     RefillReplaceBoxes(TRUE, eLang, eLang);
-    aAutoAbbrevCB.  Check(  pAutoCorrect->IsAutoCorrFlag( SaveWordCplSttLst ));
-    aAutoCapsCB.    Check(  pAutoCorrect->IsAutoCorrFlag( SaveWordWrdSttLst ));
+    aAutoAbbrevCB.	Check(	pAutoCorrect->IsAutoCorrFlag( SaveWordCplSttLst ));
+    aAutoCapsCB.	Check(	pAutoCorrect->IsAutoCorrFlag( SaveWordWrdSttLst ));
     aAutoAbbrevCB.SaveValue();
     aAutoCapsCB.SaveValue();
 }
@@ -1948,7 +1948,7 @@ IMPL_LINK(OfaAutocorrExceptPage, SelectHdl, ListBox*, pBox)
 
 IMPL_LINK(OfaAutocorrExceptPage, ModifyHdl, Edit*, pEdt)
 {
-//  BOOL bSame = pEdt->GetText() == ->GetSelectEntry();
+//	BOOL bSame = pEdt->GetText() == ->GetSelectEntry();
     const String& sEntry = pEdt->GetText();
     BOOL bEntryLen = 0!= sEntry.Len();
     if(pEdt == &aAbbrevED)
@@ -1999,26 +1999,26 @@ enum OfaQuoteOptions
     REPLACE_1ST
 };
 
-SvLBoxEntry* OfaQuoteTabPage::CreateEntry(String& rTxt, USHORT nCol)
+SvLBoxEntry* OfaQuoteTabPage::CreateEntry(String& rTxt, USHORT nCol) 
 {
     SvLBoxEntry* pEntry = new SvLBoxEntry;
-
+    
     if ( !pCheckButtonData )
     {
         pCheckButtonData = new SvLBoxButtonData( &aSwCheckLB );
         aSwCheckLB.SetCheckButtonData( pCheckButtonData );
     }
 
-    pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0));    // Sonst Puff!
+    pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0));	// Sonst Puff!
 
     String sEmpty;
     if (nCol == CBCOL_SECOND)
-        pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) );    // Leerspalte
+        pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) );	// Leerspalte
     else
         pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData ) );
 
     if (nCol == CBCOL_FIRST)
-        pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) );    // Leerspalte
+        pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) );	// Leerspalte
     else
         pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData ) );
 
@@ -2029,15 +2029,15 @@ SvLBoxEntry* OfaQuoteTabPage::CreateEntry(String& rTxt, USHORT nCol)
 
 OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) :
     SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_QUOTE ), rSet),
-    aCheckLB            (this, CUI_RES(CLB_SETTINGS     )),
-    aSwCheckLB          (this, CUI_RES(CLB_SETTINGS     )),
-    sHeader1            (CUI_RES( STR_HEADER1           )),
-    sHeader2            (CUI_RES( STR_HEADER2           )),
-    sNonBrkSpace        (CUI_RES( ST_NON_BREAK_SPACE    )),
-    sOrdinal            (CUI_RES( ST_ORDINAL            )),
+    aCheckLB			(this, CUI_RES(CLB_SETTINGS     )),
+    aSwCheckLB			(this, CUI_RES(CLB_SETTINGS     )),
+    sHeader1			(CUI_RES( STR_HEADER1		    )),
+    sHeader2			(CUI_RES( STR_HEADER2		    )),
+    sNonBrkSpace		(CUI_RES( ST_NON_BREAK_SPACE    )),
+    sOrdinal			(CUI_RES( ST_ORDINAL            )),
     pCheckButtonData    ( NULL ),
 
-    aSingleFL           (this, CUI_RES(FL_SINGLE         )),
+    aSingleFL           (this, CUI_RES(FL_SINGLE		 )),
     aSingleTypoCB       (this, CUI_RES(CB_SGL_TYPO     )),
     aSglStartQuoteFT    (this, CUI_RES(FT_SGL_STARTQUOTE )),
     aSglStartQuotePB    (this, CUI_RES(PB_SGL_STARTQUOTE )),
@@ -2053,7 +2053,7 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) :
     aStartQuotePB       (this, CUI_RES(PB_STARTQUOTE   )),
     aDblStartExFT       (this, CUI_RES(FT_DBSTEX       )),
     aEndQuoteFT         (this, CUI_RES(FT_ENDQUOTE     )),
-    aEndQuotePB         (this, CUI_RES(PB_ENDQUOTE     )),
+    aEndQuotePB    		(this, CUI_RES(PB_ENDQUOTE     )),
     aDblEndExFT         (this, CUI_RES(FT_DBECEX       )),
     aDblStandardPB      (this, CUI_RES(PB_DBL_STD      )),
 
@@ -2063,7 +2063,7 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) :
     sStandard(CUI_RES(ST_STANDARD))
 {
     FreeResource();
-
+    
     BOOL bShowSWOptions = FALSE;
 
     aCheckLB.SetHelpId( HID_OFAPAGE_QUOTE_CLB );
@@ -2079,7 +2079,7 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) :
         {
             3, 0, 20, 40
         };
-
+    
         aSwCheckLB.SetWindowBits(WB_HSCROLL| WB_VSCROLL);
 
         aSwCheckLB.SvxSimpleTable::SetTabs(aStaticTabs);
@@ -2096,12 +2096,12 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) :
         aSwCheckLB.HideTable( );
     }
 
-    aStartQuotePB.SetClickHdl(LINK(this,    OfaQuoteTabPage, QuoteHdl));
-    aEndQuotePB.SetClickHdl(LINK(this,      OfaQuoteTabPage, QuoteHdl));
+    aStartQuotePB.SetClickHdl(LINK(this, 	OfaQuoteTabPage, QuoteHdl));
+    aEndQuotePB.SetClickHdl(LINK(this, 		OfaQuoteTabPage, QuoteHdl));
     aSglStartQuotePB.SetClickHdl(LINK(this, OfaQuoteTabPage, QuoteHdl));
-    aSglEndQuotePB.SetClickHdl(LINK(this,   OfaQuoteTabPage, QuoteHdl));
-    aDblStandardPB.SetClickHdl(LINK(this,   OfaQuoteTabPage, StdQuoteHdl));
-    aSglStandardPB.SetClickHdl(LINK(this,   OfaQuoteTabPage, StdQuoteHdl));
+    aSglEndQuotePB.SetClickHdl(LINK(this, 	OfaQuoteTabPage, QuoteHdl));
+    aDblStandardPB.SetClickHdl(LINK(this, 	OfaQuoteTabPage, StdQuoteHdl));
+    aSglStandardPB.SetClickHdl(LINK(this, 	OfaQuoteTabPage, StdQuoteHdl));
 
 }
 /*-----------------03.07.97 13:17-------------------
@@ -2114,7 +2114,7 @@ OfaQuoteTabPage::~OfaQuoteTabPage()
 /*-----------------03.07.97 13:17-------------------
 
 --------------------------------------------------*/
-SfxTabPage* OfaQuoteTabPage::Create( Window* pParent,
+SfxTabPage*	OfaQuoteTabPage::Create( Window* pParent,
                                 const SfxItemSet& rAttrSet)
 {
     return new OfaQuoteTabPage(pParent, rAttrSet);
@@ -2131,8 +2131,8 @@ BOOL OfaQuoteTabPage::FillItemSet( SfxItemSet&  )
     if ( aCheckLB.IsVisible( ) )
     {
         USHORT nPos = 0;
-        pAutoCorrect->SetAutoCorrFlag(AddNonBrkSpace,       aCheckLB.IsChecked(nPos++));
-        pAutoCorrect->SetAutoCorrFlag(ChgOrdinalNumber,     aCheckLB.IsChecked(nPos++));
+        pAutoCorrect->SetAutoCorrFlag(AddNonBrkSpace,		aCheckLB.IsChecked(nPos++));
+        pAutoCorrect->SetAutoCorrFlag(ChgOrdinalNumber,		aCheckLB.IsChecked(nPos++));
     }
 
     BOOL bModified = FALSE;
@@ -2153,8 +2153,8 @@ BOOL OfaQuoteTabPage::FillItemSet( SfxItemSet&  )
                         aSwCheckLB.IsChecked(REPLACE_1ST, CBCOL_SECOND));
     }
 
-    pAutoCorrect->SetAutoCorrFlag(ChgQuotes,        aTypoCB.IsChecked());
-    pAutoCorrect->SetAutoCorrFlag(ChgSglQuotes,     aSingleTypoCB.IsChecked());
+    pAutoCorrect->SetAutoCorrFlag(ChgQuotes, 		aTypoCB.IsChecked());
+    pAutoCorrect->SetAutoCorrFlag(ChgSglQuotes, 	aSingleTypoCB.IsChecked());
     BOOL bReturn = nFlags != pAutoCorrect->GetFlags();
     if(cStartQuote != pAutoCorrect->GetStartDoubleQuote())
     {
@@ -2215,10 +2215,10 @@ void OfaQuoteTabPage::Reset( const SfxItemSet& )
         aSwCheckLB.GetModel()->Insert(CreateEntry(sNonBrkSpace,       CBCOL_BOTH ));
         aSwCheckLB.GetModel()->Insert(CreateEntry(sOrdinal,           CBCOL_BOTH ));
 
-        aSwCheckLB.CheckEntryPos( ADD_NONBRK_SPACE, CBCOL_FIRST,    pOpt->bAddNonBrkSpace );
-        aSwCheckLB.CheckEntryPos( ADD_NONBRK_SPACE, CBCOL_SECOND,   0 != (nFlags & AddNonBrkSpace) );
-        aSwCheckLB.CheckEntryPos( REPLACE_1ST,      CBCOL_FIRST,    pOpt->bChgOrdinalNumber );
-        aSwCheckLB.CheckEntryPos( REPLACE_1ST,      CBCOL_SECOND,   0 != (nFlags & ChgOrdinalNumber) );
+        aSwCheckLB.CheckEntryPos( ADD_NONBRK_SPACE, CBCOL_FIRST,	pOpt->bAddNonBrkSpace );
+        aSwCheckLB.CheckEntryPos( ADD_NONBRK_SPACE,	CBCOL_SECOND,	0 != (nFlags & AddNonBrkSpace) );
+        aSwCheckLB.CheckEntryPos( REPLACE_1ST,		CBCOL_FIRST,	pOpt->bChgOrdinalNumber );
+        aSwCheckLB.CheckEntryPos( REPLACE_1ST,		CBCOL_SECOND,	0 != (nFlags & ChgOrdinalNumber) );
 
         aSwCheckLB.SetUpdateMode( TRUE );
     }
@@ -2231,7 +2231,7 @@ void OfaQuoteTabPage::Reset( const SfxItemSet& )
 
         aCheckLB.InsertEntry( sNonBrkSpace );
         aCheckLB.InsertEntry( sOrdinal );
-
+    
         USHORT nPos = 0;
         aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & AddNonBrkSpace) );
         aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & ChgOrdinalNumber) );
@@ -2240,10 +2240,10 @@ void OfaQuoteTabPage::Reset( const SfxItemSet& )
     }
 
     // Initialize the quote stuffs
-    aTypoCB             .Check(0 != (nFlags & ChgQuotes));
-    aSingleTypoCB       .Check(0 != (nFlags & ChgSglQuotes));
-    aTypoCB             .SaveValue();
-    aSingleTypoCB       .SaveValue();
+    aTypoCB    			.Check(0 != (nFlags & ChgQuotes));
+    aSingleTypoCB    	.Check(0 != (nFlags & ChgSglQuotes));
+    aTypoCB    			.SaveValue();
+    aSingleTypoCB    	.SaveValue();
 
     cStartQuote = pAutoCorrect->GetStartDoubleQuote();
     cEndQuote = pAutoCorrect->GetEndDoubleQuote();
@@ -2260,7 +2260,7 @@ void OfaQuoteTabPage::Reset( const SfxItemSet& )
 /*-----------------15.10.96 16.42-------------------
 
 --------------------------------------------------*/
-#define SGL_START       0
+#define SGL_START		0
 #define DBL_START       1
 #define SGL_END         2
 #define DBL_END         3
@@ -2395,7 +2395,7 @@ String OfaQuoteTabPage::ChangeStringExt_Impl( sal_UCS4 cChar )
 OfaAutoCompleteTabPage::OfaAutoCompleteTabPage( Window* pParent,
                                                 const SfxItemSet& rSet )
     : SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCOMPLETE_OPTIONS ), rSet),
-    aCBActiv        (this, CUI_RES(CB_ACTIV)),
+    aCBActiv		(this, CUI_RES(CB_ACTIV)),
     aCBAppendSpace  (this, CUI_RES(CB_APPEND_SPACE)),
     aCBAsTip        (this, CUI_RES(CB_AS_TIP)),
     aCBCollect      (this, CUI_RES(CB_COLLECT)),
@@ -2428,7 +2428,7 @@ OfaAutoCompleteTabPage::OfaAutoCompleteTabPage( Window* pParent,
         KeyCode aKCode( *pKeys );
         USHORT nPos = aDCBExpandKey.InsertEntry( aKCode.GetName() );
         aDCBExpandKey.SetEntryData( nPos, (void*)(ULONG)*pKeys );
-        if( KEY_RETURN == *pKeys )      // default to RETURN
+        if( KEY_RETURN == *pKeys )		// default to RETURN
             aDCBExpandKey.SelectEntryPos( nPos );
     }
 
@@ -2441,7 +2441,7 @@ OfaAutoCompleteTabPage::~OfaAutoCompleteTabPage()
 {
 }
 
-SfxTabPage* OfaAutoCompleteTabPage::Create( Window* pParent,
+SfxTabPage*	OfaAutoCompleteTabPage::Create( Window* pParent,
                                             const SfxItemSet& rSet)
 {
     return new OfaAutoCompleteTabPage( pParent, rSet );
@@ -2461,7 +2461,7 @@ BOOL OfaAutoCompleteTabPage::FillItemSet( SfxItemSet& )
     bModified |= pOpt->bAutoCmpltCollectWords != bCheck;
     pOpt->bAutoCmpltCollectWords = bCheck;
     bCheck = !aCBRemoveList.IsChecked(); // inverted value!
-    bModified |= pOpt->bAutoCmpltKeepList != bCheck;
+    bModified |= pOpt->bAutoCmpltKeepList != bCheck; 
     pOpt->bAutoCmpltKeepList = bCheck;
     bCheck = aCBAppendSpace.IsChecked();
     bModified |= pOpt->bAutoCmpltAppendBlanc != bCheck;
@@ -2665,7 +2665,7 @@ OfaSmartTagOptionsTabPage::~OfaSmartTagOptionsTabPage()
 
 }
 
-SfxTabPage* OfaSmartTagOptionsTabPage::Create( Window* pParent, const SfxItemSet& rSet)
+SfxTabPage*	OfaSmartTagOptionsTabPage::Create( Window* pParent, const SfxItemSet& rSet)
 {
     return new OfaSmartTagOptionsTabPage( pParent, rSet );
 }
diff --git a/cui/source/tabpages/autocdlg.hrc b/cui/source/tabpages/autocdlg.hrc
index 7a747939b4d5..e63684c96061 100644
--- a/cui/source/tabpages/autocdlg.hrc
+++ b/cui/source/tabpages/autocdlg.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 // defines ------------------------------------------------------------------
 
-#define CLB_SETTINGS                    1
+#define CLB_SETTINGS					1
 /*
 #define STR_DOUBLECAPS                  3
 #define STR_STARTCAPS                   4
@@ -48,14 +48,14 @@
 #define FT_ENDQUOTE                     14
 #define PB_ENDQUOTE                     15
 
-#define FL_ABBREV                       16
-#define ED_ABBREV                       17
-#define LB_ABBREV                       18
-#define PB_NEWABBREV                    19
-#define PB_DELABBREV                    20
-#define FL_DOUBLECAPS                   21
-#define ED_DOUBLE_CAPS                  22
-#define LB_DOUBLE_CAPS                  23
+#define FL_ABBREV		 				16
+#define ED_ABBREV		        		17
+#define LB_ABBREV		        		18
+#define PB_NEWABBREV	                19
+#define PB_DELABBREV	                20
+#define FL_DOUBLECAPS	                21
+#define ED_DOUBLE_CAPS	                22
+#define LB_DOUBLE_CAPS	                23
 #define PB_NEWDOUBLECAPS                24
 #define PB_DELDOUBLECAPS                25
 
@@ -69,9 +69,9 @@
 #define STR_CLOSE_AUTOCORR              38
 #define FT_SHORT                        39
 #define FT_REPLACE                      40
-#define STR_CHANGE_START                41
+#define STR_CHANGE_START				41
 #define STR_CHANGE_END                  42
-#define CB_AUTOABBREV                   43
+#define CB_AUTOABBREV	                43
 #define CB_AUTOCAPS                     44
 
 #define FT_SGL_STARTQUOTE               45
@@ -89,39 +89,39 @@
 #define CB_SGL_TYPO                     57
 #define ST_STANDARD                     58
 
-#define PB_EDIT                         61
-#define ST_DEL_EMPTY_PARA               62
-#define ST_TYPO                         66
-#define ST_USER_STYLE                   67
-#define ST_BULLET                       68
-#define STR_DEL_SPACES_AT_STT_END       69
+#define PB_EDIT 						61
+#define ST_DEL_EMPTY_PARA 				62
+#define ST_TYPO 						66
+#define ST_USER_STYLE					67
+#define ST_BULLET						68
+#define STR_DEL_SPACES_AT_STT_END		69
 #define STR_DEL_SPACES_BETWEEN_LINES    70
 
-#define ST_RIGHT_MARGIN                 74
-#define STR_NUM                         75
-#define STR_BORDER                      76
-#define STR_TABLE                       77
-#define STR_REPLACE_TEMPLATES           78
-#define FL_PRCNT                        79
-
-#define STR_HEADER                      90
-#define FT_HEADER_EXPLANATION           91
-#define STR_HEADER1                     92
-#define STR_HEADER2                     93
-#define FT_HEADER1_EXPLANATION          94
-#define FT_HEADER2_EXPLANATION          95
-
-#define ED_RIGHT_MARGIN                 100
-#define BT_OK                           101
-#define BT_CANCEL                       102
-
-#define BT_AWCP_OK                      110
-#define BT_AWCP_CANCEL                  111
-#define GB_AWCP_VALUE                   112
-#define ED_AWCP_WORD_LEN                113
-#define ED_AWCP_LIST_LEN                114
-#define FT_AWCP_WORD_LEN                115
-#define FT_AWCP_LIST_LEN                116
+#define ST_RIGHT_MARGIN 				74
+#define STR_NUM							75
+#define STR_BORDER              		76
+#define STR_TABLE               		77
+#define STR_REPLACE_TEMPLATES			78
+#define FL_PRCNT						79
+
+#define STR_HEADER						90
+#define FT_HEADER_EXPLANATION			91
+#define STR_HEADER1						92
+#define STR_HEADER2						93
+#define FT_HEADER1_EXPLANATION			94
+#define FT_HEADER2_EXPLANATION			95
+
+#define ED_RIGHT_MARGIN			 		100
+#define BT_OK							101
+#define BT_CANCEL						102
+
+#define BT_AWCP_OK						110
+#define BT_AWCP_CANCEL					111
+#define GB_AWCP_VALUE					112
+#define ED_AWCP_WORD_LEN				113
+#define ED_AWCP_LIST_LEN				114
+#define FT_AWCP_WORD_LEN				115
+#define FT_AWCP_LIST_LEN				116
 
 #define CB_ACTIV                        121
 #define CB_COLLECT                      122
@@ -138,7 +138,7 @@
 #define PB_ENTRIES                      133
 
 
-#define ST_USE_REPLACE                  200
+#define ST_USE_REPLACE					200
 #define ST_CPTL_STT_WORD                201
 #define ST_CPTL_STT_SENT                202
 #define ST_BOLD_UNDER                   203
diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src
index 53b31dc575ea..2fbbd2177cb0 100644
--- a/cui/source/tabpages/autocdlg.src
+++ b/cui/source/tabpages/autocdlg.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -768,7 +768,7 @@ TabPage RID_OFAPAGE_SMARTTAG_OPTIONS
     SVLook = TRUE ;
     Hide = TRUE ;
     Text [ en-US ] = "Smart Tags";
-
+    
     CheckBox CB_SMARTTAGS
     {
         Pos = MAP_APPFONT( 4, 3 );
@@ -782,7 +782,7 @@ TabPage RID_OFAPAGE_SMARTTAG_OPTIONS
         Size = MAP_APPFONT( 116, 8 );
         Text [ en-US ] = "Currently installed smart tags";
     };
-
+    
     Control LB_SMARTTAGS
     {
         Pos = MAP_APPFONT ( 12 , 25 ) ;
@@ -790,14 +790,14 @@ TabPage RID_OFAPAGE_SMARTTAG_OPTIONS
         Border = TRUE ;
         TabStop = TRUE ;
     };
-
+    
     PushButton PB_SMARTTAGS
     {
         Pos = MAP_APPFONT ( 188 , 25 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "Properties...";
     };
-
+    
 };
 
 
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index d3224b6bf78b..231bcdd18db1 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include <editeng/eerdll.hxx>
 
 // Tabellenhintergrund
-#define TBL_DEST_CELL   0
-#define TBL_DEST_ROW    1
-#define TBL_DEST_TBL    2
+#define TBL_DEST_CELL 	0
+#define TBL_DEST_ROW 	1
+#define TBL_DEST_TBL	2
 
 #include <editeng/brshitem.hxx>
 #include "backgrnd.hxx"
@@ -81,9 +81,9 @@ static USHORT pRanges[] =
 
 struct SvxBackgroundTable_Impl
 {
-    SvxBrushItem*   pCellBrush;
-    SvxBrushItem*   pRowBrush;
-    SvxBrushItem*   pTableBrush;
+    SvxBrushItem*	pCellBrush;
+    SvxBrushItem*	pRowBrush;
+    SvxBrushItem*	pTableBrush;
     USHORT          nCellWhich;
     USHORT          nRowWhich;
     USHORT          nTableWhich;
@@ -96,10 +96,10 @@ struct SvxBackgroundTable_Impl
 
 struct SvxBackgroundPara_Impl
 {
-    SvxBrushItem*   pParaBrush;
-    SvxBrushItem*   pCharBrush;
+    SvxBrushItem*	pParaBrush;
+    SvxBrushItem*	pCharBrush;
 
-    USHORT          nActPos;
+    USHORT 			nActPos;
 
     SvxBackgroundPara_Impl() :
         pParaBrush(NULL), pCharBrush(NULL) {}
@@ -133,15 +133,15 @@ void lcl_SetTransparency(SvxBrushItem& rBrush, long nTransparency)
 }
 //-------------------------------------------------------------------------
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
 */
 
 USHORT GetItemId_Impl( ValueSet& rValueSet, const Color& rCol )
 {
-    BOOL    bFound = FALSE;
-    USHORT  nCount = rValueSet.GetItemCount();
-    USHORT  n      = 1;
+    BOOL	bFound = FALSE;
+    USHORT	nCount = rValueSet.GetItemCount();
+    USHORT	n	   = 1;
 
     while ( !bFound && n <= nCount )
     {
@@ -159,7 +159,7 @@ USHORT GetItemId_Impl( ValueSet& rValueSet, const Color& rCol )
 
 // class BackgroundPreview -----------------------------------------------
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Vorschaufenster f"ur Brush oder Bitmap
 */
@@ -171,19 +171,19 @@ public:
                            const ResId& rResId, BOOL bIsBmpPreview );
     ~BackgroundPreviewImpl();
 
-    void            NotifyChange( const Color&  rColor );
-    void            NotifyChange( const Bitmap* pBitmap );
+    void			NotifyChange( const Color&  rColor );
+    void			NotifyChange( const Bitmap* pBitmap );
 
 protected:
-    virtual void    Paint( const Rectangle& rRect );
+    virtual void	Paint( const Rectangle& rRect );
     virtual void    DataChanged( const DataChangedEvent& rDCEvt );
 
 private:
-    const BOOL      bIsBmp;
-    Bitmap*         pBitmap;
-    Point           aDrawPos;
-    Size            aDrawSize;
-    Rectangle       aDrawRect;
+    const BOOL		bIsBmp;
+    Bitmap*			pBitmap;
+    Point			aDrawPos;
+    Size			aDrawSize;
+    Rectangle		aDrawRect;
     BYTE            nTransparency;
 };
 
@@ -196,14 +196,14 @@ BackgroundPreviewImpl::BackgroundPreviewImpl
     BOOL bIsBmpPreview
 ) :
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
 */
 
     Window( pParent, rResId ),
 
-    bIsBmp   ( bIsBmpPreview ),
-    pBitmap  ( NULL ),
+    bIsBmp	 ( bIsBmpPreview ),
+    pBitmap	 ( NULL ),
     aDrawRect( Point(0,0), GetOutputSizePixel() ),
     nTransparency(0)
 
@@ -216,7 +216,7 @@ BackgroundPreviewImpl::BackgroundPreviewImpl
 
 BackgroundPreviewImpl::~BackgroundPreviewImpl()
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
 */
 
@@ -241,7 +241,7 @@ void BackgroundPreviewImpl::NotifyChange( const Color& rColor )
 //-----------------------------------------------------------------------
 
 void BackgroundPreviewImpl::NotifyChange( const Bitmap* pNewBitmap )
-/*  [Beschreibung]
+/*	[Beschreibung]
 
 */
 
@@ -314,7 +314,7 @@ void BackgroundPreviewImpl::Paint( const Rectangle& )
         {
             Size aSize = GetOutputSizePixel();
             DrawLine( Point(0,0),               Point(aSize.Width(),aSize.Height()) );
-            DrawLine( Point(0,aSize.Height()),  Point(aSize.Width(),0) );
+            DrawLine( Point(0,aSize.Height()),	Point(aSize.Width(),0) );
         }
     }
 }
@@ -338,51 +338,51 @@ void BackgroundPreviewImpl::DataChanged( const DataChangedEvent& rDCEvt )
 SvxBackgroundTabPage::SvxBackgroundTabPage( Window* pParent,
                                             const SfxItemSet& rCoreSet ) :
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
 */
 
     SvxTabPage( pParent, CUI_RES( RID_SVXPAGE_BACKGROUND ), rCoreSet ),
 
-    aBorderWin          ( this, CUI_RES(CT_BORDER) ),
+    aBorderWin			( this, CUI_RES(CT_BORDER) ),
     aBackgroundColorSet ( &aBorderWin, CUI_RES( SET_BGDCOLOR ) ),
     aBackgroundColorBox ( this, CUI_RES( GB_BGDCOLOR ) ),
     pPreviewWin1        ( new BackgroundPreviewImpl(
                             this, CUI_RES( WIN_PREVIEW1 ), FALSE ) ),
     aColTransFT         ( this, CUI_RES( FT_COL_TRANS ) ),
     aColTransMF         ( this, CUI_RES( MF_COL_TRANS ) ),
-    aBtnBrowse          ( this, CUI_RES( BTN_BROWSE ) ),
-    aBtnLink            ( this, CUI_RES( BTN_LINK ) ),
-    aBtnPreview         ( this, CUI_RES( BTN_PREVIEW ) ),
-    aFtFile             ( this, CUI_RES( FT_FILE ) ),
-    aGbFile             ( this, CUI_RES( GB_FILE ) ),
+    aBtnBrowse	        ( this, CUI_RES( BTN_BROWSE ) ),
+    aBtnLink	        ( this, CUI_RES( BTN_LINK ) ),
+    aBtnPreview	        ( this, CUI_RES( BTN_PREVIEW ) ),
+    aFtFile		        ( this, CUI_RES( FT_FILE ) ),
+    aGbFile		        ( this, CUI_RES( GB_FILE ) ),
     aBtnPosition        ( this, CUI_RES( BTN_POSITION ) ),
-    aBtnArea            ( this, CUI_RES( BTN_AREA ) ),
-    aBtnTile            ( this, CUI_RES( BTN_TILE ) ),
-    aWndPosition        ( this, CUI_RES( WND_POSITION ), RP_MM ),
-    aGbPosition         ( this, CUI_RES( GB_POSITION ) ),
+    aBtnArea	        ( this, CUI_RES( BTN_AREA ) ),
+    aBtnTile	        ( this, CUI_RES( BTN_TILE ) ),
+    aWndPosition		( this, CUI_RES( WND_POSITION ), RP_MM ),
+    aGbPosition			( this, CUI_RES( GB_POSITION ) ),
     aGraphTransFL       ( this, CUI_RES( FL_GRAPH_TRANS ) ),
     aGraphTransMF       ( this, CUI_RES( MF_GRAPH_TRANS ) ),
     pPreviewWin2        ( new BackgroundPreviewImpl(
                             this, CUI_RES( WIN_PREVIEW2 ), TRUE ) ),
-    aSelectTxt          ( this, CUI_RES( FT_SELECTOR ) ),
-    aLbSelect           ( this, CUI_RES( LB_SELECTOR ) ),
+    aSelectTxt			( this, CUI_RES( FT_SELECTOR ) ),
+    aLbSelect			( this, CUI_RES( LB_SELECTOR ) ),
     aStrBrowse          ( CUI_RES( STR_BROWSE ) ),
     aStrUnlinked        ( CUI_RES( STR_UNLINKED ) ),
     aTblDesc            ( this, CUI_RES( FT_TBL_DESC ) ),
     aTblLBox            ( this, CUI_RES( LB_TBL_BOX ) ),
     aParaLBox           ( this, CUI_RES( LB_PARA_BOX ) ),
     nHtmlMode           ( 0 ),
-    bAllowShowSelector  ( TRUE ),
-    bIsGraphicValid     ( FALSE ),
-    bLinkOnly           ( FALSE ),
+    bAllowShowSelector	( TRUE ),
+    bIsGraphicValid		( FALSE ),
+    bLinkOnly			( FALSE ),
     bResized            ( FALSE ),
     bColTransparency    ( FALSE ),
     bGraphTransparency  ( FALSE ),
 
     pPageImpl           ( new SvxBackgroundPage_Impl ),
-    pImportDlg          ( NULL ),
-    pTableBck_Impl      ( NULL ),
+    pImportDlg			( NULL ),
+    pTableBck_Impl		( NULL ),
     pParaBck_Impl       ( NULL )
 
 {
@@ -409,7 +409,7 @@ SvxBackgroundTabPage::SvxBackgroundTabPage( Window* pParent,
 
 SvxBackgroundTabPage::~SvxBackgroundTabPage()
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
 */
 
@@ -440,7 +440,7 @@ SvxBackgroundTabPage::~SvxBackgroundTabPage()
 
 USHORT* SvxBackgroundTabPage::GetRanges()
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     gibt den Bereich der Which-Werte zur"uck
 */
@@ -454,7 +454,7 @@ USHORT* SvxBackgroundTabPage::GetRanges()
 SfxTabPage* SvxBackgroundTabPage::Create( Window* pParent,
                                           const SfxItemSet& rAttrSet )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Create-Methode f"ur den TabDialog
 */
@@ -467,15 +467,15 @@ SfxTabPage* SvxBackgroundTabPage::Create( Window* pParent,
 
 void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
 */
 
 {
 // os: So ein Unsinn! Irgendwo laesst sich so ein Item immer finden,
-//      es muss aber im rSet vorhanden sein!
-//  const SfxPoolItem* pX = GetOldItem( rSet, SID_VIEW_FLD_PIC );
-//  if( pX && pX->ISA(SfxWallpaperItem))
+//		es muss aber im rSet vorhanden sein!
+//	const SfxPoolItem* pX = GetOldItem( rSet, SID_VIEW_FLD_PIC );
+// 	if( pX && pX->ISA(SfxWallpaperItem))
     if(SFX_ITEM_AVAILABLE <= rSet.GetItemState(GetWhich(SID_VIEW_FLD_PIC), FALSE))
     {
         ResetFromWallpaperItem( rSet );
@@ -496,7 +496,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet )
     const SfxPoolItem* pItem;
     USHORT nDestValue = USHRT_MAX;
 
-    if ( SFX_ITEM_SET == rSet.GetItemState( SID_BACKGRND_DESTINATION,
+    if ( SFX_ITEM_SET == rSet.GetItemState(	SID_BACKGRND_DESTINATION,
                                             FALSE, &pItem ) )
     {
         nDestValue = ((const SfxUInt16Item*)pItem)->GetValue();
@@ -712,8 +712,8 @@ void SvxBackgroundTabPage::ResetFromWallpaperItem( const SfxItemSet& rSet )
     bLinkOnly = TRUE;
     aBtnLink.Check( TRUE );
     aBtnLink.Show( FALSE );
-//  if( !pItem || !pItem->GetWallpaper(FALSE).IsBitmap() )
-//      aBtnLink.Check();
+//	if( !pItem || !pItem->GetWallpaper(FALSE).IsBitmap() )
+//		aBtnLink.Check();
 
     delete pTemp;
 }
@@ -724,7 +724,7 @@ void SvxBackgroundTabPage::ResetFromWallpaperItem( const SfxItemSet& rSet )
 
 void SvxBackgroundTabPage::FillUserData()
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Beim Destruieren einer SfxTabPage wird diese virtuelle Methode gerufen,
     damit die TabPage interne Informationen sichern kann.
@@ -740,7 +740,7 @@ void SvxBackgroundTabPage::FillUserData()
 
 BOOL SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
 */
 
@@ -751,10 +751,10 @@ BOOL SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
         LoadTimerHdl_Impl( pPageImpl->pLoadTimer );
     }
 // os: So ein Unsinn! Irgendwo laesst sich so ein Item immer finden,
-//      es muss aber im rSet vorhanden sein!
+//		es muss aber im rSet vorhanden sein!
 
-//  const SfxPoolItem* pX = GetOldItem( rCoreSet, SID_VIEW_FLD_PIC );
-//  if( pX && pX->ISA(SfxWallpaperItem))
+//	const SfxPoolItem* pX = GetOldItem( rCoreSet, SID_VIEW_FLD_PIC );
+//	if( pX && pX->ISA(SfxWallpaperItem))
     if(SFX_ITEM_AVAILABLE <= rCoreSet.GetItemState(GetWhich(SID_VIEW_FLD_PIC), FALSE))
         return FillItemSetWithWallpaperItem( rCoreSet, SID_VIEW_FLD_PIC );
 
@@ -797,9 +797,9 @@ BOOL SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
     BOOL bGraphTransparencyChanged = bGraphTransparency && (aGraphTransMF.GetText() != aGraphTransMF.GetSavedValue());
     if ( pOld )
     {
-        const SvxBrushItem& rOldItem    = (const SvxBrushItem&)*pOld;
-        SvxGraphicPosition  eOldPos     = rOldItem.GetGraphicPos();
-        const BOOL          bIsBrush    = ( 0 == aLbSelect.GetSelectEntryPos() );
+        const SvxBrushItem& rOldItem	= (const SvxBrushItem&)*pOld;
+        SvxGraphicPosition	eOldPos		= rOldItem.GetGraphicPos();
+        const BOOL 			bIsBrush	= ( 0 == aLbSelect.GetSelectEntryPos() );
 
         // transparency has to be set if enabled, the color not already set to "No fill" and
         if( bColTransparency &&
@@ -828,9 +828,9 @@ BOOL SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
             {
                 // Bitmap-Behandlung:
 
-                SvxGraphicPosition  eNewPos  = GetGraphicPosition_Impl();
-                const BOOL          bIsLink  = aBtnLink.IsChecked();
-                const BOOL          bWasLink = (NULL != rOldItem.GetGraphicLink() );
+                SvxGraphicPosition	eNewPos  = GetGraphicPosition_Impl();
+                const BOOL			bIsLink  = aBtnLink.IsChecked();
+                const BOOL			bWasLink = (NULL != rOldItem.GetGraphicLink() );
 
 
                 if ( !bIsLink && !bIsGraphicValid )
@@ -1001,10 +1001,10 @@ BOOL SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, U
     const SfxItemSet& rOldSet = GetItemSet();
     DBG_ASSERT(pOld,"FillItemSetWithWallpaperItem: Item not found");
 
-    SvxBrushItem        rOldItem( (const CntWallpaperItem&)*pOld, nWhich );
-    SvxGraphicPosition  eOldPos     = rOldItem.GetGraphicPos();
-    const BOOL          bIsBrush    = ( 0 == aLbSelect.GetSelectEntryPos() );
-    BOOL                bModified = FALSE;
+    SvxBrushItem 		rOldItem( (const CntWallpaperItem&)*pOld, nWhich );
+    SvxGraphicPosition	eOldPos		= rOldItem.GetGraphicPos();
+    const BOOL 			bIsBrush	= ( 0 == aLbSelect.GetSelectEntryPos() );
+    BOOL				bModified = FALSE;
 
     if (   ( (GPOS_NONE == eOldPos) && bIsBrush  )
         || ( (GPOS_NONE != eOldPos) && !bIsBrush ) ) // Brush <-> Bitmap gewechselt?
@@ -1027,7 +1027,7 @@ BOOL SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, U
         else
         {
             // Bitmap-Behandlung:
-            SvxGraphicPosition  eNewPos  = GetGraphicPosition_Impl();
+            SvxGraphicPosition	eNewPos  = GetGraphicPosition_Impl();
 
             int bBitmapChanged = ( ( eNewPos != eOldPos ) ||
                                    ( *rOldItem.GetGraphicLink() != aBgdGraphicPath ) );
@@ -1074,7 +1074,7 @@ BOOL SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, U
 
 int SvxBackgroundTabPage::DeactivatePage( SfxItemSet* _pSet )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     virtuelle Methode, wird beim Deaktivieren gerufen
 */
@@ -1093,7 +1093,7 @@ int SvxBackgroundTabPage::DeactivatePage( SfxItemSet* _pSet )
 
 void SvxBackgroundTabPage::PointChanged( Window* , RECT_POINT  )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
 */
 
@@ -1105,7 +1105,7 @@ void SvxBackgroundTabPage::PointChanged( Window* , RECT_POINT  )
 
 void SvxBackgroundTabPage::ShowSelector()
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
 */
 
@@ -1144,7 +1144,7 @@ void SvxBackgroundTabPage::ShowSelector()
 
 void SvxBackgroundTabPage::RaiseLoadError_Impl()
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
 */
 
@@ -1164,7 +1164,7 @@ void SvxBackgroundTabPage::RaiseLoadError_Impl()
 
 BOOL SvxBackgroundTabPage::LoadLinkedGraphic_Impl()
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
 */
 
@@ -1181,7 +1181,7 @@ BOOL SvxBackgroundTabPage::LoadLinkedGraphic_Impl()
 
 void SvxBackgroundTabPage::FillColorValueSets_Impl()
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     F"ullen des Farb-Sets
 */
@@ -1204,9 +1204,9 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl()
 
     if ( pColorTable )
     {
-        short i = 0;
-        long nCount = pColorTable->Count();
-        XColorEntry* pEntry = NULL;
+        short i	= 0;
+        long nCount	= pColorTable->Count();
+        XColorEntry* pEntry	= NULL;
         Color aColWhite( COL_WHITE );
         String aStrWhite( EditResId( RID_SVXITEMS_COLOR_WHITE ) );
         WinBits nBits = ( aBackgroundColorSet.GetStyle() | WB_ITEMBORDER | WB_NAMEFIELD | WB_NONEFIELD );
@@ -1215,7 +1215,7 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl()
         for ( i = 0; i < nCount; i++ )
         {
             pEntry = pColorTable->GetColor(i);
-            aBackgroundColorSet.InsertItem( i + 1, pEntry->GetColor(), pEntry->GetName() );
+            aBackgroundColorSet.InsertItem(	i + 1, pEntry->GetColor(), pEntry->GetName() );
         }
 
         while ( i < 80 )
@@ -1247,7 +1247,7 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl()
 
 void SvxBackgroundTabPage::ShowColorUI_Impl()
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Die Controls f"ur das Einstellen der Grafik ausblenden und die
     Controls f"ur die Farbeinstellung einblenden.
@@ -1285,7 +1285,7 @@ void SvxBackgroundTabPage::ShowColorUI_Impl()
 
 void SvxBackgroundTabPage::ShowBitmapUI_Impl()
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Die Controls f"ur die Farbeinstellung ausblenden und die
     Controls f"ur das Einstellen der Grafik einblenden.
@@ -1328,7 +1328,7 @@ void SvxBackgroundTabPage::ShowBitmapUI_Impl()
 
 void SvxBackgroundTabPage::SetGraphicPosition_Impl( SvxGraphicPosition ePos )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Die Controls f"ur die Grafikposition einstellen.
 */
@@ -1358,15 +1358,15 @@ void SvxBackgroundTabPage::SetGraphicPosition_Impl( SvxGraphicPosition ePos )
 
             switch ( ePos )
             {
-                case GPOS_MM:   break;
-                case GPOS_LT:   eNewPos = RP_LT; break;
-                case GPOS_MT:   eNewPos = RP_MT; break;
-                case GPOS_RT:   eNewPos = RP_RT; break;
-                case GPOS_LM:   eNewPos = RP_LM; break;
-                case GPOS_RM:   eNewPos = RP_RM; break;
-                case GPOS_LB:   eNewPos = RP_LB; break;
-                case GPOS_MB:   eNewPos = RP_MB; break;
-                case GPOS_RB:   eNewPos = RP_RB; break;
+                case GPOS_MM:	break;
+                case GPOS_LT:	eNewPos = RP_LT; break;
+                case GPOS_MT:	eNewPos = RP_MT; break;
+                case GPOS_RT:	eNewPos = RP_RT; break;
+                case GPOS_LM:	eNewPos = RP_LM; break;
+                case GPOS_RM:	eNewPos = RP_RM; break;
+                case GPOS_LB:	eNewPos = RP_LB; break;
+                case GPOS_MB:	eNewPos = RP_MB; break;
+                case GPOS_RB:	eNewPos = RP_RB; break;
                 default: ;//prevent warning
             }
             aWndPosition.SetActualRP( eNewPos );
@@ -1380,7 +1380,7 @@ void SvxBackgroundTabPage::SetGraphicPosition_Impl( SvxGraphicPosition ePos )
 
 SvxGraphicPosition SvxBackgroundTabPage::GetGraphicPosition_Impl()
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Die Position der Grafik zur"uckgeben.
 */
@@ -1394,15 +1394,15 @@ SvxGraphicPosition SvxBackgroundTabPage::GetGraphicPosition_Impl()
     {
         switch ( aWndPosition.GetActualRP() )
         {
-            case RP_LT: return GPOS_LT;
-            case RP_MT: return GPOS_MT;
-            case RP_RT: return GPOS_RT;
-            case RP_LM: return GPOS_LM;
-            case RP_MM: return GPOS_MM;
-            case RP_RM: return GPOS_RM;
-            case RP_LB: return GPOS_LB;
-            case RP_MB: return GPOS_MB;
-            case RP_RB: return GPOS_RB;
+            case RP_LT:	return GPOS_LT;
+            case RP_MT:	return GPOS_MT;
+            case RP_RT:	return GPOS_RT;
+            case RP_LM:	return GPOS_LM;
+            case RP_MM:	return GPOS_MM;
+            case RP_RM:	return GPOS_RM;
+            case RP_LB:	return GPOS_LB;
+            case RP_MB:	return GPOS_MB;
+            case RP_RB:	return GPOS_RB;
         }
     }
     return GPOS_MM;
@@ -1431,7 +1431,7 @@ IMPL_LINK( SvxBackgroundTabPage, BackgroundColorHdl_Impl, ValueSet*, EMPTYARG )
 
 IMPL_LINK( SvxBackgroundTabPage, SelectHdl_Impl, ListBox*, EMPTYARG )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
 */
 
@@ -1453,7 +1453,7 @@ IMPL_LINK( SvxBackgroundTabPage, SelectHdl_Impl, ListBox*, EMPTYARG )
 
 IMPL_LINK( SvxBackgroundTabPage, FileClickHdl_Impl, CheckBox*, pBox )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
 */
 
@@ -1488,7 +1488,7 @@ IMPL_LINK( SvxBackgroundTabPage, FileClickHdl_Impl, CheckBox*, pBox )
             else
             {
                 if ( aBgdGraphicPath.Len() > 0 ) // nur bei gelinkter Grafik
-                    RaiseLoadError_Impl();       // ein Fehler
+                    RaiseLoadError_Impl();		 // ein Fehler
                 pPreviewWin2->NotifyChange( NULL );
             }
         }
@@ -1502,7 +1502,7 @@ IMPL_LINK( SvxBackgroundTabPage, FileClickHdl_Impl, CheckBox*, pBox )
 
 IMPL_LINK( SvxBackgroundTabPage, RadioClickHdl_Impl, RadioButton*, pBtn )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
 */
 
@@ -1527,7 +1527,7 @@ IMPL_LINK( SvxBackgroundTabPage, RadioClickHdl_Impl, RadioButton*, pBtn )
 
 IMPL_LINK( SvxBackgroundTabPage, BrowseHdl_Impl, PushButton* , EMPTYARG )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Handler, gerufen durch das Dr"ucken des Durchsuchen-Buttons.
     Grafik/Einf"ugen-Dialog erzeugen, Pfad setzen und starten.
@@ -1568,7 +1568,7 @@ IMPL_LINK( SvxBackgroundTabPage, BrowseHdl_Impl, PushButton* , EMPTYARG )
 
 IMPL_LINK( SvxBackgroundTabPage, LoadTimerHdl_Impl, Timer* , pTimer )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
     Verz"ogertes Laden der Grafik.
     Grafik wird nur dann geladen, wenn sie unterschiedlich zur
@@ -1588,7 +1588,7 @@ IMPL_LINK( SvxBackgroundTabPage, LoadTimerHdl_Impl, Timer* , pTimer )
             {
                 // neue Datei gew"ahlt
                 aBgdGraphicPath   = pImportDlg->GetPath();
-                aBgdGraphicFilter = pImportDlg->GetCurrentFilter();
+                aBgdGraphicFilter =	pImportDlg->GetCurrentFilter();
                 BOOL bLink = ( nHtmlMode & HTMLMODE_ON ) || bLinkOnly ? TRUE : pImportDlg->IsAsLink();
                 aBtnLink.Check( bLink );
                 aBtnLink.Enable();
@@ -1629,13 +1629,13 @@ IMPL_LINK( SvxBackgroundTabPage, LoadTimerHdl_Impl, Timer* , pTimer )
 
 void SvxBackgroundTabPage::ShowTblControl()
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
 */
 
 {
-    aTblLBox            .SetSelectHdl( HDL(TblDestinationHdl_Impl) );
-    aTblLBox            .SelectEntryPos(0);
+    aTblLBox			.SetSelectHdl( HDL(TblDestinationHdl_Impl) );
+    aTblLBox			.SelectEntryPos(0);
     aTblDesc.Show();
     aTblLBox.Show();
 }
@@ -1657,7 +1657,7 @@ void SvxBackgroundTabPage::ShowParaControl(BOOL bCharOnly)
 
 IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox*, pBox )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
 */
 
@@ -1691,8 +1691,8 @@ IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox*, pBox )
         }
         else
         {
-                SvxGraphicPosition  eNewPos  = GetGraphicPosition_Impl();
-                const BOOL          bIsLink  = aBtnLink.IsChecked();
+                SvxGraphicPosition	eNewPos  = GetGraphicPosition_Impl();
+                const BOOL			bIsLink  = aBtnLink.IsChecked();
 
                 if ( !bIsLink && !bIsGraphicValid )
                     bIsGraphicValid = LoadLinkedGraphic_Impl();
@@ -1762,8 +1762,8 @@ IMPL_LINK( SvxBackgroundTabPage, ParaDestinationHdl_Impl, ListBox*, pBox )
         }
         else
         {
-                SvxGraphicPosition  eNewPos  = GetGraphicPosition_Impl();
-                const BOOL          bIsLink  = aBtnLink.IsChecked();
+                SvxGraphicPosition	eNewPos  = GetGraphicPosition_Impl();
+                const BOOL			bIsLink  = aBtnLink.IsChecked();
 
                 if ( !bIsLink && !bIsGraphicValid )
                     bIsGraphicValid = LoadLinkedGraphic_Impl();
@@ -1803,12 +1803,12 @@ IMPL_LINK( SvxBackgroundTabPage, ParaDestinationHdl_Impl, ListBox*, pBox )
 void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr,
                                               const String& rUserData )
 
-/*  [Beschreibung]
+/*	[Beschreibung]
 
 */
 
 {
-    SvxGraphicPosition  ePos = rBgdAttr.GetGraphicPos();
+    SvxGraphicPosition	ePos = rBgdAttr.GetGraphicPos();
     const Color& rColor = rBgdAttr.GetColor();
     if(bColTransparency)
     {
@@ -1852,13 +1852,13 @@ void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr,
             aBtnLink.Check( FALSE );
             aBtnLink.Disable();
             pPreviewWin2->NotifyChange( NULL );
-            SetGraphicPosition_Impl( GPOS_TILED );  // Kacheln als Default
+            SetGraphicPosition_Impl( GPOS_TILED );	// Kacheln als Default
         }
     }
     else
     {
-        const String*   pStrLink   = rBgdAttr.GetGraphicLink();
-        const String*   pStrFilter = rBgdAttr.GetGraphicFilter();
+        const String*	pStrLink   = rBgdAttr.GetGraphicLink();
+        const String*	pStrFilter = rBgdAttr.GetGraphicFilter();
 
         aLbSelect.SelectEntryPos( 1 );
         ShowBitmapUI_Impl();
diff --git a/cui/source/tabpages/backgrnd.hrc b/cui/source/tabpages/backgrnd.hrc
index fdfafabe8f11..dcd161ce8110 100644
--- a/cui/source/tabpages/backgrnd.hrc
+++ b/cui/source/tabpages/backgrnd.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 // defines ------------------------------------------------------------------
 
-#define FT_SELECTOR     1
-#define LB_SELECTOR     1
+#define FT_SELECTOR		1
+#define LB_SELECTOR		1
 
-#define SET_BGDCOLOR    10
-#define GB_BGDCOLOR     11
-#define SET_PATTERN     12
-#define GB_COL_PREVIEW  13
-#define SET_PATCOLOR    14
-#define GB_PATCOLOR     15
-#define CT_BORDER       16
-#define FT_PREVIEW      20
-#define WIN_PREVIEW1    21
+#define SET_BGDCOLOR	10
+#define GB_BGDCOLOR		11
+#define SET_PATTERN		12
+#define GB_COL_PREVIEW	13
+#define SET_PATCOLOR	14
+#define GB_PATCOLOR		15
+#define CT_BORDER		16
+#define FT_PREVIEW		20
+#define WIN_PREVIEW1	21
 
-#define BTN_BROWSE      20
-#define FT_FILE         21
-#define BTN_LINK        22
-#define BTN_PREVIEW     23
-#define GB_FILE         24
-#define BTN_AREA        25
-#define BTN_TILE        26
-#define BTN_POSITION    27
-#define WND_POSITION    28
-#define GB_POSITION     29
-#define WIN_PREVIEW2    30
-#define GB_PREVIEW      31
-#define LB_TBL_BOX      32
+#define BTN_BROWSE		20
+#define FT_FILE			21
+#define BTN_LINK		22
+#define BTN_PREVIEW		23
+#define GB_FILE			24
+#define BTN_AREA		25
+#define BTN_TILE		26
+#define BTN_POSITION	27
+#define WND_POSITION	28
+#define GB_POSITION		29
+#define WIN_PREVIEW2	30
+#define GB_PREVIEW		31
+#define LB_TBL_BOX		32
 #define FT_TBL_DESC     33
 #define LB_PARA_BOX     34
 #define FT_COL_TRANS    35
@@ -62,8 +62,8 @@
 #define FL_GRAPH_TRANS  37
 #define MF_GRAPH_TRANS  38
 
-#define STR_BROWSE      1
-#define STR_UNLINKED    2
+#define STR_BROWSE		1
+#define STR_UNLINKED	2
 
 
 #endif
diff --git a/cui/source/tabpages/backgrnd.src b/cui/source/tabpages/backgrnd.src
index 7f413f116aff..21b87099d20f 100644
--- a/cui/source/tabpages/backgrnd.src
+++ b/cui/source/tabpages/backgrnd.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <svx/dialogs.hrc>
 
  // define ----------------------------------------------------------------
-#define UNLINKED_IMAGE                      \
+#define UNLINKED_IMAGE						\
     Text [ en-US ] = "Unlinked graphic" ; \
 
  // pragma ----------------------------------------------------------------
diff --git a/cui/source/tabpages/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx
index f688e9b720f5..f22d1c28db14 100644
--- a/cui/source/tabpages/bbdlg.cxx
+++ b/cui/source/tabpages/bbdlg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/tabpages/bbdlg.src b/cui/source/tabpages/bbdlg.src
index 973272d11d2e..0b4089801060 100644
--- a/cui/source/tabpages/bbdlg.src
+++ b/cui/source/tabpages/bbdlg.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ TabDialog RID_SVXDLG_BBDLG
     Size = MAP_APPFONT ( 328 , 155 ) ;
     Text [ en-US ] = "Border / Background" ;
     Moveable = TRUE ;
-     // Closeable = TRUE; hat ja einen OKButton
+     //	Closeable = TRUE; hat ja einen OKButton
     TabControl 1
     {
         OutputSize = TRUE ;
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index ffe2fae38679..e080287acd75 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 #define LINESTYLE_HTML_MAX 5
 
-#include <svx/xtable.hxx>               // XColorTable
+#include <svx/xtable.hxx>				// XColorTable
 #include <svx/drawitem.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/shaditem.hxx>
@@ -64,14 +64,14 @@
  * [Beschreibung:]
  * TabPage zum Einstellen der Rahmen-Attribute.
  * Benoetigt
- *      ein SvxShadowItem: Schatten
- *      ein SvxBoxItem:    Linien links,rechts,oben,unten ),
- *      ein SvxBoxInfo:    Linien vertikal,horizontal, Abstaende, Flags )
+ *		ein SvxShadowItem: Schatten
+ *		ein SvxBoxItem:    Linien links,rechts,oben,unten ),
+ *		ein SvxBoxInfo:    Linien vertikal,horizontal, Abstaende, Flags )
  *
  * Linien koennen drei Zustaende haben.
- *      1. Show     ( -> gueltige Werte )
- *      2. Hide     ( -> NULL-Pointer )
- *      3. DontCare ( -> gesonderte Valid-Flags im InfoItem )
+ *		1. Show		( -> gueltige Werte )
+ *		2. Hide		( -> NULL-Pointer )
+ *		3. DontCare ( -> gesonderte Valid-Flags im InfoItem )
  */
 
 // static ----------------------------------------------------------------
@@ -91,56 +91,56 @@ BOOL SvxBorderTabPage::bSync = TRUE;
 
 //------------------------------------------------------------------------
 
-#define LINE_WIDTH0     (DEF_LINE_WIDTH_0 *100)
-#define LINE_WIDTH1     (DEF_LINE_WIDTH_1 *100)
-#define LINE_WIDTH2     (DEF_LINE_WIDTH_2 *100)
-#define LINE_WIDTH3     (DEF_LINE_WIDTH_3 *100)
-#define LINE_WIDTH4     (DEF_LINE_WIDTH_4 *100)
+#define LINE_WIDTH0		(DEF_LINE_WIDTH_0 *100)
+#define LINE_WIDTH1		(DEF_LINE_WIDTH_1 *100)
+#define LINE_WIDTH2		(DEF_LINE_WIDTH_2 *100)
+#define LINE_WIDTH3		(DEF_LINE_WIDTH_3 *100)
+#define LINE_WIDTH4		(DEF_LINE_WIDTH_4 *100)
 #define LINE_WIDTH5     (DEF_LINE_WIDTH_5 *100)
 
-#define DLINE0_OUT      (DEF_DOUBLE_LINE0_OUT  *100)
-#define DLINE0_IN       (DEF_DOUBLE_LINE0_IN   *100)
-#define DLINE0_DIST     (DEF_DOUBLE_LINE0_DIST *100)
+#define DLINE0_OUT		(DEF_DOUBLE_LINE0_OUT  *100)
+#define DLINE0_IN		(DEF_DOUBLE_LINE0_IN   *100)
+#define DLINE0_DIST		(DEF_DOUBLE_LINE0_DIST *100)
 
-#define DLINE1_OUT      (DEF_DOUBLE_LINE1_OUT  *100)
-#define DLINE1_IN       (DEF_DOUBLE_LINE1_IN   *100)
-#define DLINE1_DIST     (DEF_DOUBLE_LINE1_DIST *100)
+#define DLINE1_OUT		(DEF_DOUBLE_LINE1_OUT  *100)
+#define DLINE1_IN		(DEF_DOUBLE_LINE1_IN   *100)
+#define DLINE1_DIST		(DEF_DOUBLE_LINE1_DIST *100)
 
-#define DLINE2_OUT      (DEF_DOUBLE_LINE2_OUT  *100)
-#define DLINE2_IN       (DEF_DOUBLE_LINE2_IN   *100)
-#define DLINE2_DIST     (DEF_DOUBLE_LINE2_DIST *100)
+#define DLINE2_OUT		(DEF_DOUBLE_LINE2_OUT  *100)
+#define DLINE2_IN		(DEF_DOUBLE_LINE2_IN   *100)
+#define DLINE2_DIST		(DEF_DOUBLE_LINE2_DIST *100)
 
-#define DLINE3_OUT      (DEF_DOUBLE_LINE3_OUT  *100)
-#define DLINE3_IN       (DEF_DOUBLE_LINE3_IN   *100)
-#define DLINE3_DIST     (DEF_DOUBLE_LINE3_DIST *100)
+#define DLINE3_OUT		(DEF_DOUBLE_LINE3_OUT  *100)
+#define DLINE3_IN		(DEF_DOUBLE_LINE3_IN   *100)
+#define DLINE3_DIST		(DEF_DOUBLE_LINE3_DIST *100)
 
-#define DLINE4_OUT      (DEF_DOUBLE_LINE4_OUT  *100)
-#define DLINE4_IN       (DEF_DOUBLE_LINE4_IN   *100)
-#define DLINE4_DIST     (DEF_DOUBLE_LINE4_DIST *100)
+#define DLINE4_OUT		(DEF_DOUBLE_LINE4_OUT  *100)
+#define DLINE4_IN		(DEF_DOUBLE_LINE4_IN   *100)
+#define DLINE4_DIST		(DEF_DOUBLE_LINE4_DIST *100)
 
-#define DLINE5_OUT      (DEF_DOUBLE_LINE5_OUT  *100)
-#define DLINE5_IN       (DEF_DOUBLE_LINE5_IN   *100)
-#define DLINE5_DIST     (DEF_DOUBLE_LINE5_DIST *100)
+#define DLINE5_OUT		(DEF_DOUBLE_LINE5_OUT  *100)
+#define DLINE5_IN		(DEF_DOUBLE_LINE5_IN   *100)
+#define DLINE5_DIST		(DEF_DOUBLE_LINE5_DIST *100)
 
-#define DLINE6_OUT      (DEF_DOUBLE_LINE6_OUT  *100)
-#define DLINE6_IN       (DEF_DOUBLE_LINE6_IN   *100)
-#define DLINE6_DIST     (DEF_DOUBLE_LINE6_DIST *100)
+#define DLINE6_OUT		(DEF_DOUBLE_LINE6_OUT  *100)
+#define DLINE6_IN		(DEF_DOUBLE_LINE6_IN   *100)
+#define DLINE6_DIST		(DEF_DOUBLE_LINE6_DIST *100)
 
-#define DLINE7_OUT      (DEF_DOUBLE_LINE7_OUT  *100)
-#define DLINE7_IN       (DEF_DOUBLE_LINE7_IN   *100)
-#define DLINE7_DIST     (DEF_DOUBLE_LINE7_DIST *100)
+#define DLINE7_OUT		(DEF_DOUBLE_LINE7_OUT  *100)
+#define DLINE7_IN		(DEF_DOUBLE_LINE7_IN   *100)
+#define DLINE7_DIST		(DEF_DOUBLE_LINE7_DIST *100)
 
-#define DLINE8_OUT      (DEF_DOUBLE_LINE8_OUT  *100)
-#define DLINE8_IN       (DEF_DOUBLE_LINE8_IN   *100)
-#define DLINE8_DIST     (DEF_DOUBLE_LINE8_DIST *100)
+#define DLINE8_OUT		(DEF_DOUBLE_LINE8_OUT  *100)
+#define DLINE8_IN		(DEF_DOUBLE_LINE8_IN   *100)
+#define DLINE8_DIST		(DEF_DOUBLE_LINE8_DIST *100)
 
-#define DLINE9_OUT      (DEF_DOUBLE_LINE9_OUT  *100)
-#define DLINE9_IN       (DEF_DOUBLE_LINE9_IN   *100)
-#define DLINE9_DIST     (DEF_DOUBLE_LINE9_DIST *100)
+#define DLINE9_OUT		(DEF_DOUBLE_LINE9_OUT  *100)
+#define DLINE9_IN		(DEF_DOUBLE_LINE9_IN   *100)
+#define DLINE9_DIST		(DEF_DOUBLE_LINE9_DIST *100)
 
-#define DLINE10_OUT     (DEF_DOUBLE_LINE10_OUT *100)
-#define DLINE10_IN      (DEF_DOUBLE_LINE10_IN  *100)
-#define DLINE10_DIST    (DEF_DOUBLE_LINE10_DIST*100)
+#define DLINE10_OUT		(DEF_DOUBLE_LINE10_OUT *100)
+#define DLINE10_IN		(DEF_DOUBLE_LINE10_IN  *100)
+#define DLINE10_DIST	(DEF_DOUBLE_LINE10_DIST*100)
 
 #define RGBCOL(eColorName) (TpBorderRGBColor(eColorName))
 
@@ -178,14 +178,14 @@ void lcl_SetDecimalDigitsTo1(MetricField& rField)
 SvxBorderTabPage::SvxBorderTabPage( Window* pParent,
                                     const SfxItemSet& rCoreAttrs )
 
-    :   SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_BORDER ), rCoreAttrs ),
+    :	SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_BORDER ), rCoreAttrs ),
 
         aFlBorder       ( this, CUI_RES( FL_BORDER ) ),
         aDefaultFT      ( this, CUI_RES( FT_DEFAULT ) ),
         aWndPresets     ( this, CUI_RES( WIN_PRESETS ) ),
         aUserDefFT      ( this, CUI_RES( FT_USERDEF ) ),
         aFrameSel       ( this, CUI_RES( WIN_FRAMESEL ) ),
-
+        
         aFlSep1         ( this, CUI_RES( FL_SEPARATOR1 ) ),
         aFlLine         ( this, CUI_RES( FL_LINE ) ),
         aStyleFT        ( this, CUI_RES( FT_STYLE ) ),
@@ -352,9 +352,9 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent,
     FillLineListBox_Impl();
 
     // ColorBox aus der XColorTable fuellen.
-    SfxObjectShell*     pDocSh      = SfxObjectShell::Current();
-    const SfxPoolItem*  pItem       = NULL;
-    XColorTable*        pColorTable = NULL;
+    SfxObjectShell*		pDocSh		= SfxObjectShell::Current();
+    const SfxPoolItem*	pItem 		= NULL;
+    XColorTable*		pColorTable = NULL;
 
     DBG_ASSERT( pDocSh, "DocShell not found!" );
 
@@ -449,13 +449,13 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet )
 
     const SvxBoxItem*       pBoxItem;
     const SvxBoxInfoItem*   pBoxInfoItem;
-    USHORT                  nWhichBox       = GetWhich(SID_ATTR_BORDER_OUTER);
-    SfxMapUnit              eCoreUnit;
-    const Color             aColBlack       = RGBCOL(COL_BLACK);
+    USHORT					nWhichBox		= GetWhich(SID_ATTR_BORDER_OUTER);
+    SfxMapUnit 				eCoreUnit;
+    const Color				aColBlack		= RGBCOL(COL_BLACK);
 
     pBoxItem  = (const SvxBoxItem*)GetItem( rSet, SID_ATTR_BORDER_OUTER );
-
-
+    
+    
     pBoxInfoItem = (const SvxBoxInfoItem*)GetItem( rSet, SID_ATTR_BORDER_INNER, sal_False );
 
     eCoreUnit = rSet.GetPool()->GetMetric( nWhichBox );
@@ -671,11 +671,11 @@ BOOL SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
 {
     bool bAttrsChanged = SfxTabPage::FillItemSet( rCoreAttrs );
 
-    BOOL                  bPut          = TRUE;
-    USHORT                nBoxWhich     = GetWhich( SID_ATTR_BORDER_OUTER );
-    USHORT                nBoxInfoWhich = rCoreAttrs.GetPool()->GetWhich( SID_ATTR_BORDER_INNER, sal_False );
-    const SfxItemSet&     rOldSet       = GetItemSet();
-    SvxBoxItem            aBoxItem      ( nBoxWhich );
+    BOOL				  bPut		   	= TRUE;
+    USHORT				  nBoxWhich		= GetWhich( SID_ATTR_BORDER_OUTER );
+    USHORT				  nBoxInfoWhich = rCoreAttrs.GetPool()->GetWhich( SID_ATTR_BORDER_INNER, sal_False );
+    const SfxItemSet&	  rOldSet		= GetItemSet();
+    SvxBoxItem		      aBoxItem 	    ( nBoxWhich );
     SvxBoxInfoItem        aBoxInfoItem  ( nBoxInfoWhich );
     SvxBoxItem* pOldBoxItem = (SvxBoxItem*)GetOldItem( rCoreAttrs, SID_ATTR_BORDER_OUTER );
 
@@ -743,7 +743,7 @@ BOOL SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
                         nMinValue == aRightMF .GetValue() ||
                         nMinValue == aTopMF   .GetValue() ||
                         nMinValue == aBottomMF.GetValue() ||
-                        (pOldBoxInfoItem && !pOldBoxInfoItem->IsValid(VALID_DISTANCE))
+                        (pOldBoxInfoItem && !pOldBoxInfoItem->IsValid(VALID_DISTANCE)) 
                        )
                     {
                         aBoxItem.SetDistance( (USHORT)GetCoreValue( aLeftMF, eCoreUnit ), BOX_LINE_LEFT  );
@@ -1151,7 +1151,7 @@ IMPL_LINK( SvxBorderTabPage, LinesChanged_Impl, void*, EMPTYARG )
     {
         BOOL bLineSet = aFrameSel.IsAnyBorderVisible();
         BOOL bMinAllowed = 0 != (nSWMode & (SW_BORDER_MODE_FRAME|SW_BORDER_MODE_TABLE));
-        BOOL bSpaceModified =   aLeftMF  .IsModified()||
+        BOOL bSpaceModified = 	aLeftMF  .IsModified()||
                                 aRightMF .IsModified()||
                                 aTopMF   .IsModified()||
                                 aBottomMF.IsModified();
diff --git a/cui/source/tabpages/border.hrc b/cui/source/tabpages/border.hrc
index 3f7699df951b..2d7359ef1e33 100644
--- a/cui/source/tabpages/border.hrc
+++ b/cui/source/tabpages/border.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #define CB_MERGEADJACENTBORDERS 66
 
 // ImageListe fuer ValueSets:
-#define IL_PRE_BITMAPS          1400
+#define IL_PRE_BITMAPS			1400
 #define ILH_PRE_BITMAPS         1401
 #define IID_PRE_CELL_NONE       1
 #define IID_PRE_CELL_ALL        2
@@ -93,13 +93,13 @@
 #define IID_PRE_TABLE_ALL       20
 #define IID_PRE_TABLE_OUTER2    21
 
-#define IL_SDW_BITMAPS          1500
+#define IL_SDW_BITMAPS			1500
 #define ILH_SDW_BITMAPS         1501
-#define IID_SHADOWNONE          1
-#define IID_SHADOW_BOT_RIGHT    2
-#define IID_SHADOW_BOT_LEFT     3
-#define IID_SHADOW_TOP_RIGHT    4
-#define IID_SHADOW_TOP_LEFT     5
+#define IID_SHADOWNONE			1
+#define IID_SHADOW_BOT_RIGHT	2
+#define IID_SHADOW_BOT_LEFT		3
+#define IID_SHADOW_TOP_RIGHT	4
+#define IID_SHADOW_TOP_LEFT		5
 
 
 #endif
diff --git a/cui/source/tabpages/border.src b/cui/source/tabpages/border.src
index 811f5429aeb7..a2ad4d617fe0 100644
--- a/cui/source/tabpages/border.src
+++ b/cui/source/tabpages/border.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx
index 290306176e1c..780e969e1958 100644
--- a/cui/source/tabpages/borderconn.cxx
+++ b/cui/source/tabpages/borderconn.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/tabpages/borderconn.hxx b/cui/source/tabpages/borderconn.hxx
index 76071f904a6d..7f8343d8742f 100644
--- a/cui/source/tabpages/borderconn.hxx
+++ b/cui/source/tabpages/borderconn.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index e0356b2b5391..2c0f8ac5e500 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include <cuires.hrc>
 #include "chardlg.hrc"
 
-#include <svx/xtable.hxx>       // XColorTable
+#include <svx/xtable.hxx>		// XColorTable
 #include "chardlg.hxx"
 #include "editeng/fontitem.hxx"
 #include <editeng/postitem.hxx>
@@ -95,13 +95,13 @@ using namespace ::com::sun::star;
 
 // define ----------------------------------------------------------------
 
-#define ISITEMSET   rSet.GetItemState(nWhich)>=SFX_ITEM_DEFAULT
+#define ISITEMSET	rSet.GetItemState(nWhich)>=SFX_ITEM_DEFAULT
 
-#define CLEARTITEM  rSet.InvalidateItem(nWhich)
+#define CLEARTITEM	rSet.InvalidateItem(nWhich)
 
-#define LW_NORMAL   0
+#define LW_NORMAL	0
 #define LW_GESPERRT 1
-#define LW_SCHMAL   2
+#define LW_SCHMAL	2
 
 // static ----------------------------------------------------------------
 
@@ -214,10 +214,10 @@ SvxCharBasePage::~SvxCharBasePage()
 //void SvxCharBasePage::SetPrevFontAttributes( const SfxItemSet& rSet )
 void SvxCharBasePage::ActivatePage( const SfxItemSet& rSet )
 {
-    SvxFont&        rFont = GetPreviewFont();
-    SvxFont&        rCJKFont = GetPreviewCJKFont();
-    SvxFont&        rCTLFont = GetPreviewCTLFont();
-    USHORT          nWhich;
+    SvxFont&		rFont = GetPreviewFont();
+    SvxFont&		rCJKFont = GetPreviewCJKFont();
+    SvxFont&		rCTLFont = GetPreviewCTLFont();
+    USHORT			nWhich;
 
     nWhich = GetWhich( SID_CHAR_DLG_PREVIEW_STRING );
     if( ISITEMSET )
@@ -262,7 +262,7 @@ void SvxCharBasePage::ActivatePage( const SfxItemSet& rSet )
     rCJKFont.SetOverline( eOverline );
     rCTLFont.SetOverline( eOverline );
 
-    //  Strikeout
+    //	Strikeout
     FontStrikeout eStrikeout;
     nWhich = GetWhich( SID_ATTR_CHAR_STRIKEOUT );
     if( ISITEMSET )
@@ -400,7 +400,7 @@ void SvxCharBasePage::ActivatePage( const SfxItemSet& rSet )
         rCJKFont.SetColor( aCol );
         rCTLFont.SetColor( aCol );
 
-        m_aPreviewWin.AutoCorrectFontColor();   // handle color COL_AUTO
+        m_aPreviewWin.AutoCorrectFontColor();	// handle color COL_AUTO
     }
 
     // Kerning
@@ -453,12 +453,12 @@ void SvxCharBasePage::SetPrevFontSize( const SfxItemSet& rSet, USHORT nSlot, Svx
     long nH;
     if( rSet.GetItemState( nWhich ) >= SFX_ITEM_SET )
     {
-        nH = LogicToLogic(  ( ( SvxFontHeightItem& ) rSet.Get( nWhich ) ).GetHeight(),
+        nH = LogicToLogic(	( ( SvxFontHeightItem& ) rSet.Get( nWhich ) ).GetHeight(),
                             ( MapUnit ) rSet.GetPool()->GetMetric( nWhich ),
                             MAP_TWIP );
     }
     else
-        nH = 240;   // as default 12pt
+        nH = 240;	// as default 12pt
 
     rFont.SetSize( Size( 0, nH ) );
 }
@@ -502,10 +502,10 @@ void SvxCharBasePage::SetPrevFontStyle( const SfxItemSet& rSet, USHORT nPosture,
 
 void SvxCharBasePage::SetPrevFontWidthScale( const SfxItemSet& rSet )
 {
-    USHORT  nWhich = GetWhich( SID_ATTR_CHAR_SCALEWIDTH );
+    USHORT	nWhich = GetWhich( SID_ATTR_CHAR_SCALEWIDTH );
     if( ISITEMSET )
     {
-        const SvxCharScaleWidthItem&    rItem = ( SvxCharScaleWidthItem& ) rSet.Get( nWhich );
+        const SvxCharScaleWidthItem&	rItem = ( SvxCharScaleWidthItem& ) rSet.Get( nWhich );
 
         m_aPreviewWin.SetFontWidthScale( rItem.GetValue() );
     }
@@ -538,19 +538,19 @@ void SvxCharBasePage::SetPrevFontEscapement( BYTE nProp, BYTE nEscProp, short nE
 
 struct SvxCharNamePage_Impl
 {
-    Timer           m_aUpdateTimer;
-    String          m_aNoStyleText;
-    String          m_aTransparentText;
-    const FontList* m_pFontList;
-    USHORT          m_nExtraEntryPos;
-    BOOL            m_bMustDelete;
-    BOOL            m_bInSearchMode;
+    Timer			m_aUpdateTimer;
+    String			m_aNoStyleText;
+    String			m_aTransparentText;
+    const FontList*	m_pFontList;
+    USHORT			m_nExtraEntryPos;
+    BOOL			m_bMustDelete;
+    BOOL			m_bInSearchMode;
 
     SvxCharNamePage_Impl() :
 
-        m_pFontList     ( NULL ),
+        m_pFontList		( NULL ),
         m_nExtraEntryPos( LISTBOX_ENTRY_NOTFOUND ),
-        m_bMustDelete   ( FALSE ),
+        m_bMustDelete	( FALSE ),
         m_bInSearchMode ( FALSE )
 
     {
@@ -608,12 +608,12 @@ SvxCharNamePage::SvxCharNamePage( Window* pParent, const SfxItemSet& rInSet ) :
     m_pCTLLine              = new FixedLine( this, CUI_RES( FL_CTL ) );
     m_pCTLFontNameFT        = new FixedText( this, CUI_RES( FT_CTL_NAME ) );
     m_pCTLFontNameLB        = new FontNameBox( this, CUI_RES( LB_CTL_NAME ) );
-    m_pCTLFontStyleFT       = new FixedText( this, CUI_RES( FT_CTL_STYLE ) );
-    m_pCTLFontStyleLB       = new FontStyleBox( this, CUI_RES( LB_CTL_STYLE ) );
-    m_pCTLFontSizeFT        = new FixedText( this, CUI_RES( FT_CTL_SIZE ) );
-    m_pCTLFontSizeLB        = new FontSizeBox( this, CUI_RES( LB_CTL_SIZE ) );
-    m_pCTLFontLanguageFT    = new FixedText( this, CUI_RES( FT_CTL_LANG ) );
-    m_pCTLFontLanguageLB    = new SvxLanguageBox( this, CUI_RES( LB_CTL_LANG ) );
+    m_pCTLFontStyleFT		= new FixedText( this, CUI_RES( FT_CTL_STYLE ) );
+    m_pCTLFontStyleLB		= new FontStyleBox( this, CUI_RES( LB_CTL_STYLE ) );
+    m_pCTLFontSizeFT		= new FixedText( this, CUI_RES( FT_CTL_SIZE ) );
+    m_pCTLFontSizeLB		= new FontSizeBox( this, CUI_RES( LB_CTL_SIZE ) );
+    m_pCTLFontLanguageFT	= new FixedText( this, CUI_RES( FT_CTL_LANG ) );
+    m_pCTLFontLanguageLB	= new SvxLanguageBox( this, CUI_RES( LB_CTL_LANG ) );
 
     if( bCJK )
     {
@@ -662,9 +662,9 @@ SvxCharNamePage::SvxCharNamePage( Window* pParent, const SfxItemSet& rInSet ) :
 
     FreeResource();
 
-    m_pWestFontLanguageLB->SetLanguageList( LANG_LIST_WESTERN,  TRUE, FALSE, TRUE );
-    m_pEastFontLanguageLB->SetLanguageList( LANG_LIST_CJK,      TRUE, FALSE, TRUE );
-    m_pCTLFontLanguageLB->SetLanguageList( LANG_LIST_CTL,       TRUE, FALSE, TRUE );
+    m_pWestFontLanguageLB->SetLanguageList( LANG_LIST_WESTERN,	TRUE, FALSE, TRUE );
+    m_pEastFontLanguageLB->SetLanguageList( LANG_LIST_CJK,		TRUE, FALSE, TRUE );
+    m_pCTLFontLanguageLB->SetLanguageList( LANG_LIST_CTL,		TRUE, FALSE, TRUE );
 
     Initialize();
 }
@@ -813,7 +813,7 @@ const FontList* SvxCharNamePage::GetFontList() const
 // -----------------------------------------------------------------------------
 namespace
 {
-    FontInfo calcFontInfo(  SvxFont& _rFont,
+    FontInfo calcFontInfo(	SvxFont& _rFont,
                     SvxCharNamePage* _pPage,
                     const FontNameBox* _pFontNameLB,
                     const FontStyleBox* _pFontStyleLB,
@@ -862,7 +862,7 @@ namespace
         else if ( _pFontSizeLB->GetText().Len() )
             aSize.Height() = PointToTwips( static_cast<long>(_pFontSizeLB->GetValue() / 10) );
         else
-            aSize.Height() = 200;   // default 10pt
+            aSize.Height() = 200;	// default 10pt
         aFontInfo.SetSize( aSize );
 
         _rFont.SetFamily( aFontInfo.GetFamily() );
@@ -1379,7 +1379,7 @@ BOOL SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp
     // FontSize
     long nSize = static_cast<long>(pSizeBox->GetValue());
 
-    if ( !pSizeBox->GetText().Len() )   // GetValue() gibt dann Min-Wert zurueck
+    if ( !pSizeBox->GetText().Len() )	// GetValue() gibt dann Min-Wert zurueck
         nSize = 0;
     long nSavedSize = pSizeBox->GetSavedValue().ToInt32();
     bool bRel = true;
@@ -1612,7 +1612,7 @@ void SvxCharNamePage::ActivatePage( const SfxItemSet& rSet )
 {
     SvxCharBasePage::ActivatePage( rSet );
 
-    UpdatePreview_Impl();       // instead of asynchronous calling in ctor
+    UpdatePreview_Impl();		// instead of asynchronous calling in ctor
 }
 
 // -----------------------------------------------------------------------
@@ -1659,7 +1659,7 @@ BOOL SvxCharNamePage::FillItemSet( SfxItemSet& rSet )
     BOOL bModified = FillItemSet_Impl( rSet, Western );
     bModified |= FillItemSet_Impl( rSet, Asian );
     bModified |= FillItemSet_Impl( rSet, Ctl );
-//! bModified |= FillItemSetColor_Impl( rSet );
+//!	bModified |= FillItemSetColor_Impl( rSet );
     return bModified;
 }
 
@@ -1689,8 +1689,8 @@ namespace
             static_cast< short >( CalcToPoint( rHeightItem.GetHeight(), eUnit, 1 ) * 10 );
 
         // ausgehend von der akt. Hoehe:
-        //      - negativ bis minimal 2 pt
-        //      - positiv bis maximal 999 pt
+        //		- negativ bis minimal 2 pt
+        //		- positiv bis maximal 999 pt
         _pFontSizeLB->EnablePtRelativeMode( sal::static_int_cast< short >(-(nCurHeight - 20)), (9999 - nCurHeight), 10 );
     }
 }
@@ -1769,41 +1769,41 @@ SvxCharEffectsPage::SvxCharEffectsPage( Window* pParent, const SfxItemSet& rInSe
     m_aFontColorFT          ( this, CUI_RES( FT_FONTCOLOR ) ),
     m_aFontColorLB          ( this, CUI_RES( LB_FONTCOLOR ) ),
 
-    m_aEffectsFT            ( this, CUI_RES( FT_EFFECTS ) ),
-    m_aEffectsLB            ( this, 0 ),
+    m_aEffectsFT			( this, CUI_RES( FT_EFFECTS ) ),
+    m_aEffectsLB			( this, 0 ),
 
-    m_aEffects2LB           ( this, CUI_RES( LB_EFFECTS2 ) ),
+    m_aEffects2LB			( this, CUI_RES( LB_EFFECTS2 ) ),
 
     m_aReliefFT             ( this, CUI_RES( FT_RELIEF ) ),
     m_aReliefLB             ( this, CUI_RES( LB_RELIEF ) ),
 
-    m_aOutlineBtn           ( this, CUI_RES( CB_OUTLINE ) ),
-    m_aShadowBtn            ( this, CUI_RES( CB_SHADOW ) ),
-    m_aBlinkingBtn          ( this, CUI_RES( CB_BLINKING ) ),
+    m_aOutlineBtn			( this, CUI_RES( CB_OUTLINE ) ),
+    m_aShadowBtn			( this, CUI_RES( CB_SHADOW ) ),
+    m_aBlinkingBtn			( this, CUI_RES( CB_BLINKING ) ),
     m_aHiddenBtn            ( this, CUI_RES( CB_CHARHIDDEN ) ),
 
-    m_aVerticalLine         ( this, CUI_RES( FL_EFFECTS_VERTICAL ) ),
+    m_aVerticalLine			( this, CUI_RES( FL_EFFECTS_VERTICAL ) ),
 
-    m_aOverlineFT           ( this, CUI_RES( FT_OVERLINE ) ),
-    m_aOverlineLB           ( this, CUI_RES( LB_OVERLINE ) ),
-    m_aOverlineColorFT      ( this, CUI_RES( FT_OVERLINE_COLOR ) ),
-    m_aOverlineColorLB      ( this, CUI_RES( LB_OVERLINE_COLOR ) ),
-    m_aStrikeoutFT          ( this, CUI_RES( FT_STRIKEOUT ) ),
-    m_aStrikeoutLB          ( this, CUI_RES( LB_STRIKEOUT ) ),
-    m_aUnderlineFT          ( this, CUI_RES( FT_UNDERLINE ) ),
-    m_aUnderlineLB          ( this, CUI_RES( LB_UNDERLINE ) ),
-    m_aUnderlineColorFT     ( this, CUI_RES( FT_UNDERLINE_COLOR ) ),
-    m_aUnderlineColorLB     ( this, CUI_RES( LB_UNDERLINE_COLOR ) ),
-    m_aIndividualWordsBtn   ( this, CUI_RES( CB_INDIVIDUALWORDS ) ),
+    m_aOverlineFT			( this, CUI_RES( FT_OVERLINE ) ),
+    m_aOverlineLB			( this, CUI_RES( LB_OVERLINE ) ),
+    m_aOverlineColorFT		( this, CUI_RES( FT_OVERLINE_COLOR ) ),
+    m_aOverlineColorLB		( this, CUI_RES( LB_OVERLINE_COLOR ) ),
+    m_aStrikeoutFT			( this, CUI_RES( FT_STRIKEOUT ) ),
+    m_aStrikeoutLB			( this, CUI_RES( LB_STRIKEOUT ) ),
+    m_aUnderlineFT			( this, CUI_RES( FT_UNDERLINE ) ),
+    m_aUnderlineLB			( this, CUI_RES( LB_UNDERLINE ) ),
+    m_aUnderlineColorFT		( this, CUI_RES( FT_UNDERLINE_COLOR ) ),
+    m_aUnderlineColorLB		( this, CUI_RES( LB_UNDERLINE_COLOR ) ),
+    m_aIndividualWordsBtn	( this, CUI_RES( CB_INDIVIDUALWORDS ) ),
 
-    m_aAsianLine            ( this, CUI_RES( FL_EFFECTS_ASIAN ) ),
+    m_aAsianLine			( this, CUI_RES( FL_EFFECTS_ASIAN ) ),
 
-    m_aEmphasisFT           ( this, CUI_RES( FT_EMPHASIS ) ),
-    m_aEmphasisLB           ( this, CUI_RES( LB_EMPHASIS ) ),
-    m_aPositionFT           ( this, CUI_RES( FT_POSITION ) ),
-    m_aPositionLB           ( this, CUI_RES( LB_POSITION ) ),
+    m_aEmphasisFT			( this, CUI_RES( FT_EMPHASIS ) ),
+    m_aEmphasisLB			( this, CUI_RES( LB_EMPHASIS ) ),
+    m_aPositionFT			( this, CUI_RES( FT_POSITION ) ),
+    m_aPositionLB			( this, CUI_RES( LB_POSITION ) ),
 
-    m_aTransparentColorName ( CUI_RES( STR_CHARNAME_TRANSPARENT ) )
+    m_aTransparentColorName	( CUI_RES( STR_CHARNAME_TRANSPARENT ) )
 
 {
     m_aEffectsLB.Hide();
@@ -2332,7 +2332,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet )
         }
     }
 
-    //  Strikeout
+    //	Strikeout
     nWhich = GetWhich( SID_ATTR_CHAR_STRIKEOUT );
     rFont.SetStrikeout( STRIKEOUT_NONE );
     rCJKFont.SetStrikeout( STRIKEOUT_NONE );
@@ -2440,7 +2440,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet )
     }
 
     // the select handler for the underline/overline/strikeout list boxes
-//  SelectHdl_Impl( NULL );
+//	SelectHdl_Impl( NULL );
     DBG_ASSERT(m_aUnderlineLB.GetSelectHdl() == m_aOverlineLB.GetSelectHdl(),
         "SvxCharEffectsPage::Reset: inconsistence (1)!");
     DBG_ASSERT(m_aUnderlineLB.GetSelectHdl() == m_aStrikeoutLB.GetSelectHdl(),
@@ -2451,7 +2451,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet )
         // 30.05.2001 - 86262 - frank.schoenheit@germany.sun.com
 
     // the select handler for the emphasis listbox
-//  SelectHdl_Impl( &m_aEmphasisLB );
+//	SelectHdl_Impl( &m_aEmphasisLB );
     DBG_ASSERT(m_aEmphasisLB.GetSelectHdl() == LINK(this, SvxCharEffectsPage, SelectHdl_Impl),
         "SvxCharEffectsPage::Reset: inconsistence (2)!");
     m_aEmphasisLB.GetSelectHdl().Call( &m_aEmphasisLB );
@@ -3039,35 +3039,35 @@ SvxCharPositionPage::SvxCharPositionPage( Window* pParent, const SfxItemSet& rIn
 
     SvxCharBasePage( pParent, CUI_RES( RID_SVXPAGE_CHAR_POSITION ), rInSet, WIN_POS_PREVIEW, FT_POS_FONTTYPE ),
 
-    m_aPositionLine     ( this, CUI_RES( FL_POSITION ) ),
-    m_aHighPosBtn       ( this, CUI_RES( RB_HIGHPOS ) ),
-    m_aNormalPosBtn     ( this, CUI_RES( RB_NORMALPOS ) ),
-    m_aLowPosBtn        ( this, CUI_RES( RB_LOWPOS ) ),
-    m_aHighLowFT        ( this, CUI_RES( FT_HIGHLOW ) ),
-    m_aHighLowEdit      ( this, CUI_RES( ED_HIGHLOW ) ),
-    m_aHighLowRB        ( this, CUI_RES( CB_HIGHLOW ) ),
-    m_aFontSizeFT       ( this, CUI_RES( FT_FONTSIZE ) ),
-    m_aFontSizeEdit     ( this, CUI_RES( ED_FONTSIZE ) ),
+    m_aPositionLine		( this, CUI_RES( FL_POSITION ) ),
+    m_aHighPosBtn		( this, CUI_RES( RB_HIGHPOS ) ),
+    m_aNormalPosBtn		( this, CUI_RES( RB_NORMALPOS ) ),
+    m_aLowPosBtn		( this, CUI_RES( RB_LOWPOS ) ),
+    m_aHighLowFT		( this, CUI_RES( FT_HIGHLOW ) ),
+    m_aHighLowEdit		( this, CUI_RES( ED_HIGHLOW ) ),
+    m_aHighLowRB		( this, CUI_RES( CB_HIGHLOW ) ),
+    m_aFontSizeFT		( this, CUI_RES( FT_FONTSIZE ) ),
+    m_aFontSizeEdit		( this, CUI_RES( ED_FONTSIZE ) ),
     m_aRotationScalingFL( this, CUI_RES( FL_ROTATION_SCALING ) ),
-    m_aScalingFL        ( this, CUI_RES( FL_SCALING ) ),
-    m_a0degRB           ( this, CUI_RES( RB_0_DEG ) ),
-    m_a90degRB          ( this, CUI_RES( RB_90_DEG ) ),
-    m_a270degRB         ( this, CUI_RES( RB_270_DEG ) ),
-    m_aFitToLineCB      ( this, CUI_RES( CB_FIT_TO_LINE ) ),
-    m_aScaleWidthFT     ( this, CUI_RES( FT_SCALE_WIDTH ) ),
-    m_aScaleWidthMF     ( this, CUI_RES( MF_SCALE_WIDTH ) ),
-
-    m_aKerningLine      ( this, CUI_RES( FL_KERNING2 ) ),
-    m_aKerningLB        ( this, CUI_RES( LB_KERNING2 ) ),
-    m_aKerningFT        ( this, CUI_RES( FT_KERNING2 ) ),
-    m_aKerningEdit      ( this, CUI_RES( ED_KERNING2 ) ),
-    m_aPairKerningBtn   ( this, CUI_RES( CB_PAIRKERNING ) ),
-
-    m_nSuperEsc         ( (short)DFLT_ESC_SUPER ),
-    m_nSubEsc           ( (short)DFLT_ESC_SUB ),
-    m_nScaleWidthItemSetVal ( 100 ),
-    m_nScaleWidthInitialVal ( 100 ),
-    m_nSuperProp        ( (BYTE)DFLT_ESC_PROP ),
+    m_aScalingFL		( this, CUI_RES( FL_SCALING ) ),
+    m_a0degRB			( this, CUI_RES( RB_0_DEG ) ),
+    m_a90degRB			( this, CUI_RES( RB_90_DEG ) ),
+    m_a270degRB			( this, CUI_RES( RB_270_DEG ) ),
+    m_aFitToLineCB		( this, CUI_RES( CB_FIT_TO_LINE ) ),
+    m_aScaleWidthFT		( this, CUI_RES( FT_SCALE_WIDTH ) ),
+    m_aScaleWidthMF		( this, CUI_RES( MF_SCALE_WIDTH ) ),
+
+    m_aKerningLine		( this, CUI_RES( FL_KERNING2 ) ),
+    m_aKerningLB		( this, CUI_RES( LB_KERNING2 ) ),
+    m_aKerningFT		( this, CUI_RES( FT_KERNING2 ) ),
+    m_aKerningEdit		( this, CUI_RES( ED_KERNING2 ) ),
+    m_aPairKerningBtn	( this, CUI_RES( CB_PAIRKERNING ) ),
+
+    m_nSuperEsc			( (short)DFLT_ESC_SUPER ),
+    m_nSubEsc			( (short)DFLT_ESC_SUB ),
+    m_nScaleWidthItemSetVal	( 100 ),
+    m_nScaleWidthInitialVal	( 100 ),
+    m_nSuperProp		( (BYTE)DFLT_ESC_PROP ),
     m_nSubProp          ( (BYTE)DFLT_ESC_PROP )
 {
     FreeResource();
@@ -3175,7 +3175,7 @@ void SvxCharPositionPage::SetEscapement_Impl( USHORT nEsc )
 
 IMPL_LINK( SvxCharPositionPage, PositionHdl_Impl, RadioButton*, pBtn )
 {
-    USHORT nEsc = SVX_ESCAPEMENT_OFF;   // also when pBtn == NULL
+    USHORT nEsc = SVX_ESCAPEMENT_OFF;	// also when pBtn == NULL
 
     if ( &m_aHighPosBtn == pBtn )
         nEsc = SVX_ESCAPEMENT_SUPERSCRIPT;
@@ -3204,7 +3204,7 @@ IMPL_LINK( SvxCharPositionPage, RotationHdl_Impl, RadioButton*, pBtn )
 IMPL_LINK( SvxCharPositionPage, FontModifyHdl_Impl, MetricField*, EMPTYARG )
 {
     BYTE nEscProp = (BYTE)m_aFontSizeEdit.GetValue();
-    short nEsc  = (short)m_aHighLowEdit.GetValue();
+    short nEsc	= (short)m_aHighLowEdit.GetValue();
     nEsc *= m_aLowPosBtn.IsChecked() ? -1 : 1;
     UpdatePreview_Impl( 100, nEscProp, nEsc );
     return 0;
@@ -3641,7 +3641,7 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet )
 
 BOOL SvxCharPositionPage::FillItemSet( SfxItemSet& rSet )
 {
-    //  Position (hoch, normal oder tief)
+    //	Position (hoch, normal oder tief)
     const SfxItemSet& rOldSet = GetItemSet();
     BOOL bModified = FALSE, bChanged = TRUE;
     USHORT nWhich = GetWhich( SID_ATTR_CHAR_ESCAPEMENT );
@@ -3670,7 +3670,7 @@ BOOL SvxCharPositionPage::FillItemSet( SfxItemSet& rSet )
     if ( pOld )
     {
         const SvxEscapementItem& rItem = *( (const SvxEscapementItem*)pOld );
-        if ( rItem.GetEsc() == nEsc && rItem.GetProp() == nEscProp  )
+        if ( rItem.GetEsc() == nEsc && rItem.GetProp() == nEscProp	)
             bChanged = FALSE;
     }
 
@@ -3808,14 +3808,14 @@ SvxCharTwoLinesPage::SvxCharTwoLinesPage( Window* pParent, const SfxItemSet& rIn
 
     SvxCharBasePage( pParent, CUI_RES( RID_SVXPAGE_CHAR_TWOLINES ), rInSet, WIN_TWOLINES_PREVIEW, FT_TWOLINES_FONTTYPE ),
 
-    m_aSwitchOnLine     ( this, CUI_RES( FL_SWITCHON ) ),
-    m_aTwoLinesBtn      ( this, CUI_RES( CB_TWOLINES ) ),
+    m_aSwitchOnLine		( this, CUI_RES( FL_SWITCHON ) ),
+    m_aTwoLinesBtn		( this, CUI_RES( CB_TWOLINES ) ),
 
-    m_aEncloseLine      ( this, CUI_RES( FL_ENCLOSE ) ),
-    m_aStartBracketFT   ( this, CUI_RES( FT_STARTBRACKET ) ),
-    m_aStartBracketLB   ( this, CUI_RES( ED_STARTBRACKET ) ),
-    m_aEndBracketFT     ( this, CUI_RES( FT_ENDBRACKET ) ),
-    m_aEndBracketLB     ( this, CUI_RES( ED_ENDBRACKET ) ),
+    m_aEncloseLine		( this, CUI_RES( FL_ENCLOSE ) ),
+    m_aStartBracketFT	( this, CUI_RES( FT_STARTBRACKET ) ),
+    m_aStartBracketLB	( this, CUI_RES( ED_STARTBRACKET ) ),
+    m_aEndBracketFT		( this, CUI_RES( FT_ENDBRACKET ) ),
+    m_aEndBracketLB		( this, CUI_RES( ED_ENDBRACKET ) ),
     m_nStartBracketPosition( 0 ),
     m_nEndBracketPosition( 0 )
 {
@@ -4035,7 +4035,7 @@ BOOL SvxCharTwoLinesPage::FillItemSet( SfxItemSet& rSet )
     return bModified;
 }
 
-void    SvxCharTwoLinesPage::UpdatePreview_Impl()
+void	SvxCharTwoLinesPage::UpdatePreview_Impl()
 {
     sal_Unicode cStart = m_aStartBracketLB.GetSelectEntryPos() > 0
         ? m_aStartBracketLB.GetSelectEntry().GetChar(0) : 0;
diff --git a/cui/source/tabpages/chardlg.h b/cui/source/tabpages/chardlg.h
index 168502b6f331..f597a9beed85 100644
--- a/cui/source/tabpages/chardlg.h
+++ b/cui/source/tabpages/chardlg.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,43 +30,43 @@
 
 // define ----------------------------------------------------------------
 
-#define CHRDLG_UNDERLINE_NONE               0
-#define CHRDLG_UNDERLINE_SINGLE             1
-#define CHRDLG_UNDERLINE_DOUBLE             2
-#define CHRDLG_UNDERLINE_DOTTED             3
-#define CHRDLG_UNDERLINE_DONTKNOW           4
-#define CHRDLG_UNDERLINE_DASH               5
-#define CHRDLG_UNDERLINE_LONGDASH           6
-#define CHRDLG_UNDERLINE_DASHDOT            7
-#define CHRDLG_UNDERLINE_DASHDOTDOT         8
-#define CHRDLG_UNDERLINE_SMALLWAVE          9
-#define CHRDLG_UNDERLINE_WAVE               10
-#define CHRDLG_UNDERLINE_DOUBLEWAVE         11
-#define CHRDLG_UNDERLINE_BOLD               12
-#define CHRDLG_UNDERLINE_BOLDDOTTED         13
-#define CHRDLG_UNDERLINE_BOLDDASH           14
-#define CHRDLG_UNDERLINE_BOLDLONGDASH       15
-#define CHRDLG_UNDERLINE_BOLDDASHDOT        16
-#define CHRDLG_UNDERLINE_BOLDDASHDOTDOT     17
-#define CHRDLG_UNDERLINE_BOLDWAVE           18
+#define CHRDLG_UNDERLINE_NONE				0
+#define CHRDLG_UNDERLINE_SINGLE				1
+#define CHRDLG_UNDERLINE_DOUBLE				2
+#define CHRDLG_UNDERLINE_DOTTED				3
+#define CHRDLG_UNDERLINE_DONTKNOW			4
+#define CHRDLG_UNDERLINE_DASH				5
+#define CHRDLG_UNDERLINE_LONGDASH			6
+#define CHRDLG_UNDERLINE_DASHDOT			7
+#define CHRDLG_UNDERLINE_DASHDOTDOT			8
+#define CHRDLG_UNDERLINE_SMALLWAVE			9
+#define CHRDLG_UNDERLINE_WAVE				10
+#define CHRDLG_UNDERLINE_DOUBLEWAVE			11
+#define CHRDLG_UNDERLINE_BOLD				12
+#define CHRDLG_UNDERLINE_BOLDDOTTED			13
+#define CHRDLG_UNDERLINE_BOLDDASH			14
+#define CHRDLG_UNDERLINE_BOLDLONGDASH		15
+#define CHRDLG_UNDERLINE_BOLDDASHDOT		16
+#define CHRDLG_UNDERLINE_BOLDDASHDOTDOT		17
+#define CHRDLG_UNDERLINE_BOLDWAVE			18
 
-#define CHRDLG_STRIKEOUT_NONE               0
-#define CHRDLG_STRIKEOUT_SINGLE             1
-#define CHRDLG_STRIKEOUT_DOUBLE             2
-#define CHRDLG_STRIKEOUT_DONTKNOW           3
-#define CHRDLG_STRIKEOUT_BOLD               4
-#define CHRDLG_STRIKEOUT_SLASH              5
-#define CHRDLG_STRIKEOUT_X                  6
+#define CHRDLG_STRIKEOUT_NONE				0
+#define CHRDLG_STRIKEOUT_SINGLE				1
+#define CHRDLG_STRIKEOUT_DOUBLE				2
+#define CHRDLG_STRIKEOUT_DONTKNOW			3
+#define CHRDLG_STRIKEOUT_BOLD				4
+#define CHRDLG_STRIKEOUT_SLASH				5
+#define CHRDLG_STRIKEOUT_X					6
 
-#define CHRDLG_ENCLOSE_NONE                 0
-#define CHRDLG_ENCLOSE_ROUND                1
-#define CHRDLG_ENCLOSE_SQUARE               2
-#define CHRDLG_ENCLOSE_POINTED              3
-#define CHRDLG_ENCLOSE_CURVED               4
-#define CHRDLG_ENCLOSE_SPECIAL_CHAR         5
+#define CHRDLG_ENCLOSE_NONE					0
+#define CHRDLG_ENCLOSE_ROUND				1
+#define CHRDLG_ENCLOSE_SQUARE				2
+#define CHRDLG_ENCLOSE_POINTED				3
+#define CHRDLG_ENCLOSE_CURVED				4
+#define CHRDLG_ENCLOSE_SPECIAL_CHAR			5
 
-#define CHRDLG_POSITION_OVER                0
-#define CHRDLG_POSITION_UNDER               1
+#define CHRDLG_POSITION_OVER				0
+#define CHRDLG_POSITION_UNDER				1
 
 #endif
 
diff --git a/cui/source/tabpages/chardlg.hrc b/cui/source/tabpages/chardlg.hrc
index 3d12b5f3bd0b..fa33c07cedd9 100644
--- a/cui/source/tabpages/chardlg.hrc
+++ b/cui/source/tabpages/chardlg.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,142 +31,142 @@
 
 // NamePage -----------------------------------------------------------------
 
-#define FL_WEST                 100
-#define FT_WEST_NAME            101
-#define LB_WEST_NAME            102
-#define FT_WEST_STYLE           103
-#define LB_WEST_STYLE           104
-#define FT_WEST_SIZE            105
-#define LB_WEST_SIZE            106
-#define FT_WEST_LANG            107
-#define LB_WEST_LANG            108
-
-#define FL_EAST                 110
-#define FT_EAST_NAME            111
-#define LB_EAST_NAME            112
-#define FT_EAST_STYLE           113
-#define LB_EAST_STYLE           114
-#define FT_EAST_SIZE            115
-#define LB_EAST_SIZE            116
-#define FT_EAST_LANG            117
-#define LB_EAST_LANG            118
-
-#define FL_CTL                  120
-#define FT_CTL_NAME             121
-#define LB_CTL_NAME             122
-#define FT_CTL_STYLE            123
-#define LB_CTL_STYLE            124
-#define FT_CTL_SIZE             125
-#define LB_CTL_SIZE             126
-#define FT_CTL_LANG             127
-#define LB_CTL_LANG             128
-
-#define WIN_CHAR_PREVIEW        131
-#define FT_CHAR_FONTTYPE        132
+#define FL_WEST					100
+#define FT_WEST_NAME			101
+#define LB_WEST_NAME			102
+#define FT_WEST_STYLE			103
+#define LB_WEST_STYLE			104
+#define FT_WEST_SIZE			105
+#define LB_WEST_SIZE			106
+#define FT_WEST_LANG			107
+#define LB_WEST_LANG			108
+
+#define FL_EAST					110
+#define FT_EAST_NAME			111
+#define LB_EAST_NAME			112
+#define FT_EAST_STYLE			113
+#define LB_EAST_STYLE			114
+#define FT_EAST_SIZE			115
+#define LB_EAST_SIZE			116
+#define FT_EAST_LANG			117
+#define LB_EAST_LANG			118
+
+#define FL_CTL					120
+#define FT_CTL_NAME				121
+#define LB_CTL_NAME				122
+#define FT_CTL_STYLE			123
+#define LB_CTL_STYLE			124
+#define FT_CTL_SIZE	   			125
+#define LB_CTL_SIZE				126
+#define FT_CTL_LANG				127
+#define LB_CTL_LANG				128
+
+#define WIN_CHAR_PREVIEW		131
+#define FT_CHAR_FONTTYPE		132
 
 #define FL_COLOR2               140
-#define FT_COLOR2               141
-#define LB_COLOR2               142
+#define FT_COLOR2				141
+#define LB_COLOR2				142
 
-#define STR_CHARNAME_NOSTYLE        150
-#define STR_CHARNAME_TRANSPARENT    151
+#define STR_CHARNAME_NOSTYLE		150
+#define STR_CHARNAME_TRANSPARENT	151
 
 // EffectsPage --------------------------------------------------------------
 
 #define FT_FONTCOLOR            201
 #define LB_FONTCOLOR            202
 
-#define FT_EFFECTS              203
-#define LB_EFFECTS              204
-#define LB_EFFECTS2             205
+#define FT_EFFECTS				203
+#define LB_EFFECTS				204
+#define LB_EFFECTS2				205
 
 #define FT_RELIEF               206
 #define LB_RELIEF               207
 
-#define CB_OUTLINE              208
-#define CB_SHADOW               209
-#define CB_BLINKING             210
+#define CB_OUTLINE				208
+#define CB_SHADOW				209
+#define CB_BLINKING				210
 #define CB_CHARHIDDEN           211
 
-#define FL_EFFECTS_VERTICAL     220
+#define	FL_EFFECTS_VERTICAL		220
 
 #define FT_OVERLINE             221
 #define LB_OVERLINE             222
 #define FT_OVERLINE_COLOR       223
 #define LB_OVERLINE_COLOR       224
 
-#define FT_STRIKEOUT            225
-#define LB_STRIKEOUT            226
+#define FT_STRIKEOUT			225
+#define LB_STRIKEOUT			226
 
-#define FT_UNDERLINE            227
-#define LB_UNDERLINE            228
-#define FT_UNDERLINE_COLOR      229
-#define LB_UNDERLINE_COLOR      230
+#define FT_UNDERLINE			227
+#define LB_UNDERLINE			228
+#define FT_UNDERLINE_COLOR		229
+#define LB_UNDERLINE_COLOR		230
 
-#define CB_INDIVIDUALWORDS      231
+#define CB_INDIVIDUALWORDS		231
 
-#define FL_EFFECTS_ASIAN        240
+#define	FL_EFFECTS_ASIAN		240
 
-#define FT_EMPHASIS             241
-#define LB_EMPHASIS             242
-#define FT_POSITION             243
-#define LB_POSITION             244
+#define FT_EMPHASIS				241
+#define LB_EMPHASIS				242
+#define FT_POSITION				243
+#define LB_POSITION				244
 
-#define WIN_EFFECTS_PREVIEW     251
-#define FT_EFFECTS_FONTTYPE     252
+#define WIN_EFFECTS_PREVIEW		251
+#define FT_EFFECTS_FONTTYPE		252
 
-#define STR_EFFECTS_TRANSPARENT 260
-#define STR_EFFECTS_CAPITALS    261
-#define STR_EFFECTS_LOWERCASE   262
-#define STR_EFFECTS_TITLE       263
-#define STR_EFFECTS_SMALL       264
-#define STR_EFFECTS_OUTLINE     265
-#define STR_EFFECTS_SHADOW      266
-#define STR_EFFECTS_BLINKING    267
+#define STR_EFFECTS_TRANSPARENT	260
+#define STR_EFFECTS_CAPITALS	261
+#define STR_EFFECTS_LOWERCASE	262
+#define STR_EFFECTS_TITLE		263
+#define STR_EFFECTS_SMALL		264
+#define STR_EFFECTS_OUTLINE		265
+#define STR_EFFECTS_SHADOW		266
+#define STR_EFFECTS_BLINKING	267
 
 // PositionPage -------------------------------------------------------------
 
-#define FL_POSITION             300
-#define RB_HIGHPOS              301
-#define RB_NORMALPOS            302
-#define RB_LOWPOS               303
-#define FT_HIGHLOW              304
-#define ED_HIGHLOW              305
-#define CB_HIGHLOW              306
-#define FT_FONTSIZE             307
-#define ED_FONTSIZE             308
-#define FL_ROTATION_SCALING     309
-#define FL_SCALING              310
-#define RB_0_DEG                311
-#define RB_90_DEG               312
-#define RB_270_DEG              313
-#define CB_FIT_TO_LINE          314
-#define FT_SCALE_WIDTH          315
-#define MF_SCALE_WIDTH          316
-
-#define FL_KERNING2             320
-#define LB_KERNING2             321
-#define FT_KERNING2             322
-#define ED_KERNING2             323
-#define CB_PAIRKERNING          324
-
-#define WIN_POS_PREVIEW         331
-#define FT_POS_FONTTYPE         332
+#define FL_POSITION				300
+#define RB_HIGHPOS				301
+#define RB_NORMALPOS			302
+#define RB_LOWPOS				303
+#define FT_HIGHLOW				304
+#define ED_HIGHLOW				305
+#define CB_HIGHLOW				306
+#define FT_FONTSIZE				307
+#define ED_FONTSIZE				308
+#define FL_ROTATION_SCALING		309
+#define FL_SCALING				310
+#define RB_0_DEG				311
+#define RB_90_DEG				312
+#define RB_270_DEG				313
+#define CB_FIT_TO_LINE			314
+#define FT_SCALE_WIDTH			315
+#define MF_SCALE_WIDTH			316
+
+#define FL_KERNING2				320
+#define LB_KERNING2				321
+#define FT_KERNING2				322
+#define ED_KERNING2				323
+#define CB_PAIRKERNING			324
+
+#define WIN_POS_PREVIEW			331
+#define FT_POS_FONTTYPE			332
 
 // TwoLinesPage -------------------------------------------------------------
 
-#define FL_SWITCHON             400
-#define CB_TWOLINES             401
+#define FL_SWITCHON				400
+#define CB_TWOLINES				401
 
-#define FL_ENCLOSE              410
-#define FT_STARTBRACKET         411
-#define ED_STARTBRACKET         412
-#define FT_ENDBRACKET           413
-#define ED_ENDBRACKET           414
+#define FL_ENCLOSE				410
+#define FT_STARTBRACKET			411
+#define ED_STARTBRACKET			412
+#define FT_ENDBRACKET			413
+#define ED_ENDBRACKET			414
 
-#define FL_TWOLINES_PREVIEW     420
-#define WIN_TWOLINES_PREVIEW    421
-#define FT_TWOLINES_FONTTYPE    422
+#define FL_TWOLINES_PREVIEW		420
+#define WIN_TWOLINES_PREVIEW	421
+#define FT_TWOLINES_FONTTYPE	422
 
 #define FT_WEST_NAME_NOCJK                    423
 #define LB_WEST_NAME_NOCJK                    424
diff --git a/cui/source/tabpages/chardlg.src b/cui/source/tabpages/chardlg.src
index 9673fc950f3f..532a1bf8946c 100644
--- a/cui/source/tabpages/chardlg.src
+++ b/cui/source/tabpages/chardlg.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index 8962d489d8c5..126a0adb1402 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -95,11 +95,11 @@ SvxConnectionDialog::~SvxConnectionDialog()
 \************************************************************************/
 
 SvxConnectionPage::SvxConnectionPage( Window* pWindow, const SfxItemSet& rInAttrs ) :
-                SfxTabPage      ( pWindow, CUI_RES( RID_SVXPAGE_CONNECTION ),
+                SfxTabPage		( pWindow, CUI_RES( RID_SVXPAGE_CONNECTION ),
                                   rInAttrs ),
 
-        aFtType                 ( this, CUI_RES( FT_TYPE ) ),
-        aLbType                 ( this, CUI_RES( LB_TYPE ) ),
+        aFtType      			( this, CUI_RES( FT_TYPE ) ),
+        aLbType					( this, CUI_RES( LB_TYPE ) ),
 
         aFlDelta                ( this, CUI_RES( FL_DELTA ) ),
         aFtLine1                ( this, CUI_RES( FT_LINE_1 ) ),
@@ -110,14 +110,14 @@ SvxConnectionPage::SvxConnectionPage( Window* pWindow, const SfxItemSet& rInAttr
         aMtrFldLine3            ( this, CUI_RES( MTR_FLD_LINE_3 ) ),
 
         aFlDistance             ( this, CUI_RES( FL_DISTANCE ) ),
-        aFtHorz1                ( this, CUI_RES( FT_HORZ_1 ) ),
-        aMtrFldHorz1            ( this, CUI_RES( MTR_FLD_HORZ_1 ) ),
+        aFtHorz1    			( this, CUI_RES( FT_HORZ_1 ) ),
+        aMtrFldHorz1    		( this, CUI_RES( MTR_FLD_HORZ_1 ) ),
         aFtVert1                ( this, CUI_RES( FT_VERT_1 ) ),
         aMtrFldVert1            ( this, CUI_RES( MTR_FLD_VERT_1 ) ),
         aFtHorz2                ( this, CUI_RES( FT_HORZ_2 ) ),
         aMtrFldHorz2            ( this, CUI_RES( MTR_FLD_HORZ_2 ) ),
         aFtVert2                ( this, CUI_RES( FT_VERT_2 ) ),
-        aMtrFldVert2            ( this, CUI_RES( MTR_FLD_VERT_2 ) ),
+        aMtrFldVert2    		( this, CUI_RES( MTR_FLD_VERT_2 ) ),
 
         aCtlPreview             ( this, CUI_RES( CTL_PREVIEW ), rInAttrs ),
         rOutAttrs               ( rInAttrs ),
@@ -331,8 +331,8 @@ void __EXPORT SvxConnectionPage::Reset( const SfxItemSet& rAttrs )
 
 BOOL SvxConnectionPage::FillItemSet( SfxItemSet& rAttrs)
 {
-    BOOL     bModified = FALSE;
-    INT32    nValue;
+    BOOL	 bModified = FALSE;
+    INT32	 nValue;
 
     if( aMtrFldHorz1.GetText() != aMtrFldHorz1.GetSavedValue() )
     {
@@ -429,7 +429,7 @@ SfxTabPage* SvxConnectionPage::Create( Window* pWindow,
 |*
 \************************************************************************/
 
-USHORT* SvxConnectionPage::GetRanges()
+USHORT*	SvxConnectionPage::GetRanges()
 {
     return( pRanges );
 }
@@ -559,7 +559,7 @@ void SvxConnectionPage::PageCreated (SfxAllItemSet aSet)
     SFX_ITEMSET_ARG(&aSet,pOfaPtrItem,OfaPtrItem,SID_OBJECT_LIST,sal_False);
     if (pOfaPtrItem)
         SetView( static_cast<SdrView *>(pOfaPtrItem->GetValue()) );
-
+    
     Construct();
 }
 
diff --git a/cui/source/tabpages/connect.hrc b/cui/source/tabpages/connect.hrc
index 2d0584d94232..263972a1dad0 100644
--- a/cui/source/tabpages/connect.hrc
+++ b/cui/source/tabpages/connect.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/tabpages/connect.src b/cui/source/tabpages/connect.src
index 64623b0cee25..a52e893e601c 100644
--- a/cui/source/tabpages/connect.src
+++ b/cui/source/tabpages/connect.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx
index 433b5e6e2ab5..2a51a2c6fce3 100644
--- a/cui/source/tabpages/dstribut.cxx
+++ b/cui/source/tabpages/dstribut.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ SvxDistributeDialog::SvxDistributeDialog(
     const SfxItemSet& rInAttrs,
     SvxDistributeHorizontal eHor,
     SvxDistributeVertical eVer)
-:   SfxSingleTabDialog(pParent, rInAttrs, RID_SVXPAGE_DISTRIBUTE ),
+:	SfxSingleTabDialog(pParent, rInAttrs, RID_SVXPAGE_DISTRIBUTE ),
     mpPage(0L)
 {
     mpPage = new SvxDistributePage(this, rInAttrs, eHor, eVer);
@@ -85,27 +85,27 @@ SvxDistributePage::SvxDistributePage(
     const SfxItemSet& rInAttrs,
     SvxDistributeHorizontal eHor,
     SvxDistributeVertical eVer)
-:   SvxTabPage(pWindow, CUI_RES(RID_SVXPAGE_DISTRIBUTE), rInAttrs),
+:	SvxTabPage(pWindow, CUI_RES(RID_SVXPAGE_DISTRIBUTE), rInAttrs),
     meDistributeHor(eHor),
     meDistributeVer(eVer),
-    maFlHorizontal      (this, CUI_RES(FL_HORIZONTAL        )),
-    maBtnHorNone        (this, CUI_RES(BTN_HOR_NONE     )),
-    maBtnHorLeft        (this, CUI_RES(BTN_HOR_LEFT     )),
-    maBtnHorCenter      (this, CUI_RES(BTN_HOR_CENTER       )),
-    maBtnHorDistance    (this, CUI_RES(BTN_HOR_DISTANCE )),
-    maBtnHorRight       (this, CUI_RES(BTN_HOR_RIGHT        )),
-    maHorLow            (this, CUI_RES(IMG_HOR_LOW      )),
-    maHorCenter         (this, CUI_RES(IMG_HOR_CENTER       )),
-    maHorDistance       (this, CUI_RES(IMG_HOR_DISTANCE )),
-    maHorHigh           (this, CUI_RES(IMG_HOR_HIGH     )),
-    maFlVertical        (this, CUI_RES(FL_VERTICAL      )),
-    maBtnVerNone        (this, CUI_RES(BTN_VER_NONE     )),
-    maBtnVerTop         (this, CUI_RES(BTN_VER_TOP      )),
-    maBtnVerCenter      (this, CUI_RES(BTN_VER_CENTER       )),
-    maBtnVerDistance    (this, CUI_RES(BTN_VER_DISTANCE )),
-    maBtnVerBottom      (this, CUI_RES(BTN_VER_BOTTOM       )),
+    maFlHorizontal		(this, CUI_RES(FL_HORIZONTAL		)),
+    maBtnHorNone		(this, CUI_RES(BTN_HOR_NONE		)),
+    maBtnHorLeft		(this, CUI_RES(BTN_HOR_LEFT		)),
+    maBtnHorCenter		(this, CUI_RES(BTN_HOR_CENTER		)),
+    maBtnHorDistance	(this, CUI_RES(BTN_HOR_DISTANCE	)),
+    maBtnHorRight		(this, CUI_RES(BTN_HOR_RIGHT		)),
+    maHorLow			(this, CUI_RES(IMG_HOR_LOW		)),
+    maHorCenter			(this, CUI_RES(IMG_HOR_CENTER		)),
+    maHorDistance		(this, CUI_RES(IMG_HOR_DISTANCE	)),
+    maHorHigh			(this, CUI_RES(IMG_HOR_HIGH		)),
+    maFlVertical		(this, CUI_RES(FL_VERTICAL		)),
+    maBtnVerNone		(this, CUI_RES(BTN_VER_NONE		)),
+    maBtnVerTop			(this, CUI_RES(BTN_VER_TOP		)),
+    maBtnVerCenter		(this, CUI_RES(BTN_VER_CENTER		)),
+    maBtnVerDistance	(this, CUI_RES(BTN_VER_DISTANCE	)),
+    maBtnVerBottom		(this, CUI_RES(BTN_VER_BOTTOM		)),
     maVerLow            (this, CUI_RES(IMG_VER_LOW        )),
-    maVerCenter         (this, CUI_RES(IMG_VER_CENTER       )),
+    maVerCenter			(this, CUI_RES(IMG_VER_CENTER		)),
     maVerDistance       (this, CUI_RES(IMG_VER_DISTANCE   )),
     maVerHigh           (this, CUI_RES(IMG_VER_HIGH       ))
 {
@@ -149,7 +149,7 @@ SfxTabPage* SvxDistributePage::Create(Window* pWindow, const SfxItemSet& rAttrs,
 |*
 \************************************************************************/
 
-UINT16* SvxDistributePage::GetRanges()
+UINT16*	SvxDistributePage::GetRanges()
 {
     return(pRanges);
 }
diff --git a/cui/source/tabpages/dstribut.hrc b/cui/source/tabpages/dstribut.hrc
index 201fac2b5227..13d979e411e9 100644
--- a/cui/source/tabpages/dstribut.hrc
+++ b/cui/source/tabpages/dstribut.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR 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.
  *
  ************************************************************************/
-#define FL_HORIZONTAL           1
-#define BTN_HOR_NONE            2
-#define BTN_HOR_LEFT            3
-#define BTN_HOR_CENTER          4
-#define BTN_HOR_DISTANCE        5
-#define BTN_HOR_RIGHT           6
-#define FL_VERTICAL             7
-#define BTN_VER_NONE            8
-#define BTN_VER_TOP             9
-#define BTN_VER_CENTER          10
-#define BTN_VER_DISTANCE        11
-#define BTN_VER_BOTTOM          12
-#define IMG_HOR_LOW             14
-#define IMG_HOR_CENTER          15
-#define IMG_HOR_DISTANCE        16
-#define IMG_HOR_HIGH            17
-#define IMG_VER_LOW             18
-#define IMG_VER_CENTER          19
-#define IMG_VER_DISTANCE        20
-#define IMG_VER_HIGH            21
+#define	FL_HORIZONTAL			1
+#define	BTN_HOR_NONE			2
+#define	BTN_HOR_LEFT			3
+#define	BTN_HOR_CENTER			4
+#define	BTN_HOR_DISTANCE		5
+#define	BTN_HOR_RIGHT			6
+#define	FL_VERTICAL				7
+#define	BTN_VER_NONE			8
+#define	BTN_VER_TOP				9
+#define	BTN_VER_CENTER			10
+#define	BTN_VER_DISTANCE		11
+#define	BTN_VER_BOTTOM			12
+#define IMG_HOR_LOW				14
+#define IMG_HOR_CENTER			15
+#define IMG_HOR_DISTANCE		16
+#define IMG_HOR_HIGH			17
+#define IMG_VER_LOW				18
+#define IMG_VER_CENTER			19
+#define IMG_VER_DISTANCE		20
+#define IMG_VER_HIGH			21
 
-#define IMG_HOR_LOW_H           22
-#define IMG_HOR_CENTER_H        23
-#define IMG_HOR_DISTANCE_H      24
-#define IMG_HOR_HIGH_H          25
-#define IMG_VER_LOW_H           26
-#define IMG_VER_CENTER_H        27
-#define IMG_VER_DISTANCE_H      28
-#define IMG_VER_HIGH_H          29
+#define IMG_HOR_LOW_H			22
+#define IMG_HOR_CENTER_H		23
+#define IMG_HOR_DISTANCE_H		24
+#define IMG_HOR_HIGH_H			25
+#define IMG_VER_LOW_H			26
+#define IMG_VER_CENTER_H		27
+#define IMG_VER_DISTANCE_H		28
+#define IMG_VER_HIGH_H			29
diff --git a/cui/source/tabpages/dstribut.src b/cui/source/tabpages/dstribut.src
index 18e38fd5236a..667d12ab8599 100644
--- a/cui/source/tabpages/dstribut.src
+++ b/cui/source/tabpages/dstribut.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/tabpages/frmdirlbox.src b/cui/source/tabpages/frmdirlbox.src
index a6a43160afa5..518defe0c95b 100644
--- a/cui/source/tabpages/frmdirlbox.src
+++ b/cui/source/tabpages/frmdirlbox.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 0500207c2049..24715455bf7c 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <cuires.hrc>
 #include <svx/dialogs.hrc> // for RID_SVXPAGE_GRFCROP
 
-#define CM_1_TO_TWIP        567
+#define CM_1_TO_TWIP 		567
 
 
 inline long lcl_GetValue( MetricField& rMetric, FieldUnit eUnit )
@@ -57,7 +57,7 @@ inline long lcl_GetValue( MetricField& rMetric, FieldUnit eUnit )
  --------------------------------------------------------------------*/
 
 SvxGrfCropPage::SvxGrfCropPage ( Window *pParent, const SfxItemSet &rSet )
-    : SfxTabPage( pParent,  CUI_RES( RID_SVXPAGE_GRFCROP ), rSet ),
+    : SfxTabPage( pParent, 	CUI_RES( RID_SVXPAGE_GRFCROP ), rSet ),
     aCropFL(        this, CUI_RES( FL_CROP    )),
     aZoomConstRB(   this, CUI_RES( RB_ZOOMCONST)),
     aSizeConstRB(   this, CUI_RES( RB_SIZECONST)),
@@ -71,16 +71,16 @@ SvxGrfCropPage::SvxGrfCropPage ( Window *pParent, const SfxItemSet &rSet )
     aBottomMF(      this, CUI_RES( MF_BOTTOM  )),
     aZoomFL(        this, CUI_RES( FL_ZOOM    )),
     aWidthZoomFT(   this, CUI_RES( FT_WIDTHZOOM )),
-    aWidthZoomMF(   this, CUI_RES( MF_WIDTHZOOM )),
-    aHeightZoomFT(  this, CUI_RES( FT_HEIGHTZOOM)),
-    aHeightZoomMF(  this, CUI_RES( MF_HEIGHTZOOM)),
+    aWidthZoomMF( 	this, CUI_RES( MF_WIDTHZOOM )),
+    aHeightZoomFT( 	this, CUI_RES( FT_HEIGHTZOOM)),
+    aHeightZoomMF( 	this, CUI_RES( MF_HEIGHTZOOM)),
     aSizeFL(        this, CUI_RES( FL_SIZE    )),
     aWidthFT(       this, CUI_RES( FT_WIDTH   )),
     aWidthMF(       this, CUI_RES( MF_WIDTH   )),
     aHeightFT(      this, CUI_RES( FT_HEIGHT  )),
     aHeightMF(      this, CUI_RES( MF_HEIGHT  )),
     aOrigSizeFT(    this, CUI_RES(FT_ORIG_SIZE)),
-    aOrigSizePB(    this, CUI_RES( PB_ORGSIZE )),
+    aOrigSizePB( 	this, CUI_RES( PB_ORGSIZE )),
     aExampleWN(     this, CUI_RES( WN_BSP     )),
     pLastCropField(0),
     bInitialized(FALSE),
@@ -180,10 +180,10 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet )
 
         SvxGrfCrop* pCrop =  (SvxGrfCrop*)pItem;
 
-        aExampleWN.SetLeft(     pCrop->GetLeft());
-        aExampleWN.SetRight(    pCrop->GetRight());
-        aExampleWN.SetTop(      pCrop->GetTop());
-        aExampleWN.SetBottom(   pCrop->GetBottom());
+        aExampleWN.SetLeft(		pCrop->GetLeft());
+        aExampleWN.SetRight(	pCrop->GetRight());
+        aExampleWN.SetTop(		pCrop->GetTop());
+        aExampleWN.SetBottom(	pCrop->GetBottom());
 
         aLeftMF.SetValue( aLeftMF.Normalize( pCrop->GetLeft()), eUnit );
         aRightMF.SetValue( aRightMF.Normalize( pCrop->GetRight()), eUnit );
@@ -291,7 +291,7 @@ BOOL SvxGrfCropPage::FillItemSet(SfxItemSet &rSet)
         }
     }
     if( aLeftMF.IsModified() || aRightMF.IsModified() ||
-        aTopMF.IsModified()  || aBottomMF.IsModified() )
+        aTopMF.IsModified()  ||	aBottomMF.IsModified() )
     {
         USHORT nW = rPool.GetWhich( SID_ATTR_GRAF_CROP );
         FieldUnit eUnit = MapToFieldUnit( rSet.GetPool()->GetMetric( nW ));
@@ -493,16 +493,16 @@ IMPL_LINK( SvxGrfCropPage, CropHdl, const MetricField *, pField )
         {
             if(pField == &aLeftMF)
             {
-//              nLeft = aPageSize.Width() -
-//                  ((nRight + aOrigSize.Width()) * nWidthZoom) / 100;
+//				nLeft = aPageSize.Width() -
+//					((nRight + aOrigSize.Width()) * nWidthZoom) / 100;
                 nLeft = aOrigSize.Width() -
                             ( aPageSize.Width() * 100 / nWidthZoom + nRight );
                 aLeftMF.SetValue( aLeftMF.Normalize( nLeft ), eUnit );
             }
             else
             {
-//              nRight = aPageSize.Width() -
-//                  ((nLeft - aOrigSize.Width()) * nWidthZoom) / 100;
+//				nRight = aPageSize.Width() -
+//					((nLeft - aOrigSize.Width()) * nWidthZoom) / 100;
                 nRight = aOrigSize.Width() -
                             ( aPageSize.Width() * 100 / nWidthZoom + nLeft );
                 aRightMF.SetValue( aRightMF.Normalize( nRight ), eUnit );
@@ -526,16 +526,16 @@ IMPL_LINK( SvxGrfCropPage, CropHdl, const MetricField *, pField )
         {
             if(pField == &aTopMF)
             {
-//              nTop = aPageSize.Height() -
-//                  ((aOrigSize.Height() - nBottom) * nHeightZoom)/ 100;
+//				nTop = aPageSize.Height() -
+//					((aOrigSize.Height() - nBottom) * nHeightZoom)/ 100;
                 nTop = aOrigSize.Height() -
                             ( aPageSize.Height() * 100 / nHeightZoom + nBottom);
                 aTopMF.SetValue( aWidthMF.Normalize( nTop ), eUnit );
             }
             else
             {
-//              nBottom = aPageSize.Height() -
-//                  ((aOrigSize.Height() - nTop)*nHeightZoom) / 100;
+//				nBottom = aPageSize.Height() -
+//					((aOrigSize.Height() - nTop)*nHeightZoom) / 100;
                 nBottom = aOrigSize.Height() -
                             ( aPageSize.Height() * 100 / nHeightZoom + nTop);
                 aBottomMF.SetValue( aWidthMF.Normalize( nBottom ), eUnit );
@@ -629,7 +629,7 @@ void SvxGrfCropPage::CalcMinMaxBorder()
     aRightMF.SetMax( aRightMF.Normalize(nMin), eUnit );
 
     // Zoom nicht unter 2%
-/*  nMin = (aOrigSize.Width() * 102) /100;
+/*	nMin = (aOrigSize.Width() * 102) /100;
     aLeftMF.SetMax(aPageSize.Width() - nR - nMin);
     aRightMF.SetMax(aPageSize.Width() - nL - nMin);
 */
@@ -643,12 +643,12 @@ void SvxGrfCropPage::CalcMinMaxBorder()
     aTopMF.SetMax( aTopMF.Normalize(nMin), eUnit );
 
     // Zoom nicht unter 2%
-/*  nMin = (aOrigSize.Height() * 102) /100;
+/*	nMin = (aOrigSize.Height() * 102) /100;
     aTopMF.SetMax(aPageSize.Height() - nLow - nMin);
     aBottomMF.SetMax(aPageSize.Height() - nUp - nMin);*/
 }
 /*--------------------------------------------------------------------
-    Beschreibung:   Spinsize auf 1/20 der Originalgroesse setzen,
+    Beschreibung: 	Spinsize auf 1/20 der Originalgroesse setzen,
                     FixedText mit der Originalgroesse fuellen
  --------------------------------------------------------------------*/
 
@@ -710,7 +710,7 @@ void SvxGrfCropPage::GraphicHasChanged( BOOL bFound )
         sTemp += aFld.GetText();
         aOrigSizeFT.SetText(sTemp);
     }
-    aLeftFT         .Enable(bFound);
+    aLeftFT			.Enable(bFound);
     aLeftMF         .Enable(bFound);
     aRightFT        .Enable(bFound);
     aRightMF        .Enable(bFound);
@@ -723,7 +723,7 @@ void SvxGrfCropPage::GraphicHasChanged( BOOL bFound )
     aWidthFT        .Enable(bFound);
     aWidthMF        .Enable(bFound);
     aHeightFT       .Enable(bFound);
-    aHeightMF       .Enable(bFound);
+    aHeightMF		.Enable(bFound);
     aWidthZoomFT    .Enable(bFound);
     aWidthZoomMF    .Enable(bFound);
     aHeightZoomFT   .Enable(bFound);
@@ -801,10 +801,10 @@ void SvxGrfCropPage::SvxCropExample::Paint( const Rectangle& )
     aSz = PixelToLogic( aSz );
     SetFillColor( Color( COL_TRANSPARENT ) );
     SetRasterOp( ROP_INVERT );
-    aRect.Left()    += aTopLeft.Y();
-    aRect.Top()     += aTopLeft.X();
-    aRect.Right()   -= aBottomRight.Y();
-    aRect.Bottom()  -= aBottomRight.X();
+    aRect.Left() 	+= aTopLeft.Y();
+    aRect.Top() 	+= aTopLeft.X();
+    aRect.Right() 	-= aBottomRight.Y();
+    aRect.Bottom() 	-= aBottomRight.X();
     DrawRect( aRect );
 }
 
diff --git a/cui/source/tabpages/grfpage.hrc b/cui/source/tabpages/grfpage.hrc
index 438e67a8010f..72b288d8f415 100644
--- a/cui/source/tabpages/grfpage.hrc
+++ b/cui/source/tabpages/grfpage.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
  *
  ************************************************************************/
 
-#define FT_BOTTOM           1
+#define FT_BOTTOM			1
 #define FT_HEIGHT           2
 #define FT_HEIGHTZOOM       3
 #define FT_LEFT             4
diff --git a/cui/source/tabpages/grfpage.src b/cui/source/tabpages/grfpage.src
index 74b9e8e5cda0..863f8787d083 100644
--- a/cui/source/tabpages/grfpage.src
+++ b/cui/source/tabpages/grfpage.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <svx/dialogs.hrc>
 
 /************************************************************/
-/*                                                                                                                  */
-/*                                                                                                                  */
-/*                                   Crop-Page                                                          */
-/*                                                                                                                  */
-/*                                                                                                                  */
+/*																													*/
+/*																													*/
+/*									 Crop-Page															*/
+/*																													*/
+/*																													*/
 /************************************************************/
 TabPage RID_SVXPAGE_GRFCROP
 {
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 4eeb6be807fe..e722bfa43c6b 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 ----------------------------------------------------------------
 
-#define AZ_OPTIMAL      0
-#define AZ_VON_OBEN     1
-#define AZ_VON_LINKS    2
-#define AZ_HORIZONTAL   3
-#define AZ_VERTIKAL     4
+#define AZ_OPTIMAL		0
+#define AZ_VON_OBEN		1
+#define AZ_VON_LINKS	2
+#define AZ_HORIZONTAL	3
+#define AZ_VERTIKAL		4
 
-#define AT_OBEN         0
-#define AT_MITTE        1
-#define AT_UNTEN        2
+#define AT_OBEN			0
+#define AT_MITTE		1
+#define AT_UNTEN		2
 
-#define WK_OPTIMAL      0
-#define WK_30           1
-#define WK_45           2
-#define WK_60           3
-#define WK_90           4
+#define WK_OPTIMAL		0
+#define WK_30			1
+#define WK_45			2
+#define WK_60			3
+#define WK_90			4
 
 // static ----------------------------------------------------------------
 
@@ -84,27 +84,27 @@ static USHORT pCaptionRanges[] =
 // -----------------------------------------------------------------------
 
 SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const SfxItemSet& rInAttrs)
- :  SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_CAPTION ), rInAttrs ),
-
-    aCT_CAPTTYPE(       this, CUI_RES( CT_CAPTTYPE ) ),
-    aFT_ABSTAND(        this, CUI_RES( FT_ABSTAND ) ),
-    aMF_ABSTAND(        this, CUI_RES( MF_ABSTAND ) ),
-    aFT_WINKEL(         this, CUI_RES( FT_WINKEL ) ),
-    aLB_WINKEL(         this, CUI_RES( LB_WINKEL ) ),
-    aFT_ANSATZ(         this, CUI_RES( FT_ANSATZ ) ),
-    aLB_ANSATZ(         this, CUI_RES( LB_ANSATZ ) ),
-    aFT_UM(             this, CUI_RES( FT_UM ) ),
-    aMF_ANSATZ(         this, CUI_RES( MF_ANSATZ ) ),
-    aFT_ANSATZ_REL(     this, CUI_RES( FT_ANSATZ_REL ) ),
-    aLB_ANSATZ_REL(     this, CUI_RES( LB_ANSATZ_REL ) ),
-    aFT_LAENGE(         this, CUI_RES( FT_LAENGE ) ),
-    aMF_LAENGE(         this, CUI_RES( MF_LAENGE ) ),
-    aCB_LAENGE(         this, CUI_RES( CB_LAENGE ) ),
+ :	SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_CAPTION ), rInAttrs ),
+
+    aCT_CAPTTYPE(		this, CUI_RES( CT_CAPTTYPE ) ),
+    aFT_ABSTAND(		this, CUI_RES( FT_ABSTAND ) ),
+    aMF_ABSTAND(		this, CUI_RES( MF_ABSTAND ) ),
+    aFT_WINKEL(			this, CUI_RES( FT_WINKEL ) ),
+    aLB_WINKEL(			this, CUI_RES( LB_WINKEL ) ),
+    aFT_ANSATZ(			this, CUI_RES( FT_ANSATZ ) ),
+    aLB_ANSATZ(			this, CUI_RES( LB_ANSATZ ) ),
+    aFT_UM(				this, CUI_RES( FT_UM ) ),
+    aMF_ANSATZ(			this, CUI_RES( MF_ANSATZ ) ),
+    aFT_ANSATZ_REL(		this, CUI_RES( FT_ANSATZ_REL ) ),
+    aLB_ANSATZ_REL(		this, CUI_RES( LB_ANSATZ_REL ) ),
+    aFT_LAENGE(			this, CUI_RES( FT_LAENGE ) ),
+    aMF_LAENGE(			this, CUI_RES( MF_LAENGE ) ),
+    aCB_LAENGE(			this, CUI_RES( CB_LAENGE ) ),
 
     aStrHorzList( CUI_RES(STR_HORZ_LIST) ),
     aStrVertList( CUI_RES(STR_VERT_LIST) ),
 
-    rOutAttrs       ( rInAttrs )
+    rOutAttrs		( rInAttrs )
 {
     //------------NYI-------------------------------------------
     aFT_WINKEL.Hide();
@@ -138,9 +138,9 @@ SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const SfxItemSet& rInAttrs
     aCT_CAPTTYPE.SetSelectHdl(LINK( this, SvxCaptionTabPage, SelectCaptTypeHdl_Impl));
 
     Image aImage;
-    aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_1, aImage, String(CUI_RES(STR_CAPTTYPE_1)));
-    aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_2, aImage, String(CUI_RES(STR_CAPTTYPE_2)));
-    aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_3, aImage, String(CUI_RES(STR_CAPTTYPE_3)));
+    aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_1, aImage,	String(CUI_RES(STR_CAPTTYPE_1)));
+    aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_2,	aImage,	String(CUI_RES(STR_CAPTTYPE_2)));
+    aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_3,	aImage,	String(CUI_RES(STR_CAPTTYPE_3)));
 
     FillValueSet();
 
@@ -178,7 +178,7 @@ BOOL SvxCaptionTabPage::FillItemSet( SfxItemSet&  _rOutAttrs)
     SfxItemPool*    pPool = _rOutAttrs.GetPool();
     DBG_ASSERT( pPool, "Wo ist der Pool" );
 
-    SfxMapUnit      eUnit;
+    SfxMapUnit		eUnit;
 
     nCaptionType = aCT_CAPTTYPE.GetSelectItemId()-1;
 
@@ -195,8 +195,8 @@ BOOL SvxCaptionTabPage::FillItemSet( SfxItemSet&  _rOutAttrs)
     {
         switch( nEscDir )
         {
-            case SDRCAPT_ESCHORIZONTAL:     nEscDir=SDRCAPT_ESCVERTICAL;break;
-            case SDRCAPT_ESCVERTICAL:       nEscDir=SDRCAPT_ESCHORIZONTAL;break;
+            case SDRCAPT_ESCHORIZONTAL:		nEscDir=SDRCAPT_ESCVERTICAL;break;
+            case SDRCAPT_ESCVERTICAL:		nEscDir=SDRCAPT_ESCHORIZONTAL;break;
         }
     }
 
@@ -207,13 +207,13 @@ BOOL SvxCaptionTabPage::FillItemSet( SfxItemSet&  _rOutAttrs)
 
     if( bEscRel )
     {
-        long    nVal = 0;
+        long	nVal = 0;
 
         switch( aLB_ANSATZ_REL.GetSelectEntryPos() )
         {
-            case AT_OBEN:   nVal=0;break;
-            case AT_MITTE:  nVal=5000;break;
-            case AT_UNTEN:  nVal=10000;break;
+            case AT_OBEN:	nVal=0;break;
+            case AT_MITTE:	nVal=5000;break;
+            case AT_UNTEN:	nVal=10000;break;
         }
         _rOutAttrs.Put( SdrCaptionEscRelItem( nVal ) );
     }
@@ -265,11 +265,11 @@ void SvxCaptionTabPage::Reset( const SfxItemSet&  )
     SetFieldUnit( aMF_ANSATZ, eFUnit );
     SetFieldUnit( aMF_LAENGE, eFUnit );
 
-    SfxItemPool*    pPool = rOutAttrs.GetPool();
+    SfxItemPool* 	pPool = rOutAttrs.GetPool();
     DBG_ASSERT( pPool, "Wo ist der Pool" );
 
-    USHORT          nWhich;
-    SfxMapUnit      eUnit;
+    USHORT			nWhich;
+    SfxMapUnit		eUnit;
 
     //------- Winkel ----------
     nWhich = GetWhich( SDRATTR_CAPTIONANGLE );
@@ -311,8 +311,8 @@ void SvxCaptionTabPage::Reset( const SfxItemSet&  )
     {
         switch( nEscDir )
         {
-            case SDRCAPT_ESCHORIZONTAL:     nEscDir=SDRCAPT_ESCVERTICAL;break;
-            case SDRCAPT_ESCVERTICAL:       nEscDir=SDRCAPT_ESCHORIZONTAL;break;
+            case SDRCAPT_ESCHORIZONTAL:		nEscDir=SDRCAPT_ESCVERTICAL;break;
+            case SDRCAPT_ESCVERTICAL:		nEscDir=SDRCAPT_ESCHORIZONTAL;break;
         }
     }
 
@@ -392,7 +392,7 @@ SfxTabPage* SvxCaptionTabPage::Create( Window* pWindow,
 
 //------------------------------------------------------------------------
 
-USHORT* SvxCaptionTabPage::GetRanges()
+USHORT*	SvxCaptionTabPage::GetRanges()
 {
     return( pCaptionRanges );
 }
@@ -401,13 +401,13 @@ USHORT* SvxCaptionTabPage::GetRanges()
 
 void SvxCaptionTabPage::SetupAnsatz_Impl( USHORT nType )
 {
-    xub_StrLen  nCnt=0, nIdx=0;
+    xub_StrLen	nCnt=0, nIdx=0;
 
     switch( nType )
     {
         case AZ_OPTIMAL:
-//      aMF_ANSATZ.Hide(); //XXX auch bei OPTIMAL werden Abswerte genommen
-//      aFT_UM.Hide();
+//		aMF_ANSATZ.Hide(); //XXX auch bei OPTIMAL werden Abswerte genommen
+//		aFT_UM.Hide();
         aMF_ANSATZ.Show();
         aFT_UM.Show();
         aFT_ANSATZ_REL.Hide();
@@ -580,7 +580,7 @@ void SvxCaptionTabPage::FillValueSet()
 
 
 SvxCaptionTabDialog::SvxCaptionTabDialog(Window* pParent, const SdrView* pSdrView, USHORT nAnchorTypes)
- :  SfxTabDialog( pParent, CUI_RES( RID_SVXDLG_CAPTION ) ),
+ :	SfxTabDialog( pParent, CUI_RES( RID_SVXDLG_CAPTION ) ),
     pView       ( pSdrView ),
     nAnchorCtrls(nAnchorTypes)
 {
@@ -590,13 +590,13 @@ SvxCaptionTabDialog::SvxCaptionTabDialog(Window* pParent, const SdrView* pSdrVie
 
     //different positioning page in Writer
     if(nAnchorCtrls & 0x00ff )
-    {
-        AddTabPage( RID_SVXPAGE_SWPOSSIZE, SvxSwPosSizeTabPage::Create,
+    {        
+        AddTabPage( RID_SVXPAGE_SWPOSSIZE, SvxSwPosSizeTabPage::Create, 
                                 SvxSwPosSizeTabPage::GetRanges );
         RemoveTabPage( RID_SVXPAGE_POSITION_SIZE);
     }
     else
-    {
+    {        
         AddTabPage( RID_SVXPAGE_POSITION_SIZE, SvxPositionSizeTabPage::Create,
                                 SvxPositionSizeTabPage::GetRanges );
         RemoveTabPage( RID_SVXPAGE_SWPOSSIZE );
@@ -631,7 +631,7 @@ void SvxCaptionTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage )
             SvxSwPosSizeTabPage& rSwPage = static_cast<SvxSwPosSizeTabPage&>(rPage);
             rSwPage.EnableAnchorTypes(nAnchorCtrls);
             rSwPage.SetValidateFramePosLink( aValidateLink );
-        }
+        }            
         break;
 
         case RID_SVXPAGE_CAPTION:
@@ -646,7 +646,7 @@ void SvxCaptionTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage )
 void SvxCaptionTabDialog::SetValidateFramePosLink( const Link& rLink )
 {
     aValidateLink = rLink;
-}
+}            
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/labdlg.hrc b/cui/source/tabpages/labdlg.hrc
index 8f76e8572f86..5c82d8c90fcc 100644
--- a/cui/source/tabpages/labdlg.hrc
+++ b/cui/source/tabpages/labdlg.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,53 +25,53 @@
  *
  ************************************************************************/
 #include <cuires.hrc>
-//#define RID_SVXPAGE_CAPTION       1000
-//#define RID_SVXDLG_CAPTION        1001
+//#define RID_SVXPAGE_CAPTION		1000
+//#define RID_SVXDLG_CAPTION		1001
 
-#define TAB_CONTROL             1
-#define BTN_OK                  1
-#define BTN_CANCEL              1
-#define BTN_HELP                1
+#define TAB_CONTROL				1
+#define BTN_OK					1
+#define BTN_CANCEL				1
+#define BTN_HELP				1
 
-#define FT_ABSTAND              1
-#define FT_WINKEL               2
-#define FT_ANSATZ               3
-#define FT_LAENGE               4
-#define FT_UM                   5
-#define FT_ANSATZ_REL           6
+#define FT_ABSTAND				1
+#define FT_WINKEL				2
+#define FT_ANSATZ				3
+#define FT_LAENGE				4
+#define FT_UM					5
+#define FT_ANSATZ_REL			6
 
-#define CT_CAPTTYPE             1
+#define CT_CAPTTYPE				1
 
-#define MF_ABSTAND              1
-#define MF_ANSATZ               2
-#define MF_LAENGE               3
+#define MF_ABSTAND				1
+#define MF_ANSATZ				2
+#define MF_LAENGE				3
 
-#define CB_LAENGE               1
+#define CB_LAENGE				1
 
-#define CM_LAENGE               1
+#define CM_LAENGE				1
 
-#define LB_WINKEL               1
-#define LB_ANSATZ               2
-#define LB_ANSATZ_REL           3
+#define LB_WINKEL				1
+#define LB_ANSATZ				2
+#define LB_ANSATZ_REL			3
 
-#define STR_CAPTTYPE_1          1
-#define STR_CAPTTYPE_2          2
-#define STR_CAPTTYPE_3          3
-#define STR_CAPTTYPE_4          4
-#define STR_HORZ_LIST           10
-#define STR_VERT_LIST           11
+#define STR_CAPTTYPE_1			1
+#define STR_CAPTTYPE_2			2
+#define STR_CAPTTYPE_3			3
+#define STR_CAPTTYPE_4			4
+#define STR_HORZ_LIST			10
+#define STR_VERT_LIST			11
 
-#define BMP_CAPTTYPE_1          1
-#define BMP_CAPTTYPE_2          2
-#define BMP_CAPTTYPE_3          3
-#define BMP_CAPTTYPE_4          4
+#define BMP_CAPTTYPE_1			1
+#define BMP_CAPTTYPE_2			2
+#define BMP_CAPTTYPE_3			3
+#define BMP_CAPTTYPE_4			4
 
-#define BMP_CAPTTYPE_1_H        5
-#define BMP_CAPTTYPE_2_H        6
-#define BMP_CAPTTYPE_3_H        7
-#define BMP_CAPTTYPE_4_H        8
+#define BMP_CAPTTYPE_1_H		5
+#define BMP_CAPTTYPE_2_H		6
+#define BMP_CAPTTYPE_3_H		7
+#define BMP_CAPTTYPE_4_H		8
 
-#define SHOW_HORZ               1
-#define SHOW_VERT               2
-#define SHOW_ABS                3
-#define SHOW_NONE               4
+#define SHOW_HORZ				1
+#define SHOW_VERT				2
+#define SHOW_ABS				3
+#define SHOW_NONE				4
diff --git a/cui/source/tabpages/labdlg.src b/cui/source/tabpages/labdlg.src
index ed13f2de9b49..45e8aa370ff7 100644
--- a/cui/source/tabpages/labdlg.src
+++ b/cui/source/tabpages/labdlg.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ TabDialog RID_SVXDLG_CAPTION\
                 Identifier = RID_SVXPAGE_POSITION_SIZE ;
                 PageResID = RID_SVXPAGE_POSITION_SIZE ;
                 _POS_SIZE_TEXT
-            };
+            };                                                              
             PageItem
             {
                 Identifier = RID_SVXPAGE_SWPOSSIZE;
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index ebdc7554123d..69bc1ac0a319 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ public:
     _SfxMacroTabPage_Impl( void );
     ~_SfxMacroTabPage_Impl();
 
-    String                          maStaticMacroLBLabel;
-    PushButton*                     pAssignPB;
-    PushButton*                     pDeletePB;
-    String*                         pStrEvent;
-    String*                         pAssignedMacro;
-    ListBox*                        pScriptTypeLB;
-    _HeaderTabListBox*              pEventLB;
-    SfxConfigGroupListBox_Impl*     pGroupLB;
-    FixedText*                      pFT_MacroLBLabel;
-    SfxConfigFunctionListBox_Impl*  pMacroLB;
-
-    FixedText*                      pMacroFT;
-    String*                         pMacroStr;
-    FNGetRangeHdl                   fnGetRange;
-    FNGetMacrosOfRangeHdl           fnGetMacroOfRange;
-
-    BOOL                            bReadOnly;
+    String							maStaticMacroLBLabel;
+    PushButton*						pAssignPB;
+    PushButton*						pDeletePB;
+    String*							pStrEvent;
+    String*							pAssignedMacro;
+    ListBox*						pScriptTypeLB;
+    _HeaderTabListBox*				pEventLB;
+    SfxConfigGroupListBox_Impl*		pGroupLB;
+    FixedText*						pFT_MacroLBLabel;
+    SfxConfigFunctionListBox_Impl*	pMacroLB;
+
+    FixedText*						pMacroFT;
+    String*							pMacroStr;
+    FNGetRangeHdl					fnGetRange;
+    FNGetMacrosOfRangeHdl			fnGetMacroOfRange;
+
+    BOOL							bReadOnly;
     Timer                           maFillGroupTimer;
-    BOOL                            bGotEvents;
+    BOOL							bGotEvents;
 };
 
 _SfxMacroTabPage_Impl::_SfxMacroTabPage_Impl( void ) :
@@ -130,15 +130,15 @@ static long nTabs[] =
         0, 90
     };
 
-#define TAB_WIDTH_MIN       10
+#define TAB_WIDTH_MIN		10
 
 // IDs for items in HeaderBar of EventLB
-#define ITEMID_EVENT        1
-#define ITMEID_ASSMACRO     2
+#define	ITEMID_EVENT		1
+#define	ITMEID_ASSMACRO		2
 
 
-#define LB_EVENTS_ITEMPOS   1
-#define LB_MACROS_ITEMPOS   2
+#define LB_EVENTS_ITEMPOS	1
+#define LB_MACROS_ITEMPOS	2
 
 String ConvertToUIName_Impl( SvxMacro *pMacro, const String& /*rLanguage*/ )
 {
@@ -273,7 +273,7 @@ BOOL _SfxMacroTabPage::FillItemSet( SfxItemSet& rSet )
     return FALSE;
 }
 
-void _SfxMacroTabPage::PageCreated (SfxAllItemSet aSet)
+void _SfxMacroTabPage::PageCreated (SfxAllItemSet aSet) 
 {
     const SfxPoolItem* pEventsItem;
     if( !mpImpl->bGotEvents && SFX_ITEM_SET == aSet.GetItemState( SID_EVENTCONFIG, TRUE, &pEventsItem ) )
@@ -326,10 +326,10 @@ BOOL _SfxMacroTabPage::IsReadOnly() const
 
 IMPL_STATIC_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox*, EMPTYARG )
 {
-    _SfxMacroTabPage_Impl*  pImpl = pThis->mpImpl;
-    SvHeaderTabListBox&     rListBox = pImpl->pEventLB->GetListBox();
-    SvLBoxEntry*            pE = rListBox.FirstSelected();
-    ULONG                   nPos;
+    _SfxMacroTabPage_Impl*	pImpl = pThis->mpImpl;
+    SvHeaderTabListBox&		rListBox = pImpl->pEventLB->GetListBox();
+    SvLBoxEntry*			pE = rListBox.FirstSelected();
+    ULONG					nPos;
     if( !pE || LISTBOX_ENTRY_NOTFOUND ==
         ( nPos = rListBox.GetModel()->GetAbsPos( pE ) ) )
     {
@@ -360,14 +360,14 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox*, EMPTYARG )
 
 IMPL_STATIC_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox*, EMPTYARG )
 {
-    _SfxMacroTabPage_Impl*  pImpl = pThis->mpImpl;
-    String                  sSel( pImpl->pGroupLB->GetGroup() );
-    String                  aLanguage = pImpl->pScriptTypeLB->GetSelectEntry();
+    _SfxMacroTabPage_Impl*	pImpl = pThis->mpImpl;
+    String					sSel( pImpl->pGroupLB->GetGroup() );
+    String					aLanguage = pImpl->pScriptTypeLB->GetSelectEntry();
     if( !aLanguage.EqualsAscii( "JavaScript" ) )
     {
         pImpl->pGroupLB->GroupSelected();
-        SfxMacroInfo*   pMacro = pImpl->pMacroLB->GetMacroInfo();
-        String          aLabelText;
+        SfxMacroInfo*	pMacro = pImpl->pMacroLB->GetMacroInfo();
+        String			aLabelText;
         if( pMacro )
         {
             aLabelText = pImpl->maStaticMacroLBLabel;
@@ -387,7 +387,7 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox*, EMPTYARG )
 
 IMPL_STATIC_LINK( _SfxMacroTabPage, SelectMacro_Impl, ListBox*, EMPTYARG )
 {
-    _SfxMacroTabPage_Impl*  pImpl = pThis->mpImpl;
+    _SfxMacroTabPage_Impl*	pImpl = pThis->mpImpl;
     pImpl->pMacroLB->FunctionSelected();
     pThis->EnableButtons( pImpl->pScriptTypeLB->GetSelectEntry() );
     return 0;
@@ -401,7 +401,7 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, GetFocus_Impl, Edit*, EMPTYARG )
 
 IMPL_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn )
 {
-    _SfxMacroTabPage_Impl*  pImpl = pThis->mpImpl;
+    _SfxMacroTabPage_Impl*	pImpl = pThis->mpImpl;
     SvHeaderTabListBox& rListBox = pImpl->pEventLB->GetListBox();
     SvLBoxEntry* pE = rListBox.FirstSelected();
     ULONG nPos;
@@ -489,12 +489,12 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, TimeOut_Impl, Timer*, EMPTYARG )
 void _SfxMacroTabPage::InitAndSetHandler()
 {
     // Handler installieren
-    SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
-    HeaderBar&          rHeaderBar = mpImpl->pEventLB->GetHeaderBar();
-    Link                aLnk(STATIC_LINK(this, _SfxMacroTabPage, AssignDeleteHdl_Impl ));
+    SvHeaderTabListBox&	rListBox = mpImpl->pEventLB->GetListBox();
+    HeaderBar&			rHeaderBar = mpImpl->pEventLB->GetHeaderBar();
+    Link				aLnk(STATIC_LINK(this, _SfxMacroTabPage, AssignDeleteHdl_Impl ));
     mpImpl->pMacroLB->SetDoubleClickHdl( aLnk );
-    mpImpl->pDeletePB->SetClickHdl( aLnk );
-    mpImpl->pAssignPB->SetClickHdl( aLnk );
+    mpImpl->pDeletePB->SetClickHdl(	aLnk );
+    mpImpl->pAssignPB->SetClickHdl(	aLnk );
     rListBox.SetDoubleClickHdl( aLnk );
 
     rListBox.SetSelectHdl( STATIC_LINK( this, _SfxMacroTabPage, SelectEvent_Impl ));
@@ -507,7 +507,7 @@ void _SfxMacroTabPage::InitAndSetHandler()
     rListBox.SetTabs( &nTabs[0], MAP_APPFONT );
     Size aSize( nTabs[ 2 ], 0 );
     rHeaderBar.InsertItem( ITEMID_EVENT, *mpImpl->pStrEvent, LogicToPixel( aSize, MapMode( MAP_APPFONT ) ).Width() );
-    aSize.Width() = 1764;       // don't know what, so 42^2 is best to use...
+    aSize.Width() = 1764;		// don't know what, so 42^2 is best to use...
     rHeaderBar.InsertItem( ITMEID_ASSMACRO, *mpImpl->pAssignedMacro, LogicToPixel( aSize, MapMode( MAP_APPFONT ) ).Width() );
     rListBox.SetSpaceBetweenEntries( 0 );
 
@@ -552,23 +552,23 @@ void _SfxMacroTabPage::FillMacroList()
 
 void _SfxMacroTabPage::FillEvents()
 {
-    SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
+    SvHeaderTabListBox&	rListBox = mpImpl->pEventLB->GetListBox();
 
-    String              aLanguage = mpImpl->pScriptTypeLB->GetSelectEntry();
-    ULONG               nEntryCnt = rListBox.GetEntryCount();
+    String				aLanguage = mpImpl->pScriptTypeLB->GetSelectEntry();
+    ULONG				nEntryCnt = rListBox.GetEntryCount();
 
     // Events aus der Tabelle holen und die EventListBox entsprechen fuellen
     for( ULONG n = 0 ; n < nEntryCnt ; ++n )
     {
-        SvLBoxEntry*    pE = rListBox.GetEntry( n );
+        SvLBoxEntry*	pE = rListBox.GetEntry( n );
         if( pE )
         {
-            SvLBoxString*   pLItem = ( SvLBoxString* ) pE->GetItem( LB_MACROS_ITEMPOS );
+            SvLBoxString*	pLItem = ( SvLBoxString* ) pE->GetItem( LB_MACROS_ITEMPOS );
             DBG_ASSERT( pLItem && SV_ITEM_ID_LBOXSTRING == pLItem->IsA(), "_SfxMacroTabPage::FillEvents(): no LBoxString" );
 
-            String          sOld( pLItem->GetText() );
-            String          sNew;
-            USHORT          nEventId = ( USHORT ) ( ULONG ) pE->GetUserData();
+            String			sOld( pLItem->GetText() );
+            String			sNew;
+            USHORT			nEventId = ( USHORT ) ( ULONG ) pE->GetUserData();
             if( aTbl.IsKeyValid( nEventId ) )
                 sNew = ConvertToUIName_Impl( aTbl.Get( nEventId ), aLanguage );
 
@@ -583,12 +583,12 @@ void _SfxMacroTabPage::FillEvents()
 
 void _SfxMacroTabPage::SelectEvent( const String & /*rEventName*/, USHORT nEventId )
 {
-    SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
-    ULONG               nEntryCnt = rListBox.GetEntryCount();
+    SvHeaderTabListBox&	rListBox = mpImpl->pEventLB->GetListBox();
+    ULONG				nEntryCnt = rListBox.GetEntryCount();
 
     for( ULONG n = 0 ; n < nEntryCnt ; ++n )
     {
-        SvLBoxEntry*    pE = rListBox.GetEntry( n );
+        SvLBoxEntry*	pE = rListBox.GetEntry( n );
         if( pE && ( USHORT ) ( ULONG ) pE->GetUserData() == nEventId )
         {
             rListBox.SetCurEntry( pE );
@@ -674,19 +674,19 @@ SvStringsDtor* __EXPORT _ImpGetMacrosOfRangeHdl(
 SfxMacroTabPage::SfxMacroTabPage( Window* pParent, const ResId& rResId, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rSet )
     : _SfxMacroTabPage( pParent, rResId, rSet )
 {
-    mpImpl->pStrEvent           = new String(                   CUI_RES( STR_EVENT ) );
-    mpImpl->pAssignedMacro      = new String(                   CUI_RES( STR_ASSMACRO ) );
-    mpImpl->pEventLB            = new _HeaderTabListBox( this,  CUI_RES( LB_EVENT ) );
-    mpImpl->pAssignPB           = new PushButton( this,         CUI_RES( PB_ASSIGN ) );
-    mpImpl->pDeletePB           = new PushButton( this,         CUI_RES( PB_DELETE ) );
-    mpImpl->pScriptTypeLB       = new ListBox(this,             CUI_RES( LB_SCRIPTTYPE ) );
+    mpImpl->pStrEvent			= new String(					CUI_RES( STR_EVENT ) );
+    mpImpl->pAssignedMacro		= new String(					CUI_RES( STR_ASSMACRO ) );
+    mpImpl->pEventLB			= new _HeaderTabListBox( this,	CUI_RES( LB_EVENT ) );
+    mpImpl->pAssignPB			= new PushButton( this,			CUI_RES( PB_ASSIGN ) );
+    mpImpl->pDeletePB			= new PushButton( this,			CUI_RES( PB_DELETE ) );
+    mpImpl->pScriptTypeLB		= new ListBox(this,				CUI_RES( LB_SCRIPTTYPE ) );
     mpImpl->pScriptTypeLB->Hide();
-    mpImpl->pMacroFT            = new FixedText( this,          CUI_RES( FT_MACRO ) );
-    mpImpl->pGroupLB            = new SfxConfigGroupListBox_Impl( this,     CUI_RES( LB_GROUP ) );
-    mpImpl->pFT_MacroLBLabel    = new FixedText( this,          CUI_RES( FT_LABEL4LB_MACROS ) );
+    mpImpl->pMacroFT			= new FixedText( this,			CUI_RES( FT_MACRO ) );
+    mpImpl->pGroupLB			= new SfxConfigGroupListBox_Impl( this,		CUI_RES( LB_GROUP ) );
+    mpImpl->pFT_MacroLBLabel	= new FixedText( this,			CUI_RES( FT_LABEL4LB_MACROS ) );
     mpImpl->maStaticMacroLBLabel= mpImpl->pFT_MacroLBLabel->GetText();
-    mpImpl->pMacroLB            = new SfxConfigFunctionListBox_Impl( this,  CUI_RES( LB_MACROS ) );
-    mpImpl->pMacroStr           = new String(                   CUI_RES( STR_MACROS ) );
+    mpImpl->pMacroLB			= new SfxConfigFunctionListBox_Impl( this,	CUI_RES( LB_MACROS ) );
+    mpImpl->pMacroStr			= new String(					CUI_RES( STR_MACROS ) );
 
     FreeResource();
 
diff --git a/cui/source/tabpages/macroass.hrc b/cui/source/tabpages/macroass.hrc
index 614711e1981e..9c6fd7ccd021 100644
--- a/cui/source/tabpages/macroass.hrc
+++ b/cui/source/tabpages/macroass.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,51 +32,51 @@
 #include <svtools/controldims.hrc>
 #endif
 
-#define     LB_EVENT                2
-#define     PB_ASSIGN               3
-#define     PB_DELETE               4
-#define     FT_MACRO                5
-#define     LB_GROUP                6
-#define     LB_MACROS               7
-#define     LB_SCRIPTTYPE           8
-#define     FT_LABEL4LB_MACROS      9
-#define     STR_JAVASCRIPT          10
-#define     STR_MACROS              11
-#define     ED_JAVASCRIPT           12
-#define     STR_EVENT               13
-#define     STR_ASSMACRO            14
+#define 	LB_EVENT				2
+#define 	PB_ASSIGN				3
+#define 	PB_DELETE				4
+#define 	FT_MACRO				5
+#define 	LB_GROUP				6
+#define   	LB_MACROS				7
+#define 	LB_SCRIPTTYPE			8
+#define		FT_LABEL4LB_MACROS		9
+#define 	STR_JAVASCRIPT			10
+#define 	STR_MACROS				11
+#define		ED_JAVASCRIPT			12
+#define		STR_EVENT				13
+#define		STR_ASSMACRO			14
 
 
 // COL0<---------------WIDTH_1_2--------------->COL3<->COL4<----WIDTH4---->COL5
 //     <--WIDTH1-->COL1<-SPACE1->COL2<--WIDTH2->
 
-#define WIDTH_TP        260                                     // of whole tabpage
-#define COL5            (WIDTH_TP-RSC_SP_DLG_INNERBORDER_RIGHT)
-#define COL4            (COL5-RSC_CD_PUSHBUTTON_WIDTH)
-#define COL3            (COL4-RSC_SP_CTRL_X)
-#define COL0            (RSC_SP_TBPG_INNERBORDER_LEFT)
-#define WIDTH1_2        (COL3-COL0)                             // width of upper listbox
-#define SPACE1          4                                       // space between lower listboxes
-#define WIDTH1          ((WIDTH1_2-SPACE1)/2)                   // width of lower left listbox
-#define WIDTH2          (WIDTH1_2-WIDTH1-SPACE1)                // width of lower right listbox
-#define COL1            (COL0+WIDTH1)
-#define COL2            (COL1+SPACE1)
+#define	WIDTH_TP		260										// of whole tabpage
+#define	COL5			(WIDTH_TP-RSC_SP_DLG_INNERBORDER_RIGHT)
+#define	COL4			(COL5-RSC_CD_PUSHBUTTON_WIDTH)
+#define	COL3			(COL4-RSC_SP_CTRL_X)
+#define	COL0			(RSC_SP_TBPG_INNERBORDER_LEFT)
+#define	WIDTH1_2		(COL3-COL0)								// width of upper listbox
+#define SPACE1			4										// space between lower listboxes
+#define WIDTH1			((WIDTH1_2-SPACE1)/2)					// width of lower left listbox
+#define	WIDTH2			(WIDTH1_2-WIDTH1-SPACE1)				// width of lower right listbox
+#define COL1			(COL0+WIDTH1)
+#define	COL2			(COL1+SPACE1)
 
-#define HEIGHT_TP       185                                     // of whole tabpage
-#define HEIGHT0         62                                      // of upper listbox
-#define ROW0            6                                       // more than RSC_SP_FLGR_INNERBORDER_TOP cause of bad design
-#define ROW1            (ROW0+RSC_CD_PUSHBUTTON_HEIGHT)         // Assign button
-#define ROW2            (ROW1+RSC_SP_CTRL_GROUP_Y)
-#define ROW3            (ROW2+RSC_CD_PUSHBUTTON_HEIGHT)         // Remove button
-#define ROW4            (ROW3+RSC_SP_CTRL_GROUP_Y)
-#define ROW5            (ROW4+RSC_CD_DROPDOWN_HEIGHT)           // script type listbox (hidden)
-#define ROW6            (ROW0+HEIGHT0)
-#define ROW7            (ROW6+RSC_SP_CTRL_Y)
-#define HEIGHT_EXTRA7   (RSC_CD_FIXEDTEXT_HEIGHT)               // additional height for FT_LABEL4LB_MACROS
-#define ROW7A           (ROW7+HEIGHT_EXTRA7)
-#define ROW8            (ROW7+RSC_CD_FIXEDTEXT_HEIGHT+HEIGHT_EXTRA7)// label for lower listboxes (2 lines!)
-#define ROW9            (HEIGHT_TP-RSC_SP_TBPG_INNERBORDER_BOTTOM)
-#define HEIGHT8         (ROW9-ROW8)                             // of lower listboxes
+#define HEIGHT_TP		185										// of whole tabpage
+#define HEIGHT0			62										// of upper listbox
+#define	ROW0			6										// more than RSC_SP_FLGR_INNERBORDER_TOP cause of bad design
+#define	ROW1			(ROW0+RSC_CD_PUSHBUTTON_HEIGHT)			// Assign button
+#define	ROW2			(ROW1+RSC_SP_CTRL_GROUP_Y)
+#define	ROW3			(ROW2+RSC_CD_PUSHBUTTON_HEIGHT)			// Remove button
+#define	ROW4			(ROW3+RSC_SP_CTRL_GROUP_Y)
+#define	ROW5			(ROW4+RSC_CD_DROPDOWN_HEIGHT)			// script type listbox (hidden)
+#define	ROW6			(ROW0+HEIGHT0)
+#define	ROW7			(ROW6+RSC_SP_CTRL_Y)
+#define	HEIGHT_EXTRA7	(RSC_CD_FIXEDTEXT_HEIGHT)				// additional height for FT_LABEL4LB_MACROS
+#define	ROW7A			(ROW7+HEIGHT_EXTRA7)
+#define	ROW8			(ROW7+RSC_CD_FIXEDTEXT_HEIGHT+HEIGHT_EXTRA7)// label for lower listboxes (2 lines!)
+#define	ROW9			(HEIGHT_TP-RSC_SP_TBPG_INNERBORDER_BOTTOM)
+#define	HEIGHT8			(ROW9-ROW8)								// of lower listboxes
 
 #endif
 
diff --git a/cui/source/tabpages/macroass.src b/cui/source/tabpages/macroass.src
index 4f5d78ffe795..c64aac6c1284 100644
--- a/cui/source/tabpages/macroass.src
+++ b/cui/source/tabpages/macroass.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index a6f198151f26..13c60ff7378e 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,25 +96,25 @@ SvxMeasureDialog::~SvxMeasureDialog()
 \************************************************************************/
 
 SvxMeasurePage::SvxMeasurePage( Window* pWindow, const SfxItemSet& rInAttrs ) :
-                SvxTabPage      ( pWindow, CUI_RES( RID_SVXPAGE_MEASURE ),
+                SvxTabPage		( pWindow, CUI_RES( RID_SVXPAGE_MEASURE ),
                                   rInAttrs ),
 
         aFlLine                 ( this, CUI_RES( FL_LINE ) ),
-        aFtLineDist             ( this, CUI_RES( FT_LINE_DIST ) ),
-        aMtrFldLineDist         ( this, CUI_RES( MTR_LINE_DIST ) ),
-        aFtHelplineOverhang     ( this, CUI_RES( FT_HELPLINE_OVERHANG ) ),
-        aMtrFldHelplineOverhang ( this, CUI_RES( MTR_FLD_HELPLINE_OVERHANG ) ),
-        aFtHelplineDist         ( this, CUI_RES( FT_HELPLINE_DIST ) ),
-        aMtrFldHelplineDist     ( this, CUI_RES( MTR_FLD_HELPLINE_DIST ) ),
-        aFtHelpline1Len         ( this, CUI_RES( FT_HELPLINE1_LEN ) ),
-        aMtrFldHelpline1Len     ( this, CUI_RES( MTR_FLD_HELPLINE1_LEN ) ),
-        aFtHelpline2Len         ( this, CUI_RES( FT_HELPLINE2_LEN ) ),
-        aMtrFldHelpline2Len     ( this, CUI_RES( MTR_FLD_HELPLINE2_LEN ) ),
-        aTsbBelowRefEdge        ( this, CUI_RES( TSB_BELOW_REF_EDGE ) ),
-        aFtDecimalPlaces        ( this, CUI_RES( FT_DECIMALPLACES ) ),
-        aMtrFldDecimalPlaces    ( this, CUI_RES( MTR_FLD_DECIMALPLACES ) ),
-
-        aFlLabel                ( this, CUI_RES( FL_LABEL ) ),
+        aFtLineDist				( this, CUI_RES( FT_LINE_DIST ) ),
+        aMtrFldLineDist			( this, CUI_RES( MTR_LINE_DIST ) ),
+        aFtHelplineOverhang		( this, CUI_RES( FT_HELPLINE_OVERHANG ) ),
+        aMtrFldHelplineOverhang	( this, CUI_RES( MTR_FLD_HELPLINE_OVERHANG ) ),
+        aFtHelplineDist			( this, CUI_RES( FT_HELPLINE_DIST ) ),
+        aMtrFldHelplineDist		( this, CUI_RES( MTR_FLD_HELPLINE_DIST ) ),
+        aFtHelpline1Len			( this, CUI_RES( FT_HELPLINE1_LEN ) ),
+        aMtrFldHelpline1Len		( this, CUI_RES( MTR_FLD_HELPLINE1_LEN ) ),
+        aFtHelpline2Len			( this, CUI_RES( FT_HELPLINE2_LEN ) ),
+        aMtrFldHelpline2Len		( this, CUI_RES( MTR_FLD_HELPLINE2_LEN ) ),
+        aTsbBelowRefEdge		( this, CUI_RES( TSB_BELOW_REF_EDGE ) ),
+        aFtDecimalPlaces		( this, CUI_RES( FT_DECIMALPLACES ) ),
+        aMtrFldDecimalPlaces	( this, CUI_RES( MTR_FLD_DECIMALPLACES ) ),
+
+        aFlLabel    			( this, CUI_RES( FL_LABEL ) ),
         aFtPosition             ( this, CUI_RES( FT_POSITION ) ),
         aCtlPosition            ( this, CUI_RES( CTL_POSITION ) ),
         aTsbAutoPosV            ( this, CUI_RES( TSB_AUTOPOSV ) ),
@@ -123,12 +123,12 @@ SvxMeasurePage::SvxMeasurePage( Window* pWindow, const SfxItemSet& rInAttrs ) :
         aLbUnit                 ( this, CUI_RES( LB_UNIT ) ),
         aTsbParallel            ( this, CUI_RES( TSB_PARALLEL ) ),
         aCtlPreview             ( this, CUI_RES( CTL_PREVIEW ), rInAttrs ),
-
+        
         aFlVert                 ( this, CUI_RES( FL_VERT ) ),
         rOutAttrs               ( rInAttrs ),
         aAttrSet                ( *rInAttrs.GetPool() ),
         pView( 0 ),
-
+        
         bPositionModified       ( FALSE )
 {
     FillUnitLB();
@@ -364,37 +364,37 @@ void __EXPORT SvxMeasurePage::Reset( const SfxItemSet& rAttrs )
                 case SDRMEASURE_ABOVE:
                     switch( eHPos )
                     {
-                    case SDRMEASURE_TEXTLEFTOUTSIDE:    eRP = RP_LT; break;
-                    case SDRMEASURE_TEXTINSIDE:         eRP = RP_MT; break;
-                    case SDRMEASURE_TEXTRIGHTOUTSIDE:   eRP = RP_RT; break;
-                    case SDRMEASURE_TEXTHAUTO:          eRP = RP_MT; break;
+                    case SDRMEASURE_TEXTLEFTOUTSIDE:	eRP = RP_LT; break;
+                    case SDRMEASURE_TEXTINSIDE:			eRP = RP_MT; break;
+                    case SDRMEASURE_TEXTRIGHTOUTSIDE:	eRP = RP_RT; break;
+                    case SDRMEASURE_TEXTHAUTO:			eRP = RP_MT; break;
                     }
                     break;
                 case SDRMEASURETEXT_VERTICALCENTERED:
                     switch( eHPos )
                     {
-                    case SDRMEASURE_TEXTLEFTOUTSIDE:    eRP = RP_LM; break;
-                    case SDRMEASURE_TEXTINSIDE:         eRP = RP_MM; break;
-                    case SDRMEASURE_TEXTRIGHTOUTSIDE:   eRP = RP_RM; break;
-                    case SDRMEASURE_TEXTHAUTO:          eRP = RP_MM; break;
+                    case SDRMEASURE_TEXTLEFTOUTSIDE:	eRP = RP_LM; break;
+                    case SDRMEASURE_TEXTINSIDE:			eRP = RP_MM; break;
+                    case SDRMEASURE_TEXTRIGHTOUTSIDE:	eRP = RP_RM; break;
+                    case SDRMEASURE_TEXTHAUTO:			eRP = RP_MM; break;
                     }
                     break;
                 case SDRMEASURE_BELOW:
                     switch( eHPos )
                     {
-                    case SDRMEASURE_TEXTLEFTOUTSIDE:    eRP = RP_LB; break;
-                    case SDRMEASURE_TEXTINSIDE:         eRP = RP_MB; break;
-                    case SDRMEASURE_TEXTRIGHTOUTSIDE:   eRP = RP_RB; break;
-                    case SDRMEASURE_TEXTHAUTO:          eRP = RP_MB; break;
+                    case SDRMEASURE_TEXTLEFTOUTSIDE:	eRP = RP_LB; break;
+                    case SDRMEASURE_TEXTINSIDE:			eRP = RP_MB; break;
+                    case SDRMEASURE_TEXTRIGHTOUTSIDE:	eRP = RP_RB; break;
+                    case SDRMEASURE_TEXTHAUTO:			eRP = RP_MB; break;
                     }
                     break;
                 case SDRMEASURE_TEXTVAUTO:
                     switch( eHPos )
                     {
-                    case SDRMEASURE_TEXTLEFTOUTSIDE:    eRP = RP_LM; break;
-                    case SDRMEASURE_TEXTINSIDE:         eRP = RP_MM; break;
-                    case SDRMEASURE_TEXTRIGHTOUTSIDE:   eRP = RP_RM; break;
-                    case SDRMEASURE_TEXTHAUTO:          eRP = RP_MM; break;
+                    case SDRMEASURE_TEXTLEFTOUTSIDE:	eRP = RP_LM; break;
+                    case SDRMEASURE_TEXTINSIDE:			eRP = RP_MM; break;
+                    case SDRMEASURE_TEXTRIGHTOUTSIDE:	eRP = RP_RM; break;
+                    case SDRMEASURE_TEXTHAUTO:			eRP = RP_MM; break;
                     }
                     break;
                  default: ;//prevent warning
@@ -443,8 +443,8 @@ void __EXPORT SvxMeasurePage::Reset( const SfxItemSet& rAttrs )
 
 BOOL SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs)
 {
-    BOOL     bModified = FALSE;
-    INT32    nValue;
+    BOOL	 bModified = FALSE;
+    INT32	 nValue;
     TriState eState;
 
     if( aMtrFldLineDist.GetText() != aMtrFldLineDist.GetSavedValue() )
@@ -631,7 +631,7 @@ SfxTabPage* SvxMeasurePage::Create( Window* pWindow,
 |*
 \************************************************************************/
 
-USHORT* SvxMeasurePage::GetRanges()
+USHORT*	SvxMeasurePage::GetRanges()
 {
     return( pRanges );
 }
@@ -866,10 +866,10 @@ void SvxMeasurePage::FillUnitLB()
 void SvxMeasurePage::PageCreated (SfxAllItemSet aSet)
 {
     SFX_ITEMSET_ARG (&aSet,pOfaPtrItem,OfaPtrItem,SID_OBJECT_LIST,sal_False);
-
+    
     if (pOfaPtrItem)
         SetView( static_cast<SdrView *>(pOfaPtrItem->GetValue()));
-
+    
     Construct();
 }
 
diff --git a/cui/source/tabpages/measure.hrc b/cui/source/tabpages/measure.hrc
index 11dfaba27d22..0229ca775d5d 100644
--- a/cui/source/tabpages/measure.hrc
+++ b/cui/source/tabpages/measure.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR 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.
  *
  ************************************************************************/
-#define FL_LINE         1
-#define FL_LABEL        2
-#define FL_VERT         3
+#define FL_LINE			1
+#define FL_LABEL		2
+#define FL_VERT			3
 
 #define FT_LINE_DIST 1
 #define FT_HELPLINE_OVERHANG 2
diff --git a/cui/source/tabpages/measure.src b/cui/source/tabpages/measure.src
index 79c46b13079b..bec4950362cf 100644
--- a/cui/source/tabpages/measure.src
+++ b/cui/source/tabpages/measure.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 1fe6de438dc0..efc287f000a4 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,16 +79,16 @@ static USHORT pRanges[] =
 };
 
 /*************************************************************************
-#*  Methode:        SvxNumberPreviewImpl                    Datum:02.10.97
+#*	Methode:		SvxNumberPreviewImpl					Datum:02.10.97
 #*------------------------------------------------------------------------
 #*
-#*  Klasse:     SvxNumberPreview
+#*  Klasse:		SvxNumberPreview
 #*
-#*  Funktion:   Konstruktor der Klasse SvxNumberPreviewImpl
+#*  Funktion:	Konstruktor der Klasse SvxNumberPreviewImpl
 #*
-#*  Input:      Fenster, Resource-ID
+#*  Input:		Fenster, Resource-ID
 #*
-#*  Output:     ---
+#*	Output:		---
 #*
 #************************************************************************/
 
@@ -106,16 +106,16 @@ SvxNumberPreviewImpl::SvxNumberPreviewImpl( Window* pParent, const ResId& rResId
 }
 
 /*************************************************************************
-#*  Methode:        SvxNumberPreviewImpl                    Datum:02.10.97
+#*	Methode:		SvxNumberPreviewImpl					Datum:02.10.97
 #*------------------------------------------------------------------------
 #*
-#*  Klasse:     SvxNumberPreview
+#*  Klasse:		SvxNumberPreview
 #*
-#*  Funktion:   Destruktor der Klasse SvxNumberPreviewImpl
+#*  Funktion:	Destruktor der Klasse SvxNumberPreviewImpl
 #*
-#*  Input:      ---
+#*  Input:		---
 #*
-#*  Output:     ---
+#*	Output:		---
 #*
 #************************************************************************/
 
@@ -124,16 +124,16 @@ SvxNumberPreviewImpl::~SvxNumberPreviewImpl()
 }
 
 /*************************************************************************
-#*  Methode:        NotifyChange                            Datum:02.10.97
+#*	Methode:		NotifyChange							Datum:02.10.97
 #*------------------------------------------------------------------------
 #*
-#*  Klasse:     SvxNumberPreviewImpl
+#*  Klasse:		SvxNumberPreviewImpl
 #*
-#*  Funktion:   Funktion fuer das Aendern des Preview- Strings
+#*  Funktion:	Funktion fuer das Aendern des Preview- Strings
 #*
-#*  Input:      String, Farbe
+#*  Input:		String, Farbe
 #*
-#*  Output:     ---
+#*	Output:		---
 #*
 #************************************************************************/
 
@@ -149,24 +149,24 @@ void SvxNumberPreviewImpl::NotifyChange( const String& rPrevStr,
 }
 
 /*************************************************************************
-#*  Methode:        Paint                                   Datum:02.10.97
+#*	Methode:		Paint									Datum:02.10.97
 #*------------------------------------------------------------------------
 #*
-#*  Klasse:     SvxNumberPreviewImpl
+#*  Klasse:		SvxNumberPreviewImpl
 #*
-#*  Funktion:   Funktion fuer das neu zeichnen des Fensters.
+#*  Funktion:	Funktion fuer das neu zeichnen des Fensters.
 #*
-#*  Input:      ---
+#*  Input:		---
 #*
-#*  Output:     ---
+#*	Output:		---
 #*
 #************************************************************************/
 
 void SvxNumberPreviewImpl::Paint( const Rectangle& )
 {
-    Font    aDrawFont   = GetFont();
-    Size    aSzWnd      = GetOutputSizePixel();
-    Point   aPosText    = Point( (aSzWnd.Width()  - GetTextWidth( aPrevStr )) /2,
+    Font	aDrawFont	= GetFont();
+    Size	aSzWnd		= GetOutputSizePixel();
+    Point	aPosText	= Point( (aSzWnd.Width()  - GetTextWidth( aPrevStr )) /2,
                                  (aSzWnd.Height() - GetTextHeight())/2 );
 
     aDrawFont.SetColor( aPrevCol );
@@ -225,11 +225,11 @@ void SvxNumberPreviewImpl::DataChanged( const DataChangedEvent& rDCEvt )
 // class SvxNumberFormatTabPage ------------------------------------------
 
 #define REMOVE_DONTKNOW() \
-    if ( !aFtLanguage.IsEnabled() )                                     \
-    {                                                                   \
-        aFtLanguage .Enable();                                          \
-        aLbLanguage .Enable();                                          \
-        aLbLanguage .SelectLanguage( pNumFmtShell->GetCurLanguage() );  \
+    if ( !aFtLanguage.IsEnabled() )										\
+    {																	\
+        aFtLanguage	.Enable();											\
+        aLbLanguage	.Enable();											\
+        aLbLanguage	.SelectLanguage( pNumFmtShell->GetCurLanguage() );	\
     }
 
 #define HDL(hdl) LINK( this, SvxNumberFormatTabPage, hdl )
@@ -248,16 +248,16 @@ void SvxNumberPreviewImpl::DataChanged( const DataChangedEvent& rDCEvt )
 #define THIS_CUI_RES CUI_RES
 #endif /* !ENABLE_LAYOUT */
 
-SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window*             pParent,
-                                                const SfxItemSet&   rCoreAttrs )
+SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window*				pParent,
+                                                const SfxItemSet&	rCoreAttrs )
 
-    :   SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_NUMBERFORMAT ), rCoreAttrs ),
+    :	SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_NUMBERFORMAT ), rCoreAttrs ),
 
         aFtCategory     ( this, CUI_RES( FT_CATEGORY ) ),
-        aLbCategory     ( this, CUI_RES( LB_CATEGORY ) ),
-        aFtFormat       ( this, CUI_RES( FT_FORMAT ) ),
-        aLbCurrency     ( this, CUI_RES( LB_CURRENCY) ),
-        aLbFormat       ( this, CUI_RES( LB_FORMAT ) ),
+        aLbCategory		( this, CUI_RES( LB_CATEGORY ) ),
+        aFtFormat		( this, CUI_RES( FT_FORMAT ) ),
+        aLbCurrency		( this, CUI_RES( LB_CURRENCY) ),
+        aLbFormat		( this, CUI_RES( LB_FORMAT ) ),
         aFtLanguage     ( this, CUI_RES( FT_LANGUAGE ) ),
         aLbLanguage     ( this, CUI_RES( LB_LANGUAGE ), FALSE ),
         aCbSourceFormat ( this, CUI_RES( CB_SOURCEFORMAT ) ),
@@ -268,15 +268,15 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window*             pParent,
         aBtnNegRed      ( this, CUI_RES( BTN_NEGRED ) ),
         aBtnThousand    ( this, CUI_RES( BTN_THOUSAND ) ),
         aFlOptions      ( this, CUI_RES( FL_OPTIONS ) ),
-
+        
         aFtEdFormat     ( this, CUI_RES( FT_EDFORMAT ) ),
-        aEdFormat       ( this, CUI_RES( ED_FORMAT ) ),
+        aEdFormat		( this, CUI_RES( ED_FORMAT ) ),
         aIbAdd          ( this, CUI_RES( IB_ADD       ) ),
         aIbInfo         ( this, CUI_RES( IB_INFO      ) ),
         aIbRemove       ( this, CUI_RES( IB_REMOVE    ) ),
         aFtComment      ( this, CUI_RES( FT_COMMENT ) ),
         aEdComment      ( this, CUI_RES( ED_COMMENT ) ),
-
+        
 #if ENABLE_LAYOUT
         aWndPreview     ( LAYOUT_THIS_WINDOW(this), CUI_RES_PLAIN( WND_NUMBER_PREVIEW ) ),
 #else
@@ -285,7 +285,7 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window*             pParent,
         pNumItem        ( NULL ),
         pNumFmtShell    ( NULL ),
         nInitFormat     ( ULONG_MAX ),
-
+        
         sAutomaticEntry ( THIS_CUI_RES( STR_AUTO_ENTRY)),
         pLastActivWindow( NULL )
 {
@@ -307,33 +307,33 @@ SvxNumberFormatTabPage::~SvxNumberFormatTabPage()
 
 void SvxNumberFormatTabPage::Init_Impl()
 {
-    ImageList               aIconList( CUI_RES_PLAIN ( IL_ICON ) );
-    ImageList               aIconListHC( CUI_RES_PLAIN ( IL_ICON_HC ) );
+    ImageList				aIconList( CUI_RES_PLAIN ( IL_ICON ) );
+    ImageList				aIconListHC( CUI_RES_PLAIN ( IL_ICON_HC ) );
 
     bNumItemFlag=TRUE;
     bOneAreaFlag=FALSE;
 
     nCatHeight=aLbCategory.GetSizePixel().Height();
 
-    nCurFormatY     =aLbFormat.GetPosPixel().Y();
+    nCurFormatY		=aLbFormat.GetPosPixel().Y();
     nCurFormatHeight=aLbFormat.GetSizePixel().Height();
-    nStdFormatY     =aLbCurrency.GetPosPixel().Y();
+    nStdFormatY		=aLbCurrency.GetPosPixel().Y();
     nStdFormatHeight=nCurFormatY-nStdFormatY+nCurFormatHeight;
 
-    aIbAdd.     SetModeImage( aIconList.GetImage( IID_ADD ) );
-    aIbAdd.     SetModeImage( aIconListHC.GetImage( IID_ADD ), BMP_COLOR_HIGHCONTRAST );
+    aIbAdd.		SetModeImage( aIconList.GetImage( IID_ADD ) );
+    aIbAdd.		SetModeImage( aIconListHC.GetImage( IID_ADD ), BMP_COLOR_HIGHCONTRAST );
 
-    aIbRemove.  SetModeImage( aIconList.GetImage( IID_REMOVE ) );
-    aIbRemove.  SetModeImage( aIconListHC.GetImage( IID_REMOVE ), BMP_COLOR_HIGHCONTRAST );
+    aIbRemove.	SetModeImage( aIconList.GetImage( IID_REMOVE ) );
+    aIbRemove.	SetModeImage( aIconListHC.GetImage( IID_REMOVE ), BMP_COLOR_HIGHCONTRAST );
 
-    aIbInfo.    SetModeImage( aIconList.GetImage( IID_INFO ) );
-    aIbInfo.    SetModeImage( aIconListHC.GetImage( IID_INFO ), BMP_COLOR_HIGHCONTRAST );
+    aIbInfo.	SetModeImage( aIconList.GetImage( IID_INFO ) );
+    aIbInfo.	SetModeImage( aIconListHC.GetImage( IID_INFO ), BMP_COLOR_HIGHCONTRAST );
 
     aIbAdd.Enable(FALSE );
     aIbRemove.Enable(FALSE );
     aIbInfo.Enable(FALSE );
 
-    aEdComment.SetText(aLbCategory.GetEntry(1));    //String fuer Benutzerdefiniert
+    aEdComment.SetText(aLbCategory.GetEntry(1));	//String fuer Benutzerdefiniert
                                                         //holen
     aEdComment.Hide();
 
@@ -344,29 +344,29 @@ void SvxNumberFormatTabPage::Init_Impl()
 // Handler verbinden
     Link aLink = LINK( this, SvxNumberFormatTabPage, SelFormatHdl_Impl );
 
-    aLbCategory     .SetSelectHdl( aLink );
-    aLbFormat       .SetSelectHdl( aLink );
-    aLbLanguage     .SetSelectHdl( aLink );
-    aLbCurrency     .SetSelectHdl( aLink );
+    aLbCategory		.SetSelectHdl( aLink );
+    aLbFormat		.SetSelectHdl( aLink );
+    aLbLanguage		.SetSelectHdl( aLink );
+    aLbCurrency		.SetSelectHdl( aLink );
     aCbSourceFormat .SetClickHdl( aLink );
 
     aLink = LINK( this, SvxNumberFormatTabPage, OptHdl_Impl );
 
-    aEdDecimals     .SetModifyHdl( aLink );
-    aEdLeadZeroes   .SetModifyHdl( aLink );
-    aBtnNegRed      .SetClickHdl( aLink );
-    aBtnThousand    .SetClickHdl( aLink );
-    aLbFormat       .SetDoubleClickHdl( HDL( DoubleClickHdl_Impl ) );
-    aEdFormat       .SetModifyHdl( HDL( EditHdl_Impl ) );
+    aEdDecimals		.SetModifyHdl( aLink );
+    aEdLeadZeroes	.SetModifyHdl( aLink );
+    aBtnNegRed		.SetClickHdl( aLink );
+    aBtnThousand	.SetClickHdl( aLink );
+    aLbFormat		.SetDoubleClickHdl( HDL( DoubleClickHdl_Impl ) );
+    aEdFormat		.SetModifyHdl( HDL( EditHdl_Impl ) );
     aIbAdd.SetClickHdl( HDL( ClickHdl_Impl ) );
     aIbRemove.SetClickHdl( HDL( ClickHdl_Impl ) );
     aIbInfo.SetClickHdl( HDL( ClickHdl_Impl ) );
 
     aLink = LINK( this, SvxNumberFormatTabPage, LostFocusHdl_Impl);
 
-    aEdComment      .SetLoseFocusHdl( aLink);
-    aResetWinTimer  .SetTimeoutHdl(LINK( this, SvxNumberFormatTabPage, TimeHdl_Impl));
-    aResetWinTimer  .SetTimeout( 10);
+    aEdComment		.SetLoseFocusHdl( aLink);
+    aResetWinTimer	.SetTimeoutHdl(LINK( this, SvxNumberFormatTabPage, TimeHdl_Impl));
+    aResetWinTimer	.SetTimeout( 10);
 
     // Sprachen-ListBox initialisieren
 
@@ -384,16 +384,16 @@ void SvxNumberFormatTabPage::Init_Impl()
 }
 
 /*************************************************************************
-#*  Methode:        GetRanges                               Datum:02.10.97
+#*	Methode:		GetRanges								Datum:02.10.97
 #*------------------------------------------------------------------------
 #*
-#*  Klasse:     SvxNumberFormatTabPage
+#*  Klasse:		SvxNumberFormatTabPage
 #*
-#*  Funktion:   Liefert Bereichsangaben zurueck.
+#*  Funktion:	Liefert Bereichsangaben zurueck.
 #*
-#*  Input:      ---
+#*  Input:		---
 #*
-#*  Output:     Bereich
+#*	Output:		Bereich
 #*
 #************************************************************************/
 
@@ -404,20 +404,20 @@ USHORT* SvxNumberFormatTabPage::GetRanges()
 
 
 /*************************************************************************
-#*  Methode:        Create                                  Datum:02.10.97
+#*	Methode:		Create									Datum:02.10.97
 #*------------------------------------------------------------------------
 #*
-#*  Klasse:     SvxNumberFormatTabPage
+#*  Klasse:		SvxNumberFormatTabPage
 #*
-#*  Funktion:   Erzeugt eine neue Zahlenformat- Seite.
+#*  Funktion:	Erzeugt eine neue Zahlenformat- Seite.
 #*
-#*  Input:      Fenster, SfxItemSet
+#*  Input:		Fenster, SfxItemSet
 #*
-#*  Output:     neue TabPage
+#*	Output:		neue TabPage
 #*
 #************************************************************************/
 
-SfxTabPage* SvxNumberFormatTabPage::Create( Window* pParent,
+SfxTabPage*	SvxNumberFormatTabPage::Create( Window* pParent,
                                             const SfxItemSet& rAttrSet )
 {
     return ( new SvxNumberFormatTabPage( pParent, rAttrSet ) );
@@ -425,34 +425,34 @@ SfxTabPage* SvxNumberFormatTabPage::Create( Window* pParent,
 
 
 /*************************************************************************
-#*  Methode:        Reset                                   Datum:02.10.97
+#*	Methode:		Reset									Datum:02.10.97
 #*------------------------------------------------------------------------
 #*
-#*  Klasse:     SvxNumberFormatTabPage
+#*  Klasse:		SvxNumberFormatTabPage
 #*
-#*  Funktion:   Die Attribute des Dialogs werden mit Hilfe
-#*              des Itemsets neu eingestellt.
+#*  Funktion:	Die Attribute des Dialogs werden mit Hilfe
+#*				des Itemsets neu eingestellt.
 #*
-#*  Input:      SfxItemSet
+#*  Input:		SfxItemSet
 #*
-#*  Output:     ---
+#*	Output:		---
 #*
 #************************************************************************/
 
 void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet )
 {
-    const SfxUInt32Item*        pValFmtAttr     = NULL;
-    const SfxPoolItem*          pItem           = NULL;
+    const SfxUInt32Item*		pValFmtAttr		= NULL;
+    const SfxPoolItem*			pItem			= NULL;
     const SfxBoolItem*          pAutoEntryAttr = NULL;
 
-    USHORT                      nCatLbSelPos    = 0;
-    USHORT                      nFmtLbSelPos    = 0;
-    LanguageType                eLangType       = LANGUAGE_DONTKNOW;
-    SvxDelStrgs                 aFmtEntryList;
-    SvxNumberValueType          eValType        = SVX_VALUE_TYPE_UNDEFINED;
-    double                      nValDouble      = 0;
-    String                      aValString;
-    SfxItemState                eState          = SFX_ITEM_DONTCARE;
+    USHORT						nCatLbSelPos	= 0;
+    USHORT						nFmtLbSelPos	= 0;
+    LanguageType				eLangType		= LANGUAGE_DONTKNOW;
+    SvxDelStrgs					aFmtEntryList;
+    SvxNumberValueType			eValType		= SVX_VALUE_TYPE_UNDEFINED;
+    double						nValDouble		= 0;
+    String						aValString;
+    SfxItemState				eState			= SFX_ITEM_DONTCARE;
 
 
     eState = rSet.GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_NOLANGUAGE ),TRUE,&pItem);
@@ -546,7 +546,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet )
             aValString = pNumItem->GetValueString();
             break;
         case SVX_VALUE_TYPE_NUMBER:
-            //  #50441# string may be set in addition to the value
+            //	#50441# string may be set in addition to the value
             aValString = pNumItem->GetValueString();
             nValDouble = pNumItem->GetValueDouble();
             break;
@@ -558,11 +558,11 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet )
     // nun sind alle Informationen fuer die Formatierer-Shell beisammen:
 
     if ( pNumFmtShell )
-         delete pNumFmtShell;   // ggF. alte Shell loeschen (==Reset)
+         delete pNumFmtShell;	// ggF. alte Shell loeschen (==Reset)
 
-    nInitFormat = ( pValFmtAttr )               // Init-Key merken
-                    ? pValFmtAttr->GetValue()   // (fuer FillItemSet())
-                    : ULONG_MAX;                // == DONT_KNOW
+    nInitFormat = ( pValFmtAttr )				// Init-Key merken
+                    ? pValFmtAttr->GetValue()	// (fuer FillItemSet())
+                    : ULONG_MAX;				// == DONT_KNOW
 
 
     if ( eValType == SVX_VALUE_TYPE_STRING )
@@ -621,13 +621,13 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet )
 //! This spoils everything because it rematches currency formats based on
 //! the selected aLbCurrency entry instead of the current format.
 //! Besides that everything seems to be initialized by now, so why call it?
-//  SelFormatHdl_Impl( &aLbCategory );
+//	SelFormatHdl_Impl( &aLbCategory );
 
     if ( pValFmtAttr )
     {
         EditHdl_Impl( &aEdFormat ); // UpdateOptions_Impl() als Seiteneffekt
     }
-    else    // DONT_KNOW
+    else	// DONT_KNOW
     {
         // Kategoriewechsel und direkte Eingabe sind moeglich, sonst nix:
         Obstructing();
@@ -643,50 +643,50 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet )
 }
 
 /*************************************************************************
-#*  Methode:        Obstructing                             Datum:02.10.97
+#*	Methode:		Obstructing								Datum:02.10.97
 #*------------------------------------------------------------------------
 #*
-#*  Klasse:     SvxNumberFormatTabPage
+#*  Klasse:		SvxNumberFormatTabPage
 #*
-#*  Funktion:   Sperren der Controls mit Ausnahme von Kategoriewechsel
-#*              und direkter Eingabe.
+#*  Funktion:	Sperren der Controls mit Ausnahme von Kategoriewechsel
+#*				und direkter Eingabe.
 #*
-#*  Input:      ---
+#*  Input:		---
 #*
-#*  Output:     ---
+#*	Output:		---
 #*
 #************************************************************************/
 void SvxNumberFormatTabPage::Obstructing()
 {
-    aLbFormat       .SetNoSelection();
-    aLbLanguage     .SetNoSelection();
-    aFtLanguage     .Disable();
-    aLbLanguage     .Disable();
+    aLbFormat		.SetNoSelection();
+    aLbLanguage		.SetNoSelection();
+    aFtLanguage		.Disable();
+    aLbLanguage		.Disable();
 
     aIbAdd.Enable(FALSE );
     aIbRemove.Enable(FALSE );
     aIbInfo.Enable(FALSE );
 
-    aBtnNegRed      .Disable();
-    aBtnThousand    .Disable();
-    aFtLeadZeroes   .Disable();
-    aFtDecimals     .Disable();
-    aEdLeadZeroes   .Disable();
-    aEdDecimals     .Disable();
-    aFlOptions      .Disable();
-    aEdDecimals     .SetText( String() );
-    aEdLeadZeroes   .SetText( String() );
-    aBtnNegRed      .Check( FALSE );
-    aBtnThousand    .Check( FALSE );
+    aBtnNegRed		.Disable();
+    aBtnThousand	.Disable();
+    aFtLeadZeroes	.Disable();
+    aFtDecimals		.Disable();
+    aEdLeadZeroes	.Disable();
+    aEdDecimals		.Disable();
+    aFlOptions		.Disable();
+    aEdDecimals		.SetText( String() );
+    aEdLeadZeroes	.SetText( String() );
+    aBtnNegRed		.Check( FALSE );
+    aBtnThousand	.Check( FALSE );
     aWndPreview     .NotifyChange( String() );
 
-    aLbCategory     .SelectEntryPos( 0 );
-    aEdFormat       .SetText( String() );
-    aFtComment      .SetText( String() );
-    aEdComment      .SetText(aLbCategory.GetEntry(1));  //String fuer Benutzerdefiniert
+    aLbCategory		.SelectEntryPos( 0 );
+    aEdFormat		.SetText( String() );
+    aFtComment		.SetText( String() );
+    aEdComment		.SetText(aLbCategory.GetEntry(1));	//String fuer Benutzerdefiniert
                                                         //holen
 
-    aEdFormat       .GrabFocus();
+    aEdFormat		.GrabFocus();
 }
 
 
@@ -725,16 +725,16 @@ void SvxNumberFormatTabPage::EnableBySourceFormat_Impl()
 
 
 /*************************************************************************
-#*  Methode:    HideLanguage                                Datum:14.05.98
+#*	Methode:	HideLanguage								Datum:14.05.98
 #*------------------------------------------------------------------------
 #*
-#*  Klasse:     SvxNumberFormatTabPage
+#*  Klasse:		SvxNumberFormatTabPage
 #*
-#*  Funktion:   Versteckt die Spracheinstellung:
+#*  Funktion:	Versteckt die Spracheinstellung:
 #*
-#*  Input:      BOOL nFlag
+#*  Input:		BOOL nFlag
 #*
-#*  Output:     ---
+#*	Output:		---
 #*
 #************************************************************************/
 
@@ -758,18 +758,18 @@ void SvxNumberFormatTabPage::HideLanguage(BOOL nFlag)
 }
 
 /*************************************************************************
-#*  Methode:        FillItemSet                             Datum:02.10.97
+#*	Methode:		FillItemSet								Datum:02.10.97
 #*------------------------------------------------------------------------
 #*
-#*  Klasse:     SvxNumberFormatTabPage
+#*  Klasse:		SvxNumberFormatTabPage
 #*
-#*  Funktion:   Stellt die Attribute im ItemSet ein,
-#*              sowie in der DocShell den numItem, wenn
-#*              bNumItemFlag nicht gesetzt ist.
+#*  Funktion:	Stellt die Attribute im ItemSet ein,
+#*				sowie in der DocShell den numItem, wenn
+#*				bNumItemFlag nicht gesetzt ist.
 #*
-#*  Input:      SfxItemSet
+#*  Input:		SfxItemSet
 #*
-#*  Output:     ---
+#*	Output:		---
 #*
 #************************************************************************/
 
@@ -779,12 +779,12 @@ BOOL SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
     if ( bDataChanged )
     {
         const SfxItemSet& rMyItemSet = GetItemSet();
-        USHORT          nWhich       = GetWhich( SID_ATTR_NUMBERFORMAT_VALUE );
+        USHORT			nWhich		 = GetWhich( SID_ATTR_NUMBERFORMAT_VALUE );
         SfxItemState    eItemState   = rMyItemSet.GetItemState( nWhich, FALSE );
 
         // OK chosen - Is format code input entered already taken over?
         // If not, simulate Add. Upon syntax error ignore input and prevent Put.
-        String      aFormat = aEdFormat.GetText();
+        String		aFormat	= aEdFormat.GetText();
         sal_uInt32 nCurKey = pNumFmtShell->GetCurNumFmtKey();
 
         if ( aIbAdd.IsEnabled() || pNumFmtShell->IsTmpCurrencyFormat(aFormat) )
@@ -824,7 +824,7 @@ BOOL SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
 
         if ( nDelCount > 0 )
         {
-            sal_uInt32*         pDelArr = new sal_uInt32[nDelCount];
+            sal_uInt32*			pDelArr = new sal_uInt32[nDelCount];
 
             pNumFmtShell->GetUpdateData( pDelArr, nDelCount );
             pNumItem->SetDelFormatArray( pDelArr, nDelCount );
@@ -835,7 +835,7 @@ BOOL SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
             }
             else
             {
-                SfxObjectShell* pDocSh  = SfxObjectShell::Current();
+                SfxObjectShell*	pDocSh  = SfxObjectShell::Current();
 
                 DBG_ASSERT( pDocSh, "DocShell not found!" );
 
@@ -881,7 +881,7 @@ int SvxNumberFormatTabPage::DeactivatePage( SfxItemSet* _pSet )
     {
         const ULONG  nCurKey    = pNumFmtShell->GetCurNumFmtKey();
         const USHORT nWhich     = GetWhich( SID_ATTR_NUMBERFORMAT_VALUE );
-        SfxItemState eItemState = GetItemSet().GetItemState( nWhich, FALSE );
+        SfxItemState eItemState	= GetItemSet().GetItemState( nWhich, FALSE );
 
         if ( (nInitFormat == nCurKey) && (SFX_ITEM_DEFAULT == eItemState) )
             _pSet->ClearItem( nWhich );
@@ -904,13 +904,13 @@ void SvxNumberFormatTabPage::SetInfoItem( const SvxNumberInfoItem& rItem )
 
 void SvxNumberFormatTabPage::FillFormatListBox_Impl( SvxDelStrgs& rEntries )
 {
-    String*     pEntry;
-    String      aTmpString;
-    String      aTmpCatString;
-    Font        aFont=aLbCategory.GetFont();
-    USHORT      i = 0;
-    short       nTmpCatPos;
-    short       aPrivCat;
+    String*		pEntry;
+    String		aTmpString;
+    String		aTmpCatString;
+    Font		aFont=aLbCategory.GetFont();
+    USHORT		i = 0;
+    short		nTmpCatPos;
+    short		aPrivCat;
 
     aLbFormat.Clear();
     aLbFormat.SetUpdateMode( FALSE );
@@ -932,7 +932,7 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl( SvxDelStrgs& rEntries )
     {
         case CAT_ALL:
         case CAT_TEXT:
-        case CAT_NUMBER:        i=1;
+        case CAT_NUMBER:		i=1;
                                 pEntry=rEntries[0];
                                 if(pEntry!=NULL)
                                 {
@@ -945,7 +945,7 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl( SvxDelStrgs& rEntries )
                                 }
                                 break;
 
-        default:                break;
+        default:				break;
     }
 
     if(pNumFmtShell!=NULL)
@@ -973,16 +973,16 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl( SvxDelStrgs& rEntries )
 
 
 /*************************************************************************
-#*  Methode:        DeleteEntryList_Impl                    Datum:02.10.97
+#*	Methode:		DeleteEntryList_Impl					Datum:02.10.97
 #*------------------------------------------------------------------------
 #*
-#*  Klasse:     SvxNumberFormatTabPage
+#*  Klasse:		SvxNumberFormatTabPage
 #*
-#*  Funktion:   Loescht eine SvStrings- Liste
+#*  Funktion:	Loescht eine SvStrings- Liste
 #*
-#*  Input:      String-liste
+#*  Input:		String-liste
 #*
-#*  Output:     ---
+#*	Output:		---
 #*
 #************************************************************************/
 
@@ -994,32 +994,32 @@ void SvxNumberFormatTabPage::DeleteEntryList_Impl( SvxDelStrgs& rEntries )
 
 
 /*************************************************************************
-#*  Methode:        UpdateOptions_Impl                      Datum:02.10.97
+#*	Methode:		UpdateOptions_Impl						Datum:02.10.97
 #*------------------------------------------------------------------------
 #*
-#*  Klasse:     SvxNumberFormatTabPage
+#*  Klasse:		SvxNumberFormatTabPage
 #*
-#*  Funktion:   Stellt je nach eingestelltem Format die Options-
-#*              attribute neu ein.
+#*  Funktion:	Stellt je nach eingestelltem Format die Options-
+#*				attribute neu ein.
 #*
-#*  Input:      Flag, ob sich die Kategorie geaendert hat.
+#*  Input:		Flag, ob sich die Kategorie geaendert hat.
 #*
-#*  Output:     ---
+#*	Output:		---
 #*
 #***?********************************************************************/
 
 void SvxNumberFormatTabPage::UpdateOptions_Impl( BOOL bCheckCatChange /*= FALSE*/ )
 {
-    SvxDelStrgs aEntryList;
-    String  theFormat           = aEdFormat.GetText();
-    USHORT  nCurCategory        = aLbCategory.GetSelectEntryPos();
-    USHORT  nCategory           = nCurCategory;
-    USHORT  nDecimals           = 0;
-    USHORT  nZeroes             = 0;
-    BOOL    bNegRed             = FALSE;
-    BOOL    bThousand           = FALSE;
-    short   nTmpCatPos;
-    USHORT  nCurrencyPos        =aLbCurrency.GetSelectEntryPos();
+    SvxDelStrgs	aEntryList;
+    String	theFormat			= aEdFormat.GetText();
+    USHORT	nCurCategory		= aLbCategory.GetSelectEntryPos();
+    USHORT  nCategory			= nCurCategory;
+    USHORT	nDecimals			= 0;
+    USHORT	nZeroes				= 0;
+    BOOL	bNegRed				= FALSE;
+    BOOL	bThousand			= FALSE;
+    short	nTmpCatPos;
+    USHORT	nCurrencyPos		=aLbCurrency.GetSelectEntryPos();
 
     if(bOneAreaFlag)
     {
@@ -1088,12 +1088,12 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( BOOL bCheckCatChange /*= FALSE*
             aBtnNegRed.Enable();
             aBtnThousand.Enable();
             /*
-            aEdDecimals  .SetValue( nDecimals );
+            aEdDecimals	 .SetValue( nDecimals );
             aEdLeadZeroes.SetValue( nZeroes );
             */
-            aEdDecimals  .SetText( UniString::CreateFromInt32( nDecimals ) );
+            aEdDecimals	 .SetText( UniString::CreateFromInt32( nDecimals ) );
             aEdLeadZeroes.SetText( UniString::CreateFromInt32( nZeroes ) );
-            aBtnNegRed   .Check( bNegRed );
+            aBtnNegRed	 .Check( bNegRed );
             aBtnThousand .Check( bThousand );
             break;
 
@@ -1106,46 +1106,46 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( BOOL bCheckCatChange /*= FALSE*
         case CAT_SCIENTIFIC:
         case CAT_FRACTION:
         default:
-            aFlOptions      .Disable();
-            aFtDecimals     .Disable();
-            aEdDecimals     .Disable();
-            aFtLeadZeroes   .Disable();
-            aEdLeadZeroes   .Disable();
-            aBtnNegRed      .Disable();
-            aBtnThousand    .Disable();
-            aEdDecimals     .SetText( UniString::CreateFromInt32( 0 ) );
-            aEdLeadZeroes   .SetText( UniString::CreateFromInt32( 0 ) );
-            aBtnNegRed      .Check( FALSE );
-            aBtnThousand    .Check( FALSE );
+            aFlOptions		.Disable();
+            aFtDecimals		.Disable();
+            aEdDecimals		.Disable();
+            aFtLeadZeroes	.Disable();
+            aEdLeadZeroes	.Disable();
+            aBtnNegRed		.Disable();
+            aBtnThousand	.Disable();
+            aEdDecimals		.SetText( UniString::CreateFromInt32( 0 ) );
+            aEdLeadZeroes	.SetText( UniString::CreateFromInt32( 0 ) );
+            aBtnNegRed		.Check( FALSE );
+            aBtnThousand	.Check( FALSE );
     }
 }
 
 
 /*************************************************************************
-#*  Methode:        UpdateFormatListBox_Impl                Datum:02.10.97
+#*	Methode:		UpdateFormatListBox_Impl				Datum:02.10.97
 #*------------------------------------------------------------------------
 #*
-#*  Klasse:     SvxNumberFormatTabPage
+#*  Klasse:		SvxNumberFormatTabPage
 #*
-#*  Funktion:   Aktualisiert die Format- Listbox und zusaetzlich
-#*              wird abhaengig vom bUpdateEdit- Flag der String
-#*              in der Editbox geaendert.
+#*  Funktion:	Aktualisiert die Format- Listbox und zusaetzlich
+#*				wird abhaengig vom bUpdateEdit- Flag der String
+#*				in der Editbox geaendert.
 #*
-#*  Input:      Flags fuer Kategorie und Editbox
+#*  Input:		Flags fuer Kategorie und Editbox
 #*
-#*  Output:     ---
+#*	Output:		---
 #*
 #************************************************************************/
 
 void SvxNumberFormatTabPage::UpdateFormatListBox_Impl
     (
-        USHORT bCat,        // Category oder Land/Sprache ListBox?
-        BOOL   bUpdateEdit  // Format-Edit aktualisieren?
+        USHORT bCat,		// Category oder Land/Sprache ListBox?
+        BOOL   bUpdateEdit	// Format-Edit aktualisieren?
     )
 {
-    SvxDelStrgs aEntryList;
-    short       nFmtLbSelPos = 0;
-    short       nTmpCatPos;
+    SvxDelStrgs	aEntryList;
+    short		nFmtLbSelPos = 0;
+    short		nTmpCatPos;
 
     if(bOneAreaFlag)
     {
@@ -1253,18 +1253,18 @@ void SvxNumberFormatTabPage::UpdateFormatListBox_Impl
 
 
 /*************************************************************************
-#*  Handle:     DoubleClickHdl_Impl                         Datum:02.10.97
+#*	Handle:		DoubleClickHdl_Impl							Datum:02.10.97
 #*------------------------------------------------------------------------
 #*
-#*  Klasse:     SvxNumberFormatTabPage
+#*  Klasse:		SvxNumberFormatTabPage
 #*
-#*  Funktion:   Bei einem Doppelklick in die Format- Listbox
-#*              wird der Wert uebernommen und der OK-Button
-#*              ausgeloest
+#*  Funktion:	Bei einem Doppelklick in die Format- Listbox
+#*				wird der Wert uebernommen und der OK-Button
+#*				ausgeloest
 #*
-#*  Input:      Pointer auf Listbox
+#*  Input:		Pointer auf Listbox
 #*
-#*  Output:     ---
+#*	Output:		---
 #*
 #************************************************************************/
 
@@ -1291,18 +1291,18 @@ IMPL_LINK( SvxNumberFormatTabPage, DoubleClickHdl_Impl, SvxFontListBox*, pLb )
 
 
 /*************************************************************************
-#*  Methode:    SelFormatHdl_Impl                           Datum:02.10.97
+#*	Methode:	SelFormatHdl_Impl							Datum:02.10.97
 #*------------------------------------------------------------------------
 #*
-#*  Klasse:     SvxNumberFormatTabPage
+#*  Klasse:		SvxNumberFormatTabPage
 #*
-#*  Funktion:   Wird aufgerufen, wenn sich die Sprache, die Kategorie
-#*              oder das Format aendert. Dem entsprechend werden die
-#*              Einstellungen geaendert.
+#*  Funktion:	Wird aufgerufen, wenn sich die Sprache, die Kategorie
+#*				oder das Format aendert. Dem entsprechend werden die
+#*				Einstellungen geaendert.
 #*
-#*  Input:      Pointer auf Listbox
+#*  Input:		Pointer auf Listbox
 #*
-#*  Output:     ---
+#*	Output:		---
 #*
 #************************************************************************/
 
@@ -1330,7 +1330,7 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb )
             pLb = &aLbFormat;   // continue with the current format selected
     }
 
-    short       nTmpCatPos;
+    short		nTmpCatPos;
 
     if(bOneAreaFlag)
     {
@@ -1353,12 +1353,12 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb )
     // Format-ListBox ----------------------------------------------------
     if ( (SvxFontListBox *)pLb == &aLbFormat )
     {
-        USHORT  nSelPos = (USHORT) aLbFormat.GetSelectEntryPos();
-        String  aFormat = aLbFormat.GetSelectEntry();
-        String  aComment;
-        SvxDelStrgs aEntryList;
+        USHORT	nSelPos = (USHORT) aLbFormat.GetSelectEntryPos();
+        String	aFormat	= aLbFormat.GetSelectEntry();
+        String	aComment;
+        SvxDelStrgs	aEntryList;
 
-        short       nFmtLbSelPos = nSelPos;
+        short		nFmtLbSelPos = nSelPos;
 
         aFormat=pNumFmtShell->GetFormat4Entry(nSelPos);
         aComment=pNumFmtShell->GetComment4Entry(nSelPos);
@@ -1431,25 +1431,25 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb )
 
 
 /*************************************************************************
-#*  Methode:    ClickHdl_Impl, ImageButton* pIB             Datum:02.10.97
+#*	Methode:	ClickHdl_Impl, ImageButton* pIB 			Datum:02.10.97
 #*------------------------------------------------------------------------
 #*
-#*  Klasse:     SvxNumberFormatTabPage
+#*  Klasse:		SvxNumberFormatTabPage
 #*
-#*  Funktion:   Wenn, der Hinzufuegen- oder Entfernen- Button
-#*              wird diese Funktion aufgerufen und die Zahlenformat-
-#*              Liste den entsprechend geaendert.
+#*  Funktion:	Wenn, der Hinzufuegen- oder Entfernen- Button
+#*				wird diese Funktion aufgerufen und die Zahlenformat-
+#*				Liste den entsprechend geaendert.
 #*
-#*  Input:      Toolbox- Button
+#*  Input:		Toolbox- Button
 #*
-#*  Output:     ---
+#*	Output:		---
 #*
 #************************************************************************/
 
 IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, ImageButton*, pIB)
 {
-    BOOL        bAdded = FALSE;
-    BOOL        bDeleted = FALSE;
+    BOOL		bAdded = FALSE;
+    BOOL		bDeleted = FALSE;
     ULONG       nReturn = 0;
     const ULONG nReturnChanged  = 0x1;  // THE boolean return value
     const ULONG nReturnAdded    = 0x2;  // temp: format added
@@ -1458,12 +1458,12 @@ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, ImageButton*, pIB)
     if(pIB==&aIbAdd)
     {   // Also called from FillItemSet() if a temporary currency format has
         // to be added, not only if the Add button is enabled.
-        String      aFormat = aEdFormat.GetText();
-        SvxDelStrgs aEntryList;
-        SvxDelStrgs a2EntryList;
-        USHORT      nCatLbSelPos = 0;
-        short       nFmtLbSelPos = SELPOS_NONE;
-        xub_StrLen  nErrPos=0;
+        String		aFormat	= aEdFormat.GetText();
+        SvxDelStrgs	aEntryList;
+        SvxDelStrgs	a2EntryList;
+        USHORT		nCatLbSelPos = 0;
+        short		nFmtLbSelPos = SELPOS_NONE;
+        xub_StrLen	nErrPos=0;
 
         pNumFmtShell->SetCurCurrencyEntry(NULL);
         bAdded = pNumFmtShell->AddFormat( aFormat, nErrPos,
@@ -1504,7 +1504,7 @@ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, ImageButton*, pIB)
                 if ( bAdded && (nFmtLbSelPos != SELPOS_NONE) )
                 {
                     // Alles klar
-                    if(bOneAreaFlag)                  //@@ ???
+                    if(bOneAreaFlag)				  //@@ ???
                         SetCategory(0);
                     else
                         SetCategory(nCatLbSelPos );
@@ -1524,7 +1524,7 @@ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, ImageButton*, pIB)
                     aEdFormat.SetText( aFormat );
 
                     //aEdComment.SetText(String()); //@@ ???
-                    aEdComment.SetText(aLbCategory.GetEntry(1));    //String fuer Benutzerdefiniert
+                    aEdComment.SetText(aLbCategory.GetEntry(1));	//String fuer Benutzerdefiniert
                                                                     //holen
                     ChangePreviewText( (USHORT)nFmtLbSelPos );
                 }
@@ -1540,10 +1540,10 @@ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, ImageButton*, pIB)
     }
     else if(pIB==&aIbRemove)
     {
-        String      aFormat = aEdFormat.GetText();
-        SvxDelStrgs aEntryList;
-        USHORT      nCatLbSelPos = 0;
-        short       nFmtLbSelPos = SELPOS_NONE;
+        String		aFormat	= aEdFormat.GetText();
+        SvxDelStrgs	aEntryList;
+        USHORT		nCatLbSelPos = 0;
+        short		nFmtLbSelPos = SELPOS_NONE;
 
         bDeleted = pNumFmtShell->RemoveFormat( aFormat,
                                                nCatLbSelPos,
@@ -1555,14 +1555,14 @@ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, ImageButton*, pIB)
         {
             if(nFmtLbSelPos>=0 &&  nFmtLbSelPos<aEntryList.Count())
             {
-                aFormat = *aEntryList[nFmtLbSelPos];
+                aFormat	= *aEntryList[nFmtLbSelPos];
             }
 
             FillFormatListBox_Impl( aEntryList );
 
             if ( nFmtLbSelPos != SELPOS_NONE )
             {
-                if(bOneAreaFlag)                  //@@ ???
+                if(bOneAreaFlag)				  //@@ ???
                         SetCategory(0);
                     else
                         SetCategory(nCatLbSelPos );
@@ -1602,17 +1602,17 @@ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, ImageButton*, pIB)
 
 
 /*************************************************************************
-#*  Methode:    EditHdl_Impl                                Datum:02.10.97
+#*	Methode:	EditHdl_Impl								Datum:02.10.97
 #*------------------------------------------------------------------------
 #*
-#*  Klasse:     SvxNumberFormatTabPage
+#*  Klasse:		SvxNumberFormatTabPage
 #*
-#*  Funktion:   Wenn der Eintrag im Eingabefeld geaendert wird,
-#*              so wird die Vorschau aktualisiert und
+#*  Funktion:	Wenn der Eintrag im Eingabefeld geaendert wird,
+#*				so wird die Vorschau aktualisiert und
 #*
-#*  Input:      Pointer auf Editbox
+#*  Input:		Pointer auf Editbox
 #*
-#*  Output:     ---
+#*	Output:		---
 #*
 #************************************************************************/
 
@@ -1676,16 +1676,16 @@ IMPL_LINK( SvxNumberFormatTabPage, EditHdl_Impl, Edit*, pEdFormat )
 
 
 /*************************************************************************
-#*  Methode:        NotifyChange                            Datum:02.10.97
+#*	Methode:		NotifyChange							Datum:02.10.97
 #*------------------------------------------------------------------------
 #*
-#*  Klasse:     SvxNumberFormatTabPage
+#*  Klasse:		SvxNumberFormatTabPage
 #*
-#*  Funktion:   Fuehrt Aenderungen in den Zahlen- Attributen durch.
+#*  Funktion:	Fuehrt Aenderungen in den Zahlen- Attributen durch.
 #*
-#*  Input:      Options- Controls
+#*  Input:		Options- Controls
 #*
-#*  Output:     ---
+#*	Output:		---
 #*
 #************************************************************************/
 
@@ -1696,15 +1696,15 @@ IMPL_LINK( SvxNumberFormatTabPage, OptHdl_Impl, void *, pOptCtrl )
         || ((CheckBox*)    pOptCtrl == &aBtnNegRed)
         || ((CheckBox*)    pOptCtrl == &aBtnThousand) )
     {
-        String        aFormat;
-        BOOL          bThousand     =    aBtnThousand.IsEnabled()
+        String		  aFormat;
+        BOOL		  bThousand 	=    aBtnThousand.IsEnabled()
                                       && aBtnThousand.IsChecked();
-        BOOL          bNegRed       =    aBtnNegRed.IsEnabled()
+        BOOL		  bNegRed		=    aBtnNegRed.IsEnabled()
                                       && aBtnNegRed.IsChecked();
-        USHORT        nPrecision    = (aEdDecimals.IsEnabled())
+        USHORT		  nPrecision	= (aEdDecimals.IsEnabled())
                                         ? (USHORT)aEdDecimals.GetValue()
                                         : (USHORT)0;
-        USHORT        nLeadZeroes   = (aEdLeadZeroes.IsEnabled())
+        USHORT		  nLeadZeroes	= (aEdLeadZeroes.IsEnabled())
                                         ? (USHORT)aEdLeadZeroes.GetValue()
                                         : (USHORT)0;
 
@@ -1743,16 +1743,16 @@ IMPL_LINK( SvxNumberFormatTabPage, TimeHdl_Impl, Timer*, EMPTYARG)
 
 
 /*************************************************************************
-#*  Methode:    LostFocusHdl_Impl                           Datum:30.10.97
+#*	Methode:	LostFocusHdl_Impl							Datum:30.10.97
 #*------------------------------------------------------------------------
 #*
-#*  Klasse:     SvxNumberFormatTabPage
+#*  Klasse:		SvxNumberFormatTabPage
 #*
-#*  Funktion:   Fuehrt Aenderungen in den Zahlen- Attributen durch.
+#*  Funktion:	Fuehrt Aenderungen in den Zahlen- Attributen durch.
 #*
-#*  Input:      Options- Controls
+#*  Input:		Options- Controls
 #*
-#*  Output:     ---
+#*	Output:		---
 #*
 #************************************************************************/
 
@@ -1766,10 +1766,10 @@ IMPL_LINK( SvxNumberFormatTabPage, LostFocusHdl_Impl, Edit *, pEd)
         aFtComment.Show();
         if(!aIbAdd.IsEnabled())
         {
-            USHORT  nSelPos = (USHORT) aLbFormat.GetSelectEntryPos();
+            USHORT	nSelPos = (USHORT) aLbFormat.GetSelectEntryPos();
             pNumFmtShell->SetComment4Entry(nSelPos,
                                         aEdComment.GetText());
-            aEdComment.SetText(aLbCategory.GetEntry(1));    //String fuer Benutzerdefiniert
+            aEdComment.SetText(aLbCategory.GetEntry(1));	//String fuer Benutzerdefiniert
                                                             //holen
         }
     }
@@ -1777,16 +1777,16 @@ IMPL_LINK( SvxNumberFormatTabPage, LostFocusHdl_Impl, Edit *, pEd)
 }
 
 /*************************************************************************
-#*  Methode:        NotifyChange                            Datum:02.10.97
+#*	Methode:		NotifyChange							Datum:02.10.97
 #*------------------------------------------------------------------------
 #*
-#*  Klasse:     SvxNumberFormatTabPage
+#*  Klasse:		SvxNumberFormatTabPage
 #*
-#*  Funktion:   Fuehrt Aenderungen in den Zahlen- Attributen durch.
+#*  Funktion:	Fuehrt Aenderungen in den Zahlen- Attributen durch.
 #*
-#*  Input:      Options- Controls
+#*  Input:		Options- Controls
 #*
-#*  Output:     ---
+#*	Output:		---
 #*
 #************************************************************************/
 
@@ -1796,24 +1796,24 @@ String SvxNumberFormatTabPage::GetExpColorString(
     double nVal = 0;
     switch (nTmpCatPos)
     {
-        case CAT_CURRENCY:      nVal=SVX_NUMVAL_CURRENCY; break;
+        case CAT_CURRENCY:		nVal=SVX_NUMVAL_CURRENCY; break;
 
         case CAT_SCIENTIFIC:
         case CAT_FRACTION:
-        case CAT_NUMBER:        nVal=SVX_NUMVAL_STANDARD; break;
+        case CAT_NUMBER:		nVal=SVX_NUMVAL_STANDARD; break;
 
-        case CAT_PERCENT:       nVal=SVX_NUMVAL_PERCENT; break;
+        case CAT_PERCENT:		nVal=SVX_NUMVAL_PERCENT; break;
 
-        case CAT_ALL:           nVal=SVX_NUMVAL_STANDARD; break;
+        case CAT_ALL:			nVal=SVX_NUMVAL_STANDARD; break;
 
-        case CAT_TIME:          nVal=SVX_NUMVAL_TIME; break;
-        case CAT_DATE:          nVal=SVX_NUMVAL_DATE; break;
+        case CAT_TIME:			nVal=SVX_NUMVAL_TIME; break;
+        case CAT_DATE:			nVal=SVX_NUMVAL_DATE; break;
 
-        case CAT_BOOLEAN:       nVal=SVX_NUMVAL_BOOLEAN; break;
+        case CAT_BOOLEAN:		nVal=SVX_NUMVAL_BOOLEAN; break;
 
         case CAT_USERDEFINED:
         case CAT_TEXT:
-        default:                nVal=0;break;
+        default:				nVal=0;break;
     }
 
     String aPreviewString;
@@ -1854,16 +1854,16 @@ long SvxNumberFormatTabPage::PreNotify( NotifyEvent& rNEvt )
     return SfxTabPage::PreNotify( rNEvt );
 }
 /*************************************************************************
-#*  Methode:    SetOkHdl                                    Datum:01.11.97
+#*	Methode:	SetOkHdl									Datum:01.11.97
 #*------------------------------------------------------------------------
 #*
-#*  Klasse:     SvxNumberFormatTabPage
+#*  Klasse:		SvxNumberFormatTabPage
 #*
-#*  Funktion:   Setzt den OkHandler neu.
+#*  Funktion:	Setzt den OkHandler neu.
 #*
-#*  Input:      Neuer OkHandler
+#*  Input:		Neuer OkHandler
 #*
-#*  Output:     ---
+#*	Output:		---
 #*
 #************************************************************************/
 
@@ -1874,11 +1874,11 @@ void SvxNumberFormatTabPage::SetOkHdl( const Link& rOkHandler )
 
 void SvxNumberFormatTabPage::FillCurrencyBox()
 {
-    SvStringsDtor   aList;
+    SvStringsDtor	aList;
     NfShCurrencyEntries rEntries;
-    XubString*      pEntry = NULL;
-    USHORT  nPos=0;
-    USHORT  nSelPos=0;
+    XubString*		pEntry = NULL;
+    USHORT	nPos=0;
+    USHORT	nSelPos=0;
 
     pNumFmtShell->GetCurrencySymbols( aList, &nSelPos);
 
@@ -1892,7 +1892,7 @@ void SvxNumberFormatTabPage::FillCurrencyBox()
 
 void SvxNumberFormatTabPage::SetCategory(USHORT nPos)
 {
-    USHORT  nCurCategory = aLbCategory.GetSelectEntryPos();
+    USHORT	nCurCategory = aLbCategory.GetSelectEntryPos();
     Point aPos=aLbFormat.GetPosPixel();
     Size  aSize=aLbFormat.GetSizePixel();
     USHORT nTmpCatPos;
diff --git a/cui/source/tabpages/numfmt.hrc b/cui/source/tabpages/numfmt.hrc
index f863a303c800..5e549c18e994 100644
--- a/cui/source/tabpages/numfmt.hrc
+++ b/cui/source/tabpages/numfmt.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,44 +31,44 @@
 
 //================================================
 // Zahlen-TabPage:
-#define WND_NUMBER_PREVIEW      2
-#define FT_CATEGORY             3
-#define FT_FORMAT               4
-#define FT_OPTIONS              5
-#define FT_EDFORMAT             6
-#define LB_CATEGORY             9
-#define LB_FORMAT               10
+#define WND_NUMBER_PREVIEW		2
+#define FT_CATEGORY				3
+#define FT_FORMAT				4
+#define FT_OPTIONS				5
+#define FT_EDFORMAT				6
+#define LB_CATEGORY				9
+#define LB_FORMAT				10
 #define FL_OPTIONS              11
-#define FT_LANGUAGE             12
-#define LB_LANGUAGE             13
-#define ED_FORMAT               14
-#define BTN_ADD                 15
-#define BTN_REMOVE              16
-#define BMP_CHECK               17
-#define BMP_DCHECK              18
-#define BMP_CROSS               19
-#define BMP_DCROSS              20
-#define FT_DECIMALS             21
-#define ED_DECIMALS             22
-#define FT_LEADZEROES           23
-#define ED_LEADZEROES           24
-#define BTN_NEGRED              25
-#define BTN_THOUSAND            26
-#define FT_COMMENT              27
-#define ED_COMMENT              28
-#define IB_ADD                  29
-#define IB_REMOVE               30
-#define IB_INFO                 31
-#define IL_ICON                 32
-#define LB_CURRENCY             33
+#define FT_LANGUAGE				12
+#define LB_LANGUAGE				13
+#define ED_FORMAT				14
+#define BTN_ADD					15
+#define BTN_REMOVE				16
+#define BMP_CHECK				17
+#define BMP_DCHECK				18
+#define BMP_CROSS				19
+#define BMP_DCROSS				20
+#define FT_DECIMALS				21
+#define ED_DECIMALS				22
+#define FT_LEADZEROES			23
+#define ED_LEADZEROES			24
+#define BTN_NEGRED				25
+#define BTN_THOUSAND			26
+#define FT_COMMENT				27
+#define ED_COMMENT				28
+#define IB_ADD					29
+#define IB_REMOVE				30
+#define IB_INFO					31
+#define	IL_ICON					32
+#define	LB_CURRENCY				33
 #define CB_SOURCEFORMAT         34
-#define IL_ICON_HC              35
+#define IL_ICON_HC				35
 #define STR_AUTO_ENTRY          36
 
-#define TBX_ADDREMOVE           1
-#define IID_ADD                 1
-#define IID_REMOVE              2
-#define IID_INFO                3
+#define TBX_ADDREMOVE			1
+#define IID_ADD					1
+#define IID_REMOVE				2
+#define IID_INFO				3
 
 #endif
 
diff --git a/cui/source/tabpages/numfmt.src b/cui/source/tabpages/numfmt.src
index 2538b196932c..78074755ed4a 100644
--- a/cui/source/tabpages/numfmt.src
+++ b/cui/source/tabpages/numfmt.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 0a1e02b78a9e..582f34b6982c 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -97,20 +97,20 @@ SV_IMPL_PTRARR(SvxNumSettingsArr_Impl,SvxNumSettings_ImplPtr);
 /*-----------------07.02.97 15.37-------------------
 
 --------------------------------------------------*/
-#define NUM_PAGETYPE_BULLET         0
+#define NUM_PAGETYPE_BULLET			0
 #define NUM_PAGETYPE_SINGLENUM      1
 #define NUM_PAGETYPE_NUM            2
 #define NUM_PAGETYPE_BMP            3
 #define PAGETYPE_USER_START         10
 
-#define SHOW_NUMBERING              0
-#define SHOW_BULLET                 1
-#define SHOW_BITMAP                 2
+#define SHOW_NUMBERING				0
+#define SHOW_BULLET					1
+#define SHOW_BITMAP					2
 
-#define MAX_BMP_WIDTH               16
-#define MAX_BMP_HEIGHT              16
+#define MAX_BMP_WIDTH				16
+#define MAX_BMP_HEIGHT				16
 
-static BOOL bLastRelative =         FALSE;
+static BOOL bLastRelative =			FALSE;
 static const sal_Char cNumberingType[] = "NumberingType";
 static const sal_Char cValue[] = "Value";
 static const sal_Char cParentNumbering[] = "ParentNumbering";
@@ -228,10 +228,10 @@ Font& lcl_GetDefaultBulletFont()
 
 
 SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(Window* pParent,
-                               const SfxItemSet& rSet)  :
+                               const SfxItemSet& rSet)	:
     SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_PICK_SINGLE_NUM ), rSet ),
     aValuesFL(      this, CUI_RES(FL_VALUES) ),
-    pExamplesVS(    new SvxNumValueSet(this, CUI_RES(VS_VALUES), NUM_PAGETYPE_SINGLENUM )),
+    pExamplesVS(	new SvxNumValueSet(this, CUI_RES(VS_VALUES), NUM_PAGETYPE_SINGLENUM )),
     pActNum(0),
     pSaveNum(0),
     nActNumLvl( USHRT_MAX ),
@@ -289,7 +289,7 @@ SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(Window* pParent,
 
 --------------------------------------------------*/
 
-SfxTabPage*  SvxSingleNumPickTabPage::Create( Window* pParent,
+SfxTabPage*	 SvxSingleNumPickTabPage::Create( Window* pParent,
                                 const SfxItemSet& rAttrSet)
 {
     return new SvxSingleNumPickTabPage(pParent, rAttrSet);
@@ -370,7 +370,7 @@ int  SvxSingleNumPickTabPage::DeactivatePage(SfxItemSet *_pSet)
 void  SvxSingleNumPickTabPage::Reset( const SfxItemSet& rSet )
 {
     const SfxPoolItem* pItem;
-//  nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel();
+//	nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel();
     //im Draw gibt es das Item als WhichId, im Writer nur als SlotId
     SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, FALSE, &pItem);
     if(eState != SFX_ITEM_SET)
@@ -457,10 +457,10 @@ IMPL_LINK(SvxSingleNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG)
 
 
 SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent,
-                               const SfxItemSet& rSet)  :
+                               const SfxItemSet& rSet)	:
     SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_PICK_BULLET ), rSet ),
     aValuesFL(      this, CUI_RES(FL_VALUES) ),
-    pExamplesVS(    new SvxNumValueSet(this, CUI_RES(VS_VALUES), NUM_PAGETYPE_BULLET )),
+    pExamplesVS(	new SvxNumValueSet(this, CUI_RES(VS_VALUES), NUM_PAGETYPE_BULLET )),
     pActNum(0),
     pSaveNum(0),
     nActNumLvl( USHRT_MAX ),
@@ -491,7 +491,7 @@ SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent,
 --------------------------------------------------*/
 
 
-SfxTabPage*  SvxBulletPickTabPage::Create( Window* pParent,
+SfxTabPage*	 SvxBulletPickTabPage::Create( Window* pParent,
                                 const SfxItemSet& rAttrSet)
 {
     return new SvxBulletPickTabPage(pParent, rAttrSet);
@@ -586,7 +586,7 @@ void  SvxBulletPickTabPage::Reset( const SfxItemSet& rSet )
     delete pSaveNum;
     pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
 
-//  nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel();
+//	nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel();
 
     if(!pActNum)
         pActNum = new  SvxNumRule(*pSaveNum);
@@ -640,7 +640,7 @@ IMPL_LINK(SvxBulletPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG)
 void SvxBulletPickTabPage::PageCreated(SfxAllItemSet aSet)
 {
 
-    SFX_ITEMSET_ARG (&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,sal_False);
+    SFX_ITEMSET_ARG	(&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,sal_False);
 
     if (pBulletCharFmt)
         SetCharFmtName( pBulletCharFmt->GetValue());
@@ -658,7 +658,7 @@ SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent,
                                const SfxItemSet& rSet) :
     SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_PICK_NUM ), rSet ),
     aValuesFL(      this, CUI_RES(FL_VALUES) ),
-    pExamplesVS(    new SvxNumValueSet(this, CUI_RES(VS_VALUES), NUM_PAGETYPE_NUM )),
+    pExamplesVS(	new SvxNumValueSet(this, CUI_RES(VS_VALUES), NUM_PAGETYPE_NUM )),
     pActNum(0),
     pSaveNum(0),
     nActNumLvl( USHRT_MAX ),
@@ -726,7 +726,7 @@ SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent,
 --------------------------------------------------*/
 
 
-SfxTabPage*  SvxNumPickTabPage::Create( Window* pParent,
+SfxTabPage*	 SvxNumPickTabPage::Create( Window* pParent,
                                 const SfxItemSet& rAttrSet)
 {
     return new SvxNumPickTabPage(pParent, rAttrSet);
@@ -821,7 +821,7 @@ void  SvxNumPickTabPage::Reset( const SfxItemSet& rSet )
     delete pSaveNum;
     pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
 
-//  nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel();
+//	nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel();
     if(!pActNum)
         pActNum = new  SvxNumRule(*pSaveNum);
     else if(*pSaveNum != *pActNum)
@@ -925,8 +925,8 @@ IMPL_LINK(SvxNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG)
 
 void SvxNumPickTabPage::PageCreated(SfxAllItemSet aSet)
 {
-    SFX_ITEMSET_ARG (&aSet,pNumCharFmt,SfxStringItem,SID_NUM_CHAR_FMT,sal_False);
-    SFX_ITEMSET_ARG (&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,sal_False);
+    SFX_ITEMSET_ARG	(&aSet,pNumCharFmt,SfxStringItem,SID_NUM_CHAR_FMT,sal_False);
+    SFX_ITEMSET_ARG	(&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,sal_False);
 
 
     if (pNumCharFmt &&pBulletCharFmt)
@@ -963,8 +963,8 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent,
     SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_PICK_BMP ), rSet ),
     aValuesFL(      this, CUI_RES(FL_VALUES) ),
     pExamplesVS(    new SvxBmpNumValueSet(this, CUI_RES(VS_VALUES)/*, aGrfNames*/ )),
-    aErrorText(     this, CUI_RES(FT_ERROR)),
-    aLinkedCB(      this, CUI_RES(CB_LINKED)),
+    aErrorText(		this, CUI_RES(FT_ERROR)),
+    aLinkedCB(		this, CUI_RES(CB_LINKED)),
     pActNum(0),
     pSaveNum(0),
     nActNumLvl( USHRT_MAX ),
@@ -1025,7 +1025,7 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent,
 
 --------------------------------------------------*/
 
-SfxTabPage*  SvxBitmapPickTabPage::Create( Window* pParent,
+SfxTabPage*	 SvxBitmapPickTabPage::Create( Window* pParent,
                                 const SfxItemSet& rAttrSet)
 {
     return new SvxBitmapPickTabPage(pParent, rAttrSet);
@@ -1040,7 +1040,7 @@ void  SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet)
     const SfxPoolItem* pItem;
     bPreset = FALSE;
     BOOL bIsPreset = FALSE;
-//  nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel();
+//	nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel();
     const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet();
     if(pExampleSet)
     {
@@ -1089,7 +1089,7 @@ BOOL  SvxBitmapPickTabPage::FillItemSet( SfxItemSet& rSet )
     if ( !aGrfNames.Count() )
     {
 // das ist im SfxItemSet leider nicht zulaessig #52134#
-//      rSet.DisableItem(SID_ATTR_NUMBERING_RULE);
+//		rSet.DisableItem(SID_ATTR_NUMBERING_RULE);
         return FALSE;
     }
     if( (bPreset || bModified) && pActNum)
@@ -1235,13 +1235,13 @@ IMPL_LINK(SvxBitmapPickTabPage, LinkBmpHdl_Impl, CheckBox*, EMPTYARG )
 //CHINA001 aFormatTimer.Stop();
 //CHINA001 }
 //CHINA001
-//CHINA001 void     SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
+//CHINA001 void		SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
 //CHINA001 {
 //CHINA001 SvxNumValueSet::UserDraw(rUDEvt);
 //CHINA001
 //CHINA001 Rectangle aRect = rUDEvt.GetRect();
 //CHINA001 OutputDevice*  pDev = rUDEvt.GetDevice();
-//CHINA001 USHORT   nItemId = rUDEvt.GetItemId();
+//CHINA001 USHORT	nItemId = rUDEvt.GetItemId();
 //CHINA001 Point aBLPos = aRect.TopLeft();
 //CHINA001
 //CHINA001 int nRectHeight = aRect.GetHeight();
@@ -1252,8 +1252,8 @@ IMPL_LINK(SvxBitmapPickTabPage, LinkBmpHdl_Impl, CheckBox*, EMPTYARG )
 //CHINA001 &aGraphic, NULL))
 //CHINA001 {
 //CHINA001 bGrfNotFound = TRUE;
-//CHINA001  }
-//CHINA001  else
+//CHINA001	}
+//CHINA001	else
 //CHINA001 {
 //CHINA001 Point aPos(aBLPos.X() + 5, 0);
 //CHINA001 for( USHORT i = 0; i < 3; i++ )
@@ -1261,8 +1261,8 @@ IMPL_LINK(SvxBitmapPickTabPage, LinkBmpHdl_Impl, CheckBox*, EMPTYARG )
 //CHINA001 USHORT nY = 11 + i * 33;
 //CHINA001 aPos.Y() = aBLPos.Y() + nRectHeight  * nY / 100;
 //CHINA001 aGraphic.Draw( pDev, aPos, aSize );
-//CHINA001      }
-//CHINA001  }
+//CHINA001		}
+//CHINA001	}
 //CHINA001 }
 //CHINA001
 //CHINA001 IMPL_LINK(SvxBmpNumValueSet, FormatHdl_Impl, Timer*, EMPTYARG)
@@ -1272,7 +1272,7 @@ IMPL_LINK(SvxBitmapPickTabPage, LinkBmpHdl_Impl, CheckBox*, EMPTYARG )
 //CHINA001 {
 //CHINA001 bGrfNotFound = FALSE;
 //CHINA001 Format();
-//CHINA001  }
+//CHINA001	}
 //CHINA001 Invalidate();
 //CHINA001 return 0;
 //CHINA001 }
@@ -1286,38 +1286,38 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent,
 
     aFormatFL(      this, CUI_RES(FL_FORMAT   )),
     aLevelFT(       this, CUI_RES(FT_LEVEL    )),
-    aLevelLB(       this, CUI_RES(LB_LEVEL  )),
-    aFmtFT(         this, CUI_RES(FT_FMT        )),
-    aFmtLB(         this, CUI_RES(LB_FMT        )),
-    aPrefixFT(      this, CUI_RES(FT_PREFIX )),
-    aPrefixED(      this, CUI_RES(ED_PREFIX )),
-    aSuffixFT(      this, CUI_RES(FT_SUFFIX )),
-    aSuffixED(      this, CUI_RES(ED_SUFFIX )),
-    aCharFmtFT(     this, CUI_RES(FT_CHARFMT    )),
-    aCharFmtLB(     this, CUI_RES(LB_CHARFMT    )),
-    aBulColorFT(    this, CUI_RES(FT_BUL_COLOR)),
-    aBulColLB(      this, CUI_RES(LB_BUL_COLOR)),
-    aBulRelSizeFT(  this, CUI_RES(FT_BUL_REL_SIZE)),
-    aBulRelSizeMF(  this, CUI_RES(MF_BUL_REL_SIZE)),
-    aAllLevelFT(    this, CUI_RES(FT_ALL_LEVEL)),
-    aAllLevelNF(    this, CUI_RES(NF_ALL_LEVEL)),
-    aStartFT(       this, CUI_RES(FT_START  )),
-    aStartED(       this, CUI_RES(ED_START  )),
-    aBulletPB(      this, CUI_RES(PB_BULLET )),
-    aAlignFT(       this, CUI_RES(FT_ALIGN  )),
-    aAlignLB(       this, CUI_RES(LB_ALIGN  )),
-    aBitmapFT(      this, CUI_RES(FT_BITMAP )),
-    aBitmapMB(      this, CUI_RES(MB_BITMAP )),
-    aSizeFT(        this, CUI_RES(FT_SIZE       )),
-    aWidthMF(       this, CUI_RES(MF_WIDTH  )),
-    aMultFT(        this, CUI_RES(FT_MULT       )),
-    aHeightMF(      this, CUI_RES(MF_HEIGHT )),
-    aRatioCB(       this, CUI_RES(CB_RATIO  )),
-    aOrientFT(      this, CUI_RES(FT_ORIENT )),
-    aOrientLB(      this, CUI_RES(LB_ORIENT )),
+    aLevelLB(		this, CUI_RES(LB_LEVEL	)),
+    aFmtFT(			this, CUI_RES(FT_FMT		)),
+    aFmtLB(			this, CUI_RES(LB_FMT		)),
+    aPrefixFT(		this, CUI_RES(FT_PREFIX	)),
+    aPrefixED(		this, CUI_RES(ED_PREFIX	)),
+    aSuffixFT(		this, CUI_RES(FT_SUFFIX	)),
+    aSuffixED(		this, CUI_RES(ED_SUFFIX	)),
+    aCharFmtFT(		this, CUI_RES(FT_CHARFMT	)),
+    aCharFmtLB(		this, CUI_RES(LB_CHARFMT	)),
+    aBulColorFT(	this, CUI_RES(FT_BUL_COLOR)),
+    aBulColLB(		this, CUI_RES(LB_BUL_COLOR)),
+    aBulRelSizeFT(	this, CUI_RES(FT_BUL_REL_SIZE)),
+    aBulRelSizeMF(	this, CUI_RES(MF_BUL_REL_SIZE)),
+    aAllLevelFT(	this, CUI_RES(FT_ALL_LEVEL)),
+    aAllLevelNF(	this, CUI_RES(NF_ALL_LEVEL)),
+    aStartFT(		this, CUI_RES(FT_START	)),
+    aStartED(		this, CUI_RES(ED_START	)),
+    aBulletPB(		this, CUI_RES(PB_BULLET	)),
+    aAlignFT(		this, CUI_RES(FT_ALIGN	)),
+    aAlignLB(		this, CUI_RES(LB_ALIGN	)),
+    aBitmapFT(		this, CUI_RES(FT_BITMAP	)),
+    aBitmapMB(		this, CUI_RES(MB_BITMAP	)),
+    aSizeFT(		this, CUI_RES(FT_SIZE		)),
+    aWidthMF(		this, CUI_RES(MF_WIDTH	)),
+    aMultFT(		this, CUI_RES(FT_MULT		)),
+    aHeightMF(		this, CUI_RES(MF_HEIGHT	)),
+    aRatioCB(		this, CUI_RES(CB_RATIO	)),
+    aOrientFT(		this, CUI_RES(FT_ORIENT	)),
+    aOrientLB(		this, CUI_RES(LB_ORIENT	)),
     aSameLevelFL(   this, CUI_RES(FL_SAME_LEVEL)),
-    aSameLevelCB(   this, CUI_RES(CB_SAME_LEVEL)),
-    pPreviewWIN(    new SvxNumberingPreview(this, CUI_RES(WIN_PREVIEW   ))),
+    aSameLevelCB(	this, CUI_RES(CB_SAME_LEVEL)),
+    pPreviewWIN(	new SvxNumberingPreview(this, CUI_RES(WIN_PREVIEW	))),
     pActNum(0),
     pSaveNum(0),
     bLastWidthModified(FALSE),
@@ -1359,7 +1359,7 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent,
     PopupMenu* pPopup = new PopupMenu;
     aBitmapMB.GetPopupMenu()->SetPopupMenu( MN_GALLERY, pPopup );
 
-    pPopup->InsertItem( NUM_NO_GRAPHIC, String(CUI_RES(ST_POPUP_EMPTY_ENTRY)) );
+    pPopup->InsertItem(	NUM_NO_GRAPHIC, String(CUI_RES(ST_POPUP_EMPTY_ENTRY)) );
     pPopup->EnableItem( NUM_NO_GRAPHIC, FALSE );
 
     eCoreUnit = rSet.GetPool()->GetMetric(rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE));
@@ -1456,7 +1456,7 @@ void SvxNumOptionsTabPage::SetMetric(FieldUnit eMetric)
 /*-----------------01.12.97 16:30-------------------
 
 --------------------------------------------------*/
-SfxTabPage* SvxNumOptionsTabPage::Create( Window* pParent,
+SfxTabPage*	SvxNumOptionsTabPage::Create( Window* pParent,
                                 const SfxItemSet& rAttrSet)
 {
     return new SvxNumOptionsTabPage(pParent, rAttrSet);
@@ -1464,7 +1464,7 @@ SfxTabPage* SvxNumOptionsTabPage::Create( Window* pParent,
 /*-----------------01.12.97 16:29-------------------
 
 --------------------------------------------------*/
-void    SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet)
+void 	SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet)
 {
     const SfxPoolItem* pItem;
     const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet();
@@ -1507,7 +1507,7 @@ void    SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet)
 /*-----------------01.12.97 16:29-------------------
 
 --------------------------------------------------*/
-int     SvxNumOptionsTabPage::DeactivatePage(SfxItemSet * _pSet)
+int 	SvxNumOptionsTabPage::DeactivatePage(SfxItemSet * _pSet)
 {
     if(_pSet)
         FillItemSet(*_pSet);
@@ -1516,7 +1516,7 @@ int     SvxNumOptionsTabPage::DeactivatePage(SfxItemSet * _pSet)
 /*-----------------01.12.97 16:29-------------------
 
 --------------------------------------------------*/
-BOOL    SvxNumOptionsTabPage::FillItemSet( SfxItemSet& rSet )
+BOOL 	SvxNumOptionsTabPage::FillItemSet( SfxItemSet& rSet )
 {
     rSet.Put(SfxUInt16Item(SID_PARAM_CUR_NUM_LEVEL, nActNumLvl));
     if(bModified && pActNum)
@@ -1530,7 +1530,7 @@ BOOL    SvxNumOptionsTabPage::FillItemSet( SfxItemSet& rSet )
 /*-----------------01.12.97 16:29-------------------
 
 --------------------------------------------------*/
-void    SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
+void 	SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
 {
     const SfxPoolItem* pItem;
     //im Draw gibt es das Item als WhichId, im Writer nur als SlotId
@@ -1569,7 +1569,7 @@ void    SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
     else
         aLevelLB.SelectEntryPos(aLevelLB.GetEntryCount() - 1);
 
-//  nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel();
+//	nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel();
     USHORT nMask = 1;
     aLevelLB.SetUpdateMode(FALSE);
     aLevelLB.SetNoSelection();
@@ -1707,19 +1707,19 @@ void    SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
 --------------------------------------------------*/
 void SvxNumOptionsTabPage::InitControls()
 {
-    BOOL bShowBullet    = TRUE;
-    BOOL bShowBitmap    = TRUE;
-    BOOL bSameType      = TRUE;
-    BOOL bSameStart     = TRUE;
-    BOOL bSamePrefix    = TRUE;
-    BOOL bSameSuffix    = TRUE;
-    BOOL bAllLevel      = TRUE;
-    BOOL bSameCharFmt   = TRUE;
-    BOOL bSameVOrient   = TRUE;
-    BOOL bSameSize      = TRUE;
-    BOOL bSameBulColor  = TRUE;
+    BOOL bShowBullet 	= TRUE;
+    BOOL bShowBitmap 	= TRUE;
+    BOOL bSameType 		= TRUE;
+    BOOL bSameStart 	= TRUE;
+    BOOL bSamePrefix 	= TRUE;
+    BOOL bSameSuffix 	= TRUE;
+    BOOL bAllLevel 		= TRUE;
+    BOOL bSameCharFmt	= TRUE;
+    BOOL bSameVOrient	= TRUE;
+    BOOL bSameSize		= TRUE;
+    BOOL bSameBulColor 	= TRUE;
     BOOL bSameBulRelSize= TRUE;
-    BOOL bSameAdjust    = TRUE;
+    BOOL bSameAdjust 	= TRUE;
 
     const SvxNumberFormat* aNumFmtArr[SVX_MAX_NUM];
     String sFirstCharFmt;
@@ -1755,13 +1755,13 @@ void SvxNumOptionsTabPage::InitControls()
                 bSamePrefix = aNumFmtArr[i]->GetPrefix() == aNumFmtArr[nLvl]->GetPrefix();
                 bSameSuffix = aNumFmtArr[i]->GetSuffix() == aNumFmtArr[nLvl]->GetSuffix();
                 bAllLevel &= aNumFmtArr[i]->GetIncludeUpperLevels() == aNumFmtArr[nLvl]->GetIncludeUpperLevels();
-                bSameCharFmt    &=  sFirstCharFmt == aNumFmtArr[i]->GetCharFmtName();
+                bSameCharFmt 	&= 	sFirstCharFmt == aNumFmtArr[i]->GetCharFmtName();
                 bSameVOrient    &= eFirstOrient == aNumFmtArr[i]->GetVertOrient();
                 if(bShowBitmap && bSameSize)
                     bSameSize &= aNumFmtArr[i]->GetGraphicSize() == aFirstSize;
                 bSameBulColor &= aNumFmtArr[i]->GetBulletColor() == aNumFmtArr[nLvl]->GetBulletColor();
                 bSameBulRelSize &= aNumFmtArr[i]->GetBulletRelSize() == aNumFmtArr[nLvl]->GetBulletRelSize();
-                bSameAdjust     &= aNumFmtArr[i]->GetNumAdjust() == aNumFmtArr[nLvl]->GetNumAdjust();
+                bSameAdjust 	&= aNumFmtArr[i]->GetNumAdjust() == aNumFmtArr[nLvl]->GetNumAdjust();
             }
             nHighestLevel = i;
         }
@@ -1852,10 +1852,10 @@ void SvxNumOptionsTabPage::InitControls()
         break;
         case SHOW_BULLET:
         {
-//              const Font* pFnt = aNumFmtArr[Lvl]->GetBulletFont();
-//              if(pFnt)
-//                  ChgTxtFont(aBulletFT, *pFnt);
-//              aBulletFT.SetText(String((char)aNumFmtArr[nLvl]->GetBulletChar()));
+//				const Font* pFnt = aNumFmtArr[Lvl]->GetBulletFont();
+//				if(pFnt)
+//					ChgTxtFont(aBulletFT, *pFnt);
+//				aBulletFT.SetText(String((char)aNumFmtArr[nLvl]->GetBulletChar()));
         }
         break;
         case SHOW_BITMAP:
@@ -1936,31 +1936,31 @@ void SvxNumOptionsTabPage::SwitchNumberType( BYTE nType, BOOL )
 
     aBulletPB.Show(bBullet);
     BOOL bBullColor = pActNum->IsFeatureSupported(NUM_BULLET_COLOR);
-    aBulColorFT.Show(   !bBitmap && bBullColor );
-    aBulColLB.Show(     !bBitmap && bBullColor );
+    aBulColorFT.Show( 	!bBitmap && bBullColor );
+    aBulColLB.Show(		!bBitmap && bBullColor );
     BOOL bBullResSize = pActNum->IsFeatureSupported(NUM_BULLET_REL_SIZE);
-    aBulRelSizeFT.Show( !bBitmap && bBullResSize );
-    aBulRelSizeMF.Show( !bBitmap && bBullResSize );
+    aBulRelSizeFT.Show(	!bBitmap && bBullResSize );
+    aBulRelSizeMF.Show(	!bBitmap && bBullResSize );
 
-    aBitmapFT   .Show(bBitmap);
-    aBitmapMB   .Show(bBitmap);
+    aBitmapFT	.Show(bBitmap);
+    aBitmapMB	.Show(bBitmap);
 
-    aSizeFT     .Show(bBitmap);
-    aWidthMF    .Show(bBitmap);
-    aMultFT     .Show(bBitmap);
-    aHeightMF   .Show(bBitmap);
-    aRatioCB    .Show(bBitmap);
+    aSizeFT		.Show(bBitmap);
+    aWidthMF	.Show(bBitmap);
+    aMultFT	    .Show(bBitmap);
+    aHeightMF	.Show(bBitmap);
+    aRatioCB	.Show(bBitmap);
 
-    aOrientFT   .Show(bBitmap &&  bAllLevelFeature);
-    aOrientLB   .Show(bBitmap &&  bAllLevelFeature);
+    aOrientFT	.Show(bBitmap &&  bAllLevelFeature);
+    aOrientLB	.Show(bBitmap &&  bAllLevelFeature);
 
-    aSizeFT     .Enable(bEnableBitmap);
-    aWidthMF    .Enable(bEnableBitmap);
-    aMultFT     .Enable(bEnableBitmap);
-    aHeightMF   .Enable(bEnableBitmap);
-    aRatioCB    .Enable(bEnableBitmap);
-    aOrientFT   .Enable(bEnableBitmap);
-    aOrientLB   .Enable(bEnableBitmap);
+    aSizeFT		.Enable(bEnableBitmap);
+    aWidthMF	.Enable(bEnableBitmap);
+    aMultFT	    .Enable(bEnableBitmap);
+    aHeightMF	.Enable(bEnableBitmap);
+    aRatioCB	.Enable(bEnableBitmap);
+    aOrientFT	.Enable(bEnableBitmap);
+    aOrientLB	.Enable(bEnableBitmap);
 
 }
 /*-----------------02.12.97 13:51-------------------
@@ -2094,7 +2094,7 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox )
             {
                 aNumFmt.SetPrefix( aPrefixED.GetText() );
                 aNumFmt.SetSuffix( aSuffixED.GetText() );
-//              aNumFmt.SetBulletFont(0);
+//				aNumFmt.SetBulletFont(0);
                 SwitchNumberType(SHOW_NUMBERING);
                 pActNum->SetLevel(i, aNumFmt);
                 CheckForStartValue_Impl(nNumberingType);
@@ -2241,12 +2241,12 @@ IMPL_LINK( SvxNumOptionsTabPage, BulRelSizeHdl_Impl, MetricField *, pField)
 --------------------------------------------------*/
 IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton )
 {
-    USHORT                  nItemId = pButton->GetCurItemId();
-    String                  aGrfName;
-    Size                    aSize;
-    sal_Bool                bSucc(sal_False);
-    SvxOpenGraphicDialog    aGrfDlg( CUI_RES(RID_STR_EDIT_GRAPHIC) );
-//  aGrfDlg.SetDialogHelpId( HID_NUMBERINGOPT_SEL_GRF_FROM_FILE );
+    USHORT 					nItemId = pButton->GetCurItemId();
+    String 					aGrfName;
+    Size 					aSize;
+    sal_Bool				bSucc(sal_False);
+    SvxOpenGraphicDialog	aGrfDlg( CUI_RES(RID_STR_EDIT_GRAPHIC) );
+//	aGrfDlg.SetDialogHelpId( HID_NUMBERINGOPT_SEL_GRF_FROM_FILE );
 
     if(MN_GALLERY_ENTRY <= nItemId )
     {
@@ -2267,7 +2267,7 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton )
             // ausgewaehlten Filter merken
             aGrfName = aGrfDlg.GetPath();
 
-            Graphic aGraphic;
+            Graphic	aGraphic;
             if( !aGrfDlg.GetGraphic(aGraphic) )
             {
                 aSize = SvxNumberFormat::GetGraphicSizeMM100(&aGraphic);
@@ -2385,7 +2385,7 @@ IMPL_LINK( SvxNumOptionsTabPage, BulletHdl_Impl, Button *, EMPTYARG )
     {
         if(nActNumLvl & nMask)
         {
-            const SvxNumberFormat&  rCurFmt = pActNum->GetLevel(i);
+            const SvxNumberFormat& 	rCurFmt = pActNum->GetLevel(i);
             if(bFirst)
             {
                  cBullet = rCurFmt.GetBulletChar();
@@ -2448,7 +2448,7 @@ IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, MetricField *, pField)
                                                 MAP_100TH_MM, (MapUnit)eCoreUnit );
     nHeightVal = OutputDevice::LogicToLogic( nHeightVal,
                                                 MAP_100TH_MM, (MapUnit)eCoreUnit);
-    double  fSizeRatio;
+    double	fSizeRatio;
 
     BOOL bRepaint = FALSE;
     USHORT nMask = 1;
@@ -2656,7 +2656,7 @@ USHORT lcl_DrawBullet(VirtualDevice* pVDev,
 /*-----------------02.12.97 10:34-------------------
     Vorschau der Numerierung painten
 --------------------------------------------------*/
-void    SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ )
+void	SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ )
 {
     Size aSize(PixelToLogic(GetOutputSizePixel()));
     Rectangle aRect(Point(0,0), aSize);
@@ -2948,7 +2948,7 @@ void    SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ )
             }
         }
     }
-    DrawOutDev( Point(0,0), aSize,
+    DrawOutDev(	Point(0,0), aSize,
                 Point(0,0), aSize,
                         *pVDev );
     delete pVDev;
@@ -2963,16 +2963,16 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent,
     SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_NUM_POSITION ), rSet ),
     aPositionFL(    this, CUI_RES(FL_POSITION )),
     aLevelFT(       this, CUI_RES(FT_LEVEL    )),
-    aLevelLB(       this, CUI_RES(LB_LEVEL  )),
-    aDistBorderFT(  this, CUI_RES(FT_BORDERDIST )),
-    aDistBorderMF(  this, CUI_RES(MF_BORDERDIST )),
-    aRelativeCB(    this, CUI_RES(CB_RELATIVE       )),
-    aIndentFT(      this, CUI_RES(FT_INDENT     )),
-    aIndentMF(      this, CUI_RES(MF_INDENT     )),
-    aDistNumFT(     this, CUI_RES(FT_NUMDIST        )),
-    aDistNumMF(     this, CUI_RES(MF_NUMDIST        )),
-    aAlignFT(       this, CUI_RES(FT_ALIGN  )),
-    aAlignLB(       this, CUI_RES(LB_ALIGN  )),
+    aLevelLB(		this, CUI_RES(LB_LEVEL	)),
+    aDistBorderFT(	this, CUI_RES(FT_BORDERDIST	)),
+    aDistBorderMF(	this, CUI_RES(MF_BORDERDIST	)),
+    aRelativeCB(	this, CUI_RES(CB_RELATIVE		)),
+    aIndentFT(		this, CUI_RES(FT_INDENT		)),
+    aIndentMF(		this, CUI_RES(MF_INDENT		)),
+    aDistNumFT(		this, CUI_RES(FT_NUMDIST		)),
+    aDistNumMF(		this, CUI_RES(MF_NUMDIST		)),
+    aAlignFT(		this, CUI_RES(FT_ALIGN	)),
+    aAlignLB(		this, CUI_RES(LB_ALIGN	)),
     aLabelFollowedByFT( this, CUI_RES(FT_LABEL_FOLLOWED_BY) ),
     aLabelFollowedByLB( this, CUI_RES(LB_LABEL_FOLLOWED_BY) ),
     aListtabFT( this, CUI_RES(FT_LISTTAB) ),
@@ -2984,7 +2984,7 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent,
     aIndentAtFT( this, CUI_RES(FT_INDENT_AT) ),
     aIndentAtMF( this, CUI_RES(MF_INDENT_AT) ),
     aStandardPB(    this, CUI_RES(PB_STANDARD       )),
-    pPreviewWIN(    new SvxNumberingPreview(this, CUI_RES(WIN_PREVIEW   ))),
+    pPreviewWIN(	new SvxNumberingPreview(this, CUI_RES(WIN_PREVIEW	))),
     pActNum(0),
     pSaveNum(0),
     nActNumLvl( USHRT_MAX ),
@@ -3076,7 +3076,7 @@ SvxNumPositionTabPage::~SvxNumPositionTabPage()
 #if OSL_DEBUG_LEVEL > 1
 void lcl_PrintDebugOutput(FixedText& rFixed, const SvxNumberFormat& rNumFmt)
 {
-#define TWIP_TO_MM100(TWIP)     ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L))
+#define TWIP_TO_MM100(TWIP) 	((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L))
 
     sal_Char const sHash[] = " # ";
     if ( rNumFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
@@ -3106,7 +3106,7 @@ void lcl_PrintDebugOutput(FixedText& rFixed, const SvxNumberFormat& rNumFmt)
 --------------------------------------------------*/
 void SvxNumPositionTabPage::InitControls()
 {
-    bInInintControl = TRUE;
+    bInInintControl	= TRUE;
     const bool bRelative = !bLabelAlignmentPosAndSpaceModeActive &&
                      aRelativeCB.IsEnabled() && aRelativeCB.IsChecked();
     const bool bSingleSelection = aLevelLB.GetSelectEntryCount() == 1 &&
@@ -3300,7 +3300,7 @@ void SvxNumPositionTabPage::InitControls()
     if ( bSetDistEmpty )
         aDistBorderMF.SetText(aEmptyStr);
 
-    bInInintControl = FALSE;
+    bInInintControl	= FALSE;
 }
 
 /*-----------------03.12.97 10:02-------------------
@@ -3508,7 +3508,7 @@ void SvxNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode()
 /*-----------------03.12.97 10:02-------------------
 
 --------------------------------------------------*/
-SfxTabPage* SvxNumPositionTabPage::Create( Window* pParent,
+SfxTabPage*	SvxNumPositionTabPage::Create( Window* pParent,
                                 const SfxItemSet& rAttrSet)
 {
     return new SvxNumPositionTabPage(pParent, rAttrSet);
@@ -3517,20 +3517,20 @@ SfxTabPage* SvxNumPositionTabPage::Create( Window* pParent,
 /*-----------------04.12.97 12:51-------------------
 
 --------------------------------------------------*/
-void    SvxNumPositionTabPage::SetMetric(FieldUnit eMetric)
+void	SvxNumPositionTabPage::SetMetric(FieldUnit eMetric)
 {
     if(eMetric == FUNIT_MM)
     {
         aDistBorderMF .SetDecimalDigits(1);
-        aDistNumMF    .SetDecimalDigits(1);
-        aIndentMF     .SetDecimalDigits(1);
+        aDistNumMF	  .SetDecimalDigits(1);
+        aIndentMF	  .SetDecimalDigits(1);
         aListtabMF.SetDecimalDigits(1);
         aAlignedAtMF.SetDecimalDigits(1);
         aIndentAtMF.SetDecimalDigits(1);
     }
     aDistBorderMF .SetUnit( eMetric );
-    aDistNumMF    .SetUnit( eMetric );
-    aIndentMF     .SetUnit( eMetric );
+    aDistNumMF	  .SetUnit( eMetric );
+    aIndentMF	  .SetUnit( eMetric );
     aListtabMF.SetUnit( eMetric );
     aAlignedAtMF.SetUnit( eMetric );
     aIndentAtMF.SetUnit( eMetric );
@@ -3723,7 +3723,7 @@ IMPL_LINK( SvxNumPositionTabPage, RelativeHdl_Impl, CheckBox *, pBox )
     }
     String aEmptyStr;
     if(bSetValue)
-        SetMetricValue(aDistBorderMF, nValue,   eCoreUnit);
+        SetMetricValue(aDistBorderMF, nValue,	eCoreUnit);
     else
         aDistBorderMF.SetText(aEmptyStr);
     aDistBorderMF.Enable(bOn || bSingleSelection);
@@ -3938,10 +3938,10 @@ void SvxNumOptionsTabPage::SetModified(BOOL bRepaint)
 
 void SvxNumOptionsTabPage::PageCreated(SfxAllItemSet aSet)
 {
-    SFX_ITEMSET_ARG (&aSet,pListItem,SfxStringListItem,SID_CHAR_FMT_LIST_BOX,sal_False);
-    SFX_ITEMSET_ARG (&aSet,pNumCharFmt,SfxStringItem,SID_NUM_CHAR_FMT,sal_False);
-    SFX_ITEMSET_ARG (&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,sal_False);
-    SFX_ITEMSET_ARG (&aSet,pMetricItem,SfxAllEnumItem,SID_METRIC_ITEM,sal_False);
+    SFX_ITEMSET_ARG	(&aSet,pListItem,SfxStringListItem,SID_CHAR_FMT_LIST_BOX,sal_False);
+    SFX_ITEMSET_ARG	(&aSet,pNumCharFmt,SfxStringItem,SID_NUM_CHAR_FMT,sal_False);
+    SFX_ITEMSET_ARG	(&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,sal_False);
+    SFX_ITEMSET_ARG	(&aSet,pMetricItem,SfxAllEnumItem,SID_METRIC_ITEM,sal_False);
 
     if (pNumCharFmt &&pBulletCharFmt)
         SetCharFmts( pNumCharFmt->GetValue(),pBulletCharFmt->GetValue());
@@ -3963,7 +3963,7 @@ void SvxNumOptionsTabPage::PageCreated(SfxAllItemSet aSet)
 
 void SvxNumPositionTabPage::PageCreated(SfxAllItemSet aSet)
 {
-    SFX_ITEMSET_ARG (&aSet,pMetricItem,SfxAllEnumItem,SID_METRIC_ITEM,sal_False);
+    SFX_ITEMSET_ARG	(&aSet,pMetricItem,SfxAllEnumItem,SID_METRIC_ITEM,sal_False);
 
     if (pMetricItem)
         SetMetric(static_cast<FieldUnit>(pMetricItem->GetValue()));
diff --git a/cui/source/tabpages/numpages.hrc b/cui/source/tabpages/numpages.hrc
index 02fb93676658..1482de300adb 100644
--- a/cui/source/tabpages/numpages.hrc
+++ b/cui/source/tabpages/numpages.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
  *
  ************************************************************************/
 
-#define FT_ALIGN        50
+#define FT_ALIGN		50
 #define LB_ALIGN        51
 #define FT_DIST_BORDER  52
 #define MF_DIST_BORDER  53
@@ -33,7 +33,7 @@
 #define MF_DIST_NUM     55
 #define GB_POS          56
 
-#define LB_FMT_CHAR     60
+#define LB_FMT_CHAR   	60
 #define FT_FMT_CHAR     61
 
 #define FT_WIDTH        67
@@ -41,13 +41,13 @@
 #define FT_HEIGHT       70
 
 
-#define MN_STD_NUMBER   120
+#define MN_STD_NUMBER	120
 #define MD_DEL_NUMBER   121
 #define MN_STD_BULLET   122
 #define MN_DEL_BULLET   123
 
 #define STR_BULLET      200
-//#define STR_NUMFMT_1  201
+//#define STR_NUMFMT_1	201
 //#define STR_NUMFMT_2    202
 //#define STR_NUMFMT_3    203
 //#define STR_NUMFMT_4    204
@@ -65,57 +65,57 @@
 
 #define FL_VALUES               220
 #define VS_VALUES       221
-#define ST_CUSTOMIZE    222
-#define FT_ERROR        223
-#define CB_LINKED       224
+#define ST_CUSTOMIZE	222
+#define FT_ERROR		223
+#define CB_LINKED		224
 
 #define FT_LEVEL            151
 #define LB_LEVEL            152
 #define FL_FORMAT           153
 #define FL_POSITION         154
-#define FT_PREFIX       155
-#define ED_PREFIX       156
-#define FT_FMT          157
-#define LB_FMT          158
-#define FT_SUFFIX       159
-#define ED_SUFFIX       160
+#define FT_PREFIX	    155
+#define ED_PREFIX	    156
+#define FT_FMT		    157
+#define LB_FMT		    158
+#define FT_SUFFIX	    159
+#define ED_SUFFIX	    160
 #define FT_BORDERDIST   161
 #define MF_BORDERDIST   162
-#define FT_NUMDIST      163
-#define MF_NUMDIST      164
-#define FT_INDENT       165
-#define MF_INDENT       166
-#define FT_CHARFMT      167
-#define LB_CHARFMT      168
+#define FT_NUMDIST		163
+#define MF_NUMDIST		164
+#define FT_INDENT		165
+#define MF_INDENT		166
+#define FT_CHARFMT		167
+#define LB_CHARFMT	    168
 #define NF_ALL_LEVEL    169
-#define FT_START        170
-#define ED_START        171
-#define FT_BULLET       172
-#define PB_BULLET       173
+#define FT_START	    170
+#define ED_START	    171
+#define FT_BULLET	    172
+#define PB_BULLET	    173
 #define WIN_PREVIEW     174
-#define FT_BITMAP       175
-#define PB_SEARCH       176
-#define CB_RATIO        177
-#define FT_SIZE         178
-#define MF_WIDTH        179
-#define FT_MULT         180
-#define MF_HEIGHT       181
-#define FT_ORIENT       182
-#define LB_ORIENT       183
+#define FT_BITMAP	    175
+#define PB_SEARCH	    176
+#define CB_RATIO	    177
+#define FT_SIZE		    178
+#define MF_WIDTH	    179
+#define FT_MULT		    180
+#define MF_HEIGHT	    181
+#define FT_ORIENT	    182
+#define LB_ORIENT	    183
 #define MB_BITMAP       184
 #define CB_RELATIVE     185
 #define FT_ALL_LEVEL    186
 #define PB_STANDARD     187
 #define CB_SAME_LEVEL   188
 #define FL_SAME_LEVEL   189
-#define FT_BUL_COLOR    190
+#define FT_BUL_COLOR	190
 #define LB_BUL_COLOR    191
 #define FT_BUL_REL_SIZE 192
 #define MF_BUL_REL_SIZE 193
 // 194 removed
 #define ST_POPUP_EMPTY_ENTRY 195
 
-#define MN_GRAPHIC_DLG     1
+#define MN_GRAPHIC_DLG	   1
 #define MN_GALLERY         2
 #define MN_GALLERY_ENTRY 100
 
diff --git a/cui/source/tabpages/numpages.src b/cui/source/tabpages/numpages.src
index 323b5cdd6ba6..7613771422db 100644
--- a/cui/source/tabpages/numpages.src
+++ b/cui/source/tabpages/numpages.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 /**************************************************************************/
 /*                                                                        */
-/*  TabPage                                                               */
+/* 	TabPage                                                               */
 /*                                                                        */
 /**************************************************************************/
 TabPage RID_SVXPAGE_PICK_BULLET
@@ -56,7 +56,7 @@ TabPage RID_SVXPAGE_PICK_BULLET
 };
 /**************************************************************************/
 /*                                                                        */
-/*  TabPage                                                               */
+/* 	TabPage                                                               */
 /*                                                                        */
 /**************************************************************************/
 TabPage RID_SVXPAGE_PICK_SINGLE_NUM
@@ -80,7 +80,7 @@ TabPage RID_SVXPAGE_PICK_SINGLE_NUM
 };
 /**************************************************************************/
 /*                                                                        */
-/*  TabPage                                                               */
+/* 	TabPage                                                               */
 /*                                                                        */
 /**************************************************************************/
 TabPage RID_SVXPAGE_PICK_NUM
@@ -104,7 +104,7 @@ TabPage RID_SVXPAGE_PICK_NUM
 };
 /**************************************************************************/
 /*                                                                        */
-/*  TabPage                                                               */
+/* 	TabPage                                                               */
 /*                                                                        */
 /**************************************************************************/
 TabPage RID_SVXPAGE_PICK_BMP
@@ -144,7 +144,7 @@ TabPage RID_SVXPAGE_PICK_BMP
 };
 /**************************************************************************/
 /*                                                                        */
-/*  TabPage Numerierungsoptionen                                          */
+/* 	TabPage Numerierungsoptionen                                          */
 /*                                                                        */
 /**************************************************************************/
 TabPage RID_SVXPAGE_NUM_OPTIONS
@@ -189,17 +189,17 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         CurPos = 0 ;
         StringList [ en-US ] =
         {
-            < "1, 2, 3, ... " ;                 4/*SVX_NUM_ARABIC              */; > ;
-            < "A, B, C, ... " ;                 0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
-            < "a, b, c, ..." ;              1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
-            < "I, II, III, ... " ;          2/*SVX_NUM_ROMAN_UPPER         */; > ;
-            < "i, ii, iii, ... " ;          3/*SVX_NUM_ROMAN_LOWER         */; > ;
-            < "A, .., AA, .., AAA, ... " ;  9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
+            < "1, 2, 3, ... " ; 				4/*SVX_NUM_ARABIC              */; > ;
+            < "A, B, C, ... " ; 				0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
+            < "a, b, c, ..." ; 				1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
+            < "I, II, III, ... " ;			2/*SVX_NUM_ROMAN_UPPER         */; > ;
+            < "i, ii, iii, ... " ; 			3/*SVX_NUM_ROMAN_LOWER         */; > ;
+            < "A, .., AA, .., AAA, ... " ; 	9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
             < "a, .., aa, .., aaa, ..." ;  10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
-            < "Bullet" ;                    6/*SVX_NUM_CHAR_SPECIAL        */; > ;
-            < "Graphics" ;                  8/*SVX_NUM_BITMAP              */; > ;
-            < "Linked graphics" ;           0x88/*SVX_NUM_BITMAP|0x80      */; > ;
-            < "None" ;                      5/*SVX_NUM_NUMBER_NONE         */; > ;
+            < "Bullet" ; 					6/*SVX_NUM_CHAR_SPECIAL        */; > ;
+            < "Graphics" ; 					8/*SVX_NUM_BITMAP              */; > ;
+            < "Linked graphics" ; 			0x88/*SVX_NUM_BITMAP|0x80      */; > ;
+            < "None" ;						5/*SVX_NUM_NUMBER_NONE         */; > ;
             < "Native Numbering" ;                      12 /*NATIVE_NUMBERING                   */; > ;
             < "�, Б, .., �а, �б, ... (Bulgarian)" ;     38 /*CHARS_CYRILLIC_UPPER_LETTER_BG     */; > ;
             < "а, б, .., аа, аб, ... (Bulgarian)" ;     39 /*CHARS_CYRILLIC_LOWER_LETTER_BG     */; > ;
@@ -520,7 +520,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
 };
 /**************************************************************************/
 /*                                                                        */
-/*  TabPage Positionen                                                    */
+/* 	TabPage Positionen                                                    */
 /*                                                                        */
 /**************************************************************************/
 TabPage RID_SVXPAGE_NUM_POSITION
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 5ac69582c99e..49d7221974dc 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,9 +126,9 @@ void SvxHtmlExportModeConfigItem_Impl::Notify( const com::sun::star::uno::Sequen
 
 // static ----------------------------------------------------------------
 
-static const long MINBODY       = 284;  // 0,5cm in twips aufgerundet
-//static const long PRINT_OFFSET    = 17;   // 0,03cm in twips abgerundet
-static const long PRINT_OFFSET  = 0;    // why was this ever set to 17 ? it led to wrong right and bottom margins.
+static const long MINBODY 		= 284;	// 0,5cm in twips aufgerundet
+//static const long PRINT_OFFSET 	= 17;	// 0,03cm in twips abgerundet
+static const long PRINT_OFFSET 	= 0;	// why was this ever set to 17 ? it led to wrong right and bottom margins.
 
 static USHORT pRanges[] =
 {
@@ -208,14 +208,14 @@ BOOL IsEqualSize_Impl( const SvxSizeItem* pSize, const Size& rSize )
 
 // -----------------------------------------------------------------------
 
-#define MARGIN_LEFT     ( (MarginPosition)0x0001 )
-#define MARGIN_RIGHT    ( (MarginPosition)0x0002 )
-#define MARGIN_TOP      ( (MarginPosition)0x0004 )
-#define MARGIN_BOTTOM   ( (MarginPosition)0x0008 )
+#define MARGIN_LEFT		( (MarginPosition)0x0001 )
+#define MARGIN_RIGHT	( (MarginPosition)0x0002 )
+#define MARGIN_TOP		( (MarginPosition)0x0004 )
+#define MARGIN_BOTTOM	( (MarginPosition)0x0008 )
 
 struct SvxPage_Impl
 {
-    MarginPosition  m_nPos;
+    MarginPosition	m_nPos;
     Printer*        mpDefPrinter;
     bool            mbDelPrinter;
 
@@ -266,37 +266,37 @@ SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) :
     aPaperTrayBox       ( this, CUI_RES( LB_PAPER_TRAY ) ),
     aMarginFl           ( this, CUI_RES( FL_MARGIN ) ),
     aLeftMarginLbl      ( this, CUI_RES( FT_LEFT_MARGIN ) ),
-    aLeftMarginEdit     ( this, CUI_RES( ED_LEFT_MARGIN ) ),
-    aRightMarginLbl     ( this, CUI_RES( FT_RIGHT_MARGIN ) ),
-    aRightMarginEdit    ( this, CUI_RES( ED_RIGHT_MARGIN ) ),
-    aTopMarginLbl       ( this, CUI_RES( FT_TOP_MARGIN ) ),
-    aTopMarginEdit      ( this, CUI_RES( ED_TOP_MARGIN ) ),
-    aBottomMarginLbl    ( this, CUI_RES( FT_BOTTOM_MARGIN ) ),
-    aBottomMarginEdit   ( this, CUI_RES( ED_BOTTOM_MARGIN ) ),
+    aLeftMarginEdit		( this, CUI_RES( ED_LEFT_MARGIN ) ),
+    aRightMarginLbl		( this, CUI_RES( FT_RIGHT_MARGIN ) ),
+    aRightMarginEdit	( this, CUI_RES( ED_RIGHT_MARGIN ) ),
+    aTopMarginLbl		( this, CUI_RES( FT_TOP_MARGIN ) ),
+    aTopMarginEdit		( this, CUI_RES( ED_TOP_MARGIN ) ),
+    aBottomMarginLbl	( this, CUI_RES( FT_BOTTOM_MARGIN ) ),
+    aBottomMarginEdit	( this, CUI_RES( ED_BOTTOM_MARGIN ) ),
 
     aLayoutFL           ( this, CUI_RES( FL_LAYOUT ) ),
-    aPageText           ( this, CUI_RES( FT_PAGELAYOUT ) ),
+    aPageText			( this, CUI_RES( FT_PAGELAYOUT ) ),
     aLayoutBox          ( this, CUI_RES( LB_LAYOUT ) ),
-    aNumberFormatText   ( this, CUI_RES( FT_NUMBER_FORMAT ) ),
-    aNumberFormatBox    ( this, CUI_RES( LB_NUMBER_FORMAT ) ),
+    aNumberFormatText	( this, CUI_RES( FT_NUMBER_FORMAT ) ),
+    aNumberFormatBox	( this, CUI_RES( LB_NUMBER_FORMAT ) ),
     aBottomSeparatorFl  ( this, CUI_RES( FL_BOTTOM_SEP ) ),
     aTblAlignFT         ( this, CUI_RES( FT_TBL_ALIGN ) ),
     aHorzBox            ( this, CUI_RES( CB_HORZ ) ),
-    aVertBox            ( this, CUI_RES( CB_VERT ) ),
-    aAdaptBox           ( this, CUI_RES( CB_ADAPT ) ),
+    aVertBox			( this, CUI_RES( CB_VERT ) ),
+    aAdaptBox			( this, CUI_RES( CB_ADAPT ) ),
     aRegisterCB         ( this, CUI_RES( CB_REGISTER ) ),
     aRegisterFT         ( this, CUI_RES( FT_REGISTER ) ),
-    aRegisterLB         ( this, CUI_RES( LB_REGISTER ) ),
+    aRegisterLB       	( this, CUI_RES( LB_REGISTER ) ),
 
-    aInsideText         (       CUI_RES( STR_INSIDE ) ),
-    aOutsideText        (       CUI_RES( STR_OUTSIDE ) ),
-    aPrintRangeQueryText(       CUI_RES( STR_QUERY_PRINTRANGE ) ),
+    aInsideText			( 		CUI_RES( STR_INSIDE ) ),
+    aOutsideText		( 		CUI_RES( STR_OUTSIDE ) ),
+    aPrintRangeQueryText(		CUI_RES( STR_QUERY_PRINTRANGE ) ),
 
-    bLandscape          ( FALSE ),
-    eMode               ( SVX_PAGE_MODE_STANDARD ),
-    ePaperStart         ( PAPER_A3 ),
-    ePaperEnd           ( PAPER_ENV_DL ),
-    pImpl               ( new SvxPage_Impl )
+    bLandscape			( FALSE ),
+    eMode				( SVX_PAGE_MODE_STANDARD ),
+    ePaperStart			( PAPER_A3 ),
+    ePaperEnd 			( PAPER_ENV_DL ),
+    pImpl				( new SvxPage_Impl )
 
 {
     bBorderModified = FALSE;
@@ -546,7 +546,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet )
 
     String aBinName;
 
-    if ( PAPERBIN_PRINTER_SETTINGS  == nPaperBin )
+    if ( PAPERBIN_PRINTER_SETTINGS	== nPaperBin )
         aBinName = EE_RESSTR( RID_SVXSTR_PAPERBIN_SETTINGS );
     else
         aBinName = pImpl->mpDefPrinter->GetPaperBinName( (USHORT)nPaperBin );
@@ -668,7 +668,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet )
 
     // im Beispiel Hintergrund und Umrandung anzeigen
     ResetBackground_Impl( rSet );
-//! UpdateExample_Impl();
+//!	UpdateExample_Impl();
     RangeHdl_Impl( 0 );
 
     // Header Footer anzeigen
@@ -822,7 +822,7 @@ BOOL SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
 
     if ( PAPER_USER == ePaper )
     {
-        if ( nOld != nPos                       ||
+        if ( nOld != nPos						||
              aPaperWidthEdit.IsValueModified()  ||
              aPaperHeightEdit.IsValueModified() ||
              bChecked != aLandscapeBtn.GetSavedValue() )
@@ -860,7 +860,7 @@ BOOL SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
     // sonstiges Zeug der Page
     nWhich = GetWhich( SID_ATTR_PAGE );
     SvxPageItem aPage( (const SvxPageItem&)rOldSet.Get( nWhich ) );
-    bMod =  aLayoutBox.GetSelectEntryPos()  != aLayoutBox.GetSavedValue();
+    bMod = 	aLayoutBox.GetSelectEntryPos()  != aLayoutBox.GetSavedValue();
 
     if ( bMod )
         aPage.SetPageUsage(
@@ -1158,7 +1158,7 @@ IMPL_LINK( SvxPageDescPage, SwapOrientation_Impl, RadioButton *, pBtn )
 void SvxPageDescPage::SwapFirstValues_Impl( bool bSet )
 {
     MapMode aOldMode = pImpl->mpDefPrinter->GetMapMode();
-    Orientation eOri = ORIENTATION_PORTRAIT;
+    Orientation	eOri = ORIENTATION_PORTRAIT;
 
     if ( bLandscape )
         eOri = ORIENTATION_LANDSCAPE;
@@ -1202,7 +1202,7 @@ void SvxPageDescPage::SwapFirstValues_Impl( bool bSet )
     nFirstRightMargin = static_cast<long>(aRightMarginEdit.GetFirst());
     aTopMarginEdit.SetFirst( aTopMarginEdit.Normalize( nNewT ), FUNIT_TWIP );
     nFirstTopMargin = static_cast<long>(aTopMarginEdit.GetFirst());
-    aBottomMarginEdit.SetFirst( aBottomMarginEdit.Normalize( nNewB ), FUNIT_TWIP );
+    aBottomMarginEdit.SetFirst(	aBottomMarginEdit.Normalize( nNewB ), FUNIT_TWIP );
     nFirstBottomMargin = static_cast<long>(aBottomMarginEdit.GetFirst());
 
     if ( bSet )
@@ -1239,7 +1239,7 @@ IMPL_LINK_INLINE_END( SvxPageDescPage, BorderModify_Impl, MetricField *, EMPTYAR
 void SvxPageDescPage::UpdateExample_Impl( bool bResetbackground )
 {
     // Size
-    Size aSize( GetCoreValue( aPaperWidthEdit, SFX_MAPUNIT_TWIP ),
+    Size aSize(	GetCoreValue( aPaperWidthEdit, SFX_MAPUNIT_TWIP ),
                 GetCoreValue( aPaperHeightEdit, SFX_MAPUNIT_TWIP ) );
 
     aBspWin.SetSize( aSize );
@@ -1478,13 +1478,13 @@ int SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet )
             MetricField* pField = NULL;
             if ( IsPrinterRangeOverflow( aLeftMarginEdit, nFirstLeftMargin, nLastLeftMargin, MARGIN_LEFT ) )
                 pField = &aLeftMarginEdit;
-            if (    IsPrinterRangeOverflow( aRightMarginEdit, nFirstRightMargin, nLastRightMargin, MARGIN_RIGHT )
+            if (	IsPrinterRangeOverflow( aRightMarginEdit, nFirstRightMargin, nLastRightMargin, MARGIN_RIGHT )
                  && !pField )
                 pField = &aRightMarginEdit;
-            if (    IsPrinterRangeOverflow( aTopMarginEdit, nFirstTopMargin, nLastTopMargin, MARGIN_TOP )
+            if (	IsPrinterRangeOverflow( aTopMarginEdit, nFirstTopMargin, nLastTopMargin, MARGIN_TOP )
                  && !pField )
                 pField = &aTopMarginEdit;
-            if (    IsPrinterRangeOverflow( aBottomMarginEdit, nFirstBottomMargin, nLastBottomMargin, MARGIN_BOTTOM )
+            if (	IsPrinterRangeOverflow( aBottomMarginEdit, nFirstBottomMargin, nLastBottomMargin, MARGIN_BOTTOM )
                  && !pField )
                 pField = &aBottomMarginEdit;
             if ( pField )
@@ -1569,8 +1569,8 @@ IMPL_LINK( SvxPageDescPage, RangeHdl_Impl, Edit *, EMPTYARG )
     nW = static_cast<long>(aPaperWidthEdit.Denormalize(aPaperWidthEdit.GetValue(FUNIT_TWIP)));
 
     // Top
-    long nMax = nH - nBB - aBorder.Height() - MINBODY -
-                nFDist - nFHeight - nHDist - nHHeight;
+    long nMax =	nH - nBB - aBorder.Height() - MINBODY -
+                nFDist - nFHeight -	nHDist - nHHeight;
 
     aTopMarginEdit.SetMax(aTopMarginEdit.Normalize(nMax), FUNIT_TWIP);
 
diff --git a/cui/source/tabpages/page.h b/cui/source/tabpages/page.h
index 733ef66a0aab..eeb9ce3a6f5c 100644
--- a/cui/source/tabpages/page.h
+++ b/cui/source/tabpages/page.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,43 +30,43 @@
 
 // define ----------------------------------------------------------------
 
-#define PAPERSIZE_A0            0
-#define PAPERSIZE_A1            1
-#define PAPERSIZE_A2            2
-#define PAPERSIZE_A3            3
-#define PAPERSIZE_A4            4
-#define PAPERSIZE_A5            5
-#define PAPERSIZE_B4_ISO        6
-#define PAPERSIZE_B5_ISO        7
-#define PAPERSIZE_LETTER        8
-#define PAPERSIZE_LEGAL         9
-#define PAPERSIZE_TABLOID       10
-#define PAPERSIZE_USER          11
-#define PAPERSIZE_B6_ISO        12
-#define PAPERSIZE_C4            13
-#define PAPERSIZE_C5            14
-#define PAPERSIZE_C6            15
-#define PAPERSIZE_C65           16
-#define PAPERSIZE_DL            17
-#define PAPERSIZE_DIA           18
-#define PAPERSIZE_SCREEN        19
-#define PAPERSIZE_C             20
-#define PAPERSIZE_D             21
-#define PAPERSIZE_E             22
-#define PAPERSIZE_EXECUTIVE     23
-#define PAPERSIZE_LEGAL2        24
-#define PAPERSIZE_MONARCH       25
-#define PAPERSIZE_COM675        26
-#define PAPERSIZE_COM9          27
-#define PAPERSIZE_COM10         28
-#define PAPERSIZE_COM11         29
-#define PAPERSIZE_COM12         30
-#define PAPERSIZE_KAI16         31
-#define PAPERSIZE_KAI32         32
-#define PAPERSIZE_KAI32BIG      33
-#define PAPERSIZE_B4_JIS        34
-#define PAPERSIZE_B5_JIS        35
-#define PAPERSIZE_B6_JIS        36
+#define PAPERSIZE_A0			0
+#define PAPERSIZE_A1			1
+#define PAPERSIZE_A2			2
+#define PAPERSIZE_A3			3
+#define PAPERSIZE_A4			4
+#define PAPERSIZE_A5			5
+#define PAPERSIZE_B4_ISO		6
+#define PAPERSIZE_B5_ISO		7
+#define PAPERSIZE_LETTER		8
+#define PAPERSIZE_LEGAL 		9
+#define PAPERSIZE_TABLOID   	10
+#define PAPERSIZE_USER  		11
+#define PAPERSIZE_B6_ISO		12
+#define PAPERSIZE_C4			13
+#define PAPERSIZE_C5			14
+#define PAPERSIZE_C6			15
+#define PAPERSIZE_C65   		16
+#define PAPERSIZE_DL			17
+#define PAPERSIZE_DIA   		18
+#define PAPERSIZE_SCREEN		19
+#define PAPERSIZE_C 			20
+#define PAPERSIZE_D 			21
+#define PAPERSIZE_E 			22
+#define PAPERSIZE_EXECUTIVE 	23
+#define PAPERSIZE_LEGAL2		24
+#define PAPERSIZE_MONARCH   	25
+#define PAPERSIZE_COM675  		26
+#define PAPERSIZE_COM9  		27
+#define PAPERSIZE_COM10 		28
+#define PAPERSIZE_COM11 		29
+#define PAPERSIZE_COM12 		30
+#define PAPERSIZE_KAI16 		31
+#define PAPERSIZE_KAI32 		32
+#define PAPERSIZE_KAI32BIG 		33
+#define PAPERSIZE_B4_JIS		34
+#define PAPERSIZE_B5_JIS		35
+#define PAPERSIZE_B6_JIS		36
 
 #endif
 
diff --git a/cui/source/tabpages/page.hrc b/cui/source/tabpages/page.hrc
index de66988c2b0c..55ffdbd0c772 100644
--- a/cui/source/tabpages/page.hrc
+++ b/cui/source/tabpages/page.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,55 +29,55 @@
 
 // defines ---------------------------------------------------------------
 
-#define FT_LEFT_MARGIN          10
-#define ED_LEFT_MARGIN          11
-#define FT_RIGHT_MARGIN         12
-#define ED_RIGHT_MARGIN         13
-#define FT_TOP_MARGIN           14
-#define ED_TOP_MARGIN           15
-#define FT_BOTTOM_MARGIN        16
-#define ED_BOTTOM_MARGIN        17
-#define FL_MARGIN               18
+#define FT_LEFT_MARGIN			10
+#define ED_LEFT_MARGIN			11
+#define FT_RIGHT_MARGIN			12
+#define ED_RIGHT_MARGIN			13
+#define FT_TOP_MARGIN			14
+#define ED_TOP_MARGIN			15
+#define FT_BOTTOM_MARGIN		16
+#define ED_BOTTOM_MARGIN		17
+#define FL_MARGIN				18
 
-#define LB_LAYOUT               20
-#define FT_PAGELAYOUT           21
+#define LB_LAYOUT				20
+#define FT_PAGELAYOUT			21
 
-#define LB_NUMBER_FORMAT        30
+#define LB_NUMBER_FORMAT		30
 #define FL_LAYOUT        31
-#define FT_NUMBER_FORMAT        32
+#define FT_NUMBER_FORMAT		32
 
-#define FT_TEXT_FLOW            35
-#define LB_TEXT_FLOW            36
+#define FT_TEXT_FLOW			35
+#define LB_TEXT_FLOW			36
 
-#define WN_BSP                  40
+#define WN_BSP					40
 
 #define FT_ORIENTATION          48
 #define FT_PAPER_FORMAT         49
-#define LB_PAPER_SIZE           50
-#define RB_PORTRAIT             51
-#define RB_LANDSCAPE            52
-#define FT_PAPER_WIDTH          53
-#define ED_PAPER_WIDTH          54
-#define FT_PAPER_HEIGHT         55
-#define ED_PAPER_HEIGHT         56
-#define FT_PAPER_TRAY           57
-#define LB_PAPER_TRAY           58
-#define FL_PAPER_SIZE           59
+#define LB_PAPER_SIZE			50
+#define RB_PORTRAIT				51
+#define RB_LANDSCAPE			52
+#define FT_PAPER_WIDTH			53
+#define ED_PAPER_WIDTH			54
+#define FT_PAPER_HEIGHT			55
+#define ED_PAPER_HEIGHT			56
+#define FT_PAPER_TRAY			57
+#define LB_PAPER_TRAY			58
+#define FL_PAPER_SIZE			59
 
 #define CB_REGISTER             60
 #define FT_REGISTER             61
 #define LB_REGISTER             62
 #define FL_BOTTOM_SEP           64
 
-#define CB_HORZ                 70
-#define CB_VERT                 71
-#define CB_ADAPT                72
+#define CB_HORZ					70
+#define CB_VERT					71
+#define CB_ADAPT				72
 #define FT_TBL_ALIGN            73
 
-#define PB_BACK                 80
+#define PB_BACK					80
 
-#define STR_INSIDE              90
-#define STR_OUTSIDE             91
+#define STR_INSIDE				90
+#define STR_OUTSIDE				91
 #define STR_QUERY_PRINTRANGE    92
 
 #endif
diff --git a/cui/source/tabpages/page.src b/cui/source/tabpages/page.src
index c96b43a5a966..35c06cce5dc1 100644
--- a/cui/source/tabpages/page.src
+++ b/cui/source/tabpages/page.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index bae6fde93b8b..5351d90b9779 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,28 +69,28 @@
 
 static USHORT pStdRanges[] =
 {
-    SID_ATTR_PARA_LINESPACE,        // 10033
+    SID_ATTR_PARA_LINESPACE,		// 10033
     SID_ATTR_PARA_LINESPACE,
-    SID_ATTR_LRSPACE,               // 10048 -
-    SID_ATTR_ULSPACE,               // 10049
-    SID_ATTR_PARA_REGISTER,         // 10413
+    SID_ATTR_LRSPACE,				// 10048 -
+    SID_ATTR_ULSPACE,				// 10049
+    SID_ATTR_PARA_REGISTER,			// 10413
     SID_ATTR_PARA_REGISTER,
     0
 };
 
 static USHORT pAlignRanges[] =
 {
-    SID_ATTR_PARA_ADJUST,           // 10027
+    SID_ATTR_PARA_ADJUST,			// 10027
     SID_ATTR_PARA_ADJUST,
     0
 };
 
 static USHORT pExtRanges[] =
 {
-    SID_ATTR_PARA_PAGEBREAK,        // 10037 -
-    SID_ATTR_PARA_WIDOWS,           // 10041
-    SID_ATTR_PARA_MODEL,            // 10065 -
-    SID_ATTR_PARA_KEEP,             // 10066
+    SID_ATTR_PARA_PAGEBREAK,		// 10037 -
+    SID_ATTR_PARA_WIDOWS,			// 10041
+    SID_ATTR_PARA_MODEL,			// 10065 -
+    SID_ATTR_PARA_KEEP,				// 10066
     0
 };
 
@@ -110,7 +110,7 @@ enum LineSpaceList
     LLINESPACE_PROP = 3,
     LLINESPACE_MIN  = 4,
     LLINESPACE_DURCH= 5,
-    LLINESPACE_FIX  = 6,
+    LLINESPACE_FIX 	= 6,
     LLINESPACE_END
 };
 
@@ -182,7 +182,7 @@ USHORT GetHtmlMode_Impl(const SfxItemSet& rSet)
 IMPL_LINK( SvxStdParagraphTabPage, ELRLoseFocusHdl, Edit *, EMPTYARG )
 {
 //! if ( aLeftIndent.IsRelativeMode() )
-//!     return 0; //!!!
+//! 	return 0; //!!!
 
     SfxItemPool* pPool = GetItemSet().GetPool();
     DBG_ASSERT( pPool, "Wo ist der Pool" );
@@ -334,7 +334,7 @@ BOOL SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
     if ( aLeftIndent.IsValueModified() ||
          aFLineIndent.IsValueModified() ||
          aRightIndent.IsValueModified()
-         ||  aAutoCB.GetSavedValue() != aAutoCB.IsChecked() )
+         ||	 aAutoCB.GetSavedValue() != aAutoCB.IsChecked() )
     {
         nWhich = GetWhich( SID_ATTR_LRSPACE );
         SfxMapUnit eUnit = pPool->GetMetric( nWhich );
@@ -665,7 +665,7 @@ SvxStdParagraphTabPage::SvxStdParagraphTabPage( Window* pParent,
     aLeftIndent             ( this, CUI_RES( ED_LEFTINDENT ) ),
     aRightLabel             ( this, CUI_RES( FT_RIGHTINDENT ) ),
     aRightIndent            ( this, CUI_RES( ED_RIGHTINDENT ) ),
-
+    
     aFLineLabel             ( this, CUI_RES( FT_FLINEINDENT ) ),
     aFLineIndent            ( this, CUI_RES( ED_FLINEINDENT ) ),
     aAutoCB                 ( this, CUI_RES( CB_AUTO ) ),
@@ -988,14 +988,14 @@ void SvxStdParagraphTabPage::EnableAutoFirstLine()
 }
 
 
-void    SvxStdParagraphTabPage::EnableAbsLineDist(long nMinTwip)
+void	SvxStdParagraphTabPage::EnableAbsLineDist(long nMinTwip)
 {
     aLineDist.InsertEntry(sAbsDist);
     nMinFixDist = nMinTwip;
 }
 
 
-void    SvxStdParagraphTabPage::PageCreated(SfxAllItemSet aSet)
+void	SvxStdParagraphTabPage::PageCreated(SfxAllItemSet aSet)
 {
 
 /* different bit represent call to different method of SvxStdParagraphTabPage
@@ -1006,9 +1006,9 @@ void    SvxStdParagraphTabPage::PageCreated(SfxAllItemSet aSet)
 
 
             */
-    SFX_ITEMSET_ARG (&aSet,pPageWidthItem,SfxUInt16Item,SID_SVXSTDPARAGRAPHTABPAGE_PAGEWIDTH,sal_False);
-    SFX_ITEMSET_ARG (&aSet,pFlagSetItem,SfxUInt32Item,SID_SVXSTDPARAGRAPHTABPAGE_FLAGSET,sal_False);
-    SFX_ITEMSET_ARG (&aSet,pLineDistItem,SfxUInt32Item,SID_SVXSTDPARAGRAPHTABPAGE_ABSLINEDIST,sal_False);
+    SFX_ITEMSET_ARG	(&aSet,pPageWidthItem,SfxUInt16Item,SID_SVXSTDPARAGRAPHTABPAGE_PAGEWIDTH,sal_False);
+    SFX_ITEMSET_ARG	(&aSet,pFlagSetItem,SfxUInt32Item,SID_SVXSTDPARAGRAPHTABPAGE_FLAGSET,sal_False);
+    SFX_ITEMSET_ARG	(&aSet,pLineDistItem,SfxUInt32Item,SID_SVXSTDPARAGRAPHTABPAGE_ABSLINEDIST,sal_False);
 
     if (pPageWidthItem)
         SetPageWidth(pPageWidthItem->GetValue());
@@ -1029,17 +1029,17 @@ void    SvxStdParagraphTabPage::PageCreated(SfxAllItemSet aSet)
         EnableAbsLineDist(pLineDistItem->GetValue());
 
     if (pFlagSetItem)
-        if  (( 0x0008 & pFlagSetItem->GetValue()) == 0x0008 )
+        if	(( 0x0008 & pFlagSetItem->GetValue()) == 0x0008 )
                 EnableNegativeMode();
 
 }
 
 
-#define LASTLINEPOS_DEFAULT     0
-#define LASTLINEPOS_LEFT        1
+#define LASTLINEPOS_DEFAULT		0
+#define LASTLINEPOS_LEFT		1
 
-#define LASTLINECOUNT_OLD       3
-#define LASTLINECOUNT_NEW       4
+#define LASTLINECOUNT_OLD		3
+#define LASTLINECOUNT_NEW		4
 
 // class SvxParaAlignTabPage ------------------------------------------------
 
@@ -1047,22 +1047,22 @@ SvxParaAlignTabPage::SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSe
     : SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_ALIGN_PARAGRAPH ),rSet),
     aAlignFrm           ( this, CUI_RES( FL_ALIGN ) ),
     aLeft               ( this, CUI_RES( BTN_LEFTALIGN ) ),
-    aRight              ( this, CUI_RES( BTN_RIGHTALIGN ) ),
-    aCenter             ( this, CUI_RES( BTN_CENTERALIGN ) ),
-    aJustify            ( this, CUI_RES( BTN_JUSTIFYALIGN ) ),
+    aRight				( this, CUI_RES( BTN_RIGHTALIGN ) ),
+    aCenter				( this, CUI_RES( BTN_CENTERALIGN ) ),
+    aJustify			( this, CUI_RES( BTN_JUSTIFYALIGN ) ),
     aLastLineFT         ( this, CUI_RES( FT_LASTLINE ) ),
-    aLastLineLB         ( this, CUI_RES( LB_LASTLINE ) ),
-    aExpandCB           ( this, CUI_RES( CB_EXPAND ) ),
-    aSnapToGridCB       ( this, CUI_RES( CB_SNAP ) ),
-    aExampleWin         ( this, CUI_RES( WN_EXAMPLE ) ),
+    aLastLineLB			( this, CUI_RES( LB_LASTLINE ) ),
+    aExpandCB			( this, CUI_RES( CB_EXPAND ) ),
+    aSnapToGridCB		( this, CUI_RES( CB_SNAP ) ),
+    aExampleWin			( this, CUI_RES( WN_EXAMPLE ) ),
 
-    aVertAlignFL        ( this, CUI_RES( FL_VERTALIGN ) ),
-    aVertAlignFT        ( this, CUI_RES( FT_VERTALIGN ) ),
-    aVertAlignLB        ( this, CUI_RES( LB_VERTALIGN ) ),
+    aVertAlignFL		( this, CUI_RES( FL_VERTALIGN ) ),
+    aVertAlignFT		( this, CUI_RES( FT_VERTALIGN ) ),
+    aVertAlignLB		( this, CUI_RES( LB_VERTALIGN ) ),
 
-    aPropertiesFL       ( this, CUI_RES( FL_PROPERTIES    )),
-    aTextDirectionFT    ( this, CUI_RES( FT_TEXTDIRECTION )),
-    aTextDirectionLB    ( this, CUI_RES( LB_TEXTDIRECTION ))
+    aPropertiesFL		( this, CUI_RES( FL_PROPERTIES    )),
+    aTextDirectionFT	( this, CUI_RES( FT_TEXTDIRECTION )),
+    aTextDirectionLB	( this, CUI_RES( LB_TEXTDIRECTION ))
 {
     SvtLanguageOptions aLangOptions;
     USHORT nLastLinePos = LASTLINEPOS_DEFAULT;
@@ -1122,12 +1122,12 @@ int SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet )
     return LEAVE_PAGE;
 }
 
-SfxTabPage* SvxParaAlignTabPage::Create( Window* pParent, const SfxItemSet& rSet )
+SfxTabPage*	SvxParaAlignTabPage::Create( Window* pParent, const SfxItemSet& rSet )
 {
     return new SvxParaAlignTabPage(pParent, rSet);
 }
 
-USHORT* SvxParaAlignTabPage::GetRanges()
+USHORT*	SvxParaAlignTabPage::GetRanges()
 {
     return pAlignRanges;
 
@@ -1344,9 +1344,9 @@ IMPL_LINK( SvxParaAlignTabPage, TextDirectionHdl_Impl, ListBox*, EMPTYARG )
     switch ( eDir )
     {
         // check the default alignment for this text direction
-        case FRMDIR_HORI_LEFT_TOP :     aLeft.Check( TRUE ); break;
-        case FRMDIR_HORI_RIGHT_TOP :    aRight.Check( TRUE ); break;
-        case FRMDIR_ENVIRONMENT :       /* do nothing */ break;
+        case FRMDIR_HORI_LEFT_TOP :		aLeft.Check( TRUE ); break;
+        case FRMDIR_HORI_RIGHT_TOP :	aRight.Check( TRUE ); break;
+        case FRMDIR_ENVIRONMENT :		/* do nothing */ break;
         default:
         {
             DBG_ERRORFILE( "SvxParaAlignTabPage::TextDirectionHdl_Impl(): other directions not supported" );
@@ -1356,7 +1356,7 @@ IMPL_LINK( SvxParaAlignTabPage, TextDirectionHdl_Impl, ListBox*, EMPTYARG )
     return 0;
 }
 
-void    SvxParaAlignTabPage::UpdateExample_Impl( BOOL bAll )
+void	SvxParaAlignTabPage::UpdateExample_Impl( BOOL bAll )
 {
     if ( aLeft.IsChecked() )
         aExampleWin.SetAdjust( SVX_ADJUST_LEFT );
@@ -1394,7 +1394,7 @@ void SvxParaAlignTabPage::EnableJustifyExt()
 
 void SvxParaAlignTabPage::PageCreated (SfxAllItemSet aSet)
 {
-    SFX_ITEMSET_ARG (&aSet,pBoolItem,SfxBoolItem,SID_SVXPARAALIGNTABPAGE_ENABLEJUSTIFYEXT,sal_False);
+    SFX_ITEMSET_ARG	(&aSet,pBoolItem,SfxBoolItem,SID_SVXPARAALIGNTABPAGE_ENABLEJUSTIFYEXT,sal_False);
     if (pBoolItem)
         if(pBoolItem->GetValue())
             EnableJustifyExt();
@@ -1415,9 +1415,9 @@ BOOL SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
     const TriState eHyphenState = aHyphenBox.GetState();
     const SfxPoolItem* pOld = GetOldItem( rOutSet, SID_ATTR_PARA_HYPHENZONE );
 
-    if ( eHyphenState != aHyphenBox.GetSavedValue()     ||
-         aExtHyphenBeforeBox.IsValueModified()          ||
-         aExtHyphenAfterBox.IsValueModified()           ||
+    if ( eHyphenState != aHyphenBox.GetSavedValue() 	||
+         aExtHyphenBeforeBox.IsValueModified() 	   		||
+         aExtHyphenAfterBox.IsValueModified()			||
          aMaxHyphenEdit.IsValueModified() )
     {
         SvxHyphenZoneItem aHyphen(
@@ -1496,7 +1496,7 @@ BOOL SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
         SfxItemState eModelState = GetItemSet().GetItemState(SID_ATTR_PARA_MODEL, FALSE);
 
         if ( (eModelState == SFX_ITEM_SET && STATE_CHECK == aPageBreakBox.GetState()) ||
-             eState != aPageBreakBox.GetSavedValue()                ||
+             eState != aPageBreakBox.GetSavedValue()				||
              aBreakTypeLB.GetSelectEntryPos() != aBreakTypeLB.GetSavedValue()   ||
              aBreakPositionLB.GetSelectEntryPos() != aBreakPositionLB.GetSavedValue() )
         {
@@ -1534,7 +1534,7 @@ BOOL SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
             }
             pOld = GetOldItem( rOutSet, SID_ATTR_PARA_PAGEBREAK );
 
-            if ( eState != aPageBreakBox.GetSavedValue()                ||
+            if ( eState != aPageBreakBox.GetSavedValue()				||
                     !pOld || !( *(const SvxFmtBreakItem*)pOld == aBreak ) )
             {
                 bModified = TRUE;
@@ -1711,7 +1711,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet )
             aPagenumEdit.Enable(FALSE);
             aPagenumText.Enable(FALSE);
         }
-//!!!   ApplyCollClickHdl_Impl( &aApplyCollBtn );
+//!!!	ApplyCollClickHdl_Impl( &aApplyCollBtn );
 
         if ( !bIsPageModel )
         {
@@ -1923,13 +1923,13 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSe
 
     SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_EXT_PARAGRAPH ), rAttr ),
 
-    aHyphenBox          ( this, CUI_RES( BTN_HYPHEN ) ),
-    aBeforeText         ( this, CUI_RES( FT_HYPHENBEFORE ) ),
+    aHyphenBox    		( this, CUI_RES( BTN_HYPHEN ) ),
+    aBeforeText			( this, CUI_RES( FT_HYPHENBEFORE ) ),
     aExtHyphenBeforeBox ( this, CUI_RES( ED_HYPHENBEFORE ) ),
-    aAfterText          ( this, CUI_RES( FT_HYPHENAFTER ) ),
+    aAfterText			( this, CUI_RES( FT_HYPHENAFTER ) ),
     aExtHyphenAfterBox  ( this, CUI_RES( ED_HYPHENAFTER ) ),
     aMaxHyphenLabel     ( this, CUI_RES( FT_MAXHYPH ) ),
-    aMaxHyphenEdit      ( this, CUI_RES( ED_MAXHYPH ) ),
+    aMaxHyphenEdit		( this, CUI_RES( ED_MAXHYPH ) ),
     aExtFL              ( this, CUI_RES( FL_HYPHEN ) ),
     aBreaksFL           ( this, CUI_RES( FL_BREAKS ) ),
     aPageBreakBox       ( this, CUI_RES( BTN_PAGEBREAK ) ),
@@ -1943,11 +1943,11 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSe
 //    aAfterBox           ( this, CUI_RES( BTN_PAGEBREAKAFTER ) ),
     aApplyCollBtn       ( this, CUI_RES( BTN_PAGECOLL ) ),
     aApplyCollBox       ( this, CUI_RES( LB_PAGECOLL ) ),
-    aPagenumText        ( this, CUI_RES( FT_PAGENUM ) ),
-    aPagenumEdit        ( this, CUI_RES( ED_PAGENUM ) ),
+    aPagenumText		( this, CUI_RES( FT_PAGENUM ) ),
+    aPagenumEdit		( this, CUI_RES( ED_PAGENUM ) ),
     aExtendFL           ( this, CUI_RES( FL_OPTIONS ) ),
     aKeepTogetherBox    ( this, CUI_RES( BTN_KEEPTOGETHER ) ),
-    aKeepParaBox        ( this, CUI_RES( CB_KEEPTOGETHER ) ),
+    aKeepParaBox		( this, CUI_RES( CB_KEEPTOGETHER ) ),
     aOrphanBox          ( this, CUI_RES( BTN_ORPHANS ) ),
     aOrphanRowNo        ( this, CUI_RES( ED_ORPHANS ) ),
     aOrphanRowLabel     ( this, CUI_RES( FT_ORPHANS ) ),
@@ -1963,12 +1963,12 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSe
     // diese Page braucht ExchangeSupport
     SetExchangeSupport();
 
-    aHyphenBox.SetClickHdl(         LINK( this, SvxExtParagraphTabPage, HyphenClickHdl_Impl ) );
-    aPageBreakBox.SetClickHdl(      LINK( this, SvxExtParagraphTabPage, PageBreakHdl_Impl ) );
-    aKeepTogetherBox.SetClickHdl(   LINK( this, SvxExtParagraphTabPage, KeepTogetherHdl_Impl ) );
-    aWidowBox.SetClickHdl(          LINK( this, SvxExtParagraphTabPage, WidowHdl_Impl ) );
-    aOrphanBox.SetClickHdl(         LINK( this, SvxExtParagraphTabPage, OrphanHdl_Impl ) );
-    aApplyCollBtn.SetClickHdl(      LINK( this, SvxExtParagraphTabPage, ApplyCollClickHdl_Impl ) );
+    aHyphenBox.SetClickHdl( 		LINK( this, SvxExtParagraphTabPage, HyphenClickHdl_Impl ) );
+    aPageBreakBox.SetClickHdl( 		LINK( this, SvxExtParagraphTabPage, PageBreakHdl_Impl ) );
+    aKeepTogetherBox.SetClickHdl( 	LINK( this, SvxExtParagraphTabPage, KeepTogetherHdl_Impl ) );
+    aWidowBox.SetClickHdl( 			LINK( this, SvxExtParagraphTabPage, WidowHdl_Impl ) );
+    aOrphanBox.SetClickHdl( 		LINK( this, SvxExtParagraphTabPage, OrphanHdl_Impl ) );
+    aApplyCollBtn.SetClickHdl( 		LINK( this, SvxExtParagraphTabPage, ApplyCollClickHdl_Impl ) );
     aBreakTypeLB.SetSelectHdl(      LINK( this, SvxExtParagraphTabPage, PageBreakTypeHdl_Impl ) );
     aBreakPositionLB.SetSelectHdl(  LINK( this, SvxExtParagraphTabPage, PageBreakPosHdl_Impl ) );
 
@@ -1995,13 +1995,13 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSe
     if ( nHtmlMode & HTMLMODE_ON )
     {
         bHtmlMode = TRUE;
-        aHyphenBox           .Enable(FALSE);
-        aBeforeText          .Enable(FALSE);
+        aHyphenBox    		 .Enable(FALSE);
+        aBeforeText			 .Enable(FALSE);
         aExtHyphenBeforeBox  .Enable(FALSE);
-        aAfterText           .Enable(FALSE);
+        aAfterText			 .Enable(FALSE);
         aExtHyphenAfterBox   .Enable(FALSE);
         aMaxHyphenLabel      .Enable(FALSE);
-        aMaxHyphenEdit       .Enable(FALSE);
+        aMaxHyphenEdit		 .Enable(FALSE);
         aExtFL               .Enable(FALSE);
         aPagenumText         .Enable(FALSE);
         aPagenumEdit         .Enable(FALSE);
@@ -2221,7 +2221,7 @@ void SvxExtParagraphTabPage::PageCreated(SfxAllItemSet aSet)
 {
 
 
-    SFX_ITEMSET_ARG (&aSet,pDisablePageBreakItem,SfxBoolItem,SID_DISABLE_SVXEXTPARAGRAPHTABPAGE_PAGEBREAK,sal_False);
+    SFX_ITEMSET_ARG	(&aSet,pDisablePageBreakItem,SfxBoolItem,SID_DISABLE_SVXEXTPARAGRAPHTABPAGE_PAGEBREAK,sal_False);
 
     if (pDisablePageBreakItem)
         if ( pDisablePageBreakItem->GetValue())
@@ -2235,7 +2235,7 @@ SvxAsianTabPage::SvxAsianTabPage( Window* pParent, const SfxItemSet& rSet ) :
     aOptionsFL(         this, CUI_RES(FL_AS_OPTIONS       )),
     aForbiddenRulesCB(  this, CUI_RES(CB_AS_FORBIDDEN     )),
     aHangingPunctCB(    this, CUI_RES(CB_AS_HANG_PUNC     )),
-    aScriptSpaceCB(     this, CUI_RES(CB_AS_SCRIPT_SPACE    ))//,
+    aScriptSpaceCB(     this, CUI_RES(CB_AS_SCRIPT_SPACE	))//,
 
 {
     FreeResource();
@@ -2251,12 +2251,12 @@ SvxAsianTabPage::~SvxAsianTabPage()
 {
 }
 
-SfxTabPage* SvxAsianTabPage::Create(    Window* pParent, const SfxItemSet& rSet )
+SfxTabPage*	SvxAsianTabPage::Create(	Window* pParent, const SfxItemSet& rSet )
 {
     return new SvxAsianTabPage(pParent, rSet);
 }
 
-USHORT*     SvxAsianTabPage::GetRanges()
+USHORT*		SvxAsianTabPage::GetRanges()
 {
     static USHORT pRanges[] =
     {
@@ -2266,7 +2266,7 @@ USHORT*     SvxAsianTabPage::GetRanges()
     return pRanges;
 }
 
-BOOL        SvxAsianTabPage::FillItemSet( SfxItemSet& rSet )
+BOOL		SvxAsianTabPage::FillItemSet( SfxItemSet& rSet )
 {
     BOOL bRet = FALSE;
     SfxItemPool* pPool = rSet.GetPool();
@@ -2320,17 +2320,17 @@ void lcl_SetBox(const SfxItemSet& rSet, USHORT nSlotId, TriStateBox& rBox)
 void SvxAsianTabPage::Reset( const SfxItemSet& rSet )
 {
     lcl_SetBox(rSet, SID_ATTR_PARA_FORBIDDEN_RULES, aForbiddenRulesCB );
-//  lcl_SetBox(rSet, , aAllowWordBreakCB );
+//	lcl_SetBox(rSet, , aAllowWordBreakCB );
     lcl_SetBox(rSet, SID_ATTR_PARA_HANGPUNCTUATION, aHangingPunctCB );
 
 
     //character distance not yet available
-//  lcl_SetBox(rSet, , aPuntuationCB    );
+//	lcl_SetBox(rSet, , aPuntuationCB    );
     lcl_SetBox(rSet, SID_ATTR_PARA_SCRIPTSPACE, aScriptSpaceCB );
-//  lcl_SetBox(rSet, , aAdjustNumbersCB );
-//  aAllowWordBreakCB   .Enable(FALSE);
-//  aPuntuationCB       .Enable(FALSE);
-//  aAdjustNumbersCB    .Enable(FALSE);
+//	lcl_SetBox(rSet, , aAdjustNumbersCB );
+//	aAllowWordBreakCB	.Enable(FALSE);
+//	aPuntuationCB		.Enable(FALSE);
+//	aAdjustNumbersCB	.Enable(FALSE);
 }
 /* -----------------------------19.12.00 12:59--------------------------------
 
diff --git a/cui/source/tabpages/paragrph.hrc b/cui/source/tabpages/paragrph.hrc
index 8a14407a9cd0..b521366ef9f1 100644
--- a/cui/source/tabpages/paragrph.hrc
+++ b/cui/source/tabpages/paragrph.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 // StandardTabPage ----------------------------------------------------------
 
-#define FT_LEFTINDENT           10
-#define ED_LEFTINDENT           11
-#define FT_FLINEINDENT          12
-#define ED_FLINEINDENT          13
-#define FT_RIGHTINDENT          14
-#define ED_RIGHTINDENT          15
+#define FT_LEFTINDENT			10
+#define ED_LEFTINDENT			11
+#define FT_FLINEINDENT			12
+#define ED_FLINEINDENT			13
+#define FT_RIGHTINDENT			14
+#define ED_RIGHTINDENT			15
 #define FL_INDENT                       16
 
 #define FT_TOPDIST                      20
 #define ED_TOPDIST                      21
-#define FT_BOTTOMDIST           22
-#define ED_BOTTOMDIST           23
+#define FT_BOTTOMDIST			22
+#define ED_BOTTOMDIST			23
 #define FL_DIST                         24
 
-#define BTN_LEFTALIGN           30
-#define BTN_RIGHTALIGN          31
-#define BTN_CENTERALIGN         32
-#define BTN_JUSTIFYALIGN        33
+#define BTN_LEFTALIGN			30
+#define BTN_RIGHTALIGN			31
+#define BTN_CENTERALIGN			32
+#define BTN_JUSTIFYALIGN		33
 #define FL_ALIGN                        34
 #define FL_VERTALIGN                    35
 #define LB_VERTALIGN                    36
@@ -57,8 +57,8 @@
 
 #define LB_LINEDIST                     40
 #define FT_LINEDIST                     41
-#define ED_LINEDISTPERCENT      42
-#define ED_LINEDISTMETRIC       43
+#define ED_LINEDISTPERCENT		42
+#define ED_LINEDISTMETRIC		43
 #define FL_LINEDIST                     44
 #define WN_EXAMPLE                      46
 
@@ -73,20 +73,20 @@
 // ExtendedTabPage ----------------------------------------------------------
 
 #define BTN_HYPHEN                      50
-#define ED_HYPHENBEFORE         52
-#define FT_HYPHENBEFORE         53
-#define ED_HYPHENAFTER          55
-#define FT_HYPHENAFTER          56
+#define ED_HYPHENBEFORE			52
+#define FT_HYPHENBEFORE			53
+#define ED_HYPHENAFTER			55
+#define FT_HYPHENAFTER			56
 #define FL_HYPHEN                       57
 
-#define BTN_PAGEBREAK           60
+#define BTN_PAGEBREAK			60
 #define FT_BREAKTYPE            61
 #define LB_BREAKTYPE            62
 #define FT_BREAKPOSITION        63
 #define LB_BREAKPOSITION        64
-#define BTN_PAGECOLL            65
+#define BTN_PAGECOLL			65
 #define LB_PAGECOLL                     66
-#define BTN_KEEPTOGETHER        67
+#define BTN_KEEPTOGETHER		67
 #define BTN_WIDOWS                      68
 #define ED_WIDOWS                       69
 #define FT_WIDOWS                       70
@@ -96,10 +96,10 @@
 #define FL_OPTIONS                      74
 #define FT_PAGENUM                      75
 #define ED_PAGENUM                      76
-#define FL_BREAKS                       77
+#define FL_BREAKS						77
 
 #define CB_KEEPTOGETHER                 80
-#define FT_MAXHYPH                      81
+#define FT_MAXHYPH  					81
 #define ED_MAXHYPH                      83
 
 #define CB_REGISTER                     84
@@ -115,7 +115,7 @@
 
 #define CB_AS_FORBIDDEN                 4
 
-#define CB_AS_SCRIPT_SPACE              7
+#define CB_AS_SCRIPT_SPACE				7
 
 #endif
 
diff --git a/cui/source/tabpages/paragrph.src b/cui/source/tabpages/paragrph.src
index d52283ceea8f..9b06d2612a80 100644
--- a/cui/source/tabpages/paragrph.src
+++ b/cui/source/tabpages/paragrph.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -486,7 +486,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
         Text [ en-US ] = "Hyphenation" ;
     };
     FixedLine FL_OPTIONS
-    {   // is moved one section deeper to not raise unnecessary translations
+    {	// is moved one section deeper to not raise unnecessary translations
         Pos = MAP_APPFONT ( 6 , 116 ) ;
         Size = MAP_APPFONT ( 248 , 8 ) ;
         Text [ en-US ] = "Options" ;
@@ -501,7 +501,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
     };
     TriStateBox BTN_PAGEBREAK
     {
-         //         Disable = TRUE;
+         //			Disable = TRUE;
         Pos = MAP_APPFONT ( 12 , 86 ) ;
         Size = MAP_APPFONT ( 61 , 10 ) ;
         Text [ en-US ] = "Insert" ;
@@ -546,7 +546,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
     };
     TriStateBox BTN_PAGECOLL
     {
-         //         Disable = TRUE;
+         //			Disable = TRUE;
         Pos = MAP_APPFONT (21 , 100 ) ;
         Size = MAP_APPFONT ( 75 , 10 ) ;
         Text [ en-US ] = "With Page St~yle" ;
@@ -554,7 +554,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
     };
     ListBox LB_PAGECOLL
     {
-         //         Disable = TRUE;
+         //			Disable = TRUE;
         Pos = MAP_APPFONT ( 98 , 98 ) ;
         Size = MAP_APPFONT ( 61 , 50 ) ;
         DropDown = TRUE ;
diff --git a/cui/source/tabpages/strings.src b/cui/source/tabpages/strings.src
index a1cb7cb80582..2bc1c595f584 100644
--- a/cui/source/tabpages/strings.src
+++ b/cui/source/tabpages/strings.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 396e3c16b7e9..d9a02c37cdbb 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/tabpages/swpossizetabpage.hrc b/cui/source/tabpages/swpossizetabpage.hrc
index 9c5170b21d83..b7e69c27c83b 100644
--- a/cui/source/tabpages/swpossizetabpage.hrc
+++ b/cui/source/tabpages/swpossizetabpage.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/tabpages/swpossizetabpage.hxx b/cui/source/tabpages/swpossizetabpage.hxx
index 4ad36b9aa1d7..224504cc14d7 100644
--- a/cui/source/tabpages/swpossizetabpage.hxx
+++ b/cui/source/tabpages/swpossizetabpage.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class SvxSwPosSizeTabPage : public SfxTabPage
     FixedText   m_aHeightFT;
     MetricField m_aHeightMF;
     CheckBox    m_aKeepRatioCB;
-
+    
     FixedLine   m_aSeparatorFL;
 
     FixedLine   m_aAnchorFL;
@@ -71,7 +71,7 @@ class SvxSwPosSizeTabPage : public SfxTabPage
     MetricField m_aHoriByMF;
     FixedText   m_aHoriToFT;
     ListBox     m_aHoriToLB;
-
+    
     CheckBox    m_aHoriMirrorCB;
 
     FixedText   m_aVertFT;
@@ -82,16 +82,16 @@ class SvxSwPosSizeTabPage : public SfxTabPage
     ListBox     m_aVertToLB;
 
     CheckBox    m_aFollowCB;
-
+    
     SvxSwFrameExample m_aExampleWN;
-
+    
     Link        m_aValidateLink;
-
+    
     //'string provider'
     SvxSwFramePosString m_aFramePosString;
-
+    
     Rectangle           m_aRect; //size of all selected objects
-    Rectangle           m_aWorkArea;
+    Rectangle           m_aWorkArea; 
     Point               m_aAnchorPos;
 
     FrmMap* m_pVMap;
@@ -103,7 +103,7 @@ class SvxSwPosSizeTabPage : public SfxTabPage
     short   m_nOldHRel;
     short   m_nOldV;
     short   m_nOldVRel;
-
+    
     double  m_fWidthHeightRatio; //width-to-height ratio to support the KeepRatio button
     USHORT  m_nHtmlMode;
     bool    m_bHtmlMode;
@@ -115,7 +115,7 @@ class SvxSwPosSizeTabPage : public SfxTabPage
     bool    m_bIsInRightToLeft;
 
 
-
+    
     DECL_LINK( RangeModifyHdl, Edit * );
     DECL_LINK( AnchorTypeHdl, RadioButton * );
     DECL_LINK( PosHdl, ListBox * );
@@ -123,7 +123,7 @@ class SvxSwPosSizeTabPage : public SfxTabPage
     DECL_LINK( MirrorHdl, CheckBox * );
     DECL_LINK( ModifyHdl, Edit * );
     DECL_LINK( ProtectHdl, TriStateBox *);
-
+    
     void            InitPos(short nAnchorType, USHORT nH, USHORT nHRel,
                             USHORT nV,  USHORT nVRel,
                             long   nX,  long   nY);
@@ -136,10 +136,10 @@ class SvxSwPosSizeTabPage : public SfxTabPage
 
     void            UpdateExample();
 
-public:
+public:     
     SvxSwPosSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs  );
     ~SvxSwPosSizeTabPage();
-
+    
     static SfxTabPage* Create( Window*, const SfxItemSet& );
     static USHORT*     GetRanges();
 
@@ -149,9 +149,9 @@ public:
     virtual int  DeactivatePage( SfxItemSet* pSet );
 
     void    EnableAnchorTypes(USHORT nAnchorEnable);
-
+    
     void SetValidateFramePosLink( const Link& rLink )
-            {m_aValidateLink = rLink;}
+            {m_aValidateLink = rLink;}        
 
     void SetView( const SdrView* pSdrView );
 };
diff --git a/cui/source/tabpages/swpossizetabpage.src b/cui/source/tabpages/swpossizetabpage.src
index c5fd8e8816e9..d8bcad8e81ed 100644
--- a/cui/source/tabpages/swpossizetabpage.src
+++ b/cui/source/tabpages/swpossizetabpage.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index 49fd6bcf393e..4f8b1bc5e760 100644
--- a/cui/source/tabpages/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/tabpages/tabarea.hrc b/cui/source/tabpages/tabarea.hrc
index 10fe10f1495d..dfa14dd7f04b 100644
--- a/cui/source/tabpages/tabarea.hrc
+++ b/cui/source/tabpages/tabarea.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #define FT_Y_OFFSET 2
 #define MTR_FLD_X_OFFSET 1
 #define MTR_FLD_Y_OFFSET 2
-#define LB_AREA_TYPE 19
+#define LB_AREA_TYPE 19 
 #define RBT_ROW 6
 #define RBT_COLUMN 7
 #define MTR_FLD_OFFSET 3
@@ -152,36 +152,36 @@
 #define FT_Y_SIZE 11
 #define FT_BITMAPS_HIDDEN 12
 
-#define RBT_TRANS_OFF 8
-#define RBT_TRANS_LINEAR 9
-#define RBT_TRANS_GRADIENT 10
-#define GRP_TRANS_MODE 9
-#define GRP_TRANS_GRADIENT 10
-#define CTL_TRANS_PREVIEW   19
+#define	RBT_TRANS_OFF 8
+#define	RBT_TRANS_LINEAR 9
+#define	RBT_TRANS_GRADIENT 10
+#define	GRP_TRANS_MODE 9
+#define	GRP_TRANS_GRADIENT 10
+#define CTL_TRANS_PREVIEW	19
 
-#define FT_TRGR_TYPE 12
-#define LB_TRGR_GRADIENT_TYPES 3
-#define FT_TRGR_CENTER_X 13
-#define MTR_TRGR_CENTER_X 4
-#define FT_TRGR_CENTER_Y 14
-#define MTR_TRGR_CENTER_Y 5
-#define FT_TRGR_ANGLE 15
-#define MTR_TRGR_ANGLE 6
-#define FT_TRGR_BORDER 16
-#define MTR_TRGR_BORDER 7
-#define FT_TRGR_START_VALUE 17
-#define MTR_TRGR_START_VALUE 8
-#define FT_TRGR_END_VALUE 18
-#define MTR_TRGR_END_VALUE 9
+#define	FT_TRGR_TYPE 12
+#define	LB_TRGR_GRADIENT_TYPES 3
+#define	FT_TRGR_CENTER_X 13
+#define	MTR_TRGR_CENTER_X 4
+#define	FT_TRGR_CENTER_Y 14
+#define	MTR_TRGR_CENTER_Y 5
+#define	FT_TRGR_ANGLE 15
+#define	MTR_TRGR_ANGLE 6
+#define	FT_TRGR_BORDER 16
+#define	MTR_TRGR_BORDER 7
+#define	FT_TRGR_START_VALUE 17
+#define	MTR_TRGR_START_VALUE 8
+#define	FT_TRGR_END_VALUE 18
+#define	MTR_TRGR_END_VALUE 9
 #define MTR_TRANSPARENT 10
 
 #define MTR_SHADOW_TRANSPARENT 11
 
 // Hatch-Background on Area-TabPage
-#define GRP_HATCHBCKGRD         20
-#define CB_HATCHBCKGRD          21
-#define LB_HATCHBCKGRDCOLOR     22
+#define GRP_HATCHBCKGRD			20
+#define CB_HATCHBCKGRD			21
+#define LB_HATCHBCKGRDCOLOR		22
 
 
-#define IMG_LOAD_H  23
-#define IMG_SAVE_H  24
+#define IMG_LOAD_H	23
+#define IMG_SAVE_H	24
diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src
index f5ff6b24ff66..9ff8c0d6f919 100644
--- a/cui/source/tabpages/tabarea.src
+++ b/cui/source/tabpages/tabarea.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include "tabarea.hrc"
 #include <svx/dialogs.hrc>
 
-#define MASKCOLOR       MaskColor = Color{ Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
+#define MASKCOLOR		MaskColor = Color{ Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
 
 
  // RID_SVXPAGE_AREA ------------------------------------------------------
-#define TRANS_GRAD_OFFSET_X             6
-#define TRANS_GRAD_OFFSET_Y             64
-#define TRANS_GRAD_FIELD_SEPARATION     24
+#define	TRANS_GRAD_OFFSET_X				6
+#define	TRANS_GRAD_OFFSET_Y				64
+#define	TRANS_GRAD_FIELD_SEPARATION		24
 
 TabPage RID_SVXPAGE_TRANSPARENCE
 {
diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx
index 42e4a867b181..2a50f906c088 100644
--- a/cui/source/tabpages/tabline.cxx
+++ b/cui/source/tabpages/tabline.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ SvxLineTabDialog::SvxLineTabDialog
     BOOL bHasObj
 ) :
 
-    SfxTabDialog    ( pParent, CUI_RES( RID_SVXDLG_LINE ), pAttr ),
-    pDrawModel      ( pModel ),
-    pObj            ( pSdrObj ),
+    SfxTabDialog	( pParent, CUI_RES( RID_SVXDLG_LINE ), pAttr ),
+    pDrawModel		( pModel ),
+    pObj			( pSdrObj ),
     rOutAttrs       ( *pAttr ),
     pColorTab       ( pModel->GetColorTable() ),
     mpNewColorTab   ( pModel->GetColorTable() ),
@@ -121,7 +121,7 @@ SvxLineTabDialog::SvxLineTabDialog
 
     AddTabPage( RID_SVXPAGE_LINE_DEF, SvxLineDefTabPage::Create, 0);
     AddTabPage( RID_SVXPAGE_LINEEND_DEF, SvxLineEndDefTabPage::Create, 0);
-//  AddTabPage( RID_SVXPAGE_COLOR, SvxColorTabPage::Create, 0 );
+//	AddTabPage( RID_SVXPAGE_COLOR, SvxColorTabPage::Create, 0 );
 
     SetCurPageId( RID_SVXPAGE_LINE );
 
diff --git a/cui/source/tabpages/tabline.hrc b/cui/source/tabpages/tabline.hrc
index 0034e2126bf5..34b7e7fe4085 100644
--- a/cui/source/tabpages/tabline.hrc
+++ b/cui/source/tabpages/tabline.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,9 +77,9 @@
 #define TSB_CENTER_END 5
 #define FT_TRANSPARENT 10
 #define MTR_LINE_TRANSPARENT 5
-#define FL_SEPARATOR 4
-#define FT_LINE_END_STYLE 11
-#define FT_TITLE 12
+#define	FL_SEPARATOR 4
+#define	FT_LINE_END_STYLE 11
+#define	FT_TITLE 12
 
 // #116827#
 #define FL_EDGE_STYLE 5
@@ -87,16 +87,16 @@
 #define LB_EDGE_STYLE 5
 
 //Symbole (fuer StarChart)
-#define FT_SYMBOL_WIDTH     20
-#define FT_SYMBOL_HEIGHT    21
-#define MF_SYMBOL_WIDTH     22
-#define MF_SYMBOL_HEIGHT    23
-#define CB_SYMBOL_RATIO     24
-#define FL_SYMBOL_FORMAT    25
-#define MB_SYMBOL_BITMAP    26
+#define FT_SYMBOL_WIDTH		20
+#define FT_SYMBOL_HEIGHT	21
+#define MF_SYMBOL_WIDTH		22
+#define MF_SYMBOL_HEIGHT	23
+#define CB_SYMBOL_RATIO		24
+#define FL_SYMBOL_FORMAT	25
+#define MB_SYMBOL_BITMAP	26
 
 
-#define MN_GRAPHIC_DLG     1
+#define MN_GRAPHIC_DLG	   1
 #define MN_GALLERY         2
 #define MN_SYMBOLS         3
 #define MN_SYMBOLS_NONE    4
diff --git a/cui/source/tabpages/tabline.src b/cui/source/tabpages/tabline.src
index e16c3d7e9529..57d821389ad9 100644
--- a/cui/source/tabpages/tabline.src
+++ b/cui/source/tabpages/tabline.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 // Selecting LineStyle / Color / Width --------------------
 
-#define MASKCOLOR   MaskColor = Color{ Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
+#define MASKCOLOR	MaskColor = Color{ Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
 
 
 TabPage RID_SVXPAGE_LINE
@@ -744,7 +744,7 @@ TabDialog RID_SVXDLG_LINE
                 Identifier = RID_SVXPAGE_SHADOW ;
                 PageResID = RID_SVXPAGE_SHADOW ;
                 Text [ en-US ] = "Shadow" ;
-            };
+            };		
             PageItem
             {
                 Identifier = RID_SVXPAGE_LINE_DEF ;
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index b6d047977c64..a40a1a448340 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -738,7 +738,7 @@ IMPL_LINK( SvxTabulatorTabPage, ModifyHdl_Impl, MetricBox *, EMPTYARG )
 
 void SvxTabulatorTabPage::PageCreated(SfxAllItemSet aSet)
 {
-    SFX_ITEMSET_ARG (&aSet,pControlItem,SfxUInt16Item,SID_SVXTABULATORTABPAGE_CONTROLFLAGS,sal_False);
+    SFX_ITEMSET_ARG	(&aSet,pControlItem,SfxUInt16Item,SID_SVXTABULATORTABPAGE_CONTROLFLAGS,sal_False);
     if (pControlItem)
         DisableControls(pControlItem->GetValue());
 }
diff --git a/cui/source/tabpages/tabstpge.hrc b/cui/source/tabpages/tabstpge.hrc
index be3823fd9cd4..97ae4d947381 100644
--- a/cui/source/tabpages/tabstpge.hrc
+++ b/cui/source/tabpages/tabstpge.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,25 +33,25 @@
 #define FL_TABPOS                       11
 #define FL_TABPOS_VERT                  12
 
-#define BTN_TABTYPE_LEFT        20
+#define	BTN_TABTYPE_LEFT		20
 #define WIN_TABLEFT                     21
-#define BTN_TABTYPE_RIGHT       22
-#define WIN_TABRIGHT            23
-#define BTN_TABTYPE_CENTER      24
-#define WIN_TABCENTER           25
-#define BTN_TABTYPE_DECIMAL     26
-#define WIN_TABDECIMAL          27
-#define ED_TABTYPE_DECCHAR      28
-#define FT_TABTYPE_DECCHAR      29
+#define	BTN_TABTYPE_RIGHT		22
+#define WIN_TABRIGHT			23
+#define	BTN_TABTYPE_CENTER		24
+#define WIN_TABCENTER			25
+#define	BTN_TABTYPE_DECIMAL		26
+#define WIN_TABDECIMAL			27
+#define	ED_TABTYPE_DECCHAR		28
+#define FT_TABTYPE_DECCHAR		29
 #define FL_TABTYPE                      30
 
 
-#define BTN_FILLCHAR_NO         40
-#define BTN_FILLCHAR_POINTS     41
+#define	BTN_FILLCHAR_NO 		40
+#define	BTN_FILLCHAR_POINTS		41
 #define BTN_FILLCHAR_DASHLINE           42
 #define BTN_FILLCHAR_UNDERSCORE         43
-#define BTN_FILLCHAR_OTHER      44
-#define ED_FILLCHAR_OTHER       45
+#define	BTN_FILLCHAR_OTHER		44
+#define	ED_FILLCHAR_OTHER		45
 #define FL_FILLCHAR                     46
 
 #define BTN_NEW                         50
diff --git a/cui/source/tabpages/tabstpge.src b/cui/source/tabpages/tabstpge.src
index 3bd0467f2f0c..cb743cf849a1 100644
--- a/cui/source/tabpages/tabstpge.src
+++ b/cui/source/tabpages/tabstpge.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index e489a91546e5..5c1a3ea232a8 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,8 +63,8 @@ __EXPORT SvxTextTabDialog::SvxTextTabDialog( Window* pParent,
                                 const SfxItemSet* pAttr,
                                 const SdrView* pSdrView ) :
         SfxTabDialog        ( pParent, CUI_RES( RID_SVXDLG_TEXT ), pAttr ),
-        rOutAttrs           ( *pAttr ),
-        pView               ( pSdrView )
+        rOutAttrs			( *pAttr ),
+        pView				( pSdrView )
 {
     FreeResource();
 
@@ -105,36 +105,36 @@ void __EXPORT SvxTextTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage )
 \************************************************************************/
 
 SvxTextAnimationPage::SvxTextAnimationPage( Window* pWindow, const SfxItemSet& rInAttrs ) :
-                SfxTabPage      ( pWindow, CUI_RES( RID_SVXPAGE_TEXTANIMATION ),
+                SfxTabPage		( pWindow, CUI_RES( RID_SVXPAGE_TEXTANIMATION ),
                                   rInAttrs ),
-                aFlEffect       ( this, CUI_RES(FL_EFFECT)),
-                aFtEffects      ( this, CUI_RES(FT_EFFECTS)),
-                aLbEffect       ( this, CUI_RES( LB_EFFECT ) ),
-                //aCtlEffect        ( this, CUI_RES( CTL_EFFECT ) ),
-                aFtDirection    ( this, CUI_RES(FT_DIRECTION) ),
-                aBtnUp          ( this, CUI_RES( BTN_UP ) ),
-                aBtnLeft        ( this, CUI_RES( BTN_LEFT ) ),
-                aBtnRight       ( this, CUI_RES( BTN_RIGHT ) ),
-                aBtnDown        ( this, CUI_RES( BTN_DOWN ) ),
+                aFlEffect		( this, CUI_RES(FL_EFFECT)),
+                aFtEffects		( this, CUI_RES(FT_EFFECTS)),
+                aLbEffect		( this, CUI_RES( LB_EFFECT ) ),
+                //aCtlEffect		( this, CUI_RES( CTL_EFFECT ) ),
+                aFtDirection	( this, CUI_RES(FT_DIRECTION) ),
+                aBtnUp   		( this, CUI_RES( BTN_UP ) ),
+                aBtnLeft  		( this, CUI_RES( BTN_LEFT ) ),
+                aBtnRight 		( this, CUI_RES( BTN_RIGHT ) ),
+                aBtnDown		( this, CUI_RES( BTN_DOWN ) ),
 
                 aFlProperties   ( this, CUI_RES(FL_PROPERTIES)),
-                aTsbStartInside ( this, CUI_RES( TSB_START_INSIDE ) ),
-                aTsbStopInside  ( this, CUI_RES( TSB_STOP_INSIDE ) ),
+                aTsbStartInside	( this, CUI_RES( TSB_START_INSIDE ) ),
+                aTsbStopInside	( this, CUI_RES( TSB_STOP_INSIDE ) ),
 
-                aFtCount        ( this, CUI_RES(FT_COUNT)),
-                aTsbEndless     ( this, CUI_RES( TSB_ENDLESS ) ),
-                aNumFldCount    ( this, CUI_RES( NUM_FLD_COUNT ) ),
+                aFtCount		( this, CUI_RES(FT_COUNT)),
+                aTsbEndless		( this, CUI_RES( TSB_ENDLESS ) ),
+                aNumFldCount	( this, CUI_RES( NUM_FLD_COUNT ) ),
 
-                aFtAmount       ( this, CUI_RES(FT_AMOUNT)),
-                aTsbPixel       ( this, CUI_RES( TSB_PIXEL ) ),
-                aMtrFldAmount   ( this, CUI_RES( MTR_FLD_AMOUNT ) ),
+                aFtAmount		( this, CUI_RES(FT_AMOUNT)),
+                aTsbPixel		( this, CUI_RES( TSB_PIXEL ) ),
+                aMtrFldAmount	( this, CUI_RES( MTR_FLD_AMOUNT ) ),
 
-                aFtDelay        ( this, CUI_RES(FT_DELAY)),
-                aTsbAuto        ( this, CUI_RES( TSB_AUTO ) ),
-                aMtrFldDelay    ( this, CUI_RES( MTR_FLD_DELAY ) ),
+                aFtDelay		( this, CUI_RES(FT_DELAY)),
+                aTsbAuto   		( this, CUI_RES( TSB_AUTO ) ),
+                aMtrFldDelay	( this, CUI_RES( MTR_FLD_DELAY ) ),
 
-                rOutAttrs       ( rInAttrs ),
-                eAniKind        ( SDRTEXTANI_NONE )
+                rOutAttrs		( rInAttrs ),
+                eAniKind		( SDRTEXTANI_NONE )
 {
     FreeResource();
 
@@ -494,7 +494,7 @@ void SvxTextAnimationPage::Construct()
 |*
 \************************************************************************/
 
-USHORT* SvxTextAnimationPage::GetRanges()
+USHORT*	SvxTextAnimationPage::GetRanges()
 {
     return( pRanges );
 }
diff --git a/cui/source/tabpages/textanim.hrc b/cui/source/tabpages/textanim.hrc
index 2f29d81a146a..9fc1d207e8fe 100644
--- a/cui/source/tabpages/textanim.hrc
+++ b/cui/source/tabpages/textanim.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/tabpages/textanim.src b/cui/source/tabpages/textanim.src
index 229875a6ad4d..346426f24ea9 100644
--- a/cui/source/tabpages/textanim.src
+++ b/cui/source/tabpages/textanim.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,40 +32,40 @@
 #include <svx/dialogs.hrc>
 
 // direction image buttons
-#define MA_HALFBUTTON_WIDTH     7
-#define MA_BUTTON_WIDTH         (2 * MA_HALFBUTTON_WIDTH)
-#define MA_BUTTON_HEIGHT        (2 * MA_HALFBUTTON_WIDTH)
-#define BUTTON_SIZE             MAP_APPFONT( MA_BUTTON_WIDTH, MA_BUTTON_WIDTH )
+#define MA_HALFBUTTON_WIDTH		7
+#define MA_BUTTON_WIDTH			(2 * MA_HALFBUTTON_WIDTH)
+#define MA_BUTTON_HEIGHT		(2 * MA_HALFBUTTON_WIDTH)
+#define BUTTON_SIZE				MAP_APPFONT( MA_BUTTON_WIDTH, MA_BUTTON_WIDTH )
 #define MA_MOVEBUT_GRACE_X      6
 
 // height of first group         Text effects
-#define MA_EFFECTSGROUP_HEIGHT  (RSC_CD_FIXEDLINE_HEIGHT + \
+#define MA_EFFECTSGROUP_HEIGHT	(RSC_CD_FIXEDLINE_HEIGHT + \
                                  RSC_SP_FLGR_INNERBORDER_LEFT + \
-/* direction buttons */          3*MA_BUTTON_HEIGHT + \
+/* direction buttons */			 3*MA_BUTTON_HEIGHT + \
                                  RSC_SP_FLGR_INNERBORDER_BOTTOM + RSC_SP_FLGR_SPACE_Y)
 
-// height of second group                height of FIXEDTEXT
-#define MA_PROPERTIESGROUP_HEIGHT       (RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_LEFT + \
-/* text initially visible */             RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + \
-/* text finally visible */               RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + \
-/* animation runs */                     RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_GROUP_Y + \
-/* number of runs */                     RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + \
-/* step size */                          RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_GROUP_Y + \
-/* number of pixel */                    RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + \
-/* step delay */                         RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_GROUP_Y + \
-/* delay time */                         RSC_CD_TEXTBOX_HEIGHT)
+// height of second group				 height of FIXEDTEXT
+#define MA_PROPERTIESGROUP_HEIGHT		(RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_LEFT + \
+/* text initially visible */			 RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + \
+/* text finally visible */				 RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + \
+/* animation runs */					 RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_GROUP_Y + \
+/* number of runs */					 RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + \
+/* step size */							 RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_GROUP_Y + \
+/* number of pixel */					 RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + \
+/* step delay */						 RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_GROUP_Y + \
+/* delay time */						 RSC_CD_TEXTBOX_HEIGHT)
 
 
 // left space for real controls
-#define MA_LEFT_SPACE                   (RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT)
+#define MA_LEFT_SPACE					(RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT)
 
 // tabpage total size
-#define MA_TOTAL_WIDTH          260
-#define MA_TOTAL_HEIGHT         RSC_SP_TBPG_INNERBORDER_TOP + MA_EFFECTSGROUP_HEIGHT + MA_PROPERTIESGROUP_HEIGHT + RSC_SP_TBPG_INNERBORDER_BOTTOM
+#define MA_TOTAL_WIDTH			260
+#define MA_TOTAL_HEIGHT			RSC_SP_TBPG_INNERBORDER_TOP + MA_EFFECTSGROUP_HEIGHT + MA_PROPERTIESGROUP_HEIGHT + RSC_SP_TBPG_INNERBORDER_BOTTOM
 
 // X position and width of effects drop down
-#define MA_EFFECTLIST_X                 50
-#define MA_EFFECTLIST_WIDTH             95
+#define MA_EFFECTLIST_X					50
+#define MA_EFFECTLIST_WIDTH				95
 
 
  // RID_SVXPAGE_TEXTANIMATION ---------------------------------------------
@@ -81,7 +81,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
         Size = MAP_APPFONT ( MA_TOTAL_WIDTH - RSC_SP_TBPG_INNERBORDER_LEFT - RSC_SP_TBPG_INNERBORDER_RIGHT, RSC_CD_FIXEDLINE_HEIGHT ) ;
         Text [ en-US ] = "Text animation effects" ;
     };
-#define MA_CURR_Y       RSC_SP_TBPG_INNERBORDER_TOP + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP + MA_BUTTON_HEIGHT
+#define MA_CURR_Y		RSC_SP_TBPG_INNERBORDER_TOP + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP + MA_BUTTON_HEIGHT
     FixedText FT_EFFECTS
     {
         Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT, MA_CURR_Y + 3 ) ;
@@ -154,7 +154,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
         Size = MAP_APPFONT ( MA_TOTAL_WIDTH - RSC_SP_TBPG_INNERBORDER_LEFT - RSC_SP_TBPG_INNERBORDER_RIGHT, RSC_CD_FIXEDLINE_HEIGHT ) ;
         Text [ en-US ] = "Properties" ;
     };
-#define MA_CURR_Y2      RSC_SP_TBPG_INNERBORDER_TOP + MA_EFFECTSGROUP_HEIGHT + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP
+#define MA_CURR_Y2		RSC_SP_TBPG_INNERBORDER_TOP + MA_EFFECTSGROUP_HEIGHT + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP
     TriStateBox TSB_START_INSIDE
     {
         TabStop = TRUE ;
@@ -162,7 +162,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
         Size = MAP_APPFONT ( MA_TOTAL_WIDTH - RSC_SP_TBPG_INNERBORDER_LEFT - RSC_SP_TBPG_INNERBORDER_RIGHT - 12, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "S~tart inside" ;
     };
-#define MA_CURR_Y3      MA_CURR_Y2 + RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y
+#define MA_CURR_Y3		MA_CURR_Y2 + RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y
     TriStateBox TSB_STOP_INSIDE
     {
         TabStop = TRUE ;
@@ -170,7 +170,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
         Size = MAP_APPFONT ( MA_TOTAL_WIDTH - RSC_SP_TBPG_INNERBORDER_LEFT - RSC_SP_TBPG_INNERBORDER_RIGHT - 12, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "Text visible when exiting" ;
     };
-#define MA_CURR_Y4      MA_CURR_Y3 + RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y
+#define MA_CURR_Y4		MA_CURR_Y3 + RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y
     FixedText FT_COUNT
     {
         Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT, MA_CURR_Y4 ) ;
@@ -178,7 +178,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
                              RSC_CD_FIXEDTEXT_HEIGHT ) ;
         Text [ en-US ] = "Animation cycles" ;
     };
-#define MA_CURR_Y5      MA_CURR_Y4 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP
+#define MA_CURR_Y5		MA_CURR_Y4 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP
     TriStateBox TSB_ENDLESS
     {
         TabStop = TRUE ;
@@ -198,7 +198,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
         Minimum = 1 ;
         First = 1 ;
     };
-#define MA_CURR_Y6      MA_CURR_Y5 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y
+#define MA_CURR_Y6		MA_CURR_Y5 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y
     FixedText FT_AMOUNT
     {
         Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT, MA_CURR_Y6 ) ;
@@ -206,7 +206,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
                              RSC_CD_FIXEDTEXT_HEIGHT ) ;
         Text [ en-US ] = "Increment" ;
     };
-#define MA_CURR_Y7      MA_CURR_Y6 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP
+#define MA_CURR_Y7		MA_CURR_Y6 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP
     TriStateBox TSB_PIXEL
     {
         TabStop = TRUE ;
@@ -231,7 +231,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
         Maximum = 10000 ;
         Last = 10000 ;
     };
-#define MA_CURR_Y8      MA_CURR_Y7 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y
+#define MA_CURR_Y8		MA_CURR_Y7 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y
     FixedText FT_DELAY
     {
         Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT, MA_CURR_Y8 ) ;
@@ -239,7 +239,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
                              RSC_CD_FIXEDTEXT_HEIGHT ) ;
         Text [ en-US ] = "Delay" ;
     };
-#define MA_CURR_Y9      MA_CURR_Y8 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP
+#define MA_CURR_Y9		MA_CURR_Y8 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP
     TriStateBox TSB_AUTO
     {
         Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + 9 , MA_CURR_Y9 + 2 ) ;
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 8ca6d49e4ab1..152f1b911256 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -71,8 +71,8 @@ static USHORT pRanges[] =
 \************************************************************************/
 
 //CHINA001 SvxTextAttrDialog::SvxTextAttrDialog( Window* pParent, const SfxItemSet& rInAttrs,
-//CHINA001                              const SdrView* pSdrView ) :
-//CHINA001      SfxSingleTabDialog( pParent, rInAttrs, RID_SVXPAGE_TEXTATTR )
+//CHINA001 								const SdrView* pSdrView ) :
+//CHINA001 		SfxSingleTabDialog( pParent, rInAttrs, RID_SVXPAGE_TEXTATTR )
 //CHINA001 {
 //CHINA001 SvxTextAttrPage* pPage = new SvxTextAttrPage( this, rInAttrs );
 //CHINA001
@@ -99,34 +99,34 @@ static USHORT pRanges[] =
 \************************************************************************/
 
 SvxTextAttrPage::SvxTextAttrPage( Window* pWindow, const SfxItemSet& rInAttrs ) :
-                SvxTabPage      ( pWindow, CUI_RES( RID_SVXPAGE_TEXTATTR ),
+                SvxTabPage		( pWindow, CUI_RES( RID_SVXPAGE_TEXTATTR ),
                                   rInAttrs ),
 
-                aFlText         ( this, CUI_RES( FL_TEXT ) ),
+                aFlText			( this, CUI_RES( FL_TEXT ) ),
                 aTsbAutoGrowWidth  ( this, CUI_RES( TSB_AUTOGROW_WIDTH ) ),
                 aTsbAutoGrowHeight ( this, CUI_RES( TSB_AUTOGROW_HEIGHT ) ),
-                aTsbFitToSize   ( this, CUI_RES( TSB_FIT_TO_SIZE ) ),
-                aTsbContour     ( this, CUI_RES( TSB_CONTOUR ) ),
+                aTsbFitToSize	( this, CUI_RES( TSB_FIT_TO_SIZE ) ),
+                aTsbContour  	( this, CUI_RES( TSB_CONTOUR ) ),
                 aTsbWordWrapText( this, CUI_RES( TSB_WORDWRAP_TEXT ) ),
                 aTsbAutoGrowSize( this, CUI_RES( TSB_AUTOGROW_SIZE ) ),
-                aFlDistance     ( this, CUI_RES( FL_DISTANCE ) ),
-                aFtLeft         ( this, CUI_RES( FT_LEFT ) ),
-                aMtrFldLeft     ( this, CUI_RES( MTR_FLD_LEFT ) ),
-                aFtRight        ( this, CUI_RES( FT_RIGHT ) ),
-                aMtrFldRight    ( this, CUI_RES( MTR_FLD_RIGHT ) ),
-                aFtTop          ( this, CUI_RES( FT_TOP ) ),
-                aMtrFldTop      ( this, CUI_RES( MTR_FLD_TOP ) ),
-                aFtBottom       ( this, CUI_RES( FT_BOTTOM ) ),
-                aMtrFldBottom   ( this, CUI_RES( MTR_FLD_BOTTOM ) ),
-
-                aFlSeparator    ( this, CUI_RES( FL_SEPARATOR ) ),
-
-                aFlPosition     ( this, CUI_RES( FL_POSITION ) ),
-                aCtlPosition    ( this, CUI_RES( CTL_POSITION ),
+                aFlDistance		( this, CUI_RES( FL_DISTANCE ) ),
+                aFtLeft			( this, CUI_RES( FT_LEFT ) ),
+                aMtrFldLeft		( this, CUI_RES( MTR_FLD_LEFT ) ),
+                aFtRight		( this, CUI_RES( FT_RIGHT ) ),
+                aMtrFldRight	( this, CUI_RES( MTR_FLD_RIGHT ) ),
+                aFtTop			( this, CUI_RES( FT_TOP ) ),
+                aMtrFldTop		( this, CUI_RES( MTR_FLD_TOP ) ),
+                aFtBottom		( this, CUI_RES( FT_BOTTOM ) ),
+                aMtrFldBottom	( this, CUI_RES( MTR_FLD_BOTTOM ) ),
+
+                aFlSeparator	( this, CUI_RES( FL_SEPARATOR ) ),
+
+                aFlPosition		( this, CUI_RES( FL_POSITION ) ),
+                aCtlPosition 	( this, CUI_RES( CTL_POSITION ),
                                             RP_MM, 240, 100 ),
-                aTsbFullWidth   ( this, CUI_RES( TSB_FULL_WIDTH ) ),
+                aTsbFullWidth 	( this, CUI_RES( TSB_FULL_WIDTH ) ),
 
-                rOutAttrs       ( rInAttrs )
+                rOutAttrs		( rInAttrs )
 {
     FreeResource();
 
@@ -384,7 +384,7 @@ BOOL SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs)
     DBG_ASSERT( pPool, "Wo ist der Pool" );
     SfxMapUnit eUnit = pPool->GetMetric( SDRATTR_TEXT_LEFTDIST );
 
-    INT32    nValue;
+    INT32	 nValue;
     TriState eState;
 
     if( aMtrFldLeft.GetText() != aMtrFldLeft.GetSavedValue() )
@@ -595,7 +595,7 @@ SfxTabPage* SvxTextAttrPage::Create( Window* pWindow,
 |*
 \************************************************************************/
 
-USHORT* SvxTextAttrPage::GetRanges()
+USHORT*	SvxTextAttrPage::GetRanges()
 {
     return( pRanges );
 }
@@ -715,8 +715,8 @@ IMPL_LINK( SvxTextAttrPage, ClickHdl_Impl, void *, EMPTYARG )
 {
     BOOL bAutoGrowWidth  = aTsbAutoGrowWidth.GetState() == STATE_CHECK;
     BOOL bAutoGrowHeight = aTsbAutoGrowHeight.GetState() == STATE_CHECK;
-    BOOL bFitToSize      = aTsbFitToSize.GetState() == STATE_CHECK;
-    BOOL bContour        = aTsbContour.GetState() == STATE_CHECK;
+    BOOL bFitToSize 	 = aTsbFitToSize.GetState() == STATE_CHECK;
+    BOOL bContour		 = aTsbContour.GetState() == STATE_CHECK;
 
     aTsbContour.Enable( !bFitToSize &&
                         !( ( bAutoGrowWidth && bAutoGrowWidthEnabled ) || ( bAutoGrowHeight && bAutoGrowHeightEnabled ) ) &&
diff --git a/cui/source/tabpages/textattr.hrc b/cui/source/tabpages/textattr.hrc
index b5da04f607e5..70d4512c51c4 100644
--- a/cui/source/tabpages/textattr.hrc
+++ b/cui/source/tabpages/textattr.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/source/tabpages/textattr.src b/cui/source/tabpages/textattr.src
index 59b0a534472d..23a2138cbe57 100644
--- a/cui/source/tabpages/textattr.src
+++ b/cui/source/tabpages/textattr.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ TabPage RID_SVXPAGE_TEXTATTR
     };
     TriStateBox TSB_WORDWRAP_TEXT
     {
-        TabStop = TRUE;
+        TabStop = TRUE;		
         Pos = MAP_APPFONT( 132, 14  ) ;
         Size = MAP_APPFONT( 127 , 10 ) ;
         Text [ en-US ] = "~Word wrap text in shape";
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 5ba3c1b9511e..ffb0f487ccf9 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ static USHORT pTransparenceRanges[] =
 
 /*************************************************************************
 |*
-|*  Dialog for transparence
+|*	Dialog for transparence
 |*
 \************************************************************************/
 
@@ -251,33 +251,33 @@ void SvxTransparenceTabPage::SetControlState_Impl(XGradientStyle eXGS)
 }
 
 SvxTransparenceTabPage::SvxTransparenceTabPage(Window* pParent, const SfxItemSet& rInAttrs)
-:   SvxTabPage          ( pParent, CUI_RES( RID_SVXPAGE_TRANSPARENCE ), rInAttrs),
+:	SvxTabPage			( pParent, CUI_RES( RID_SVXPAGE_TRANSPARENCE ), rInAttrs),
     rOutAttrs           ( rInAttrs ),
     nPageType(0),
     nDlgType(0),
-
+    
     aFlProp             ( this, CUI_RES( FL_PROP ) ),
-    aRbtTransOff        ( this, CUI_RES( RBT_TRANS_OFF ) ),
+    aRbtTransOff		( this, CUI_RES( RBT_TRANS_OFF ) ),
     aRbtTransLinear     ( this, CUI_RES( RBT_TRANS_LINEAR ) ),
-    aRbtTransGradient   ( this, CUI_RES( RBT_TRANS_GRADIENT ) ),
+    aRbtTransGradient	( this, CUI_RES( RBT_TRANS_GRADIENT ) ),
 
     aMtrTransparent     ( this, CUI_RES( MTR_TRANSPARENT ) ),
 
-    aFtTrgrType         ( this, CUI_RES( FT_TRGR_TYPE ) ),
-    aLbTrgrGradientType ( this, CUI_RES( LB_TRGR_GRADIENT_TYPES ) ),
-    aFtTrgrCenterX      ( this, CUI_RES( FT_TRGR_CENTER_X ) ),
-    aMtrTrgrCenterX     ( this, CUI_RES( MTR_TRGR_CENTER_X ) ),
-    aFtTrgrCenterY      ( this, CUI_RES( FT_TRGR_CENTER_Y ) ),
-    aMtrTrgrCenterY     ( this, CUI_RES( MTR_TRGR_CENTER_Y ) ),
-    aFtTrgrAngle        ( this, CUI_RES( FT_TRGR_ANGLE ) ),
-    aMtrTrgrAngle       ( this, CUI_RES( MTR_TRGR_ANGLE ) ),
-    aFtTrgrBorder       ( this, CUI_RES( FT_TRGR_BORDER ) ),
-    aMtrTrgrBorder      ( this, CUI_RES( MTR_TRGR_BORDER ) ),
-    aFtTrgrStartValue   ( this, CUI_RES( FT_TRGR_START_VALUE ) ),
-    aMtrTrgrStartValue  ( this, CUI_RES( MTR_TRGR_START_VALUE ) ),
-    aFtTrgrEndValue     ( this, CUI_RES( FT_TRGR_END_VALUE ) ),
-    aMtrTrgrEndValue    ( this, CUI_RES( MTR_TRGR_END_VALUE ) ),
-
+    aFtTrgrType			( this, CUI_RES( FT_TRGR_TYPE ) ),
+    aLbTrgrGradientType	( this, CUI_RES( LB_TRGR_GRADIENT_TYPES ) ),
+    aFtTrgrCenterX		( this, CUI_RES( FT_TRGR_CENTER_X ) ),
+    aMtrTrgrCenterX		( this, CUI_RES( MTR_TRGR_CENTER_X ) ),
+    aFtTrgrCenterY		( this, CUI_RES( FT_TRGR_CENTER_Y ) ),
+    aMtrTrgrCenterY		( this, CUI_RES( MTR_TRGR_CENTER_Y ) ),
+    aFtTrgrAngle		( this, CUI_RES( FT_TRGR_ANGLE ) ),
+    aMtrTrgrAngle		( this, CUI_RES( MTR_TRGR_ANGLE ) ),
+    aFtTrgrBorder		( this, CUI_RES( FT_TRGR_BORDER ) ),
+    aMtrTrgrBorder		( this, CUI_RES( MTR_TRGR_BORDER ) ),
+    aFtTrgrStartValue	( this, CUI_RES( FT_TRGR_START_VALUE ) ),
+    aMtrTrgrStartValue	( this, CUI_RES( MTR_TRGR_START_VALUE ) ),
+    aFtTrgrEndValue		( this, CUI_RES( FT_TRGR_END_VALUE ) ),
+    aMtrTrgrEndValue	( this, CUI_RES( MTR_TRGR_END_VALUE ) ),
+    
     aCtlBitmapPreview   ( this, CUI_RES( CTL_BITMAP_PREVIEW ) ),
     aCtlXRectPreview    ( this, CUI_RES( CTL_TRANS_PREVIEW ) ),
     bBitmap             ( FALSE ),
@@ -605,22 +605,22 @@ void SvxTransparenceTabPage::PageCreated (SfxAllItemSet aSet)
 }
 /*************************************************************************
 |*
-|*  Dialog to modify fill-attributes
+|*	Dialog to modify fill-attributes
 |*
 \************************************************************************/
 
 SvxAreaTabPage::SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
 
-    SvxTabPage          ( pParent, CUI_RES( RID_SVXPAGE_AREA ), rInAttrs ),
+    SvxTabPage			( pParent, CUI_RES( RID_SVXPAGE_AREA ), rInAttrs ),
 
     aFlProp             ( this, CUI_RES( FL_PROP ) ),
     aTypeLB             ( this, CUI_RES( LB_AREA_TYPE ) ),
 
-    aLbColor            ( this, CUI_RES( LB_COLOR ) ),
-    aLbGradient         ( this, CUI_RES( LB_GRADIENT ) ),
-    aLbHatching         ( this, CUI_RES( LB_HATCHING ) ),
-    aLbBitmap           ( this, CUI_RES( LB_BITMAP ) ),
-    aCtlBitmapPreview   ( this, CUI_RES( CTL_BITMAP_PREVIEW ) ),
+    aLbColor			( this, CUI_RES( LB_COLOR ) ),
+    aLbGradient			( this, CUI_RES( LB_GRADIENT ) ),
+    aLbHatching			( this, CUI_RES( LB_HATCHING ) ),
+    aLbBitmap			( this, CUI_RES( LB_BITMAP ) ),
+    aCtlBitmapPreview	( this, CUI_RES( CTL_BITMAP_PREVIEW ) ),
 
     aTsbStepCount       ( this, CUI_RES( TSB_STEPCOUNT ) ),
     aFlStepCount        ( this, CUI_RES( FL_STEPCOUNT ) ),
@@ -643,14 +643,14 @@ SvxAreaTabPage::SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
     aFtYOffset          ( this, CUI_RES( FT_Y_OFFSET ) ),
     aMtrFldYOffset      ( this, CUI_RES( MTR_FLD_Y_OFFSET ) ),
     aTsbTile            ( this, CUI_RES( TSB_TILE ) ),
-    aTsbStretch         ( this, CUI_RES( TSB_STRETCH ) ),
+    aTsbStretch    		( this, CUI_RES( TSB_STRETCH ) ),
     aFlOffset           ( this, CUI_RES( FL_OFFSET ) ),
     aRbtRow             ( this, CUI_RES( RBT_ROW ) ),
-    aRbtColumn          ( this, CUI_RES( RBT_COLUMN ) ),
+    aRbtColumn			( this, CUI_RES( RBT_COLUMN ) ),
     aMtrFldOffset       ( this, CUI_RES( MTR_FLD_OFFSET ) ),
 
     aCtlXRectPreview    ( this, CUI_RES( CTL_COLOR_PREVIEW ) ),
-
+    
     rOutAttrs           ( rInAttrs ),
 
     pColorTab( NULL ),
@@ -975,7 +975,7 @@ BOOL SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
 {
     const SfxPoolItem* pOld = NULL;
     USHORT  _nPos;
-    BOOL    bModified = FALSE;
+    BOOL	bModified = FALSE;
 
     if( nDlgType != 0 || *pbAreaTP )
     {
@@ -1442,7 +1442,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs )
                 {
                     XFillGradientItem aGradientItem( ( ( const XFillGradientItem& )
                                             rAttrs.Get( XATTR_FILLGRADIENT ) ) );
-                    String    aString( aGradientItem.GetName() );
+                    String	  aString( aGradientItem.GetName() );
                     XGradient aGradient( aGradientItem.GetGradientValue() );
 
                     aLbGradient.SelectEntryByList( pGradientList, aString, aGradient );
@@ -1725,7 +1725,7 @@ SfxTabPage* SvxAreaTabPage::Create( Window* pWindow,
 
 //------------------------------------------------------------------------
 
-USHORT* SvxAreaTabPage::GetRanges()
+USHORT*	SvxAreaTabPage::GetRanges()
 {
     return( pAreaRanges );
 }
@@ -1834,8 +1834,8 @@ IMPL_LINK( SvxAreaTabPage, ClickColorHdl_Impl, void *, EMPTYARG )
     aLbHatchBckgrdColor.Hide();
 
     // Text der Tabelle setzen
-    String          aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
-    INetURLObject   aURL( pColorTab->GetPath() );
+    String			aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+    INetURLObject	aURL( pColorTab->GetPath() );
 
     aURL.Append( pColorTab->GetName() );
     DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
@@ -1924,8 +1924,8 @@ IMPL_LINK( SvxAreaTabPage, ClickGradientHdl_Impl, void *, EMPTYARG )
     aLbHatchBckgrdColor.Hide();
 
     // Text der Tabelle setzen
-    String          aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
-    INetURLObject   aURL( pGradientList->GetPath() );
+    String			aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+    INetURLObject	aURL( pGradientList->GetPath() );
 
     aURL.Append( pGradientList->GetName() );
     DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
@@ -2016,8 +2016,8 @@ IMPL_LINK( SvxAreaTabPage, ClickHatchingHdl_Impl, void *, EMPTYARG )
     aLbHatchBckgrdColor.Enable();
 
     // Text der Tabelle setzen
-    String          aString( CUI_RES( RID_SVXSTR_TABLE ) );     aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
-    INetURLObject   aURL( pHatchingList->GetPath() );
+    String			aString( CUI_RES( RID_SVXSTR_TABLE ) ); 	aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+    INetURLObject	aURL( pHatchingList->GetPath() );
 
     aURL.Append( pHatchingList->GetName() );
     DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
@@ -2177,8 +2177,8 @@ IMPL_LINK( SvxAreaTabPage, ClickBitmapHdl_Impl, void *, EMPTYARG )
     aFlOffset.Show();
 
     // Text der Tabelle setzen
-    String          aString( CUI_RES( RID_SVXSTR_TABLE ) );     aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
-    INetURLObject   aURL( pBitmapList->GetPath() );
+    String			aString( CUI_RES( RID_SVXSTR_TABLE ) ); 	aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+    INetURLObject	aURL( pBitmapList->GetPath() );
 
     aURL.Append( pBitmapList->GetName() );
     DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 2b1ae42646c9..dd42c0a14b23 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -74,7 +74,7 @@
 
 /*************************************************************************
 |*
-|*  Dialog zum Aendern und Definieren der Bitmaps
+|*	Dialog zum Aendern und Definieren der Bitmaps
 |*
 \************************************************************************/
 
@@ -84,26 +84,26 @@ SvxBitmapTabPage::SvxBitmapTabPage
     const SfxItemSet& rInAttrs
 ) :
 
-    SvxTabPage          ( pParent, CUI_RES( RID_SVXPAGE_BITMAP ), rInAttrs ),
+    SvxTabPage			( pParent, CUI_RES( RID_SVXPAGE_BITMAP ), rInAttrs ),
 
     aCtlPixel           ( this, CUI_RES( CTL_PIXEL ) ),
     aFtPixelEdit        ( this, CUI_RES( FT_PIXEL_EDIT ) ),
     aFtColor            ( this, CUI_RES( FT_COLOR ) ),
-    aLbColor            ( this, CUI_RES( LB_COLOR ) ),
-    aFtBackgroundColor  ( this, CUI_RES( FT_BACKGROUND_COLOR ) ),
-    aLbBackgroundColor  ( this, CUI_RES( LB_BACKGROUND_COLOR ) ),
+    aLbColor			( this, CUI_RES( LB_COLOR ) ),
+    aFtBackgroundColor	( this, CUI_RES( FT_BACKGROUND_COLOR ) ),
+    aLbBackgroundColor	( this, CUI_RES( LB_BACKGROUND_COLOR ) ),
     // This fix text is used only to provide the name for the following
     // bitmap list box.  The fixed text is not displayed.
     aLbBitmapsHidden    ( this, CUI_RES( FT_BITMAPS_HIDDEN ) ),
-    aLbBitmaps          ( this, CUI_RES( LB_BITMAPS ) ),
+    aLbBitmaps			( this, CUI_RES( LB_BITMAPS ) ),
     aFlProp             ( this, CUI_RES( FL_PROP ) ),
-    aCtlPreview         ( this, CUI_RES( CTL_PREVIEW ) ),
-    aBtnAdd             ( this, CUI_RES( BTN_ADD ) ),
+    aCtlPreview			( this, CUI_RES( CTL_PREVIEW ) ),
+    aBtnAdd				( this, CUI_RES( BTN_ADD ) ),
     aBtnModify          ( this, CUI_RES( BTN_MODIFY ) ),
     aBtnImport          ( this, CUI_RES( BTN_IMPORT ) ),
     aBtnDelete          ( this, CUI_RES( BTN_DELETE ) ),
-    aBtnLoad            ( this, CUI_RES( BTN_LOAD ) ),
-    aBtnSave            ( this, CUI_RES( BTN_SAVE ) ),
+    aBtnLoad			( this, CUI_RES( BTN_LOAD ) ),
+    aBtnSave			( this, CUI_RES( BTN_SAVE ) ),
 
     aBitmapCtl          ( this, aCtlPreview.GetSizePixel() ),
     rOutAttrs           ( rInAttrs ),
@@ -210,8 +210,8 @@ void SvxBitmapTabPage::ActivatePage( const SfxItemSet&  )
 
             // Ermitteln (evtl. abschneiden) des Namens und in
             // der GroupBox darstellen
-            String          aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
-            INetURLObject   aURL( pBitmapList->GetPath() );
+            String			aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+            INetURLObject	aURL( pBitmapList->GetPath() );
 
             aURL.Append( pBitmapList->GetName() );
             DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
@@ -359,13 +359,13 @@ IMPL_LINK( SvxBitmapTabPage, ChangeBitmapHdl_Impl, void *, EMPTYARG )
     }
     if( pXOBitmap )
     {
-        //WorkWindow        aTmpWW( DLGWIN );
-        //VirtualDevice aVD( aTmpWW );
-        //USHORT    nLines = aCtlPixel.GetLineCount();
-        //Color aPixelColor, aBackColor;
-        //BOOL  bPixelColor = FALSE;
-        //USHORT    nWidth  = pBitmap->GetSizePixel().Width();
-        //USHORT    nHeight = pBitmap->GetSizePixel().Height();
+        //WorkWindow		aTmpWW( DLGWIN );
+        //VirtualDevice	aVD( aTmpWW );
+        //USHORT	nLines = aCtlPixel.GetLineCount();
+        //Color	aPixelColor, aBackColor;
+        //BOOL	bPixelColor = FALSE;
+        //USHORT	nWidth  = pBitmap->GetSizePixel().Width();
+        //USHORT	nHeight = pBitmap->GetSizePixel().Height();
 
         // #85339# try to convert bitmapped item to array item.
         if(pXOBitmap->GetBitmapType() == XBITMAP_IMPORT)
@@ -688,7 +688,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
 #ifdef WNT
             // hack: #31355# W.P.
             Rectangle aRect( aLbBitmaps.GetPosPixel(), aLbBitmaps.GetSizePixel() );
-            if( TRUE ) {                // ??? overlapped with pDlg
+            if( TRUE ) {				// ??? overlapped with pDlg
                                         // and srolling
                 Invalidate( aRect );
                 //aLbBitmaps.Invalidate();
@@ -731,8 +731,8 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG )
 
     if( !aDlg.Execute() )
     {
-        Graphic         aGraphic;
-        int             nError = 1;
+        Graphic 		aGraphic;
+        int 			nError = 1;
 
         EnterWait();
         nError = aDlg.GetGraphic( aGraphic );
@@ -744,8 +744,8 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG )
             WarningBox*    pWarnBox = NULL;
 
             // convert file URL to UI name
-            String          aName;
-            INetURLObject   aURL( aDlg.GetPath() );
+            String 			aName;
+            INetURLObject	aURL( aDlg.GetPath() );
             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
             DBG_ASSERT(pFact, "Dialogdiet fail!");
             AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, String(aURL.GetName()).GetToken( 0, '.' ), aDesc );
@@ -797,7 +797,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG )
 #ifdef WNT
                 // hack: #31355# W.P.
                 Rectangle aRect( aLbBitmaps.GetPosPixel(), aLbBitmaps.GetSizePixel() );
-                if( TRUE ) {                // ??? overlapped with pDlg
+                if( TRUE ) {				// ??? overlapped with pDlg
                                             // and srolling
                     Invalidate( aRect );
                     //aLbBitmaps.Invalidate();
@@ -1053,8 +1053,8 @@ IMPL_LINK( SvxBitmapTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
     aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE ) );
     if ( aDlg.Execute() == ERRCODE_NONE )
     {
-        INetURLObject   aURL( aDlg.GetPath() );
-        INetURLObject   aPathURL( aURL );
+        INetURLObject	aURL( aDlg.GetPath() );
+        INetURLObject	aPathURL( aURL );
 
         aPathURL.removeSegment();
         aPathURL.removeFinalSlash();
@@ -1150,7 +1150,7 @@ void SvxBitmapTabPage::PointChanged( Window* pWindow, RECT_POINT )
 
 
 
-Window* SvxBitmapTabPage::GetParentLabeledBy( const Window* pLabeled ) const
+Window*	SvxBitmapTabPage::GetParentLabeledBy( const Window* pLabeled ) const
 {
     if (pLabeled == &aLbBitmaps)
         return const_cast<FixedText*>(&aLbBitmapsHidden);
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 00f5fb5739cb..efb6a0d82172 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 /*************************************************************************
 |*
-|*  Dialog zum Aendern und Definieren der Farben
+|*	Dialog zum Aendern und Definieren der Farben
 |*
 \************************************************************************/
 
@@ -83,13 +83,13 @@ SvxColorTabPage::SvxColorTabPage
     const SfxItemSet& rInAttrs
 ) :
 
-    SfxTabPage          ( pParent, CUI_RES( RID_SVXPAGE_COLOR ), rInAttrs ),
+    SfxTabPage			( pParent, CUI_RES( RID_SVXPAGE_COLOR ), rInAttrs ),
 
     aFlProp             ( this, CUI_RES( FL_PROP ) ),
     aFtName             ( this, CUI_RES( FT_NAME ) ),
-    aEdtName            ( this, CUI_RES( EDT_NAME ) ),
-    aFtColor            ( this, CUI_RES( FT_COLOR ) ),
-    aLbColor            ( this, CUI_RES( LB_COLOR ) ),
+    aEdtName			( this, CUI_RES( EDT_NAME ) ),
+    aFtColor			( this, CUI_RES( FT_COLOR ) ),
+    aLbColor			( this, CUI_RES( LB_COLOR ) ),
 
     aTableNameFT        ( this, CUI_RES( FT_TABLE_NAME ) ),
     aValSetColorTable   ( this, CUI_RES( CTL_COLORTABLE ) ),
@@ -98,20 +98,20 @@ SvxColorTabPage::SvxColorTabPage
     aCtlPreviewNew      ( this, CUI_RES( CTL_PREVIEW_NEW ) ),
 
     aLbColorModel       ( this, CUI_RES( LB_COLORMODEL ) ),
-    aFtColorModel1      ( this, CUI_RES( FT_1 ) ),
-    aMtrFldColorModel1  ( this, CUI_RES( MTR_FLD_1 ) ),
-    aFtColorModel2      ( this, CUI_RES( FT_2 ) ),
-    aMtrFldColorModel2  ( this, CUI_RES( MTR_FLD_2 ) ),
-    aFtColorModel3      ( this, CUI_RES( FT_3 ) ),
-    aMtrFldColorModel3  ( this, CUI_RES( MTR_FLD_3 ) ),
-    aFtColorModel4      ( this, CUI_RES( FT_4 ) ),
-    aMtrFldColorModel4  ( this, CUI_RES( MTR_FLD_4 ) ),
-    aBtnAdd             ( this, CUI_RES( BTN_ADD ) ),
-    aBtnModify          ( this, CUI_RES( BTN_MODIFY ) ),
-    aBtnWorkOn          ( this, CUI_RES( BTN_WORK_ON ) ),
-    aBtnDelete          ( this, CUI_RES( BTN_DELETE ) ),
-    aBtnLoad            ( this, CUI_RES( BTN_LOAD ) ),
-    aBtnSave            ( this, CUI_RES( BTN_SAVE ) ),
+    aFtColorModel1		( this, CUI_RES( FT_1 ) ),
+    aMtrFldColorModel1	( this, CUI_RES( MTR_FLD_1 ) ),
+    aFtColorModel2		( this, CUI_RES( FT_2 ) ),
+    aMtrFldColorModel2	( this, CUI_RES( MTR_FLD_2 ) ),
+    aFtColorModel3		( this, CUI_RES( FT_3 ) ),
+    aMtrFldColorModel3	( this, CUI_RES( MTR_FLD_3 ) ),
+    aFtColorModel4		( this, CUI_RES( FT_4 ) ),
+    aMtrFldColorModel4	( this, CUI_RES( MTR_FLD_4 ) ),
+    aBtnAdd 			( this, CUI_RES( BTN_ADD ) ),
+    aBtnModify			( this, CUI_RES( BTN_MODIFY ) ),
+    aBtnWorkOn			( this, CUI_RES( BTN_WORK_ON ) ),
+    aBtnDelete			( this, CUI_RES( BTN_DELETE ) ),
+    aBtnLoad			( this, CUI_RES( BTN_LOAD ) ),
+    aBtnSave			( this, CUI_RES( BTN_SAVE ) ),
 
     rOutAttrs           ( rInAttrs ),
     pColorTab( NULL ),
@@ -227,8 +227,8 @@ void SvxColorTabPage::ActivatePage( const SfxItemSet& )
 
             // Ermitteln (evtl. abschneiden) des Namens und in
             // der GroupBox darstellen
-            String          aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
-            INetURLObject   aURL( pColorTab->GetPath() );
+            String			aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+            INetURLObject	aURL( pColorTab->GetPath() );
 
             aURL.Append( pColorTab->GetName() );
             DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index ef48bbbe9483..270c7b9384e5 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -61,7 +61,7 @@
 
 /*************************************************************************
 |*
-|*  Dialog zum Aendern und Definieren der Farbverlaeufe
+|*	Dialog zum Aendern und Definieren der Farbverlaeufe
 |*
 \************************************************************************/
 
@@ -70,20 +70,20 @@ SvxGradientTabPage::SvxGradientTabPage
     Window* pParent,
     const SfxItemSet& rInAttrs
 ) :
-    SfxTabPage          ( pParent, CUI_RES( RID_SVXPAGE_GRADIENT ), rInAttrs ),
+    SfxTabPage			( pParent, CUI_RES( RID_SVXPAGE_GRADIENT ), rInAttrs ),
 
     aFlProp             ( this, CUI_RES( FL_PROP ) ),
     aFtType             ( this, CUI_RES( FT_TYPE ) ),
-    aLbGradientType     ( this, CUI_RES( LB_GRADIENT_TYPES ) ),
-    aFtCenterX          ( this, CUI_RES( FT_CENTER_X ) ),
-    aMtrCenterX         ( this, CUI_RES( MTR_CENTER_X ) ),
-    aFtCenterY          ( this, CUI_RES( FT_CENTER_Y ) ),
-    aMtrCenterY         ( this, CUI_RES( MTR_CENTER_Y ) ),
-    aFtAngle            ( this, CUI_RES( FT_ANGLE ) ),
-    aMtrAngle           ( this, CUI_RES( MTR_ANGLE ) ),
-    aFtBorder           ( this, CUI_RES( FT_BORDER ) ),
-    aMtrBorder          ( this, CUI_RES( MTR_BORDER ) ),
-    aFtColorFrom        ( this, CUI_RES( FT_COLOR_FROM ) ),
+    aLbGradientType		( this, CUI_RES( LB_GRADIENT_TYPES ) ),
+    aFtCenterX			( this, CUI_RES( FT_CENTER_X ) ),
+    aMtrCenterX			( this, CUI_RES( MTR_CENTER_X ) ),
+    aFtCenterY			( this, CUI_RES( FT_CENTER_Y ) ),
+    aMtrCenterY			( this, CUI_RES( MTR_CENTER_Y ) ),
+    aFtAngle			( this, CUI_RES( FT_ANGLE ) ),
+    aMtrAngle			( this, CUI_RES( MTR_ANGLE ) ),
+    aFtBorder			( this, CUI_RES( FT_BORDER ) ),
+    aMtrBorder			( this, CUI_RES( MTR_BORDER ) ),
+    aFtColorFrom		( this, CUI_RES( FT_COLOR_FROM ) ),
     aLbColorFrom        ( this, CUI_RES( LB_COLOR_FROM ) ),
     aMtrColorFrom       ( this, CUI_RES( MTR_COLOR_FROM ) ),
     aFtColorTo          ( this, CUI_RES( FT_COLOR_TO ) ),
@@ -91,11 +91,11 @@ SvxGradientTabPage::SvxGradientTabPage
     aMtrColorTo         ( this, CUI_RES( MTR_COLOR_TO ) ),
     aLbGradients        ( this, CUI_RES( LB_GRADIENTS ) ),
     aCtlPreview         ( this, CUI_RES( CTL_PREVIEW ) ),
-    aBtnAdd             ( this, CUI_RES( BTN_ADD ) ),
-    aBtnModify          ( this, CUI_RES( BTN_MODIFY ) ),
-    aBtnDelete          ( this, CUI_RES( BTN_DELETE ) ),
-    aBtnLoad            ( this, CUI_RES( BTN_LOAD ) ),
-    aBtnSave            ( this, CUI_RES( BTN_SAVE ) ),
+    aBtnAdd				( this, CUI_RES( BTN_ADD ) ),
+    aBtnModify			( this, CUI_RES( BTN_MODIFY ) ),
+    aBtnDelete			( this, CUI_RES( BTN_DELETE ) ),
+    aBtnLoad			( this, CUI_RES( BTN_LOAD ) ),
+    aBtnSave			( this, CUI_RES( BTN_SAVE ) ),
 
     rOutAttrs           ( rInAttrs ),
 
@@ -218,8 +218,8 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet&  )
 
             // Ermitteln (evtl. abschneiden) des Namens und in
             // der GroupBox darstellen
-            String          aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
-            INetURLObject   aURL( pGradientList->GetPath() );
+            String			aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+            INetURLObject	aURL( pGradientList->GetPath() );
 
             aURL.Append( pGradientList->GetName() );
             DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
@@ -338,9 +338,9 @@ BOOL SvxGradientTabPage::FillItemSet( SfxItemSet& rSet )
     {
         // CheckChanges(); <-- doppelte Abfrage ?
 
-        XGradient*  pXGradient = NULL;
-        String      aString;
-        USHORT      nPos = aLbGradients.GetSelectEntryPos();
+        XGradient*	pXGradient = NULL;
+        String	  	aString;
+        USHORT	  	nPos = aLbGradients.GetSelectEntryPos();
         if( nPos != LISTBOX_ENTRY_NOTFOUND )
         {
             pXGradient = new XGradient( pGradientList->GetGradient( nPos )->GetGradient() );
@@ -513,7 +513,7 @@ IMPL_LINK( SvxGradientTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
 #ifdef WNT
         // hack: #31355# W.P.
         Rectangle aRect( aLbGradients.GetPosPixel(), aLbGradients.GetSizePixel() );
-        if( TRUE ) {                // ??? overlapped with pDlg
+        if( TRUE ) {				// ??? overlapped with pDlg
                                     // and srolling
             Invalidate( aRect );
             //aLbGradients.Invalidate();
@@ -771,8 +771,8 @@ IMPL_LINK( SvxGradientTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
     aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE ) );
     if ( aDlg.Execute() == ERRCODE_NONE )
     {
-        INetURLObject   aURL( aDlg.GetPath() );
-        INetURLObject   aPathURL( aURL );
+        INetURLObject	aURL( aDlg.GetPath() );
+        INetURLObject	aPathURL( aURL );
 
         aPathURL.removeSegment();
         aPathURL.removeFinalSlash();
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 3ff6cb8134be..4d14a8558174 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -62,7 +62,7 @@
 
 /*************************************************************************
 |*
-|*  Dialog zum Aendern und Definieren der Schraffuren
+|*	Dialog zum Aendern und Definieren der Schraffuren
 |*
 \************************************************************************/
 
@@ -72,26 +72,26 @@ SvxHatchTabPage::SvxHatchTabPage
     const SfxItemSet& rInAttrs
 ) :
 
-    SvxTabPage          ( pParent, CUI_RES( RID_SVXPAGE_HATCH ), rInAttrs ),
+    SvxTabPage			( pParent, CUI_RES( RID_SVXPAGE_HATCH ), rInAttrs ),
 
     aFtDistance         ( this, CUI_RES( FT_LINE_DISTANCE ) ),
-    aMtrDistance        ( this, CUI_RES( MTR_FLD_DISTANCE ) ),
-    aFtAngle            ( this, CUI_RES( FT_LINE_ANGLE ) ),
-    aMtrAngle           ( this, CUI_RES( MTR_FLD_ANGLE ) ),
-    aCtlAngle           ( this, CUI_RES( CTL_ANGLE ),
+    aMtrDistance		( this, CUI_RES( MTR_FLD_DISTANCE ) ),
+    aFtAngle			( this, CUI_RES( FT_LINE_ANGLE ) ),
+    aMtrAngle			( this, CUI_RES( MTR_FLD_ANGLE ) ),
+    aCtlAngle			( this, CUI_RES( CTL_ANGLE ),
                                     RP_RB, 200, 80, CS_ANGLE ),
     aFlProp             ( this, CUI_RES( FL_PROP ) ),
-    aFtLineType         ( this, CUI_RES( FT_LINE_TYPE ) ),
-    aLbLineType         ( this, CUI_RES( LB_LINE_TYPE ) ),
-    aFtLineColor        ( this, CUI_RES( FT_LINE_COLOR ) ),
-    aLbLineColor        ( this, CUI_RES( LB_LINE_COLOR ) ),
-    aLbHatchings        ( this, CUI_RES( LB_HATCHINGS ) ),
-    aCtlPreview         ( this, CUI_RES( CTL_PREVIEW ) ),
-    aBtnAdd             ( this, CUI_RES( BTN_ADD ) ),
-    aBtnModify          ( this, CUI_RES( BTN_MODIFY ) ),
-    aBtnDelete          ( this, CUI_RES( BTN_DELETE ) ),
-    aBtnLoad            ( this, CUI_RES( BTN_LOAD ) ),
-    aBtnSave            ( this, CUI_RES( BTN_SAVE ) ),
+    aFtLineType			( this, CUI_RES( FT_LINE_TYPE ) ),
+    aLbLineType			( this, CUI_RES( LB_LINE_TYPE ) ),
+    aFtLineColor		( this, CUI_RES( FT_LINE_COLOR ) ),
+    aLbLineColor		( this, CUI_RES( LB_LINE_COLOR ) ),
+    aLbHatchings		( this, CUI_RES( LB_HATCHINGS ) ),
+    aCtlPreview			( this, CUI_RES( CTL_PREVIEW ) ),
+    aBtnAdd				( this, CUI_RES( BTN_ADD ) ),
+    aBtnModify			( this, CUI_RES( BTN_MODIFY ) ),
+    aBtnDelete			( this, CUI_RES( BTN_DELETE ) ),
+    aBtnLoad			( this, CUI_RES( BTN_LOAD ) ),
+    aBtnSave			( this, CUI_RES( BTN_SAVE ) ),
 
     rOutAttrs           ( rInAttrs ),
     pColorTab( NULL ),
@@ -202,8 +202,8 @@ void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet )
 
             // Ermitteln (evtl. abschneiden) des Namens und in
             // der GroupBox darstellen
-            String          aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
-            INetURLObject   aURL( pHatchingList->GetPath() );
+            String			aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+            INetURLObject	aURL( pHatchingList->GetPath() );
 
             aURL.Append( pHatchingList->GetName() );
             DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
@@ -251,9 +251,9 @@ int SvxHatchTabPage::DeactivatePage( SfxItemSet* _pSet )
 
 long SvxHatchTabPage::CheckChanges_Impl()
 {
-    if( aMtrDistance.GetText()           != aMtrDistance.GetSavedValue() ||
-        aMtrAngle.GetText()              != aMtrAngle.GetSavedValue() ||
-        aLbLineType.GetSelectEntryPos()  != aLbLineType.GetSavedValue()  ||
+    if( aMtrDistance.GetText()			 != aMtrDistance.GetSavedValue() ||
+        aMtrAngle.GetText()				 != aMtrAngle.GetSavedValue() ||
+        aLbLineType.GetSelectEntryPos()	 != aLbLineType.GetSavedValue()  ||
         aLbLineColor.GetSelectEntryPos() != aLbLineColor.GetSavedValue() ||
         aLbHatchings.GetSelectEntryPos() != aLbHatchings.GetSavedValue() )
     {
@@ -311,9 +311,9 @@ BOOL SvxHatchTabPage::FillItemSet( SfxItemSet& rSet )
         {
             // CheckChanges(); <-- doppelte Abfrage ?
 
-            XHatch* pXHatch = NULL;
-            String  aString;
-            USHORT  nPos = aLbHatchings.GetSelectEntryPos();
+            XHatch*	pXHatch = NULL;
+            String	aString;
+            USHORT	nPos = aLbHatchings.GetSelectEntryPos();
             if( nPos != LISTBOX_ENTRY_NOTFOUND )
             {
                 pXHatch = new XHatch( pHatchingList->GetHatch( nPos )->GetHatch() );
@@ -572,7 +572,7 @@ IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
 #ifdef WNT
         // hack: #31355# W.P.
         Rectangle aRect( aLbHatchings.GetPosPixel(), aLbHatchings.GetSizePixel() );
-        if( TRUE ) {                // ??? overlapped with pDlg
+        if( TRUE ) {				// ??? overlapped with pDlg
                                     // and srolling
             Invalidate( aRect );
             //aLbHatchings.Invalidate();
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 024de010e4db..2b48ff26dcc3 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include <svx/svdmodel.hxx>
 #include "svx/svxgrahicitem.hxx"
 #include <sfx2/request.hxx>
-#include "svx/ofaitem.hxx"
+#include "svx/ofaitem.hxx" 
 #include <svx/svdobj.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdmodel.hxx>
@@ -69,7 +69,7 @@
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 
-#define MAX_BMP_WIDTH   16
+#define MAX_BMP_WIDTH 	16
 #define MAX_BMP_HEIGHT  16
 // define ----------------------------------------------------------------
 
@@ -92,7 +92,7 @@ static USHORT pLineRanges[] =
 
 /*************************************************************************
 |*
-|*  Dialog zum Aendern der Linien
+|*	Dialog zum Aendern der Linien
 |*
 \************************************************************************/
 
@@ -101,7 +101,7 @@ SvxLineTabPage::SvxLineTabPage
     Window* pParent,
     const SfxItemSet& rInAttrs
 ) :
-    SvxTabPage          ( pParent, CUI_RES( RID_SVXPAGE_LINE ), rInAttrs ),
+    SvxTabPage			( pParent, CUI_RES( RID_SVXPAGE_LINE ), rInAttrs ),
     aFtLineStyle        ( this, CUI_RES( FT_LINE_STYLE ) ),
     aLbLineStyle        ( this, CUI_RES( LB_LINE_STYLE ) ),
     aFtColor            ( this, CUI_RES( FT_COLOR ) ),
@@ -123,26 +123,26 @@ SvxLineTabPage::SvxLineTabPage
     aFlLineEnds         ( this, CUI_RES( FL_LINE_ENDS ) ),
     aCtlPreview         ( this, CUI_RES( CTL_PREVIEW ) ),
     aFLSeparator        ( this, CUI_RES( FL_SEPARATOR ) ),
-
+    
     // #116827#
     maFLEdgeStyle       ( this, CUI_RES( FL_EDGE_STYLE ) ),
     maFTEdgeStyle       ( this, CUI_RES( FT_EDGE_STYLE ) ),
     maLBEdgeStyle       ( this, CUI_RES( LB_EDGE_STYLE ) ),
-
+    
     pSymbolList(NULL),
     bNewSize(false),
     nNumMenuGalleryItems(0),
     nSymbolType(SVX_SYMBOLTYPE_UNKNOWN), //unbekannt bzw. unchanged
     pSymbolAttr(NULL),
-    //#58425# Symbole auf einer Linie (z.B. StarChart)
+    //#58425# Symbole auf einer Linie (z.B. StarChart) 
     aFlSymbol           ( this, CUI_RES(FL_SYMBOL_FORMAT)),
     aSymbolMB           ( this, CUI_RES(MB_SYMBOL_BITMAP)),
     aSymbolWidthFT      ( this, CUI_RES(FT_SYMBOL_WIDTH)),
-    aSymbolWidthMF      ( this, CUI_RES(MF_SYMBOL_WIDTH)),
-    aSymbolHeightFT     ( this, CUI_RES(FT_SYMBOL_HEIGHT)),
-    aSymbolHeightMF     ( this, CUI_RES(MF_SYMBOL_HEIGHT)),
+    aSymbolWidthMF		( this, CUI_RES(MF_SYMBOL_WIDTH)),
+    aSymbolHeightFT		( this, CUI_RES(FT_SYMBOL_HEIGHT)),
+    aSymbolHeightMF		( this, CUI_RES(MF_SYMBOL_HEIGHT)),
     aSymbolRatioCB      ( this, CUI_RES(CB_SYMBOL_RATIO)),
-
+    
     bLastWidthModified(FALSE),
     aSymbolLastSize(Size(0,0)),
     bSymbols(FALSE),
@@ -343,7 +343,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
             // SelectStyleHdl_Impl( this );
         }
 
-        INetURLObject   aDashURL( pDashList->GetPath() );
+        INetURLObject	aDashURL( pDashList->GetPath() );
 
         aDashURL.Append( pDashList->GetName() );
         DBG_ASSERT( aDashURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
@@ -474,8 +474,8 @@ int SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet )
 BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
 {
     const SfxPoolItem* pOld = NULL;
-    USHORT  nPos;
-    BOOL    bModified = FALSE;
+    USHORT	nPos;
+    BOOL	bModified = FALSE;
 
     // Um evtl. Modifikationen der Liste vorzubeugen
     // werden Items anderer Seiten nicht gesetzt
@@ -485,7 +485,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
         if( nPos != LISTBOX_ENTRY_NOTFOUND &&
             nPos != aLbLineStyle.GetSavedValue() )
         {
-            XLineStyleItem* pStyleItem = NULL;
+            XLineStyleItem*	pStyleItem = NULL;
 
             if( nPos == 0 )
                 pStyleItem = new XLineStyleItem( XLINE_NONE );
@@ -859,8 +859,8 @@ BOOL SvxLineTabPage::FillXLSet_Impl()
 
 void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
 {
-    String      aString;
-    XLineStyle  eXLS; // XLINE_NONE, XLINE_SOLID, XLINE_DASH
+    String		aString;
+    XLineStyle	eXLS; // XLINE_NONE, XLINE_SOLID, XLINE_DASH
 
     // Linienstil
     const SfxPoolItem *pPoolItem;
@@ -1172,10 +1172,10 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
     else
         aMtrTransparent.SetText( String() );
 
-    if( !aLbStartStyle.IsEnabled()  &&
-        !aLbEndStyle.IsEnabled()    &&
+    if( !aLbStartStyle.IsEnabled()	&&
+        !aLbEndStyle.IsEnabled()	&&
         !aMtrStartWidth.IsEnabled() &&
-        !aMtrEndWidth.IsEnabled()   &&
+        !aMtrEndWidth.IsEnabled()	&&
         !aTsbCenterStart.IsEnabled()&&
         !aTsbCenterEnd.IsEnabled() )
     {
@@ -1244,7 +1244,7 @@ SfxTabPage* SvxLineTabPage::Create( Window* pWindow,
 
 //------------------------------------------------------------------------
 
-USHORT* SvxLineTabPage::GetRanges()
+USHORT*	SvxLineTabPage::GetRanges()
 {
     return( pLineRanges );
 }
@@ -1740,7 +1740,7 @@ IMPL_LINK( SvxLineTabPage, SizeHdl_Impl, MetricField *, pField)
     nWidthVal = OutputDevice::LogicToLogic(nWidthVal,MAP_100TH_MM,(MapUnit)ePoolUnit );
     nHeightVal = OutputDevice::LogicToLogic(nHeightVal,MAP_100TH_MM,(MapUnit)ePoolUnit);
     aSymbolSize=Size(nWidthVal,nHeightVal);
-    double  fSizeRatio = (double)1;
+    double	fSizeRatio = (double)1;
 
     if(bRatio)
     {
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 4aeb0959456e..48471ae74e6d 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -65,7 +65,7 @@
 
 /*************************************************************************
 |*
-|*  Dialog zum Definieren von Linienstilen
+|*	Dialog zum Definieren von Linienstilen
 |*
 \************************************************************************/
 
@@ -81,22 +81,22 @@ SvxLineDefTabPage::SvxLineDefTabPage
     aFTLinestyle    ( this, CUI_RES( FT_LINESTYLE ) ),
     aLbLineStyles   ( this, CUI_RES( LB_LINESTYLES ) ),
     aFtType         ( this, CUI_RES( FT_TYPE ) ),
-    aLbType1        ( this, CUI_RES( LB_TYPE_1 ) ),
-    aLbType2        ( this, CUI_RES( LB_TYPE_2 ) ),
-    aFtNumber       ( this, CUI_RES( FT_NUMBER ) ),
-    aNumFldNumber1  ( this, CUI_RES( NUM_FLD_1 ) ),
-    aNumFldNumber2  ( this, CUI_RES( NUM_FLD_2 ) ),
+    aLbType1		( this, CUI_RES( LB_TYPE_1 ) ),
+    aLbType2		( this, CUI_RES( LB_TYPE_2 ) ),
+    aFtNumber		( this, CUI_RES( FT_NUMBER ) ),
+    aNumFldNumber1	( this, CUI_RES( NUM_FLD_1 ) ),
+    aNumFldNumber2	( this, CUI_RES( NUM_FLD_2 ) ),
     aFtLength       ( this, CUI_RES( FT_LENGTH ) ),
     aMtrLength1     ( this, CUI_RES( MTR_FLD_LENGTH_1 ) ),
     aMtrLength2     ( this, CUI_RES( MTR_FLD_LENGTH_2 ) ),
     aFtDistance     ( this, CUI_RES( FT_DISTANCE ) ),
-    aMtrDistance    ( this, CUI_RES( MTR_FLD_DISTANCE ) ),
+    aMtrDistance	( this, CUI_RES( MTR_FLD_DISTANCE ) ),
     aCbxSynchronize ( this, CUI_RES( CBX_SYNCHRONIZE ) ),
     aBtnAdd         ( this, CUI_RES( BTN_ADD ) ),
-    aBtnModify      ( this, CUI_RES( BTN_MODIFY ) ),
-    aBtnDelete      ( this, CUI_RES( BTN_DELETE ) ),
+    aBtnModify		( this, CUI_RES( BTN_MODIFY ) ),
+    aBtnDelete		( this, CUI_RES( BTN_DELETE ) ),
     aBtnLoad        ( this, CUI_RES( BTN_LOAD ) ),
-    aBtnSave        ( this, CUI_RES( BTN_SAVE ) ),
+    aBtnSave		( this, CUI_RES( BTN_SAVE ) ),
     aCtlPreview     ( this, CUI_RES( CTL_PREVIEW ) ),
 
     rOutAttrs       ( rInAttrs ),
@@ -204,13 +204,13 @@ void SvxLineDefTabPage::ActivatePage( const SfxItemSet& )
 
             // Ermitteln (evtl. abschneiden) des Namens und in
             // der GroupBox darstellen
-            String          aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
-            INetURLObject   aURL( pDashList->GetPath() );
+            String			aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+            INetURLObject	aURL( pDashList->GetPath() );
 
             aURL.Append( pDashList->GetName() );
             DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
 
-/*          if ( aURL.getBase().Len() > 18 )
+/*			if ( aURL.getBase().Len() > 18 )
             {
                 aString += aURL.getBase().Copy( 0, 15 );
                 aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) );
@@ -245,13 +245,13 @@ void SvxLineDefTabPage::CheckChanges_Impl()
     // wird hier benutzt, um Aenderungen NICHT zu verlieren
     //XDashStyle eXDS;
 
-    if( aNumFldNumber1.GetText()     != aNumFldNumber1.GetSavedValue() ||
-        aMtrLength1.GetText()        != aMtrLength1.GetSavedValue() ||
+    if( aNumFldNumber1.GetText() 	 != aNumFldNumber1.GetSavedValue() ||
+        aMtrLength1.GetText() 		 != aMtrLength1.GetSavedValue() ||
         aLbType1.GetSelectEntryPos() != aLbType1.GetSavedValue() ||
-        aNumFldNumber2.GetText()     != aNumFldNumber2.GetSavedValue() ||
-        aMtrLength2.GetText()        != aMtrLength2.GetSavedValue() ||
+        aNumFldNumber2.GetText() 	 != aNumFldNumber2.GetSavedValue() ||
+        aMtrLength2.GetText() 		 != aMtrLength2.GetSavedValue() ||
         aLbType2.GetSelectEntryPos() != aLbType2.GetSavedValue() ||
-        aMtrDistance.GetText()       != aMtrDistance.GetSavedValue() )
+        aMtrDistance.GetText() 		 != aMtrDistance.GetSavedValue() )
     {
         ResMgr& rMgr = CUI_MGR();
         Image aWarningBoxImage = WarningBox::GetStandardImage();
@@ -820,7 +820,7 @@ IMPL_LINK( SvxLineDefTabPage, ClickLoadHdl_Impl, void *, EMPTYARG )
 
                     pDashList->SetName( aURL.getName() );
 
-/*                  // Ermitteln (evtl. abschneiden) des Namens und in
+/*					// Ermitteln (evtl. abschneiden) des Namens und in
                     // der GroupBox darstellen
                     String aString( ResId( RID_SVXSTR_TABLE, rMgr ) );
                     aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
@@ -898,7 +898,7 @@ IMPL_LINK( SvxLineDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
 
         if( pDashList->Save() )
         {
-/*          // Ermitteln (evtl. abschneiden) des Namens und in
+/*			// Ermitteln (evtl. abschneiden) des Namens und in
             // der GroupBox darstellen
             String aString( CUI_RES( RID_SVXSTR_TABLE ) );
             aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
@@ -934,7 +934,7 @@ void SvxLineDefTabPage::FillDash_Impl()
 {
     XDashStyle eXDS;
 
-/*  Alle Stile werden z.Z. nicht benutzt
+/*	Alle Stile werden z.Z. nicht benutzt
     if( aRbtEnds1.IsChecked() )
         eXDS = XDASH_ROUND;
     else if( aRbtEnds2.IsChecked() )
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 68cbc76aa7a0..749e83f12e21 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 /*************************************************************************
 |*
-|*  Dialog zum Definieren von Linienenden-Stilen
+|*	Dialog zum Definieren von Linienenden-Stilen
 |*
 \************************************************************************/
 
@@ -90,7 +90,7 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage
     aBtnModify          ( this, CUI_RES( BTN_MODIFY ) ),
     aBtnDelete          ( this, CUI_RES( BTN_DELETE ) ),
     aBtnLoad            ( this, CUI_RES( BTN_LOAD ) ),
-    aBtnSave            ( this, CUI_RES( BTN_SAVE ) ),
+    aBtnSave 		    ( this, CUI_RES( BTN_SAVE ) ),
     aFiTip              ( this, CUI_RES( FI_TIP ) ),
     aCtlPreview         ( this, CUI_RES( CTL_PREVIEW ) ),
 
@@ -186,13 +186,13 @@ void SvxLineEndDefTabPage::ActivatePage( const SfxItemSet& )
                 aLbLineEnds.SelectEntryPos( *pPosLineEndLb );
                 SelectLineEndHdl_Impl( this );
             }
-            INetURLObject   aURL( pLineEndList->GetPath() );
+            INetURLObject	aURL( pLineEndList->GetPath() );
 
             aURL.Append( pLineEndList->GetName() );
             DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
-/*          // Ermitteln (evtl. abschneiden) des Namens und in
+/*			// Ermitteln (evtl. abschneiden) des Namens und in
             // der GroupBox darstellen
-            String          aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+            String			aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
 
             if ( aURL.getBase().Len() > 18 )
             {
@@ -629,7 +629,7 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickLoadHdl_Impl, void *, EMPTYARG )
 
                     pLineEndList->SetName( aURL.getName() );
 
-/*                  // Ermitteln (evtl. abschneiden) des Namens und in
+/*					// Ermitteln (evtl. abschneiden) des Namens und in
                     // der GroupBox darstellen
                     String aString( ResId( RID_SVXSTR_TABLE, rMgr ) );
                     aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
@@ -694,8 +694,8 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
     aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE ) );
     if ( aDlg.Execute() == ERRCODE_NONE )
     {
-        INetURLObject   aURL( aDlg.GetPath() );
-        INetURLObject   aPathURL( aURL );
+        INetURLObject	aURL( aDlg.GetPath() );
+        INetURLObject	aPathURL( aURL );
 
         aPathURL.removeSegment();
         aPathURL.removeFinalSlash();
@@ -705,7 +705,7 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
 
         if( pLineEndList->Save() )
         {
-/*          // Ermitteln (evtl. abschneiden) des Namens und in
+/*			// Ermitteln (evtl. abschneiden) des Namens und in
             // der GroupBox darstellen
             String aString( CUI_RES( RID_SVXSTR_TABLE ) );
             aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index bf615350c5c8..e57c19c874f5 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,26 +66,26 @@ static USHORT pShadowRanges[] =
 
 /*************************************************************************
 |*
-|*  Dialog zum Aendern des Schattens
+|*	Dialog zum Aendern des Schattens
 |*
 \************************************************************************/
 
 SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
 
-    SvxTabPage          ( pParent, CUI_RES( RID_SVXPAGE_SHADOW ), rInAttrs ),
+    SvxTabPage			( pParent, CUI_RES( RID_SVXPAGE_SHADOW ), rInAttrs ),
 
     aFlProp             ( this, CUI_RES( FL_PROP ) ),
     aTsbShowShadow      ( this, CUI_RES( TSB_SHOW_SHADOW ) ),
     aFtPosition         ( this, CUI_RES( FT_POSITION ) ),
     aCtlPosition        ( this, CUI_RES( CTL_POSITION ) ),
-    aFtDistance         ( this, CUI_RES( FT_DISTANCE ) ),
-    aMtrDistance        ( this, CUI_RES( MTR_FLD_DISTANCE ) ),
-    aFtShadowColor      ( this, CUI_RES( FT_SHADOW_COLOR ) ),
-    aLbShadowColor      ( this, CUI_RES( LB_SHADOW_COLOR ) ),
+    aFtDistance			( this, CUI_RES( FT_DISTANCE ) ),
+    aMtrDistance		( this, CUI_RES( MTR_FLD_DISTANCE ) ),
+    aFtShadowColor		( this, CUI_RES( FT_SHADOW_COLOR ) ),
+    aLbShadowColor		( this, CUI_RES( LB_SHADOW_COLOR ) ),
     aFtTransparent      ( this, CUI_RES( FT_TRANSPARENT ) ),
     aMtrTransparent      ( this, CUI_RES( MTR_SHADOW_TRANSPARENT ) ),
     aCtlXRectPreview    ( this, CUI_RES( CTL_COLOR_PREVIEW ) ),
-    rOutAttrs           ( rInAttrs ),
+    rOutAttrs			( rInAttrs ),
     pColorTab( NULL ),
     bDisable            ( FALSE ),
     pXPool              ( (XOutdevItemPool*) rInAttrs.GetPool() ),
@@ -279,8 +279,8 @@ int SvxShadowTabPage::DeactivatePage( SfxItemSet* _pSet )
 
 BOOL SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs )
 {
-    const SfxPoolItem*  pOld = NULL;
-    BOOL                bModified = FALSE;
+    const SfxPoolItem*	pOld = NULL;
+    BOOL				bModified = FALSE;
 
     if( !bDisable )
     {
@@ -305,14 +305,14 @@ BOOL SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs )
 
         switch( aCtlPosition.GetActualRP() )
         {
-            case RP_LT: nX = nY = -nXY;      break;
-            case RP_MT: nY = -nXY;           break;
+            case RP_LT: nX = nY = -nXY; 	 break;
+            case RP_MT: nY = -nXY;			 break;
             case RP_RT: nX = nXY; nY = -nXY; break;
-            case RP_LM: nX = -nXY;           break;
-            case RP_RM: nX = nXY;            break;
+            case RP_LM: nX = -nXY;			 break;
+            case RP_RM: nX = nXY;			 break;
             case RP_LB: nX = -nXY; nY = nXY; break;
-            case RP_MB: nY = nXY;            break;
-            case RP_RB: nX = nY = nXY;       break;
+            case RP_MB: nY = nXY; 			 break;
+            case RP_RB: nX = nY = nXY; 		 break;
             case RP_MM: break;
         }
 
@@ -425,7 +425,7 @@ void SvxShadowTabPage::Reset( const SfxItemSet& rAttrs )
                 SetMetricValue( aMtrDistance, nY < 0L ? -nY : nY, ePoolUnit );
 
             // Setzen des Schatten-Controls
-            if     ( nX <  0L && nY <  0L ) aCtlPosition.SetActualRP( RP_LT );
+            if	   ( nX <  0L && nY <  0L ) aCtlPosition.SetActualRP( RP_LT );
             else if( nX == 0L && nY <  0L ) aCtlPosition.SetActualRP( RP_MT );
             else if( nX >  0L && nY <  0L ) aCtlPosition.SetActualRP( RP_RT );
             else if( nX <  0L && nY == 0L ) aCtlPosition.SetActualRP( RP_LM );
@@ -502,7 +502,7 @@ SfxTabPage* SvxShadowTabPage::Create( Window* pWindow,
 
 //------------------------------------------------------------------------
 
-USHORT* SvxShadowTabPage::GetRanges()
+USHORT*	SvxShadowTabPage::GetRanges()
 {
     return( pShadowRanges );
 }
@@ -564,14 +564,14 @@ IMPL_LINK( SvxShadowTabPage, ModifyShadowHdl_Impl, void *, EMPTYARG )
     INT32 nXY = GetCoreValue( aMtrDistance, ePoolUnit );
     switch( aCtlPosition.GetActualRP() )
     {
-        case RP_LT: nX = nY = -nXY;      break;
-        case RP_MT: nY = -nXY;           break;
+        case RP_LT: nX = nY = -nXY; 	 break;
+        case RP_MT: nY = -nXY;			 break;
         case RP_RT: nX = nXY; nY = -nXY; break;
-        case RP_LM: nX = -nXY;           break;
-        case RP_RM: nX = nXY;            break;
+        case RP_LM: nX = -nXY;			 break;
+        case RP_RM: nX = nXY;			 break;
         case RP_LB: nX = -nXY; nY = nXY; break;
-        case RP_MB: nY = nXY;            break;
-        case RP_RB: nX = nY = nXY;       break;
+        case RP_MB: nY = nXY; 			 break;
+        case RP_RB: nX = nY = nXY; 		 break;
         case RP_MM: break;
     }
 
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 2c6b73bc2985..c54658e495e3 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,12 +132,12 @@ SvxTransformTabDialog::SvxTransformTabDialog( Window* pParent, const SfxItemSet*
 
     //different positioning page in Writer
     if(nAnchorCtrls & 0x00ff)
-    {
+    {        
         AddTabPage(RID_SVXPAGE_SWPOSSIZE, SvxSwPosSizeTabPage::Create, SvxSwPosSizeTabPage::GetRanges);
         RemoveTabPage(RID_SVXPAGE_POSITION_SIZE);
     }
     else
-    {
+    {        
         AddTabPage(RID_SVXPAGE_POSITION_SIZE, SvxPositionSizeTabPage::Create, SvxPositionSizeTabPage::GetRanges);
         RemoveTabPage(RID_SVXPAGE_SWPOSSIZE);
     }
@@ -163,7 +163,7 @@ void SvxTransformTabDialog::PageCreated(USHORT nId, SfxTabPage &rPage)
             SvxPositionSizeTabPage& rSvxPos =  static_cast<SvxPositionSizeTabPage&>(rPage);
             rSvxPos.SetView(pView);
             rSvxPos.Construct();
-
+            
             if(nAnchorCtrls & SVX_OBJ_NORESIZE)
             {
                 rSvxPos.DisableResize();
@@ -174,7 +174,7 @@ void SvxTransformTabDialog::PageCreated(USHORT nId, SfxTabPage &rPage)
                 rSvxPos.DisableProtect();
                 rSvxPos.UpdateControlStates();
             }
-
+        
             break;
         }
         case RID_SVXPAGE_SWPOSSIZE :
@@ -194,7 +194,7 @@ void SvxTransformTabDialog::PageCreated(USHORT nId, SfxTabPage &rPage)
 
             rSvxAng.SetView( pView );
             rSvxAng.Construct();
-
+        
             break;
         }
 
@@ -226,18 +226,18 @@ void SvxTransformTabDialog::SetValidateFramePosLink(const Link& rLink)
 
 SvxAngleTabPage::SvxAngleTabPage( Window* pParent, const SfxItemSet& rInAttrs  ) :
     SvxTabPage              ( pParent, CUI_RES( RID_SVXPAGE_ANGLE ), rInAttrs ),
-    aFlPosition             ( this, CUI_RES( FL_POSITION ) ),
+    aFlPosition				( this, CUI_RES( FL_POSITION ) ),
     aFtPosX                 ( this, CUI_RES( FT_POS_X ) ),
     aMtrPosX                ( this, CUI_RES( MTR_FLD_POS_X ) ),
     aFtPosY                 ( this, CUI_RES( FT_POS_Y ) ),
     aMtrPosY                ( this, CUI_RES( MTR_FLD_POS_Y ) ),
-    aFtPosPresets           ( this, CUI_RES(FT_POSPRESETS) ),
+    aFtPosPresets			( this, CUI_RES(FT_POSPRESETS) ),	
     aCtlRect                ( this, CUI_RES( CTL_RECT ) ),
-
+    
     aFlAngle                ( this, CUI_RES( FL_ANGLE ) ),
     aFtAngle                ( this, CUI_RES( FT_ANGLE ) ),
     aMtrAngle               ( this, CUI_RES( MTR_FLD_ANGLE ) ),
-    aFtAnglePresets         ( this, CUI_RES(FT_ANGLEPRESETS) ),
+    aFtAnglePresets			( this, CUI_RES(FT_ANGLEPRESETS) ),	
     aCtlAngle               ( this, CUI_RES( CTL_ANGLE ),
                                 RP_RB, 200, 80, CS_ANGLE ),
     rOutAttrs               ( rInAttrs )
@@ -707,34 +707,34 @@ void SvxSlantTabPage::PointChanged( Window* , RECT_POINT  )
 
 SvxPositionSizeTabPage::SvxPositionSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs  ) :
     SvxTabPage      ( pParent, CUI_RES( RID_SVXPAGE_POSITION_SIZE ), rInAttrs ),
-    maFlPosition        ( this, CUI_RES( FL_POSITION ) ),
-    maFtPosX            ( this, CUI_RES( FT_POS_X ) ),
-    maMtrPosX           ( this, CUI_RES( MTR_FLD_POS_X ) ),
-    maFtPosY            ( this, CUI_RES( FT_POS_Y ) ),
-    maMtrPosY           ( this, CUI_RES( MTR_FLD_POS_Y ) ),
+    maFlPosition		( this, CUI_RES( FL_POSITION ) ),
+    maFtPosX			( this, CUI_RES( FT_POS_X ) ),
+    maMtrPosX			( this, CUI_RES( MTR_FLD_POS_X ) ),
+    maFtPosY			( this, CUI_RES( FT_POS_Y ) ),
+    maMtrPosY			( this, CUI_RES( MTR_FLD_POS_Y ) ),
     maFtPosReference    ( this, CUI_RES( FT_POSREFERENCE ) ),
     maCtlPos            ( this, CUI_RES( CTL_POSRECT ), RP_LT ),
-
+    
     maFlSize                         ( this, CUI_RES( FL_SIZE ) ),
     maFtWidth                        ( this, CUI_RES( FT_WIDTH ) ),
     maMtrWidth                       ( this, CUI_RES( MTR_FLD_WIDTH ) ),
     maFtHeight                       ( this, CUI_RES( FT_HEIGHT ) ),
     maMtrHeight                      ( this, CUI_RES( MTR_FLD_HEIGHT ) ),
     maCbxScale                       ( this, CUI_RES( CBX_SCALE ) ),
-    maFtSizeReference                ( this, CUI_RES( FT_SIZEREFERENCE) ),
+    maFtSizeReference                ( this, CUI_RES( FT_SIZEREFERENCE) ),       
     maCtlSize                        ( this, CUI_RES( CTL_SIZERECT ), RP_LT ),
-
+    
     maFlProtect         ( this, CUI_RES( FL_PROTECT) ),
     maTsbPosProtect     ( this, CUI_RES( TSB_POSPROTECT ) ),
     maTsbSizeProtect                 ( this, CUI_RES( TSB_SIZEPROTECT ) ),
-
+    
 
     maFlAdjust                       ( this, CUI_RES( FL_ADJUST ) ),
-    maTsbAutoGrowWidth              ( this, CUI_RES( TSB_AUTOGROW_WIDTH ) ),
-    maTsbAutoGrowHeight             ( this, CUI_RES( TSB_AUTOGROW_HEIGHT ) ),
-
-    maFlDivider                     (this, CUI_RES( FL_DIVIDER ) ),
+    maTsbAutoGrowWidth				( this, CUI_RES( TSB_AUTOGROW_WIDTH ) ),
+    maTsbAutoGrowHeight				( this, CUI_RES( TSB_AUTOGROW_HEIGHT ) ),
 
+    maFlDivider						(this, CUI_RES( FL_DIVIDER ) ),
+    
     mrOutAttrs       ( rInAttrs ),
     mnProtectSizeState( STATE_NOCHECK ),
     mbPageDisabled   ( FALSE ),
@@ -830,7 +830,7 @@ void SvxPositionSizeTabPage::Construct()
         }
     }
 
-    // this should happen via SID_ATTR_TRANSFORM_AUTOSIZE
+    // this should happen via SID_ATTR_TRANSFORM_AUTOSIZE 
     if(1 == rMarkList.GetMarkCount())
     {
         const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
@@ -1622,7 +1622,7 @@ IMPL_LINK( SvxPositionSizeTabPage, ChangeWidthHdl, void *, EMPTYARG )
     if( maCbxScale.IsChecked() && maCbxScale.IsEnabled() )
     {
         sal_Int64 nHeight(basegfx::fround64((mfOldHeight * (double)maMtrWidth.GetValue()) / mfOldWidth));
-
+        
         if(nHeight <= maMtrHeight.GetMax(FUNIT_NONE))
         {
             maMtrHeight.SetUserValue(nHeight, FUNIT_NONE);
@@ -1631,7 +1631,7 @@ IMPL_LINK( SvxPositionSizeTabPage, ChangeWidthHdl, void *, EMPTYARG )
         {
             nHeight = maMtrHeight.GetMax(FUNIT_NONE);
             maMtrHeight.SetUserValue(nHeight);
-
+            
             const sal_Int64 nWidth(basegfx::fround64((mfOldWidth * (double)nHeight) / mfOldHeight));
             maMtrWidth.SetUserValue(nWidth, FUNIT_NONE);
         }
diff --git a/cui/source/tabpages/transfrm.hrc b/cui/source/tabpages/transfrm.hrc
index 2d57b7208f68..28d81fa62355 100644
--- a/cui/source/tabpages/transfrm.hrc
+++ b/cui/source/tabpages/transfrm.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR 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.
  *
  ************************************************************************/
-#define TAB_CONTROL                 1
-#define BTN_OK                      2
-#define BTN_CANCEL                  3
-#define BTN_HELP                    4
-#define FT_POS_X                    5
-#define FT_POS_Y                    6
-#define MTR_FLD_POS_X               7
-#define MTR_FLD_POS_Y               8
-#define CBX_COPY                    9
-#define TSB_PROTECT                 10
-#define TSB_AUTO                    11
-#define TSB_AUTOGROW_HEIGHT         12
-#define TSB_AUTOGROW_WIDTH          13
-#define BTN_RESET                   14
-#define FT_WIDTH                    15
-#define FT_HEIGHT                   16
-#define MTR_FLD_WIDTH               17
-#define MTR_FLD_HEIGHT              18
-#define MTR_FLD_ANGLE               19
-#define CTL_RECT                    20
-#define CTL_ANGLE                   21
-#define CBX_SCALE                   22
-#define FL_ADJUST                   23
-#define FL_POSITION                 24
-#define FL_SIZE                     25
-#define FL_SLANT                    26
-#define FL_RADIUS                   27
-#define FT_RADIUS                   28
-#define MTR_FLD_RADIUS              29
-#define FL_ANGLE                    30
-#define FT_ANGLE                    31
-#define TSB_VERTICAL                32
-#define FL_ANCHOR                   33
-#define FT_ANCHOR                   34
-#define LB_ANCHOR                   35
-#define FT_ORIENT                   36
-#define FT_REFERENCE                37
-#define FT_POSPRESETS               38
-#define FT_ANGLEPRESETS             39
-#define LB_ORIENT                   40
-#define FT_SIZEREFERENCE            41
-#define CTL_SIZERECT                42
-#define FT_POSREFERENCE             43
-#define CTL_POSRECT                 44
-#define TSB_POSPROTECT              45
-#define TSB_SIZEPROTECT             46
-#define FL_PROTECT                  47
-#define FL_DIVIDER                  48
+#define TAB_CONTROL					1
+#define BTN_OK						2
+#define BTN_CANCEL					3
+#define BTN_HELP					4
+#define FT_POS_X					5
+#define FT_POS_Y					6
+#define MTR_FLD_POS_X				7
+#define MTR_FLD_POS_Y				8
+#define CBX_COPY					9
+#define TSB_PROTECT					10
+#define TSB_AUTO					11
+#define TSB_AUTOGROW_HEIGHT			12
+#define TSB_AUTOGROW_WIDTH			13
+#define BTN_RESET					14
+#define FT_WIDTH					15
+#define FT_HEIGHT					16
+#define MTR_FLD_WIDTH				17
+#define MTR_FLD_HEIGHT				18
+#define MTR_FLD_ANGLE				19
+#define CTL_RECT					20
+#define CTL_ANGLE					21
+#define CBX_SCALE					22
+#define FL_ADJUST					23
+#define FL_POSITION					24
+#define FL_SIZE						25
+#define FL_SLANT					26
+#define FL_RADIUS					27
+#define FT_RADIUS					28
+#define MTR_FLD_RADIUS				29
+#define FL_ANGLE					30
+#define FT_ANGLE					31
+#define TSB_VERTICAL				32
+#define FL_ANCHOR					33
+#define FT_ANCHOR					34
+#define LB_ANCHOR					35
+#define FT_ORIENT					36
+#define FT_REFERENCE				37
+#define FT_POSPRESETS				38
+#define FT_ANGLEPRESETS				39
+#define LB_ORIENT					40
+#define FT_SIZEREFERENCE			41
+#define CTL_SIZERECT				42
+#define FT_POSREFERENCE				43
+#define CTL_POSRECT					44
+#define TSB_POSPROTECT				45
+#define TSB_SIZEPROTECT				46
+#define FL_PROTECT					47
+#define FL_DIVIDER					48
 
 //
diff --git a/cui/source/tabpages/transfrm.src b/cui/source/tabpages/transfrm.src
index 761fdcfb2349..5e57d5742344 100644
--- a/cui/source/tabpages/transfrm.src
+++ b/cui/source/tabpages/transfrm.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/cui/util/hidother.src b/cui/util/hidother.src
index 258d6404f19a..d5299d854fa5 100644
--- a/cui/util/hidother.src
+++ b/cui/util/hidother.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 "../source/inc/helpid.hrc"            // HID_XXX
 
-hidspecial HID_AUTOCORR_LANGUAGE                    { HelpId = HID_AUTOCORR_LANGUAGE; };
+hidspecial HID_AUTOCORR_LANGUAGE 					{ HelpId = HID_AUTOCORR_LANGUAGE; };
 hidspecial HID_CLB_EDIT_MODULES_DICS            { HelpID =  HID_CLB_EDIT_MODULES_DICS       ;};
 hidspecial HID_CLB_EDIT_MODULES_MODULES         { HelpID =  HID_CLB_EDIT_MODULES_MODULES    ;};
 hidspecial HID_CLB_LINGU_MODULES                { HelpID =  HID_CLB_LINGU_MODULES           ;};
diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx
index 02e8d01bf9b7..236eb1d8b85f 100644
--- a/embedserv/source/embed/docholder.cxx
+++ b/embedserv/source/embed/docholder.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 using namespace ::com::sun::star;
 
-extern ::rtl::OUString  getFilterNameFromGUID_Impl( GUID* );
+extern ::rtl::OUString	getFilterNameFromGUID_Impl( GUID* );
 
 // add mutex locking ???
 
@@ -139,7 +139,7 @@ void DocumentHolder::LoadDocInFrame( sal_Bool bPluginMode )
             -1,
             aAny,
             beans::PropertyState_DIRECT_VALUE);
-
+        
         aAny <<= sal_False;
         aSeq[1] = beans::PropertyValue(
             rtl::OUString(
@@ -147,7 +147,7 @@ void DocumentHolder::LoadDocInFrame( sal_Bool bPluginMode )
             -1,
             aAny,
             beans::PropertyState_DIRECT_VALUE);
-
+        
         aAny <<= (sal_Bool) sal_True;
         aSeq[2] = beans::PropertyValue(
             rtl::OUString(
@@ -295,7 +295,7 @@ HRESULT DocumentHolder::InPlaceActivate(
         {   // determine XWindow and window handle of parent
             HWND                          hWndxWinParent(0);
             uno::Reference<awt::XWindow>  xWin;
-
+            
             static const ::rtl::OUString aToolkitServiceName(
                 RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.awt.Toolkit" ) );
             uno::Reference<awt::XSystemChildFactory> xToolkit(
@@ -306,7 +306,7 @@ HRESULT DocumentHolder::InPlaceActivate(
                 if( !m_pCHatchWin )
                     m_pCHatchWin = new winwrap::CHatchWin(
                         m_hInstance,this);
-
+                
                 if(m_pCHatchWin->Init(hWndSite,/*ID_HATCHWINDOW*/2000, NULL)) {
                     m_pCHatchWin->RectsSet(&rcPos,&rcClip); //set visible area
                     hWndxWinParent = m_pCHatchWin->Window();
@@ -317,7 +317,7 @@ HRESULT DocumentHolder::InPlaceActivate(
                     delete m_pCHatchWin, m_pCHatchWin = 0;
                     hWndxWinParent = hWndSite;
                 }
-
+                
                 aAny <<= sal_Int32(hWndxWinParent);
                 xWin = uno::Reference<awt::XWindow>(
                     xToolkit->createSystemChild(
@@ -326,7 +326,7 @@ HRESULT DocumentHolder::InPlaceActivate(
                         lang::SystemDependent::SYSTEM_WIN32),
                     uno::UNO_QUERY);
             }
-
+            
             if(xWin.is()) {
                 xWin->setPosSize(
                     m_pCHatchWin ? HATCHWIN_BORDERWIDTHDEFAULT : 0,
@@ -335,7 +335,7 @@ HRESULT DocumentHolder::InPlaceActivate(
                     rcPos.bottom - rcPos.top,
                     awt::PosSize::POSSIZE);
                 xWin->setVisible(sal_True);
-
+                
                 m_xEditWindow = xWin;
                 m_hWndxWinParent = hWndxWinParent;
             }
@@ -347,7 +347,7 @@ HRESULT DocumentHolder::InPlaceActivate(
                 SetParent(m_hWndxWinParent,hWndSite);
                 ShowWindow(m_hWndxWinParent,SW_SHOW);  //Make visible.
             }
-
+            
             if ( !m_xFrame.is() )
                 // initially set size to "empty", this guarantees that the final resize
                 // is always executed (will be done by "SetObjectRects" after getting internal border)
@@ -359,7 +359,7 @@ HRESULT DocumentHolder::InPlaceActivate(
                     awt::PosSize::POSSIZE);
             m_xEditWindow->setVisible(sal_True);
         }
-
+        
         if(m_xContainerWindow.is()) {
             if(m_hWndxWinCont) {
                 if(m_pIOleIPFrame) {
@@ -371,7 +371,7 @@ HRESULT DocumentHolder::InPlaceActivate(
             }
             m_xContainerWindow->setVisible(true);
         }
-
+        
         if(m_xFrame.is())
             m_xFrame->activate();
         else {
@@ -381,10 +381,10 @@ HRESULT DocumentHolder::InPlaceActivate(
             m_xFrame = uno::Reference<frame::XFrame>(
                 m_xFactory->createInstance(aFrameServiceName),
                 uno::UNO_QUERY);
-
+            
             if(!m_xFrame.is())
                 return ERROR;
-
+            
             m_xFrame->initialize(m_xEditWindow);
 
             uno::Reference<frame::XDispatchProviderInterception>
@@ -399,13 +399,13 @@ HRESULT DocumentHolder::InPlaceActivate(
                     rtl::OUString::createFromAscii("LayoutManager"));
                 aAny >>= m_xLayoutManager;
             }
-
+            
             if(m_xLayoutManager.is())
                 m_xLayoutManager->setDockingAreaAcceptor(this);
-
+            
             // load the model into the frame
             LoadDocInFrame( sal_True );
-
+            
             static const ::rtl::OUString aDesktopServiceName (
                 RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.frame.Desktop" ) );
             uno::Reference< frame::XFramesSupplier > xDesktop(
@@ -413,7 +413,7 @@ HRESULT DocumentHolder::InPlaceActivate(
                 uno::UNO_QUERY );
             if(xDesktop.is())
                 xDesktop->getFrames()->append(m_xFrame);
-
+            
             // determine the menuhandle to get menutitems.
             if(m_xLayoutManager.is()) {
                 uno::Reference< ::com::sun::star::ui::XUIElement > xUIEl(
@@ -435,14 +435,14 @@ HRESULT DocumentHolder::InPlaceActivate(
                             "private:resource/menubar/menubar" )));
             }
         }
-
+        
         // TODO/cd: Workaround for status indicator bug. It always makes the
         // document window visible, when someone tries to use the status
         // indicator. As we save our document when we get the deactivation
         // from OLE this conflict to hide floating windows.
         if(m_xLayoutManager.is())
             m_xLayoutManager->setVisible(true);
-
+        
         // get document border and resize rects according to border
         GetDocumentBorder( &m_aBorder );
         SetObjectRects( &rcPos, &rcClip );
@@ -457,7 +457,7 @@ HRESULT DocumentHolder::InPlaceActivate(
         // setTitle(m_aDocumentNamePart);
         if (fIncludeUI)
             hr=UIActivate();
-
+        
         m_pIOleIPSite->DiscardUndoState();
     }
     catch( uno::Exception& )
@@ -501,7 +501,7 @@ void DocumentHolder::InPlaceDeactivate(void)
 //        CComPtr< IOleClientSite > pClientSite;
 //
 //        m_pIOleIPSite->QueryInterface(
-//              IID_IOleClientSite, (void**)&pClientSite );
+//		        IID_IOleClientSite, (void**)&pClientSite );
 //        if ( pClientSite )
 //            pClientSite->SaveObject();
 
@@ -881,7 +881,7 @@ uno::Reference< frame::XFrame > DocumentHolder::DocumentFrame()
 uno::Reference< frame::XDispatchProviderInterceptor > DocumentHolder::CreateNewInterceptor()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
-
+    
     ClearInterceptorInternally();
 
     uno::Reference< frame::XDispatchProviderInterceptor > xInterceptor( m_pInterceptor = new Interceptor( m_xOleAccess, this, m_bLink ) );
@@ -1320,14 +1320,14 @@ HRESULT DocumentHolder::SetContRects(LPCRECT aRect)
         memset(&wi,0,sizeof(wi));
         if(m_pIOleIPFrame) {
             m_pIOleIPFrame->GetBorder((LPRECT)&wi);
-            m_xContainerWindow->setPosSize(
+            m_xContainerWindow->setPosSize( 
                 0,0,
                 wi.right - wi.left,
                 wi.bottom - wi.top,
                 awt::PosSize::POSSIZE);
         }
         else
-           m_xContainerWindow->setPosSize(
+           m_xContainerWindow->setPosSize( 
             0,0,
             aRect->right - aRect->left,
             aRect->bottom - aRect->top,
@@ -1515,7 +1515,7 @@ DocumentHolder::queryClosing(
         util::CloseVetoException
     )
 {
-    if ( !m_bLink
+    if ( !m_bLink 
       && ( m_xDocument.is() && m_xDocument == aSource.Source || m_xFrame.is() && m_xFrame == aSource.Source ) )
         throw util::CloseVetoException();
 }
@@ -1635,7 +1635,7 @@ void SAL_CALL DocumentHolder::modified( const lang::EventObject& /*aEvent*/ )
 //         mgw.width[5]=1;
 //     }
 
-// Fix strange warnings about some
+// Fix strange warnings about some 
 // ATL::CAxHostWindow::QueryInterface|AddRef|Releae functions.
 // warning C4505: 'xxx' : unreferenced local function has been removed
 #if defined(_MSC_VER)
diff --git a/embedserv/source/embed/ed_idataobj.cxx b/embedserv/source/embed/ed_idataobj.cxx
index d4f75f4a6353..73e1ed629441 100644
--- a/embedserv/source/embed/ed_idataobj.cxx
+++ b/embedserv/source/embed/ed_idataobj.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ STDMETHODIMP EmbedDocument_Impl::GetDataHere( FORMATETC * pFormatetc, STGMEDIUM
     {
         if ( !( pFormatetc->tymed & TYMED_ISTORAGE ) )
             return DV_E_TYMED;
-
+            
         if ( !pMedium->pstg ) return STG_E_MEDIUMFULL;
 
         HRESULT hr = SaveTo_Impl( pMedium->pstg );
@@ -216,17 +216,17 @@ STDMETHODIMP EmbedDocument_Impl::QueryGetData( FORMATETC * pFormatetc )
         {
             if ( !( pFormatetc->tymed & TYMED_ENHMF ) )
                 return DV_E_TYMED;
-
+    
             return S_OK;
         }
         else if ( pFormatetc->cfFormat == CF_METAFILEPICT )
         {
-              if ( !( pFormatetc->tymed & TYMED_MFPICT ) )
+              if ( !( pFormatetc->tymed & TYMED_MFPICT ) ) 
                 return DV_E_TYMED;
-
+    
             return S_OK;
         }
-        else
+        else 
         {
             CLIPFORMAT cf_embSource = (CLIPFORMAT)RegisterClipboardFormatA( "Embed Source" );
             CLIPFORMAT cf_embObj = (CLIPFORMAT)RegisterClipboardFormatA( "Embedded Object" );
@@ -234,7 +234,7 @@ STDMETHODIMP EmbedDocument_Impl::QueryGetData( FORMATETC * pFormatetc )
             {
                 if ( !( pFormatetc->tymed & TYMED_ISTORAGE ) )
                     return DV_E_TYMED;
-
+                    
                 return S_OK;
             }
         }
@@ -252,7 +252,7 @@ STDMETHODIMP EmbedDocument_Impl::GetCanonicalFormatEtc( FORMATETC * pFormatetcIn
     pFormatetcOut->ptd = NULL;
     pFormatetcOut->cfFormat = pFormatetcIn->cfFormat;
     pFormatetcOut->dwAspect = DVASPECT_CONTENT;
-
+    
     if ( pFormatetcIn->cfFormat == CF_ENHMETAFILE )
     {
         pFormatetcOut->tymed = TYMED_ENHMF;
@@ -263,7 +263,7 @@ STDMETHODIMP EmbedDocument_Impl::GetCanonicalFormatEtc( FORMATETC * pFormatetcIn
           pFormatetcOut->tymed = TYMED_MFPICT;
         return S_OK;
     }
-    else
+    else 
     {
         CLIPFORMAT cf_embSource = (CLIPFORMAT)RegisterClipboardFormatA( "Embed Source" );
         CLIPFORMAT cf_embObj = (CLIPFORMAT)RegisterClipboardFormatA( "Embedded Object" );
@@ -295,7 +295,7 @@ STDMETHODIMP EmbedDocument_Impl::DAdvise( FORMATETC * pFormatetc, DWORD advf, IA
     if ( !m_pDAdviseHolder )
         if ( !SUCCEEDED( CreateDataAdviseHolder( &m_pDAdviseHolder ) ) || !m_pDAdviseHolder )
             return E_OUTOFMEMORY;
-
+    
     return m_pDAdviseHolder->Advise( (IDataObject*)this, pFormatetc, advf, pAdvSink, pdwConnection );
 }
 
@@ -304,7 +304,7 @@ STDMETHODIMP EmbedDocument_Impl::DUnadvise( DWORD dwConnection )
     if ( !m_pDAdviseHolder )
         if ( !SUCCEEDED( CreateDataAdviseHolder( &m_pDAdviseHolder ) ) || !m_pDAdviseHolder )
             return E_OUTOFMEMORY;
-
+    
     return m_pDAdviseHolder->Unadvise( dwConnection );
 }
 
@@ -313,11 +313,11 @@ STDMETHODIMP EmbedDocument_Impl::EnumDAdvise( IEnumSTATDATA ** ppenumAdvise )
     if ( !m_pDAdviseHolder )
         if ( !SUCCEEDED( CreateDataAdviseHolder( &m_pDAdviseHolder ) ) || !m_pDAdviseHolder )
             return E_OUTOFMEMORY;
-
+    
     return m_pDAdviseHolder->EnumAdvise( ppenumAdvise );
 }
 
-// Fix strange warnings about some
+// Fix strange warnings about some 
 // ATL::CAxHostWindow::QueryInterface|AddRef|Releae functions.
 // warning C4505: 'xxx' : unreferenced local function has been removed
 #if defined(_MSC_VER)
diff --git a/embedserv/source/embed/ed_iinplace.cxx b/embedserv/source/embed/ed_iinplace.cxx
index 5604cbb7739e..7e696463f01c 100644
--- a/embedserv/source/embed/ed_iinplace.cxx
+++ b/embedserv/source/embed/ed_iinplace.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 STDMETHODIMP EmbedDocument_Impl::GetWindow(HWND *hWnd)
 {
     OSL_ENSURE(m_pDocHolder,"no document for inplace activation");
-
+    
     *hWnd = m_pDocHolder->GetTopMostWinHandle();
     if(*hWnd != NULL)
         return NOERROR;
@@ -84,7 +84,7 @@ STDMETHODIMP EmbedDocument_Impl::UIDeactivate(void)
 STDMETHODIMP EmbedDocument_Impl::SetObjectRects(LPCRECT aRect, LPCRECT aClip)
 {
     OSL_ENSURE(m_pDocHolder,"no document for inplace activation");
-
+    
     return m_pDocHolder->SetObjectRects(aRect,aClip);
 }
 
@@ -93,7 +93,7 @@ STDMETHODIMP EmbedDocument_Impl::ReactivateAndUndo(void)
     return E_NOTIMPL;
 }
 
-// Fix strange warnings about some
+// Fix strange warnings about some 
 // ATL::CAxHostWindow::QueryInterface|AddRef|Releae functions.
 // warning C4505: 'xxx' : unreferenced local function has been removed
 #if defined(_MSC_VER)
diff --git a/embedserv/source/embed/ed_ioleobject.cxx b/embedserv/source/embed/ed_ioleobject.cxx
index db6adfaa729c..4910dca3d675 100644
--- a/embedserv/source/embed/ed_ioleobject.cxx
+++ b/embedserv/source/embed/ed_ioleobject.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 using namespace ::com::sun::star;
 
 
-extern ::rtl::OUString  getFilterNameFromGUID_Impl( GUID* );
+extern ::rtl::OUString	getFilterNameFromGUID_Impl( GUID* );
 
 //-------------------------------------------------------------------------------
 // IOleObject
@@ -187,7 +187,7 @@ STDMETHODIMP EmbedDocument_Impl::DoVerb(
                 return m_pDocHolder->InPlaceActivate(pActiveSite,FALSE);
                 break;
             case OLEIVERB_UIACTIVATE:
-                OSL_ENSURE(m_pDocHolder,"no document for     inplace activation");
+                OSL_ENSURE(m_pDocHolder,"no document for	 inplace activation");
 
                 return m_pDocHolder->InPlaceActivate(pActiveSite,TRUE);
                 break;
diff --git a/embedserv/source/embed/ed_ipersiststr.cxx b/embedserv/source/embed/ed_ipersiststr.cxx
index 6d6bc7712cec..7a762f0ed3a3 100644
--- a/embedserv/source/embed/ed_ipersiststr.cxx
+++ b/embedserv/source/embed/ed_ipersiststr.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 using namespace ::com::sun::star;
 
 extern ::rtl::OUString  getStorageTypeFromGUID_Impl( GUID* guid );
-extern ::rtl::OUString  getServiceNameFromGUID_Impl( GUID* );
-extern ::rtl::OUString  getFilterNameFromGUID_Impl( GUID* );
-// extern CLIPFORMAT        getClipFormatFromGUID_Impl( GUID* );
+extern ::rtl::OUString	getServiceNameFromGUID_Impl( GUID* );
+extern ::rtl::OUString	getFilterNameFromGUID_Impl( GUID* );
+// extern CLIPFORMAT		getClipFormatFromGUID_Impl( GUID* );
 ::rtl::OUString getTestFileURLFromGUID_Impl( GUID* guid );
 
 const ::rtl::OUString aOfficeEmbedStreamName( RTL_CONSTASCII_USTRINGPARAM ( "package_stream" ) );
@@ -440,12 +440,12 @@ STDMETHODIMP EmbedDocument_Impl::InitNew( IStorage *pStg )
                     ::rtl::OUString aCurType = getStorageTypeFromGUID_Impl( &m_guid ); // ???
                     CLIPFORMAT cf = (CLIPFORMAT)RegisterClipboardFormatA( "Embedded Object" );
                     hr = WriteFmtUserTypeStg( pStg,
-                                            cf,                         // ???
+                                            cf,							// ???
                                             reinterpret_cast<LPWSTR>(( sal_Unicode* )aCurType.getStr()) );
 
                     if ( hr == S_OK )
                     {
-                        hr = pStg->CreateStream( reinterpret_cast<LPCWSTR>(aOfficeEmbedStreamName.getStr()),
+                        hr = pStg->CreateStream( reinterpret_cast<LPCWSTR>(aOfficeEmbedStreamName.getStr()), 
                                                  STGM_CREATE | ( nStreamMode & 0x73 ),
                                                  0,
                                                  0,
@@ -453,7 +453,7 @@ STDMETHODIMP EmbedDocument_Impl::InitNew( IStorage *pStg )
 
                         if ( hr == S_OK && m_pOwnStream )
                         {
-                            hr = pStg->CreateStream( reinterpret_cast<LPCWSTR>(aExtentStreamName.getStr()),
+                            hr = pStg->CreateStream( reinterpret_cast<LPCWSTR>(aExtentStreamName.getStr()), 
                                                      STGM_CREATE | ( nStreamMode & 0x73 ),
                                                      0,
                                                      0,
@@ -611,14 +611,14 @@ STDMETHODIMP EmbedDocument_Impl::Save( IStorage *pStgSave, BOOL fSameAsLoad )
         if ( FAILED( hr ) ) return E_FAIL;
 
         DWORD nStreamMode = aStat.grfMode;
-        hr = pStgSave->CreateStream( reinterpret_cast<LPCWSTR>(aOfficeEmbedStreamName.getStr()),
+        hr = pStgSave->CreateStream( reinterpret_cast<LPCWSTR>(aOfficeEmbedStreamName.getStr()), 
                                  STGM_CREATE | ( nStreamMode & 0x73 ),
                                 0,
                                  0,
                                  &pTargetStream );
         if ( FAILED( hr ) || !pTargetStream ) return E_FAIL;
 
-        hr = pStgSave->CreateStream( reinterpret_cast<LPCWSTR>(aExtentStreamName.getStr()),
+        hr = pStgSave->CreateStream( reinterpret_cast<LPCWSTR>(aExtentStreamName.getStr()), 
                                  STGM_CREATE | ( nStreamMode & 0x73 ),
                                 0,
                                  0,
@@ -777,7 +777,7 @@ STDMETHODIMP EmbedDocument_Impl::Load( LPCOLESTR pszFileName, DWORD /*dwMode*/ )
     ::rtl::OUString aCurType = getServiceNameFromGUID_Impl( &m_guid ); // ???
     CLIPFORMAT cf = (CLIPFORMAT)RegisterClipboardFormatA( "Embedded Object" );
     hr = WriteFmtUserTypeStg( m_pMasterStorage,
-                            cf,                         // ???
+                            cf,							// ???
                             reinterpret_cast<LPWSTR>(( sal_Unicode* )aCurType.getStr()) );
     if ( FAILED( hr ) ) return E_FAIL;
 
@@ -828,7 +828,7 @@ STDMETHODIMP EmbedDocument_Impl::Load( LPCOLESTR pszFileName, DWORD /*dwMode*/ )
             ::rtl::OUString aCurType = getServiceNameFromGUID_Impl( &m_guid ); // ???
             CLIPFORMAT cf = (CLIPFORMAT)RegisterClipboardFormatA( "Embedded Object" );
             hr = WriteFmtUserTypeStg( m_pMasterStorage,
-                                    cf,                         // ???
+                                    cf,							// ???
                                     reinterpret_cast<LPWSTR>(( sal_Unicode* )aCurType.getStr()) );
 
             if ( SUCCEEDED( hr ) )
@@ -1010,7 +1010,7 @@ void LockedEmbedDocument_Impl::ExecuteMethod( sal_Int16 nId )
     }
 }
 
-// Fix strange warnings about some
+// Fix strange warnings about some 
 // ATL::CAxHostWindow::QueryInterface|AddRef|Releae functions.
 // warning C4505: 'xxx' : unreferenced local function has been removed
 #if defined(_MSC_VER)
diff --git a/embedserv/source/embed/esdll.cxx b/embedserv/source/embed/esdll.cxx
index 56ee550c1e81..582a3dcba572 100644
--- a/embedserv/source/embed/esdll.cxx
+++ b/embedserv/source/embed/esdll.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/embedserv/source/embed/guid.cxx b/embedserv/source/embed/guid.cxx
index 90122776df9c..6512b0d8a82e 100644
--- a/embedserv/source/embed/guid.cxx
+++ b/embedserv/source/embed/guid.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 }
 */
 
-// Fix strange warnings about some
+// Fix strange warnings about some 
 // ATL::CAxHostWindow::QueryInterface|AddRef|Releae functions.
 // warning C4505: 'xxx' : unreferenced local function has been removed
 #if defined(_MSC_VER)
diff --git a/embedserv/source/embed/iipaobj.cxx b/embedserv/source/embed/iipaobj.cxx
index 1c51ffa09f89..d3d5ea77fd81 100644
--- a/embedserv/source/embed/iipaobj.cxx
+++ b/embedserv/source/embed/iipaobj.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,12 +48,12 @@ CIIAObj::~CIIAObj()
 STDMETHODIMP CIIAObj::QueryInterface(REFIID riid, LPVOID FAR *ppv)
 {
     *ppv=NULL;
-
-    if(IID_IUnknown==riid ||
+    
+    if(IID_IUnknown==riid || 
        IID_IOleWindow==riid ||
        IID_IOleInPlaceActiveObject==riid)
         *ppv=this;
-
+    
     //AddRef any interface we'll return.
     if (NULL!=*ppv)
     {
@@ -110,7 +110,7 @@ STDMETHODIMP CIIAObj::ResizeBorder(
     LPCRECT pRect,LPOLEINPLACEUIWINDOW,BOOL bFrame)
 {
     if(!bFrame) return NOERROR;
-
+    
     if ( !m_rDocHolder.is() )
         return E_FAIL;
 
@@ -123,7 +123,7 @@ STDMETHODIMP CIIAObj::EnableModeless(BOOL)
     return NOERROR;
 }
 
-// Fix strange warnings about some
+// Fix strange warnings about some 
 // ATL::CAxHostWindow::QueryInterface|AddRef|Releae functions.
 // warning C4505: 'xxx' : unreferenced local function has been removed
 #if defined(_MSC_VER)
diff --git a/embedserv/source/embed/intercept.cxx b/embedserv/source/embed/intercept.cxx
index 08a01020510d..e94d5c900523 100644
--- a/embedserv/source/embed/intercept.cxx
+++ b/embedserv/source/embed/intercept.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ uno::Sequence< ::rtl::OUString > Interceptor::m_aInterceptedURL(IUL);
 
 struct equalOUString
 {
-    bool operator()(
+    bool operator()( 
         const rtl::OUString& rKey1,
         const rtl::OUString& rKey2 ) const
     {
@@ -79,27 +79,27 @@ public:
 
 
 void SAL_CALL
-Interceptor::addEventListener(
+Interceptor::addEventListener( 
     const uno::Reference<lang::XEventListener >& Listener )
     throw( uno::RuntimeException )
 {
     osl::MutexGuard aGuard( m_aMutex );
-
+    
     if ( ! m_pDisposeEventListeners )
         m_pDisposeEventListeners =
             new cppu::OInterfaceContainerHelper( m_aMutex );
-
+    
     m_pDisposeEventListeners->addInterface( Listener );
 }
 
 
 void SAL_CALL
-Interceptor::removeEventListener(
+Interceptor::removeEventListener( 
     const uno::Reference< lang::XEventListener >& Listener )
     throw( uno::RuntimeException )
 {
     osl::MutexGuard aGuard( m_aMutex );
-
+    
     if ( m_pDisposeEventListeners )
         m_pDisposeEventListeners->removeInterface( Listener );
 }
@@ -110,15 +110,15 @@ void SAL_CALL Interceptor::dispose()
 {
     lang::EventObject aEvt;
     aEvt.Source = static_cast< frame::XDispatch* >( this );
-
+    
     osl::MutexGuard aGuard(m_aMutex);
-
+    
     if ( m_pDisposeEventListeners && m_pDisposeEventListeners->getLength() )
         m_pDisposeEventListeners->disposeAndClear( aEvt );
-
+    
     if(m_pStatCL)
         m_pStatCL->disposeAndClear( aEvt );
-
+    
     m_xSlaveDispatchProvider = 0;
     m_xMasterDispatchProvider = 0;
 }
@@ -141,11 +141,11 @@ Interceptor::Interceptor(
     m_aInterceptedURL[1] = rtl::OUString(
         RTL_CONSTASCII_USTRINGPARAM(".uno:SaveAll"));
     m_aInterceptedURL[2] = rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM(".uno:CloseDoc"));
+        RTL_CONSTASCII_USTRINGPARAM(".uno:CloseDoc"));	
     m_aInterceptedURL[3] = rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM(".uno:CloseWin"));
+        RTL_CONSTASCII_USTRINGPARAM(".uno:CloseWin"));	
     m_aInterceptedURL[4] = rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM(".uno:CloseFrame"));
+        RTL_CONSTASCII_USTRINGPARAM(".uno:CloseFrame"));	
     m_aInterceptedURL[5] = rtl::OUString(
         RTL_CONSTASCII_USTRINGPARAM(".uno:SaveAs"));
 }
@@ -158,7 +158,7 @@ Interceptor::~Interceptor()
 
     if(m_pStatCL)
         delete m_pStatCL;
-
+    
     DocumentHolder* pTmpDocH = NULL;
     uno::Reference< uno::XInterface > xLock;
     {
@@ -181,8 +181,8 @@ void Interceptor::DisconnectDocHolder()
 }
 
 //XDispatch
-void SAL_CALL
-Interceptor::dispatch(
+void SAL_CALL 
+Interceptor::dispatch( 
     const util::URL& URL,
     const uno::Sequence<
     beans::PropertyValue >& Arguments )
@@ -193,7 +193,7 @@ Interceptor::dispatch(
         osl::MutexGuard aGuard(m_aMutex);
         xOleAccess = m_xOleAccess;
     }
-
+    
     if ( xOleAccess.is() )
     {
         LockedEmbedDocument_Impl aDocLock = xOleAccess->GetEmbedDocument();
@@ -210,7 +210,7 @@ Interceptor::dispatch(
             {
                 uno::Sequence< beans::PropertyValue > aNewArgs = Arguments;
                 sal_Int32 nInd = 0;
-
+    
                 while( nInd < aNewArgs.getLength() )
                 {
                     if ( aNewArgs[nInd].Name.equalsAscii( "SaveTo" ) )
@@ -220,7 +220,7 @@ Interceptor::dispatch(
                     }
                     nInd++;
                 }
-
+            
                 if ( nInd == aNewArgs.getLength() )
                 {
                     aNewArgs.realloc( nInd + 1 );
@@ -259,28 +259,28 @@ void Interceptor::generateFeatureStateEvent()
         {
             if( i == 1 || m_bLink && i != 5 )
                 continue;
-
-            cppu::OInterfaceContainerHelper* pICH =
+            
+            cppu::OInterfaceContainerHelper* pICH = 
                 m_pStatCL->getContainer(m_aInterceptedURL[i]);
             uno::Sequence<uno::Reference<uno::XInterface> > aSeq;
             if(pICH)
                 aSeq = pICH->getElements();
             if(!aSeq.getLength())
                 continue;
-
+            
             frame::FeatureStateEvent aStateEvent;
             aStateEvent.IsEnabled = sal_True;
-            aStateEvent.Requery = sal_False;
+            aStateEvent.Requery = sal_False;			
             if(i == 0)
             {
-
+                
                 aStateEvent.FeatureURL.Complete = m_aInterceptedURL[0];
                 aStateEvent.FeatureDescriptor = rtl::OUString(
                     RTL_CONSTASCII_USTRINGPARAM("Update"));
                 aStateEvent.State <<= (rtl::OUString(
-                    RTL_CONSTASCII_USTRINGPARAM("($1) ")) +
+                    RTL_CONSTASCII_USTRINGPARAM("($1) ")) + 
                                        aTitle);
-
+                
             }
             else if ( i == 5 )
             {
@@ -298,16 +298,16 @@ void Interceptor::generateFeatureStateEvent()
                 aStateEvent.State <<= (rtl::OUString(
                     RTL_CONSTASCII_USTRINGPARAM("($2) ")) +
                                        aTitle);
-
+                
             }
-
+            
             for(sal_Int32 k = 0; k < aSeq.getLength(); ++k)
             {
                 uno::Reference<frame::XStatusListener>
                     Control(aSeq[k],uno::UNO_QUERY);
                 if(Control.is())
                     Control->statusChanged(aStateEvent);
-
+                
             }
         }
     }
@@ -315,9 +315,9 @@ void Interceptor::generateFeatureStateEvent()
 
 
 void SAL_CALL
-Interceptor::addStatusListener(
-    const uno::Reference<
-    frame::XStatusListener >& Control,
+Interceptor::addStatusListener( 
+    const uno::Reference< 
+    frame::XStatusListener >& Control, 
     const util::URL& URL )
     throw (
         uno::RuntimeException
@@ -325,8 +325,8 @@ Interceptor::addStatusListener(
 {
     if(!Control.is())
         return;
-
-    if( !m_bLink && URL.Complete == m_aInterceptedURL[0] )
+    
+    if( !m_bLink && URL.Complete == m_aInterceptedURL[0] ) 
     {   // Save
         DocumentHolder* pTmpDocH = NULL;
         uno::Reference< uno::XInterface > xLock;
@@ -348,21 +348,21 @@ Interceptor::addStatusListener(
         aStateEvent.IsEnabled = sal_True;
         aStateEvent.Requery = sal_False;
         aStateEvent.State <<= (rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM("($1) ")) +
+            RTL_CONSTASCII_USTRINGPARAM("($1) ")) + 
                                aTitle );
         Control->statusChanged(aStateEvent);
-
+        
         {
             osl::MutexGuard aGuard(m_aMutex);
             if(!m_pStatCL)
-                m_pStatCL =
+                m_pStatCL = 
                     new StatusChangeListenerContainer(m_aMutex);
         }
-
+        
         m_pStatCL->addInterface(URL.Complete,Control);
         return;
     }
-
+    
     sal_Int32 i = 2;
     if ( !m_bLink
       && ( URL.Complete == m_aInterceptedURL[i] ||
@@ -392,20 +392,20 @@ Interceptor::addStatusListener(
             RTL_CONSTASCII_USTRINGPARAM("($2) ")) +
                                aTitle );
         Control->statusChanged(aStateEvent);
-
-
+        
+        
         {
             osl::MutexGuard aGuard(m_aMutex);
             if(!m_pStatCL)
-                m_pStatCL =
+                m_pStatCL = 
                     new StatusChangeListenerContainer(m_aMutex);
         }
-
+        
         m_pStatCL->addInterface(URL.Complete,Control);
         return;
     }
 
-    if(URL.Complete == m_aInterceptedURL[5])
+    if(URL.Complete == m_aInterceptedURL[5]) 
     {   // SaveAs
         frame::FeatureStateEvent aStateEvent;
         aStateEvent.FeatureURL.Complete = m_aInterceptedURL[5];
@@ -415,14 +415,14 @@ Interceptor::addStatusListener(
         aStateEvent.Requery = sal_False;
         aStateEvent.State <<= (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("($3)")));
         Control->statusChanged(aStateEvent);
-
+        
         {
             osl::MutexGuard aGuard(m_aMutex);
             if(!m_pStatCL)
-                m_pStatCL =
+                m_pStatCL = 
                     new StatusChangeListenerContainer(m_aMutex);
         }
-
+        
         m_pStatCL->addInterface(URL.Complete,Control);
         return;
     }
@@ -432,9 +432,9 @@ Interceptor::addStatusListener(
 
 void SAL_CALL
 Interceptor::removeStatusListener(
-    const uno::Reference<
-    frame::XStatusListener >& Control,
-    const util::URL& URL )
+    const uno::Reference< 
+    frame::XStatusListener >& Control, 
+    const util::URL& URL ) 
     throw (
         uno::RuntimeException
     )
@@ -449,8 +449,8 @@ Interceptor::removeStatusListener(
 
 
 //XInterceptorInfo
-uno::Sequence< ::rtl::OUString >
-SAL_CALL
+uno::Sequence< ::rtl::OUString > 
+SAL_CALL 
 Interceptor::getInterceptedURLs(  )
     throw (
         uno::RuntimeException
@@ -465,7 +465,7 @@ Interceptor::getInterceptedURLs(  )
 
         return aResult;
     }
-
+    
     return m_aInterceptedURL;
 }
 
@@ -473,9 +473,9 @@ Interceptor::getInterceptedURLs(  )
 // XDispatchProvider
 
 uno::Reference< frame::XDispatch > SAL_CALL
-Interceptor::queryDispatch(
+Interceptor::queryDispatch( 
     const util::URL& URL,
-    const ::rtl::OUString& TargetFrameName,
+    const ::rtl::OUString& TargetFrameName, 
     sal_Int32 SearchFlags )
     throw (
         uno::RuntimeException
@@ -516,7 +516,7 @@ Interceptor::queryDispatches(
         aRet = m_xSlaveDispatchProvider->queryDispatches(Requests);
     else
         aRet.realloc(Requests.getLength());
-
+    
     for(sal_Int32 i = 0; i < Requests.getLength(); ++i)
         if ( !m_bLink && m_aInterceptedURL[0] == Requests[i].FeatureURL.Complete )
             aRet[i] = (frame::XDispatch*) this;
@@ -538,8 +538,8 @@ Interceptor::queryDispatches(
 
 //XDispatchProviderInterceptor
 
-uno::Reference< frame::XDispatchProvider > SAL_CALL
-Interceptor::getSlaveDispatchProvider(  )
+uno::Reference< frame::XDispatchProvider > SAL_CALL 
+Interceptor::getSlaveDispatchProvider(  ) 
     throw (
         uno::RuntimeException
     )
@@ -549,7 +549,7 @@ Interceptor::getSlaveDispatchProvider(  )
 }
 
 void SAL_CALL
-Interceptor::setSlaveDispatchProvider(
+Interceptor::setSlaveDispatchProvider( 
     const uno::Reference< frame::XDispatchProvider >& NewDispatchProvider )
     throw (
         uno::RuntimeException
@@ -561,18 +561,18 @@ Interceptor::setSlaveDispatchProvider(
 
 
 uno::Reference< frame::XDispatchProvider > SAL_CALL
-Interceptor::getMasterDispatchProvider(  )
+Interceptor::getMasterDispatchProvider(  ) 
     throw (
         uno::RuntimeException
     )
 {
     osl::MutexGuard aGuard(m_aMutex);
-    return m_xMasterDispatchProvider;
+    return m_xMasterDispatchProvider;	
 }
 
-
+    
 void SAL_CALL
-Interceptor::setMasterDispatchProvider(
+Interceptor::setMasterDispatchProvider( 
     const uno::Reference< frame::XDispatchProvider >& NewSupplier )
     throw (
         uno::RuntimeException
@@ -582,7 +582,7 @@ Interceptor::setMasterDispatchProvider(
     m_xMasterDispatchProvider = NewSupplier;
 }
 
-// Fix strange warnings about some
+// Fix strange warnings about some 
 // ATL::CAxHostWindow::QueryInterface|AddRef|Releae functions.
 // warning C4505: 'xxx' : unreferenced local function has been removed
 #if defined(_MSC_VER)
diff --git a/embedserv/source/embed/register.cxx b/embedserv/source/embed/register.cxx
index 75b9e5ed4e29..d51df036fb3c 100644
--- a/embedserv/source/embed/register.cxx
+++ b/embedserv/source/embed/register.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/embedserv/source/embed/servprov.cxx b/embedserv/source/embed/servprov.cxx
index 952774c2807a..e21780903ab6 100644
--- a/embedserv/source/embed/servprov.cxx
+++ b/embedserv/source/embed/servprov.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ void o2u_attachCurrentThread()
 
     if ( oleThreadData.getData() != 0 )
     {
-        HINSTANCE inst= LoadLibrary( _T("ole32.dll"));
+        HINSTANCE inst=	LoadLibrary( _T("ole32.dll"));
         if( inst )
         {
             HRESULT hr;
@@ -226,25 +226,25 @@ EmbedProviderFactory_Impl::~EmbedProviderFactory_Impl()
 sal_Bool EmbedProviderFactory_Impl::registerClass()
 {
     HRESULT hresult;
-
+    
     o2u_attachCurrentThread();
 
-    hresult = CoRegisterClassObject(
+    hresult = CoRegisterClassObject(				
             m_guid,
             this,
             CLSCTX_LOCAL_SERVER,
             REGCLS_MULTIPLEUSE,
             &m_factoryHandle);
-
-    return (hresult == NOERROR);
-}
+            
+    return (hresult == NOERROR);			
+}	
 
 sal_Bool EmbedProviderFactory_Impl::deregisterClass()
 {
     HRESULT hresult = CoRevokeClassObject( m_factoryHandle );
 
-    return (hresult == NOERROR);
-}
+    return (hresult == NOERROR);			
+}	
 
 STDMETHODIMP EmbedProviderFactory_Impl::QueryInterface(REFIID riid, void FAR* FAR* ppv)
 {
@@ -253,7 +253,7 @@ STDMETHODIMP EmbedProviderFactory_Impl::QueryInterface(REFIID riid, void FAR* FA
         AddRef();
         *ppv = (IUnknown*) (IClassFactory*) this;
         return NOERROR;
-    }
+    } 
     else if (IsEqualIID(riid, IID_IClassFactory))
     {
         AddRef();
@@ -276,9 +276,9 @@ STDMETHODIMP_(ULONG) EmbedProviderFactory_Impl::Release()
     sal_Int32 nCount = --m_refCount;
     if ( nCount == 0 )
     {
-        delete this;
+        delete this;		
     }
-
+    
     return nCount;
 }
 
@@ -287,9 +287,9 @@ STDMETHODIMP EmbedProviderFactory_Impl::CreateInstance(IUnknown FAR* punkOuter,
                                                        void FAR* FAR* ppv)
 {
     punkOuter = NULL;
-
+    
     IUnknown* pEmbedDocument = (IUnknown*)(IPersistStorage*)( new EmbedDocument_Impl( m_xFactory, &m_guid ) );
-
+    
     return pEmbedDocument->QueryInterface( riid, ppv );
 }
 
@@ -298,7 +298,7 @@ STDMETHODIMP EmbedProviderFactory_Impl::LockServer( int /*fLock*/ )
     return NOERROR;
 }
 
-// Fix strange warnings about some
+// Fix strange warnings about some 
 // ATL::CAxHostWindow::QueryInterface|AddRef|Releae functions.
 // warning C4505: 'xxx' : unreferenced local function has been removed
 #if defined(_MSC_VER)
diff --git a/embedserv/source/embed/syswinwrapper.cxx b/embedserv/source/embed/syswinwrapper.cxx
index 455e143261f7..c247617d9235 100644
--- a/embedserv/source/embed/syswinwrapper.cxx
+++ b/embedserv/source/embed/syswinwrapper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -226,15 +226,15 @@ BOOL CHatchWin::Init(HWND hWndParent, UINT uID, HWND hWndAssoc)
         , SZCLASSHATCHWIN, WS_CHILD | WS_CLIPSIBLINGS
         | WS_CLIPCHILDREN, 0, 0, 100, 100, hWndParent, (HMENU)uID
         , m_hInst, this);
-
+    
     m_uID=uID;
     m_hWndAssociate=hWndAssoc;
-
+    
     return (NULL!=m_hWnd);
 }
 
 
-void CHatchWin::SetTrans()
+void CHatchWin::SetTrans() 
 {
     HRGN hrgn = CreateRectRgn(0,0,0,0);
     SetWindowRgn(m_hWnd,hrgn,true);
@@ -317,14 +317,14 @@ void CHatchWin::RectsSet(LPRECT prcPos, LPRECT prcClip)
 //                  , prcPos->bottom-prcPos->top, SWP_NOZORDER | SWP_NOACTIVATE);
 
     RECT newRC;
-    GetClientRect(m_hWnd,&newRC);
+    GetClientRect(m_hWnd,&newRC);    
     m_aTracker = Tracker(
         &newRC,
-        Tracker::hatchInside |
+        Tracker::hatchInside | 
         Tracker::hatchedBorder |
         Tracker::resizeInside
     );
-
+    
     return;
 }
 
@@ -406,10 +406,10 @@ LRESULT APIENTRY winwrap::HatchWndProc(
     PCHatchWin  phw;
     HDC         hDC;
     PAINTSTRUCT ps;
-
+    
     phw=(PCHatchWin)GetWindowLong(hWnd, HWWL_STRUCTURE);
     POINT ptMouse;
-
+    
     switch (iMsg)
     {
         case WM_CREATE:
@@ -425,7 +425,7 @@ LRESULT APIENTRY winwrap::HatchWndProc(
         case WM_LBUTTONDOWN:
             GetCursorPos(&ptMouse);
             ScreenToClient(hWnd,&ptMouse);
-
+            
             // track in case we have to
             if(phw->m_aTracker.Track(hWnd,ptMouse,FALSE,GetParent(hWnd)))
             {
@@ -444,7 +444,7 @@ LRESULT APIENTRY winwrap::HatchWndProc(
             //We need this since the container will SetFocus to us.
             if (NULL!=phw->m_hWndKid)
                 SetFocus(phw->m_hWndKid);
-
+            
             break;
         case WM_LBUTTONDBLCLK:
             /*
@@ -466,11 +466,11 @@ LRESULT APIENTRY winwrap::HatchWndProc(
         default:
             return DefWindowProc(hWnd, iMsg, wParam, lParam);
     }
-
+    
     return 0L;
 }
 
-// Fix strange warnings about some
+// Fix strange warnings about some 
 // ATL::CAxHostWindow::QueryInterface|AddRef|Releae functions.
 // warning C4505: 'xxx' : unreferenced local function has been removed
 #if defined(_MSC_VER)
diff --git a/embedserv/source/embed/tracker.cxx b/embedserv/source/embed/tracker.cxx
index 9c97c8c973d6..4d7e7408ad6a 100644
--- a/embedserv/source/embed/tracker.cxx
+++ b/embedserv/source/embed/tracker.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -144,7 +144,7 @@ void DrawDragRect(
         SetRectRgn(rgnInside,rect.left,rect.top,rect.right,rect.bottom);
         CombineRgn(rgnLast,rgnOutside,rgnInside, RGN_XOR);
 
-//      // only diff them if brushes are the same
+// 		// only diff them if brushes are the same
         if (hBrush == hBrushLast)
         {
             rgnUpdate = CreateRectRgn(0, 0, 0, 0);
@@ -199,7 +199,7 @@ void NormalizeRect(LPRECT rp)
         rp->left = rp->right;
         rp->right = tmp;
     }
-
+    
     if(rp->top > rp->bottom) {
         UINT tmp = rp->top;
         rp->top = rp->bottom;
@@ -245,36 +245,36 @@ void Tracker::Construct()
                 wPattern <<= 1;
             }
             HBITMAP hatchBitmap = CreateBitmap(8, 8, 1, 1,&hatchPattern);
-
+            
             // create black hatched brush
             _afxHatchBrush = CreatePatternBrush(hatchBitmap);
             DeleteObject(hatchBitmap);
         }
-
+        
         if (_afxBlackDottedPen == NULL)
         {
             // create black dotted pen
             _afxBlackDottedPen = CreatePen(PS_DOT, 0, RGB(0, 0, 0));
         }
-
+        
         // get default handle size from Windows profile setting
         static const TCHAR szWindows[] = TEXT("windows");
         static const TCHAR szInplaceBorderWidth[] =
             TEXT("oleinplaceborderwidth");
         _afxHandleSize = GetProfileInt(szWindows, szInplaceBorderWidth, 4);
         bInitialized = TRUE;
-
+        
         _afxCursors[0] = _afxCursors[2] = LoadCursor(0,IDC_SIZENWSE);
         _afxCursors[4] = _afxCursors[6] = LoadCursor(0,IDC_SIZENS);
         _afxCursors[1] = _afxCursors[3] = LoadCursor(0,IDC_SIZENESW);
         _afxCursors[5] = _afxCursors[7] = LoadCursor(0,IDC_SIZEWE);
         _afxCursors[8] = LoadCursor(0,IDC_SIZEALL);
     }
-
+    
     m_nStyle = 0;
     m_nHandleSize = _afxHandleSize;
     m_sizeMin.cy = m_sizeMin.cx = m_nHandleSize*2;
-
+    
     SetRectEmpty(&m_rectLast);
     m_sizeLast.cx = m_sizeLast.cy = 0;
     m_bErase = FALSE;
@@ -289,7 +289,7 @@ Tracker::~Tracker()
 int Tracker::HitTest(POINT point) const
 {
     TrackerHit hitResult = hitNothing;
-
+    
     RECT rectTrue;
     GetTrueRect(&rectTrue);
     NormalizeRect(&rectTrue);
@@ -309,20 +309,20 @@ BOOL Tracker::SetCursor(HWND pWnd, UINT nHitTest) const
     // trackers should only be in client area
     if (nHitTest != HTCLIENT)
         return FALSE;
-
+    
     // convert cursor position to client co-ordinates
     POINT point;
     GetCursorPos(&point);
     ScreenToClient(pWnd,&point);
-
+    
     // do hittest and normalize hit
     int nHandle = HitTestHandles(point);
     if (nHandle < 0)
         return FALSE;
-
+    
     // need to normalize the hittest such that we get proper cursors
     nHandle = NormalizeHit(nHandle);
-
+    
     // handle special case of hitting area between handles
     //  (logically the same -- handled as a move -- but different cursor)
     if (nHandle == hitMiddle && !PtInRect(&m_rect,point))
@@ -331,8 +331,8 @@ BOOL Tracker::SetCursor(HWND pWnd, UINT nHitTest) const
         if (m_nStyle & hatchedBorder)
             nHandle = (TrackerHit)9;
     }
-
-    ::SetCursor(_afxCursors[nHandle]);
+    
+    ::SetCursor(_afxCursors[nHandle]);	
     return TRUE;
 }
 
@@ -348,7 +348,7 @@ BOOL Tracker::Track(HWND hWnd,POINT point,BOOL bAllowInvert,
         // didn't hit a handle, so just return FALSE
         return FALSE;
     }
-
+    
     // otherwise, call helper function to do the tracking
     m_bAllowInvert = bAllowInvert;
     SetCursor(hWnd,nHandle);
@@ -361,25 +361,25 @@ BOOL Tracker::TrackHandle(int nHandle,HWND hWnd,POINT point,HWND hWndClipTo)
     // don't handle if capture already set
     if (GetCapture() != NULL)
         return FALSE;
-
+    
     // save original width & height in pixels
     int nWidth = m_rect.right - m_rect.left;
     int nHeight = m_rect.bottom - m_rect.top;
-
+    
     // set capture to the window which received this message
     SetCapture(hWnd);
     UpdateWindow(hWnd);
     if (hWndClipTo != NULL)
         UpdateWindow(hWndClipTo);
     RECT rectSave = m_rect;
-
+    
     // find out what x/y coords we are supposed to modify
     int *px, *py;
     int xDiff, yDiff;
     GetModifyPointers(nHandle, &px, &py, &xDiff, &yDiff);
     xDiff = point.x - xDiff;
     yDiff = point.y - yDiff;
-
+    
     // get DC for drawing
     HDC hDrawDC;
     if (hWndClipTo != NULL)
@@ -392,19 +392,19 @@ BOOL Tracker::TrackHandle(int nHandle,HWND hWnd,POINT point,HWND hWndClipTo)
         // otherwise, just use normal DC
         hDrawDC = GetDC(hWnd);
     }
-
+    
     RECT rectOld;
     BOOL bMoved = FALSE;
-
+    
     // get messages until capture lost or cancelled/accepted
     for (;;)
     {
         MSG msg;
         GetMessage(&msg, NULL, 0, 0);
-
+        
         if (GetCapture() != hWnd)
             break;
-
+        
         switch (msg.message)
         {
             // handle movement/accept messages
@@ -416,7 +416,7 @@ BOOL Tracker::TrackHandle(int nHandle,HWND hWnd,POINT point,HWND hWndClipTo)
                 *px = (int)(short)LOWORD(msg.lParam) - xDiff;
             if (py != NULL)
                 *py = (int)(short)HIWORD(msg.lParam) - yDiff;
-
+            
             // handle move case
             if (nHandle == hitMiddle)
             {
@@ -425,7 +425,7 @@ BOOL Tracker::TrackHandle(int nHandle,HWND hWnd,POINT point,HWND hWndClipTo)
             }
             // allow caller to adjust the rectangle if necessary
             AdjustRect(nHandle,&m_rect);
-
+            
             // only redraw and callback if the rect actually changed!
             m_bFinalErase = (msg.message == WM_LBUTTONUP);
             if (!EqualRect(&rectOld,&m_rect) || m_bFinalErase)
@@ -441,14 +441,14 @@ BOOL Tracker::TrackHandle(int nHandle,HWND hWnd,POINT point,HWND hWndClipTo)
             }
             if (m_bFinalErase)
                 goto ExitLoop;
-
+            
             if (!EqualRect(&rectOld,&m_rect))
             {
                 m_bErase = FALSE;
                 DrawTrackerRect(&m_rect,hWndClipTo,hDrawDC,hWnd);
             }
             break;
-
+            
             // handle cancel messages
         case WM_KEYDOWN:
             if (msg.wParam != VK_ESCAPE)
@@ -461,34 +461,34 @@ BOOL Tracker::TrackHandle(int nHandle,HWND hWnd,POINT point,HWND hWndClipTo)
             }
             m_rect = rectSave;
             goto ExitLoop;
-
+            
             // just dispatch rest of the messages
         default:
             DispatchMessage(&msg);
             break;
         }
     }
-
+    
   ExitLoop:
     if (hWndClipTo != NULL)
         ReleaseDC(hWndClipTo,hDrawDC);
     else
         ReleaseDC(hWnd,hDrawDC);
     ReleaseCapture();
-
+    
     // restore rect in case bMoved is still FALSE
     if (!bMoved)
         m_rect = rectSave;
     m_bFinalErase = FALSE;
     m_bErase = FALSE;
-
+    
     // return TRUE only if rect has changed
     return !EqualRect(&rectSave,&m_rect);
 }
 
 
 void Tracker::OnChangedRect(const RECT& /*rectOld*/)
-{
+{    
 }
 
 
@@ -496,11 +496,11 @@ void Tracker::AdjustRect(int nHandle, LPRECT)
 {
     if(nHandle == hitMiddle)
         return;
-
+    
     // convert the handle into locations within m_rect
     int *px, *py;
     GetModifyPointers(nHandle, &px, &py, NULL, NULL);
-
+    
     // enforce minimum width
     int nNewWidth = m_rect.right - m_rect.left;
     int nAbsWidth = m_bAllowInvert ? abs(nNewWidth) : nNewWidth;
@@ -512,7 +512,7 @@ void Tracker::AdjustRect(int nHandle, LPRECT)
         *px = *(int*)((BYTE*)&m_rect + pRectInfo->nOffsetAcross) +
             nNewWidth * m_sizeMin.cx * -pRectInfo->nSignAcross;
     }
-
+    
     // enforce minimum height
     int nNewHeight = m_rect.bottom - m_rect.top;
     int nAbsHeight = m_bAllowInvert ? abs(nNewHeight) : nNewHeight;
@@ -533,11 +533,11 @@ void Tracker::DrawTrackerRect(
     // first, normalize the rectangle for drawing
     RECT rect = *lpRect;
     NormalizeRect(&rect);
-
+    
     // convert to client coordinates
     if (pWndClipTo != NULL)
         TransformRect(&rect,pWnd,pWndClipTo);
-
+    
     SIZE size;
     size.cx = 0; size.cy = 0;
     if (!m_bFinalErase)
@@ -554,11 +554,11 @@ void Tracker::DrawTrackerRect(
             size.cy = 1; // CY_BORDER;
         }
     }
-
+    
     // and draw it
-    if (m_bFinalErase || !m_bErase)
+    if (m_bFinalErase || !m_bErase)        
         DrawDragRect(pDC,&rect,size,&m_rectLast,m_sizeLast);
-
+    
     // remember last rectangles
     m_rectLast = rect;
     m_sizeLast = size;
@@ -571,16 +571,16 @@ void Tracker::Draw(HDC hDC) const
     SetMapMode(hDC,MM_TEXT);
     SetViewportOrgEx(hDC,0, 0,NULL);
     SetWindowOrgEx(hDC,0, 0,NULL);
-
+    
     // get normalized rectangle
     RECT rect = m_rect;
     NormalizeRect(&rect);
-
+    
     HPEN pOldPen = NULL;
     HBRUSH pOldBrush = NULL;
     HGDIOBJ pTemp;
     int nOldROP;
-
+    
     // draw lines
     if ((m_nStyle & (dottedLine|solidLine)) != 0)
     {
@@ -594,11 +594,11 @@ void Tracker::Draw(HDC hDC) const
         Rectangle(hDC,rect.left, rect.top, rect.right, rect.bottom);
         SetROP2(hDC,nOldROP);
     }
-
+    
     // if hatchBrush is going to be used, need to unrealize it
     if ((m_nStyle & (hatchInside|hatchedBorder)) != 0)
         UnrealizeObject((HGDIOBJ)_afxHatchBrush);
-
+    
     // hatch inside
     if ((m_nStyle & hatchInside) != 0)
     {
@@ -613,7 +613,7 @@ void Tracker::Draw(HDC hDC) const
         Rectangle(hDC,rect.left+1, rect.top+1, rect.right, rect.bottom);
         SetROP2(hDC,nOldROP);
     }
-
+    
     // draw hatched border
     if ((m_nStyle & hatchedBorder) != 0)
     {
@@ -633,7 +633,7 @@ void Tracker::Draw(HDC hDC) const
         PatBlt(hDC,rect.right, rect.top, rectTrue.right-rect.right,
                rect.bottom-rect.top, 0x000F0001 /* Pn */);
     }
-
+    
     // draw resize handles
     if ((m_nStyle & (resizeInside|resizeOutside)) != 0)
     {
@@ -650,7 +650,7 @@ void Tracker::Draw(HDC hDC) const
         }
         DeleteObject(hbrush);
     }
-
+    
     // cleanup pDC state
     if (pOldPen != NULL)
         SelectObject(hDC,pOldPen);
@@ -667,16 +667,16 @@ void Tracker::GetHandleRect(int nHandle,RECT* pHandleRect) const
     NormalizeRect(&rectT);
     if ((m_nStyle & (solidLine|dottedLine)) != 0)
         InflateRect(&rectT,+1, +1);
-
+    
     // since the rectangle itself was normalized, we also have to invert the
     //  resize handles.
     nHandle = NormalizeHit(nHandle);
-
+    
     // handle case of resize handles outside the tracker
     int size = GetHandleSize();
     if (m_nStyle & resizeOutside)
         InflateRect(&rectT,size-1, size-1);
-
+    
     // calculate position of the resize handle
     int nWidth = rectT.right - rectT.left;
     int nHeight = rectT.bottom - rectT.top;
@@ -690,7 +690,7 @@ void Tracker::GetHandleRect(int nHandle,RECT* pHandleRect) const
     rect.top += pHandleInfo->nCenterY * (nHeight - size) / 2;
     rect.right = rect.left + size;
     rect.bottom = rect.top + size;
-
+    
     *pHandleRect = rect;
 }
 
@@ -699,7 +699,7 @@ int Tracker::GetHandleSize(LPRECT lpRect) const
 {
     if (lpRect == NULL)
         lpRect = (LPRECT)&m_rect;
-
+    
     int size = m_nHandleSize;
     if (!(m_nStyle & resizeOutside))
     {
@@ -759,12 +759,12 @@ int Tracker::HitTestHandles(POINT point) const
 {
     RECT rect;
     UINT mask = GetHandleMask();
-
+    
     // see if hit anywhere inside the tracker
     GetTrueRect(&rect);
     if (!PtInRect(&rect,point))
         return hitNothing;  // totally missed
-
+    
     // see if we hit a handle
     for (int i = 0; i < 8; ++i)
     {
@@ -775,7 +775,7 @@ int Tracker::HitTestHandles(POINT point) const
                 return (TrackerHit)i;
         }
     }
-
+    
     // last of all, check for non-hit outside of object, between resize handles
     if ((m_nStyle & hatchedBorder) == 0)
     {
@@ -796,14 +796,14 @@ void Tracker::GetModifyPointers(
 {
     if (nHandle == hitMiddle)
         nHandle = hitTopLeft;   // same as hitting top-left
-
+    
     *ppx = NULL;
     *ppy = NULL;
-
+    
     // fill in the part of the rect that this handle modifies
     //  (Note: handles that map to themselves along a given axis when that
     //   axis is inverted don't modify the value on that axis)
-
+    
     const AFX_HANDLEINFO* pHandleInfo = &_afxHandleInfo[nHandle];
     if (pHandleInfo->nInvertX != nHandle)
     {
@@ -831,7 +831,7 @@ void Tracker::GetModifyPointers(
     }
 }
 
-// Fix strange warnings about some
+// Fix strange warnings about some 
 // ATL::CAxHostWindow::QueryInterface|AddRef|Releae functions.
 // warning C4505: 'xxx' : unreferenced local function has been removed
 #if defined(_MSC_VER)
diff --git a/embedserv/source/embed/xwin.cxx b/embedserv/source/embed/xwin.cxx
index 473647419cb9..38840a7d71f1 100644
--- a/embedserv/source/embed/xwin.cxx
+++ b/embedserv/source/embed/xwin.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ ContainerWindowWrapper::ContainerWindowWrapper(HWND aHwnd)
       m_pDisposeEventListeners(0)
 {
 }
-
+    
 ContainerWindowWrapper::~ContainerWindowWrapper()
 {
     delete m_pDisposeEventListeners;
@@ -47,31 +47,31 @@ ContainerWindowWrapper::~ContainerWindowWrapper()
 
 void SAL_CALL
 ContainerWindowWrapper::dispose(
-)
+) 
     throw (
         ::com::sun::star::uno::RuntimeException
     )
 {
     cppu::OInterfaceContainerHelper *pDisposeEventListeners(0);
-
+    
     {
         osl::MutexGuard aGuard(m_aMutex);
         pDisposeEventListeners = m_pDisposeEventListeners;
     }
-
+    
     if(pDisposeEventListeners) {
         lang::EventObject aEvt;
         aEvt.Source = static_cast< awt::XWindow* >(this);
-
+        
         pDisposeEventListeners->disposeAndClear(aEvt);
     }
 }
 
 
 void SAL_CALL
-ContainerWindowWrapper::addEventListener(
+ContainerWindowWrapper::addEventListener( 
     const ::com::sun::star::uno::Reference<
-    ::com::sun::star::lang::XEventListener >& Listener
+    ::com::sun::star::lang::XEventListener >& Listener 
 )
     throw (
         ::com::sun::star::uno::RuntimeException
@@ -82,14 +82,14 @@ ContainerWindowWrapper::addEventListener(
         osl::MutexGuard aGuard(m_aMutex);
         pDisposeEventListeners = m_pDisposeEventListeners;
     }
-
+    
     if(! pDisposeEventListeners)
     {
         osl::MutexGuard aGuard(m_aMutex);
         pDisposeEventListeners = m_pDisposeEventListeners =
             new cppu::OInterfaceContainerHelper(m_aMutex);
     }
-
+    
     pDisposeEventListeners->addInterface( Listener );
 }
 
@@ -98,11 +98,11 @@ void SAL_CALL
 ContainerWindowWrapper::removeEventListener(
     const ::com::sun::star::uno::Reference<
     ::com::sun::star::lang::XEventListener >& Listener
-)
+) 
     throw (
         ::com::sun::star::uno::RuntimeException
     )
-{
+{    
     cppu::OInterfaceContainerHelper *pDisposeEventListeners(0);
     {
         osl::MutexGuard aGuard(m_aMutex);
@@ -117,15 +117,15 @@ ContainerWindowWrapper::removeEventListener(
 // XSystemDependentWindowPeer
 
 ::com::sun::star::uno::Any SAL_CALL
-ContainerWindowWrapper::getWindowHandle(
+ContainerWindowWrapper::getWindowHandle( 
     const ::com::sun::star::uno::Sequence< sal_Int8 >& ProcessId,
     sal_Int16 SystemType
-)
+) 
     throw (
         ::com::sun::star::uno::RuntimeException
     )
 {
-    if(SystemType == lang::SystemDependent::SYSTEM_WIN32 ||
+    if(SystemType == lang::SystemDependent::SYSTEM_WIN32 || 
        SystemType == lang::SystemDependent::SYSTEM_WIN16)
     {
         uno::Any aAny;
@@ -138,24 +138,24 @@ ContainerWindowWrapper::getWindowHandle(
 }
 
 
-
+    
 void SAL_CALL
-ContainerWindowWrapper::setPosSize(
+ContainerWindowWrapper::setPosSize( 
     sal_Int32 X,
     sal_Int32 Y,
-    sal_Int32 Width,
-    sal_Int32 Height,
+    sal_Int32 Width, 
+    sal_Int32 Height, 
     sal_Int16 Flags
 )
     throw (
         ::com::sun::star::uno::RuntimeException)
 {
-
+    
 }
 
 ::com::sun::star::awt::Rectangle SAL_CALL
-ContainerWindowWrapper::getPosSize(
-)
+ContainerWindowWrapper::getPosSize(  
+) 
     throw (
         ::com::sun::star::uno::RuntimeException
     )
@@ -167,7 +167,7 @@ ContainerWindowWrapper::getPosSize(
 void SAL_CALL
 ContainerWindowWrapper::setVisible(
     sal_Bool Visible
-)
+) 
     throw (
         ::com::sun::star::uno::RuntimeException
     )
@@ -177,9 +177,9 @@ ContainerWindowWrapper::setVisible(
 
 
 void SAL_CALL
-ContainerWindowWrapper::setEnable(
+ContainerWindowWrapper::setEnable( 
     sal_Bool Enable
-)
+) 
     throw (
         ::com::sun::star::uno::RuntimeException
     )
@@ -189,7 +189,7 @@ ContainerWindowWrapper::setEnable(
 
 void SAL_CALL
 ContainerWindowWrapper::setFocus(
-)
+) 
     throw (
         ::com::sun::star::uno::RuntimeException
     )
@@ -198,22 +198,22 @@ ContainerWindowWrapper::setFocus(
 }
 
 void SAL_CALL
-ContainerWindowWrapper::addWindowListener(
-    const ::com::sun::star::uno::Reference<
+ContainerWindowWrapper::addWindowListener( 
+    const ::com::sun::star::uno::Reference< 
     ::com::sun::star::awt::XWindowListener >& xListener
-)
+) 
     throw (
         ::com::sun::star::uno::RuntimeException
     )
 {
 
 }
-
+    
 void SAL_CALL
 ContainerWindowWrapper::removeWindowListener(
     const ::com::sun::star::uno::Reference<
     ::com::sun::star::awt::XWindowListener >& xListener
-)
+) 
     throw (
         ::com::sun::star::uno::RuntimeException
     )
@@ -223,10 +223,10 @@ ContainerWindowWrapper::removeWindowListener(
 
 
 void SAL_CALL
-ContainerWindowWrapper::addFocusListener(
+ContainerWindowWrapper::addFocusListener( 
     const ::com::sun::star::uno::Reference<
     ::com::sun::star::awt::XFocusListener >& xListener
-)
+) 
     throw (
         ::com::sun::star::uno::RuntimeException
     )
@@ -234,24 +234,24 @@ ContainerWindowWrapper::addFocusListener(
 
 }
 
-
+    
 void SAL_CALL
 ContainerWindowWrapper::removeFocusListener(
     const ::com::sun::star::uno::Reference<
     ::com::sun::star::awt::XFocusListener >& xListener
-)
+) 
     throw (
         ::com::sun::star::uno::RuntimeException
     )
 {
 
 }
-
+    
 void SAL_CALL
 ContainerWindowWrapper::addKeyListener(
     const ::com::sun::star::uno::Reference<
     ::com::sun::star::awt::XKeyListener >& xListener
-)
+) 
     throw (
         ::com::sun::star::uno::RuntimeException
     )
@@ -260,10 +260,10 @@ ContainerWindowWrapper::addKeyListener(
 }
 
 void SAL_CALL
-ContainerWindowWrapper::removeKeyListener(
+ContainerWindowWrapper::removeKeyListener( 
     const ::com::sun::star::uno::Reference<
     ::com::sun::star::awt::XKeyListener >& xListener
-)
+) 
     throw (
         ::com::sun::star::uno::RuntimeException
     )
@@ -271,21 +271,21 @@ ContainerWindowWrapper::removeKeyListener(
 
 }
 
-
+    
 void SAL_CALL
 ContainerWindowWrapper::addMouseListener(
     const ::com::sun::star::uno::Reference<
     ::com::sun::star::awt::XMouseListener >& xListener
-)
+) 
     throw (
         ::com::sun::star::uno::RuntimeException
     )
 {
-
+    
 }
+    
 
-
-void SAL_CALL
+void SAL_CALL 
 ContainerWindowWrapper::removeMouseListener(
     const ::com::sun::star::uno::Reference<
     ::com::sun::star::awt::XMouseListener >& xListener
@@ -301,17 +301,17 @@ ContainerWindowWrapper::removeMouseListener(
 void SAL_CALL
 ContainerWindowWrapper::addMouseMotionListener(
     const ::com::sun::star::uno::Reference<
-    ::com::sun::star::awt::XMouseMotionListener >& xListener
-)
+    ::com::sun::star::awt::XMouseMotionListener >& xListener 
+) 
     throw (
         ::com::sun::star::uno::RuntimeException
     )
 {
 
 }
-
+    
 void SAL_CALL
-ContainerWindowWrapper::removeMouseMotionListener(
+ContainerWindowWrapper::removeMouseMotionListener( 
     const ::com::sun::star::uno::Reference<
     ::com::sun::star::awt::XMouseMotionListener >& xListener
 )
@@ -326,19 +326,19 @@ void SAL_CALL
 ContainerWindowWrapper::addPaintListener(
     const ::com::sun::star::uno::Reference<
     ::com::sun::star::awt::XPaintListener >& xListener
-)
+) 
     throw (
         ::com::sun::star::uno::RuntimeException
     )
 {
-
+    
 }
 
 void SAL_CALL
-ContainerWindowWrapper::removePaintListener(
-    const ::com::sun::star::uno::Reference<
+ContainerWindowWrapper::removePaintListener( 
+    const ::com::sun::star::uno::Reference< 
     ::com::sun::star::awt::XPaintListener >& xListener
-)
+) 
     throw (
         ::com::sun::star::uno::RuntimeException
     )
diff --git a/embedserv/source/inc/common.h b/embedserv/source/inc/common.h
index aa9c703e5a88..e0d43c14652c 100644
--- a/embedserv/source/inc/common.h
+++ b/embedserv/source/inc/common.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/embedserv/source/inc/docholder.hxx b/embedserv/source/inc/docholder.hxx
index 9655f49606d9..3e51c7b6c55e 100644
--- a/embedserv/source/inc/docholder.hxx
+++ b/embedserv/source/inc/docholder.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class DocumentHolder :
                         ::com::sun::star::ui::XDockingAreaAcceptor>
 {
 private:
-    ::osl::Mutex                m_aMutex;
+    ::osl::Mutex				m_aMutex;
 
     BOOL                        m_bAllowInPlace;
     LPOLEINPLACESITE            m_pIOleIPSite;
@@ -107,14 +107,14 @@ private:
 
     sal_Bool m_bLink;
 
-
+    
     ::com::sun::star::uno::Reference<
     ::com::sun::star::frame::XFrame > DocumentFrame();
 
 
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >
         CreateNewInterceptor();
-
+    
     void ClearInterceptorInternally();
 
     void LoadDocInFrame( sal_Bool bPluginMode );
diff --git a/embedserv/source/inc/embeddoc.hxx b/embedserv/source/inc/embeddoc.hxx
index 950dcda18122..4a4845691c2f 100644
--- a/embedserv/source/inc/embeddoc.hxx
+++ b/embedserv/source/inc/embeddoc.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -164,29 +164,29 @@ public:
     HRESULT OLENotifyDeactivation();
 
 protected:
-    oslInterlockedCount                 m_refCount;
+    oslInterlockedCount					m_refCount;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory;
 
-    DocumentHolder*                     m_pDocHolder;
-    ::rtl::OUString                     m_aFileName;
+    DocumentHolder*						m_pDocHolder;
+    ::rtl::OUString						m_aFileName;
 
-    CComPtr< IStorage >                 m_pMasterStorage;
-    CComPtr< IStream >                  m_pOwnStream;
-    CComPtr< IStream >                  m_pExtStream;
-    GUID                                m_guid;
+    CComPtr< IStorage >					m_pMasterStorage;
+    CComPtr< IStream >					m_pOwnStream;
+    CComPtr< IStream >					m_pExtStream;
+    GUID								m_guid;
 
-    sal_Bool                            m_bIsDirty;
+    sal_Bool							m_bIsDirty;
 
-    CComPtr< IOleClientSite >           m_pClientSite;
-    CComPtr< IDataAdviseHolder >        m_pDAdviseHolder;
+    CComPtr< IOleClientSite >			m_pClientSite;
+    CComPtr< IDataAdviseHolder >		m_pDAdviseHolder;
 
-    AdviseSinkHashMap                   m_aAdviseHashMap;
-    DWORD                               m_nAdviseNum;
+    AdviseSinkHashMap					m_aAdviseHashMap;
+    DWORD								m_nAdviseNum;
 
     ::rtl::Reference< EmbeddedDocumentInstanceAccess_Impl > m_xOwnAccess;
 
-    sal_Bool                            m_bIsInVerbHandling;
+    sal_Bool							m_bIsInVerbHandling;
 };
 
 class BooleanGuard_Impl
diff --git a/embedserv/source/inc/embeddocaccess.hxx b/embedserv/source/inc/embeddocaccess.hxx
index ed59dff1ad6e..76f86cab9bcb 100644
--- a/embedserv/source/inc/embeddocaccess.hxx
+++ b/embedserv/source/inc/embeddocaccess.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <cppuhelper/weak.hxx>
 
-#define OLESERV_SAVEOBJECT      1
-#define OLESERV_CLOSE           2
-#define OLESERV_NOTIFY          3
-#define OLESERV_NOTIFYCLOSING   4
-#define OLESERV_SHOWOBJECT      5
-#define OLESERV_DEACTIVATE      6
+#define OLESERV_SAVEOBJECT	    1
+#define OLESERV_CLOSE		    2
+#define OLESERV_NOTIFY		    3
+#define OLESERV_NOTIFYCLOSING	4
+#define OLESERV_SHOWOBJECT	    5
+#define OLESERV_DEACTIVATE	    6
 
 #include <oleidl.h>
 #ifndef __MINGW32__
diff --git a/embedserv/source/inc/embservconst.h b/embedserv/source/inc/embservconst.h
index e682ec4aa5ee..ac4cdcf70853 100644
--- a/embedserv/source/inc/embservconst.h
+++ b/embedserv/source/inc/embservconst.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,7 +46,7 @@ const sal_Int32 nConstBufferSize = 32000;
 #ifdef __MINGW32__
 #define DECLSPEC_SELECTANY
 #endif
-#if defined(__MINGW32__) && !defined(INITGUID)
+#if defined(__MINGW32__) && !defined(INITGUID) 
 EXTERN_C const GUID DECLSPEC_SELECTANY OID_WriterTextServer;
 EXTERN_C const GUID DECLSPEC_SELECTANY OID_WriterOASISTextServer;
 
diff --git a/embedserv/source/inc/iipaobj.hxx b/embedserv/source/inc/iipaobj.hxx
index e0d38ea3348d..54dabed9eb1d 100644
--- a/embedserv/source/inc/iipaobj.hxx
+++ b/embedserv/source/inc/iipaobj.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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:
 
 private:
 
-    oslInterlockedCount                 m_refCount;
+    oslInterlockedCount					m_refCount;
     ::rtl::Reference< DocumentHolder >  m_rDocHolder;
 };
 
diff --git a/embedserv/source/inc/intercept.hxx b/embedserv/source/inc/intercept.hxx
index 267fe1a399cb..09e7601bf5bd 100644
--- a/embedserv/source/inc/intercept.hxx
+++ b/embedserv/source/inc/intercept.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ public:
     void DisconnectDocHolder();
 
     void generateFeatureStateEvent();
-
+    
     // overwritten to release the statuslistner.
 
 
@@ -71,108 +71,108 @@ public:
     addEventListener(
         const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& xListener )
         throw( com::sun::star::uno::RuntimeException );
-
+    
     virtual void SAL_CALL
     removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& aListener )
         throw( com::sun::star::uno::RuntimeException );
-
+    
     void SAL_CALL
     dispose() throw(::com::sun::star::uno::RuntimeException);
-
-
-
+    
+    
+    
     //XDispatch
-    virtual void SAL_CALL
-    dispatch(
+    virtual void SAL_CALL 
+    dispatch( 
         const ::com::sun::star::util::URL& URL,
         const ::com::sun::star::uno::Sequence<
         ::com::sun::star::beans::PropertyValue >& Arguments )
         throw (::com::sun::star::uno::RuntimeException);
-
+    
     virtual void SAL_CALL
-    addStatusListener(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::frame::XStatusListener >& Control,
+    addStatusListener( 
+        const ::com::sun::star::uno::Reference< 
+        ::com::sun::star::frame::XStatusListener >& Control, 
         const ::com::sun::star::util::URL& URL )
         throw (
             ::com::sun::star::uno::RuntimeException
         );
-
+    
     virtual void SAL_CALL
-    removeStatusListener(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::frame::XStatusListener >& Control,
-        const ::com::sun::star::util::URL& URL )
+    removeStatusListener( 
+        const ::com::sun::star::uno::Reference< 
+        ::com::sun::star::frame::XStatusListener >& Control, 
+        const ::com::sun::star::util::URL& URL ) 
         throw (
             ::com::sun::star::uno::RuntimeException
         );
-
+    
     //XInterceptorInfo
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString >
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > 
     SAL_CALL getInterceptedURLs(  )
         throw (
             ::com::sun::star::uno::RuntimeException
         );
-
+    
 
     //XDispatchProvider ( inherited by XDispatchProviderInterceptor )
-    virtual ::com::sun::star::uno::Reference<
+    virtual ::com::sun::star::uno::Reference< 
     ::com::sun::star::frame::XDispatch > SAL_CALL
-    queryDispatch(
+    queryDispatch( 
         const ::com::sun::star::util::URL& URL,
-        const ::rtl::OUString& TargetFrameName,
+        const ::rtl::OUString& TargetFrameName, 
         sal_Int32 SearchFlags )
         throw (
             ::com::sun::star::uno::RuntimeException
         );
-
-    virtual ::com::sun::star::uno::Sequence<
-    ::com::sun::star::uno::Reference<
+    
+    virtual ::com::sun::star::uno::Sequence< 
+    ::com::sun::star::uno::Reference< 
     ::com::sun::star::frame::XDispatch > > SAL_CALL
-    queryDispatches(
+    queryDispatches( 
         const ::com::sun::star::uno::Sequence<
         ::com::sun::star::frame::DispatchDescriptor >& Requests )
         throw (
             ::com::sun::star::uno::RuntimeException
         );
-
-
+    
+    
     //XDispatchProviderInterceptor
     virtual ::com::sun::star::uno::Reference<
-    ::com::sun::star::frame::XDispatchProvider > SAL_CALL
-    getSlaveDispatchProvider(  )
+    ::com::sun::star::frame::XDispatchProvider > SAL_CALL 
+    getSlaveDispatchProvider(  ) 
         throw (
             ::com::sun::star::uno::RuntimeException
         );
-
+    
     virtual void SAL_CALL
-    setSlaveDispatchProvider(
-        const ::com::sun::star::uno::Reference<
+    setSlaveDispatchProvider( 
+        const ::com::sun::star::uno::Reference< 
         ::com::sun::star::frame::XDispatchProvider >& NewDispatchProvider )
         throw (
             ::com::sun::star::uno::RuntimeException
         );
 
-    virtual ::com::sun::star::uno::Reference<
+    virtual ::com::sun::star::uno::Reference< 
     ::com::sun::star::frame::XDispatchProvider > SAL_CALL
-    getMasterDispatchProvider(  )
+    getMasterDispatchProvider(  ) 
         throw (
             ::com::sun::star::uno::RuntimeException
         );
-
+    
     virtual void SAL_CALL
-    setMasterDispatchProvider(
-        const ::com::sun::star::uno::Reference<
+    setMasterDispatchProvider( 
+        const ::com::sun::star::uno::Reference< 
         ::com::sun::star::frame::XDispatchProvider >& NewSupplier )
         throw (
             ::com::sun::star::uno::RuntimeException
-        );
-
-
+        );	
+    
+    
 private:
-
+    
     osl::Mutex   m_aMutex;
-
+    
     ::rtl::Reference< EmbeddedDocumentInstanceAccess_Impl > m_xOleAccess;
 
     ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface > m_xDocHLocker;
@@ -180,11 +180,11 @@ private:
 
     ::com::sun::star::uno::Reference<
     ::com::sun::star::frame::XDispatchProvider > m_xSlaveDispatchProvider;
-
-    ::com::sun::star::uno::Reference<
+    
+    ::com::sun::star::uno::Reference< 
     ::com::sun::star::frame::XDispatchProvider > m_xMasterDispatchProvider;
 
-    static ::com::sun::star::uno::Sequence< ::rtl::OUString >
+    static ::com::sun::star::uno::Sequence< ::rtl::OUString > 
     m_aInterceptedURL;
 
     cppu::OInterfaceContainerHelper*    m_pDisposeEventListeners;
diff --git a/embedserv/source/inc/servprov.hxx b/embedserv/source/inc/servprov.hxx
index cc861d2cc8d0..4206148ee80c 100644
--- a/embedserv/source/inc/servprov.hxx
+++ b/embedserv/source/inc/servprov.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,15 +51,15 @@ public:
     virtual ~EmbedServer_Impl();
 
     // XInterface
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
+    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) 
         throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL acquire() throw ();
     virtual void SAL_CALL release() throw ();
 
     // XTypeProvider
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( )
+    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()
+    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() 
         throw(::com::sun::star::uno::RuntimeException);
 
 protected:
@@ -77,7 +77,7 @@ public:
 
     sal_Bool registerClass();
     sal_Bool deregisterClass();
-
+    
     /* IUnknown methods */
     STDMETHOD(QueryInterface)(REFIID riid, LPVOID FAR * ppvObj);
     STDMETHOD_(ULONG, AddRef)();
@@ -90,8 +90,8 @@ public:
 protected:
 
     oslInterlockedCount m_refCount;
-    GUID                m_guid;
-    DWORD               m_factoryHandle;
+    GUID				m_guid;
+    DWORD 				m_factoryHandle;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory;
 };
diff --git a/embedserv/source/inc/stdafx.h b/embedserv/source/inc/stdafx.h
index c1110ac8ab42..b6e553e7f65b 100644
--- a/embedserv/source/inc/stdafx.h
+++ b/embedserv/source/inc/stdafx.h
@@ -39,6 +39,6 @@ using ::std::max;
 #pragma warning(pop)
 #endif
 
-#endif
+#endif 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embedserv/source/inc/syswinwrapper.hxx b/embedserv/source/inc/syswinwrapper.hxx
index ce049c502200..0eff8b5d0df0 100644
--- a/embedserv/source/inc/syswinwrapper.hxx
+++ b/embedserv/source/inc/syswinwrapper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/embedserv/source/inc/xwin.hxx b/embedserv/source/inc/xwin.hxx
index e7cdbac53117..d6abfaa93fa7 100644
--- a/embedserv/source/inc/xwin.hxx
+++ b/embedserv/source/inc/xwin.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,163 +39,163 @@
 
 
 class ContainerWindowWrapper:
-    public ::cppu::WeakImplHelper2<
+    public ::cppu::WeakImplHelper2< 
                  ::com::sun::star::awt::XWindow,
                  ::com::sun::star::awt::XSystemDependentWindowPeer>
 {
 public:
 
     ContainerWindowWrapper(HWND aHwnd);
-
+    
     ~ ContainerWindowWrapper();
-
-
+    
+    
     // XComponent
-
+    
     virtual void SAL_CALL
     dispose(
-    )
+    ) 
         throw (
             ::com::sun::star::uno::RuntimeException
         );
-
+    
     virtual void SAL_CALL
-    addEventListener(
+    addEventListener( 
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::lang::XEventListener >& xListener
+        ::com::sun::star::lang::XEventListener >& xListener 
     )
         throw (
             ::com::sun::star::uno::RuntimeException
         );
-
+    
     virtual void SAL_CALL
-    removeEventListener(
+    removeEventListener( 
         const ::com::sun::star::uno::Reference<
         ::com::sun::star::lang::XEventListener >& aListener
-    )
+    ) 
         throw (
             ::com::sun::star::uno::RuntimeException
         );
-
-
+    
+    
     // XSystemDependentWindowPeer
-
+    
     virtual ::com::sun::star::uno::Any SAL_CALL
-    getWindowHandle(
+    getWindowHandle( 
         const ::com::sun::star::uno::Sequence< sal_Int8 >& ProcessId,
         sal_Int16 SystemType
-    )
+    ) 
         throw (
             ::com::sun::star::uno::RuntimeException
         );
 
     // XWindow
-
+    
     virtual void SAL_CALL
-    setPosSize(
+    setPosSize( 
         sal_Int32 X,
         sal_Int32 Y,
-        sal_Int32 Width,
-        sal_Int32 Height,
+        sal_Int32 Width, 
+        sal_Int32 Height, 
         sal_Int16 Flags
     )
         throw (
             ::com::sun::star::uno::RuntimeException);
-
+    
     virtual ::com::sun::star::awt::Rectangle SAL_CALL
-    getPosSize(
-    )
+    getPosSize(  
+    ) 
         throw (
             ::com::sun::star::uno::RuntimeException
         );
-
+    
     virtual void SAL_CALL
     setVisible(
         sal_Bool Visible
-    )
+    ) 
         throw (
             ::com::sun::star::uno::RuntimeException
         );
-
+    
     virtual void SAL_CALL
-    setEnable(
+    setEnable( 
         sal_Bool Enable
-    )
+    ) 
         throw (
             ::com::sun::star::uno::RuntimeException
         );
 
     virtual void SAL_CALL
     setFocus(
-    )
+    ) 
         throw (
             ::com::sun::star::uno::RuntimeException
         );
-
+    
     virtual void SAL_CALL
-    addWindowListener(
-        const ::com::sun::star::uno::Reference<
+    addWindowListener( 
+        const ::com::sun::star::uno::Reference< 
         ::com::sun::star::awt::XWindowListener >& xListener
-    )
+    ) 
         throw (
             ::com::sun::star::uno::RuntimeException
         );
-
+    
     virtual void SAL_CALL
     removeWindowListener(
         const ::com::sun::star::uno::Reference<
         ::com::sun::star::awt::XWindowListener >& xListener
-    )
+    ) 
         throw (
             ::com::sun::star::uno::RuntimeException
         );
 
     virtual void SAL_CALL
-    addFocusListener(
+    addFocusListener( 
         const ::com::sun::star::uno::Reference<
         ::com::sun::star::awt::XFocusListener >& xListener
-    )
+    ) 
         throw (
             ::com::sun::star::uno::RuntimeException
         );
-
+    
     virtual void SAL_CALL
     removeFocusListener(
         const ::com::sun::star::uno::Reference<
         ::com::sun::star::awt::XFocusListener >& xListener
-    )
+    ) 
         throw (
             ::com::sun::star::uno::RuntimeException
         );
-
+    
     virtual void SAL_CALL
     addKeyListener(
         const ::com::sun::star::uno::Reference<
         ::com::sun::star::awt::XKeyListener >& xListener
-    )
+    ) 
         throw (
             ::com::sun::star::uno::RuntimeException
         );
-
+    
     virtual void SAL_CALL
-    removeKeyListener(
+    removeKeyListener( 
         const ::com::sun::star::uno::Reference<
         ::com::sun::star::awt::XKeyListener >& xListener
-    )
+    ) 
         throw (
             ::com::sun::star::uno::RuntimeException
         );
-
+    
     virtual void SAL_CALL
     addMouseListener(
         const ::com::sun::star::uno::Reference<
         ::com::sun::star::awt::XMouseListener >& xListener
-    )
+    ) 
         throw (
             ::com::sun::star::uno::RuntimeException
         );
-
-    virtual void SAL_CALL
+    
+    virtual void SAL_CALL 
     removeMouseListener(
         const ::com::sun::star::uno::Reference<
         ::com::sun::star::awt::XMouseListener >& xListener
@@ -203,49 +203,49 @@ public:
         throw (
             ::com::sun::star::uno::RuntimeException
         );
-
+    
     virtual void SAL_CALL
     addMouseMotionListener(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::awt::XMouseMotionListener >& xListener
-    )
+        ::com::sun::star::awt::XMouseMotionListener >& xListener 
+    ) 
         throw (
             ::com::sun::star::uno::RuntimeException
         );
-
+    
     virtual void SAL_CALL
-    removeMouseMotionListener(
+    removeMouseMotionListener( 
         const ::com::sun::star::uno::Reference<
         ::com::sun::star::awt::XMouseMotionListener >& xListener
     )
         throw (
             ::com::sun::star::uno::RuntimeException
         );
-
+    
     virtual void SAL_CALL
     addPaintListener(
         const ::com::sun::star::uno::Reference<
         ::com::sun::star::awt::XPaintListener >& xListener
-    )
+    ) 
         throw (
             ::com::sun::star::uno::RuntimeException
         );
-
+    
     virtual void SAL_CALL
-    removePaintListener(
-        const ::com::sun::star::uno::Reference<
+    removePaintListener( 
+        const ::com::sun::star::uno::Reference< 
         ::com::sun::star::awt::XPaintListener >& xListener
-    )
+    ) 
         throw (
             ::com::sun::star::uno::RuntimeException
         );
 
-
+    
 private:
-
+    
     osl::Mutex m_aMutex;
     cppu::OInterfaceContainerHelper *m_pDisposeEventListeners;
-
+    
     HWND m_aHwnd;
 };
 
diff --git a/embedserv/source/inprocserv/advisesink.cxx b/embedserv/source/inprocserv/advisesink.cxx
index 2922105a7e1d..03c63bb1c0af 100644
--- a/embedserv/source/inprocserv/advisesink.cxx
+++ b/embedserv/source/inprocserv/advisesink.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/embedserv/source/inprocserv/advisesink.hxx b/embedserv/source/inprocserv/advisesink.hxx
index 2e699cf65d40..22246b1ef021 100644
--- a/embedserv/source/inprocserv/advisesink.hxx
+++ b/embedserv/source/inprocserv/advisesink.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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:
     DWORD GetAspect() { return m_nAspect; }
     ComSmart< IAdviseSink >& GetOrigAdvise() { return m_pListener; }
     void DisconnectOrigAdvise() { m_pListener = NULL; }
-
+    
     void SetClosed() { m_bClosed = TRUE; }
     void UnsetClosed() { m_bClosed = FALSE; }
     BOOL IsClosed() { return m_bClosed; }
diff --git a/embedserv/source/inprocserv/dllentry.cxx b/embedserv/source/inprocserv/dllentry.cxx
index b54c2c6e42db..acb94fd5e67d 100644
--- a/embedserv/source/inprocserv/dllentry.cxx
+++ b/embedserv/source/inprocserv/dllentry.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,10 +69,10 @@ namespace {
 
     int GetStringFromClassID( const GUID& guid, char* pBuf, int nLen )
     {
-        // is not allowed to insert
+        // is not allowed to insert 
         if ( nLen < 38 )
             return 0;
-
+        
         pBuf[0] = '{';
         FillCharFromInt( guid.Data1, &pBuf[1], 8 );
         pBuf[9] = '-';
@@ -157,7 +157,7 @@ public:
 protected:
 
     ULONG               m_refCount;
-    GUID                m_guid;
+    GUID				m_guid;
 };
 }; // namespace inprocserv
 
@@ -331,7 +331,7 @@ STDMETHODIMP InprocEmbedProvider_Impl::CreateInstance(IUnknown FAR* punkOuter,
 
     if ( !SUCCEEDED( hr ) )
         *ppv = NULL;
-
+    
     return hr;
 }
 
diff --git a/embedserv/source/inprocserv/inprocembobj.cxx b/embedserv/source/inprocserv/inprocembobj.cxx
index 32ea696554f5..6171ca741915 100644
--- a/embedserv/source/inprocserv/inprocembobj.cxx
+++ b/embedserv/source/inprocserv/inprocembobj.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ void WriteDebugInfo( DWORD pThis, char* pString, DWORD nToWrite )
         pNumber[0] = '0';
         pNumber[1] = 'x';
         for ( int nInd = 0; nInd < 8; nInd++ )
-            pNumber[nInd+2] = (char)( ( pThis / ( 1 << ( 7 - nInd ) ) ) % 16 ) + 48;
+            pNumber[nInd+2] = (char)( ( pThis / ( 1 << ( 7 - nInd ) ) ) % 16 ) + 48;  
         pNumber[10] = ' ';
         pNumber[11] = 0;
 
@@ -206,7 +206,7 @@ BOOL InprocEmbedDocument_Impl::CheckDefHandler()
 //            // reinit the handler
 //            ComSmart< IRunnableObject > pIRunObj;
 //            hr = m_pDefHandler->QueryInterface( IID_IRunnableObject, (void**)&pIRunObj );
-//
+//            
 //            if ( SUCCEEDED( hr ) && pIRunObj )
             {
 //                {
@@ -268,7 +268,7 @@ BOOL InprocEmbedDocument_Impl::CheckDefHandler()
             WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
             if ( m_pClientSite )
                 pOleObject->SetClientSite( m_pClientSite );
-
+            
             WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
             for ( DWORD nInd = 0; nInd < DEFAULT_ARRAY_LEN; nInd++ )
                 if ( m_pOleAdvises[nInd] )
@@ -550,7 +550,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::InitNew( IStorage *pStg )
                     m_pFileName = NULL;
                 }
             }
-
+            
             return hr;
         }
     }
@@ -567,7 +567,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::Load( IStorage *pStg )
         WRITEDEBUGINFO( "InprocEmbedDocument_Impl::Load( IStorage *pStg )" );
         ComSmart< IPersistStorage > pPersist;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IPersistStorage, (void**)&pPersist );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pPersist )
         {
@@ -587,7 +587,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::Load( IStorage *pStg )
                     m_pFileName = NULL;
                 }
             }
-
+            
             return hr;
         }
     }
@@ -607,7 +607,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::Save( IStorage *pStgSave, BOOL fSameAsLoa
     {
         ComSmart< IPersistStorage > pPersist;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IPersistStorage, (void**)&pPersist );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pPersist )
             return pPersist->Save( pStgSave, fSameAsLoad );
@@ -633,7 +633,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::SaveCompleted( IStorage *pStgNew )
     {
         ComSmart< IPersistStorage > pPersist;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IPersistStorage, (void**)&pPersist );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pPersist )
         {
@@ -671,7 +671,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::HandsOffStorage()
     {
         ComSmart< IPersistStorage > pPersist;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IPersistStorage, (void**)&pPersist );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pPersist )
         {
@@ -698,7 +698,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::Load( LPCOLESTR pszFileName, DWORD dwMode
     {
         ComSmart< IPersistFile > pPersist;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IPersistFile, (void**)&pPersist );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pPersist )
         {
@@ -729,7 +729,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::Save( LPCOLESTR pszFileName, BOOL fRememb
     {
         ComSmart< IPersistFile > pPersist;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IPersistFile, (void**)&pPersist );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pPersist )
             return pPersist->Save( pszFileName, fRemember );
@@ -746,7 +746,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::SaveCompleted( LPCOLESTR pszFileName )
     {
         ComSmart< IPersistFile > pPersist;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IPersistFile, (void**)&pPersist );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pPersist )
         {
@@ -776,7 +776,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetCurFile( LPOLESTR *ppszFileName )
     {
         ComSmart< IPersistFile > pPersist;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IPersistFile, (void**)&pPersist );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pPersist )
             return pPersist->GetCurFile( ppszFileName );
@@ -807,7 +807,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetClientSite( IOleClientSite* pSite )
     {
         ComSmart< IOleObject > pOleObject;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IOleObject, (void**)&pOleObject );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pOleObject )
         {
@@ -821,7 +821,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetClientSite( IOleClientSite* pSite )
                     m_pOleContainer->LockContainer( FALSE );
                     m_pOleContainer = NULL;
                 }
-
+                
                 m_pClientSite->GetContainer( &m_pOleContainer );
                 if ( m_pOleContainer )
                     m_pOleContainer->LockContainer( TRUE );
@@ -842,7 +842,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetClientSite( IOleClientSite** pSite )
     {
         ComSmart< IOleObject > pOleObject;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IOleObject, (void**)&pOleObject );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pOleObject )
             return pOleObject->GetClientSite( pSite );
@@ -860,7 +860,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetHostNames( LPCOLESTR szContainerApp, L
     {
         ComSmart< IOleObject > pOleObject;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IOleObject, (void**)&pOleObject );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pOleObject )
         {
@@ -881,7 +881,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::Close( DWORD dwSaveOption )
         // no need to close if there is no default handler.
         ComSmart< IOleObject > pOleObject;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IOleObject, (void**)&pOleObject );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pOleObject )
         {
@@ -904,7 +904,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetMoniker( DWORD dwWhichMoniker, IMonike
     {
         ComSmart< IOleObject > pOleObject;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IOleObject, (void**)&pOleObject );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pOleObject )
             return pOleObject->SetMoniker( dwWhichMoniker, pmk );
@@ -921,7 +921,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetMoniker( DWORD dwAssign, DWORD dwWhich
     {
         ComSmart< IOleObject > pOleObject;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IOleObject, (void**)&pOleObject );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pOleObject )
             return pOleObject->GetMoniker( dwAssign, dwWhichMoniker, ppmk );
@@ -938,7 +938,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::InitFromData( IDataObject * pDataObject,
     {
         ComSmart< IOleObject > pOleObject;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IOleObject, (void**)&pOleObject );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pOleObject )
             return pOleObject->InitFromData( pDataObject, fCreation, dwReserved );
@@ -955,7 +955,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetClipboardData( DWORD dwReserved, IData
     {
         ComSmart< IOleObject > pOleObject;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IOleObject, (void**)&pOleObject );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pOleObject )
             return pOleObject->GetClipboardData( dwReserved, ppDataObject );
@@ -979,7 +979,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::DoVerb(
         WRITEDEBUGINFO( "DoVerb" MY_STRING_LINE "n" );
         ComSmart< IOleObject > pOleObject;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IOleObject, (void**)&pOleObject );
-
+        
         WRITEDEBUGINFO( "DoVerb" );
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         WRITEDEBUGINFO( "DoVerb" );
@@ -1009,7 +1009,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::EnumVerbs( IEnumOLEVERB ** ppEnumOleVerb
     {
         ComSmart< IOleObject > pOleObject;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IOleObject, (void**)&pOleObject );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pOleObject )
             return pOleObject->EnumVerbs( ppEnumOleVerb );
@@ -1027,7 +1027,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::Update()
     {
         ComSmart< IOleObject > pOleObject;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IOleObject, (void**)&pOleObject );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pOleObject )
             return pOleObject->Update();
@@ -1044,7 +1044,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::IsUpToDate()
     {
         ComSmart< IOleObject > pOleObject;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IOleObject, (void**)&pOleObject );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pOleObject )
             return pOleObject->IsUpToDate();
@@ -1071,7 +1071,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetUserType( DWORD dwFormOfType, LPOLESTR
     {
         ComSmart< IOleObject > pOleObject;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IOleObject, (void**)&pOleObject );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pOleObject )
             return pOleObject->GetUserType( dwFormOfType, pszUserType );
@@ -1088,7 +1088,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetExtent( DWORD dwDrawAspect, SIZEL *psi
     {
         ComSmart< IOleObject > pOleObject;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IOleObject, (void**)&pOleObject );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pOleObject )
             return pOleObject->SetExtent( dwDrawAspect, psizel );
@@ -1105,7 +1105,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetExtent( DWORD dwDrawAspect, SIZEL * ps
     {
         ComSmart< IOleObject > pOleObject;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IOleObject, (void**)&pOleObject );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pOleObject )
             return pOleObject->GetExtent( dwDrawAspect, psizel );
@@ -1118,7 +1118,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetExtent( DWORD dwDrawAspect, SIZEL * ps
 STDMETHODIMP InprocEmbedDocument_Impl::Advise( IAdviseSink *pAdvSink, DWORD *pdwConnection )
 {
     WRITEDEBUGINFO( "InprocEmbedDocument_Impl::Advise( IAdviseSink *pAdvSink, DWORD *pdwConnection )" );
-
+    
     if ( !pdwConnection )
         return E_FAIL;
 
@@ -1133,13 +1133,13 @@ STDMETHODIMP InprocEmbedDocument_Impl::Advise( IAdviseSink *pAdvSink, DWORD *pdw
     {
         ComSmart< IOleObject > pOleObject;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IOleObject, (void**)&pOleObject );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pOleObject )
         {
             ComSmart< OleWrapperAdviseSink > pOwnAdvise( new OleWrapperAdviseSink( pAdvSink ) );
             DWORD nRegID = 0;
-
+            
             if ( SUCCEEDED( pOleObject->Advise( pOwnAdvise, &nRegID ) ) && nRegID > 0 )
             {
                 pOwnAdvise->SetRegID( nRegID );
@@ -1147,7 +1147,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::Advise( IAdviseSink *pAdvSink, DWORD *pdw
                 if ( *pdwConnection )
                     return S_OK;
                 else
-                    pOleObject->Unadvise( nRegID );
+                    pOleObject->Unadvise( nRegID );  
             }
         }
     }
@@ -1165,7 +1165,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::Unadvise( DWORD dwConnection )
         {
             ComSmart< IOleObject > pOleObject;
             HRESULT hr = m_pDefHandler->QueryInterface( IID_IOleObject, (void**)&pOleObject );
-
+            
             ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
             if ( SUCCEEDED( hr ) && pOleObject )
             {
@@ -1209,7 +1209,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetMiscStatus( DWORD dwAspect, DWORD * pd
     {
         ComSmart< IOleObject > pOleObject;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IOleObject, (void**)&pOleObject );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pOleObject )
             return pOleObject->GetMiscStatus( dwAspect, pdwStatus );
@@ -1226,7 +1226,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetColorScheme( LOGPALETTE * pLogpal )
     {
         ComSmart< IOleObject > pOleObject;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IOleObject, (void**)&pOleObject );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pOleObject )
             return pOleObject->SetColorScheme( pLogpal );
@@ -1244,7 +1244,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetData( FORMATETC * pFormatetc, STGMEDIU
     {
         ComSmart< IDataObject > pIDataObject;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IDataObject, (void**)&pIDataObject );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pIDataObject )
             return pIDataObject->GetData( pFormatetc, pMedium );
@@ -1261,7 +1261,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetDataHere( FORMATETC * pFormatetc, STGM
     {
         ComSmart< IDataObject > pIDataObject;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IDataObject, (void**)&pIDataObject );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pIDataObject )
             return pIDataObject->GetDataHere( pFormatetc, pMedium );
@@ -1278,7 +1278,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::QueryGetData( FORMATETC * pFormatetc )
     {
         ComSmart< IDataObject > pIDataObject;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IDataObject, (void**)&pIDataObject );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pIDataObject )
             return pIDataObject->QueryGetData( pFormatetc );
@@ -1295,7 +1295,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetCanonicalFormatEtc( FORMATETC * pForma
     {
         ComSmart< IDataObject > pIDataObject;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IDataObject, (void**)&pIDataObject );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pIDataObject )
             return pIDataObject->GetCanonicalFormatEtc( pFormatetcIn, pFormatetcOut );
@@ -1312,7 +1312,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetData( FORMATETC * pFormatetc, STGMEDIU
     {
         ComSmart< IDataObject > pIDataObject;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IDataObject, (void**)&pIDataObject );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pIDataObject )
             return pIDataObject->SetData( pFormatetc, pMedium, fRelease );
@@ -1329,7 +1329,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::EnumFormatEtc( DWORD dwDirection, IEnumFO
     {
         ComSmart< IDataObject > pIDataObject;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IDataObject, (void**)&pIDataObject );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pIDataObject )
             return pIDataObject->EnumFormatEtc( dwDirection, ppFormatetc );
@@ -1357,13 +1357,13 @@ STDMETHODIMP InprocEmbedDocument_Impl::DAdvise( FORMATETC * pFormatetc, DWORD ad
     {
         ComSmart< IDataObject > pIDataObject;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IDataObject, (void**)&pIDataObject );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pIDataObject )
         {
             ComSmart< OleWrapperAdviseSink > pOwnAdvise( new OleWrapperAdviseSink( ComSmart<IAdviseSink>( pAdvSink ), pFormatetc, advf ) );
             DWORD nRegID = 0;
-
+            
             if ( SUCCEEDED( pIDataObject->DAdvise( pFormatetc, advf, pOwnAdvise, &nRegID ) ) && nRegID > 0 )
             {
                 pOwnAdvise->SetRegID( nRegID );
@@ -1371,7 +1371,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::DAdvise( FORMATETC * pFormatetc, DWORD ad
                 if ( *pdwConnection )
                     return S_OK;
                 else
-                    pIDataObject->DUnadvise( nRegID );
+                    pIDataObject->DUnadvise( nRegID );  
             }
         }
     }
@@ -1390,7 +1390,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::DUnadvise( DWORD dwConnection )
         {
             ComSmart< IDataObject > pIDataObject;
             HRESULT hr = m_pDefHandler->QueryInterface( IID_IDataObject, (void**)&pIDataObject );
-
+            
             ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
             if ( SUCCEEDED( hr ) && pIDataObject )
             {
@@ -1416,7 +1416,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::EnumDAdvise( IEnumSTATDATA ** ppenumAdvis
     {
         ComSmart< IDataObject > pIDataObject;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IDataObject, (void**)&pIDataObject );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pIDataObject )
             return pIDataObject->EnumDAdvise( ppenumAdvise );
@@ -1434,7 +1434,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetRunningClass( LPCLSID lpClsid )
     {
         ComSmart< IRunnableObject > pIRunObj;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IRunnableObject, (void**)&pIRunObj );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pIRunObj )
             return pIRunObj->GetRunningClass( lpClsid );
@@ -1451,7 +1451,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::Run( LPBINDCTX pbc )
     {
         ComSmart< IRunnableObject > pIRunObj;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IRunnableObject, (void**)&pIRunObj );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pIRunObj )
             return pIRunObj->Run( pbc );
@@ -1468,7 +1468,7 @@ BOOL STDMETHODCALLTYPE InprocEmbedDocument_Impl::IsRunning()
     {
         ComSmart< IRunnableObject > pIRunObj;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IRunnableObject, (void**)&pIRunObj );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pIRunObj )
             return pIRunObj->IsRunning();
@@ -1486,7 +1486,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::LockRunning( BOOL fLock, BOOL fLastUnlock
     {
         ComSmart< IRunnableObject > pIRunObj;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IRunnableObject, (void**)&pIRunObj );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pIRunObj )
             return pIRunObj->LockRunning( fLock, fLastUnlockCloses );
@@ -1503,7 +1503,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetContainedObject( BOOL fContained)
     {
         ComSmart< IRunnableObject > pIRunObj;
         HRESULT hr = m_pDefHandler->QueryInterface( IID_IRunnableObject, (void**)&pIRunObj );
-
+        
         ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
         if ( SUCCEEDED( hr ) && pIRunObj )
             return pIRunObj->SetContainedObject( fContained );
@@ -1603,7 +1603,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetAdvise( DWORD aspects, DWORD advf, IAd
         if ( SUCCEEDED( hr ) && pIViewObject )
         {
             ComSmart< OleWrapperAdviseSink > pOwnAdvise( new OleWrapperAdviseSink( pAdvSink, aspects, advf ) );
-
+            
             if ( SUCCEEDED( pIViewObject->SetAdvise( aspects, advf, pOwnAdvise ) ) )
             {
                 m_pViewAdvise = pOwnAdvise;
diff --git a/embedserv/source/inprocserv/inprocembobj.h b/embedserv/source/inprocserv/inprocembobj.h
index 0592352dad49..ebbbd393ea13 100644
--- a/embedserv/source/inprocserv/inprocembobj.h
+++ b/embedserv/source/inprocserv/inprocembobj.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
@@ -234,7 +234,7 @@ public:
     STDMETHOD(GetTypeInfo)( UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo);
     STDMETHOD(GetIDsOfNames)( REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId);
     STDMETHOD(Invoke)( DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr);
-
+ 
 };
 
 } // namespace inprocserv
diff --git a/embedserv/source/inprocserv/smartpointer.hxx b/embedserv/source/inprocserv/smartpointer.hxx
index 776ec5305ed8..cc8b458ddbc2 100644
--- a/embedserv/source/inprocserv/smartpointer.hxx
+++ b/embedserv/source/inprocserv/smartpointer.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ template< class T > class ComSmart
             pInterface->Release();
         }
     }
-
+    
 public:
     ComSmart()
     : m_pInterface( NULL )
@@ -79,7 +79,7 @@ public:
          if ( m_pInterface != NULL )
             m_pInterface->AddRef();
     }
-
+ 
     ~ComSmart()
     {
         OwnRelease();
@@ -96,7 +96,7 @@ public:
 
         return *this;
     }
-
+ 
     ComSmart<T>& operator=( T* pInterface )
     {
         OwnRelease();
@@ -118,7 +118,7 @@ public:
     {
         return *m_pInterface;
     }
-
+     
     T** operator&()
     {
         OwnRelease();
diff --git a/extensions/inc/abpilot.hrc b/extensions/inc/abpilot.hrc
index ad2c4b1115c2..aea77a3f3b9b 100644
--- a/extensions/inc/abpilot.hrc
+++ b/extensions/inc/abpilot.hrc
@@ -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/extensions/inc/appsettings.hxx b/extensions/inc/appsettings.hxx
index 8622db0bd77e..78f38ffb4fe5 100644
--- a/extensions/inc/appsettings.hxx
+++ b/extensions/inc/appsettings.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/inc/bibliography.hrc b/extensions/inc/bibliography.hrc
index c67060e18edf..90372fc0b564 100644
--- a/extensions/inc/bibliography.hrc
+++ b/extensions/inc/bibliography.hrc
@@ -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/extensions/inc/dbpilots.hrc b/extensions/inc/dbpilots.hrc
index 46ee01805938..38a47138c875 100644
--- a/extensions/inc/dbpilots.hrc
+++ b/extensions/inc/dbpilots.hrc
@@ -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
@@ -41,10 +41,10 @@
 #define HID_LISTWIZARD_NEXT                     ( HID_DBP_START +   9)
 #define HID_LISTWIZARD_CANCEL                   ( HID_DBP_START +  10)
 #define HID_LISTWIZARD_FINISH                   ( HID_DBP_START +  11)
-#define HID_GRIDWIZARD_PREVIOUS                 ( HID_DBP_START +  12)
-#define HID_GRIDWIZARD_NEXT                     ( HID_DBP_START +  13)
-#define HID_GRIDWIZARD_CANCEL                   ( HID_DBP_START +  14)
-#define HID_GRIDWIZARD_FINISH                   ( HID_DBP_START +  15)
+#define HID_GRIDWIZARD_PREVIOUS					( HID_DBP_START +  12)
+#define HID_GRIDWIZARD_NEXT						( HID_DBP_START +  13)
+#define HID_GRIDWIZARD_CANCEL					( HID_DBP_START +  14)
+#define HID_GRIDWIZARD_FINISH					( HID_DBP_START +  15)
     // !! if you add new IDs, please also adjust HID_ABP_LAST below !!
 #define HID_DBP_LAST    HID_GRIDWIZARD_FINISH
 
diff --git a/extensions/inc/extensio.hrc b/extensions/inc/extensio.hrc
index bd643892d42f..5b1154763738 100644
--- a/extensions/inc/extensio.hrc
+++ b/extensions/inc/extensio.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 // -----------------------------------------------------------------------
 // - resource id ranges
 
-#define RID_ABP_START       ( RID_MORE_EXTENSIONS_START +   0 )
-#define RID_ABP_END         ( RID_MORE_EXTENSIONS_START +  19 )
+#define RID_ABP_START		( RID_MORE_EXTENSIONS_START +   0 )
+#define RID_ABP_END			( RID_MORE_EXTENSIONS_START +  19 )
 
 #define RID_DBP_START       ( RID_MORE_EXTENSIONS_START +  20 )
 #define RID_DBP_END         ( RID_MORE_EXTENSIONS_START +  39 )
@@ -49,11 +49,11 @@
 // -----------------------------------------------------------------------
 // - help id ranges
 
-#define HID_DBP_START       ( HID_EXTENSIONS_START +   0 )
-#define HID_DBP_END         ( HID_EXTENSIONS_START +  19 )
+#define HID_DBP_START		( HID_EXTENSIONS_START +   0 )
+#define HID_DBP_END			( HID_EXTENSIONS_START +  19 )
 
-#define HID_ABP_START       ( HID_EXTENSIONS_START +  20 )
-#define HID_ABP_END         ( HID_EXTENSIONS_START +  39 )
+#define HID_ABP_START		( HID_EXTENSIONS_START +  20 )
+#define HID_ABP_END			( HID_EXTENSIONS_START +  39 )
 
 #define HID_BIBLIO_START    ( HID_EXTENSIONS_START +   40 )
 #define HID_BIBLIO_END      ( HID_EXTENSIONS_START +   89 )
diff --git a/extensions/inc/pch/precompiled_extensions.cxx b/extensions/inc/pch/precompiled_extensions.cxx
index 9943e17e4c45..6a73045125b8 100644
--- a/extensions/inc/pch/precompiled_extensions.cxx
+++ b/extensions/inc/pch/precompiled_extensions.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/inc/pch/precompiled_extensions.hxx b/extensions/inc/pch/precompiled_extensions.hxx
index d0f8b8936f10..91c1d8849fc9 100644
--- a/extensions/inc/pch/precompiled_extensions.hxx
+++ b/extensions/inc/pch/precompiled_extensions.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/inc/propctrlr.hrc b/extensions/inc/propctrlr.hrc
index 477f512797ec..ab11bf432117 100644
--- a/extensions/inc/propctrlr.hrc
+++ b/extensions/inc/propctrlr.hrc
@@ -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/extensions/inc/ucbhelper/ext_content.hxx b/extensions/inc/ucbhelper/ext_content.hxx
index 69d4a016eecb..50d7f83a3c4e 100644
--- a/extensions/inc/ucbhelper/ext_content.hxx
+++ b/extensions/inc/ucbhelper/ext_content.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,30 +59,30 @@ using namespace osl;
 
 template <class Type> class safe_list : public osl::Mutex, public std::list< Type > {};
 
-class OSimpleContentIdentifier :    public OWeakObject,
+class OSimpleContentIdentifier :	public OWeakObject,
                                     public XContentIdentifier
 {
 private:
-    OUString    Identifier;
-    OUString    ProviderScheme;
+    OUString	Identifier;
+    OUString	ProviderScheme;
 
 public:
     OSimpleContentIdentifier( const OUString& rIdentifier, const OUString& rProviderScheme );
 
     // XInterface
-    virtual Any         SAL_CALL queryInterface( const Type &type ) throw( RuntimeException );
-    virtual void        SAL_CALL acquire() throw(RuntimeException);
-    virtual void        SAL_CALL release() throw(RuntimeException);
+    virtual Any			SAL_CALL queryInterface( const Type &type ) throw( RuntimeException );
+    virtual void 		SAL_CALL acquire() throw(RuntimeException);
+    virtual void 		SAL_CALL release() throw(RuntimeException);
 
     // XContentIdentifier
-    virtual OUString    SAL_CALL getContentIdentifier() throw(RuntimeException);
-    virtual OUString    SAL_CALL getContentProviderScheme() throw(RuntimeException);
+    virtual OUString 	SAL_CALL getContentIdentifier() throw(RuntimeException);
+    virtual OUString 	SAL_CALL getContentProviderScheme() throw(RuntimeException);
 };
 
 
 //---------------------------------------------------------------------------
 //
-//  FileSystemContent
+//	FileSystemContent
 //
 //---------------------------------------------------------------------------
 
@@ -98,8 +98,8 @@ public XComponent
 public:
     struct PropertyChangeEventInfo
     {
-        OUString    Name;
-        long        Handle;
+        OUString	Name;
+        long		Handle;
 
         PropertyChangeEventInfo() : Handle( -1 ) {}
 
@@ -113,8 +113,8 @@ public:
 
     struct PropertyChangeListenerInfo
     {
-        Reference< XPropertiesChangeListener >  xListener;
-        list< PropertyChangeEventInfo >         aEventInfos;
+        Reference< XPropertiesChangeListener >	xListener;
+        list< PropertyChangeEventInfo >			aEventInfos;
 
         inline int operator ==( const PropertyChangeListenerInfo& crInfo ) const
         { return xListener == crInfo.xListener; }
@@ -127,9 +127,9 @@ public:
 protected:
     Sequence< PropertyChangeEvent > matchListenerEvents( const Sequence< PropertyChangeEvent >& crEvents, const PropertyChangeListenerInfo & crInfo );
 
-    safe_list< Reference< XContentEventListener > > m_aContentListeners;
-    safe_list< Reference< XEventListener > >        m_aComponentListeners;
-    safe_list< PropertyChangeListenerInfo >         m_aPropertyChangeListeners;
+    safe_list< Reference< XContentEventListener > >	m_aContentListeners;
+    safe_list< Reference< XEventListener > >		m_aComponentListeners;
+    safe_list< PropertyChangeListenerInfo >			m_aPropertyChangeListeners;
 public:
     virtual ~OContent() {}
 
@@ -140,7 +140,7 @@ public:
     virtual Any doCommand( const Command & crCommand ) = 0;
 
     // XInterface
-    virtual Any         SAL_CALL queryInterface( const Type &type ) throw( RuntimeException );
+    virtual Any			SAL_CALL queryInterface( const Type &type ) throw( RuntimeException );
 
     virtual void SAL_CALL acquire() throw(RuntimeException);
     virtual void SAL_CALL release() throw(RuntimeException);
@@ -159,7 +159,7 @@ public:
 
     // XCommandInfo
     virtual CommandInfo SAL_CALL getCommandInfoByName( const OUString& rName ) throw( UnsupportedCommandException );
-    virtual CommandInfo SAL_CALL getCommandInfoByHandle( long nHandle ) throw( UnsupportedCommandException );
+    virtual CommandInfo SAL_CALL getCommandInfoByHandle( long nHandle )	throw( UnsupportedCommandException );
     virtual sal_Bool SAL_CALL hasCommandByName( const OUString& rName ) throw();
     virtual sal_Bool SAL_CALL hasCommandByHandle( long nHandle ) throw();
 
@@ -175,19 +175,19 @@ public:
 
 //---------------------------------------------------------------------------
 //
-//  FolderContent
+//	FolderContent
 //
 //---------------------------------------------------------------------------
 
 // supported Commands
-static const sal_Int32 OPEN     = 0;
-static const sal_Int32 CLOSE    = 1;
+static const sal_Int32 OPEN		= 0;
+static const sal_Int32 CLOSE	= 1;
 
 class OFolderContent : public OContent
 {
 protected:
     // Already provided children
-    safe_list< XContent >   m_aChildList;
+    safe_list< XContent >	m_aChildList;
 
     // OContent
     virtual Any doCommand( const Command & crCommand );
@@ -210,7 +210,7 @@ public:
 
 //---------------------------------------------------------------------------
 //
-//  OContentTask
+//	OContentTask
 //
 //---------------------------------------------------------------------------
 
@@ -218,12 +218,12 @@ class OContentTask :
 public OWeakObject,
 public XContentTask
 {
-    Guard< OContent >                       m_aContentGuard;
+    Guard< OContent >						m_aContentGuard;
 protected:
-    OContent                                *m_pContent;
-    Reference< XContentTaskEnvironment >    m_xEnvironment;
-    ContentTaskStatus                       m_eStatus;
-    oslThread                               m_aThread;
+    OContent								*m_pContent;
+    Reference< XContentTaskEnvironment >	m_xEnvironment;
+    ContentTaskStatus						m_eStatus;
+    oslThread								m_aThread;
 
     static void executeWorker( void * );
     virtual ContentTaskStatus setStatus( ContentTaskStatus eStatus );
@@ -235,7 +235,7 @@ public:
     virtual ~OContentTask();
 
     // XInterface
-    virtual Any         SAL_CALL queryInterface( const Type &type ) throw( RuntimeException );
+    virtual Any			SAL_CALL queryInterface( const Type &type ) throw( RuntimeException );
 
     virtual void SAL_CALL acquire() throw(RuntimeException);
     virtual void SAL_CALL release() throw(RuntimeException);
@@ -250,7 +250,7 @@ public:
 
 //---------------------------------------------------------------------------
 //
-//  OCommandTask
+//	OCommandTask
 //
 //---------------------------------------------------------------------------
 
@@ -259,8 +259,8 @@ public OContentTask,
 public XCommandTask
 {
 protected:
-    Command             m_aCommand;
-    Any                 m_aResult;
+    Command				m_aCommand;
+    Any					m_aResult;
 
 public:
     OCommandTask( const Reference< XContentTaskEnvironment >& xEnv, OContent *pContent, const Command& rCommand );
@@ -269,9 +269,9 @@ public:
     virtual void doExecute();
 
     // XInterface
-    virtual Any         SAL_CALL queryInterface( const Type &type ) throw( RuntimeException );
-    virtual void        SAL_CALL acquire() throw(RuntimeException);
-    virtual void        SAL_CALL release() throw(RuntimeException);
+    virtual Any			SAL_CALL queryInterface( const Type &type ) throw( RuntimeException );
+    virtual void 		SAL_CALL acquire() throw(RuntimeException);
+    virtual void 		SAL_CALL release() throw(RuntimeException);
 
     // XContentTask
     virtual void SAL_CALL start() throw();
@@ -287,7 +287,7 @@ public:
 
 //---------------------------------------------------------------------------
 //
-//  OPropertyTask
+//	OPropertyTask
 //
 //---------------------------------------------------------------------------
 
@@ -296,11 +296,11 @@ public OContentTask,
 public XPropertyTask
 {
 protected:
-    Sequence< PropertyValueInfo >   m_aProperties;
-    PropertyTaskType                m_eType;
+    Sequence< PropertyValueInfo >	m_aProperties;
+    PropertyTaskType				m_eType;
 public:
     OPropertyTask(const Reference< XContentTaskEnvironment >& Environment, OContent *pContent, const Sequence< PropertyValue >& Properties, PropertyTaskType Type );
-    virtual ~OPropertyTask();
+    virtual	~OPropertyTask();
 
     virtual void doExecute();
 
@@ -309,9 +309,9 @@ public:
     virtual void getPropertyValue( PropertyValueInfo & rProperty ) = 0;
 
     // XInterface
-    virtual Any         SAL_CALL queryInterface( const Type &type ) throw( RuntimeException );
-    virtual void        SAL_CALL acquire() throw(RuntimeException);
-    virtual void        SAL_CALL release() throw(RuntimeException);
+    virtual Any			SAL_CALL queryInterface( const Type &type ) throw( RuntimeException );
+    virtual void 		SAL_CALL acquire() throw(RuntimeException);
+    virtual void 		SAL_CALL release() throw(RuntimeException);
 
     // XContentTask
     virtual void SAL_CALL start() throw();
diff --git a/extensions/inc/update.hrc b/extensions/inc/update.hrc
index 2cd1f8f69f12..9dd3463157dc 100644
--- a/extensions/inc/update.hrc
+++ b/extensions/inc/update.hrc
@@ -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/extensions/qa/complex/extensions/OfficeResourceLoader.java b/extensions/qa/complex/extensions/OfficeResourceLoader.java
index d0b2f1db2db8..16bc967cc08b 100644
--- a/extensions/qa/complex/extensions/OfficeResourceLoader.java
+++ b/extensions/qa/complex/extensions/OfficeResourceLoader.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/extensions/qa/complex/extensions/orl_de.src b/extensions/qa/complex/extensions/orl_de.src
index c5a91afe6b2e..e92ac818a446 100644
--- a/extensions/qa/complex/extensions/orl_de.src
+++ b/extensions/qa/complex/extensions/orl_de.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/qa/complex/extensions/orl_en-US.src b/extensions/qa/complex/extensions/orl_en-US.src
index 77518f4d5e26..bdeaac39a69f 100644
--- a/extensions/qa/complex/extensions/orl_en-US.src
+++ b/extensions/qa/complex/extensions/orl_en-US.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/qa/integration/extensions/ComponentFactory.java b/extensions/qa/integration/extensions/ComponentFactory.java
index b1824c1f5577..5edeb1bb65e0 100644
--- a/extensions/qa/integration/extensions/ComponentFactory.java
+++ b/extensions/qa/integration/extensions/ComponentFactory.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/extensions/qa/integration/extensions/ConsoleWait.java b/extensions/qa/integration/extensions/ConsoleWait.java
index 4c92b9c57554..4c4a4349161b 100644
--- a/extensions/qa/integration/extensions/ConsoleWait.java
+++ b/extensions/qa/integration/extensions/ConsoleWait.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/extensions/qa/integration/extensions/Frame.java b/extensions/qa/integration/extensions/Frame.java
index 4b61d60d05e5..a53fe65a29f2 100644
--- a/extensions/qa/integration/extensions/Frame.java
+++ b/extensions/qa/integration/extensions/Frame.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/extensions/qa/integration/extensions/MethodHandler.java b/extensions/qa/integration/extensions/MethodHandler.java
index ca14eae0723d..e75e0205e634 100644
--- a/extensions/qa/integration/extensions/MethodHandler.java
+++ b/extensions/qa/integration/extensions/MethodHandler.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/extensions/qa/integration/extensions/ObjectInspector.java b/extensions/qa/integration/extensions/ObjectInspector.java
index 0a436a1ae650..e6799dfa9d66 100644
--- a/extensions/qa/integration/extensions/ObjectInspector.java
+++ b/extensions/qa/integration/extensions/ObjectInspector.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/extensions/qa/integration/extensions/ServicesHandler.java b/extensions/qa/integration/extensions/ServicesHandler.java
index 33bb69961028..0340a988a31f 100644
--- a/extensions/qa/integration/extensions/ServicesHandler.java
+++ b/extensions/qa/integration/extensions/ServicesHandler.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/extensions/qa/integration/extensions/TestSkeleton.java b/extensions/qa/integration/extensions/TestSkeleton.java
index dad1cfc375b2..833f06b36a68 100644
--- a/extensions/qa/integration/extensions/TestSkeleton.java
+++ b/extensions/qa/integration/extensions/TestSkeleton.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/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx
index dc4f026390d2..af6e0dc4b5be 100644
--- a/extensions/source/abpilot/abpfinalpage.cxx
+++ b/extensions/source/abpilot/abpfinalpage.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,14 +62,14 @@ namespace abp
     //---------------------------------------------------------------------
     FinalPage::FinalPage( OAddessBookSourcePilot* _pParent )
         :AddressBookSourcePage(_pParent, ModuleRes(RID_PAGE_FINAL))
-        ,m_aExplanation         ( this, ModuleRes( FT_FINISH_EXPL ) )
-        ,m_aLocationLabel       ( this, ModuleRes( FT_LOCATION ) )
-        ,m_aLocation            ( this, ModuleRes( CBB_LOCATION ) )
-        ,m_aBrowse              ( this, ModuleRes( PB_BROWSE ) )
-        ,m_aRegisterName        ( this, ModuleRes( CB_REGISTER_DS ) )
-        ,m_aNameLabel           ( this, ModuleRes( FT_NAME_EXPL ) )
-        ,m_aName                ( this, ModuleRes( ET_DATASOURCENAME ) )
-        ,m_aDuplicateNameError  ( this, ModuleRes( FT_DUPLICATENAME ) )
+        ,m_aExplanation			( this, ModuleRes( FT_FINISH_EXPL ) )
+        ,m_aLocationLabel		( this, ModuleRes( FT_LOCATION ) )
+        ,m_aLocation			( this, ModuleRes( CBB_LOCATION ) )
+        ,m_aBrowse				( this, ModuleRes( PB_BROWSE ) )
+        ,m_aRegisterName		( this, ModuleRes( CB_REGISTER_DS ) )
+        ,m_aNameLabel			( this, ModuleRes( FT_NAME_EXPL ) )
+        ,m_aName				( this, ModuleRes( ET_DATASOURCENAME ) )
+        ,m_aDuplicateNameError	( this, ModuleRes( FT_DUPLICATENAME ) )
         ,m_aLocationController( ::comphelper::ComponentContext( _pParent->getORB() ), m_aLocation, m_aBrowse )
     {
         FreeResource();
@@ -223,7 +223,7 @@ namespace abp
         return 0L;
     }
 //.........................................................................
-}   // namespace abp
+}	// namespace abp
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/abpilot/abpfinalpage.hxx b/extensions/source/abpilot/abpfinalpage.hxx
index 036b4fa543b4..6fbf76b540a4 100644
--- a/extensions/source/abpilot/abpfinalpage.hxx
+++ b/extensions/source/abpilot/abpfinalpage.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,31 +47,31 @@ namespace abp
     class FinalPage : public AddressBookSourcePage
     {
     protected:
-        FixedText       m_aExplanation;
-        FixedText       m_aLocationLabel;
-        ::svt::OFileURLControl  m_aLocation;
-        PushButton      m_aBrowse;
-        CheckBox        m_aRegisterName;
-        FixedText       m_aNameLabel;
-        Edit            m_aName;
-        FixedText       m_aDuplicateNameError;
+        FixedText		m_aExplanation;
+        FixedText		m_aLocationLabel;
+        ::svt::OFileURLControl	m_aLocation;
+        PushButton		m_aBrowse;
+        CheckBox		m_aRegisterName;
+        FixedText		m_aNameLabel;
+        Edit			m_aName;
+        FixedText		m_aDuplicateNameError;
 
         ::svx::DatabaseLocationInputController
                         m_aLocationController;
 
-        StringBag       m_aInvalidDataSourceNames;
+        StringBag		m_aInvalidDataSourceNames;
 
     public:
         FinalPage( OAddessBookSourcePilot* _pParent );
 
     protected:
         // OWizardPage overridables
-        virtual void        initializePage();
-        virtual sal_Bool    commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+        virtual void		initializePage();
+        virtual sal_Bool	commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
 
         // TabDialog overridables
-        virtual void        ActivatePage();
-        virtual void        DeactivatePage();
+        virtual void		ActivatePage();
+        virtual void		DeactivatePage();
 
         // OImportPage overridables
         virtual bool        canAdvance() const;
@@ -80,13 +80,13 @@ namespace abp
         DECL_LINK( OnNameModified, Edit* );
         DECL_LINK( OnRegister, CheckBox* );
 
-        sal_Bool    isValidName() const;
-        void        implCheckName();
-        void        setFields();
+        sal_Bool	isValidName() const;
+        void		implCheckName();
+        void		setFields();
     };
 
 //.........................................................................
-}   // namespace abp
+}	// namespace abp
 //.........................................................................
 
 #endif // EXTENSIONS_ABP_ABPFINALPAGE_HXX
diff --git a/extensions/source/abpilot/abpresid.hrc b/extensions/source/abpilot/abpresid.hrc
index 1afc6e88a2f0..273ba6b6efb9 100644
--- a/extensions/source/abpilot/abpresid.hrc
+++ b/extensions/source/abpilot/abpresid.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,78 +33,78 @@
 //========================================================================
 // basics
 
-#define RID_DIALOG_START                RID_ABP_START
-#define RID_PAGE_START                  RID_ABP_START
-#define RID_STRING_START                RID_ABP_START
-#define RID_ERRORBOX_START              RID_ABP_START
-#define RID_UNTYPED_START               RID_ABP_START
-#define RID_QUERYBOX_START              RID_ABP_START
-#define RID_BITMAP_START                RID_ABP_START
+#define RID_DIALOG_START				RID_ABP_START
+#define RID_PAGE_START					RID_ABP_START
+#define RID_STRING_START				RID_ABP_START
+#define RID_ERRORBOX_START				RID_ABP_START
+#define RID_UNTYPED_START				RID_ABP_START
+#define RID_QUERYBOX_START				RID_ABP_START
+#define RID_BITMAP_START				RID_ABP_START
 
 //========================================================================
 // dialogs
 
-#define RID_DLG_ADDRESSBOOKSOURCEPILOT  ( RID_DIALOG_START +  0 )
+#define RID_DLG_ADDRESSBOOKSOURCEPILOT	( RID_DIALOG_START +  0 )
 // please adjust RID_DIALOG_END (below) when adding new dialogs
 
-#define RID_DIALOG_END                  RID_DLG_ADDRESSBOOKSOURCEPILOT
+#define RID_DIALOG_END					RID_DLG_ADDRESSBOOKSOURCEPILOT
 
 //========================================================================
 // tab pages
 
-#define RID_PAGE_SELECTABTYPE           ( RID_PAGE_START +  0 )
-#define RID_PAGE_ADMININVOKATION        ( RID_PAGE_START +  1 )
-#define RID_PAGE_TABLESELECTION_AB      ( RID_PAGE_START +  2 )
-#define RID_PAGE_FIELDMAPPING           ( RID_PAGE_START +  3 )
-#define RID_PAGE_FINAL                  ( RID_PAGE_START +  4 )
+#define RID_PAGE_SELECTABTYPE			( RID_PAGE_START +  0 )
+#define RID_PAGE_ADMININVOKATION		( RID_PAGE_START +  1 )
+#define RID_PAGE_TABLESELECTION_AB		( RID_PAGE_START +  2 )
+#define RID_PAGE_FIELDMAPPING			( RID_PAGE_START +  3 )
+#define RID_PAGE_FINAL					( RID_PAGE_START +  4 )
 // please adjust RID_PAGE_END (below) when adding new tab pages
 
-#define RID_PAGE_END                    RID_PAGE_FINAL
+#define RID_PAGE_END					RID_PAGE_FINAL
 
 //========================================================================
 // strings
 
-#define RID_STR_DEFAULT_NAME            ( RID_STRING_START +  0 )
-#define RID_STR_ADMINDIALOGTITLE        ( RID_STRING_START +  1 )
-#define RID_STR_NOCONNECTION            ( RID_STRING_START +  2 )
-#define RID_STR_PLEASECHECKSETTINGS     ( RID_STRING_START +  3 )
-#define RID_STR_FIELDDIALOGTITLE        ( RID_STRING_START +  4 )
-#define RID_STR_NOFIELDSASSIGNED        ( RID_STRING_START +  5 )
+#define RID_STR_DEFAULT_NAME			( RID_STRING_START +  0 )
+#define RID_STR_ADMINDIALOGTITLE		( RID_STRING_START +  1 )
+#define RID_STR_NOCONNECTION			( RID_STRING_START +  2 )
+#define RID_STR_PLEASECHECKSETTINGS		( RID_STRING_START +  3 )
+#define RID_STR_FIELDDIALOGTITLE		( RID_STRING_START +  4 )
+#define RID_STR_NOFIELDSASSIGNED		( RID_STRING_START +  5 )
 // please adjust RID_STRING_END (below) when adding new strings
 
-#define RID_STRING_END                  RID_STR_NOFIELDSASSIGNED
+#define RID_STRING_END					RID_STR_NOFIELDSASSIGNED
 
 //========================================================================
 // error boxes
 
-#define RID_ERR_NEEDTYPESELECTION       ( RID_ERRORBOX_START +  0 )
+#define RID_ERR_NEEDTYPESELECTION		( RID_ERRORBOX_START +  0 )
 // please adjust RID_ERRORBOX_END (below) when adding new error boxes
 
-#define RID_ERRORBOX_END                RID_ERR_NEEDTYPESELECTION
+#define RID_ERRORBOX_END				RID_ERR_NEEDTYPESELECTION
 
 //========================================================================
 // query boxes
 
-#define RID_QRY_NOTABLES                ( RID_QUERYBOX_START +  0 )
+#define RID_QRY_NOTABLES				( RID_QUERYBOX_START +  0 )
 // please adjust RID_QUERYBOX_END (below) when adding new query boxes
 
-#define RID_QUERYBOX_END                RID_QRY_NOTABLES
+#define RID_QUERYBOX_END				RID_QRY_NOTABLES
 
 //========================================================================
 // untyped resources
 
-#define RID_RSC_NOTUSEDYET              ( RID_UNTYPED_START +  0 )
+#define RID_RSC_NOTUSEDYET				( RID_UNTYPED_START +  0 )
 // please adjust RID_UNTYPED_END (below) when adding new untyped resources
 
-#define RID_UNTYPED_END                 RID_RSC_NOTUSEDYET
+#define RID_UNTYPED_END					RID_RSC_NOTUSEDYET
 
 //========================================================================
 // bitmaps
 
-#define BMP_HEADERIMAGE                 ( RID_BITMAP_START +  0 )
+#define BMP_HEADERIMAGE					( RID_BITMAP_START +  0 )
 // please adjust RID_BITMAP_END (below) when adding new bitmaps
 
-#define RID_BITMAP_END                  BMP_HEADERIMAGE
+#define RID_BITMAP_END					BMP_HEADERIMAGE
 
 //========================================================================
 //========================================================================
@@ -136,52 +136,52 @@
 // local resource ids
 
 //........................................................................
-#define FL_SEPARATOR            1
-#define FL_TYPE                 2
-#define FL_NAME                 3
+#define FL_SEPARATOR			1
+#define FL_TYPE					2
+#define FL_NAME					3
 
 //........................................................................
-#define FT_TYPE_HINTS            1
-#define FT_ADMINEXPLANATION      3
-#define FT_NAME_EXPL             4
-#define FT_ERROR                 5
-#define FL_TOOMUCHTABLES         6
-#define FT_FIELDASSIGMENTEXPL    7
-#define FT_ASSIGNEDFIELDS        8
-#define FT_FINISH_EXPL           9
-#define FT_DUPLICATENAME        10
-#define FT_LOCATION             11
+#define FT_TYPE_HINTS			 1
+#define FT_ADMINEXPLANATION		 3
+#define FT_NAME_EXPL			 4
+#define FT_ERROR				 5
+#define FL_TOOMUCHTABLES		 6
+#define	FT_FIELDASSIGMENTEXPL	 7
+#define FT_ASSIGNEDFIELDS		 8
+#define FT_FINISH_EXPL			 9
+#define FT_DUPLICATENAME		10
+#define FT_LOCATION				11
 
 //........................................................................
-#define RB_MORK                 1
+#define RB_MORK					1
 #define RB_THUNDERBIRD          2
-#define RB_EVOLUTION            3
-#define RB_KAB                  4
-#define RB_MACAB                5
-#define RB_LDAP                 6
-#define RB_OUTLOOK              7
-#define RB_OUTLOOKEXPRESS       8
-#define RB_OTHER                9
+#define RB_EVOLUTION			3
+#define RB_KAB					4
+#define RB_MACAB				5
+#define RB_LDAP					6
+#define RB_OUTLOOK				7
+#define RB_OUTLOOKEXPRESS		8
+#define RB_OTHER				9
 #define RB_EVOLUTION_GROUPWISE  10
-#define RB_EVOLUTION_LDAP       11
+#define RB_EVOLUTION_LDAP		11
 
 //........................................................................
-#define ET_DATASOURCENAME       1
-#define ET_LOCATION             2
+#define ET_DATASOURCENAME		1
+#define ET_LOCATION				2
 
 //........................................................................
-#define PB_INVOKE_ADMIN_DIALOG  1
-#define PB_INVOKE_FIELDS_DIALOG 2
-#define PB_BROWSE               3
+#define PB_INVOKE_ADMIN_DIALOG	1
+#define PB_INVOKE_FIELDS_DIALOG	2
+#define PB_BROWSE				3
 
 //........................................................................
-#define LB_TABLELIST            1
+#define LB_TABLELIST			1
 
 //........................................................................
-#define CB_REGISTER_DS          1
+#define CB_REGISTER_DS			1
 
 //........................................................................
-#define CBB_LOCATION            1
+#define CBB_LOCATION			1
 
 //........................................................................
 #define STR_SELECT_ABTYPE           1
@@ -194,18 +194,18 @@
 // some defines
 
 //........................................................................
-#define WINDOW_SIZE_X   240
-#define WINDOW_SIZE_Y   185
+#define WINDOW_SIZE_X	240
+#define WINDOW_SIZE_Y	185
 
-#define WINDOW_BORDER_X  12
-#define WINDOW_BORDER_Y  14
+#define WINDOW_BORDER_X	 12
+#define WINDOW_BORDER_Y	 14
 
-#define BUTTON_SIZE_X    50
-#define BUTTON_SIZE_Y    14
+#define BUTTON_SIZE_X	 50
+#define BUTTON_SIZE_Y	 14
 
-#define HEADER_SIZE_Y   30
+#define HEADER_SIZE_Y	30
 
-#define BORDER_X        12
+#define BORDER_X		12
 
 //........................................................................
 
@@ -214,6 +214,6 @@
 /*************************************************************************
  * history:
  *
- *  Revision 1.0 30.01.01 16:38:29  fs
+ *	Revision 1.0 30.01.01 16:38:29  fs
  ************************************************************************/
 
diff --git a/extensions/source/abpilot/abpservices.cxx b/extensions/source/abpilot/abpservices.cxx
index 9f07a1aabb6b..93818ebc9e79 100644
--- a/extensions/source/abpilot/abpservices.cxx
+++ b/extensions/source/abpilot/abpservices.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ extern "C" void SAL_CALL abp_initializeModule()
 
 extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
 component_getImplementationEnvironment(
-                const sal_Char  **ppEnvTypeName,
-                uno_Environment ** /*ppEnv*/
+                const sal_Char	**ppEnvTypeName,
+                uno_Environment	** /*ppEnv*/
             )
 {
     abp_initializeModule();
@@ -72,8 +72,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
                 void* pRegistryKey
             )
 {
-    if (pRegistryKey)
-    try
+    if (pRegistryKey) 
+    try 
     {
         return ::abp::OModule::writeComponentInfos(
             static_cast<XMultiServiceFactory*>(pServiceManager),
diff --git a/extensions/source/abpilot/abptypes.hxx b/extensions/source/abpilot/abptypes.hxx
index 2a5922ba2c0c..3df98e9a96bc 100644
--- a/extensions/source/abpilot/abptypes.hxx
+++ b/extensions/source/abpilot/abptypes.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 abp
     DECLARE_STL_USTRINGACCESS_MAP( ::rtl::OUString, MapString2String );
 
 //.........................................................................
-}   // namespace abp
+}	// namespace abp
 //.........................................................................
 
 #endif // EXTENSIONS_ABP_ABPTYPES_HXX
diff --git a/extensions/source/abpilot/abspage.cxx b/extensions/source/abpilot/abspage.cxx
index b46674355255..993396ab3727 100644
--- a/extensions/source/abpilot/abspage.cxx
+++ b/extensions/source/abpilot/abspage.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace abp
     }
 
     //---------------------------------------------------------------------
-    const AddressSettings&  AddressBookSourcePage::getSettings() const
+    const AddressSettings&	AddressBookSourcePage::getSettings() const
     {
         return getDialog()->getSettings();
     }
@@ -85,7 +85,7 @@ namespace abp
     }
 
 //.........................................................................
-}   // namespace abp
+}	// namespace abp
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/abpilot/abspage.hxx b/extensions/source/abpilot/abspage.hxx
index 47c6725342f2..c80c8a7a2602 100644
--- a/extensions/source/abpilot/abspage.hxx
+++ b/extensions/source/abpilot/abspage.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,19 +55,19 @@ namespace abp
 
     protected:
         // helper
-        OAddessBookSourcePilot* getDialog();
-        const OAddessBookSourcePilot*   getDialog() const;
+        OAddessBookSourcePilot*	getDialog();
+        const OAddessBookSourcePilot*	getDialog() const;
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
                                 getORB();
-        AddressSettings&        getSettings();
-        const AddressSettings&  getSettings() const;
+        AddressSettings&		getSettings();
+        const AddressSettings&	getSettings() const;
 
         // TabDialog overridables
-        virtual void        DeactivatePage();
+        virtual void		DeactivatePage();
     };
 
 //.........................................................................
-}   // namespace abp
+}	// namespace abp
 //.........................................................................
 
 #endif // EXTENSIONS_ABP_ABSPAGE_HXX
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index 13ddcf175909..d8de0a7c9a0c 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -175,7 +175,7 @@ namespace abp
         // 2. check if we need to register the data source
         if ( m_aSettings.bRegisterDataSource )
             m_aNewDataSource.registerDataSource(m_aSettings.sRegisteredDataSourceName);
-
+    
         // 3. write the data source / table names into the configuration
         addressconfig::writeTemplateAddressSource( getORB(), m_aSettings.bRegisterDataSource ? m_aSettings.sRegisteredDataSourceName : m_aSettings.sDataSourceName, m_aSettings.sSelectedTable );
 
@@ -312,9 +312,9 @@ namespace abp
         const sal_Char* pGuess = NULL;
         switch ( getSettings().eType )
         {
-            case AST_MORK               :
+            case AST_MORK		        : 
             case AST_THUNDERBIRD        : pGuess = "Personal Address book"; break;
-            case AST_LDAP               : pGuess = "LDAP Directory"; break;
+            case AST_LDAP		        : pGuess = "LDAP Directory"; break;
             case AST_EVOLUTION          :
             case AST_EVOLUTION_GROUPWISE:
             case AST_EVOLUTION_LDAP     : pGuess = "Personal"; break;
@@ -339,7 +339,7 @@ namespace abp
     void OAddessBookSourcePilot::implCreateDataSource()
     {
         if (m_aNewDataSource.isValid())
-        {   // we already have a data source object
+        {	// we already have a data source object
             if ( m_aSettings.eType == m_eNewDataSourceType )
                 // and it already has the correct type
                 return;
@@ -495,7 +495,7 @@ namespace abp
     }
 
 //.........................................................................
-}   // namespace abp
+}	// namespace abp
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx
index 25795aa61def..c9d7eaba2251 100644
--- a/extensions/source/abpilot/abspilot.hxx
+++ b/extensions/source/abpilot/abspilot.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 abp
     protected:
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
                                 m_xORB;
-        AddressSettings         m_aSettings;
+        AddressSettings			m_aSettings;
 
-        ODataSource             m_aNewDataSource;
-        AddressSourceType       m_eNewDataSourceType;
+        ODataSource				m_aNewDataSource;
+        AddressSourceType		m_eNewDataSourceType;
 
     public:
         /// ctor
@@ -63,14 +63,14 @@ namespace abp
         /// get the service factory which was used to create the dialog
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
                                 getORB() { return m_xORB; }
-        AddressSettings&        getSettings() { return m_aSettings; }
-        const AddressSettings&  getSettings() const { return m_aSettings; }
+        AddressSettings&		getSettings() { return m_aSettings; }
+        const AddressSettings&	getSettings() const { return m_aSettings; }
 
-        const ODataSource&      getDataSource() const { return m_aNewDataSource; }
+        const ODataSource&		getDataSource() const { return m_aNewDataSource; }
 
-        sal_Bool                connectToDataSource( sal_Bool _bForceReConnect );
+        sal_Bool				connectToDataSource( sal_Bool _bForceReConnect );
 
-        void                    travelNext( ) { OAddessBookSourcePilot_Base::travelNext(); }
+        void					travelNext( ) { OAddessBookSourcePilot_Base::travelNext(); }
 
         /// to be called when the selected type changed
         void                    typeSelectionChanged( AddressSourceType _eType );
@@ -85,7 +85,7 @@ namespace abp
         // RoadmapWizard
         virtual String              getStateDisplayName( WizardState _nState ) const;
 
-        virtual BOOL    Close();
+        virtual BOOL	Close();
 
     private:
         DECL_LINK( OnCancelClicked, void* );
@@ -101,16 +101,16 @@ namespace abp
         /// guesses a default for the table name, if no valid table is selected
         void implDefaultTableName();
 
-        inline sal_Bool needAdminInvokationPage( AddressSourceType _eType ) const
+        inline sal_Bool	needAdminInvokationPage( AddressSourceType _eType ) const
         {
-            return  (   ( AST_LDAP == _eType )
-                    ||  ( AST_OTHER == _eType )
+            return	(	( AST_LDAP == _eType )
+                    ||	( AST_OTHER == _eType )
                     );
         }
         /// check if with the current settings, we would need to invoke he administration dialog for more details about the data source
-        inline sal_Bool needAdminInvokationPage() const
+        inline sal_Bool	needAdminInvokationPage() const
         {
-            return  needAdminInvokationPage( m_aSettings.eType );
+            return	needAdminInvokationPage( m_aSettings.eType );
         }
 
         inline sal_Bool needManualFieldMapping( AddressSourceType _eType ) const
@@ -143,7 +143,7 @@ namespace abp
     };
 
 //.........................................................................
-}   // namespace abp
+}	// namespace abp
 //.........................................................................
 
 #endif // EXTENSIONS_ABSPILOT_HXX
diff --git a/extensions/source/abpilot/abspilot.src b/extensions/source/abpilot/abspilot.src
index be177b5f6e19..a69ac07eba75 100644
--- a/extensions/source/abpilot/abspilot.src
+++ b/extensions/source/abpilot/abspilot.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ ModalDialog RID_DLG_ADDRESSBOOKSOURCEPILOT
 
     HelpId = HID_ABSPILOT;
 
-    OutputSize      = TRUE ;
-    SVLook          = TRUE ;
-    Moveable        = TRUE ;
-    Closeable       = TRUE ;
-    Hide            = TRUE;
+    OutputSize		= TRUE ;
+    SVLook			= TRUE ;
+    Moveable		= TRUE ;
+    Closeable		= TRUE ;
+    Hide			= TRUE;
 
     String STR_SELECT_ABTYPE
     {
@@ -71,13 +71,13 @@ ModalDialog RID_DLG_ADDRESSBOOKSOURCEPILOT
 //........................................................................
 TabPage RID_PAGE_SELECTABTYPE
 {
-    SVLook  = TRUE ;
-    Size    = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
+    SVLook	= TRUE ;
+    Size	= MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
 
     FixedText FT_TYPE_HINTS
     {
-        Pos     = MAP_APPFONT ( BORDER_X, 9 ) ;
-        Size    = MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 40 ) ;
+        Pos		= MAP_APPFONT ( BORDER_X, 9 ) ;
+        Size	= MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 40 ) ;
         WordBreak = TRUE;
 
         Text [ en-US ] = "%PRODUCTNAME lets you access address data already present in your system. To do this, a %PRODUCTNAME data source will be created in which your address data is available in tabular form.\n\nThis wizard helps you create the data source.";
@@ -85,65 +85,65 @@ TabPage RID_PAGE_SELECTABTYPE
 
     FixedLine FL_TYPE
     {
-        Pos     = MAP_APPFONT ( 7, 56 ) ;
-        Size    = MAP_APPFONT ( WINDOW_SIZE_X - 14, 8 ) ;
+        Pos		= MAP_APPFONT ( 7, 56 ) ;
+        Size	= MAP_APPFONT ( WINDOW_SIZE_X - 14, 8 ) ;
 
         Text [ en-US ] = "Please select the type of your external address book:";
     };
 
     RadioButton RB_EVOLUTION
      {
-         Size   = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+         Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
         Text [ en-US ] = "Evolution";
     };
     RadioButton RB_EVOLUTION_GROUPWISE
      {
-         Size   = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+         Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
         Text [ en-US ] = "Groupwise";
     };
     RadioButton RB_EVOLUTION_LDAP
      {
-         Size   = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+         Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
         Text [ en-US ] = "Evolution LDAP";
     };
     RadioButton RB_MORK
     {
-        Size    = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+        Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
         Text [ en-US ] = "Mozilla / Netscape";
     };
     RadioButton RB_THUNDERBIRD
     {
-        Size    = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+        Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
         Text [ en-US ] = "Thunderbird";
     };
     RadioButton RB_KAB
      {
-         Size   = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+         Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
         Text [ en-US ] = "KDE address book";
     };
     RadioButton RB_MACAB
     {
-        Size    = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+        Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
         Text [ en-US ] = "Mac OS X address book";
     };
     RadioButton RB_LDAP
     {
-        Size    = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+        Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
         Text [ en-US ] = "LDAP address data";
     };
     RadioButton RB_OUTLOOK
     {
-        Size    = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+        Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
         Text [ en-US ] = "Outlook address book";
     };
     RadioButton RB_OUTLOOKEXPRESS
     {
-        Size    = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+        Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
         Text [ en-US ] = "Windows system address book";
     };
     RadioButton RB_OTHER
     {
-        Size    = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+        Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
         Text [ en-US ] = "Other external data source";
     };
 };
@@ -151,13 +151,13 @@ TabPage RID_PAGE_SELECTABTYPE
 //........................................................................
 TabPage RID_PAGE_ADMININVOKATION
 {
-    SVLook  = TRUE ;
-    Size    = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
+    SVLook	= TRUE ;
+    Size	= MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
 
     FixedText FT_ADMINEXPLANATION
     {
-        Pos     = MAP_APPFONT ( BORDER_X, 9 ) ;
-        Size    = MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 48 ) ;
+        Pos		= MAP_APPFONT ( BORDER_X, 9 ) ;
+        Size	= MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 48 ) ;
         WordBreak = TRUE;
 
         Text [ en-US ] = "To set up the new data source, additional information is required.\n\nClick the following button to open another dialog in which you then enter the necessary information.";
@@ -165,16 +165,16 @@ TabPage RID_PAGE_ADMININVOKATION
 
     PushButton PB_INVOKE_ADMIN_DIALOG
     {
-        Pos     = MAP_APPFONT ( ( WINDOW_SIZE_X - BUTTON_SIZE_X ) / 2, 60 ) ;
-        Size    = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ) ;
+        Pos		= MAP_APPFONT ( ( WINDOW_SIZE_X - BUTTON_SIZE_X ) / 2, 60 ) ;
+        Size	= MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ) ;
 
         Text [ en-US ] = "Settings";
     };
 
     FixedText FT_ERROR
     {
-        Pos     = MAP_APPFONT ( BORDER_X, WINDOW_SIZE_Y - HEADER_SIZE_Y - 7 - 48 ) ;
-        Size    = MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 48 ) ;
+        Pos		= MAP_APPFONT ( BORDER_X, WINDOW_SIZE_Y - HEADER_SIZE_Y - 7 - 48 ) ;
+        Size	= MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 48 ) ;
         WordBreak = TRUE;
         Hide = TRUE;
 
@@ -185,13 +185,13 @@ TabPage RID_PAGE_ADMININVOKATION
 //........................................................................
 TabPage RID_PAGE_TABLESELECTION_AB
 {
-    SVLook  = TRUE ;
-    Size    = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
+    SVLook	= TRUE ;
+    Size	= MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
 
     FixedText FL_TOOMUCHTABLES
     {
-        Pos     = MAP_APPFONT ( BORDER_X, 9 ) ;
-        Size    = MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 24 ) ;
+        Pos		= MAP_APPFONT ( BORDER_X, 9 ) ;
+        Size	= MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 24 ) ;
         WordBreak = TRUE;
 
         Text [ en-US ] = "The external data source you have chosen contains more than one address book.\nPlease select the one you mainly want to work with:";
@@ -199,8 +199,8 @@ TabPage RID_PAGE_TABLESELECTION_AB
 
     ListBox LB_TABLELIST
     {
-        Pos     = MAP_APPFONT ( BORDER_X, 36 ) ;
-        Size    = MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 50 ) ;
+        Pos		= MAP_APPFONT ( BORDER_X, 36 ) ;
+        Size	= MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 50 ) ;
         SVLook = TRUE;
         Sort = TRUE;
         DropDown = FALSE;
@@ -212,13 +212,13 @@ TabPage RID_PAGE_TABLESELECTION_AB
 //........................................................................
 TabPage RID_PAGE_FIELDMAPPING
 {
-    SVLook  = TRUE ;
-    Size    = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
+    SVLook	= TRUE ;
+    Size	= MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
 
     FixedText FT_FIELDASSIGMENTEXPL
     {
-        Pos     = MAP_APPFONT ( BORDER_X, 9 ) ;
-        Size    = MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 72 ) ;
+        Pos		= MAP_APPFONT ( BORDER_X, 9 ) ;
+        Size	= MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 72 ) ;
         WordBreak = TRUE;
 
         Text [ en-US ] = "To incorporate the address data in your templates, %PRODUCTNAME has to know which fields contain which data.\n\nFor instance, you could have stored the e-mail addresses in a field named \"email\", or \"E-mail\" or \"EM\" - or something completely different.\n\nClick the button below to open another dialog where you can enter the settings for your data source.";
@@ -226,16 +226,16 @@ TabPage RID_PAGE_FIELDMAPPING
 
     PushButton PB_INVOKE_FIELDS_DIALOG
     {
-        Pos     = MAP_APPFONT ( ( WINDOW_SIZE_X - BUTTON_SIZE_X ) / 2, 84 ) ;
-        Size    = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ) ;
+        Pos		= MAP_APPFONT ( ( WINDOW_SIZE_X - BUTTON_SIZE_X ) / 2, 84 ) ;
+        Size	= MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ) ;
 
         Text [ en-US ] = "Field Assignment";
     };
 
     FixedText FT_ASSIGNEDFIELDS
     {
-        Pos     = MAP_APPFONT ( BORDER_X, WINDOW_SIZE_Y - HEADER_SIZE_Y - 7 - 32 ) ;
-        Size    = MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 32 ) ;
+        Pos		= MAP_APPFONT ( BORDER_X, WINDOW_SIZE_Y - HEADER_SIZE_Y - 7 - 32 ) ;
+        Size	= MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 32 ) ;
         WordBreak = TRUE;
     };
 };
@@ -243,76 +243,76 @@ TabPage RID_PAGE_FIELDMAPPING
 //........................................................................
 TabPage RID_PAGE_FINAL
 {
-    SVLook  = TRUE ;
-    Size    = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
+    SVLook	= TRUE ;
+    Size	= MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
 
     FixedText FT_FINISH_EXPL
     {
-        Pos     = MAP_APPFONT ( BORDER_X, 9 ) ;
-        Size    = MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 40 ) ;
+        Pos		= MAP_APPFONT ( BORDER_X, 9 ) ;
+        Size	= MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 40 ) ;
         WordBreak = TRUE;
 
         Text [ en-US ] = "That was all the information necessary to integrate your address data into %PRODUCTNAME.\n\nNow, just enter the name under which you want to register the data source in %PRODUCTNAME.";
     };
-
+    
     FixedText FT_LOCATION
     {
-        Pos     = MAP_APPFONT ( BORDER_X, 53 ) ;
-        Size    = MAP_APPFONT ( 50, 8 ) ;
+        Pos		= MAP_APPFONT ( BORDER_X, 53 ) ;
+        Size	= MAP_APPFONT ( 50, 8 ) ;
         Group = TRUE;
 
         Text [ en-US ] = "Location";
     };
-
+    
     ComboBox CBB_LOCATION
     {
-        Pos     = MAP_APPFONT ( BORDER_X , 64 ) ;
-        Size    = MAP_APPFONT ( WINDOW_SIZE_X - 53 - BORDER_X - BORDER_X, 12) ;
+        Pos		= MAP_APPFONT ( BORDER_X , 64 ) ;
+        Size	= MAP_APPFONT ( WINDOW_SIZE_X - 53 - BORDER_X - BORDER_X, 12) ;
         SVLook = TRUE;
         Border = TRUE;
         DropDown = TRUE ;
         AutoHScroll = TRUE ;
     };
-
+    
     PushButton PB_BROWSE
     {
-        Pos     = MAP_APPFONT ( WINDOW_SIZE_X - 50 - BORDER_X  , 63 ) ;
-        Size    = MAP_APPFONT ( 50, 14) ;
+        Pos		= MAP_APPFONT ( WINDOW_SIZE_X - 50 - BORDER_X  , 63 ) ;
+        Size	= MAP_APPFONT ( 50, 14) ;
         SVLook = TRUE;
         Group = FALSE;
-
+        
         Text [ en-US ] = "Browse...";
     };
 
     CheckBox CB_REGISTER_DS
     {
-        Pos     = MAP_APPFONT ( BORDER_X, 82 ) ;
-        Size    = MAP_APPFONT ( WINDOW_SIZE_X - BORDER_X - BORDER_X, 8) ;
+        Pos		= MAP_APPFONT ( BORDER_X, 82 ) ;
+        Size	= MAP_APPFONT ( WINDOW_SIZE_X - BORDER_X - BORDER_X, 8) ;
         SVLook = TRUE;
         Group = TRUE;
-
+        
         Text [ en-US ] = "Make this address book available to all modules in %PRODUCTNAME.";
     };
     FixedText FT_NAME_EXPL
     {
-        Pos     = MAP_APPFONT ( BORDER_X + 10, 93 ) ;
-        Size    = MAP_APPFONT ( WINDOW_SIZE_X - BORDER_X - BORDER_X - 10, 8 ) ;
+        Pos		= MAP_APPFONT ( BORDER_X + 10, 93 ) ;
+        Size	= MAP_APPFONT ( WINDOW_SIZE_X - BORDER_X - BORDER_X - 10, 8 ) ;
 
         Text [ en-US ] = "Address book name";
     };
 
     Edit ET_DATASOURCENAME
     {
-        Pos     = MAP_APPFONT ( BORDER_X + 10, 104 ) ;
-        Size    = MAP_APPFONT ( WINDOW_SIZE_X - 56 - BORDER_X - BORDER_X - 10, 12) ;
+        Pos		= MAP_APPFONT ( BORDER_X + 10, 104 ) ;
+        Size	= MAP_APPFONT ( WINDOW_SIZE_X - 56 - BORDER_X - BORDER_X - 10, 12) ;
         SVLook = TRUE;
         Border = TRUE;
     };
 
     FixedText FT_DUPLICATENAME
     {
-        Pos     = MAP_APPFONT ( BORDER_X + 10, WINDOW_SIZE_Y - HEADER_SIZE_Y - 7 - 24 ) ;
-        Size    = MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 24) ;
+        Pos		= MAP_APPFONT ( BORDER_X + 10, WINDOW_SIZE_Y - HEADER_SIZE_Y - 7 - 24 ) ;
+        Size	= MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 24) ;
         WordBreak = TRUE;
         Hide = TRUE;
         Group = FALSE;
diff --git a/extensions/source/abpilot/addresssettings.hxx b/extensions/source/abpilot/addresssettings.hxx
index 6acb48022fc5..9c05144befb6 100644
--- a/extensions/source/abpilot/addresssettings.hxx
+++ b/extensions/source/abpilot/addresssettings.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace abp
     //=====================================================================
     struct AddressSettings
     {
-        AddressSourceType   eType;
-        ::rtl::OUString     sDataSourceName;
-        ::rtl::OUString     sRegisteredDataSourceName;
-        ::rtl::OUString     sSelectedTable;
+        AddressSourceType	eType;
+        ::rtl::OUString		sDataSourceName;
+        ::rtl::OUString		sRegisteredDataSourceName;
+        ::rtl::OUString		sSelectedTable;
         bool                bIgnoreNoTable;
-        MapString2String    aFieldMapping;
+        MapString2String	aFieldMapping;
         bool                bRegisterDataSource;
     };
 
 //.........................................................................
-}   // namespace abp
+}	// namespace abp
 //.........................................................................
 
 #endif // EXTENSIONS_ABP_ADDRESSSETTINGS_HXX
diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx
index 41eda708fd19..8f406ced1ce7 100644
--- a/extensions/source/abpilot/admininvokationimpl.cxx
+++ b/extensions/source/abpilot/admininvokationimpl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 "componentmodule.hxx"
 #include <vcl/waitobj.hxx>
 
-
+ 
 //.........................................................................
 namespace abp
 {
@@ -114,7 +114,7 @@ namespace abp
             }
 
             if (xDialog.is())
-            {   // execute it
+            {	// execute it
                 if (xDialog->execute())
                     return sal_True;
             }
@@ -129,7 +129,7 @@ namespace abp
     }
 
 //.........................................................................
-}   // namespace abp
+}	// namespace abp
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/abpilot/admininvokationimpl.hxx b/extensions/source/abpilot/admininvokationimpl.hxx
index a4fbd8910361..760d2270e0cd 100644
--- a/extensions/source/abpilot/admininvokationimpl.hxx
+++ b/extensions/source/abpilot/admininvokationimpl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace abp
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
                         m_xORB;
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDataSource;
-        Window*         m_pMessageParent;
+        Window*			m_pMessageParent;
 
     public:
         OAdminDialogInvokation(
@@ -64,7 +64,7 @@ namespace abp
     };
 
 //.........................................................................
-}   // namespace abp
+}	// namespace abp
 //.........................................................................
 
 #endif // EXTENSIONS_ABP_ADMININVOKATIONIMPL_HXX
diff --git a/extensions/source/abpilot/admininvokationpage.cxx b/extensions/source/abpilot/admininvokationpage.cxx
index 3ef7fc398ab5..872c050508a2 100644
--- a/extensions/source/abpilot/admininvokationpage.cxx
+++ b/extensions/source/abpilot/admininvokationpage.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace abp
     //=====================================================================
     AdminDialogInvokationPage::AdminDialogInvokationPage( OAddessBookSourcePilot* _pParent )
         :AddressBookSourcePage(_pParent, ModuleRes(RID_PAGE_ADMININVOKATION))
-        ,m_aExplanation         (this, ModuleRes(FT_ADMINEXPLANATION))
-        ,m_aInvokeAdminDialog   (this, ModuleRes(PB_INVOKE_ADMIN_DIALOG))
-        ,m_aErrorMessage        (this, ModuleRes(FT_ERROR))
+        ,m_aExplanation			(this, ModuleRes(FT_ADMINEXPLANATION))
+        ,m_aInvokeAdminDialog	(this, ModuleRes(PB_INVOKE_ADMIN_DIALOG))
+        ,m_aErrorMessage		(this, ModuleRes(FT_ERROR))
         ,m_bSuccessfullyExecutedDialog(sal_False)
     {
         FreeResource();
@@ -110,7 +110,7 @@ namespace abp
     }
 
 //.........................................................................
-}   // namespace abp
+}	// namespace abp
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/abpilot/admininvokationpage.hxx b/extensions/source/abpilot/admininvokationpage.hxx
index 377d32e9d0b1..ac435be2cd07 100644
--- a/extensions/source/abpilot/admininvokationpage.hxx
+++ b/extensions/source/abpilot/admininvokationpage.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,19 +42,19 @@ namespace abp
     class AdminDialogInvokationPage : public AddressBookSourcePage
     {
     protected:
-        FixedText       m_aExplanation;
-        PushButton      m_aInvokeAdminDialog;
-        FixedText       m_aErrorMessage;
+        FixedText		m_aExplanation;
+        PushButton		m_aInvokeAdminDialog;
+        FixedText		m_aErrorMessage;
 
-        sal_Bool        m_bSuccessfullyExecutedDialog;
+        sal_Bool		m_bSuccessfullyExecutedDialog;
 
     public:
         AdminDialogInvokationPage( OAddessBookSourcePilot* _pParent );
 
     protected:
         // TabDialog overridables
-        virtual void        ActivatePage();
-        virtual void        initializePage();
+        virtual void		ActivatePage();
+        virtual void		initializePage();
 
         // OImportPage overridables
         virtual bool        canAdvance() const;
@@ -67,7 +67,7 @@ namespace abp
     };
 
 //.........................................................................
-}   // namespace abp
+}	// namespace abp
 //.........................................................................
 
 #endif // EXTENSIONS_ABP_ADMINDIALOG_INVOKATION_PAGE_HXX
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index eb024565a840..95e2be27bea8 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace abp
         DBG_ASSERT( xDynamicContext.is(), "lcl_implCreateAndInsert: missing an interface on the context (XNamingService)!" );
         if (xDynamicContext.is())
         {
-            //  xDynamicContext->registerObject( _rName, xNewDataSource );
+            //	xDynamicContext->registerObject( _rName, xNewDataSource );
             _rxNewDataSource = xNewDataSource;
         }
     }
@@ -180,14 +180,14 @@ namespace abp
     //=====================================================================
     struct ODataSourceContextImpl
     {
-        Reference< XMultiServiceFactory >   xORB;
-        Reference< XNameAccess >            xContext;           /// the UNO data source context
-        StringBag                           aDataSourceNames;   /// for quicker name checks (without the UNO overhead)
+        Reference< XMultiServiceFactory >	xORB;
+        Reference< XNameAccess >			xContext;			/// the UNO data source context
+        StringBag							aDataSourceNames;	/// for quicker name checks (without the UNO overhead)
 
         ODataSourceContextImpl( const Reference< XMultiServiceFactory >& _rxORB ) : xORB( _rxORB ) { }
         ODataSourceContextImpl( const ODataSourceContextImpl& _rSource )
-            :xORB       ( _rSource.xORB )
-            ,xContext   ( _rSource.xContext )
+            :xORB		( _rSource.xORB )
+            ,xContext	( _rSource.xContext )
         {
         }
     };
@@ -229,7 +229,7 @@ namespace abp
 
         sal_Int32 nPostFix = 1;
         while ( ( m_pImpl->aDataSourceNames.end() != aPos ) && ( nPostFix < 65535 ) )
-        {   // there already is a data source with this name
+        {	// there already is a data source with this name
             sCheck = _rDataSourceName;
             sCheck += ::rtl::OUString::valueOf( nPostFix++ );
 
@@ -247,65 +247,65 @@ namespace abp
     }
 
     //---------------------------------------------------------------------
-    ODataSource ODataSourceContext::createNewLDAP( const ::rtl::OUString& _rName) SAL_THROW (( ))
+    ODataSource	ODataSourceContext::createNewLDAP( const ::rtl::OUString& _rName) SAL_THROW (( ))
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:ldap:" );
     }
 
     //---------------------------------------------------------------------
-    ODataSource ODataSourceContext::createNewMORK( const ::rtl::OUString& _rName) SAL_THROW (( ))
+    ODataSource	ODataSourceContext::createNewMORK( const ::rtl::OUString& _rName) SAL_THROW (( ))
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:mozilla" );
     }
 
     //---------------------------------------------------------------------
-    ODataSource ODataSourceContext::createNewThunderbird( const ::rtl::OUString& _rName ) SAL_THROW (( ))
+    ODataSource	ODataSourceContext::createNewThunderbird( const ::rtl::OUString& _rName ) SAL_THROW (( ))
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:thunderbird" );
     }
 
     //---------------------------------------------------------------------
-    ODataSource ODataSourceContext::createNewEvolutionLdap( const ::rtl::OUString& _rName) SAL_THROW (( ))
+    ODataSource	ODataSourceContext::createNewEvolutionLdap( const ::rtl::OUString& _rName) SAL_THROW (( ))
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution:ldap" );
     }
     //---------------------------------------------------------------------
-    ODataSource ODataSourceContext::createNewEvolutionGroupwise( const ::rtl::OUString& _rName) SAL_THROW (( ))
+    ODataSource	ODataSourceContext::createNewEvolutionGroupwise( const ::rtl::OUString& _rName) SAL_THROW (( ))
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution:groupwise" );
     }
     //---------------------------------------------------------------------
-    ODataSource ODataSourceContext::createNewEvolution( const ::rtl::OUString& _rName) SAL_THROW (( ))
+    ODataSource	ODataSourceContext::createNewEvolution( const ::rtl::OUString& _rName) SAL_THROW (( ))
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution:local" );
     }
 
     //---------------------------------------------------------------------
-    ODataSource ODataSourceContext::createNewKab( const ::rtl::OUString& _rName) SAL_THROW (( ))
+    ODataSource	ODataSourceContext::createNewKab( const ::rtl::OUString& _rName) SAL_THROW (( ))
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:kab" );
     }
 
     //---------------------------------------------------------------------
-    ODataSource ODataSourceContext::createNewMacab( const ::rtl::OUString& _rName) SAL_THROW (( ))
+    ODataSource	ODataSourceContext::createNewMacab( const ::rtl::OUString& _rName) SAL_THROW (( ))
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:macab" );
     }
 
     //---------------------------------------------------------------------
-    ODataSource ODataSourceContext::createNewOutlook( const ::rtl::OUString& _rName) SAL_THROW (( ))
+    ODataSource	ODataSourceContext::createNewOutlook( const ::rtl::OUString& _rName) SAL_THROW (( ))
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:outlook" );
     }
 
     //---------------------------------------------------------------------
-    ODataSource ODataSourceContext::createNewOE( const ::rtl::OUString& _rName) SAL_THROW (( ))
+    ODataSource	ODataSourceContext::createNewOE( const ::rtl::OUString& _rName) SAL_THROW (( ))
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:outlookexp" );
     }
 
     //---------------------------------------------------------------------
-    ODataSource ODataSourceContext::createNewDBase( const ::rtl::OUString& _rName) SAL_THROW (( ))
+    ODataSource	ODataSourceContext::createNewDBase( const ::rtl::OUString& _rName) SAL_THROW (( ))
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:dbase:" );
     }
@@ -316,13 +316,13 @@ namespace abp
     struct ODataSourceImpl
     {
     public:
-        Reference< XMultiServiceFactory >       xORB;               /// the service factory
-        Reference< XPropertySet >               xDataSource;        /// the UNO data source
+        Reference< XMultiServiceFactory >		xORB;				/// the service factory
+        Reference< XPropertySet >				xDataSource;		/// the UNO data source
         ::utl::SharedUNOComponent< XConnection >
                                                 xConnection;
-        StringBag                               aTables;            // the cached table names
-        ::rtl::OUString                         sName;
-        sal_Bool                                bTablesUpToDate;    // table name cache up-to-date?
+        StringBag								aTables;			// the cached table names
+        ::rtl::OUString							sName;
+        sal_Bool								bTablesUpToDate;	// table name cache up-to-date?
 
         ODataSourceImpl( const Reference< XMultiServiceFactory >& _rxORB )
             :xORB( _rxORB )
@@ -411,7 +411,7 @@ namespace abp
         catch(const Exception&)
         {
             DBG_ERROR( "ODataSource::registerDataSource: caught an exception while creating the data source!" );
-        }
+        }		
     }
 
     //---------------------------------------------------------------------
@@ -633,7 +633,7 @@ namespace abp
     }
 
 //.........................................................................
-}   // namespace abp
+}	// namespace abp
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/abpilot/datasourcehandling.hxx b/extensions/source/abpilot/datasourcehandling.hxx
index bffcb62cdf97..cce6253bb9bf 100644
--- a/extensions/source/abpilot/datasourcehandling.hxx
+++ b/extensions/source/abpilot/datasourcehandling.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 abp
     class ODataSourceContext
     {
     private:
-        ODataSourceContextImpl*     m_pImpl;
+        ODataSourceContextImpl*		m_pImpl;
 
     public:
         ODataSourceContext(
@@ -67,7 +67,7 @@ namespace abp
         );
 
         /// retrieves the names of all data sources
-        void    getDataSourceNames( StringBag& _rNames ) const SAL_THROW (( ));
+        void	getDataSourceNames( StringBag& _rNames ) const SAL_THROW (( ));
 
         /// disambiguates the given name by appending auccessive numbers
         ::rtl::OUString& disambiguate(::rtl::OUString& _rDataSourceName);
@@ -94,16 +94,16 @@ namespace abp
         ODataSource createNewMacab( const ::rtl::OUString& _rName ) SAL_THROW (( ));
 
         /// creates a new LDAP data source
-        ODataSource createNewLDAP( const ::rtl::OUString& _rName ) SAL_THROW (( ));
+        ODataSource	createNewLDAP( const ::rtl::OUString& _rName ) SAL_THROW (( ));
 
         /// creates a new Outlook data source
-        ODataSource createNewOutlook( const ::rtl::OUString& _rName ) SAL_THROW (( ));
+        ODataSource	createNewOutlook( const ::rtl::OUString& _rName ) SAL_THROW (( ));
 
         /// creates a new Outlook express data source
-        ODataSource createNewOE( const ::rtl::OUString& _rName ) SAL_THROW (( ));
+        ODataSource	createNewOE( const ::rtl::OUString& _rName ) SAL_THROW (( ));
 
         /// creates a new dBase data source
-        ODataSource createNewDBase( const ::rtl::OUString& _rName ) SAL_THROW (( ));
+        ODataSource	createNewDBase( const ::rtl::OUString& _rName ) SAL_THROW (( ));
     };
 
     //=====================================================================
@@ -120,7 +120,7 @@ namespace abp
     class ODataSource
     {
     private:
-        ODataSourceImpl*    m_pImpl;
+        ODataSourceImpl*	m_pImpl;
 
     public:
         // ----------------------------------------------------------------
@@ -142,11 +142,11 @@ namespace abp
 
         // ----------------------------------------------------------------
         /// checks whether or not the object represents a valid data source
-        sal_Bool    isValid() const SAL_THROW (( ));
+        sal_Bool	isValid() const SAL_THROW (( ));
 
         // ----------------------------------------------------------------
         /// removes the data source represented by the object from the data source context
-        void        remove() SAL_THROW (( ));
+        void		remove() SAL_THROW (( ));
             // TODO: put this into the context class
 
         /// returns the name of the data source
@@ -154,7 +154,7 @@ namespace abp
                     getName() const SAL_THROW (( ));
 
         /// renames the data source
-        sal_Bool    rename( const ::rtl::OUString& _rName ) SAL_THROW (( ));
+        sal_Bool	rename( const ::rtl::OUString& _rName ) SAL_THROW (( ));
             // TODO: put this into the context class
 
         // ----------------------------------------------------------------
@@ -166,25 +166,25 @@ namespace abp
                 at all.
             @see isConnected
         */
-        sal_Bool    connect( Window* _pMessageParent ) SAL_THROW (( ));
+        sal_Bool	connect( Window* _pMessageParent ) SAL_THROW (( ));
 
         /// returns <TRUE/> if the object has a valid connection, obtained from it's data source
-        sal_Bool    isConnected( ) const SAL_THROW (( ));
+        sal_Bool	isConnected( ) const SAL_THROW (( ));
 
         /// disconnects from the data source (i.e. disposes the UNO connection hold internally)
-        void        disconnect( ) SAL_THROW (( ));
+        void		disconnect( ) SAL_THROW (( ));
 
         /// stores the database file
-        void        store() SAL_THROW (( ));
+        void		store() SAL_THROW (( ));
 
         /// register the data source under the given name in the configuration
-        void        registerDataSource( const ::rtl::OUString& _sRegisteredDataSourceName )  SAL_THROW (( ));
+        void		registerDataSource( const ::rtl::OUString& _sRegisteredDataSourceName )  SAL_THROW (( ));
 
         // ----------------------------------------------------------------
         /** retrieves the tables names from the connection
             <p>to be called when <method>isConnection</method> returns <TRUE/> only</p>
         */
-        const StringBag&    getTableNames() const SAL_THROW (( ));
+        const StringBag&	getTableNames() const SAL_THROW (( ));
 
         /** determines whether a given table exists
         */
@@ -198,7 +198,7 @@ namespace abp
         /** set a new data source.
             <p>Available to selected clients only</p>
         */
-        void        setDataSource(
+        void		setDataSource(
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDS
             ,const ::rtl::OUString& _sName
             ,PackageAccessControl
@@ -209,7 +209,7 @@ namespace abp
     };
 
 //.........................................................................
-}   // namespace abp
+}	// namespace abp
 //.........................................................................
 
 #endif // EXTENSIONS_ABP_DATASOURCEHANDLING_HXX
diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx
index c7af76636362..48e0073360f3 100644
--- a/extensions/source/abpilot/fieldmappingimpl.cxx
+++ b/extensions/source/abpilot/fieldmappingimpl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -172,28 +172,28 @@ namespace abp
                 // So what we need first is a mapping from programmatic names (1) to programmatic names (2)
                 const sal_Char* pMappingProgrammatics[] =
                 {
-                    "FirstName",            "FirstName",
-                    "LastName",             "LastName",
-                    "Street",               "HomeAddress",
-                    "Zip",                  "HomeZipCode",
-                    "City",                 "HomeCity",
-                    "State",                "HomeState",
-                    "Country",              "HomeCountry",
-                    "PhonePriv",            "HomePhone",
-                    "PhoneComp",            "WorkPhone",
-                    "PhoneCell",            "CellularNumber",
-                    "Pager",                "PagerNumber",
-                    "Fax",                  "FaxNumber",
-                    "EMail",                "PrimaryEmail",
-                    "URL",                  "WebPage1",
-                    "Note",                 "Notes",
-                    "Altfield1",            "Custom1",
-                    "Altfield2",            "Custom2",
-                    "Altfield3",            "Custom3",
-                    "Altfield4",            "Custom4",
-                    "Title",                "JobTitle",
-                    "Company",              "Company",
-                    "Department",           "Department"
+                    "FirstName",			"FirstName",
+                    "LastName",				"LastName",
+                    "Street",				"HomeAddress",
+                    "Zip",					"HomeZipCode",
+                    "City",					"HomeCity",
+                    "State",				"HomeState",
+                    "Country",				"HomeCountry",
+                    "PhonePriv",			"HomePhone",
+                    "PhoneComp",			"WorkPhone",
+                    "PhoneCell",			"CellularNumber",
+                    "Pager",				"PagerNumber",
+                    "Fax",					"FaxNumber",
+                    "EMail",				"PrimaryEmail",
+                    "URL",					"WebPage1",
+                    "Note",					"Notes",
+                    "Altfield1",			"Custom1",
+                    "Altfield2",			"Custom2",
+                    "Altfield3",			"Custom3",
+                    "Altfield4",			"Custom4",
+                    "Title",				"JobTitle",
+                    "Company",				"Company",
+                    "Department",			"Department"
                 };
                     // (this list is not complete: both lists of programmatic names are larger in real,
                     // but this list above is the intersection)
@@ -217,7 +217,7 @@ namespace abp
                 ::rtl::OUString sAddressProgrammatic;
                 ::rtl::OUString sDriverProgrammatic;
                 ::rtl::OUString sDriverUI;
-                for (   sal_Int32 i=0;
+                for	(	sal_Int32 i=0;
                         i < nIntersectedProgrammatics;
                         ++i
                     )
@@ -284,7 +284,7 @@ namespace abp
                 // do we have a new alias for the programmatic?
                 MapString2StringIterator aPos = aFieldAssignment.find( *pExistentFields );
                 if ( aFieldAssignment.end() != aPos )
-                {   // yes
+                {	// yes
                     // -> set a new value
                     OConfigurationNode aExistentField = aFields.openNode( *pExistentFields );
                     aExistentField.setNodeValue( sAssignedNodeName, makeAny( aPos->second ) );
@@ -292,7 +292,7 @@ namespace abp
                     aFieldAssignment.erase( *pExistentFields );
                 }
                 else
-                {   // no
+                {	// no
                     // -> remove it
                     aFields.removeNode( *pExistentFields );
                 }
@@ -300,7 +300,7 @@ namespace abp
 
             // now everything remaining in aFieldAssignment marks a mapping entry which was not present
             // in the config before
-            for (   ConstMapString2StringIterator aNewMapping = aFieldAssignment.begin();
+            for (	ConstMapString2StringIterator aNewMapping = aFieldAssignment.begin();
                     aNewMapping != aFieldAssignment.end();
                     ++aNewMapping
                 )
@@ -319,7 +319,7 @@ namespace abp
         }
 
     //.....................................................................
-    }   // namespace fieldmapping
+    }	// namespace fieldmapping
     //.....................................................................
 
     //.....................................................................
@@ -364,11 +364,11 @@ namespace abp
         }
 
     //.....................................................................
-    }   // namespace addressconfig
+    }	// namespace addressconfig
     //.....................................................................
 
 //.........................................................................
-}   // namespace abp
+}	// namespace abp
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/abpilot/fieldmappingimpl.hxx b/extensions/source/abpilot/fieldmappingimpl.hxx
index 7d8ae420bc39..fe93fd01f2f9 100644
--- a/extensions/source/abpilot/fieldmappingimpl.hxx
+++ b/extensions/source/abpilot/fieldmappingimpl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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/uno/Reference.hxx>
 #include "addresssettings.hxx"
 
-namespace com { namespace sun { namespace star {
+namespace com { namespace sun { namespace star { 
     namespace lang {
         class XMultiServiceFactory;
     }
@@ -77,7 +77,7 @@ namespace abp
             <p>The column names as used by the SDBC driver for address books is stored in the configuration,
             and this function creates a mapping which uses this configuration information.</p>
         */
-        void defaultMapping(
+        void defaultMapping( 
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB,
             MapString2String& /* [out] */ _rFieldAssignment
         ) SAL_THROW ( ( ) );
@@ -91,7 +91,7 @@ namespace abp
         ) SAL_THROW ( ( ) );
 
     //.....................................................................
-    }   // namespace fieldmapping
+    }	// namespace fieldmapping
     //.....................................................................
 
     //.....................................................................
@@ -116,11 +116,11 @@ namespace abp
         ) SAL_THROW ( ( ) );
 
     //.....................................................................
-    }   // namespace addressconfig
+    }	// namespace addressconfig
     //.....................................................................
 
 //.........................................................................
-}   // namespace abp
+}	// namespace abp
 //.........................................................................
 
 #endif // EXTENSIONS_ABP_FIELDMAPPINGIMPL_HXX
diff --git a/extensions/source/abpilot/fieldmappingpage.cxx b/extensions/source/abpilot/fieldmappingpage.cxx
index 323259965d62..82f25f900d2d 100644
--- a/extensions/source/abpilot/fieldmappingpage.cxx
+++ b/extensions/source/abpilot/fieldmappingpage.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace abp
     //---------------------------------------------------------------------
     FieldMappingPage::FieldMappingPage( OAddessBookSourcePilot* _pParent )
         :AddressBookSourcePage( _pParent, ModuleRes( RID_PAGE_FIELDMAPPING ) )
-        ,m_aExplanation     ( this, ModuleRes( FT_FIELDASSIGMENTEXPL ) )
-        ,m_aInvokeDialog    ( this, ModuleRes( PB_INVOKE_FIELDS_DIALOG ) )
-        ,m_aHint            ( this, ModuleRes( FT_ASSIGNEDFIELDS ) )
+        ,m_aExplanation		( this, ModuleRes( FT_FIELDASSIGMENTEXPL ) )
+        ,m_aInvokeDialog	( this, ModuleRes( PB_INVOKE_FIELDS_DIALOG ) )
+        ,m_aHint			( this, ModuleRes( FT_ASSIGNEDFIELDS ) )
     {
         FreeResource();
 
@@ -115,7 +115,7 @@ namespace abp
     }
 
 //.........................................................................
-}   // namespace abp
+}	// namespace abp
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/abpilot/fieldmappingpage.hxx b/extensions/source/abpilot/fieldmappingpage.hxx
index 330c8e37c4a8..3da50be83ad9 100644
--- a/extensions/source/abpilot/fieldmappingpage.hxx
+++ b/extensions/source/abpilot/fieldmappingpage.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,20 +42,20 @@ namespace abp
     class FieldMappingPage : public AddressBookSourcePage
     {
     protected:
-        FixedText       m_aExplanation;
-        PushButton      m_aInvokeDialog;
-        FixedText       m_aHint;
+        FixedText		m_aExplanation;
+        PushButton		m_aInvokeDialog;
+        FixedText		m_aHint;
 
     public:
         FieldMappingPage( OAddessBookSourcePilot* _pParent );
 
     protected:
         // OWizardPage overridables
-        virtual void        initializePage();
+        virtual void		initializePage();
 
         // TabDialog overridables
-        virtual void        ActivatePage();
-        virtual void        DeactivatePage();
+        virtual void		ActivatePage();
+        virtual void		DeactivatePage();
 
     private:
         DECL_LINK( OnInvokeDialog, void* );
@@ -64,7 +64,7 @@ namespace abp
     };
 
 //.........................................................................
-}   // namespace abp
+}	// namespace abp
 //.........................................................................
 
 #endif // EXTENSIONS_ABP_FIELDMAPPINGPAGE_HXX
diff --git a/extensions/source/abpilot/moduleabp.cxx b/extensions/source/abpilot/moduleabp.cxx
index 6fb06c7f68ac..ead9753193f4 100644
--- a/extensions/source/abpilot/moduleabp.cxx
+++ b/extensions/source/abpilot/moduleabp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/abpilot/tableselectionpage.cxx b/extensions/source/abpilot/tableselectionpage.cxx
index fa3d4cc23c7c..5e6a2182d145 100644
--- a/extensions/source/abpilot/tableselectionpage.cxx
+++ b/extensions/source/abpilot/tableselectionpage.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace abp
     //---------------------------------------------------------------------
     TableSelectionPage::TableSelectionPage( OAddessBookSourcePilot* _pParent )
         :AddressBookSourcePage(_pParent, ModuleRes(RID_PAGE_TABLESELECTION_AB))
-        ,m_aLabel           ( this, ModuleRes( FL_TOOMUCHTABLES ) )
-        ,m_aTableList       ( this, ModuleRes( LB_TABLELIST ) )
+        ,m_aLabel			( this, ModuleRes( FL_TOOMUCHTABLES ) )
+        ,m_aTableList		( this, ModuleRes( LB_TABLELIST ) )
     {
         FreeResource();
 
@@ -83,7 +83,7 @@ namespace abp
             // this page should never bother the user if there is 1 or less tables.
 
         // fill the list
-        for (   ConstStringBagIterator aTables = aTableNames.begin();
+        for	(	ConstStringBagIterator aTables = aTableNames.begin();
                 aTables != aTableNames.end();
                 ++aTables
             )
@@ -124,12 +124,12 @@ namespace abp
     //---------------------------------------------------------------------
     bool TableSelectionPage::canAdvance() const
     {
-        return  AddressBookSourcePage::canAdvance()
-            &&  ( 0 < m_aTableList.GetSelectEntryCount() );
+        return	AddressBookSourcePage::canAdvance()
+            &&	( 0 < m_aTableList.GetSelectEntryCount() );
     }
 
 //.........................................................................
-}   // namespace abp
+}	// namespace abp
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/abpilot/tableselectionpage.hxx b/extensions/source/abpilot/tableselectionpage.hxx
index 9a7edca449dc..82b2d5d57c03 100644
--- a/extensions/source/abpilot/tableselectionpage.hxx
+++ b/extensions/source/abpilot/tableselectionpage.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace abp
     class TableSelectionPage : public AddressBookSourcePage
     {
     protected:
-        FixedText       m_aLabel;
-        ListBox         m_aTableList;
+        FixedText		m_aLabel;
+        ListBox			m_aTableList;
 
     public:
         TableSelectionPage( OAddessBookSourcePilot* _pParent );
 
     protected:
         // OWizardPage overridables
-        virtual void        initializePage();
-        virtual sal_Bool    commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+        virtual void		initializePage();
+        virtual sal_Bool	commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
 
         // TabDialog overridables
-        virtual void        ActivatePage();
-        virtual void        DeactivatePage();
+        virtual void		ActivatePage();
+        virtual void		DeactivatePage();
 
         // OImportPage overridables
         virtual bool        canAdvance() const;
@@ -67,7 +67,7 @@ namespace abp
     };
 
 //.........................................................................
-}   // namespace abp
+}	// namespace abp
 //.........................................................................
 
 #endif // EXTENSIONS_ABP_TABLESELECTIONPAGE_HXX
diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx
index 67b360d9dc91..f78878f0419c 100644
--- a/extensions/source/abpilot/typeselectionpage.cxx
+++ b/extensions/source/abpilot/typeselectionpage.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,19 +48,19 @@ namespace abp
     //---------------------------------------------------------------------
     TypeSelectionPage::TypeSelectionPage( OAddessBookSourcePilot* _pParent )
         :AddressBookSourcePage(_pParent, ModuleRes(RID_PAGE_SELECTABTYPE))
-        ,m_aHint                (this,  ModuleRes(FT_TYPE_HINTS))
-        ,m_aTypeSep             (this,  ModuleRes(FL_TYPE))
-        ,m_aEvolution           (this,  ModuleRes(RB_EVOLUTION))
-        ,m_aEvolutionGroupwise  (this,  ModuleRes(RB_EVOLUTION_GROUPWISE))
-        ,m_aEvolutionLdap       (this,  ModuleRes(RB_EVOLUTION_LDAP))
-        ,m_aMORK                (this,  ModuleRes(RB_MORK))
+        ,m_aHint			    (this,	ModuleRes(FT_TYPE_HINTS))
+        ,m_aTypeSep			    (this,	ModuleRes(FL_TYPE))
+        ,m_aEvolution		    (this,	ModuleRes(RB_EVOLUTION))
+        ,m_aEvolutionGroupwise  (this,	ModuleRes(RB_EVOLUTION_GROUPWISE))
+        ,m_aEvolutionLdap	    (this,	ModuleRes(RB_EVOLUTION_LDAP))
+        ,m_aMORK			    (this,	ModuleRes(RB_MORK))
         ,m_aThunderbird         (this,  ModuleRes(RB_THUNDERBIRD))
-        ,m_aKab                 (this,  ModuleRes(RB_KAB))
-        ,m_aMacab               (this,  ModuleRes(RB_MACAB))
-        ,m_aLDAP                (this,  ModuleRes(RB_LDAP))
-        ,m_aOutlook             (this,  ModuleRes(RB_OUTLOOK))
-        ,m_aOE                  (this,  ModuleRes(RB_OUTLOOKEXPRESS))
-        ,m_aOther               (this,  ModuleRes(RB_OTHER))
+        ,m_aKab				    (this,	ModuleRes(RB_KAB))
+        ,m_aMacab			    (this,	ModuleRes(RB_MACAB))
+        ,m_aLDAP			    (this,	ModuleRes(RB_LDAP))
+        ,m_aOutlook			    (this,	ModuleRes(RB_OUTLOOK))
+        ,m_aOE				    (this,	ModuleRes(RB_OUTLOOKEXPRESS))
+        ,m_aOther			    (this,	ModuleRes(RB_OTHER))
     {
         FreeResource();
 
@@ -229,8 +229,8 @@ namespace abp
     //---------------------------------------------------------------------
     bool TypeSelectionPage::canAdvance() const
     {
-        return  AddressBookSourcePage::canAdvance()
-            &&  (AST_INVALID != getSelectedType());
+        return	AddressBookSourcePage::canAdvance()
+            &&	(AST_INVALID != getSelectedType());
     }
 
     //---------------------------------------------------------------------
@@ -242,7 +242,7 @@ namespace abp
     }
 
 //.........................................................................
-}   // namespace abp
+}	// namespace abp
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/abpilot/typeselectionpage.hxx b/extensions/source/abpilot/typeselectionpage.hxx
index b78f3f036f52..37e0a8beb6da 100644
--- a/extensions/source/abpilot/typeselectionpage.hxx
+++ b/extensions/source/abpilot/typeselectionpage.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace abp
     class TypeSelectionPage : public AddressBookSourcePage
     {
     protected:
-        FixedText       m_aHint;
-        FixedLine       m_aTypeSep;
-        RadioButton     m_aEvolution;
-        RadioButton     m_aEvolutionGroupwise;
-        RadioButton     m_aEvolutionLdap;
-        RadioButton     m_aMORK;
-        RadioButton     m_aThunderbird;
-        RadioButton     m_aKab;
-        RadioButton     m_aMacab;
-        RadioButton     m_aLDAP;
-        RadioButton     m_aOutlook;
-        RadioButton     m_aOE;
-        RadioButton     m_aOther;
+        FixedText		m_aHint;
+        FixedLine		m_aTypeSep;
+        RadioButton		m_aEvolution;
+        RadioButton		m_aEvolutionGroupwise;
+        RadioButton		m_aEvolutionLdap;
+        RadioButton		m_aMORK;
+        RadioButton		m_aThunderbird;
+        RadioButton		m_aKab;
+        RadioButton		m_aMacab;
+        RadioButton		m_aLDAP;
+        RadioButton		m_aOutlook;
+        RadioButton		m_aOE;
+        RadioButton		m_aOther;
 
         struct ButtonItem {
             RadioButton *m_pItem;
@@ -83,12 +83,12 @@ namespace abp
 
     protected:
         // OWizardPage overridables
-        virtual void        initializePage();
-        virtual sal_Bool    commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+        virtual void		initializePage();
+        virtual sal_Bool	commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
 
         // TabDialog overridables
-        virtual void        ActivatePage();
-        virtual void        DeactivatePage();
+        virtual void		ActivatePage();
+        virtual void		DeactivatePage();
 
         // OImportPage overridables
         virtual bool        canAdvance() const;
@@ -96,11 +96,11 @@ namespace abp
     private:
         DECL_LINK( OnTypeSelected, void* );
 
-        void                selectType( AddressSourceType _eType );
+        void				selectType( AddressSourceType _eType );
     };
 
 //.........................................................................
-}   // namespace abp
+}	// namespace abp
 //.........................................................................
 
 #endif // EXTENSIONS_ABP_TYPESELECTIONPAGE_HXX
diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx
index 2d7c8633489c..0c58f088a665 100644
--- a/extensions/source/abpilot/unodialogabp.cxx
+++ b/extensions/source/abpilot/unodialogabp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace abp
     }
 
     //--------------------------------------------------------------------------
-    Dialog* OABSPilotUno::createDialog(Window* _pParent)
+    Dialog*	OABSPilotUno::createDialog(Window* _pParent)
     {
         return new OAddessBookSourcePilot(_pParent, m_aContext.getLegacyServiceFactory());
     }
@@ -192,7 +192,7 @@ namespace abp
     }
 
 //.........................................................................
-}   // namespace abp
+}	// namespace abp
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/abpilot/unodialogabp.hxx b/extensions/source/abpilot/unodialogabp.hxx
index aa320b027191..ab56106b5746 100644
--- a/extensions/source/abpilot/unodialogabp.hxx
+++ b/extensions/source/abpilot/unodialogabp.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace abp
     //= OABSPilotUno
     //=====================================================================
     class OABSPilotUno;
-    typedef ::svt::OGenericUnoDialog                                OABSPilotUno_DBase;
-    typedef ::cppu::ImplHelper1< ::com::sun::star::task::XJob >     OABSPilotUno_JBase;
-    typedef ::comphelper::OPropertyArrayUsageHelper< OABSPilotUno > OABSPilotUno_PBase;
+    typedef ::svt::OGenericUnoDialog								OABSPilotUno_DBase;
+    typedef ::cppu::ImplHelper1< ::com::sun::star::task::XJob >		OABSPilotUno_JBase;
+    typedef ::comphelper::OPropertyArrayUsageHelper< OABSPilotUno >	OABSPilotUno_PBase;
     /// the UNO wrapper for the address book source pilot
     class OABSPilotUno
             :public OABSPilotUno_DBase
@@ -90,12 +90,12 @@ namespace abp
         using OABSPilotUno_DBase::execute;
     protected:
     // OGenericUnoDialog overridables
-        virtual Dialog* createDialog(Window* _pParent);
+        virtual Dialog*	createDialog(Window* _pParent);
         virtual void executedDialog(sal_Int16 _nExecutionResult);
     };
 
 //.........................................................................
-}   // namespace abp
+}	// namespace abp
 //.........................................................................
 
 #endif // EXTENSIONS_ABP_UNODIALOG_HXX
diff --git a/extensions/source/activex/main/SOActionsApproval.cpp b/extensions/source/activex/main/SOActionsApproval.cpp
index b795b92fcf76..fd4abb170959 100644
--- a/extensions/source/activex/main/SOActionsApproval.cpp
+++ b/extensions/source/activex/main/SOActionsApproval.cpp
@@ -11,7 +11,7 @@
 
 STDMETHODIMP SOActionsApproval::InterfaceSupportsErrorInfo(REFIID riid)
 {
-    static const IID* arr[] =
+    static const IID* arr[] = 
     {
         &IID_ISOActionsApproval,
     };
diff --git a/extensions/source/activex/main/SOActionsApproval.h b/extensions/source/activex/main/SOActionsApproval.h
index a5570312864d..097d7b97a29f 100644
--- a/extensions/source/activex/main/SOActionsApproval.h
+++ b/extensions/source/activex/main/SOActionsApproval.h
@@ -51,7 +51,7 @@ DECLARE_REGISTRY_RESOURCEID(IDR_SODOCUMENTEVENTLISTENER)
     STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid);
 
 // ISOActionsApproval
-        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE approveAction(
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE approveAction( 
             /* [in] */ long nActionID,
             /* [retval][out] */ boolean *pbApproval)
         {
diff --git a/extensions/source/activex/main/SOActiveX.cpp b/extensions/source/activex/main/SOActiveX.cpp
index f95e42772185..3468337a0e80 100644
--- a/extensions/source/activex/main/SOActiveX.cpp
+++ b/extensions/source/activex/main/SOActiveX.cpp
@@ -61,7 +61,7 @@ HRESULT ExecuteFunc( IDispatch* idispUnoObject,
     // for debugging purposes
     // USES_CONVERSION;
     // if ( !SUCCEEDED( hr ) )
-    //  ::MessageBox( NULL, OLE2A( myInfo.bstrDescription ), OLE2A( myInfo.bstrSource ), MB_OK | MB_ICONINFORMATION );
+    //	::MessageBox( NULL, OLE2A( myInfo.bstrDescription ), OLE2A( myInfo.bstrSource ), MB_OK | MB_ICONINFORMATION );
 
     return hr;
 }
@@ -142,16 +142,16 @@ CSOActiveX::CSOActiveX()
     if( !SUCCEEDED( hr ) )
         OutputError_Impl( NULL, hr );
 
-    mPWinClass.style            = CS_HREDRAW|CS_VREDRAW;
-    mPWinClass.lpfnWndProc      = ::DefWindowProc;
-    mPWinClass.cbClsExtra       = 0;
-    mPWinClass.cbWndExtra       = 0;
-    mPWinClass.hInstance        = (HINSTANCE) GetModuleHandle(NULL); //myInstance;
-    mPWinClass.hIcon            = NULL;
-    mPWinClass.hCursor          = NULL;
-    mPWinClass.hbrBackground    = (HBRUSH) COLOR_BACKGROUND;
-    mPWinClass.lpszMenuName     = NULL;
-    mPWinClass.lpszClassName    = STAROFFICE_WINDOWCLASS;
+    mPWinClass.style			= CS_HREDRAW|CS_VREDRAW;
+    mPWinClass.lpfnWndProc		= ::DefWindowProc;
+    mPWinClass.cbClsExtra		= 0;
+    mPWinClass.cbWndExtra		= 0;
+    mPWinClass.hInstance		= (HINSTANCE) GetModuleHandle(NULL); //myInstance;
+    mPWinClass.hIcon			= NULL;
+    mPWinClass.hCursor			= NULL;
+    mPWinClass.hbrBackground	= (HBRUSH) COLOR_BACKGROUND;
+    mPWinClass.lpszMenuName	    = NULL;
+    mPWinClass.lpszClassName	= STAROFFICE_WINDOWCLASS;
 
     RegisterClass(&mPWinClass);
 }
@@ -260,7 +260,7 @@ HRESULT CSOActiveX::TerminateOffice()
     hr = ExecuteFunc( pdispChildren, L"queryFrames", &nFlag, 1, &aFrames );
     if ( SUCCEEDED( hr ) )
     {
-        if ( ( aFrames.vt == ( VT_ARRAY | VT_DISPATCH ) || aFrames.vt == ( VT_ARRAY | VT_VARIANT ) )
+        if ( ( aFrames.vt == ( VT_ARRAY | VT_DISPATCH ) || aFrames.vt == ( VT_ARRAY | VT_VARIANT ) ) 
           && ( !aFrames.parray || aFrames.parray->cDims == 1 && aFrames.parray->rgsabound[0].cElements == 0 ) )
         {
             // there is no frames open
@@ -269,7 +269,7 @@ HRESULT CSOActiveX::TerminateOffice()
             hr = ExecuteFunc( pdispDesktop, L"terminate", NULL, 0, &dummyResult );
         }
     }
-
+    
     return hr;
 }
 
@@ -372,7 +372,7 @@ STDMETHODIMP CSOActiveX::Load( LPPROPERTYBAG pPropBag, LPERRORLOG /*pErrorLog*/
     hr = CBindStatusCallback<CSOActiveX>::Download( this, &CSOActiveX::CallbackCreateXInputStream, mCurFileUrl, m_spClientSite, FALSE );
     if ( hr == MK_S_ASYNCHRONOUS )
         hr = S_OK;
-
+    
     if ( !SUCCEEDED( hr ) )
     {
         // trigger initialization without stream
@@ -574,7 +574,7 @@ HRESULT CSOActiveX::CreateFrameOldWay( HWND hwnd, int width, int height )
         long nInitInd = 0;
         CComVariant pFrameVariant( mpDispFrame );
         SafeArrayPutElement( pInitVals, &nInitInd, &pFrameVariant );
-
+        
         // the second sequence element
         nInitInd = 1;
         CComVariant pStrArr( 1L );
@@ -615,7 +615,7 @@ HRESULT CSOActiveX::CallLoadComponentFromURL1PBool( OLECHAR* sUrl, OLECHAR* sArg
     HRESULT hr = GetUnoStruct( L"com.sun.star.beans.PropertyValue", pdispPropVal );
     if( !SUCCEEDED( hr ) ) return hr;
 
-    OLECHAR*    sPropMemberNames[2] = { L"Name", L"Value" };
+    OLECHAR* 	sPropMemberNames[2] = { L"Name", L"Value" };
     CComVariant pPropVar[2];
     pPropVar[0] = CComVariant( sArgName );
     pPropVar[1].vt = VT_BOOL; pPropVar[1].boolVal = sArgVal ? VARIANT_TRUE : VARIANT_FALSE ;
@@ -666,7 +666,7 @@ HRESULT CSOActiveX::CallDispatchMethod( OLECHAR* sUrl,
         hr = GetUnoStruct( L"com.sun.star.beans.PropertyValue", pdispPropVal );
         if( !SUCCEEDED( hr ) ) return hr;
 
-        OLECHAR*    sPropMemberNames[2] = { L"Name", L"Value" };
+        OLECHAR* 	sPropMemberNames[2] = { L"Name", L"Value" };
         CComVariant pPropVar[2];
         pPropVar[0] = aArgNames[ix];
         pPropVar[1] = aArgVals[ix];
@@ -719,7 +719,7 @@ void CSOActiveX::CallbackCreateXInputStream( CBindStatusCallback<CSOActiveX>* /*
         if( SUCCEEDED( hr ) && mpDispTempFile )
         {
             SAFEARRAY FAR* pDataArray = SafeArrayCreateVector( VT_I1, 0, dwSize );
-
+    
             if ( pDataArray )
             {
                 hr = SafeArrayLock( pDataArray );
@@ -951,7 +951,7 @@ HRESULT CSOActiveX::OnDrawAdvanced( ATL_DRAWINFO& di )
     if ( mbDrawLocked )
         return S_OK;
     LockingGuard aGuard( mbDrawLocked );
-
+    
     if( m_spInPlaceSite && mCurFileUrl && mbReadyForActivation )
     {
         HWND hwnd;
@@ -1084,7 +1084,7 @@ STDMETHODIMP CSOActiveX::SetClientSite( IOleClientSite* aClientSite )
 
     CComPtr<IOleContainer> aContainer;
     m_spClientSite->GetContainer( &aContainer );
-//  ATLASSERT( aContainer );
+//	ATLASSERT( aContainer );
 
     if( SUCCEEDED( hr )  && aContainer )
     {
@@ -1096,7 +1096,7 @@ STDMETHODIMP CSOActiveX::SetClientSite( IOleClientSite* aClientSite )
             aServiceProvider->QueryService( SID_SInternetExplorer,
                                             IID_IWebBrowser,
                                             (void**)&mWebBrowser2 );
-//          ATLASSERT( mWebBrowser2 );
+//			ATLASSERT( mWebBrowser2 );
             if( mWebBrowser2 )
                 AtlAdvise( mWebBrowser2, GetUnknown(), DIID_DWebBrowserEvents2, &mCookie );
         }
diff --git a/extensions/source/activex/main/SOActiveX.h b/extensions/source/activex/main/SOActiveX.h
index fea95d09c9b9..4b589090b6aa 100644
--- a/extensions/source/activex/main/SOActiveX.h
+++ b/extensions/source/activex/main/SOActiveX.h
@@ -50,38 +50,38 @@ class ATL_NO_VTABLE CSOActiveX :
     public IOleInPlaceActiveObjectImpl<CSOActiveX>,
     public IViewObjectExImpl<CSOActiveX>,
     public IOleInPlaceObjectWindowlessImpl<CSOActiveX>,
-//  public IConnectionPointContainerImpl<CSOActiveX>,
+//	public IConnectionPointContainerImpl<CSOActiveX>,
     public CComCoClass<CSOActiveX, &CLSID_SOActiveX>,
-//  public CProxy_ItryPluginEvents< CSOActiveX >,
+//	public CProxy_ItryPluginEvents< CSOActiveX >,
     public IPersistPropertyBagImpl< CSOActiveX >,
-    public IProvideClassInfo2Impl<  &CLSID_SOActiveX,
+    public IProvideClassInfo2Impl<	&CLSID_SOActiveX,
                                     &DIID__ISOActiveXEvents,
                                     &LIBID_SO_ACTIVEXLib >,
     public IObjectSafetyImpl< CSOActiveX,
                               INTERFACESAFE_FOR_UNTRUSTED_DATA >
 {
 protected:
-    CComPtr<IWebBrowser2>   mWebBrowser2;
-    DWORD                   mCookie;
-
-    CComPtr<IDispatch>      mpDispFactory;
-    CComPtr<IDispatch>      mpDispFrame;
-    CComPtr<IDispatch>      mpInstanceLocker;
-    CComPtr<IDispatch>      mpDispWin;
-    OLECHAR*                mCurFileUrl;
-    BOOL                    mbLoad;
-    BOOL                    mbViewOnly;
+    CComPtr<IWebBrowser2>	mWebBrowser2;
+    DWORD					mCookie;
+
+    CComPtr<IDispatch> 		mpDispFactory;
+    CComPtr<IDispatch> 		mpDispFrame;
+    CComPtr<IDispatch> 		mpInstanceLocker;
+    CComPtr<IDispatch> 		mpDispWin;
+    OLECHAR*          		mCurFileUrl;
+    BOOL					mbLoad;
+    BOOL					mbViewOnly;
     WNDCLASS                mPWinClass;
-    HWND                    mParentWin;
-    HWND                    mOffWin;
+    HWND					mParentWin;
+    HWND					mOffWin;
 
     SODispatchInterceptor*  mpDispatchInterceptor;
-    SOVersion               mnVersion;
+    SOVersion				mnVersion;
 
-    BOOL                    mbReadyForActivation;
-    CComPtr<IDispatch>      mpDispTempFile;
+    BOOL					mbReadyForActivation;
+    CComPtr<IDispatch> 		mpDispTempFile;
 
-    BOOL                    mbDrawLocked;
+    BOOL					mbDrawLocked;
 
 public:
     CSOActiveX();
@@ -105,7 +105,7 @@ BEGIN_COM_MAP(CSOActiveX)
     COM_INTERFACE_ENTRY(IOleObject)
     COM_INTERFACE_ENTRY(IPersistStreamInit)
     COM_INTERFACE_ENTRY2(IPersist, IPersistStreamInit)
-//  COM_INTERFACE_ENTRY(IConnectionPointContainer)
+//	COM_INTERFACE_ENTRY(IConnectionPointContainer)
     COM_INTERFACE_ENTRY(IProvideClassInfo)
     COM_INTERFACE_ENTRY(IProvideClassInfo2)
     COM_INTERFACE_ENTRY(IPersistPropertyBag)
@@ -162,7 +162,7 @@ public:
     HRESULT CallDispatchMethod( OLECHAR* sUrl, CComVariant* sArgNames, CComVariant* sArgVal, unsigned int count );
     HRESULT CallLoadComponentFromURL1PBool( OLECHAR* sUrl, OLECHAR* sArgName, BOOL sArgVal );
     HRESULT GetUrlStruct( OLECHAR* sUrl, CComPtr<IDispatch>& pdispUrl );
-    HRESULT Cleanup();
+    HRESULT	Cleanup();
     HRESULT TerminateOffice();
     HRESULT GetURL( const OLECHAR* url,
                                 const OLECHAR* target );
diff --git a/extensions/source/activex/main/SOComWindowPeer.cpp b/extensions/source/activex/main/SOComWindowPeer.cpp
index 6ae1c805fa39..b6c0986c0ab2 100644
--- a/extensions/source/activex/main/SOComWindowPeer.cpp
+++ b/extensions/source/activex/main/SOComWindowPeer.cpp
@@ -10,7 +10,7 @@
 
 STDMETHODIMP SOComWindowPeer::InterfaceSupportsErrorInfo(REFIID riid)
 {
-    static const IID* arr[] =
+    static const IID* arr[] = 
     {
         &IID_ISOComWindowPeer,
     };
diff --git a/extensions/source/activex/main/SODispatchInterceptor.cpp b/extensions/source/activex/main/SODispatchInterceptor.cpp
index 5a4455265b97..eadce51085e8 100644
--- a/extensions/source/activex/main/SODispatchInterceptor.cpp
+++ b/extensions/source/activex/main/SODispatchInterceptor.cpp
@@ -13,7 +13,7 @@
 
 STDMETHODIMP SODispatchInterceptor::InterfaceSupportsErrorInfo(REFIID riid)
 {
-    static const IID* arr[] =
+    static const IID* arr[] = 
     {
         &IID_ISODispatchInterceptor,
     };
@@ -71,7 +71,7 @@ STDMETHODIMP SODispatchInterceptor::queryDispatch( IDispatch FAR* aURL,
         aArgs[0] = CComVariant( nSearchFlags );
         aArgs[1] = CComVariant( aTargetFrameName );
         aArgs[2] = CComVariant( aURL );
-
+        
         hr = ExecuteFunc( m_xSlave, L"queryDispatch", aArgs, 3, &aResult );
         if( !SUCCEEDED( hr ) || aResult.vt != VT_DISPATCH || aResult.pdispVal == NULL )
         {
@@ -91,9 +91,9 @@ STDMETHODIMP SODispatchInterceptor::queryDispatch( IDispatch FAR* aURL,
 
 STDMETHODIMP SODispatchInterceptor::queryDispatches( SAFEARRAY FAR* aDescripts, SAFEARRAY FAR* FAR* retVal)
 {
-    if ( !aDescripts || !retVal || SafeArrayGetDim( aDescripts ) != 1 )
+    if ( !aDescripts || !retVal || SafeArrayGetDim( aDescripts ) != 1 ) 
         return E_FAIL;
-
+    
     long nLB, nUB;
 
     HRESULT hr = SafeArrayGetLBound( aDescripts, 1, &nLB );
@@ -128,7 +128,7 @@ STDMETHODIMP SODispatchInterceptor::queryDispatches( SAFEARRAY FAR* aDescripts,
     return S_OK;
 }
 
-
+        
 STDMETHODIMP SODispatchInterceptor::dispatch( IDispatch FAR* aURL, SAFEARRAY FAR* aArgs)
 {
     // get url from aURL
@@ -185,19 +185,19 @@ STDMETHODIMP SODispatchInterceptor::dispatch( IDispatch FAR* aURL, SAFEARRAY FAR
 
     return S_OK;
 }
-
+        
 STDMETHODIMP SODispatchInterceptor::addStatusListener( IDispatch FAR* /*xControl*/, IDispatch FAR* /*aURL*/)
 {
     // not implemented
     return S_OK;
 }
-
+       
 STDMETHODIMP SODispatchInterceptor::removeStatusListener( IDispatch FAR* /*xControl*/, IDispatch FAR* /*aURL*/)
 {
     // not implemented
     return S_OK;
 }
-
+       
 STDMETHODIMP SODispatchInterceptor::getInterceptedURLs( SAFEARRAY FAR* FAR* pVal )
 {
     *pVal = SafeArrayCreateVector( VT_BSTR, 0, 3 );
diff --git a/extensions/source/activex/main/SODispatchInterceptor.h b/extensions/source/activex/main/SODispatchInterceptor.h
index 538b12f24d2e..1a9b7e38cd6a 100644
--- a/extensions/source/activex/main/SODispatchInterceptor.h
+++ b/extensions/source/activex/main/SODispatchInterceptor.h
@@ -33,10 +33,10 @@ class SODispatchInterceptor :
     public CComObjectRoot,
     public CComCoClass<SODispatchInterceptor,&CLSID_SODispatchInterceptor>
 {
-    CComPtr<IDispatch>  m_xMaster;
-    CComPtr<IDispatch>  m_xSlave;
-    CSOActiveX*         m_xParentControl;
-    CRITICAL_SECTION    mMutex;
+    CComPtr<IDispatch>	m_xMaster;
+    CComPtr<IDispatch>	m_xSlave;
+    CSOActiveX* 		m_xParentControl;
+    CRITICAL_SECTION	mMutex;
 public:
     SODispatchInterceptor() : m_xParentControl( NULL ) { InitializeCriticalSection(&mMutex); }
     virtual ~SODispatchInterceptor() { ATLASSERT( !m_xParentControl ); DeleteCriticalSection(&mMutex); }
diff --git a/extensions/source/activex/main/com_uno_helper.h b/extensions/source/activex/main/com_uno_helper.h
index 230fc63a6e77..94573c645d16 100644
--- a/extensions/source/activex/main/com_uno_helper.h
+++ b/extensions/source/activex/main/com_uno_helper.h
@@ -1,26 +1,26 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #include "stdafx2.h"
 
-HRESULT ExecuteFunc( IDispatch* idispUnoObject,
-                     OLECHAR* sFuncName,
-                     CComVariant* params,
-                     unsigned int count,
+HRESULT ExecuteFunc( IDispatch* idispUnoObject, 
+                     OLECHAR* sFuncName, 
+                     CComVariant* params, 
+                     unsigned int count, 
                      CComVariant* pResult );
 
-HRESULT GetIDispByFunc( IDispatch* idispUnoObject,
-                          OLECHAR* sFuncName,
-                          CComVariant* params,
-                          unsigned int count,
+HRESULT GetIDispByFunc( IDispatch* idispUnoObject, 
+                          OLECHAR* sFuncName, 
+                          CComVariant* params, 
+                          unsigned int count, 
                           CComPtr<IDispatch>& pdispResult );
 
-HRESULT PutPropertiesToIDisp( IDispatch* pdispObject,
-                              OLECHAR** sMemberNames,
-                              CComVariant* pVariant,
+HRESULT PutPropertiesToIDisp( IDispatch* pdispObject, 
+                              OLECHAR** sMemberNames, 
+                              CComVariant* pVariant, 
                               unsigned int count );
 
-HRESULT GetPropertiesFromIDisp( IDispatch* pdispObject,
-                                OLECHAR** sMemberNames,
-                                CComVariant* pVariant,
+HRESULT GetPropertiesFromIDisp( IDispatch* pdispObject, 
+                                OLECHAR** sMemberNames, 
+                                CComVariant* pVariant, 
                                 unsigned int count );
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/activex/main/resource.h b/extensions/source/activex/main/resource.h
index fe74853c6d15..a80234031fb0 100644
--- a/extensions/source/activex/main/resource.h
+++ b/extensions/source/activex/main/resource.h
@@ -15,7 +15,7 @@
 
 
 // Next default values for new objects
-//
+// 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        201
diff --git a/extensions/source/activex/main/so_activex.cpp b/extensions/source/activex/main/so_activex.cpp
index 43e49b6b3345..a681d18f6ffa 100644
--- a/extensions/source/activex/main/so_activex.cpp
+++ b/extensions/source/activex/main/so_activex.cpp
@@ -3,7 +3,7 @@
 
 
 // Note: Proxy/Stub Information
-//      To build a separate proxy/stub DLL,
+//      To build a separate proxy/stub DLL, 
 //      run nmake -f so_activexps.mk in the project directory.
 
 #include "stdio.h"
@@ -30,14 +30,14 @@ END_OBJECT_MAP()
 #define X32_LIB_NAME "so_activex.dll"
 
 // 06.11.2009 tkr: to provide windows xp as build systems for mingw we need to define KEY_WOW64_64KEY
-// in mingw 3.13 KEY_WOW64_64KEY isn't available < Win2003 systems.
+// in mingw 3.13 KEY_WOW64_64KEY isn't available < Win2003 systems. 
 // Also defined in setup_native\source\win32\customactions\reg64\reg64.cxx,source\win32\customactions\shellextensions\shellextensions.cxx and
 // extensions\source\activex\main\so_activex.cpp
 #ifndef KEY_WOW64_64KEY
-    #define KEY_WOW64_64KEY (0x0100)
+    #define KEY_WOW64_64KEY	(0x0100)
 #endif
 #ifndef KEY_WOW64_32KEY
-    #define KEY_WOW64_32KEY (0x0200)
+    #define KEY_WOW64_32KEY	(0x0200)
 #endif
 
 const REGSAM n64KeyAccess = KEY_ALL_ACCESS | KEY_WOW64_64KEY;
@@ -53,7 +53,7 @@ const BOOL bX64 = FALSE;
 
 // 10.11.2009 tkr: MinGW doesn't know anything about RegDeleteKeyExA if WINVER < 0x0502.
 extern "C" {
-WINADVAPI LONG WINAPI RegDeleteKeyExA(HKEY,LPCSTR,REGSAM,DWORD);
+WINADVAPI LONG WINAPI RegDeleteKeyExA(HKEY,LPCSTR,REGSAM,DWORD); 
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -102,14 +102,14 @@ const char* aFileExt[] = { ".vor",
 const char* aMimeType[] = {
                           "application/vnd.stardivision.writer",
 
-                          "application/vnd.stardivision.chart",
+                          "application/vnd.stardivision.chart", 
                           "application/vnd.stardivision.draw",
                           "application/vnd.stardivision.impress",
                           "application/vnd.stardivision.impress-packed",
                           "application/vnd.stardivision.calc",
                           "application/vnd.stardivision.writer",
                           "application/vnd.stardivision.math",
-
+    
                           MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE_ASCII,
                           MIMETYPE_VND_SUN_XML_CALC_TEMPLATE_ASCII,
                           MIMETYPE_VND_SUN_XML_IMPRESS_TEMPLATE_ASCII,
@@ -164,27 +164,27 @@ const char* aLocalPrefix = "Software\\Classes\\";
 BOOL createKey( HKEY hkey,
                 const char* aKeyToCreate,
         REGSAM nKeyAccess,
-                const char* aValue = NULL,
-                const char* aChildName = NULL,
+                const char* aValue = NULL, 
+                const char* aChildName = NULL, 
                 const char* aChildValue = NULL )
 {
     HKEY hkey1;
-
-    return ( ERROR_SUCCESS == RegCreateKeyExA( hkey, aKeyToCreate, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey1 , NULL )
-           && ( !aValue || ERROR_SUCCESS == RegSetValueExA( hkey1,
-                                                           "",
-                                                           0,
-                                                           REG_SZ,
-                                                           (const BYTE*)aValue,
+    
+    return ( ERROR_SUCCESS == RegCreateKeyExA( hkey, aKeyToCreate, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey1 , NULL ) 
+           && ( !aValue || ERROR_SUCCESS == RegSetValueExA( hkey1, 
+                                                           "", 
+                                                           0, 
+                                                           REG_SZ, 
+                                                           (const BYTE*)aValue, 
                                                            strlen( aValue ) ) )
-           && ( !aChildName || ERROR_SUCCESS == RegSetValueExA( hkey1,
-                                                               aChildName,
-                                                               0,
-                                                               REG_SZ,
-                                                               (const BYTE*)aChildValue,
+           && ( !aChildName || ERROR_SUCCESS == RegSetValueExA( hkey1, 
+                                                               aChildName, 
+                                                               0, 
+                                                               REG_SZ, 
+                                                               (const BYTE*)aChildValue, 
                                                                strlen( aChildValue ) ) )
            && ERROR_SUCCESS == RegCloseKey( hkey1 ) );
-
+    
 }
 
 STDAPI DllUnregisterServerNative( int nMode, BOOL bForAllUsers, BOOL bFor64Bit );
@@ -204,7 +204,7 @@ STDAPI DllRegisterServerNative_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAc
     char pActiveXPath[1124];
     char pActiveXPath101[1124];
 
-
+    
     // In case SO7 is installed for this user he can have local registry entries that will prevent him from
     // using SO8 ActiveX control. The fix is just to clean up the local entries related to ActiveX control.
     // Unfortunately it can be done only for the user who installs the office.
@@ -222,7 +222,7 @@ STDAPI DllRegisterServerNative_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAc
 
         {
             wsprintfA( aSubKey, "%sCLSID\\%s", aPrefix, aClassID );
-            aResult =
+            aResult = 
                 ( ERROR_SUCCESS == RegCreateKeyExA( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey , NULL )
                     && ERROR_SUCCESS == RegSetValueExA( hkey, "", 0, REG_SZ, (const BYTE*)"SOActiveX Class", 17 )
                     && createKey( hkey, "Control", nKeyAccess )
@@ -291,22 +291,22 @@ STDAPI DllRegisterServerNative_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAc
         {
             wsprintfA( aSubKey, "%sMIME\\DataBase\\Content Type\\%s", aPrefix, aMimeType[ind] );
             if ( ERROR_SUCCESS != RegCreateKeyExA( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey, NULL )
-//              || ERROR_SUCCESS != RegSetValueExA(hkey, "Extension", 0, REG_SZ,
+//              || ERROR_SUCCESS != RegSetValueExA(hkey, "Extension", 0, REG_SZ, 
 //                 (const BYTE *)aFileExt[ind], strlen( aFileExt[ind] ) )
               || ERROR_SUCCESS != RegSetValueExA(hkey, "CLSID", 0, REG_SZ,
                  (const BYTE *)aClassID, strlen(aClassID)) )
                     aResult = FALSE;
-
-            if( hkey )
+    
+            if( hkey )    
                 RegCloseKey(hkey),hkey= NULL;
 
 /*
             wsprintfA( aSubKey, "%s%s", aPrefix, aFileExt[ind] );
-            if ( ERROR_SUCCESS != RegCreateKeyExA( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey, NULL )
+            if ( ERROR_SUCCESS != RegCreateKeyExA( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey, NULL ) 
               || ERROR_SUCCESS != RegSetValueExA(hkey, "Content Type", 0, REG_SZ,
                  (const BYTE *)aMimeType[ind], strlen( aMimeType[ind] ) ) )
                     aResult = FALSE;
-            if( hkey )
+            if( hkey )    
                 RegCloseKey(hkey),hkey= NULL;
 */
         }
@@ -320,7 +320,7 @@ STDAPI DllRegisterServerNative_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAc
                wsprintfA( aSubKey, "EnableFullPage\\%s", aFileExt[ind] );
                if ( ERROR_SUCCESS != RegCreateKeyExA( hkey, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey1 , NULL ) )
                    aResult = FALSE;
-
+    
             if ( hkey1 )
                    RegCloseKey(hkey1),hkey1= NULL;
          }
@@ -375,7 +375,7 @@ STDAPI DllUnregisterServerNative_Impl( int nMode, BOOL bForAllUsers, REGSAM nKey
     BOOL        fErr = FALSE;
     char aSubKey[513];
     const char*    aPrefix = aLocalPrefix; // bForAllUsers ? "" : aLocalPrefix;
-
+    
     for( int ind = 0; ind < SUPPORTED_EXT_NUM; ind++ )
     {
         if( nForModes[ind] & nMode )
@@ -388,7 +388,7 @@ STDAPI DllUnregisterServerNative_Impl( int nMode, BOOL bForAllUsers, REGSAM nKey
             {
                 if ( ERROR_SUCCESS != RegDeleteValue( hkey, "CLSID" ) )
                     fErr = TRUE;
-
+    
                 if ( ERROR_SUCCESS != RegQueryInfoKey(  hkey, NULL, NULL, NULL,
                                                     &nSubKeys, NULL, NULL,
                                                     &nValues, NULL, NULL, NULL, NULL ) )
@@ -396,14 +396,14 @@ STDAPI DllUnregisterServerNative_Impl( int nMode, BOOL bForAllUsers, REGSAM nKey
                     RegCloseKey( hkey ), hkey = NULL;
                     fErr = TRUE;
                 }
-                else
+                else 
                 {
                     RegCloseKey( hkey ), hkey = NULL;
                     if ( !nSubKeys && !nValues )
                         DeleteKeyTree( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, nKeyAccess );
                 }
             }
-
+    
                wsprintfA( aSubKey, "%s%s", aPrefix, aFileExt[ind] );
                if ( ERROR_SUCCESS != RegCreateKeyExA( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey, NULL ) )
                 fErr = TRUE;
@@ -416,7 +416,7 @@ STDAPI DllUnregisterServerNative_Impl( int nMode, BOOL bForAllUsers, REGSAM nKey
                     RegCloseKey( hkey ), hkey = NULL;
                     fErr = TRUE;
                 }
-                else
+                else 
                 {
                     RegCloseKey( hkey ), hkey = NULL;
                     if ( !nSubKeys && !nValues )
@@ -472,12 +472,12 @@ STDAPI DllUnregisterServerNative( int nMode, BOOL bForAllUsers, BOOL bFor64Bit )
 
 #define SUPPORTED_MSEXT_NUM 7
 const char* aMSFileExt[] = { ".dot", ".doc", ".xlt", ".xls", ".pot", ".ppt", ".pps" };
-const char* aMSMimeType[] = { "application/msword",
-                          "application/msword",
-                          "application/msexcell",
-                          "application/msexcell",
-                          "application/mspowerpoint",
-                          "application/mspowerpoint",
+const char* aMSMimeType[] = { "application/msword", 
+                          "application/msword", 
+                          "application/msexcell", 
+                          "application/msexcell", 
+                          "application/mspowerpoint", 
+                          "application/mspowerpoint", 
                           "application/mspowerpoint" };
 const int nForMSModes[] = { 1, 1, 2, 2, 4, 4, 4 };
 
@@ -504,22 +504,22 @@ STDAPI DllRegisterServerDoc_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAcces
         {
                wsprintfA( aSubKey, "%sMIME\\DataBase\\Content Type\\%s", aPrefix, aMSMimeType[ind] );
                if ( ERROR_SUCCESS != RegCreateKeyExA( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey, NULL )
-               || ERROR_SUCCESS != RegSetValueExA(hkey, "Extension", 0, REG_SZ,
+               || ERROR_SUCCESS != RegSetValueExA(hkey, "Extension", 0, REG_SZ, 
                    (const BYTE *)aMSFileExt[ind], strlen( aMSFileExt[ind] ) )
                || ERROR_SUCCESS != RegSetValueExA(hkey, "CLSID", 0, REG_SZ,
                    (const BYTE *)aClassID, strlen(aClassID)) )
                        aResult = FALSE;
-
-               if( hkey )
+    
+               if( hkey )    
                    RegCloseKey(hkey),hkey= NULL;
-
+    
                wsprintfA( aSubKey, "%s%s", aPrefix, aMSFileExt[ind] );
-               if ( ERROR_SUCCESS != RegCreateKeyExA( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey, NULL )
+               if ( ERROR_SUCCESS != RegCreateKeyExA( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey, NULL ) 
                || ERROR_SUCCESS != RegSetValueExA(hkey, "Content Type", 0, REG_SZ,
                    (const BYTE *)aMSMimeType[ind], strlen( aMSMimeType[ind] ) ) )
                        aResult = FALSE;
-
-               if( hkey )
+    
+               if( hkey )    
                    RegCloseKey(hkey),hkey= NULL;
         }
     }
@@ -572,13 +572,13 @@ STDAPI DllUnregisterServerDoc_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAcc
     BOOL        fErr = FALSE;
     char aSubKey[513];
     const char*    aPrefix = aLocalPrefix; // bForAllUsers ? "" : aLocalPrefix;
-
+    
       for( int ind = 0; ind < SUPPORTED_MSEXT_NUM; ind++ )
        {
         if( nForMSModes[ind] & nMode )
         {
             DWORD nSubKeys = 0, nValues = 0;
-
+        
                wsprintfA( aSubKey, "%sMIME\\DataBase\\Content Type\\%s", aPrefix, aMSMimeType[ind] );
                if ( ERROR_SUCCESS != RegCreateKeyExA( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey, NULL ) )
                 fErr = TRUE;
@@ -597,7 +597,7 @@ STDAPI DllUnregisterServerDoc_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAcc
                     RegCloseKey( hkey ), hkey = NULL;
                     fErr = TRUE;
                 }
-                else
+                else 
                 {
                     RegCloseKey( hkey ), hkey = NULL;
                     if ( !nSubKeys && !nValues )
@@ -620,7 +620,7 @@ STDAPI DllUnregisterServerDoc_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAcc
                     RegCloseKey( hkey ), hkey = NULL;
                     fErr = TRUE;
                 }
-                else
+                else 
                 {
                     RegCloseKey( hkey ), hkey = NULL;
                     if ( !nSubKeys && !nValues )
diff --git a/extensions/source/activex/msidl/so_activex.idl b/extensions/source/activex/msidl/so_activex.idl
index d1a7d9936eed..ff396f5f9008 100644
--- a/extensions/source/activex/msidl/so_activex.idl
+++ b/extensions/source/activex/msidl/so_activex.idl
@@ -29,36 +29,36 @@ import "ocidl.idl";
 ]
 interface ISOComWindowPeer : IDispatch
 {
-    [id(1), helpstring("method getWindowHandle")]
+    [id(1), helpstring("method getWindowHandle")] 
                 HRESULT getWindowHandle( [in] SAFEARRAY(VARIANT) procId,
                                          [in] short s,
                                          [out,retval] long* ret);
 
-    [id(2), helpstring("method getToolkit")]
+    [id(2), helpstring("method getToolkit")] 
                 HRESULT getToolkit( [out,retval] IDispatch** retVal );
 
-    [id(3), helpstring("method setPointer")]
+    [id(3), helpstring("method setPointer")] 
                 HRESULT setPointer( [in] IDispatch* xPointer );
 
-    [id(4), helpstring("method setBackground")]
+    [id(4), helpstring("method setBackground")] 
                 HRESULT setBackground( [in] int nColor );
 
-    [id(5), helpstring("method invalidate")]
+    [id(5), helpstring("method invalidate")] 
                 HRESULT invalidate( [in] short );
 
-    [id(6), helpstring("method invalidateRect")]
+    [id(6), helpstring("method invalidateRect")] 
                 HRESULT invalidateRect( [in] IDispatch* aRect, [in] short nFlags );
 
-    [id(7), helpstring("method dispose")]
+    [id(7), helpstring("method dispose")] 
                 HRESULT dispose();
 
-    [id(8), helpstring("method addEventListener")]
+    [id(8), helpstring("method addEventListener")] 
                 HRESULT addEventListener( [in] IDispatch* xListener );
 
-    [id(9), helpstring("method removeEventListener")]
+    [id(9), helpstring("method removeEventListener")] 
                 HRESULT removeEventListener( [in] IDispatch* xListener );
 
-    [propget, id(10), helpstring("property_implementedInterfaces")]
+    [propget, id(10), helpstring("property_implementedInterfaces")] 
                 HRESULT Bridge_implementedInterfaces([out, retval] SAFEARRAY(BSTR) *pVal);
 };
 
@@ -71,20 +71,20 @@ interface ISOComWindowPeer : IDispatch
 ]
 interface ISODispatchInterceptor : IDispatch
 {
-//com.sun.star.frame.XDispatchProviderInterceptor
+//com.sun.star.frame.XDispatchProviderInterceptor 
 
     [id(1), helpstring("method getSlaveDispatchProvider")]
                 HRESULT getSlaveDispatchProvider( [out,retval] IDispatch** retVal );
 
-    [id(2), helpstring("method setSlaveDispatchProvider")]
+    [id(2), helpstring("method setSlaveDispatchProvider")] 
                 HRESULT setSlaveDispatchProvider( [in] IDispatch* xNewDispatchProvider );
 
-    [id(3), helpstring("method getMasterDispatchProvider")]
+    [id(3), helpstring("method getMasterDispatchProvider")] 
                 HRESULT getMasterDispatchProvider( [out,retval] IDispatch** retVal );
 
-    [id(4), helpstring("method setMasterDispatchProvider")]
+    [id(4), helpstring("method setMasterDispatchProvider")] 
                 HRESULT setMasterDispatchProvider( [in] IDispatch* xNewSupplier );
-
+ 
 // com.sun.star.frame.XDispatchProvider
 
     [id(5), helpstring("method queryDispatch")]
@@ -93,7 +93,7 @@ interface ISODispatchInterceptor : IDispatch
                                        [in] long nSearchFlags,
                                        [out,retval] IDispatch** retVal );
 
-    [id(6), helpstring("method queryDispatches")]
+    [id(6), helpstring("method queryDispatches")] 
                 HRESULT queryDispatches( [in] SAFEARRAY(IDispatch*) aDescripts,
                                          [out,retval] SAFEARRAY(VARIANT)* retVal );
 
@@ -104,14 +104,14 @@ interface ISODispatchInterceptor : IDispatch
                 HRESULT dispatch( [in] IDispatch* aURL,
                                   [in] SAFEARRAY(VARIANT) aArgs );
 
-    [id(8), helpstring("method addStatusListener")]
+    [id(8), helpstring("method addStatusListener")] 
                 HRESULT addStatusListener( [in] IDispatch* xControl,
                                            [in] IDispatch* aURL );
 
-    [id(9), helpstring("method removeStatusListener")]
+    [id(9), helpstring("method removeStatusListener")] 
                 HRESULT removeStatusListener( [in] IDispatch* xControl,
                                               [in] IDispatch* aURL );
-
+ 
 // com.sun.star.frame.XInterceptorInfo
 
 
@@ -119,7 +119,7 @@ interface ISODispatchInterceptor : IDispatch
                 HRESULT getInterceptedURLs( [out,retval] SAFEARRAY(BSTR)* pVal );
 
 // the common UNO-COM staff
-    [propget, id(11), helpstring("property_implementedInterfaces")]
+    [propget, id(11), helpstring("property_implementedInterfaces")] 
                 HRESULT Bridge_implementedInterfaces([out, retval] SAFEARRAY(BSTR) *pVal);
 
 };
@@ -138,12 +138,12 @@ interface ISOActionsApproval : IDispatch
 {
 //com.sun.star.embed.XActionsApproval
 
-    [id(1), helpstring("method approveAction")]
+    [id(1), helpstring("method approveAction")] 
                 HRESULT approveAction( [in] long aActionID,
                                         [out,retval] boolean* pbApproval );
 
 // the common UNO-COM staff
-    [propget, id(2), helpstring("property_implementedInterfaces")]
+    [propget, id(2), helpstring("property_implementedInterfaces")] 
                 HRESULT Bridge_implementedInterfaces([out, retval] SAFEARRAY(BSTR) *pVal);
 };
 
diff --git a/extensions/source/bibliography/bib.hrc b/extensions/source/bibliography/bib.hrc
index 319c58d509ad..eb6afcb44135 100644
--- a/extensions/source/bibliography/bib.hrc
+++ b/extensions/source/bibliography/bib.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,50 +30,50 @@
 #include "bibliography.hrc"
 
 #ifndef RID_BIB_START
-#define RID_BIB_START                   RID_EXTENSIONS_START
+#define RID_BIB_START					RID_EXTENSIONS_START
 #endif
 
 // ResIDs
 
 //Dialogs (100)
-#define RID_BIB_DIALOG              (RID_BIB_START)
-#define RID_TP_GENERAL              (RID_BIB_DIALOG)
+#define RID_BIB_DIALOG				(RID_BIB_START)
+#define RID_TP_GENERAL				(RID_BIB_DIALOG)
 #define RID_DLG_MAPPING             (RID_BIB_DIALOG + 1)
 #define RID_DLG_DBCHANGE            (RID_BIB_DIALOG + 2)
 
 //Controls(100)
-#define RID_BIB_CONTROLS            (RID_BIB_START + 100)
-#define RID_BIB_TOOLBAR             (RID_BIB_CONTROLS+ 1)
+#define RID_BIB_CONTROLS			(RID_BIB_START + 100)
+#define RID_BIB_TOOLBAR				(RID_BIB_CONTROLS+ 1)
 #define RID_TOOLBAR_IMGLIST         (RID_BIB_CONTROLS+ 2)
 #define RID_TOOLBAR_IMGLIST_HC      (RID_BIB_CONTROLS+ 3)
 #define RID_TOOLBAR_BIGIMGLIST      (RID_BIB_CONTROLS+ 4)
 #define RID_TOOLBAR_BIGIMGLIST_HC   (RID_BIB_CONTROLS+ 5)
 
 //Menu(100)
-#define RID_BIB_MENU                (RID_BIB_CONTROLS + 100)
-#define RID_MAIN_MENU               (RID_BIB_MENU +1)
-//#define RID_MAIN_ME_HIERARCHICAL  (RID_BIB_MENU +2)
-#define RID_MAIN_ME_NEWENTRY        (RID_BIB_MENU +3)
-#define RID_MAIN_ME_CHANGEENTRY     (RID_BIB_MENU +4)
-#define RID_MAIN_ME_REMOVEENTRY     (RID_BIB_MENU +5)
-#define RID_MAIN_ME_SEARCH          (RID_BIB_MENU +6)
-#define RID_MAIN_ME_FIELDDLG        (RID_BIB_MENU +7)
-//#define RID_MAIN_ME_LAYOUT            (RID_BIB_MENU +8)
-#define RID_MAIN_ME_MAPPING         (RID_BIB_MENU +9)
-#define RID_MAIN_ME_DBSOURCE        (RID_BIB_MENU +10)
+#define RID_BIB_MENU				(RID_BIB_CONTROLS + 100)
+#define RID_MAIN_MENU				(RID_BIB_MENU +1)
+//#define RID_MAIN_ME_HIERARCHICAL	(RID_BIB_MENU +2)
+#define RID_MAIN_ME_NEWENTRY		(RID_BIB_MENU +3)
+#define RID_MAIN_ME_CHANGEENTRY		(RID_BIB_MENU +4)
+#define RID_MAIN_ME_REMOVEENTRY		(RID_BIB_MENU +5)
+#define RID_MAIN_ME_SEARCH			(RID_BIB_MENU +6)
+#define RID_MAIN_ME_FIELDDLG		(RID_BIB_MENU +7)
+//#define RID_MAIN_ME_LAYOUT			(RID_BIB_MENU +8)
+#define RID_MAIN_ME_MAPPING			(RID_BIB_MENU +9)
+#define RID_MAIN_ME_DBSOURCE		(RID_BIB_MENU +10)
 #define RID_MAIN_DELETE_RECORD      (RID_BIB_MENU +11)
 #define RID_MAIN_INSERT_RECORD      (RID_BIB_MENU +12)
-#define MN_TEMPLATES                (RID_BIB_MENU +13)      // to make makro ITEM_FILE_DOCTEMPLATE happy...
+#define MN_TEMPLATES				(RID_BIB_MENU +13)		// to make makro ITEM_FILE_DOCTEMPLATE happy...
 
-#define RID_POPUP_ME_VIEW           (RID_BIB_MENU +50)
+#define RID_POPUP_ME_VIEW			(RID_BIB_MENU +50)
 
 // Strings (500)
-#define RID_BIB_STRING              (RID_BIB_START + 200)
-    // FREE                         (RID_BIB_STRING +  1)
-#define RID_BIB_STR_FIELDSELECTION  (RID_BIB_STRING +  2)
-#define RID_BIB_STR_TABWIN_PREFIX   (RID_BIB_STRING +  3)
-#define RID_BIB_STR_FRAME_TITLE     (RID_BIB_STRING +  4)
-#define RID_MAP_QUESTION            (RID_BIB_STRING +  5)
+#define RID_BIB_STRING	            (RID_BIB_START + 200)
+    // FREE							(RID_BIB_STRING +  1)
+#define RID_BIB_STR_FIELDSELECTION	(RID_BIB_STRING +  2)
+#define RID_BIB_STR_TABWIN_PREFIX	(RID_BIB_STRING +  3)
+#define RID_BIB_STR_FRAME_TITLE		(RID_BIB_STRING +  4)
+#define RID_MAP_QUESTION			(RID_BIB_STRING +  5)
 
 #define ST_IDENTIFIER               (RID_BIB_STRING +  6)
 #define ST_AUTHTYPE                 (RID_BIB_STRING +  7)
diff --git a/extensions/source/bibliography/bib.src b/extensions/source/bibliography/bib.src
index 1ad6a7c83d17..1492de7b650a 100644
--- a/extensions/source/bibliography/bib.src
+++ b/extensions/source/bibliography/bib.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx
index 6caac4f610d3..f6f7c93f0470 100644
--- a/extensions/source/bibliography/bibbeam.cxx
+++ b/extensions/source/bibliography/bibbeam.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ using namespace ::com::sun::star::uno;
 
 #define C2U(cChar) OUString::createFromAscii(cChar)
 
-#define PROPERTY_FRAME                      1
-#define ID_TOOLBAR                          1
-#define ID_GRIDWIN                          2
+#define PROPERTY_FRAME						1
+#define ID_TOOLBAR							1
+#define ID_GRIDWIN							2
 
 //.........................................................................
 namespace bib
@@ -66,14 +66,14 @@ namespace bib
 
     void HandleTaskPaneList( Window* pWindow, BOOL bAddToList )
     {
-        Window*             pParent = pWindow->GetParent();
+        Window*				pParent = pWindow->GetParent();
 
         DBG_ASSERT( pParent, "-GetTaskPaneList(): everybody here should have a parent!" );
 
-        SystemWindow*       pSysWin = pParent->GetSystemWindow();
+        SystemWindow*		pSysWin = pParent->GetSystemWindow();
         if( pSysWin )
         {
-            TaskPaneList*   pTaskPaneList = pSysWin->GetTaskPaneList();
+            TaskPaneList*	pTaskPaneList = pSysWin->GetTaskPaneList();
             if( pTaskPaneList )
             {
                 if( bAddToList )
@@ -91,16 +91,16 @@ namespace bib
                 :public Window //DockingWindow
     {
     private:
-            Reference< awt::XWindow >           m_xGridWin;
-            Reference< awt::XControlModel >     m_xGridModel;
-            Reference< awt::XControl >          m_xControl;
-            Reference< awt::XControlContainer > m_xControlContainer;
+            Reference< awt::XWindow >			m_xGridWin;
+            Reference< awt::XControlModel >		m_xGridModel;
+            Reference< awt::XControl > 			m_xControl;
+            Reference< awt::XControlContainer >	m_xControlContainer;
             // #100312# ---------
             Reference< frame::XDispatchProviderInterception> m_xDispatchProviderInterception;
-
+            
     protected:
 
-            virtual void        Resize();
+            virtual void		Resize();
 
     public:
 
@@ -154,7 +154,7 @@ namespace bib
 
             if ( m_xGridModel.is() && xMgr.is())
             {
-                uno::Reference< XPropertySet >  xPropSet( m_xGridModel, UNO_QUERY );
+                uno::Reference< XPropertySet >	xPropSet( m_xGridModel, UNO_QUERY );
 
                 if ( xPropSet.is() && m_xGridModel.is() )
                 {
@@ -289,7 +289,7 @@ namespace bib
             xReturn = pGridWin->getDispatchProviderInterception();
         return xReturn;
     }
-
+    
     //---------------------------------------------------------------------
     void BibBeamer::SetXController(const uno::Reference< frame::XController > & xCtr)
     {
@@ -316,7 +316,7 @@ namespace bib
     }
 
 //.........................................................................
-}   // namespace bib
+}	// namespace bib
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/bibliography/bibbeam.hxx b/extensions/source/bibliography/bibbeam.hxx
index 68fc1fe38441..c9742b38baaa 100644
--- a/extensions/source/bibliography/bibbeam.hxx
+++ b/extensions/source/bibliography/bibbeam.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,40 +55,40 @@ namespace bib
     {
         private:
 
-            ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >            m_xController;
-            ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >                 m_xToolBarRef;
-            ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >                 m_xGridRef;
-            ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >                  m_xGridWin;
+            ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >			m_xController;
+            ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > 				m_xToolBarRef;
+            ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > 				m_xGridRef;
+            ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >					m_xGridWin;
 
-            BibDataManager*         pDatMan;
-            BibToolBar*             pToolBar;
-            BibGridwin*             pGridWin;
+            BibDataManager* 		pDatMan;
+            BibToolBar* 			pToolBar;
+            BibGridwin* 			pGridWin;
 
             DECL_LINK( RecalcLayout_Impl, void* );
 
         protected:
 
-            void                    createToolBar();
-            void                    createGridWin();
+            void					createToolBar();
+            void					createGridWin();
 
             // FormControlContainer ----------
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >
                     getControlContainer();
         public:
             // #100312# -------------------
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception >
+            virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception > 
                     getDispatchProviderInterception();
 
             BibBeamer(Window* pParent,BibDataManager* pDatMan, WinBits nStyle = WB_3DLOOK );
             ~BibBeamer();
 
-            void    SetXController(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > &);
+            void	SetXController(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > &);
 
-            virtual void            GetFocus();
+            virtual void			GetFocus();
     };
 
 //.........................................................................
-}   // namespace bib
+}	// namespace bib
 //.........................................................................
 
 #endif
diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx
index 2ab99b35bf23..adf7ef75c276 100644
--- a/extensions/source/bibliography/bibconfig.cxx
+++ b/extensions/source/bibliography/bibconfig.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -189,7 +189,7 @@ BibConfig::BibConfig() :
                 pAssignmentPropertyNames[nFieldIdx] = sSubPrefix;
                 pAssignmentPropertyNames[nFieldIdx++] += C2U("/ProgrammaticFieldName");
                 pAssignmentPropertyNames[nFieldIdx] = sSubPrefix;
-                pAssignmentPropertyNames[nFieldIdx++]   += C2U("/AssignedFieldName");
+                pAssignmentPropertyNames[nFieldIdx++]	+= C2U("/AssignedFieldName");
             }
             Sequence<Any> aAssignmentValues = GetProperties(aAssignmentPropertyNames);
             const Any* pAssignmentValues = aAssignmentValues.getConstArray();
@@ -225,7 +225,7 @@ BibConfig::~BibConfig()
  ---------------------------------------------------------------------------*/
 BibDBDescriptor BibConfig::GetBibliographyURL()
 {
-    BibDBDescriptor aRet;
+    BibDBDescriptor	aRet;
     aRet.sDataSource = sDataSource;
     aRet.sTableOrQuery = sTableOrQuery;
     aRet.nCommandType = nTblOrQuery;
@@ -246,7 +246,7 @@ void BibConfig::Notify( const com::sun::star::uno::Sequence<rtl::OUString>& )
 {
 }
 
-void    BibConfig::Commit()
+void	BibConfig::Commit()
 {
     const Sequence<OUString> aPropertyNames = GetPropertyNames();
     Sequence<Any> aValues(aPropertyNames.getLength());
@@ -285,13 +285,13 @@ void    BibConfig::Commit()
         sPrefix += C2U("/_");
         sPrefix += OUString::valueOf(i);
         sPrefix += C2U("/");
-        pNodeValues[nIndex].Name    = sPrefix;
-        pNodeValues[nIndex].Name    += sName;
+        pNodeValues[nIndex].Name	= sPrefix;
+        pNodeValues[nIndex].Name	+= sName;
         pNodeValues[nIndex++].Value <<= pMapping->sURL;
-        pNodeValues[nIndex].Name    = sPrefix;
+        pNodeValues[nIndex].Name	= sPrefix;
         pNodeValues[nIndex].Name    += sTable;
         pNodeValues[nIndex++].Value <<= pMapping->sTableName;
-        pNodeValues[nIndex].Name    = sPrefix;
+        pNodeValues[nIndex].Name	= sPrefix;
         pNodeValues[nIndex].Name    += sCommandType;
         pNodeValues[nIndex++].Value <<= pMapping->nCommandType;
         SetSetProperties( C2U(cDataSourceHistory), aNodeValues);
@@ -310,11 +310,11 @@ void    BibConfig::Commit()
             sSubPrefix += OUString::valueOf(nFieldAssignment);
             Sequence< PropertyValue > aAssignmentValues(2);
             PropertyValue* pAssignmentValues = aAssignmentValues.getArray();
-            pAssignmentValues[0].Name   = sSubPrefix;
-            pAssignmentValues[0].Name   += sFieldName;
+            pAssignmentValues[0].Name	= sSubPrefix;
+            pAssignmentValues[0].Name	+= sFieldName;
             pAssignmentValues[0].Value <<= pMapping->aColumnPairs[nFieldAssignment].sLogicalColumnName;
-            pAssignmentValues[1].Name   = sSubPrefix;
-            pAssignmentValues[1].Name   += sDatabaseFieldName;
+            pAssignmentValues[1].Name	= sSubPrefix;
+            pAssignmentValues[1].Name	+= sDatabaseFieldName;
             pAssignmentValues[1].Value <<= pMapping->aColumnPairs[nFieldAssignment].sRealColumnName;
             SetSetProperties( sPrefix, aAssignmentValues );
             nFieldAssignment++;
@@ -324,7 +324,7 @@ void    BibConfig::Commit()
 /* -----------------------------13.11.00 12:23--------------------------------
 
  ---------------------------------------------------------------------------*/
-const Mapping*  BibConfig::GetMapping(const BibDBDescriptor& rDesc) const
+const Mapping* 	BibConfig::GetMapping(const BibDBDescriptor& rDesc) const
 {
     for(sal_uInt16 i = 0; i < pMappingsArr->Count(); i++)
     {
diff --git a/extensions/source/bibliography/bibconfig.hxx b/extensions/source/bibliography/bibconfig.hxx
index 093f0078b828..18af8fed5f46 100644
--- a/extensions/source/bibliography/bibconfig.hxx
+++ b/extensions/source/bibliography/bibconfig.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 class MappingArray;
 
 //-----------------------------------------------------------------------------
-#define COLUMN_COUNT                31
-#define IDENTIFIER_POS              0
-#define AUTHORITYTYPE_POS           1
+#define COLUMN_COUNT 				31
+#define IDENTIFIER_POS				0
+#define AUTHORITYTYPE_POS			1
 #define AUTHOR_POS                  2
 #define TITLE_POS                   3
 #define YEAR_POS                    4
@@ -68,16 +68,16 @@ class MappingArray;
 //-----------------------------------------------------------------------------
 struct StringPair
 {
-    rtl::OUString   sRealColumnName;
-    rtl::OUString   sLogicalColumnName;
+    rtl::OUString 	sRealColumnName;
+    rtl::OUString  	sLogicalColumnName;
 };
 //-----------------------------------------------------------------------------
 struct Mapping
 {
-    rtl::OUString       sTableName;
-    rtl::OUString       sURL;
-    sal_Int16           nCommandType;
-    StringPair          aColumnPairs[COLUMN_COUNT];
+    rtl::OUString 		sTableName;
+    rtl::OUString		sURL;
+    sal_Int16			nCommandType;
+    StringPair 			aColumnPairs[COLUMN_COUNT];
 
     Mapping() :
         nCommandType(0){}
@@ -85,55 +85,55 @@ struct Mapping
 //-----------------------------------------------------------------------------
 struct BibDBDescriptor
 {
-    rtl::OUString   sDataSource;
-    rtl::OUString   sTableOrQuery;
-    sal_Int32       nCommandType;
+    rtl::OUString 	sDataSource;
+    rtl::OUString  	sTableOrQuery;
+    sal_Int32 		nCommandType;
 };
 //-----------------------------------------------------------------------------
 
 class BibConfig : public utl::ConfigItem
 {
-    rtl::OUString   sDataSource;
-    rtl::OUString   sTableOrQuery;
-    sal_Int32       nTblOrQuery;
-
-    rtl::OUString   sQueryField;
-    rtl::OUString   sQueryText;
-    MappingArray*               pMappingsArr;
-    long            nBeamerSize;
-    long            nViewSize;
+    rtl::OUString 	sDataSource;
+    rtl::OUString 	sTableOrQuery;
+    sal_Int32 		nTblOrQuery;
+
+    rtl::OUString 	sQueryField;
+    rtl::OUString 	sQueryText;
+    MappingArray*				pMappingsArr;
+    long 			nBeamerSize;
+    long 			nViewSize;
     sal_Bool        bShowColumnAssignmentWarning;
 
-    rtl::OUString               aColumnDefaults[COLUMN_COUNT];
+    rtl::OUString 				aColumnDefaults[COLUMN_COUNT];
 
     com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames();
 public:
     BibConfig();
     ~BibConfig();
 
-    virtual void    Commit();
+    virtual void	Commit();
     virtual void            Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
 
-    BibDBDescriptor         GetBibliographyURL();
-    void                    SetBibliographyURL(const BibDBDescriptor& rDesc);
+    BibDBDescriptor			GetBibliographyURL();
+    void					SetBibliographyURL(const BibDBDescriptor& rDesc);
 
-    const Mapping*          GetMapping(const BibDBDescriptor& rDesc) const;
-    void                    SetMapping(const BibDBDescriptor& rDesc, const Mapping* pMapping);
+    const Mapping* 			GetMapping(const BibDBDescriptor& rDesc) const;
+    void					SetMapping(const BibDBDescriptor& rDesc, const Mapping* pMapping);
 
-    const rtl::OUString&    GetDefColumnName(sal_uInt16 nIndex) const
+    const rtl::OUString&	GetDefColumnName(sal_uInt16 nIndex) const
                                             {return aColumnDefaults[nIndex];}
 
 
-    void                    setBeamerSize(long nSize) {SetModified(); nBeamerSize = nSize;}
-    long                    getBeamerSize()const {return nBeamerSize;}
-    void                    setViewSize(long nSize) {SetModified(); nViewSize = nSize;}
-    long                    getViewSize() {return nViewSize;}
+    void					setBeamerSize(long nSize) {SetModified(); nBeamerSize = nSize;}
+    long					getBeamerSize()const {return nBeamerSize;}
+    void					setViewSize(long nSize) {SetModified(); nViewSize = nSize;}
+    long					getViewSize() {return nViewSize;}
 
-    const rtl::OUString&    getQueryField() const {return sQueryField;}
-    void                    setQueryField(const rtl::OUString& rSet) {SetModified(); sQueryField = rSet;}
+    const rtl::OUString&	getQueryField() const {return sQueryField;}
+    void					setQueryField(const rtl::OUString& rSet) {SetModified(); sQueryField = rSet;}
 
-    const rtl::OUString&    getQueryText() const {return sQueryText;}
-    void                    setQueryText(const rtl::OUString& rSet) {SetModified(); sQueryText = rSet;}
+    const rtl::OUString&	getQueryText() const {return sQueryText;}
+    void					setQueryText(const rtl::OUString& rSet) {SetModified(); sQueryText = rSet;}
 
     sal_Bool                IsShowColumnAssignmentWarning() const
                                 { return bShowColumnAssignmentWarning;}
diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx
index ac137f462d63..2c3e0f4d1e37 100644
--- a/extensions/source/bibliography/bibcont.cxx
+++ b/extensions/source/bibliography/bibcont.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ using namespace ::com::sun::star::frame;
 using namespace ::rtl;
 
 #define C2U(cChar) OUString::createFromAscii(cChar)
-#define PROPERTY_FRAME                      1
+#define PROPERTY_FRAME						1
 //split window size is a percent value
 #define WIN_MIN_HEIGHT 10
 #define WIN_STEP_SIZE 5
@@ -101,7 +101,7 @@ BibWindowContainer::BibWindowContainer( Window* pParent, BibShortCutHandler* pCh
 {
     if(pChild!=NULL)
     {
-        Window* pChildWindow = GetChild();
+        Window*	pChildWindow = GetChild();
         pChildWindow->SetParent(this);
         pChildWindow->Show();
         pChildWindow->SetPosPixel(Point(0,0));
@@ -113,7 +113,7 @@ BibWindowContainer::~BibWindowContainer()
     if( pChild )
     {
         Window* pDel = GetChild();
-        pChild = NULL;          // prevents GetFocus for child while deleting!
+        pChild = NULL;			// prevents GetFocus for child while deleting!
         delete pDel;
     }
 }
@@ -158,14 +158,14 @@ BibBookContainer::~BibBookContainer()
     if( pTopWin )
     {
         Window* pDel = pTopWin;
-        pTopWin = NULL;         // prevents GetFocus for child while deleting!
+        pTopWin = NULL;			// prevents GetFocus for child while deleting!
         delete pDel;
     }
 
     if( pBottomWin )
     {
         Window* pDel = pBottomWin;
-        pBottomWin = NULL;      // prevents GetFocus for child while deleting!
+        pBottomWin = NULL;		// prevents GetFocus for child while deleting!
         delete pDel;
     }
 
@@ -178,10 +178,10 @@ void BibBookContainer::Split()
 }
 IMPL_LINK( BibBookContainer, SplitHdl, Timer*,/*pT*/)
 {
-    long nSize= GetItemSize( TOP_WINDOW);
+    long nSize=	GetItemSize( TOP_WINDOW);
     BibConfig* pConfig = BibModul::GetConfig();
     pConfig->setBeamerSize(nSize);
-    nSize = GetItemSize( BOTTOM_WINDOW);
+    nSize =	GetItemSize( BOTTOM_WINDOW);
     pConfig->setViewSize(nSize);
     return 0;
 }
diff --git a/extensions/source/bibliography/bibcont.hxx b/extensions/source/bibliography/bibcont.hxx
index be725ac5f713..54659be8ec08 100644
--- a/extensions/source/bibliography/bibcont.hxx
+++ b/extensions/source/bibliography/bibcont.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,29 +36,29 @@
 
 #include "bibmod.hxx"
 
-#define TOP_WINDOW                          1
-#define BOTTOM_WINDOW                       2
+#define TOP_WINDOW							1
+#define BOTTOM_WINDOW						2
 
 class BibDataManager;
 
-class BibWindowContainer : public BibWindow     //Window
+class BibWindowContainer : public BibWindow		//Window
 {
     private:
         // !BibShortCutHandler is also always a Window!
-        BibShortCutHandler*     pChild;
+        BibShortCutHandler*		pChild;
 
     protected:
-        virtual void            Resize();
+        virtual void			Resize();
 
     public:
         BibWindowContainer( Window* pParent, BibShortCutHandler* pChild, WinBits nStyle = WB_3DLOOK);
         ~BibWindowContainer();
 
-        inline Window*          GetChild();
+        inline Window*			GetChild();
 
-        virtual void            GetFocus();
+        virtual void			GetFocus();
 
-        virtual BOOL            HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled
+        virtual BOOL			HandleShortCutKey( const KeyEvent& rKeyEvent );	// returns true, if key was handled
 
         using Window::GetChild;
 };
@@ -73,24 +73,24 @@ class BibBookContainer: public BibSplitWindow
 {
     private:
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >             xTopFrameRef;
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >             xBottomFrameRef;
+        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > 			xTopFrameRef;
+        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > 			xBottomFrameRef;
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >              xTopPeerRef;
-        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >              xBottomPeerRef;
+        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > 				xTopPeerRef;
+        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > 				xBottomPeerRef;
 
-        BibDataManager*         pDatMan;
-        BibWindowContainer*     pTopWin;
-        BibWindowContainer*     pBottomWin;
-        sal_Bool                    bFirstTime;
-        HdlBibModul             pBibMod;
-        Timer                   aTimer;
+        BibDataManager*			pDatMan;
+        BibWindowContainer*		pTopWin;
+        BibWindowContainer*		pBottomWin;
+        sal_Bool					bFirstTime;
+        HdlBibModul				pBibMod;
+        Timer					aTimer;
 
         DECL_LINK( SplitHdl, Timer*);
 
     protected:
 
-        virtual void            Split();
+        virtual void			Split();
 
         virtual long            PreNotify( NotifyEvent& rNEvt );
 
@@ -99,17 +99,17 @@ class BibBookContainer: public BibSplitWindow
         BibBookContainer(Window* pParent,BibDataManager*, WinBits nStyle = WB_3DLOOK );
         ~BibBookContainer();
 
-        inline BibWindow*       GetTopWin() {return pTopWin;}
-        inline BibWindow*       GetBottomWin() {return pBottomWin;}
+        inline BibWindow*		GetTopWin() {return pTopWin;}
+        inline BibWindow*		GetBottomWin() {return pBottomWin;}
 
         // !BibShortCutHandler is also always a Window!
-        void                    createTopFrame( BibShortCutHandler* pWin );
+        void					createTopFrame( BibShortCutHandler* pWin );
 
-        void                    createBottomFrame( BibShortCutHandler* pWin );
+        void					createBottomFrame( BibShortCutHandler* pWin );
 
-        virtual void            GetFocus();
+        virtual void			GetFocus();
 
-        virtual sal_Bool        HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled
+        virtual sal_Bool		HandleShortCutKey( const KeyEvent& rKeyEvent );	// returns true, if key was handled
 };
 
 #endif
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index db46e5d9f8d6..776f50a03067 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <svl/urihelper.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/processfactory.hxx>
-#include <cppuhelper/factory.hxx>   // helper for factories
+#include <cppuhelper/factory.hxx>	// helper for factories
 #include <com/sun/star/sdbc/ResultSetType.hpp>
 #include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
 #include <com/sun/star/sdb/XColumn.hpp>
@@ -90,37 +90,37 @@ using namespace ::com::sun::star::frame;
 
 //-----------------------------------------------------------------------------
 
-#define PROPERTY_FRAME                      1
+#define PROPERTY_FRAME						1
 
 class BibliographyLoader : public cppu::WeakImplHelper4
                             < XServiceInfo, XNameAccess, XPropertySet, XFrameLoader >
 {
-    HdlBibModul                                     m_pBibMod;
-    Reference< XLoadable >                          m_xDatMan;
-    BibDataManager*                                 m_pDatMan;
-    Reference< XNameAccess >                        m_xColumns;
-    Reference< XResultSet >                         m_xCursor;
+    HdlBibModul 									m_pBibMod;
+    Reference< XLoadable >							m_xDatMan;
+    BibDataManager* 								m_pDatMan;
+    Reference< XNameAccess > 						m_xColumns;
+    Reference< XResultSet > 						m_xCursor;
 
 private:
 
-    void                    loadView(const Reference< XFrame > & aFrame, const rtl::OUString& aURL,
+    void					loadView(const Reference< XFrame > & aFrame, const rtl::OUString& aURL,
                                 const Sequence< PropertyValue >& aArgs,
                                 const Reference< XLoadEventListener > & aListener);
 
-    BibDataManager*         GetDataManager()const;
-    Reference< XNameAccess >            GetDataColumns() const;
-    Reference< XResultSet >             GetDataCursor() const;
-    Reference< sdb::XColumn >               GetIdentifierColumn() const;
+    BibDataManager* 		GetDataManager()const;
+    Reference< XNameAccess > 			GetDataColumns() const;
+    Reference< XResultSet > 			GetDataCursor() const;
+    Reference< sdb::XColumn >				GetIdentifierColumn() const;
 
 public:
                             BibliographyLoader();
                             ~BibliographyLoader();
 
     // XServiceInfo
-    rtl::OUString               SAL_CALL getImplementationName() throw(  );
-    sal_Bool                    SAL_CALL supportsService(const rtl::OUString& ServiceName) throw(  );
-    Sequence< rtl::OUString >   SAL_CALL getSupportedServiceNames(void) throw(  );
-    static rtl::OUString                getImplementationName_Static() throw(  )
+    rtl::OUString				SAL_CALL getImplementationName() throw(  );
+    sal_Bool					SAL_CALL supportsService(const rtl::OUString& ServiceName) throw(  );
+    Sequence< rtl::OUString >	SAL_CALL getSupportedServiceNames(void) throw(	);
+    static rtl::OUString				getImplementationName_Static() throw(  )
 
                             {
                                 //!
@@ -146,15 +146,15 @@ public:
     virtual void SAL_CALL addVetoableChangeListener(const rtl::OUString& PropertyName, const Reference< XVetoableChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException );
     virtual void SAL_CALL removeVetoableChangeListener(const rtl::OUString& PropertyName, const Reference< XVetoableChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException );
 
-    static Sequence<rtl::OUString>  SAL_CALL getSupportedServiceNames_Static(void) throw(  );
+    static Sequence<rtl::OUString>	SAL_CALL getSupportedServiceNames_Static(void) throw(  );
 
-    friend  Reference< XInterface >     SAL_CALL BibliographyLoader_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ) throw( Exception );
+    friend	Reference< XInterface > 	SAL_CALL BibliographyLoader_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ) throw( Exception );
 
     // XLoader
-    virtual void            SAL_CALL load(const Reference< XFrame > & aFrame, const rtl::OUString& aURL,
+    virtual void			SAL_CALL load(const Reference< XFrame > & aFrame, const rtl::OUString& aURL,
                                 const Sequence< PropertyValue >& aArgs,
                                 const Reference< XLoadEventListener > & aListener) throw (::com::sun::star::uno::RuntimeException);
-    virtual void            SAL_CALL cancel(void) throw (::com::sun::star::uno::RuntimeException);
+    virtual void			SAL_CALL cancel(void) throw (::com::sun::star::uno::RuntimeException);
 };
 
 BibliographyLoader::BibliographyLoader() :
@@ -204,7 +204,7 @@ Sequence< rtl::OUString > BibliographyLoader::getSupportedServiceNames(void) thr
 }
 
 // ORegistryServiceManager_Static
-Sequence< rtl::OUString > BibliographyLoader::getSupportedServiceNames_Static(void) throw(  )
+Sequence< rtl::OUString > BibliographyLoader::getSupportedServiceNames_Static(void) throw(	)
 {
     Sequence< rtl::OUString > aSNS( 2 );
     aSNS.getArray()[0] = C2U("com.sun.star.frame.FrameLoader");
@@ -234,11 +234,11 @@ extern "C"
 
 
             //sKey += rtl::OUString::createFromAscii("/UNO/SERVICES");
-            Reference< registry::XRegistryKey > xNewKey = xImplKey->createKey(  C2U("/UNO/SERVICES") );
+            Reference< registry::XRegistryKey > xNewKey = xImplKey->createKey(	C2U("/UNO/SERVICES") );
             Sequence< rtl::OUString > aServices = BibliographyLoader::getSupportedServiceNames_Static();
             for( INT32 i = 0; i < aServices.getLength(); i++ )
                 xNewKey->createKey( aServices.getConstArray()[i]);
-            xNewKey = xImplKey->createKey(  C2U("/UNO/Loader"));
+            xNewKey = xImplKey->createKey(	C2U("/UNO/Loader"));
 
             Reference< registry::XRegistryKey >  xPatternKey = xImplKey->createKey( C2U("/Loader/Pattern" ));
             xPatternKey->setAsciiValue( C2U( ".component:Bibliography/*" ) );
@@ -327,16 +327,16 @@ void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const rtl:
     aURL.Complete = aMenuRes;
 
     Reference< XMultiServiceFactory >  xMgr = comphelper::getProcessServiceFactory();
-    Reference< util::XURLTransformer >  xTrans ( xMgr->createInstance( C2U("com.sun.star.util.URLTransformer") ), UNO_QUERY );
+    Reference< util::XURLTransformer >	xTrans ( xMgr->createInstance( C2U("com.sun.star.util.URLTransformer") ), UNO_QUERY );
     if( xTrans.is() )
     {
         // Datei laden
         xTrans->parseStrict( aURL );
 
-        Reference< XDispatchProvider >  xProv( rFrame, UNO_QUERY );
+        Reference< XDispatchProvider >	xProv( rFrame, UNO_QUERY );
         if ( xProv.is() )
         {
-            Reference< XDispatch >  aDisp = xProv->queryDispatch( aURL, C2U("_menubar"), 12 );
+            Reference< XDispatch >	aDisp = xProv->queryDispatch( aURL, C2U("_menubar"), 12 );
             if ( aDisp.is() )
                 aDisp->dispatch( aURL, Sequence<PropertyValue>() );
         }
@@ -643,7 +643,7 @@ sal_Bool BibliographyLoader::hasByName(const rtl::OUString& rName) throw ( Runti
         Reference< XResultSet >  xCursor = GetDataCursor();
         Reference< sdb::XColumn >  xIdColumn = GetIdentifierColumn();
 
-        if (xIdColumn.is())     // implies xCursor.is()
+        if (xIdColumn.is()) 	// implies xCursor.is()
         {
             do
             {
@@ -715,37 +715,37 @@ Any BibliographyLoader::getPropertyValue(const rtl::OUString& rPropertyName)
     Any aRet;
     static const sal_uInt16 aInternalMapping[] =
     {
-        IDENTIFIER_POS             , // BibliographyDataField_IDENTIFIER
-        AUTHORITYTYPE_POS          , // BibliographyDataField_BIBILIOGRAPHIC_TYPE
-        ADDRESS_POS                , // BibliographyDataField_ADDRESS
-        ANNOTE_POS                 , // BibliographyDataField_ANNOTE
-        AUTHOR_POS                 , // BibliographyDataField_AUTHOR
-        BOOKTITLE_POS              , // BibliographyDataField_BOOKTITLE
-        CHAPTER_POS                , // BibliographyDataField_CHAPTER
-        EDITION_POS                , // BibliographyDataField_EDITION
-        EDITOR_POS                 , // BibliographyDataField_EDITOR
-        HOWPUBLISHED_POS           , // BibliographyDataField_HOWPUBLISHED
-        INSTITUTION_POS            , // BibliographyDataField_INSTITUTION
-        JOURNAL_POS                , // BibliographyDataField_JOURNAL
-        MONTH_POS                  , // BibliographyDataField_MONTH
-        NOTE_POS                   , // BibliographyDataField_NOTE
-        NUMBER_POS                 , // BibliographyDataField_NUMBER
-        ORGANIZATIONS_POS          , // BibliographyDataField_ORGANIZATIONS
-        PAGES_POS                  , // BibliographyDataField_PAGES
-        PUBLISHER_POS              , // BibliographyDataField_PUBLISHER
-        SCHOOL_POS                 , // BibliographyDataField_SCHOOL
-        SERIES_POS                 , // BibliographyDataField_SERIES
-        TITLE_POS                  , // BibliographyDataField_TITLE
-        REPORTTYPE_POS             , // BibliographyDataField_REPORT_TYPE
-        VOLUME_POS                 , // BibliographyDataField_VOLUME
-        YEAR_POS                   , // BibliographyDataField_YEAR
-        URL_POS                    , // BibliographyDataField_URL
-        CUSTOM1_POS                , // BibliographyDataField_CUSTOM1
-        CUSTOM2_POS                , // BibliographyDataField_CUSTOM2
-        CUSTOM3_POS                , // BibliographyDataField_CUSTOM3
-        CUSTOM4_POS                , // BibliographyDataField_CUSTOM4
-        CUSTOM5_POS                , // BibliographyDataField_CUSTOM5
-        ISBN_POS                    //BibliographyDataField_ISBN
+        IDENTIFIER_POS			   , // BibliographyDataField_IDENTIFIER
+        AUTHORITYTYPE_POS		   , // BibliographyDataField_BIBILIOGRAPHIC_TYPE
+        ADDRESS_POS 			   , // BibliographyDataField_ADDRESS
+        ANNOTE_POS				   , // BibliographyDataField_ANNOTE
+        AUTHOR_POS				   , // BibliographyDataField_AUTHOR
+        BOOKTITLE_POS			   , // BibliographyDataField_BOOKTITLE
+        CHAPTER_POS 			   , // BibliographyDataField_CHAPTER
+        EDITION_POS 			   , // BibliographyDataField_EDITION
+        EDITOR_POS				   , // BibliographyDataField_EDITOR
+        HOWPUBLISHED_POS		   , // BibliographyDataField_HOWPUBLISHED
+        INSTITUTION_POS 		   , // BibliographyDataField_INSTITUTION
+        JOURNAL_POS 			   , // BibliographyDataField_JOURNAL
+        MONTH_POS				   , // BibliographyDataField_MONTH
+        NOTE_POS				   , // BibliographyDataField_NOTE
+        NUMBER_POS				   , // BibliographyDataField_NUMBER
+        ORGANIZATIONS_POS		   , // BibliographyDataField_ORGANIZATIONS
+        PAGES_POS				   , // BibliographyDataField_PAGES
+        PUBLISHER_POS			   , // BibliographyDataField_PUBLISHER
+        SCHOOL_POS				   , // BibliographyDataField_SCHOOL
+        SERIES_POS				   , // BibliographyDataField_SERIES
+        TITLE_POS				   , // BibliographyDataField_TITLE
+        REPORTTYPE_POS			   , // BibliographyDataField_REPORT_TYPE
+        VOLUME_POS				   , // BibliographyDataField_VOLUME
+        YEAR_POS				   , // BibliographyDataField_YEAR
+        URL_POS 				   , // BibliographyDataField_URL
+        CUSTOM1_POS 			   , // BibliographyDataField_CUSTOM1
+        CUSTOM2_POS 			   , // BibliographyDataField_CUSTOM2
+        CUSTOM3_POS 			   , // BibliographyDataField_CUSTOM3
+        CUSTOM4_POS 			   , // BibliographyDataField_CUSTOM4
+        CUSTOM5_POS 			   , // BibliographyDataField_CUSTOM5
+        ISBN_POS					//BibliographyDataField_ISBN
     };
     if(C2U("BibliographyDataFieldNames") == rPropertyName)
     {
diff --git a/extensions/source/bibliography/bibmod.cxx b/extensions/source/bibliography/bibmod.cxx
index 05d068b807af..a9809282d354 100644
--- a/extensions/source/bibliography/bibmod.cxx
+++ b/extensions/source/bibliography/bibmod.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ using namespace ::com::sun::star::ucb;
 #define C2U(cChar) OUString::createFromAscii(cChar)
 #define C2S(cChar) String::CreateFromAscii(cChar)
 
-HdlBibModul OpenBibModul()
+HdlBibModul	OpenBibModul()
 {
     if(pBibModul==NULL)
     {
@@ -93,12 +93,12 @@ BibModul::~BibModul()
     pBibConfig = 0;
 }
 
-BibDataManager*  BibModul::createDataManager()
+BibDataManager*	 BibModul::createDataManager()
 {
     return new BibDataManager();
 }
 //-----------------------------------------------------------------------------
-BibConfig*  BibModul::GetConfig()
+BibConfig*	BibModul::GetConfig()
 {
     if(! pBibConfig)
         pBibConfig = new BibConfig;
diff --git a/extensions/source/bibliography/bibmod.hxx b/extensions/source/bibliography/bibmod.hxx
index 475d67937129..0e2f04854e14 100644
--- a/extensions/source/bibliography/bibmod.hxx
+++ b/extensions/source/bibliography/bibmod.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class ResMgr;
 class BibDataManager;
 class BibConfig;
 
-#define BIBLIOGRAPHY_INI_GROUP      "Bibliography"
-#define BIBLIOGRAPHY_INI_CUR_NAME   "BibliographyCurrent"
-#define BIBLIOGRAPHY_INI_DB_ENTRY   "Bibliography"
+#define BIBLIOGRAPHY_INI_GROUP		"Bibliography"
+#define BIBLIOGRAPHY_INI_CUR_NAME	"BibliographyCurrent"
+#define BIBLIOGRAPHY_INI_DB_ENTRY 	"Bibliography"
 #define BIBLIOGRAPHY_INI_MAPPING    "BibliographyFields"
 #define BIBLIOGRAPHY_TYPE_NAMES     "BibliographyTypeNames"
 
 class BibModul
 {
     private:
-        ResMgr*                 pResMgr;
-        static BibConfig*       pBibConfig;
+        ResMgr*					pResMgr;
+        static BibConfig*		pBibConfig;
 
     public:
                                 BibModul();
                                 ~BibModul();
 
-        ResMgr*                 GetResMgr(){return pResMgr;}
-        static BibConfig*       GetConfig();
+        ResMgr*					GetResMgr(){return pResMgr;}
+        static BibConfig*		GetConfig();
 
-        BibDataManager*         createDataManager();
+        BibDataManager*			createDataManager();
 
 };
 
-typedef BibModul*       PtrBibModul;
-typedef PtrBibModul*    HdlBibModul;
+typedef BibModul*		PtrBibModul;
+typedef PtrBibModul*	HdlBibModul;
 
-HdlBibModul     OpenBibModul();
-void            CloseBibModul(HdlBibModul ppBibModul);
+HdlBibModul		OpenBibModul();
+void			CloseBibModul(HdlBibModul ppBibModul);
 
 #endif
 
diff --git a/extensions/source/bibliography/bibprop.hrc b/extensions/source/bibliography/bibprop.hrc
index 42767a2c01b1..0f24597eee7a 100644
--- a/extensions/source/bibliography/bibprop.hrc
+++ b/extensions/source/bibliography/bibprop.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/bibliography/bibresid.hxx b/extensions/source/bibliography/bibresid.hxx
index de8c6c0a0769..724dec0c3673 100644
--- a/extensions/source/bibliography/bibresid.hxx
+++ b/extensions/source/bibliography/bibresid.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/bibliography/bibshortcuthandler.hxx b/extensions/source/bibliography/bibshortcuthandler.hxx
index f0bf5aa574b0..88fe8b18a532 100644
--- a/extensions/source/bibliography/bibshortcuthandler.hxx
+++ b/extensions/source/bibliography/bibshortcuthandler.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 class BibShortCutHandler
 {
 private:
-    Window*                 pBaseClass;     // in cases, where BibShortCutHandler also has to be a window
+    Window*					pBaseClass;		// in cases, where BibShortCutHandler also has to be a window
 
 protected:
-    inline                  BibShortCutHandler( Window* pBaseClass );
+    inline					BibShortCutHandler( Window* pBaseClass );
 
 public:
-    virtual                 ~BibShortCutHandler();
-    virtual BOOL            HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled
+    virtual					~BibShortCutHandler();
+    virtual BOOL			HandleShortCutKey( const KeyEvent& rKeyEvent );	// returns true, if key was handled
 
-    inline Window*          GetWindow( void );
+    inline Window*			GetWindow( void );
 };
 
 inline BibShortCutHandler::BibShortCutHandler( Window* _pBaseClass ) : pBaseClass( _pBaseClass )
@@ -66,7 +66,7 @@ class BibWindow : public Window, public BibShortCutHandler
 {
 public:
                             BibWindow( Window* pParent,WinBits nStyle = WB_3DLOOK);
-    virtual                 ~BibWindow();
+    virtual					~BibWindow();
 };
 
 
@@ -74,7 +74,7 @@ class BibSplitWindow : public SplitWindow, public BibShortCutHandler
 {
 public:
                             BibSplitWindow( Window* pParent,WinBits nStyle = WB_3DLOOK);
-    virtual                 ~BibSplitWindow();
+    virtual					~BibSplitWindow();
 };
 
 
@@ -82,7 +82,7 @@ class BibTabPage : public TabPage, public BibShortCutHandler
 {
 public:
                             BibTabPage( Window* pParent, const ResId& rResId );
-    virtual                 ~BibTabPage();
+    virtual					~BibTabPage();
 };
 
 #endif
diff --git a/extensions/source/bibliography/bibtools.hxx b/extensions/source/bibliography/bibtools.hxx
index 91dd5648ce63..d62a5bce7528 100644
--- a/extensions/source/bibliography/bibtools.hxx
+++ b/extensions/source/bibliography/bibtools.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 BIBTOOLS_HXX
 
-#include <vcl/taskpanelist.hxx>     // includes also vcl/window.hxx
+#include <vcl/taskpanelist.hxx>		// includes also vcl/window.hxx
 
 namespace bib
 {
diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx
index abf2d293ba82..44c94cb1a317 100644
--- a/extensions/source/bibliography/bibview.cxx
+++ b/extensions/source/bibliography/bibview.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace bib
                 }
                 catch( const uno::Exception& rEx)
                 {
-                   (void) rEx;
-                }
+                   (void) rEx; 
+                }            
             }
         }
 
@@ -227,7 +227,7 @@ namespace bib
     }
 
 //.........................................................................
-}   // namespace bib
+}	// namespace bib
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/bibliography/bibview.hxx b/extensions/source/bibliography/bibview.hxx
index f4fa44ea7b17..0f86069a554a 100644
--- a/extensions/source/bibliography/bibview.hxx
+++ b/extensions/source/bibliography/bibview.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 "formcontrolcontainer.hxx"
 #include "bibshortcuthandler.hxx"
 
-class   BibGeneralPage;
-class   BibDataManager;
+class	BibGeneralPage;
+class	BibDataManager;
 
 namespace com{ namespace sun{ namespace star{ namespace awt{ class XFocusListener;}}}}
 
@@ -47,39 +47,39 @@ namespace bib
     class BibView : public BibWindow, public FormControlContainer
     {
     private:
-        BibDataManager*                                                             m_pDatMan;
-        ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable>        m_xDatMan;
-        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener>    m_xGeneralPage;
-        BibGeneralPage*                                                             m_pGeneralPage;
+        BibDataManager*																m_pDatMan;
+        ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable> 		m_xDatMan;
+        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener> 	m_xGeneralPage;
+        BibGeneralPage*																m_pGeneralPage;
 
     private:
         DECL_STATIC_LINK(BibView, CallMappingHdl, BibView*);
 
     protected:
         // Window overridables
-            virtual void    Resize();
+            virtual void	Resize();
 
         // FormControlContainer
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >
+        virtual	::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >
                             getControlContainer();
 
         // XLoadListener equivalents
-        virtual void        _loaded( const ::com::sun::star::lang::EventObject& _rEvent );
-        virtual void        _reloaded( const ::com::sun::star::lang::EventObject& _rEvent );
+        virtual void		_loaded( const ::com::sun::star::lang::EventObject& _rEvent );
+        virtual void		_reloaded( const ::com::sun::star::lang::EventObject& _rEvent );
 
     public:
                             BibView( Window* _pParent, BibDataManager* _pDatMan, WinBits nStyle = WB_3DLOOK );
                             ~BibView();
 
-        void                UpdatePages();
+        void				UpdatePages();
 
-        virtual void        GetFocus();
+        virtual void		GetFocus();
 
-        virtual BOOL        HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled
+        virtual BOOL		HandleShortCutKey( const KeyEvent& rKeyEvent );	// returns true, if key was handled
     };
 
 //.........................................................................
-}   // namespace bib
+}	// namespace bib
 //.........................................................................
 
 #endif
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index fa9775377896..1290431f760c 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ using namespace ::ucb;
 Reference< XConnection > getConnection(const ::rtl::OUString& _rURL)
 {
     // first get the sdb::DataSource corresponding to the url
-    Reference< XDataSource >    xDataSource;
+    Reference< XDataSource >	xDataSource;
     // is it a favorite title ?
     Reference< XMultiServiceFactory >  xMgr = comphelper::getProcessServiceFactory();
     Reference<XInterface> xNamingContextIfc = xMgr->createInstance(C2U("com.sun.star.sdb.DatabaseContext"));
@@ -126,19 +126,19 @@ Reference< XConnection > getConnection(const ::rtl::OUString& _rURL)
         }
         catch(Exception eEx)
         {
-            (void) eEx; // make compiler happy
+            (void) eEx;	// make compiler happy
             DBG_ERROR("Exception caught in ODatabaseContext::getRegisteredObject()");
         }
     }
     // build the connection from the data source
-    Reference< XConnection >    xConn;
+    Reference< XConnection >	xConn;
     if (xDataSource.is())
     {
         // need user/pwd for this
         ::rtl::OUString sUser, sPwd;
         Reference< XPropertySet >  xDataSourceProps(xDataSource, UNO_QUERY);
         Reference< XCompletedConnection > xComplConn(xDataSource, UNO_QUERY);
-/*      Reference< XPropertySetInfo >  xInfo = xDataSourceProps.is() ? xDataSourceProps->getPropertySetInfo() : Reference< XPropertySetInfo > ();
+/*		Reference< XPropertySetInfo >  xInfo = xDataSourceProps.is() ? xDataSourceProps->getPropertySetInfo() : Reference< XPropertySetInfo > ();
         if (xInfo.is() && xInfo->hasPropertyByName(C2U("User")))
             xDataSourceProps->getPropertyValue(C2U("User")) >>= sUser;
         if (xInfo.is() && xInfo->hasPropertyByName(C2U("Password")))
@@ -150,7 +150,7 @@ Reference< XConnection > getConnection(const ::rtl::OUString& _rURL)
             Reference<XInterface> xHdl = xMgr->createInstance(C2U("com.sun.star.task.InteractionHandler"));
             Reference<task::XInteractionHandler> xIHdl(xHdl, UNO_QUERY);
             xConn = xComplConn->connectWithCompletion(xIHdl);
-//          xConn = xDataSource->getConnection(sUser, sPwd);
+//			xConn = xDataSource->getConnection(sUser, sPwd);
         }
         catch(SQLException&)
         {
@@ -158,7 +158,7 @@ Reference< XConnection > getConnection(const ::rtl::OUString& _rURL)
         }
         catch(Exception& e )
         {
-            (void) e;   // make compiler happy
+            (void) e;	// make compiler happy
         }
 
     }
@@ -168,9 +168,9 @@ Reference< XConnection > getConnection(const ::rtl::OUString& _rURL)
 /* -----------------17.01.00 14:46-------------------
 
  --------------------------------------------------*/
-Reference< XConnection >    getConnection(const Reference< XInterface > & xRowSet)
+Reference< XConnection >	getConnection(const Reference< XInterface > & xRowSet)
 {
-    Reference< XConnection >    xConn;
+    Reference< XConnection >	xConn;
     try
     {
         Reference< XPropertySet >  xFormProps(xRowSet, UNO_QUERY);
@@ -185,7 +185,7 @@ Reference< XConnection >    getConnection(const Reference< XInterface > & xRowSe
     }
     catch(Exception& e )
     {
-        (void) e;   // make compiler happy
+        (void) e;	// make compiler happy
         DBG_ERROR("exception in getConnection");
     }
 
@@ -203,7 +203,7 @@ Reference< XNameAccess >  getColumns(const Reference< XForm > & _rxForm)
         xReturn = xSupplyCols->getColumns();
 
     if (!xReturn.is() || (xReturn->getElementNames().getLength() == 0))
-    {   // no ....
+    {	// no ....
         xReturn = NULL;
         // -> get the table the form is bound to and ask it for their columns
         Reference< XTablesSupplier >  xSupplyTables( getConnection( _rxForm ), UNO_QUERY );
@@ -248,78 +248,78 @@ Reference< XNameAccess >  getColumns(const Reference< XForm > & _rxForm)
 class MappingDialog_Impl : public ModalDialog
 {
     BibDataManager* pDatMan;
-    OKButton        aOKBT;
-    CancelButton    aCancelBT;
-    HelpButton      aHelpBT;
-    FixedLine       aMapGB;
-    FixedText       aIdentifierFT;
-    ListBox         aIdentifierLB;
-    FixedText       aAuthorityTypeFT;
-    ListBox         aAuthorityTypeLB;
+    OKButton		aOKBT;
+    CancelButton	aCancelBT;
+    HelpButton		aHelpBT;
+    FixedLine		aMapGB;
+    FixedText		aIdentifierFT;
+    ListBox 		aIdentifierLB;
+    FixedText		aAuthorityTypeFT;
+    ListBox 		aAuthorityTypeLB;
     FixedText       aAuthorFT;
-    ListBox         aAuthorLB;
-    FixedText       aTitleFT;
-    ListBox         aTitleLB;
+    ListBox 		aAuthorLB;
+    FixedText		aTitleFT;
+    ListBox 		aTitleLB;
     FixedText       aMonthFT;
-    ListBox         aMonthLB;
+    ListBox 		aMonthLB;
     FixedText       aYearFT;
-    ListBox         aYearLB;
+    ListBox 		aYearLB;
     FixedText       aISBNFT;
-    ListBox         aISBNLB;
+    ListBox 		aISBNLB;
     FixedText       aBooktitleFT;
-    ListBox         aBooktitleLB;
+    ListBox 		aBooktitleLB;
     FixedText       aChapterFT;
-    ListBox         aChapterLB;
+    ListBox 		aChapterLB;
     FixedText       aEditionFT;
-    ListBox         aEditionLB;
+    ListBox 		aEditionLB;
     FixedText       aEditorFT;
-    ListBox         aEditorLB;
+    ListBox 		aEditorLB;
     FixedText       aHowpublishedFT;
-    ListBox         aHowpublishedLB;
+    ListBox 		aHowpublishedLB;
     FixedText       aInstitutionFT;
-    ListBox         aInstitutionLB;
+    ListBox 		aInstitutionLB;
     FixedText       aJournalFT;
-    ListBox         aJournalLB;
+    ListBox 		aJournalLB;
     FixedText       aNoteFT;
-    ListBox         aNoteLB;
+    ListBox 		aNoteLB;
     FixedText       aAnnoteFT;
-    ListBox         aAnnoteLB;
+    ListBox 		aAnnoteLB;
     FixedText       aNumberFT;
-    ListBox         aNumberLB;
+    ListBox 		aNumberLB;
     FixedText       aOrganizationsFT;
-    ListBox         aOrganizationsLB;
+    ListBox 		aOrganizationsLB;
     FixedText       aPagesFT;
-    ListBox         aPagesLB;
+    ListBox 		aPagesLB;
     FixedText       aPublisherFT;
-    ListBox         aPublisherLB;
+    ListBox 		aPublisherLB;
     FixedText       aAddressFT;
-    ListBox         aAddressLB;
+    ListBox 		aAddressLB;
     FixedText       aSchoolFT;
-    ListBox         aSchoolLB;
+    ListBox 		aSchoolLB;
     FixedText       aSeriesFT;
-    ListBox         aSeriesLB;
+    ListBox 		aSeriesLB;
     FixedText       aReportTypeFT;
-    ListBox         aReportTypeLB;
+    ListBox 		aReportTypeLB;
     FixedText       aVolumeFT;
-    ListBox         aVolumeLB;
+    ListBox 		aVolumeLB;
     FixedText       aURLFT;
-    ListBox         aURLLB;
+    ListBox 		aURLLB;
     FixedText       aCustom1FT;
-    ListBox         aCustom1LB;
-    FixedText       aCustom2FT;
-    ListBox         aCustom2LB;
-    FixedText       aCustom3FT;
-    ListBox         aCustom3LB;
-    FixedText       aCustom4FT;
-    ListBox         aCustom4LB;
-    FixedText       aCustom5FT;
-    ListBox         aCustom5LB;
-    ListBox*        aListBoxes[COLUMN_COUNT];
-    String          sNone;
-
-    sal_Bool        bModified;
-
-
+    ListBox 		aCustom1LB;
+    FixedText		aCustom2FT;
+    ListBox 		aCustom2LB;
+    FixedText		aCustom3FT;
+    ListBox 		aCustom3LB;
+    FixedText		aCustom4FT;
+    ListBox 		aCustom4LB;
+    FixedText		aCustom5FT;
+    ListBox 		aCustom5LB;
+    ListBox*		aListBoxes[COLUMN_COUNT];
+    String			sNone;
+
+    sal_Bool		bModified;
+
+    
 
     DECL_LINK(OkHdl, OKButton*);
     DECL_LINK(ListBoxSelectHdl, ListBox*);
@@ -328,7 +328,7 @@ public:
     MappingDialog_Impl(Window* pParent, BibDataManager* pDatMan);
     ~MappingDialog_Impl();
 
-    void    SetModified() {bModified = TRUE;}
+    void	SetModified() {bModified = TRUE;}
 
 };
 /* -----------------11.11.99 16:42-------------------
@@ -348,110 +348,110 @@ sal_uInt16 lcl_FindLogicalName(BibConfig* pConfig ,
 MappingDialog_Impl::MappingDialog_Impl(Window* pParent, BibDataManager* pMan) :
     ModalDialog(pParent, BibResId(RID_DLG_MAPPING) ),
     pDatMan(pMan),
-    aOKBT(this,                 BibResId( BT_OK         )),
-    aCancelBT(this,             BibResId( BT_CANCEL     )),
-    aHelpBT(this,               BibResId( BT_HELP           )),
-
-    aMapGB(this,                BibResId( GB_MAPPING        )),
-
-    aIdentifierFT(this,         BibResId( FT_IDENTIFIER )),
-    aIdentifierLB(this,         BibResId( LB_IDENTIFIER )),
-    aAuthorityTypeFT(this,      BibResId( FT_AUTHORITYTYPE )),
-    aAuthorityTypeLB(this,      BibResId( LB_AUTHORITYTYPE )),
-    aAuthorFT(this,             BibResId( FT_AUTHOR     )),
-    aAuthorLB(this,             BibResId( LB_AUTHOR     )),
-    aTitleFT(this,              BibResId( FT_TITLE      )),
-    aTitleLB(this,              BibResId( LB_TITLE      )),
-    aMonthFT(this,              BibResId( FT_MONTH      )),
-    aMonthLB(this,              BibResId( LB_MONTH      )),
-    aYearFT(this,               BibResId( FT_YEAR           )),
-    aYearLB(this,               BibResId( LB_YEAR           )),
-    aISBNFT(this,               BibResId( FT_ISBN           )),
-    aISBNLB(this,               BibResId( LB_ISBN           )),
-    aBooktitleFT(this,          BibResId( FT_BOOKTITLE  )),
-    aBooktitleLB(this,          BibResId( LB_BOOKTITLE  )),
-    aChapterFT(this,            BibResId( FT_CHAPTER        )),
-    aChapterLB(this,            BibResId( LB_CHAPTER        )),
-    aEditionFT(this,            BibResId( FT_EDITION        )),
-    aEditionLB(this,            BibResId( LB_EDITION        )),
-    aEditorFT(this,             BibResId( FT_EDITOR     )),
-    aEditorLB(this,             BibResId( LB_EDITOR     )),
-    aHowpublishedFT(this,       BibResId( FT_HOWPUBLISHED   )),
-    aHowpublishedLB(this,       BibResId( LB_HOWPUBLISHED   )),
-    aInstitutionFT(this,        BibResId( FT_INSTITUTION    )),
-    aInstitutionLB(this,        BibResId( LB_INSTITUTION    )),
-    aJournalFT(this,            BibResId( FT_JOURNAL        )),
-    aJournalLB(this,            BibResId( LB_JOURNAL        )),
-    aNoteFT(this,               BibResId( FT_NOTE           )),
-    aNoteLB(this,               BibResId( LB_NOTE           )),
-    aAnnoteFT(this,             BibResId( FT_ANNOTE     )),
-    aAnnoteLB(this,             BibResId( LB_ANNOTE     )),
-    aNumberFT(this,             BibResId( FT_NUMBER     )),
-    aNumberLB(this,             BibResId( LB_NUMBER     )),
-    aOrganizationsFT(this,      BibResId( FT_ORGANIZATIONS )),
-    aOrganizationsLB(this,      BibResId( LB_ORGANIZATIONS )),
-    aPagesFT(this,              BibResId( FT_PAGES      )),
-    aPagesLB(this,              BibResId( LB_PAGES      )),
-    aPublisherFT(this,          BibResId( FT_PUBLISHER  )),
-    aPublisherLB(this,          BibResId( LB_PUBLISHER  )),
-    aAddressFT(this,            BibResId( FT_ADDRESS        )),
-    aAddressLB(this,            BibResId( LB_ADDRESS        )),
-    aSchoolFT(this,             BibResId( FT_SCHOOL     )),
-    aSchoolLB(this,             BibResId( LB_SCHOOL     )),
-    aSeriesFT(this,             BibResId( FT_SERIES     )),
-    aSeriesLB(this,             BibResId( LB_SERIES     )),
-    aReportTypeFT(this,         BibResId( FT_REPORTTYPE )),
-    aReportTypeLB(this,         BibResId( LB_REPORTTYPE )),
-    aVolumeFT(this,             BibResId( FT_VOLUME     )),
-    aVolumeLB(this,             BibResId( LB_VOLUME     )),
-    aURLFT(this,                BibResId( FT_URL            )),
-    aURLLB(this,                BibResId( LB_URL            )),
-    aCustom1FT(this,            BibResId( FT_CUSTOM1        )),
-    aCustom1LB(this,            BibResId( LB_CUSTOM1        )),
-    aCustom2FT(this,            BibResId( FT_CUSTOM2        )),
-    aCustom2LB(this,            BibResId( LB_CUSTOM2        )),
-    aCustom3FT(this,            BibResId( FT_CUSTOM3        )),
-    aCustom3LB(this,            BibResId( LB_CUSTOM3        )),
-    aCustom4FT(this,            BibResId( FT_CUSTOM4        )),
-    aCustom4LB(this,            BibResId( LB_CUSTOM4        )),
-    aCustom5FT(this,            BibResId( FT_CUSTOM5        )),
-    aCustom5LB(this,            BibResId( LB_CUSTOM5        )),
+    aOKBT(this, 				BibResId( BT_OK			)),
+    aCancelBT(this, 			BibResId( BT_CANCEL		)),
+    aHelpBT(this,				BibResId( BT_HELP			)),
+
+    aMapGB(this,				BibResId( GB_MAPPING		)),
+
+    aIdentifierFT(this, 		BibResId( FT_IDENTIFIER	)),
+    aIdentifierLB(this, 		BibResId( LB_IDENTIFIER	)),
+    aAuthorityTypeFT(this,		BibResId( FT_AUTHORITYTYPE )),
+    aAuthorityTypeLB(this,		BibResId( LB_AUTHORITYTYPE )),
+    aAuthorFT(this, 			BibResId( FT_AUTHOR		)),
+    aAuthorLB(this, 			BibResId( LB_AUTHOR		)),
+    aTitleFT(this,				BibResId( FT_TITLE 		)),
+    aTitleLB(this,				BibResId( LB_TITLE 		)),
+    aMonthFT(this,				BibResId( FT_MONTH 		)),
+    aMonthLB(this,				BibResId( LB_MONTH 		)),
+    aYearFT(this,				BibResId( FT_YEAR			)),
+    aYearLB(this,				BibResId( LB_YEAR			)),
+    aISBNFT(this,				BibResId( FT_ISBN			)),
+    aISBNLB(this,				BibResId( LB_ISBN			)),
+    aBooktitleFT(this,			BibResId( FT_BOOKTITLE 	)),
+    aBooktitleLB(this,			BibResId( LB_BOOKTITLE 	)),
+    aChapterFT(this,			BibResId( FT_CHAPTER		)),
+    aChapterLB(this,			BibResId( LB_CHAPTER		)),
+    aEditionFT(this,			BibResId( FT_EDITION		)),
+    aEditionLB(this,			BibResId( LB_EDITION		)),
+    aEditorFT(this, 			BibResId( FT_EDITOR		)),
+    aEditorLB(this, 			BibResId( LB_EDITOR		)),
+    aHowpublishedFT(this,		BibResId( FT_HOWPUBLISHED	)),
+    aHowpublishedLB(this,		BibResId( LB_HOWPUBLISHED	)),
+    aInstitutionFT(this,		BibResId( FT_INSTITUTION	)),
+    aInstitutionLB(this,		BibResId( LB_INSTITUTION	)),
+    aJournalFT(this,			BibResId( FT_JOURNAL		)),
+    aJournalLB(this,			BibResId( LB_JOURNAL		)),
+    aNoteFT(this,				BibResId( FT_NOTE			)),
+    aNoteLB(this,				BibResId( LB_NOTE			)),
+    aAnnoteFT(this, 			BibResId( FT_ANNOTE		)),
+    aAnnoteLB(this, 			BibResId( LB_ANNOTE		)),
+    aNumberFT(this, 			BibResId( FT_NUMBER		)),
+    aNumberLB(this, 			BibResId( LB_NUMBER		)),
+    aOrganizationsFT(this,		BibResId( FT_ORGANIZATIONS )),
+    aOrganizationsLB(this,		BibResId( LB_ORGANIZATIONS )),
+    aPagesFT(this,				BibResId( FT_PAGES 		)),
+    aPagesLB(this,				BibResId( LB_PAGES 		)),
+    aPublisherFT(this,			BibResId( FT_PUBLISHER 	)),
+    aPublisherLB(this,			BibResId( LB_PUBLISHER 	)),
+    aAddressFT(this,			BibResId( FT_ADDRESS		)),
+    aAddressLB(this,			BibResId( LB_ADDRESS		)),
+    aSchoolFT(this, 			BibResId( FT_SCHOOL		)),
+    aSchoolLB(this, 			BibResId( LB_SCHOOL		)),
+    aSeriesFT(this, 			BibResId( FT_SERIES		)),
+    aSeriesLB(this, 			BibResId( LB_SERIES		)),
+    aReportTypeFT(this, 		BibResId( FT_REPORTTYPE	)),
+    aReportTypeLB(this, 		BibResId( LB_REPORTTYPE	)),
+    aVolumeFT(this, 			BibResId( FT_VOLUME		)),
+    aVolumeLB(this, 			BibResId( LB_VOLUME		)),
+    aURLFT(this,				BibResId( FT_URL			)),
+    aURLLB(this,				BibResId( LB_URL			)),
+    aCustom1FT(this,			BibResId( FT_CUSTOM1		)),
+    aCustom1LB(this,			BibResId( LB_CUSTOM1		)),
+    aCustom2FT(this,			BibResId( FT_CUSTOM2		)),
+    aCustom2LB(this,			BibResId( LB_CUSTOM2		)),
+    aCustom3FT(this,			BibResId( FT_CUSTOM3		)),
+    aCustom3LB(this,			BibResId( LB_CUSTOM3		)),
+    aCustom4FT(this,			BibResId( FT_CUSTOM4		)),
+    aCustom4LB(this,			BibResId( LB_CUSTOM4		)),
+    aCustom5FT(this,			BibResId( FT_CUSTOM5		)),
+    aCustom5LB(this,			BibResId( LB_CUSTOM5		)),
     sNone(BibResId(ST_NONE)),
     bModified(sal_False)
 {
     FreeResource();
 
-    aIdentifierFT.SetText(String(         BibResId( ST_IDENTIFIER    )));
-    aAuthorityTypeFT.SetText(String(      BibResId( ST_AUTHTYPE )));
-    aAuthorFT.SetText(String(             BibResId( ST_AUTHOR        )));
-    aTitleFT.SetText(String(              BibResId( ST_TITLE         )));
-    aMonthFT.SetText(String(              BibResId( ST_MONTH         )));
-    aYearFT.SetText(String(               BibResId( ST_YEAR          )));
-    aISBNFT.SetText(String(               BibResId( ST_ISBN          )));
-    aBooktitleFT.SetText(String(          BibResId( ST_BOOKTITLE     )));
-    aChapterFT.SetText(String(            BibResId( ST_CHAPTER       )));
-    aEditionFT.SetText(String(            BibResId( ST_EDITION       )));
-    aEditorFT.SetText(String(             BibResId( ST_EDITOR        )));
-    aHowpublishedFT.SetText(String(       BibResId( ST_HOWPUBLISHED  )));
-    aInstitutionFT.SetText(String(        BibResId( ST_INSTITUTION   )));
-    aJournalFT.SetText(String(            BibResId( ST_JOURNAL       )));
-    aNoteFT.SetText(String(               BibResId( ST_NOTE          )));
-    aAnnoteFT.SetText(String(             BibResId( ST_ANNOTE        )));
-    aNumberFT.SetText(String(             BibResId( ST_NUMBER        )));
-    aOrganizationsFT.SetText(String(      BibResId( ST_ORGANIZATION )));
-    aPagesFT.SetText(String(              BibResId( ST_PAGE         )));
-    aPublisherFT.SetText(String(          BibResId( ST_PUBLISHER     )));
-    aAddressFT.SetText(String(            BibResId( ST_ADDRESS       )));
-    aSchoolFT.SetText(String(             BibResId( ST_SCHOOL        )));
-    aSeriesFT.SetText(String(             BibResId( ST_SERIES        )));
-    aReportTypeFT.SetText(String(         BibResId( ST_REPORT    )));
-    aVolumeFT.SetText(String(             BibResId( ST_VOLUME        )));
-    aURLFT.SetText(String(                BibResId( ST_URL           )));
-    aCustom1FT.SetText(String(            BibResId( ST_CUSTOM1       )));
-    aCustom2FT.SetText(String(            BibResId( ST_CUSTOM2       )));
-    aCustom3FT.SetText(String(            BibResId( ST_CUSTOM3       )));
-    aCustom4FT.SetText(String(            BibResId( ST_CUSTOM4       )));
-    aCustom5FT.SetText(String(            BibResId( ST_CUSTOM5       )));
+    aIdentifierFT.SetText(String(		  BibResId( ST_IDENTIFIER	 )));
+    aAuthorityTypeFT.SetText(String(	  BibResId( ST_AUTHTYPE )));
+    aAuthorFT.SetText(String(			  BibResId( ST_AUTHOR		 )));
+    aTitleFT.SetText(String(			  BibResId( ST_TITLE		 )));
+    aMonthFT.SetText(String(			  BibResId( ST_MONTH		 )));
+    aYearFT.SetText(String( 			  BibResId( ST_YEAR 		 )));
+    aISBNFT.SetText(String( 			  BibResId( ST_ISBN 		 )));
+    aBooktitleFT.SetText(String(		  BibResId( ST_BOOKTITLE	 )));
+    aChapterFT.SetText(String(			  BibResId( ST_CHAPTER		 )));
+    aEditionFT.SetText(String(			  BibResId( ST_EDITION		 )));
+    aEditorFT.SetText(String(			  BibResId( ST_EDITOR		 )));
+    aHowpublishedFT.SetText(String( 	  BibResId( ST_HOWPUBLISHED  )));
+    aInstitutionFT.SetText(String(		  BibResId( ST_INSTITUTION	 )));
+    aJournalFT.SetText(String(			  BibResId( ST_JOURNAL		 )));
+    aNoteFT.SetText(String( 			  BibResId( ST_NOTE 		 )));
+    aAnnoteFT.SetText(String(			  BibResId( ST_ANNOTE		 )));
+    aNumberFT.SetText(String(			  BibResId( ST_NUMBER		 )));
+    aOrganizationsFT.SetText(String(	  BibResId( ST_ORGANIZATION )));
+    aPagesFT.SetText(String(			  BibResId( ST_PAGE 		)));
+    aPublisherFT.SetText(String(		  BibResId( ST_PUBLISHER	 )));
+    aAddressFT.SetText(String(			  BibResId( ST_ADDRESS		 )));
+    aSchoolFT.SetText(String(			  BibResId( ST_SCHOOL		 )));
+    aSeriesFT.SetText(String(			  BibResId( ST_SERIES		 )));
+    aReportTypeFT.SetText(String(		  BibResId( ST_REPORT	 )));
+    aVolumeFT.SetText(String(			  BibResId( ST_VOLUME		 )));
+    aURLFT.SetText(String(				  BibResId( ST_URL			 )));
+    aCustom1FT.SetText(String(			  BibResId( ST_CUSTOM1		 )));
+    aCustom2FT.SetText(String(			  BibResId( ST_CUSTOM2		 )));
+    aCustom3FT.SetText(String(			  BibResId( ST_CUSTOM3		 )));
+    aCustom4FT.SetText(String(			  BibResId( ST_CUSTOM4		 )));
+    aCustom5FT.SetText(String(			  BibResId( ST_CUSTOM5		 )));
 
     aOKBT.SetClickHdl(LINK(this, MappingDialog_Impl, OkHdl));
     String sTitle = GetText();
@@ -592,25 +592,25 @@ IMPL_LINK(MappingDialog_Impl, OkHdl, OKButton*, EMPTYARG)
  --------------------------------------------------*/
 class DBChangeDialog_Impl : public ModalDialog
 {
-    OKButton        aOKBT;
-    CancelButton    aCancelBT;
-    HelpButton      aHelpBT;
-    FixedLine       aSelectionGB;
-    SvTabListBox    aSelectionLB;
-    HeaderBar       aSelectionHB;
-    DBChangeDialogConfig_Impl   aConfig;
-    String          aEntryST;
-    String          aURLST;
+    OKButton		aOKBT;
+    CancelButton	aCancelBT;
+    HelpButton		aHelpBT;
+    FixedLine		aSelectionGB;
+    SvTabListBox	aSelectionLB;
+    HeaderBar		aSelectionHB;
+    DBChangeDialogConfig_Impl	aConfig;
+    String			aEntryST;
+    String			aURLST;
 
     BibDataManager* pDatMan;
 
-//  DECL_LINK(EndDragHdl, HeaderBar*);
+//	DECL_LINK(EndDragHdl, HeaderBar*);
     DECL_LINK(DoubleClickHdl, SvTabListBox*);
 public:
     DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan );
     ~DBChangeDialog_Impl();
 
-    String      GetCurrentURL()const;
+    String		GetCurrentURL()const;
 };
 
 /*-- 18.11.99 10:35:20---------------------------------------------------
@@ -618,12 +618,12 @@ public:
   -----------------------------------------------------------------------*/
 DBChangeDialog_Impl::DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan ) :
     ModalDialog(pParent, BibResId(RID_DLG_DBCHANGE) ),
-    aOKBT(this,         BibResId( BT_OK     )),
-    aCancelBT(this,     BibResId( BT_CANCEL )),
-    aHelpBT(this,       BibResId( BT_HELP       )),
-    aSelectionGB(this,  BibResId( GB_SELECTION )),
-    aSelectionLB(this,  BibResId( LB_SELECTION )),
-    aSelectionHB(this,  BibResId( HB_SELECTION )),
+    aOKBT(this, 		BibResId( BT_OK		)),
+    aCancelBT(this, 	BibResId( BT_CANCEL	)),
+    aHelpBT(this,		BibResId( BT_HELP		)),
+    aSelectionGB(this,	BibResId( GB_SELECTION )),
+    aSelectionLB(this,	BibResId( LB_SELECTION )),
+    aSelectionHB(this,	BibResId( HB_SELECTION )),
     aEntryST(BibResId(ST_ENTRY)),
     aURLST( BibResId(ST_URL)),
     pDatMan(pMan)
@@ -663,7 +663,7 @@ DBChangeDialog_Impl::DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan )
     }
     catch(Exception& e )
     {
-        (void) e;   // make compiler happy
+        (void) e;	// make compiler happy
         DBG_ERROR("Exception in BibDataManager::DBChangeDialog_Impl::DBChangeDialog_Impl");
     }
 
@@ -699,7 +699,7 @@ DBChangeDialog_Impl::~DBChangeDialog_Impl()
 /* -----------------18.11.99 12:36-------------------
 
  --------------------------------------------------*/
-String  DBChangeDialog_Impl::GetCurrentURL()const
+String	DBChangeDialog_Impl::GetCurrentURL()const
 {
     String sRet;
     SvLBoxEntry* pEntry = aSelectionLB.FirstSelected();
@@ -809,9 +809,9 @@ BibDataManager::BibDataManager()
  --------------------------------------------------*/
 BibDataManager::~BibDataManager()
 {
-    Reference< XLoadable >      xLoad( m_xForm, UNO_QUERY );
-    Reference< XPropertySet >   xPrSet( m_xForm, UNO_QUERY );
-    Reference< XComponent >     xComp( m_xForm, UNO_QUERY );
+    Reference< XLoadable >		xLoad( m_xForm, UNO_QUERY );
+    Reference< XPropertySet >	xPrSet( m_xForm, UNO_QUERY );
+    Reference< XComponent > 	xComp( m_xForm, UNO_QUERY );
     if ( m_xForm.is() )
     {
         Reference< XComponent >  xConnection;
@@ -871,8 +871,8 @@ void BibDataManager::InsertFields(const Reference< XFormComponent > & _rxGrid)
             ::rtl::OUString sCurrentModelType;
             const ::rtl::OUString sType(C2U("Type"));
             sal_Int32 nType = 0;
-            sal_Bool bIsFormatted           = sal_False;
-            sal_Bool bFormattedIsNumeric    = sal_True;
+            sal_Bool bIsFormatted			= sal_False;
+            sal_Bool bFormattedIsNumeric	= sal_True;
             xField->getPropertyValue(sType) >>= nType;
             switch(nType)
             {
@@ -909,7 +909,7 @@ void BibDataManager::InsertFields(const Reference< XFormComponent > & _rxGrid)
                 xCurrentCol->setPropertyValue(C2U("TreatAsNumber"), aFormatted);
             }
             Any aColName = makeAny( *pFields );
-            xCurrentCol->setPropertyValue(FM_PROP_CONTROLSOURCE,    aColName);
+            xCurrentCol->setPropertyValue(FM_PROP_CONTROLSOURCE,	aColName);
             xCurrentCol->setPropertyValue(FM_PROP_LABEL, aColName);
 
             xColContainer->insertByName( *pFields, makeAny( xCurrentCol ) );
@@ -917,21 +917,21 @@ void BibDataManager::InsertFields(const Reference< XFormComponent > & _rxGrid)
     }
     catch(Exception& e )
     {
-        (void) e;   // make compiler happy
+        (void) e;	// make compiler happy
         DBG_ERROR("Exception in BibDataManager::InsertFields");
     }
 }
 /* --------------------------------------------------
 
  --------------------------------------------------*/
-Reference< awt::XControlModel > BibDataManager::updateGridModel()
+Reference< awt::XControlModel >	BibDataManager::updateGridModel()
 {
     return updateGridModel( m_xForm );
 }
 /* --------------------------------------------------
 
  --------------------------------------------------*/
-Reference< awt::XControlModel > BibDataManager::updateGridModel(const Reference< XForm > & xDbForm)
+Reference< awt::XControlModel >	BibDataManager::updateGridModel(const Reference< XForm > & xDbForm)
 {
     try
     {
@@ -944,8 +944,8 @@ Reference< awt::XControlModel > BibDataManager::updateGridModel(const Reference<
             m_xGridModel = createGridModel( gGridName );
 
             Reference< XNameContainer >  xNameCont(xDbForm, UNO_QUERY);
-//          if (xNameCont->hasByName(sName))
-//              xNameCont->removeByName(sName);
+//			if (xNameCont->hasByName(sName))
+//				xNameCont->removeByName(sName);
 //
             xNameCont->insertByName( sName, makeAny( m_xGridModel ) );
         }
@@ -956,7 +956,7 @@ Reference< awt::XControlModel > BibDataManager::updateGridModel(const Reference<
     }
     catch(Exception& e )
     {
-        (void) e;   // make compiler happy
+        (void) e;	// make compiler happy
         DBG_ERROR("::updateGridModel: something went wrong !");
     }
 
@@ -966,9 +966,9 @@ Reference< awt::XControlModel > BibDataManager::updateGridModel(const Reference<
 /* --------------------------------------------------
 
  --------------------------------------------------*/
-Reference< XForm >  BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc)
+Reference< XForm >	BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc)
 {
-    Reference< XForm >  xResult;
+    Reference< XForm >	xResult;
     try
     {
         Reference< XMultiServiceFactory >  xMgr = comphelper::getProcessServiceFactory();
@@ -989,7 +989,7 @@ Reference< XForm >  BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc)
             aVal <<= (sal_Int32)50;
             aPropertySet->setPropertyValue(C2U("FetchSize"), aVal);
 
-            Reference< XConnection >    xConnection = getConnection(rDesc.sDataSource);
+            Reference< XConnection >	xConnection = getConnection(rDesc.sDataSource);
             aVal <<= xConnection;
             aPropertySet->setPropertyValue(C2U("ActiveConnection"), aVal);
 
@@ -1018,7 +1018,7 @@ Reference< XForm >  BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc)
                 aPropertySet->setPropertyValue(C2U("CommandType"), aVal);
 
 
-                Reference< XDatabaseMetaData >  xMetaData = xConnection->getMetaData();
+                Reference< XDatabaseMetaData >	xMetaData = xConnection->getMetaData();
                 aQuoteChar = xMetaData->getIdentifierQuoteString();
 
                 Reference< XMultiServiceFactory > xFactory(xConnection, UNO_QUERY);
@@ -1042,7 +1042,7 @@ Reference< XForm >  BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc)
     }
     catch(Exception& e )
     {
-        (void) e;   // make compiler happy
+        (void) e;	// make compiler happy
         DBG_ERROR("::createDatabaseForm: something went wrong !");
     }
 
@@ -1065,7 +1065,7 @@ Sequence< ::rtl::OUString > BibDataManager::getDataSources()
     }
     catch(Exception& e )
     {
-        (void) e;   // make compiler happy
+        (void) e;	// make compiler happy
         DBG_ERROR("::getDataSources: something went wrong !");
     }
 
@@ -1180,7 +1180,7 @@ void BibDataManager::setActiveDataSource(const ::rtl::OUString& rURL)
         Reference< XComponent >  xOldConnection;
         aPropertySet->getPropertyValue(C2U("ActiveConnection")) >>= xOldConnection;
 
-        Reference< XConnection >    xConnection = getConnection(rURL);
+        Reference< XConnection >	xConnection = getConnection(rURL);
         if(!xConnection.is())
         {
             aDataSourceURL = sTmp;
@@ -1230,7 +1230,7 @@ void BibDataManager::setActiveDataSource(const ::rtl::OUString& rURL)
         FeatureStateEvent aEvent;
         util::URL aURL;
         aEvent.IsEnabled  = sal_True;
-        aEvent.Requery    = sal_False;
+        aEvent.Requery	  = sal_False;
         aEvent.FeatureDescriptor = getActiveDataTable();
 
         aEvent.State = makeAny( getDataSources() );
@@ -1259,7 +1259,7 @@ void BibDataManager::setActiveDataTable(const ::rtl::OUString& rTable)
 
         if(aPropertySet.is())
         {
-            Reference< XConnection >    xConnection = getConnection( m_xForm );
+            Reference< XConnection >	xConnection = getConnection( m_xForm );
             Reference< XTablesSupplier >  xSupplyTables(xConnection, UNO_QUERY);
             Reference< XNameAccess > xAccess = xSupplyTables->getTables();
             Sequence< ::rtl::OUString > aTableNameSeq = xAccess->getElementNames();
@@ -1280,7 +1280,7 @@ void BibDataManager::setActiveDataTable(const ::rtl::OUString& rTable)
             }
             if (pTableNames != pTableNamesEnd)
             {
-                Reference< XDatabaseMetaData >  xMetaData = xConnection->getMetaData();
+                Reference< XDatabaseMetaData >	xMetaData = xConnection->getMetaData();
                 aQuoteChar = xMetaData->getIdentifierQuoteString();
 
                 Reference< XMultiServiceFactory > xFactory(xConnection, UNO_QUERY);
@@ -1309,7 +1309,7 @@ void BibDataManager::setActiveDataTable(const ::rtl::OUString& rTable)
     }
     catch(Exception& e )
     {
-        (void) e;   // make compiler happy
+        (void) e;	// make compiler happy
         DBG_ERROR("::setActiveDataTable: something went wrong !");
     }
 
@@ -1410,9 +1410,9 @@ void SAL_CALL BibDataManager::removeLoadListener( const Reference< XLoadListener
 }
 
 //------------------------------------------------------------------------
-Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUString& rName)
+Reference< awt::XControlModel >	BibDataManager::createGridModel(const ::rtl::OUString& rName)
 {
-    Reference< awt::XControlModel > xModel;
+    Reference< awt::XControlModel >	xModel;
 
     try
     {
@@ -1442,7 +1442,7 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUS
     }
     catch(Exception& e )
     {
-        (void) e;   // make compiler happy
+        (void) e;	// make compiler happy
         DBG_ERROR("::createGridModel: something went wrong !");
     }
 
@@ -1489,10 +1489,10 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUS
     return aResStr;
 }
 //------------------------------------------------------------------------
-Reference< awt::XControlModel > BibDataManager::loadControlModel(
+Reference< awt::XControlModel >	BibDataManager::loadControlModel(
                     const ::rtl::OUString& rName, sal_Bool bForceListBox)
 {
-    Reference< awt::XControlModel > xModel;
+    Reference< awt::XControlModel >	xModel;
     ::rtl::OUString aName(C2U("View_"));
     aName += rName;
 
@@ -1565,7 +1565,7 @@ Reference< awt::XControlModel > BibDataManager::loadControlModel(
     }
     catch(Exception& e )
     {
-        (void) e;   // make compiler happy
+        (void) e;	// make compiler happy
         DBG_ERROR("::loadControlModel: something went wrong !");
     }
     return xModel;
@@ -1606,7 +1606,7 @@ void BibDataManager::propertyChange(const beans::PropertyChangeEvent& evt) throw
     }
     catch(Exception& e )
     {
-        (void) e;   // make compiler happy
+        (void) e;	// make compiler happy
         DBG_ERROR("::propertyChange: something went wrong !");
     }
 
@@ -1651,7 +1651,7 @@ try
 }
 catch(Exception& e )
 {
-    (void) e;   // make compiler happy
+    (void) e;	// make compiler happy
     DBG_ERROR("Exception in BibDataManager::SetMeAsUidListener");
 }
 
@@ -1697,7 +1697,7 @@ try
 }
 catch(Exception& e )
 {
-    (void) e;   // make compiler happy
+    (void) e;	// make compiler happy
     DBG_ERROR("Exception in BibDataManager::RemoveMeAsUidListener");
 }
 
@@ -1712,9 +1712,9 @@ void BibDataManager::CreateMappingDialog(Window* pParent)
     if(RET_OK == pDlg->Execute() && pBibView)
     {
         reload();
-//      unload();
-//      pBibView->UpdatePages();
-//      load();
+//		unload();
+//		pBibView->UpdatePages();
+//		load();
     }
     delete pDlg;
 }
diff --git a/extensions/source/bibliography/datman.hrc b/extensions/source/bibliography/datman.hrc
index 97f72cf98431..5ea4749eef1c 100644
--- a/extensions/source/bibliography/datman.hrc
+++ b/extensions/source/bibliography/datman.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,15 +26,15 @@
  ************************************************************************/
 
 
-#define BT_OK               1
+#define BT_OK				1
 #define BT_CANCEL           2
 #define BT_HELP             3
 #define GB_MAPPING          4
 #define FT_IDENTIFIER       5
 #define LB_IDENTIFIER       6
-#define ST_NONE             7
+#define ST_NONE				7
 
-#define FT_AUTHORITYTYPE    8
+#define FT_AUTHORITYTYPE	8
 #define LB_AUTHORITYTYPE    9
 #define FT_ADDRESS          10
 #define LB_ADDRESS          11
@@ -95,8 +95,8 @@
 #define FT_CUSTOM5          66
 #define LB_CUSTOM5          67
 
-#define GB_SELECTION        68
-#define ST_ENTRY            69
-#define LB_SELECTION        71
-#define HB_SELECTION        72
+#define GB_SELECTION		68
+#define ST_ENTRY		    69
+#define LB_SELECTION		71
+#define HB_SELECTION		72
 
diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx
index 7a499b785e71..4f485641e9e1 100644
--- a/extensions/source/bibliography/datman.hxx
+++ b/extensions/source/bibliography/datman.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,28 +73,28 @@ public:
     BibInterceptorHelper( ::bib::BibBeamer* pBibBeamer, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch);
 
     void ReleaseInterceptor();
-
+    
     // XDispatchProvider
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw (::com::sun::star::uno::RuntimeException);
-    // XDispatchProviderInterceptor
+    // XDispatchProviderInterceptor 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setSlaveDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewSlaveDispatchProvider ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setMasterDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewMasterDispatchProvider ) throw (::com::sun::star::uno::RuntimeException);
 };
 
-typedef cppu::WeakComponentImplHelper2  <   ::com::sun::star::beans::XPropertyChangeListener
-                                        ,   ::com::sun::star::form::XLoadable
-                                        >   BibDataManager_Base;
+typedef cppu::WeakComponentImplHelper2	<	::com::sun::star::beans::XPropertyChangeListener
+                                        ,	::com::sun::star::form::XLoadable
+                                        >	BibDataManager_Base;
 class BibDataManager
             :public ::comphelper::OMutexAndBroadcastHelper
             ,public BibDataManager_Base
 {
 private:
-        ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >                       m_xForm;
-        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >                m_xGridModel;
-        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >               m_xSourceProps;
+        ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > 					    m_xForm;
+        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > 			    m_xGridModel;
+        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > 			    m_xSourceProps;
         ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer >   m_xParser;
         ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >    m_xFormCtrl;
         // #100312# -------------------
@@ -102,24 +102,24 @@ private:
         BibInterceptorHelper* m_pInterceptorHelper;
 
         ::rtl::OUString                     aActiveDataTable;
-        ::rtl::OUString                     aDataSourceURL;
-        ::rtl::OUString                     aQuoteChar;
-        ::com::sun::star::uno::Any                      aUID;
-        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >              xBibCursor;
+        ::rtl::OUString						aDataSourceURL;
+        ::rtl::OUString						aQuoteChar;
+        ::com::sun::star::uno::Any						aUID;
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > 				xBibCursor;
 
-        ::cppu::OInterfaceContainerHelper   m_aLoadListeners;
+        ::cppu::OInterfaceContainerHelper	m_aLoadListeners;
 
-        ::bib::BibView*             pBibView;
-        BibToolBar*                 pToolbar;
+        ::bib::BibView* 			pBibView;
+        BibToolBar*					pToolbar;
 
-        rtl::OUString               sIdentifierMapping;
+        rtl::OUString 				sIdentifierMapping;
 protected:
 
-        void                        InsertFields(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > & xGrid);
-        void                        SetMeAsUidListener();
-        void                        RemoveMeAsUidListener();
+        void						InsertFields(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > & xGrid);
+        void						SetMeAsUidListener();
+        void						RemoveMeAsUidListener();
 
-        void                        UpdateAddressbookCursor(::rtl::OUString aSourceName);
+        void						UpdateAddressbookCursor(::rtl::OUString aSourceName);
 
         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >
                                     updateGridModel(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > & xDbForm);
@@ -141,53 +141,53 @@ public:
         BibDataManager();
         ~BibDataManager();
 
-        virtual void                SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt)
+        virtual void				SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt)
                                                                 throw( ::com::sun::star::uno::RuntimeException );
-        virtual void                SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source )
+        virtual void 				SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source )
                                                                 throw( ::com::sun::star::uno::RuntimeException );
 
 
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >                   createDatabaseForm( BibDBDescriptor&    aDesc);
+        ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > 					createDatabaseForm(	BibDBDescriptor&	aDesc);
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >            updateGridModel();
+        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > 			updateGridModel();
 
-        ::com::sun::star::uno::Sequence< ::rtl::OUString>           getDataSources();
+        ::com::sun::star::uno::Sequence< ::rtl::OUString>			getDataSources();
 
-        ::rtl::OUString             getActiveDataSource() {return aDataSourceURL;}
-        void                        setActiveDataSource(const ::rtl::OUString& rURL);
+        ::rtl::OUString				getActiveDataSource() {return aDataSourceURL;}
+        void						setActiveDataSource(const ::rtl::OUString& rURL);
 
-        ::rtl::OUString             getActiveDataTable();
-        void                        setActiveDataTable(const ::rtl::OUString& rTable);
+        ::rtl::OUString				getActiveDataTable();
+        void						setActiveDataTable(const ::rtl::OUString& rTable);
 
-        void                        setFilter(const ::rtl::OUString& rQuery);
-        ::rtl::OUString                     getFilter();
+        void						setFilter(const ::rtl::OUString& rQuery);
+        ::rtl::OUString						getFilter();
 
-        ::com::sun::star::uno::Sequence< ::rtl::OUString>           getQueryFields();
-        ::rtl::OUString                     getQueryField();
-        void                        startQueryWith(const ::rtl::OUString& rQuery);
+        ::com::sun::star::uno::Sequence< ::rtl::OUString>			getQueryFields();
+        ::rtl::OUString						getQueryField();
+        void						startQueryWith(const ::rtl::OUString& rQuery);
 
-        const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer >&    getParser() { return m_xParser; }
-        const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >&                        getForm()   { return m_xForm; }
+        const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer >&    getParser()	{ return m_xParser; }
+        const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& 					    getForm()	{ return m_xForm; }
 
 
-        ::rtl::OUString                     getControlName(sal_Int32 nFormatKey );
+        ::rtl::OUString						getControlName(sal_Int32 nFormatKey );
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >            loadControlModel(const ::rtl::OUString& rName,
+        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > 			loadControlModel(const ::rtl::OUString& rName,
                                                         sal_Bool bForceListBox = sal_False);
 
-        void                        CreateMappingDialog(Window* pParent);
+        void						CreateMappingDialog(Window* pParent);
         ::rtl::OUString             CreateDBChangeDialog(Window* pParent);
 
         void                        DispatchDBChangeDialog();
-        sal_Bool                    HasActiveConnection() const;
+        sal_Bool                    HasActiveConnection() const; 
 
-        void                        SetView( ::bib::BibView* pView ) { pBibView = pView; }
+        void						SetView( ::bib::BibView* pView ) { pBibView = pView; }
 
-        void                        SetToolbar(BibToolBar* pSet);
+        void						SetToolbar(BibToolBar* pSet);
 
-        const rtl::OUString&        GetIdentifierMapping();
-        void                        ResetIdentifierMapping() {sIdentifierMapping = rtl::OUString();}
+        const rtl::OUString&		GetIdentifierMapping();
+        void						ResetIdentifierMapping() {sIdentifierMapping = rtl::OUString();}
 
         ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > GetFormController();
         // #100312# ----------
diff --git a/extensions/source/bibliography/datman.src b/extensions/source/bibliography/datman.src
index 0a0643b1b117..6b8c4b00ef41 100644
--- a/extensions/source/bibliography/datman.src
+++ b/extensions/source/bibliography/datman.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ ModalDialog RID_DLG_MAPPING
         Size = MAP_APPFONT ( 329 , 8 ) ;
         Text [ en-US ] = "Column names";
     };
-    FixedText   FT_IDENTIFIER
+    FixedText	FT_IDENTIFIER
     {
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
diff --git a/extensions/source/bibliography/formcontrolcontainer.cxx b/extensions/source/bibliography/formcontrolcontainer.cxx
index db61efc3e7c3..22ee46485b04 100644
--- a/extensions/source/bibliography/formcontrolcontainer.cxx
+++ b/extensions/source/bibliography/formcontrolcontainer.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,7 +129,7 @@ namespace bib
         }
         catch( const Exception& e)
         {
-            (void) e;   // make compiler happy
+            (void) e;	// make compiler happy
             DBG_ERROR( "FormControlContainer::implSetDesignMode: caught an exception!" );
         }
     }
@@ -176,7 +176,7 @@ namespace bib
     }
 
 //.........................................................................
-}   // namespace bib
+}	// namespace bib
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/bibliography/formcontrolcontainer.hxx b/extensions/source/bibliography/formcontrolcontainer.hxx
index b80b60d8bc75..a1e72b11a222 100644
--- a/extensions/source/bibliography/formcontrolcontainer.hxx
+++ b/extensions/source/bibliography/formcontrolcontainer.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace bib
             ,public ::bib::OLoadListener
     {
     private:
-        OLoadListenerAdapter*   m_pFormAdapter;
+        OLoadListenerAdapter*	m_pFormAdapter;
         ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable >
                                 m_xForm;
     private:
-        void    implSetDesignMode( sal_Bool _bDesign );
+        void	implSetDesignMode( sal_Bool _bDesign );
 
     protected:
         FormControlContainer( );
         ~FormControlContainer( );
 
-        sal_Bool    isFormConnected() const { return NULL != m_pFormAdapter; }
-        void        connectForm( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable >& _rxForm );
-        void        disconnectForm();
+        sal_Bool	isFormConnected() const { return NULL != m_pFormAdapter; }
+        void		connectForm( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable >& _rxForm );
+        void		disconnectForm();
 
-        void        ensureDesignMode();
+        void		ensureDesignMode();
 
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >
+        virtual	::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >
                     getControlContainer() = 0;
 
     protected:
@@ -78,7 +78,7 @@ namespace bib
     };
 
 //.........................................................................
-}   // namespace bib
+}	// namespace bib
 //.........................................................................
 
 #endif // EXTENSIONS_BIB_FORMCONTROLCONTAINER_HXX
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 1194982782c3..495362294602 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ const CmdToInfoCache& GetCommandToInfoCache()
             bCacheInitialized = sal_True;
         }
     }
-
+    
     return aCmdToInfoCache;
 }
 
@@ -147,10 +147,10 @@ const CmdToInfoCache& GetCommandToInfoCache()
 class BibFrameCtrl_Impl : public cppu::WeakImplHelper1 < XFrameActionListener >
 {
 public:
-    Mutex                               aMutex;
-    OMultiTypeInterfaceContainerHelper  aLC;
+    Mutex								aMutex;
+    OMultiTypeInterfaceContainerHelper	aLC;
 
-    BibFrameController_Impl*            pController;
+    BibFrameController_Impl*			pController;
 
                                         BibFrameCtrl_Impl()
                                             : aLC( aMutex )
@@ -159,8 +159,8 @@ public:
 
                                         ~BibFrameCtrl_Impl();
 
-    virtual void                        SAL_CALL frameAction(const FrameActionEvent& aEvent) throw( RuntimeException );
-    virtual void                        SAL_CALL disposing( const lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void						SAL_CALL frameAction(const FrameActionEvent& aEvent) throw( RuntimeException );
+    virtual void						SAL_CALL disposing( const lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
 };
 
 
@@ -235,7 +235,7 @@ sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const ::rtl::OUStrin
     // base services are included there and should be asked by uno-rtti.
     ::com::sun::star::uno::Sequence< ::rtl::OUString > lNames(1);
     lNames[0] = ::rtl::OUString::createFromAscii("com.sun.star.frame.Bibliography");
-    return lNames;
+    return lNames;    
 }
 
 void BibFrameController_Impl::attachFrame( const uno::Reference< XFrame > & xArg ) throw (::com::sun::star::uno::RuntimeException)
@@ -298,7 +298,7 @@ void BibFrameController_Impl::removeEventListener( const uno::Reference< lang::X
     pImp->aLC.removeInterface( ::getCppuType((const Reference< lang::XEventListener >*)0), aListener );
 }
 
-uno::Reference< frame::XDispatch >  BibFrameController_Impl::queryDispatch( const util::URL& aURL, const rtl::OUString& /*aTarget*/, sal_Int32 /*nSearchFlags*/ ) throw (::com::sun::star::uno::RuntimeException)
+uno::Reference< frame::XDispatch >	BibFrameController_Impl::queryDispatch( const util::URL& aURL, const rtl::OUString& /*aTarget*/, sal_Int32 /*nSearchFlags*/ ) throw (::com::sun::star::uno::RuntimeException)
 {
     if ( !bDisposing )
     {
@@ -306,7 +306,7 @@ uno::Reference< frame::XDispatch >  BibFrameController_Impl::queryDispatch( cons
         CmdToInfoCache::const_iterator pIter = rCmdCache.find( aURL.Complete );
         if ( pIter != rCmdCache.end() )
         {
-            if (( pDatMan->HasActiveConnection() ) ||
+            if (( pDatMan->HasActiveConnection() ) || 
                 ( !pIter->second.bActiveConnection ))
                 return (frame::XDispatch*) this;
         }
@@ -323,7 +323,7 @@ uno::Sequence<uno::Reference< XDispatch > > BibFrameController_Impl::queryDispat
     return aDispatches;
 }
 
-uno::Sequence< ::sal_Int16 > SAL_CALL BibFrameController_Impl::getSupportedCommandGroups()
+uno::Sequence< ::sal_Int16 > SAL_CALL BibFrameController_Impl::getSupportedCommandGroups() 
 throw (::com::sun::star::uno::RuntimeException)
 {
     uno::Sequence< ::sal_Int16 > aDispatchInfo( 4 );
@@ -335,12 +335,12 @@ throw (::com::sun::star::uno::RuntimeException)
 
     return aDispatchInfo;
 }
-
-uno::Sequence< frame::DispatchInformation > SAL_CALL BibFrameController_Impl::getConfigurableDispatchInformation( ::sal_Int16 nCommandGroup )
+ 
+uno::Sequence< frame::DispatchInformation > SAL_CALL BibFrameController_Impl::getConfigurableDispatchInformation( ::sal_Int16 nCommandGroup ) 
 throw (::com::sun::star::uno::RuntimeException)
 {
     const CmdToInfoCache& rCmdCache = GetCommandToInfoCache();
-
+    
     sal_Bool                                    bGroupFound( sal_False );
     frame::DispatchInformation                  aDispatchInfo;
     std::list< frame::DispatchInformation >     aDispatchInfoList;
@@ -369,7 +369,7 @@ throw (::com::sun::star::uno::RuntimeException)
 
     ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchInformation > aSeq =
         comphelper::containerToSequence< ::com::sun::star::frame::DispatchInformation, std::list< ::com::sun::star::frame::DispatchInformation > >( aDispatchInfoList );
-
+    
     return aSeq;
 }
 
@@ -422,7 +422,7 @@ sal_Bool BibFrameController_Impl::SaveModified(const Reference< form::runtime::X
 }
 
 Window* lcl_GetFocusChild( Window* pParent )
-{
+{        
     USHORT nChildren = pParent->GetChildCount();
     for( USHORT nChild = 0; nChild < nChildren; ++nChild)
     {
@@ -484,8 +484,8 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
                     FeatureStateEvent  aEvent;
                     aEvent.FeatureURL = pObj->aURL;
                     aEvent.IsEnabled  = sal_True;
-                    aEvent.Requery    = sal_False;
-                    aEvent.Source     = (XDispatch *) this;
+                    aEvent.Requery	  = sal_False;
+                    aEvent.Source	  = (XDispatch *) this;
                     pObj->xListener->statusChanged( aEvent );
                     //break; because there are more than one
                 }
@@ -571,8 +571,8 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
                     FeatureStateEvent  aEvent;
                     aEvent.FeatureURL = pObj->aURL;
                     aEvent.IsEnabled  = 0 != pDatMan->getParser()->getFilter().getLength();
-                    aEvent.Requery    = sal_False;
-                    aEvent.Source     = (XDispatch *) this;
+                    aEvent.Requery	  = sal_False;
+                    aEvent.Source	  = (XDispatch *) this;
                     pObj->xListener->statusChanged( aEvent );
                 }
             }
@@ -673,29 +673,29 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
         {
             Window* pChild = lcl_GetFocusChild( VCLUnoHelper::GetWindow( xWindow ) );
             if(pChild)
-            {
+            {        
                 KeyEvent aEvent( 0, KEYFUNC_CUT );
                 pChild->KeyInput( aEvent );
             }
-        }
+        }    
         else if(aCommand.EqualsAscii("Copy"))
         {
             Window* pChild = lcl_GetFocusChild( VCLUnoHelper::GetWindow( xWindow ) );
             if(pChild)
-            {
+            {        
                 KeyEvent aEvent( 0, KEYFUNC_COPY );
                 pChild->KeyInput( aEvent );
             }
-        }
+        }    
         else if(aCommand.EqualsAscii("Paste"))
         {
             Window* pChild = lcl_GetFocusChild( VCLUnoHelper::GetWindow( xWindow ) );
             if(pChild)
-            {
+            {        
                 KeyEvent aEvent( 0, KEYFUNC_PASTE );
                 pChild->KeyInput( aEvent );
             }
-        }
+        }    
     }
 }
 IMPL_STATIC_LINK( BibFrameController_Impl, DisposeHdl, void*, EMPTYARG )
@@ -813,7 +813,7 @@ void BibFrameController_Impl::addStatusListener(
                     {
                     }
                 }
-            }
+            }            
             uno::Reference< datatransfer::XTransferable > xContents = xClip->getContents(  );
         }
     }
@@ -829,12 +829,12 @@ void BibFrameController_Impl::addStatusListener(
             xSet->getPropertyValue(C2U("RowCount")) >>= nCount;
             aEvent.IsEnabled  = nCount > 0;
         }
-    }
+    }            
     else if (aURL.Path == C2U("Bib/InsertRecord"))
     {
         Reference< beans::XPropertySet >  xSet(pDatMan->getForm(), UNO_QUERY);
         aEvent.IsEnabled = canInsertRecords(xSet);
-    }
+    }            
     aListener->statusChanged( aEvent );
 }
 //-----------------------------------------------------------------------------
@@ -879,8 +879,8 @@ void BibFrameController_Impl::RemoveFilter()
             FeatureStateEvent  aEvent;
             aEvent.FeatureURL = pObj->aURL;
             aEvent.IsEnabled  = sal_False;
-            aEvent.Requery    = sal_False;
-            aEvent.Source     = (XDispatch *) this;
+            aEvent.Requery	  = sal_False;
+            aEvent.Source	  = (XDispatch *) this;
             pObj->xListener->statusChanged( aEvent );
             bRemoveFilter=sal_True;
         }
@@ -889,8 +889,8 @@ void BibFrameController_Impl::RemoveFilter()
             FeatureStateEvent  aEvent;
             aEvent.FeatureURL = pObj->aURL;
             aEvent.IsEnabled  = sal_True;
-            aEvent.Requery    = sal_False;
-            aEvent.Source     = (XDispatch *) this;
+            aEvent.Requery	  = sal_False;
+            aEvent.Source	  = (XDispatch *) this;
             aEvent.State <<= aQuery;
             pObj->xListener->statusChanged( aEvent );
             bQueryText=sal_True;
@@ -919,7 +919,7 @@ void BibFrameController_Impl::ChangeDataSource(const uno::Sequence< beans::Prope
         aDBTableName = pDatMan->getActiveDataTable();
     }
     else
-    {
+    {        
         m_xDatMan->unload();
         pDatMan->setActiveDataTable(aDBTableName);
         pDatMan->updateGridModel();
@@ -939,8 +939,8 @@ void BibFrameController_Impl::ChangeDataSource(const uno::Sequence< beans::Prope
             FeatureStateEvent  aEvent;
             aEvent.FeatureURL = pObj->aURL;
             aEvent.IsEnabled  = sal_True;
-            aEvent.Requery    = sal_False;
-            aEvent.Source     = (XDispatch *) this;
+            aEvent.Requery	  = sal_False;
+            aEvent.Source	  = (XDispatch *) this;
             aEvent.FeatureDescriptor=pDatMan->getQueryField();
 
             uno::Sequence<rtl::OUString> aStringSeq=pDatMan->getQueryFields();
@@ -954,8 +954,8 @@ void BibFrameController_Impl::ChangeDataSource(const uno::Sequence< beans::Prope
             FeatureStateEvent  aEvent;
             aEvent.FeatureURL = pObj->aURL;
             aEvent.IsEnabled  = sal_True;
-            aEvent.Requery    = sal_False;
-            aEvent.Source     = (XDispatch *) this;
+            aEvent.Requery	  = sal_False;
+            aEvent.Source	  = (XDispatch *) this;
             BibConfig* pConfig = BibModul::GetConfig();
             aEvent.State <<= pConfig->getQueryText();
             pObj->xListener->statusChanged( aEvent );
diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx
index 5cd7e9d46471..4ef00f967fed 100644
--- a/extensions/source/bibliography/framectr.hxx
+++ b/extensions/source/bibliography/framectr.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace com{namespace sun{namespace star{
 class BibStatusDispatch
 {
 public:
-    ::com::sun::star::util::URL                 aURL;
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >    xListener;
-                        BibStatusDispatch( const ::com::sun::star::util::URL& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >  xRef )
+    ::com::sun::star::util::URL 				aURL;
+    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >	xListener;
+                        BibStatusDispatch( const ::com::sun::star::util::URL& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >	xRef )
                             : aURL( rURL )
                             , xListener( xRef )
                         {}
@@ -69,15 +69,15 @@ class BibFrameController_Impl : public cppu::WeakImplHelper5 <
 >
 {
 friend class BibFrameCtrl_Impl;
-    BibFrameCtrl_Impl*          pImp;
-    BibStatusDispatchArr        aStatusListeners;
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >                  xWindow;
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >                 xFrame;
-    sal_Bool                        bDisposing;
-    sal_Bool                        bHierarchical;
-    ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable >               m_xDatMan;
-    BibDataManager*             pDatMan;
-    HdlBibModul                 pBibMod;
+    BibFrameCtrl_Impl*			pImp;
+    BibStatusDispatchArr		aStatusListeners;
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >					xWindow;
+    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > 				xFrame;
+    sal_Bool						bDisposing;
+    sal_Bool						bHierarchical;
+    ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable >				m_xDatMan;
+    BibDataManager* 			pDatMan;
+    HdlBibModul 				pBibMod;
 
     DECL_STATIC_LINK( BibFrameController_Impl, DisposeHdl, void* );
 
@@ -88,11 +88,11 @@ public:
                                 ~BibFrameController_Impl();
 
 
-    void                        activate();
-    void                        deactivate();
+    void						activate();
+    void						deactivate();
 
-    void                        ChangeDataSource(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs);
-    void                        RemoveFilter();
+    void						ChangeDataSource(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs);
+    void						RemoveFilter();
 
                                 // ::com::sun::star::lang::XServiceInfo
     virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
@@ -100,27 +100,27 @@ public:
     virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
 
                                 // ::com::sun::star::frame::XController
-    virtual void                SAL_CALL attachFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & xFrame ) throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool            SAL_CALL attachModel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xModel ) throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool            SAL_CALL suspend( sal_Bool bSuspend ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any  SAL_CALL    getViewData() throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL                           restoreViewData( const ::com::sun::star::uno::Any& Value ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void				SAL_CALL attachFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & xFrame ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool			SAL_CALL attachModel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xModel ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool			SAL_CALL suspend( sal_Bool bSuspend ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any	SAL_CALL	getViewData() throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL							restoreViewData( const ::com::sun::star::uno::Any& Value ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL getModel() throw (::com::sun::star::uno::RuntimeException);
 
                                 // ::com::sun::star::lang::XComponent
-    virtual void                SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException);
-    virtual void                SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void                SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void				SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException);
+    virtual void				SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void				SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener ) throw (::com::sun::star::uno::RuntimeException);
 
                                 // ::com::sun::star::frame::XDispatchProvider
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >          SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >			SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >  > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts) throw (::com::sun::star::uno::RuntimeException);
 
                                 //class ::com::sun::star::frame::XDispatch
-    virtual void                SAL_CALL dispatch(const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs) throw (::com::sun::star::uno::RuntimeException);
-    virtual void                SAL_CALL addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw (::com::sun::star::uno::RuntimeException);
-    virtual void                SAL_CALL removeStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw (::com::sun::star::uno::RuntimeException);
+    virtual void				SAL_CALL dispatch(const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs) throw (::com::sun::star::uno::RuntimeException);
+    virtual void				SAL_CALL addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw (::com::sun::star::uno::RuntimeException);
+    virtual void				SAL_CALL removeStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw (::com::sun::star::uno::RuntimeException);
 
                                 // ::com::sun::star::frame::XDispatchInformationProvider
     virtual ::com::sun::star::uno::Sequence< ::sal_Int16 > SAL_CALL getSupportedCommandGroups(  ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index 3cee7f8b8364..c699aff5d485 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,9 +96,9 @@ OUString lcl_GetColumnName( const Mapping* pMapping, sal_uInt16 nIndexPos )
 /* -----------------------------04.01.00 10:54--------------------------------
 
  ---------------------------------------------------------------------------*/
-class BibPosListener    :public cppu::WeakImplHelper1 <sdbc::XRowSetListener>
+class BibPosListener	:public cppu::WeakImplHelper1 <sdbc::XRowSetListener>
 {
-    BibGeneralPage*     pParentPage;
+    BibGeneralPage* 	pParentPage;
 public:
     BibPosListener(BibGeneralPage* pParent);
 
@@ -162,7 +162,7 @@ void BibPosListener::cursorMoved(const lang::EventObject& /*aEvent*/) throw( uno
             {
                 uno::Any aVal = xValueAcc->getByName(uTypeMapping);
                 uno::Reference< uno::XInterface >  xInt = *(uno::Reference< uno::XInterface > *)aVal.getValue();
-                uno::Reference< sdb::XColumn >  xCol(xInt, UNO_QUERY);
+                uno::Reference< sdb::XColumn >	xCol(xInt, UNO_QUERY);
                 DBG_ASSERT(xCol.is(), "BibPosListener::positioned : invalid column (no sdb::XColumn) !");
                 if (xCol.is())
                 {
@@ -189,7 +189,7 @@ void BibPosListener::cursorMoved(const lang::EventObject& /*aEvent*/) throw( uno
     }
     catch(Exception& rEx)
     {
-        (void) rEx; // make compiler happy
+        (void) rEx;	// make compiler happy
         DBG_ERROR("BibPosListener::positioned: something went wrong !");
     }
 }
@@ -206,40 +206,40 @@ void BibPosListener::disposing(const lang::EventObject& /*Source*/) throw( uno::
 BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan):
     BibTabPage(pParent,BibResId(RID_TP_GENERAL)),
     aControlParentWin(this, WB_DIALOGCONTROL),
-    aIdentifierFT(&aControlParentWin,   BibResId(FT_IDENTIFIER  )),
-    aAuthTypeFT(&aControlParentWin,     BibResId(FT_AUTHTYPE        )),
-    aYearFT(&aControlParentWin,         BibResId(FT_YEAR            )),
-    aAuthorFT(&aControlParentWin,       BibResId(FT_AUTHOR      )),
-    aTitleFT(&aControlParentWin,        BibResId(FT_TITLE           )),
-    aPublisherFT(&aControlParentWin,    BibResId(FT_PUBLISHER       )),
-    aAddressFT(&aControlParentWin,      BibResId(FT_ADDRESS     )),
-    aISBNFT(&aControlParentWin,         BibResId(FT_ISBN            )),
-    aChapterFT(&aControlParentWin,      BibResId(FT_CHAPTER     )),
-    aPagesFT(&aControlParentWin,        BibResId(FT_PAGE            )),
+    aIdentifierFT(&aControlParentWin,	BibResId(FT_IDENTIFIER 	)),
+    aAuthTypeFT(&aControlParentWin, 	BibResId(FT_AUTHTYPE		)),
+    aYearFT(&aControlParentWin, 		BibResId(FT_YEAR			)),
+    aAuthorFT(&aControlParentWin,		BibResId(FT_AUTHOR 		)),
+    aTitleFT(&aControlParentWin,		BibResId(FT_TITLE			)),
+    aPublisherFT(&aControlParentWin,	BibResId(FT_PUBLISHER		)),
+    aAddressFT(&aControlParentWin,		BibResId(FT_ADDRESS		)),
+    aISBNFT(&aControlParentWin, 		BibResId(FT_ISBN			)),
+    aChapterFT(&aControlParentWin,		BibResId(FT_CHAPTER		)),
+    aPagesFT(&aControlParentWin,		BibResId(FT_PAGE			)),
     aFirstFL(&aControlParentWin,        BibResId(FL_1        )),
-    aEditorFT(&aControlParentWin,       BibResId(FT_EDITOR      )),
-    aEditionFT(&aControlParentWin,      BibResId(FT_EDITION     )),
-    aBooktitleFT(&aControlParentWin,    BibResId(FT_BOOKTITLE       )),
-    aVolumeFT(&aControlParentWin,       BibResId(FT_VOLUME      )),
-    aHowpublishedFT(&aControlParentWin, BibResId(FT_HOWPUBLISHED    )),
-    aOrganizationsFT(&aControlParentWin,BibResId(FT_ORGANIZATION    )),
-    aInstitutionFT(&aControlParentWin,  BibResId(FT_INSTITUTION )),
-    aSchoolFT(&aControlParentWin,       BibResId(FT_SCHOOL      )),
-    aReportTypeFT(&aControlParentWin,   BibResId(FT_REPORT      )),
-    aMonthFT(&aControlParentWin,        BibResId(FT_MONTH           )),
+    aEditorFT(&aControlParentWin,		BibResId(FT_EDITOR 		)),
+    aEditionFT(&aControlParentWin,		BibResId(FT_EDITION		)),
+    aBooktitleFT(&aControlParentWin,	BibResId(FT_BOOKTITLE		)),
+    aVolumeFT(&aControlParentWin,		BibResId(FT_VOLUME 		)),
+    aHowpublishedFT(&aControlParentWin, BibResId(FT_HOWPUBLISHED	)),
+    aOrganizationsFT(&aControlParentWin,BibResId(FT_ORGANIZATION	)),
+    aInstitutionFT(&aControlParentWin,	BibResId(FT_INSTITUTION	)),
+    aSchoolFT(&aControlParentWin,		BibResId(FT_SCHOOL 		)),
+    aReportTypeFT(&aControlParentWin,	BibResId(FT_REPORT 		)),
+    aMonthFT(&aControlParentWin,		BibResId(FT_MONTH			)),
     aSecondFL(&aControlParentWin,       BibResId(FL_2        )),
-    aJournalFT(&aControlParentWin,      BibResId(FT_JOURNAL     )),
-    aNumberFT(&aControlParentWin,       BibResId(FT_NUMBER      )),
-    aSeriesFT(&aControlParentWin,       BibResId(FT_SERIES      )),
-    aAnnoteFT(&aControlParentWin,       BibResId(FT_ANNOTE      )),
-    aNoteFT(&aControlParentWin,         BibResId(FT_NOTE            )),
-    aURLFT(&aControlParentWin,          BibResId(FT_URL         )),
+    aJournalFT(&aControlParentWin,		BibResId(FT_JOURNAL		)),
+    aNumberFT(&aControlParentWin,		BibResId(FT_NUMBER 		)),
+    aSeriesFT(&aControlParentWin,		BibResId(FT_SERIES 		)),
+    aAnnoteFT(&aControlParentWin,		BibResId(FT_ANNOTE 		)),
+    aNoteFT(&aControlParentWin, 		BibResId(FT_NOTE			)),
+    aURLFT(&aControlParentWin,			BibResId(FT_URL			)),
     aThirdFL(&aControlParentWin,        BibResId(FL_3        )),
-    aCustom1FT(&aControlParentWin,      BibResId(FT_CUSTOM1     )),
-    aCustom2FT(&aControlParentWin,      BibResId(FT_CUSTOM2     )),
-    aCustom3FT(&aControlParentWin,      BibResId(FT_CUSTOM3     )),
-    aCustom4FT(&aControlParentWin,      BibResId(FT_CUSTOM4     )),
-    aCustom5FT(&aControlParentWin,      BibResId(FT_CUSTOM5     )),
+    aCustom1FT(&aControlParentWin,		BibResId(FT_CUSTOM1		)),
+    aCustom2FT(&aControlParentWin,		BibResId(FT_CUSTOM2		)),
+    aCustom3FT(&aControlParentWin,		BibResId(FT_CUSTOM3		)),
+    aCustom4FT(&aControlParentWin,		BibResId(FT_CUSTOM4		)),
+    aCustom5FT(&aControlParentWin,		BibResId(FT_CUSTOM5		)),
     aHoriScroll(this, WB_HORZ),
     aVertScroll(this, WB_VERT),
     sErrorPrefix(BibResId(ST_ERROR_PREFIX)),
@@ -253,24 +253,24 @@ BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan):
     aBibTypeArr[1] = String(BibResId(ST_TYPE_BOOK));
     aBibTypeArr[2] = String(BibResId(ST_TYPE_BOOKLET));
     aBibTypeArr[3] = String(BibResId(ST_TYPE_CONFERENCE));
-    aBibTypeArr[4] = String(BibResId(ST_TYPE_INBOOK ));
+    aBibTypeArr[4] = String(BibResId(ST_TYPE_INBOOK	));
     aBibTypeArr[5] = String(BibResId(ST_TYPE_INCOLLECTION));
     aBibTypeArr[6] = String(BibResId(ST_TYPE_INPROCEEDINGS));
-    aBibTypeArr[7] = String(BibResId(ST_TYPE_JOURNAL       ));
-    aBibTypeArr[8] = String(BibResId(ST_TYPE_MANUAL    ));
+    aBibTypeArr[7] = String(BibResId(ST_TYPE_JOURNAL	   ));
+    aBibTypeArr[8] = String(BibResId(ST_TYPE_MANUAL	   ));
     aBibTypeArr[9] = String(BibResId(ST_TYPE_MASTERSTHESIS));
-    aBibTypeArr[10] = String(BibResId(ST_TYPE_MISC      ));
-    aBibTypeArr[11] = String(BibResId(ST_TYPE_PHDTHESIS ));
-    aBibTypeArr[12] = String(BibResId(ST_TYPE_PROCEEDINGS   ));
-    aBibTypeArr[13] = String(BibResId(ST_TYPE_TECHREPORT    ));
-    aBibTypeArr[14] = String(BibResId(ST_TYPE_UNPUBLISHED   ));
-    aBibTypeArr[15] = String(BibResId(ST_TYPE_EMAIL     ));
-    aBibTypeArr[16] = String(BibResId(ST_TYPE_WWW           ));
-    aBibTypeArr[17] = String(BibResId(ST_TYPE_CUSTOM1       ));
-    aBibTypeArr[18] = String(BibResId(ST_TYPE_CUSTOM2       ));
-    aBibTypeArr[19] = String(BibResId(ST_TYPE_CUSTOM3       ));
-    aBibTypeArr[20] = String(BibResId(ST_TYPE_CUSTOM4       ));
-    aBibTypeArr[21] = String(BibResId(ST_TYPE_CUSTOM5       ));
+    aBibTypeArr[10] = String(BibResId(ST_TYPE_MISC 		));
+    aBibTypeArr[11] = String(BibResId(ST_TYPE_PHDTHESIS	));
+    aBibTypeArr[12] = String(BibResId(ST_TYPE_PROCEEDINGS	));
+    aBibTypeArr[13] = String(BibResId(ST_TYPE_TECHREPORT	));
+    aBibTypeArr[14] = String(BibResId(ST_TYPE_UNPUBLISHED	));
+    aBibTypeArr[15] = String(BibResId(ST_TYPE_EMAIL		));
+    aBibTypeArr[16] = String(BibResId(ST_TYPE_WWW			));
+    aBibTypeArr[17] = String(BibResId(ST_TYPE_CUSTOM1		));
+    aBibTypeArr[18] = String(BibResId(ST_TYPE_CUSTOM2		));
+    aBibTypeArr[19] = String(BibResId(ST_TYPE_CUSTOM3		));
+    aBibTypeArr[20] = String(BibResId(ST_TYPE_CUSTOM4		));
+    aBibTypeArr[21] = String(BibResId(ST_TYPE_CUSTOM5		));
 
     FreeResource();
 
@@ -310,7 +310,7 @@ BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan):
     // the control should be a bit smaller than the fixed text
     Size aControlSize(aIdentifierFT.GetSizePixel());
     aControlSize.Width() = aControlSize.Width() * 8 / 10;
-
+    
     AddControlWithError( lcl_GetColumnName( pMapping, IDENTIFIER_POS ), lcl_MovePoint( aIdentifierFT ),
         aControlSize, sTableErrorString, aIdentifierFT.GetText(),
         HID_BIB_IDENTIFIER_POS, 0 );
@@ -321,7 +321,7 @@ BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan):
         aAuthTypeFT.GetText(), HID_BIB_AUTHORITYTYPE_POS, 1 );
 
     ::Point aYearPos = lcl_MovePoint(aYearFT);
-    AddControlWithError( lcl_GetColumnName( pMapping, YEAR_POS ), aYearPos,
+    AddControlWithError( lcl_GetColumnName( pMapping, YEAR_POS ), aYearPos, 
         aControlSize, sTableErrorString, aYearFT.GetText(), HID_BIB_YEAR_POS, 4 );
 
     AddControlWithError( lcl_GetColumnName(pMapping, AUTHOR_POS), lcl_MovePoint(aAuthorFT),
@@ -345,19 +345,19 @@ BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan):
     AddControlWithError( lcl_GetColumnName( pMapping, CHAPTER_POS ), lcl_MovePoint(aChapterFT),
         aControlSize, sTableErrorString, aChapterFT.GetText(), HID_BIB_CHAPTER_POS, 10 );
 
-    AddControlWithError( lcl_GetColumnName( pMapping, PAGES_POS ), lcl_MovePoint( aPagesFT ),
+    AddControlWithError( lcl_GetColumnName( pMapping, PAGES_POS ), lcl_MovePoint( aPagesFT ), 
         aControlSize, sTableErrorString, aPagesFT.GetText(), HID_BIB_PAGES_POS, 19 );
 
-    AddControlWithError( lcl_GetColumnName( pMapping, EDITOR_POS ), lcl_MovePoint( aEditorFT ),
+    AddControlWithError( lcl_GetColumnName( pMapping, EDITOR_POS ), lcl_MovePoint( aEditorFT ), 
         aControlSize, sTableErrorString, aEditorFT.GetText(), HID_BIB_EDITOR_POS, 12 );
 
-    AddControlWithError( lcl_GetColumnName( pMapping, EDITION_POS ), lcl_MovePoint(aEditionFT),
+    AddControlWithError( lcl_GetColumnName( pMapping, EDITION_POS ), lcl_MovePoint(aEditionFT), 
         aControlSize, sTableErrorString, aEditionFT.GetText(), HID_BIB_EDITION_POS, 11 );
 
     AddControlWithError( lcl_GetColumnName(pMapping, BOOKTITLE_POS), lcl_MovePoint(aBooktitleFT),
         aControlSize, sTableErrorString, aBooktitleFT.GetText(), HID_BIB_BOOKTITLE_POS, 9 );
 
-    AddControlWithError( lcl_GetColumnName( pMapping, VOLUME_POS ), lcl_MovePoint( aVolumeFT ),
+    AddControlWithError( lcl_GetColumnName( pMapping, VOLUME_POS ), lcl_MovePoint( aVolumeFT ), 
         aControlSize, sTableErrorString, aVolumeFT.GetText(), HID_BIB_VOLUME_POS, 24 );
 
     AddControlWithError( lcl_GetColumnName( pMapping, HOWPUBLISHED_POS ), lcl_MovePoint( aHowpublishedFT ),
@@ -369,46 +369,46 @@ BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan):
     AddControlWithError( lcl_GetColumnName( pMapping, INSTITUTION_POS ), lcl_MovePoint( aInstitutionFT ),
         aControlSize, sTableErrorString, aInstitutionFT.GetText(), HID_BIB_INSTITUTION_POS, 14 );
 
-    AddControlWithError( lcl_GetColumnName( pMapping, SCHOOL_POS ), lcl_MovePoint( aSchoolFT ),
+    AddControlWithError( lcl_GetColumnName( pMapping, SCHOOL_POS ), lcl_MovePoint( aSchoolFT ), 
         aControlSize, sTableErrorString, aSchoolFT.GetText(), HID_BIB_SCHOOL_POS, 20 );
 
     AddControlWithError( lcl_GetColumnName( pMapping, REPORTTYPE_POS ), lcl_MovePoint( aReportTypeFT ),
         aControlSize, sTableErrorString, aReportTypeFT.GetText(), HID_BIB_REPORTTYPE_POS, 23 );
 
-    AddControlWithError( lcl_GetColumnName( pMapping, MONTH_POS ), lcl_MovePoint( aMonthFT ),
+    AddControlWithError( lcl_GetColumnName( pMapping, MONTH_POS ), lcl_MovePoint( aMonthFT ), 
         aControlSize, sTableErrorString, aMonthFT.GetText(), HID_BIB_MONTH_POS, 3 );
 
     AddControlWithError( lcl_GetColumnName( pMapping, JOURNAL_POS ), lcl_MovePoint( aJournalFT ),
         aControlSize, sTableErrorString, aJournalFT.GetText(), HID_BIB_JOURNAL_POS, 15 );
 
-    AddControlWithError( lcl_GetColumnName( pMapping, NUMBER_POS ), lcl_MovePoint( aNumberFT ),
+    AddControlWithError( lcl_GetColumnName( pMapping, NUMBER_POS ), lcl_MovePoint( aNumberFT ), 
         aControlSize, sTableErrorString, aNumberFT.GetText(), HID_BIB_NUMBER_POS, 17 );
 
-    AddControlWithError( lcl_GetColumnName( pMapping, SERIES_POS ), lcl_MovePoint( aSeriesFT ),
+    AddControlWithError( lcl_GetColumnName( pMapping, SERIES_POS ), lcl_MovePoint( aSeriesFT ), 
         aControlSize, sTableErrorString, aSeriesFT.GetText(), HID_BIB_SERIES_POS, 21 );
 
-    AddControlWithError( lcl_GetColumnName( pMapping, ANNOTE_POS ), lcl_MovePoint( aAnnoteFT ),
+    AddControlWithError( lcl_GetColumnName( pMapping, ANNOTE_POS ), lcl_MovePoint( aAnnoteFT ), 
         aControlSize, sTableErrorString, aAnnoteFT.GetText(), HID_BIB_ANNOTE_POS, 8 );
 
-    AddControlWithError( lcl_GetColumnName( pMapping, NOTE_POS ), lcl_MovePoint( aNoteFT ),
+    AddControlWithError( lcl_GetColumnName( pMapping, NOTE_POS ), lcl_MovePoint( aNoteFT ), 
         aControlSize, sTableErrorString, aNoteFT.GetText(), HID_BIB_NOTE_POS, 16 );
 
-    AddControlWithError( lcl_GetColumnName( pMapping, URL_POS ), lcl_MovePoint( aURLFT ),
+    AddControlWithError( lcl_GetColumnName( pMapping, URL_POS ), lcl_MovePoint( aURLFT ), 
         aControlSize, sTableErrorString, aURLFT.GetText(), HID_BIB_URL_POS, 25 );
 
     AddControlWithError( lcl_GetColumnName( pMapping, CUSTOM1_POS ), lcl_MovePoint( aCustom1FT ),
         aControlSize, sTableErrorString, aCustom1FT.GetText(), HID_BIB_CUSTOM1_POS, 26 );
 
-    AddControlWithError( lcl_GetColumnName( pMapping, CUSTOM2_POS ), lcl_MovePoint( aCustom2FT ),
+    AddControlWithError( lcl_GetColumnName( pMapping, CUSTOM2_POS ), lcl_MovePoint( aCustom2FT ), 
         aControlSize, sTableErrorString, aCustom2FT.GetText(), HID_BIB_CUSTOM2_POS, 27 );
 
-    AddControlWithError( lcl_GetColumnName( pMapping, CUSTOM3_POS ), lcl_MovePoint( aCustom3FT ),
+    AddControlWithError( lcl_GetColumnName( pMapping, CUSTOM3_POS ), lcl_MovePoint( aCustom3FT ), 
         aControlSize, sTableErrorString, aCustom3FT.GetText(), HID_BIB_CUSTOM3_POS, 28 );
 
-    AddControlWithError( lcl_GetColumnName( pMapping, CUSTOM4_POS ), lcl_MovePoint( aCustom4FT ),
+    AddControlWithError( lcl_GetColumnName( pMapping, CUSTOM4_POS ), lcl_MovePoint( aCustom4FT ), 
         aControlSize, sTableErrorString, aCustom4FT.GetText(), HID_BIB_CUSTOM4_POS, 29 );
 
-    AddControlWithError( lcl_GetColumnName( pMapping, CUSTOM5_POS ), lcl_MovePoint( aCustom5FT ),
+    AddControlWithError( lcl_GetColumnName( pMapping, CUSTOM5_POS ), lcl_MovePoint( aCustom5FT ), 
         aControlSize, sTableErrorString, aCustom5FT.GetText(), HID_BIB_CUSTOM5_POS, 30 );
 
     xPosListener = new BibPosListener(this);
@@ -468,8 +468,8 @@ void BibGeneralPage::AddControlWithError( const OUString& rColumnName, const ::P
 {
     // adds also the XControl and creates a map entry in nFT2CtrlMap[] for mapping between control and FT
 
-    INT16                                   nIndex = -1;
-    uno::Reference< awt::XControlModel >    xTmp = AddXControl(rColumnName, rPos, rSize, nHelpId, nIndex );
+    INT16									nIndex = -1;
+    uno::Reference< awt::XControlModel >	xTmp = AddXControl(rColumnName, rPos, rSize, nHelpId, nIndex );
     if( xTmp.is() )
     {
         DBG_ASSERT( nIndexInFTArray < FIELD_COUNT, "*BibGeneralPage::AddControlWithError(): wrong array index!" );
@@ -562,9 +562,9 @@ uno::Reference< awt::XControlModel >  BibGeneralPage::AddXControl(
 
                     // Peer als Child zu dem FrameWindow
                     xCtrlContnr->addControl(rName, xControl);
-                    uno::Reference< awt::XWindow >  xCtrWin(xControl, UNO_QUERY );
+                    uno::Reference< awt::XWindow >	xCtrWin(xControl, UNO_QUERY );
                     xCtrWin->addFocusListener( this );
-                    rIndex = -1;    // -> implies, that not found
+                    rIndex = -1;	// -> implies, that not found
                     for(USHORT i = 0; i < FIELD_COUNT; i++)
                         if(!aControls[i].is())
                         {
@@ -585,7 +585,7 @@ uno::Reference< awt::XControlModel >  BibGeneralPage::AddXControl(
     }
     catch(Exception& rEx)
     {
-        (void) rEx; // make compiler happy
+        (void) rEx;	// make compiler happy
         DBG_ERROR("BibGeneralPage::AddXControl: something went wrong !");
     }
     return xCtrModel;
@@ -634,7 +634,7 @@ void BibGeneralPage::AdjustScrollbars()
     if(bHoriVisible)
         aControlParentWinSz.Height() -=  aSize.Height();
     if(bVertVisible)
-        aControlParentWinSz.Width() -=  aSize.Width();
+        aControlParentWinSz.Width() -=	aSize.Width();
     aControlParentWin.SetSizePixel(aControlParentWinSz);
 }
 
@@ -648,39 +648,39 @@ void BibGeneralPage::Resize()
 
 void BibGeneralPage::InitFixedTexts( void )
 {
-    String      aFixedStrings[ FIELD_COUNT ] =
+    String		aFixedStrings[ FIELD_COUNT ] =
     {
-        String( BibResId( ST_IDENTIFIER     ) ),
-        String( BibResId( ST_AUTHTYPE       ) ),
-        String( BibResId( ST_AUTHOR         ) ),
-        String( BibResId( ST_TITLE          ) ),
-        String( BibResId( ST_MONTH          ) ),
-        String( BibResId( ST_YEAR           ) ),
-        String( BibResId( ST_ISBN           ) ),
-        String( BibResId( ST_BOOKTITLE      ) ),
-        String( BibResId( ST_CHAPTER        ) ),
-        String( BibResId( ST_EDITION        ) ),
-        String( BibResId( ST_EDITOR         ) ),
-        String( BibResId( ST_HOWPUBLISHED   ) ),
-        String( BibResId( ST_INSTITUTION    ) ),
-        String( BibResId( ST_JOURNAL        ) ),
-        String( BibResId( ST_NOTE           ) ),
-        String( BibResId( ST_ANNOTE         ) ),
-        String( BibResId( ST_NUMBER         ) ),
-        String( BibResId( ST_ORGANIZATION   ) ),
-        String( BibResId( ST_PAGE           ) ),
-        String( BibResId( ST_PUBLISHER      ) ),
-        String( BibResId( ST_ADDRESS        ) ),
-        String( BibResId( ST_SCHOOL         ) ),
-        String( BibResId( ST_SERIES         ) ),
-        String( BibResId( ST_REPORT         ) ),
-        String( BibResId( ST_VOLUME         ) ),
-        String( BibResId( ST_URL            ) ),
-        String( BibResId( ST_CUSTOM1        ) ),
-        String( BibResId( ST_CUSTOM2        ) ),
-        String( BibResId( ST_CUSTOM3        ) ),
-        String( BibResId( ST_CUSTOM4        ) ),
-        String( BibResId( ST_CUSTOM5        ) )
+        String( BibResId( ST_IDENTIFIER		) ),
+        String( BibResId( ST_AUTHTYPE		) ),
+        String( BibResId( ST_AUTHOR			) ),
+        String( BibResId( ST_TITLE			) ),
+        String( BibResId( ST_MONTH			) ),
+        String( BibResId( ST_YEAR 			) ),
+        String( BibResId( ST_ISBN 			) ),
+        String( BibResId( ST_BOOKTITLE		) ),
+        String( BibResId( ST_CHAPTER		) ),
+        String( BibResId( ST_EDITION		) ),
+        String( BibResId( ST_EDITOR			) ),
+        String( BibResId( ST_HOWPUBLISHED	) ),
+        String( BibResId( ST_INSTITUTION	) ),
+        String( BibResId( ST_JOURNAL		) ),
+        String( BibResId( ST_NOTE 			) ),
+        String( BibResId( ST_ANNOTE			) ),
+        String( BibResId( ST_NUMBER			) ),
+        String( BibResId( ST_ORGANIZATION	) ),
+        String( BibResId( ST_PAGE 			) ),
+        String( BibResId( ST_PUBLISHER		) ),
+        String( BibResId( ST_ADDRESS		) ),
+        String( BibResId( ST_SCHOOL			) ),
+        String( BibResId( ST_SERIES			) ),
+        String( BibResId( ST_REPORT			) ),
+        String( BibResId( ST_VOLUME			) ),
+        String( BibResId( ST_URL			) ),
+        String( BibResId( ST_CUSTOM1		) ),
+        String( BibResId( ST_CUSTOM2		) ),
+        String( BibResId( ST_CUSTOM3		) ),
+        String( BibResId( ST_CUSTOM4		) ),
+        String( BibResId( ST_CUSTOM5		) )
     };
 
     aFixedTexts[0] = &aIdentifierFT;
@@ -715,9 +715,9 @@ void BibGeneralPage::InitFixedTexts( void )
     aFixedTexts[29] = &aCustom4FT;
     aFixedTexts[30] = &aCustom5FT;
 
-    int                 i;
+    int					i;
 
-    MnemonicGenerator   aMnemonicGenerator;
+    MnemonicGenerator	aMnemonicGenerator;
     // init mnemonics, first register all strings
     for( i = 0 ; i < FIELD_COUNT ; ++i )
         aMnemonicGenerator.RegisterMnemonic( aFixedStrings[ i ] );
@@ -812,7 +812,7 @@ void BibGeneralPage::disposing(const lang::EventObject& /*Source*/) throw( uno::
 
 void BibGeneralPage::GetFocus()
 {
-    Reference< awt::XWindow >*  pxControl = aControls;
+    Reference< awt::XWindow >*	pxControl = aControls;
 
     for( int i = FIELD_COUNT ; i ; --i, ++pxControl )
     {
@@ -831,40 +831,40 @@ BOOL BibGeneralPage::HandleShortCutKey( const KeyEvent& rKeyEvent )
 {
     DBG_ASSERT( KEY_MOD2 == rKeyEvent.GetKeyCode().GetModifier(), "+BibGeneralPage::HandleShortCutKey(): this is not for me!" );
 
-    const vcl::I18nHelper&      rI18nHelper = Application::GetSettings().GetUILocaleI18nHelper();
-    const xub_Unicode           c = rKeyEvent.GetCharCode();
-    BOOL                        bHandled = FALSE;
+    const vcl::I18nHelper&		rI18nHelper = Application::GetSettings().GetUILocaleI18nHelper();
+    const xub_Unicode			c = rKeyEvent.GetCharCode();
+    BOOL						bHandled = FALSE;
 
-    sal_Int16                   i;
+    sal_Int16					i;
 
-    typedef std::vector< sal_Int16 >    sal_Int16_vector;
+    typedef std::vector< sal_Int16 >	sal_Int16_vector;
 
-    sal_Int16_vector::size_type nFocused = 0xFFFF;  // index of focused in vector, no one focused initial
+    sal_Int16_vector::size_type	nFocused = 0xFFFF;	// index of focused in vector, no one focused initial
     DBG_ASSERT( nFocused > 0, "*BibGeneralPage::HandleShortCutKey(): size_type works not as expected!" );
 
-    sal_Int16_vector            aMatchList;
+    sal_Int16_vector			aMatchList;
 
     for( i = 0 ; i < FIELD_COUNT ; ++i )
     {
         if( rI18nHelper.MatchMnemonic( aFixedTexts[ i ]->GetText(), c ) )
         {
             bHandled = TRUE;
-            sal_Int16           nCtrlIndex = nFT2CtrlMap[ i ];
+            sal_Int16			nCtrlIndex = nFT2CtrlMap[ i ];
 
             if( nCtrlIndex >= 0 )
-            {   // store index of control
+            {	// store index of control
                 DBG_ASSERT( aControls[ nCtrlIndex ].is(), "-BibGeneralPage::HandleShortCutKey(): valid index and no control?" );
 
                 uno::Reference< awt::XControl >  xControl( aControls[ nCtrlIndex ], UNO_QUERY );
                 DBG_ASSERT( xControl.is(), "-BibGeneralPage::HandleShortCutKey(): a control wich is not a control!" );
 
-                Window*         pWindow = VCLUnoHelper::GetWindow( xControl->getPeer() );
+                Window*			pWindow = VCLUnoHelper::GetWindow( xControl->getPeer() );
 
                 if( pWindow )
                 {
                     aMatchList.push_back( nCtrlIndex );
                     if( pWindow->HasChildPathFocus() )
-                    {   // save focused control
+                    {	// save focused control
                         DBG_ASSERT( nFocused == 0xFFFF, "+BibGeneralPage::HandleShortCutKey(): more than one with focus?!" );
                         DBG_ASSERT( aMatchList.size() > 0, "+BibGeneralPage::HandleShortCutKey(): push_back and no content?!" );
                         nFocused = aMatchList.size() - 1;
diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx
index 2db696bbe1f3..5f2211cbdaba 100644
--- a/extensions/source/bibliography/general.hxx
+++ b/extensions/source/bibliography/general.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 cppu::WeakAggImplHelper1 < ::com::sun::star::awt::XFocusListener > BibGe
 
 class BibGeneralPage: public BibGeneralPageBaseClass, public BibTabPage
 {
-    Window              aControlParentWin;
-    FixedText           aIdentifierFT;
-    FixedText           aAuthTypeFT;
+    Window				aControlParentWin;
+    FixedText			aIdentifierFT;
+    FixedText			aAuthTypeFT;
     FixedText           aYearFT;
 
-    FixedText           aAuthorFT;
+    FixedText			aAuthorFT;
     FixedText           aTitleFT;
 
-    FixedText           aPublisherFT;
+    FixedText			aPublisherFT;
     FixedText           aAddressFT;
     FixedText           aISBNFT;
 
     FixedText           aChapterFT;
     FixedText           aPagesFT;
     FixedLine           aFirstFL;
-
+    
     FixedText           aEditorFT;
     FixedText           aEditionFT;
-
+    
     FixedText           aBooktitleFT;
     FixedText           aVolumeFT;
     FixedText           aHowpublishedFT;
-
+    
     FixedText           aOrganizationsFT;
     FixedText           aInstitutionFT;
     FixedText           aSchoolFT;
-
+    
     FixedText           aReportTypeFT;
     FixedText           aMonthFT;
     FixedLine           aSecondFL;
-
+    
     FixedText           aJournalFT;
     FixedText           aNumberFT;
     FixedText           aSeriesFT;
-
+    
     FixedText           aAnnoteFT;
     FixedText           aNoteFT;
     FixedText           aURLFT;
     FixedLine           aThirdFL;
 
     FixedText           aCustom1FT;
-    FixedText           aCustom2FT;
-    FixedText           aCustom3FT;
-    FixedText           aCustom4FT;
-    FixedText           aCustom5FT;
+    FixedText			aCustom2FT;
+    FixedText			aCustom3FT;
+    FixedText			aCustom4FT;
+    FixedText			aCustom5FT;
 
-    ScrollBar           aHoriScroll;
-    ScrollBar           aVertScroll;
+    ScrollBar			aHoriScroll;
+    ScrollBar			aVertScroll;
 
-    FixedText*          aFixedTexts[ FIELD_COUNT ];
-    sal_Int16           nFT2CtrlMap[ FIELD_COUNT ];
+    FixedText*			aFixedTexts[ FIELD_COUNT ];
+    sal_Int16			nFT2CtrlMap[ FIELD_COUNT ];
 
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >
                         aControls[ FIELD_COUNT ];
 
-    Size                aStdSize;
-    Point               aBasePos;
+    Size				aStdSize;
+    Point				aBasePos;
 
-    String              aBibTypeArr[ TYPE_COUNT ];
-    String              sErrorPrefix;
-    String              sTableErrorString;
+    String				aBibTypeArr[ TYPE_COUNT ];
+    String				sErrorPrefix;
+    String				sTableErrorString;
 
-    String              sTypeColumnName;
+    String				sTypeColumnName;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >
                         xCtrlContnr;
@@ -133,49 +133,49 @@ class BibGeneralPage: public BibGeneralPageBaseClass, public BibTabPage
                         xPosListener;
 
 
-    BibDataManager*     pDatMan;
+    BibDataManager*		pDatMan;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >
                                 AddXControl( const String& rName, Point aPos, Size aSize, sal_uInt16 nHelpId,
                                             sal_Int16& rIndex );
 
-    void                        AddControlWithError( const rtl::OUString& rColumnName, const Point& rPos,
+    void						AddControlWithError( const rtl::OUString& rColumnName, const Point& rPos,
                                             const Size& rSize, String& rErrorString, String aColumnUIName,
                                             sal_uInt16 nHelpId, sal_uInt16 nIndexInFTArray );
 
-    void                        AdjustScrollbars();
+    void						AdjustScrollbars();
 
     DECL_LINK( ScrollHdl, ScrollBar* );
 
 protected:
-    virtual void                Resize();
-    void                        InitFixedTexts( void );     // create mnemonics and set text an all fixed texts
+    virtual void				Resize();
+    void						InitFixedTexts( void );		// create mnemonics and set text an all fixed texts
 
 public:
                                 BibGeneralPage(Window* pParent, BibDataManager* pDatMan);
-    virtual                     ~BibGeneralPage();
+    virtual						~BibGeneralPage();
 
-    inline const String&        GetErrorString() const;
+    inline const String&		GetErrorString() const;
 
     inline const ::com::sun::star::uno::Reference< ::com::sun::star::form::XBoundComponent >&
                                 GetTypeListBoxModel() const;
     inline const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >&
                                 GetControlContainer() const;
 
-    inline BibDataManager*      GetDataManager();
+    inline BibDataManager* 		GetDataManager();
 
-    void                        CommitActiveControl();
+    void						CommitActiveControl();
 
-    virtual void SAL_CALL       disposing( const ::com::sun::star::lang::EventObject& Source ) throw( com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL		disposing( const ::com::sun::star::lang::EventObject& Source ) throw( com::sun::star::uno::RuntimeException );
 
-    void SAL_CALL               focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw( com::sun::star::uno::RuntimeException );
-    void SAL_CALL               focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw( com::sun::star::uno::RuntimeException );
+    void SAL_CALL				focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw( com::sun::star::uno::RuntimeException );
+    void SAL_CALL				focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw( com::sun::star::uno::RuntimeException );
 
-    void                        RemoveListeners();
+    void						RemoveListeners();
 
-    virtual void                GetFocus();
+    virtual void				GetFocus();
 
-    virtual BOOL                HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled
+    virtual BOOL				HandleShortCutKey( const KeyEvent& rKeyEvent );	// returns true, if key was handled
 };
 
 
diff --git a/extensions/source/bibliography/hidother.src b/extensions/source/bibliography/hidother.src
index 7517961645e3..57028fb426e1 100644
--- a/extensions/source/bibliography/hidother.src
+++ b/extensions/source/bibliography/hidother.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,35 +27,35 @@
 
 #include "bibliography.hrc"
 
-hidspecial HID_BIB_IDENTIFIER_POS                   { HelpID = HID_BIB_IDENTIFIER_POS          ; };
-hidspecial HID_BIB_AUTHORITYTYPE_POS                { HelpID = HID_BIB_AUTHORITYTYPE_POS       ; };
-hidspecial HID_BIB_AUTHOR_POS                       { HelpID = HID_BIB_AUTHOR_POS              ; };
-hidspecial HID_BIB_TITLE_POS                        { HelpID = HID_BIB_TITLE_POS               ; };
-hidspecial HID_BIB_YEAR_POS                         { HelpID = HID_BIB_YEAR_POS                ; };
-hidspecial HID_BIB_ISBN_POS                         { HelpID = HID_BIB_ISBN_POS                ; };
-hidspecial HID_BIB_BOOKTITLE_POS                    { HelpID = HID_BIB_BOOKTITLE_POS           ; };
-hidspecial HID_BIB_CHAPTER_POS                      { HelpID = HID_BIB_CHAPTER_POS             ; };
-hidspecial HID_BIB_EDITION_POS                      { HelpID = HID_BIB_EDITION_POS             ; };
-hidspecial HID_BIB_EDITOR_POS                       { HelpID = HID_BIB_EDITOR_POS              ; };
-hidspecial HID_BIB_HOWPUBLISHED_POS                 { HelpID = HID_BIB_HOWPUBLISHED_POS        ; };
-hidspecial HID_BIB_INSTITUTION_POS                  { HelpID = HID_BIB_INSTITUTION_POS         ; };
-hidspecial HID_BIB_JOURNAL_POS                      { HelpID = HID_BIB_JOURNAL_POS             ; };
-hidspecial HID_BIB_MONTH_POS                        { HelpID = HID_BIB_MONTH_POS               ; };
-hidspecial HID_BIB_NOTE_POS                         { HelpID = HID_BIB_NOTE_POS                ; };
-hidspecial HID_BIB_ANNOTE_POS                       { HelpID = HID_BIB_ANNOTE_POS              ; };
-hidspecial HID_BIB_NUMBER_POS                       { HelpID = HID_BIB_NUMBER_POS              ; };
-hidspecial HID_BIB_ORGANIZATIONS_POS                { HelpID = HID_BIB_ORGANIZATIONS_POS       ; };
-hidspecial HID_BIB_PAGES_POS                        { HelpID = HID_BIB_PAGES_POS               ; };
-hidspecial HID_BIB_PUBLISHER_POS                    { HelpID = HID_BIB_PUBLISHER_POS           ; };
-hidspecial HID_BIB_ADDRESS_POS                      { HelpID = HID_BIB_ADDRESS_POS             ; };
-hidspecial HID_BIB_SCHOOL_POS                       { HelpID = HID_BIB_SCHOOL_POS              ; };
-hidspecial HID_BIB_SERIES_POS                       { HelpID = HID_BIB_SERIES_POS              ; };
-hidspecial HID_BIB_REPORTTYPE_POS                   { HelpID = HID_BIB_REPORTTYPE_POS          ; };
-hidspecial HID_BIB_VOLUME_POS                       { HelpID = HID_BIB_VOLUME_POS              ; };
-hidspecial HID_BIB_URL_POS                          { HelpID = HID_BIB_URL_POS                 ; };
-hidspecial HID_BIB_CUSTOM1_POS                      { HelpID = HID_BIB_CUSTOM1_POS             ; };
-hidspecial HID_BIB_CUSTOM2_POS                      { HelpID = HID_BIB_CUSTOM2_POS             ; };
-hidspecial HID_BIB_CUSTOM3_POS                      { HelpID = HID_BIB_CUSTOM3_POS             ; };
-hidspecial HID_BIB_CUSTOM4_POS                      { HelpID = HID_BIB_CUSTOM4_POS             ; };
-hidspecial HID_BIB_CUSTOM5_POS                      { HelpID = HID_BIB_CUSTOM5_POS             ; };
+hidspecial HID_BIB_IDENTIFIER_POS		   	 		{ HelpID = HID_BIB_IDENTIFIER_POS		   ; };
+hidspecial HID_BIB_AUTHORITYTYPE_POS	   	 		{ HelpID = HID_BIB_AUTHORITYTYPE_POS	   ; };
+hidspecial HID_BIB_AUTHOR_POS              	 		{ HelpID = HID_BIB_AUTHOR_POS              ; };
+hidspecial HID_BIB_TITLE_POS               	 		{ HelpID = HID_BIB_TITLE_POS               ; };
+hidspecial HID_BIB_YEAR_POS                	 		{ HelpID = HID_BIB_YEAR_POS                ; };
+hidspecial HID_BIB_ISBN_POS                	 		{ HelpID = HID_BIB_ISBN_POS                ; };
+hidspecial HID_BIB_BOOKTITLE_POS           	 		{ HelpID = HID_BIB_BOOKTITLE_POS           ; };
+hidspecial HID_BIB_CHAPTER_POS             	 		{ HelpID = HID_BIB_CHAPTER_POS             ; };
+hidspecial HID_BIB_EDITION_POS             	 		{ HelpID = HID_BIB_EDITION_POS             ; };
+hidspecial HID_BIB_EDITOR_POS              	 		{ HelpID = HID_BIB_EDITOR_POS              ; };
+hidspecial HID_BIB_HOWPUBLISHED_POS        	 		{ HelpID = HID_BIB_HOWPUBLISHED_POS        ; };
+hidspecial HID_BIB_INSTITUTION_POS         	 		{ HelpID = HID_BIB_INSTITUTION_POS         ; };
+hidspecial HID_BIB_JOURNAL_POS             	 		{ HelpID = HID_BIB_JOURNAL_POS             ; };
+hidspecial HID_BIB_MONTH_POS               	 		{ HelpID = HID_BIB_MONTH_POS               ; };
+hidspecial HID_BIB_NOTE_POS                	 		{ HelpID = HID_BIB_NOTE_POS                ; };
+hidspecial HID_BIB_ANNOTE_POS              	 		{ HelpID = HID_BIB_ANNOTE_POS              ; };
+hidspecial HID_BIB_NUMBER_POS              	 		{ HelpID = HID_BIB_NUMBER_POS              ; };
+hidspecial HID_BIB_ORGANIZATIONS_POS       	 		{ HelpID = HID_BIB_ORGANIZATIONS_POS       ; };
+hidspecial HID_BIB_PAGES_POS               	 		{ HelpID = HID_BIB_PAGES_POS               ; };
+hidspecial HID_BIB_PUBLISHER_POS           	 		{ HelpID = HID_BIB_PUBLISHER_POS           ; };
+hidspecial HID_BIB_ADDRESS_POS             	 		{ HelpID = HID_BIB_ADDRESS_POS             ; };
+hidspecial HID_BIB_SCHOOL_POS              	 		{ HelpID = HID_BIB_SCHOOL_POS              ; };
+hidspecial HID_BIB_SERIES_POS              	 		{ HelpID = HID_BIB_SERIES_POS              ; };
+hidspecial HID_BIB_REPORTTYPE_POS          	 		{ HelpID = HID_BIB_REPORTTYPE_POS          ; };
+hidspecial HID_BIB_VOLUME_POS              	 		{ HelpID = HID_BIB_VOLUME_POS              ; };
+hidspecial HID_BIB_URL_POS                 	 		{ HelpID = HID_BIB_URL_POS                 ; };
+hidspecial HID_BIB_CUSTOM1_POS             	 		{ HelpID = HID_BIB_CUSTOM1_POS             ; };
+hidspecial HID_BIB_CUSTOM2_POS             	 		{ HelpID = HID_BIB_CUSTOM2_POS             ; };
+hidspecial HID_BIB_CUSTOM3_POS             	 		{ HelpID = HID_BIB_CUSTOM3_POS             ; };
+hidspecial HID_BIB_CUSTOM4_POS             	 		{ HelpID = HID_BIB_CUSTOM4_POS             ; };
+hidspecial HID_BIB_CUSTOM5_POS             	 		{ HelpID = HID_BIB_CUSTOM5_POS             ; };
 hidspecial HID_BIB_DB_GRIDCTRL                      { HelpID = HID_BIB_DB_GRIDCTRL             ; };
diff --git a/extensions/source/bibliography/loadlisteneradapter.cxx b/extensions/source/bibliography/loadlisteneradapter.cxx
index ff71292c9e7f..928fb020ac4d 100644
--- a/extensions/source/bibliography/loadlisteneradapter.cxx
+++ b/extensions/source/bibliography/loadlisteneradapter.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -144,7 +144,7 @@ namespace bib
                 m_pListener->_disposing( _rSource );
 
             // disconnect the listener
-            if ( m_pListener )  // may have been reset whilest calling into _disposing
+            if ( m_pListener )	// may have been reset whilest calling into _disposing
                 m_pListener->setAdapter( NULL );
         }
 
@@ -235,7 +235,7 @@ namespace bib
     }
 
 //.........................................................................
-}   // namespace bib
+}	// namespace bib
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/bibliography/loadlisteneradapter.hxx b/extensions/source/bibliography/loadlisteneradapter.hxx
index c37384e4d266..c35cb939b5b0 100644
--- a/extensions/source/bibliography/loadlisteneradapter.hxx
+++ b/extensions/source/bibliography/loadlisteneradapter.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace bib
         friend class OComponentAdapterBase;
 
     private:
-        OComponentAdapterBase*  m_pAdapter;
-        ::osl::Mutex&           m_rMutex;
+        OComponentAdapterBase*	m_pAdapter;
+        ::osl::Mutex&			m_rMutex;
     protected:
         OComponentListener( ::osl::Mutex& _rMutex )
             :m_pAdapter( NULL )
@@ -77,10 +77,10 @@ namespace bib
     private:
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
                                             m_xComponent;
-        OComponentListener*                 m_pListener;
-        sal_Int32                           m_nLockCount;
-        sal_Bool                            m_bListening    : 1;
-        sal_Bool                            m_bAutoRelease  : 1;
+        OComponentListener*					m_pListener;
+        sal_Int32							m_nLockCount;
+        sal_Bool							m_bListening	: 1;
+        sal_Bool							m_bAutoRelease	: 1;
 
         // impl method for dispose - virtual, 'cause you at least need to remove the listener from the broadcaster
         virtual void disposing() = 0;
@@ -88,11 +88,11 @@ namespace bib
     protected:
         // attribute access for derivees
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >&
-                                getComponent() const    { return m_xComponent; }
-        OComponentListener*     getListener()           { return m_pListener; }
+                                getComponent() const	{ return m_xComponent; }
+        OComponentListener*		getListener()			{ return m_pListener; }
 
         // to be called by derivees which started listening at the component
-        virtual void    startComponentListening() = 0;
+        virtual	void	startComponentListening() = 0;
 
         virtual ~OComponentAdapterBase();
 
@@ -113,7 +113,7 @@ namespace bib
 
     // helper
         /// get the lock count
-        sal_Int32   locked() const { return m_nLockCount; }
+        sal_Int32	locked() const { return m_nLockCount; }
 
         /// dispose the object - stop listening and such
         void dispose();
@@ -144,17 +144,17 @@ namespace bib
     //=====================================================================
     //= OLoadListenerAdapter
     //=====================================================================
-    typedef ::cppu::WeakImplHelper1< ::com::sun::star::form::XLoadListener >    OLoadListenerAdapter_Base;
+    typedef	::cppu::WeakImplHelper1< ::com::sun::star::form::XLoadListener >	OLoadListenerAdapter_Base;
     class OLoadListenerAdapter
         :public OLoadListenerAdapter_Base
         ,public OComponentAdapterBase
     {
     protected:
-        OLoadListener*      getLoadListener( )  { return static_cast< OLoadListener* >( getListener() ); }
+        OLoadListener*		getLoadListener( )	{ return static_cast< OLoadListener* >( getListener() ); }
 
     protected:
-        virtual void    disposing();
-        virtual void    startComponentListening();
+        virtual void	disposing();
+        virtual	void	startComponentListening();
 
     public:
         OLoadListenerAdapter(
@@ -179,7 +179,7 @@ namespace bib
     };
 
 //.........................................................................
-}   // namespace bib
+}	// namespace bib
 //.........................................................................
 
 #endif // EXTENSIONS_BIB_LOADLISTENERADAPTER_HXX
diff --git a/extensions/source/bibliography/menu.src b/extensions/source/bibliography/menu.src
index 0ccc8a1c7f41..6b8adc355fb1 100644
--- a/extensions/source/bibliography/menu.src
+++ b/extensions/source/bibliography/menu.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 /*
 
-The menu bar resource has become obsolete. You find the menu bar definition
+The menu bar resource has become obsolete. You find the menu bar definition 
 now at: <project>/uiconfig/sbibliography/menubar/menubar.xml
 
 */
diff --git a/extensions/source/bibliography/sections.hrc b/extensions/source/bibliography/sections.hrc
index 5d146e04ce53..2488f4ed62df 100644
--- a/extensions/source/bibliography/sections.hrc
+++ b/extensions/source/bibliography/sections.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,82 +28,82 @@
 #include "bib.hrc"
 
 //General
-/*#define FT_FIRST_MIDDLE       1
-#define ED_FIRST            2
-#define ED_MIDDLE           3
-#define FT_NAME_SUFFIX      4
-#define ED_NAME             5
-#define CB_SUFFIX           6
-#define ED_INITIALS         8
-#define FT_COMPANY          9
-#define ED_COMPANY          10
-#define FT_DEPARTMENT       11
-#define ED_DEPARTMENT       12
-#define FT_SALUTATION       13
-#define CB_SALUTATION       14
-#define FT_SHOWNNAME        15
-#define ED_SHOWNNAME        16*/
-#define FT_IDENTIFIER       1
-#define FT_AUTHTYPE         2
-#define FT_AUTHOR           3
-#define FT_YEAR             4
-#define FT_ISBN             5
+/*#define FT_FIRST_MIDDLE		1
+#define ED_FIRST			2
+#define ED_MIDDLE			3
+#define FT_NAME_SUFFIX		4
+#define ED_NAME				5
+#define CB_SUFFIX			6
+#define ED_INITIALS			8
+#define FT_COMPANY			9
+#define ED_COMPANY			10
+#define FT_DEPARTMENT		11
+#define ED_DEPARTMENT		12
+#define FT_SALUTATION		13
+#define CB_SALUTATION		14
+#define FT_SHOWNNAME		15
+#define ED_SHOWNNAME		16*/
+#define FT_IDENTIFIER		1
+#define FT_AUTHTYPE	        2
+#define FT_AUTHOR		    3
+#define FT_YEAR		        4
+#define FT_ISBN		        5
 
-#define FT_MONTH            6
+#define FT_MONTH			6
 
-#define FT_PUBLISHER        8
+#define FT_PUBLISHER		8
 
-#define FT_ADDRESS          9
-#define FT_ANNOTE           10
-#define FT_BOOKTITLE        11
-#define FT_CHAPTER          12
-#define FT_EDITION          13
-#define FT_EDITOR           14
-#define FT_HOWPUBLISHED     15
-#define FT_INSTITUTION      16
-#define FT_JOURNAL          17
-#define FT_NOTE             18
-#define FT_NUMBER           19
-#define FT_ORGANIZATION     20
-#define FT_PAGE             21
-#define FT_SCHOOL           22
-#define FT_SERIES           23
-#define FT_TITLE            24
-#define FT_REPORT           25
-#define FT_VOLUME           26
-#define FT_URL              27
-#define FT_CUSTOM1          28
-#define FT_CUSTOM2          29
-#define FT_CUSTOM3          30
-#define FT_CUSTOM4          31
-#define FT_CUSTOM5          32
-#define ST_ERROR_PREFIX     33
+#define FT_ADDRESS		    9
+#define FT_ANNOTE			10
+#define FT_BOOKTITLE		11
+#define FT_CHAPTER		    12
+#define FT_EDITION		    13
+#define FT_EDITOR			14
+#define FT_HOWPUBLISHED	    15
+#define FT_INSTITUTION	    16
+#define FT_JOURNAL		    17
+#define FT_NOTE			    18
+#define FT_NUMBER			19
+#define FT_ORGANIZATION	    20
+#define FT_PAGE			    21
+#define FT_SCHOOL			22
+#define FT_SERIES			23
+#define FT_TITLE			24
+#define FT_REPORT			25
+#define FT_VOLUME			26
+#define FT_URL			    27
+#define FT_CUSTOM1		    28
+#define FT_CUSTOM2		    29
+#define FT_CUSTOM3		    30
+#define FT_CUSTOM4		    31
+#define FT_CUSTOM5		    32
+#define ST_ERROR_PREFIX		33
 #define FL_1                34
 #define FL_2                35
 #define FL_3                36
 
 //Business Address
-#define FT_OFFICE       1
-#define FT_STREET       2
-#define FT_CITY         3
-#define FT_STATE        4
-#define FT_COUNTRY      5
-#define FT_ZIP          6
-#define ED_OFFICE       7
-#define ED_STREET       8
-#define ED_CITY         9
-#define ED_STATE        10
-#define ED_COUNTRY      11
-#define ED_ZIP          12
-#define ED_POBOX        13
+#define FT_OFFICE		1
+#define FT_STREET		2
+#define FT_CITY			3
+#define FT_STATE		4
+#define FT_COUNTRY		5
+#define FT_ZIP			6
+#define ED_OFFICE		7
+#define ED_STREET		8
+#define ED_CITY			9
+#define ED_STATE		10
+#define ED_COUNTRY		11
+#define ED_ZIP			12
+#define ED_POBOX		13
 
 
 //Popup SectionControl
-#define PU_INSERT       1
-#define PU_REMOVE       2
-#define PU_CHG_NAME     3
+#define PU_INSERT		1
+#define PU_REMOVE		2
+#define PU_CHG_NAME		3
 
-#define ST_TYPE_ARTICLE                 40
+#define ST_TYPE_ARTICLE					40
 #define ST_TYPE_BOOK                    41
 #define ST_TYPE_BOOKLET                 42
 #define ST_TYPE_CONFERENCE              43
diff --git a/extensions/source/bibliography/sections.src b/extensions/source/bibliography/sections.src
index 19501bd0e62a..3f7fe83d5fba 100644
--- a/extensions/source/bibliography/sections.src
+++ b/extensions/source/bibliography/sections.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 #define FT_POS          12
 #define FTSIZE_LEFT     88
-#define ED_POS_LEFT     FT_POS+FTSIZE_LEFT+1
+#define ED_POS_LEFT		FT_POS+FTSIZE_LEFT+1
 #define ED_SIZE         70
-#define ED_POS_LEFT2    ED_POS_LEFT + ED_SIZE +1
-#define FT_POS_MIDDLE   ED_POS_LEFT2 + 5
-#define FT_POS_RIGHT    FT_POS_MIDDLE + FT_POS_MIDDLE - FT_POS
+#define ED_POS_LEFT2	ED_POS_LEFT + ED_SIZE +1
+#define FT_POS_MIDDLE	ED_POS_LEFT2 + 5
+#define FT_POS_RIGHT 	FT_POS_MIDDLE + FT_POS_MIDDLE - FT_POS
 
 #define FL_POS          6
 #define PAGE_WIDTH      FT_POS_RIGHT + FTSIZE_LEFT + (FTSIZE_LEFT * 8 / 10) + FL_POS + 5
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 1cfb4726068d..dc801d27f808 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ void BibToolBarListener::statusChanged(const ::com::sun::star::frame::FeatureSta
     }
 };
 
-rtl::OUString   BibToolBarListener::GetCommand()
+rtl::OUString	BibToolBarListener::GetCommand()
 {
     return aCommand;
 }
@@ -166,7 +166,7 @@ void BibTBQueryMenuListener::statusChanged(const frame::FeatureStateEvent& rEvt)
                 sal_uInt16 nID=pToolBar->InsertFilterItem(String(pStringArray[i]));
                 if(pStringArray[i]==rEvt.FeatureDescriptor)
                 {
-//                  XubString aStr = rEvt.FeatureDescriptor;
+//					XubString aStr = rEvt.FeatureDescriptor;
                     pToolBar->SelectFilterItem(nID);
                 }
             }
@@ -231,7 +231,7 @@ BibToolBar::BibToolBar(Window* pParent, Link aLink, WinBits nStyle):
     aLBSource.SetDropDownLineCount(9);
     aLBSource.Show();
     aLBSource.SetSelectHdl(LINK( this, BibToolBar, SelHdl));
-
+    
     SvtMiscOptions().AddListenerLink( LINK( this, BibToolBar, OptionsChanged_Impl ) );
     Application::AddEventListener( LINK( this, BibToolBar, SettingsChanged_Impl ) );
 
@@ -272,10 +272,10 @@ BibToolBar::~BibToolBar()
 
 void BibToolBar::InitListener()
 {
-    sal_uInt16  nCount=GetItemCount();
+    sal_uInt16	nCount=GetItemCount();
 
     uno::Reference< lang::XMultiServiceFactory >  xMgr = comphelper::getProcessServiceFactory();
-    uno::Reference< frame::XDispatch >  xDisp(xController,UNO_QUERY);
+    uno::Reference< frame::XDispatch >	xDisp(xController,UNO_QUERY);
 
     uno::Reference< util::XURLTransformer >  xTrans ( xMgr->createInstance( C2U("com.sun.star.util.URLTransformer") ), UNO_QUERY );
     if( xTrans.is() )
@@ -330,7 +330,7 @@ void BibToolBar::SetXController(const uno::Reference< frame::XController > & xCt
 
 void BibToolBar::Select()
 {
-    sal_uInt16  nId=GetCurItemId();
+    sal_uInt16	nId=GetCurItemId();
 
     if(nId!=TBC_BT_AUTOFILTER)
     {
@@ -354,7 +354,7 @@ void BibToolBar::SendDispatch(sal_uInt16 nId, const Sequence< PropertyValue >& r
 {
     rtl::OUString aCommand = GetItemCommand(nId);
 
-    uno::Reference< frame::XDispatchProvider >  xDSP( xController, UNO_QUERY );
+    uno::Reference< frame::XDispatchProvider >	xDSP( xController, UNO_QUERY );
 
     if( xDSP.is() && aCommand.getLength())
     {
@@ -369,7 +369,7 @@ void BibToolBar::SendDispatch(sal_uInt16 nId, const Sequence< PropertyValue >& r
 
             xTrans->parseStrict( aURL );
 
-            uno::Reference< frame::XDispatch >  xDisp = xDSP->queryDispatch( aURL, rtl::OUString(), frame::FrameSearchFlag::SELF );
+            uno::Reference< frame::XDispatch >	xDisp = xDSP->queryDispatch( aURL, rtl::OUString(), frame::FrameSearchFlag::SELF );
 
             if ( xDisp.is() )
                     xDisp->dispatch( aURL, rArgs);
@@ -380,7 +380,7 @@ void BibToolBar::SendDispatch(sal_uInt16 nId, const Sequence< PropertyValue >& r
 
 void BibToolBar::Click()
 {
-    sal_uInt16  nId=GetCurItemId();
+    sal_uInt16	nId=GetCurItemId();
 
     if(nId == TBC_BT_COL_ASSIGN )
     {
@@ -412,7 +412,7 @@ sal_uInt16 BibToolBar::InsertFilterItem(const XubString& aMenuEntry)
 
     return nMenuId;
 }
-void BibToolBar::SelectFilterItem(sal_uInt16    nId)
+void BibToolBar::SelectFilterItem(sal_uInt16	nId)
 {
     aPopupMenu.CheckItem(nId);
     nSelMenuItem=nId;
@@ -497,7 +497,7 @@ IMPL_LINK( BibToolBar, SendSelHdl, Timer*,/*pT*/)
     Sequence<PropertyValue> aPropVal(1);
     PropertyValue* pPropertyVal = (PropertyValue*)aPropVal.getConstArray();
     pPropertyVal[0].Name = C2U("DataSourceName");
-    String aEntry( MnemonicGenerator::EraseAllMnemonicChars( aLBSource.GetSelectEntry() ) );
+    String aEntry( MnemonicGenerator::EraseAllMnemonicChars( aLBSource.GetSelectEntry() ) ); 
     rtl::OUString aSelection = aEntry;
     pPropertyVal[0].Value <<= aSelection;
     SendDispatch(TBC_LB_SOURCE,aPropVal);
@@ -510,7 +510,7 @@ IMPL_LINK( BibToolBar, MenuHdl, ToolBox*, /*pToolbox*/)
     sal_uInt16  nId=GetCurItemId();
     if(nId==TBC_BT_AUTOFILTER)
     {
-        EndSelection();     // vor SetDropMode (SetDropMode ruft SetItemImage)
+        EndSelection(); 	// vor SetDropMode (SetDropMode ruft SetItemImage)
 
         SetItemDown(TBC_BT_AUTOFILTER,sal_True);
         nId = aPopupMenu.Execute(this, GetItemRect(TBC_BT_AUTOFILTER));
@@ -542,7 +542,7 @@ IMPL_LINK( BibToolBar, MenuHdl, ToolBox*, /*pToolbox*/)
     return 0;
 }
 //-----------------------------------------------------------------------------
-void    BibToolBar::statusChanged(const frame::FeatureStateEvent& rEvent)
+void	BibToolBar::statusChanged(const frame::FeatureStateEvent& rEvent)
                                             throw( uno::RuntimeException )
 {
     for(sal_uInt16 i = 0; i < aListenerArr.Count(); i++)
@@ -579,7 +579,7 @@ IMPL_LINK( BibToolBar, OptionsChanged_Impl, void*, /*pVoid*/ )
         SetOutStyle( nOutStyle );
         bRebuildToolBar = sal_True;
     }
-
+    
     if ( bRebuildToolBar )
         RebuildToolbar();
 
@@ -597,7 +597,7 @@ IMPL_LINK( BibToolBar, SettingsChanged_Impl, void*, /*pVoid*/ )
         nSymbolsSize = eSymbolsSize;
         RebuildToolbar();
     }
-
+    
     return 0L;
 }
 
@@ -613,10 +613,10 @@ void BibToolBar::RebuildToolbar()
 
 void BibToolBar::ApplyImageList()
 {
-    ImageList& rList = ( nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ) ?
+    ImageList& rList = ( nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ) ? 
                        ( GetSettings().GetStyleSettings().GetHighContrastMode() ? aImgLstHC : aImgLst ) :
                        ( GetSettings().GetStyleSettings().GetHighContrastMode() ? aBigImgLstHC : aBigImgLst );
-
+    
     SetItemImage(TBC_BT_AUTOFILTER  , rList.GetImage(SID_FM_AUTOFILTER));
     SetItemImage(TBC_BT_FILTERCRIT  , rList.GetImage(SID_FM_FILTERCRIT));
     SetItemImage(TBC_BT_REMOVEFILTER, rList.GetImage(SID_FM_REMOVE_FILTER_SORT ));
diff --git a/extensions/source/bibliography/toolbar.hrc b/extensions/source/bibliography/toolbar.hrc
index 05c81921e44d..7349bd2c2aae 100644
--- a/extensions/source/bibliography/toolbar.hrc
+++ b/extensions/source/bibliography/toolbar.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,21 +26,21 @@
  ************************************************************************/
 #include "bib.hrc"
 
-#define TBC_FT_SOURCE       1
-#define TBC_LB_SOURCE       2
-#define TBC_FT_QUERY        3
-#define TBC_ED_QUERY        4
-#define TBC_BT_AUTOFILTER   5
-#define TBC_BT_FILTERCRIT   6
-#define TBC_BT_REMOVEFILTER 7
-#define TBC_BT_NEWCARD      8
-#define TBC_BT_EDITCARD     9
-#define TBC_BT_REMOVECARD   10
-#define TBC_BT_INSERT       11
-#define TBC_BT_UPDATE       12
-#define TBC_BT_MAIL         13
-#define TBC_BT_URL          14
-#define TBC_BT_COL_ASSIGN   15
+#define TBC_FT_SOURCE		1
+#define TBC_LB_SOURCE		2
+#define TBC_FT_QUERY		3
+#define TBC_ED_QUERY		4
+#define TBC_BT_AUTOFILTER	5
+#define TBC_BT_FILTERCRIT	6
+#define TBC_BT_REMOVEFILTER	7
+#define TBC_BT_NEWCARD		8
+#define TBC_BT_EDITCARD		9
+#define TBC_BT_REMOVECARD	10
+#define TBC_BT_INSERT		11
+#define TBC_BT_UPDATE		12
+#define TBC_BT_MAIL			13
+#define TBC_BT_URL			14
+#define TBC_BT_COL_ASSIGN 	15
 #define TBC_BT_CHANGESOURCE 16
 #define IL_TOOLBOX          17
 #define ILH_TOOLBOX         18
diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx
index fe1f615d8c2c..07775e31f121 100644
--- a/extensions/source/bibliography/toolbar.hxx
+++ b/extensions/source/bibliography/toolbar.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,27 +48,27 @@ class BibToolBarListener: public cppu::WeakImplHelper1 < ::com::sun::star::frame
 {
 private:
 
-    sal_uInt16      nIndex;
-    rtl::OUString           aCommand;
+    sal_uInt16		nIndex;
+    rtl::OUString			aCommand;
 
 protected:
 
-    BibToolBar      *pToolBar;
+    BibToolBar		*pToolBar;
 
 public:
 
     BibToolBarListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId);
     ~BibToolBarListener();
 
-    rtl::OUString           GetCommand();
+    rtl::OUString			GetCommand();
 
     // ::com::sun::star::lang::XEventListener
     // we do not hold References to dispatches, so there is nothing to do on disposal
-    virtual void    SAL_CALL disposing(const ::com::sun::star::lang::EventObject& /*Source*/)
+    virtual void	SAL_CALL disposing(const ::com::sun::star::lang::EventObject& /*Source*/)
                                             throw( ::com::sun::star::uno::RuntimeException ){};
 
     // ::com::sun::star::frame::XStatusListener
-    virtual void    SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event)
+    virtual void	SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event)
                                             throw( ::com::sun::star::uno::RuntimeException );
 
 };
@@ -80,7 +80,7 @@ public:
     BibTBListBoxListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId);
     ~BibTBListBoxListener();
 
-    virtual void    SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event)
+    virtual void	SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event)
                                             throw( ::com::sun::star::uno::RuntimeException );
 
 };
@@ -92,19 +92,19 @@ public:
     BibTBEditListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId);
     ~BibTBEditListener();
 
-    virtual void    SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event)
+    virtual void	SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event)
                                             throw( ::com::sun::star::uno::RuntimeException );
 
 };
 
-class BibTBQueryMenuListener:   public BibToolBarListener
+class BibTBQueryMenuListener:	public BibToolBarListener
 {
 public:
 
     BibTBQueryMenuListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId);
     ~BibTBQueryMenuListener();
 
-    virtual void    SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event)
+    virtual void	SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event)
                                             throw( ::com::sun::star::uno::RuntimeException );
 
 };
@@ -113,31 +113,31 @@ public:
 typedef ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener>* BibToolBarListenerPtr;
 SV_DECL_PTRARR_DEL( BibToolBarListenerArr, BibToolBarListenerPtr, 4, 4 )
 
-class BibToolBar:   public ToolBox
+class BibToolBar:	public ToolBox
 {
     private:
 
-        BibToolBarListenerArr   aListenerArr;
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >            xController;
-        Timer                   aTimer;
+        BibToolBarListenerArr	aListenerArr;
+        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >			xController;
+        Timer					aTimer;
 //      Timer                   aMenuTimer;
         ImageList               aImgLst;
         ImageList               aImgLstHC;
         ImageList               aBigImgLst;
         ImageList               aBigImgLstHC;
-        FixedText               aFtSource;
-        ListBox                 aLBSource;
-        FixedText               aFtQuery;
-        Edit                    aEdQuery;
-        PopupMenu               aPopupMenu;
-        sal_uInt16              nMenuId;
-        sal_uInt16              nSelMenuItem;
-        rtl::OUString           aQueryField;
+        FixedText				aFtSource;
+        ListBox 				aLBSource;
+        FixedText				aFtQuery;
+        Edit					aEdQuery;
+        PopupMenu				aPopupMenu;
+        sal_uInt16				nMenuId;
+        sal_uInt16				nSelMenuItem;
+        rtl::OUString			aQueryField;
         Link                    aLayoutManager;
         sal_Int16               nSymbolsSize;
         sal_Int16               nOutStyle;
 
-        BibDataManager*         pDatMan;
+        BibDataManager* 		pDatMan;
         DECL_LINK( SelHdl, ListBox* );
         DECL_LINK( SendSelHdl, Timer* );
         DECL_LINK( MenuHdl, ToolBox* );
@@ -146,13 +146,13 @@ class BibToolBar:   public ToolBox
 
         void                    ApplyImageList();
         void                    RebuildToolbar();
-
+    
     protected:
 
         void                    DataChanged( const DataChangedEvent& rDCEvt );
         void                    InitListener();
-        virtual void            Select();
-        virtual void            Click();
+        virtual void			Select();
+        virtual void			Click();
         long                    PreNotify( NotifyEvent& rNEvt );
 
 
@@ -161,26 +161,26 @@ class BibToolBar:   public ToolBox
         BibToolBar(Window* pParent, Link aLink, WinBits nStyle = WB_3DLOOK );
         ~BibToolBar();
 
-        void    SetXController(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > &);
+        void	SetXController(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > &);
 
-        void    ClearSourceList();
-        void    UpdateSourceList(sal_Bool bFlag=sal_True);
-        void    EnableSourceList(sal_Bool bFlag=sal_True);
-        void    InsertSourceEntry(const XubString&,sal_uInt16 nPos=LISTBOX_APPEND );
-        void    SelectSourceEntry(const XubString& );
+        void	ClearSourceList();
+        void	UpdateSourceList(sal_Bool bFlag=sal_True);
+        void	EnableSourceList(sal_Bool bFlag=sal_True);
+        void	InsertSourceEntry(const XubString&,sal_uInt16 nPos=LISTBOX_APPEND );
+        void	SelectSourceEntry(const XubString& );
 
-        void    EnableQuery(sal_Bool bFlag=sal_True);
-        void    SetQueryString(const XubString& );
+        void	EnableQuery(sal_Bool bFlag=sal_True);
+        void	SetQueryString(const XubString& );
         void    AdjustToolBox();
 
-        void    ClearFilterMenu();
-        sal_uInt16  InsertFilterItem(const XubString& );
-        void    SelectFilterItem(sal_uInt16 nId);
+        void	ClearFilterMenu();
+        sal_uInt16	InsertFilterItem(const XubString& );
+        void	SelectFilterItem(sal_uInt16 nId);
 
-        void    statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event)
+        void	statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event)
                                             throw( ::com::sun::star::uno::RuntimeException );
 
-        void    SetDatMan(BibDataManager& rDatMan) {pDatMan = &rDatMan;}
+        void	SetDatMan(BibDataManager& rDatMan) {pDatMan = &rDatMan;}
         void    SendDispatch(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs);
 };
 
diff --git a/extensions/source/bibliography/toolbar.src b/extensions/source/bibliography/toolbar.src
index b8a604587bc4..9016a4570b8b 100644
--- a/extensions/source/bibliography/toolbar.src
+++ b/extensions/source/bibliography/toolbar.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 "bibliography.hrc"
 #include "toolbar.hrc"
 
-#define MASKCOLOR   MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; };
+#define MASKCOLOR	MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; };
 
 ToolBox RID_BIB_TOOLBAR
 {
@@ -109,7 +109,7 @@ ToolBox RID_BIB_TOOLBAR
         {
             Identifier = TBC_BT_COL_ASSIGN ;
             HelpId = HID_BIB_MAPPINGDLG;
-//          Command = ".uno:Bib/Mapping" ;
+//			Command = ".uno:Bib/Mapping" ;
 //            ItemBitmap = Bitmap { File = "sc10711.bmp" ; };
             Text [ en-US ] = "Column Arrangement";
         };
diff --git a/extensions/source/config/ldap/componentdef.cxx b/extensions/source/config/ldap/componentdef.cxx
index 0943f6e0cb84..87c535d7e0ad 100644
--- a/extensions/source/config/ldap/componentdef.cxx
+++ b/extensions/source/config/ldap/componentdef.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ static uno::Reference<uno::XInterface> SAL_CALL createLdapUserProfileBe(
 }
 //------------------------------------------------------------------------------
 
-static const cppu::ImplementationEntry kImplementations_entries[] =
+static const cppu::ImplementationEntry kImplementations_entries[] = 
 {
     {
         createLdapUserProfileBe,
diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx
index 9a4747b74811..827baec0b928 100644
--- a/extensions/source/config/ldap/ldapaccess.cxx
+++ b/extensions/source/config/ldap/ldapaccess.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 namespace extensions { namespace config { namespace ldap {
 
-oslModule       LdapConnection::s_Ldap_Module = NULL;
+oslModule		LdapConnection::s_Ldap_Module = NULL;
 t_ldap_unbind_s          LdapConnection::s_p_unbind_s = NULL;
-t_ldap_simple_bind_s     LdapConnection::s_p_simple_bind_s = NULL;
+t_ldap_simple_bind_s	 LdapConnection::s_p_simple_bind_s = NULL;
 t_ldap_set_option        LdapConnection::s_p_set_option = NULL;
 t_ldap_err2string        LdapConnection::s_p_err2string = NULL;
 t_ldap_init              LdapConnection::s_p_init = NULL;
@@ -58,10 +58,10 @@ typedef int LdapErrCode;
 struct LdapMessageHolder
 {
     LdapMessageHolder() : msg(0) {}
-    ~LdapMessageHolder()
-    {
-        if (msg)
-            (*LdapConnection::s_p_msgfree)(msg);
+    ~LdapMessageHolder() 
+    { 
+        if (msg) 
+            (*LdapConnection::s_p_msgfree)(msg); 
     }
 
     LDAPMessage * msg;
@@ -71,16 +71,16 @@ private:
     void operator=(LdapMessageHolder const&);
 };
 //------------------------------------------------------------------------------
-LdapConnection::~LdapConnection()
+LdapConnection::~LdapConnection() 
 {
     if (isValid()) disconnect();
 }
 //------------------------------------------------------------------------------
 
-void LdapConnection::disconnect()
+void LdapConnection::disconnect() 
 {
-    if (mConnection != NULL)
-    {
+    if (mConnection != NULL) 
+    { 
         (*s_p_unbind_s)(mConnection) ;
         mConnection = NULL;
     }
@@ -89,16 +89,16 @@ void LdapConnection::disconnect()
 
 static void checkLdapReturnCode(const sal_Char *aOperation,
                                 LdapErrCode aRetCode,
-                                LDAP * /*aConnection*/)
+                                LDAP * /*aConnection*/) 
 {
     if (aRetCode == LDAP_SUCCESS) { return ; }
 
     static const sal_Char *kNoSpecificMessage = "No additional information" ;
     rtl::OUStringBuffer message ;
 
-    if (aOperation != NULL)
+    if (aOperation != NULL) 
     {
-        message.appendAscii(aOperation).appendAscii(": ") ;
+        message.appendAscii(aOperation).appendAscii(": ") ; 
     }
     message.appendAscii((*LdapConnection::s_p_err2string)(aRetCode)).appendAscii(" (") ;
     sal_Char *stub = NULL ;
@@ -106,23 +106,23 @@ static void checkLdapReturnCode(const sal_Char *aOperation,
 #ifndef LDAP_OPT_SIZELIMIT // for use with OpenLDAP
     (*s_p_get_lderrno)(aConnection, NULL, &stub) ;
 #endif
-    if (stub != NULL)
+    if (stub != NULL) 
     {
         message.appendAscii(stub) ;
         // It would seem the message returned is actually
         // not a copy of a string but rather some static
-        // string itself. At any rate freeing it seems to
+        // string itself. At any rate freeing it seems to 
         // cause some undue problems at least on Windows.
         // This call is thus disabled for the moment.
         //(*s_p_memfree)(stub) ;
     }
     else { message.appendAscii(kNoSpecificMessage) ; }
     message.appendAscii(")") ;
-    throw ldap::LdapGenericException(message.makeStringAndClear(),
+    throw ldap::LdapGenericException(message.makeStringAndClear(), 
                                      NULL, aRetCode) ;
 }
 //------------------------------------------------------------------------------
-void  LdapConnection::connectSimple(const LdapDefinition& aDefinition)
+void  LdapConnection::connectSimple(const LdapDefinition& aDefinition) 
    throw (ldap::LdapConnectionException, ldap::LdapGenericException)
 {
     OSL_ENSURE(!isValid(), "Recoonecting an LDAP connection that is already established");
@@ -132,9 +132,9 @@ void  LdapConnection::connectSimple(const LdapDefinition& aDefinition)
     connectSimple();
 }
 //------------------------------------------------------------------------------
-void  LdapConnection::connectSimple()
+void  LdapConnection::connectSimple() 
    throw (ldap::LdapConnectionException, ldap::LdapGenericException)
-{
+{    
     if (!isValid())
     {
         // Connect to the server
@@ -148,11 +148,11 @@ void  LdapConnection::connectSimple()
 #ifdef LDAP_X_OPT_CONNECT_TIMEOUT // OpenLDAP doesn't support this and the func
         /* timeout is specified in milliseconds -> 4 seconds*/
         int timeout = 4000;
-        (*s_p_set_option)( mConnection,
-                        LDAP_X_OPT_CONNECT_TIMEOUT,
+        (*s_p_set_option)( mConnection, 
+                        LDAP_X_OPT_CONNECT_TIMEOUT, 
                         &timeout );
 #endif
-
+        
         // Do the bind
         LdapErrCode retCode = (*s_p_simple_bind_s)(mConnection,
                                                mLdapDefinition.mAnonUser ,
@@ -162,10 +162,10 @@ void  LdapConnection::connectSimple()
     }
 }
 //------------------------------------------------------------------------------
-void LdapConnection::initConnection()
+void LdapConnection::initConnection() 
     throw (ldap::LdapConnectionException)
 {
-    if (mLdapDefinition.mServer.getLength() == 0)
+    if (mLdapDefinition.mServer.getLength() == 0) 
     {
         rtl::OUStringBuffer message ;
 
@@ -175,9 +175,9 @@ void LdapConnection::initConnection()
 
     if (mLdapDefinition.mPort == 0) mLdapDefinition.mPort = LDAP_PORT;
 
-    mConnection = (*s_p_init)(mLdapDefinition.mServer,
+    mConnection = (*s_p_init)(mLdapDefinition.mServer, 
                             mLdapDefinition.mPort) ;
-    if (mConnection == NULL)
+    if (mConnection == NULL) 
     {
         rtl::OUStringBuffer message ;
 
@@ -185,7 +185,7 @@ void LdapConnection::initConnection()
         message.appendAscii(mLdapDefinition.mServer) ;
         message.appendAscii(":") ;
         message.append(mLdapDefinition.mPort) ;
-        throw ldap::LdapConnectionException(message.makeStringAndClear(),
+        throw ldap::LdapConnectionException(message.makeStringAndClear(), 
                                             NULL) ;
     }
 }
@@ -208,7 +208,7 @@ void LdapConnection::initConnection()
                                       0,
                                       0, // Attributes + values
                                       &result.msg) ;
-
+    
     checkLdapReturnCode("getUserProfile", retCode,mConnection) ;
 
     void * ptr;
@@ -227,23 +227,23 @@ void LdapConnection::initConnection()
 }
 //------------------------------------------------------------------------------
  rtl::OString LdapConnection::findUserDn(const rtl::OString& aUser)
-    throw (lang::IllegalArgumentException,
+    throw (lang::IllegalArgumentException, 
             ldap::LdapConnectionException, ldap::LdapGenericException)
 {
     if (!isValid()) { connectSimple(); }
 
-    if (aUser.getLength() == 0)
+    if (aUser.getLength() == 0) 
     {
         throw lang::IllegalArgumentException(
             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
             ("LdapConnection::findUserDn -User id is empty")),
                 NULL, 0) ;
     }
-
-
-
+    
+    
+    
     rtl::OStringBuffer filter( "(&(objectclass=" );
-
+             
     filter.append( mLdapDefinition.mUserObjectClass ).append(")(") ;
     filter.append( mLdapDefinition.mUserUniqueAttr ).append("=").append(aUser).append("))") ;
 
@@ -251,7 +251,7 @@ void LdapConnection::initConnection()
     sal_Char * attributes [2];
     attributes[0]= const_cast<sal_Char *>(LDAP_NO_ATTRS);
     attributes[1]= NULL;
-    LdapErrCode retCode = (*s_p_search_s)(mConnection,
+    LdapErrCode retCode = (*s_p_search_s)(mConnection, 
                                       mLdapDefinition.mBaseDN,
                                       LDAP_SCOPE_SUBTREE,
                                       filter.makeStringAndClear(), attributes, 0, &result.msg) ;
@@ -260,10 +260,10 @@ void LdapConnection::initConnection()
     rtl::OString userDn ;
     LDAPMessage *entry = (*s_p_first_entry)(mConnection, result.msg) ;
 
-    if (entry != NULL)
+    if (entry != NULL) 
     {
         sal_Char *charsDn = (*s_p_get_dn)(mConnection, entry) ;
-
+        
         userDn = charsDn ;
         (*s_p_memfree)(charsDn) ;
     }
diff --git a/extensions/source/config/ldap/ldapaccess.hxx b/extensions/source/config/ldap/ldapaccess.hxx
index 691178fd0e50..a9bcbee5826a 100644
--- a/extensions/source/config/ldap/ldapaccess.hxx
+++ b/extensions/source/config/ldap/ldapaccess.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ struct LdapUserProfile;
 class LdapUserProfileMap;
 
 typedef LDAP_API(int) (LDAP_CALL *t_ldap_unbind_s)( LDAP *ld );
-typedef LDAP_API(int) (LDAP_CALL *t_ldap_simple_bind_s)( LDAP *ld, const char *who, const char *passwd );
-typedef LDAP_API(int) (LDAP_CALL *t_ldap_set_option)( LDAP *ld, int option, const void *optdata );
+typedef LDAP_API(int) (LDAP_CALL *t_ldap_simple_bind_s)( LDAP *ld, const char *who,	const char *passwd );
+typedef LDAP_API(int) (LDAP_CALL *t_ldap_set_option)( LDAP *ld, int option,	const void *optdata );
 typedef LDAP_API(char *) (LDAP_CALL *t_ldap_err2string)( int err );
 typedef LDAP_API(LDAP *) (LDAP_CALL *t_ldap_init)( const char *defhost, int defport );
 typedef LDAP_API(int) (LDAP_CALL *t_ldap_msgfree)( LDAPMessage *lm );
 typedef LDAP_API(char *) (LDAP_CALL *t_ldap_get_dn)( LDAP *ld, LDAPMessage *entry );
-typedef LDAP_API(LDAPMessage *) (LDAP_CALL *t_ldap_first_entry)( LDAP *ld,  LDAPMessage *chain );
+typedef LDAP_API(LDAPMessage *) (LDAP_CALL *t_ldap_first_entry)( LDAP *ld, 	LDAPMessage *chain );
 typedef LDAP_API(char *) (LDAP_CALL *t_ldap_first_attribute)( LDAP *ld, LDAPMessage *entry, void **ptr );
 typedef LDAP_API(char *) (LDAP_CALL *t_ldap_next_attribute)( LDAP *ld, LDAPMessage *entry, void *ptr );
-typedef LDAP_API(int) (LDAP_CALL *t_ldap_search_s)( LDAP *ld, const char *base, int scope,  const char *filter, char **attrs, int attrsonly, LDAPMessage **res );
+typedef LDAP_API(int) (LDAP_CALL *t_ldap_search_s)( LDAP *ld, const char *base, int scope,	const char *filter, char **attrs, int attrsonly, LDAPMessage **res );
 typedef LDAP_API(void) (LDAP_CALL *t_ldap_value_free)( char **vals );
-typedef LDAP_API(char **) (LDAP_CALL *t_ldap_get_values)( LDAP *ld, LDAPMessage *entry, const char *target );
+typedef LDAP_API(char **) (LDAP_CALL *t_ldap_get_values)( LDAP *ld, LDAPMessage *entry,	const char *target );
 typedef LDAP_API(void) (LDAP_CALL *t_ldap_memfree)( void *p );
 //------------------------------------------------------------------------------
 /** Struct containing the information on LDAP connection */
@@ -88,11 +88,11 @@ struct LdapDefinition
 typedef std::map< rtl::OUString, rtl::OUString > LdapData; // key/value pairs
 
 /** Class encapulating all LDAP functionality */
-class LdapConnection
+class LdapConnection 
 {
     friend struct LdapMessageHolder;
 public:
-
+    
     /** Default constructor */
     LdapConnection(void) : mConnection(NULL),mLdapDefinition() {}
     /** Destructor, releases the connection */
@@ -102,7 +102,7 @@ public:
         throw (ldap::LdapConnectionException,
                 ldap::LdapGenericException);
 
-    /**
+    /** 
         Gets LdapUserProfile from LDAP repository for specified user
         @param aUser    name of logged on user
         @param aUserProfileMap  Map containing LDAP->00o mapping
@@ -119,16 +119,16 @@ public:
     /** finds DN of user
         @return  DN of User
     */
-    rtl::OString findUserDn(const rtl::OString& aUser)
+    rtl::OString findUserDn(const rtl::OString& aUser)  
         throw (lang::IllegalArgumentException,
-                ldap::LdapConnectionException,
+                ldap::LdapConnectionException, 
                 ldap::LdapGenericException);
 
     void loadModule();
 
     static t_ldap_err2string        s_p_err2string;
 private:
-
+    
     void initConnection()
          throw (ldap::LdapConnectionException);
     void disconnect();
@@ -137,20 +137,20 @@ private:
       @return   sal_True if connection is valid, sal_False otherwise
       */
     bool isValid(void) const { return mConnection != NULL ; }
-
+    
     void  connectSimple()
         throw (ldap::LdapConnectionException,
                 ldap::LdapGenericException);
-
+    
     /** LDAP connection object */
     LDAP* mConnection ;
     LdapDefinition mLdapDefinition;
 
-    static oslModule                s_Ldap_Module;
+    static oslModule		        s_Ldap_Module;
     static t_ldap_value_free        s_p_value_free;
     static t_ldap_get_values        s_p_get_values;
     static t_ldap_unbind_s          s_p_unbind_s;
-    static t_ldap_simple_bind_s     s_p_simple_bind_s;
+    static t_ldap_simple_bind_s	    s_p_simple_bind_s;
     static t_ldap_set_option        s_p_set_option;
     static t_ldap_init              s_p_init;
     static t_ldap_msgfree           s_p_msgfree;
@@ -159,7 +159,7 @@ private:
     static t_ldap_first_attribute   s_p_first_attribute;
     static t_ldap_next_attribute    s_p_next_attribute;
     static t_ldap_search_s          s_p_search_s;
-
+    
     static t_ldap_memfree           s_p_memfree;
 
 } ;
diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx
index c87c5935fee9..6cc22c7190b1 100644
--- a/extensions/source/config/ldap/ldapuserprofilebe.cxx
+++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ LdapUserProfileBe::LdapUserProfileBe( const uno::Reference<uno::XComponentContex
     {
         osl::Mutex & aInitMutex = rtl::Static< osl::Mutex, LdapUserProfileBe >::get();
         osl::MutexGuard aInitGuard(aInitMutex);
-
+    
         static bool bReentrantCall; // = false
         OSL_ENSURE(!bReentrantCall, "configuration: Ldap Backend constructor called reentrantly - probably a registration error.");
 
@@ -74,10 +74,10 @@ LdapUserProfileBe::LdapUserProfileBe( const uno::Reference<uno::XComponentContex
                         &aDefinition, &loggedOnUser))
                 {
                     throw css::uno::RuntimeException(
-                        rtl::OUString::createFromAscii("LdapUserProfileBe- LDAP not configured"),
-                        NULL);
+                        rtl::OUString::createFromAscii("LdapUserProfileBe- LDAP not configured"),           
+                        NULL); 	
                 }
-
+                    
                 bReentrantCall = false ;
             }
             catch (...)
@@ -94,7 +94,7 @@ LdapUserProfileBe::LdapUserProfileBe( const uno::Reference<uno::XComponentContex
     connection.getUserProfile(loggedOnUser, &data_);
 }
 //------------------------------------------------------------------------------
-LdapUserProfileBe::~LdapUserProfileBe()
+LdapUserProfileBe::~LdapUserProfileBe() 
 {
 }
 //------------------------------------------------------------------------------
@@ -120,7 +120,7 @@ bool LdapUserProfileBe::readLdapConfiguration(
     try
     {
         uno::Reference< lang::XMultiServiceFactory > xCfgProvider(
-                                                        factory->createInstance(kConfigurationProviderService),
+                                                        factory->createInstance(kConfigurationProviderService), 
                                                         uno::UNO_QUERY);
         OSL_ENSURE(xCfgProvider.is(),"LdapUserProfileBe: could not create the configuration provider");
         if (!xCfgProvider.is())
@@ -132,12 +132,12 @@ bool LdapUserProfileBe::readLdapConfiguration(
         aArgs[0] <<=  aPath;
 
         xIface = xCfgProvider->createInstanceWithArguments(kReadOnlyViewService, aArgs);
-
+    
         uno::Reference<container::XNameAccess > xAccess(xIface, uno::UNO_QUERY_THROW);
-        xAccess->getByName(kServerDefiniton) >>= xIface;
+        xAccess->getByName(kServerDefiniton) >>= xIface; 
 
         uno::Reference<container::XNameAccess > xChildAccess(xIface, uno::UNO_QUERY_THROW);
-
+       
         if (!getLdapStringParam(xChildAccess, kServer, definition->mServer))
             return false;
         if (!getLdapStringParam(xChildAccess, kBaseDN, definition->mBaseDN))
@@ -162,15 +162,15 @@ bool LdapUserProfileBe::readLdapConfiguration(
                 rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
         return false;
     }
-
+    
     osl::Security aSecurityContext;
     if (!aSecurityContext.getUserName(*loggedOnUser))
         OSL_TRACE("LdapUserProfileBackend - could not get Logged on user from system");
-
+    
     sal_Int32 nIndex = loggedOnUser->indexOf('/');
     if (nIndex > 0)
         *loggedOnUser = loggedOnUser->copy(nIndex+1);
-
+    
     //Remember to remove
     OSL_TRACE("Logged on user is %s", rtl::OUStringToOString(*loggedOnUser,RTL_TEXTENCODING_ASCII_US).getStr());
 
@@ -186,7 +186,7 @@ bool LdapUserProfileBe::getLdapStringParam(
     rtl::OUString sParam;
     xAccess->getByName(aLdapSetting) >>= sParam;
     aServerParameter = rtl::OUStringToOString(sParam, RTL_TEXTENCODING_ASCII_US);
-
+    
     return aServerParameter.getLength() != 0;
 }
 //------------------------------------------------------------------------------
@@ -238,14 +238,14 @@ rtl::OUString SAL_CALL LdapUserProfileBe::getLdapUserProfileBeName(void) {
 }
 //------------------------------------------------------------------------------
 
-rtl::OUString SAL_CALL LdapUserProfileBe::getImplementationName(void)
-    throw (uno::RuntimeException)
+rtl::OUString SAL_CALL LdapUserProfileBe::getImplementationName(void) 
+    throw (uno::RuntimeException) 
 {
     return getLdapUserProfileBeName() ;
 }
 //------------------------------------------------------------------------------
 
-uno::Sequence<rtl::OUString> SAL_CALL LdapUserProfileBe::getLdapUserProfileBeServiceNames(void)
+uno::Sequence<rtl::OUString> SAL_CALL LdapUserProfileBe::getLdapUserProfileBeServiceNames(void) 
 {
     uno::Sequence<rtl::OUString> aServices(1) ;
     aServices[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.backend.LdapUserProfileBe")) ;
@@ -253,8 +253,8 @@ uno::Sequence<rtl::OUString> SAL_CALL LdapUserProfileBe::getLdapUserProfileBeSer
 }
 //------------------------------------------------------------------------------
 
-sal_Bool SAL_CALL LdapUserProfileBe::supportsService(const rtl::OUString& aServiceName)
-    throw (uno::RuntimeException)
+sal_Bool SAL_CALL LdapUserProfileBe::supportsService(const rtl::OUString& aServiceName) 
+    throw (uno::RuntimeException) 
 {
     uno::Sequence< rtl::OUString > const svc = getLdapUserProfileBeServiceNames();
 
@@ -266,9 +266,9 @@ sal_Bool SAL_CALL LdapUserProfileBe::supportsService(const rtl::OUString& aServi
 
 //------------------------------------------------------------------------------
 
-uno::Sequence<rtl::OUString>
-SAL_CALL LdapUserProfileBe::getSupportedServiceNames(void)
-    throw (uno::RuntimeException)
+uno::Sequence<rtl::OUString> 
+SAL_CALL LdapUserProfileBe::getSupportedServiceNames(void) 
+    throw (uno::RuntimeException) 
 {
     return getLdapUserProfileBeServiceNames() ;
 }
diff --git a/extensions/source/config/ldap/ldapuserprofilebe.hxx b/extensions/source/config/ldap/ldapuserprofilebe.hxx
index 2a6cc93385cc..6fced57bca1e 100644
--- a/extensions/source/config/ldap/ldapuserprofilebe.hxx
+++ b/extensions/source/config/ldap/ldapuserprofilebe.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,28 +54,28 @@ typedef cppu::WeakComponentImplHelper2<css::beans::XPropertySet,
 
 struct LdapProfileMutexHolder { osl::Mutex mMutex; };
 /**
-  Implements the PlatformBackend service, a specialization of the
-  XPropertySet service for retreiving LDAP user profile
+  Implements the PlatformBackend service, a specialization of the 
+  XPropertySet service for retreiving LDAP user profile 
   configuration settings from a LDAP repsoitory.
   */
-class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase
+class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase 
 {
     public :
-
+        
         LdapUserProfileBe(const uno::Reference<uno::XComponentContext>& xContext);
         ~LdapUserProfileBe(void) ;
 
         // XServiceInfo
-        virtual rtl::OUString SAL_CALL
-            getImplementationName(  )
+        virtual rtl::OUString SAL_CALL 
+            getImplementationName(  ) 
                 throw (uno::RuntimeException) ;
-
-        virtual sal_Bool SAL_CALL
-            supportsService( const rtl::OUString& aServiceName )
+        
+        virtual sal_Bool SAL_CALL 
+            supportsService( const rtl::OUString& aServiceName ) 
                 throw (uno::RuntimeException) ;
 
-        virtual uno::Sequence<rtl::OUString> SAL_CALL
-            getSupportedServiceNames(  )
+        virtual uno::Sequence<rtl::OUString> SAL_CALL 
+            getSupportedServiceNames(  ) 
                 throw (uno::RuntimeException) ;
 
         // XPropertySet
@@ -138,7 +138,7 @@ class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase
           Provides the supported services names
           @return   service names
           */
-        static uno::Sequence<rtl::OUString> SAL_CALL
+        static uno::Sequence<rtl::OUString> SAL_CALL 
             getLdapUserProfileBeServiceNames(void) ;
 
     private:
@@ -146,7 +146,7 @@ class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase
         bool readLdapConfiguration(
             uno::Reference<lang::XMultiServiceFactory> const & factory,
             LdapDefinition * definition, rtl::OUString * loggedOnUser);
-
+        
         bool getLdapStringParam(uno::Reference<container::XNameAccess>& xAccess,
                                 const rtl::OUString& aLdapSetting,
                                 rtl::OString& aServerParameter);
diff --git a/extensions/source/config/ldap/wrapldapinclude.hxx b/extensions/source/config/ldap/wrapldapinclude.hxx
index 4a43f1fa06ca..9e401944c1cc 100644
--- a/extensions/source/config/ldap/wrapldapinclude.hxx
+++ b/extensions/source/config/ldap/wrapldapinclude.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index 8554dc52500f..4ec5568481db 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace dbp
     //---------------------------------------------------------------------
     OTableSelectionPage::OTableSelectionPage(OControlWizard* _pParent)
         :OControlWizardPage(_pParent, ModuleRes(RID_PAGE_TABLESELECTION))
-        ,m_aData            (this, ModuleRes(FL_DATA))
-        ,m_aExplanation     (this, ModuleRes(FT_EXPLANATION))
-        ,m_aDatasourceLabel (this, ModuleRes(FT_DATASOURCE))
-        ,m_aDatasource      (this, ModuleRes(LB_DATASOURCE))
-        ,m_aSearchDatabase  (this, ModuleRes(PB_FORMDATASOURCE))
-        ,m_aTableLabel      (this, ModuleRes(FT_TABLE))
-        ,m_aTable           (this, ModuleRes(LB_TABLE))
+        ,m_aData			(this, ModuleRes(FL_DATA))
+        ,m_aExplanation		(this, ModuleRes(FT_EXPLANATION))
+        ,m_aDatasourceLabel	(this, ModuleRes(FT_DATASOURCE))
+        ,m_aDatasource		(this, ModuleRes(LB_DATASOURCE))
+        ,m_aSearchDatabase	(this, ModuleRes(PB_FORMDATASOURCE))
+        ,m_aTableLabel		(this, ModuleRes(FT_TABLE))
+        ,m_aTable			(this, ModuleRes(LB_TABLE))
     {
         FreeResource();
 
@@ -234,7 +234,7 @@ namespace dbp
     IMPL_LINK( OTableSelectionPage, OnListboxSelection, ListBox*, _pBox )
     {
         if (&m_aDatasource == _pBox)
-        {   // new data source selected
+        {	// new data source selected
             implFillTables();
         }
         else
@@ -296,7 +296,7 @@ namespace dbp
                     }
 
                     if (m_xDSContext->getByName(sCurrentDatasource) >>= xDatasource)
-                    {   // connect
+                    {	// connect
                         // get the default SDB interaction handler
                         Reference< XInteractionHandler > xHandler = getDialog()->getInteractionHandler(this);
                         if (!xHandler.is() )
@@ -353,7 +353,7 @@ namespace dbp
 
 
         if ( aSQLException.hasValue() )
-        {   // an SQLException (or derivee) was thrown ...
+        {	// an SQLException (or derivee) was thrown ...
             Reference< XInteractionRequest > xRequest = new OInteractionRequest(aSQLException);
             try
             {
@@ -466,12 +466,12 @@ namespace dbp
     //---------------------------------------------------------------------
     ODBFieldPage::ODBFieldPage( OControlWizard* _pParent )
         :OMaybeListSelectionPage(_pParent, ModuleRes(RID_PAGE_OPTION_DBFIELD))
-        ,m_aFrame           (this, ModuleRes(FL_DATABASEFIELD_EXPL))
-        ,m_aDescription     (this, ModuleRes(FT_DATABASEFIELD_EXPL))
-        ,m_aQuestion        (this, ModuleRes(FT_DATABASEFIELD_QUEST))
-        ,m_aStoreYes        (this, ModuleRes(RB_STOREINFIELD_YES))
-        ,m_aStoreNo         (this, ModuleRes(LB_STOREINFIELD))
-        ,m_aStoreWhere      (this, ModuleRes(RB_STOREINFIELD_NO))
+        ,m_aFrame			(this, ModuleRes(FL_DATABASEFIELD_EXPL))
+        ,m_aDescription		(this, ModuleRes(FT_DATABASEFIELD_EXPL))
+        ,m_aQuestion		(this, ModuleRes(FT_DATABASEFIELD_QUEST))
+        ,m_aStoreYes		(this, ModuleRes(RB_STOREINFIELD_YES))
+        ,m_aStoreNo			(this, ModuleRes(LB_STOREINFIELD))
+        ,m_aStoreWhere		(this, ModuleRes(RB_STOREINFIELD_NO))
     {
         FreeResource();
         announceControls(m_aStoreYes, m_aStoreNo, m_aStoreWhere);
@@ -501,7 +501,7 @@ namespace dbp
     }
 
 //.........................................................................
-}   // namespace dbp
+}	// namespace dbp
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx
index 7dd210de79e4..bdeb59fff3ec 100644
--- a/extensions/source/dbpilots/commonpagesdbp.hxx
+++ b/extensions/source/dbpilots/commonpagesdbp.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,13 +45,13 @@ namespace dbp
     class OTableSelectionPage : public OControlWizardPage
     {
     protected:
-        FixedLine       m_aData;
-        FixedText       m_aExplanation;
-        FixedText       m_aDatasourceLabel;
-        ListBox         m_aDatasource;
-        PushButton      m_aSearchDatabase;
-        FixedText       m_aTableLabel;
-        ListBox         m_aTable;
+        FixedLine		m_aData;
+        FixedText		m_aExplanation;
+        FixedText		m_aDatasourceLabel;
+        ListBox			m_aDatasource;
+        PushButton		m_aSearchDatabase;
+        FixedText		m_aTableLabel;
+        ListBox			m_aTable;
 
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
                         m_xDSContext;
@@ -64,8 +64,8 @@ namespace dbp
         void ActivatePage();
 
         // OWizardPage overridables
-        virtual void        initializePage();
-        virtual sal_Bool    commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+        virtual void		initializePage();
+        virtual sal_Bool	commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
 
     protected:
         DECL_LINK( OnListboxSelection, ListBox* );
@@ -73,7 +73,7 @@ namespace dbp
         DECL_LINK( OnSearchClicked, PushButton* );
 
         void implCollectDatasource();
-        void implFillTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >&
+        void implFillTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& 
                         _rxConn = ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >());
 
         // OControlWizardPage overridables
@@ -86,9 +86,9 @@ namespace dbp
     class OMaybeListSelectionPage : public OControlWizardPage
     {
     protected:
-        RadioButton*    m_pYes;
-        RadioButton*    m_pNo;
-        ListBox*        m_pList;
+        RadioButton*	m_pYes;
+        RadioButton*	m_pNo;
+        ListBox*		m_pList;
 
     public:
         OMaybeListSelectionPage( OControlWizard* _pParent, const ResId& _rId );
@@ -100,7 +100,7 @@ namespace dbp
         void ActivatePage();
 
         // own helper
-        void    announceControls(
+        void	announceControls(
             RadioButton& _rYesButton,
             RadioButton& _rNoButton,
             ListBox& _rSelection);
@@ -117,12 +117,12 @@ namespace dbp
     class ODBFieldPage : public OMaybeListSelectionPage
     {
     protected:
-        FixedLine       m_aFrame;
-        FixedText       m_aDescription;
-        FixedText       m_aQuestion;
-        RadioButton     m_aStoreYes;
-        RadioButton     m_aStoreNo;
-        ListBox         m_aStoreWhere;
+        FixedLine		m_aFrame;
+        FixedText		m_aDescription;
+        FixedText		m_aQuestion;
+        RadioButton		m_aStoreYes;
+        RadioButton		m_aStoreNo;
+        ListBox			m_aStoreWhere;
 
     public:
         ODBFieldPage( OControlWizard* _pParent );
@@ -139,7 +139,7 @@ namespace dbp
     };
 
 //.........................................................................
-}   // namespace dbp
+}	// namespace dbp
 //.........................................................................
 
 
diff --git a/extensions/source/dbpilots/commonpagesdbp.src b/extensions/source/dbpilots/commonpagesdbp.src
index 41d199a70209..783bdb48b65f 100644
--- a/extensions/source/dbpilots/commonpagesdbp.src
+++ b/extensions/source/dbpilots/commonpagesdbp.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ TabPage RID_PAGE_TABLESELECTION
     {
         Pos = MAP_APPFONT ( 4 , 3  ) ;
         Size = MAP_APPFONT ( WINDOW_SIZE_X - 8 , 8 ) ;
-        Text [ en-US ]  = "Data";
+        Text [ en-US ]	= "Data";
     };
     FixedText FT_EXPLANATION
     {
@@ -65,14 +65,14 @@ TabPage RID_PAGE_TABLESELECTION
         DropDown = TRUE ;
         AutoHScroll = TRUE ;
     };
-
+    
     PushButton PB_FORMDATASOURCE
     {
         Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 + WINDOW_HALF_SIZE_X - 24 , 25  ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         Text [ en-US ] = "~...";
     };
-
+    
     FixedText FT_TABLE
     {
         Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3, 46 ) ;
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index 202263cff749..45e436d28fd0 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,13 +192,13 @@ namespace dbp
         ModuleRes aModuleRes(RID_PAGE_FORM_DATASOURCE_STATUS);
         OLocalResourceAccess aLocalControls(aModuleRes, RSC_TABPAGE);
 
-        m_pFormSettingsSeparator    = new FixedLine(this,  ModuleRes(FL_FORMSETINGS));
-        m_pFormDatasourceLabel      = new FixedText(this,  ModuleRes(FT_FORMDATASOURCELABEL));
-        m_pFormDatasource           = new FixedText(this,  ModuleRes(FT_FORMDATASOURCE));
-        m_pFormContentTypeLabel     = new FixedText(this,  ModuleRes(FT_FORMCONTENTTYPELABEL));
-        m_pFormContentType          = new FixedText(this,  ModuleRes(FT_FORMCONTENTTYPE));
-        m_pFormTableLabel           = new FixedText(this,  ModuleRes(FT_FORMTABLELABEL));
-        m_pFormTable                = new FixedText(this,  ModuleRes(FT_FORMTABLE));
+        m_pFormSettingsSeparator	= new FixedLine(this,  ModuleRes(FL_FORMSETINGS));
+        m_pFormDatasourceLabel		= new FixedText(this,  ModuleRes(FT_FORMDATASOURCELABEL));
+        m_pFormDatasource			= new FixedText(this,  ModuleRes(FT_FORMDATASOURCE));
+        m_pFormContentTypeLabel		= new FixedText(this,  ModuleRes(FT_FORMCONTENTTYPELABEL));
+        m_pFormContentType			= new FixedText(this,  ModuleRes(FT_FORMCONTENTTYPE));
+        m_pFormTableLabel			= new FixedText(this,  ModuleRes(FT_FORMTABLELABEL));
+        m_pFormTable				= new FixedText(this,  ModuleRes(FT_FORMTABLE));
 
         const OControlWizardContext& rContext = getContext();
         if ( rContext.bEmbedded )
@@ -347,7 +347,7 @@ namespace dbp
             for (sal_Int32 i=0; i<nObjects; ++i)
             {
                 if (xPageObjects->getByIndex(i) >>= xControlShape)
-                {   // it _is_ a control shape
+                {	// it _is_ a control shape
                     xControlModel = xControlShape->getControl();
                     DBG_ASSERT(xControlModel.is(), "OControlWizard::implDetermineShape: control shape without model!");
                     if (xModelCompare.get() == xControlModel.get())
@@ -398,7 +398,7 @@ namespace dbp
 
                 Reference< XDrawPageSupplier > xPageSupp(xModel, UNO_QUERY);
                 if (xPageSupp.is())
-                {   // it's a document with only one page -> Writer
+                {	// it's a document with only one page -> Writer
                     xPage = xPageSupp->getDrawPage();
                 }
                 else
@@ -410,7 +410,7 @@ namespace dbp
                     // maybe it's a spredsheet
                     Reference< XSpreadsheetView > xView(xController, UNO_QUERY);
                     if (xView.is())
-                    {   // okay, it is one
+                    {	// okay, it is one
                         Reference< XSpreadsheet > xSheet = xView->getActiveSheet();
                         xPageSupp = Reference< XDrawPageSupplier >(xSheet, UNO_QUERY);
                         DBG_ASSERT(xPageSupp.is(), "OControlWizard::implDeterminePage: a spreadsheet which is no page supplier!");
@@ -418,7 +418,7 @@ namespace dbp
                             xPage = xPageSupp->getDrawPage();
                     }
                     else
-                    {   // can be a draw/impress doc only
+                    {	// can be a draw/impress doc only
                         Reference< XDrawView > xDrawView(xController, UNO_QUERY);
                         DBG_ASSERT(xDrawView.is(), "OControlWizard::implDeterminePage: no alternatives left ... can't determine the page!");
                         if (xDrawView.is())
@@ -427,7 +427,7 @@ namespace dbp
                 }
             }
             else
-            {
+            {	
                 DBG_ASSERT(xPage.is(), "OControlWizard::implDeterminePage: can't determine the page (no model)!");
             }
             m_aContext.xDrawPage = xPage;
@@ -462,7 +462,7 @@ namespace dbp
 
     //---------------------------------------------------------------------
     Reference< XConnection > OControlWizard::getFormConnection(const OAccessRegulator&) const
-    {
+    {		
         return getFormConnection();
     }
     //---------------------------------------------------------------------
@@ -472,7 +472,7 @@ namespace dbp
         try
         {
             if ( !::dbtools::isEmbeddedInDatabase(m_aContext.xForm,xConn) )
-                m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("ActiveConnection")) >>= xConn;
+                m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("ActiveConnection")) >>= xConn;			
         }
         catch(const Exception&)
         {
@@ -632,9 +632,9 @@ namespace dbp
             if (xColumns.is())
             {
                 m_aContext.aFieldNames = xColumns->getElementNames();
-                static const ::rtl::OUString s_sFieldTypeProperty   = ::rtl::OUString::createFromAscii("Type");
+                static const ::rtl::OUString s_sFieldTypeProperty	= ::rtl::OUString::createFromAscii("Type");
                 const ::rtl::OUString* pBegin = m_aContext.aFieldNames.getConstArray();
-                const ::rtl::OUString* pEnd   = pBegin + m_aContext.aFieldNames.getLength();
+                const ::rtl::OUString* pEnd	  = pBegin + m_aContext.aFieldNames.getLength();
                 for(;pBegin != pEnd;++pBegin)
                 {
                     sal_Int32 nFieldType = DataType::OTHER;
@@ -663,7 +663,7 @@ namespace dbp
         ::comphelper::disposeComponent(xStatement);
 
         if (aSQLException.hasValue())
-        {   // an SQLException (or derivee) was thrown ...
+        {	// an SQLException (or derivee) was thrown ...
 
             // prepend an extra SQLContext explaining what we were doing
             SQLContext aContext;
@@ -745,35 +745,35 @@ namespace dbp
         // lemme see ...
         return (0 == getContext().aFieldNames.getLength());
             // if we got fields, the data source is valid ...
-//      try
-//      {
-//          // first, we need a valid data source name
-//          ::rtl::OUString sDataSourceName;
-//          m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("DataSourceName")) >>= sDataSourceName;
-//          if (m_aContext.xDatasourceContext.is() && m_aContext.xDatasourceContext->hasByName(sDataSourceName))
-//          {   // at least the data source name is valid ...
-//              // then, a CommandType "table" would be nice ...
-//              sal_Int32 nCommandType = CommandType::COMMAND;
-//              m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("CommandType")) >>= nCommandType;
-//              if (CommandType::TABLE == nCommandType)
-//              {   // okay ....
-//                  // now the table itself should be valid
-//                  ::rtl::OUString sTableName;
-//                  m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("Command")) >>= sTableName;
-//                  if (m_aContext.xObjectContainer.is() && m_aContext.xObjectContainer->hasByName(sTableName))
-//                      return sal_False;
-//              }
-//          }
-//      }
-//      catch(Exception&)
-//      {
-//          DBG_ERROR("OControlWizard::needDatasourceSelection: caught an exception while checking the form settings!");
-//      }
-//      return sal_True;
+//		try
+//		{
+//			// first, we need a valid data source name
+//			::rtl::OUString sDataSourceName;
+//			m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("DataSourceName")) >>= sDataSourceName;
+//			if (m_aContext.xDatasourceContext.is() && m_aContext.xDatasourceContext->hasByName(sDataSourceName))
+//			{	// at least the data source name is valid ...
+//				// then, a CommandType "table" would be nice ...
+//				sal_Int32 nCommandType = CommandType::COMMAND;
+//				m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("CommandType")) >>= nCommandType;
+//				if (CommandType::TABLE == nCommandType)
+//				{	// okay ....
+//					// now the table itself should be valid
+//					::rtl::OUString sTableName;
+//					m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("Command")) >>= sTableName;
+//					if (m_aContext.xObjectContainer.is() && m_aContext.xObjectContainer->hasByName(sTableName))
+//						return sal_False;
+//				}
+//			}
+//		}
+//		catch(Exception&)
+//		{
+//			DBG_ERROR("OControlWizard::needDatasourceSelection: caught an exception while checking the form settings!");
+//		}
+//		return sal_True;
     }
 
 //.........................................................................
-}   // namespace dbp
+}	// namespace dbp
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx
index 292515c46f9b..0c5eb649d9dc 100644
--- a/extensions/source/dbpilots/controlwizard.hxx
+++ b/extensions/source/dbpilots/controlwizard.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace dbp
     //=====================================================================
     struct OControlWizardSettings
     {
-        String      sControlLabel;
+        String		sControlLabel;
     };
 
     //=====================================================================
@@ -66,20 +66,20 @@ namespace dbp
     class OControlWizardPage : public OControlWizardPage_Base
     {
     protected:
-        FixedLine*      m_pFormSettingsSeparator;
-        FixedText*      m_pFormDatasourceLabel;
-        FixedText*      m_pFormDatasource;
-        FixedText*      m_pFormContentTypeLabel;
-        FixedText*      m_pFormContentType;
-        FixedText*      m_pFormTableLabel;
-        FixedText*      m_pFormTable;
+        FixedLine*		m_pFormSettingsSeparator;
+        FixedText*		m_pFormDatasourceLabel;
+        FixedText*		m_pFormDatasource;
+        FixedText*		m_pFormContentTypeLabel;
+        FixedText*		m_pFormContentType;
+        FixedText*		m_pFormTableLabel;
+        FixedText*		m_pFormTable;
 
     protected:
-        OControlWizard*                 getDialog();
-        const OControlWizard*           getDialog() const;
-        const OControlWizardContext&    getContext();
-        sal_Bool                        updateContext();
-        void                            setFormConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn, sal_Bool _bAutoDispose = sal_True );
+        OControlWizard*					getDialog();
+        const OControlWizard*			getDialog() const;
+        const OControlWizardContext&	getContext();
+        sal_Bool						updateContext();
+        void							setFormConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn, sal_Bool _bAutoDispose = sal_True );
         ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >
                                         getFormConnection() const;
 
@@ -103,7 +103,7 @@ namespace dbp
 
     protected:
         // OWizardPage overridables
-        virtual void        initializePage();
+        virtual void		initializePage();
     };
 
     struct OAccessRegulator;
@@ -114,7 +114,7 @@ namespace dbp
     class OControlWizard : public OControlWizard_Base
     {
     private:
-        OControlWizardContext   m_aContext;
+        OControlWizardContext	m_aContext;
 
     protected:
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
@@ -130,15 +130,15 @@ namespace dbp
         ~OControlWizard();
 
         // make the some base class methods public
-        sal_Bool    travelNext() { return OControlWizard_Base::travelNext(); }
+        sal_Bool	travelNext() { return OControlWizard_Base::travelNext(); }
 
     public:
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
             getServiceFactory() const { return m_xORB; }
 
-        const OControlWizardContext&    getContext() const { return m_aContext; }
-        sal_Bool                        updateContext(const OAccessRegulator&);
-        void                            setFormConnection(const OAccessRegulator&, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn, sal_Bool _bAutoDispose = sal_True );
+        const OControlWizardContext&	getContext() const { return m_aContext; }
+        sal_Bool						updateContext(const OAccessRegulator&);
+        void							setFormConnection(const OAccessRegulator&, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn, sal_Bool _bAutoDispose = sal_True );
         ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >
                                         getFormConnection(const OAccessRegulator&) const;
 
@@ -162,7 +162,7 @@ namespace dbp
         virtual sal_Bool approveControl(sal_Int16 _nClassId) = 0;
 
         // ModalDialog overridables
-        virtual short   Execute();
+        virtual short	Execute();
 
     private:
         sal_Bool initContext();
@@ -177,7 +177,7 @@ namespace dbp
     };
 
 //.........................................................................
-}   // namespace dbp
+}	// namespace dbp
 //.........................................................................
 
 #endif // _EXTENSIONS_DBP_CONTROLWIZARD_HXX
diff --git a/extensions/source/dbpilots/dbpilots.src b/extensions/source/dbpilots/dbpilots.src
index fa96cbead1eb..fcdda32e0747 100644
--- a/extensions/source/dbpilots/dbpilots.src
+++ b/extensions/source/dbpilots/dbpilots.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,29 +33,29 @@ ModalDialog RID_DLG_GROUPBOXWIZARD
 {
     Text [ en-US ] = "Group Element Wizard";
 
-    OutputSize      = TRUE ;
-    SVLook          = TRUE ;
-    Moveable        = TRUE ;
-    Closeable       = TRUE ;
-    Hide            = TRUE;
+    OutputSize		= TRUE ;
+    SVLook			= TRUE ;
+    Moveable		= TRUE ;
+    Closeable		= TRUE ;
+    Hide			= TRUE;
 };
 
 ModalDialog RID_DLG_LISTCOMBOWIZARD
 {
-    OutputSize      = TRUE ;
-    SVLook          = TRUE ;
-    Moveable        = TRUE ;
-    Closeable       = TRUE ;
-    Hide            = TRUE;
+    OutputSize		= TRUE ;
+    SVLook			= TRUE ;
+    Moveable		= TRUE ;
+    Closeable		= TRUE ;
+    Hide			= TRUE;
 };
 
 ModalDialog RID_DLG_GRIDWIZARD
 {
-    OutputSize      = TRUE ;
-    SVLook          = TRUE ;
-    Moveable        = TRUE ;
-    Closeable       = TRUE ;
-    Hide            = TRUE;
+    OutputSize		= TRUE ;
+    SVLook			= TRUE ;
+    Moveable		= TRUE ;
+    Closeable		= TRUE ;
+    Hide			= TRUE;
 
     Text [ en-US ] = "Table Element Wizard";
 };
diff --git a/extensions/source/dbpilots/dbpresid.hrc b/extensions/source/dbpilots/dbpresid.hrc
index ecb424c5e3b7..81f61d49c96b 100644
--- a/extensions/source/dbpilots/dbpresid.hrc
+++ b/extensions/source/dbpilots/dbpresid.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,63 +33,63 @@
 //========================================================================
 // basics
 
-#define RID_DIALOG_START                RID_DBP_START
-#define RID_PAGE_START                  RID_DBP_START
-#define RID_STRING_START                RID_DBP_START
-#define RID_ERRORBOX_START              RID_DBP_START
+#define RID_DIALOG_START				RID_DBP_START
+#define RID_PAGE_START					RID_DBP_START
+#define RID_STRING_START				RID_DBP_START
+#define RID_ERRORBOX_START				RID_DBP_START
 
 //========================================================================
 // strings
 
-#define RID_STR_GROUPWIZ_DBFIELD        (RID_STRING_START +  1 )
-#define RID_STR_COMBOWIZ_DBFIELD        (RID_STRING_START +  2 )
-#define RID_STR_LISTWIZARD_TITLE        (RID_STRING_START +  3 )
-#define RID_STR_COMBOWIZARD_TITLE       (RID_STRING_START +  4 )
-#define RID_STR_COULDNOTOPENTABLE       (RID_STRING_START +  5 )
-#define RID_STR_DATEPOSTFIX             (RID_STRING_START +  6 )
-#define RID_STR_TIMEPOSTFIX             (RID_STRING_START +  7 )
-#define RID_STR_TYPE_QUERY              (RID_STRING_START +  8 )
-#define RID_STR_TYPE_TABLE              (RID_STRING_START +  9 )
-#define RID_STR_TYPE_COMMAND            (RID_STRING_START + 10 )
+#define RID_STR_GROUPWIZ_DBFIELD		(RID_STRING_START +  1 )
+#define RID_STR_COMBOWIZ_DBFIELD		(RID_STRING_START +  2 )
+#define RID_STR_LISTWIZARD_TITLE		(RID_STRING_START +  3 )
+#define RID_STR_COMBOWIZARD_TITLE		(RID_STRING_START +  4 )
+#define RID_STR_COULDNOTOPENTABLE		(RID_STRING_START +  5 )
+#define RID_STR_DATEPOSTFIX				(RID_STRING_START +  6 )
+#define RID_STR_TIMEPOSTFIX				(RID_STRING_START +  7 )
+#define RID_STR_TYPE_QUERY				(RID_STRING_START +  8 )
+#define RID_STR_TYPE_TABLE				(RID_STRING_START +  9 )
+#define RID_STR_TYPE_COMMAND			(RID_STRING_START + 10 )
 
 // please adjust RID_STRING_END (below) when adding new strings
-#define RID_STRING_END                  RID_STR_TIMEPOSTFIX
+#define RID_STRING_END					RID_STR_TIMEPOSTFIX
 
 //========================================================================
 // dialogs
 
-#define RID_DLG_GROUPBOXWIZARD          ( RID_DIALOG_START +  1 )
-#define RID_DLG_LISTCOMBOWIZARD         ( RID_DIALOG_START +  2 )
-#define RID_DLG_GRIDWIZARD              ( RID_DIALOG_START +  3 )
+#define RID_DLG_GROUPBOXWIZARD			( RID_DIALOG_START +  1 )
+#define RID_DLG_LISTCOMBOWIZARD			( RID_DIALOG_START +  2 )
+#define RID_DLG_GRIDWIZARD				( RID_DIALOG_START +  3 )
 
 // please adjust RID_DIALOG_END (below) when adding new dialogs
-#define RID_DIALOG_END                  RID_DLG_GRIDWIZARD
+#define RID_DIALOG_END					RID_DLG_GRIDWIZARD
 
 //========================================================================
 // tab pages
 
-#define RID_PAGE_TABLESELECTION             ( RID_PAGE_START +  1 )
-#define RID_PAGE_GROUPRADIOSELECTION        ( RID_PAGE_START +  2 )
-#define RID_PAGE_DEFAULTFIELDSELECTION      ( RID_PAGE_START +  3 )
-#define RID_PAGE_OPTIONVALUES               ( RID_PAGE_START +  4 )
-#define RID_PAGE_OPTION_DBFIELD             ( RID_PAGE_START +  5 )
-#define RID_PAGE_OPTIONS_FINAL              ( RID_PAGE_START +  6 )
-#define RID_PAGE_LCW_CONTENTSELECTION_TABLE ( RID_PAGE_START +  7 )
-#define RID_PAGE_LCW_CONTENTSELECTION_FIELD ( RID_PAGE_START +  8 )
-#define RID_PAGE_LCW_FIELDLINK              ( RID_PAGE_START +  9 )
-#define RID_PAGE_GW_FIELDSELECTION          ( RID_PAGE_START + 10 )
-#define RID_PAGE_FORM_DATASOURCE_STATUS     ( RID_PAGE_START + 11 )
+#define RID_PAGE_TABLESELECTION				( RID_PAGE_START +  1 )
+#define RID_PAGE_GROUPRADIOSELECTION		( RID_PAGE_START +  2 )
+#define RID_PAGE_DEFAULTFIELDSELECTION		( RID_PAGE_START +  3 )
+#define RID_PAGE_OPTIONVALUES				( RID_PAGE_START +  4 )
+#define RID_PAGE_OPTION_DBFIELD				( RID_PAGE_START +  5 )
+#define RID_PAGE_OPTIONS_FINAL				( RID_PAGE_START +  6 )
+#define RID_PAGE_LCW_CONTENTSELECTION_TABLE	( RID_PAGE_START +  7 )
+#define RID_PAGE_LCW_CONTENTSELECTION_FIELD	( RID_PAGE_START +  8 )
+#define RID_PAGE_LCW_FIELDLINK				( RID_PAGE_START +  9 )
+#define RID_PAGE_GW_FIELDSELECTION			( RID_PAGE_START + 10 )
+#define RID_PAGE_FORM_DATASOURCE_STATUS		( RID_PAGE_START + 11 )
 
 // please adjust RID_PAGE_END (below) when adding new tab pages
-#define RID_PAGE_END                        RID_PAGE_GW_FIELDSELECTION
+#define RID_PAGE_END						RID_PAGE_GW_FIELDSELECTION
 
 //========================================================================
 // ErrorBox
 
-#define RID_ERR_INVALID_FORM_CONNECTION     ( RID_ERRORBOX_START +  1 )
+#define RID_ERR_INVALID_FORM_CONNECTION		( RID_ERRORBOX_START +  1 )
 
 // please adjust RID_ERRORBOX_END (below) when adding new error boxes
-#define RID_ERRORBOX_END                    RID_ERR_INVALID_FORM_CONNECTION
+#define RID_ERRORBOX_END					RID_ERR_INVALID_FORM_CONNECTION
 
 
 //========================================================================
@@ -115,96 +115,96 @@
 //........................................................................
 // FixedLine
 
-#define FL_DATA                     1
-#define FL_DEFAULTSELECTION         2
-#define FL_OPTIONVALUES             3
-#define FL_DATABASEFIELD_EXPL       4
-#define FL_NAMEIT                   5
-#define FL_FRAME                    6
-#define FL_FORMSETINGS              7
+#define FL_DATA						1
+#define FL_DEFAULTSELECTION			2
+#define FL_OPTIONVALUES				3
+#define FL_DATABASEFIELD_EXPL		4
+#define FL_NAMEIT					5
+#define FL_FRAME					6
+#define FL_FORMSETINGS				7
 
 //........................................................................
 // FixedText
 
-#define FT_DATASOURCE                1
-#define FT_TABLE                     2
-#define FT_RADIOLABELS               3
-#define FT_RADIOBUTTONS              4
-#define FT_DEFAULTSELECTION          5
-#define FT_OPTIONVALUES_EXPL         6
-#define FT_OPTIONVALUES              7
-#define FT_DATABASEFIELD_EXPL        8
-#define FT_DATABASEFIELD_QUEST       9
-#define FT_NAMEIT                   10
-#define FT_THATSALL                 11
-#define FT_SELECTTABLE_LABEL        12
-#define FT_TABLEFIELDS              13
-#define FT_DISPLAYEDFIELD           14
-#define FT_CONTENTFIELD_INFO        15
-#define FT_VALUELISTFIELD           16
-#define FT_TABLEFIELD               17
-#define FT_EXPLANATION              18
-#define FT_EXISTING_FIELDS          19
-#define FT_SELECTED_FIELDS          20
-#define FT_FIELDLINK_DESC           21
-#define FT_FORMDATASOURCELABEL      22
-#define FT_FORMDATASOURCE           23
-#define FT_FORMTABLELABEL           24
-#define FT_FORMTABLE                25
-#define FT_FORMCONTENTTYPELABEL     26
-#define FT_FORMCONTENTTYPE          27
+#define FT_DATASOURCE				 1
+#define FT_TABLE					 2
+#define	FT_RADIOLABELS				 3
+#define FT_RADIOBUTTONS				 4
+#define FT_DEFAULTSELECTION			 5
+#define FT_OPTIONVALUES_EXPL		 6
+#define FT_OPTIONVALUES				 7
+#define FT_DATABASEFIELD_EXPL		 8
+#define FT_DATABASEFIELD_QUEST		 9
+#define FT_NAMEIT					10
+#define FT_THATSALL					11
+#define FT_SELECTTABLE_LABEL		12
+#define FT_TABLEFIELDS				13
+#define FT_DISPLAYEDFIELD			14
+#define FT_CONTENTFIELD_INFO		15
+#define FT_VALUELISTFIELD			16
+#define FT_TABLEFIELD				17
+#define FT_EXPLANATION				18
+#define FT_EXISTING_FIELDS			19
+#define FT_SELECTED_FIELDS			20
+#define FT_FIELDLINK_DESC			21
+#define FT_FORMDATASOURCELABEL		22
+#define FT_FORMDATASOURCE			23
+#define FT_FORMTABLELABEL			24
+#define FT_FORMTABLE				25
+#define FT_FORMCONTENTTYPELABEL		26
+#define FT_FORMCONTENTTYPE			27
 
 //........................................................................
 // ListBox
 
-#define LB_DATASOURCE               1
-#define LB_TABLE                    2
-#define LB_RADIOBUTTONS             3
-#define LB_DEFSELECTIONFIELD        3
-#define LB_STOREINFIELD             4
-#define LB_SELECTTABLE              5
-#define LB_SELECTFIELD              6
-#define LB_EXISTING_FIELDS          7
-#define LB_SELECTED_FIELDS          8
+#define LB_DATASOURCE				1
+#define LB_TABLE					2
+#define LB_RADIOBUTTONS				3
+#define LB_DEFSELECTIONFIELD		3
+#define LB_STOREINFIELD				4
+#define LB_SELECTTABLE				5
+#define LB_SELECTFIELD				6
+#define LB_EXISTING_FIELDS			7
+#define LB_SELECTED_FIELDS			8
 
 //........................................................................
 // Edit
 
-#define ET_RADIOLABELS              1
-#define ET_OPTIONVALUE              2
-#define ET_NAMEIT                   3
-#define ET_DISPLAYEDFIELD           4
+#define ET_RADIOLABELS				1
+#define ET_OPTIONVALUE				2
+#define ET_NAMEIT					3
+#define ET_DISPLAYEDFIELD			4
 
 //........................................................................
 // PushButton
 
-#define PB_MOVETORIGHT              1
-#define PB_MOVETOLEFT               2
-#define PB_FIELDRIGHT               3
-#define PB_ALLFIELDSRIGHT           4
-#define PB_FIELDLEFT                5
-#define PB_ALLFIELDSLEFT            6
-#define PB_FORMDATASOURCE           7
+#define PB_MOVETORIGHT				1
+#define PB_MOVETOLEFT				2
+#define PB_FIELDRIGHT				3
+#define PB_ALLFIELDSRIGHT			4
+#define PB_FIELDLEFT				5
+#define PB_ALLFIELDSLEFT			6
+#define PB_FORMDATASOURCE			7
 
 //........................................................................
 // RadioButton
 
-#define RB_DEFSELECTION_YES         1
-#define RB_DEFSELECTION_NO          2
-#define RB_STOREINFIELD_YES         3
-#define RB_STOREINFIELD_NO          4
+#define RB_DEFSELECTION_YES			1
+#define RB_DEFSELECTION_NO			2
+#define RB_STOREINFIELD_YES			3
+#define RB_STOREINFIELD_NO			4
 
 //........................................................................
 // ComboBox
 
-#define CMB_VALUELISTFIELD          1
-#define CMB_TABLEFIELD              2
+#define CMB_VALUELISTFIELD			1
+#define CMB_TABLEFIELD				2
 
 //........................................................................
 // String
 
-#define STR_FIELDINFO_LISTBOX       1
-#define STR_FIELDINFO_COMBOBOX      2
+#define STR_FIELDINFO_LISTBOX		1
+#define STR_FIELDINFO_COMBOBOX		2
 
 //........................................................................
 // Image
@@ -217,15 +217,15 @@
 //========================================================================
 // defines
 
-#define WINDOW_SIZE_X       260
-#define WINDOW_SIZE_Y       185
-#define WINDOW_HALF_SIZE_X  ( WINDOW_SIZE_X / 2 )
+#define WINDOW_SIZE_X		260
+#define WINDOW_SIZE_Y		185
+#define WINDOW_HALF_SIZE_X	( WINDOW_SIZE_X / 2 )
 
-#define BUTTON_SIZE_X       50
-#define BUTTON_SIZE_Y       14
+#define BUTTON_SIZE_X		50
+#define BUTTON_SIZE_Y		14
 
-#define ITEM_BUTTON_SIZE_X  20
-#define ITEM_BUTTON_SIZE_Y  12
+#define ITEM_BUTTON_SIZE_X	20
+#define ITEM_BUTTON_SIZE_Y	12
 
 
 
diff --git a/extensions/source/dbpilots/dbpservices.cxx b/extensions/source/dbpilots/dbpservices.cxx
index 3b251c144eb7..e1e41725af25 100644
--- a/extensions/source/dbpilots/dbpservices.cxx
+++ b/extensions/source/dbpilots/dbpservices.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,8 +62,8 @@ extern "C" void SAL_CALL dbp_initializeModule()
 
 extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
 component_getImplementationEnvironment(
-                const sal_Char  **ppEnvTypeName,
-                uno_Environment ** /*ppEnv*/
+                const sal_Char	**ppEnvTypeName,
+                uno_Environment	** /*ppEnv*/
             )
 {
     dbp_initializeModule();
@@ -76,8 +76,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
                 void* pRegistryKey
             )
 {
-    if (pRegistryKey)
-    try
+    if (pRegistryKey) 
+    try 
     {
         return ::dbp::OModule::writeComponentInfos(
             static_cast<XMultiServiceFactory*>(pServiceManager),
diff --git a/extensions/source/dbpilots/dbptools.cxx b/extensions/source/dbpilots/dbptools.cxx
index 6bf34b177643..05d85f5c8790 100644
--- a/extensions/source/dbpilots/dbptools.cxx
+++ b/extensions/source/dbpilots/dbptools.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 dbp
     }
 
 //.........................................................................
-}   // namespace dbp
+}	// namespace dbp
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/dbpilots/dbptools.hxx b/extensions/source/dbpilots/dbptools.hxx
index 971b37fe10c9..7c37e7edd305 100644
--- a/extensions/source/dbpilots/dbptools.hxx
+++ b/extensions/source/dbpilots/dbptools.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 dbp
         ::rtl::OUString& _rElementsName);
 
 //.........................................................................
-}   // namespace dbp
+}	// namespace dbp
 //.........................................................................
 
 
diff --git a/extensions/source/dbpilots/dbptypes.hxx b/extensions/source/dbpilots/dbptypes.hxx
index ef5676f9fea9..be188f63fdf0 100644
--- a/extensions/source/dbpilots/dbptypes.hxx
+++ b/extensions/source/dbpilots/dbptypes.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 dbp
     DECLARE_STL_STDKEY_MAP( sal_uInt32, String, MapInt2String );
 
 //.........................................................................
-}   // namespace dbp
+}	// namespace dbp
 //.........................................................................
 #endif // _EXTENSIONS_DBP_DBPTYPES_HXX_
 
diff --git a/extensions/source/dbpilots/gridpages.src b/extensions/source/dbpilots/gridpages.src
index 5aca75b77d55..5b5d557ca18a 100644
--- a/extensions/source/dbpilots/gridpages.src
+++ b/extensions/source/dbpilots/gridpages.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index f3bd194a27c3..6c39ac373524 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include "dbptools.hxx"
 #include "dbpilots.hrc"
 
-#define GW_STATE_DATASOURCE_SELECTION   0
-#define GW_STATE_FIELDSELECTION         1
+#define GW_STATE_DATASOURCE_SELECTION	0
+#define GW_STATE_FIELDSELECTION			1
 
 //.........................................................................
 namespace dbp
@@ -75,7 +75,7 @@ namespace dbp
 
         // if we do not need the data source selection page ...
         if (!needDatasourceSelection())
-        {   // ... skip it!
+        {	// ... skip it!
             skip(1);
             m_bHadDataSelection = sal_False;
         }
@@ -111,17 +111,17 @@ namespace dbp
         if (!xColumnFactory.is() || !xColumnContainer.is())
             return;
 
-        static const ::rtl::OUString s_sDataFieldProperty   = ::rtl::OUString::createFromAscii("DataField");
-        static const ::rtl::OUString s_sLabelProperty       = ::rtl::OUString::createFromAscii("Label");
-        static const ::rtl::OUString s_sWidthProperty       = ::rtl::OUString::createFromAscii("Width");
+        static const ::rtl::OUString s_sDataFieldProperty	= ::rtl::OUString::createFromAscii("DataField");
+        static const ::rtl::OUString s_sLabelProperty		= ::rtl::OUString::createFromAscii("Label");
+        static const ::rtl::OUString s_sWidthProperty		= ::rtl::OUString::createFromAscii("Width");
         static const ::rtl::OUString s_sMouseWheelBehavior  = ::rtl::OUString::createFromAscii("MouseWheelBehavior");
         static const ::rtl::OUString s_sEmptyString;
 
         // collect "descriptors" for the to-be-created (grid)columns
         DECLARE_STL_VECTOR( ::rtl::OUString, StringArray );
-        StringArray aColumnServiceNames;    // service names to be used with the XGridColumnFactory
-        StringArray aColumnLabelPostfixes;  // postfixes to append to the column labels
-        StringArray aFormFieldNames;        // data field names
+        StringArray aColumnServiceNames;	// service names to be used with the XGridColumnFactory
+        StringArray aColumnLabelPostfixes;	// postfixes to append to the column labels
+        StringArray aFormFieldNames;		// data field names
 
         aColumnServiceNames.reserve(getSettings().aSelectedFields.getLength());
         aColumnLabelPostfixes.reserve(getSettings().aSelectedFields.getLength());
@@ -188,8 +188,8 @@ namespace dbp
             }
         }
 
-        DBG_ASSERT( aFormFieldNames.size() == aColumnServiceNames.size()
-                &&  aColumnServiceNames.size() == aColumnLabelPostfixes.size(),
+        DBG_ASSERT(	aFormFieldNames.size() == aColumnServiceNames.size()
+                &&	aColumnServiceNames.size() == aColumnLabelPostfixes.size(),
                 "OGridWizard::implApplySettings: inconsistent descriptor sequences!");
 
         // now loop through the descriptions and create the (grid)columns out of th descriptors
@@ -227,9 +227,9 @@ namespace dbp
                 }
                 catch(Exception&)
                 {
-                    DBG_ERROR(  ::rtl::OString("OGridWizard::implApplySettings: unexpected exception while creating the grid column for field ")
-                            +=  ::rtl::OString(pFormFieldName->getStr(), pFormFieldName->getLength(), gsl_getSystemTextEncoding())
-                            +=  ::rtl::OString("!"));
+                    DBG_ERROR(	::rtl::OString("OGridWizard::implApplySettings: unexpected exception while creating the grid column for field ")
+                            +=	::rtl::OString(pFormFieldName->getStr(), pFormFieldName->getLength(), gsl_getSystemTextEncoding())
+                            +=	::rtl::OString("!"));
                 }
             }
         }
@@ -306,15 +306,15 @@ namespace dbp
     //---------------------------------------------------------------------
     OGridFieldsSelection::OGridFieldsSelection( OGridWizard* _pParent )
         :OGridPage(_pParent, ModuleRes(RID_PAGE_GW_FIELDSELECTION))
-        ,m_aFrame               (this, ModuleRes(FL_FRAME))
-        ,m_aExistFieldsLabel    (this, ModuleRes(FT_EXISTING_FIELDS))
-        ,m_aExistFields         (this, ModuleRes(LB_EXISTING_FIELDS))
-        ,m_aSelectOne           (this, ModuleRes(PB_FIELDRIGHT))
-        ,m_aSelectAll           (this, ModuleRes(PB_ALLFIELDSRIGHT))
-        ,m_aDeselectOne         (this, ModuleRes(PB_FIELDLEFT))
-        ,m_aDeselectAll         (this, ModuleRes(PB_ALLFIELDSLEFT))
-        ,m_aSelFieldsLabel      (this, ModuleRes(FT_SELECTED_FIELDS))
-        ,m_aSelFields           (this, ModuleRes(LB_SELECTED_FIELDS))
+        ,m_aFrame				(this, ModuleRes(FL_FRAME))
+        ,m_aExistFieldsLabel	(this, ModuleRes(FT_EXISTING_FIELDS))
+        ,m_aExistFields			(this, ModuleRes(LB_EXISTING_FIELDS))
+        ,m_aSelectOne			(this, ModuleRes(PB_FIELDRIGHT))
+        ,m_aSelectAll			(this, ModuleRes(PB_ALLFIELDSRIGHT))
+        ,m_aDeselectOne			(this, ModuleRes(PB_FIELDLEFT))
+        ,m_aDeselectAll			(this, ModuleRes(PB_ALLFIELDSLEFT))
+        ,m_aSelFieldsLabel		(this, ModuleRes(FT_SELECTED_FIELDS))
+        ,m_aSelFields			(this, ModuleRes(LB_SELECTED_FIELDS))
     {
         FreeResource();
 
@@ -426,7 +426,7 @@ namespace dbp
 
         USHORT nInsertPos = LISTBOX_APPEND;
         if (!bMoveRight)
-        {   // need to determine an insert pos which reflects the original
+        {	// need to determine an insert pos which reflects the original
             nInsertPos = 0;
             while (nInsertPos < rMoveTo.GetEntryCount())
             {
@@ -481,7 +481,7 @@ namespace dbp
     }
 
 //.........................................................................
-}   // namespace dbp
+}	// namespace dbp
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx
index 8af95be86aa0..085762ce4f7c 100644
--- a/extensions/source/dbpilots/gridwizard.hxx
+++ b/extensions/source/dbpilots/gridwizard.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 dbp
     //=====================================================================
     struct OGridSettings : public OControlWizardSettings
     {
-        ::com::sun::star::uno::Sequence< ::rtl::OUString >      aSelectedFields;
+        ::com::sun::star::uno::Sequence< ::rtl::OUString >		aSelectedFields;
     };
 
     //=====================================================================
@@ -51,8 +51,8 @@ namespace dbp
     class OGridWizard : public OControlWizard
     {
     protected:
-        OGridSettings   m_aSettings;
-        sal_Bool        m_bHadDataSelection : 1;
+        OGridSettings	m_aSettings;
+        sal_Bool		m_bHadDataSelection : 1;
 
     public:
         OGridWizard(
@@ -65,10 +65,10 @@ namespace dbp
 
     protected:
         // OWizardMachine overridables
-        virtual ::svt::OWizardPage* createPage( WizardState _nState );
-        virtual WizardState         determineNextState( WizardState _nCurrentState ) const;
-        virtual void                enterState( WizardState _nState );
-        virtual sal_Bool            leaveState( WizardState _nState );
+        virtual ::svt::OWizardPage*	createPage( WizardState _nState );
+        virtual WizardState		    determineNextState( WizardState _nCurrentState ) const;
+        virtual	void				enterState( WizardState _nState );
+        virtual	sal_Bool			leaveState( WizardState _nState );
         virtual sal_Bool            onFinish();
 
         virtual sal_Bool approveControl(sal_Int16 _nClassId);
@@ -95,15 +95,15 @@ namespace dbp
     class OGridFieldsSelection : public OGridPage
     {
     protected:
-        FixedLine       m_aFrame;
-        FixedText       m_aExistFieldsLabel;
-        ListBox         m_aExistFields;
-        PushButton      m_aSelectOne;
-        PushButton      m_aSelectAll;
-        PushButton      m_aDeselectOne;
-        PushButton      m_aDeselectAll;
-        FixedText       m_aSelFieldsLabel;
-        ListBox         m_aSelFields;
+        FixedLine		m_aFrame;
+        FixedText		m_aExistFieldsLabel;
+        ListBox			m_aExistFields;
+        PushButton		m_aSelectOne;
+        PushButton		m_aSelectAll;
+        PushButton		m_aDeselectOne;
+        PushButton		m_aDeselectAll;
+        FixedText		m_aSelFieldsLabel;
+        ListBox			m_aSelFields;
 
     public:
         OGridFieldsSelection( OGridWizard* _pParent );
@@ -113,8 +113,8 @@ namespace dbp
         virtual void ActivatePage();
 
         // OWizardPage overridables
-        virtual void        initializePage();
-        virtual sal_Bool    commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+        virtual void		initializePage();
+        virtual sal_Bool	commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
         virtual bool        canAdvance() const;
 
     protected:
@@ -130,7 +130,7 @@ namespace dbp
     };
 
 //.........................................................................
-}   // namespace dbp
+}	// namespace dbp
 //.........................................................................
 
 #endif // _EXTENSIONS_DBP_GRIDWIZARD_HXX_
diff --git a/extensions/source/dbpilots/groupboxpages.src b/extensions/source/dbpilots/groupboxpages.src
index 6b651e848010..f5538e2a14af 100644
--- a/extensions/source/dbpilots/groupboxpages.src
+++ b/extensions/source/dbpilots/groupboxpages.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index f8cd1c509ebf..8bda68c04c72 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include "dbpilots.hrc"
 
 
-//#define GBW_STATE_DATASELECTION       0
-#define GBW_STATE_OPTIONLIST        0
-#define GBW_STATE_DEFAULTOPTION     1
-#define GBW_STATE_OPTIONVALUES      2
-#define GBW_STATE_DBFIELD           3
-#define GBW_STATE_FINALIZE          4
+//#define GBW_STATE_DATASELECTION		0
+#define GBW_STATE_OPTIONLIST		0
+#define GBW_STATE_DEFAULTOPTION		1
+#define GBW_STATE_OPTIONVALUES		2
+#define GBW_STATE_DBFIELD			3
+#define GBW_STATE_FINALIZE			4
 
 //.........................................................................
 namespace dbp
@@ -84,8 +84,8 @@ namespace dbp
     {
         switch (_nState)
         {
-//          case GBW_STATE_DATASELECTION:
-//              return new OTableSelectionPage(this);
+//			case GBW_STATE_DATASELECTION:
+//				return new OTableSelectionPage(this);
 //
             case GBW_STATE_OPTIONLIST:
                 return new ORadioSelectionPage(this);
@@ -111,8 +111,8 @@ namespace dbp
     {
         switch (_nCurrentState)
         {
-//          case GBW_STATE_DATASELECTION:
-//              return GBW_STATE_OPTIONLIST;
+//			case GBW_STATE_DATASELECTION:
+//				return GBW_STATE_OPTIONLIST;
 //
             case GBW_STATE_OPTIONLIST:
                 return GBW_STATE_DEFAULTOPTION;
@@ -141,7 +141,7 @@ namespace dbp
         {
             case GBW_STATE_DEFAULTOPTION:
                 if (!m_bVisitedDefault)
-                {   // assume that the first of the radio buttons should be selected
+                {	// assume that the first of the radio buttons should be selected
                     DBG_ASSERT(m_aSettings.aLabels.size(), "OGroupBoxWizard::enterState: should never have reached this state!");
                     m_aSettings.sDefaultField = m_aSettings.aLabels[0];
                 }
@@ -150,7 +150,7 @@ namespace dbp
 
             case GBW_STATE_DBFIELD:
                 if (!m_bVisitedDB)
-                {   // try to generate a default for the DB field
+                {	// try to generate a default for the DB field
                     // (simply use the first field in the DB names collection)
                     if (getContext().aFieldNames.getLength())
                         m_aSettings.sDBField = getContext().aFieldNames[0];
@@ -205,13 +205,13 @@ namespace dbp
     //---------------------------------------------------------------------
     ORadioSelectionPage::ORadioSelectionPage( OControlWizard* _pParent )
         :OGBWPage(_pParent, ModuleRes(RID_PAGE_GROUPRADIOSELECTION))
-        ,m_aFrame               (this, ModuleRes(FL_DATA))
-        ,m_aRadioNameLabel      (this, ModuleRes(FT_RADIOLABELS))
-        ,m_aRadioName           (this, ModuleRes(ET_RADIOLABELS))
-        ,m_aMoveRight           (this, ModuleRes(PB_MOVETORIGHT))
-        ,m_aMoveLeft            (this, ModuleRes(PB_MOVETOLEFT))
-        ,m_aExistingRadiosLabel (this, ModuleRes(FT_RADIOBUTTONS))
-        ,m_aExistingRadios      (this, ModuleRes(LB_RADIOBUTTONS))
+        ,m_aFrame				(this, ModuleRes(FL_DATA))
+        ,m_aRadioNameLabel		(this, ModuleRes(FT_RADIOLABELS))
+        ,m_aRadioName			(this, ModuleRes(ET_RADIOLABELS))
+        ,m_aMoveRight			(this, ModuleRes(PB_MOVETORIGHT))
+        ,m_aMoveLeft			(this, ModuleRes(PB_MOVETOLEFT))
+        ,m_aExistingRadiosLabel	(this, ModuleRes(FT_RADIOBUTTONS))
+        ,m_aExistingRadios		(this, ModuleRes(LB_RADIOBUTTONS))
     {
         FreeResource();
 
@@ -359,11 +359,11 @@ namespace dbp
     //---------------------------------------------------------------------
     ODefaultFieldSelectionPage::ODefaultFieldSelectionPage( OControlWizard* _pParent )
         :OMaybeListSelectionPage(_pParent, ModuleRes(RID_PAGE_DEFAULTFIELDSELECTION))
-        ,m_aFrame                   (this, ModuleRes(FL_DEFAULTSELECTION))
-        ,m_aDefaultSelectionLabel   (this, ModuleRes(FT_DEFAULTSELECTION))
-        ,m_aDefSelYes               (this, ModuleRes(RB_DEFSELECTION_YES))
-        ,m_aDefSelNo                (this, ModuleRes(RB_DEFSELECTION_NO))
-        ,m_aDefSelection            (this, ModuleRes(LB_DEFSELECTIONFIELD))
+        ,m_aFrame					(this, ModuleRes(FL_DEFAULTSELECTION))
+        ,m_aDefaultSelectionLabel	(this, ModuleRes(FT_DEFAULTSELECTION))
+        ,m_aDefSelYes				(this, ModuleRes(RB_DEFSELECTION_YES))
+        ,m_aDefSelNo				(this, ModuleRes(RB_DEFSELECTION_NO))
+        ,m_aDefSelection			(this, ModuleRes(LB_DEFSELECTIONFIELD))
     {
         FreeResource();
 
@@ -380,7 +380,7 @@ namespace dbp
 
         // fill the listbox
         m_aDefSelection.Clear();
-        for (   ConstStringArrayIterator aLoop = rSettings.aLabels.begin();
+        for	(	ConstStringArrayIterator aLoop = rSettings.aLabels.begin();
                 aLoop != rSettings.aLabels.end();
                 ++aLoop
             )
@@ -408,12 +408,12 @@ namespace dbp
     //---------------------------------------------------------------------
     OOptionValuesPage::OOptionValuesPage( OControlWizard* _pParent )
         :OGBWPage(_pParent, ModuleRes(RID_PAGE_OPTIONVALUES))
-        ,m_aFrame               (this, ModuleRes(FL_OPTIONVALUES))
-        ,m_aDescription         (this, ModuleRes(FT_OPTIONVALUES_EXPL))
-        ,m_aValueLabel          (this, ModuleRes(FT_OPTIONVALUES))
-        ,m_aValue               (this, ModuleRes(ET_OPTIONVALUE))
-        ,m_aOptionsLabel        (this, ModuleRes(FT_RADIOBUTTONS))
-        ,m_aOptions             (this, ModuleRes(LB_RADIOBUTTONS))
+        ,m_aFrame				(this, ModuleRes(FL_OPTIONVALUES))
+        ,m_aDescription			(this, ModuleRes(FT_OPTIONVALUES_EXPL))
+        ,m_aValueLabel			(this, ModuleRes(FT_OPTIONVALUES))
+        ,m_aValue				(this, ModuleRes(ET_OPTIONVALUE))
+        ,m_aOptionsLabel		(this, ModuleRes(FT_RADIOBUTTONS))
+        ,m_aOptions				(this, ModuleRes(LB_RADIOBUTTONS))
         ,m_nLastSelection((::svt::WizardTypes::WizardState)-1)
     {
         FreeResource();
@@ -462,7 +462,7 @@ namespace dbp
         // fill the list with all available options
         m_aOptions.Clear();
         m_nLastSelection = -1;
-        for (   ConstStringArrayIterator aLoop = rSettings.aLabels.begin();
+        for	(	ConstStringArrayIterator aLoop = rSettings.aLabels.begin();
                 aLoop != rSettings.aLabels.end();
                 ++aLoop
             )
@@ -515,10 +515,10 @@ namespace dbp
     //---------------------------------------------------------------------
     OFinalizeGBWPage::OFinalizeGBWPage( OControlWizard* _pParent )
         :OGBWPage(_pParent, ModuleRes(RID_PAGE_OPTIONS_FINAL))
-        ,m_aFrame           (this, ModuleRes(FL_NAMEIT))
-        ,m_aNameLabel       (this, ModuleRes(FT_NAMEIT))
-        ,m_aName            (this, ModuleRes(ET_NAMEIT))
-        ,m_aThatsAll        (this, ModuleRes(FT_THATSALL))
+        ,m_aFrame			(this, ModuleRes(FL_NAMEIT))
+        ,m_aNameLabel		(this, ModuleRes(FT_NAMEIT))
+        ,m_aName			(this, ModuleRes(ET_NAMEIT))
+        ,m_aThatsAll		(this, ModuleRes(FT_THATSALL))
     {
         FreeResource();
     }
@@ -557,7 +557,7 @@ namespace dbp
     }
 
 //.........................................................................
-}   // namespace dbp
+}	// namespace dbp
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/dbpilots/groupboxwiz.hxx b/extensions/source/dbpilots/groupboxwiz.hxx
index 725e36e6d8e1..2b762e1f96ce 100644
--- a/extensions/source/dbpilots/groupboxwiz.hxx
+++ b/extensions/source/dbpilots/groupboxwiz.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 dbp
     //=====================================================================
     struct OOptionGroupSettings : public OControlWizardSettings
     {
-        StringArray     aLabels;
-        StringArray     aValues;
-        String          sDefaultField;
-        String          sDBField;
-        String          sName;
+        StringArray		aLabels;
+        StringArray		aValues;
+        String			sDefaultField;
+        String			sDBField;
+        String			sName;
     };
 
     //=====================================================================
@@ -55,10 +55,10 @@ namespace dbp
     class OGroupBoxWizard : public OControlWizard
     {
     protected:
-        OOptionGroupSettings        m_aSettings;
+        OOptionGroupSettings		m_aSettings;
 
-        sal_Bool        m_bVisitedDefault   : 1;
-        sal_Bool        m_bVisitedDB        : 1;
+        sal_Bool		m_bVisitedDefault	: 1;
+        sal_Bool		m_bVisitedDB		: 1;
 
     public:
         OGroupBoxWizard(
@@ -71,9 +71,9 @@ namespace dbp
 
     protected:
         // OWizardMachine overridables
-        virtual ::svt::OWizardPage* createPage( WizardState _nState );
-        virtual WizardState         determineNextState( WizardState _nCurrentState ) const;
-        virtual void                enterState( WizardState _nState );
+        virtual ::svt::OWizardPage*	createPage( WizardState _nState );
+        virtual WizardState	        determineNextState( WizardState _nCurrentState ) const;
+        virtual	void			    enterState( WizardState _nState );
         virtual sal_Bool            onFinish();
 
         virtual sal_Bool approveControl(sal_Int16 _nClassId);
@@ -100,13 +100,13 @@ namespace dbp
     class ORadioSelectionPage : public OGBWPage
     {
     protected:
-        FixedLine       m_aFrame;
-        FixedText       m_aRadioNameLabel;
-        Edit            m_aRadioName;
-        PushButton      m_aMoveRight;
-        PushButton      m_aMoveLeft;
-        FixedText       m_aExistingRadiosLabel;
-        ListBox         m_aExistingRadios;
+        FixedLine		m_aFrame;
+        FixedText		m_aRadioNameLabel;
+        Edit			m_aRadioName;
+        PushButton		m_aMoveRight;
+        PushButton		m_aMoveLeft;
+        FixedText		m_aExistingRadiosLabel;
+        ListBox			m_aExistingRadios;
 
     public:
         ORadioSelectionPage( OControlWizard* _pParent );
@@ -116,8 +116,8 @@ namespace dbp
         void ActivatePage();
 
         // OWizardPage overridables
-        virtual void        initializePage();
-        virtual sal_Bool    commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+        virtual void		initializePage();
+        virtual sal_Bool	commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
         virtual bool        canAdvance() const;
 
         DECL_LINK( OnMoveEntry, PushButton* );
@@ -133,19 +133,19 @@ namespace dbp
     class ODefaultFieldSelectionPage : public OMaybeListSelectionPage
     {
     protected:
-        FixedLine       m_aFrame;
-        FixedText       m_aDefaultSelectionLabel;
-        RadioButton     m_aDefSelYes;
-        RadioButton     m_aDefSelNo;
-        ListBox         m_aDefSelection;
+        FixedLine		m_aFrame;
+        FixedText		m_aDefaultSelectionLabel;
+        RadioButton		m_aDefSelYes;
+        RadioButton		m_aDefSelNo;
+        ListBox			m_aDefSelection;
 
     public:
         ODefaultFieldSelectionPage( OControlWizard* _pParent );
 
     protected:
         // OWizardPage overridables
-        virtual void        initializePage();
-        virtual sal_Bool    commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+        virtual void		initializePage();
+        virtual sal_Bool	commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
 
         OOptionGroupSettings& getSettings() { return static_cast<OGroupBoxWizard*>(getDialog())->getSettings(); }
     };
@@ -156,14 +156,14 @@ namespace dbp
     class OOptionValuesPage : public OGBWPage
     {
     protected:
-        FixedLine       m_aFrame;
-        FixedText       m_aDescription;
-        FixedText       m_aValueLabel;
-        Edit            m_aValue;
-        FixedText       m_aOptionsLabel;
-        ListBox         m_aOptions;
-
-        StringArray     m_aUncommittedValues;
+        FixedLine		m_aFrame;
+        FixedText		m_aDescription;
+        FixedText		m_aValueLabel;
+        Edit			m_aValue;
+        FixedText		m_aOptionsLabel;
+        ListBox			m_aOptions;
+
+        StringArray		m_aUncommittedValues;
         ::svt::WizardTypes::WizardState
                         m_nLastSelection;
 
@@ -175,8 +175,8 @@ namespace dbp
         void ActivatePage();
 
         // OWizardPage overridables
-        virtual void        initializePage();
-        virtual sal_Bool    commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+        virtual void		initializePage();
+        virtual sal_Bool	commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
 
         void implTraveledOptions();
 
@@ -204,10 +204,10 @@ namespace dbp
     class OFinalizeGBWPage : public OGBWPage
     {
     protected:
-        FixedLine       m_aFrame;
-        FixedText       m_aNameLabel;
-        Edit            m_aName;
-        FixedText       m_aThatsAll;
+        FixedLine		m_aFrame;
+        FixedText		m_aNameLabel;
+        Edit			m_aName;
+        FixedText		m_aThatsAll;
 
     public:
         OFinalizeGBWPage( OControlWizard* _pParent );
@@ -217,13 +217,13 @@ namespace dbp
         void ActivatePage();
 
         // OWizardPage overridables
-        virtual void        initializePage();
-        virtual sal_Bool    commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+        virtual void		initializePage();
+        virtual sal_Bool	commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
         virtual bool        canAdvance() const;
     };
 
 //.........................................................................
-}   // namespace dbp
+}	// namespace dbp
 //.........................................................................
 
 #endif // _EXTENSIONS_DBP_GROUPBOXWIZ_HXX_
diff --git a/extensions/source/dbpilots/listcombopages.src b/extensions/source/dbpilots/listcombopages.src
index eb83140de316..7e48fef2cca9 100644
--- a/extensions/source/dbpilots/listcombopages.src
+++ b/extensions/source/dbpilots/listcombopages.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index d70fdcb97378..93c71ba16085 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace dbp
 
         // if we do not need the data source selection page ...
         if (!needDatasourceSelection())
-        {   // ... skip it!
+        {	// ... skip it!
             skip(1);
             m_bHadDataSelection = sal_False;
         }
@@ -293,9 +293,9 @@ namespace dbp
     //---------------------------------------------------------------------
     OContentTableSelection::OContentTableSelection( OListComboWizard* _pParent )
         :OLCPage(_pParent, ModuleRes(RID_PAGE_LCW_CONTENTSELECTION_TABLE))
-        ,m_aFrame               (this, ModuleRes(FL_FRAME))
-        ,m_aSelectTableLabel    (this, ModuleRes(FT_SELECTTABLE_LABEL))
-        ,m_aSelectTable         (this, ModuleRes(LB_SELECTTABLE))
+        ,m_aFrame				(this, ModuleRes(FL_FRAME))
+        ,m_aSelectTableLabel	(this, ModuleRes(FT_SELECTTABLE_LABEL))
+        ,m_aSelectTable			(this, ModuleRes(LB_SELECTTABLE))
     {
         FreeResource();
 
@@ -380,12 +380,12 @@ namespace dbp
     //---------------------------------------------------------------------
     OContentFieldSelection::OContentFieldSelection( OListComboWizard* _pParent )
         :OLCPage(_pParent, ModuleRes(RID_PAGE_LCW_CONTENTSELECTION_FIELD))
-        ,m_aFrame               (this, ModuleRes(FL_FRAME))
-        ,m_aTableFields         (this, ModuleRes(FT_TABLEFIELDS))
-        ,m_aSelectTableField    (this, ModuleRes(LB_SELECTFIELD))
-        ,m_aDisplayedFieldLabel (this, ModuleRes(FT_DISPLAYEDFIELD))
-        ,m_aDisplayedField      (this, ModuleRes(ET_DISPLAYEDFIELD))
-        ,m_aInfo                (this, ModuleRes(FT_CONTENTFIELD_INFO))
+        ,m_aFrame				(this, ModuleRes(FL_FRAME))
+        ,m_aTableFields			(this, ModuleRes(FT_TABLEFIELDS))
+        ,m_aSelectTableField	(this, ModuleRes(LB_SELECTFIELD))
+        ,m_aDisplayedFieldLabel	(this, ModuleRes(FT_DISPLAYEDFIELD))
+        ,m_aDisplayedField		(this, ModuleRes(ET_DISPLAYEDFIELD))
+        ,m_aInfo				(this, ModuleRes(FT_CONTENTFIELD_INFO))
     {
         m_aInfo.SetText(String(ModuleRes( isListBox() ? STR_FIELDINFO_LISTBOX : STR_FIELDINFO_COMBOBOX)));
         FreeResource();
@@ -454,12 +454,12 @@ namespace dbp
     //---------------------------------------------------------------------
     OLinkFieldsPage::OLinkFieldsPage( OListComboWizard* _pParent )
         :OLCPage(_pParent, ModuleRes(RID_PAGE_LCW_FIELDLINK))
-        ,m_aDescription         (this, ModuleRes(FT_FIELDLINK_DESC))
-        ,m_aFrame               (this, ModuleRes(FL_FRAME))
-        ,m_aValueListFieldLabel (this, ModuleRes(FT_VALUELISTFIELD))
-        ,m_aValueListField      (this, ModuleRes(CMB_VALUELISTFIELD))
-        ,m_aTableFieldLabel     (this, ModuleRes(FT_TABLEFIELD))
-        ,m_aTableField          (this, ModuleRes(CMB_TABLEFIELD))
+        ,m_aDescription			(this, ModuleRes(FT_FIELDLINK_DESC))
+        ,m_aFrame				(this, ModuleRes(FL_FRAME))
+        ,m_aValueListFieldLabel	(this, ModuleRes(FT_VALUELISTFIELD))
+        ,m_aValueListField		(this, ModuleRes(CMB_VALUELISTFIELD))
+        ,m_aTableFieldLabel		(this, ModuleRes(FT_TABLEFIELD))
+        ,m_aTableField			(this, ModuleRes(CMB_TABLEFIELD))
     {
         FreeResource();
 
@@ -558,7 +558,7 @@ namespace dbp
     }
 
 //.........................................................................
-}   // namespace dbp
+}	// namespace dbp
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx
index 67e32b50ba88..2f0ff8f85be1 100644
--- a/extensions/source/dbpilots/listcombowizard.hxx
+++ b/extensions/source/dbpilots/listcombowizard.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,21 +37,21 @@ namespace dbp
 {
 //.........................................................................
 
-#define LCW_STATE_DATASOURCE_SELECTION  0
-#define LCW_STATE_TABLESELECTION        1
-#define LCW_STATE_FIELDSELECTION        2
-#define LCW_STATE_FIELDLINK             3
-#define LCW_STATE_COMBODBFIELD          4
+#define LCW_STATE_DATASOURCE_SELECTION	0
+#define LCW_STATE_TABLESELECTION		1
+#define LCW_STATE_FIELDSELECTION		2
+#define LCW_STATE_FIELDLINK				3
+#define LCW_STATE_COMBODBFIELD			4
 
     //=====================================================================
     //= OListComboSettings
     //=====================================================================
     struct OListComboSettings : public OControlWizardSettings
     {
-        String          sListContentTable;
-        String          sListContentField;
-        String          sLinkedFormField;
-        String          sLinkedListField;
+        String			sListContentTable;
+        String			sListContentField;
+        String			sLinkedFormField;
+        String			sLinkedListField;
     };
 
     //=====================================================================
@@ -60,9 +60,9 @@ namespace dbp
     class OListComboWizard : public OControlWizard
     {
     protected:
-        OListComboSettings      m_aSettings;
-        sal_Bool                m_bListBox : 1;
-        sal_Bool                m_bHadDataSelection : 1;
+        OListComboSettings		m_aSettings;
+        sal_Bool				m_bListBox : 1;
+        sal_Bool				m_bHadDataSelection : 1;
 
     public:
         OListComboWizard(
@@ -77,10 +77,10 @@ namespace dbp
 
     protected:
         // OWizardMachine overridables
-        virtual ::svt::OWizardPage* createPage( WizardState _nState );
-        virtual WizardState         determineNextState( WizardState _nCurrentState ) const;
-        virtual void                enterState( WizardState _nState );
-        virtual sal_Bool            leaveState( WizardState _nState );
+        virtual ::svt::OWizardPage*	createPage( WizardState _nState );
+        virtual WizardState	        determineNextState( WizardState _nCurrentState ) const;
+        virtual	void			    enterState( WizardState _nState );
+        virtual	sal_Bool		    leaveState( WizardState _nState );
         virtual sal_Bool            onFinish();
 
         virtual sal_Bool approveControl(sal_Int16 _nClassId);
@@ -116,9 +116,9 @@ namespace dbp
     class OContentTableSelection : public OLCPage
     {
     protected:
-        FixedLine       m_aFrame;
-        FixedText       m_aSelectTableLabel;
-        ListBox         m_aSelectTable;
+        FixedLine		m_aFrame;
+        FixedText		m_aSelectTableLabel;
+        ListBox			m_aSelectTable;
 
     public:
         OContentTableSelection( OListComboWizard* _pParent );
@@ -128,8 +128,8 @@ namespace dbp
         virtual void ActivatePage();
 
         // OWizardPage overridables
-        virtual void        initializePage();
-        virtual sal_Bool    commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+        virtual void		initializePage();
+        virtual sal_Bool	commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
         virtual bool        canAdvance() const;
 
     protected:
@@ -143,12 +143,12 @@ namespace dbp
     class OContentFieldSelection : public OLCPage
     {
     protected:
-        FixedLine       m_aFrame;
-        FixedText       m_aTableFields;
-        ListBox         m_aSelectTableField;
-        FixedText       m_aDisplayedFieldLabel;
-        Edit            m_aDisplayedField;
-        FixedText       m_aInfo;
+        FixedLine		m_aFrame;
+        FixedText		m_aTableFields;
+        ListBox			m_aSelectTableField;
+        FixedText		m_aDisplayedFieldLabel;
+        Edit			m_aDisplayedField;
+        FixedText		m_aInfo;
 
 
     public:
@@ -162,8 +162,8 @@ namespace dbp
         virtual void ActivatePage();
 
         // OWizardPage overridables
-        virtual void        initializePage();
-        virtual sal_Bool    commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+        virtual void		initializePage();
+        virtual sal_Bool	commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
         virtual bool        canAdvance() const;
     };
 
@@ -173,12 +173,12 @@ namespace dbp
     class OLinkFieldsPage : public OLCPage
     {
     protected:
-        FixedText       m_aDescription;
-        FixedLine       m_aFrame;
-        FixedText       m_aValueListFieldLabel;
-        ComboBox        m_aValueListField;
-        FixedText       m_aTableFieldLabel;
-        ComboBox        m_aTableField;
+        FixedText		m_aDescription;
+        FixedLine		m_aFrame;
+        FixedText		m_aValueListFieldLabel;
+        ComboBox		m_aValueListField;
+        FixedText		m_aTableFieldLabel;
+        ComboBox		m_aTableField;
 
 
     public:
@@ -189,8 +189,8 @@ namespace dbp
         virtual void ActivatePage();
 
         // OWizardPage overridables
-        virtual void        initializePage();
-        virtual sal_Bool    commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+        virtual void		initializePage();
+        virtual sal_Bool	commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
         virtual bool        canAdvance() const;
 
     private:
@@ -221,7 +221,7 @@ namespace dbp
     };
 
 //.........................................................................
-}   // namespace dbp
+}	// namespace dbp
 //.........................................................................
 
 #endif // _EXTENSIONS_DBP_LISTCOMBOWIZARD_HXX_
diff --git a/extensions/source/dbpilots/moduledbp.cxx b/extensions/source/dbpilots/moduledbp.cxx
index 6fb06c7f68ac..ead9753193f4 100644
--- a/extensions/source/dbpilots/moduledbp.cxx
+++ b/extensions/source/dbpilots/moduledbp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/dbpilots/optiongrouplayouter.cxx b/extensions/source/dbpilots/optiongrouplayouter.cxx
index 13c453243d0f..7bc1f84cf91d 100644
--- a/extensions/source/dbpilots/optiongrouplayouter.cxx
+++ b/extensions/source/dbpilots/optiongrouplayouter.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace dbp
 {
 //.........................................................................
 
-#define BUTTON_HEIGHT       300
-#define TOP_HEIGHT          300
-#define HEIGHT              450
-#define OFFSET              300
-#define MIN_WIDTH           600
+#define BUTTON_HEIGHT		300
+#define TOP_HEIGHT			300
+#define HEIGHT				450
+#define OFFSET				300
+#define MIN_WIDTH			600
 
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::drawing;
@@ -212,7 +212,7 @@ namespace dbp
     }
 
 //.........................................................................
-}   // namespace dbp
+}	// namespace dbp
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/dbpilots/optiongrouplayouter.hxx b/extensions/source/dbpilots/optiongrouplayouter.hxx
index 0d38149146a5..52b6e7bfc315 100644
--- a/extensions/source/dbpilots/optiongrouplayouter.hxx
+++ b/extensions/source/dbpilots/optiongrouplayouter.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,19 +57,19 @@ namespace dbp
             );
 
     public:
-        void    doLayout(
+        void	doLayout(
             const OControlWizardContext& _rContext,
             const OOptionGroupSettings& _rSettings
         );
 
     protected:
-        void    implAnchorShape(
+        void	implAnchorShape(
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxShapeProps
             );
     };
 
 //.........................................................................
-}   // namespace dbp
+}	// namespace dbp
 //.........................................................................
 
 #endif // _EXTENSIONS_DBP_OPTIONGROUPLAYOUTER_HXX_
diff --git a/extensions/source/dbpilots/unoautopilot.hxx b/extensions/source/dbpilots/unoautopilot.hxx
index b55d9ae34b7d..bfa4e0cfed6d 100644
--- a/extensions/source/dbpilots/unoautopilot.hxx
+++ b/extensions/source/dbpilots/unoautopilot.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 dbp
     struct IServiceInfo
     {
     public:
-        ::rtl::OUString     getImplementationName() const;
+        ::rtl::OUString		getImplementationName() const;
         ::com::sun::star::uno::Sequence< ::rtl::OUString >
                             getServiceNames() const;
     };
@@ -57,7 +57,7 @@ namespace dbp
     //=====================================================================
     //= OUnoAutoPilot
     //=====================================================================
-    typedef ::svt::OGenericUnoDialog    OUnoAutoPilot_Base;
+    typedef ::svt::OGenericUnoDialog	OUnoAutoPilot_Base;
     template <class TYPE, class SERVICEINFO>
     class OUnoAutoPilot
             :public OUnoAutoPilot_Base
@@ -93,14 +93,14 @@ namespace dbp
 
     protected:
     // OGenericUnoDialog overridables
-        virtual Dialog* createDialog(Window* _pParent);
+        virtual Dialog*	createDialog(Window* _pParent);
         virtual void implInitialize(const com::sun::star::uno::Any& _rValue);
     };
 
 #include "unoautopilot.inl"
 
 //.........................................................................
-}   // namespace dbp
+}	// namespace dbp
 //.........................................................................
 
 #endif // _EXTENSIONS_DBP_UNOAUTOPILOT_HXX_
diff --git a/extensions/source/dbpilots/unoautopilot.inl b/extensions/source/dbpilots/unoautopilot.inl
index 0e3a953bcad1..cc1fa0eba310 100644
--- a/extensions/source/dbpilots/unoautopilot.inl
+++ b/extensions/source/dbpilots/unoautopilot.inl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ template <class TYPE, class SERVICEINFO>
 
 //--------------------------------------------------------------------------
 template <class TYPE, class SERVICEINFO>
-Dialog* OUnoAutoPilot<TYPE, SERVICEINFO>::createDialog(Window* _pParent)
+Dialog*	OUnoAutoPilot<TYPE, SERVICEINFO>::createDialog(Window* _pParent)
 {
     return new TYPE(_pParent, m_xObjectModel, m_aContext.getLegacyServiceFactory());
 }
diff --git a/extensions/source/dbpilots/wizardcontext.hxx b/extensions/source/dbpilots/wizardcontext.hxx
index 07d8fb0920c2..93cc936bdd73 100644
--- a/extensions/source/dbpilots/wizardcontext.hxx
+++ b/extensions/source/dbpilots/wizardcontext.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace dbp
     };
 
 //.........................................................................
-}   // namespace dbp
+}	// namespace dbp
 //.........................................................................
 
 #endif // _EXTENSIONS_DBP_WIZARDCONTEXT_HXX_
diff --git a/extensions/source/dbpilots/wizardservices.cxx b/extensions/source/dbpilots/wizardservices.cxx
index 23d0c2b6c80b..b90e47478fc3 100644
--- a/extensions/source/dbpilots/wizardservices.cxx
+++ b/extensions/source/dbpilots/wizardservices.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -116,7 +116,7 @@ namespace dbp
     }
 
 //.........................................................................
-}   // namespace dbp
+}	// namespace dbp
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/dbpilots/wizardservices.hxx b/extensions/source/dbpilots/wizardservices.hxx
index 23f71d2722cc..48c57115b1c8 100644
--- a/extensions/source/dbpilots/wizardservices.hxx
+++ b/extensions/source/dbpilots/wizardservices.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 dbp
     struct OGroupBoxSI
     {
     public:
-        ::rtl::OUString         getImplementationName() const;
+        ::rtl::OUString			getImplementationName() const;
         ::com::sun::star::uno::Sequence< ::rtl::OUString >
                                 getServiceNames() const;
     };
@@ -56,7 +56,7 @@ namespace dbp
     struct OListComboSI
     {
     public:
-        ::rtl::OUString         getImplementationName() const;
+        ::rtl::OUString			getImplementationName() const;
         ::com::sun::star::uno::Sequence< ::rtl::OUString >
                                 getServiceNames() const;
     };
@@ -68,13 +68,13 @@ namespace dbp
     struct OGridSI
     {
     public:
-        ::rtl::OUString         getImplementationName() const;
+        ::rtl::OUString			getImplementationName() const;
         ::com::sun::star::uno::Sequence< ::rtl::OUString >
                                 getServiceNames() const;
     };
 
 //.........................................................................
-}   // namespace dbp
+}	// namespace dbp
 //.........................................................................
 
 #endif // _EXTENSIONS_DBW_WIZARDSERVICES_HXX_
diff --git a/extensions/source/inc/componentmodule.cxx b/extensions/source/inc/componentmodule.cxx
index fe8321be9cdd..b5b80f89963a 100644
--- a/extensions/source/inc/componentmodule.cxx
+++ b/extensions/source/inc/componentmodule.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <comphelper/sequence.hxx>
 #include <tools/debug.hxx>
 
-#define ENTER_MOD_METHOD()  \
-    ::osl::MutexGuard aGuard(s_aMutex); \
+#define ENTER_MOD_METHOD()	\
+    ::osl::MutexGuard aGuard(s_aMutex);	\
     ensureImpl()
-
+    
 //.........................................................................
 namespace COMPMOD_NAMESPACE
 {
@@ -54,9 +54,9 @@ namespace COMPMOD_NAMESPACE
     */
     class OModuleImpl
     {
-        ResMgr*     m_pRessources;
-        sal_Bool    m_bInitialized;
-        ByteString  m_sFilePrefix;
+        ResMgr*		m_pRessources;
+        sal_Bool	m_bInitialized;
+        ByteString	m_sFilePrefix;
 
     public:
         /// ctor
@@ -64,8 +64,8 @@ namespace COMPMOD_NAMESPACE
         ~OModuleImpl();
 
         /// get the manager for the ressources of the module
-        ResMgr* getResManager();
-        void    setResourceFilePrefix(const ::rtl::OString& _rPrefix) { m_sFilePrefix = _rPrefix; }
+        ResMgr*	getResManager();
+        void	setResourceFilePrefix(const ::rtl::OString& _rPrefix) { m_sFilePrefix = _rPrefix; }
     };
 
     //-------------------------------------------------------------------------
@@ -83,7 +83,7 @@ namespace COMPMOD_NAMESPACE
     }
 
     //-------------------------------------------------------------------------
-    ResMgr* OModuleImpl::getResManager()
+    ResMgr*	OModuleImpl::getResManager()
     {
         // note that this method is not threadsafe, which counts for the whole class !
         if (!m_pRessources && !m_bInitialized)
@@ -93,10 +93,10 @@ namespace COMPMOD_NAMESPACE
             ByteString aMgrName = m_sFilePrefix;
 
             m_pRessources = ResMgr::CreateResMgr(aMgrName.GetBuffer());
-            DBG_ASSERT(m_pRessources,
+            DBG_ASSERT(m_pRessources, 
                     (ByteString("OModuleImpl::getResManager: could not create the resource manager (file name: ")
-                +=  aMgrName
-                +=  ByteString(")!")).GetBuffer());
+                +=	aMgrName
+                +=	ByteString(")!")).GetBuffer());
 
             m_bInitialized = sal_True;
         }
@@ -106,12 +106,12 @@ namespace COMPMOD_NAMESPACE
     //=========================================================================
     //= OModule
     //=========================================================================
-    ::osl::Mutex    OModule::s_aMutex;
-    sal_Int32       OModule::s_nClients = 0;
-    OModuleImpl*    OModule::s_pImpl = NULL;
-    ::rtl::OString  OModule::s_sResPrefix;
+    ::osl::Mutex	OModule::s_aMutex;
+    sal_Int32		OModule::s_nClients = 0;
+    OModuleImpl*	OModule::s_pImpl = NULL;
+    ::rtl::OString	OModule::s_sResPrefix;
     //-------------------------------------------------------------------------
-    ResMgr* OModule::getResManager()
+    ResMgr*	OModule::getResManager()
     {
         ENTER_MOD_METHOD();
         return s_pImpl->getResManager();
@@ -157,10 +157,10 @@ namespace COMPMOD_NAMESPACE
     //- registration helper
     //--------------------------------------------------------------------------
 
-    Sequence< ::rtl::OUString >*                OModule::s_pImplementationNames = NULL;
-    Sequence< Sequence< ::rtl::OUString > >*    OModule::s_pSupportedServices = NULL;
-    Sequence< sal_Int64 >*                      OModule::s_pCreationFunctionPointers = NULL;
-    Sequence< sal_Int64 >*                      OModule::s_pFactoryFunctionPointers = NULL;
+    Sequence< ::rtl::OUString >*				OModule::s_pImplementationNames = NULL;
+    Sequence< Sequence< ::rtl::OUString > >*	OModule::s_pSupportedServices = NULL;
+    Sequence< sal_Int64 >*						OModule::s_pCreationFunctionPointers = NULL;
+    Sequence< sal_Int64 >*						OModule::s_pFactoryFunctionPointers = NULL;
 
     //--------------------------------------------------------------------------
     void OModule::registerComponent(
@@ -181,9 +181,9 @@ namespace COMPMOD_NAMESPACE
         OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
             "OModule::registerComponent : inconsistent state (the pointers (2)) !");
 
-        OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
-                    &&  (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
-                    &&  (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
+        OSL_ENSURE(	(s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
+                    &&	(s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
+                    &&	(s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
             "OModule::registerComponent : inconsistent state !");
 
         sal_Int32 nOldLen = s_pImplementationNames->getLength();
@@ -208,9 +208,9 @@ namespace COMPMOD_NAMESPACE
         }
         OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
             "OModule::revokeComponent : inconsistent state (the pointers) !");
-        OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
-                    &&  (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
-                    &&  (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
+        OSL_ENSURE(	(s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
+                    &&	(s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
+                    &&	(s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
             "OModule::revokeComponent : inconsistent state !");
 
         sal_Int32 nLen = s_pImplementationNames->getLength();
@@ -250,9 +250,9 @@ namespace COMPMOD_NAMESPACE
         }
         OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
             "OModule::writeComponentInfos : inconsistent state (the pointers) !");
-        OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
-                    &&  (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
-                    &&  (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
+        OSL_ENSURE(	(s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
+                    &&	(s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
+                    &&	(s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
             "OModule::writeComponentInfos : inconsistent state !");
 
         sal_Int32 nLen = s_pImplementationNames->getLength();
@@ -299,9 +299,9 @@ namespace COMPMOD_NAMESPACE
         }
         OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
             "OModule::getComponentFactory : inconsistent state (the pointers) !");
-        OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
-                    &&  (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
-                    &&  (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
+        OSL_ENSURE(	(s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
+                    &&	(s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
+                    &&	(s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
             "OModule::getComponentFactory : inconsistent state !");
 
 
@@ -335,7 +335,7 @@ namespace COMPMOD_NAMESPACE
 
 
 //.........................................................................
-}   // namespace COMPMOD_NAMESPACE
+}	// namespace COMPMOD_NAMESPACE
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/inc/componentmodule.hxx b/extensions/source/inc/componentmodule.hxx
index 8ac75326a56e..d0c93c5b0663 100644
--- a/extensions/source/inc/componentmodule.hxx
+++ b/extensions/source/inc/componentmodule.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,36 +76,36 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
 
     protected:
         // resource administration
-        static ::osl::Mutex     s_aMutex;       /// access safety
-        static sal_Int32        s_nClients;     /// number of registered clients
-        static OModuleImpl*     s_pImpl;        /// impl class. lives as long as at least one client for the module is registered
-        static ::rtl::OString   s_sResPrefix;
+        static ::osl::Mutex		s_aMutex;		/// access safety
+        static sal_Int32		s_nClients;		/// number of registered clients
+        static OModuleImpl*		s_pImpl;		/// impl class. lives as long as at least one client for the module is registered
+        static ::rtl::OString	s_sResPrefix;
 
         // auto registration administration
-        static  ::com::sun::star::uno::Sequence< ::rtl::OUString >*
+        static	::com::sun::star::uno::Sequence< ::rtl::OUString >*
             s_pImplementationNames;
-        static  ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >*
+        static	::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >*
             s_pSupportedServices;
-        static  ::com::sun::star::uno::Sequence< sal_Int64 >*
+        static	::com::sun::star::uno::Sequence< sal_Int64 >*
             s_pCreationFunctionPointers;
-        static  ::com::sun::star::uno::Sequence< sal_Int64 >*
+        static	::com::sun::star::uno::Sequence< sal_Int64 >*
             s_pFactoryFunctionPointers;
 
     public:
         // cna be set as long as no resource has been accessed ...
-        static void     setResourceFilePrefix(const ::rtl::OString& _rPrefix);
+        static void		setResourceFilePrefix(const ::rtl::OString& _rPrefix);
 
         /// get the vcl res manager of the module
-        static ResMgr*  getResManager();
+        static ResMgr*	getResManager();
 
         /** register a component implementing a service with the given data.
-            @param  _rImplementationName
+            @param	_rImplementationName
                         the implementation name of the component
-            @param  _rServiceNames
+            @param	_rServiceNames
                         the services the component supports
-            @param  _pCreateFunction
+            @param	_pCreateFunction
                         a function for creating an instance of the component
-            @param  _pFactoryFunction
+            @param	_pFactoryFunction
                         a function for creating a factory for that component
             @see revokeComponent
         */
@@ -116,7 +116,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
             FactoryInstantiation _pFactoryFunction);
 
         /** revoke the registration for the specified component
-            @param  _rImplementationName
+            @param	_rImplementationName
                 the implementation name of the component
         */
         static void revokeComponent(
@@ -126,9 +126,9 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
             <p>writes the registration information of all components which are currently registered into the
             specified registry.<p/>
             <p>Usually used from within component_writeInfo.<p/>
-            @param  _rxServiceManager
+            @param	_rxServiceManager
                         the service manager
-            @param  _rRootKey
+            @param	_rRootKey
                         the registry key under which the information will be stored
             @return
                         sal_True if the registration of all implementations was successfull, sal_False otherwise
@@ -139,9 +139,9 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
 
         /** creates a Factory for the component with the given implementation name.
             <p>Usually used from within component_getFactory.<p/>
-            @param  _rxServiceManager
+            @param	_rxServiceManager
                         a pointer to an XMultiServiceFactory interface as got in component_getFactory
-            @param  _pImplementationName
+            @param	_pImplementationName
                         the implementation name of the component
             @return
                         the XInterface access to a factory for the component
@@ -153,9 +153,9 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
 
     protected:
         /// register a client for the module
-        static void registerClient();
+        static void	registerClient();
         /// revoke a client for the module
-        static void revokeClient();
+        static void	revokeClient();
 
     private:
         /** ensure that the impl class exists
@@ -167,13 +167,13 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
     //=========================================================================
     //= OModuleResourceClient
     //=========================================================================
-    /** base class for objects which uses any global module-specific ressources
+    /** base class for objects which uses any global module-specific ressources 
     */
     class OModuleResourceClient
     {
     public:
-        OModuleResourceClient()     { OModule::registerClient(); }
-        ~OModuleResourceClient()    { OModule::revokeClient(); }
+        OModuleResourceClient()		{ OModule::registerClient(); }
+        ~OModuleResourceClient()	{ OModule::revokeClient(); }
     };
 
     //=========================================================================
@@ -272,7 +272,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
     }
 
 //.........................................................................
-}   // namespace COMPMOD_NAMESPACE
+}	// namespace COMPMOD_NAMESPACE
 //.........................................................................
 
 #endif // _EXTENSIONS_COMPONENT_MODULE_HXX_
diff --git a/extensions/source/logging/consolehandler.cxx b/extensions/source/logging/consolehandler.cxx
index c095198900ef..9e51ca370a7b 100644
--- a/extensions/source/logging/consolehandler.cxx
+++ b/extensions/source/logging/consolehandler.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -180,7 +180,7 @@ namespace logging
         MethodGuard aGuard( *this );
         return m_nThreshold;
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL ConsoleHandler::setThreshold( ::sal_Int32 _threshold ) throw (RuntimeException)
     {
@@ -196,42 +196,42 @@ namespace logging
         OSL_VERIFY( m_aHandlerHelper.getEncoding( sEncoding ) );
         return sEncoding;
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL ConsoleHandler::setEncoding( const ::rtl::OUString& _rEncoding ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         OSL_VERIFY( m_aHandlerHelper.setEncoding( _rEncoding ) );
     }
-
+    
     //--------------------------------------------------------------------
     Reference< XLogFormatter > SAL_CALL ConsoleHandler::getFormatter() throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         return m_aHandlerHelper.getFormatter();
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL ConsoleHandler::setFormatter( const Reference< XLogFormatter >& _rxFormatter ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         m_aHandlerHelper.setFormatter( _rxFormatter );
     }
-
+    
     //--------------------------------------------------------------------
     ::sal_Int32 SAL_CALL ConsoleHandler::getLevel() throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         return m_aHandlerHelper.getLevel();
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL ConsoleHandler::setLevel( ::sal_Int32 _nLevel ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         m_aHandlerHelper.setLevel( _nLevel );
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL ConsoleHandler::flush(  ) throw (RuntimeException)
     {
@@ -239,7 +239,7 @@ namespace logging
         fflush( stdout );
         fflush( stderr );
     }
-
+    
     //--------------------------------------------------------------------
     ::sal_Bool SAL_CALL ConsoleHandler::publish( const LogRecord& _rRecord ) throw (RuntimeException)
     {
@@ -292,7 +292,7 @@ namespace logging
     {
         return getImplementationName_static();
     }
-
+    
     //--------------------------------------------------------------------
     ::sal_Bool SAL_CALL ConsoleHandler::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException)
     {
@@ -305,19 +305,19 @@ namespace logging
                 return sal_True;
         return sal_False;
     }
-
+    
     //--------------------------------------------------------------------
     Sequence< ::rtl::OUString > SAL_CALL ConsoleHandler::getSupportedServiceNames() throw(RuntimeException)
     {
         return getSupportedServiceNames_static();
     }
-
+    
     //--------------------------------------------------------------------
     ::rtl::OUString SAL_CALL ConsoleHandler::getImplementationName_static()
     {
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.ConsoleHandler" ) );
     }
-
+    
     //--------------------------------------------------------------------
     Sequence< ::rtl::OUString > SAL_CALL ConsoleHandler::getSupportedServiceNames_static()
     {
diff --git a/extensions/source/logging/csvformatter.cxx b/extensions/source/logging/csvformatter.cxx
index 275d6938217b..244b0b3407ba 100644
--- a/extensions/source/logging/csvformatter.cxx
+++ b/extensions/source/logging/csvformatter.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER 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 logging
     {
     public:
         virtual ::rtl::OUString SAL_CALL formatMultiColumn(const Sequence< ::rtl::OUString>& column_data) throw (RuntimeException);
-
+        
         // XServiceInfo - static version
         static ::rtl::OUString SAL_CALL getImplementationName_static();
         static Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static();
@@ -145,7 +145,7 @@ namespace
             // special treatment for the last character
             if(quote_char==str[str_length-1])
                 buf.append(quote_char);
-            // iterating backwards because the index at which we insert wont be shifted
+            // iterating backwards because the index at which we insert wont be shifted 
             // when moving that way.
             for(sal_Int32 i = str_length; i>=0; )
             {
@@ -157,8 +157,8 @@ namespace
         }
         else
             buf.append(str);
-    };
-
+    }; 
+    
     ::com::sun::star::uno::Sequence< ::rtl::OUString> initialColumns()
     {
         com::sun::star::uno::Sequence< ::rtl::OUString> result = ::com::sun::star::uno::Sequence< ::rtl::OUString>(1);
@@ -171,11 +171,11 @@ namespace
 namespace logging
 {
     CsvFormatter::CsvFormatter( const Reference< XComponentContext >& context )
-        :m_aContext( context ),
-        m_LogEventNo(true),
-        m_LogThread(true),
-        m_LogTimestamp(true),
-        m_LogSource(false),
+        :m_aContext( context ), 
+        m_LogEventNo(true), 
+        m_LogThread(true), 
+        m_LogTimestamp(true), 
+        m_LogSource(false), 
         m_MultiColumn(false),
         m_Columnnames(initialColumns())
     { }
@@ -225,7 +225,7 @@ namespace logging
 
     void CsvFormatter::setLogSource(::sal_Bool log_source) throw (RuntimeException)
     {
-        m_LogSource = log_source;
+        m_LogSource = log_source; 
     }
 
     void CsvFormatter::setColumnnames(const Sequence< ::rtl::OUString >& columnnames) throw (RuntimeException)
@@ -248,7 +248,7 @@ namespace logging
         sal_Int32 columns = m_Columnnames.getLength();
         for(sal_Int32 i=0; i<columns; i++)
         {
-            buf.append(m_Columnnames[i]);
+            buf.append(m_Columnnames[i]); 
             buf.append(comma_char);
         }
         buf.setLength(buf.getLength()-1);
@@ -288,7 +288,7 @@ namespace logging
             aLogEntry.appendAscii( buffer );
             aLogEntry.append(comma_char);
         }
-
+        
         if(m_LogSource)
         {
             appendEncodedString(aLogEntry, record.SourceClassName);
@@ -310,7 +310,7 @@ namespace logging
         aLogEntry.append( dos_newline );
         return aLogEntry.makeStringAndClear();
     }
-
+    
     ::rtl::OUString SAL_CALL CsvFormatter::getTail(  ) throw (RuntimeException)
     {
         return ::rtl::OUString();
@@ -340,22 +340,22 @@ namespace logging
                 return sal_True;
         return sal_False;
     }
-
+    
     ::rtl::OUString SAL_CALL CsvFormatter::getImplementationName() throw(RuntimeException)
     {
         return getImplementationName_static();
     }
-
+    
     Sequence< ::rtl::OUString > SAL_CALL CsvFormatter::getSupportedServiceNames() throw(RuntimeException)
     {
         return getSupportedServiceNames_static();
     }
-
+    
     ::rtl::OUString SAL_CALL CsvFormatter::getImplementationName_static()
     {
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.CsvFormatter" ) );
     }
-
+    
     Sequence< ::rtl::OUString > SAL_CALL CsvFormatter::getSupportedServiceNames_static()
     {
         Sequence< ::rtl::OUString > aServiceNames(1);
diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx
index e0680441a85a..beeccbb7453b 100644
--- a/extensions/source/logging/filehandler.cxx
+++ b/extensions/source/logging/filehandler.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -286,42 +286,42 @@ namespace logging
         OSL_VERIFY( m_aHandlerHelper.getEncoding( sEncoding ) );
         return sEncoding;
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL FileHandler::setEncoding( const ::rtl::OUString& _rEncoding ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         OSL_VERIFY( m_aHandlerHelper.setEncoding( _rEncoding ) );
     }
-
+    
     //--------------------------------------------------------------------
     Reference< XLogFormatter > SAL_CALL FileHandler::getFormatter() throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         return m_aHandlerHelper.getFormatter();
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL FileHandler::setFormatter( const Reference< XLogFormatter >& _rxFormatter ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         m_aHandlerHelper.setFormatter( _rxFormatter );
     }
-
+    
     //--------------------------------------------------------------------
     ::sal_Int32 SAL_CALL FileHandler::getLevel() throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         return m_aHandlerHelper.getLevel();
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL FileHandler::setLevel( ::sal_Int32 _nLevel ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         m_aHandlerHelper.setLevel( _nLevel );
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL FileHandler::flush(  ) throw (RuntimeException)
     {
@@ -337,7 +337,7 @@ namespace logging
                 m_pFile->sync();
         OSL_ENSURE(res == ::osl::FileBase::E_None, "FileHandler::flush: Could not sync logfile to filesystem.");
     }
-
+    
     //--------------------------------------------------------------------
     ::sal_Bool SAL_CALL FileHandler::publish( const LogRecord& _rRecord ) throw (RuntimeException)
     {
@@ -391,7 +391,7 @@ namespace logging
     {
         return getImplementationName_static();
     }
-
+    
     //--------------------------------------------------------------------
     ::sal_Bool SAL_CALL FileHandler::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException)
     {
@@ -404,19 +404,19 @@ namespace logging
                 return sal_True;
         return sal_False;
     }
-
+    
     //--------------------------------------------------------------------
     Sequence< ::rtl::OUString > SAL_CALL FileHandler::getSupportedServiceNames() throw(RuntimeException)
     {
         return getSupportedServiceNames_static();
     }
-
+    
     //--------------------------------------------------------------------
     ::rtl::OUString SAL_CALL FileHandler::getImplementationName_static()
     {
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.FileHandler" ) );
     }
-
+    
     //--------------------------------------------------------------------
     Sequence< ::rtl::OUString > SAL_CALL FileHandler::getSupportedServiceNames_static()
     {
diff --git a/extensions/source/logging/log_module.cxx b/extensions/source/logging/log_module.cxx
index c6b2eb677c0d..5cdf5e73723a 100644
--- a/extensions/source/logging/log_module.cxx
+++ b/extensions/source/logging/log_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
diff --git a/extensions/source/logging/log_module.hxx b/extensions/source/logging/log_module.hxx
index dfee11365350..dbc06816ccab 100644
--- a/extensions/source/logging/log_module.hxx
+++ b/extensions/source/logging/log_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
diff --git a/extensions/source/logging/log_services.cxx b/extensions/source/logging/log_services.cxx
index 9659849d0970..4cf0d54e13c0 100644
--- a/extensions/source/logging/log_services.cxx
+++ b/extensions/source/logging/log_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/extensions/source/logging/logger.cxx b/extensions/source/logging/logger.cxx
index 0f20d88753e0..64de34fc78b5 100644
--- a/extensions/source/logging/logger.cxx
+++ b/extensions/source/logging/logger.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace logging
             return sal_False;
         }
     }
-
+    
     //====================================================================
     //= EventLogger - declaration
     //====================================================================
@@ -217,7 +217,7 @@ namespace logging
 
         return true;
     }
-
+    
     //--------------------------------------------------------------------
     void EventLogger::impl_ts_logEvent_nothrow( const LogRecord& _rRecord )
     {
@@ -237,35 +237,35 @@ namespace logging
     {
         return m_sName;
     }
-
+    
     //--------------------------------------------------------------------
     ::sal_Int32 SAL_CALL EventLogger::getLevel() throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         return m_nLogLevel;
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL EventLogger::setLevel( ::sal_Int32 _level ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         m_nLogLevel = _level;
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL EventLogger::addLogHandler( const Reference< XLogHandler >& _rxLogHandler ) throw (RuntimeException)
     {
         if ( _rxLogHandler.is() )
             m_aHandlers.addInterface( _rxLogHandler );
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL EventLogger::removeLogHandler( const Reference< XLogHandler >& _rxLogHandler ) throw (RuntimeException)
     {
         if ( _rxLogHandler.is() )
             m_aHandlers.removeInterface( _rxLogHandler );
     }
-
+    
     //--------------------------------------------------------------------
     ::sal_Bool SAL_CALL EventLogger::isLoggable( ::sal_Int32 _nLevel ) throw (RuntimeException)
     {
@@ -283,7 +283,7 @@ namespace logging
             osl_incrementInterlockedCount( &m_nEventNumber )
         ) );
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL EventLogger::logp( ::sal_Int32 _nLevel, const ::rtl::OUString& _rSourceClass, const ::rtl::OUString& _rSourceMethod, const ::rtl::OUString& _rMessage ) throw (RuntimeException)
     {
@@ -302,13 +302,13 @@ namespace logging
     {
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.EventLogger" ) );
     }
-
+    
     //--------------------------------------------------------------------
     ::sal_Bool EventLogger::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException)
     {
         return lcl_supportsService_nothrow( *this, _rServiceName );
     }
-
+    
     //--------------------------------------------------------------------
     Sequence< ::rtl::OUString > SAL_CALL EventLogger::getSupportedServiceNames() throw(RuntimeException)
     {
@@ -331,13 +331,13 @@ namespace logging
     {
         return getImplementationName_static();
     }
-
+    
     //--------------------------------------------------------------------
     ::sal_Bool SAL_CALL LoggerPool::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException)
     {
         return lcl_supportsService_nothrow( *this, _rServiceName );
     }
-
+    
     //--------------------------------------------------------------------
     Sequence< ::rtl::OUString > SAL_CALL LoggerPool::getSupportedServiceNames() throw(RuntimeException)
     {
@@ -349,7 +349,7 @@ namespace logging
     {
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.LoggerPool" ) );
     }
-
+    
     //--------------------------------------------------------------------
     Sequence< ::rtl::OUString > SAL_CALL LoggerPool::getSupportedServiceNames_static()
     {
@@ -386,7 +386,7 @@ namespace logging
 
         return xLogger;
     }
-
+    
     //--------------------------------------------------------------------
     Reference< XLogger > SAL_CALL LoggerPool::getDefaultLogger(  ) throw (RuntimeException)
     {
diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx
index 048ede71a41e..e05c93e1ebf9 100644
--- a/extensions/source/logging/loggerconfig.cxx
+++ b/extensions/source/logging/loggerconfig.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/logging/loggerconfig.hxx b/extensions/source/logging/loggerconfig.hxx
index eb41a6e12f78..78157d8ad73a 100644
--- a/extensions/source/logging/loggerconfig.hxx
+++ b/extensions/source/logging/loggerconfig.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/logging/loghandler.cxx b/extensions/source/logging/loghandler.cxx
index 796cdd114192..a2c7411b390b 100644
--- a/extensions/source/logging/loghandler.cxx
+++ b/extensions/source/logging/loghandler.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/logging/loghandler.hxx b/extensions/source/logging/loghandler.hxx
index 235e7e850a6a..34f93d4c2824 100644
--- a/extensions/source/logging/loghandler.hxx
+++ b/extensions/source/logging/loghandler.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 logging
 //........................................................................
 
     //====================================================================
-    //=
+    //= 
     //====================================================================
     class LogHandlerHelper
     {
diff --git a/extensions/source/logging/logrecord.cxx b/extensions/source/logging/logrecord.cxx
index bbab43afe117..8ff2f94b1af1 100644
--- a/extensions/source/logging/logrecord.cxx
+++ b/extensions/source/logging/logrecord.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/logging/logrecord.hxx b/extensions/source/logging/logrecord.hxx
index 5e741df5788d..53c8f49f7d07 100644
--- a/extensions/source/logging/logrecord.hxx
+++ b/extensions/source/logging/logrecord.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/logging/methodguard.hxx b/extensions/source/logging/methodguard.hxx
index 5067cf5425ea..62b37f6706fc 100644
--- a/extensions/source/logging/methodguard.hxx
+++ b/extensions/source/logging/methodguard.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/logging/plaintextformatter.cxx b/extensions/source/logging/plaintextformatter.cxx
index 3ea85f415b7c..6d5591467960 100644
--- a/extensions/source/logging/plaintextformatter.cxx
+++ b/extensions/source/logging/plaintextformatter.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -125,7 +125,7 @@ namespace logging
         aHeader.appendAscii( "\n" );
         return aHeader.makeStringAndClear();
     }
-
+    
     //--------------------------------------------------------------------
     ::rtl::OUString SAL_CALL PlainTextFormatter::format( const LogRecord& _rRecord ) throw (RuntimeException)
     {
@@ -163,7 +163,7 @@ namespace logging
 
         return aLogEntry.makeStringAndClear();
     }
-
+    
     //--------------------------------------------------------------------
     ::rtl::OUString SAL_CALL PlainTextFormatter::getTail(  ) throw (RuntimeException)
     {
@@ -183,25 +183,25 @@ namespace logging
                 return sal_True;
         return sal_False;
     }
-
+    
     //--------------------------------------------------------------------
     ::rtl::OUString SAL_CALL PlainTextFormatter::getImplementationName() throw(RuntimeException)
     {
         return getImplementationName_static();
     }
-
+    
     //--------------------------------------------------------------------
     Sequence< ::rtl::OUString > SAL_CALL PlainTextFormatter::getSupportedServiceNames() throw(RuntimeException)
     {
         return getSupportedServiceNames_static();
     }
-
+    
     //--------------------------------------------------------------------
     ::rtl::OUString SAL_CALL PlainTextFormatter::getImplementationName_static()
     {
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.PlainTextFormatter" ) );
     }
-
+    
     //--------------------------------------------------------------------
     Sequence< ::rtl::OUString > SAL_CALL PlainTextFormatter::getSupportedServiceNames_static()
     {
diff --git a/extensions/source/macosx/spotlight/OOoContentDataParser.h b/extensions/source/macosx/spotlight/OOoContentDataParser.h
index 537a1b2e49ed..b307bb3756cd 100644
--- a/extensions/source/macosx/spotlight/OOoContentDataParser.h
+++ b/extensions/source/macosx/spotlight/OOoContentDataParser.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 @@
 @interface OOoContentDataParser : NSObject {
     // indicates if we are interested in an element's content
     BOOL shouldReadCharacters;
-
+    
     // the MD importer's values
     NSMutableDictionary *mdiValues;
-
+    
     // all of the text inside a document
     NSMutableString *textContent;
-
+    
     // the current element's content
     NSMutableString *runningTextContent;
 }
diff --git a/extensions/source/macosx/spotlight/OOoMetaDataParser.h b/extensions/source/macosx/spotlight/OOoMetaDataParser.h
index d22e10f128a2..fdeb61d15c67 100644
--- a/extensions/source/macosx/spotlight/OOoMetaDataParser.h
+++ b/extensions/source/macosx/spotlight/OOoMetaDataParser.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 @@
     BOOL shouldReadCharacters;
     //indicates if the current element is a custom metadata tag
     BOOL isCustom;
-
+    
     NSMutableDictionary *metaValues;
     NSMutableString *textCurrentElement;
     NSString *customAttribute;
diff --git a/extensions/source/macosx/spotlight/OOoSpotlightImporter.h b/extensions/source/macosx/spotlight/OOoSpotlightImporter.h
index 78493590b177..6fec52fae722 100644
--- a/extensions/source/macosx/spotlight/OOoSpotlightImporter.h
+++ b/extensions/source/macosx/spotlight/OOoSpotlightImporter.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/extensions/source/macosx/spotlight/ioapi.h b/extensions/source/macosx/spotlight/ioapi.h
index 3bfb93d551e2..4b10726a7dad 100644
--- a/extensions/source/macosx/spotlight/ioapi.h
+++ b/extensions/source/macosx/spotlight/ioapi.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/extensions/source/macosx/spotlight/mdimporter/schema.xml b/extensions/source/macosx/spotlight/mdimporter/schema.xml
index f0b634475a81..06457c86fca2 100644
--- a/extensions/source/macosx/spotlight/mdimporter/schema.xml
+++ b/extensions/source/macosx/spotlight/mdimporter/schema.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
+ 
 <schema version="1.0" xmlns="http://www.apple.com/metadata"
                       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                       xsi:schemaLocation="http://www.apple.com/metadata file:///System/Library/Frameworks/CoreServices.framework/Frameworks/Metadata.framework/Resources/MetadataSchema.xsd">
     <note>
         OpenOffice.org allows the user to enter 4 pieces of custom information in the document's metadata.
-        These metadata fields are described here for Spotlight's use.
+        These metadata fields are described here for Spotlight's use.		      
     </note>
     <attributes>
         <attribute name="org_openoffice_opendocument_custominfo1" type="CFString"/>
diff --git a/extensions/source/macosx/spotlight/unzip.h b/extensions/source/macosx/spotlight/unzip.h
index a513d0dcd37f..e710cd84a0d6 100644
--- a/extensions/source/macosx/spotlight/unzip.h
+++ b/extensions/source/macosx/spotlight/unzip.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
@@ -78,7 +78,7 @@ extern "C" {
 #endif
 
 #include <zlib.h>
-
+    
 #include "ioapi.h"
 
 #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx
index d009774aeb25..d19b7b6d2482 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/nsplugin/source/npshell.hxx b/extensions/source/nsplugin/source/npshell.hxx
index 8af8bc687535..e3e44c93ac09 100644
--- a/extensions/source/nsplugin/source/npshell.hxx
+++ b/extensions/source/nsplugin/source/npshell.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/nsplugin/source/ns_debug.hxx b/extensions/source/nsplugin/source/ns_debug.hxx
index 83dc5a695534..d2ee5b0bd2cd 100644
--- a/extensions/source/nsplugin/source/ns_debug.hxx
+++ b/extensions/source/nsplugin/source/ns_debug.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/nsplugin/source/nsp_func.hxx b/extensions/source/nsplugin/source/nsp_func.hxx
index 566236a24ad3..c9ebbc7d747c 100644
--- a/extensions/source/nsplugin/source/nsp_func.hxx
+++ b/extensions/source/nsplugin/source/nsp_func.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ typedef int NSP_PIPE_FD;
 #define NSP_Write_Pipe(a, b, c, d) write(a, b, c)
 #define NSP_Read_Pipe(a, b, c, d) read(a, b, c)
 
-//for socket
+//for socket 
 #define NSP_CloseSocket close
 
 //for sleep
@@ -86,13 +86,13 @@ SECURITY_ATTRIBUTES  NSP_pipe_access = { sizeof(SECURITY_ATTRIBUTES), NULL, TRUE
 //for execl()
 #define NSP_CreateProcess(a, b ) CreateProcess(a, b, NULL, NULL, TRUE, 0, NULL, NULL, NULL, NULL)
 
-//for socket
+//for socket 
 #define NSP_CloseSocket closesocket
 //for sleep
 #define NSP_Sleep(a) Sleep(a*1000)
 
 //for mutex
-#define NSP_Mute_Obj    HANDLE
+#define NSP_Mute_Obj    HANDLE 
 #define NSP_New_Mute_Obj()    CreateMutex (NULL, FALSE, NULL)
 #define NSP_Lock_Mute_Obj(a)  WaitForSingleObject(a, INFINITE)
 #define NSP_Unlock_Mute_Obj(a)  ReleaseMutex(a)
diff --git a/extensions/source/nsplugin/source/nsp_windows.cxx b/extensions/source/nsplugin/source/nsp_windows.cxx
index fe9060d134b1..85cabfbb278c 100644
--- a/extensions/source/nsplugin/source/nsp_windows.cxx
+++ b/extensions/source/nsplugin/source/nsp_windows.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,28 +39,28 @@
 int NSP_ResetWinStyl(long hParent)
 {
     int ret = 0;
-#ifdef WNT
+#ifdef WNT    
     LONG dOldStyl = GetWindowLong( (HWND)hParent, GWL_STYLE);
     ret = dOldStyl;
-
+    
     if(ret != 0)
     {
         LONG dNewStyl = dOldStyl|WS_CLIPCHILDREN;
         if(0 == SetWindowLong((HWND)hParent, GWL_STYLE, dNewStyl))
             ret = 0;
     }
-#endif
+#endif    
     return ret;
-
+        
 }
 
 int NSP_RestoreWinStyl(long hParent, long dOldStyle)
 {
     int ret = 0;
-#ifdef WNT
+#ifdef WNT    
     ret = SetWindowLong((HWND)hParent, GWL_STYLE, dOldStyle);
-#endif
-    return ret;
+#endif     
+    return ret;       
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/nsplugin/source/nsp_windows.hxx b/extensions/source/nsplugin/source/nsp_windows.hxx
index 1a2d49711973..4ed2f89c3906 100644
--- a/extensions/source/nsplugin/source/nsp_windows.hxx
+++ b/extensions/source/nsplugin/source/nsp_windows.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 __NSP_WINDOWS_HXX__
 #define __NSP_WINDOWS_HXX__
 
-
+ 
 int NSP_ResetWinStyl(long hParent);
 int NSP_RestoreWinStyl(long hParent, long dOldStyle);
 
diff --git a/extensions/source/nsplugin/source/so_closelistener.cxx b/extensions/source/nsplugin/source/so_closelistener.cxx
index 3b99747b104b..4fb26e593669 100644
--- a/extensions/source/nsplugin/source/so_closelistener.cxx
+++ b/extensions/source/nsplugin/source/so_closelistener.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/nsplugin/source/so_closelistener.hxx b/extensions/source/nsplugin/source/so_closelistener.hxx
index 733381544399..7451c44b8203 100644
--- a/extensions/source/nsplugin/source/so_closelistener.hxx
+++ b/extensions/source/nsplugin/source/so_closelistener.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ public:
     virtual void SAL_CALL notifyClosing( const ::com::sun::star::lang::EventObject& aEvent ) throw ( ::com::sun::star::uno::RuntimeException ) ;
 
     virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw ( ::com::sun::star::uno::RuntimeException ) ;
-};
+};	
 
 #endif
 
diff --git a/extensions/source/nsplugin/source/so_env.cxx b/extensions/source/nsplugin/source/so_env.cxx
index bf782a74933f..8f8e436f0d7d 100644
--- a/extensions/source/nsplugin/source/so_env.cxx
+++ b/extensions/source/nsplugin/source/so_env.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ restoreUTF8(char *pPath)
     unsigned char *s, *d;
 
 #define XDIGIT(c) ((c) <= '9' ? (c) - '0' : ((c) & 0x4F) - 'A' + 10)
-
+                                                                                                                                                       
     s = d = (unsigned char *)pPath;
     do {
         if (*s == '%' && s[1] && s[2]) {
diff --git a/extensions/source/nsplugin/source/so_env.hxx b/extensions/source/nsplugin/source/so_env.hxx
index 5da85f23c467..9737425f428e 100644
--- a/extensions/source/nsplugin/source/so_env.hxx
+++ b/extensions/source/nsplugin/source/so_env.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 UNIX
 #define STAROFFICE_VERSION_FILE "/.sversionrc"
 #define STAROFFICE_EXE_FILE_NAME "soffice"
-#endif
+#endif 
 #ifdef WNT
 #define STAROFFICE_VERSION_FILE "\\sversion.ini"
 #define STAROFFICE_EXE_FILE_NAME "soffice.exe"
@@ -72,7 +72,7 @@ const char* findInstallDir();
 
 // return SO program dir absolute path, like "/home/build/staroffice/program"
 const char* findProgramDir();
-
+    
 #ifdef WNT
 // return SO executable absolute path, like "/home/build/staroffice/program/soffice"
 const char* findSofficeExecutable();
diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx
index f6320c22f33e..b94d2958a815 100644
--- a/extensions/source/nsplugin/source/so_instance.cxx
+++ b/extensions/source/nsplugin/source/so_instance.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,15 +36,15 @@
 #include <com/sun/star/awt/XVclWindowPeer.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
-#include <com/sun/star/presentation/XPresentation.hpp>
-#include <com/sun/star/presentation/XPresentationSupplier.hpp>
+#include <com/sun/star/ucb/XSimpleFileAccess.hpp> 
+#include <com/sun/star/presentation/XPresentation.hpp> 
+#include <com/sun/star/presentation/XPresentationSupplier.hpp> 
 #include <tools/debug.hxx>
 #include <tools/color.hxx>
 #include <vcl/window.hxx>
 #include <rtl/textenc.h>
 #include <rtl/locale.h>
-#include <osl/nlsupport.h>
+#include <osl/nlsupport.h> 
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -84,12 +84,12 @@ SoPluginInstance::SoPluginInstance(long pParent, Reference< XMultiServiceFactory
     m_nHeight = 0;
     m_nX = 0;
     m_nY = 0;
-    m_nFlag = 15;
+    m_nFlag = 15; 
     m_bInit = sal_False;
     m_sURL = rtl::OUString::createFromAscii("");
     m_hParent = 0;
     m_pParent = pParent;
-    m_dParentStyl = 0;
+    m_dParentStyl = 0;  
     mxRemoteMSF = xMSF;
 }
 
@@ -102,8 +102,8 @@ sal_Bool SoPluginInstance::SetURL(char* aURL)
     debug_fprintf(NSP_LOG_APPEND, "SoPluginInstance::SetURL %s\n", aURL);
     sal_uInt16 encoding = 11;
 
-    rtl_Locale* pLocale = NULL;
-    osl_getProcessLocale(&pLocale);
+    rtl_Locale* pLocale = NULL; 
+    osl_getProcessLocale(&pLocale); 
     encoding = osl_getTextEncodingFromLocale(pLocale);
 
     m_sURL = ::rtl::OUString(aURL, strlen(aURL), encoding);
@@ -120,7 +120,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
     {
         debug_fprintf(NSP_LOG_APPEND, "only reset windows size\n");
         m_xUnoWin->setPosSize( m_nX, m_nY, m_nWidth, m_nHeight, m_nFlag );
-        debug_fprintf(NSP_LOG_APPEND, "set windows to x:%d y:%d w:%d h%d falg:%d\n",
+        debug_fprintf(NSP_LOG_APPEND, "set windows to x:%d y:%d w:%d h%d falg:%d\n", 
             m_nX, m_nY, m_nWidth, m_nHeight, m_nFlag);
         return sal_True;
     }
@@ -135,7 +135,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
     try
     {
         // try to create netscape plugin window
-        Reference< awt::XToolkit > xToolkit(
+        Reference< awt::XToolkit > xToolkit( 
             mxRemoteMSF->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.awt.Toolkit") ),
             uno::UNO_QUERY );
         if( !xToolkit.is() )
@@ -143,7 +143,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
             debug_fprintf(NSP_LOG_APPEND, "Can not create Toolkit!\n");
             return sal_False;
         }
-
+    
         // prepare parameters for plugin window
         css::uno::Any hwndParent = css::uno::makeAny((sal_Int32)hParent);
 #ifdef UNIX
@@ -152,10 +152,10 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
 #ifdef WNT
         sal_Int16 nWindowType = css::lang::SystemDependent::SYSTEM_WIN32;
 #endif //end of WNT
-
+        
         Reference< awt::XSystemChildFactory > xToolkitSystemChildFactory(xToolkit, uno::UNO_QUERY);
         if (!xToolkitSystemChildFactory.is())
-        {
+        {        
             debug_fprintf(NSP_LOG_APPEND, "print by Nsplugin, get xToolkitSystemChildFactory failure.\n");
             return sal_False;
         }
@@ -163,8 +163,8 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
         debug_fprintf(NSP_LOG_APPEND, "print by Nsplugin,  try to create plugin container window HWIN:%ld.\n", hParent);
 
         // create the plugin window
-        Reference< awt::XWindowPeer > xNewWinPeer =
-            xToolkitSystemChildFactory->createSystemChild( hwndParent,
+        Reference< awt::XWindowPeer > xNewWinPeer = 
+            xToolkitSystemChildFactory->createSystemChild( hwndParent, 
                 css::uno::Sequence<sal_Int8>(), nWindowType );
         if ( !xNewWinPeer.is() )
         {
@@ -184,7 +184,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
         xNewWinPeer->setBackground( COL_GRAY );
         m_xUnoWin->setVisible( sal_True );
         m_xUnoWin->setPosSize( m_nX, m_nY, m_nWidth, m_nHeight, m_nFlag );
-        debug_fprintf(NSP_LOG_APPEND, "set windows to x:%d y:%d w:%d h%d falg:%d\n",
+        debug_fprintf(NSP_LOG_APPEND, "set windows to x:%d y:%d w:%d h%d falg:%d\n", 
             m_nX, m_nY, m_nWidth, m_nHeight, m_nFlag);
 
         // create frame
@@ -199,7 +199,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
 
         // initialize frame
         m_xFrame->initialize( m_xUnoWin );
-
+ 
         try
         {
             // currently ignore errors in this code
@@ -211,9 +211,9 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
         }
         catch( uno::Exception& )
         {}
-
+ 
         // get frames supplier
-        Reference< frame::XFramesSupplier > m_xFramesSupplier(
+        Reference< frame::XFramesSupplier > m_xFramesSupplier( 
             mxRemoteMSF->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop") ),
             uno::UNO_QUERY );
         if ( !m_xFramesSupplier.is() )
@@ -221,7 +221,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
             debug_fprintf(NSP_LOG_APPEND, "can not get desktop\n");
             return sal_False;
         }
-
+        
         // get frames
         m_xFrames = m_xFramesSupplier->getFrames();
         if ( !m_xFrames.is() )
@@ -229,10 +229,10 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
             debug_fprintf(NSP_LOG_APPEND, "can not get frames from FramesSupplier\n");
             return sal_False;
         }
-
+        
         // append m_xFrame to m_xFrames
         m_xFrames->append( m_xFrame );
-
+    
         // create XComponentLoader
         Reference< frame::XComponentLoader > xLoader( m_xFrame, uno::UNO_QUERY );
         if ( !xLoader.is() )
@@ -240,7 +240,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
             debug_fprintf(NSP_LOG_APPEND, "can not get ComponentLoader to load URL\n");
             return sal_False;
         }
-
+        
         //create stream for the document
         Reference< ::com::sun::star::ucb::XSimpleFileAccess > xSimpleFileAccess(
             mxRemoteMSF->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess") ),
@@ -248,14 +248,14 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
         if(!xSimpleFileAccess.is())
         {
             debug_fprintf(NSP_LOG_APPEND, "can not create SimpleFileAccess to load URL\n");
-            return sal_False;
+            return sal_False;      
         }
-        Reference<io::XInputStream> xInputStream = xSimpleFileAccess->openFileRead( m_sURL );
-
+        Reference<io::XInputStream> xInputStream = xSimpleFileAccess->openFileRead( m_sURL );    
+        
         if(!xInputStream.is())
         {
             debug_fprintf(NSP_LOG_APPEND, "can not create XInputStream for URL\n");
-            return sal_False;
+            return sal_False;   
         }
 
         // prepare to load document
@@ -271,35 +271,35 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
         setPropValues[ 3 ].Name = "FilterName";
         setPropValues[ 3 ].Value =  "Flat XML File";*/
 
-        debug_fprintf(NSP_LOG_APPEND, "try to load copy of URL from local file %s:%d\n",
-            ::rtl::OUStringToOString( m_sURL, RTL_TEXTENCODING_ASCII_US ).getStr( ),
+        debug_fprintf(NSP_LOG_APPEND, "try to load copy of URL from local file %s:%d\n", 
+            ::rtl::OUStringToOString( m_sURL, RTL_TEXTENCODING_ASCII_US ).getStr( ), 
             m_sURL.getLength() );
-
+               
 
         // load document
-/*
+/*        
         m_xComponent = xLoader->loadComponentFromURL(
-            OUString(RTL_CONSTASCII_USTRINGPARAM("private:stream")), //m_sURL,
+            OUString(RTL_CONSTASCII_USTRINGPARAM("private:stream")), //m_sURL, 
             m_xFrame->getName(), 0, setPropValues );
-  */
+  */      
 
          Sequence< ::com::sun::star::beans::PropertyValue > setPropValues2(3);
         setPropValues2[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("ViewOnly") );
         setPropValues2[0].Value <<= sal_True;
         setPropValues2[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("ReadOnly") );
-        setPropValues2[1].Value <<= sal_True;
+        setPropValues2[1].Value <<= sal_True;   
         setPropValues2[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("AsTemplate") );
-        setPropValues2[2].Value <<= sal_False;
+        setPropValues2[2].Value <<= sal_False;  
         m_xComponent = xLoader->loadComponentFromURL(
-            m_sURL,
-            m_xFrame->getName(), 0, setPropValues2 );
-
+            m_sURL, 
+            m_xFrame->getName(), 0, setPropValues2 ); 
+        
         if ( !m_xComponent.is() )
         {
             debug_fprintf(NSP_LOG_APPEND, "print by Nsplugin, Load Componment error\n");
             return sal_False;
-        }
-
+        }    
+ 
          // register the closelistener that will prevent closing of the component
         Reference< util::XCloseable > xCloseable( m_xFrame, uno::UNO_QUERY );
         if ( xCloseable.is() )
@@ -315,7 +315,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
         debug_fprintf(NSP_LOG_APPEND, "load document success\n");
 
         // create frame::XDispatchHelper and frame::XDispatchProvider
-        m_xDispatcher = Reference< frame::XDispatchHelper > (
+        m_xDispatcher = Reference< frame::XDispatchHelper > ( 
             mxRemoteMSF->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.DispatchHelper")),
             uno::UNO_QUERY );
         if(!m_xDispatcher.is())
@@ -327,23 +327,23 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
         if(!m_xDispatchProvider.is())
         {
             debug_fprintf(NSP_LOG_APPEND, "m_xDispatchProvider can not be getten\n");
-            return sal_False;
+            return sal_False;  
         }
 
         //try to enable toolbar and tool windows
         Sequence< ::com::sun::star::beans::PropertyValue > propertyValue(1);
         propertyValue[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("FunctionBarVisible") );
         propertyValue[0].Value <<= sal_True;
-        m_xDispatcher->executeDispatch(m_xDispatchProvider,
-                ::rtl::OUString::createFromAscii(".uno:FunctionBarVisible"),
+        m_xDispatcher->executeDispatch(m_xDispatchProvider, 
+                ::rtl::OUString::createFromAscii(".uno:FunctionBarVisible"), 
                 m_xFrame->getName(), 0,
-                propertyValue );
-
+                propertyValue ); 
+                
         // reset window style of parent window
 #ifdef WNT
-        m_dParentStyl = ::NSP_ResetWinStyl (m_hParent);
+        m_dParentStyl = ::NSP_ResetWinStyl (m_hParent);        
 #endif
-        m_bInit = sal_True;
+        m_bInit = sal_True; 
 
         try
         {
@@ -382,10 +382,10 @@ sal_Bool SoPluginInstance::SetWindow(NSP_HWND hParent, int x, int y, int w, int
     {
         m_hParent = hParent;
 
-        debug_fprintf(NSP_LOG_APPEND, "SoPluginInstance::SetWindow %s : %d\n",
-            ::rtl::OUStringToOString(m_sURL, RTL_TEXTENCODING_ASCII_US).getStr(),
+        debug_fprintf(NSP_LOG_APPEND, "SoPluginInstance::SetWindow %s : %d\n", 
+            ::rtl::OUStringToOString(m_sURL, RTL_TEXTENCODING_ASCII_US).getStr(), 
             m_sURL.getLength() );
-        m_nWidth = w;
+        m_nWidth = w; 
         m_nHeight =h;
         m_nX = x;
         m_nY = y;
@@ -406,7 +406,7 @@ sal_Bool SoPluginInstance::SetWindow(NSP_HWND hParent, int x, int y, int w, int
             mxRemoteMSF = Reference< XMultiServiceFactory >();
             m_bInit = sal_False;
             bRetval = LoadDocument(hParent);
-            debug_fprintf(NSP_LOG_APPEND, "load document again, return %d\n", bRetval);
+            debug_fprintf(NSP_LOG_APPEND, "load document again, return %d\n", bRetval);        
         }
     }
 
@@ -415,16 +415,16 @@ sal_Bool SoPluginInstance::SetWindow(NSP_HWND hParent, int x, int y, int w, int
 
 sal_Bool SoPluginInstance::Destroy(void)
 {
-#ifdef WNT
+#ifdef WNT   
     if(m_dParentStyl != 0)
         NSP_RestoreWinStyl(m_hParent, m_dParentStyl);
 #endif
-//  if(m_xDispatcher.is()){
-//   m_xDispatcher->executeDispatch(m_xDispatchProvider,
-//                ::rtl::OUString::createFromAscii(".uno:CloseFrame"),
+//	if(m_xDispatcher.is()){
+//	 m_xDispatcher->executeDispatch(m_xDispatchProvider, 
+//                ::rtl::OUString::createFromAscii(".uno:CloseFrame"), 
 //                ::rtl::OUString::createFromAscii("_top"), 0,
 //                Sequence< ::com::sun::star::beans::PropertyValue >() );
-//  }
+//	}
 
     uno::Reference< util::XCloseable > xCloseable( m_xFrame, uno::UNO_QUERY );
 
@@ -451,7 +451,7 @@ sal_Bool SoPluginInstance::Destroy(void)
                 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.DocumentCloser" ) ),
                 aArgs ),
             uno::UNO_QUERY_THROW );
-
+    
         xDocumentCloser->dispose(); // this call should close the document
     }
     catch( uno::Exception& )
@@ -479,19 +479,19 @@ sal_Bool SoPluginInstance::Destroy(void)
     m_xFrames = Reference< frame::XFrames >();
     m_xDispatcher = Reference< frame::XDispatchHelper >();
     m_xDispatchProvider = Reference< frame::XDispatchProvider >();
-    return sal_True;
-}
+    return sal_True; 
+} 
 
 sal_Bool SoPluginInstance::Print(void)
 {
     if(!m_xDispatcher.is())
         return sal_False;
-
+        
     Sequence< ::com::sun::star::beans::PropertyValue > propertyValue(1);
-    m_xDispatcher->executeDispatch(m_xDispatchProvider,
-        ::rtl::OUString::createFromAscii(".uno:PrintDefault"),
+    m_xDispatcher->executeDispatch(m_xDispatchProvider, 
+        ::rtl::OUString::createFromAscii(".uno:PrintDefault"), 
         m_xFrame->getName(), 0,
-        propertyValue );
+        propertyValue );             
     return sal_True;
 }
 
diff --git a/extensions/source/nsplugin/source/so_instance.hxx b/extensions/source/nsplugin/source/so_instance.hxx
index 54974799f9a4..07b73ba8c1d6 100644
--- a/extensions/source/nsplugin/source/so_instance.hxx
+++ b/extensions/source/nsplugin/source/so_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
@@ -55,7 +55,7 @@
 typedef sal_Int32 NSP_HWND;
 
 class PluginDocumentClosePreventer;
-class SoPluginInstance
+class SoPluginInstance 
 {
 
 private:
@@ -63,7 +63,7 @@ private:
     static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxRemoteMSF;
     // Dir where Soffice is in, ie. /Soffice7/program
     static char sSO_Dir[NPP_PATH_MAX];
-    int m_nWidth;
+    int m_nWidth; 
     int m_nHeight;
     int m_nX;
     int m_nY;
@@ -71,7 +71,7 @@ private:
     ::rtl::OUString m_sURL; // URL of the document to be loaded
     sal_Bool m_bInit;       // If the Plugin instance is initilaized.
     NSP_HWND m_hParent;       // Windows handle of parent window
-    long m_pParent;       // ID of this instance - get from NPP
+    long m_pParent;       // ID of this instance - get from NPP  
     // StarOffice window
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xUnoWin;
     // StarOffice component window
@@ -90,14 +90,14 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener > m_xCloseListener;
 
     sal_Bool LoadDocument(NSP_HWND hParent);
-
+    
     long m_dParentStyl;       // Old Windows style of parent window
 
-
+        
 public:
     SoPluginInstance(long iInstance, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF);
     virtual ~SoPluginInstance(void);
-    virtual sal_Bool SetURL(char* aURL);
+    virtual sal_Bool SetURL(char* aURL); 
     virtual sal_Bool IsInit(void){return m_bInit;};
     virtual sal_Bool SetWindow(NSP_HWND hParent, int x, int y, int w, int h) ;
     virtual sal_Bool Destroy(void) ;
diff --git a/extensions/source/nsplugin/source/so_main.cxx b/extensions/source/nsplugin/source/so_main.cxx
index 76381fab9c61..eaead5ff5303 100644
--- a/extensions/source/nsplugin/source/so_main.cxx
+++ b/extensions/source/nsplugin/source/so_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
@@ -42,7 +42,7 @@
 #endif
 #pragma warning (push,1)
 #pragma warning (disable:4668)
-#define WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN    
 #include <windows.h>
 #include <winsock2.h>
 #include <stdlib.h>
@@ -98,23 +98,23 @@ using namespace ::com::sun::star::uno;
 
 SoPluginInstance* lpInstance[MAX_NODE_NUM];
 
-static  NSP_PIPE_FD la_read_fd = 0;
+static  NSP_PIPE_FD la_read_fd = 0; 
 static char const * progdir = NULL;
 
 
 long int NSP_ReadFromPipe(NSP_PIPE_FD fp, void* buf, unsigned long int len)
 {
     unsigned long int len_unix = 0, len_wnt = 0;
-
+    
     len_unix = NSP_Read_Pipe(fp, buf, len, &len_wnt);
 #ifdef UNIX
     (void)len_wnt;
     return  len_unix;
-#endif //end of UNIX
+#endif //end of UNIX    
 #ifdef WNT
-    return  len_wnt;
-#endif //end of WNT
-
+    return  len_wnt; 
+#endif //end of WNT          
+ 
 }
 
 int find_free_node()
@@ -131,7 +131,7 @@ int find_cur_node(long cur_id)
 {
     for(int i=0; i<MAX_NODE_NUM; i++)
     {
-        if(lpInstance[i] == NULL)
+        if(lpInstance[i] == NULL) 
             continue;
         if(cur_id == lpInstance[i]->GetParent())
             return i;
@@ -144,9 +144,9 @@ sal_Bool dump_plugin_message(PLUGIN_MSG* pMsg)
     if (!pMsg)
         return sal_False;
     debug_fprintf(NSP_LOG_APPEND, "NSPlugin Message: msg_id:%d; instance_id:%d;wnd_id:%d;wnd_x:%d;wnd_y:%d;wnd_w:%d;wnd_h:%d; url:%s\n",
-        pMsg->msg_id, pMsg->instance_id, pMsg->wnd_id,
+        pMsg->msg_id, pMsg->instance_id, pMsg->wnd_id, 
         pMsg->wnd_x, pMsg->wnd_y, pMsg->wnd_w, pMsg->wnd_h, pMsg->url);
-    return sal_True;
+    return sal_True;    
 }
 
 int Set_Window(PLUGIN_MSG* pMsg)
@@ -159,7 +159,7 @@ int Set_Window(PLUGIN_MSG* pMsg)
         pMsg->wnd_x, pMsg->wnd_y, pMsg->wnd_w, pMsg->wnd_h))
         return 0;
     else
-        return -1;
+        return -1;    
 }
 
 int Set_URL(PLUGIN_MSG* pMsg)
@@ -171,7 +171,7 @@ int Set_URL(PLUGIN_MSG* pMsg)
     if(lpInstance[cur_no]->SetURL(pMsg->url))
         return 0;
     else
-        return -1;
+        return -1;    
 }
 
 int New_Instance(PLUGIN_MSG* pMsg, Reference< lang::XMultiServiceFactory > xMSF)
@@ -294,7 +294,7 @@ Reference< lang::XMultiServiceFactory > SAL_CALL start_office(NSP_PIPE_FD read_f
 #endif //end of WNT
 
         // create default local component context
-        Reference< XComponentContext > xLocalContext(
+        Reference< XComponentContext > xLocalContext( 
             defaultBootstrap_InitialComponentContext() );
         if ( !xLocalContext.is() )
         {
@@ -341,14 +341,14 @@ Reference< lang::XMultiServiceFactory > SAL_CALL start_office(NSP_PIPE_FD read_f
         OSL_ASSERT( buf.getLength() == 0 );
         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "uno:pipe,name=" ) );
         buf.append( aPluginPipeName );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(
+        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( 
             ";urp;StarOffice.ComponentContext" ) );
         OUString sConnectString( buf.makeStringAndClear() );
 
         try
         {
             // try to connect to office, no need to start instance again if office already started
-            xRemoteContext.set(
+            xRemoteContext.set( 
                 xUrlResolver->resolve( sConnectString ), UNO_QUERY_THROW );
             debug_fprintf(NSP_LOG_APPEND, "Staroffice already start\n");
             return Reference< lang::XMultiServiceFactory >(xRemoteContext->getServiceManager(), UNO_QUERY);
@@ -375,7 +375,7 @@ Reference< lang::XMultiServiceFactory > SAL_CALL start_office(NSP_PIPE_FD read_f
                    NULL);
             _exit(255);
         }
-#else
+#else 
         (void) read_fd; /* avoid warning about unused parameter */
         Security sec;
         oslProcess hProcess = 0;
@@ -413,7 +413,7 @@ Reference< lang::XMultiServiceFactory > SAL_CALL start_office(NSP_PIPE_FD read_f
             try
             {
                 // try to connect to office
-                xRemoteContext.set(
+                xRemoteContext.set( 
                     xUrlResolver->resolve( sConnectString ), UNO_QUERY_THROW );
                 return Reference< lang::XMultiServiceFactory >(xRemoteContext->getServiceManager(), UNO_QUERY);
             }
@@ -459,7 +459,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     fd_pipe[0] = (NSP_PIPE_FD) iPipe[0] ;
     fd_pipe[1] = (NSP_PIPE_FD) iPipe[1] ;
     NSP_Close_Pipe(fd_pipe[1]);
-
+    
     la_read_fd = fd_pipe[0];
     if(la_read_fd < 0)
     {
diff --git a/extensions/source/nsplugin/source/so_msg.hxx b/extensions/source/nsplugin/source/so_msg.hxx
index 8a539ed72a87..162bb40f04ec 100644
--- a/extensions/source/nsplugin/source/so_msg.hxx
+++ b/extensions/source/nsplugin/source/so_msg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ enum msg_type
     SO_SET_WINDOW,   // 1
     SO_SET_URL,      // 2
     SO_NEW_INSTANCE, // 3
-    SO_DESTROY,      // 4
+    SO_DESTROY,      // 4 
     SO_SHUTDOWN,     // 5
     SO_PRINT         // 6
 };
diff --git a/extensions/source/ole/comifaces.hxx b/extensions/source/ole/comifaces.hxx
index 70308715ef4d..d33f350b8f70 100644
--- a/extensions/source/ole/comifaces.hxx
+++ b/extensions/source/ole/comifaces.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/ole/jscriptclasses.cxx b/extensions/source/ole/jscriptclasses.cxx
index b2f75f1e667c..5b5083a0c848 100644
--- a/extensions/source/ole/jscriptclasses.cxx
+++ b/extensions/source/ole/jscriptclasses.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,13 +59,13 @@ STDMETHODIMP JScriptValue::GetTypeInfo( UINT /*iTInfo*/,
 // JScriptValue, IDispatch --------------------------------------------
 STDMETHODIMP JScriptValue::GetIDsOfNames( REFIID /*riid*/,
                                              LPOLESTR *rgszNames,
-                                             UINT /*cNames*/,
+                                             UINT /*cNames*/,			
                                              LCID /*lcid*/,
                                              DISPID *rgDispId)
 {
     if( !rgDispId)
         return E_POINTER;
-
+    
 
     HRESULT ret= S_OK;
     CComBSTR name(*rgszNames);
@@ -99,7 +99,7 @@ STDMETHODIMP JScriptValue::Invoke( DISPID dispIdMember,
         return DISP_E_NONAMEDARGS;
 
 
-    HRESULT ret= S_OK;
+    HRESULT ret= S_OK; 
     switch( dispIdMember)
     {
     case 0: // DISPID_VALUE
@@ -113,13 +113,13 @@ STDMETHODIMP JScriptValue::Invoke( DISPID dispIdMember,
         break;
     case 1:
         if( wFlags & DISPATCH_METHOD)
-            ret= Set( pDispParams->rgvarg[1], pDispParams->rgvarg[0]);
+            ret= Set( pDispParams->rgvarg[1], pDispParams->rgvarg[0]); 
         if( FAILED( ret))
             ret= DISP_E_EXCEPTION;
         break;
-    case 2:
+    case 2: 
         if( wFlags & DISPATCH_METHOD)
-            ret= Get( pVarResult);
+            ret= Get( pVarResult); 
         if( FAILED( ret))
             ret= DISP_E_EXCEPTION;
         break;
@@ -145,7 +145,7 @@ STDMETHODIMP JScriptValue::Invoke( DISPID dispIdMember,
 
 // JScriptValue, IScriptOutParam-----------------------
 STDMETHODIMP JScriptValue::Set( VARIANT type, VARIANT value)
-{
+{	
     Lock();
     HRESULT hr= S_OK;
     m_varValue.Clear();
@@ -213,7 +213,7 @@ STDMETHODIMP JScriptValue::GetValue( BSTR* type, VARIANT *value)
     if( !type || !value)
         return E_POINTER;
     HRESULT hr;
-    if( SUCCEEDED(  hr= m_bstrType.CopyTo( type)))
+    if( SUCCEEDED(	hr= m_bstrType.CopyTo( type)))
         hr= VariantCopy( value, &m_varValue);
     Unlock();
     return hr;
@@ -249,13 +249,13 @@ STDMETHODIMP JScriptOutParam::GetTypeInfo( UINT /*iTInfo*/,
 // JScriptOutParam, IDispatch --------------------------------------------
 STDMETHODIMP JScriptOutParam::GetIDsOfNames( REFIID /*riid*/,
                                              LPOLESTR *rgszNames,
-                                             UINT /*cNames*/,
+                                             UINT /*cNames*/,			
                                              LCID /*lcid*/,
                                              DISPID *rgDispId)
 {
     if( !rgDispId)
         return E_POINTER;
-
+    
 
     HRESULT ret= S_OK;
     CComBSTR name(*rgszNames);
@@ -279,7 +279,7 @@ STDMETHODIMP JScriptOutParam::Invoke( DISPID dispIdMember,
                          EXCEPINFO* /*pExcepInfo*/,
                          UINT* /*puArgErr*/)
 {
-    HRESULT ret= S_OK;
+    HRESULT ret= S_OK; 
     switch( dispIdMember)
     {
     case 0: // DISPID_VALUE
@@ -297,7 +297,7 @@ STDMETHODIMP JScriptOutParam::Invoke( DISPID dispIdMember,
         else
             ret= E_POINTER;
         break;
-    case 1: //
+    case 1: // 
         if( wFlags & DISPATCH_PROPERTYGET && pVarResult)
         {
             if( FAILED( VariantCopy( pVarResult, &m_varValue)))
diff --git a/extensions/source/ole/jscriptclasses.hxx b/extensions/source/ole/jscriptclasses.hxx
index b881e94419dd..7eab4bd8c8aa 100644
--- a/extensions/source/ole/jscriptclasses.hxx
+++ b/extensions/source/ole/jscriptclasses.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/ole/ole2uno.cxx b/extensions/source/ole/ole2uno.cxx
index 203c6b4d3b8b..16060432ac75 100644
--- a/extensions/source/ole/ole2uno.cxx
+++ b/extensions/source/ole/ole2uno.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,18 +57,18 @@ Mutex * getBridgeMutex()
 
 // Mutex* getBridgeMutex()
 // {
-//  static Mutex* pMutex= NULL;
+// 	static Mutex* pMutex= NULL;
 
-//  if( ! pMutex)
-//  {
-//      MutexGuard guard( Mutex::getGlobalMutex() );
-//      if( !pMutex)
-//      {
-//          static Mutex aMutex;
-//          pMutex= &aMutex;
-//      }
-//  }
-//  return pMutex;
+// 	if( ! pMutex)
+// 	{
+// 		MutexGuard guard( Mutex::getGlobalMutex() );
+// 		if( !pMutex)
+// 		{
+// 			static Mutex aMutex;
+// 			pMutex= &aMutex;
+// 		}
+// 	}
+// 	return pMutex;
 // }
 
 }
diff --git a/extensions/source/ole/ole2uno.hxx b/extensions/source/ole/ole2uno.hxx
index 2cd8c75d3857..fc3ad87ce0b5 100644
--- a/extensions/source/ole/ole2uno.hxx
+++ b/extensions/source/ole/ole2uno.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/ole/oledll.cxx b/extensions/source/ole/oledll.cxx
index 6c80487ffcb4..5346aa940cf7 100644
--- a/extensions/source/ole/oledll.cxx
+++ b/extensions/source/ole/oledll.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index 847ce89ce4f9..20359a21901b 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -78,7 +78,7 @@ using namespace com::sun::star::bridge::oleautomation;
 using namespace com::sun::star::bridge::ModelDependent;
 
 #define JSCRIPT_ID_PROPERTY L"_environment"
-#define JSCRIPT_ID          L"jscript"
+#define JSCRIPT_ID			L"jscript"
 namespace ole_adapter
 {
 
@@ -128,7 +128,7 @@ IUnknownWrapper_Impl::~IUnknownWrapper_Impl()
 
     // remove entries in global maps
     typedef hash_map<sal_uInt32, sal_uInt32>::iterator _IT;
-    _IT it= WrapperToAdapterMap.find( (sal_uInt32) xIntRoot);
+    _IT it=	WrapperToAdapterMap.find( (sal_uInt32) xIntRoot);
     if( it != WrapperToAdapterMap.end())
     {
         sal_uInt32 adapter= it->second;
@@ -1078,9 +1078,9 @@ Any  IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName,
     }
 
 
-    CComVariant     varResult;
-    ExcepInfo       excepinfo;
-    unsigned int    uArgErr;
+    CComVariant		varResult;
+    ExcepInfo 		excepinfo;
+    unsigned int 	uArgErr;
     DISPPARAMS dispparams= { pVarParams, NULL, parameterCount, 0};
     // Get the DISPID
     FuncDesc aDesc(getTypeInfo());
@@ -1161,7 +1161,7 @@ Any  IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName,
         {
             try
             {
-                if( pMethod )
+                if( pMethod	)
                     variantToAny(&varResult, ret, Type( pMethod->pReturnTypeRef), sal_False);
                 else
                     variantToAny(&varResult, ret, sal_False);
@@ -1185,7 +1185,7 @@ Any  IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName,
 
     if( !bConvRet) // conversion of return or out parameter failed
         throw CannotConvertException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Call to COM object failed. Conversion of return or out value failed")),
-                                      Reference<XInterface>( static_cast<XWeak*>(this), UNO_QUERY   ), TypeClass_UNKNOWN,
+                                      Reference<XInterface>( static_cast<XWeak*>(this), UNO_QUERY	), TypeClass_UNKNOWN,
                                       FailReason::UNKNOWN, 0);// lookup error code
     // conversion of return or out parameter failed
     switch (hr)
@@ -1421,7 +1421,7 @@ sal_Bool IUnknownWrapper_Impl::isJScriptObject()
         if( disp)
         {
             CComVariant result;
-            if( SUCCEEDED(  disp.GetPropertyByName( JSCRIPT_ID_PROPERTY, &result)))
+            if( SUCCEEDED(	disp.GetPropertyByName( JSCRIPT_ID_PROPERTY, &result)))
             {
                 if(result.vt == VT_BSTR)
                 {
@@ -1473,10 +1473,10 @@ Any  IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc& aFuncDesc,
     Any ret;
     HRESULT result;
 
-    DISPPARAMS      dispparams = {NULL, NULL, 0, 0};
-    CComVariant     varResult;
-    ExcepInfo       excepinfo;
-    unsigned int    uArgErr;
+    DISPPARAMS 		dispparams = {NULL, NULL, 0, 0};
+    CComVariant		varResult;
+    ExcepInfo 		excepinfo;
+    unsigned int 	uArgErr;
     sal_Int32       i = 0;
     sal_Int32 nUnoArgs = Params.getLength();
     DISPID idPropertyPut = DISPID_PROPERTYPUT;
@@ -1779,7 +1779,7 @@ Any  IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc& aFuncDesc,
             }
             // in parameter no VT_BYREF except for array, interfaces
             else
-            {   // void any stands for optional param
+            {	// void any stands for optional param
                 if (i < nUnoArgs && anyArg.getValueTypeClass() != TypeClass_VOID)
                 {
                     anyToVariant( & arArgs[revIndex], anyArg, varType);
@@ -2029,7 +2029,7 @@ bool IUnknownWrapper_Impl::getDispid(const OUString& sFuncName, DISPID * id)
 {
     OSL_ASSERT(m_spDispatch);
     LPOLESTR lpsz = const_cast<LPOLESTR> (reinterpret_cast<LPCOLESTR>(sFuncName.getStr()));
-    HRESULT hr = m_spDispatch->GetIDsOfNames(IID_NULL, &lpsz, 1, LOCALE_USER_DEFAULT, id);
+    HRESULT	hr = m_spDispatch->GetIDsOfNames(IID_NULL, &lpsz, 1, LOCALE_USER_DEFAULT, id);
     return hr == S_OK ? true : false;
 }
 void IUnknownWrapper_Impl::getFuncDesc(const OUString & sFuncName, FUNCDESC ** pFuncDesc)
diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx
index 733d25f1d78b..0f926695eaab 100644
--- a/extensions/source/ole/oleobjw.hxx
+++ b/extensions/source/ole/oleobjw.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,7 +145,7 @@ protected:
                                        Sequence<sal_Int16 >& OutParamIndex,
                                        Sequence< Any >& OutParam);
     // Is used for OleObjectFactory service
-    virtual Any invokeWithDispIdComTlb(const OUString& sFuncName,
+    virtual Any invokeWithDispIdComTlb(const OUString& sFuncName, 
                                        const Sequence< Any >& Params,
                                        Sequence< sal_Int16 >& OutParamIndex,
                                        Sequence< Any >& OutParam);
@@ -162,7 +162,7 @@ protected:
 
 
     // UnoConversionUtilities -------------------------------------------------------------------------------
-    virtual Reference<XInterface> createUnoWrapperInstance();
+    virtual	Reference<XInterface> createUnoWrapperInstance();
     virtual Reference<XInterface> createComWrapperInstance();
 
     /**Obtains a FUNCDESC structure for a function.
@@ -189,13 +189,13 @@ protected:
     // After return attributInfo contains typelib_InterfaceAttributeTypeDescription::pAttributeTypeRef
     void getAttributeInfo(const OUString& sName, TypeDescription& attributeInfo);
     // used by get MethodInfo
-    TypeDescription  getInterfaceMemberDescOfCurrentCall(const OUString& sName);
+    TypeDescription	 getInterfaceMemberDescOfCurrentCall(const OUString& sName);
     /** Returns alway a valid ITypeInfo interface or throws a BridgeRuntimeError.
         The returned interface does not need to be AddRef'ed as long as it is locally
         used. The interface is kept in the instance of this class.
      */
-    ITypeInfo*  getTypeInfo();
-
+    ITypeInfo*	getTypeInfo();
+    
     /** Returns the DISPID for a function or property name. If true is returned then
         id contains a valid DISPID.
     */
@@ -203,10 +203,10 @@ protected:
     bool getDispid(const OUString& sFuncName, DISPID * id);
 
     VARTYPE getUserDefinedElementType( ITypeInfo* pTypeInfo, const DWORD nHrefType );
-
+    
     /** Gets the element type in a VARIANT like style. E.g. if desc->lptdesc contains
         a VT_PTR than it is replaced by VT_BYREF and VT_SAFEARRAY is replaced by VT_ARRAY
-        If the TYPEDESC describes an SAFEARRAY then varType is a combination of VT_ARRAY
+        If the TYPEDESC describes an SAFEARRAY then varType is a combination of VT_ARRAY 
         and the element type.
         The argument desc must be obtained from FUNCDESC::lprgelemdescParam[i].tdesc where
         FUNCDESC was obtained from the ITypeInfo belonging to wrapped IDispatch.
@@ -221,10 +221,10 @@ protected:
 
     /** Returns a FUNCDESC structure which contains type information about the
         current XInvocation::invoke call. The FUNCDESC either describes a method,
-        a property put or a property get operation.
+        a property put or a property get operation. 
         It uses the types  com.sun.star.bridge.oleautomation.PropertyPutArgument
         which can be
-        contained in the sequence of in-arguments of invoke to determine if the call is
+        contained in the sequence of in-arguments of invoke to determine if the call is 
         a property put or property get operation.
         If no adequate FUNCDESC was found, an IllegalArgumentException is thrown.
         Therefore it is safe to assume that the returned FUNCDESC* is not NULL.
@@ -259,8 +259,8 @@ protected:
     was transported as VT_DISPATCH in a VARIANT rather then a VT_UNKNOWN
     */
     sal_Bool  m_bOriginalDispatch;
-    DispIdMap           m_dispIdMap;
-    Reference<XIdlClass>*       m_pxIdlClass;
+    DispIdMap 			m_dispIdMap;
+    Reference<XIdlClass>*		m_pxIdlClass;
 
 
     // used by isJScriptObject
diff --git a/extensions/source/ole/olethread.cxx b/extensions/source/ole/olethread.cxx
index bd17dff2b90e..bd6f5fbceeec 100644
--- a/extensions/source/ole/olethread.cxx
+++ b/extensions/source/ole/olethread.cxx
@@ -54,7 +54,7 @@ void o2u_attachCurrentThread()
 
     if ((sal_Bool)(sal_IntPtr)oleThreadData.getData() != sal_True)
     {
-        HINSTANCE inst= LoadLibrary( _T("ole32.dll"));
+        HINSTANCE inst=	LoadLibrary( _T("ole32.dll"));
         if( inst )
         {
             HRESULT hr;
diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx
index 82c5170a075a..ecf45a4ce074 100644
--- a/extensions/source/ole/servprov.cxx
+++ b/extensions/source/ole/servprov.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ DEFINE_GUID(OID_ServiceManager, 0x82154420, 0xfbf, 0x11d4, 0x83, 0x13, 0x0, 0x50
 DEFINE_GUID(OID_ServiceManager, 0xd9bb9d1d, 0xbfa9, 0x4357, 0x9f, 0x11, 0x9a, 0x2e, 0x90, 0x61, 0xf0, 0x6e);
 #endif
 
-extern  rtl_StandardModuleCount globalModuleCount;
+extern	rtl_StandardModuleCount globalModuleCount;
 
 /*****************************************************************************
 
@@ -544,7 +544,7 @@ OleClient_Impl::~OleClient_Impl()
     globalModuleCount.modCnt.release( &globalModuleCount.modCnt);
 }
 
-Sequence< OUString >    SAL_CALL OleClient_Impl::getAvailableServiceNames() throw( RuntimeException )
+Sequence< OUString >	SAL_CALL OleClient_Impl::getAvailableServiceNames() throw( RuntimeException )
 {
     Sequence< OUString > ret;
 
@@ -559,23 +559,23 @@ OUString OleClient_Impl::getImplementationName()
 
 Reference<XInterface> SAL_CALL OleClient_Impl::createInstance(const OUString& ServiceSpecifier) throw (Exception, RuntimeException )
 {
-    Reference<XInterface>   ret;
-    HRESULT         result;
-    IUnknown*       pUnknown = NULL;
-    CLSID           classId;
+    Reference<XInterface> 	ret;
+    HRESULT 		result;
+    IUnknown* 		pUnknown = NULL;
+    CLSID			classId;
 
     o2u_attachCurrentThread();
 
     result = CLSIDFromProgID(
-                  reinterpret_cast<LPCWSTR>(ServiceSpecifier.getStr()),     //Pointer to the ProgID
-                  &classId);                        //Pointer to the CLSID
+                  reinterpret_cast<LPCWSTR>(ServiceSpecifier.getStr()),  	//Pointer to the ProgID
+                  &classId);         				//Pointer to the CLSID
 
 
     if (result == NOERROR)
     {
         result = CoCreateInstance(
-                      classId,              //Class identifier (CLSID) of the object
-                      NULL,                 //Pointer to whether object is or isn't part of an aggregate
+                      classId,     			//Class identifier (CLSID) of the object
+                      NULL, 			   	//Pointer to whether object is or isn't part of an aggregate
                       CLSCTX_SERVER,  //Context for running executable code
                       IID_IUnknown,         //Reference to the identifier of the interface
                       (void**)&pUnknown);   //Address of output variable that receives
@@ -584,11 +584,11 @@ Reference<XInterface> SAL_CALL OleClient_Impl::createInstance(const OUString& Se
 
     if (pUnknown != NULL)
     {
-        Any any;
+        Any	any;
         CComVariant variant;
 
         V_VT(&variant) = VT_UNKNOWN;
-        V_UNKNOWN(&variant) = pUnknown;
+        V_UNKNOWN(&variant)	= pUnknown;
         // AddRef for Variant
         pUnknown->AddRef();
 
@@ -661,7 +661,7 @@ OleServer_Impl::OleServer_Impl( const Reference<XMultiServiceFactory>& smgr):
     sal_Bool bOLERegister = sal_False;
 #else
     sal_Bool bOLERegister = sal_True;
-#endif
+#endif	
     sal_Bool ret = provideInstance( m_smgr, (GUID*)&OID_ServiceManager, bOLERegister );
     (void)ret;
 }
diff --git a/extensions/source/ole/servprov.hxx b/extensions/source/ole/servprov.hxx
index d9c47cdbd7eb..49091b1fcd38 100644
--- a/extensions/source/ole/servprov.hxx
+++ b/extensions/source/ole/servprov.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ using namespace std;
 
 namespace ole_adapter
 {
-Reference< XInterface> SAL_CALL ConverterProvider_CreateInstance(   const Reference<XMultiServiceFactory> & xSMgr)
+Reference< XInterface> SAL_CALL ConverterProvider_CreateInstance(	const Reference<XMultiServiceFactory> & xSMgr)
                             throw( Exception);
-Reference< XInterface> SAL_CALL ConverterProvider_CreateInstance2(  const Reference<XMultiServiceFactory> & xSMgr)
+Reference< XInterface> SAL_CALL ConverterProvider_CreateInstance2(	const Reference<XMultiServiceFactory> & xSMgr)
                             throw( Exception);
-Reference< XInterface> SAL_CALL ConverterProvider_CreateInstanceVar1(   const Reference<XMultiServiceFactory> & xSMgr)
+Reference< XInterface> SAL_CALL ConverterProvider_CreateInstanceVar1(	const Reference<XMultiServiceFactory> & xSMgr)
                             throw( Exception);
 Reference<XInterface> SAL_CALL OleClient_CreateInstance( const Reference<XMultiServiceFactory> & xSMgr)
                             throw( Exception);
@@ -56,10 +56,10 @@ Reference<XInterface> SAL_CALL OleServer_CreateInstance( const Reference<XMultiS
 
     class declaration IClassFactoryWrapper
 
-    Specify abstract helper methods on class factories, which provide
+    Specify abstract helper methods on class factories, which provide 
     UNO objects. These methods are used by objects of class OleServer_Impl,
     to handle the OLE registration of different class factories.
-
+    
 *****************************************************************************/
 
 class IClassFactoryWrapper : public IClassFactory
@@ -74,14 +74,14 @@ public:
 
     class declaration ProviderOleWrapper_Impl
 
-    Provides an UNO service provider as OLE class factory. Handle the
-    OLE registration by overloading the abstract methods from
+    Provides an UNO service provider as OLE class factory. Handle the 
+    OLE registration by overloading the abstract methods from 
     IClassFactoryWrapper.
 
     Acts as a COM class factory. When IClassFactory::CreateInstance is being called
     then it creates an service by help of the XSingleServiceFactory member and maps
     maps it to a COM object.
-
+    
 *****************************************************************************/
 
 class ProviderOleWrapper_Impl : public IClassFactoryWrapper
@@ -94,7 +94,7 @@ public:
 
     sal_Bool registerClass();
     sal_Bool deregisterClass();
-
+    
     /* IUnknown methods */
     STDMETHOD(QueryInterface)(REFIID riid, LPVOID FAR * ppvObj);
     STDMETHOD_(ULONG, AddRef)();
@@ -108,9 +108,9 @@ protected:
 
     oslInterlockedCount m_refCount;
     Reference<XSingleServiceFactory> m_xSingleServiceFactory;
-    GUID                m_guid;
-    DWORD               m_factoryHandle;
-    Reference<XBridgeSupplier2> m_bridgeSupplier;
+    GUID				m_guid;
+    DWORD 				m_factoryHandle;
+    Reference<XBridgeSupplier2>	m_bridgeSupplier;
     Reference<XMultiServiceFactory> m_smgr;
 };
 
@@ -118,10 +118,10 @@ protected:
 
     class declaration OneInstanceOleWrapper_Impl
 
-    Provides an single UNO object as OLE object. Handle the
-    OLE registration by overloading the abstract methods from
+    Provides an single UNO object as OLE object. Handle the 
+    OLE registration by overloading the abstract methods from 
     IClassFactoryWrapper.
-
+    
       Acts as a COM class factory. When IClassFactory::CreateInstance is being called
     then it maps the XInstance member it to a COM object.
 
@@ -136,7 +136,7 @@ public:
 
     sal_Bool registerClass();
     sal_Bool deregisterClass();
-
+    
     /* IUnknown methods */
     STDMETHOD(QueryInterface)(REFIID riid, LPVOID FAR * ppvObj);
     STDMETHOD_(ULONG, AddRef)();
@@ -149,10 +149,10 @@ public:
 protected:
 
     oslInterlockedCount m_refCount;
-    Reference<XInterface>       m_xInst;
-    GUID                m_guid;
-    DWORD               m_factoryHandle;
-    Reference<XBridgeSupplier2> m_bridgeSupplier;
+    Reference<XInterface> 		m_xInst;
+    GUID				m_guid;
+    DWORD 				m_factoryHandle;
+    Reference<XBridgeSupplier2>	m_bridgeSupplier;
     Reference<XMultiServiceFactory> m_smgr;
     unsigned long       m_nApplRegHandle;
     sal_Bool            m_bAsApplication;
@@ -163,17 +163,17 @@ protected:
     class declaration OleConverter_Impl2
 
     Implementation of the UNO service com.sun.star.bridge.OleBridgeSupplier2.
-
+    
 *****************************************************************************/
 
-// This class realizes the service com.sun.star.bridge.OleBridgeSupplier2 and
+// This class realizes the service com.sun.star.bridge.OleBridgeSupplier2 and 
 // com.sun.star.bridge.OleBridgeSupplierVar1. The class implements XBridgeSupplier2
 // instead of XBridgeSuppplier as done by class OleConverter_Impl. The XBridgeSupplier2
 // interface does not need a Maschine Id in its createBridge function anymore,
 // If an UNO interface is to be converted then the member m_nUnoWrapperClass determines
-// what wrapper class is to be used. There are currently InterfaceOleWrapper_Impl and
-// UnoObjectWrapperRemoteOpt. The first is used for the OleBridgeSupplier2 and the
-// latter for OleBridgeSupplierVar1.
+// what wrapper class is to be used. There are currently InterfaceOleWrapper_Impl and 
+// UnoObjectWrapperRemoteOpt. The first is used for the OleBridgeSupplier2 and the 
+// latter for OleBridgeSupplierVar1. 
 // The m_nComWrapperClass specifies the class which is used as wrapper for COM interfaces.
 // Currently there is only one class available ( IUnknownWrapper_Impl).
 class OleConverter_Impl2 : public WeakImplHelper2<XBridgeSupplier2, XInitialization>,
@@ -182,14 +182,14 @@ class OleConverter_Impl2 : public WeakImplHelper2<XBridgeSupplier2, XInitializat
 public:
     OleConverter_Impl2( const Reference<XMultiServiceFactory>& smgr);
     OleConverter_Impl2( const  Reference<XMultiServiceFactory>& smgr, sal_uInt8 unoWrapperClass, sal_uInt8 comWrapperClass );
-    virtual ~OleConverter_Impl2();
+    virtual	~OleConverter_Impl2();
 
     // XBridgeSupplier2 ---------------------------------------------------
 
-    virtual Any SAL_CALL createBridge(const Any& modelDepObject,
-                                const Sequence<sal_Int8>& ProcessId,
-                                sal_Int16 sourceModelType,
-                                sal_Int16 destModelType)
+    virtual Any SAL_CALL createBridge(const Any& modelDepObject, 
+                                const Sequence<sal_Int8>& ProcessId, 
+                                sal_Int16 sourceModelType, 
+                                sal_Int16 destModelType) 
             throw (IllegalArgumentException, RuntimeException);
 
     // XInitialization
@@ -208,7 +208,7 @@ protected:
     class declaration OleClient_Impl
 
     Implementation of the UNO service com.sun.star.bridge.OleObjectFactory.
-
+    
 *****************************************************************************/
 
 
@@ -222,8 +222,8 @@ public:
     // XMultiServiceFactory
     virtual Reference<XInterface> SAL_CALL createInstance(const OUString& ServiceSpecifier) throw( Exception, RuntimeException);
     virtual Reference<XInterface> SAL_CALL createInstanceWithArguments(const OUString& ServiceSpecifier, const Sequence< Any >& Arguments) throw (Exception, RuntimeException);
-    Sequence< OUString >    SAL_CALL getAvailableServiceNames() throw (RuntimeException);
-
+    Sequence< OUString >	SAL_CALL getAvailableServiceNames() throw (RuntimeException);
+    
     // Abstract struct UnoConversionUtilities
     virtual Reference< XInterface > createUnoWrapperInstance();
     virtual Reference< XInterface > createComWrapperInstance();
@@ -231,7 +231,7 @@ public:
 
     OUString getImplementationName();
 protected:
-    Reference<XBridgeSupplier2> m_bridgeSupplier;
+    Reference<XBridgeSupplier2>	m_bridgeSupplier;
 };
 
 /*****************************************************************************
@@ -239,10 +239,10 @@ protected:
     class declaration OleServer_Impl
 
     Implementation of the UNO service com.sun.star.bridge.OleApplicationRegistration.
-    Register the calling application as OLE automation server for
-    standard OLE object. The objects will be registered while instanciating
-    this implementation and deregistrated, if this implementation is destroyed.
-
+    Register the calling application as OLE automation server for 
+    standard OLE object. The objects will be registered while instanciating 
+    this implementation and deregistrated, if this implementation is destroyed. 
+    
 *****************************************************************************/
 
 class OleServer_Impl : public OWeakObject, XTypeProvider
@@ -266,7 +266,7 @@ protected:
     sal_Bool provideInstance(const Reference<XInterface>& xInst, GUID* guid, sal_Bool bAsApplication );
 
     list< IClassFactoryWrapper* > m_wrapperList;
-    Reference< XBridgeSupplier2 >   m_bridgeSupplier;
+    Reference< XBridgeSupplier2 >	m_bridgeSupplier;
 
     Reference<XMultiServiceFactory> m_smgr;
 };
diff --git a/extensions/source/ole/servreg.cxx b/extensions/source/ole/servreg.cxx
index 7311f965ca8d..16a99df48fa4 100644
--- a/extensions/source/ole/servreg.cxx
+++ b/extensions/source/ole/servreg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,14 +44,14 @@ rtl_StandardModuleCount globalModuleCount= MODULE_COUNT_INIT;
 
 
 
-Reference<XInterface> SAL_CALL ConverterProvider_CreateInstance2(   const Reference<XMultiServiceFactory> & xSMgr)
+Reference<XInterface> SAL_CALL ConverterProvider_CreateInstance2(	const Reference<XMultiServiceFactory> & xSMgr)
                             throw(Exception)
 {
     Reference<XInterface> xService = *new OleConverter_Impl2( xSMgr);
     return xService;
 }
 
-Reference<XInterface> SAL_CALL ConverterProvider_CreateInstanceVar1(    const Reference<XMultiServiceFactory> & xSMgr)
+Reference<XInterface> SAL_CALL ConverterProvider_CreateInstanceVar1(	const Reference<XMultiServiceFactory> & xSMgr)
                             throw(Exception)
 {
     Reference<XInterface> xService = *new OleConverter_Impl2( xSMgr, UNO_OBJECT_WRAPPER_REMOTE_OPT, IUNKNOWN_WRAPPER_IMPL);
@@ -77,50 +77,50 @@ extern "C" void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     void * pRet = 0;
-
+    
     OUString aImplName( OUString::createFromAscii( pImplName ) );
     Reference< XSingleServiceFactory > xFactory;
     Sequence<OUString> seqServiceNames;
     if (pServiceManager && aImplName.equals(  reinterpret_cast<const sal_Unicode*>(L"com.sun.star.comp.ole.OleConverter2")  ))
     {
         xFactory=  createSingleFactory( reinterpret_cast< XMultiServiceFactory*>(pServiceManager),
-                                         OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ole.OleConverter2")),
+                                         OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ole.OleConverter2")), 
                                          ConverterProvider_CreateInstance2, seqServiceNames,
                                          &globalModuleCount.modCnt );
     }
     else if (pServiceManager && aImplName.equals(  reinterpret_cast<const sal_Unicode*>(L"com.sun.star.comp.ole.OleConverterVar1")  ))
     {
         xFactory= createSingleFactory( reinterpret_cast<XMultiServiceFactory*>(pServiceManager),
-                                       OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ole.OleConverterVar1")),
+                                       OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ole.OleConverterVar1")), 
                                        ConverterProvider_CreateInstanceVar1, seqServiceNames,
                                        &globalModuleCount.modCnt );
     }
     else if(pServiceManager && aImplName.equals(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.comp.ole.OleClient")))
     {
         xFactory= createSingleFactory( reinterpret_cast< XMultiServiceFactory*>(pServiceManager),
-                                       OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ole.OleClient")),
+                                       OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ole.OleClient")), 
                                        OleClient_CreateInstance, seqServiceNames,
                                        &globalModuleCount.modCnt);
     }
     else if(pServiceManager && aImplName.equals(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.comp.ole.OleServer")))
     {
         xFactory= createOneInstanceFactory( reinterpret_cast< XMultiServiceFactory*>(pServiceManager),
-                                            OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ole.OleServer")),
+                                            OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ole.OleServer")), 
                                             OleServer_CreateInstance, seqServiceNames,
                                             &globalModuleCount.modCnt);
     }
-
+        
     if (xFactory.is())
     {
         xFactory->acquire();
         pRet = xFactory.get();
     }
-
+    
     return pRet;
 }
 
 
-extern "C" sal_Bool SAL_CALL component_writeInfo(   void * /*pServiceManager*/, void * pRegistryKey )
+extern "C" sal_Bool SAL_CALL component_writeInfo(	void * /*pServiceManager*/, void * pRegistryKey )
 {
     if (pRegistryKey)
     {
@@ -150,7 +150,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo(   void * /*pServiceManager*/,
             xNewKey->createKey(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.bridge.OleApplicationRegistration"));
 
             xNewKey->createKey(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.bridge.oleautomation.ApplicationRegistration"));
-
+                
             return sal_True;
         }
         catch (InvalidRegistryException &)
@@ -168,7 +168,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
 }
 
 
-extern "C"  sal_Bool component_canUnload( TimeValue* libUnused)
+extern "C"	sal_Bool component_canUnload( TimeValue* libUnused)
 {
     return globalModuleCount.canUnload( &globalModuleCount, libUnused);
 }
diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx
index a220bd5d1578..1970b08fd843 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 // for some reason DECIMAL_NEG (wtypes.h) which contains BYTE is not resolved.
 typedef unsigned char   BYTE;
 // classes for wrapping uno objects
-#define INTERFACE_OLE_WRAPPER_IMPL      1
-#define UNO_OBJECT_WRAPPER_REMOTE_OPT   2
+#define INTERFACE_OLE_WRAPPER_IMPL		1
+#define UNO_OBJECT_WRAPPER_REMOTE_OPT	2
 
 #define INVOCATION_SERVICE reinterpret_cast<const sal_Unicode*>(L"com.sun.star.script.Invocation")
 
 
 // classes for wrapping ole objects
-#define IUNKNOWN_WRAPPER_IMPL           1
+#define IUNKNOWN_WRAPPER_IMPL			1
 
 #define INTERFACE_ADAPTER_FACTORY  reinterpret_cast<const sal_Unicode*>(L"com.sun.star.script.InvocationAdapterFactory")
 // COM or JScript objects implementing UNO interfaces have to implement this property
@@ -75,14 +75,14 @@ namespace ole_adapter
 extern hash_map<sal_uInt32, sal_uInt32> AdapterToWrapperMap;
 extern hash_map<sal_uInt32, sal_uInt32> WrapperToAdapterMap;
 typedef hash_map<sal_uInt32, sal_uInt32>::iterator IT_Wrap;
-typedef hash_map<sal_uInt32, sal_uInt32>::iterator CIT_Wrap;
+typedef hash_map<sal_uInt32, sal_uInt32>::iterator CIT_Wrap;    
 //Maps IUnknown pointers to a weak reference of the respective wrapper class (e.g.
 // IUnknownWrapperImpl. It is the responsibility of the wrapper to remove the entry when
 // it is being destroyed.
 // Used to ensure that an Automation object is always mapped to the same UNO objects.
 extern hash_map<sal_uInt32, WeakReference<XInterface> > ComPtrToWrapperMap;
 typedef hash_map<sal_uInt32, WeakReference<XInterface> >::iterator IT_Com;
-typedef hash_map<sal_uInt32, WeakReference<XInterface> >::const_iterator CIT_Com;
+typedef hash_map<sal_uInt32, WeakReference<XInterface> >::const_iterator CIT_Com;    
 
 // Maps XInterface pointers to a weak reference of its wrapper class (i.e.
 // InterfaceOleWrapper_Impl). It is the responsibility of the wrapper to remove the entry when
@@ -134,11 +134,11 @@ public:
     /** @exception com.sun.star.lang.IllegalArgumentException
         If rSeq does not contain a sequence then the exception is thrown.
     */
-    SAFEARRAY*  createUnoSequenceWrapper(const Any& rSeq);
+    SAFEARRAY* 	createUnoSequenceWrapper(const Any& rSeq);
     /** @exception com.sun.star.lang.IllegalArgumentException
         If rSeq does not contain a sequence or elemtype has no proper value
         then the exception is thrown.
-    */
+    */    
     SAFEARRAY*  createUnoSequenceWrapper(const Any& rSeq, VARTYPE elemtype);
     /**
        @exception com.sun.star.lang.IllegalArgumentException
@@ -191,15 +191,15 @@ public:
     static sal_Bool isJScriptArray(const VARIANT* pvar);
 
     Sequence<Type> getImplementedInterfaces(IUnknown* pUnk);
-
+    
 protected:
     Reference<XInterface> createAdapter(const Sequence<Type>& types, const Reference<XInterface>& receiver);
-
+    
     // helper function for Sequence conversion
     void getElementCountAndTypeOfSequence( const Any& rSeq, sal_Int32 dim, Sequence< sal_Int32 >& seqElementCounts, TypeDescription& typeDesc);
     // helper function for Sequence conversion
-    sal_Bool incrementMultidimensionalIndex(sal_Int32 dimensions, const sal_Int32 * parDimensionLength,
-                                    sal_Int32 * parMultidimensionalIndex);
+    sal_Bool incrementMultidimensionalIndex(sal_Int32 dimensions, const sal_Int32 * parDimensionLength, 
+                                    sal_Int32 * parMultidimensionalIndex);    
     // helper function for Sequence conversion
     size_t getOleElementSize( VARTYPE type);
 
@@ -209,7 +209,7 @@ protected:
     Reference<XTypeConverter> getTypeConverter();
 
     // This member determines what class is used to convert a UNO object
-    // or struct to a COM object. It is passed along to the o2u_anyToVariant
+    // or struct to a COM object. It is passed along to the o2u_anyToVariant 
     // function in the createBridge function implementation
     sal_uInt8 m_nUnoWrapperClass;
     sal_uInt8 m_nComWrapperClass;
@@ -254,7 +254,7 @@ bool convertSelfToCom( T& unoInterface, VARIANT * pVar)
             Sequence<sal_Int8> seqId( arId, 16);
             Any anySource;
             anySource <<= xInt;
-            Any anyDisp=    xSupplier->createBridge( anySource, seqId, UNO, OLE);
+            Any anyDisp=	xSupplier->createBridge( anySource, seqId, UNO, OLE);
             if( anyDisp.getValueTypeClass() == TypeClass_UNSIGNED_LONG)
             {
                 VARIANT* pvariant= *(VARIANT**)anyDisp.getValue();
@@ -277,11 +277,11 @@ bool convertSelfToCom( T& unoInterface, VARIANT * pVar)
 
 // Gets the invocation factory depending on the Type in the Any.
 // The factory can be created by a local or remote multi service factory.
-// In case there is a remote multi service factory available there are
+// In case there is a remote multi service factory available there are 
 // some services or types for which the local factory is used. The exceptions
 // are:  all structs.
 // Param anyObject - contains the object ( interface, struct) for what we need an invocation object.
-//
+// 
 template<class T>
 Reference< XSingleServiceFactory > UnoConversionUtilities<T>::getInvocationFactory(const Any& anyObject)
 {
@@ -291,14 +291,14 @@ Reference< XSingleServiceFactory > UnoConversionUtilities<T>::getInvocationFacto
         m_smgrRemote.is() )
     {
         if(  ! m_xInvocationFactoryRemote.is() )
-            m_xInvocationFactoryRemote= Reference<XSingleServiceFactory>(
+            m_xInvocationFactoryRemote= Reference<XSingleServiceFactory>( 
             m_smgrRemote->createInstance( INVOCATION_SERVICE), UNO_QUERY);
         retVal= m_xInvocationFactoryRemote;
     }
     else
     {
         if( ! m_xInvocationFactoryLocal.is() )
-            m_xInvocationFactoryLocal= Reference<XSingleServiceFactory>(
+            m_xInvocationFactoryLocal= Reference<XSingleServiceFactory>( 
             m_smgr->createInstance(INVOCATION_SERVICE ), UNO_QUERY);
         retVal= m_xInvocationFactoryLocal;
     }
@@ -314,7 +314,7 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANTARG* pArg, Any& rAny,
         bool bFail = false;
         bool bCannotConvert = false;
         CComVariant var;
-
+        
         // There is no need to support indirect values, since they're not supported by UNO
         if( FAILED(hr= VariantCopyInd( &var, const_cast<VARIANTARG*>(pArg)))) // remove VT_BYREF
             throw BridgeRuntimeError(
@@ -322,14 +322,14 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANTARG* pArg, Any& rAny,
                       "VariantCopyInd failed for reason : ") + OUString::valueOf(hr));
         bool bHandled = convertValueObject( & var, rAny);
         if( bHandled)
-            OSL_ENSURE(  rAny.getValueType() == ptype, "type in Value Object must match the type parameter");
-
+            OSL_ENSURE(  rAny.getValueType() == ptype, "type in Value Object must match the type parameter");	
+        
         if( ! bHandled)
         {
             // convert into a variant type that is the equivalent to the type
             // the sequence expects. Thus variantToAny produces the correct type
             // E.g. An Array object contains VT_I4 and the sequence expects shorts
-            // than the vartype must be changed. The reason is, you can't specify the
+            // than the vartype must be changed. The reason is, you can't specify the 
             // type in JavaScript and the script engine determines the type beeing used.
             switch( ptype.getTypeClass())
             {
@@ -354,12 +354,12 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANTARG* pArg, Any& rAny,
                 }
                 break;
             case TypeClass_INTERFACE: // could also be an IUnknown
-            case TypeClass_STRUCT:
-            {
+            case TypeClass_STRUCT:	
+            {                    
                 rAny = createOleObjectWrapper( & var, ptype);
                 break;
             }
-            case TypeClass_ENUM:
+            case TypeClass_ENUM: 
                 if(SUCCEEDED(hr = VariantChangeType( & var, &var, 0, VT_I4)))
                     rAny.setValue((void*) & var.lVal, ptype);
                 else if (hr == DISP_E_TYPEMISMATCH)
@@ -367,11 +367,11 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANTARG* pArg, Any& rAny,
                 else
                     bFail = true;
                 break;
-            case TypeClass_SEQUENCE:
+            case TypeClass_SEQUENCE: 
                 // There are different ways of receiving a sequence:
                 // 1: JScript, VARTYPE: VT_DISPATCH
                 // 2. VBScript simple arraysVT_VARIANT|VT_BYREF the referenced VARIANT contains
-                //      a VT_ARRAY|  <type>
+                //		a VT_ARRAY|  <type>
                 // 3. VBSrcript multi dimensional arrays: VT_ARRAY|VT_BYREF
                 if( pArg->vt == VT_DISPATCH)
                 {
@@ -386,7 +386,7 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANTARG* pArg, Any& rAny,
                         Reference<XTypeConverter> conv = getTypeConverter();
                         if (conv.is())
                         {
-                            try
+                            try 
                             {
                                 Any anySeq = makeAny(unoSeq);
                                 Any convAny = conv->convertTo(anySeq, ptype);
@@ -409,16 +409,16 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANTARG* pArg, Any& rAny,
                         }
                     }
                 }
-                break;
-            case TypeClass_VOID:
+                break; 
+            case TypeClass_VOID: 
                 rAny.setValue(NULL,Type());
                 break;
-            case TypeClass_ANY:     //  Any
+            case TypeClass_ANY:		//  Any 
                 // There could be a JScript Array that needs special handling
                 // If an Any is expected and this Any must contain a Sequence
                 // then we cannot figure out what element type is required.
                 // Therefore we convert to Sequence< Any >
-                if( pArg->vt == VT_DISPATCH &&  isJScriptArray( pArg))
+                if( pArg->vt == VT_DISPATCH && 	isJScriptArray( pArg))
                 {
                     dispatchExObject2Sequence( pArg, rAny,
                                                getCppuType((Sequence<Any>*) 0));
@@ -435,11 +435,11 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANTARG* pArg, Any& rAny,
                         variantToAny( & var, rAny, getCppuType( (sal_uInt64*) 0),
                                       bReduceValueRange);
                     }
-                    else
+                    else 
                     {
                         //negative value
                         variantToAny( & var, rAny, getCppuType( (sal_Int64*) 0),
-                                      bReduceValueRange);
+                                      bReduceValueRange);                        
                     }
                 }
                 else
@@ -447,7 +447,7 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANTARG* pArg, Any& rAny,
                     variantToAny( & var, rAny);
                 }
                 break;
-            case TypeClass_BOOLEAN:         // VARIANT could be VARIANT_BOOL or other
+            case TypeClass_BOOLEAN:			// VARIANT could be VARIANT_BOOL or other
                 if(SUCCEEDED(hr = VariantChangeType( & var, &var, 0, VT_BOOL)))
                     variantToAny( & var, rAny);
                 else if (hr == DISP_E_TYPEMISMATCH)
@@ -455,7 +455,7 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANTARG* pArg, Any& rAny,
                 else
                     bFail = true;
                 break;
-            case TypeClass_STRING:      // UString
+            case TypeClass_STRING:		// UString
                 if(SUCCEEDED(hr = VariantChangeType( & var, &var, 0, VT_BSTR)))
                     variantToAny( & var, rAny);
                 else if (hr == DISP_E_TYPEMISMATCH)
@@ -463,7 +463,7 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANTARG* pArg, Any& rAny,
                 else
                     bFail = true;
                 break;
-            case TypeClass_FLOAT:       // float
+            case TypeClass_FLOAT: 		// float
                 if(SUCCEEDED(hr = VariantChangeType( & var, &var, 0, VT_R4)))
                     variantToAny( & var, rAny);
                 else if (hr == DISP_E_TYPEMISMATCH)
@@ -471,7 +471,7 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANTARG* pArg, Any& rAny,
                 else
                     bFail = true;
                 break;
-            case TypeClass_DOUBLE:      // double
+            case TypeClass_DOUBLE: 		// double
             if(SUCCEEDED(hr = VariantChangeType( & var, &var, 0, VT_R8)))
                 variantToAny(& var, rAny);
             else if (hr == DISP_E_TYPEMISMATCH)
@@ -479,7 +479,7 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANTARG* pArg, Any& rAny,
             else
                 bFail = true;
             break;
-            case TypeClass_BYTE:            // BYTE
+            case TypeClass_BYTE:			// BYTE
                 if(SUCCEEDED(hr = VariantChangeType( & var, &var, 0, VT_I1)))
                     variantToAny( & var, rAny);
                 else if (hr == DISP_E_TYPEMISMATCH)
@@ -487,11 +487,11 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANTARG* pArg, Any& rAny,
                 else
                     bFail = true;
                 break;
-            case TypeClass_SHORT:       // INT16
+            case TypeClass_SHORT: 		// INT16
                 if(SUCCEEDED(hr = VariantChangeType( & var, &var, 0, VT_I2)))
                     variantToAny( & var, rAny);
                 else if (hr == DISP_E_TYPEMISMATCH)
-                    bCannotConvert = true;
+                    bCannotConvert = true;                
                 else
                     bFail = true;
                 break;
@@ -499,7 +499,7 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANTARG* pArg, Any& rAny,
                 if(SUCCEEDED(hr = VariantChangeType(& var, &var, 0, VT_I4)))
                     variantToAny( & var, rAny, bReduceValueRange);
                 else if (hr == DISP_E_TYPEMISMATCH)
-                    bCannotConvert = true;
+                    bCannotConvert = true;                
                 else
                     bFail = true;
                 break;
@@ -519,15 +519,15 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANTARG* pArg, Any& rAny,
                     rAny <<= value;
                 }
                 else if (hr == DISP_E_TYPEMISMATCH)
-                    bCannotConvert = true;
+                    bCannotConvert = true;                
                 else
                     bFail = true;
                 break;
-            case TypeClass_UNSIGNED_SHORT:  // UINT16
+            case TypeClass_UNSIGNED_SHORT:	// UINT16
                 if(SUCCEEDED(hr = VariantChangeType( & var, &var, 0, VT_UI2)))
                     variantToAny( & var, rAny);
                 else if (hr == DISP_E_TYPEMISMATCH)
-                    bCannotConvert = true;
+                    bCannotConvert = true;                
                 else
                     bFail = true;
                 break;
@@ -535,11 +535,11 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANTARG* pArg, Any& rAny,
                 if(SUCCEEDED(hr = VariantChangeType( & var, &var, 0, VT_UI4)))
                     variantToAny( & var, rAny, bReduceValueRange);
                 else if (hr == DISP_E_TYPEMISMATCH)
-                    bCannotConvert = true;
+                    bCannotConvert = true;                
                 else
                     bFail = true;
                 break;
-            case TypeClass_UNSIGNED_HYPER:
+            case TypeClass_UNSIGNED_HYPER:    
                 if(SUCCEEDED(hr = VariantChangeType(& var, &var, 0, VT_DECIMAL)))
                 {
                     if (var.decVal.Hi32 > 0 || var.decVal.scale > 0)
@@ -550,7 +550,7 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANTARG* pArg, Any& rAny,
                     rAny <<= var.decVal.Lo64;
                 }
                 else if (hr == DISP_E_TYPEMISMATCH)
-                    bCannotConvert = true;
+                    bCannotConvert = true;                
                 else
                     bFail = true;
                 break;
@@ -563,13 +563,13 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANTARG* pArg, Any& rAny,
                     bFail = true;
                 break;
             default:
-// case TypeClass_SERVICE:  break;  // meta construct
+// case TypeClass_SERVICE:	break;	// meta construct 
 // case TypeClass_TYPEDEF: break;
-// case TypeClass_UNION:    break;
-// case TypeClass_MODULE:   break;      // module
-// case TypeClass_EXCEPTION: break;
+// case TypeClass_UNION: 	break;	 			
+// case TypeClass_MODULE:	break;		// module
+// case TypeClass_EXCEPTION: break;	
 // case TypeClass_ARRAY: break;    // there's no Array at the moment
-// case TypeClass_UNKNOWN:  break;
+// case TypeClass_UNKNOWN:	break;                
                 bCannotConvert = true;
                 break;
             }
@@ -582,7 +582,7 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANTARG* pArg, Any& rAny,
                 OUSTR("\"  to the expected UNO type of type class: ") +
                 OUString::valueOf((sal_Int32) ptype.getTypeClass()),
                 0, TypeClass_UNKNOWN, FailReason::TYPE_NOT_SUPPORTED,0);
-
+            
         if (bFail)
             throw IllegalArgumentException(
                 OUSTR("[automation bridge]UnoConversionUtilities<T>:variantToAny\n"
@@ -614,9 +614,9 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANTARG* pArg, Any& rAny,
                   "UnoConversionUtilities<T>::variantToAny !"));
     }
 }
-
+    
 // The function only converts Sequences to SAFEARRAYS with elements of the type
-// specified by the parameter type. Everything else is forwarded to
+// specified by the parameter type. Everything else is forwarded to 
 // anyToVariant(VARIANT* pVariant, const Any& rAny)
 // Param type must not be VT_BYREF
 template<class T>
@@ -638,7 +638,7 @@ void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny,
                 pVariant->byref= ar;
             }
         }
-        else if(type == VT_VARIANT)
+        else if(type == VT_VARIANT) 
         {
             anyToVariant(pVariant, rAny);
         }
@@ -656,14 +656,14 @@ void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny,
                         OUSTR("\"  to the expected Automation type of VARTYPE: ") +
                         OUString::valueOf((sal_Int32)type),
                         0, TypeClass_UNKNOWN, FailReason::TYPE_NOT_SUPPORTED,0);
-
+                
                 throw BridgeRuntimeError(
                     OUSTR("[automation bridge]UnoConversionUtilities<T>::anyToVariant \n"
                           "Conversion of any with ") +
                     rAny.getValueType().getTypeName() +
                     OUSTR(" to VARIANT with type: ") + OUString::valueOf((sal_Int32) type) +
                     OUSTR(" failed! Error code: ") + OUString::valueOf(hr));
-
+                
             }
             if(FAILED(hr = VariantCopy(pVariant, &var)))
             {
@@ -671,7 +671,7 @@ void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny,
                     OUSTR("[automation bridge]UnoConversionUtilities<T>::anyToVariant \n"
                           "VariantCopy failed for reason: ") + OUString::valueOf(hr));
             }
-        }
+        }    
     }
     catch (IllegalArgumentException &)
     {
@@ -689,7 +689,7 @@ void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny,
     {
         throw BridgeRuntimeError(
             OUSTR("[automation bridge]UnoConversionUtilities<T>::anyToVariant \n"
-                  "Unexpected exception occurred. Message: ") + e.Message);
+                  "Unexpected exception occurred. Message: ") + e.Message);        
     }
     catch(...)
     {
@@ -707,7 +707,7 @@ void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny)
     {
         switch (rAny.getValueTypeClass())
         {
-        case TypeClass_INTERFACE:
+        case TypeClass_INTERFACE:	
         {
             Reference<XInterface> xInt;
             if (rAny >>= xInt)
@@ -784,7 +784,7 @@ void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny)
             }
             break;
         }
-        case TypeClass_SEQUENCE:        // sequence ??? SafeArray descriptor
+        case TypeClass_SEQUENCE:		// sequence ??? SafeArray descriptor
         {
             SAFEARRAY* pArray = createUnoSequenceWrapper(rAny);
             if (pArray)
@@ -809,7 +809,7 @@ void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny)
             }
             break;
         }
-        case TypeClass_BOOLEAN:
+        case TypeClass_BOOLEAN: 
         {
             sal_Bool value;
             if (rAny >>= value)
@@ -849,7 +849,7 @@ void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny)
         {
             float value;
             if (rAny >>= value)
-            {
+            {       
                 pVariant->vt = VT_R4;
                 pVariant->fltVal = value;
             }
@@ -888,8 +888,8 @@ void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny)
             }
             break;
         }
-        case TypeClass_SHORT:       // INT16
-        case TypeClass_UNSIGNED_SHORT:  // UINT16
+        case TypeClass_SHORT: 		// INT16
+        case TypeClass_UNSIGNED_SHORT:	// UINT16
         {
             sal_Int16 value;
             if (rAny >>= value)
@@ -927,15 +927,15 @@ void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny)
         }
         case TypeClass_HYPER:
         {
-
+            
             pVariant->vt = VT_DECIMAL;
             pVariant->decVal.scale = 0;
             pVariant->decVal.sign = 0;
             pVariant->decVal.Hi32 = 0;
-
+            
             sal_Int64 value;
             rAny >>= value;
-
+            
             if (value & SAL_CONST_UINT64(0x8000000000000000))
                 pVariant->decVal.sign = DECIMAL_NEG;
 
@@ -971,7 +971,7 @@ void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny)
             break;
         }
         default:
-            //TypeClass_SERVICE:
+            //TypeClass_SERVICE: 
             //TypeClass_EXCEPTION:
             //When a InvocationTargetException is thrown when calling XInvocation::invoke
             //on a UNO object, then the target exception is directly used to create a
@@ -980,8 +980,8 @@ void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny)
             //TypeClass_ANY:
             //TypeClass_UNKNOWN:
             //TypeClass_UNSIGNED_OCTET:
-            // TypeClass_UNION:
-            // TypeClass_ARRAY:
+            // TypeClass_UNION: 		
+            // TypeClass_ARRAY: 	   
             // TypeClass_UNSIGNED_INT:
             // TypeClass_UNSIGNED_BYTE:
             // TypeClass_MODULE:
@@ -1000,8 +1000,8 @@ void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny)
             throw IllegalArgumentException(
                 OUSTR("[automation bridge]UnoConversionUtilities<T>::anyToVariant\n"
                       "The provided any of type\" ") + rAny.getValueType().getTypeName() +
-                OUSTR("\" is unappropriate for conversion!"), Reference<XInterface>(), -1);
-
+                OUSTR("\" is unappropriate for conversion!"), Reference<XInterface>(), -1);             
+            
         }
     }
     catch (CannotConvertException & )
@@ -1020,18 +1020,18 @@ void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny)
     {
         throw BridgeRuntimeError(
             OUSTR("[automation bridge]UnoConversionUtilities<T>::anyToVariant \n"
-                  "Unexpected exception occurred. Message: ") + e.Message);
+                  "Unexpected exception occurred. Message: ") + e.Message);        
     }
     catch(...)
     {
         throw BridgeRuntimeError(
             OUSTR("[automation bridge]UnoConversionUtilities<T>::anyToVariant \n"
-                  "Unexpected exception occurred. ") );
+                  "Unexpected exception occurred. ") );        
     }
 }
 
 // Creates an SAFEARRAY of the specified element and if necessary
-// creates a SAFEARRAY whith multiple dimensions.
+// creates a SAFEARRAY whith multiple dimensions. 
 // Used by sal_Bool anyToVariant(VARIANT* pVariant, const Any& rAny, VARTYPE type);
 template<class T>
 SAFEARRAY*  UnoConversionUtilities<T>::createUnoSequenceWrapper(const Any& rSeq, VARTYPE elemtype)
@@ -1042,9 +1042,9 @@ SAFEARRAY*  UnoConversionUtilities<T>::createUnoSequenceWrapper(const Any& rSeq,
                   "The any does not contain a sequence!"), 0, 0);
     if (elemtype == VT_NULL  ||  elemtype == VT_EMPTY)
         throw IllegalArgumentException(
-            OUSTR("[automation bridge]UnoConversionUtilities<T>::createUnoSequenceWrapper \n"
+            OUSTR("[automation bridge]UnoConversionUtilities<T>::createUnoSequenceWrapper \n" 
                   "No element type supplied!"),0, -1);
-    SAFEARRAY*  pArray= NULL;
+    SAFEARRAY*	pArray= NULL;
     // Get the dimensions. This is done by examining the type name string
     // The count of brackets determines the dimensions.
     OUString sTypeName= rSeq.getValueType().getTypeName();
@@ -1073,7 +1073,7 @@ SAFEARRAY*  UnoConversionUtilities<T>::createUnoSequenceWrapper(const Any& rSeq,
         size_t oleElementSize= getOleElementSize( elemtype);
         // SafeArrayCreate clears the memory for the data itself.
         pArray = SafeArrayCreate(elemtype, dims, prgsabound);
-
+        
         // convert the Sequence's elements and populate the SAFEARRAY
         if( pArray)
         {
@@ -1084,7 +1084,7 @@ SAFEARRAY*  UnoConversionUtilities<T>::createUnoSequenceWrapper(const Any& rSeq,
                 const sal_Int32* parElementCount= seqElementCounts.getConstArray();
                 uno_Sequence * pMultiSeq= *(uno_Sequence* const*) rSeq.getValue();
                 sal_Int32 dimsSeq= dims - 1;
-
+                
                 // arDimSeqIndizes contains the current index of a block of data.
                 // E.g. Sequence<Sequence<sal_Int32>> , the index would refer to Sequence<sal_Int32>
                 // In this case arDimSeqIndices would have the size 1. That is the elements are not counted
@@ -1096,11 +1096,11 @@ SAFEARRAY*  UnoConversionUtilities<T>::createUnoSequenceWrapper(const Any& rSeq,
                 {
                     sarDimsSeqIndices.reset(new sal_Int32[dimsSeq]);
                     arDimsSeqIndices = sarDimsSeqIndices.get();
-                    memset( arDimsSeqIndices, 0,  sizeof( sal_Int32 ) * dimsSeq);
+                    memset( arDimsSeqIndices, 0,  sizeof( sal_Int32 ) * dimsSeq); 
                 }
-
+                
                 char* psaCurrentData= (char*)pSAData;
-
+            
                 do
                 {
                     // Get the Sequence at the current index , see arDimsSeqIndices
@@ -1127,17 +1127,17 @@ SAFEARRAY*  UnoConversionUtilities<T>::createUnoSequenceWrapper(const Any& rSeq,
 
                     if( skipSeq)
                         continue;
-
+                    
                     // Calculate the current position within the datablock of the SAFEARRAY
-                    // for the next Sequence.
-                    sal_Int32 memOffset= 0;
+                    // for the next Sequence. 
+                    sal_Int32 memOffset= 0; 
                     sal_Int32 dimWeight= parElementCount[ dims - 1]; // size of the rightmost dimension
                     for(sal_Int16 idims=0; idims < dimsSeq; idims++ )
                     {
                         memOffset+= arDimsSeqIndices[dimsSeq - 1 - idims] * dimWeight;
                         // now determine the weight of the dimension to the left of the current.
                         if( dims - 2 - idims >=0)
-                            dimWeight*= parElementCount[dims - 2 - idims];
+                            dimWeight*= parElementCount[dims - 2 - idims]; 
                     }
                     psaCurrentData= (char*)pSAData + memOffset * oleElementSize;
                     // convert the Sequence and put the elements into the Safearray
@@ -1157,22 +1157,22 @@ SAFEARRAY*  UnoConversionUtilities<T>::createUnoSequenceWrapper(const Any& rSeq,
                         anyToVariant( &var, unoElement);
                         if( elemtype == VT_VARIANT )
                         {
-                            VariantCopy( ( VARIANT*)psaCurrentData, &var);
+                            VariantCopy( ( VARIANT*)psaCurrentData, &var); 
                             VariantClear( &var);
                         }
                         else
-                            memcpy( psaCurrentData, &var.byref, oleElementSize);
-
+                            memcpy( psaCurrentData, &var.byref, oleElementSize); 
+                        
                         psaCurrentData+= oleElementSize;
                     }
                 }
                 while( incrementMultidimensionalIndex( dimsSeq, parElementCount, arDimsSeqIndices));
-
+                
                 SafeArrayUnaccessData( pArray);
-            }
+            }	
         }
     }
-    return pArray;
+    return pArray;	
 }
 
 // Increments a multi dimensional index.
@@ -1180,17 +1180,17 @@ SAFEARRAY*  UnoConversionUtilities<T>::createUnoSequenceWrapper(const Any& rSeq,
 // False is also returned if an overflow of the most significant dimension occurs. E.g.
 // assume an array with the dimensions (2,2), then the lowest index is (0,0) and the highest
 // index is (1,1). If the function is being called with the index (1,1) then the overflow would
-// occur, with the result (0,0) and a sal_False as return value.
+// occur, with the result (0,0) and a sal_False as return value. 
 // Param dimensions - number of dimensions
-// Param parDimensionsLength - The array contains the size of each dimension, that is the
-//                              size of the array equals the parameter dimensions.
-//                              The rightmost dimensions is the least significant one
-//                              ( parDimensionsLengths[ dimensions -1 ] ).
-// Param parMultiDimensionalIndex - The array contains the index. Each dimension index is
-//                                  0 based.
+// Param parDimensionsLength - The array contains the size of each dimension, that is the 
+//								size of the array equals the parameter dimensions.
+//								The rightmost dimensions is the least significant one 
+//								( parDimensionsLengths[ dimensions -1 ] ).
+// Param parMultiDimensionalIndex - The array contains the index. Each dimension index is 
+//									0 based.
 template<class T>
-sal_Bool UnoConversionUtilities<T>::incrementMultidimensionalIndex(sal_Int32 dimensions,
-                                                                   const sal_Int32 * parDimensionLengths,
+sal_Bool UnoConversionUtilities<T>::incrementMultidimensionalIndex(sal_Int32 dimensions, 
+                                                                   const sal_Int32 * parDimensionLengths, 
                                                                    sal_Int32 * parMultidimensionalIndex)
 {
     if( dimensions < 1)
@@ -1198,7 +1198,7 @@ sal_Bool UnoConversionUtilities<T>::incrementMultidimensionalIndex(sal_Int32 dim
 
     sal_Bool ret= sal_True;
     sal_Bool carry= sal_True; // to get into the while loop
-
+    
     sal_Int32 currentDimension= dimensions; //most significant is 1
     while( carry)
     {
@@ -1222,7 +1222,7 @@ sal_Bool UnoConversionUtilities<T>::incrementMultidimensionalIndex(sal_Int32 dim
 }
 
 // Determines the size of a certain OLE type. The function takes
-// only those types into account which are oleautomation types and
+// only those types into account which are oleautomation types and 
 // can have a value ( unless VT_NULL, VT_EMPTY, VT_ARRAY, VT_BYREF).
 // Currently used in createUnoSequenceWrapper to calculate addresses
 // for data within a SAFEARRAY.
@@ -1248,34 +1248,34 @@ size_t UnoConversionUtilities<T>::getOleElementSize( VARTYPE type)
     return size;
 }
 
-//If a Sequence is being converted into a SAFEARRAY then we possibly have
+//If a Sequence is being converted into a SAFEARRAY then we possibly have 
 // to create a SAFEARRAY with multiple dimensions. This is the case when a
 // Sequence contains Sequences ( Sequence< Sequence < XXX > > ). The leftmost
 // Sequence in the declaration is assumed to represent dimension 1. Because
-// all Sequence elements of a Sequence can have different length, we have to
+// all Sequence elements of a Sequence can have different length, we have to 
 // determine the maximum length which is then the length of the respective
 // dimension.
 // getElementCountAndTypeOfSequence determines the length of each dimension and calls itself recursively
 // in the process.
 // param rSeq - an Any that has to contain a Sequence
 // param dim - the dimension for which the number of elements is being determined,
-//              must be one.
-// param seqElementCounts - countains the maximum number of elements for each
-//                          dimension. Index 0 contains the number of dimension one.
-//                          After return the Sequence contains the maximum number of
-//                          elements for each dimension.
-//                          The length of the Sequence must equal the number of dimensions.
-// param typeClass - TypeClass of the element type that is no Sequence, e.g.
-//                          Sequence< Sequence <Sequence <sal_Int32> > > - type is sal_Int32)
+//				must be one.
+// param seqElementCounts - countains the maximum number of elements for each 
+//							dimension. Index 0 contains the number of dimension one.
+//							After return the Sequence contains the maximum number of 
+//							elements for each dimension.
+//							The length of the Sequence must equal the number of dimensions.
+// param typeClass - TypeClass of the element type that is no Sequence, e.g. 
+//							Sequence< Sequence <Sequence <sal_Int32> > > - type is sal_Int32)
 template<class T>
-void  UnoConversionUtilities<T>::getElementCountAndTypeOfSequence( const Any& rSeq, sal_Int32 dim,
+void  UnoConversionUtilities<T>::getElementCountAndTypeOfSequence( const Any& rSeq, sal_Int32 dim, 
                                              Sequence< sal_Int32 >& seqElementCounts, TypeDescription& typeDesc)
 {
     sal_Int32 dimCount= (*(uno_Sequence* const *) rSeq.getValue())->nElements;
     if( dimCount > seqElementCounts[ dim-1])
         seqElementCounts[ dim-1]= dimCount;
 
-    // we need the element type to construct the any that is
+    // we need the element type to construct the any that is 
     // passed into getElementCountAndTypeOfSequence again
     typelib_TypeDescription* pSeqDesc= NULL;
     rSeq.getValueTypeDescription( &pSeqDesc);
@@ -1283,7 +1283,7 @@ void  UnoConversionUtilities<T>::getElementCountAndTypeOfSequence( const Any& rS
 
     // if the elements are Sequences than do recursion
     if( dim < seqElementCounts.getLength() )
-    {
+    {		
         uno_Sequence* pSeq = *(uno_Sequence* const*) rSeq.getValue();
         uno_Sequence** arSequences= (uno_Sequence**)pSeq->elements;
         for( sal_Int32 i=0; i < dimCount; i++)
@@ -1302,27 +1302,27 @@ void  UnoConversionUtilities<T>::getElementCountAndTypeOfSequence( const Any& rS
 
 
 template<class T>
-SAFEARRAY*  UnoConversionUtilities<T>::createUnoSequenceWrapper(const Any& rSeq)
+SAFEARRAY* 	UnoConversionUtilities<T>::createUnoSequenceWrapper(const Any& rSeq)
 {
     SAFEARRAY* pArray = NULL;
     sal_uInt32 n = 0;
-
+    
     if( rSeq.getValueTypeClass() != TypeClass_SEQUENCE )
         throw IllegalArgumentException(
             OUSTR("[automation bridge]UnoConversionUtilities<T>::createUnoSequenceWrapper\n"
                   "The UNO argument is not a sequence"), 0, -1);
-
+    
     uno_Sequence * punoSeq= *(uno_Sequence**) rSeq.getValue();
-
+    
     typelib_TypeDescriptionReference* pSeqTypeRef= rSeq.getValueTypeRef();
     typelib_TypeDescription* pSeqType= NULL;
     TYPELIB_DANGER_GET( &pSeqType, pSeqTypeRef);
-    typelib_IndirectTypeDescription * pSeqIndDec=   (typelib_IndirectTypeDescription*) pSeqType;
-
-
+    typelib_IndirectTypeDescription * pSeqIndDec=	(typelib_IndirectTypeDescription*) pSeqType;
+    
+    
     typelib_TypeDescriptionReference * pSeqElementTypeRef= pSeqIndDec->pType;
     TYPELIB_DANGER_RELEASE( pSeqType);
-
+        
     typelib_TypeDescription* pSeqElementDesc= NULL;
     TYPELIB_DANGER_GET( &pSeqElementDesc, pSeqElementTypeRef);
 
@@ -1339,36 +1339,36 @@ SAFEARRAY*  UnoConversionUtilities<T>::createUnoSequenceWrapper(const Any& rSeq)
     {
         sal_Int32 nElementSize= pSeqElementDesc->nSize;
         n= punoSeq->nElements;
-
+        
         SAFEARRAYBOUND rgsabound[1];
         rgsabound[0].lLbound = 0;
         rgsabound[0].cElements = n;
         VARIANT oleElement;
         long safeI[1];
-
+        
         pArray = SafeArrayCreate(VT_VARIANT, 1, rgsabound);
-
+        
         Any unoElement;
-        //      sal_uInt8 * pSeqData= (sal_uInt8*) punoSeq->pElements;
+        //		sal_uInt8 * pSeqData= (sal_uInt8*) punoSeq->pElements;
         sal_uInt8 * pSeqData= (sal_uInt8*) punoSeq->elements;
-
+        
         for (sal_uInt32 i = 0; i < n; i++)
         {
             unoElement.setValue( pSeqData + i * nElementSize, pSeqElementDesc);
             VariantInit(&oleElement);
-
+            
             anyToVariant(&oleElement, unoElement);
-
+            
             safeI[0] = i;
             SafeArrayPutElement(pArray, safeI, &oleElement);
-
+            
             VariantClear(&oleElement);
         }
     }
 
     TYPELIB_DANGER_RELEASE( pSeqElementDesc);
-
-    return pArray;
+        
+    return pArray;	
 }
 
 /* The argument rObj can contain
@@ -1383,7 +1383,7 @@ template<class T>
 void UnoConversionUtilities<T>::createUnoObjectWrapper(const Any & rObj, VARIANT * pVar)
 {
     MutexGuard guard(getBridgeMutex());
-
+    
     Reference<XInterface> xInt;
 
     TypeClass tc = rObj.getValueTypeClass();
@@ -1392,7 +1392,7 @@ void UnoConversionUtilities<T>::createUnoObjectWrapper(const Any & rObj, VARIANT
             OUSTR("[automation bridge]UnoConversionUtilities<T>::createUnoObjectWrapper \n"
                   "Cannot create an Automation interface for a UNO type which is not "
                   "a struct or interface!"), 0, -1);
-
+        
     if (rObj.getValueTypeClass() == TypeClass_INTERFACE)
     {
         if (! (rObj >>= xInt))
@@ -1409,7 +1409,7 @@ void UnoConversionUtilities<T>::createUnoObjectWrapper(const Any & rObj, VARIANT
         //make sure we have the main XInterface which is used with a map
         xInt = Reference<XInterface>(xInt, UNO_QUERY);
         //If there is already a wrapper for the UNO object then use it
-
+        
         Reference<XInterface> xIntWrapper;
         // Does a UNO wrapper exist already ?
         IT_Uno it_uno = UnoObjToWrapperMap.find( (sal_uInt32) xInt.get());
@@ -1422,7 +1422,7 @@ void UnoConversionUtilities<T>::createUnoObjectWrapper(const Any & rObj, VARIANT
                 return;
             }
         }
-        // Is the object a COM wrapper ( either XInvocation, or Adapter object)
+        // Is the object a COM wrapper ( either XInvocation, or Adapter object) 
         // or does it suppy an IDispatch by its own ?
         else
         {
@@ -1453,15 +1453,15 @@ void UnoConversionUtilities<T>::createUnoObjectWrapper(const Any & rObj, VARIANT
             xInv= Reference<XInvocation>(xInt, UNO_QUERY);
         }
     }
-
+    
     if (xInv.is())
-    {
+    {            
         Reference<XInterface> xNewWrapper = createUnoWrapperInstance();
         Reference<XInitialization> xInitWrapper(xNewWrapper, UNO_QUERY);
         if (xInitWrapper.is())
         {
             VARTYPE vartype= getVarType( rObj);
-
+            
             if (xInt.is())
             {
                 Any params[3];
@@ -1477,7 +1477,7 @@ void UnoConversionUtilities<T>::createUnoObjectWrapper(const Any & rObj, VARIANT
                 params[1] <<= vartype;
                 xInitWrapper->initialize( Sequence<Any>(params, 2));
             }
-
+            
             // put the newly created object into a map. If the same object will
             // be mapped again and there is already a wrapper then the old wrapper
             // will be used.
@@ -1488,9 +1488,9 @@ void UnoConversionUtilities<T>::createUnoObjectWrapper(const Any & rObj, VARIANT
         }
     }
 }
-
+    
 template<class T>
-void UnoConversionUtilities<T>::variantToAny( const VARIANT* pVariant, Any& rAny,
+void UnoConversionUtilities<T>::variantToAny( const VARIANT* pVariant, Any& rAny, 
                                                   sal_Bool bReduceValueRange /* = sal_True */)
 {
     HRESULT hr = S_OK;
@@ -1503,21 +1503,21 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANT* pVariant, Any& rAny
             throw BridgeRuntimeError(
                 OUSTR("[automation bridge] UnoConversionUtilities<T>::variantToAny \n"
                       "VariantCopyInd failed for reason : ") + OUString::valueOf(hr));
-
+        
         if ( ! convertValueObject( & var, rAny))
         {
             if ((var.vt & VT_ARRAY) > 0)
             {
                 VARTYPE oleTypeFlags = ::sal::static_int_cast< VARTYPE, int >( var.vt ^ VT_ARRAY );
-
+                
                 Sequence<Any> unoSeq = createOleArrayWrapper(var.parray, oleTypeFlags);
                 rAny.setValue( &unoSeq, getCppuType( &unoSeq));
             }
             else
             {
-                switch (var.vt)
+                switch (var.vt)	
                 {
-                case VT_EMPTY:
+                case VT_EMPTY: 
                     rAny.setValue(NULL, Type());
                     break;
                 case VT_NULL:
@@ -1633,7 +1633,7 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANT* pVariant, Any& rAny
                     rAny <<= dec;
                     break;
                 }
-
+                
                 default:
                     break;
                 }
@@ -1665,7 +1665,7 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANT* pVariant, Any& rAny
                   "UnoConversionUtilities<T>::variantToAny !"));
     }
 
-}
+}	
 // The function converts an IUnknown* into an UNO interface or struct. The
 // IUnknown pointer can constitute different kind of objects:
 // 1. a wrapper of an UNO struct (the wrapper was created by this bridge)
@@ -1673,27 +1673,27 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANT* pVariant, Any& rAny
 // 3. a dispatch object that implements UNO interfaces
 // 4. a dispatch object.
 
-// If the parameter "aType" has a value then the COM object ( pUnknown) is supposed to
-// implement the interface described by "aType". Moreover it ( pUnknown) can implement
+// If the parameter "aType" has a value then the COM object ( pUnknown) is supposed to 
+// implement the interface described by "aType". Moreover it ( pUnknown) can implement 
 // several other
 // UNO interfaces in which case it has to support the SUPPORTED_INTERFACES_PROP (see
 // #define) property. That property contains all names of interfaces.
-// "pUnknown" is wrapped by a COM wrapper object that implements XInvocation, e.g.
+// "pUnknown" is wrapped by a COM wrapper object that implements XInvocation, e.g. 
 // IUnknownWrapper_Impl. Additionally an object of type "aType" is created by help
 // of the INTERFACE_ADAPTER_FACTORY (see #define) service. The implementation of
 // "aType" calls on the COM wrapper's XInvocation::invoke. If the COM object supports
-// more then one UNO interfaces, as can be determined by the property
+// more then one UNO interfaces, as can be determined by the property 
 // SUPPORTED_INTERFACES_PROP, then the INTERFACE_ADAPTER_FACTORY creates an object that
 // implements all these interfaces.
-// This is only done if "pUnknown" is not already a UNO wrapper,
+// This is only done if "pUnknown" is not already a UNO wrapper, 
 // that is it is actually NOT an UNO object that was converted to a COM object. If it is an
 // UNO wrapper than the original UNO object is being extracted, queried for "aType" (if
 // it is no struct) and returned.
 template<class T>
 #ifdef __MINGW32__
-Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type& aType)
+Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type& aType)    
 #else
-Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type& aType= Type())
+Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type& aType= Type())    
 #endif
 {
     //To allow passing "Nothing" in VS 2008 we need to accept VT_EMPTY
@@ -1706,7 +1706,7 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type&
 
     CComPtr<IUnknown>  spUnknown;
     CComPtr<IDispatch> spDispatch;
-
+    
     if (pVar->vt == VT_UNKNOWN)
     {
         spUnknown = pVar->punkVal;
@@ -1727,7 +1727,7 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type&
             spDispatch.QueryInterface( & spUnknown.p);
 #endif
     }
-
+    
     static Type VOID_TYPE= Type();
     Any ret;
     //If no Type is provided and pVar contains IUnknown then we return a XInterface.
@@ -1747,12 +1747,12 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type&
             break;
         default:
             desiredType = aType;
-        }
+        }                  
     }
 
     // COM pointer are NULL, no wrapper required
      if (spUnknown == NULL)
-    {
+    { 
         Reference<XInterface> xInt;
         if( aType.getTypeClass() == TypeClass_INTERFACE)
             ret.setValue( &xInt, aType);
@@ -1762,8 +1762,8 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type&
             ret <<= xInt;
         return ret;
     }
-
-
+    
+    
     // Check if "spUnknown" is a UNO wrapper, that is an UNO object that has been
     // passed to COM. Then it supports IUnoObjectWrapper
     // and we extract the original UNO object.
@@ -1787,7 +1787,7 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type&
         }
         return ret;
     }
-
+    
     // "spUnknown" is a real COM object.
     // Before we create a new wrapper object we check if there is an existing wrapper
     // There can be two kinds of wrappers, those who wrap dispatch - UNO objects, and those who
@@ -1814,7 +1814,7 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type&
             if (seqTypes.getLength() > 0)
             {
                 //It is a COM UNO object
-                xIntAdapter = createAdapter(seqTypes, xIntWrapper);
+                xIntAdapter = createAdapter(seqTypes, xIntWrapper); 
             }
             else
             {
@@ -1840,7 +1840,7 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type&
                           "The COM object is not suitable for the UNO type: ") +
                     desiredType.getTypeName(), 0, -1);
         }
-
+        
         return ret;
     }
     // No existing wrapper. Therefore create a new proxy.
@@ -1859,7 +1859,7 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type&
             OUSTR("[automation bridge]UnoConversionUtilities<T>::createOleObjectWrapper \n"
                   "Could not create proxy object for COM object!"));
 
-    // initialize the COM wrapper
+    // initialize the COM wrapper 
     Reference<XInitialization> xInit( xIntNewProxy, UNO_QUERY);
     OSL_ASSERT( xInit.is());
 
@@ -1872,29 +1872,29 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type&
     sal_Bool bDisp = pVar->vt == VT_DISPATCH ? sal_True : sal_False;
     params[1].setValue( & bDisp, getBooleanCppuType());
     params[2] <<= seqTypes;
-
+    
     xInit->initialize( Sequence<Any>( params, 3));
 #ifdef __MINGW32__
-    ComPtrToWrapperMap[reinterpret_cast<sal_uInt32>( spUnknown.p )]= xIntNewProxy;
+    ComPtrToWrapperMap[reinterpret_cast<sal_uInt32>( spUnknown.p )]= xIntNewProxy; 
 #else
-    ComPtrToWrapperMap[reinterpret_cast<sal_uInt32>(spUnknown.p)]= xIntNewProxy;
+    ComPtrToWrapperMap[reinterpret_cast<sal_uInt32>(spUnknown.p)]= xIntNewProxy; 
 #endif
-
+    
     // we have a wrapper object
     //The wrapper implements already XInvocation and XInterface. If
-    //param aType is void then the object is supposed to have XInvocation.
+    //param aType is void then the object is supposed to have XInvocation. 
      if (aType == getCppuType((Reference<XInvocation>*)0) ||
          (aType == VOID_TYPE && seqTypes.getLength() == 0 ))
      {
          ret = xIntNewProxy->queryInterface(desiredType);
      }
-     else
+     else 
      {
          Reference<XInterface> xIntAdapter =
              createAdapter(seqTypes, xIntNewProxy);
          ret = xIntAdapter->queryInterface(desiredType);
      }
-    return ret;
+    return ret;	
 }
 template<class T>
 Reference<XInterface> UnoConversionUtilities<T>::createAdapter(const Sequence<Type>& seqTypes,
@@ -1903,18 +1903,18 @@ Reference<XInterface> UnoConversionUtilities<T>::createAdapter(const Sequence<Ty
     Reference< XInterface> xIntAdapterFac;
     xIntAdapterFac= m_smgr->createInstance(INTERFACE_ADAPTER_FACTORY);
     // We create an adapter object that does not only implement the required type but also
-    // all types that the COM object pretends to implement. An COM object must therefore
-    // support the property "_implementedInterfaces".
+    // all types that the COM object pretends to implement. An COM object must therefore 
+    // support the property "_implementedInterfaces". 
     Reference<XInterface> xIntAdapted;
     Reference<XInvocation> xInv(receiver, UNO_QUERY);
     Reference<XInvocationAdapterFactory2> xAdapterFac( xIntAdapterFac, UNO_QUERY);
     if( xAdapterFac.is())
         xIntAdapted= xAdapterFac->createAdapter( xInv, seqTypes);
-
+    
     if( xIntAdapted.is())
     {
         // Put the pointer to the wrapper object and the interface pointer of the adapted interface
-        // in a global map. Thus we can determine in a call to createUnoObjectWrapper whether the UNO
+        // in a global map. Thus we can determine in a call to createUnoObjectWrapper whether the UNO 
         // object is a wrapped COM object. In that case we extract the original COM object rather than
         // creating a wrapper around the UNO object.
         typedef hash_map<sal_uInt32,sal_uInt32>::value_type VALUE;
@@ -1929,8 +1929,8 @@ Reference<XInterface> UnoConversionUtilities<T>::createAdapter(const Sequence<Ty
     }
     return xIntAdapted;
 }
-// "convertValueObject" converts a JScriptValue object contained in "var" into
-// an any. The type contained in the any is stipulated by a "type value" thas
+// "convertValueObject" converts a JScriptValue object contained in "var" into 
+// an any. The type contained in the any is stipulated by a "type value" thas 
 // was set within the JScript script on the value object ( see JScriptValue).
 template<class T>
 bool UnoConversionUtilities<T>::convertValueObject( const VARIANTARG *var, Any& any)
@@ -1941,7 +1941,7 @@ bool UnoConversionUtilities<T>::convertValueObject( const VARIANTARG *var, Any&
         bool bFail = false;
         HRESULT hr= S_OK;
         CComVariant varDisp;
-
+        
         if(SUCCEEDED(hr = varDisp.ChangeType( VT_DISPATCH, var)))
         {
             CComPtr <IJScriptValueObject> spValue;
@@ -1951,7 +1951,7 @@ bool UnoConversionUtilities<T>::convertValueObject( const VARIANTARG *var, Any&
             CComPtr<IDispatch> spDisp( varDisp.pdispVal);
             if(spDisp)
             {
-                if(SUCCEEDED( spDisp->QueryInterface( __uuidof( IJScriptValueObject),
+                if(SUCCEEDED( spDisp->QueryInterface( __uuidof( IJScriptValueObject), 
                                                        reinterpret_cast<void**> (&spValue))))
                 {
                     ret = true; // is is a ValueObject
@@ -1975,13 +1975,13 @@ bool UnoConversionUtilities<T>::convertValueObject( const VARIANTARG *var, Any&
                         }
                     }
                     else
-                        bFail = true;;
+                        bFail = true;;				
                 }
             }
         }
         else if( hr != DISP_E_TYPEMISMATCH && hr != E_NOINTERFACE)
             bFail = true;
-
+            
         if (bFail)
             throw BridgeRuntimeError(
                 OUSTR("[automation bridge] Conversion of ValueObject failed "));
@@ -2016,19 +2016,19 @@ void UnoConversionUtilities<T>::dispatchExObject2Sequence( const VARIANTARG* pva
                                            "Conversion of dispatch object to Sequence failed!"));
         IDispatchEx* pdispEx;
         HRESULT hr;
-        if( FAILED( hr= pvar->pdispVal->QueryInterface( IID_IDispatchEx,
+        if( FAILED( hr= pvar->pdispVal->QueryInterface( IID_IDispatchEx, 
                                                         reinterpret_cast<void**>( &pdispEx))))
             throw BridgeRuntimeError(OUSTR("[automation bridge] UnoConversionUtilities<T>::dispatchExObject2Sequence \n"
                                            "Conversion of dispatch object to Sequence failed!"));
-
+        
         DISPID dispid;
         OUString sindex;
         DISPPARAMS param= {0,0,0,0};
         CComVariant result;
-
+        
         OLECHAR* sLength= L"length";
-
-        // Get the length of the array. Can also be obtained throu GetNextDispID. The
+        
+        // Get the length of the array. Can also be obtained throu GetNextDispID. The 
         // method only returns DISPIDs of the array data. Their names are like "0", "1" etc.
         if( FAILED( hr= pdispEx->GetIDsOfNames(IID_NULL, &sLength , 1, LOCALE_USER_DEFAULT, &dispid)))
             throw BridgeRuntimeError(OUSTR("[automation bridge] UnoConversionUtilities<T>::dispatchExObject2Sequence \n"
@@ -2036,20 +2036,20 @@ void UnoConversionUtilities<T>::dispatchExObject2Sequence( const VARIANTARG* pva
         if( FAILED( hr= pdispEx->InvokeEx(dispid, LOCALE_USER_DEFAULT, DISPATCH_PROPERTYGET,
                                           &param, &result, NULL, NULL)))
             throw BridgeRuntimeError(OUSTR("[automation bridge] UnoConversionUtilities<T>::dispatchExObject2Sequence \n"
-                                           "Conversion of dispatch object to Sequence failed!"));
+                                           "Conversion of dispatch object to Sequence failed!"));        
         if( FAILED( VariantChangeType( &result, &result, 0, VT_I4)))
             throw BridgeRuntimeError(OUSTR("[automation bridge] UnoConversionUtilities<T>::dispatchExObject2Sequence \n"
-                                           "Conversion of dispatch object to Sequence failed!"));
+                                           "Conversion of dispatch object to Sequence failed!"));        
         long length= result.lVal;
 
         result.Clear();
-
+        
         // get a few basic facts about the sequence, and reallocate:
         // create the Sequences
         // get the size of the elements
         typelib_TypeDescription *pDesc= NULL;
         type.getDescription( &pDesc);
-
+        
         typelib_IndirectTypeDescription *pSeqDesc= reinterpret_cast<typelib_IndirectTypeDescription*>(pDesc);
         typelib_TypeDescriptionReference *pSeqElemDescRef= pSeqDesc->pType; // type of the Sequence' elements
         Type elemType( pSeqElemDescRef);
@@ -2057,41 +2057,41 @@ void UnoConversionUtilities<T>::dispatchExObject2Sequence( const VARIANTARG* pva
         TYPELIB_DANGER_GET( &pSeqElemDesc, pSeqElemDescRef)
             sal_uInt32 nelementSize= pSeqElemDesc->nSize;
         TYPELIB_DANGER_RELEASE( pSeqElemDesc)
-
+            
             uno_Sequence *p_uno_Seq;
         uno_sequence_construct( &p_uno_Seq, pDesc, NULL, length, cpp_acquire);
-
+        
         typelib_TypeClass typeElement= pSeqDesc->pType->eTypeClass;
         char *pArray= p_uno_Seq->elements;
-
+        
         // Get All properties in the object, convert their values to the expected type and
         // put them into the passed in sequence
         for( sal_Int32 i= 0; i< length; i++)
         {
             OUString ousIndex=OUString::valueOf( i);
             OLECHAR* sindex =  (OLECHAR*)ousIndex.getStr();
-
+            
             if( FAILED( hr= pdispEx->GetIDsOfNames(IID_NULL, &sindex , 1, LOCALE_USER_DEFAULT, &dispid)))
             {
                 throw BridgeRuntimeError(OUSTR("[automation bridge] UnoConversionUtilities<T>::dispatchExObject2Sequence \n"
-                                               "Conversion of dispatch object to Sequence failed!"));
+                                               "Conversion of dispatch object to Sequence failed!"));        
             }
             if( FAILED( hr= pdispEx->InvokeEx(dispid, LOCALE_USER_DEFAULT, DISPATCH_PROPERTYGET,
                                               &param, &result, NULL, NULL)))
             {
                 throw BridgeRuntimeError(OUSTR("[automation bridge] UnoConversionUtilities<T>::dispatchExObject2Sequence \n"
                                                "Conversion of dispatch object to Sequence failed!"));
-            }
-
+            }					
+            
             // If the result is VT_DISPATCH than the Sequence's element type could be Sequence
             // Look that up in the CoreReflection to make clear.
             // That requires a recursiv conversion
-            Any any;
+            Any any;	
             // Destination address within the out-Sequence "anySeq" where to copy the next converted element
             void* pDest= (void*)(pArray + (i * nelementSize));
-
+            
             if( result.vt & VT_DISPATCH && typeElement == typelib_TypeClass_SEQUENCE)
-            {
+            {	
                 variantToAny( &result, any, elemType, sal_False);
                 // copy the converted VARIANT, that is a Sequence to the Sequence
                 uno_Sequence * p_unoSeq= *(uno_Sequence**)any.getValue();
@@ -2100,7 +2100,7 @@ void UnoConversionUtilities<T>::dispatchExObject2Sequence( const VARIANTARG* pva
                 memcpy( pDest, &p_unoSeq, nelementSize);
                 osl_incrementInterlockedCount( &p_unoSeq->nRefCount);
             }
-            else // Element type is no Sequence -> do one conversion
+            else // Element type is no Sequence -> do one conversion 
             {
                 variantToAny( &result, any, elemType, sal_False);
                 if( typeElement == typelib_TypeClass_ANY)
@@ -2122,7 +2122,7 @@ void UnoConversionUtilities<T>::dispatchExObject2Sequence( const VARIANTARG* pva
         anySeq.setValue( &p_uno_Seq, pDesc);
         uno_destructData( &p_uno_Seq, pDesc, cpp_release);
         typelib_typedescription_release( pDesc);
-
+        
         if (bFail)
             throw BridgeRuntimeError(
                 OUSTR("[automation bridge] Conversion of ValueObject failed "));
@@ -2148,7 +2148,7 @@ void UnoConversionUtilities<T>::dispatchExObject2Sequence( const VARIANTARG* pva
 /* The argument unotype is the type that is expected by the currently called UNO function.
    For example: []long, [][]long. If the function calls itself recursively then the element type
    is passed on. For example a two dimensional SAFEARRAY of type VT_I4 is to be converted. Then
-   unotype has to be either void or [][]long. When the function calls itself recursivly then
+   unotype has to be either void or [][]long. When the function calls itself recursivly then 
    it passes the element type which is []long.
 */
 template<class T>
@@ -2164,14 +2164,14 @@ Sequence<Any> UnoConversionUtilities<T>::createOleArrayWrapperOfDim(SAFEARRAY* p
     SafeArrayGetUBound(pArray, actDim, &uBound);
     nCountElements= uBound - lBound +1;
 
-    Sequence<Any>   anySeq(nCountElements);
-    Any*            pUnoArray = anySeq.getArray();
-
+    Sequence<Any> 	anySeq(nCountElements);
+    Any* 			pUnoArray = anySeq.getArray();
+            
     for (index[actDim - 1] = lBound; index[actDim - 1] <= uBound; index[actDim - 1]++)
     {
         if (actDim > 1 )
         {
-            Sequence<Any> element = createOleArrayWrapperOfDim(pArray, dimCount,
+            Sequence<Any> element = createOleArrayWrapperOfDim(pArray, dimCount, 
                 actDim - 1, index, type, getElementTypeOfSequence(unotype));
 
             pUnoArray[index[actDim - 1] - lBound].setValue(&element, getCppuType(&element));
@@ -2179,7 +2179,7 @@ Sequence<Any> UnoConversionUtilities<T>::createOleArrayWrapperOfDim(SAFEARRAY* p
         else
         {
             VARIANT variant;
-
+            
             VariantInit(&variant);
 
             V_VT(&variant) = type;
@@ -2236,18 +2236,18 @@ Sequence<Any> UnoConversionUtilities<T>::createOleArrayWrapperOfDim(SAFEARRAY* p
                     break;
                 default:
                     break;
-            }
+            }			
 
             if( unotype.getTypeClass() == TypeClass_VOID)
                 // the function was called without specifying the destination type
                 variantToAny(&variant, pUnoArray[index[actDim - 1] - lBound], sal_False);
             else
-                variantToAny(&variant, pUnoArray[index[actDim - 1] - lBound],
+                variantToAny(&variant, pUnoArray[index[actDim - 1] - lBound], 
                     getElementTypeOfSequence(unotype), sal_False);
 
             VariantClear(&variant);
         }
-    }
+    }	
     return anySeq;
 }
 
@@ -2280,12 +2280,12 @@ Sequence<Any> UnoConversionUtilities<T>::createOleArrayWrapper(SAFEARRAY* pArray
         for (unsigned int i = 0; i < dim; i++)
         {
             index[i] = 0;
-        }
-
-        ret = createOleArrayWrapperOfDim(pArray, dim, dim, index, type, unoType);
+        }		
+        
+        ret	= createOleArrayWrapperOfDim(pArray, dim, dim, index, type, unoType);		
     }
-
-    return ret;
+        
+    return ret;	
 }
 
 // If an VARIANT has the type VT_DISPATCH it can either be an JScript Array
@@ -2303,15 +2303,15 @@ sal_Bool UnoConversionUtilities<T>::isJScriptArray(const VARIANT* rvar)
     DISPID id;
     if ( rvar->vt == VT_DISPATCH && rvar->pdispVal )
     {
-        hr= rvar->pdispVal->GetIDsOfNames( IID_NULL, &sindex, 1,
+        hr= rvar->pdispVal->GetIDsOfNames( IID_NULL, &sindex, 1, 
             LOCALE_USER_DEFAULT, &id);
-
+    
         if( SUCCEEDED ( hr) )
             return sal_True;
     }
 
     return sal_False;
-}
+}	
 
 template<class T>
 VARTYPE UnoConversionUtilities<T>::mapTypeClassToVartype( TypeClass type)
@@ -2331,7 +2331,7 @@ VARTYPE UnoConversionUtilities<T>::mapTypeClassToVartype( TypeClass type)
         break;
     case TypeClass_BOOLEAN: ret= VT_BOOL;
         break;
-    case TypeClass_CHAR: ret= VT_I2;
+    case TypeClass_CHAR: ret= VT_I2; 
         break;
     case TypeClass_STRING: ret= VT_BSTR;
         break;
@@ -2365,13 +2365,13 @@ Sequence<Type> UnoConversionUtilities<T>::getImplementedInterfaces(IUnknown* pUn
         CComVariant var;
         HRESULT hr= S_OK;
         // There are two different property names possible.
-        if( FAILED( hr= disp.GetPropertyByName( SUPPORTED_INTERFACES_PROP, &var)))
+        if(	FAILED( hr= disp.GetPropertyByName( SUPPORTED_INTERFACES_PROP, &var)))
         {
             hr= disp.GetPropertyByName( SUPPORTED_INTERFACES_PROP2, &var);
         }
         if (SUCCEEDED( hr))
         {
-            // we exspect an array( SafeArray or IDispatch) of Strings.
+            // we exspect an array( SafeArray or IDispatch) of Strings. 
             Any anyNames;
             variantToAny( &var, anyNames, getCppuType( (Sequence<Any>*) 0));
             Sequence<Any> seqAny;
@@ -2409,12 +2409,12 @@ Reference<XTypeConverter> UnoConversionUtilities<T>::getTypeConverter()
 // This function tries to the change the type of a value (contained in the Any)
 // to the smallest possible that can hold the value. This is actually done only
 // for types of VT_I4 (see o2u_variantToAny). The reason is the following:
-// JavaScript passes integer values always as VT_I4. If there is a parameter or
+// JavaScript passes integer values always as VT_I4. If there is a parameter or 
 // property of type any then the bridge converts the any's content according
 // to "o2u_variantToAny". Because the VARTYPE is VT_I4 the value would be converted
 // to TypeClass_LONG. Say the method XPropertySet::setPropertyValue( string name, any value)
-// would be called on an object and the property actually is of TypeClass_SHORT.
-// After conversion of the VARIANT parameter the Any would contain type
+// would be called on an object and the property actually is of TypeClass_SHORT. 
+// After conversion of the VARIANT parameter the Any would contain type 
 // TypeClass_LONG. Because the corereflection does not cast from long to short
 // the "setPropertValue" would fail as the value has not the right type.
 
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index cae9ecb5caa3..9cd131487dc4 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ hash_map<sal_uInt32, WeakReference<XInterface> > UnoObjToWrapperMap;
 static sal_Bool writeBackOutParameter(VARIANTARG* pDest, VARIANT* pSource);
 static sal_Bool writeBackOutParameter2( VARIANTARG* pDest, VARIANT* pSource);
 static HRESULT mapCannotConvertException( CannotConvertException e, unsigned int * puArgErr);
-
+    
 
 /* Does not throw any exceptions.
    Param pInfo can be NULL.
@@ -108,7 +108,7 @@ static void writeExcepinfo(EXCEPINFO * pInfo, const OUString& message)
 /*****************************************************************************
 
     class implementation: InterfaceOleWrapper_Impl
-
+    
 *****************************************************************************/
 InterfaceOleWrapper_Impl::InterfaceOleWrapper_Impl( Reference<XMultiServiceFactory>& xFactory,
                                                     sal_uInt8 unoWrapperClass, sal_uInt8 comWrapperClass):
@@ -127,9 +127,9 @@ InterfaceOleWrapper_Impl::~InterfaceOleWrapper_Impl()
 #if OSL_DEBUG_LEVEL > 0
     fprintf(stderr,"[automation bridge] UnoObjToWrapperMap  contains: %i \n",
             UnoObjToWrapperMap.size());
-#endif
-
-}
+#endif     
+    
+}	
 
 STDMETHODIMP InterfaceOleWrapper_Impl::QueryInterface(REFIID riid, LPVOID FAR * ppv)
 {
@@ -142,7 +142,7 @@ STDMETHODIMP InterfaceOleWrapper_Impl::QueryInterface(REFIID riid, LPVOID FAR *
     {
         AddRef();
         *ppv = (IUnknown*) (IDispatch*) this;
-    }
+    } 
     else if (IsEqualIID(riid, IID_IDispatch))
     {
         AddRef();
@@ -156,7 +156,7 @@ STDMETHODIMP InterfaceOleWrapper_Impl::QueryInterface(REFIID riid, LPVOID FAR *
     else
         ret= E_NOINTERFACE;
     return ret;
-}
+}	
 
 STDMETHODIMP_(ULONG) InterfaceOleWrapper_Impl::AddRef()
 {
@@ -164,14 +164,14 @@ STDMETHODIMP_(ULONG) InterfaceOleWrapper_Impl::AddRef()
     // does not need to guard because one should not rely on the return value of
     // AddRef anyway
     return m_refCount;
-}
+}	
 
 STDMETHODIMP_(ULONG) InterfaceOleWrapper_Impl::Release()
 {
     ULONG n= m_refCount;
     release();
     return n - 1;
-}
+}	
 
 // IUnoObjectWrapper --------------------------------------------------------
 STDMETHODIMP InterfaceOleWrapper_Impl::getWrapperXInterface( Reference<XInterface>* pXInt)
@@ -206,17 +206,17 @@ STDMETHODIMP  InterfaceOleWrapper_Impl::getOriginalUnoStruct( Any * pStruct)
 STDMETHODIMP InterfaceOleWrapper_Impl::GetTypeInfoCount( unsigned int * /*pctinfo*/ )
 {
     return E_NOTIMPL ;
-}
+}	
 
 STDMETHODIMP InterfaceOleWrapper_Impl::GetTypeInfo(unsigned int /*itinfo*/, LCID /*lcid*/, ITypeInfo ** /*pptinfo*/)
 {
     return E_NOTIMPL;
-}
+}	
 
-STDMETHODIMP InterfaceOleWrapper_Impl::GetIDsOfNames(REFIID /*riid*/,
-                                                     OLECHAR ** rgszNames,
+STDMETHODIMP InterfaceOleWrapper_Impl::GetIDsOfNames(REFIID /*riid*/, 
+                                                     OLECHAR ** rgszNames, 
                                                      unsigned int cNames,
-                                                     LCID /*lcid*/,
+                                                     LCID /*lcid*/, 
                                                      DISPID * rgdispid )
 {
     HRESULT ret = DISP_E_UNKNOWNNAME;
@@ -227,7 +227,7 @@ STDMETHODIMP InterfaceOleWrapper_Impl::GetIDsOfNames(REFIID /*riid*/,
             return E_POINTER;
 
         // ----------------------------------------
-        if( ! _wcsicmp( *rgszNames, JSCRIPT_VALUE_FUNC) ||
+        if( ! _wcsicmp( *rgszNames, JSCRIPT_VALUE_FUNC) || 
             ! _wcsicmp( *rgszNames, BRIDGE_VALUE_FUNC))
         {
             *rgdispid= DISPID_JSCRIPT_VALUE_FUNC;
@@ -250,46 +250,46 @@ STDMETHODIMP InterfaceOleWrapper_Impl::GetIDsOfNames(REFIID /*riid*/,
         {
             OUString name(reinterpret_cast<const sal_Unicode*>(rgszNames[0]));
             NameToIdMap::iterator iter = m_nameToDispIdMap.find(name);
-
+            
             if (iter == m_nameToDispIdMap.end())
             {
                 OUString exactName;
-
+                
                 if (m_xExactName.is())
                 {
                     exactName = m_xExactName->getExactName(name);
                 }
                 else
-                {
+                {    
                     exactName = name;
                 }
-
+                
                 MemberInfo d(0, exactName);
-
+                
                 if (m_xInvocation->hasProperty(exactName))
                 {
-                    d.flags |= DISPATCH_PROPERTYGET;
+                    d.flags |= DISPATCH_PROPERTYGET;			
                     d.flags |= DISPATCH_PROPERTYPUT;
                     d.flags |= DISPATCH_PROPERTYPUTREF;
                 }
-
+                
                 if (m_xInvocation->hasMethod(exactName))
                 {
-                    d.flags |= DISPATCH_METHOD;
+                    d.flags |= DISPATCH_METHOD;			
                 }
-
+                
                 if (d.flags != 0)
                 {
                     m_MemberInfos.push_back(d);
                     iter = m_nameToDispIdMap.insert(NameToIdMap::value_type(exactName, (DISPID)m_MemberInfos.size())).first;
-
+                    
                     if (exactName != name)
                     {
                         iter = m_nameToDispIdMap.insert(NameToIdMap::value_type(name, (DISPID)m_MemberInfos.size())).first;
                     }
-                }
+                }		
             }
-
+        
             if (iter == m_nameToDispIdMap.end())
             {
                 ret = DISP_E_UNKNOWNNAME;
@@ -299,7 +299,7 @@ STDMETHODIMP InterfaceOleWrapper_Impl::GetIDsOfNames(REFIID /*riid*/,
                 *rgdispid = (*iter).second;
                 ret = S_OK;
             }
-        }
+        }	
     }
     catch(BridgeRuntimeError& )
     {
@@ -315,12 +315,12 @@ STDMETHODIMP InterfaceOleWrapper_Impl::GetIDsOfNames(REFIID /*riid*/,
     }
 
     return ret;
-}
-
+}	
+    
 // "convertDispparamsArgs" converts VARIANTS to their respecting Any counterparts
-// The parameters "id", "wFlags" and "pdispparams" equal those as used in
-// IDispatch::Invoke. The function handles special JavaScript
-// cases where a VARIANT of type VT_DISPATCH is ambiguous and could represent
+// The parameters "id", "wFlags" and "pdispparams" equal those as used in 
+// IDispatch::Invoke. The function handles special JavaScript 
+// cases where a VARIANT of type VT_DISPATCH is ambiguous and could represent 
 // an object, array ( JavaScript Array object), out parameter and in/out ( JavaScript Array object)
 //  parameter (JavaScript Array object)
 // Because all those VT_DISPATCH objects need a different conversion
@@ -329,10 +329,10 @@ STDMETHODIMP InterfaceOleWrapper_Impl::GetIDsOfNames(REFIID /*riid*/,
 
 // A. Type Information
 // -----------------------------------------------------------------------------
-// With the help of type information the kind of parameter can be exactly determined
-// and an appropriate conversion can be choosen. A problem arises if a method expects
-// an Any. Then the type info does not tell what the type of the value, that is kept
-// by the any, should be. In this situation the decision wheter the param is a
+// With the help of type information the kind of parameter can be exactly determined 
+// and an appropriate conversion can be choosen. A problem arises if a method expects 
+// an Any. Then the type info does not tell what the type of the value, that is kept 
+// by the any, should be. In this situation the decision wheter the param is a 
 // sequence or an object is made upon the fact if the object has a property "0"
 // ( see function "isJScriptArray"). Since this is unsafe it is recommended to use
 // the JScript value objects within a JScript script on such an occasion.
@@ -340,18 +340,18 @@ STDMETHODIMP InterfaceOleWrapper_Impl::GetIDsOfNames(REFIID /*riid*/,
 // B. JavaScript Value Object ( class JScriptValue )
 // -----------------------------------------------------------------------------
 // A JScriptValue (ValueObject) object is a COM object in that it implements IDispatch and the
-// IJScriptValue object interface. Such objects are provided by all UNO wrapper
+// IJScriptValue object interface. Such objects are provided by all UNO wrapper 
 // objects used within a JScript script. To obtain an instance one has to call
 // "_GetValueObject() or Bridge_GetValueObject()" on an UNO wrapper object (class InterfaceOleWrapper_Impl).
-// A value object is appropriately initialized within the script and passed as
+// A value object is appropriately initialized within the script and passed as 
 // parameter to an UNO object method or property. The convertDispparamsArgs function
-// can easily find out that a param is such an object by queriing for the
+// can easily find out that a param is such an object by queriing for the 
 // IJScriptValue interface. By this interface one the type and kind ( out, in/out)
-// can be determined and the right conversion can be applied.
+// can be determined and the right conversion can be applied. 
 // Using ValueObjects we spare us the effort of aquiring and examining type information
 // in order to figure out what the an IDispatch parameter is meant for.
 
-// Normal JScript object parameter can be mixed with JScriptValue object. If an
+// Normal JScript object parameter can be mixed with JScriptValue object. If an 
 // VARIANT contains an VT_DISPATCH that is no JScriptValue than the type information
 // is used to find out about the reqired type.
 void InterfaceOleWrapper_Impl::convertDispparamsArgs(DISPID id,
@@ -359,11 +359,11 @@ void InterfaceOleWrapper_Impl::convertDispparamsArgs(DISPID id,
 {
     HRESULT hr= S_OK;
     sal_Int32 countArgs= pdispparams->cArgs;
-    if( countArgs == 0)
+    if( countArgs == 0) 
         return;
-
+    
     rSeq.realloc( countArgs);
-    Any*    pParams = rSeq.getArray();
+    Any*	pParams = rSeq.getArray();
 
     Any anyParam;
 
@@ -373,14 +373,14 @@ void InterfaceOleWrapper_Impl::convertDispparamsArgs(DISPID id,
         throw BridgeRuntimeError(
             OUSTR("[automation bridge]InterfaceOleWrapper_Impl::convertDispparamsArgs \n"
                   "Could not obtain type information for current call."));
-
+    
     for (int i = 0; i < countArgs; i++)
     {
         if (info.eMemberType == MemberType_METHOD &&
             info.aParamModes[ countArgs - i -1 ]  == ParamMode_OUT)
             continue;
 
-         if(convertValueObject( & pdispparams->rgvarg[i], anyParam))
+         if(convertValueObject( & pdispparams->rgvarg[i], anyParam)) 
          { //a param is a ValueObject and could be converted
             pParams[countArgs - (i + 1)] = anyParam;
              continue;
@@ -389,13 +389,13 @@ void InterfaceOleWrapper_Impl::convertDispparamsArgs(DISPID id,
         // If the param is an out, in/out parameter in
         // JScript (Array object, with value at index 0) then we
         // extract Array[0] and put the value into varParam. At the end of the loop varParam
-        // is converted if it contains a value otherwise the VARIANT from
+        // is converted if it contains a value otherwise the VARIANT from 
         // DISPPARAMS is converted.
         CComVariant varParam;
 
         // Check for JScript out and in/out paramsobjects (VT_DISPATCH).
         // To find them out we use typeinformation of the function being called.
-        if( pdispparams->rgvarg[i].vt == VT_DISPATCH )
+        if( pdispparams->rgvarg[i].vt == VT_DISPATCH )			
         {
             if( info.eMemberType == MemberType_METHOD && info.aParamModes[ countArgs - i -1 ]  == ParamMode_INOUT)
             {
@@ -404,12 +404,12 @@ void InterfaceOleWrapper_Impl::convertDispparamsArgs(DISPID id,
                 // Array object.
                 // Get the IN-param at index "0"
                 IDispatch* pdisp= pdispparams->rgvarg[i].pdispVal;
-
+                
                 OLECHAR* sindex= L"0";
                 DISPID id;
                 DISPPARAMS noParams= {0,0,0,0};
                 if(SUCCEEDED( hr= pdisp->GetIDsOfNames( IID_NULL, &sindex, 1, LOCALE_USER_DEFAULT, &id)))
-                    hr= pdisp->Invoke( id, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_PROPERTYGET,
+                    hr= pdisp->Invoke( id, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_PROPERTYGET, 
                                        & noParams, & varParam, NULL, NULL);
                 if( FAILED( hr))
                 {
@@ -431,27 +431,27 @@ void InterfaceOleWrapper_Impl::convertDispparamsArgs(DISPID id,
             variantToAny( & varParam, anyParam, info.aType);
         else
             OSL_ASSERT(0);
-
+        
         pParams[countArgs - (i + 1)]= anyParam;
     }// end for / iterating over all parameters
 }
 
 sal_Bool  InterfaceOleWrapper_Impl::getInvocationInfoForCall( DISPID id, InvocationInfo& info)
 {
-    sal_Bool bTypesAvailable= sal_False;
-
+    sal_Bool bTypesAvailable= sal_False; 
+    
     if( !m_xInvocation.is() )return false;
     Reference<XInvocation2> inv2( m_xInvocation, UNO_QUERY);
     if( inv2.is())
     {
-        // We need the name of the property or method to get its type information.
+        // We need the name of the property or method to get its type information. 
         // The name can be identified through the param "id"
-        // that is kept as value in the map m_nameToDispIdMap.
-        // Proplem: the Windows JScript engine sometimes changes small letters to capital
+        // that is kept as value in the map m_nameToDispIdMap. 
+        // Proplem: the Windows JScript engine sometimes changes small letters to capital 
         // letters as happens in xidlclass_obj.createObject( var) // in JScript.
         // IDispatch::GetIdsOfNames is then called with "CreateObject" !!!
         // m_nameToDispIdMap can contain several names for one DISPID but only one is
-        // the exact one. If there's no m_xExactName and therefore no exact name then
+        // the exact one. If there's no m_xExactName and therefore no exact name then 
         // there's only one entry in the map.
         typedef NameToIdMap::const_iterator cit;
         OUString sMemberName;
@@ -463,7 +463,7 @@ sal_Bool  InterfaceOleWrapper_Impl::getInvocationInfoForCall( DISPID id, Invocat
                 sMemberName= (*ci1).first;
                 break;
             }
-        }
+        }        
         // Get information for the current call ( property or method).
         // There could be similar names which only differ in the cases
         // of letters. First we assume that the name which was passed into
@@ -478,7 +478,7 @@ sal_Bool  InterfaceOleWrapper_Impl::getInvocationInfoForCall( DISPID id, Invocat
         {
             validInfo= sal_False;
         }
-
+        
         if( ! validInfo)
         {
             invInfo= inv2->getInfoForName( sMemberName, sal_True);
@@ -496,20 +496,20 @@ sal_Bool  InterfaceOleWrapper_Impl::getInvocationInfoForCall( DISPID id, Invocat
 // If sourceModelType is UNO than any UNO interface implemented by InterfaceOleWrapper_Impl
 // can bridged to IDispatch ( if destModelType == OLE). The IDispatch is
 // implemented by this class.
-Any SAL_CALL InterfaceOleWrapper_Impl::createBridge(const Any& modelDepObject,
-                                const Sequence<sal_Int8>& /*ProcessId*/,
-                                sal_Int16 sourceModelType,
-                                sal_Int16 destModelType)
+Any SAL_CALL InterfaceOleWrapper_Impl::createBridge(const Any& modelDepObject, 
+                                const Sequence<sal_Int8>& /*ProcessId*/, 
+                                sal_Int16 sourceModelType, 
+                                sal_Int16 destModelType) 
             throw (IllegalArgumentException, RuntimeException)
 {
 
     Any retAny;
-    if( sourceModelType == UNO && destModelType == OLE &&
+    if( sourceModelType == UNO && destModelType == OLE && 
         modelDepObject.getValueTypeClass() == TypeClass_INTERFACE )
     {
         Reference<XInterface> xInt;
         if( modelDepObject >>= xInt )
-        {
+        {	
             if( xInt == Reference<XInterface>( static_cast<XWeak*>( this), UNO_QUERY))
             {
                 VARIANT *pVar= (VARIANT*)CoTaskMemAlloc( sizeof( VARIANT));
@@ -530,7 +530,7 @@ Any SAL_CALL InterfaceOleWrapper_Impl::createBridge(const Any& modelDepObject,
 
 
 // XInitialization --------------------------------------------------
-void SAL_CALL InterfaceOleWrapper_Impl::initialize( const Sequence< Any >& aArguments )
+void SAL_CALL InterfaceOleWrapper_Impl::initialize( const Sequence< Any >& aArguments ) 
         throw(Exception, RuntimeException)
 {
     switch( aArguments.getLength() )
@@ -558,7 +558,7 @@ Reference< XInterface > InterfaceOleWrapper_Impl::createUnoWrapperInstance()
 
 Reference<XInterface> InterfaceOleWrapper_Impl::createComWrapperInstance()
 {
-    Reference<XWeak> xWeak= static_cast<XWeak*>( new IUnknownWrapper_Impl(
+    Reference<XWeak> xWeak= static_cast<XWeak*>( new IUnknownWrapper_Impl( 
                             m_smgr, m_nUnoWrapperClass, m_nComWrapperClass));
     return Reference<XInterface>( xWeak, UNO_QUERY);
 }
@@ -571,7 +571,7 @@ bool getType( const BSTR name, Type & type)
 {
     Type retType;
     bool ret = false;
-    typelib_TypeDescription * pDesc= NULL;
+    typelib_TypeDescription	* pDesc= NULL;
     OUString str( reinterpret_cast<const sal_Unicode*>(name));
     typelib_typedescription_getByName( &pDesc, str.pData );
     if( pDesc)
@@ -585,12 +585,12 @@ bool getType( const BSTR name, Type & type)
 
 static sal_Bool writeBackOutParameter2( VARIANTARG* pDest, VARIANT* pSource)
 {
-    sal_Bool ret = sal_False;
+    sal_Bool ret = sal_False;	
     HRESULT hr;
 
     // Handle JScriptValue objects and JScript out params ( Array object )
     CComVariant varDest( *pDest);
-
+    
     if( SUCCEEDED( varDest.ChangeType(VT_DISPATCH)))
     {
         CComPtr<IDispatch> spDispDest(varDest.pdispVal);
@@ -604,9 +604,9 @@ static sal_Bool writeBackOutParameter2( VARIANTARG* pDest, VARIANT* pSource)
         if (spValueDest)
         {
             VARIANT_BOOL varBool= VARIANT_FALSE;
-            if( SUCCEEDED( hr= spValueDest->IsOutParam( &varBool) )
-                && varBool == VARIANT_TRUE  ||
-                SUCCEEDED(hr= spValueDest->IsInOutParam( &varBool) )
+            if( SUCCEEDED( hr= spValueDest->IsOutParam( &varBool) ) 
+                && varBool == VARIANT_TRUE  || 
+                SUCCEEDED(hr= spValueDest->IsInOutParam( &varBool) ) 
                 && varBool == VARIANT_TRUE )
             {
                 if( SUCCEEDED( spValueDest->Set( CComVariant(), *pSource)))
@@ -635,7 +635,7 @@ static sal_Bool writeBackOutParameter2( VARIANTARG* pDest, VARIANT* pSource)
                     DISPID dispidPut = DISPID_PROPERTYPUT;
                     dispparams.rgdispidNamedArgs = &dispidPut;
 
-                    if (pSource->vt == VT_UNKNOWN || pSource->vt == VT_DISPATCH ||
+                    if (pSource->vt == VT_UNKNOWN || pSource->vt == VT_DISPATCH || 
                         (pSource->vt & VT_ARRAY) || (pSource->vt & VT_BYREF))
                         hr = spDispEx->InvokeEx(dwDispID, LOCALE_USER_DEFAULT, DISPATCH_PROPERTYPUTREF,
                                                 &dispparams, NULL, NULL, NULL);
@@ -651,7 +651,7 @@ static sal_Bool writeBackOutParameter2( VARIANTARG* pDest, VARIANT* pSource)
             ret= writeBackOutParameter( pDest, pSource);
     }
     else // The param can't be a JScript out-parameter ( an Array object), it could be a VBScript
-    {   // param. The function checks itself for correct VBScript params
+    {	// param. The function checks itself for correct VBScript params
         ret= writeBackOutParameter( pDest, pSource);
     }
     return ret;
@@ -663,13 +663,13 @@ static sal_Bool writeBackOutParameter2( VARIANTARG* pDest, VARIANT* pSource)
 static sal_Bool writeBackOutParameter(VARIANTARG* pDest, VARIANT* pSource)
 {
     HRESULT hr;
-    sal_Bool ret = FALSE;
+    sal_Bool ret = FALSE;	
     // Out parameter must be VT_BYREF
     if ((V_VT(pDest) & VT_BYREF) != 0 )
     {
         VARTYPE oleTypeFlags = V_VT(pSource);
 
-        // if caller accept VARIANT as out parameter, any value must be converted
+        // if caller accept VARIANT as out parameter, any value must be converted 
         if (V_VT(pDest) == (VT_VARIANT | VT_BYREF))
         {
             // When the user provides a VARIANT rather then a concrete type
@@ -677,11 +677,11 @@ static sal_Bool writeBackOutParameter(VARIANTARG* pDest, VARIANT* pSource)
             // VT_DISPATCH, VT_UNKNOWN, VT_ARRAY, VT_BSTR in the VARIANT that
             // is contained in pDest are released by VariantCopy
             VariantCopy(V_VARIANTREF(pDest), pSource);
-            ret = sal_True;
+            ret	= sal_True;
         }
-        else
+        else 
         {
-            // variantarg and variant must have same type
+            // variantarg and variant must have same type	
               if ((V_VT(pDest) & oleTypeFlags) == oleTypeFlags)
             {
                 if ((oleTypeFlags & VT_ARRAY) != 0)
@@ -693,7 +693,7 @@ static sal_Bool writeBackOutParameter(VARIANTARG* pDest, VARIANT* pSource)
                         // Out Param
                         hr= SafeArrayCopy(V_ARRAY(pSource), V_ARRAYREF(pDest)) == NOERROR;
                     if( SUCCEEDED( hr))
-                        ret = sal_True;
+                        ret	= sal_True;
                 }
                 else
                 {
@@ -703,88 +703,88 @@ static sal_Bool writeBackOutParameter(VARIANTARG* pDest, VARIANT* pSource)
                     case VT_I2:
                     {
                         *V_I2REF(pDest) = V_I2(pSource);
-                        ret = sal_True;
+                        ret	= sal_True;
                         break;
                     }
                     case VT_I4:
                         *V_I4REF(pDest) = V_I4(pSource);
-                        ret = sal_True;
+                        ret	= sal_True;
                         break;
                     case VT_R4:
                         *V_R4REF(pDest) = V_R4(pSource);
-                        ret = sal_True;
+                        ret	= sal_True;
                         break;
                     case VT_R8:
                         *V_R8REF(pDest) = V_R8(pSource);
-                        ret = sal_True;
+                        ret	= sal_True;
                         break;
                     case VT_CY:
                         *V_CYREF(pDest) = V_CY(pSource);
-                        ret = sal_True;
+                        ret	= sal_True;
                         break;
                     case VT_DATE:
                         *V_DATEREF(pDest) = V_DATE(pSource);
-                        ret = sal_True;
+                        ret	= sal_True;
                         break;
                     case VT_BSTR:
                         SysFreeString( *pDest->pbstrVal);
-
+                    
                         *V_BSTRREF(pDest) = SysAllocString(V_BSTR(pSource));
-                        ret = sal_True;
+                        ret	= sal_True;
                         break;
                     case VT_DISPATCH:
-                        if (*V_DISPATCHREF(pDest) != NULL)
+                        if (*V_DISPATCHREF(pDest) != NULL) 
                             (*V_DISPATCHREF(pDest))->Release();
-
+                    
                         *V_DISPATCHREF(pDest) = V_DISPATCH(pSource);
-
-                        if (*V_DISPATCHREF(pDest) != NULL)
+                    
+                        if (*V_DISPATCHREF(pDest) != NULL) 
                             (*V_DISPATCHREF(pDest))->AddRef();
-
-                        ret = sal_True;
+                    
+                        ret	= sal_True;
                         break;
                     case VT_ERROR:
                         *V_ERRORREF(pDest) = V_ERROR(pSource);
-                        ret = sal_True;
+                        ret	= sal_True;
                         break;
                     case VT_BOOL:
                         *V_BOOLREF(pDest) = V_BOOL(pSource);
-                        ret = sal_True;
+                        ret	= sal_True;
                         break;
                     case VT_UNKNOWN:
-                        if (*V_UNKNOWNREF(pDest) != NULL)
+                        if (*V_UNKNOWNREF(pDest) != NULL) 
                             (*V_UNKNOWNREF(pDest))->Release();
-
+                    
                         *V_UNKNOWNREF(pDest) = V_UNKNOWN(pSource);
-
-                        if (*V_UNKNOWNREF(pDest) != NULL)
+                    
+                        if (*V_UNKNOWNREF(pDest) != NULL) 
                             (*V_UNKNOWNREF(pDest))->AddRef();
-
-                        ret = sal_True;
+                    
+                        ret	= sal_True;
                         break;
                     case VT_I1:
                         *V_I1REF(pDest) = V_I1(pSource);
-                        ret = sal_True;
+                        ret	= sal_True;
                         break;
                     case VT_UI1:
                         *V_UI1REF(pDest) = V_UI1(pSource);
-                        ret = sal_True;
+                        ret	= sal_True;
                         break;
                     case VT_UI2:
                         *V_UI2REF(pDest) = V_UI2(pSource);
-                        ret = sal_True;
+                        ret	= sal_True;
                         break;
                     case VT_UI4:
                         *V_UI4REF(pDest) = V_UI4(pSource);
-                        ret = sal_True;
+                        ret	= sal_True;
                         break;
                     case VT_INT:
                         *V_INTREF(pDest) = V_INT(pSource);
-                        ret = sal_True;
+                        ret	= sal_True;
                         break;
                     case VT_UINT:
                         *V_UINTREF(pDest) = V_UINT(pSource);
-                        ret = sal_True;
+                        ret	= sal_True;
                         break;
                     case VT_DECIMAL:
                         memcpy(pDest->pdecVal, pSource, sizeof(DECIMAL));
@@ -816,14 +816,14 @@ static sal_Bool writeBackOutParameter(VARIANTARG* pDest, VARIANT* pSource)
         }
     }
     return ret;
-}
+}		
 
-STDMETHODIMP InterfaceOleWrapper_Impl::Invoke(DISPID dispidMember,
-                                              REFIID /*riid*/,
-                                              LCID /*lcid*/,
+STDMETHODIMP InterfaceOleWrapper_Impl::Invoke(DISPID dispidMember, 
+                                              REFIID /*riid*/, 
+                                              LCID /*lcid*/, 
                                               unsigned short wFlags,
-                                               DISPPARAMS * pdispparams,
-                                              VARIANT * pvarResult,
+                                               DISPPARAMS * pdispparams, 
+                                              VARIANT * pvarResult, 
                                               EXCEPINFO * pexcepinfo,
                                                unsigned int * puArgErr )
 {
@@ -841,33 +841,33 @@ STDMETHODIMP InterfaceOleWrapper_Impl::Invoke(DISPID dispidMember,
         {
             MemberInfo d = m_MemberInfos[dispidMember - 1];
             DWORD flags = wFlags & d.flags;
-
+            
             if (flags != 0)
             {
                 if ((flags & DISPATCH_METHOD) != 0)
                 {
-                    if (pdispparams->cNamedArgs > 0)
-                        ret = DISP_E_NONAMEDARGS;
+                    if (pdispparams->cNamedArgs	> 0)
+                        ret = DISP_E_NONAMEDARGS;					
                     else
                     {
                         Sequence<Any> params;
-
+                    
                         convertDispparamsArgs(dispidMember, wFlags, pdispparams , params );
-
-                        ret= doInvoke(pdispparams, pvarResult,
+                        
+                        ret= doInvoke(pdispparams, pvarResult, 
                                       pexcepinfo, puArgErr, d.name, params);
                     }
                 }
                 else if ((flags & DISPATCH_PROPERTYGET) != 0)
                 {
-                    ret=  doGetProperty( pdispparams, pvarResult,
+                    ret=  doGetProperty( pdispparams, pvarResult, 
                                          pexcepinfo, d.name);
                 }
                 else if ((flags & DISPATCH_PROPERTYPUT || flags & DISPATCH_PROPERTYPUTREF) != 0)
                 {
                     if (pdispparams->cArgs != 1)
                         ret = DISP_E_BADPARAMCOUNT;
-                    else
+                    else							
                     {
                         Sequence<Any> params;
                         convertDispparamsArgs(dispidMember, wFlags, pdispparams, params );
@@ -880,7 +880,7 @@ STDMETHODIMP InterfaceOleWrapper_Impl::Invoke(DISPID dispidMember,
             }
             else
                 ret= DISP_E_MEMBERNOTFOUND;
-        }
+        }	
         else
             ret = DISP_E_MEMBERNOTFOUND;
     }
@@ -898,59 +898,59 @@ STDMETHODIMP InterfaceOleWrapper_Impl::Invoke(DISPID dispidMember,
     }
     catch(...)
     {
-        OUString message= OUSTR("InterfaceOleWrapper_Impl::Invoke : \n"
+        OUString message= OUSTR("InterfaceOleWrapper_Impl::Invoke : \n" 
                                 "Unexpected exception");
         writeExcepinfo(pexcepinfo, message);
          ret = DISP_E_EXCEPTION;
     }
 
     return ret;
-}
+}												  
 
-HRESULT InterfaceOleWrapper_Impl::doInvoke( DISPPARAMS * pdispparams, VARIANT * pvarResult,
+HRESULT InterfaceOleWrapper_Impl::doInvoke( DISPPARAMS * pdispparams, VARIANT * pvarResult, 
                               EXCEPINFO * pexcepinfo, unsigned int * puArgErr, OUString& name, Sequence<Any>& params)
 {
 
-
+    
     HRESULT ret= S_OK;
     try
     {
-        Sequence<INT16>     outIndex;
-        Sequence<Any>   outParams;
-        Any                 returnValue;
-
-        if (pdispparams->cNamedArgs > 0)
-            return DISP_E_NONAMEDARGS;
+        Sequence<INT16> 	outIndex;
+        Sequence<Any> 	outParams;
+        Any 				returnValue;
+        
+        if (pdispparams->cNamedArgs	> 0)
+            return DISP_E_NONAMEDARGS;					
 
         // invoke method and take care of exceptions
-        returnValue = m_xInvocation->invoke(name,
+        returnValue = m_xInvocation->invoke(name, 
                                             params,
                                             outIndex,
-                                            outParams);
+                                            outParams);									
 
-        // try to write back out parameter
+        // try to write back out parameter						
         if (outIndex.getLength() > 0)
         {
             const INT16* pOutIndex = outIndex.getConstArray();
             const Any* pOutParams = outParams.getConstArray();
-
+            
             for (sal_Int32 i = 0; i < outIndex.getLength(); i++)
             {
                 CComVariant variant;
                 // Currently a Sequence is converted to an SafeArray of VARIANTs.
                 anyToVariant( &variant, pOutParams[i]);
-
+                
                 // out parameter need special handling if they are VT_DISPATCH
                 // and used in JScript
                 int outindex= pOutIndex[i];
-                writeBackOutParameter2(&(pdispparams->rgvarg[pdispparams->cArgs - 1 - outindex]),
-                                       &variant );
+                writeBackOutParameter2(&(pdispparams->rgvarg[pdispparams->cArgs - 1 - outindex]), 
+                                       &variant );                
             }
         }
-
+        
         // write back return value
-        if (pvarResult != NULL)
-            anyToVariant(pvarResult, returnValue);
+        if (pvarResult != NULL)   
+            anyToVariant(pvarResult, returnValue);            
     }
     catch(IllegalArgumentException & e) //XInvocation::invoke
     {
@@ -967,7 +967,7 @@ HRESULT InterfaceOleWrapper_Impl::doInvoke( DISPPARAMS * pdispparams, VARIANT *
         const Any& org = e.TargetException;
         Exception excTarget;
         org >>= excTarget;
-        OUString message=
+        OUString message= 
             org.getValueType().getTypeName() + OUSTR(": ") + excTarget.Message;
         writeExcepinfo(pexcepinfo, message);
         ret = DISP_E_EXCEPTION;
@@ -991,7 +991,7 @@ HRESULT InterfaceOleWrapper_Impl::doInvoke( DISPPARAMS * pdispparams, VARIANT *
     }
     catch( ... )
      {
-        OUString message= OUSTR("InterfaceOleWrapper_Impl::doInvoke : \n"
+        OUString message= OUSTR("InterfaceOleWrapper_Impl::doInvoke : \n" 
                                 "Unexpected exception");
         writeExcepinfo(pexcepinfo, message);
          ret = DISP_E_EXCEPTION;
@@ -999,7 +999,7 @@ HRESULT InterfaceOleWrapper_Impl::doInvoke( DISPPARAMS * pdispparams, VARIANT *
     return ret;
 }
 
-HRESULT InterfaceOleWrapper_Impl::doGetProperty( DISPPARAMS * /*pdispparams*/, VARIANT * pvarResult,
+HRESULT InterfaceOleWrapper_Impl::doGetProperty( DISPPARAMS * /*pdispparams*/, VARIANT * pvarResult, 
                                                 EXCEPINFO * pexcepinfo, OUString& name)
 {
     HRESULT ret= S_OK;
@@ -1030,7 +1030,7 @@ HRESULT InterfaceOleWrapper_Impl::doGetProperty( DISPPARAMS * /*pdispparams*/, V
     }
     catch( ... )
     {
-        OUString message= OUSTR("InterfaceOleWrapper_Impl::doInvoke : \n"
+        OUString message= OUSTR("InterfaceOleWrapper_Impl::doInvoke : \n" 
                                 "Unexpected exception");
         writeExcepinfo(pexcepinfo, message);
          ret = DISP_E_EXCEPTION;
@@ -1038,15 +1038,15 @@ HRESULT InterfaceOleWrapper_Impl::doGetProperty( DISPPARAMS * /*pdispparams*/, V
     return  ret;
 }
 
-HRESULT InterfaceOleWrapper_Impl::doSetProperty( DISPPARAMS * /*pdispparams*/, VARIANT * /*pvarResult*/,
+HRESULT InterfaceOleWrapper_Impl::doSetProperty( DISPPARAMS * /*pdispparams*/, VARIANT * /*pvarResult*/, 
                                         EXCEPINFO * pexcepinfo, unsigned int * puArgErr, OUString& name, Sequence<Any> params)
 {
     HRESULT ret= S_OK;
-
+    
     try
     {
         m_xInvocation->setValue( name, params.getConstArray()[0]);
-    }
+    }	
     catch(UnknownPropertyException )
     {
         ret = DISP_E_MEMBERNOTFOUND;
@@ -1060,7 +1060,7 @@ HRESULT InterfaceOleWrapper_Impl::doSetProperty( DISPPARAMS * /*pdispparams*/, V
         if (pexcepinfo != NULL)
         {
             Any org = e.TargetException;
-
+            
             pexcepinfo->wCode = UNO_2_OLE_EXCEPTIONCODE;
             pexcepinfo->bstrSource = SysAllocString(L"any ONE component");
             pexcepinfo->bstrDescription = SysAllocString(
@@ -1089,7 +1089,7 @@ HRESULT InterfaceOleWrapper_Impl::InvokeGeneral( DISPID dispidMember, unsigned s
             && m_defaultValueType != VT_EMPTY && pvarResult != NULL)
         {
             bHandled= sal_True;
-            if( m_defaultValueType == VT_DISPATCH)
+            if( m_defaultValueType == VT_DISPATCH)	
             {
                 pvarResult->vt= VT_DISPATCH;
                 pvarResult->pdispVal= static_cast<IDispatch*>( this);
@@ -1123,9 +1123,9 @@ HRESULT InterfaceOleWrapper_Impl::InvokeGeneral( DISPID dispidMember, unsigned s
         {
             bHandled= sal_True;
             sal_Bool bStruct= sal_False;
-
-
-            Reference<XInterface> xIntCore= m_smgr->createInstance( OUString::createFromAscii("com.sun.star.reflection.CoreReflection"));
+            
+            
+            Reference<XInterface> xIntCore=	m_smgr->createInstance( OUString::createFromAscii("com.sun.star.reflection.CoreReflection"));
             Reference<XIdlReflection> xRefl( xIntCore, UNO_QUERY);
             if( xRefl.is() )
             {
@@ -1140,7 +1140,7 @@ HRESULT InterfaceOleWrapper_Impl::InvokeGeneral( DISPID dispidMember, unsigned s
                         classStruct->createObject( anyStruct);
                         CComVariant var;
                         anyToVariant( &var, anyStruct );
-
+                        
                         if( var.vt == VT_DISPATCH)
                         {
                             VariantCopy( pvarResult, & var);
@@ -1148,7 +1148,7 @@ HRESULT InterfaceOleWrapper_Impl::InvokeGeneral( DISPID dispidMember, unsigned s
                         }
                     }
                 }
-            }
+            }	
             ret= bStruct == sal_True ? S_OK : DISP_E_EXCEPTION;
         }
         else if (dispidMember == DISPID_CREATE_TYPE_FUNC)
@@ -1162,7 +1162,7 @@ HRESULT InterfaceOleWrapper_Impl::InvokeGeneral( DISPID dispidMember, unsigned s
                 return DISP_E_BADPARAMCOUNT;
             if (FAILED( arg.ChangeType( VT_BSTR, &pdispparams->rgvarg[0])))
                 return DISP_E_BADVARTYPE;
-
+                
             //check if the provided name represents a valid type
             Type type;
             if (getType(arg.bstrVal, type) == false)
@@ -1195,7 +1195,7 @@ HRESULT InterfaceOleWrapper_Impl::InvokeGeneral( DISPID dispidMember, unsigned s
     }
     catch( ... )
      {
-        OUString message= OUSTR("InterfaceOleWrapper_Impl::InvokeGeneral : \n"
+        OUString message= OUSTR("InterfaceOleWrapper_Impl::InvokeGeneral : \n" 
                                 "Unexpected exception");
         writeExcepinfo(pexcepinfo, message);
          ret = DISP_E_EXCEPTION;
@@ -1208,12 +1208,12 @@ HRESULT InterfaceOleWrapper_Impl::InvokeGeneral( DISPID dispidMember, unsigned s
 
 STDMETHODIMP InterfaceOleWrapper_Impl::GetDispID(BSTR /*bstrName*/, DWORD /*grfdex*/, DISPID __RPC_FAR* /*pid*/)
 {
-    HRESULT ret = ResultFromScode(E_NOTIMPL);
+    HRESULT ret = ResultFromScode(E_NOTIMPL);	
 
     return ret;
 }
 
-STDMETHODIMP InterfaceOleWrapper_Impl::InvokeEx(
+STDMETHODIMP InterfaceOleWrapper_Impl::InvokeEx( 
     /* [in] */ DISPID /*id*/,
     /* [in] */ LCID /*lcid*/,
     /* [in] */ WORD /*wFlags*/,
@@ -1222,61 +1222,61 @@ STDMETHODIMP InterfaceOleWrapper_Impl::InvokeEx(
     /* [out] */ EXCEPINFO __RPC_FAR* /*pei*/,
     /* [unique][in] */ IServiceProvider __RPC_FAR* /*pspCaller*/)
 {
-    HRESULT ret = ResultFromScode(E_NOTIMPL);
+    HRESULT ret = ResultFromScode(E_NOTIMPL);	
 
     return ret;
 }
 
 
-STDMETHODIMP InterfaceOleWrapper_Impl::DeleteMemberByName(
+STDMETHODIMP InterfaceOleWrapper_Impl::DeleteMemberByName( 
     /* [in] */ BSTR /*bstr*/,
     /* [in] */ DWORD /*grfdex*/)
 {
-    HRESULT ret = ResultFromScode(E_NOTIMPL);
+    HRESULT ret = ResultFromScode(E_NOTIMPL);	
 
     return ret;
 }
 
 STDMETHODIMP InterfaceOleWrapper_Impl::DeleteMemberByDispID(DISPID /*id*/)
 {
-    HRESULT ret = ResultFromScode(E_NOTIMPL);
+    HRESULT ret = ResultFromScode(E_NOTIMPL);	
 
     return ret;
 }
 
-STDMETHODIMP InterfaceOleWrapper_Impl::GetMemberProperties(
+STDMETHODIMP InterfaceOleWrapper_Impl::GetMemberProperties( 
     /* [in] */ DISPID /*id*/,
     /* [in] */ DWORD /*grfdexFetch*/,
     /* [out] */ DWORD __RPC_FAR* /*pgrfdex*/)
 {
-    HRESULT ret = ResultFromScode(E_NOTIMPL);
+    HRESULT ret = ResultFromScode(E_NOTIMPL);	
 
     return ret;
 }
 
-STDMETHODIMP InterfaceOleWrapper_Impl::GetMemberName(
+STDMETHODIMP InterfaceOleWrapper_Impl::GetMemberName( 
     /* [in] */ DISPID /*id*/,
     /* [out] */ BSTR __RPC_FAR* /*pbstrName*/)
 {
-    HRESULT ret = ResultFromScode(E_NOTIMPL);
+    HRESULT ret = ResultFromScode(E_NOTIMPL);	
 
     return ret;
 }
 
-STDMETHODIMP InterfaceOleWrapper_Impl::GetNextDispID(
+STDMETHODIMP InterfaceOleWrapper_Impl::GetNextDispID( 
     /* [in] */ DWORD /*grfdex*/,
     /* [in] */ DISPID /*id*/,
     /* [out] */ DISPID __RPC_FAR* /*pid*/)
 {
-    HRESULT ret = ResultFromScode(E_NOTIMPL);
+    HRESULT ret = ResultFromScode(E_NOTIMPL);	
 
     return ret;
 }
 
-STDMETHODIMP InterfaceOleWrapper_Impl::GetNameSpaceParent(
+STDMETHODIMP InterfaceOleWrapper_Impl::GetNameSpaceParent( 
     /* [out] */ IUnknown __RPC_FAR *__RPC_FAR* /*ppunk*/)
 {
-    HRESULT ret = ResultFromScode(E_NOTIMPL);
+    HRESULT ret = ResultFromScode(E_NOTIMPL);	
 
     return ret;
 }
@@ -1366,27 +1366,27 @@ STDMETHODIMP  UnoObjectWrapperRemoteOpt::Invoke ( DISPID dispidMember, REFIID /*
                             puArgErr, bHandled);
         if( bHandled)
             return ret;
-
+        
         if ( dispidMember > 0  && m_xInvocation.is())
         {
-
+            
             IdToMemberInfoMap::iterator it_MemberInfo= m_idToMemberInfoMap.find( dispidMember);
             if( it_MemberInfo != m_idToMemberInfoMap.end() )
             {
                 MemberInfo& info= it_MemberInfo->second;
-
+                
                 Sequence<Any> params; // holds converted any s
                 if( ! info.flags )
                 { // DISPID called for the first time
                     if( wFlags == DISPATCH_METHOD )
-                    {
+                    {					
                         convertDispparamsArgs(dispidMember, wFlags, pdispparams, params );
-
-                        if( FAILED( ret= doInvoke( pdispparams, pvarResult,
+                        
+                        if( FAILED( ret= doInvoke( pdispparams, pvarResult, 
                                                    pexcepinfo, puArgErr, info.name, params))
                             && ret == DISP_E_MEMBERNOTFOUND)
                         {
-                            // try to get the exact name
+                            // try to get the exact name 
                             OUString exactName;
                             if (m_xExactName.is())
                             {
@@ -1394,24 +1394,24 @@ STDMETHODIMP  UnoObjectWrapperRemoteOpt::Invoke ( DISPID dispidMember, REFIID /*
                                 // invoke again
                                 if( exactName.getLength() != 0)
                                 {
-                                    if( SUCCEEDED( ret= doInvoke( pdispparams, pvarResult,
+                                    if( SUCCEEDED( ret= doInvoke( pdispparams, pvarResult, 
                                                                   pexcepinfo, puArgErr, exactName, params)))
                                         info.name= exactName;
-                                }
+                                } 
                             }
-                        }
+                        }	
                         if( SUCCEEDED( ret ) )
                             info.flags= DISPATCH_METHOD;
                     } //if( wFlags == DISPATCH_METHOD )
-
+                    
                     else if( wFlags == DISPATCH_PROPERTYPUT || wFlags == DISPATCH_PROPERTYPUTREF)
                     {
                         convertDispparamsArgs(dispidMember, wFlags, pdispparams, params );
-                        if( FAILED( ret= doSetProperty( pdispparams, pvarResult,
+                        if( FAILED( ret= doSetProperty( pdispparams, pvarResult, 
                                                         pexcepinfo, puArgErr, info.name, params))
                             && ret == DISP_E_MEMBERNOTFOUND)
                         {
-                            // try to get the exact name
+                            // try to get the exact name 
                             OUString exactName;
                             if (m_xExactName.is())
                             {
@@ -1419,23 +1419,23 @@ STDMETHODIMP  UnoObjectWrapperRemoteOpt::Invoke ( DISPID dispidMember, REFIID /*
                                 // invoke again
                                 if( exactName.getLength() != 0)
                                 {
-                                    if( SUCCEEDED( ret= doSetProperty( pdispparams, pvarResult,
+                                    if( SUCCEEDED( ret= doSetProperty( pdispparams, pvarResult, 
                                                                        pexcepinfo, puArgErr, exactName, params)))
                                         info.name= exactName;
-                                }
+                                } 
                             }
-                        }
+                        }	
                         if( SUCCEEDED( ret ) )
                             info.flags= DISPATCH_PROPERTYPUT | DISPATCH_PROPERTYGET;
                     }
-
+                    
                     else if( wFlags == DISPATCH_PROPERTYGET)
                     {
-                        if( FAILED( ret= doGetProperty( pdispparams, pvarResult,
+                        if( FAILED( ret= doGetProperty( pdispparams, pvarResult, 
                                                         pexcepinfo, info.name))
                             && ret == DISP_E_MEMBERNOTFOUND)
                         {
-                            // try to get the exact name
+                            // try to get the exact name 
                             OUString exactName;
                             if (m_xExactName.is())
                             {
@@ -1443,107 +1443,107 @@ STDMETHODIMP  UnoObjectWrapperRemoteOpt::Invoke ( DISPID dispidMember, REFIID /*
                                 // invoke again
                                 if( exactName.getLength() != 0)
                                 {
-                                    if( SUCCEEDED( ret= doGetProperty( pdispparams, pvarResult,
+                                    if( SUCCEEDED( ret= doGetProperty( pdispparams, pvarResult, 
                                                                        pexcepinfo, exactName)))
                                         info.name= exactName;
-                                }
+                                } 
                             }
-                        }
+                        }	
                         if( SUCCEEDED( ret ) )
                             info.flags= DISPATCH_PROPERTYGET | DISPATCH_PROPERTYPUT;
                     }
-                    else if( wFlags & DISPATCH_METHOD &&
+                    else if( wFlags & DISPATCH_METHOD && 
                              (wFlags & DISPATCH_PROPERTYPUT || wFlags & DISPATCH_PROPERTYPUTREF))
                     {
-
+                        
                         OUString exactName;
                         // convert params for DISPATCH_METHOD or DISPATCH_PROPERTYPUT
                         convertDispparamsArgs(dispidMember, wFlags, pdispparams, params );
                         // try first as method
-                        if( FAILED( ret= doInvoke( pdispparams, pvarResult,
+                        if( FAILED( ret= doInvoke( pdispparams, pvarResult, 
                                                    pexcepinfo, puArgErr, info.name, params))
                             && ret == DISP_E_MEMBERNOTFOUND)
                         {
-                            // try to get the exact name
+                            // try to get the exact name 
                             if (m_xExactName.is())
                             {
                                 exactName = m_xExactName->getExactName( info.name);
                                 // invoke again
                                 if( exactName.getLength() != 0)
                                 {
-                                    if( SUCCEEDED( ret= doInvoke( pdispparams, pvarResult,
+                                    if( SUCCEEDED( ret= doInvoke( pdispparams, pvarResult, 
                                                                   pexcepinfo, puArgErr, exactName, params)))
                                         info.name= exactName;
-                                }
+                                } 
                             }
-                        }
+                        }	
                         if( SUCCEEDED( ret ) )
                             info.flags= DISPATCH_METHOD;
-
+                        
                         // try as property
                         if( FAILED( ret) && pdispparams->cArgs == 1)
                         {
-                            if( FAILED( ret= doSetProperty( pdispparams, pvarResult,
+                            if( FAILED( ret= doSetProperty( pdispparams, pvarResult, 
                                                             pexcepinfo, puArgErr, info.name, params))
                                 && ret == DISP_E_MEMBERNOTFOUND)
                             {
-                                // try to get the exact name
+                                // try to get the exact name 
                                 if( exactName.getLength() != 0)
                                 {
-                                    if( SUCCEEDED( ret= doSetProperty( pdispparams, pvarResult,
+                                    if( SUCCEEDED( ret= doSetProperty( pdispparams, pvarResult, 
                                                                        pexcepinfo, puArgErr, exactName, params)))
                                         info.name= exactName;
-                                }
-                            }
+                                } 
+                            }	
                             if( SUCCEEDED( ret ) )
-                                info.flags= DISPATCH_PROPERTYPUT | DISPATCH_PROPERTYGET;
+                                info.flags= DISPATCH_PROPERTYPUT | DISPATCH_PROPERTYGET;					
                         }
                     }
                     else if( wFlags & DISPATCH_METHOD && wFlags & DISPATCH_PROPERTYGET)
                     {
                         OUString exactName;
                         convertDispparamsArgs(dispidMember, wFlags, pdispparams, params );
-
-                        if( FAILED( ret= doInvoke( pdispparams, pvarResult,
+                        
+                        if( FAILED( ret= doInvoke( pdispparams, pvarResult, 
                                                    pexcepinfo, puArgErr, info.name, params))
                             && ret == DISP_E_MEMBERNOTFOUND)
                         {
-                            // try to get the exact name
+                            // try to get the exact name 
                             if (m_xExactName.is())
                             {
                                 exactName = m_xExactName->getExactName( info.name);
                                 // invoke again
                                 if( exactName.getLength() != 0)
                                 {
-                                    if( SUCCEEDED( ret= doInvoke( pdispparams, pvarResult,
+                                    if( SUCCEEDED( ret= doInvoke( pdispparams, pvarResult, 
                                                                   pexcepinfo, puArgErr, exactName, params)))
                                         info.name= exactName;
-                                }
+                                } 
                             }
-                        }
+                        }	
                         if( SUCCEEDED( ret ) )
                             info.flags= DISPATCH_METHOD;
-
+                        
                         // try as property
                         if( FAILED( ret) && pdispparams->cArgs == 1)
                         {
-                            if( FAILED( ret= doGetProperty( pdispparams, pvarResult,
+                            if( FAILED( ret= doGetProperty( pdispparams, pvarResult, 
                                                             pexcepinfo, info.name))
                                 && ret == DISP_E_MEMBERNOTFOUND)
                             {
                                 if( exactName.getLength() != 0)
                                 {
-                                    if( SUCCEEDED( ret= doSetProperty( pdispparams, pvarResult,
+                                    if( SUCCEEDED( ret= doSetProperty( pdispparams, pvarResult, 
                                                                        pexcepinfo, puArgErr, exactName, params)))
                                         info.name= exactName;
-                                }
-                            }
+                                } 
+                            }	
                             if( SUCCEEDED( ret ) )
                                 info.flags= DISPATCH_PROPERTYGET;
                         }
                     }
-
-                    // update ínformation about this member
+                    
+                    // update ínformation about this member 
                     if( ret == DISP_E_MEMBERNOTFOUND)
                     {
                         // Remember the name as not existing
@@ -1557,19 +1557,19 @@ STDMETHODIMP  UnoObjectWrapperRemoteOpt::Invoke ( DISPID dispidMember, REFIID /*
                     if( wFlags & DISPATCH_METHOD && info.flags == DISPATCH_METHOD)
                     {
                         convertDispparamsArgs(dispidMember, wFlags, pdispparams, params );
-                        ret= doInvoke( pdispparams, pvarResult,
+                        ret= doInvoke( pdispparams, pvarResult, 
                                        pexcepinfo, puArgErr, info.name, params);
                     }
                     else if( (wFlags & DISPATCH_PROPERTYPUT || wFlags & DISPATCH_PROPERTYPUTREF )  &&
                              info.flags & DISPATCH_PROPERTYPUT)
                     {
                         convertDispparamsArgs(dispidMember, wFlags, pdispparams, params );
-                        ret= doSetProperty( pdispparams, pvarResult,
+                        ret= doSetProperty( pdispparams, pvarResult, 
                                             pexcepinfo, puArgErr, info.name, params);
                     }
                     else if( (wFlags & DISPATCH_PROPERTYGET) && ( info.flags & DISPATCH_PROPERTYGET))
                     {
-                        ret= doGetProperty( pdispparams, pvarResult,
+                        ret= doGetProperty( pdispparams, pvarResult, 
                                             pexcepinfo, info.name);
                     }
                     else
@@ -1577,7 +1577,7 @@ STDMETHODIMP  UnoObjectWrapperRemoteOpt::Invoke ( DISPID dispidMember, REFIID /*
                         ret= DISP_E_MEMBERNOTFOUND;
                     }
                 }
-            }//     if( it_MemberInfo != m_idToMemberInfoMap.end() )
+            }//		if( it_MemberInfo != m_idToMemberInfoMap.end() )
             else
                 ret= DISP_E_MEMBERNOTFOUND;
         }
@@ -1596,16 +1596,16 @@ STDMETHODIMP  UnoObjectWrapperRemoteOpt::Invoke ( DISPID dispidMember, REFIID /*
     }
     catch(...)
     {
-        OUString message= OUSTR("UnoObjectWrapperRemoteOpt::Invoke : \n"
+        OUString message= OUSTR("UnoObjectWrapperRemoteOpt::Invoke : \n" 
                                 "Unexpected exception");
         writeExcepinfo(pexcepinfo, message);
         ret = DISP_E_EXCEPTION;
     }
-
+    
     return ret;
 }
 
-HRESULT UnoObjectWrapperRemoteOpt::methodInvoke( DISPID /*dispidMember*/, DISPPARAMS * /*pdispparams*/, VARIANT * /*pvarResult*/,
+HRESULT	UnoObjectWrapperRemoteOpt::methodInvoke( DISPID /*dispidMember*/, DISPPARAMS * /*pdispparams*/, VARIANT * /*pvarResult*/, 
                               EXCEPINFO * /*pexcepinfo*/, unsigned int * /*puArgErr*/, Sequence<Any> params)
 {
     return S_OK;
@@ -1661,12 +1661,12 @@ static HRESULT mapCannotConvertException( CannotConvertException e, unsigned int
     return ret;
 }
 
-// The function maps the TypeClass of the any to VARTYPE: If
+// The function maps the TypeClass of the any to VARTYPE: If 
 // the Any contains STRUCT or INTERFACE then the return value
 // is VT_DISPATCH. The function is used from o2u_createUnoObjectWrapper
 // and the result is put into the constructor of the uno - wrapper
 // object. If a client asks the object for DISPID_VALUE and this
-// funtion returned VT_DISPATCH then the IDispatch of the same
+// funtion returned VT_DISPATCH then the IDispatch of the same 
 // object is being returned.
 // See InterfaceOleWrapper_Impl::Invoke, InterfaceOleWrapper_Impl::m_defaultValueType
 const VARTYPE getVarType( const Any& value)
diff --git a/extensions/source/ole/unoobjw.hxx b/extensions/source/ole/unoobjw.hxx
index e57421fc9286..e007dd662883 100644
--- a/extensions/source/ole/unoobjw.hxx
+++ b/extensions/source/ole/unoobjw.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,16 +42,16 @@
 #include "ole2uno.hxx"
 #include "unoconversionutilities.hxx"
 
-//#define INVOCATION_SERVICE    L"com.sun.star.script.Invocation"
-#define JSCRIPT_VALUE_FUNC  L"_GetValueObject"
-#define GET_STRUCT_FUNC     L"_GetStruct"
+//#define INVOCATION_SERVICE	L"com.sun.star.script.Invocation"
+#define JSCRIPT_VALUE_FUNC	L"_GetValueObject"
+#define GET_STRUCT_FUNC		L"_GetStruct"
 #define BRIDGE_VALUE_FUNC L"Bridge_GetValueObject"
 #define BRIDGE_GET_STRUCT_FUNC L"Bridge_GetStruct"
 #define BRIDGE_CREATE_TYPE_FUNC L"Bridge_CreateType"
 
 #define DISPID_JSCRIPT_VALUE_FUNC   -10l
-#define DISPID_GET_STRUCT_FUNC      -102
-#define DISPID_CREATE_TYPE_FUNC     -103
+#define DISPID_GET_STRUCT_FUNC		-102
+#define DISPID_CREATE_TYPE_FUNC		-103
 
 using namespace std;
 using namespace cppu;
@@ -84,8 +84,8 @@ struct MemberInfo
 {
     MemberInfo() : flags(0), name() {}
     MemberInfo(WORD f, const OUString& n) : flags(f), name(n) {}
-
-    WORD    flags;
+    
+    WORD 	flags;	
     OUString name;
 };
 
@@ -114,10 +114,10 @@ typedef hash_map
 /*****************************************************************************
 
     class declaration: InterfaceOleWrapper_Impl
-
+    
 *****************************************************************************/
 
-class InterfaceOleWrapper_Impl : public WeakImplHelper2<XBridgeSupplier2, XInitialization>,
+class InterfaceOleWrapper_Impl : public WeakImplHelper2<XBridgeSupplier2, XInitialization>, 
                                  public IDispatchEx,
                                  public UnoConversionUtilities<InterfaceOleWrapper_Impl>,
                                  public IUnoObjectWrapper
@@ -144,12 +144,12 @@ public:
 
     /* IDispatchEx methods */
 
-    virtual HRESULT STDMETHODCALLTYPE GetDispID(
+    virtual HRESULT STDMETHODCALLTYPE GetDispID( 
         /* [in] */ BSTR bstrName,
         /* [in] */ DWORD grfdex,
         /* [out] */ DISPID __RPC_FAR *pid);
-
-    virtual /* [local] */ HRESULT STDMETHODCALLTYPE InvokeEx(
+    
+    virtual /* [local] */ HRESULT STDMETHODCALLTYPE InvokeEx( 
         /* [in] */ DISPID id,
         /* [in] */ LCID lcid,
         /* [in] */ WORD wFlags,
@@ -157,36 +157,36 @@ public:
         /* [out] */ VARIANT __RPC_FAR *pvarRes,
         /* [out] */ EXCEPINFO __RPC_FAR *pei,
         /* [unique][in] */ IServiceProvider __RPC_FAR *pspCaller);
-
-    virtual HRESULT STDMETHODCALLTYPE DeleteMemberByName(
+    
+    virtual HRESULT STDMETHODCALLTYPE DeleteMemberByName( 
         /* [in] */ BSTR bstr,
         /* [in] */ DWORD grfdex);
-
-    virtual HRESULT STDMETHODCALLTYPE DeleteMemberByDispID(
+    
+    virtual HRESULT STDMETHODCALLTYPE DeleteMemberByDispID( 
         /* [in] */ DISPID id);
-
-    virtual HRESULT STDMETHODCALLTYPE GetMemberProperties(
+    
+    virtual HRESULT STDMETHODCALLTYPE GetMemberProperties( 
         /* [in] */ DISPID id,
         /* [in] */ DWORD grfdexFetch,
         /* [out] */ DWORD __RPC_FAR *pgrfdex);
-
-    virtual HRESULT STDMETHODCALLTYPE GetMemberName(
+    
+    virtual HRESULT STDMETHODCALLTYPE GetMemberName( 
         /* [in] */ DISPID id,
         /* [out] */ BSTR __RPC_FAR *pbstrName);
-
-    virtual HRESULT STDMETHODCALLTYPE GetNextDispID(
+    
+    virtual HRESULT STDMETHODCALLTYPE GetNextDispID( 
         /* [in] */ DWORD grfdex,
         /* [in] */ DISPID id,
         /* [out] */ DISPID __RPC_FAR *pid);
-
-    virtual HRESULT STDMETHODCALLTYPE GetNameSpaceParent(
+    
+    virtual HRESULT STDMETHODCALLTYPE GetNameSpaceParent( 
         /* [out] */ IUnknown __RPC_FAR *__RPC_FAR *ppunk);
-
+        
     // XBridgeSupplier2 ---------------------------------------------------
-    virtual Any SAL_CALL createBridge(const Any& modelDepObject,
-                                const Sequence<sal_Int8>& ProcessId,
-                                sal_Int16 sourceModelType,
-                                sal_Int16 destModelType)
+    virtual Any SAL_CALL createBridge(const Any& modelDepObject, 
+                                const Sequence<sal_Int8>& ProcessId, 
+                                sal_Int16 sourceModelType, 
+                                sal_Int16 destModelType) 
             throw (IllegalArgumentException, RuntimeException);
 
     //XInitialization -----------------------------------------------------
@@ -198,34 +198,34 @@ public:
     STDMETHOD( getOriginalUnoStruct)( Any * pStruct);
 
     // UnoConversionUtility
-    virtual Reference< XInterface > createUnoWrapperInstance();
+    virtual Reference< XInterface > createUnoWrapperInstance(); 
     virtual Reference< XInterface > createComWrapperInstance();
 
 
 protected:
-    virtual HRESULT doInvoke( DISPPARAMS * pdispparams, VARIANT * pvarResult,
+    virtual	HRESULT	doInvoke( DISPPARAMS * pdispparams, VARIANT * pvarResult, 
                               EXCEPINFO * pexcepinfo, unsigned int * puArgErr, OUString & name, Sequence<Any>& params);
 
-    virtual HRESULT doGetProperty( DISPPARAMS * pdispparams, VARIANT * pvarResult,
+    virtual HRESULT doGetProperty( DISPPARAMS * pdispparams, VARIANT * pvarResult, 
                                         EXCEPINFO * pexcepinfo, OUString & name );
 
-    virtual HRESULT doSetProperty( DISPPARAMS * pdispparams, VARIANT * pvarResult,
+    virtual HRESULT doSetProperty( DISPPARAMS * pdispparams, VARIANT * pvarResult, 
                                         EXCEPINFO * pexcepinfo, unsigned int * puArgErr, OUString & name, Sequence<Any> params);
 
     virtual HRESULT InvokeGeneral( DISPID dispidMember, unsigned short wFlags,
                          DISPPARAMS * pdispparams, VARIANT * pvarResult, EXCEPINFO * pexcepinfo,
                          unsigned int * puArgErr, sal_Bool& bHandled);
 
-    void convertDispparamsArgs( DISPID id, unsigned short wFlags, DISPPARAMS* pdispparams,
+    void convertDispparamsArgs( DISPID id, unsigned short wFlags, DISPPARAMS* pdispparams, 
                             Sequence<Any>& rSeq);
 
     sal_Bool getInvocationInfoForCall(DISPID id, InvocationInfo& info);
 
-    Reference<XInvocation>                  m_xInvocation;
-    Reference<XExactName>                   m_xExactName;
-    Reference<XInterface>                   m_xOrigin;
-    NameToIdMap                     m_nameToDispIdMap;
-    vector<MemberInfo>              m_MemberInfos;
+    Reference<XInvocation> 					m_xInvocation;
+    Reference<XExactName>					m_xExactName;
+    Reference<XInterface> 					m_xOrigin;
+    NameToIdMap						m_nameToDispIdMap;
+    vector<MemberInfo> 				m_MemberInfos;
     // This member is used to determine the default value
     // denoted by DISPID_VALUE (0). For proper results in JavaScript
     // we have to return the default value when we write an object
@@ -234,13 +234,13 @@ protected:
     // to detect the default value. The wrapped object must then return
     // its own IDispatch* otherwise we cannot access it within the script.
     // see InterfaceOleWrapper_Impl::Invoke
-    VARTYPE                         m_defaultValueType;
+    VARTYPE							m_defaultValueType;
 
 };
 
 /*****************************************************************************
 
-    class declaration: UnoObjectWrapperRemoteOpt
+    class declaration: UnoObjectWrapperRemoteOpt 
     ( Uno Object Wrapper Remote Optimized)
     This is the UNO wrapper used in the service com.sun.star.bridge.OleBridgeSupplierVar1.
     Key features:
@@ -249,7 +249,7 @@ protected:
     if a call is made to a property or method if the flags are DISPATCH_METHOD | DISPATCH_PROPERTYPUT.
     If something has been found out about a property or member than it is saved
     in a MemberInfo structure hold by a IdToMemberInfoMap stl map.
-
+    
 *****************************************************************************/
 class UnoObjectWrapperRemoteOpt: public InterfaceOleWrapper_Impl
 {
@@ -270,20 +270,20 @@ public:
 
 protected:
 
-        HRESULT methodInvoke( DISPID dispidMember, DISPPARAMS * pdispparams, VARIANT * pvarResult,
+        HRESULT	methodInvoke( DISPID dispidMember, DISPPARAMS * pdispparams, VARIANT * pvarResult, 
                               EXCEPINFO * pexcepinfo, unsigned int * puArgErr, Sequence<Any> params);
     // In GetIDsOfNames are blindly passed out, that is without verifying
-    // the name. If two names are passed in during different calls to
+    // the name. If two names are passed in during different calls to 
     // GetIDsOfNames and the names differ only in their cases then different
     // id's are passed out ( e.g. "doSomethingMethod" or "dosomethingmethod").
-    // In Invoke the DISPID is remapped to the name passed to GetIDsOfNames
+    // In Invoke the DISPID is remapped to the name passed to GetIDsOfNames 
     // and the name is used as parameter for XInvocation::invoke. If invoke
     // fails because of a wrong name, then m_xExactName ( XExactName) is used
     // to verify the name. The correct name is then inserted to m_MemberInfos
-    // ( vector<MemberInfo> ). During the next call to Invoke the right name
-    // is used.         .
-
+    // ( vector<MemberInfo> ). During the next call to Invoke the right name 
+    // is used.			.
 
+        
     BadNameMap m_badNameMap;
 
     IdToMemberInfoMap m_idToMemberInfoMap;
diff --git a/extensions/source/ole/unotypewrapper.cxx b/extensions/source/ole/unotypewrapper.cxx
index ea0393d55ee9..7461d7d0e62f 100644
--- a/extensions/source/ole/unotypewrapper.cxx
+++ b/extensions/source/ole/unotypewrapper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -95,7 +95,7 @@ STDMETHODIMP UnoTypeWrapper::GetTypeInfo( UINT /*iTInfo*/,
 // UnoTypeWrapper, IDispatch --------------------------------------------
 STDMETHODIMP UnoTypeWrapper::GetIDsOfNames( REFIID /*riid*/,
                                             LPOLESTR *rgszNames,
-                                            UINT /*cNames*/,
+                                            UINT /*cNames*/,			
                                             LCID /*lcid*/,
                                             DISPID *rgDispId)
 {
@@ -126,12 +126,12 @@ STDMETHODIMP UnoTypeWrapper::Invoke( DISPID dispIdMember,
 {
     if (pDispParams == NULL)
         return DISP_E_EXCEPTION;
-
+        
     if( pDispParams->cNamedArgs)
         return DISP_E_NONAMEDARGS;
-
-
-    HRESULT ret= S_OK;
+    
+    
+    HRESULT ret= S_OK; 
     switch( dispIdMember)
     {
     case DISPID_VALUE: // DISPID_VALUE
@@ -156,7 +156,7 @@ STDMETHODIMP UnoTypeWrapper::Invoke( DISPID dispIdMember,
 
 // IUnoTypeWrapper-----------------------
 STDMETHODIMP UnoTypeWrapper::put_Name(BSTR  val)
-{
+{	
      Lock();
      HRESULT hr = S_OK;
     m_sName = val;
diff --git a/extensions/source/ole/unotypewrapper.hxx b/extensions/source/ole/unotypewrapper.hxx
index 748d7a59da58..f09fd9bfbbb2 100644
--- a/extensions/source/ole/unotypewrapper.hxx
+++ b/extensions/source/ole/unotypewrapper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/ole/windata.cxx b/extensions/source/ole/windata.cxx
index 267478b8eb5c..e4047e3b184c 100644
--- a/extensions/source/ole/windata.cxx
+++ b/extensions/source/ole/windata.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/ole/windata.hxx b/extensions/source/ole/windata.hxx
index ed951f248ea2..fce3d4af5e9c 100644
--- a/extensions/source/ole/windata.hxx
+++ b/extensions/source/ole/windata.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 namespace ole_adapter
 {
-//Wrapper for VARDESC
+//Wrapper for VARDESC		
 class VarDesc
 {
     VARDESC* operator = (const VarDesc*);
@@ -88,7 +88,7 @@ class FuncDesc
     FUNCDESC * m_pFuncDesc;
 
 public:
-
+    
     FuncDesc(ITypeInfo * pTypeInfo) :
         m_pFuncDesc(NULL),
         m_pTypeInfo(pTypeInfo)
diff --git a/extensions/source/oooimprovecore/core.cxx b/extensions/source/oooimprovecore/core.cxx
index 472d844337a3..4c13d5b5e2b3 100644
--- a/extensions/source/oooimprovecore/core.cxx
+++ b/extensions/source/oooimprovecore/core.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/oooimprovecore/oooimprovecore_module.cxx b/extensions/source/oooimprovecore/oooimprovecore_module.cxx
index f77d45f2393a..c686bee9455a 100644
--- a/extensions/source/oooimprovecore/oooimprovecore_module.cxx
+++ b/extensions/source/oooimprovecore/oooimprovecore_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
@@ -34,6 +34,6 @@
 namespace oooimprovecore
 {
     IMPLEMENT_COMPONENT_MODULE( OooimprovecoreModule );
-}
+} 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/oooimprovecore/oooimprovecore_module.hxx b/extensions/source/oooimprovecore/oooimprovecore_module.hxx
index 432dcc71997d..3cf4d715588f 100644
--- a/extensions/source/oooimprovecore/oooimprovecore_module.hxx
+++ b/extensions/source/oooimprovecore/oooimprovecore_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
@@ -35,6 +35,6 @@ namespace oooimprovecore
 {
     DECLARE_COMPONENT_MODULE( OooimprovecoreModule, OooimprovecoreModuleClient )
 }
-#endif
+#endif 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/oooimprovecore/oooimprovecore_services.cxx b/extensions/source/oooimprovecore/oooimprovecore_services.cxx
index 6c3a04539e30..532e9a2d14d1 100644
--- a/extensions/source/oooimprovecore/oooimprovecore_services.cxx
+++ b/extensions/source/oooimprovecore/oooimprovecore_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/extensions/source/oooimprovement/config.cxx b/extensions/source/oooimprovement/config.cxx
index 296df200d50d..52347ac47c2d 100644
--- a/extensions/source/oooimprovement/config.cxx
+++ b/extensions/source/oooimprovement/config.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/oooimprovement/config.hxx b/extensions/source/oooimprovement/config.hxx
index 3fe1cbe5eba7..9aebafe15894 100644
--- a/extensions/source/oooimprovement/config.hxx
+++ b/extensions/source/oooimprovement/config.hxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/oooimprovement/corecontroller.cxx b/extensions/source/oooimprovement/corecontroller.cxx
index 8a9bae0f62dd..0d3cc368169b 100644
--- a/extensions/source/oooimprovement/corecontroller.cxx
+++ b/extensions/source/oooimprovement/corecontroller.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/oooimprovement/corecontroller.hxx b/extensions/source/oooimprovement/corecontroller.hxx
index 925fa94f038d..5d68cc0395df 100644
--- a/extensions/source/oooimprovement/corecontroller.hxx
+++ b/extensions/source/oooimprovement/corecontroller.hxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER 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 @@ namespace oooimprovement
             CoreController(const css::uno::Reference< css::lang::XMultiServiceFactory>& sm);
             virtual ~CoreController();
 
-            // css::oooimprovement::XCoreController
+            // css::oooimprovement::XCoreController            
             virtual sal_Bool SAL_CALL enablingUiEventsLoggerAllowed(sal_Int16 version)
                 throw(css::uno::RuntimeException);
             virtual sal_Bool SAL_CALL showBuiltinOptionsPage(sal_Int16 version)
diff --git a/extensions/source/oooimprovement/errormail.cxx b/extensions/source/oooimprovement/errormail.cxx
index de7ef8db0e6f..81bf38ba2868 100644
--- a/extensions/source/oooimprovement/errormail.cxx
+++ b/extensions/source/oooimprovement/errormail.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER 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 @@ namespace {
     {
         struct utsname info;
         //memset(&info, 0, sizeof(info));
-        uname(&info);
+        uname(&info); 
         OStringBuffer result =
             "<systeminfo:systeminfo xmlns:systeminfo=\"http://openoffice.org/2002/systeminfo\">\n"
             "<systeminfo:System name=\""
@@ -170,19 +170,19 @@ namespace {
     };
 }
 
-namespace oooimprovement
+namespace oooimprovement  
 {
     Errormail::Errormail(const Reference<XMultiServiceFactory>& sf)
         : m_ServiceFactory(sf)
     {}
-
+        
     OString Errormail::getXml()
     {
         Config config(m_ServiceFactory);
         const OString usertype;
         const OString email = OUStringToOString(config.getReporterEmail(), RTL_TEXTENCODING_ASCII_US);
         OString feedback;
-        {
+        {        
             OStringBuffer temp;
             temp.append(config.getReportCount());
             feedback = temp.makeStringAndClear();
@@ -200,7 +200,7 @@ namespace oooimprovement
             + xmlAttrEncode(title) + "</reportmail:title>\n"
            "<reportmail:attachment name=\"data.zip\" media-type=\"application/zip\" class=\"OOoImprovementLog\"/>\n"
             "</reportmail:mail>\n"
-            + getOfficeInfoXml(m_ServiceFactory)
+            + getOfficeInfoXml(m_ServiceFactory) 
             + getSystemInfoXml(m_ServiceFactory) +
             "</errormail:errormail>\n";
         return result.makeStringAndClear();
diff --git a/extensions/source/oooimprovement/errormail.hxx b/extensions/source/oooimprovement/errormail.hxx
index 8b836514fcac..8a9f3a4db7a4 100644
--- a/extensions/source/oooimprovement/errormail.hxx
+++ b/extensions/source/oooimprovement/errormail.hxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/oooimprovement/invite_job.cxx b/extensions/source/oooimprovement/invite_job.cxx
index 1b96c0c181cd..59c84acde617 100644
--- a/extensions/source/oooimprovement/invite_job.cxx
+++ b/extensions/source/oooimprovement/invite_job.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/oooimprovement/invite_job.hxx b/extensions/source/oooimprovement/invite_job.hxx
index 65981518657a..fc2feb515a85 100644
--- a/extensions/source/oooimprovement/invite_job.hxx
+++ b/extensions/source/oooimprovement/invite_job.hxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/oooimprovement/logpacker.cxx b/extensions/source/oooimprovement/logpacker.cxx
index 4defc2ab2cbe..59dadca7a3bb 100644
--- a/extensions/source/oooimprovement/logpacker.cxx
+++ b/extensions/source/oooimprovement/logpacker.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER 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 @@ namespace oooimprovement
     LogPacker::LogPacker(const Reference<XMultiServiceFactory>& sf)
         : m_ServiceFactory(sf)
     {}
-
+    
     sal_Int32 LogPacker::pack(const OUString& fileurl)
     {
         Reference<XSimpleFileAccess> file_access(
@@ -108,10 +108,10 @@ namespace oooimprovement
         unzipped_stream->closeInput();
         zipped_stream->flush();
         zipped_stream->closeOutput();
-        Reference<XTransactedObject>(storage, UNO_QUERY_THROW)->commit();
+        Reference<XTransactedObject>(storage, UNO_QUERY_THROW)->commit(); 
         file_access->kill(fileurl);
         return logged_events;
     }
-}
+} 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/oooimprovement/logpacker.hxx b/extensions/source/oooimprovement/logpacker.hxx
index fdf08141ba03..52e86fd8e065 100644
--- a/extensions/source/oooimprovement/logpacker.hxx
+++ b/extensions/source/oooimprovement/logpacker.hxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/oooimprovement/logstorage.cxx b/extensions/source/oooimprovement/logstorage.cxx
index 7181ed2fdce6..27313a5fb4d9 100644
--- a/extensions/source/oooimprovement/logstorage.cxx
+++ b/extensions/source/oooimprovement/logstorage.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER 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 @@ namespace
             result = path_sub->substituteVariables(result, sal_False);
         return result;
     }
-
+    
     static bool isZipfile(const OUString& fileurl)
     {
         static const OUString file_extension = OUString::createFromAscii(".zip");
-        return fileurl.match(file_extension, fileurl.getLength()-file_extension.getLength());
+        return fileurl.match(file_extension, fileurl.getLength()-file_extension.getLength()); 
     };
-
+    
     static bool isLogfile(const OUString& fileurl)
     {
         static const OUString file_extension = OUString::createFromAscii(".csv");
         static const OUString current = OUString::createFromAscii("Current.csv");
         return
             fileurl.match(file_extension, fileurl.getLength()-file_extension.getLength())
-            && !fileurl.match(current, fileurl.getLength()-current.getLength());
+            && !fileurl.match(current, fileurl.getLength()-current.getLength()); 
     };
 
     static bool isZipOrLogFile(const OUString& fileurl)
@@ -88,9 +88,9 @@ namespace
             UNO_QUERY_THROW);
         return file_access->getFolderContents(
             getLogPathFromCfg(sf),
-            false);
+            false);   
     };
-
+    
     static vector<OUString> getLogStoragefiles(
         const Reference<XMultiServiceFactory>& sf,
         bool (*condition)(const OUString& path))
@@ -102,7 +102,7 @@ namespace
             if(condition(candidates[idx]))
                 result.push_back(candidates[idx]);
         return result;
-    };
+    }; 
 
     static void assureLogStorageExists(const Reference<XMultiServiceFactory>& sf)
     {
@@ -121,7 +121,7 @@ namespace oooimprovement
     LogStorage::LogStorage(const Reference<XMultiServiceFactory>& sf)
         : m_ServiceFactory(sf)
     {}
-
+    
     void LogStorage::assureExists()
     {
         assureLogStorageExists(m_ServiceFactory);
@@ -141,9 +141,9 @@ namespace oooimprovement
 
     const vector<OUString> LogStorage::getUnzippedLogFiles() const
     { return getLogStoragefiles(m_ServiceFactory, &isLogfile); }
-
+    
     const vector<OUString> LogStorage::getZippedLogFiles() const
     { return getLogStoragefiles(m_ServiceFactory, &isZipfile); }
-}
+} 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/oooimprovement/logstorage.hxx b/extensions/source/oooimprovement/logstorage.hxx
index 82dcdf331f59..f97c99a51085 100644
--- a/extensions/source/oooimprovement/logstorage.hxx
+++ b/extensions/source/oooimprovement/logstorage.hxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/oooimprovement/myconfigurationhelper.cxx b/extensions/source/oooimprovement/myconfigurationhelper.cxx
index d9ff3ecd03dc..88e11dfcc88d 100644
--- a/extensions/source/oooimprovement/myconfigurationhelper.cxx
+++ b/extensions/source/oooimprovement/myconfigurationhelper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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
         buf.appendAscii("The requested path \"");
         buf.append(path);
         buf.appendAscii("\" does not exists.");
-        return buf.makeStringAndClear();
+        return buf.makeStringAndClear(); 
     };
 }
 
diff --git a/extensions/source/oooimprovement/myconfigurationhelper.hxx b/extensions/source/oooimprovement/myconfigurationhelper.hxx
index 619d8cf93e06..96936bcb9656 100644
--- a/extensions/source/oooimprovement/myconfigurationhelper.hxx
+++ b/extensions/source/oooimprovement/myconfigurationhelper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/oooimprovement/onlogrotate_job.cxx b/extensions/source/oooimprovement/onlogrotate_job.cxx
index 18108df7629e..da78298b6145 100644
--- a/extensions/source/oooimprovement/onlogrotate_job.cxx
+++ b/extensions/source/oooimprovement/onlogrotate_job.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/oooimprovement/onlogrotate_job.hxx b/extensions/source/oooimprovement/onlogrotate_job.hxx
index 16e36530073c..5832c44d658d 100644
--- a/extensions/source/oooimprovement/onlogrotate_job.hxx
+++ b/extensions/source/oooimprovement/onlogrotate_job.hxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/oooimprovement/oooimprovement_exports.cxx b/extensions/source/oooimprovement/oooimprovement_exports.cxx
index fff1610fcb3a..eed57333d3de 100644
--- a/extensions/source/oooimprovement/oooimprovement_exports.cxx
+++ b/extensions/source/oooimprovement/oooimprovement_exports.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER 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,6 +108,6 @@ extern "C"
         factory->acquire();
         return factory.get();
     }
-}
+} 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/oooimprovement/soaprequest.cxx b/extensions/source/oooimprovement/soaprequest.cxx
index aad080ed9520..c2dc4b348ef4 100644
--- a/extensions/source/oooimprovement/soaprequest.cxx
+++ b/extensions/source/oooimprovement/soaprequest.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/oooimprovement/soaprequest.hxx b/extensions/source/oooimprovement/soaprequest.hxx
index 313569a2c0d0..126bc0948343 100644
--- a/extensions/source/oooimprovement/soaprequest.hxx
+++ b/extensions/source/oooimprovement/soaprequest.hxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/oooimprovement/soapsender.cxx b/extensions/source/oooimprovement/soapsender.cxx
index 17a3252fb608..32a50f30e3cb 100644
--- a/extensions/source/oooimprovement/soapsender.cxx
+++ b/extensions/source/oooimprovement/soapsender.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER 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 @@ namespace
 {
     static OString getHttpPostHeader(OString path, sal_Int32 length)
     {
-        OStringBuffer result =
+        OStringBuffer result = 
             "POST " + path + " HTTP/1.0\r\n"
             "Content-Type: text/xml; charset=\"utf-8\"\r\n"
             "Content-Length: ";
@@ -74,7 +74,7 @@ namespace oooimprovement
         : m_ServiceFactory(sf)
         , m_Url(url)
     { }
-
+    
     void SoapSender::send(const SoapRequest& request) const
     {
         Reference<XTempFile> temp_file(
@@ -86,19 +86,19 @@ namespace oooimprovement
         Reference<XURLTransformer> url_trans(
             m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.util.URLTransformer")),
             UNO_QUERY_THROW);
-
-        // writing request to tempfile
+    
+        // writing request to tempfile 
         {
             Reference<XOutputStream> temp_stream = temp_file->getOutputStream();
             request.writeTo(temp_stream);
             temp_stream->flush();
             temp_stream->closeOutput();
         }
-
+        
         // parse Url
         URL url;
         {
-            url.Complete = m_Url;
+            url.Complete = m_Url;          
             url_trans->parseStrict(url);
         }
 
@@ -112,7 +112,7 @@ namespace oooimprovement
                     OUString::createFromAscii("unable to connect to SOAP server"),
                     Reference<XInterface>());
         }
-
+        
         // send header
         {
             OStringBuffer path_on_server =
@@ -122,9 +122,9 @@ namespace oooimprovement
             if(socket->write(header.getStr(), header.getLength()) != static_cast<sal_Int32>(header.getLength()))
                 throw RuntimeException(
                     OUString::createFromAscii("error while sending HTTP header"),
-                    Reference<XInterface>());
+                    Reference<XInterface>()); 
         }
-
+        
         // send soap request
         {
             Reference<XInputStream> temp_stream = file_access->openFileRead(temp_file->getUri());
@@ -158,6 +158,6 @@ namespace oooimprovement
                     Reference<XInterface>());
         }
     }
-}
+} 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/oooimprovement/soapsender.hxx b/extensions/source/oooimprovement/soapsender.hxx
index b21cbe95e011..6a3e3d6f1d51 100644
--- a/extensions/source/oooimprovement/soapsender.hxx
+++ b/extensions/source/oooimprovement/soapsender.hxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER 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 oooimprovement
             void send(const SoapRequest& request) const;
         private:
             const css::uno::Reference< css::lang::XMultiServiceFactory> m_ServiceFactory;
-            const ::rtl::OUString m_Url;
+            const ::rtl::OUString m_Url; 
     };
     #undef css
 }
diff --git a/extensions/source/plugin/aqua/macmgr.cxx b/extensions/source/plugin/aqua/macmgr.cxx
index f1d0e3a3c99b..e17b3bde2058 100644
--- a/extensions/source/plugin/aqua/macmgr.cxx
+++ b/extensions/source/plugin/aqua/macmgr.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ using namespace com::sun::star::plugin;
 
 namespace plugstringhelper
 {
-
+    
 rtl::OUString getString( CFStringRef i_xString )
 {
     rtl::OUStringBuffer aBuf;
@@ -70,7 +70,7 @@ CFMutableStringRef createString( const rtl::OUString& i_rString )
 
 CFURLRef createURL( const rtl::OUString& i_rString )
 {
-
+    
     CFMutableStringRef xMutableString = createString( i_rString );
     CFURLRef xURL = CFURLCreateWithString( NULL, xMutableString, NULL );
     CFRelease( xMutableString );
@@ -124,12 +124,12 @@ static int parsePlist( CFBundleRef i_xBundle, const rtl::OUString& i_rBundleURL
     {
         return 0;
     }
-
+    
     // prepare an array of key and value refs
     std::vector< CFTypeRef > aKeys( nMimetypes, CFTypeRef(NULL) );
     std::vector< CFTypeRef > aValues( nMimetypes, CFTypeRef(NULL) );
     CFDictionaryGetKeysAndValues(static_cast<CFDictionaryRef>(xMimeDict), &aKeys[0], &aValues[0] );
-
+    
     int nAdded = 0;
     for( int i = 0; i < nMimetypes; i++ )
     {
@@ -138,7 +138,7 @@ static int parsePlist( CFBundleRef i_xBundle, const rtl::OUString& i_rBundleURL
         if( ! xKey || CFGetTypeID(xKey) != CFStringGetTypeID() )
             continue;
         rtl::OUString aMimetype = getString( (CFStringRef)xKey );
-
+        
         // the correspoding value should be a dictionary
         CFTypeRef xDict = aValues[i];
         if( ! xDict || CFGetTypeID( xDict ) != CFDictionaryGetTypeID() )
@@ -148,7 +148,7 @@ static int parsePlist( CFBundleRef i_xBundle, const rtl::OUString& i_rBundleURL
         CFTypeRef xExtArray = CFDictionaryGetValue( (CFDictionaryRef)xDict,  CFSTR("WebPluginExtensions" ) );
         if( !xExtArray || CFGetTypeID( xExtArray ) != CFArrayGetTypeID() )
             continue;
-
+        
         OUStringBuffer aExtBuf;
         int nExtensions = CFArrayGetCount( (CFArrayRef)xExtArray );
         for( int n = 0; n < nExtensions; n++ )
@@ -164,7 +164,7 @@ static int parsePlist( CFBundleRef i_xBundle, const rtl::OUString& i_rBundleURL
                 aExtBuf.append( aExt );
             }
         }
-
+        
         // get the description string
         CFTypeRef xDescString = CFDictionaryGetValue( (CFDictionaryRef)xDict,  CFSTR("WebPluginTypeDescription" ) );
         if( !xDescString || CFGetTypeID( xDescString ) != CFStringGetTypeID() )
@@ -173,14 +173,14 @@ static int parsePlist( CFBundleRef i_xBundle, const rtl::OUString& i_rBundleURL
 
         PluginDescription* pNew = new PluginDescription;
         // set plugin name (path to library)
-        pNew->PluginName    = i_rBundleURL;
+        pNew->PluginName	= i_rBundleURL;
         // set mimetype
-        pNew->Mimetype  = aMimetype;
+        pNew->Mimetype 	= aMimetype;
         // set extension line
-        pNew->Extension = aExtBuf.makeStringAndClear();
+        pNew->Extension	= aExtBuf.makeStringAndClear();
         // set description
         pNew->Description= aDescription;
-
+        
         io_rDescriptions.push_back( pNew );
         nAdded++;
 
@@ -195,9 +195,9 @@ static int parsePlist( CFBundleRef i_xBundle, const rtl::OUString& i_rBundleURL
                  OUStringToOString( pNew->Description, RTL_TEXTENCODING_UTF8 ).getStr()
                  );
 #endif
-
+        
     }
-
+    
     return nAdded;
 }
 
@@ -205,12 +205,12 @@ static int parseMimeString( const rtl::OUString& i_rBundleURL , list< PluginDesc
 {
     if( ! i_pMime )
         return 0;
-
+    
     rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
-
+    
     OStringBuffer aMIME;
     aMIME.append( i_pMime );
-
+        
     if( aMIME.getLength() < 1 )
         return 0;
 
@@ -221,14 +221,14 @@ static int parseMimeString( const rtl::OUString& i_rBundleURL , list< PluginDesc
     while( nIndex != -1 )
     {
         OString aType = aLine.getToken( 0, ';', nIndex );
-
+        
         sal_Int32 nTypeIndex = 0;
-        OString aMimetype   = aType.getToken( 0, ':', nTypeIndex );
-        OString aExtLine    = aType.getToken( 0, ':', nTypeIndex );
+        OString aMimetype	= aType.getToken( 0, ':', nTypeIndex );
+        OString aExtLine	= aType.getToken( 0, ':', nTypeIndex );
         if( nTypeIndex < 0 ) // ensure at least three tokens
             continue;
-        OString aDesc       = aType.getToken( 0, ':', nTypeIndex );
-
+        OString aDesc		= aType.getToken( 0, ':', nTypeIndex );
+        
         // create extension list string
         sal_Int32 nExtIndex = 0;
         OStringBuffer aExtension;
@@ -241,19 +241,19 @@ static int parseMimeString( const rtl::OUString& i_rBundleURL , list< PluginDesc
             if( nExtIndex != -1 )
                 aExtension.append( ';' );
         }
-
+        
         PluginDescription* pNew = new PluginDescription;
         // set plugin name (path to library)
-        pNew->PluginName    = i_rBundleURL;
+        pNew->PluginName	= i_rBundleURL;
         // set mimetype
-        pNew->Mimetype  = OStringToOUString( aMimetype, aEncoding );
+        pNew->Mimetype 	= OStringToOUString( aMimetype, aEncoding );
         // set extension line
-        pNew->Extension = OStringToOUString( aExtension.makeStringAndClear(), aEncoding );
+        pNew->Extension	= OStringToOUString( aExtension.makeStringAndClear(), aEncoding );
         // set description
         pNew->Description= OStringToOUString( aDesc, aEncoding );
         io_rDescriptions.push_back( pNew );
         nAdded++;
-
+        
 #if OSL_DEBUG_LEVEL > 1
         fprintf( stderr,
                  "Inserting from mime string:\n"
@@ -295,7 +295,7 @@ static int parseMimeResource( CFBundleRef i_xBundle,
     #endif
     xRes = 0;
     BPSupportedMIMETypes aMIMETypesStrangeStruct = {kBPSupportedMIMETypesStructVers_1, NULL, NULL};
-
+    
     BP_GetSupportedMIMETypesUPP pBPGetSupp = (BP_GetSupportedMIMETypesUPP)osl_getAsciiFunctionSymbol( i_rMod, "BP_GetSupportedMIMETypes" );
     if( pBPGetSupp &&
         noErr == pBPGetSupp( &aMIMETypesStrangeStruct, 0 ) &&
@@ -324,7 +324,7 @@ static int parseMimeResource( CFBundleRef i_xBundle,
             }
         }
     }
-
+    
     if( aMIMETypesStrangeStruct.typeStrings && aMIMETypesStrangeStruct.infoStrings )
     {
         short nVariantCount = (**(short**)aMIMETypesStrangeStruct.typeStrings) / 2;
@@ -353,19 +353,19 @@ static int parseMimeResource( CFBundleRef i_xBundle,
                 if( nExtIndex != -1 )
                     aExtension.append( sal_Unicode(';') );
             }
-
+            
             PluginDescription* pNew = new PluginDescription;
             // set plugin name (path to library)
-            pNew->PluginName    = i_rBundleURL;
+            pNew->PluginName	= i_rBundleURL;
             // set mimetype
-            pNew->Mimetype  = aMimetype;
+            pNew->Mimetype 	= aMimetype;
             // set extension line
-            pNew->Extension = aExtension.makeStringAndClear();
+            pNew->Extension	= aExtension.makeStringAndClear();
             // set description
             pNew->Description= aDescription;
             io_rDescriptions.push_back( pNew );
             nAdded++;
-
+            
             #if OSL_DEBUG_LEVEL > 1
             fprintf( stderr,
                      "Inserting from resource:\n"
@@ -379,8 +379,8 @@ static int parseMimeResource( CFBundleRef i_xBundle,
             #endif
         }
     }
-
-
+    
+    
     // clean up
     if( aMIMETypesStrangeStruct.typeStrings )
     {
@@ -394,7 +394,7 @@ static int parseMimeResource( CFBundleRef i_xBundle,
     }
     if( xRes )
         CFBundleCloseBundleResourceMap( i_xBundle, xRes );
-
+    
     return nAdded;
 }
 
@@ -410,9 +410,9 @@ static bool checkBlackList( CFBundleRef i_xBundle )
     CFTypeRef bundleversion = CFBundleGetValueForInfoDictionaryKey( i_xBundle, CFSTR("CFBundleVersion"));
     if( bundleversion && CFGetTypeID(bundleversion) == CFStringGetTypeID() )
         aBundleVersion = getString( static_cast<CFStringRef>(bundleversion) );
-
+    
     bool bReject = false;
-    // #i102735# VLC plugin prior to 1.0 tends to crash
+    // #i102735# VLC plugin prior to 1.0 tends to crash 
     if( aBundleName.equalsAscii( "VLC Plug-in" ) )
     {
         sal_Int32 nIndex = 0;
@@ -427,7 +427,7 @@ static bool checkBlackList( CFBundleRef i_xBundle )
     {
         bReject = true;
     }
-
+    
     #if OSL_DEBUG_LEVEL > 1
     if( bReject )
         fprintf( stderr, "rejecting plugin \"%s\" version %s\n",
@@ -444,7 +444,7 @@ static int getPluginDescriptions( CFBundleRef i_xBundle , list< PluginDescriptio
     int nDescriptions = 0;
     if( ! i_xBundle )
         return nDescriptions;
-
+    
     if( checkBlackList( i_xBundle ) )
         return 0;
 
@@ -452,7 +452,7 @@ static int getPluginDescriptions( CFBundleRef i_xBundle , list< PluginDescriptio
     CFURLRef xURL = CFBundleCopyBundleURL( i_xBundle );
     aPlugURL = getString( xURL );
     CFRelease( xURL );
-
+    
     #if OSL_DEBUG_LEVEL > 1
     rtl::OUString aPlugName, aPlugDescription;
     CFTypeRef name = CFBundleGetValueForInfoDictionaryKey( i_xBundle, CFSTR("WebPluginName"));
@@ -462,15 +462,15 @@ static int getPluginDescriptions( CFBundleRef i_xBundle , list< PluginDescriptio
     CFTypeRef description = CFBundleGetValueForInfoDictionaryKey( i_xBundle, CFSTR("WebPluginDescription"));
     if( description && CFGetTypeID(description) == CFStringGetTypeID() )
         aPlugDescription = getString( static_cast<CFStringRef>(description) );
-
+    
     fprintf( stderr, "URL: %s\nname: %s\ndescription: %s\n",
         rtl::OUStringToOString( aPlugURL, RTL_TEXTENCODING_UTF8 ).getStr(),
         rtl::OUStringToOString( aPlugName, RTL_TEXTENCODING_UTF8 ).getStr(),
         rtl::OUStringToOString( aPlugDescription, RTL_TEXTENCODING_UTF8 ).getStr()
         );
     #endif
-
-
+    
+    
     // get location of plugin library
     CFURLRef xLibURL = CFBundleCopyExecutableURL( i_xBundle );
     if( ! xLibURL )
@@ -478,7 +478,7 @@ static int getPluginDescriptions( CFBundleRef i_xBundle , list< PluginDescriptio
     // get the file system path
     rtl::OUString aModuleURL( CFURLtoOSLURL( xLibURL ) );
     CFRelease( xLibURL );
-
+    
     #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "exec URL = %s\n", rtl::OUStringToOString( aModuleURL, RTL_TEXTENCODING_UTF8 ).getStr() );
     #endif
@@ -506,7 +506,7 @@ static int getPluginDescriptions( CFBundleRef i_xBundle , list< PluginDescriptio
         osl_unloadModule( aMod );
         return nDescriptions;
     }
-
+    
     // resolve the symbol that might get us the mimetypes
     const char* (*pGetMimeDescription)() = (const char*(*)())osl_getAsciiFunctionSymbol( aMod, "_NP_GetMIMEDescription" );
     if( pGetMimeDescription )
@@ -522,7 +522,7 @@ static int getPluginDescriptions( CFBundleRef i_xBundle , list< PluginDescriptio
             }
         }
     }
-
+    
     // and as last resort check the resource of the bundle
     nDescriptions = parseMimeResource( i_xBundle, aMod, aPlugURL, io_rDescriptions );
     osl_unloadModule( aMod );
@@ -536,24 +536,24 @@ static bool CheckPlugin( const rtl::OUString& rPath, list< PluginDescription* >&
 #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "Trying path %s ... ", rtl::OUStringToOString( rPath, RTL_TEXTENCODING_UTF8 ).getStr() );
 #endif
-    CFURLRef xURL = createURL( rPath );
-
+    CFURLRef xURL = createURL( rPath );    
+    
     CFArrayRef xBundles = CFBundleCreateBundlesFromDirectory( NULL, xURL, CFSTR("plugin") );
     if( ! xBundles )
         return false;
-
+    
     CFIndex nBundles = CFArrayGetCount( xBundles );
-
+    
 #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "got %d bundles\n", (int)nBundles );
 #endif
-
+    
     int nDescriptions = 0;
     for( CFIndex i = 0; i < nBundles; i++ )
     {
         CFBundleRef xBundle = (CFBundleRef)CFArrayGetValueAtIndex( xBundles, i );
         nDescriptions += getPluginDescriptions( xBundle, rDescriptions );
-
+        
         CFRelease( xBundle );
     }
     CFRelease( xBundles );
@@ -574,7 +574,7 @@ static rtl::OUString FindFolderURL(  FSVolumeRefNum vRefNum, OSType folderType )
         aRet = getString( xURL );
         CFRelease( xURL );
     }
-
+    
     return aRet;
 }
 
@@ -587,7 +587,7 @@ Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() th
         std::list<PluginDescription*> aPlugins;
 
         static const char* pNPXPluginPath = getenv( "MOZ_PLUGIN_PATH" );
-
+        
         // get directories
         std::list< rtl::OUString > aPaths;
         if( pNPXPluginPath )
@@ -599,7 +599,7 @@ Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() th
             aPaths.push_back( getString( xURL ) );
             CFRelease( xURL );
         }
-
+        
         rtl::OUString aPath = FindFolderURL( kUserDomain, kInternetPlugInFolderType );
         if( aPath.getLength() )
             aPaths.push_back( aPath );
@@ -609,14 +609,14 @@ Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() th
         aPath = FindFolderURL( kOnAppropriateDisk, kInternetPlugInFolderType );
         if( aPath.getLength() )
             aPaths.push_back( aPath );
-
-
+        
+        
         const Sequence< ::rtl::OUString >& rPaths( PluginManager::getAdditionalSearchPaths() );
         for( sal_Int32 i = 0; i < rPaths.getLength(); i++ )
         {
             aPaths.push_back( getURLFromPath( rPaths.getConstArray()[i] ) );
         }
-
+        
         for( std::list< rtl::OUString >::const_iterator it = aPaths.begin(); it != aPaths.end(); ++it )
         {
             rtl::OUString aPath( *it );
@@ -625,8 +625,8 @@ Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() th
 #endif
             CheckPlugin( aPath, aPlugins );
         }
-
-
+        
+        
         // create return value
         aDescriptions = Sequence<PluginDescription>( aPlugins.size() );
 #if OSL_DEBUG_LEVEL > 1
diff --git a/extensions/source/plugin/aqua/sysplug.cxx b/extensions/source/plugin/aqua/sysplug.cxx
index 39e3fc5cc4c4..3139b5cdfe45 100644
--- a/extensions/source/plugin/aqua/sysplug.cxx
+++ b/extensions/source/plugin/aqua/sysplug.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ MacPluginComm::MacPluginComm( const rtl::OUString& i_rMimetype, const rtl::OUStr
 {
     // initialize plugin function table
     memset( &m_aNPPfuncs, 0, sizeof( m_aNPPfuncs ) );
-
+    
     // load the bundle
     CFURLRef xURL = createURL( i_rBundle );
     m_xBundle = CFBundleCreate( NULL, xURL );
@@ -247,7 +247,7 @@ MacPluginComm::MacPluginComm( const rtl::OUString& i_rMimetype, const rtl::OUStr
     m_aNPPfuncs.size = sizeof( m_aNPPfuncs );
     m_aNPPfuncs.version = 0;
 
-
+    
     m_eCall = eNP_Initialize;
     execute();
 }
@@ -277,7 +277,7 @@ BOOL MacPluginComm::retrieveFunction( const char* i_pName, void** o_ppFunc ) con
         return FALSE;
 
     *o_ppFunc = (void*)osl_getAsciiFunctionSymbol( m_hPlugLib, i_pName );
-
+  
     if( ! *o_ppFunc && m_xBundle )
     {
         rtl::OUString aName( OUString::createFromAscii( *i_pName == '_' ? i_pName+1 : i_pName ) );
@@ -295,7 +295,7 @@ BOOL MacPluginComm::retrieveFunction( const char* i_pName, void** o_ppFunc ) con
 IMPL_LINK( MacPluginComm, NullTimerHdl, void*, EMPTYARG )
 {
     // note: this is a Timer handler, we are already protected by the SolarMutex
-
+    
     FakeEventRecord aRec;
     aRec.what = nullEvent;
     aRec.where.h = aRec.where.v = 20000;
@@ -307,7 +307,7 @@ IMPL_LINK( MacPluginComm, NullTimerHdl, void*, EMPTYARG )
         if( rPlugData.m_pPlugView ) // for safety do not dispatch null events before first NPP_SetWindow
             (*m_aNPPfuncs.event)( (*it)->getNPPInstance(), &aRec );
     }
-
+    
     return 0;
 }
 
@@ -330,8 +330,8 @@ long MacPluginComm::doIt()
             NPError (*pEntry)( NPPluginFuncs* );
             retrieveFunction( "NP_GetEntryPoints", (void**)&pEntry );
             nErr = (*pEntry)( &m_aNPPfuncs );
-
-            DBG_ASSERT( nErr == NPERR_NO_ERROR, "NP_GetEntryPoints() failed!" );
+        
+            DBG_ASSERT( nErr == NPERR_NO_ERROR, "NP_GetEntryPoints() failed!" );            
         }
         else
         {
@@ -343,7 +343,7 @@ long MacPluginComm::doIt()
     case eNPP_Destroy:
         if( m_aNullEventClients.empty() )
             delete m_pNullTimer, m_pNullTimer = NULL;
-
+        
         TRACE( "eNPP_Destroy" );
         nRet = (m_aNPPfuncs.destroy
                 ? (*m_aNPPfuncs.destroy)(
@@ -408,7 +408,7 @@ long MacPluginComm::doIt()
                     (NPP)m_aArgs[0],
                     (NPWindow*)m_aArgs[1] )
                 : NPERR_GENERIC_ERROR);
-
+        
         break;
     }
     case eNPP_HandleEvent:
@@ -419,7 +419,7 @@ long MacPluginComm::doIt()
                     (NPP)m_aArgs[0],
                     m_aArgs[1] )
                 : NPERR_GENERIC_ERROR);
-
+        
         break;
     }
     case eNPP_StreamAsFile:
@@ -501,9 +501,9 @@ NPError MacPluginComm::NPP_Destroy( XPlugin_Impl* i_pImpl, NPSavedData** save )
 {
     // remove from NullEvent timer
     m_aNullEventClients.remove( i_pImpl );
-
+    
     NPError nErr = NPP_Destroy( i_pImpl->getNPPInstance(), save );
-
+    
     // release plugin view
     SysPlugData& rPlugData( i_pImpl->getSysPlugData() );
     if( rPlugData.m_pPlugView )
@@ -512,7 +512,7 @@ NPError MacPluginComm::NPP_Destroy( XPlugin_Impl* i_pImpl, NPSavedData** save )
         [rPlugData.m_pPlugView release];
         rPlugData.m_pPlugView = nil;
     }
-
+    
     return nErr;
 }
 
@@ -546,7 +546,7 @@ NPError MacPluginComm::NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode
 
     if( pImpl ) // sanity check
         m_aNullEventClients.push_back( pImpl );
-
+    
     DBG_ASSERT( m_aNPPfuncs.newp, "### NPP_New(): null pointer in NPP functions table!" );
     #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "NPP_New( %s. %p, %d, %d",
@@ -563,7 +563,7 @@ NPError MacPluginComm::NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode
     m_aArgs[4] = (void*)argn;
     m_aArgs[5] = (void*)argv;
     m_aArgs[6] = (void*)saved;
-
+    
     return (NPError)execute();
 }
 
@@ -703,7 +703,7 @@ void MacPluginComm::NPP_Shutdown()
 NPError MacPluginComm::NPP_SetWindow( XPlugin_Impl* i_pImpl )
 {
     // update window NPWindow from view
-    SysPlugData& rPlugData( i_pImpl->getSysPlugData() );
+    SysPlugData& rPlugData( i_pImpl->getSysPlugData() );        
 
     // update plug view
     NSRect aPlugRect = [rPlugData.m_pParentView frame];
@@ -721,31 +721,31 @@ NPError MacPluginComm::NPP_SetWindow( XPlugin_Impl* i_pImpl )
     NSRect aWinRect = [pWin frame];
     NSRect aBounds = [rPlugData.m_pPlugView frame];
     NSRect aVisibleBounds = [rPlugData.m_pPlugView visibleRect];
-
+    
     #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "visible bounds = %d+%d+%dx%d\n",
              (int)aVisibleBounds.origin.x, (int)aVisibleBounds.origin.y,
              (int)aVisibleBounds.size.width, (int)aVisibleBounds.size.height );
     #endif
-
+    
     NSPoint aViewOrigin = [rPlugData.m_pPlugView convertPoint: NSZeroPoint toView: nil];
     // save view origin so we can notice movement of the view in drawView
     // in case of a moved view we need to reset the port/context
     rPlugData.m_aLastPlugViewOrigin = aViewOrigin;
-
+    
     // convert view origin to topdown coordinates
     aViewOrigin.y = aWinRect.size.height - aViewOrigin.y;
-
+    
     // same for clipping
     NSPoint aClipOrigin = [rPlugData.m_pPlugView convertPoint: aVisibleBounds.origin toView: nil];
     aClipOrigin.y = aWinRect.size.height - aClipOrigin.y;
-
+    
     #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "view origin: %d+%d, clip origin = %d+%d\n",
              (int)aViewOrigin.x, (int)aViewOrigin.y,
              (int)aClipOrigin.x, (int)aClipOrigin.y );
     #endif
-
+    
     pNPWin->x                = aViewOrigin.x;
     pNPWin->y                = aViewOrigin.y;
     pNPWin->width            = aBounds.size.width;
@@ -756,7 +756,7 @@ NPError MacPluginComm::NPP_SetWindow( XPlugin_Impl* i_pImpl )
     pNPWin->clipRect.bottom  = aClipOrigin.y + aVisibleBounds.size.height;
 
     if( rPlugData.m_nDrawingModel == 1 )
-    {
+    {        
         rPlugData.m_aCGContext.window = reinterpret_cast<WindowRef>([pWin windowRef]);
         pNPWin->window = &rPlugData.m_aCGContext;
         rPlugData.m_aCGContext.context = reinterpret_cast<CGContextRef>([[pWin graphicsContext] graphicsPort]);
@@ -776,12 +776,12 @@ NPError MacPluginComm::NPP_SetWindow( XPlugin_Impl* i_pImpl )
                  rPlugData.m_aNPPort.port, (int)rPlugData.m_aNPPort.portx, (int)rPlugData.m_aNPPort.porty );
         #endif
     }
-
+    
     if( pNPWin->width == 0 || pNPWin->height == 0 || [rPlugData.m_pPlugView isHiddenOrHasHiddenAncestor] )
         rPlugData.m_bSetWindowOnDraw = true;
 
     NPError nErr = NPP_SetWindow( i_pImpl->getNPPInstance(), i_pImpl->getNPWindow() );
-
+    
     return nErr;
 }
 
diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx
index 4d6a109d57e5..bf23f9c19113 100644
--- a/extensions/source/plugin/base/context.cxx
+++ b/extensions/source/plugin/base/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
@@ -52,19 +52,19 @@
 using namespace com::sun::star::io;
 
 namespace ext_plug {
-
+    
 class FileSink : public ::cppu::WeakAggImplHelper1< ::com::sun::star::io::XOutputStream >
 {
 private:
-    Reference< ::com::sun::star::lang::XMultiServiceFactory >   m_xSMgr;
-    FILE*                   fp;
-    Reference< ::com::sun::star::plugin::XPlugin >              m_xPlugin;
-    ::rtl::OUString                 m_aMIMEType;
-    ::rtl::OUString                 m_aTarget;
-    ::rtl::OUString                 m_aFileName;
+    Reference< ::com::sun::star::lang::XMultiServiceFactory > 	m_xSMgr;
+    FILE*					fp;
+    Reference< ::com::sun::star::plugin::XPlugin > 				m_xPlugin;
+    ::rtl::OUString					m_aMIMEType;
+    ::rtl::OUString					m_aTarget;
+    ::rtl::OUString					m_aFileName;
 
 public:
-    FileSink( const Reference< ::com::sun::star::lang::XMultiServiceFactory >   &,
+    FileSink( const Reference< ::com::sun::star::lang::XMultiServiceFactory > 	&,
               const Reference< ::com::sun::star::plugin::XPlugin > & plugin,
               const ::rtl::OUString& mimetype,
               const ::rtl::OUString& target,
@@ -82,8 +82,8 @@ using namespace ext_plug;
 
 class XPluginContext_Impl : public ::cppu::WeakAggImplHelper1< ::com::sun::star::plugin::XPluginContext >
 {
-    Reference< ::com::sun::star::lang::XMultiServiceFactory >   m_xSMgr;
-    rtl_TextEncoding                                        m_aEncoding;
+    Reference< ::com::sun::star::lang::XMultiServiceFactory > 	m_xSMgr;
+    rtl_TextEncoding										m_aEncoding;
 public:
 
     XPluginContext_Impl( const Reference< ::com::sun::star::lang::XMultiServiceFactory >  & );
@@ -142,7 +142,7 @@ void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlu
                                   0, 0, (sal_Bool)(aUrl.compareToAscii( "file:", 5 ) == 0) );
         return;
     }
-
+    
     Reference< ::com::sun::star::frame::XComponentLoader >  xLoader( xInst, UNO_QUERY );
     XPlugin_Impl* pPlugin = XPluginManager_Impl::getPluginImplementation( plugin );
 
@@ -151,9 +151,9 @@ void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlu
         try
         {
             ::com::sun::star::beans::PropertyValue aValue;
-            aValue.Name     = ::rtl::OUString::createFromAscii( "Referer" );
+            aValue.Name		= ::rtl::OUString::createFromAscii( "Referer" );
             aValue.Value <<= pPlugin->getRefererURL();
-
+            
             Sequence< ::com::sun::star::beans::PropertyValue > aArgs( &aValue, 1 );
             Reference< ::com::sun::star::lang::XComponent >  xComp =
                 xLoader->loadComponentFromURL(
@@ -228,10 +228,10 @@ void XPluginContext_Impl::postURL(const Reference< ::com::sun::star::plugin::XPl
         try
         {
             ::com::sun::star::beans::PropertyValue aValues[2];
-            aValues[0].Name = ::rtl::OUString::createFromAscii( "Referer" );
+            aValues[0].Name	= ::rtl::OUString::createFromAscii( "Referer" );
             aValues[0].Value <<= pPlugin->getRefererURL();
-
-            aValues[1].Name = ::rtl::OUString::createFromAscii( "PostString" );
+            
+            aValues[1].Name	= ::rtl::OUString::createFromAscii( "PostString" );
             aValues[1].Value <<= ::rtl::OStringToOUString( (char*)( file ? aBuf : buf ).getConstArray(), m_aEncoding );
             Sequence< ::com::sun::star::beans::PropertyValue > aArgs( aValues, 2 );
             Reference< ::com::sun::star::lang::XComponent >  xComp =
@@ -313,7 +313,7 @@ void FileSink::closeOutput() throw()
             ::com::sun::star::beans::PropertyValue aValue;
             aValue.Name = ::rtl::OUString::createFromAscii( "Referer" );
             aValue.Value <<= pPlugin->getRefererURL();
-
+            
             Sequence< ::com::sun::star::beans::PropertyValue > aArgs( &aValue, 1 );
             Reference< ::com::sun::star::lang::XComponent >  xComp =
                 xLoader->loadComponentFromURL(
diff --git a/extensions/source/plugin/base/evtlstnr.cxx b/extensions/source/plugin/base/evtlstnr.cxx
index d01844aadff6..ffbf3c208031 100644
--- a/extensions/source/plugin/base/evtlstnr.cxx
+++ b/extensions/source/plugin/base/evtlstnr.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/plugin/base/manager.cxx b/extensions/source/plugin/base/manager.cxx
index 0ebee37244c9..4e193244d0eb 100644
--- a/extensions/source/plugin/base/manager.cxx
+++ b/extensions/source/plugin/base/manager.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/plugin/base/multiplx.cxx b/extensions/source/plugin/base/multiplx.cxx
index 209885f6a475..bd25b51db184 100644
--- a/extensions/source/plugin/base/multiplx.cxx
+++ b/extensions/source/plugin/base/multiplx.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include <osl/diagnose.h>
 #include <plugin/multiplx.hxx>
 
-//  ---------------------------------------------------------------------
-//  class MRCListenerMultiplexerHelper
-//  ---------------------------------------------------------------------
+//	---------------------------------------------------------------------
+//	class MRCListenerMultiplexerHelper
+//	---------------------------------------------------------------------
 MRCListenerMultiplexerHelper::MRCListenerMultiplexerHelper
 (
       const Reference< ::com::sun::star::awt::XWindow >  & rControl
@@ -172,32 +172,32 @@ void MRCListenerMultiplexerHelper::disposing(const ::com::sun::star::lang::Event
     xPeer = Reference< ::com::sun::star::awt::XWindow > ();
 }
 
-#define MULTIPLEX( InterfaceName, MethodName, EventName )                   \
-::cppu::OInterfaceContainerHelper * pCont;                                          \
-pCont = aListenerHolder.getContainer( ::getCppuType((const Reference< InterfaceName >*)0) );        \
-if( pCont )                                                                 \
-{                                                                           \
-    ::cppu::OInterfaceIteratorHelper    aIt( *pCont );                              \
-    EventName aEvt = e;                                                     \
-    /* Remark: The control is the event source not the peer. We must change */  \
-    /* the source of the event */                                               \
+#define MULTIPLEX( InterfaceName, MethodName, EventName )					\
+::cppu::OInterfaceContainerHelper * pCont;											\
+pCont = aListenerHolder.getContainer( ::getCppuType((const Reference< InterfaceName >*)0) );		\
+if( pCont )																	\
+{																			\
+    ::cppu::OInterfaceIteratorHelper	aIt( *pCont );								\
+    EventName aEvt = e;														\
+    /* Remark: The control is the event source not the peer. We must change	*/	\
+    /* the source of the event */												\
     aEvt.Source = xControl;\
-    /*.is the control not destroyed */                                      \
-    if( aEvt.Source.is() )                                                  \
-    {                                                                       \
-        if( aIt.hasMoreElements() )                                         \
-        {                                                                   \
-            InterfaceName * pListener = (InterfaceName *)aIt.next();        \
-            try                                                             \
-            {                                                               \
-                pListener->MethodName( aEvt );                              \
-            }                                                               \
-            catch( RuntimeException& )                                  \
-            {                                                               \
-                /* ignore all usr system exceptions from the listener */    \
-            }                                                               \
-        }                                                                   \
-    }                                                                       \
+    /*.is the control not destroyed */										\
+    if( aEvt.Source.is() )													\
+    {																		\
+        if( aIt.hasMoreElements() )											\
+        {																	\
+            InterfaceName * pListener = (InterfaceName *)aIt.next();		\
+            try																\
+            {																\
+                pListener->MethodName( aEvt );								\
+            }																\
+            catch( RuntimeException& )									\
+            {																\
+                /* ignore all usr system exceptions from the listener */	\
+            }																\
+        }																	\
+    }																		\
 }
 
 // ::com::sun::star::awt::XFocusListener
diff --git a/extensions/source/plugin/base/nfuncs.cxx b/extensions/source/plugin/base/nfuncs.cxx
index b378795a92f1..cbfc05e423e8 100644
--- a/extensions/source/plugin/base/nfuncs.cxx
+++ b/extensions/source/plugin/base/nfuncs.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,9 +158,9 @@ static ::rtl::OString normalizeURL( XPlugin_Impl* plugin, const ::rtl::OString&
 
 struct AsynchronousGetURL
 {
-    OUString                        aUrl;
-    OUString                        aTarget;
-    Reference< XEventListener >     xListener;
+    OUString						aUrl;
+    OUString						aTarget;
+    Reference< XEventListener >		xListener;
 
     DECL_LINK( getURL, XPlugin_Impl* );
 };
@@ -287,9 +287,9 @@ extern "C" {
             pImpl->addPluginEventListener( pListener );
             pListener = NULL;
         }
-        pAsync->aUrl        = OStringToOUString( aLoadURL, pImpl->getTextEncoding() );
-        pAsync->aTarget     = OStringToOUString( target, pImpl->getTextEncoding() );
-        pAsync->xListener   = pListener;
+        pAsync->aUrl		= OStringToOUString( aLoadURL, pImpl->getTextEncoding() );
+        pAsync->aTarget		= OStringToOUString( target, pImpl->getTextEncoding() );
+        pAsync->xListener	= pListener;
         pImpl->setLastGetUrl( aLoadURL );
         Application::PostUserEvent( LINK( pAsync, AsynchronousGetURL, getURL ), pImpl );
 
@@ -550,7 +550,7 @@ NPError SAL_CALL NP_LOADDS  NPN_GetValue( NPP instance, NPNVariable variable, vo
 
     if( ! pImpl )
         return 0;
-
+    
     NPError aResult( NPERR_NO_ERROR );
 
     switch( variable )
@@ -622,9 +622,9 @@ NPError SAL_CALL NP_LOADDS  NPN_SetValue( NPP instance,
     case (NPPVariable)1000: // NPNVpluginDrawingModel
     {
         int nDrawingModel = (int)value; // ugly, but that's the way we need to do it
-
+        
         TRACEN( "drawing model: ", nDrawingModel );
-
+        
         XPlugin_Impl* pImpl = XPluginManager_Impl::getXPluginFromNPP( instance );
         if( pImpl )
             pImpl->getSysPlugData().m_nDrawingModel = nDrawingModel;
diff --git a/extensions/source/plugin/base/plcom.cxx b/extensions/source/plugin/base/plcom.cxx
index 9aef0e1de458..a77145cdf573 100644
--- a/extensions/source/plugin/base/plcom.cxx
+++ b/extensions/source/plugin/base/plcom.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/plugin/base/plctrl.cxx b/extensions/source/plugin/base/plctrl.cxx
index 4498ecedcb3b..cf86074806f9 100644
--- a/extensions/source/plugin/base/plctrl.cxx
+++ b/extensions/source/plugin/base/plctrl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,11 +99,11 @@ void PluginControl_Impl::dispose(void)
 void PluginControl_Impl::setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWidth_, sal_Int32 nHeight_, sal_Int16 nFlags )
     throw( RuntimeException )
 {
-    _nX         = nX_ >=0 ? nX_ : 0;
-    _nY         = nY_ >=0 ? nY_ : 0;
-    _nWidth     = nWidth_ >=0 ? nWidth_ : 0;
-    _nHeight    = nHeight_ >=0 ? nHeight_ : 0;
-    _nFlags     = nFlags;
+    _nX			= nX_ >=0 ? nX_ : 0;
+    _nY			= nY_ >=0 ? nY_ : 0;
+    _nWidth		= nWidth_ >=0 ? nWidth_ : 0;
+    _nHeight	= nHeight_ >=0 ? nHeight_ : 0;
+    _nFlags		= nFlags;
 
     if (_xPeerWindow.is())
         _xPeerWindow->setPosSize( _nX, _nY, _nWidth, _nHeight, nFlags );
@@ -124,7 +124,7 @@ void PluginControl_Impl::setVisible( sal_Bool bVisible )
     if (_xPeerWindow.is())
         _xPeerWindow->setVisible( _bVisible && !_bInDesignMode );
 }
-
+    
 //---- ::com::sun::star::awt::XWindow -------------------------------------------------------------------------------------
 void PluginControl_Impl::setEnable( sal_Bool bEnable )
     throw( RuntimeException )
@@ -133,7 +133,7 @@ void PluginControl_Impl::setEnable( sal_Bool bEnable )
     if (_xPeerWindow.is())
         _xPeerWindow->setEnable( _bEnable );
 }
-
+    
 //---- ::com::sun::star::awt::XWindow -------------------------------------------------------------------------------------
 void PluginControl_Impl::setFocus(void) throw( RuntimeException )
 {
@@ -149,9 +149,9 @@ void PluginControl_Impl::releasePeer()
     {
         _xParentWindow->removeFocusListener( this );
         _xPeerWindow->dispose();
-        _pSysChild      = NULL;
-        _xPeerWindow    = Reference< ::com::sun::star::awt::XWindow > ();
-        _xPeer          = Reference< ::com::sun::star::awt::XWindowPeer > ();
+        _pSysChild		= NULL;
+        _xPeerWindow	= Reference< ::com::sun::star::awt::XWindow > ();
+        _xPeer			= Reference< ::com::sun::star::awt::XWindowPeer > ();
         getMultiplexer()->setPeer( Reference< ::com::sun::star::awt::XWindow > () );
     }
 }
@@ -169,20 +169,20 @@ void PluginControl_Impl::createPeer( const Reference< ::com::sun::star::awt::XTo
     _xParentPeer = xParentPeer;
     _xParentWindow = Reference< ::com::sun::star::awt::XWindow > ( xParentPeer, UNO_QUERY );
     DBG_ASSERT( _xParentWindow.is(), "### no parent peer window!" );
-
+    
     Window* pImpl = VCLUnoHelper::GetWindow( xParentPeer );
     if (pImpl)
     {
         _pSysChild = new SystemChildWindow( pImpl, WB_CLIPCHILDREN );
         if (pImpl->HasFocus())
             _pSysChild->GrabFocus();
-
+        
         // get peer
-        _xPeer          = Reference< ::com::sun::star::awt::XWindowPeer > ( _pSysChild->GetComponentInterface() );
-        _xPeerWindow    = Reference< ::com::sun::star::awt::XWindow > ( _xPeer, UNO_QUERY );
+        _xPeer			= Reference< ::com::sun::star::awt::XWindowPeer > ( _pSysChild->GetComponentInterface() );
+        _xPeerWindow	= Reference< ::com::sun::star::awt::XWindow > ( _xPeer, UNO_QUERY );
         // !_BOTH_ MUST BE VALID!
         DBG_ASSERT( (_xPeer.is() && _xPeerWindow.is()), "### no peer!" );
-
+        
         _xParentWindow->addFocusListener( this );
         _xPeerWindow->setPosSize( _nX, _nY, _nWidth, _nHeight, _nFlags );
         _xPeerWindow->setEnable( _bEnable );
@@ -220,7 +220,7 @@ void PluginControl_Impl::removePaintListener( const Reference< ::com::sun::star:
 }
 
 //---- ::com::sun::star::awt::XWindow -------------------------------------------------------------------------------------
-void PluginControl_Impl::addWindowListener( const Reference< ::com::sun::star::awt::XWindowListener > & l )
+void PluginControl_Impl::addWindowListener(	const Reference< ::com::sun::star::awt::XWindowListener > & l )
     throw( RuntimeException )
 {
     getMultiplexer()->advise( ::getCppuType((const Reference< ::com::sun::star::awt::XWindowListener >*)0), l );
diff --git a/extensions/source/plugin/base/plmodel.cxx b/extensions/source/plugin/base/plmodel.cxx
index 9cd5cd0e79cc..5a7164720900 100644
--- a/extensions/source/plugin/base/plmodel.cxx
+++ b/extensions/source/plugin/base/plmodel.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,13 +115,13 @@ Reference< ::com::sun::star::beans::XPropertySetInfo >  PluginModel::getProperty
 }
 
 sal_Bool PluginModel::convertFastPropertyValue( Any & rConvertedValue,
-                                                Any & rOldValue,
+                                                Any & rOldValue, 
                                                 sal_Int32 nHandle,
                                                 const Any& rValue ) throw()
 {
     if( nHandle == 1 || nHandle == 2 )
     {
-        if( rValue.getValueTypeClass() == TypeClass_STRING )
+        if( rValue.getValueTypeClass() == TypeClass_STRING )   
         {
             rConvertedValue = rValue;
             if( nHandle == 2 )
@@ -182,7 +182,7 @@ void PluginModel::dispose(void) throw()
         (*it)->disposing( aEvt );
 
     m_aDisposeListeners.clear();
-
+    
     disposing();
 }
 
diff --git a/extensions/source/plugin/base/service.cxx b/extensions/source/plugin/base/service.cxx
index 1ce6dcc1a05c..0b5d8321bf22 100644
--- a/extensions/source/plugin/base/service.cxx
+++ b/extensions/source/plugin/base/service.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ extern "C" {
             try
             {
                 Reference< ::com::sun::star::registry::XRegistryKey > xKey( reinterpret_cast< ::com::sun::star::registry::XRegistryKey* >( pXUnoKey ) );
-
+                
                 ::rtl::OUString aImplName = ::rtl::OUString::createFromAscii( "/" );
                 aImplName += XPluginManager_Impl::getImplementationName_Static();
                 aImplName += ::rtl::OUString::createFromAscii( "/UNO/SERVICES/com.sun.star.plugin.PluginManager" );
                 xKey->createKey( aImplName );
-
+                
                 aImplName = ::rtl::OUString::createFromAscii( "/" );
                 aImplName += PluginModel::getImplementationName_Static();
                 aImplName += ::rtl::OUString::createFromAscii( "/UNO/SERVICES/com.sun.star.plugin.PluginModel" );
                 xKey->createKey( aImplName );
-
+                
                 return sal_True;
             }
             catch( ::com::sun::star::registry::InvalidRegistryException& )
diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx
index 8e8af63b94b8..610cc8dd1d91 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -283,14 +283,14 @@ void XPlugin_Impl::freeArgs()
 
 void XPlugin_Impl::prependArg( const char* pName, const char* pValue )
 {
-    const char** pNewNames      = new const char*[m_nArgs+1];
-    const char** pNewValues = new const char*[m_nArgs+1];
+    const char** pNewNames		= new const char*[m_nArgs+1];
+    const char** pNewValues	= new const char*[m_nArgs+1];
 
-    pNewNames[0]        = strdup( pName );
-    pNewValues[0]       = strdup( pValue );
+    pNewNames[0]		= strdup( pName );
+    pNewValues[0]		= strdup( pValue );
     for( int nIndex = 0; nIndex < m_nArgs; ++nIndex )
     {
-        pNewNames[nIndex+1] = m_pArgn[nIndex];
+        pNewNames[nIndex+1]	= m_pArgn[nIndex];
         pNewValues[nIndex+1]= m_pArgv[nIndex];
     }
     // free old arrays
@@ -334,23 +334,23 @@ void XPlugin_Impl::handleSpecialArgs()
             m_pArgv = new const char*[m_nArgs];
 
             // SRC
-            m_pArgn[0]      = strdup( "SRC" );
-            m_pArgv[0]      = strdup( OUStringToOString( aURL, m_aEncoding ).getStr() );
+            m_pArgn[0]		= strdup( "SRC" );
+            m_pArgv[0]		= strdup( OUStringToOString( aURL, m_aEncoding ).getStr() );
             // WIDTH
-            m_pArgn[1]      = strdup( "WIDTH" );
-            m_pArgv[1]      = strdup( "200" );
+            m_pArgn[1]		= strdup( "WIDTH" );
+            m_pArgv[1]		= strdup( "200" );
             // HEIGHT
-            m_pArgn[2]      = strdup( "HEIGHT" );
-            m_pArgv[2]      = strdup( "200" );
+            m_pArgn[2]		= strdup( "HEIGHT" );
+            m_pArgv[2]		= strdup( "200" );
             // CONTROLS
-            m_pArgn[3]      = strdup( "CONTROLS" );
-            m_pArgv[3]      = strdup( "PlayButton,StopButton,ImageWindow" );
+            m_pArgn[3]		= strdup( "CONTROLS" );
+            m_pArgv[3]		= strdup( "PlayButton,StopButton,ImageWindow" );
             // AUTOSTART
-            m_pArgn[4]      = strdup( "AUTOSTART" );
-            m_pArgv[4]      = strdup( "TRUE" );
+            m_pArgn[4]		= strdup( "AUTOSTART" );
+            m_pArgv[4]		= strdup( "TRUE" );
             // NOJAVA
-            m_pArgn[5]      = strdup( "NOJAVA" );
-            m_pArgv[5]      = strdup( "TRUE" );
+            m_pArgn[5]		= strdup( "NOJAVA" );
+            m_pArgv[5]		= strdup( "TRUE" );
         }
     }
     // #69333# special for pdf
@@ -875,14 +875,14 @@ void XPlugin_Impl::setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWidth_,
 
     PluginControl_Impl::setPosSize(nX_, nY_, nWidth_, nHeight_, nFlags);
 
-    m_aNPWindow.x                   = 0;
-    m_aNPWindow.y                   = 0;
-    m_aNPWindow.width               = nWidth_;
-    m_aNPWindow.height              = nHeight_;
-    m_aNPWindow.clipRect.top        = 0;
-    m_aNPWindow.clipRect.left       = 0;
-    m_aNPWindow.clipRect.right      = ::sal::static_int_cast< uint16, sal_Int32 >( nWidth_ );
-    m_aNPWindow.clipRect.bottom     = ::sal::static_int_cast< uint16, sal_Int32 >( nHeight_ );
+    m_aNPWindow.x       			= 0;
+    m_aNPWindow.y       			= 0;
+    m_aNPWindow.width   			= nWidth_;
+    m_aNPWindow.height  			= nHeight_;
+    m_aNPWindow.clipRect.top		= 0;
+    m_aNPWindow.clipRect.left		= 0;
+    m_aNPWindow.clipRect.right		= ::sal::static_int_cast< uint16, sal_Int32 >( nWidth_ );
+    m_aNPWindow.clipRect.bottom		= ::sal::static_int_cast< uint16, sal_Int32 >( nHeight_ );
 
     if( getPluginComm() )
         getPluginComm()->NPP_SetWindow( this );
diff --git a/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx b/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx
index 01b8dafa0f2c..acabff40f123 100644
--- a/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx
+++ b/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ rtl::OUString           CFURLtoOSLURL( CFURLRef i_xURL );
 class MacPluginComm :
     public PluginComm,
     public ::vcl::SolarThreadExecutor
-
+    
 {
     enum CallType {
         eNPP_Destroy,
@@ -92,13 +92,13 @@ class MacPluginComm :
         eNP_Initialize
     };
 
-    void*               m_aArgs[ 8 ];
-    CallType            m_eCall;
-
-    virtual long        doIt();
+    void*				m_aArgs[ 8 ];
+    CallType			m_eCall;
+    
+    virtual long		doIt();
 public:
                         MacPluginComm( const rtl::OUString& rMIME, const rtl::OUString& rName, NSView* pView );
-    virtual             ~MacPluginComm();
+    virtual				~MacPluginComm();
 
     // FIXME:
     // this actually should be from the NP headers
@@ -111,39 +111,39 @@ public:
     } NP_CGContext;
 
 public:
-    virtual NPError     NPP_Destroy( NPP instance, NPSavedData** save );
-    virtual NPError     NPP_DestroyStream( NPP instance, NPStream* stream, NPError reason );
-    virtual void *      NPP_GetJavaClass();
-    virtual NPError     NPP_Initialize();
-    virtual NPError     NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
+    virtual NPError		NPP_Destroy( NPP instance, NPSavedData** save );
+    virtual NPError		NPP_DestroyStream( NPP instance, NPStream* stream, NPError reason );
+    virtual void *		NPP_GetJavaClass();
+    virtual NPError		NPP_Initialize();
+    virtual NPError		NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
                                  char* argn[], char* argv[], NPSavedData *saved );
-    virtual NPError     NPP_NewStream( NPP instance, NPMIMEType type, NPStream* stream,
+    virtual NPError		NPP_NewStream( NPP instance, NPMIMEType type, NPStream* stream,
                                        NPBool seekable, uint16* stype );
-    virtual void        NPP_Print( NPP instance, NPPrint* platformPrint );
-    virtual NPError     NPP_SetWindow( NPP instance, NPWindow* window );
-    virtual void        NPP_Shutdown();
-    virtual void        NPP_StreamAsFile( NPP instance, NPStream* stream, const char* fname );
-    virtual void        NPP_URLNotify( NPP instance, const char* url,
+    virtual void		NPP_Print( NPP instance, NPPrint* platformPrint );
+    virtual NPError		NPP_SetWindow( NPP instance, NPWindow* window );
+    virtual void		NPP_Shutdown();
+    virtual void		NPP_StreamAsFile( NPP instance, NPStream* stream, const char* fname );
+    virtual void		NPP_URLNotify( NPP instance, const char* url,
                                        NPReason reason, void* notifyData );
-    virtual int32       NPP_Write( NPP instance, NPStream* stream, int32 offset,
+    virtual int32		NPP_Write( NPP instance, NPStream* stream, int32 offset,
                                    int32 len, void* buffer );
-    virtual int32       NPP_WriteReady( NPP instance, NPStream* stream );
-    virtual NPError     NPP_GetValue( NPP instance, NPPVariable variable, void *ret_value );
-    virtual NPError     NPP_SetValue( NPP instance, NPNVariable variable, void *ret_value );
+    virtual int32		NPP_WriteReady( NPP instance, NPStream* stream );
+    virtual NPError		NPP_GetValue( NPP instance, NPPVariable variable, void *ret_value );
+    virtual NPError		NPP_SetValue( NPP instance, NPNVariable variable, void *ret_value );
     virtual int16       NPP_HandleEvent( NPP instance, void* event );
 
     virtual NPError     NPP_SetWindow( XPlugin_Impl* );
     virtual NPError     NPP_Destroy( XPlugin_Impl*, NPSavedData** save );
-
+    
     void                drawView( XPlugin_Impl* );
 private:
-    BOOL                retrieveFunction( const char* i_pName, void** i_ppFunc ) const;
+    BOOL				retrieveFunction( const char* i_pName, void** i_ppFunc ) const;
     DECL_LINK( NullTimerHdl, void* );
-
+        
 private:
     CFBundleRef         m_xBundle;
-    oslModule           m_hPlugLib;
-    NPPluginFuncs       m_aNPPfuncs;
+    oslModule			m_hPlugLib;
+    NPPluginFuncs		m_aNPPfuncs;
 
     // timer for sending nullEvents
     AutoTimer*                      m_pNullTimer;
diff --git a/extensions/source/plugin/inc/plugin/impl.hxx b/extensions/source/plugin/inc/plugin/impl.hxx
index a11460eb384f..99bedc5da5ce 100644
--- a/extensions/source/plugin/inc/plugin/impl.hxx
+++ b/extensions/source/plugin/inc/plugin/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
@@ -69,11 +69,11 @@
 
 #include <list>
 
-#ifdef WNT
+#ifdef WNT 
 #include "plugin/win/sysplug.hxx"
 #endif
 
-#ifdef WNT
+#ifdef WNT 
 #include <plugin/win/sysplug.hxx>
 #elif defined(OS2)
 #include "plugin/os2/sysplug.hxx"
@@ -100,9 +100,9 @@ typedef int SysPlugData;
 
 using namespace com::sun::star::uno;
 
-#define PROVIDING_NONE              0
-#define PROVIDING_NOW               1
-#define PROVIDING_MODEL_UPDATE      2
+#define PROVIDING_NONE				0
+#define PROVIDING_NOW				1
+#define PROVIDING_MODEL_UPDATE		2
 
 // forwards
 namespace ucbhelper { class Content; }
@@ -118,36 +118,36 @@ class XPlugin_Impl : public com::sun::star::plugin::XPlugin,
                      public com::sun::star::beans::XPropertyChangeListener
 {
 private:
-    ::osl::Mutex                m_aMutex;
-    Reference< com::sun::star::lang::XMultiServiceFactory >         m_xSMgr;
-    Reference< com::sun::star::plugin::XPluginContext >             m_rBrowserContext;
+    ::osl::Mutex				m_aMutex;
+    Reference< com::sun::star::lang::XMultiServiceFactory > 		m_xSMgr;
+    Reference< com::sun::star::plugin::XPluginContext > 			m_rBrowserContext;
 
-    PluginComm*                 m_pPluginComm;
-    NPP_t                       m_aInstance;
-    NPWindow                    m_aNPWindow;
+    PluginComm*					m_pPluginComm;
+    NPP_t						m_aInstance;
+    NPWindow					m_aNPWindow;
     SysPlugData                 m_aSysPlugData;
-    rtl_TextEncoding            m_aEncoding;
+    rtl_TextEncoding			m_aEncoding;
 
-    const char**                m_pArgv;
-    const char**                m_pArgn;
-    int                         m_nArgs;
-    rtl::OString                m_aLastGetUrl;
+    const char**				m_pArgv;
+    const char**				m_pArgn;
+    int							m_nArgs;
+    rtl::OString				m_aLastGetUrl;
 
-    Reference< com::sun::star::awt::XControlModel >             m_xModel;
+    Reference< com::sun::star::awt::XControlModel > 			m_xModel;
 
-    ::com::sun::star::plugin::PluginDescription         m_aDescription;
-    sal_Int16                       m_aPluginMode;
+    ::com::sun::star::plugin::PluginDescription			m_aDescription;
+    sal_Int16						m_aPluginMode;
 
-    int                         m_nProvidingState;
-    int                         m_nCalledFromPlugin;
-    PluginDisposer*             m_pDisposer;
+    int							m_nProvidingState;
+    int							m_nCalledFromPlugin;
+    PluginDisposer*				m_pDisposer;
 
-    ::std::list<PluginInputStream*>     m_aInputStreams;
-    ::std::list<PluginOutputStream*>    m_aOutputStreams;
-    ::std::list<PluginEventListener*>   m_aPEventListeners;
-    ::rtl::OUString                     m_aURL;
+    ::std::list<PluginInputStream*>		m_aInputStreams;
+    ::std::list<PluginOutputStream*>	m_aOutputStreams;	
+    ::std::list<PluginEventListener*>	m_aPEventListeners;
+    ::rtl::OUString						m_aURL;
 
-    sal_Bool                        m_bIsDisposed;
+    sal_Bool						m_bIsDisposed;
 
     void prependArg( const char* pName, const char* pValue ); // arguments will be strdup'ed
     void initArgs( const Sequence< rtl::OUString >& argn,
@@ -155,7 +155,7 @@ private:
                    sal_Int16 mode );
     void freeArgs();
     void handleSpecialArgs();
-
+    
     void loadPlugin();
     void destroyInstance();
     void modelChanged();
@@ -165,7 +165,7 @@ public:
     virtual ~XPlugin_Impl();
 
     ::osl::Mutex& getMutex() { return m_aMutex; }
-
+    
     void destroyStreams();
 
     void setLastGetUrl( const rtl::OString& rUrl ) { m_aLastGetUrl = rUrl; }
@@ -174,8 +174,8 @@ public:
 
     ::std::list<PluginInputStream*>& getInputStreams() { return m_aInputStreams; }
     ::std::list<PluginOutputStream*>& getOutputStreams() { return m_aOutputStreams; }
-    PluginComm*     getPluginComm() { return m_pPluginComm; }
-    void            setPluginComm( PluginComm* comm )
+    PluginComm*		getPluginComm() { return m_pPluginComm; }
+    void			setPluginComm( PluginComm* comm )
         {
             if( ! m_pPluginComm )
             {
@@ -186,32 +186,32 @@ public:
     Reference< com::sun::star::lang::XMultiServiceFactory > getServiceManager() { return m_xSMgr; }
     const com::sun::star::plugin::PluginDescription& getDescription() const { return m_aDescription; }
     rtl_TextEncoding getTextEncoding() { return m_aEncoding; }
-    NPP             getNPPInstance() { return &m_aInstance; }
-    NPWindow*       getNPWindow() { return &m_aNPWindow; }
+    NPP				getNPPInstance() { return &m_aInstance; }
+    NPWindow*		getNPWindow() { return &m_aNPWindow; }
     SysPlugData&    getSysPlugData() { return m_aSysPlugData; }
 
-    void            enterPluginCallback() { m_nCalledFromPlugin++; }
-    void            leavePluginCallback() { m_nCalledFromPlugin--; }
-    sal_Bool            isDisposable() { return m_nCalledFromPlugin < 1 ? sal_True : sal_False; }
-    DECL_LINK( secondLevelDispose, XPlugin_Impl* );
+    void			enterPluginCallback() { m_nCalledFromPlugin++; }
+    void			leavePluginCallback() { m_nCalledFromPlugin--; }
+    sal_Bool			isDisposable() { return m_nCalledFromPlugin < 1 ? sal_True : sal_False; }
+    DECL_LINK( secondLevelDispose, XPlugin_Impl* );	
 
     void addPluginEventListener( PluginEventListener* pListener  )
         { m_aPEventListeners.push_back( pListener ); }
     void checkListeners( const char* normalizedURL );
-
-    void            initInstance(
+    
+    void			initInstance( 
         const com::sun::star::plugin::PluginDescription& rDescription,
         const Sequence< rtl::OUString >& argn,
         const Sequence< rtl::OUString >& argv,
         sal_Int16 mode );
-    void            initInstance(
+    void			initInstance( 
         const rtl::OUString& rURL,
         const Sequence< rtl::OUString >& argn,
         const Sequence< rtl::OUString >& argv,
         sal_Int16 mode );
 
-    const rtl::OUString&    getRefererURL() { return m_aURL; }
-    ::rtl::OUString getCreationURL();
+    const rtl::OUString&	getRefererURL() { return m_aURL; }
+    ::rtl::OUString	getCreationURL();
 
     PluginStream* getStreamFromNPStream( NPStream* );
 
@@ -223,11 +223,11 @@ public:
     void setPluginContext( const Reference< com::sun::star::plugin::XPluginContext > & );
 
     void secondLevelDispose();
-
-//  static const Reference< com::sun::star::reflection::XIdlClass > &   staticGetIdlClass();
+    
+//	static const Reference< com::sun::star::reflection::XIdlClass > &	staticGetIdlClass();
 
     // XInterface
-    virtual Any SAL_CALL queryInterface( const Type& ) throw( com::sun::star::uno::RuntimeException );
+    virtual Any	SAL_CALL queryInterface( const Type& ) throw( com::sun::star::uno::RuntimeException );
     virtual void SAL_CALL acquire()  throw()
     { OWeakAggObject::acquire(); }
     virtual void SAL_CALL release()  throw()
@@ -258,12 +258,12 @@ public:
 class PluginManager
 {
 private:
-    Reference< com::sun::star::lang::XMultiServiceFactory >         m_xSMgr;
-    ::std::list<PluginComm*>        m_aPluginComms;
-    ::std::list<XPlugin_Impl*>      m_aAllPlugins;
-    ::osl::Mutex                    m_aPluginMutex;
+    Reference< com::sun::star::lang::XMultiServiceFactory > 		m_xSMgr;
+    ::std::list<PluginComm*>		m_aPluginComms;
+    ::std::list<XPlugin_Impl*>		m_aAllPlugins;
+    ::osl::Mutex					m_aPluginMutex;
 
-    static PluginManager*       pManager;
+    static PluginManager*		pManager;
 
     PluginManager();
 public:
@@ -280,7 +280,7 @@ public:
 class XPluginManager_Impl :
     public cppu::WeakAggImplHelper1< com::sun::star::plugin::XPluginManager >
 {
-    Reference< com::sun::star::lang::XMultiServiceFactory >     m_xSMgr;
+    Reference< com::sun::star::lang::XMultiServiceFactory > 	m_xSMgr;
 public:
     XPluginManager_Impl( const Reference< com::sun::star::lang::XMultiServiceFactory >  & );
     virtual ~XPluginManager_Impl();
@@ -302,10 +302,10 @@ public:
 
     virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw();
     virtual rtl::OUString SAL_CALL getImplementationName() throw();
-
+    
     Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw(  );
     static Sequence< rtl::OUString > getSupportedServiceNames_Static(void) throw(  );
-    static rtl::OUString                getImplementationName_Static() throw(  )
+    static rtl::OUString 				getImplementationName_Static() throw(  )
     {
         /** the soplayer uses this name in its source! maybe not after 5.2 */
         return rtl::OUString::createFromAscii( "com.sun.star.extensions.PluginManager" );
@@ -318,8 +318,8 @@ enum PluginStreamType { InputStream, OutputStream };
 class PluginStream
 {
 protected:
-    XPlugin_Impl*       m_pPlugin;
-    NPStream            m_aNPStream;
+    XPlugin_Impl*		m_pPlugin;
+    NPStream			m_aNPStream;
 public:
     PluginStream( XPlugin_Impl* pPlugin,
                    const char* url, sal_uInt32 len, sal_uInt32 lastmod );
@@ -339,26 +339,26 @@ class PluginInputStream :
                 >
 {
 private:
-    ::ucbhelper::Content*       m_pContent;
-    sal_Int32                   m_nMode;
-    UINT32                      m_nWritePos;
+    ::ucbhelper::Content*		m_pContent;
+    sal_Int32					m_nMode;
+    UINT32						m_nWritePos;
 
-    Reference< com::sun::star::io::XActiveDataSource >  m_xSource;
+    Reference< com::sun::star::io::XActiveDataSource >	m_xSource;
     // hold a reference on input until closeOutput is called
-
-    Reference< com::sun::star::io::XConnectable >           m_xPredecessor;
-    Reference< com::sun::star::io::XConnectable >           m_xSuccessor;
+    
+    Reference< com::sun::star::io::XConnectable >			m_xPredecessor;
+    Reference< com::sun::star::io::XConnectable >			m_xSuccessor;
 
     // needed to hold a reference to self in NP_SEEK mode
-    Reference< com::sun::star::io::XOutputStream >          m_xSelf;
-
-    SvFileStream                m_aFileStream;
+    Reference< com::sun::star::io::XOutputStream >			m_xSelf;
+    
+    SvFileStream				m_aFileStream;
 public:
     PluginInputStream( XPlugin_Impl* pPlugin,
                    const char* url, UINT32 len, UINT32 lastmod );
 
     PluginInputStream() : PluginStream( NULL, NULL, 0, 0 ) {}
-
+    
     virtual ~PluginInputStream();
 
     virtual PluginStreamType getStreamType();
@@ -370,7 +370,7 @@ public:
     void load();
 
     // clear reference
-    bool releaseSelf()
+    bool releaseSelf() 
     { bool bRet = m_xSelf.is(); m_xSelf.clear();  return bRet; }
 
     // XOutputStream
@@ -393,7 +393,7 @@ public:
 class PluginOutputStream : public PluginStream
 {
 private:
-    Reference< com::sun::star::io::XOutputStream >  m_xStream;
+    Reference< com::sun::star::io::XOutputStream > 	m_xStream;
 public:
     PluginOutputStream( XPlugin_Impl* pPlugin, const char* url,
                         sal_uInt32 len, sal_uInt32 lastmod );
@@ -408,11 +408,11 @@ class PluginEventListener :
     public cppu::WeakAggImplHelper1< com::sun::star::lang::XEventListener >
 {
 private:
-    XPlugin_Impl*   m_pPlugin;
-    Reference< com::sun::star::plugin::XPlugin >        m_xPlugin; // just to hold the plugin
-    char*           m_pUrl;
-    char*           m_pNormalizedUrl;
-    void*           m_pNotifyData;
+    XPlugin_Impl*	m_pPlugin;
+    Reference< com::sun::star::plugin::XPlugin > 		m_xPlugin; // just to hold the plugin
+    char*			m_pUrl;
+    char*			m_pNormalizedUrl;
+    void*			m_pNotifyData;
 public:
     PluginEventListener( XPlugin_Impl*,
                          const char* url,
@@ -422,8 +422,8 @@ public:
 
     const char* getURL() { return m_pUrl; }
     const char* getNormalizedURL() { return m_pNormalizedUrl; }
-    void*       getNotifyData() { return m_pNotifyData; }
-
+    void*		getNotifyData() { return m_pNotifyData; }
+    
     // com::sun::star::lang::XEventListener
     virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject&  Source ) throw();
 };
diff --git a/extensions/source/plugin/inc/plugin/model.hxx b/extensions/source/plugin/inc/plugin/model.hxx
index 8832b8ed1f75..91dfea02e32f 100644
--- a/extensions/source/plugin/inc/plugin/model.hxx
+++ b/extensions/source/plugin/inc/plugin/model.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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:
     ~BroadcasterHelperHolder() {}
 
     ::cppu::OBroadcastHelper& getHelper() { return m_aHelper; }
-
+    
 };
 
 class PluginModel : public BroadcasterHelperHolder,
@@ -111,7 +111,7 @@ class PluginModel : public BroadcasterHelperHolder,
     // OPropertySetHelper
     virtual cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
     virtual sal_Bool  SAL_CALL convertFastPropertyValue( Any & rConvertedValue,
-                                                         Any & rOldValue,
+                                                         Any & rOldValue, 
                                                          sal_Int32 nHandle,
                                                          const Any& rValue ) throw();
     virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle,
diff --git a/extensions/source/plugin/inc/plugin/multiplx.hxx b/extensions/source/plugin/inc/plugin/multiplx.hxx
index 27c29785721f..4544304b785e 100644
--- a/extensions/source/plugin/inc/plugin/multiplx.hxx
+++ b/extensions/source/plugin/inc/plugin/multiplx.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ struct MRCListenerMultiplexerHelper_Mutex
     ::osl::Mutex aMutex;
 };
 
-class MRCListenerMultiplexerHelper  :
+class MRCListenerMultiplexerHelper	:
     public MRCListenerMultiplexerHelper_Mutex,
 
     public ::cppu::WeakAggImplHelper7<
@@ -79,17 +79,17 @@ public:
     /**
      * Create a Multiplexer of XWindowEvents.
      *
-     * @param rControl  The control. All listeners think that this is the original
-     *                  broadcaster.
-     * @param rPeer     The peer from which the original events are dispatched. Null is
-     *                  allowed.
+     * @param rControl	The control. All listeners think that this is the original
+     *					broadcaster.
+     * @param rPeer		The peer from which the original events are dispatched. Null is
+     *					allowed.
      */
     MRCListenerMultiplexerHelper( const Reference< ::com::sun::star::awt::XWindow >  & rControl, const Reference< ::com::sun::star::awt::XWindow >  & rPeer );
 
     /**
      * Remove all listeners from the previous set peer and add the needed listeners to rPeer.
-     * @param rPeer     The peer from which the original events are dispatched. Null is
-     *                  allowed.
+     * @param rPeer		The peer from which the original events are dispatched. Null is
+     *					allowed.
      */
     void setPeer( const Reference< ::com::sun::star::awt::XWindow >  & rPeer );
 
@@ -108,61 +108,61 @@ public:
     void unadvise(const Type& type, const Reference< XInterface > & listener);
 
     // ::com::sun::star::lang::XEventListener
-    void SAL_CALL   disposing(const ::com::sun::star::lang::EventObject& Source) throw();
+    void SAL_CALL	disposing(const ::com::sun::star::lang::EventObject& Source) throw();
     // ::com::sun::star::awt::XFocusListener
-    void SAL_CALL   focusGained(const ::com::sun::star::awt::FocusEvent& e) throw();
-    void SAL_CALL   focusLost(const ::com::sun::star::awt::FocusEvent& e) throw();
+    void SAL_CALL	focusGained(const ::com::sun::star::awt::FocusEvent& e) throw();
+    void SAL_CALL	focusLost(const ::com::sun::star::awt::FocusEvent& e) throw();
     // ::com::sun::star::awt::XWindowListener
-    void SAL_CALL   windowResized(const ::com::sun::star::awt::WindowEvent& e) throw();
-    void SAL_CALL   windowMoved(const ::com::sun::star::awt::WindowEvent& e) throw();
-    void SAL_CALL   windowShown(const ::com::sun::star::lang::EventObject& e) throw();
-    void SAL_CALL   windowHidden(const ::com::sun::star::lang::EventObject& e) throw();
+    void SAL_CALL	windowResized(const ::com::sun::star::awt::WindowEvent& e) throw();
+    void SAL_CALL	windowMoved(const ::com::sun::star::awt::WindowEvent& e) throw();
+    void SAL_CALL	windowShown(const ::com::sun::star::lang::EventObject& e) throw();
+    void SAL_CALL	windowHidden(const ::com::sun::star::lang::EventObject& e) throw();
     // ::com::sun::star::awt::XKeyListener
-    void SAL_CALL   keyPressed( const ::com::sun::star::awt::KeyEvent& e ) throw();
-    void SAL_CALL   keyReleased( const ::com::sun::star::awt::KeyEvent& e ) throw();
+    void SAL_CALL	keyPressed( const ::com::sun::star::awt::KeyEvent& e ) throw();
+    void SAL_CALL	keyReleased( const ::com::sun::star::awt::KeyEvent& e ) throw();
     // ::com::sun::star::awt::XMouseListener
-    void SAL_CALL   mousePressed(const ::com::sun::star::awt::MouseEvent& e) throw();
-    void SAL_CALL   mouseReleased(const ::com::sun::star::awt::MouseEvent& e) throw();
-    void SAL_CALL   mouseEntered(const ::com::sun::star::awt::MouseEvent& e) throw();
-    void SAL_CALL   mouseExited(const ::com::sun::star::awt::MouseEvent& e) throw();
+    void SAL_CALL	mousePressed(const ::com::sun::star::awt::MouseEvent& e) throw();
+    void SAL_CALL	mouseReleased(const ::com::sun::star::awt::MouseEvent& e) throw();
+    void SAL_CALL	mouseEntered(const ::com::sun::star::awt::MouseEvent& e) throw();
+    void SAL_CALL	mouseExited(const ::com::sun::star::awt::MouseEvent& e) throw();
     // ::com::sun::star::awt::XMouseMotionListener
-    void SAL_CALL   mouseDragged(const ::com::sun::star::awt::MouseEvent& e) throw();
-    void SAL_CALL   mouseMoved(const ::com::sun::star::awt::MouseEvent& e) throw();
+    void SAL_CALL	mouseDragged(const ::com::sun::star::awt::MouseEvent& e) throw();
+    void SAL_CALL	mouseMoved(const ::com::sun::star::awt::MouseEvent& e) throw();
     // ::com::sun::star::awt::XPaintListener
-    void SAL_CALL   windowPaint(const ::com::sun::star::awt::PaintEvent& e) throw();
+    void SAL_CALL	windowPaint(const ::com::sun::star::awt::PaintEvent& e) throw();
     // ::com::sun::star::awt::XTopWindowListener
-    void SAL_CALL   windowOpened( const ::com::sun::star::lang::EventObject& e ) throw();
-    void SAL_CALL   windowClosing( const ::com::sun::star::lang::EventObject& e ) throw();
-    void SAL_CALL   windowClosed( const ::com::sun::star::lang::EventObject& e ) throw();
-    void SAL_CALL   windowMinimized( const ::com::sun::star::lang::EventObject& e ) throw();
-    void SAL_CALL   windowNormalized( const ::com::sun::star::lang::EventObject& e ) throw();
-    void SAL_CALL   windowActivated( const ::com::sun::star::lang::EventObject& e ) throw();
-    void SAL_CALL   windowDeactivated( const ::com::sun::star::lang::EventObject& e ) throw();
+    void SAL_CALL	windowOpened( const ::com::sun::star::lang::EventObject& e ) throw();
+    void SAL_CALL	windowClosing( const ::com::sun::star::lang::EventObject& e ) throw();
+    void SAL_CALL	windowClosed( const ::com::sun::star::lang::EventObject& e ) throw();
+    void SAL_CALL	windowMinimized( const ::com::sun::star::lang::EventObject& e ) throw();
+    void SAL_CALL	windowNormalized( const ::com::sun::star::lang::EventObject& e ) throw();
+    void SAL_CALL	windowActivated( const ::com::sun::star::lang::EventObject& e ) throw();
+    void SAL_CALL	windowDeactivated( const ::com::sun::star::lang::EventObject& e ) throw();
 protected:
     /**
      * Remove the listener with the uik rUik from the peer rPeer.
-     * @param rPeer the peer from which the listener is removed.
-     * @param rUik  the listener uik, which specify the type of the listener.
+     * @param rPeer	the peer from which the listener is removed.
+     * @param rUik	the listener uik, which specify the type of the listener.
      */
-    void        adviseToPeer( const Reference< ::com::sun::star::awt::XWindow >  & rPeer, const Type & type );
+    void		adviseToPeer( const Reference< ::com::sun::star::awt::XWindow >  & rPeer, const Type & type );
     /**
      * Add the listener with the uik rUik to the peer rPeer.
-     * @param rPeer the peer to which the listener is added.
-     * @param rUik  the listener uik, which specify the type of the listener.
+     * @param rPeer	the peer to which the listener is added.
+     * @param rUik	the listener uik, which specify the type of the listener.
      */
-    void        unadviseFromPeer( const Reference< ::com::sun::star::awt::XWindow >  & rPeer, const Type & type );
+    void		unadviseFromPeer( const Reference< ::com::sun::star::awt::XWindow >  & rPeer, const Type & type );
 private:
     /** The source of the events. Normally this is the peer object.*/
-    Reference< ::com::sun::star::awt::XWindow >         xPeer;
-    WeakReference< ::com::sun::star::awt::XControl >    xControl;
-    ::cppu::OMultiTypeInterfaceContainerHelper  aListenerHolder;
+    Reference< ::com::sun::star::awt::XWindow > 		xPeer;
+    WeakReference< ::com::sun::star::awt::XControl >	xControl;
+    ::cppu::OMultiTypeInterfaceContainerHelper	aListenerHolder;
 
 
     MRCListenerMultiplexerHelper( const MRCListenerMultiplexerHelper & );
     MRCListenerMultiplexerHelper & operator = ( const MRCListenerMultiplexerHelper & );
 };
 
-#endif  // _MRC_MULTIPLX_HXX
+#endif	// _MRC_MULTIPLX_HXX
 
 
 
diff --git a/extensions/source/plugin/inc/plugin/plcom.hxx b/extensions/source/plugin/inc/plugin/plcom.hxx
index b23fc6c6ada9..8775a8450e16 100644
--- a/extensions/source/plugin/inc/plugin/plcom.hxx
+++ b/extensions/source/plugin/inc/plugin/plcom.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class XPlugin_Impl;
 class PluginComm
 {
 protected:
-    int                         m_nRefCount;
-    ::rtl::OString              m_aLibName;
-    std::list< String >         m_aFilesToDelete;
+    int							m_nRefCount;
+    ::rtl::OString				m_aLibName;
+    std::list< String >			m_aFilesToDelete;
 public:
     PluginComm( const ::rtl::OString& rLibName, bool bReusable = true );
     virtual ~PluginComm();
@@ -78,7 +78,7 @@ public:
     virtual NPError NPP_GetValue( NPP instance, NPPVariable  variable, void* value ) = 0;
     virtual NPError NPP_SetValue( NPP instance, NPNVariable variable,
                                  void *value) = 0;
-
+    
     virtual NPError NPP_SetWindow( XPlugin_Impl* );
     virtual NPError NPP_Destroy( XPlugin_Impl*, NPSavedData** save );
 };
diff --git a/extensions/source/plugin/inc/plugin/plctrl.hxx b/extensions/source/plugin/inc/plugin/plctrl.hxx
index 06ee50cb8e0a..c98199213512 100644
--- a/extensions/source/plugin/inc/plugin/plctrl.hxx
+++ b/extensions/source/plugin/inc/plugin/plctrl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,33 +80,33 @@ public:
     { _xContext = xContext; }
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getContext() throw( ::com::sun::star::uno::RuntimeException )
     { return _xContext; }
-
+    
     virtual sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & Model ) throw( ::com::sun::star::uno::RuntimeException ) = 0;
-//  { DBG_ERROR( "### setModel() illegal on plugincontrol!" ); return sal_False; }
+//	{ DBG_ERROR( "### setModel() illegal on plugincontrol!" ); return sal_False; }
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel() throw( ::com::sun::star::uno::RuntimeException ) = 0;
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XView > SAL_CALL getView() throw( ::com::sun::star::uno::RuntimeException )
     { return (::com::sun::star::awt::XView*)this; }
-
+    
     virtual sal_Bool SAL_CALL isTransparent() throw( ::com::sun::star::uno::RuntimeException )
     { return sal_False; }
-
+    
     virtual void SAL_CALL setDesignMode( sal_Bool bOn ) throw( ::com::sun::star::uno::RuntimeException );
     virtual sal_Bool SAL_CALL isDesignMode() throw( ::com::sun::star::uno::RuntimeException )
     { return _bInDesignMode; }
-
+    
     virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > & xToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > & Parent) throw( ::com::sun::star::uno::RuntimeException );
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > SAL_CALL getPeer() throw( ::com::sun::star::uno::RuntimeException )
     { return _xPeer; }
-
+    
     // ::com::sun::star::awt::XWindow
     virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( ::com::sun::star::uno::RuntimeException );
     virtual void SAL_CALL setEnable( sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException );
     virtual void SAL_CALL setFocus(void) throw( ::com::sun::star::uno::RuntimeException );
-
+    
     virtual void SAL_CALL setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWidth_, sal_Int32 nHeight_, sal_Int16 nFlags ) throw( ::com::sun::star::uno::RuntimeException );
     virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize(void) throw( ::com::sun::star::uno::RuntimeException );
-
+    
     virtual void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener > & l ) throw( ::com::sun::star::uno::RuntimeException );
     virtual void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener > & l ) throw( ::com::sun::star::uno::RuntimeException );
     virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener > & l ) throw( ::com::sun::star::uno::RuntimeException );
@@ -125,11 +125,11 @@ public:
     // ::com::sun::star::awt::XFocusListener
     virtual void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent & rEvt ) throw( ::com::sun::star::uno::RuntimeException );
     virtual void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent & rEvt ) throw( ::com::sun::star::uno::RuntimeException );
-
+    
     // ::com::sun::star::lang::XComponent
     virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & l ) throw( ::com::sun::star::uno::RuntimeException );
     virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & l ) throw( ::com::sun::star::uno::RuntimeException );
-
+    
     virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException );
 
     // ::com::sun::star::awt::XView
@@ -137,44 +137,44 @@ public:
     { return sal_False; }
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > SAL_CALL getGraphics(void) throw( ::com::sun::star::uno::RuntimeException )
     { return ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > (); }
-
-    virtual ::com::sun::star::awt::Size SAL_CALL getSize(void) throw( ::com::sun::star::uno::RuntimeException )
+    
+    virtual ::com::sun::star::awt::Size	SAL_CALL getSize(void) throw( ::com::sun::star::uno::RuntimeException )
     { return ::com::sun::star::awt::Size(_nWidth, _nHeight); }
-
+    
     virtual void SAL_CALL draw( sal_Int32 x, sal_Int32 y ) throw( ::com::sun::star::uno::RuntimeException );
     virtual void SAL_CALL setZoom( float ZoomX, float ZoomY ) throw( ::com::sun::star::uno::RuntimeException );
 
 public:
                                 PluginControl_Impl();
-    virtual                     ~PluginControl_Impl();
-
+    virtual						~PluginControl_Impl();
+    
     MRCListenerMultiplexerHelper* getMultiplexer();
 
 protected:
-    void                        releasePeer();
-
+    void						releasePeer();
+    
 protected:
-    ::std::list< Reference< ::com::sun::star::lang::XEventListener > >  _aDisposeListeners;
-    MRCListenerMultiplexerHelper*       _pMultiplexer;
-
-    Reference< XInterface >                         _xContext;
-
-    sal_Int32                               _nX;
-    sal_Int32                               _nY;
-    sal_Int32                               _nWidth;
-    sal_Int32                               _nHeight;
-    sal_Int16                               _nFlags;
-
-    sal_Bool                                _bVisible;
-    sal_Bool                                _bInDesignMode;
-    sal_Bool                                _bEnable;
-
-    SystemChildWindow*                  _pSysChild;
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >                      _xPeer;
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >                          _xPeerWindow;
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >                          _xParentWindow;
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >                      _xParentPeer;
+    ::std::list< Reference< ::com::sun::star::lang::XEventListener > >	_aDisposeListeners;
+    MRCListenerMultiplexerHelper*		_pMultiplexer;
+
+    Reference< XInterface > 						_xContext;
+    
+    sal_Int32								_nX;
+    sal_Int32								_nY;
+    sal_Int32								_nWidth;
+    sal_Int32								_nHeight;
+    sal_Int16								_nFlags;
+    
+    sal_Bool								_bVisible;
+    sal_Bool								_bInDesignMode;
+    sal_Bool								_bEnable;
+    
+    SystemChildWindow*					_pSysChild;
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > 						_xPeer;
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > 							_xPeerWindow;
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > 							_xParentWindow;
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > 						_xParentPeer;
 };
 
 #endif
diff --git a/extensions/source/plugin/inc/plugin/unx/mediator.hxx b/extensions/source/plugin/inc/plugin/unx/mediator.hxx
index acf73c498a6c..1c847bb88e08 100644
--- a/extensions/source/plugin/inc/plugin/unx/mediator.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/mediator.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 struct MediatorMessage
 {
-    ULONG   m_nID;
-    ULONG   m_nBytes;
-    char*   m_pBytes;
-    char*   m_pRun;
+    ULONG	m_nID;
+    ULONG	m_nBytes;
+    char*	m_pBytes;
+    char*	m_pRun;
 
     MediatorMessage() : m_nID( 0 ), m_nBytes( 0 ),
         m_pBytes( NULL ), m_pRun( NULL ) {}
@@ -73,13 +73,13 @@ struct MediatorMessage
             memcpy( m_pBytes, pBytes, (size_t)m_nBytes );
         }
 
-    ULONG   ExtractULONG();
-    char*   GetString();
-    UINT32  GetUINT32();
-    void*   GetBytes( ULONG& );
-    void*   GetBytes() { ULONG nBytes; return GetBytes( nBytes ); }
+    ULONG	ExtractULONG();
+    char*	GetString();
+    UINT32	GetUINT32();
+    void*	GetBytes( ULONG& );
+    void*	GetBytes() { ULONG nBytes; return GetBytes( nBytes ); }
 
-    void    Rewind() { m_pRun = NULL; }
+    void	Rewind() { m_pRun = NULL; }
 };
 
 class MediatorListener;
@@ -88,22 +88,22 @@ class Mediator
 {
     friend class MediatorListener;
 protected:
-    int                                 m_nSocket;
+    int									m_nSocket;
 
-    std::vector<MediatorMessage*>       m_aMessageQueue;
+    std::vector<MediatorMessage*>		m_aMessageQueue;
     osl::Mutex m_aQueueMutex;
     osl::Mutex m_aSendMutex;
     // only one thread can send a message at any given time
     osl::Condition                      m_aNewMessageCdtn;
-    MediatorListener*                   m_pListener;
+    MediatorListener*					m_pListener;
     // thread to fill the queue
 
-    ULONG                               m_nCurrentID;
+    ULONG								m_nCurrentID;
     // will be constantly increased with each message sent
-    bool                                m_bValid;
+    bool								m_bValid;
 
-    Link                                m_aConnectionLostHdl;
-    Link                                m_aNewMessageHdl;
+    Link								m_aConnectionLostHdl;
+    Link								m_aNewMessageHdl;
 public:
     Mediator( int nSocket );
     ~Mediator();
@@ -155,7 +155,7 @@ class MediatorListener : public osl::Thread
 {
     friend class Mediator;
   private:
-    Mediator*       m_pMediator;
+    Mediator*		m_pMediator;
     ::osl::Mutex    m_aMutex;
 
     MediatorListener( Mediator* );
diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
index 7db023161249..491fdf4475a5 100644
--- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,15 +39,15 @@
 #    define USE_MOTIF
 #endif
 
-#define Window      XLIB_Window
-#define Font        XLIB_Font
-#define KeyCode     XLIB_KeyCode
-#define Time        XLIB_Time
-#define Cursor      XLIB_Cursor
-#define Region      XLIB_Region
-#define String      XLIB_String
-#define Boolean     XLIB_Boolean
-#define XPointer    XLIB_XPointer
+#define Window		XLIB_Window
+#define Font		XLIB_Font
+#define KeyCode		XLIB_KeyCode
+#define Time		XLIB_Time
+#define Cursor		XLIB_Cursor
+#define Region		XLIB_Region
+#define String		XLIB_String
+#define Boolean		XLIB_Boolean
+#define XPointer	XLIB_XPointer
 #include <X11/Xlib.h>
 extern "C" {
 #include <X11/Intrinsic.h>
@@ -137,17 +137,17 @@ extern "C" {
 class ConnectorInstance
 {
 public:
-    NPP                         instance;
-    NPWindow                    window;
-    NPSetWindowCallbackStruct   ws_info;
-    char*                       pMimeType;
-    void*                       pShell;
-    void*                       pWidget;
-    void*                       pForm;
-
+    NPP							instance;
+    NPWindow					window;
+    NPSetWindowCallbackStruct	ws_info;
+    char*						pMimeType;
+    void*						pShell;
+    void*						pWidget;
+    void*						pForm;
+    
     GtkWidget*                  pGtkWindow;
     GtkWidget*                  pGtkWidget;
-
+    
     bool                        bShouldUseXEmbed;
 
     int nArg;
@@ -170,29 +170,29 @@ protected:
     osl::Mutex               m_aUserEventMutex;
 
     static std::vector<PluginConnector*>  allConnectors;
-
+    
     DECL_LINK( NewMessageHdl, Mediator* );
     DECL_LINK( WorkOnNewMessageHdl, Mediator* );
-
+    
     std::vector<NPStream*>              m_aNPWrapStreams;
     std::vector<ConnectorInstance*>     m_aInstances;
-
-    ULONG   FillBuffer( char*&, const char*, ULONG, va_list );
+    
+    ULONG	FillBuffer( char*&, const char*, ULONG, va_list );
 public:
     PluginConnector( int nSocket );
     ~PluginConnector();
 
     virtual MediatorMessage* WaitForAnswer( ULONG nMessageID );
-    MediatorMessage*    Transact( const char*, ULONG, ... );
-    MediatorMessage*    Transact( UINT32, ... );
-    void                Respond( ULONG nID, char*, ULONG, ... );
-    ULONG               Send( UINT32, ... );
+    MediatorMessage*	Transact( const char*, ULONG, ... );
+    MediatorMessage*	Transact( UINT32, ... );
+    void				Respond( ULONG nID, char*, ULONG, ... );
+    ULONG				Send( UINT32, ... );
 
     static const UINT32 UnknownStreamID = 0xffffffff;
     static const UINT32 UnknownNPPID = 0xffffffff;
 
-    UINT32  GetStreamID( NPStream* pStream );
-    UINT32  GetNPPID( NPP );
+    UINT32	GetStreamID( NPStream* pStream );
+    UINT32	GetNPPID( NPP );
 
     std::vector<NPStream*>& getStreamList() { return m_aNPWrapStreams; }
 
@@ -209,7 +209,7 @@ public:
         LINK( this, PluginConnector, WorkOnNewMessageHdl ).
             Call( (Mediator*)this );
     }
-
+    
     ConnectorInstance* getInstance( NPP );
     ConnectorInstance* getInstanceById( UINT32 );
 };
diff --git a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx
index df44c149e30a..69d64f7ac514 100644
--- a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 class UnxPluginComm : public PluginComm, public PluginConnector
 {
 private:
-    static int  nConnCounter;
+    static int	nConnCounter;
 
-    pid_t       m_nCommPID;
+    pid_t		m_nCommPID;
 public:
     UnxPluginComm( const String& mimetype,
                    const String& library,
diff --git a/extensions/source/plugin/inc/plugin/win/sysplug.hxx b/extensions/source/plugin/inc/plugin/win/sysplug.hxx
index 45e09d98d950..4161312b4988 100644
--- a/extensions/source/plugin/inc/plugin/win/sysplug.hxx
+++ b/extensions/source/plugin/inc/plugin/win/sysplug.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 class PluginComm_Impl :
     public PluginComm,
     public ::vcl::SolarThreadExecutor
-
+    
 {
     enum CallType {
         eNPP_Destroy,
@@ -79,45 +79,45 @@ class PluginComm_Impl :
         eNP_Initialize
     };
 
-    void*               m_aArgs[ 8 ];
-    CallType            m_eCall;
-
-    virtual long        doIt();
+    void*				m_aArgs[ 8 ];
+    CallType			m_eCall;
+    
+    virtual long		doIt();
 public:
                         PluginComm_Impl( const rtl::OUString& rMIME, const rtl::OUString& rName, HWND hWnd );
-    virtual             ~PluginComm_Impl();
-
+    virtual				~PluginComm_Impl();
+    
 public:
     using PluginComm::NPP_Destroy;
-    virtual NPError     NPP_Destroy( NPP instance, NPSavedData** save );
-    virtual NPError     NPP_DestroyStream( NPP instance, NPStream* stream, NPError reason );
-    virtual void *      NPP_GetJavaClass();
-    virtual NPError     NPP_Initialize();
-    virtual NPError     NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
+    virtual NPError		NPP_Destroy( NPP instance, NPSavedData** save );
+    virtual NPError		NPP_DestroyStream( NPP instance, NPStream* stream, NPError reason );
+    virtual void *		NPP_GetJavaClass();
+    virtual NPError		NPP_Initialize();
+    virtual NPError		NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
                                  char* argn[], char* argv[], NPSavedData *saved );
-    virtual NPError     NPP_NewStream( NPP instance, NPMIMEType type, NPStream* stream,
+    virtual NPError		NPP_NewStream( NPP instance, NPMIMEType type, NPStream* stream,
                                        NPBool seekable, uint16* stype );
-    virtual void        NPP_Print( NPP instance, NPPrint* platformPrint );
-
+    virtual void		NPP_Print( NPP instance, NPPrint* platformPrint );
+    
     using PluginComm::NPP_SetWindow;
-    virtual NPError     NPP_SetWindow( NPP instance, NPWindow* window );
-    virtual void        NPP_Shutdown();
-    virtual void        NPP_StreamAsFile( NPP instance, NPStream* stream, const char* fname );
-    virtual void        NPP_URLNotify( NPP instance, const char* url,
+    virtual NPError		NPP_SetWindow( NPP instance, NPWindow* window );
+    virtual void		NPP_Shutdown();
+    virtual void		NPP_StreamAsFile( NPP instance, NPStream* stream, const char* fname );
+    virtual void		NPP_URLNotify( NPP instance, const char* url,
                                        NPReason reason, void* notifyData );
-    virtual int32       NPP_Write( NPP instance, NPStream* stream, int32 offset,
+    virtual int32		NPP_Write( NPP instance, NPStream* stream, int32 offset,
                                    int32 len, void* buffer );
-    virtual int32       NPP_WriteReady( NPP instance, NPStream* stream );
-    virtual NPError     NPP_GetValue( NPP instance, NPPVariable variable, void *ret_alue );
-    virtual NPError     NPP_SetValue( NPP instance, NPNVariable variable, void *ret_alue );
-
+    virtual int32		NPP_WriteReady( NPP instance, NPStream* stream );
+    virtual NPError		NPP_GetValue( NPP instance, NPPVariable variable, void *ret_alue );
+    virtual NPError		NPP_SetValue( NPP instance, NPNVariable variable, void *ret_alue );
+    
 private:
-    BOOL                retrieveFunction( TCHAR* pName, void** ppFunc ) const;
-
+    BOOL				retrieveFunction( TCHAR* pName, void** ppFunc ) const;
+    
 private:
-    HINSTANCE           _plDLL;
+    HINSTANCE			_plDLL;
 
-    NPPluginFuncs       _NPPfuncs;
+    NPPluginFuncs		_NPPfuncs;
 };
 
 
diff --git a/extensions/source/plugin/unx/mediator.cxx b/extensions/source/plugin/unx/mediator.cxx
index 4cbab9e0c9a2..afd42fa308bf 100644
--- a/extensions/source/plugin/unx/mediator.cxx
+++ b/extensions/source/plugin/unx/mediator.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 MediatorListener::run()
     {
         ULONG nHeader[ 3 ];
         int nBytes;
-
+        
         if( m_pMediator && ( nBytes = read( m_pMediator->m_nSocket, nHeader, sizeof( nHeader ) ) ) == sizeof( nHeader ) && nHeader[2] == MEDIATOR_MAGIC)
         {
             if( nHeader[ 0 ] == 0 && nHeader[ 1 ] == 0 )
diff --git a/extensions/source/plugin/unx/npnapi.cxx b/extensions/source/plugin/unx/npnapi.cxx
index 6e862f67b2c0..f1f58fcc08bf 100644
--- a/extensions/source/plugin/unx/npnapi.cxx
+++ b/extensions/source/plugin/unx/npnapi.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,12 +61,12 @@ static void* l_NPN_MemAlloc( uint32 nBytes )
     void* pMem = new char[nBytes];
     return pMem;
 }
-
+    
 static void l_NPN_MemFree( void* pMem )
 {
     delete [] (char*)pMem;
 }
-
+    
 static uint32 l_NPN_MemFlush( uint32 /*nSize*/ )
 {
     return 0;
@@ -77,7 +77,7 @@ static NPError l_NPN_DestroyStream( NPP instance, NPStream* stream, NPError reas
     UINT32 nInstance = pConnector->GetNPPID( instance );
     if( nInstance == PluginConnector::UnknownNPPID )
         return NPERR_GENERIC_ERROR;
-
+    
     UINT32 nFileID = pConnector->GetStreamID( stream );
     MediatorMessage* pMes=
         pConnector->
@@ -128,14 +128,14 @@ static NPError l_NPN_GetURL( NPP instance, const char* url, const char* window )
     UINT32 nInstance = pConnector->GetNPPID( instance );
     if( nInstance == PluginConnector::UnknownNPPID )
         return NPERR_GENERIC_ERROR;
-
+    
     MediatorMessage* pMes=
         pConnector->
         Transact( eNPN_GetURL,
                   &nInstance, sizeof( nInstance ),
                   POST_STRING(url),
                   POST_STRING(window),
-                  NULL );
+                  NULL );	
     medDebug( !pMes, "geturl: message unaswered\n" );
     if( ! pMes )
         return NPERR_GENERIC_ERROR;
@@ -200,7 +200,7 @@ static NPError l_NPN_NewStream( NPP instance, NPMIMEType type, const char* targe
         pStream->end = pMes->GetUINT32();
         pStream->lastmodified = pMes->GetUINT32();
         pStream->ndata = pStream->pdata = pStream->notifyData = NULL;
-
+        
         pConnector->getStreamList().push_back( pStream );
         *stream = pStream;
     }
@@ -268,7 +268,7 @@ static NPError l_NPN_RequestRead( NPStream* stream, NPByteRange* rangeList )
         nRanges++;
         pRange = pRange->next;
     }
-
+    
     UINT32* pArray = new UINT32[ 2 * nRanges ];
     pRange = rangeList;
     UINT32 n = 0;
@@ -305,7 +305,7 @@ static void l_NPN_Status( NPP instance, const char* message )
     pConnector->Send( eNPN_Status,
                       &nInstance, sizeof( nInstance ),
                       POST_STRING( message ),
-                      NULL );
+                      NULL ); 
 }
 
 static const char* l_NPN_UserAgent( NPP instance )
@@ -382,7 +382,7 @@ static int32 l_NPN_Write( NPP instance, NPStream* stream, int32 len, void* buffe
         return 0;
 
     INT32 nRet = pMes->GetUINT32();
-    return nRet;
+    return nRet;  
 }
 
 static void l_NPN_ReloadPlugins( NPBool /*reloadPages*/ )
@@ -519,9 +519,9 @@ static NPPluginFuncs aPluginFuncs =
 
 
 oslModule pPluginLib = NULL;
-char*(*pNPP_GetMIMEDescription)()                               = NULL;
-NPError (*pNP_Initialize)(NPNetscapeFuncs*,NPPluginFuncs*)      = NULL;
-NPError (*pNP_Shutdown)()                                       = NULL;
+char*(*pNPP_GetMIMEDescription)()								= NULL;
+NPError (*pNP_Initialize)(NPNetscapeFuncs*,NPPluginFuncs*)		= NULL;
+NPError (*pNP_Shutdown)()										= NULL;
 
 std::vector< PluginConnector* > PluginConnector::allConnectors;
 
@@ -547,11 +547,11 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
         {
             case eNPP_DestroyStream:
             {
-                UINT32 nInstance    = pMessage->GetUINT32();
-                NPP instance        = m_aInstances[ nInstance ]->instance;
-                UINT32 nFileID      = pMessage->GetUINT32();
-                NPStream* pStream   = m_aNPWrapStreams[ nFileID ];
-                NPError aReason     = GetNPError( pMessage );
+                UINT32 nInstance	= pMessage->GetUINT32();
+                NPP instance		= m_aInstances[ nInstance ]->instance;
+                UINT32 nFileID		= pMessage->GetUINT32();
+                NPStream* pStream	= m_aNPWrapStreams[ nFileID ];
+                NPError aReason		= GetNPError( pMessage );
                 m_aNPWrapStreams.erase( m_aNPWrapStreams.begin() + nFileID );
 
                 aReason = aPluginFuncs.destroystream( instance, pStream, aReason );
@@ -565,7 +565,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
             break;
             case eNPP_Destroy:
             {
-                UINT32 nInstance    = pMessage->GetUINT32();
+                UINT32 nInstance	= pMessage->GetUINT32();
                 ConnectorInstance* pInst= m_aInstances[ nInstance ];
 
                 // some plugin rely on old netscapes behaviour
@@ -573,9 +573,9 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
                 // the instance, so mimic that behaviour here
                 if( pInst->pShell )
                     XtDestroyWidget( (Widget)pInst->pShell );
-
+                
                 pInst->pWidget = pInst->pShell = NULL;
-
+                
                 // the other side will call eNPP_DestroyPhase2 after this
                 NPError aReason = NPERR_NO_ERROR;
                 Respond( pMessage->m_nID, (char*)&aReason, sizeof( aReason ), NULL );
@@ -584,9 +584,9 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
             case eNPP_DestroyPhase2:
             {
                 // now really destroy the instance
-                UINT32 nInstance    = pMessage->GetUINT32();
+                UINT32 nInstance	= pMessage->GetUINT32();
                 ConnectorInstance* pInst= m_aInstances[ nInstance ];
-                NPP instance        = pInst->instance;
+                NPP instance		= pInst->instance;
                 NPSavedData* pSave = NULL;
 
                 NPError aRet = aPluginFuncs.destroy( instance, &pSave );
@@ -619,15 +619,15 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
             break;
             case eNPP_NewStream:
             {
-                UINT32 nInstance        = pMessage->GetUINT32();
-                NPP instance            = m_aInstances[ nInstance ]->instance;
-                char* pType             = pMessage->GetString();
-                NPStream* pStream       = new NPStream;
-                pStream->url            = pMessage->GetString();
-                pStream->end            = pMessage->GetUINT32();
-                pStream->lastmodified   = pMessage->GetUINT32();
+                UINT32 nInstance		= pMessage->GetUINT32();
+                NPP instance			= m_aInstances[ nInstance ]->instance;
+                char* pType				= pMessage->GetString();
+                NPStream* pStream		= new NPStream;
+                pStream->url			= pMessage->GetString();
+                pStream->end			= pMessage->GetUINT32();
+                pStream->lastmodified	= pMessage->GetUINT32();
                 pStream->pdata = pStream->ndata = pStream->notifyData = NULL;
-                NPBool* pSeekable       = (NPBool*)pMessage->GetBytes();
+                NPBool* pSeekable		= (NPBool*)pMessage->GetBytes();
                 m_aNPWrapStreams.push_back( pStream );
                 uint16 nStype = NP_ASFILE;
                 NPError aRet = aPluginFuncs.newstream( instance, pType, pStream,
@@ -646,10 +646,10 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
             break;
             case eNPP_New:
             {
-                char* pType     = pMessage->GetString();
-                uint16* pMode   = (uint16*)pMessage->GetBytes();
-                int16*  pArgc   = (int16*)pMessage->GetBytes();
-                NPP instance    = new NPP_t;
+                char* pType		= pMessage->GetString();
+                uint16* pMode	= (uint16*)pMessage->GetBytes();
+                int16*  pArgc	= (int16*)pMessage->GetBytes();
+                NPP instance	= new NPP_t;
                 instance->pdata = instance->ndata = NULL;
                 ULONG nArgnBytes, nArgvBytes;
                 char* pArgn = (char*)pMessage->GetBytes( nArgnBytes );
@@ -692,7 +692,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
                     medDebug( 1, "should use xembed = %s\n", pInst->bShouldUseXEmbed ? "true" : "false" );
                 }
                 #endif
-
+                
                 Respond( pMessage->m_nID,
                          (char*)&aRet, sizeof( aRet ),
                          NULL );
@@ -703,10 +703,10 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
             break;
             case eNPP_SetWindow:
             {
-                UINT32 nInstance        = pMessage->GetUINT32();
+                UINT32 nInstance		= pMessage->GetUINT32();
                 ConnectorInstance* pInst= m_aInstances[ nInstance ];
-                NPWindow* pWindow       = (NPWindow*)pMessage->GetBytes();
-
+                NPWindow* pWindow		= (NPWindow*)pMessage->GetBytes();
+                
                 if( pWindow->width < 1 )
                     pWindow->width = 1;
                 if( pWindow->height < 1 )
@@ -718,7 +718,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
                     if( ! pInst->pGtkWidget )
                     {
                         medDebug( 1, "creating gtk plug and socket\n" );
-
+                        
                         pInst->pGtkWindow = gtk_plug_new((GdkNativeWindow)reinterpret_cast<sal_uIntPtr>(pWindow->window));
                         gtk_widget_show( pInst->pGtkWindow );
                         pInst->pGtkWidget = gtk_socket_new();
@@ -733,56 +733,56 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
 
                         XSync( pAppDisplay, False );
                     }
-
+                    
                     // update widget size; alas out parent is not yet really XEMBED conformant
                     gtk_widget_set_size_request( pInst->pGtkWidget, pWindow->width, pWindow->height );
                     gtk_window_resize( GTK_WINDOW(pInst->pGtkWindow), pWindow->width, pWindow->height );
-
+                    
                     GdkScreen* pGdkScreen = gtk_widget_get_screen( pInst->pGtkWidget );
                     Screen* pScreen = ScreenOfDisplay( pAppDisplay, gdk_screen_get_number( pGdkScreen ) );
 
-                    pInst->window.x                 = 0;
-                    pInst->window.y                 = 0;
-                    pInst->window.width             = pWindow->width;
-                    pInst->window.height            = pWindow->height;
-                    pInst->window.clipRect.left     = 0;
-                    pInst->window.clipRect.top      = 0;
-                    pInst->window.clipRect.right    = pWindow->width;
-                    pInst->window.clipRect.bottom   = pWindow->height;
-                    pInst->window.ws_info           = &pInst->ws_info;
-                    pInst->window.type              = NPWindowTypeWindow;
-                    pInst->ws_info.type             = NP_SETWINDOW;
-                    pInst->ws_info.display          = pAppDisplay;
-                    pInst->ws_info.visual           = DefaultVisualOfScreen( pScreen );
-                    pInst->ws_info.colormap         = DefaultColormapOfScreen( pScreen );
-                    pInst->ws_info.depth            = DefaultDepthOfScreen( pScreen );
+                    pInst->window.x					= 0;
+                    pInst->window.y					= 0;
+                    pInst->window.width				= pWindow->width;
+                    pInst->window.height			= pWindow->height;
+                    pInst->window.clipRect.left		= 0;
+                    pInst->window.clipRect.top		= 0;
+                    pInst->window.clipRect.right	= pWindow->width;
+                    pInst->window.clipRect.bottom	= pWindow->height;
+                    pInst->window.ws_info			= &pInst->ws_info;
+                    pInst->window.type				= NPWindowTypeWindow;
+                    pInst->ws_info.type				= NP_SETWINDOW;
+                    pInst->ws_info.display			= pAppDisplay;
+                    pInst->ws_info.visual			= DefaultVisualOfScreen( pScreen );
+                    pInst->ws_info.colormap			= DefaultColormapOfScreen( pScreen );
+                    pInst->ws_info.depth			= DefaultDepthOfScreen( pScreen );
                 }
                 else
                 #endif
                 {
                     if( ! pInst->pWidget )
                     {
-                        pInst->pWidget = CreateNewShell( &(pInst->pShell), (XLIB_Window)pWindow->window );
+                        pInst->pWidget = CreateNewShell( &(pInst->pShell), (XLIB_Window)pWindow->window );					
                     }
-
+    
                     // fill in NPWindow and NPCallbackStruct
-                    pInst->window.window            = (void*)XtWindow( (Widget)pInst->pWidget );
-                    pInst->window.x                 = 0;
-                    pInst->window.y                 = 0;
-                    pInst->window.width             = pWindow->width;
-                    pInst->window.height            = pWindow->height;
-                    pInst->window.clipRect.left     = 0;
-                    pInst->window.clipRect.top      = 0;
-                    pInst->window.clipRect.right    = pWindow->width;
-                    pInst->window.clipRect.bottom   = pWindow->height;
-                    pInst->window.ws_info           = &pInst->ws_info;
-                    pInst->window.type              = NPWindowTypeWindow;
-                    pInst->ws_info.type             = NP_SETWINDOW;
-                    pInst->ws_info.display          = XtDisplay( (Widget)pInst->pWidget );
-                    pInst->ws_info.visual           = DefaultVisualOfScreen( XtScreen( (Widget)pInst->pWidget ) );
-                    pInst->ws_info.colormap         = DefaultColormapOfScreen( XtScreen( (Widget)pInst->pWidget ) );
-                    pInst->ws_info.depth            = DefaultDepthOfScreen( XtScreen( (Widget)pInst->pWidget ) );
-
+                    pInst->window.window			= (void*)XtWindow( (Widget)pInst->pWidget );
+                    pInst->window.x					= 0;
+                    pInst->window.y					= 0;
+                    pInst->window.width				= pWindow->width;
+                    pInst->window.height			= pWindow->height;
+                    pInst->window.clipRect.left		= 0;
+                    pInst->window.clipRect.top		= 0;
+                    pInst->window.clipRect.right	= pWindow->width;
+                    pInst->window.clipRect.bottom	= pWindow->height;
+                    pInst->window.ws_info			= &pInst->ws_info;
+                    pInst->window.type				= NPWindowTypeWindow;
+                    pInst->ws_info.type				= NP_SETWINDOW;
+                    pInst->ws_info.display			= XtDisplay( (Widget)pInst->pWidget );
+                    pInst->ws_info.visual			= DefaultVisualOfScreen( XtScreen( (Widget)pInst->pWidget ) );
+                    pInst->ws_info.colormap			= DefaultColormapOfScreen( XtScreen( (Widget)pInst->pWidget ) );
+                    pInst->ws_info.depth			= DefaultDepthOfScreen( XtScreen( (Widget)pInst->pWidget ) );
+    
                     XtResizeWidget( (Widget)pInst->pShell,
                                     pInst->window.width,
                                     pInst->window.height,
@@ -803,11 +803,11 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
             break;
             case eNPP_StreamAsFile:
             {
-                UINT32 nInstance        = pMessage->GetUINT32();
-                NPP instance            = m_aInstances[ nInstance ]->instance;
-                UINT32 nFileID          = pMessage->GetUINT32();
-                NPStream* pStream       = m_aNPWrapStreams[ nFileID ];
-                char* fname             = pMessage->GetString();
+                UINT32 nInstance		= pMessage->GetUINT32();
+                NPP instance			= m_aInstances[ nInstance ]->instance;
+                UINT32 nFileID			= pMessage->GetUINT32();
+                NPStream* pStream		= m_aNPWrapStreams[ nFileID ];
+                char* fname				= pMessage->GetString();
                 medDebug( 1, "pluginapp: NPP_StreamAsFile %s\n", fname );
                 aPluginFuncs.asfile( instance, pStream, fname );
                 delete [] fname;
@@ -815,11 +815,11 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
             break;
             case eNPP_URLNotify:
             {
-                UINT32 nInstance        = pMessage->GetUINT32();
-                NPP instance            = m_aInstances[ nInstance ]->instance;
-                char* url               = pMessage->GetString();
-                NPReason* pReason       = (NPReason*)pMessage->GetBytes();
-                void** notifyData       = (void**)pMessage->GetBytes();
+                UINT32 nInstance		= pMessage->GetUINT32();
+                NPP instance			= m_aInstances[ nInstance ]->instance;
+                char* url				= pMessage->GetString();
+                NPReason* pReason		= (NPReason*)pMessage->GetBytes();
+                void** notifyData		= (void**)pMessage->GetBytes();
                 aPluginFuncs.urlnotify( instance, url, *pReason, *notifyData );
                 delete [] url;
                 delete [] pReason;
@@ -828,15 +828,15 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
             break;
             case eNPP_WriteReady:
             {
-                UINT32 nInstance        = pMessage->GetUINT32();
-                NPP instance            = m_aInstances[ nInstance ]->instance;
-                UINT32 nFileID          = pMessage->GetUINT32();
-                NPStream* pStream       = m_aNPWrapStreams[ nFileID ];
+                UINT32 nInstance		= pMessage->GetUINT32();
+                NPP instance			= m_aInstances[ nInstance ]->instance;
+                UINT32 nFileID			= pMessage->GetUINT32();
+                NPStream* pStream		= m_aNPWrapStreams[ nFileID ];
                 int32 nRet = aPluginFuncs.writeready( instance, pStream );
-
+                
                 medDebug( 1, "pluginapp: NPP_WriteReady( %p, %p ) (stream id = %d) returns %d\n",
                           instance, pStream, nFileID, nRet );
-
+                
                 Respond( pMessage->m_nID,
                          (char*)&nRet, sizeof( nRet ),
                          NULL );
@@ -844,15 +844,15 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
             break;
             case eNPP_Write:
             {
-                UINT32 nInstance        = pMessage->GetUINT32();
-                NPP instance            = m_aInstances[ nInstance ]->instance;
-                UINT32 nFileID          = pMessage->GetUINT32();
-                NPStream* pStream       = m_aNPWrapStreams[ nFileID ];
-                int32 offset            = pMessage->GetUINT32();
+                UINT32 nInstance		= pMessage->GetUINT32();
+                NPP instance			= m_aInstances[ nInstance ]->instance;
+                UINT32 nFileID			= pMessage->GetUINT32();
+                NPStream* pStream		= m_aNPWrapStreams[ nFileID ];
+                int32 offset			= pMessage->GetUINT32();
                 ULONG len;
-                char* buffer            = (char*)pMessage->GetBytes( len );
+                char* buffer			= (char*)pMessage->GetBytes( len );
                 int32 nRet = aPluginFuncs.write( instance, pStream, offset, len, buffer );
-
+                
                 medDebug( 1,"pluginapp: NPP_Write( %p, %p, %d, %d, %p ) returns %d\n"
                           "stream = { pdata = %p, ndata = %p, url = %s, end = %d, lastmodified = %d, notifyData = %p }\n",
                           instance, pStream, offset, len, buffer, nRet,
diff --git a/extensions/source/plugin/unx/nppapi.cxx b/extensions/source/plugin/unx/nppapi.cxx
index bf0faabf15dc..c6dd6a59895d 100644
--- a/extensions/source/plugin/unx/nppapi.cxx
+++ b/extensions/source/plugin/unx/nppapi.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,10 +109,10 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
         {
             case eNPN_GetURL:
             {
-                UINT32 nInstance    = pMessage->GetUINT32();
-                NPP instance        = m_aInstances[ nInstance ]->instance;
-                char* pUrl          = pMessage->GetString();
-                char* pWindow       = pMessage->GetString();
+                UINT32 nInstance	= pMessage->GetUINT32();
+                NPP instance		= m_aInstances[ nInstance ]->instance;
+                char* pUrl			= pMessage->GetString();
+                char* pWindow		= pMessage->GetString();
                 NPError aRet = NPN_GetURL( instance, pUrl, pWindow );
                 Respond( pMessage->m_nID,
                          (char*)(&aRet), sizeof( NPError ), NULL );
@@ -122,11 +122,11 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
             break;
             case eNPN_GetURLNotify:
             {
-                UINT32 nInstance    = pMessage->GetUINT32();
-                NPP instance        = m_aInstances[ nInstance ]->instance;
-                char* pUrl          = pMessage->GetString();
-                char* pWindow       = pMessage->GetString();
-                void** pNotifyData  = (void**)pMessage->GetBytes();
+                UINT32 nInstance	= pMessage->GetUINT32();
+                NPP instance		= m_aInstances[ nInstance ]->instance;
+                char* pUrl			= pMessage->GetString();
+                char* pWindow		= pMessage->GetString();
+                void** pNotifyData	= (void**)pMessage->GetBytes();
                 NPError aRet = NPN_GetURLNotify( instance, pUrl, pWindow,
                                                  *pNotifyData );
                 Respond( pMessage->m_nID,
@@ -138,11 +138,11 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
             break;
             case eNPN_DestroyStream:
             {
-                UINT32 nInstance    = pMessage->GetUINT32();
-                NPP instance        = m_aInstances[ nInstance ]->instance;
-                UINT32 nFileID      = pMessage->GetUINT32();
-                char* pUrl          = pMessage->GetString();
-                NPError* pReason    = (NPError*)pMessage->GetBytes();
+                UINT32 nInstance	= pMessage->GetUINT32();
+                NPP instance		= m_aInstances[ nInstance ]->instance;
+                UINT32 nFileID		= pMessage->GetUINT32();
+                char* pUrl			= pMessage->GetString();
+                NPError* pReason	= (NPError*)pMessage->GetBytes();
                 NPError aRet = NPERR_FILE_NOT_FOUND;
                 if( nFileID < static_cast<UINT32>(m_aNPWrapStreams.size()) )
                 {
@@ -169,10 +169,10 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
             break;
             case eNPN_NewStream:
             {
-                UINT32 nInstance    = pMessage->GetUINT32();
-                NPP instance        = m_aInstances[ nInstance ]->instance;
-                NPMIMEType pType    = pMessage->GetString();
-                char* pTarget       = pMessage->GetString();
+                UINT32 nInstance	= pMessage->GetUINT32();
+                NPP instance		= m_aInstances[ nInstance ]->instance;
+                NPMIMEType pType	= pMessage->GetString();
+                char* pTarget		= pMessage->GetString();
 
                 NPStream* pStream = NULL;
 
@@ -200,21 +200,21 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
                              &pStream->lastmodified, sizeof(UINT32),
                              NULL );
                 }
-
+                
                 delete [] pTarget;
                 delete [] pType;
             }
             break;
             case eNPN_PostURLNotify:
             {
-                UINT32 nInstance    = pMessage->GetUINT32();
-                NPP instance        = m_aInstances[ nInstance ]->instance;
-                char* pUrl      = pMessage->GetString();
-                char* pTarget   = pMessage->GetString();
-                UINT32 nLen     = pMessage->GetUINT32();
-                char* pBuf      = (char*)pMessage->GetBytes();
-                NPBool* pFile   = (NPBool*)pMessage->GetBytes();
-                void** pNData   = (void**)pMessage->GetBytes();
+                UINT32 nInstance	= pMessage->GetUINT32();
+                NPP instance		= m_aInstances[ nInstance ]->instance;
+                char* pUrl		= pMessage->GetString();
+                char* pTarget	= pMessage->GetString();
+                UINT32 nLen		= pMessage->GetUINT32();
+                char* pBuf		= (char*)pMessage->GetBytes();
+                NPBool* pFile	= (NPBool*)pMessage->GetBytes();
+                void** pNData	= (void**)pMessage->GetBytes();
                 NPError aRet =
                     NPN_PostURLNotify( instance, pUrl, pTarget, nLen, pBuf, *pFile, *pNData );
                 Respond( pMessage->m_nID, (char*)&aRet, sizeof( aRet ), NULL );
@@ -227,13 +227,13 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
             break;
             case eNPN_PostURL:
             {
-                UINT32 nInstance    = pMessage->GetUINT32();
-                NPP instance        = m_aInstances[ nInstance ]->instance;
-                char* pUrl      = pMessage->GetString();
-                char* pWindow   = pMessage->GetString();
-                UINT32 nLen     = pMessage->GetUINT32();
-                char* pBuf      = (char*)pMessage->GetBytes();
-                NPBool* pFile   = (NPBool*)pMessage->GetBytes();
+                UINT32 nInstance	= pMessage->GetUINT32();
+                NPP instance		= m_aInstances[ nInstance ]->instance;
+                char* pUrl		= pMessage->GetString();
+                char* pWindow	= pMessage->GetString();
+                UINT32 nLen		= pMessage->GetUINT32();
+                char* pBuf		= (char*)pMessage->GetBytes();
+                NPBool* pFile	= (NPBool*)pMessage->GetBytes();
                 NPError aRet =
                     NPN_PostURL( instance, pUrl, pWindow, nLen, pBuf, *pFile );
                 Respond( pMessage->m_nID, (char*)&aRet, sizeof( aRet ), NULL );
@@ -245,13 +245,13 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
             break;
             case eNPN_RequestRead:
             {
-                UINT32 nFileID      = pMessage->GetUINT32();
-                NPStream* pStream   = m_aNPWrapStreams[ nFileID ];
-                UINT32 nRanges      = pMessage->GetUINT32();
-                UINT32* pArray      = (UINT32*)pMessage->GetBytes();
+                UINT32 nFileID		= pMessage->GetUINT32();
+                NPStream* pStream	= m_aNPWrapStreams[ nFileID ];
+                UINT32 nRanges		= pMessage->GetUINT32();
+                UINT32* pArray		= (UINT32*)pMessage->GetBytes();
                 // build ranges table
                 NPByteRange* pFirst = new NPByteRange;
-                NPByteRange* pRun   = pFirst;
+                NPByteRange* pRun	= pFirst;
                 for( UINT32 n = 0; n < nRanges; n++ )
                 {
                     pRun->offset = pArray[ 2*n ];
@@ -272,9 +272,9 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
             break;
             case eNPN_Status:
             {
-                UINT32 nInstance    = pMessage->GetUINT32();
-                NPP instance        = m_aInstances[ nInstance ]->instance;
-                char* pString   = pMessage->GetString();
+                UINT32 nInstance	= pMessage->GetUINT32();
+                NPP instance		= m_aInstances[ nInstance ]->instance;
+                char* pString	= pMessage->GetString();
                 NPN_Status( instance, pString );
                 delete [] pString;
             }
@@ -293,12 +293,12 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
             break;
             case eNPN_Write:
             {
-                UINT32 nInstance    = pMessage->GetUINT32();
-                NPP instance        = m_aInstances[ nInstance ]->instance;
-                UINT32 nFileID      = pMessage->GetUINT32();
-                NPStream* pStream   = m_aNPWrapStreams[ nFileID ];
-                INT32 nLen          = pMessage->GetUINT32();
-                void* pBuffer       = pMessage->GetBytes();
+                UINT32 nInstance	= pMessage->GetUINT32();
+                NPP instance		= m_aInstances[ nInstance ]->instance;
+                UINT32 nFileID		= pMessage->GetUINT32();
+                NPStream* pStream	= m_aNPWrapStreams[ nFileID ];
+                INT32 nLen			= pMessage->GetUINT32();
+                void* pBuffer		= pMessage->GetBytes();
                 INT32 nRet = NPN_Write( instance, pStream, nLen, pBuffer );
                 Respond( pMessage->m_nID,
                          (char*)&nRet, sizeof( nRet ),
@@ -309,8 +309,8 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
             break;
             case eNPN_UserAgent:
             {
-                UINT32 nInstance    = pMessage->GetUINT32();
-                NPP instance        = m_aInstances[ nInstance ]->instance;
+                UINT32 nInstance	= pMessage->GetUINT32();
+                NPP instance		= m_aInstances[ nInstance ]->instance;
                 const char* pAnswer = NPN_UserAgent( instance );
                 Respond( pMessage->m_nID,
                          (char*)pAnswer, strlen( pAnswer ),
@@ -320,7 +320,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
             default:
                 medDebug( 1, "caught unknown NPN request %d\n", nCommand );
         }
-
+        
         delete pMessage;
     }
     return 0;
@@ -342,7 +342,7 @@ NPError UnxPluginComm::NPP_Destroy( NPP instance, NPSavedData** save )
 {
     NPError aRet = NPERR_GENERIC_ERROR;
     GET_INSTANCE_RET( aRet );
-    MediatorMessage* pMes =
+    MediatorMessage* pMes = 
         Transact( eNPP_Destroy,
                   POST_INSTANCE(),
                   NULL );
@@ -379,8 +379,8 @@ NPError UnxPluginComm::NPP_DestroyStream( NPP instance, NPStream* stream, NPErro
     UINT32 nFileID = GetStreamID( stream );
     if( nFileID == PluginConnector::UnknownStreamID )
         return NPERR_GENERIC_ERROR;
-
-    MediatorMessage* pMes =
+    
+    MediatorMessage* pMes = 
         Transact( eNPP_DestroyStream,
                   POST_INSTANCE(),
                   &nFileID, sizeof( nFileID ),
@@ -402,7 +402,7 @@ void* UnxPluginComm::NPP_GetJavaClass()
 
 NPError UnxPluginComm::NPP_Initialize()
 {
-    MediatorMessage* pMes =
+    MediatorMessage* pMes = 
         Transact( eNPP_Initialize,
                   NULL );
     if( ! pMes )
@@ -444,7 +444,7 @@ NPError UnxPluginComm::NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode
 
     MediatorMessage* pMes;
     if( saved )
-        pMes =
+        pMes = 
             Transact( eNPP_New,
                       pluginType, strlen( pluginType ),
                       &mode, sizeof( mode ),
@@ -454,7 +454,7 @@ NPError UnxPluginComm::NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode
                       saved->buf, static_cast<size_t>(saved->len),
                       NULL );
     else
-        pMes =
+        pMes = 
             Transact( eNPP_New,
                       pluginType, strlen( pluginType ),
                       &mode, sizeof( mode ),
@@ -481,7 +481,7 @@ NPError UnxPluginComm::NPP_NewStream( NPP instance, NPMIMEType type, NPStream* s
     GET_INSTANCE_RET( aRet );
 
     m_aNPWrapStreams.push_back( stream );
-    MediatorMessage* pMes =
+    MediatorMessage* pMes = 
         Transact( eNPP_NewStream,
                   POST_INSTANCE(),
                   type, strlen( type ),
@@ -505,14 +505,14 @@ NPError UnxPluginComm::NPP_NewStream( NPP instance, NPMIMEType type, NPStream* s
 
 void UnxPluginComm::NPP_Print( NPP /*instance*/, NPPrint* /*platformPrint*/ )
 {
-}
+} 
 
 NPError UnxPluginComm::NPP_SetWindow( NPP instance, NPWindow* window )
 {
     NPError aRet = NPERR_GENERIC_ERROR;
     GET_INSTANCE_RET( aRet );
 
-    MediatorMessage* pMes =
+    MediatorMessage* pMes = 
         Transact( eNPP_SetWindow,
                   POST_INSTANCE(),
                   window, sizeof( NPWindow ),
@@ -547,7 +547,7 @@ void UnxPluginComm::NPP_StreamAsFile( NPP instance, NPStream* stream, const char
 void UnxPluginComm::NPP_URLNotify( NPP instance, const char* url, NPReason reason, void* notifyData )
 {
     GET_INSTANCE();
-
+    
     Send( eNPP_URLNotify,
           POST_INSTANCE(),
           url, strlen( url ),
@@ -563,7 +563,7 @@ int32 UnxPluginComm::NPP_Write( NPP instance, NPStream* stream, int32 offset, in
     if( nFileID == PluginConnector::UnknownStreamID )
         return -1;
 
-    MediatorMessage* pMes =
+    MediatorMessage* pMes = 
         Transact( eNPP_Write,
                   POST_INSTANCE(),
                   &nFileID, sizeof( nFileID ),
@@ -575,7 +575,7 @@ int32 UnxPluginComm::NPP_Write( NPP instance, NPStream* stream, int32 offset, in
 
     int32 aRet = pMes->GetUINT32();
     delete pMes;
-
+    
     return aRet;
 }
 
@@ -586,7 +586,7 @@ int32 UnxPluginComm::NPP_WriteReady( NPP instance, NPStream* stream )
     if( nFileID == PluginConnector::UnknownStreamID )
         return -1;
 
-    MediatorMessage* pMes =
+    MediatorMessage* pMes = 
         Transact( eNPP_WriteReady,
                   POST_INSTANCE(),
                   &nFileID, sizeof( nFileID ),
@@ -597,14 +597,14 @@ int32 UnxPluginComm::NPP_WriteReady( NPP instance, NPStream* stream )
 
     int32 aRet = pMes->GetUINT32();
     delete pMes;
-
+    
     return aRet;
 }
 
 char* UnxPluginComm::NPP_GetMIMEDescription()
 {
     static char* pDesc = NULL;
-    MediatorMessage* pMes =
+    MediatorMessage* pMes = 
         Transact( eNPP_GetMIMEDescription,
                   NULL );
     if( ! pMes )
diff --git a/extensions/source/plugin/unx/npwrap.cxx b/extensions/source/plugin/unx/npwrap.cxx
index 7124972d8578..04f4bbbacf5a 100644
--- a/extensions/source/plugin/unx/npwrap.cxx
+++ b/extensions/source/plugin/unx/npwrap.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 PluginConnector* pConnector = NULL;
 
-int         nAppArguments = 0;
-char**      pAppArguments = NULL;
-Display*    pAppDisplay = NULL;
+int			nAppArguments = 0;
+char**		pAppArguments = NULL;
+Display*	pAppDisplay = NULL;
 Display*    pXtAppDisplay = NULL;
 
 extern oslModule pPluginLib;
@@ -65,7 +65,7 @@ static bool bPluginAppQuit = false;
 static long GlobalConnectionLostHdl( void* /*pInst*/, void* /*pArg*/ )
 {
     medDebug( 1, "pluginapp exiting due to connection lost\n" );
-
+    
     write( wakeup_fd[1], "xxxx", 4 );
     return 0;
 }
@@ -76,14 +76,14 @@ extern "C"
     {
         return 0;
     }
-
+    
     #ifndef ENABLE_GTK
     static void ThreadEventHandler( XtPointer /*client_data*/, int* /*source*/, XtInputId* id )
     {
         char buf[256];
         // clear pipe
         int len, nLast = -1;
-
+        
         while( (len = read( wakeup_fd[0], buf, sizeof( buf ) ) ) > 0 )
             nLast = len-1;
         if( ! bPluginAppQuit )
@@ -114,7 +114,7 @@ IMPL_LINK( PluginConnector, NewMessageHdl, Mediator*, /*pMediator*/ )
     medDebug( 1, "new message handler\n" );
     write( wakeup_fd[1], "cccc", 4 );
     return 0;
-
+    
 }
 
 Widget createSubWidget( char* /*pPluginText*/, Widget shell, XLIB_Window aParentWindow )
@@ -145,7 +145,7 @@ Widget createSubWidget( char* /*pPluginText*/, Widget shell, XLIB_Window aParent
                      0, 0 );
     XtMapWidget( shell );
     XtMapWidget( newWidget );
-    XRaiseWindow( pXtAppDisplay, XtWindow( shell ) );
+    XRaiseWindow( pXtAppDisplay, XtWindow( shell ) ); 
     XSync( pXtAppDisplay, False );
 
     return newWidget;
@@ -192,7 +192,7 @@ static oslModule LoadModule( const char* pPath )
 static void CheckPlugin( const char* pPath )
 {
     oslModule pLib = LoadModule( pPath );
-
+    
     char*(*pNP_GetMIMEDescription)() = (char*(*)())
         osl_getAsciiFunctionSymbol( pLib, "NP_GetMIMEDescription" );
     if( pNP_GetMIMEDescription )
@@ -279,7 +279,7 @@ static gboolean pollXtTimerCallback(gpointer)
 static gboolean prepareWakeupEvent( GSource*, gint* )
 {
     struct pollfd aPoll = { wakeup_fd[0], POLLIN, 0 };
-    poll( &aPoll, 1, 0 );
+    poll( &aPoll, 1, 0 );    
     return (aPoll.revents & POLLIN ) != 0;
 }
 
@@ -294,7 +294,7 @@ static gboolean dispatchWakeupEvent( GSource*, GSourceFunc, gpointer )
     char buf[256];
     // clear pipe
     int len, nLast = -1;
-
+    
     while( (len = read( wakeup_fd[0], buf, sizeof( buf ) ) ) > 0 )
         nLast = len-1;
     if( ( nLast == -1  || buf[nLast] != 'x' ) && pConnector )
@@ -307,7 +307,7 @@ static gboolean dispatchWakeupEvent( GSource*, GSourceFunc, gpointer )
         delete pConnector;
         pConnector = NULL;
     }
-
+    
     return TRUE;
 }
 
@@ -359,7 +359,7 @@ int main( int argc, char **argv)
     }
     // initialize 'wakeup' pipe.
     int flags;
-
+    
     // set close-on-exec descriptor flag.
     if ((flags = fcntl (wakeup_fd[0], F_GETFD)) != -1)
     {
@@ -371,7 +371,7 @@ int main( int argc, char **argv)
         flags |= FD_CLOEXEC;
         fcntl (wakeup_fd[1], F_SETFD, flags);
     }
-
+    
     // set non-blocking I/O flag.
     if ((flags = fcntl (wakeup_fd[0], F_GETFL)) != -1)
     {
@@ -390,7 +390,7 @@ int main( int argc, char **argv)
         exit(255);
     }
     int nSocket = atol( argv[1] );
-
+    
     #ifdef ENABLE_GTK
     g_thread_init(NULL);
     gtk_init(&argc, &argv);
@@ -416,7 +416,7 @@ int main( int argc, char **argv)
         medDebug( 1, "could not get Xt GSource" );
         return 1;
     }
-
+    
     g_source_set_priority( pXTSource, GDK_PRIORITY_EVENTS );
     g_source_set_can_recurse( pXTSource, TRUE );
     g_source_attach( pXTSource, NULL );
@@ -424,7 +424,7 @@ int main( int argc, char **argv)
     aXtPollDesc.events = G_IO_IN;
     aXtPollDesc.revents = 0;
     g_source_add_poll( pXTSource, &aXtPollDesc );
-
+    
     gint xt_polling_timer_id = g_timeout_add( 25, pollXtTimerCallback, NULL);
     // Initialize wakeup events listener
     GSource *pWakeupSource = g_source_new( &aWakeupEventFuncs, sizeof(GSource) );
@@ -491,7 +491,7 @@ int main( int argc, char **argv)
     #ifdef ENABLE_GTK
     g_source_remove(xt_polling_timer_id);
     #endif
-
+    
     pNP_Shutdown();
     medDebug( 1, "NP_Shutdown done\n" );
     osl_unloadModule( pPluginLib );
diff --git a/extensions/source/plugin/unx/plugcon.cxx b/extensions/source/plugin/unx/plugcon.cxx
index 607ae05d9877..52be98fdae87 100644
--- a/extensions/source/plugin/unx/plugcon.cxx
+++ b/extensions/source/plugin/unx/plugcon.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ struct PtrStruct
 {
     char* pData;
     ULONG nBytes;
-
+    
     PtrStruct( char* i_pData, ULONG i_nBytes )
     : pData( i_pData ), nBytes( i_nBytes ) {}
 };
@@ -94,7 +94,7 @@ ULONG PluginConnector::FillBuffer( char*& rpBuffer,
 {
     std::vector< PtrStruct > aList;
     aList.reserve( 5 );
-
+    
     ULONG nDataSize = nFunctionLen + sizeof( ULONG );
     char* pNext;
 
@@ -164,7 +164,7 @@ void PluginConnector::Respond( ULONG nID,
 {
     va_list ap;
     char* pBuffer;
-
+    
     va_start( ap, nFunctionLen );
     ULONG nSize = FillBuffer( pBuffer, pFunction, nFunctionLen, ap );
     va_end( ap );
@@ -257,34 +257,34 @@ const char* GetCommandName( CommandAtoms eCommand )
 {
     switch( eCommand )
     {
-        case eNPN_GetURL:               return "NPN_GetURL";
-        case eNPN_GetURLNotify:         return "NPN_GetURLNotify";
-        case eNPN_DestroyStream:        return "NPN_DestroyStream";
-        case eNPN_NewStream:            return "NPN_NewStream";
-        case eNPN_PostURLNotify:        return "NPN_PostURLNotify";
-        case eNPN_PostURL:              return "NPN_PostURL";
-        case eNPN_RequestRead:          return "NPN_RequestRead";
-        case eNPN_Status:               return "NPN_Status";
-        case eNPN_Version:              return "NPN_Version";
-        case eNPN_Write:                return "NPN_Write";
-        case eNPN_UserAgent:            return "NPN_UserAgent";
-
-        case eNPP_DestroyStream:        return "NPP_DestroyStream";
-        case eNPP_Destroy:              return "NPP_Destroy";
-        case eNPP_DestroyPhase2:        return "NPP_DestroyPhase2";
-        case eNPP_NewStream:            return "NPP_NewStream";
-        case eNPP_New:                  return "NPP_New";
-        case eNPP_SetWindow:            return "NPP_SetWindow";
-        case eNPP_StreamAsFile:         return "NPP_StreamAsFile";
-        case eNPP_URLNotify:            return "NPP_URLNotify";
-        case eNPP_WriteReady:           return "NPP_WriteReady";
-        case eNPP_Write:                return "NPP_Write";
-        case eNPP_GetMIMEDescription:   return "NPP_GetMIMEDescription";
-        case eNPP_Initialize:           return "NPP_Initialize";
-        case eNPP_Shutdown:             return "NPP_Shutdown";
-
-        case eMaxCommand:               return "eMaxCommand";
-        default:                        return "unknown command";
+        case eNPN_GetURL:				return "NPN_GetURL";
+        case eNPN_GetURLNotify:			return "NPN_GetURLNotify";
+        case eNPN_DestroyStream:		return "NPN_DestroyStream";
+        case eNPN_NewStream:			return "NPN_NewStream";
+        case eNPN_PostURLNotify:		return "NPN_PostURLNotify";
+        case eNPN_PostURL:				return "NPN_PostURL";
+        case eNPN_RequestRead:			return "NPN_RequestRead";
+        case eNPN_Status:				return "NPN_Status";
+        case eNPN_Version:				return "NPN_Version";
+        case eNPN_Write:				return "NPN_Write";
+        case eNPN_UserAgent:			return "NPN_UserAgent";
+
+        case eNPP_DestroyStream:		return "NPP_DestroyStream";
+        case eNPP_Destroy:				return "NPP_Destroy";
+        case eNPP_DestroyPhase2:		return "NPP_DestroyPhase2";
+        case eNPP_NewStream:			return "NPP_NewStream";
+        case eNPP_New:					return "NPP_New";
+        case eNPP_SetWindow:			return "NPP_SetWindow";
+        case eNPP_StreamAsFile:			return "NPP_StreamAsFile";
+        case eNPP_URLNotify:			return "NPP_URLNotify";
+        case eNPP_WriteReady:			return "NPP_WriteReady";
+        case eNPP_Write:				return "NPP_Write";
+        case eNPP_GetMIMEDescription:	return "NPP_GetMIMEDescription";
+        case eNPP_Initialize:			return "NPP_Initialize";
+        case eNPP_Shutdown:				return "NPP_Shutdown";
+
+        case eMaxCommand:				return "eMaxCommand";
+        default:						return "unknown command";
     }
     return NULL;
 }
diff --git a/extensions/source/plugin/unx/sysplug.cxx b/extensions/source/plugin/unx/sysplug.cxx
index dc7be6799ae3..f5221aa027c8 100644
--- a/extensions/source/plugin/unx/sysplug.cxx
+++ b/extensions/source/plugin/unx/sysplug.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/plugin/unx/unxmgr.cxx b/extensions/source/plugin/unx/unxmgr.cxx
index 0ecd12b65ff7..b042815f8343 100644
--- a/extensions/source/plugin/unx/unxmgr.cxx
+++ b/extensions/source/plugin/unx/unxmgr.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,18 +121,18 @@ static bool CheckPlugin( const ByteString& rPath, list< PluginDescription* >& rD
         if( aMIME.getLength() > 0 )
         {
             OString aLine = aMIME.makeStringAndClear();
-
+            
             sal_Int32 nIndex = 0;
             while( nIndex != -1 )
             {
                 OString aType = aLine.getToken( 0, ';', nIndex );
 
                 sal_Int32 nTypeIndex = 0;
-                OString aMimetype   = aType.getToken( 0, ':', nTypeIndex );
-                OString aExtLine    = aType.getToken( 0, ':', nTypeIndex );
+                OString aMimetype	= aType.getToken( 0, ':', nTypeIndex );
+                OString aExtLine	= aType.getToken( 0, ':', nTypeIndex );
                 if( nTypeIndex < 0 ) // ensure at least three tokens
                     continue;
-                OString aDesc       = aType.getToken( 0, ':', nTypeIndex );
+                OString aDesc		= aType.getToken( 0, ':', nTypeIndex );
 
                 // create extension list string
                 sal_Int32 nExtIndex = 0;
@@ -149,11 +149,11 @@ static bool CheckPlugin( const ByteString& rPath, list< PluginDescription* >& rD
 
                 PluginDescription* pNew = new PluginDescription;
                 // set plugin name (path to library)
-                pNew->PluginName    = OStringToOUString( rPath, aEncoding );
+                pNew->PluginName	= OStringToOUString( rPath, aEncoding );
                 // set mimetype
-                pNew->Mimetype  = OStringToOUString( aMimetype, aEncoding );
+                pNew->Mimetype 	= OStringToOUString( aMimetype, aEncoding );
                 // set extension line
-                pNew->Extension = OStringToOUString( aExtension.makeStringAndClear(), aEncoding );
+                pNew->Extension	= OStringToOUString( aExtension.makeStringAndClear(), aEncoding );
                 // set description
                 pNew->Description= OStringToOUString( aDesc, aEncoding );
                 rDescriptions.push_back( pNew );
@@ -209,7 +209,7 @@ static void CheckPluginRegistryFiles( const rtl::OString& rPath, list< PluginDes
         }
         fclose( fp );
     }
-
+    
     // check subdirectories
     DIR* pDIR = opendir( rPath.getStr() );
     struct dirent* pDirEnt = NULL;
@@ -224,7 +224,7 @@ static void CheckPluginRegistryFiles( const rtl::OString& rPath, list< PluginDes
             aBuf.append( rPath );
             aBuf.append( '/' );
             aBuf.append( pBaseName );
-
+            
             if( ! stat( aBuf.getStr(), &aStat ) )
             {
                 if( S_ISDIR( aStat.st_mode ) )
diff --git a/extensions/source/plugin/win/sysplug.cxx b/extensions/source/plugin/win/sysplug.cxx
index c992341dc947..607aa4b87f88 100644
--- a/extensions/source/plugin/win/sysplug.cxx
+++ b/extensions/source/plugin/win/sysplug.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ PluginComm_Impl::~PluginComm_Impl()
 {
     if (_plDLL)
     {
-//          NPP_Shutdown();
+//			NPP_Shutdown();
 
         NPError (WINAPI * pShutdown)();
         if (retrieveFunction( _T("NP_Shutdown"), (void**)&pShutdown ))
diff --git a/extensions/source/plugin/win/winmgr.cxx b/extensions/source/plugin/win/winmgr.cxx
index db90cfbf7a45..ff9b713c6085 100644
--- a/extensions/source/plugin/win/winmgr.cxx
+++ b/extensions/source/plugin/win/winmgr.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ Sequence< PluginDescription > XPluginManager_Impl::impl_getPluginDescriptions(vo
                         OString aExtToken2( aExt.getToken( 0, '|', nIndex2 ) );
                         if( aMIMEToken.getLength() == 0 || aExtToken2.getLength() == 0 )
                             continue;
-
+                        
                         rDescr.Mimetype = OUString(
                             aMIMEToken.getStr(), aMIMEToken.getLength(), RTL_TEXTENCODING_MS_1252 );
                         if (! rDescr.Mimetype.getLength())
diff --git a/extensions/source/preload/modulepreload.cxx b/extensions/source/preload/modulepreload.cxx
index 6fb06c7f68ac..ead9753193f4 100644
--- a/extensions/source/preload/modulepreload.cxx
+++ b/extensions/source/preload/modulepreload.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/preload/oemwiz.cxx b/extensions/source/preload/oemwiz.cxx
index 9264205d7ae0..f02d20a0a824 100644
--- a/extensions/source/preload/oemwiz.cxx
+++ b/extensions/source/preload/oemwiz.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/preload/oemwiz.hxx b/extensions/source/preload/oemwiz.hxx
index e7b0c36db46b..5874994b5192 100644
--- a/extensions/source/preload/oemwiz.hxx
+++ b/extensions/source/preload/oemwiz.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/preload/preload.hrc b/extensions/source/preload/preload.hrc
index 19cb8a15ac10..a7d9725bd110 100644
--- a/extensions/source/preload/preload.hrc
+++ b/extensions/source/preload/preload.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,12 +46,12 @@
 #define ML_LICENSE          11
 #define ST_LICENSE_AGREEMENT    12
 #define ST_INSERT_USER_DATA     13
-#define IMG_ARROW           14
-#define FT_INFO2_1          15
-#define FT_INFO3_1          16
+#define IMG_ARROW			14
+#define FT_INFO2_1			15
+#define FT_INFO3_1			16
 #define FT_INFO3            17
 #define PB_PAGEDOWN         18
-#define CB_ACCEPT           19
+#define CB_ACCEPT			19
 #define LICENCE_ACCEPT      20
 #define LICENCE_NOTACCEPT   21
 
diff --git a/extensions/source/preload/preload.src b/extensions/source/preload/preload.src
index 59805b768adf..301e489cddbf 100644
--- a/extensions/source/preload/preload.src
+++ b/extensions/source/preload/preload.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ ModalDialog RID_DLG_OEMWIZARD
 {
     Text = "%PRODUCTNAME %PRODUCTVERSION";
 
-    OutputSize      = TRUE ;
-    SVLook          = TRUE ;
-    Moveable        = TRUE ;
-    Closeable       = TRUE ;
-    Hide            = TRUE;
+    OutputSize		= TRUE ;
+    SVLook			= TRUE ;
+    Moveable		= TRUE ;
+    Closeable		= TRUE ;
+    Hide			= TRUE;
     PushButton PB_PREV
     {
         Size = MAP_APPFONT ( 50 , 14 ) ;
@@ -125,7 +125,7 @@ TabPage RID_TP_WELCOME
 #define LICENSE_COL_4 (LICENSE_DIALOG_WIDTH - LICENSE_RIGHT_BORDER - PD_WIDTH)
 
 #define LICENSE_WIDTH (LICENSE_DIALOG_WIDTH - LICENSE_RIGHT_BORDER - LICENSE_ROW_1)
-#define COL3_WIDTH    (LICENSE_COL_4 - LICENSE_COL_3)
+#define COL3_WIDTH	  (LICENSE_COL_4 - LICENSE_COL_3)
 
 
 TabPage RID_TP_LICENSE
diff --git a/extensions/source/preload/preloadservices.cxx b/extensions/source/preload/preloadservices.cxx
index 3ce121c98a4f..f23d65310479 100644
--- a/extensions/source/preload/preloadservices.cxx
+++ b/extensions/source/preload/preloadservices.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/preload/preloadservices.hxx b/extensions/source/preload/preloadservices.hxx
index f4ef0c2500dc..ba51e0547bab 100644
--- a/extensions/source/preload/preloadservices.hxx
+++ b/extensions/source/preload/preloadservices.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 preload
     struct OEMPreloadSI
     {
     public:
-        ::rtl::OUString         getImplementationName() const;
+        ::rtl::OUString			getImplementationName() const;
         ::com::sun::star::uno::Sequence< ::rtl::OUString >
                                 getServiceNames() const;
     };
diff --git a/extensions/source/preload/services.cxx b/extensions/source/preload/services.cxx
index 5c2b199275f9..04dcc48657ef 100644
--- a/extensions/source/preload/services.cxx
+++ b/extensions/source/preload/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
@@ -58,8 +58,8 @@ extern "C" void SAL_CALL preload_initializeModule()
 
 extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
 component_getImplementationEnvironment(
-                const sal_Char  **ppEnvTypeName,
-                uno_Environment **  /*ppEnv*/
+                const sal_Char	**ppEnvTypeName,
+                uno_Environment	**  /*ppEnv*/
             )
 {
     preload_initializeModule();
diff --git a/extensions/source/preload/unoautopilot.hxx b/extensions/source/preload/unoautopilot.hxx
index 8533736e0e6a..dd485d887876 100644
--- a/extensions/source/preload/unoautopilot.hxx
+++ b/extensions/source/preload/unoautopilot.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 preload
     struct IServiceInfo
     {
     public:
-        ::rtl::OUString     getImplementationName() const;
+        ::rtl::OUString		getImplementationName() const;
         ::com::sun::star::uno::Sequence< ::rtl::OUString >
                             getServiceNames() const;
     };
@@ -57,7 +57,7 @@ namespace preload
     //=====================================================================
     //= OUnoAutoPilot
     //=====================================================================
-    typedef ::svt::OGenericUnoDialog    OUnoAutoPilot_Base;
+    typedef ::svt::OGenericUnoDialog	OUnoAutoPilot_Base;
     template <class TYPE, class SERVICEINFO>
     class OUnoAutoPilot
             :public OUnoAutoPilot_Base
@@ -93,14 +93,14 @@ namespace preload
 
     protected:
     // OGenericUnoDialog overridables
-        virtual Dialog* createDialog(Window* _pParent);
+        virtual Dialog*	createDialog(Window* _pParent);
         virtual void implInitialize(const com::sun::star::uno::Any& _rValue);
     };
 
 #include "unoautopilot.inl"
 
 //.........................................................................
-}   // namespace dbp
+}	// namespace dbp
 //.........................................................................
 
 #endif // _EXTENSIONS_PRELOAD_UNOAUTOPILOT_HXX_
diff --git a/extensions/source/preload/unoautopilot.inl b/extensions/source/preload/unoautopilot.inl
index 27acdd6864f3..77c3f7b589ab 100644
--- a/extensions/source/preload/unoautopilot.inl
+++ b/extensions/source/preload/unoautopilot.inl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ template <class TYPE, class SERVICEINFO>
 
 //--------------------------------------------------------------------------
 template <class TYPE, class SERVICEINFO>
-Dialog* OUnoAutoPilot<TYPE, SERVICEINFO>::createDialog(Window* _pParent)
+Dialog*	OUnoAutoPilot<TYPE, SERVICEINFO>::createDialog(Window* _pParent)
 {
     return new TYPE(_pParent, m_xObjectModel, m_aContext.getLegacyServiceFactory());
 }
diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
index b84319c47ad3..ed69baf7a8c1 100644
--- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
+++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
  #include "precompiled_extensions.hxx"
  #include "MasterDetailLinkDialog.hxx"
  #include "formlinkdialog.hxx"
-
+ 
  extern "C" void SAL_CALL createRegistryInfo_MasterDetailLinkDialog()
 {
     ::pcr::OAutoRegistration< ::pcr::MasterDetailLinkDialog > aAutoRegistration;
@@ -113,7 +113,7 @@ namespace pcr
     }
 
     //--------------------------------------------------------------------------
-    Dialog* MasterDetailLinkDialog::createDialog(Window* _pParent)
+    Dialog*	MasterDetailLinkDialog::createDialog(Window* _pParent)
     {
         return new FormLinkDialog(_pParent,m_xDetail,m_xMaster,m_aContext.getLegacyServiceFactory()
             ,m_sExplanation,m_sDetailLabel,m_sMasterLabel);
diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx
index d0b68fc18e2a..dcfd8e76e9fd 100644
--- a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx
+++ b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace pcr
 //........................................................................
 
     class MasterDetailLinkDialog;
-    typedef ::svt::OGenericUnoDialog                                            MasterDetailLinkDialog_DBase;
-    typedef ::comphelper::OPropertyArrayUsageHelper< MasterDetailLinkDialog >   MasterDetailLinkDialog_PBase;
+    typedef ::svt::OGenericUnoDialog										    MasterDetailLinkDialog_DBase;
+    typedef ::comphelper::OPropertyArrayUsageHelper< MasterDetailLinkDialog >	MasterDetailLinkDialog_PBase;
 
     //========================================================================
     //= MasterDetailLinkDialog
@@ -69,7 +69,7 @@ namespace pcr
         virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const;
 
         // OGenericUnoDialog overridables
-        virtual Dialog* createDialog(Window* _pParent);
+        virtual Dialog*	createDialog(Window* _pParent);
         virtual void implInitialize(const com::sun::star::uno::Any& _rValue);
 
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xDetail;
@@ -80,7 +80,7 @@ namespace pcr
     };
 
 //........................................................................
-}   // namespace pcr
+}	// namespace pcr
 //........................................................................
 #endif // PROPCTRLR_MASTERDETAILLINKDIALOG_HXX
 
diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx
index ad43e61ca7f9..74a2765166a0 100644
--- a/extensions/source/propctrlr/browserline.cxx
+++ b/extensions/source/propctrlr/browserline.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx
index fd091c712e78..323b457cd590 100644
--- a/extensions/source/propctrlr/browserline.hxx
+++ b/extensions/source/propctrlr/browserline.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index 02e663c820c4..a70d7cc50d67 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace pcr
     private:
         /** processes the given event, i.e. notifies it to our IControlContext
             @param  _rEvent
-                the event no notify
+                the event no notify 
             @precond
                 our mutex (well, the SolarMutex) is locked
         */
@@ -1033,8 +1033,8 @@ namespace pcr
             ++nLine;
         }
 
-        if  (   ( (size_t)nLine >= m_aOrderedLines.size() )
-            &&  ( m_aOrderedLines.size() > 0 )
+        if	(	( (size_t)nLine >= m_aOrderedLines.size() )
+            &&	( m_aOrderedLines.size() > 0 )
             )
             // wrap around
             m_aOrderedLines[0]->second.pLine->GrabFocus();
@@ -1065,7 +1065,7 @@ namespace pcr
     //------------------------------------------------------------------
     void OBrowserListBox::Clear()
     {
-        for (   ListBoxLines::iterator loop = m_aLines.begin();
+        for (	ListBoxLines::iterator loop = m_aLines.begin();
                 loop != m_aLines.end();
                 ++loop
             )
@@ -1117,7 +1117,7 @@ namespace pcr
 
         if ( nPos < m_aOrderedLines.size() )
         {
-            Window* pRefWindow = NULL;
+            Window*	pRefWindow = NULL;
             if ( nPos > 0 )
                 pRefWindow = m_aOrderedLines[nPos-1]->second.pLine->GetRefWindow();
 
@@ -1202,7 +1202,7 @@ namespace pcr
             if ( _rPropertyData.bReadOnly )
             {
                 rLine.pLine->SetReadOnly( true );
-
+            
                 // user controls (i.e. the ones not provided by the usual
                 // XPropertyControlFactory) have no chance to know that they should be read-only,
                 // since XPropertyHandler::describePropertyLine does not transport this
@@ -1269,7 +1269,7 @@ namespace pcr
                 }
             }
 
-            return 1L;
+            return 1L; 
             // handled this. In particular, we also consume PageUp/Down events if we do not use them for scrolling,
             // otherwise they would be used to scroll the document view, which does not sound like it is desired by
             // the user.
@@ -1286,9 +1286,9 @@ namespace pcr
         case EVENT_COMMAND:
         {
             const CommandEvent* pCommand = _rNEvt.GetCommandEvent();
-            if  (   ( COMMAND_WHEEL == pCommand->GetCommand() )
-                ||  ( COMMAND_STARTAUTOSCROLL == pCommand->GetCommand() )
-                ||  ( COMMAND_AUTOSCROLL == pCommand->GetCommand() )
+            if	(   ( COMMAND_WHEEL == pCommand->GetCommand() )
+                ||	( COMMAND_STARTAUTOSCROLL == pCommand->GetCommand() )
+                ||	( COMMAND_AUTOSCROLL == pCommand->GetCommand() )
                 )
             {
                 // interested in scroll events if we have a scrollbar
diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx
index d038f58c626d..6ae8b6427283 100644
--- a/extensions/source/propctrlr/browserlistbox.hxx
+++ b/extensions/source/propctrlr/browserlistbox.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -172,7 +172,7 @@ namespace pcr
 
         sal_Bool    IsModified( ) const;
         void        CommitModified( );
-
+                
     protected:
         // IControlContext
         virtual void SAL_CALL focusGained( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& Control ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/extensions/source/propctrlr/browserpage.cxx b/extensions/source/propctrlr/browserpage.cxx
index 1c3de21b9da8..30f1516190f4 100644
--- a/extensions/source/propctrlr/browserpage.cxx
+++ b/extensions/source/propctrlr/browserpage.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,13 +92,13 @@ namespace pcr
     {
         return m_aListBox.GetMinimumWidth() + LAYOUT_BORDER_LEFT + LAYOUT_BORDER_RIGHT;
     }
-
+    
     //------------------------------------------------------------------
     sal_Int32 OBrowserPage::getMinimumHeight()
     {
         return m_aListBox.GetMinimumHeight() + LAYOUT_BORDER_TOP + LAYOUT_BORDER_BOTTOM;
     }
-
+    
 //............................................................................
 } // namespace pcr
 //............................................................................
diff --git a/extensions/source/propctrlr/browserpage.hxx b/extensions/source/propctrlr/browserpage.hxx
index a77cfb76e9e9..348e56bbc5a7 100644
--- a/extensions/source/propctrlr/browserpage.hxx
+++ b/extensions/source/propctrlr/browserpage.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 pcr
     class OBrowserPage : public TabPage
     {
     private:
-        OBrowserListBox     m_aListBox;
+        OBrowserListBox		m_aListBox;
 
     protected:
         virtual void Resize();
@@ -55,7 +55,7 @@ namespace pcr
 
         sal_Int32 getMinimumWidth();
         sal_Int32 getMinimumHeight();
-
+        
               OBrowserListBox& getListBox();
         const OBrowserListBox& getListBox() const;
     };
diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx
index 3ec4e3bf3ded..1c9e29f89f8e 100644
--- a/extensions/source/propctrlr/browserview.cxx
+++ b/extensions/source/propctrlr/browserview.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -138,7 +138,7 @@ namespace pcr
         }
         return ::com::sun::star::awt::Size( aSize.Width(), aSize.Height() );
     }
-
+    
 //............................................................................
 } // namespace pcr
 //............................................................................
diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx
index 90c729b01ab7..5e7801f927ca 100644
--- a/extensions/source/propctrlr/browserview.hxx
+++ b/extensions/source/propctrlr/browserview.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace pcr
     class OPropertyEditor;
 
     //========================================================================
-    //=
+    //= 
     //========================================================================
     class OPropertyBrowserView : public Window
     {
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    m_xORB;
+        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >	m_xORB;
 
-        OPropertyEditor*        m_pPropBox;
-        sal_uInt16              m_nActivePage;
-        Link                    m_aPageActivationHandler;
+        OPropertyEditor*		m_pPropBox;
+        sal_uInt16				m_nActivePage;
+        Link					m_aPageActivationHandler;
 
     protected:
         virtual void Resize();
@@ -60,7 +60,7 @@ namespace pcr
         virtual long Notify( NotifyEvent& _rNEvt );
 
     public:
-        OPropertyBrowserView(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&    _xORB,
+        OPropertyBrowserView(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&	_xORB,
                         Window* pParent, WinBits nBits = 0);
 
         virtual ~OPropertyBrowserView();
@@ -68,15 +68,15 @@ namespace pcr
         OPropertyEditor&    getPropertyBox() { return *m_pPropBox; }
 
         // page handling
-        sal_uInt16  getActivaPage() const { return m_nActivePage; }
-        void        activatePage(sal_uInt16 _nPage);
+        sal_uInt16	getActivaPage() const { return m_nActivePage; }
+        void		activatePage(sal_uInt16 _nPage);
 
-        void    setPageActivationHandler(const Link& _rHdl) { m_aPageActivationHandler = _rHdl; }
-        Link    getPageActivationHandler() const { return m_aPageActivationHandler; }
+        void	setPageActivationHandler(const Link& _rHdl) { m_aPageActivationHandler = _rHdl; }
+        Link	getPageActivationHandler() const { return m_aPageActivationHandler; }
 
         // #95343# ------------------
         ::com::sun::star::awt::Size getMinimumSize();
-
+        
     protected:
         DECL_LINK(OnPageActivation, void*);
     };
diff --git a/extensions/source/propctrlr/buttonnavigationhandler.cxx b/extensions/source/propctrlr/buttonnavigationhandler.cxx
index 6435da2f763b..5f9f8e941ecf 100644
--- a/extensions/source/propctrlr/buttonnavigationhandler.cxx
+++ b/extensions/source/propctrlr/buttonnavigationhandler.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,7 +158,7 @@ namespace pcr
 
         return aReturn;
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL ButtonNavigationHandler::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException)
     {
@@ -184,7 +184,7 @@ namespace pcr
             OSL_ENSURE( sal_False, "ButtonNavigationHandler::setPropertyValue: cannot handle this id!" );
         }
     }
-
+    
     //--------------------------------------------------------------------
     bool ButtonNavigationHandler::isNavigationCapableButton( const Reference< XPropertySet >& _rxComponent )
     {
diff --git a/extensions/source/propctrlr/buttonnavigationhandler.hxx b/extensions/source/propctrlr/buttonnavigationhandler.hxx
index f703e010e8e5..d3be8b131e29 100644
--- a/extensions/source/propctrlr/buttonnavigationhandler.hxx
+++ b/extensions/source/propctrlr/buttonnavigationhandler.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx
index ea64279b2e81..41bc249994b1 100644
--- a/extensions/source/propctrlr/cellbindinghandler.cxx
+++ b/extensions/source/propctrlr/cellbindinghandler.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace pcr
         aInterestingProperties[2] = PROPERTY_CONTROLSOURCE;
         return aInterestingProperties;
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL CellBindingPropertyHandler::actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException)
     {
diff --git a/extensions/source/propctrlr/cellbindinghandler.hxx b/extensions/source/propctrlr/cellbindinghandler.hxx
index 8d6d60d83f69..e5e27f609879 100644
--- a/extensions/source/propctrlr/cellbindinghandler.hxx
+++ b/extensions/source/propctrlr/cellbindinghandler.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/cellbindinghelper.cxx b/extensions/source/propctrlr/cellbindinghelper.cxx
index 24fdc7fc28c3..dc9abea4b5cb 100644
--- a/extensions/source/propctrlr/cellbindinghelper.cxx
+++ b/extensions/source/propctrlr/cellbindinghelper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/cellbindinghelper.hxx b/extensions/source/propctrlr/cellbindinghelper.hxx
index faee59c24e32..8fe262b165fc 100644
--- a/extensions/source/propctrlr/cellbindinghelper.hxx
+++ b/extensions/source/propctrlr/cellbindinghelper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 pcr
 {
 //............................................................................
-
+    
     //========================================================================
     //= CellBindingHelper
     //========================================================================
@@ -68,7 +68,7 @@ namespace pcr
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel,
             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxContextDocument
         );
-
+    
     public:
         /** determines whether the given model is a spreadsheet document model
 
diff --git a/extensions/source/propctrlr/commoncontrol.cxx b/extensions/source/propctrlr/commoncontrol.cxx
index ebb80d3eba24..f532fe25c88b 100644
--- a/extensions/source/propctrlr/commoncontrol.cxx
+++ b/extensions/source/propctrlr/commoncontrol.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,31 +73,31 @@ namespace pcr
     {
         return m_nControlType;
     }
-
+    
     //--------------------------------------------------------------------
     Reference< XPropertyControlContext > SAL_CALL ControlHelper::getControlContext() throw (RuntimeException)
     {
         return m_xContext;
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL ControlHelper::setControlContext( const Reference< XPropertyControlContext >& _controlcontext ) throw (RuntimeException)
     {
         m_xContext = _controlcontext;
     }
-
+    
     //--------------------------------------------------------------------
     Reference< XWindow > SAL_CALL ControlHelper::getControlWindow() throw (RuntimeException)
     {
         return VCLUnoHelper::GetInterface( m_pControlWindow );
     }
-
+    
     //--------------------------------------------------------------------
     ::sal_Bool SAL_CALL ControlHelper::isModified(  ) throw (RuntimeException)
     {
         return m_bModified;
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL ControlHelper::notifyModifiedValue(  ) throw (RuntimeException)
     {
diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx
index a38f0e027255..6c834e9773ad 100644
--- a/extensions/source/propctrlr/commoncontrol.hxx
+++ b/extensions/source/propctrlr/commoncontrol.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,35 +272,35 @@ namespace pcr
     {
         return m_aImplControl.getControlType();
     }
-
+    
     //--------------------------------------------------------------------
     template< class CONTROL_INTERFACE, class CONTROL_WINDOW >
     inline ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlContext > SAL_CALL CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::getControlContext() throw (::com::sun::star::uno::RuntimeException)
     {
         return m_aImplControl.getControlContext();
     }
-
+    
     //--------------------------------------------------------------------
     template< class CONTROL_INTERFACE, class CONTROL_WINDOW >
     inline void SAL_CALL CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::setControlContext( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlContext >& _controlcontext ) throw (::com::sun::star::uno::RuntimeException)
     {
         m_aImplControl.setControlContext( _controlcontext );
     }
-
+    
     //--------------------------------------------------------------------
     template< class CONTROL_INTERFACE, class CONTROL_WINDOW >
     inline ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::getControlWindow() throw (::com::sun::star::uno::RuntimeException)
     {
         return m_aImplControl.getControlWindow();
     }
-
+    
     //--------------------------------------------------------------------
     template< class CONTROL_INTERFACE, class CONTROL_WINDOW >
     inline ::sal_Bool SAL_CALL CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::isModified(  ) throw (::com::sun::star::uno::RuntimeException)
     {
         return m_aImplControl.isModified();
     }
-
+    
     //--------------------------------------------------------------------
     template< class CONTROL_INTERFACE, class CONTROL_WINDOW >
     inline void SAL_CALL CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::notifyModifiedValue(  ) throw (::com::sun::star::uno::RuntimeException)
diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx
index f78349c651e5..f40d92e0a259 100644
--- a/extensions/source/propctrlr/composeduiupdate.cxx
+++ b/extensions/source/propctrlr/composeduiupdate.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace pcr
     //====================================================================
     namespace
     {
-        struct HandlerLess : public ::std::binary_function  <   Reference< XPropertyHandler >
+        struct HandlerLess : public ::std::binary_function  <	Reference< XPropertyHandler >
                                                             ,   Reference< XPropertyHandler >
-                                                            ,   bool
+                                                            ,	bool
                                                             >
         {
             bool operator()( const Reference< XPropertyHandler >& lhs, const Reference< XPropertyHandler >& rhs) const
@@ -379,7 +379,7 @@ namespace pcr
             // register listeners themself
         m_rMaster.getDelegatorUI()->registerControlObserver( _Observer );
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL CachedInspectorUI::revokeControlObserver( const Reference< XPropertyControlObserver >& _Observer ) throw (RuntimeException)
     {
diff --git a/extensions/source/propctrlr/composeduiupdate.hxx b/extensions/source/propctrlr/composeduiupdate.hxx
index 0ee9a98eeaf7..3660246d3838 100644
--- a/extensions/source/propctrlr/composeduiupdate.hxx
+++ b/extensions/source/propctrlr/composeduiupdate.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx
index fbe64bf1bd30..d922d853ea66 100644
--- a/extensions/source/propctrlr/controlfontdialog.cxx
+++ b/extensions/source/propctrlr/controlfontdialog.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace pcr
     }
 
     //--------------------------------------------------------------------------
-    Dialog* OControlFontDialog::createDialog(Window* _pParent)
+    Dialog*	OControlFontDialog::createDialog(Window* _pParent)
     {
         ControlCharacterDialog::createItemSet(m_pFontItems, m_pItemPool, m_pItemPoolDefaults);
 
@@ -171,7 +171,7 @@ namespace pcr
     }
 
 //........................................................................
-}   // namespace pcr
+}	// namespace pcr
 //........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/controlfontdialog.hxx b/extensions/source/propctrlr/controlfontdialog.hxx
index 55ea4c4eb618..555370d37623 100644
--- a/extensions/source/propctrlr/controlfontdialog.hxx
+++ b/extensions/source/propctrlr/controlfontdialog.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace pcr
     //= OControlFontDialog
     //====================================================================
     class OControlFontDialog;
-    typedef ::svt::OGenericUnoDialog                                        OControlFontDialog_DBase;
-    typedef ::comphelper::OPropertyArrayUsageHelper< OControlFontDialog >   OControlFontDialog_PBase;
+    typedef ::svt::OGenericUnoDialog										OControlFontDialog_DBase;
+    typedef ::comphelper::OPropertyArrayUsageHelper< OControlFontDialog >	OControlFontDialog_PBase;
 
     class OControlFontDialog
                 :public OControlFontDialog_DBase
@@ -58,9 +58,9 @@ namespace pcr
                 m_xControlModel;
         // </properties>
 
-        SfxItemSet*             m_pFontItems;           // item set for the dialog
-        SfxItemPool*            m_pItemPool;            // item pool for the item set for the dialog
-        SfxPoolItem**           m_pItemPoolDefaults;    // pool defaults
+        SfxItemSet*				m_pFontItems;			// item set for the dialog
+        SfxItemPool*			m_pItemPool;			// item pool for the item set for the dialog
+        SfxPoolItem**			m_pItemPoolDefaults;	// pool defaults
 
     public:
         OControlFontDialog(const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& _rxContext);
@@ -88,13 +88,13 @@ namespace pcr
 
     protected:
     // OGenericUnoDialog overridables
-        virtual Dialog* createDialog(Window* _pParent);
-        virtual void    destroyDialog();
-        virtual void    executedDialog(sal_Int16 _nExecutionResult);
+        virtual Dialog*	createDialog(Window* _pParent);
+        virtual void	destroyDialog();
+        virtual void	executedDialog(sal_Int16 _nExecutionResult);
     };
 
 //........................................................................
-}   // namespace pcr
+}	// namespace pcr
 //........................................................................
 
 #endif // _EXTENSIONS_PROPCTRLR_CONTROLFONTDIALOG_HXX_
diff --git a/extensions/source/propctrlr/controltype.hxx b/extensions/source/propctrlr/controltype.hxx
index e4871431ed06..c2c502449838 100644
--- a/extensions/source/propctrlr/controltype.hxx
+++ b/extensions/source/propctrlr/controltype.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx
index 3fd14196537a..124941034d4c 100644
--- a/extensions/source/propctrlr/defaultforminspection.cxx
+++ b/extensions/source/propctrlr/defaultforminspection.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -173,7 +173,7 @@ namespace pcr
 
         return aReturn;
     }
-
+    
     //--------------------------------------------------------------------
     Sequence< PropertyCategoryDescriptor > SAL_CALL DefaultFormComponentInspectorModel::describeCategories(  ) throw (RuntimeException)
     {
diff --git a/extensions/source/propctrlr/defaultforminspection.hxx b/extensions/source/propctrlr/defaultforminspection.hxx
index 3e3a873b5482..9fe1cd3972b2 100644
--- a/extensions/source/propctrlr/defaultforminspection.hxx
+++ b/extensions/source/propctrlr/defaultforminspection.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/defaulthelpprovider.cxx b/extensions/source/propctrlr/defaulthelpprovider.cxx
index f9d9fd8f5967..290450050ec3 100644
--- a/extensions/source/propctrlr/defaulthelpprovider.cxx
+++ b/extensions/source/propctrlr/defaulthelpprovider.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -122,7 +122,7 @@ namespace pcr
             DBG_UNHANDLED_EXCEPTION();
         }
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL DefaultHelpProvider::valueChanged( const Reference< XPropertyControl >& /*_Control*/ ) throw (RuntimeException)
     {
diff --git a/extensions/source/propctrlr/defaulthelpprovider.hxx b/extensions/source/propctrlr/defaulthelpprovider.hxx
index b99d513c2f5e..625521660240 100644
--- a/extensions/source/propctrlr/defaulthelpprovider.hxx
+++ b/extensions/source/propctrlr/defaulthelpprovider.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx
index 9dd3911cd7bd..f57b62039da5 100644
--- a/extensions/source/propctrlr/editpropertyhandler.cxx
+++ b/extensions/source/propctrlr/editpropertyhandler.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/editpropertyhandler.hxx b/extensions/source/propctrlr/editpropertyhandler.hxx
index a50e36b430b6..8035cc8938db 100644
--- a/extensions/source/propctrlr/editpropertyhandler.hxx
+++ b/extensions/source/propctrlr/editpropertyhandler.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx
index 387b3aa06479..9a356d452c1b 100644
--- a/extensions/source/propctrlr/eformshelper.cxx
+++ b/extensions/source/propctrlr/eformshelper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace pcr
 
         m_xDocument = m_xDocument.query( _rxContextDocument );
         OSL_ENSURE( m_xDocument.is(), "EFormsHelper::EFormsHelper: invalid document!" );
-
+            
     }
 
     //--------------------------------------------------------------------
diff --git a/extensions/source/propctrlr/eformshelper.hxx b/extensions/source/propctrlr/eformshelper.hxx
index ba6c3ca681e4..53883b348d13 100644
--- a/extensions/source/propctrlr/eformshelper.hxx
+++ b/extensions/source/propctrlr/eformshelper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -224,7 +224,7 @@ namespace pcr
             @see getModelElementUIName
             @see getModelElementFromUIName
         */
-        void    getAllElementUINames(
+        void    getAllElementUINames( 
                     const ModelElementType _eType,
                     ::std::vector< ::rtl::OUString >& /* [out] */ _rElementNames,
                     bool _bPrepentEmptyEntry
diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx
index 68bd6ae46311..5002606ecc76 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.cxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/eformspropertyhandler.hxx b/extensions/source/propctrlr/eformspropertyhandler.hxx
index 1cf932e6c7ff..f1613a661583 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.hxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/enumrepresentation.hxx b/extensions/source/propctrlr/enumrepresentation.hxx
index b6f65724b520..058dd1096f4a 100644
--- a/extensions/source/propctrlr/enumrepresentation.hxx
+++ b/extensions/source/propctrlr/enumrepresentation.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index 08aaa69b37cb..ac148ed648cd 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -525,14 +525,14 @@ namespace pcr
     {
         return getImplementationName_static();
     }
-
+    
     //--------------------------------------------------------------------
     ::sal_Bool SAL_CALL EventHandler::supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException)
     {
         StlSyntaxSequence< ::rtl::OUString > aAllServices( getSupportedServiceNames() );
         return ::std::find( aAllServices.begin(), aAllServices.end(), ServiceName ) != aAllServices.end();
     }
-
+    
     //--------------------------------------------------------------------
     Sequence< ::rtl::OUString > SAL_CALL EventHandler::getSupportedServiceNames(  ) throw (RuntimeException)
     {
@@ -544,7 +544,7 @@ namespace pcr
     {
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.EventHandler" ) );
     }
-
+    
     //--------------------------------------------------------------------
     Sequence< ::rtl::OUString > SAL_CALL EventHandler::getSupportedServiceNames_static(  ) throw (RuntimeException)
     {
@@ -552,7 +552,7 @@ namespace pcr
         aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.inspection.EventHandler" ) );
         return aSupported;
     }
-
+    
     //--------------------------------------------------------------------
     Reference< XInterface > SAL_CALL EventHandler::Create( const Reference< XComponentContext >& _rxContext )
     {
@@ -626,7 +626,7 @@ namespace pcr
 
         return makeAny( aPropertyValue );
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL EventHandler::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException)
     {
@@ -659,7 +659,7 @@ namespace pcr
         aEvent.NewValue <<= aNewScriptEvent;
         m_aPropertyListeners.notify( aEvent, &XPropertyChangeListener::propertyChange );
     }
-
+    
     //--------------------------------------------------------------------
     Any SAL_CALL EventHandler::convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException)
     {
@@ -687,7 +687,7 @@ namespace pcr
         aAssignedScript.ScriptCode = sNewScriptCode;
         return makeAny( aAssignedScript );
     }
-
+    
     //--------------------------------------------------------------------
     Any SAL_CALL EventHandler::convertToControlValue( const ::rtl::OUString& /*_rPropertyName*/, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException)
     {
@@ -752,13 +752,13 @@ namespace pcr
 
         return makeAny( sScript );
     }
-
+    
     //--------------------------------------------------------------------
     PropertyState SAL_CALL EventHandler::getPropertyState( const ::rtl::OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException)
     {
         return PropertyState_DIRECT_VALUE;
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL EventHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException)
     {
@@ -767,14 +767,14 @@ namespace pcr
             throw NullPointerException();
         m_aPropertyListeners.addListener( _rxListener );
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL EventHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         m_aPropertyListeners.removeListener( _rxListener );
     }
-
+    
     //--------------------------------------------------------------------
     Sequence< Property > SAL_CALL EventHandler::getSupportedProperties() throw (RuntimeException)
     {
@@ -848,21 +848,21 @@ namespace pcr
             ::std::select2nd< ::std::map< EventId, Property >::value_type >() );
         return aReturn;
     }
-
+    
     //--------------------------------------------------------------------
     Sequence< ::rtl::OUString > SAL_CALL EventHandler::getSupersededProperties( ) throw (RuntimeException)
     {
         // none
         return Sequence< ::rtl::OUString >( );
     }
-
+    
     //--------------------------------------------------------------------
     Sequence< ::rtl::OUString > SAL_CALL EventHandler::getActuatingProperties( ) throw (RuntimeException)
     {
         // none
         return Sequence< ::rtl::OUString >( );
     }
-
+    
     //--------------------------------------------------------------------
     LineDescriptor SAL_CALL EventHandler::describePropertyLine( const ::rtl::OUString& _rPropertyName,
         const Reference< XPropertyControlFactory >& _rxControlFactory )
@@ -886,13 +886,13 @@ namespace pcr
         aDescriptor.Category = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Events" ) );
         return aDescriptor;
     }
-
+    
     //--------------------------------------------------------------------
     ::sal_Bool SAL_CALL EventHandler::isComposable( const ::rtl::OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException)
     {
         return sal_False;
     }
-
+    
     //--------------------------------------------------------------------
     InteractiveSelectionResult SAL_CALL EventHandler::onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException)
     {
@@ -967,13 +967,13 @@ namespace pcr
 
         return InteractiveSelectionResult_Success;
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL EventHandler::actuatingPropertyChanged( const ::rtl::OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException)
     {
         DBG_ERROR( "EventHandler::actuatingPropertyChanged: no actuating properties -> no callback (well, this is how it *should* be!)" );
     }
-
+    
     //--------------------------------------------------------------------
     IMPLEMENT_FORWARD_XCOMPONENT( EventHandler, EventHandler_Base )
 
diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx
index 4ea10e0e6463..7e113ec741bb 100644
--- a/extensions/source/propctrlr/eventhandler.hxx
+++ b/extensions/source/propctrlr/eventhandler.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx
index b9a5e2afffe3..c18d5735d60d 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,13 +91,13 @@ namespace pcr
             _rxProps );
 
     public:
-        sal_Bool        getCheckFontProperty(const ::rtl::OUString& _rPropName, ::com::sun::star::uno::Any& _rValue);
-        ::rtl::OUString getStringFontProperty(const ::rtl::OUString& _rPropName, const ::rtl::OUString& _rDefault);
-        sal_Int16       getInt16FontProperty(const ::rtl::OUString& _rPropName, const sal_Int16 _nDefault);
-        sal_Int32       getInt32FontProperty(const ::rtl::OUString& _rPropName, const sal_Int32 _nDefault);
-        float           getFloatFontProperty(const ::rtl::OUString& _rPropName, const float _nDefault);
+        sal_Bool		getCheckFontProperty(const ::rtl::OUString& _rPropName, ::com::sun::star::uno::Any& _rValue);
+        ::rtl::OUString	getStringFontProperty(const ::rtl::OUString& _rPropName, const ::rtl::OUString& _rDefault);
+        sal_Int16		getInt16FontProperty(const ::rtl::OUString& _rPropName, const sal_Int16 _nDefault);
+        sal_Int32		getInt32FontProperty(const ::rtl::OUString& _rPropName, const sal_Int32 _nDefault);
+        float			getFloatFontProperty(const ::rtl::OUString& _rPropName, const float _nDefault);
 
-        void            invalidateItem(
+        void			invalidateItem(
                             const ::rtl::OUString& _rPropName,
                             sal_uInt16 _nItemId,
                             SfxItemSet& _rSet,
@@ -123,7 +123,7 @@ namespace pcr
     }
 
     //------------------------------------------------------------------------
-    ::rtl::OUString OFontPropertyExtractor::getStringFontProperty(const ::rtl::OUString& _rPropName, const ::rtl::OUString& _rDefault)
+    ::rtl::OUString	OFontPropertyExtractor::getStringFontProperty(const ::rtl::OUString& _rPropName, const ::rtl::OUString& _rDefault)
     {
         Any aValue;
         if (getCheckFontProperty(_rPropName, aValue))
@@ -169,8 +169,8 @@ namespace pcr
     //------------------------------------------------------------------------
     void OFontPropertyExtractor::invalidateItem(const ::rtl::OUString& _rPropName, sal_uInt16 _nItemId, SfxItemSet& _rSet, sal_Bool _bForceInvalidation)
     {
-        if  (   _bForceInvalidation
-            ||  (   m_xPropStateAccess.is()
+        if	(	_bForceInvalidation
+            ||	(	m_xPropStateAccess.is()
                 && (PropertyState_AMBIGUOUS_VALUE == m_xPropStateAccess->getPropertyState(_rPropName))
                 )
             )
@@ -212,23 +212,23 @@ namespace pcr
             ::com::sun::star::awt::FontDescriptor aDefaultFont = VCLUnoHelper::CreateFontDescriptor(aDefaultVCLFont);
 
             // get the current properties
-            ::rtl::OUString aFontName       = aPropExtractor.getStringFontProperty(PROPERTY_FONT_NAME, aDefaultFont.Name);
-            ::rtl::OUString aFontStyleName  = aPropExtractor.getStringFontProperty(PROPERTY_FONT_STYLENAME, aDefaultFont.StyleName);
-            sal_Int16   nFontFamily         = aPropExtractor.getInt16FontProperty(PROPERTY_FONT_FAMILY, aDefaultFont.Family);
-            sal_Int16   nFontCharset        = aPropExtractor.getInt16FontProperty(PROPERTY_FONT_CHARSET, aDefaultFont.CharSet);
-            float   nFontHeight             = aPropExtractor.getFloatFontProperty(PROPERTY_FONT_HEIGHT, (float)aDefaultFont.Height);
-            float   nFontWeight             = aPropExtractor.getFloatFontProperty(PROPERTY_FONT_WEIGHT, aDefaultFont.Weight);
-            sal_Int16 nFontSlant            = aPropExtractor.getInt16FontProperty(PROPERTY_FONT_SLANT, (sal_Int16)aDefaultFont.Slant);
-            sal_Int16 nFontUnderline        = aPropExtractor.getInt16FontProperty(PROPERTY_FONT_UNDERLINE, aDefaultFont.Underline);
-            sal_Int16 nFontStrikeout        = aPropExtractor.getInt16FontProperty(PROPERTY_FONT_STRIKEOUT, aDefaultFont.Strikeout);
-
-            sal_Int32 nTextLineColor        = aPropExtractor.getInt32FontProperty(PROPERTY_TEXTLINECOLOR, COL_AUTO);
-            sal_Int16 nFontRelief           = aPropExtractor.getInt16FontProperty(PROPERTY_FONT_RELIEF, (sal_Int16)aDefaultVCLFont.GetRelief());
-            sal_Int16 nFontEmphasisMark     = aPropExtractor.getInt16FontProperty(PROPERTY_FONT_EMPHASIS_MARK, aDefaultVCLFont.GetEmphasisMark());
+            ::rtl::OUString aFontName		= aPropExtractor.getStringFontProperty(PROPERTY_FONT_NAME, aDefaultFont.Name);
+            ::rtl::OUString aFontStyleName	= aPropExtractor.getStringFontProperty(PROPERTY_FONT_STYLENAME, aDefaultFont.StyleName);
+            sal_Int16	nFontFamily			= aPropExtractor.getInt16FontProperty(PROPERTY_FONT_FAMILY, aDefaultFont.Family);
+            sal_Int16	nFontCharset		= aPropExtractor.getInt16FontProperty(PROPERTY_FONT_CHARSET, aDefaultFont.CharSet);
+            float	nFontHeight				= aPropExtractor.getFloatFontProperty(PROPERTY_FONT_HEIGHT, (float)aDefaultFont.Height);
+            float	nFontWeight				= aPropExtractor.getFloatFontProperty(PROPERTY_FONT_WEIGHT, aDefaultFont.Weight);
+            sal_Int16 nFontSlant			= aPropExtractor.getInt16FontProperty(PROPERTY_FONT_SLANT, (sal_Int16)aDefaultFont.Slant);
+            sal_Int16 nFontUnderline		= aPropExtractor.getInt16FontProperty(PROPERTY_FONT_UNDERLINE, aDefaultFont.Underline);
+            sal_Int16 nFontStrikeout		= aPropExtractor.getInt16FontProperty(PROPERTY_FONT_STRIKEOUT, aDefaultFont.Strikeout);
+
+            sal_Int32 nTextLineColor		= aPropExtractor.getInt32FontProperty(PROPERTY_TEXTLINECOLOR, COL_AUTO);
+            sal_Int16 nFontRelief			= aPropExtractor.getInt16FontProperty(PROPERTY_FONT_RELIEF, (sal_Int16)aDefaultVCLFont.GetRelief());
+            sal_Int16 nFontEmphasisMark		= aPropExtractor.getInt16FontProperty(PROPERTY_FONT_EMPHASIS_MARK, aDefaultVCLFont.GetEmphasisMark());
 
             Any aValue;
-            sal_Bool bWordLineMode          = aPropExtractor.getCheckFontProperty(PROPERTY_WORDLINEMODE, aValue) ? aDefaultFont.WordLineMode : ::cppu::any2bool(aValue);
-            sal_Int32 nColor32              = aPropExtractor.getInt32FontProperty(PROPERTY_TEXTCOLOR, 0);
+            sal_Bool bWordLineMode			= aPropExtractor.getCheckFontProperty(PROPERTY_WORDLINEMODE, aValue) ? aDefaultFont.WordLineMode : ::cppu::any2bool(aValue);
+            sal_Int32 nColor32				= aPropExtractor.getInt32FontProperty(PROPERTY_TEXTCOLOR, 0);
 
             // build SfxItems with the values
             SvxFontItem aFontItem((FontFamily)nFontFamily, aFontName, aFontStyleName, PITCH_DONTKNOW, nFontCharset, CFID_FONT);
@@ -236,18 +236,18 @@ namespace pcr
             nFontHeight = (float)OutputDevice::LogicToLogic(Size(0, (sal_Int32)nFontHeight), MAP_POINT, MAP_TWIP).Height();
             SvxFontHeightItem aSvxFontHeightItem((sal_uInt32)nFontHeight,100,CFID_HEIGHT);
 
-            FontWeight      eWeight=VCLUnoHelper::ConvertFontWeight(nFontWeight);
-            FontItalic      eItalic=(FontItalic)nFontSlant;
-            FontUnderline   eUnderline=(FontUnderline)nFontUnderline;
-            FontStrikeout   eStrikeout=(FontStrikeout)nFontStrikeout;
+            FontWeight		eWeight=VCLUnoHelper::ConvertFontWeight(nFontWeight);
+            FontItalic		eItalic=(FontItalic)nFontSlant;
+            FontUnderline	eUnderline=(FontUnderline)nFontUnderline;
+            FontStrikeout	eStrikeout=(FontStrikeout)nFontStrikeout;
 
-            SvxWeightItem       aWeightItem(eWeight,CFID_WEIGHT);
-            SvxPostureItem      aPostureItem(eItalic,CFID_POSTURE);
+            SvxWeightItem		aWeightItem(eWeight,CFID_WEIGHT);
+            SvxPostureItem		aPostureItem(eItalic,CFID_POSTURE);
 
-            SvxCrossedOutItem   aCrossedOutItem(eStrikeout,CFID_STRIKEOUT);
+            SvxCrossedOutItem	aCrossedOutItem(eStrikeout,CFID_STRIKEOUT);
             SvxWordLineModeItem aWordLineModeItem(bWordLineMode, CFID_WORDLINEMODE);
 
-            SvxUnderlineItem    aUnderlineItem(eUnderline,CFID_UNDERLINE);
+            SvxUnderlineItem 	aUnderlineItem(eUnderline,CFID_UNDERLINE);
             aUnderlineItem.SetColor(Color(nTextLineColor));
 
             SvxColorItem aSvxColorItem(nColor32,CFID_CHARCOLOR);
@@ -489,7 +489,7 @@ namespace pcr
     }
 
     //------------------------------------------------------------------------
-    SfxItemSet* ControlCharacterDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults)
+    SfxItemSet*	ControlCharacterDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults)
     {
         // just to be sure ....
         _rpSet = NULL;
@@ -501,7 +501,7 @@ namespace pcr
 
         Font aDefaultVCLFont = Application::GetDefaultDevice()->GetSettings().GetStyleSettings().GetAppFont();
 
-        SfxPoolItem** pCounter = _rppDefaults;  // want to modify this without affecting the out param _rppDefaults
+        SfxPoolItem** pCounter = _rppDefaults;	// want to modify this without affecting the out param _rppDefaults
         *pCounter++ = new SvxFontItem(aDefaultVCLFont.GetFamily(), aDefaultVCLFont.GetName(), aDefaultVCLFont.GetStyleName(), aDefaultVCLFont.GetPitch(), aDefaultVCLFont.GetCharSet(), CFID_FONT);
         *pCounter++ = new SvxFontHeightItem(aDefaultVCLFont.GetHeight(), 100, CFID_HEIGHT);
         *pCounter++ = new SvxWeightItem(aDefaultVCLFont.GetWeight(), CFID_WEIGHT);
@@ -529,26 +529,26 @@ namespace pcr
         // create the pool
         static SfxItemInfo __READONLY_DATA aItemInfos[CFID_LAST_ITEM_ID - CFID_FIRST_ITEM_ID + 1] =
         {
-            { SID_ATTR_CHAR_FONT,               0 },
-            { SID_ATTR_CHAR_FONTHEIGHT,         0 },
-            { SID_ATTR_CHAR_WEIGHT,             0 },
-            { SID_ATTR_CHAR_POSTURE,            0 },
-            { SID_ATTR_CHAR_LANGUAGE,           0 },
-            { SID_ATTR_CHAR_UNDERLINE,          0 },
-            { SID_ATTR_CHAR_STRIKEOUT,          0 },
-            { SID_ATTR_CHAR_WORDLINEMODE,       0 },
-            { SID_ATTR_CHAR_COLOR,              0 },
-            { SID_ATTR_CHAR_RELIEF,             0 },
-            { SID_ATTR_CHAR_EMPHASISMARK,       0 },
-            { 0,                                0 },
-            { 0,                                0 },
-            { 0,                                0 },
-            { 0,                                0 },
-            { 0,                                0 },
-            { 0,                                0 },
-            { 0,                                0 },
-            { 0,                                0 },
-            { SID_ATTR_CHAR_FONTLIST,           0 }
+            { SID_ATTR_CHAR_FONT,				0 },
+            { SID_ATTR_CHAR_FONTHEIGHT,			0 },
+            { SID_ATTR_CHAR_WEIGHT,				0 },
+            { SID_ATTR_CHAR_POSTURE,			0 },
+            { SID_ATTR_CHAR_LANGUAGE,			0 },
+            { SID_ATTR_CHAR_UNDERLINE,			0 },
+            { SID_ATTR_CHAR_STRIKEOUT,			0 },
+            { SID_ATTR_CHAR_WORDLINEMODE,		0 },
+            { SID_ATTR_CHAR_COLOR,				0 },
+            { SID_ATTR_CHAR_RELIEF,				0 },
+            { SID_ATTR_CHAR_EMPHASISMARK,		0 },
+            { 0,								0 },
+            { 0,								0 },
+            { 0,								0 },
+            { 0,								0 },
+            { 0,								0 },
+            { 0,								0 },
+            { 0,								0 },
+            { 0,								0 },
+            { SID_ATTR_CHAR_FONTLIST,			0 }
         };
 
         _rpPool = new SfxItemPool(String::CreateFromAscii("PCRControlFontItemPool"), CFID_FIRST_ITEM_ID, CFID_LAST_ITEM_ID,
@@ -603,7 +603,7 @@ namespace pcr
     }
 
 //............................................................................
-}   // namespace pcr
+}	// namespace pcr
 //............................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/fontdialog.hxx b/extensions/source/propctrlr/fontdialog.hxx
index 5cd285470fc4..b7d812c4af90 100644
--- a/extensions/source/propctrlr/fontdialog.hxx
+++ b/extensions/source/propctrlr/fontdialog.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace pcr
         ~ControlCharacterDialog();
 
         /// creates an item set to be used with this dialog
-        static SfxItemSet*  createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults);
+        static SfxItemSet*	createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults);
 
         /// destroys an item previously created with <method>createItemSet</method>
-        static void         destroyItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults);
+        static void			destroyItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults);
 
         /// fills the given item set with values obtained from the given property set
-        static void         translatePropertiesToItems(
+        static void			translatePropertiesToItems(
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel,
             SfxItemSet* _pSet);
 
@@ -77,7 +77,7 @@ namespace pcr
         virtual void PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage);
     };
 //............................................................................
-}   // namespace pcr
+}	// namespace pcr
 //............................................................................
 
 #endif // _EXTENSIONS_PROPCTRLR_FONTDIALOG_HXX_
diff --git a/extensions/source/propctrlr/fontdialog.src b/extensions/source/propctrlr/fontdialog.src
index 51dbb6913178..7d628e9efbae 100644
--- a/extensions/source/propctrlr/fontdialog.src
+++ b/extensions/source/propctrlr/fontdialog.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/fontitemids.hxx b/extensions/source/propctrlr/fontitemids.hxx
index 888b80c15c6b..2089f93ccbeb 100644
--- a/extensions/source/propctrlr/fontitemids.hxx
+++ b/extensions/source/propctrlr/fontitemids.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 _EXTENSIONS_PROPCTRLR_FONTITEMIDS_HXX_
 #define _EXTENSIONS_PROPCTRLR_FONTITEMIDS_HXX_
 
-#define CFID_FONT               1
-#define CFID_HEIGHT             2
-#define CFID_WEIGHT             3
-#define CFID_POSTURE            4
-#define CFID_LANGUAGE           5
-#define CFID_UNDERLINE          6
-#define CFID_STRIKEOUT          7
-#define CFID_WORDLINEMODE       8
-#define CFID_CHARCOLOR          9
-#define CFID_RELIEF             10
-#define CFID_EMPHASIS           11
+#define CFID_FONT				1
+#define CFID_HEIGHT				2
+#define CFID_WEIGHT				3
+#define CFID_POSTURE			4
+#define CFID_LANGUAGE			5
+#define CFID_UNDERLINE			6
+#define CFID_STRIKEOUT			7
+#define CFID_WORDLINEMODE		8
+#define CFID_CHARCOLOR			9
+#define CFID_RELIEF				10
+#define CFID_EMPHASIS			11
 
-#define CFID_CJK_FONT           12
-#define CFID_CJK_HEIGHT         13
-#define CFID_CJK_WEIGHT         14
-#define CFID_CJK_POSTURE        15
-#define CFID_CJK_LANGUAGE       16
-#define CFID_CASEMAP            17
-#define CFID_CONTOUR            18
-#define CFID_SHADOWED           19
+#define CFID_CJK_FONT			12
+#define CFID_CJK_HEIGHT			13
+#define CFID_CJK_WEIGHT			14
+#define CFID_CJK_POSTURE		15
+#define CFID_CJK_LANGUAGE		16
+#define CFID_CASEMAP			17
+#define CFID_CONTOUR			18
+#define CFID_SHADOWED			19
 
-#define CFID_FONTLIST           20
+#define CFID_FONTLIST			20
 
-#define CFID_FIRST_ITEM_ID  CFID_FONT
-#define CFID_LAST_ITEM_ID   CFID_FONTLIST
+#define CFID_FIRST_ITEM_ID	CFID_FONT
+#define CFID_LAST_ITEM_ID	CFID_FONTLIST
 
 //........................................................................
 namespace pcr
 {
 //........................................................................
 //........................................................................
-}   // namespace pcr
+}	// namespace pcr
 //........................................................................
 
 #endif // _EXTENSIONS_PROPCTRLR_FONTITEMIDS_HXX_
diff --git a/extensions/source/propctrlr/formbrowsertools.cxx b/extensions/source/propctrlr/formbrowsertools.cxx
index 1e60db01326c..d39e6c1ee170 100644
--- a/extensions/source/propctrlr/formbrowsertools.cxx
+++ b/extensions/source/propctrlr/formbrowsertools.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 pcr
                 aUnoObj >>= xIFace;
                 sClassName = String(PcrRes(RID_STR_PROPTITLE_EDIT));
                 if (xIFace.is())
-                {   // we have a chance to check if it's a formatted field model
+                {	// we have a chance to check if it's a formatted field model
                     Reference< XServiceInfo >  xInfo(xIFace, UNO_QUERY);
                     if (xInfo.is() && (xInfo->supportsService(SERVICE_COMPONENT_FORMATTEDFIELD)))
                         sClassName = String(PcrRes(RID_STR_PROPTITLE_FORMATTED));
diff --git a/extensions/source/propctrlr/formbrowsertools.hxx b/extensions/source/propctrlr/formbrowsertools.hxx
index 4374c28e253e..ec6d329e50da 100644
--- a/extensions/source/propctrlr/formbrowsertools.hxx
+++ b/extensions/source/propctrlr/formbrowsertools.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace pcr
 
     //========================================================================
     struct PropertyLessByName
-                :public ::std::binary_function  <   ::com::sun::star::beans::Property,
+                :public ::std::binary_function	<	::com::sun::star::beans::Property,
                                                     ::com::sun::star::beans::Property,
                                                     bool
                                                 >
@@ -87,7 +87,7 @@ namespace pcr
 
     //========================================================================
     struct TypeLessByName
-                :public ::std::binary_function  <   ::com::sun::star::uno::Type,
+                :public ::std::binary_function	<	::com::sun::star::uno::Type,
                                                     ::com::sun::star::uno::Type,
                                                     bool
                                                 >
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index c5eb86be632c..5ffafad89fe4 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -377,7 +377,7 @@ namespace pcr
                             ::rtl::OUString aValueStr;
                             _rValue >>= aValueStr;
                             xStringResourceManager->setString( aPureIdStr, aValueStr );
-                            aValue = aPropertyValue;    // set value to force modified
+                            aValue = aPropertyValue;	// set value to force modified
                         }
                     }
                     // StringItemList?
@@ -2561,7 +2561,7 @@ namespace pcr
             if ( bAdd )
             {
                 sTemp.append(_sName);
-                sTemp.appendAscii("/");
+                sTemp.appendAscii("/");                
             }
             sTemp.append(*pQueryNames);
             Reference< XNameAccess > xSubQueries(_xQueryNames->getByName(*pQueryNames),UNO_QUERY);
diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx
index 1b250cef718a..81f72606f1cc 100644
--- a/extensions/source/propctrlr/formcomponenthandler.hxx
+++ b/extensions/source/propctrlr/formcomponenthandler.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace pcr
         /// access to property states
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >             m_xPropertyState;
         /// the parent of our component
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >                   m_xObjectParent;
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > 				    m_xObjectParent;
 
         /// the database connection. Owned by us if and only if we created it ourself.
         mutable ::dbtools::SharedConnection                                                     m_xRowSetConnection;
@@ -103,7 +103,7 @@ namespace pcr
         /// our component has a "Command" property
         bool                            m_bHaveCommand : 1;
         /// the class id of the component - if appliable
-        sal_Int16                       m_nClassId;
+        sal_Int16				        m_nClassId;
 
     public:
         FormComponentPropertyHandler(
diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx
index 14a4d6465bfc..e2c5b7cdc7b6 100644
--- a/extensions/source/propctrlr/formcontroller.cxx
+++ b/extensions/source/propctrlr/formcontroller.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/formcontroller.hxx b/extensions/source/propctrlr/formcontroller.hxx
index d46b4e04a76c..fc398beb42d5 100644
--- a/extensions/source/propctrlr/formcontroller.hxx
+++ b/extensions/source/propctrlr/formcontroller.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx
index 0af7c29b7f80..5c0875e7870c 100644
--- a/extensions/source/propctrlr/formgeometryhandler.cxx
+++ b/extensions/source/propctrlr/formgeometryhandler.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -777,7 +777,7 @@ namespace pcr
             m_aPropertyChangeListeners.notifyEach( &XPropertyChangeListener::propertyChange, aTranslatedEvent );
         }
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL ShapeGeometryChangeNotifier::disposing( const EventObject& /*_event*/ ) throw (RuntimeException)
     {
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index 1f31a25fdd1c..21e965ede7b7 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/formlinkdialog.hrc b/extensions/source/propctrlr/formlinkdialog.hrc
index 768034901182..25a179352d66 100644
--- a/extensions/source/propctrlr/formlinkdialog.hrc
+++ b/extensions/source/propctrlr/formlinkdialog.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx
index a660a569cd89..04d35cc9fc6e 100644
--- a/extensions/source/propctrlr/formlinkdialog.hxx
+++ b/extensions/source/propctrlr/formlinkdialog.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/formlinkdialog.src b/extensions/source/propctrlr/formlinkdialog.src
index f319675d7c42..ca936a58d4d4 100644
--- a/extensions/source/propctrlr/formlinkdialog.src
+++ b/extensions/source/propctrlr/formlinkdialog.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/formlocalid.hrc b/extensions/source/propctrlr/formlocalid.hrc
index dca59a024321..387a1418a000 100644
--- a/extensions/source/propctrlr/formlocalid.hrc
+++ b/extensions/source/propctrlr/formlocalid.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 _EXTENSIONS_PROPCTRLR_FORMLOCALID_HRC_
 #define _EXTENSIONS_PROPCTRLR_FORMLOCALID_HRC_
 
-#define TABPAGE_CHARACTERS      1
-#define TABPAGE_CHARACTERS_EXT  2
+#define TABPAGE_CHARACTERS		1
+#define TABPAGE_CHARACTERS_EXT	2
 
 #define IMG_PLUS        1
 #define IMG_MINUS       2
diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx
index d4790a44350b..ae14c90c2b44 100644
--- a/extensions/source/propctrlr/formmetadata.cxx
+++ b/extensions/source/propctrlr/formmetadata.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace pcr
     //========================================================================
     struct OPropertyInfoImpl
     {
-        String          sName;
-        String          sTranslation;
+        String			sName;
+        String			sTranslation;
         sal_uInt32      nHelpId;
         sal_Int32       nId;
         sal_uInt16      nPos;
         sal_uInt32      nUIFlags;
 
         OPropertyInfoImpl(
-                        const ::rtl::OUString&      rName,
-                        sal_Int32                   _nId,
-                        const String&               aTranslation,
-                        sal_uInt16                  nPosId,
-                        sal_uInt32                  nHelpId,
+                        const ::rtl::OUString&		rName,
+                        sal_Int32					_nId,
+                        const String&				aTranslation,
+                        sal_uInt16					nPosId,
+                        sal_uInt32					nHelpId,
                         sal_uInt32                  _nUIFlags);
     };
 
@@ -89,7 +89,7 @@ namespace pcr
             return _rLHS.sName.CompareTo( _rRHS.sName ) == COMPARE_LESS;
         }
     };
-
+    
     //========================================================================
     //= OPropertyInfoService
     //========================================================================
@@ -112,8 +112,8 @@ namespace pcr
 #define DEF_INFO_5( ident, uinameres, helpid, flag1, flag2, flag3, flag4, flag5 ) \
     DEF_INFO( ident, uinameres, helpid, PROP_FLAG_##flag1 | PROP_FLAG_##flag2 | PROP_FLAG_##flag3 | PROP_FLAG_##flag4 | PROP_FLAG_##flag5 )
 
-    sal_uInt16              OPropertyInfoService::s_nCount = 0;
-    OPropertyInfoImpl*      OPropertyInfoService::s_pPropertyInfos = NULL;
+    sal_uInt16				OPropertyInfoService::s_nCount = 0;
+    OPropertyInfoImpl*		OPropertyInfoService::s_pPropertyInfos = NULL;
     //------------------------------------------------------------------------
     const OPropertyInfoImpl* OPropertyInfoService::getPropertyInfo()
     {
@@ -351,9 +351,9 @@ namespace pcr
         DEF_INFO_3( HELPURL,           HELPURL,            HELPURL,           FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
         DEF_INFO_3( SELECTION_TYPE,    SELECTION_TYPE,     SELECTION_TYPE,                  DIALOG_VISIBLE, ENUM, COMPOSEABLE ),
         DEF_INFO_2( ROOT_DISPLAYED,    ROOT_DISPLAYED,     ROOT_DISPLAYED,                  DIALOG_VISIBLE, COMPOSEABLE ),
-        DEF_INFO_2( SHOWS_HANDLES,     SHOWS_HANDLES,      SHOWS_HANDLES,                   DIALOG_VISIBLE, COMPOSEABLE ),
-        DEF_INFO_2( SHOWS_ROOT_HANDLES, SHOWS_ROOT_HANDLES, SHOWS_ROOT_HANDLES,             DIALOG_VISIBLE, COMPOSEABLE ),
-        DEF_INFO_2( EDITABLE,          EDITABLE,           EDITABLE,                        DIALOG_VISIBLE, COMPOSEABLE ),
+        DEF_INFO_2( SHOWS_HANDLES,     SHOWS_HANDLES,      SHOWS_HANDLES,					DIALOG_VISIBLE, COMPOSEABLE ),
+        DEF_INFO_2( SHOWS_ROOT_HANDLES, SHOWS_ROOT_HANDLES, SHOWS_ROOT_HANDLES,				DIALOG_VISIBLE, COMPOSEABLE ),
+        DEF_INFO_2( EDITABLE,          EDITABLE,           EDITABLE,						DIALOG_VISIBLE, COMPOSEABLE ),
         DEF_INFO_2( INVOKES_STOP_NOT_EDITING, INVOKES_STOP_NOT_EDITING, INVOKES_STOP_NOT_EDITING, DIALOG_VISIBLE, COMPOSEABLE ),
         DEF_INFO_2( DECORATION,        DECORATION,         DECORATION,                      DIALOG_VISIBLE, COMPOSEABLE ),
         DEF_INFO_2( NOLABEL,           NOLABEL,            NOLABEL,                         DIALOG_VISIBLE, COMPOSEABLE )
@@ -613,7 +613,7 @@ namespace pcr
     {
         return m_rMetaData.getPropertyEnumRepresentations( m_nPropertyId );
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL DefaultEnumRepresentation::getValueFromDescription( const ::rtl::OUString& _rDescription, Any& _out_rValue ) const
     {
@@ -656,7 +656,7 @@ namespace pcr
             _out_rValue.clear();
         }
     }
-
+    
     //--------------------------------------------------------------------
     ::rtl::OUString SAL_CALL DefaultEnumRepresentation::getDescriptionForValue( const Any& _rEnumValue ) const
     {
@@ -675,18 +675,18 @@ namespace pcr
             sReturn = aEnumStrings[ nIntValue ];
         }
         else
-        {
+        {	
             DBG_ERROR( "DefaultEnumRepresentation::getDescriptionForValue: could not translate an enum value" );
         }
         return sReturn;
     }
-
+    
     //--------------------------------------------------------------------
     oslInterlockedCount SAL_CALL DefaultEnumRepresentation::acquire()
     {
         return osl_incrementInterlockedCount( &m_refCount );
     }
-
+    
     //--------------------------------------------------------------------
     oslInterlockedCount SAL_CALL DefaultEnumRepresentation::release()
     {
diff --git a/extensions/source/propctrlr/formmetadata.hxx b/extensions/source/propctrlr/formmetadata.hxx
index 24341b617d08..66aaf8ab2e70 100644
--- a/extensions/source/propctrlr/formmetadata.hxx
+++ b/extensions/source/propctrlr/formmetadata.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace pcr
                 ,public PcrClient
     {
     protected:
-        static sal_uInt16               s_nCount;
-        static OPropertyInfoImpl*       s_pPropertyInfos;
+        static sal_uInt16				s_nCount;
+        static OPropertyInfoImpl*		s_pPropertyInfos;
         // TODO: a real structure which allows quick access by name as well as by id
 
     public:
         // IPropertyInfoService
-        virtual sal_Int32                           getPropertyId(const String& _rName) const;
-        virtual String                              getPropertyTranslation(sal_Int32 _nId) const;
-        virtual sal_Int32                           getPropertyHelpId(sal_Int32 _nId) const;
-        virtual sal_Int16                           getPropertyPos(sal_Int32 _nId) const;
+        virtual sal_Int32				            getPropertyId(const String& _rName) const;
+        virtual String					            getPropertyTranslation(sal_Int32 _nId) const;
+        virtual sal_Int32				            getPropertyHelpId(sal_Int32 _nId) const;
+        virtual sal_Int16				            getPropertyPos(sal_Int32 _nId) const;
         virtual sal_uInt32                          getPropertyUIFlags(sal_Int32 _nId) const;
         virtual ::std::vector< ::rtl::OUString >    getPropertyEnumRepresentations(sal_Int32 _nId) const;
         virtual String                              getPropertyName( sal_Int32 _nPropId );
@@ -140,125 +140,125 @@ namespace pcr
     //= property ids (for all browseable properties)
     //========================================================================
 
-    #define PROPERTY_ID_NAME                  1
-    #define PROPERTY_ID_LABEL                 2
-    #define PROPERTY_ID_CONTROLLABEL          3
-    #define PROPERTY_ID_MAXTEXTLEN            4
-    #define PROPERTY_ID_EDITMASK              5
-    #define PROPERTY_ID_LITERALMASK           6
-    #define PROPERTY_ID_STRICTFORMAT          7
-    #define PROPERTY_ID_ENABLED               8
-    #define PROPERTY_ID_READONLY              9
-    #define PROPERTY_ID_PRINTABLE            10
-    #define PROPERTY_ID_CONTROLSOURCE        11
-    #define PROPERTY_ID_TABSTOP              12
-    #define PROPERTY_ID_TABINDEX             13
-    #define PROPERTY_ID_DATASOURCE           14
-    #define PROPERTY_ID_COMMAND              15
-    #define PROPERTY_ID_COMMANDTYPE          16
+    #define PROPERTY_ID_NAME				  1
+    #define PROPERTY_ID_LABEL				  2
+    #define PROPERTY_ID_CONTROLLABEL		  3
+    #define PROPERTY_ID_MAXTEXTLEN			  4
+    #define PROPERTY_ID_EDITMASK			  5
+    #define PROPERTY_ID_LITERALMASK			  6
+    #define PROPERTY_ID_STRICTFORMAT		  7
+    #define PROPERTY_ID_ENABLED			  	  8
+    #define PROPERTY_ID_READONLY			  9
+    #define PROPERTY_ID_PRINTABLE			 10
+    #define PROPERTY_ID_CONTROLSOURCE		 11
+    #define PROPERTY_ID_TABSTOP				 12
+    #define PROPERTY_ID_TABINDEX			 13
+    #define PROPERTY_ID_DATASOURCE			 14
+    #define PROPERTY_ID_COMMAND				 15
+    #define PROPERTY_ID_COMMANDTYPE			 16
     #define PROPERTY_ID_FILTER               17
-    #define PROPERTY_ID_SORT                 18
-    #define PROPERTY_ID_INSERTONLY           19
-    #define PROPERTY_ID_ALLOWADDITIONS       20
-    #define PROPERTY_ID_ALLOWEDITS           21
-    #define PROPERTY_ID_ALLOWDELETIONS       22
-    #define PROPERTY_ID_GROUP_NAME           23
-    #define PROPERTY_ID_NAVIGATION           24
-    #define PROPERTY_ID_CYCLE                25
-    #define PROPERTY_ID_HIDDEN_VALUE         26
-    #define PROPERTY_ID_VALUEMIN             27
-    #define PROPERTY_ID_VALUEMAX             28
-    #define PROPERTY_ID_VALUESTEP            29
-    #define PROPERTY_ID_DEFAULT_VALUE        30
-    #define PROPERTY_ID_DECIMAL_ACCURACY     31
-    #define PROPERTY_ID_SHOWTHOUSANDSEP      32
-    #define PROPERTY_ID_REFVALUE             33
-    #define PROPERTY_ID_CURRENCYSYMBOL       34
-    #define PROPERTY_ID_CURRSYM_POSITION     35
-    #define PROPERTY_ID_DATEMIN              36
-    #define PROPERTY_ID_DATEMAX              37
-    #define PROPERTY_ID_DATEFORMAT           38
+    #define PROPERTY_ID_SORT				 18
+    #define PROPERTY_ID_INSERTONLY			 19
+    #define PROPERTY_ID_ALLOWADDITIONS		 20
+    #define PROPERTY_ID_ALLOWEDITS			 21
+    #define PROPERTY_ID_ALLOWDELETIONS		 22
+    #define PROPERTY_ID_GROUP_NAME    		 23
+    #define PROPERTY_ID_NAVIGATION			 24
+    #define PROPERTY_ID_CYCLE				 25
+    #define PROPERTY_ID_HIDDEN_VALUE		 26
+    #define PROPERTY_ID_VALUEMIN			 27
+    #define PROPERTY_ID_VALUEMAX			 28
+    #define PROPERTY_ID_VALUESTEP			 29
+    #define PROPERTY_ID_DEFAULT_VALUE		 30
+    #define PROPERTY_ID_DECIMAL_ACCURACY	 31
+    #define PROPERTY_ID_SHOWTHOUSANDSEP		 32
+    #define PROPERTY_ID_REFVALUE			 33
+    #define PROPERTY_ID_CURRENCYSYMBOL		 34
+    #define PROPERTY_ID_CURRSYM_POSITION	 35
+    #define PROPERTY_ID_DATEMIN				 36
+    #define PROPERTY_ID_DATEMAX				 37
+    #define PROPERTY_ID_DATEFORMAT			 38
     #define PROPERTY_ID_SELECTEDITEMS        39
-    #define PROPERTY_ID_DEFAULT_DATE         40
-    #define PROPERTY_ID_TIMEMIN              41
-    #define PROPERTY_ID_TIMEMAX              42
-    #define PROPERTY_ID_TIMEFORMAT           43
-    #define PROPERTY_ID_DEFAULT_TIME         44
-    #define PROPERTY_ID_EFFECTIVE_MIN        45
-    #define PROPERTY_ID_EFFECTIVE_MAX        46
-    #define PROPERTY_ID_EFFECTIVE_DEFAULT    47
-    #define PROPERTY_ID_FORMATKEY            48
-    #define PROPERTY_ID_CLASSID              50
-    #define PROPERTY_ID_HEIGHT               51
-    #define PROPERTY_ID_WIDTH                52
-    #define PROPERTY_ID_BOUNDCOLUMN          53
-    #define PROPERTY_ID_LISTSOURCETYPE       54
-    #define PROPERTY_ID_LISTSOURCE           55
-    #define PROPERTY_ID_LISTINDEX            56
-    #define PROPERTY_ID_STRINGITEMLIST       57
-    #define PROPERTY_ID_DEFAULT_TEXT         58
+    #define PROPERTY_ID_DEFAULT_DATE		 40
+    #define PROPERTY_ID_TIMEMIN				 41
+    #define PROPERTY_ID_TIMEMAX				 42
+    #define PROPERTY_ID_TIMEFORMAT			 43
+    #define PROPERTY_ID_DEFAULT_TIME		 44
+    #define PROPERTY_ID_EFFECTIVE_MIN		 45
+    #define PROPERTY_ID_EFFECTIVE_MAX		 46
+    #define PROPERTY_ID_EFFECTIVE_DEFAULT	 47
+    #define PROPERTY_ID_FORMATKEY			 48
+    #define PROPERTY_ID_CLASSID				 50
+    #define PROPERTY_ID_HEIGHT				 51
+    #define PROPERTY_ID_WIDTH				 52
+    #define PROPERTY_ID_BOUNDCOLUMN			 53
+    #define PROPERTY_ID_LISTSOURCETYPE		 54
+    #define PROPERTY_ID_LISTSOURCE			 55
+    #define PROPERTY_ID_LISTINDEX			 56
+    #define PROPERTY_ID_STRINGITEMLIST		 57
+    #define PROPERTY_ID_DEFAULT_TEXT		 58
     #define PROPERTY_ID_FONT                 59
-    #define PROPERTY_ID_ALIGN                60
-    #define PROPERTY_ID_ROWHEIGHT            61
-    #define PROPERTY_ID_BACKGROUNDCOLOR      62
-    #define PROPERTY_ID_FILLCOLOR            63
-    #define PROPERTY_ID_ESCAPE_PROCESSING    64
-    #define PROPERTY_ID_LINECOLOR            65
-    #define PROPERTY_ID_BORDER               66
-    #define PROPERTY_ID_DROPDOWN             67
-    #define PROPERTY_ID_AUTOCOMPLETE         68
-    #define PROPERTY_ID_LINECOUNT            69
+    #define PROPERTY_ID_ALIGN				 60
+    #define PROPERTY_ID_ROWHEIGHT			 61
+    #define PROPERTY_ID_BACKGROUNDCOLOR		 62
+    #define PROPERTY_ID_FILLCOLOR			 63
+    #define PROPERTY_ID_ESCAPE_PROCESSING	 64
+    #define PROPERTY_ID_LINECOLOR			 65
+    #define PROPERTY_ID_BORDER				 66
+    #define PROPERTY_ID_DROPDOWN			 67
+    #define PROPERTY_ID_AUTOCOMPLETE		 68
+    #define PROPERTY_ID_LINECOUNT			 69
     #define PROPERTY_ID_WORDBREAK            70
-    #define PROPERTY_ID_MULTILINE            71
-    #define PROPERTY_ID_MULTISELECTION       72
+    #define PROPERTY_ID_MULTILINE			 71
+    #define PROPERTY_ID_MULTISELECTION		 72
     #define PROPERTY_ID_AUTOLINEBREAK        73
-    #define PROPERTY_ID_HSCROLL              74
-    #define PROPERTY_ID_VSCROLL              75
-    #define PROPERTY_ID_SPIN                 76
-    #define PROPERTY_ID_BUTTONTYPE           77
-    #define PROPERTY_ID_TARGET_URL           78
-    #define PROPERTY_ID_TARGET_FRAME         79
-    #define PROPERTY_ID_SUBMIT_ACTION        80
-    #define PROPERTY_ID_SUBMIT_TARGET        81
-    #define PROPERTY_ID_SUBMIT_METHOD        82
-    #define PROPERTY_ID_SUBMIT_ENCODING      83
-    #define PROPERTY_ID_DEFAULT_STATE        84
-    #define PROPERTY_ID_DEFAULTBUTTON        85
-    #define PROPERTY_ID_IMAGE_URL            86
-    #define PROPERTY_ID_DEFAULT_SELECT_SEQ   87
-    #define PROPERTY_ID_ECHO_CHAR            88
-    #define PROPERTY_ID_EMPTY_IS_NULL        89
-    #define PROPERTY_ID_TRISTATE             90
-    #define PROPERTY_ID_MASTERFIELDS         91
-    #define PROPERTY_ID_DETAILFIELDS         92
-    #define PROPERTY_ID_RECORDMARKER         93
-    #define PROPERTY_ID_FILTERPROPOSAL       94
-    #define PROPERTY_ID_TAG                  95
-    #define PROPERTY_ID_HELPTEXT             96
-    #define PROPERTY_ID_HELPURL              97
-    #define PROPERTY_ID_HASNAVIGATION        98
-    #define PROPERTY_ID_POSITIONX            99
-    #define PROPERTY_ID_POSITIONY            100
-    #define PROPERTY_ID_TITLE                101
-    #define PROPERTY_ID_STEP                 102
-    #define PROPERTY_ID_PROGRESSVALUE        103
-    #define PROPERTY_ID_PROGRESSVALUE_MIN    104
-    #define PROPERTY_ID_PROGRESSVALUE_MAX    105
-    #define PROPERTY_ID_SCROLLVALUE          106
-    #define PROPERTY_ID_SCROLLVALUE_MAX      107
-    #define PROPERTY_ID_LINEINCREMENT        108
-    #define PROPERTY_ID_BLOCKINCREMENT       109
-    #define PROPERTY_ID_VISIBLESIZE          110
-    #define PROPERTY_ID_ORIENTATION          111
+    #define PROPERTY_ID_HSCROLL				 74
+    #define PROPERTY_ID_VSCROLL				 75
+    #define PROPERTY_ID_SPIN				 76
+    #define PROPERTY_ID_BUTTONTYPE			 77
+    #define PROPERTY_ID_TARGET_URL			 78
+    #define PROPERTY_ID_TARGET_FRAME		 79
+    #define PROPERTY_ID_SUBMIT_ACTION		 80
+    #define PROPERTY_ID_SUBMIT_TARGET		 81
+    #define PROPERTY_ID_SUBMIT_METHOD		 82
+    #define PROPERTY_ID_SUBMIT_ENCODING		 83
+    #define PROPERTY_ID_DEFAULT_STATE		 84
+    #define PROPERTY_ID_DEFAULTBUTTON		 85
+    #define PROPERTY_ID_IMAGE_URL			 86
+    #define PROPERTY_ID_DEFAULT_SELECT_SEQ	 87
+    #define PROPERTY_ID_ECHO_CHAR			 88
+    #define PROPERTY_ID_EMPTY_IS_NULL		 89
+    #define PROPERTY_ID_TRISTATE			 90
+    #define PROPERTY_ID_MASTERFIELDS		 91
+    #define PROPERTY_ID_DETAILFIELDS		 92
+    #define PROPERTY_ID_RECORDMARKER		 93
+    #define PROPERTY_ID_FILTERPROPOSAL		 94
+    #define PROPERTY_ID_TAG					 95
+    #define PROPERTY_ID_HELPTEXT			 96
+    #define PROPERTY_ID_HELPURL				 97
+    #define PROPERTY_ID_HASNAVIGATION		 98
+    #define PROPERTY_ID_POSITIONX			 99
+    #define PROPERTY_ID_POSITIONY			 100
+    #define PROPERTY_ID_TITLE				 101
+    #define PROPERTY_ID_STEP				 102
+    #define PROPERTY_ID_PROGRESSVALUE		 103
+    #define PROPERTY_ID_PROGRESSVALUE_MIN	 104
+    #define PROPERTY_ID_PROGRESSVALUE_MAX	 105
+    #define PROPERTY_ID_SCROLLVALUE			 106
+    #define PROPERTY_ID_SCROLLVALUE_MAX		 107
+    #define PROPERTY_ID_LINEINCREMENT		 108
+    #define PROPERTY_ID_BLOCKINCREMENT		 109
+    #define PROPERTY_ID_VISIBLESIZE			 110
+    #define PROPERTY_ID_ORIENTATION			 111
     #define PROPERTY_ID_IMAGEPOSITION        112
-    #define PROPERTY_ID_DATE                 113
-    #define PROPERTY_ID_STATE                114
-    #define PROPERTY_ID_TIME                 115
-    #define PROPERTY_ID_VALUE                116
-    #define PROPERTY_ID_SCALEIMAGE           117
-    #define PROPERTY_ID_PUSHBUTTONTYPE       118
-    #define PROPERTY_ID_EFFECTIVE_VALUE      119
-    #define PROPERTY_ID_TEXT                 120
+    #define PROPERTY_ID_DATE			     113
+    #define PROPERTY_ID_STATE			     114
+    #define PROPERTY_ID_TIME			     115
+    #define PROPERTY_ID_VALUE			     116
+    #define PROPERTY_ID_SCALEIMAGE		     117
+    #define PROPERTY_ID_PUSHBUTTONTYPE	     118
+    #define PROPERTY_ID_EFFECTIVE_VALUE 	 119
+    #define PROPERTY_ID_TEXT        		 120
     #define PROPERTY_ID_BOUND_CELL           121
     #define PROPERTY_ID_LIST_CELL_RANGE      122
     #define PROPERTY_ID_CELL_EXCHANGE_TYPE   123
@@ -326,14 +326,14 @@ namespace pcr
     #define PROPERTY_ID_LIST_BINDING                185
     #define PROPERTY_ID_VERTICAL_ALIGN              186
     #define PROPERTY_ID_BINDING_NAME                187
-    #define PROPERTY_ID_DECORATION                  188
-    #define PROPERTY_ID_SELECTION_TYPE              189
-    #define PROPERTY_ID_ROOT_DISPLAYED              190
-    #define PROPERTY_ID_SHOWS_HANDLES               191
-    #define PROPERTY_ID_SHOWS_ROOT_HANDLES          192
-    #define PROPERTY_ID_EDITABLE                    193
+    #define PROPERTY_ID_DECORATION                  188		
+    #define PROPERTY_ID_SELECTION_TYPE				189
+    #define PROPERTY_ID_ROOT_DISPLAYED				190
+    #define PROPERTY_ID_SHOWS_HANDLES				191
+    #define PROPERTY_ID_SHOWS_ROOT_HANDLES			192
+    #define PROPERTY_ID_EDITABLE					193
     #define PROPERTY_ID_INVOKES_STOP_NOT_EDITING    194
-    #define PROPERTY_ID_NOLABEL                     195
+    #define PROPERTY_ID_NOLABEL				        195
     #define PROPERTY_ID_SCALE_MODE                  196
     #define PROPERTY_ID_INPUT_REQUIRED              197
     #define PROPERTY_ID_WRITING_MODE                198
diff --git a/extensions/source/propctrlr/formres.src b/extensions/source/propctrlr/formres.src
index a1ac9fe2c0c4..1170c89cccf8 100644
--- a/extensions/source/propctrlr/formres.src
+++ b/extensions/source/propctrlr/formres.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -765,11 +765,11 @@ String RID_STR_EVT_BEFOREUPDATE
 };
 String RID_STR_EVT_APPROVEROWCHANGE
 {
-    Text [ en-US ] = "Before record action" ;
+    Text [ en-US ] = "Before record action" ;	
 };
 String RID_STR_EVT_ROWCHANGE
 {
-    Text [ en-US ] = "After record action" ;
+    Text [ en-US ] = "After record action" ;	
 };
 String RID_STR_EVT_CONFIRMDELETE
 {
@@ -805,11 +805,11 @@ String RID_STR_EVT_LOADED
 };
 String RID_STR_EVT_RELOADING
 {
-    Text [ en-US ] = "Before reloading" ;
+    Text [ en-US ] = "Before reloading" ;	
 };
 String RID_STR_EVT_RELOADED
 {
-    Text [ en-US ] = "When reloading" ;
+    Text [ en-US ] = "When reloading" ;	
 };
 String RID_STR_EVT_MOUSEDRAGGED
 {
@@ -857,7 +857,7 @@ String RID_STR_EVT_APPROVEACTIONPERFORMED
 };
 String RID_STR_EVT_SUBMITTED
 {
-    Text [ en-US ] = "Before submitting" ;
+    Text [ en-US ] = "Before submitting" ;	
 };
 String RID_STR_EVT_TEXTCHANGED
 {
diff --git a/extensions/source/propctrlr/formresid.hrc b/extensions/source/propctrlr/formresid.hrc
index 0aeab5306da9..e05a6bbab365 100644
--- a/extensions/source/propctrlr/formresid.hrc
+++ b/extensions/source/propctrlr/formresid.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,118 +35,118 @@
 // -----------------------------------------------------------------------
 // - Strings
 
-#define RID_STR_FORMS                       ( RID_FORMBROWSER_START +   1 )
-#define RID_STR_PROPTITLE_DBGRID            ( RID_FORMBROWSER_START +   2 )
-#define RID_STR_PROPTITLE_PATTERNFIELD      ( RID_FORMBROWSER_START +   3 )
-#define RID_STR_PROPTITLE_CURRENCYFIELD     ( RID_FORMBROWSER_START +   4 )
-#define RID_STR_PROPTITLE_NUMERICFIELD      ( RID_FORMBROWSER_START +   5 )
-#define RID_STR_PROPTITLE_TIMEFIELD         ( RID_FORMBROWSER_START +   6 )
-#define RID_STR_PROPTITLE_DATEFIELD         ( RID_FORMBROWSER_START +   7 )
-#define RID_STR_PROPTITLE_FILECONTROL       ( RID_FORMBROWSER_START +   8 )
-#define RID_STR_PROPTITLE_IMAGECONTROL      ( RID_FORMBROWSER_START +   9 )
-#define RID_STR_PROPTITLE_IMAGEBUTTON       ( RID_FORMBROWSER_START +  10 )
-#define RID_STR_PROPTITLE_COMBOBOX          ( RID_FORMBROWSER_START +  11 )
-#define RID_STR_PROPTITLE_LISTBOX           ( RID_FORMBROWSER_START +  12 )
-#define RID_STR_PROPTITLE_FORMATTED         ( RID_FORMBROWSER_START +  13 )
-#define RID_STR_PROPTITLE_EDIT              ( RID_FORMBROWSER_START +  14 )
-#define RID_STR_PROPTITLE_GROUPBOX          ( RID_FORMBROWSER_START +  15 )
-#define RID_STR_PROPTITLE_FIXEDTEXT         ( RID_FORMBROWSER_START +  16 )
-#define RID_STR_PROPTITLE_CHECKBOX          ( RID_FORMBROWSER_START +  17 )
-#define RID_STR_PROPTITLE_RADIOBUTTON       ( RID_FORMBROWSER_START +  18 )
-#define RID_STR_PROPTITLE_PUSHBUTTON        ( RID_FORMBROWSER_START +  19 )
-#define RID_STR_PROPTITLE_HIDDENCONTROL     ( RID_FORMBROWSER_START +  30 )
-#define RID_STR_PROPTITLE_UNKNOWNCONTROL    ( RID_FORMBROWSER_START +  31 )
+#define RID_STR_FORMS						( RID_FORMBROWSER_START +   1 )
+#define RID_STR_PROPTITLE_DBGRID			( RID_FORMBROWSER_START +   2 )
+#define RID_STR_PROPTITLE_PATTERNFIELD		( RID_FORMBROWSER_START +   3 )
+#define RID_STR_PROPTITLE_CURRENCYFIELD		( RID_FORMBROWSER_START +   4 )
+#define RID_STR_PROPTITLE_NUMERICFIELD		( RID_FORMBROWSER_START +   5 )
+#define RID_STR_PROPTITLE_TIMEFIELD			( RID_FORMBROWSER_START +   6 )
+#define RID_STR_PROPTITLE_DATEFIELD			( RID_FORMBROWSER_START +   7 )
+#define RID_STR_PROPTITLE_FILECONTROL		( RID_FORMBROWSER_START +   8 )
+#define RID_STR_PROPTITLE_IMAGECONTROL		( RID_FORMBROWSER_START +   9 )
+#define RID_STR_PROPTITLE_IMAGEBUTTON		( RID_FORMBROWSER_START +  10 )
+#define RID_STR_PROPTITLE_COMBOBOX			( RID_FORMBROWSER_START +  11 )
+#define RID_STR_PROPTITLE_LISTBOX			( RID_FORMBROWSER_START +  12 )
+#define RID_STR_PROPTITLE_FORMATTED			( RID_FORMBROWSER_START +  13 )
+#define RID_STR_PROPTITLE_EDIT				( RID_FORMBROWSER_START +  14 )
+#define RID_STR_PROPTITLE_GROUPBOX			( RID_FORMBROWSER_START +  15 )
+#define RID_STR_PROPTITLE_FIXEDTEXT			( RID_FORMBROWSER_START +  16 )
+#define RID_STR_PROPTITLE_CHECKBOX			( RID_FORMBROWSER_START +  17 )
+#define RID_STR_PROPTITLE_RADIOBUTTON		( RID_FORMBROWSER_START +  18 )
+#define RID_STR_PROPTITLE_PUSHBUTTON		( RID_FORMBROWSER_START +  19 )
+#define RID_STR_PROPTITLE_HIDDENCONTROL		( RID_FORMBROWSER_START +  30 )
+#define RID_STR_PROPTITLE_UNKNOWNCONTROL	( RID_FORMBROWSER_START +  31 )
 
-#define RID_STR_NAME                        ( RID_FORMBROWSER_START +  32 )
-#define RID_STR_LABEL                       ( RID_FORMBROWSER_START +  33 )
-#define RID_STR_LABELCONTROL                ( RID_FORMBROWSER_START +  34 )
-#define RID_STR_MAXTEXTLEN                  ( RID_FORMBROWSER_START +  35 )
-#define RID_STR_EDITMASK                    ( RID_FORMBROWSER_START +  36 )
-#define RID_STR_LITERALMASK                 ( RID_FORMBROWSER_START +  37 )
-#define RID_STR_STRICTFORMAT                ( RID_FORMBROWSER_START +  38 )
-#define RID_STR_ENABLED                     ( RID_FORMBROWSER_START +  39 )
-#define RID_STR_READONLY                    ( RID_FORMBROWSER_START +  40 )
-#define RID_STR_PRINTABLE                   ( RID_FORMBROWSER_START +  41 )
-#define RID_STR_CONTROLSOURCE               ( RID_FORMBROWSER_START +  42 )
-#define RID_STR_TABSTOP                     ( RID_FORMBROWSER_START +  43 )
-#define RID_STR_TABINDEX                    ( RID_FORMBROWSER_START +  44 )
-#define RID_STR_DATASOURCE                  ( RID_FORMBROWSER_START +  45 )
-#define RID_STR_CURSORSOURCE                ( RID_FORMBROWSER_START +  46 )
-#define RID_STR_CURSORSOURCETYPE            ( RID_FORMBROWSER_START +  47 )
+#define RID_STR_NAME						( RID_FORMBROWSER_START +  32 )
+#define RID_STR_LABEL						( RID_FORMBROWSER_START +  33 )
+#define RID_STR_LABELCONTROL				( RID_FORMBROWSER_START +  34 )
+#define RID_STR_MAXTEXTLEN					( RID_FORMBROWSER_START +  35 )
+#define RID_STR_EDITMASK					( RID_FORMBROWSER_START +  36 )
+#define RID_STR_LITERALMASK					( RID_FORMBROWSER_START +  37 )
+#define RID_STR_STRICTFORMAT				( RID_FORMBROWSER_START +  38 )
+#define RID_STR_ENABLED						( RID_FORMBROWSER_START +  39 )
+#define RID_STR_READONLY					( RID_FORMBROWSER_START +  40 )
+#define RID_STR_PRINTABLE					( RID_FORMBROWSER_START +  41 )
+#define RID_STR_CONTROLSOURCE				( RID_FORMBROWSER_START +  42 )
+#define RID_STR_TABSTOP						( RID_FORMBROWSER_START +  43 )
+#define RID_STR_TABINDEX					( RID_FORMBROWSER_START +  44 )
+#define RID_STR_DATASOURCE					( RID_FORMBROWSER_START +  45 )
+#define RID_STR_CURSORSOURCE				( RID_FORMBROWSER_START +  46 )
+#define RID_STR_CURSORSOURCETYPE			( RID_FORMBROWSER_START +  47 )
 #define RID_STR_FILTER                      ( RID_FORMBROWSER_START +  48 )
-#define RID_STR_SORT_CRITERIA               ( RID_FORMBROWSER_START +  49 )
-#define RID_STR_ALLOW_ADDITIONS             ( RID_FORMBROWSER_START +  50 )
-#define RID_STR_ALLOW_EDITS                 ( RID_FORMBROWSER_START +  51 )
-#define RID_STR_ALLOW_DELETIONS             ( RID_FORMBROWSER_START +  52 )
-#define RID_STR_DATAENTRY                   ( RID_FORMBROWSER_START +  53 )
-#define RID_STR_CYCLE                       ( RID_FORMBROWSER_START +  54 )
-#define RID_STR_VALUE                       ( RID_FORMBROWSER_START +  55 )
-#define RID_STR_VALUESTEP                   ( RID_FORMBROWSER_START +  56 )
-#define RID_STR_DECIMAL_ACCURACY            ( RID_FORMBROWSER_START +  57 )
-#define RID_STR_SHOWTHOUSANDSEP             ( RID_FORMBROWSER_START +  58 )
-#define RID_STR_REFVALUE                    ( RID_FORMBROWSER_START +  59 )
-#define RID_STR_CURRENCYSYMBOL              ( RID_FORMBROWSER_START +  60 )
-#define RID_STR_CURRSYM_POSITION            ( RID_FORMBROWSER_START +  61 )
-#define RID_STR_DATEMIN                     ( RID_FORMBROWSER_START +  62 )
-#define RID_STR_DATEMAX                     ( RID_FORMBROWSER_START +  63 )
-#define RID_STR_DATEFORMAT                  ( RID_FORMBROWSER_START +  64 )
-#define RID_STR_SELECTEDITEMS               ( RID_FORMBROWSER_START +  65 )
-#define RID_STR_TIMEMIN                     ( RID_FORMBROWSER_START +  66 )
-#define RID_STR_TIMEMAX                     ( RID_FORMBROWSER_START +  67 )
-#define RID_STR_TIMEFORMAT                  ( RID_FORMBROWSER_START +  68 )
-#define RID_STR_VALUEMIN                    ( RID_FORMBROWSER_START +  69 )
-#define RID_STR_VALUEMAX                    ( RID_FORMBROWSER_START +  70 )
-#define RID_STR_FORMATKEY                   ( RID_FORMBROWSER_START +  71 )
-#define RID_STR_CLASSID                     ( RID_FORMBROWSER_START +  72 )
-#define RID_STR_HEIGHT                      ( RID_FORMBROWSER_START +  73 )
-#define RID_STR_WIDTH                       ( RID_FORMBROWSER_START +  74 )
-#define RID_STR_BOUNDCOLUMN                 ( RID_FORMBROWSER_START +  75 )
-#define RID_STR_LISTSOURCETYPE              ( RID_FORMBROWSER_START +  76 )
-#define RID_STR_LISTSOURCE                  ( RID_FORMBROWSER_START +  77 )
-#define RID_STR_LISTINDEX                   ( RID_FORMBROWSER_START +  78 )
-#define RID_STR_STRINGITEMLIST              ( RID_FORMBROWSER_START +  79 )
-#define RID_STR_DEFAULTVALUE                ( RID_FORMBROWSER_START +  80 )
-#define RID_STR_FONT                        ( RID_FORMBROWSER_START +  81 )
-#define RID_STR_ALIGN                       ( RID_FORMBROWSER_START +  82 )
-#define RID_STR_ROWHEIGHT                   ( RID_FORMBROWSER_START +  83 )
-#define RID_STR_BACKGROUNDCOLOR             ( RID_FORMBROWSER_START +  84 )
-#define RID_STR_FILLCOLOR                   ( RID_FORMBROWSER_START +  85 )
-#define RID_STR_LINECOLOR                   ( RID_FORMBROWSER_START +  86 )
-#define RID_STR_BORDER                      ( RID_FORMBROWSER_START +  87 )
-#define RID_STR_DROPDOWN                    ( RID_FORMBROWSER_START +  88 )
-#define RID_STR_AUTOCOMPLETE                ( RID_FORMBROWSER_START +  89 )
-#define RID_STR_LINECOUNT                   ( RID_FORMBROWSER_START +  90 )
-#define RID_STR_MULTILINE                   ( RID_FORMBROWSER_START +  91 )
-#define RID_STR_MULTISELECTION              ( RID_FORMBROWSER_START +  92 )
+#define RID_STR_SORT_CRITERIA				( RID_FORMBROWSER_START +  49 )
+#define RID_STR_ALLOW_ADDITIONS				( RID_FORMBROWSER_START +  50 )
+#define RID_STR_ALLOW_EDITS					( RID_FORMBROWSER_START +  51 )
+#define RID_STR_ALLOW_DELETIONS				( RID_FORMBROWSER_START +  52 )
+#define RID_STR_DATAENTRY					( RID_FORMBROWSER_START +  53 )
+#define RID_STR_CYCLE						( RID_FORMBROWSER_START +  54 )
+#define RID_STR_VALUE						( RID_FORMBROWSER_START +  55 )
+#define RID_STR_VALUESTEP					( RID_FORMBROWSER_START +  56 )
+#define RID_STR_DECIMAL_ACCURACY			( RID_FORMBROWSER_START +  57 )
+#define RID_STR_SHOWTHOUSANDSEP				( RID_FORMBROWSER_START +  58 )
+#define RID_STR_REFVALUE					( RID_FORMBROWSER_START +  59 )
+#define RID_STR_CURRENCYSYMBOL				( RID_FORMBROWSER_START +  60 )
+#define RID_STR_CURRSYM_POSITION			( RID_FORMBROWSER_START +  61 )
+#define RID_STR_DATEMIN						( RID_FORMBROWSER_START +  62 )
+#define RID_STR_DATEMAX						( RID_FORMBROWSER_START +  63 )
+#define RID_STR_DATEFORMAT					( RID_FORMBROWSER_START +  64 )
+#define RID_STR_SELECTEDITEMS				( RID_FORMBROWSER_START +  65 )
+#define RID_STR_TIMEMIN						( RID_FORMBROWSER_START +  66 )
+#define RID_STR_TIMEMAX						( RID_FORMBROWSER_START +  67 )
+#define RID_STR_TIMEFORMAT					( RID_FORMBROWSER_START +  68 )
+#define RID_STR_VALUEMIN					( RID_FORMBROWSER_START +  69 )
+#define RID_STR_VALUEMAX					( RID_FORMBROWSER_START +  70 )
+#define RID_STR_FORMATKEY					( RID_FORMBROWSER_START +  71 )
+#define RID_STR_CLASSID						( RID_FORMBROWSER_START +  72 )
+#define RID_STR_HEIGHT						( RID_FORMBROWSER_START +  73 )
+#define RID_STR_WIDTH						( RID_FORMBROWSER_START +  74 )
+#define RID_STR_BOUNDCOLUMN					( RID_FORMBROWSER_START +  75 )
+#define RID_STR_LISTSOURCETYPE				( RID_FORMBROWSER_START +  76 )
+#define RID_STR_LISTSOURCE					( RID_FORMBROWSER_START +  77 )
+#define RID_STR_LISTINDEX					( RID_FORMBROWSER_START +  78 )
+#define RID_STR_STRINGITEMLIST				( RID_FORMBROWSER_START +  79 )
+#define RID_STR_DEFAULTVALUE				( RID_FORMBROWSER_START +  80 )
+#define RID_STR_FONT						( RID_FORMBROWSER_START +  81 )
+#define RID_STR_ALIGN						( RID_FORMBROWSER_START +  82 )
+#define RID_STR_ROWHEIGHT					( RID_FORMBROWSER_START +  83 )
+#define RID_STR_BACKGROUNDCOLOR				( RID_FORMBROWSER_START +  84 )
+#define RID_STR_FILLCOLOR					( RID_FORMBROWSER_START +  85 )
+#define RID_STR_LINECOLOR					( RID_FORMBROWSER_START +  86 )
+#define RID_STR_BORDER						( RID_FORMBROWSER_START +  87 )
+#define RID_STR_DROPDOWN					( RID_FORMBROWSER_START +  88 )
+#define RID_STR_AUTOCOMPLETE				( RID_FORMBROWSER_START +  89 )
+#define RID_STR_LINECOUNT					( RID_FORMBROWSER_START +  90 )
+#define RID_STR_MULTILINE					( RID_FORMBROWSER_START +  91 )
+#define RID_STR_MULTISELECTION				( RID_FORMBROWSER_START +  92 )
 #define RID_STR_BUTTONTYPE                  ( RID_FORMBROWSER_START +  93 )
-#define RID_STR_HSCROLL                     ( RID_FORMBROWSER_START +  94 )
-#define RID_STR_VSCROLL                     ( RID_FORMBROWSER_START +  95 )
-#define RID_STR_SPIN                        ( RID_FORMBROWSER_START +  96 )
+#define RID_STR_HSCROLL						( RID_FORMBROWSER_START +  94 )
+#define RID_STR_VSCROLL						( RID_FORMBROWSER_START +  95 )
+#define RID_STR_SPIN						( RID_FORMBROWSER_START +  96 )
 #define RID_STR_AUTOLINEBREAK               ( RID_FORMBROWSER_START +  97 )
-#define RID_STR_TARGET_URL                  ( RID_FORMBROWSER_START +  98 )
-#define RID_STR_TARGET_FRAME                ( RID_FORMBROWSER_START +  99 )
-#define RID_STR_SUBMIT_ACTION               ( RID_FORMBROWSER_START + 100 )
-#define RID_STR_SUBMIT_TARGET               ( RID_FORMBROWSER_START + 101 )
-#define RID_STR_SUBMIT_METHOD               ( RID_FORMBROWSER_START + 102 )
-#define RID_STR_SUBMIT_ENCODING             ( RID_FORMBROWSER_START + 103 )
+#define RID_STR_TARGET_URL					( RID_FORMBROWSER_START +  98 )
+#define RID_STR_TARGET_FRAME				( RID_FORMBROWSER_START +  99 )
+#define RID_STR_SUBMIT_ACTION				( RID_FORMBROWSER_START + 100 )
+#define RID_STR_SUBMIT_TARGET				( RID_FORMBROWSER_START + 101 )
+#define RID_STR_SUBMIT_METHOD				( RID_FORMBROWSER_START + 102 )
+#define RID_STR_SUBMIT_ENCODING				( RID_FORMBROWSER_START + 103 )
 #define RID_STR_DEFAULT_STATE               ( RID_FORMBROWSER_START + 104 )
-#define RID_STR_DEFAULT_BUTTON              ( RID_FORMBROWSER_START + 105 )
-#define RID_STR_IMAGE_URL                   ( RID_FORMBROWSER_START + 106 )
-#define RID_STR_DEFAULT_SELECT_SEQ          ( RID_FORMBROWSER_START + 107 )
-#define RID_STR_ECHO_CHAR                   ( RID_FORMBROWSER_START + 108 )
-#define RID_STR_EMPTY_IS_NULL               ( RID_FORMBROWSER_START + 109 )
-#define RID_STR_TRISTATE                    ( RID_FORMBROWSER_START + 110 )
-#define RID_STR_MASTERFIELDS                ( RID_FORMBROWSER_START + 111 )
-#define RID_STR_SLAVEFIELDS                 ( RID_FORMBROWSER_START + 112 )
-#define RID_STR_NAVIGATION                  ( RID_FORMBROWSER_START + 113 )
-#define RID_STR_RECORDMARKER                ( RID_FORMBROWSER_START + 114 )
-#define RID_STR_FILTERPROPOSAL              ( RID_FORMBROWSER_START + 115 )
-#define RID_STR_TAG                         ( RID_FORMBROWSER_START + 116 )
-#define RID_STR_HELPTEXT                    ( RID_FORMBROWSER_START + 117 )
-#define RID_STR_HELPURL                     ( RID_FORMBROWSER_START + 118 )
+#define RID_STR_DEFAULT_BUTTON				( RID_FORMBROWSER_START + 105 )
+#define RID_STR_IMAGE_URL					( RID_FORMBROWSER_START + 106 )
+#define RID_STR_DEFAULT_SELECT_SEQ			( RID_FORMBROWSER_START + 107 )
+#define RID_STR_ECHO_CHAR					( RID_FORMBROWSER_START + 108 )
+#define RID_STR_EMPTY_IS_NULL				( RID_FORMBROWSER_START + 109 )
+#define RID_STR_TRISTATE					( RID_FORMBROWSER_START + 110 )
+#define RID_STR_MASTERFIELDS				( RID_FORMBROWSER_START + 111 )
+#define RID_STR_SLAVEFIELDS					( RID_FORMBROWSER_START + 112 )
+#define RID_STR_NAVIGATION					( RID_FORMBROWSER_START + 113 )
+#define RID_STR_RECORDMARKER				( RID_FORMBROWSER_START + 114 )
+#define RID_STR_FILTERPROPOSAL				( RID_FORMBROWSER_START + 115 )
+#define RID_STR_TAG							( RID_FORMBROWSER_START + 116 )
+#define RID_STR_HELPTEXT					( RID_FORMBROWSER_START + 117 )
+#define RID_STR_HELPURL						( RID_FORMBROWSER_START + 118 )
 #define RID_STR_INPUT_REQUIRED              ( RID_FORMBROWSER_START + 119 )
 #define RID_STR_UNCHECKEDREFVALUE           ( RID_FORMBROWSER_START + 120 )
-#define RID_STR_CURSOR_TYPE                 ( RID_FORMBROWSER_START + 121 )
+#define RID_STR_CURSOR_TYPE					( RID_FORMBROWSER_START + 121 )
 #define RID_STR_ENABLE_VISIBLE              ( RID_FORMBROWSER_START + 122 )
 #define RID_STR_WHEEL_BEHAVIOR              ( RID_FORMBROWSER_START + 123 )
 #define RID_STR_GROUP_NAME                  ( RID_FORMBROWSER_START + 124 )
@@ -157,66 +157,66 @@
     // FREE
     // FREE
     // FREE
-#define RID_STR_ENUM_NAVIGATION             ( RID_FORMBROWSER_START + 131 )
-#define RID_STR_EVT_APPROVEACTIONPERFORMED  ( RID_FORMBROWSER_START + 132 )
-#define RID_STR_EVT_ACTIONPERFORMED         ( RID_FORMBROWSER_START + 133 )
-#define RID_STR_EVT_CHANGED                 ( RID_FORMBROWSER_START + 134 )
-#define RID_STR_EVT_TEXTCHANGED             ( RID_FORMBROWSER_START + 135 )
-#define RID_STR_EVT_ITEMSTATECHANGED        ( RID_FORMBROWSER_START + 136 )
-#define RID_STR_EVT_FOCUSGAINED             ( RID_FORMBROWSER_START + 137 )
-#define RID_STR_EVT_FOCUSLOST               ( RID_FORMBROWSER_START + 138 )
-#define RID_STR_EVT_KEYTYPED                ( RID_FORMBROWSER_START + 139 )
-#define RID_STR_EVT_KEYUP                   ( RID_FORMBROWSER_START + 140 )
-#define RID_STR_EVT_MOUSEENTERED            ( RID_FORMBROWSER_START + 141 )
-#define RID_STR_EVT_MOUSEDRAGGED            ( RID_FORMBROWSER_START + 142 )
-#define RID_STR_EVT_MOUSEMOVED              ( RID_FORMBROWSER_START + 143 )
-#define RID_STR_EVT_MOUSEPRESSED            ( RID_FORMBROWSER_START + 144 )
-#define RID_STR_EVT_MOUSERELEASED           ( RID_FORMBROWSER_START + 145 )
-#define RID_STR_EVT_MOUSEEXITED             ( RID_FORMBROWSER_START + 146 )
-#define RID_STR_EVT_APPROVERESETTED         ( RID_FORMBROWSER_START + 147 )
-#define RID_STR_EVT_RESETTED                ( RID_FORMBROWSER_START + 148 )
-#define RID_STR_EVT_SUBMITTED               ( RID_FORMBROWSER_START + 149 )
-#define RID_STR_EVT_BEFOREUPDATE            ( RID_FORMBROWSER_START + 150 )
-#define RID_STR_EVT_AFTERUPDATE             ( RID_FORMBROWSER_START + 151 )
-#define RID_STR_EVT_LOADED                  ( RID_FORMBROWSER_START + 152 )
-#define RID_STR_EVT_RELOADING               ( RID_FORMBROWSER_START + 153 )
-#define RID_STR_EVT_RELOADED                ( RID_FORMBROWSER_START + 154 )
-#define RID_STR_EVT_UNLOADING               ( RID_FORMBROWSER_START + 155 )
-#define RID_STR_EVT_UNLOADED                ( RID_FORMBROWSER_START + 156 )
-#define RID_STR_EVT_CONFIRMDELETE           ( RID_FORMBROWSER_START + 157 )
-#define RID_STR_EVT_APPROVEROWCHANGE        ( RID_FORMBROWSER_START + 158 )
-#define RID_STR_EVT_ROWCHANGE               ( RID_FORMBROWSER_START + 159 )
-#define RID_STR_EVT_POSITIONING             ( RID_FORMBROWSER_START + 160 )
-#define RID_STR_EVT_POSITIONED              ( RID_FORMBROWSER_START + 161 )
-#define RID_STR_EVT_APPROVEPARAMETER        ( RID_FORMBROWSER_START + 162 )
-#define RID_STR_EVT_ERROROCCURED            ( RID_FORMBROWSER_START + 163 )
-#define RID_STR_EVENTS                      ( RID_FORMBROWSER_START + 164 )
-#define RID_STR_ESCAPE_PROCESSING           ( RID_FORMBROWSER_START + 165 )
+#define RID_STR_ENUM_NAVIGATION				( RID_FORMBROWSER_START + 131 )
+#define RID_STR_EVT_APPROVEACTIONPERFORMED	( RID_FORMBROWSER_START + 132 )
+#define RID_STR_EVT_ACTIONPERFORMED			( RID_FORMBROWSER_START + 133 )
+#define RID_STR_EVT_CHANGED					( RID_FORMBROWSER_START + 134 )
+#define RID_STR_EVT_TEXTCHANGED				( RID_FORMBROWSER_START + 135 )
+#define RID_STR_EVT_ITEMSTATECHANGED		( RID_FORMBROWSER_START + 136 )
+#define RID_STR_EVT_FOCUSGAINED				( RID_FORMBROWSER_START + 137 )
+#define RID_STR_EVT_FOCUSLOST				( RID_FORMBROWSER_START + 138 )
+#define RID_STR_EVT_KEYTYPED				( RID_FORMBROWSER_START + 139 )
+#define RID_STR_EVT_KEYUP					( RID_FORMBROWSER_START + 140 )
+#define RID_STR_EVT_MOUSEENTERED			( RID_FORMBROWSER_START + 141 )
+#define RID_STR_EVT_MOUSEDRAGGED			( RID_FORMBROWSER_START + 142 )
+#define RID_STR_EVT_MOUSEMOVED				( RID_FORMBROWSER_START + 143 )
+#define RID_STR_EVT_MOUSEPRESSED			( RID_FORMBROWSER_START + 144 )
+#define RID_STR_EVT_MOUSERELEASED			( RID_FORMBROWSER_START + 145 )
+#define RID_STR_EVT_MOUSEEXITED				( RID_FORMBROWSER_START + 146 )
+#define RID_STR_EVT_APPROVERESETTED			( RID_FORMBROWSER_START + 147 )
+#define RID_STR_EVT_RESETTED				( RID_FORMBROWSER_START + 148 )
+#define RID_STR_EVT_SUBMITTED				( RID_FORMBROWSER_START + 149 )
+#define RID_STR_EVT_BEFOREUPDATE			( RID_FORMBROWSER_START + 150 )
+#define RID_STR_EVT_AFTERUPDATE				( RID_FORMBROWSER_START + 151 )
+#define RID_STR_EVT_LOADED					( RID_FORMBROWSER_START + 152 )
+#define RID_STR_EVT_RELOADING				( RID_FORMBROWSER_START + 153 )
+#define RID_STR_EVT_RELOADED				( RID_FORMBROWSER_START + 154 )
+#define RID_STR_EVT_UNLOADING				( RID_FORMBROWSER_START + 155 )
+#define RID_STR_EVT_UNLOADED				( RID_FORMBROWSER_START + 156 )
+#define RID_STR_EVT_CONFIRMDELETE			( RID_FORMBROWSER_START + 157 )
+#define RID_STR_EVT_APPROVEROWCHANGE		( RID_FORMBROWSER_START + 158 )
+#define RID_STR_EVT_ROWCHANGE				( RID_FORMBROWSER_START + 159 )
+#define RID_STR_EVT_POSITIONING				( RID_FORMBROWSER_START + 160 )
+#define RID_STR_EVT_POSITIONED				( RID_FORMBROWSER_START + 161 )
+#define RID_STR_EVT_APPROVEPARAMETER		( RID_FORMBROWSER_START + 162 )
+#define RID_STR_EVT_ERROROCCURED			( RID_FORMBROWSER_START + 163 )
+#define RID_STR_EVENTS						( RID_FORMBROWSER_START + 164 )
+#define RID_STR_ESCAPE_PROCESSING			( RID_FORMBROWSER_START + 165 )
     // FREE
-#define RID_STR_POSITIONX                   ( RID_FORMBROWSER_START + 167 )
-#define RID_STR_POSITIONY                   ( RID_FORMBROWSER_START + 168 )
-#define RID_STR_TITLE                       ( RID_FORMBROWSER_START + 169 )
-#define RID_STR_STEP                        ( RID_FORMBROWSER_START + 170 )
-#define RID_STR_PROGRESSVALUE               ( RID_FORMBROWSER_START + 171 )
-#define RID_STR_PROGRESSVALUE_MIN           ( RID_FORMBROWSER_START + 172 )
-#define RID_STR_PROGRESSVALUE_MAX           ( RID_FORMBROWSER_START + 173 )
-#define RID_STR_SCROLLVALUE                 ( RID_FORMBROWSER_START + 174 )
-#define RID_STR_SCROLLVALUE_MAX             ( RID_FORMBROWSER_START + 175 )
-#define RID_STR_LINEINCREMENT               ( RID_FORMBROWSER_START + 176 )
-#define RID_STR_BLOCKINCREMENT              ( RID_FORMBROWSER_START + 177 )
-#define RID_STR_VISIBLESIZE                 ( RID_FORMBROWSER_START + 178 )
-#define RID_STR_ORIENTATION                 ( RID_FORMBROWSER_START + 179 )
+#define RID_STR_POSITIONX					( RID_FORMBROWSER_START + 167 )
+#define RID_STR_POSITIONY					( RID_FORMBROWSER_START + 168 )
+#define RID_STR_TITLE						( RID_FORMBROWSER_START + 169 )
+#define RID_STR_STEP						( RID_FORMBROWSER_START + 170 )
+#define RID_STR_PROGRESSVALUE				( RID_FORMBROWSER_START + 171 )
+#define RID_STR_PROGRESSVALUE_MIN			( RID_FORMBROWSER_START + 172 )
+#define RID_STR_PROGRESSVALUE_MAX			( RID_FORMBROWSER_START + 173 )
+#define RID_STR_SCROLLVALUE					( RID_FORMBROWSER_START + 174 )
+#define RID_STR_SCROLLVALUE_MAX				( RID_FORMBROWSER_START + 175 )
+#define RID_STR_LINEINCREMENT				( RID_FORMBROWSER_START + 176 )
+#define RID_STR_BLOCKINCREMENT				( RID_FORMBROWSER_START + 177 )
+#define RID_STR_VISIBLESIZE					( RID_FORMBROWSER_START + 178 )
+#define RID_STR_ORIENTATION					( RID_FORMBROWSER_START + 179 )
     // FREE
 #define RID_STR_VERTICAL_ALIGN              ( RID_FORMBROWSER_START + 181 )
-#define RID_STR_EVT_ADJUSTMENTVALUECHANGED  ( RID_FORMBROWSER_START + 182 )
-#define RID_STR_DATE                        ( RID_FORMBROWSER_START + 183 )
-#define RID_STR_STATE                       ( RID_FORMBROWSER_START + 184 )
-#define RID_STR_TIME                        ( RID_FORMBROWSER_START + 185 )
-#define RID_STR_SCALEIMAGE                  ( RID_FORMBROWSER_START + 186 )
-#define RID_STR_PUSHBUTTONTYPE              ( RID_FORMBROWSER_START + 187 )
-#define RID_STR_ENUM_PUSHBUTTONTYPE         ( RID_FORMBROWSER_START + 188 )
-#define RID_STR_UNABLETOCONNECT             ( RID_FORMBROWSER_START + 189 )
-#define RID_STR_TEXT                        ( RID_FORMBROWSER_START + 190 )
+#define RID_STR_EVT_ADJUSTMENTVALUECHANGED	( RID_FORMBROWSER_START + 182 )
+#define RID_STR_DATE						( RID_FORMBROWSER_START + 183 )
+#define RID_STR_STATE						( RID_FORMBROWSER_START + 184 )
+#define RID_STR_TIME						( RID_FORMBROWSER_START + 185 )
+#define RID_STR_SCALEIMAGE					( RID_FORMBROWSER_START + 186 )
+#define RID_STR_PUSHBUTTONTYPE				( RID_FORMBROWSER_START + 187 )
+#define RID_STR_ENUM_PUSHBUTTONTYPE			( RID_FORMBROWSER_START + 188 )
+#define RID_STR_UNABLETOCONNECT				( RID_FORMBROWSER_START + 189 )
+#define RID_STR_TEXT						( RID_FORMBROWSER_START + 190 )
 #define RID_STR_BOUND_CELL                  ( RID_FORMBROWSER_START + 191 )
 #define RID_STR_LIST_CELL_RANGE             ( RID_FORMBROWSER_START + 192 )
 #define RID_STR_CELL_EXCHANGE_TYPE          ( RID_FORMBROWSER_START + 193 )
@@ -270,14 +270,14 @@
 #define RID_STR_LIST_BINDING                ( RID_FORMBROWSER_START + 241 )
 #define RID_STR_BINDING_UI_NAME             ( RID_FORMBROWSER_START + 242 )
 #define RID_STR_BINDING_NAME                RID_STR_BINDING_UI_NAME
-#define RID_STR_DECORATION                  ( RID_FORMBROWSER_START + 243 )
-#define RID_STR_SELECTION_TYPE              ( RID_FORMBROWSER_START + 244 )
-#define RID_STR_ROOT_DISPLAYED              ( RID_FORMBROWSER_START + 245 )
-#define RID_STR_SHOWS_HANDLES               ( RID_FORMBROWSER_START + 246 )
-#define RID_STR_SHOWS_ROOT_HANDLES          ( RID_FORMBROWSER_START + 247 )
-#define RID_STR_EDITABLE                    ( RID_FORMBROWSER_START + 248 )
+#define RID_STR_DECORATION					( RID_FORMBROWSER_START + 243 )
+#define RID_STR_SELECTION_TYPE				( RID_FORMBROWSER_START + 244 )
+#define RID_STR_ROOT_DISPLAYED				( RID_FORMBROWSER_START + 245 )
+#define RID_STR_SHOWS_HANDLES				( RID_FORMBROWSER_START + 246 )
+#define RID_STR_SHOWS_ROOT_HANDLES			( RID_FORMBROWSER_START + 247 )
+#define RID_STR_EDITABLE					( RID_FORMBROWSER_START + 248 )
 #define RID_STR_INVOKES_STOP_NOT_EDITING    ( RID_FORMBROWSER_START + 249 )
-#define RID_STR_NOLABEL                     ( RID_FORMBROWSER_START + 250 )
+#define RID_STR_NOLABEL					    ( RID_FORMBROWSER_START + 250 )
 #define RID_STR_FONTSTYLE_REGULAR           ( RID_FORMBROWSER_START + 251 )
 #define RID_STR_FONTSTYLE_BOLD_ITALIC       ( RID_FORMBROWSER_START + 252 )
 #define RID_STR_FONTSTYLE_ITALIC            ( RID_FORMBROWSER_START + 253 )
@@ -293,7 +293,7 @@
 // -----------------------------------------------------------------------
 // - dialogs
 
-#define RID_DLG_SELECTLABELCONTROL          ( RID_PROPCONTROLLER_START +  0 )
+#define RID_DLG_SELECTLABELCONTROL			( RID_PROPCONTROLLER_START +  0 )
 #define RID_DLG_TABORDER                    ( RID_PROPCONTROLLER_START +  1 )
 #define RID_DLG_FORMLINKS                   ( RID_PROPCONTROLLER_START +  2 )
 #define RID_DLG_SELECTION                   ( RID_PROPCONTROLLER_START +  3 )
@@ -302,12 +302,12 @@
 // -----------------------------------------------------------------------
 // - tab dialogs
 
-#define RID_TABDLG_FONTDIALOG               ( RID_PROPCONTROLLER_START +  0 )
+#define RID_TABDLG_FONTDIALOG				( RID_PROPCONTROLLER_START +  0 )
 
 // -----------------------------------------------------------------------
 // - ImageLists
 
-#define RID_IL_FORMEXPLORER                 ( RID_PROPCONTROLLER_START +  0 )
+#define RID_IL_FORMEXPLORER					( RID_PROPCONTROLLER_START +  0 )
 #define RID_IL_FORMEXPLORER_HC              ( RID_PROPCONTROLLER_START +  1 )
 
 // -----------------------------------------------------------------------
@@ -355,32 +355,32 @@
 // we do not duplicate images. Instead we do some hard coding for the image ids
 
 
-#define RID_SVXIMG_CONTROL                          10144
-#define RID_SVXIMG_BUTTON                           10594
-#define RID_SVXIMG_RADIOBUTTON                      10595
-#define RID_SVXIMG_CHECKBOX                         10596
-#define RID_SVXIMG_FIXEDTEXT                        10597
-#define RID_SVXIMG_GROUPBOX                         10598
-#define RID_SVXIMG_EDIT                             10599
-#define RID_SVXIMG_LISTBOX                          10600
-#define RID_SVXIMG_COMBOBOX                         10601
-#define RID_SVXIMG_URLBUTTON                        10602
-#define RID_SVXIMG_GRID                             10603
-#define RID_SVXIMG_IMAGEBUTTON                      10604
-#define RID_SVXIMG_FILECONTROL                      10605
-#define RID_SVXIMG_DATEFIELD                        10704
-#define RID_SVXIMG_TIMEFIELD                        10705
-#define RID_SVXIMG_NUMERICFIELD                     10706
-#define RID_SVXIMG_CURRENCYFIELD                    10707
-#define RID_SVXIMG_PATTERNFIELD                     10708
-#define RID_SVXIMG_IMAGECONTROL                     10710
-#define RID_SVXIMG_HIDDEN                           18022
+#define RID_SVXIMG_CONTROL							10144
+#define RID_SVXIMG_BUTTON							10594
+#define RID_SVXIMG_RADIOBUTTON						10595
+#define RID_SVXIMG_CHECKBOX							10596
+#define RID_SVXIMG_FIXEDTEXT						10597
+#define RID_SVXIMG_GROUPBOX							10598
+#define RID_SVXIMG_EDIT								10599
+#define RID_SVXIMG_LISTBOX							10600
+#define RID_SVXIMG_COMBOBOX							10601
+#define RID_SVXIMG_URLBUTTON						10602
+#define RID_SVXIMG_GRID								10603
+#define RID_SVXIMG_IMAGEBUTTON						10604
+#define RID_SVXIMG_FILECONTROL						10605
+#define RID_SVXIMG_DATEFIELD						10704
+#define RID_SVXIMG_TIMEFIELD						10705
+#define RID_SVXIMG_NUMERICFIELD						10706
+#define RID_SVXIMG_CURRENCYFIELD					10707
+#define RID_SVXIMG_PATTERNFIELD						10708
+#define RID_SVXIMG_IMAGECONTROL						10710
+#define RID_SVXIMG_HIDDEN							18022
 #define RID_SVXIMG_FORMATTEDFIELD                   10728
-#define RID_SVXIMG_FILTER                           10715
-#define RID_SVXIMG_FORMS                            18013
-#define RID_SVXIMG_FORM                             10593
-#define RID_SVXIMG_COLLAPSEDNODE                    18002
-#define RID_SVXIMG_EXPANDEDNODE                     18003
+#define RID_SVXIMG_FILTER							10715
+#define RID_SVXIMG_FORMS							18013
+#define RID_SVXIMG_FORM								10593
+#define RID_SVXIMG_COLLAPSEDNODE					18002
+#define RID_SVXIMG_EXPANDEDNODE						18003
 #define RID_SVXIMG_SCROLLBAR                        10768
 #define RID_SVXIMG_SPINBUTTON                       10769
 #define RID_SVXIMG_NAVIGATIONBAR                    10607
diff --git a/extensions/source/propctrlr/formstrings.cxx b/extensions/source/propctrlr/formstrings.cxx
index 9d04554cb554..45aefb4b04bb 100644
--- a/extensions/source/propctrlr/formstrings.cxx
+++ b/extensions/source/propctrlr/formstrings.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/formstrings.hxx b/extensions/source/propctrlr/formstrings.hxx
index 19bffe32e30c..0910105dabc3 100644
--- a/extensions/source/propctrlr/formstrings.hxx
+++ b/extensions/source/propctrlr/formstrings.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,158 +36,158 @@ namespace pcr
 {
 //............................................................................
 
-    PCR_CONSTASCII_STRING( PROPERTY_DEFAULTCONTROL,         "DefaultControl" );
-    PCR_CONSTASCII_STRING( PROPERTY_INTROSPECTEDOBJECT,     "IntrospectedObject" );
-    PCR_CONSTASCII_STRING( PROPERTY_CURRENTPAGE,            "CurrentPage" );
+    PCR_CONSTASCII_STRING( PROPERTY_DEFAULTCONTROL,			"DefaultControl" );
+    PCR_CONSTASCII_STRING( PROPERTY_INTROSPECTEDOBJECT,		"IntrospectedObject" );
+    PCR_CONSTASCII_STRING( PROPERTY_CURRENTPAGE,			"CurrentPage" );
     PCR_CONSTASCII_STRING( PROPERTY_CONTROLCONTEXT,         "ControlContext" );
 
     // properties
-    PCR_CONSTASCII_STRING( PROPERTY_CLASSID,                "ClassId" );
-    PCR_CONSTASCII_STRING( PROPERTY_CONTROLLABEL,           "LabelControl");
-    PCR_CONSTASCII_STRING( PROPERTY_LABEL,                  "Label");
-    PCR_CONSTASCII_STRING( PROPERTY_TABINDEX,               "TabIndex");
+    PCR_CONSTASCII_STRING( PROPERTY_CLASSID,				"ClassId" );
+    PCR_CONSTASCII_STRING( PROPERTY_CONTROLLABEL,			"LabelControl");
+    PCR_CONSTASCII_STRING( PROPERTY_LABEL,					"Label");
+    PCR_CONSTASCII_STRING( PROPERTY_TABINDEX,				"TabIndex");
     PCR_CONSTASCII_STRING( PROPERTY_WHEEL_BEHAVIOR,         "MouseWheelBehavior");
-    PCR_CONSTASCII_STRING( PROPERTY_TAG,                    "Tag");
-    PCR_CONSTASCII_STRING( PROPERTY_NAME,                   "Name");
+    PCR_CONSTASCII_STRING( PROPERTY_TAG,					"Tag");
+    PCR_CONSTASCII_STRING( PROPERTY_NAME,					"Name");
     PCR_CONSTASCII_STRING( PROPERTY_GROUP_NAME,             "GroupName");
-    PCR_CONSTASCII_STRING( PROPERTY_VALUE,                  "Value");
-    PCR_CONSTASCII_STRING( PROPERTY_TEXT,                   "Text");
-    PCR_CONSTASCII_STRING( PROPERTY_NAVIGATION,             "NavigationBarMode");
-    PCR_CONSTASCII_STRING( PROPERTY_CYCLE,                  "Cycle");
-    PCR_CONSTASCII_STRING( PROPERTY_CONTROLSOURCE,          "DataField");
+    PCR_CONSTASCII_STRING( PROPERTY_VALUE,					"Value");
+    PCR_CONSTASCII_STRING( PROPERTY_TEXT,					"Text");
+    PCR_CONSTASCII_STRING( PROPERTY_NAVIGATION,				"NavigationBarMode");
+    PCR_CONSTASCII_STRING( PROPERTY_CYCLE,					"Cycle");
+    PCR_CONSTASCII_STRING( PROPERTY_CONTROLSOURCE,			"DataField");
     PCR_CONSTASCII_STRING( PROPERTY_INPUT_REQUIRED,         "InputRequired");
-    PCR_CONSTASCII_STRING( PROPERTY_ENABLED,                "Enabled");
+    PCR_CONSTASCII_STRING( PROPERTY_ENABLED,				"Enabled");
     PCR_CONSTASCII_STRING( PROPERTY_ENABLE_VISIBLE,         "EnableVisible" );
-    PCR_CONSTASCII_STRING( PROPERTY_READONLY,               "ReadOnly");
-    PCR_CONSTASCII_STRING( PROPERTY_ISREADONLY,             "IsReadOnly");
-    PCR_CONSTASCII_STRING( PROPERTY_FILTER,                 "Filter");
-    PCR_CONSTASCII_STRING( PROPERTY_WIDTH,                  "Width");
-    PCR_CONSTASCII_STRING( PROPERTY_MULTILINE,              "MultiLine");
-    PCR_CONSTASCII_STRING( PROPERTY_WORDBREAK,              "WordBreak");
-    PCR_CONSTASCII_STRING( PROPERTY_TARGET_URL,             "TargetURL");
-    PCR_CONSTASCII_STRING( PROPERTY_TARGET_FRAME,           "TargetFrame");
-    PCR_CONSTASCII_STRING( PROPERTY_MAXTEXTLEN,             "MaxTextLen");
-    PCR_CONSTASCII_STRING( PROPERTY_EDITMASK,               "EditMask");
-    PCR_CONSTASCII_STRING( PROPERTY_SPIN,                   "Spin");
-    PCR_CONSTASCII_STRING( PROPERTY_TRISTATE,               "TriState");
-    PCR_CONSTASCII_STRING( PROPERTY_HIDDEN_VALUE,           "HiddenValue");
-    PCR_CONSTASCII_STRING( PROPERTY_BUTTONTYPE,             "ButtonType");
+    PCR_CONSTASCII_STRING( PROPERTY_READONLY,				"ReadOnly");
+    PCR_CONSTASCII_STRING( PROPERTY_ISREADONLY,				"IsReadOnly");
+    PCR_CONSTASCII_STRING( PROPERTY_FILTER,		            "Filter");
+    PCR_CONSTASCII_STRING( PROPERTY_WIDTH,					"Width");
+    PCR_CONSTASCII_STRING( PROPERTY_MULTILINE,				"MultiLine");
+    PCR_CONSTASCII_STRING( PROPERTY_WORDBREAK,				"WordBreak");
+    PCR_CONSTASCII_STRING( PROPERTY_TARGET_URL,				"TargetURL");
+    PCR_CONSTASCII_STRING( PROPERTY_TARGET_FRAME,			"TargetFrame");
+    PCR_CONSTASCII_STRING( PROPERTY_MAXTEXTLEN,				"MaxTextLen");
+    PCR_CONSTASCII_STRING( PROPERTY_EDITMASK,				"EditMask");
+    PCR_CONSTASCII_STRING( PROPERTY_SPIN,					"Spin");
+    PCR_CONSTASCII_STRING( PROPERTY_TRISTATE,				"TriState");
+    PCR_CONSTASCII_STRING( PROPERTY_HIDDEN_VALUE,			"HiddenValue");
+    PCR_CONSTASCII_STRING( PROPERTY_BUTTONTYPE,				"ButtonType");
     PCR_CONSTASCII_STRING( PROPERTY_XFORMS_BUTTONTYPE,      "XFormsButtonType");
-    PCR_CONSTASCII_STRING( PROPERTY_STRINGITEMLIST,         "StringItemList");
-    PCR_CONSTASCII_STRING( PROPERTY_DEFAULT_TEXT,           "DefaultText");
-    PCR_CONSTASCII_STRING( PROPERTY_DEFAULT_STATE,          "DefaultState");
-    PCR_CONSTASCII_STRING( PROPERTY_FORMATKEY,              "FormatKey");
-    PCR_CONSTASCII_STRING( PROPERTY_FORMATSSUPPLIER,        "FormatsSupplier");
-    PCR_CONSTASCII_STRING( PROPERTY_SUBMIT_ACTION,          "SubmitAction");
-    PCR_CONSTASCII_STRING( PROPERTY_SUBMIT_TARGET,          "SubmitTarget");
-    PCR_CONSTASCII_STRING( PROPERTY_SUBMIT_METHOD,          "SubmitMethod");
-    PCR_CONSTASCII_STRING( PROPERTY_SUBMIT_ENCODING,        "SubmitEncoding");
-    PCR_CONSTASCII_STRING( PROPERTY_IMAGE_URL,              "ImageURL");
-    PCR_CONSTASCII_STRING( PROPERTY_EMPTY_IS_NULL,          "ConvertEmptyToNull");
-    PCR_CONSTASCII_STRING( PROPERTY_LISTSOURCETYPE,         "ListSourceType");
-    PCR_CONSTASCII_STRING( PROPERTY_LISTSOURCE,             "ListSource");
-    PCR_CONSTASCII_STRING( PROPERTY_DEFAULT_SELECT_SEQ,     "DefaultSelection");
-    PCR_CONSTASCII_STRING( PROPERTY_MULTISELECTION,         "MultiSelection");
-    PCR_CONSTASCII_STRING( PROPERTY_ALIGN,                  "Align");
+    PCR_CONSTASCII_STRING( PROPERTY_STRINGITEMLIST,			"StringItemList");
+    PCR_CONSTASCII_STRING( PROPERTY_DEFAULT_TEXT,			"DefaultText");
+    PCR_CONSTASCII_STRING( PROPERTY_DEFAULT_STATE,			"DefaultState");
+    PCR_CONSTASCII_STRING( PROPERTY_FORMATKEY,				"FormatKey");
+    PCR_CONSTASCII_STRING( PROPERTY_FORMATSSUPPLIER,		"FormatsSupplier");
+    PCR_CONSTASCII_STRING( PROPERTY_SUBMIT_ACTION,			"SubmitAction");
+    PCR_CONSTASCII_STRING( PROPERTY_SUBMIT_TARGET,			"SubmitTarget");
+    PCR_CONSTASCII_STRING( PROPERTY_SUBMIT_METHOD,			"SubmitMethod");
+    PCR_CONSTASCII_STRING( PROPERTY_SUBMIT_ENCODING,		"SubmitEncoding");
+    PCR_CONSTASCII_STRING( PROPERTY_IMAGE_URL,				"ImageURL");
+    PCR_CONSTASCII_STRING( PROPERTY_EMPTY_IS_NULL,			"ConvertEmptyToNull");
+    PCR_CONSTASCII_STRING( PROPERTY_LISTSOURCETYPE,			"ListSourceType");
+    PCR_CONSTASCII_STRING( PROPERTY_LISTSOURCE,				"ListSource");
+    PCR_CONSTASCII_STRING( PROPERTY_DEFAULT_SELECT_SEQ,		"DefaultSelection");
+    PCR_CONSTASCII_STRING( PROPERTY_MULTISELECTION,			"MultiSelection");
+    PCR_CONSTASCII_STRING( PROPERTY_ALIGN,					"Align");
     PCR_CONSTASCII_STRING( PROPERTY_VERTICAL_ALIGN,         "VerticalAlign");
-    PCR_CONSTASCII_STRING( PROPERTY_DEFAULT_DATE,           "DefaultDate");
-    PCR_CONSTASCII_STRING( PROPERTY_DEFAULT_TIME,           "DefaultTime");
-    PCR_CONSTASCII_STRING( PROPERTY_DEFAULT_VALUE,          "DefaultValue");
-    PCR_CONSTASCII_STRING( PROPERTY_DECIMAL_ACCURACY,       "DecimalAccuracy");
-    PCR_CONSTASCII_STRING( PROPERTY_REFVALUE,               "RefValue");
+    PCR_CONSTASCII_STRING( PROPERTY_DEFAULT_DATE,			"DefaultDate");
+    PCR_CONSTASCII_STRING( PROPERTY_DEFAULT_TIME,			"DefaultTime");
+    PCR_CONSTASCII_STRING( PROPERTY_DEFAULT_VALUE,			"DefaultValue");
+    PCR_CONSTASCII_STRING( PROPERTY_DECIMAL_ACCURACY,		"DecimalAccuracy");
+    PCR_CONSTASCII_STRING( PROPERTY_REFVALUE,				"RefValue");
     PCR_CONSTASCII_STRING( PROPERTY_UNCHECKEDREFVALUE,      "SecondaryRefValue");
-    PCR_CONSTASCII_STRING( PROPERTY_VALUEMIN,               "ValueMin");
-    PCR_CONSTASCII_STRING( PROPERTY_VALUEMAX,               "ValueMax");
-    PCR_CONSTASCII_STRING( PROPERTY_STRICTFORMAT,           "StrictFormat");
-    PCR_CONSTASCII_STRING( PROPERTY_ALLOWADDITIONS,         "AllowInserts");
-    PCR_CONSTASCII_STRING( PROPERTY_ALLOWEDITS,             "AllowUpdates");
-    PCR_CONSTASCII_STRING( PROPERTY_ALLOWDELETIONS,         "AllowDeletes");
-    PCR_CONSTASCII_STRING( PROPERTY_MASTERFIELDS,           "MasterFields");
-    PCR_CONSTASCII_STRING( PROPERTY_LITERALMASK,            "LiteralMask");
-    PCR_CONSTASCII_STRING( PROPERTY_VALUESTEP,              "ValueStep");
-    PCR_CONSTASCII_STRING( PROPERTY_SHOWTHOUSANDSEP,        "ShowThousandsSeparator");
-    PCR_CONSTASCII_STRING( PROPERTY_CURRENCYSYMBOL,         "CurrencySymbol");
-    PCR_CONSTASCII_STRING( PROPERTY_DATEFORMAT,             "DateFormat");
-    PCR_CONSTASCII_STRING( PROPERTY_DATEMIN,                "DateMin");
-    PCR_CONSTASCII_STRING( PROPERTY_DATEMAX,                "DateMax");
-    PCR_CONSTASCII_STRING( PROPERTY_TIMEFORMAT,             "TimeFormat");
-    PCR_CONSTASCII_STRING( PROPERTY_TIMEMIN,                "TimeMin");
-    PCR_CONSTASCII_STRING( PROPERTY_TIMEMAX,                "TimeMax");
-    PCR_CONSTASCII_STRING( PROPERTY_LINECOUNT,              "LineCount");
-    PCR_CONSTASCII_STRING( PROPERTY_BOUNDCOLUMN,            "BoundColumn");
-    PCR_CONSTASCII_STRING( PROPERTY_BACKGROUNDCOLOR,        "BackgroundColor");
-    PCR_CONSTASCII_STRING( PROPERTY_FILLCOLOR,              "FillColor");
-    PCR_CONSTASCII_STRING( PROPERTY_TEXTCOLOR,              "TextColor");
-    PCR_CONSTASCII_STRING( PROPERTY_LINECOLOR,              "LineColor");
-    PCR_CONSTASCII_STRING( PROPERTY_BORDER,                 "Border");
-    PCR_CONSTASCII_STRING( PROPERTY_ICONSIZE,               "IconSize");
-    PCR_CONSTASCII_STRING( PROPERTY_DROPDOWN,               "Dropdown");
-    PCR_CONSTASCII_STRING( PROPERTY_HSCROLL,                "HScroll");
-    PCR_CONSTASCII_STRING( PROPERTY_VSCROLL,                "VScroll");
+    PCR_CONSTASCII_STRING( PROPERTY_VALUEMIN,				"ValueMin");
+    PCR_CONSTASCII_STRING( PROPERTY_VALUEMAX,				"ValueMax");
+    PCR_CONSTASCII_STRING( PROPERTY_STRICTFORMAT,			"StrictFormat");
+    PCR_CONSTASCII_STRING( PROPERTY_ALLOWADDITIONS,			"AllowInserts");
+    PCR_CONSTASCII_STRING( PROPERTY_ALLOWEDITS,				"AllowUpdates");
+    PCR_CONSTASCII_STRING( PROPERTY_ALLOWDELETIONS,			"AllowDeletes");
+    PCR_CONSTASCII_STRING( PROPERTY_MASTERFIELDS,			"MasterFields");
+    PCR_CONSTASCII_STRING( PROPERTY_LITERALMASK,			"LiteralMask");
+    PCR_CONSTASCII_STRING( PROPERTY_VALUESTEP,				"ValueStep");
+    PCR_CONSTASCII_STRING( PROPERTY_SHOWTHOUSANDSEP,		"ShowThousandsSeparator");
+    PCR_CONSTASCII_STRING( PROPERTY_CURRENCYSYMBOL,			"CurrencySymbol");
+    PCR_CONSTASCII_STRING( PROPERTY_DATEFORMAT,				"DateFormat");
+    PCR_CONSTASCII_STRING( PROPERTY_DATEMIN,				"DateMin");
+    PCR_CONSTASCII_STRING( PROPERTY_DATEMAX,				"DateMax");
+    PCR_CONSTASCII_STRING( PROPERTY_TIMEFORMAT,				"TimeFormat");
+    PCR_CONSTASCII_STRING( PROPERTY_TIMEMIN,				"TimeMin");
+    PCR_CONSTASCII_STRING( PROPERTY_TIMEMAX,				"TimeMax");
+    PCR_CONSTASCII_STRING( PROPERTY_LINECOUNT,				"LineCount");
+    PCR_CONSTASCII_STRING( PROPERTY_BOUNDCOLUMN,			"BoundColumn");
+    PCR_CONSTASCII_STRING( PROPERTY_BACKGROUNDCOLOR,		"BackgroundColor");
+    PCR_CONSTASCII_STRING( PROPERTY_FILLCOLOR,				"FillColor");
+    PCR_CONSTASCII_STRING( PROPERTY_TEXTCOLOR,				"TextColor");
+    PCR_CONSTASCII_STRING( PROPERTY_LINECOLOR,				"LineColor");
+    PCR_CONSTASCII_STRING( PROPERTY_BORDER,					"Border");
+    PCR_CONSTASCII_STRING( PROPERTY_ICONSIZE,				"IconSize");
+    PCR_CONSTASCII_STRING( PROPERTY_DROPDOWN,				"Dropdown");
+    PCR_CONSTASCII_STRING( PROPERTY_HSCROLL,				"HScroll");
+    PCR_CONSTASCII_STRING( PROPERTY_VSCROLL,				"VScroll");
     PCR_CONSTASCII_STRING( PROPERTY_SHOW_SCROLLBARS,        "ShowScrollbars");
-    PCR_CONSTASCII_STRING( PROPERTY_TABSTOP,                "Tabstop");
-    PCR_CONSTASCII_STRING( PROPERTY_AUTOCOMPLETE,           "Autocomplete");
-    PCR_CONSTASCII_STRING( PROPERTY_PRINTABLE,              "Printable");
-    PCR_CONSTASCII_STRING( PROPERTY_ECHO_CHAR,              "EchoChar");
-    PCR_CONSTASCII_STRING( PROPERTY_ROWHEIGHT,              "RowHeight");
-    PCR_CONSTASCII_STRING( PROPERTY_HELPTEXT,               "HelpText");
+    PCR_CONSTASCII_STRING( PROPERTY_TABSTOP,				"Tabstop");
+    PCR_CONSTASCII_STRING( PROPERTY_AUTOCOMPLETE,			"Autocomplete");
+    PCR_CONSTASCII_STRING( PROPERTY_PRINTABLE,				"Printable");
+    PCR_CONSTASCII_STRING( PROPERTY_ECHO_CHAR,				"EchoChar");
+    PCR_CONSTASCII_STRING( PROPERTY_ROWHEIGHT,				"RowHeight");
+    PCR_CONSTASCII_STRING( PROPERTY_HELPTEXT,				"HelpText");
     PCR_CONSTASCII_STRING( PROPERTY_FONT,                   "FontDescriptor");
     PCR_CONSTASCII_STRING( PROPERTY_FONT_NAME,              "FontName");
-    PCR_CONSTASCII_STRING( PROPERTY_FONT_STYLENAME,         "FontStyleName");
-    PCR_CONSTASCII_STRING( PROPERTY_FONT_FAMILY,            "FontFamily");
-    PCR_CONSTASCII_STRING( PROPERTY_FONT_CHARSET,           "FontCharset");
-    PCR_CONSTASCII_STRING( PROPERTY_FONT_HEIGHT,            "FontHeight");
-    PCR_CONSTASCII_STRING( PROPERTY_FONT_WEIGHT,            "FontWeight");
-    PCR_CONSTASCII_STRING( PROPERTY_FONT_SLANT,             "FontSlant");
-    PCR_CONSTASCII_STRING( PROPERTY_FONT_UNDERLINE,         "FontUnderline");
-    PCR_CONSTASCII_STRING( PROPERTY_FONT_STRIKEOUT,         "FontStrikeout");
-    PCR_CONSTASCII_STRING( PROPERTY_FONT_RELIEF,            "FontRelief");
-    PCR_CONSTASCII_STRING( PROPERTY_FONT_EMPHASIS_MARK,     "FontEmphasisMark");
-    PCR_CONSTASCII_STRING( PROPERTY_TEXTLINECOLOR,          "TextLineColor");
-    PCR_CONSTASCII_STRING( PROPERTY_HELPURL,                "HelpURL");
-    PCR_CONSTASCII_STRING( PROPERTY_RECORDMARKER,           "HasRecordMarker");
-    PCR_CONSTASCII_STRING( PROPERTY_EFFECTIVE_DEFAULT,      "EffectiveDefault");
-    PCR_CONSTASCII_STRING( PROPERTY_EFFECTIVE_MIN,          "EffectiveMin");
-    PCR_CONSTASCII_STRING( PROPERTY_EFFECTIVE_MAX,          "EffectiveMax");
-    PCR_CONSTASCII_STRING( PROPERTY_FILTERPROPOSAL,         "UseFilterValueProposal");
-    PCR_CONSTASCII_STRING( PROPERTY_CURRSYM_POSITION,       "PrependCurrencySymbol");
-    PCR_CONSTASCII_STRING( PROPERTY_COMMAND,                "Command");
-    PCR_CONSTASCII_STRING( PROPERTY_COMMANDTYPE,            "CommandType");
-    PCR_CONSTASCII_STRING( PROPERTY_INSERTONLY,             "IgnoreResult");
-    PCR_CONSTASCII_STRING( PROPERTY_ESCAPE_PROCESSING,      "EscapeProcessing");
-    PCR_CONSTASCII_STRING( PROPERTY_TITLE,                  "Title");
-    PCR_CONSTASCII_STRING( PROPERTY_SORT,                   "Order");
-    PCR_CONSTASCII_STRING( PROPERTY_DATASOURCE,             "DataSourceName");
-    PCR_CONSTASCII_STRING( PROPERTY_DETAILFIELDS,           "DetailFields");
-    PCR_CONSTASCII_STRING( PROPERTY_DEFAULTBUTTON,          "DefaultButton");
-    PCR_CONSTASCII_STRING( PROPERTY_LISTINDEX,              "ListIndex");
-    PCR_CONSTASCII_STRING( PROPERTY_HEIGHT,                 "Height");
-    PCR_CONSTASCII_STRING( PROPERTY_HASNAVIGATION,          "HasNavigationBar");
-    PCR_CONSTASCII_STRING( PROPERTY_POSITIONX,              "PositionX");
-    PCR_CONSTASCII_STRING( PROPERTY_POSITIONY,              "PositionY");
-    PCR_CONSTASCII_STRING( PROPERTY_STEP,                   "Step");
-    PCR_CONSTASCII_STRING( PROPERTY_WORDLINEMODE,           "FontWordLineMode");
-    PCR_CONSTASCII_STRING( PROPERTY_PROGRESSVALUE,          "ProgressValue");
-    PCR_CONSTASCII_STRING( PROPERTY_PROGRESSVALUE_MIN,      "ProgressValueMin");
-    PCR_CONSTASCII_STRING( PROPERTY_PROGRESSVALUE_MAX,      "ProgressValueMax");
-    PCR_CONSTASCII_STRING( PROPERTY_SCROLLVALUE,            "ScrollValue");
-    PCR_CONSTASCII_STRING( PROPERTY_DEFAULT_SCROLLVALUE,    "DefaultScrollValue");
-    PCR_CONSTASCII_STRING( PROPERTY_SCROLLVALUE_MIN,        "ScrollValueMin");
-    PCR_CONSTASCII_STRING( PROPERTY_SCROLLVALUE_MAX,        "ScrollValueMax");
-    PCR_CONSTASCII_STRING( PROPERTY_LINEINCREMENT,          "LineIncrement");
-    PCR_CONSTASCII_STRING( PROPERTY_BLOCKINCREMENT,         "BlockIncrement");
-    PCR_CONSTASCII_STRING( PROPERTY_VISIBLESIZE,            "VisibleSize");
-    PCR_CONSTASCII_STRING( PROPERTY_ORIENTATION,            "Orientation");
+    PCR_CONSTASCII_STRING( PROPERTY_FONT_STYLENAME,			"FontStyleName");
+    PCR_CONSTASCII_STRING( PROPERTY_FONT_FAMILY,			"FontFamily");
+    PCR_CONSTASCII_STRING( PROPERTY_FONT_CHARSET,			"FontCharset");
+    PCR_CONSTASCII_STRING( PROPERTY_FONT_HEIGHT,			"FontHeight");
+    PCR_CONSTASCII_STRING( PROPERTY_FONT_WEIGHT,			"FontWeight");
+    PCR_CONSTASCII_STRING( PROPERTY_FONT_SLANT,				"FontSlant");
+    PCR_CONSTASCII_STRING( PROPERTY_FONT_UNDERLINE,			"FontUnderline");
+    PCR_CONSTASCII_STRING( PROPERTY_FONT_STRIKEOUT,			"FontStrikeout");
+    PCR_CONSTASCII_STRING( PROPERTY_FONT_RELIEF,			"FontRelief");
+    PCR_CONSTASCII_STRING( PROPERTY_FONT_EMPHASIS_MARK,		"FontEmphasisMark");
+    PCR_CONSTASCII_STRING( PROPERTY_TEXTLINECOLOR,			"TextLineColor");
+    PCR_CONSTASCII_STRING( PROPERTY_HELPURL,				"HelpURL");
+    PCR_CONSTASCII_STRING( PROPERTY_RECORDMARKER,			"HasRecordMarker");
+    PCR_CONSTASCII_STRING( PROPERTY_EFFECTIVE_DEFAULT,		"EffectiveDefault");
+    PCR_CONSTASCII_STRING( PROPERTY_EFFECTIVE_MIN,			"EffectiveMin");
+    PCR_CONSTASCII_STRING( PROPERTY_EFFECTIVE_MAX,			"EffectiveMax");
+    PCR_CONSTASCII_STRING( PROPERTY_FILTERPROPOSAL,			"UseFilterValueProposal");
+    PCR_CONSTASCII_STRING( PROPERTY_CURRSYM_POSITION,		"PrependCurrencySymbol");
+    PCR_CONSTASCII_STRING( PROPERTY_COMMAND,				"Command");
+    PCR_CONSTASCII_STRING( PROPERTY_COMMANDTYPE,			"CommandType");
+    PCR_CONSTASCII_STRING( PROPERTY_INSERTONLY,				"IgnoreResult");
+    PCR_CONSTASCII_STRING( PROPERTY_ESCAPE_PROCESSING,		"EscapeProcessing");
+    PCR_CONSTASCII_STRING( PROPERTY_TITLE,					"Title");
+    PCR_CONSTASCII_STRING( PROPERTY_SORT,					"Order");
+    PCR_CONSTASCII_STRING( PROPERTY_DATASOURCE,				"DataSourceName");
+    PCR_CONSTASCII_STRING( PROPERTY_DETAILFIELDS,			"DetailFields");
+    PCR_CONSTASCII_STRING( PROPERTY_DEFAULTBUTTON,			"DefaultButton");
+    PCR_CONSTASCII_STRING( PROPERTY_LISTINDEX,				"ListIndex");
+    PCR_CONSTASCII_STRING( PROPERTY_HEIGHT,					"Height");
+    PCR_CONSTASCII_STRING( PROPERTY_HASNAVIGATION,			"HasNavigationBar");
+    PCR_CONSTASCII_STRING( PROPERTY_POSITIONX,				"PositionX");
+    PCR_CONSTASCII_STRING( PROPERTY_POSITIONY,				"PositionY");
+    PCR_CONSTASCII_STRING( PROPERTY_STEP,					"Step");
+    PCR_CONSTASCII_STRING( PROPERTY_WORDLINEMODE,			"FontWordLineMode");
+    PCR_CONSTASCII_STRING( PROPERTY_PROGRESSVALUE,			"ProgressValue");
+    PCR_CONSTASCII_STRING( PROPERTY_PROGRESSVALUE_MIN,		"ProgressValueMin");
+    PCR_CONSTASCII_STRING( PROPERTY_PROGRESSVALUE_MAX,		"ProgressValueMax");
+    PCR_CONSTASCII_STRING( PROPERTY_SCROLLVALUE,			"ScrollValue");
+    PCR_CONSTASCII_STRING( PROPERTY_DEFAULT_SCROLLVALUE,	"DefaultScrollValue");
+    PCR_CONSTASCII_STRING( PROPERTY_SCROLLVALUE_MIN,		"ScrollValueMin");
+    PCR_CONSTASCII_STRING( PROPERTY_SCROLLVALUE_MAX,		"ScrollValueMax");
+    PCR_CONSTASCII_STRING( PROPERTY_LINEINCREMENT,			"LineIncrement");
+    PCR_CONSTASCII_STRING( PROPERTY_BLOCKINCREMENT,			"BlockIncrement");
+    PCR_CONSTASCII_STRING( PROPERTY_VISIBLESIZE,			"VisibleSize");
+    PCR_CONSTASCII_STRING( PROPERTY_ORIENTATION,			"Orientation");
     PCR_CONSTASCII_STRING( PROPERTY_IMAGEPOSITION,          "ImagePosition");
-    PCR_CONSTASCII_STRING( PROPERTY_ACTIVE_CONNECTION,      "ActiveConnection");
-    PCR_CONSTASCII_STRING( PROPERTY_ACTIVECOMMAND,          "ActiveCommand");
-    PCR_CONSTASCII_STRING( PROPERTY_DATE,                   "Date");
-    PCR_CONSTASCII_STRING( PROPERTY_STATE,                  "State");
-    PCR_CONSTASCII_STRING( PROPERTY_TIME,                   "Time");
-    PCR_CONSTASCII_STRING( PROPERTY_SCALEIMAGE,             "ScaleImage");
+    PCR_CONSTASCII_STRING( PROPERTY_ACTIVE_CONNECTION,		"ActiveConnection");
+    PCR_CONSTASCII_STRING( PROPERTY_ACTIVECOMMAND,		    "ActiveCommand");
+    PCR_CONSTASCII_STRING( PROPERTY_DATE,   				"Date");
+    PCR_CONSTASCII_STRING( PROPERTY_STATE,   				"State");
+    PCR_CONSTASCII_STRING( PROPERTY_TIME,   				"Time");
+    PCR_CONSTASCII_STRING( PROPERTY_SCALEIMAGE,   			"ScaleImage");
     PCR_CONSTASCII_STRING( PROPERTY_SCALE_MODE,             "ScaleMode");
-    PCR_CONSTASCII_STRING( PROPERTY_PUSHBUTTONTYPE,         "PushButtonType");
-    PCR_CONSTASCII_STRING( PROPERTY_EFFECTIVE_VALUE,        "EffectiveValue");
+    PCR_CONSTASCII_STRING( PROPERTY_PUSHBUTTONTYPE,   		"PushButtonType");
+    PCR_CONSTASCII_STRING( PROPERTY_EFFECTIVE_VALUE,		"EffectiveValue");
     PCR_CONSTASCII_STRING( PROPERTY_SELECTEDITEMS,          "SelectedItems");
     PCR_CONSTASCII_STRING( PROPERTY_REPEAT,                 "Repeat");
     PCR_CONSTASCII_STRING( PROPERTY_REPEAT_DELAY,           "RepeatDelay");
@@ -211,7 +211,7 @@ namespace pcr
     PCR_CONSTASCII_STRING( PROPERTY_SHOWS_ROOT_HANDLES,     "ShowsRootHandles");
     PCR_CONSTASCII_STRING( PROPERTY_EDITABLE,               "Editable");
     PCR_CONSTASCII_STRING( PROPERTY_INVOKES_STOP_NOT_EDITING, "InvokesStopNodeEditing");
-
+    
     PCR_CONSTASCII_STRING( PROPERTY_HARDLINEBREAKS,         "HardLineBreaks");
 
     PCR_CONSTASCII_STRING( PROPERTY_TOGGLE,                 "Toggle" );
@@ -220,9 +220,9 @@ namespace pcr
     PCR_CONSTASCII_STRING( PROPERTY_VISUALEFFECT,           "VisualEffect" );
     PCR_CONSTASCII_STRING( PROPERTY_BORDERCOLOR,            "BorderColor" );
 
-    PCR_CONSTASCII_STRING( PROPERTY_ADDRESS,                "Address");
-    PCR_CONSTASCII_STRING( PROPERTY_REFERENCE_SHEET,        "ReferenceSheet");
-    PCR_CONSTASCII_STRING( PROPERTY_UI_REPRESENTATION,      "UserInterfaceRepresentation");
+    PCR_CONSTASCII_STRING( PROPERTY_ADDRESS,		        "Address");
+    PCR_CONSTASCII_STRING( PROPERTY_REFERENCE_SHEET,		"ReferenceSheet");
+    PCR_CONSTASCII_STRING( PROPERTY_UI_REPRESENTATION,		"UserInterfaceRepresentation");
 
     PCR_CONSTASCII_STRING( PROPERTY_XML_DATA_MODEL,         "XMLDataModel" );
     PCR_CONSTASCII_STRING( PROPERTY_BINDING_NAME,           "BindingName" );
@@ -273,19 +273,19 @@ namespace pcr
 
     PCR_CONSTASCII_STRING( PROPERTY_MODEL,                  "Model" );
 
-    PCR_CONSTASCII_STRING( PROPERTY_CELL_EXCHANGE_TYPE,     "ExchangeSelectionIndex");
-    PCR_CONSTASCII_STRING( PROPERTY_BOUND_CELL,             "BoundCell");
-    PCR_CONSTASCII_STRING( PROPERTY_LIST_CELL_RANGE,        "CellRange");
+    PCR_CONSTASCII_STRING( PROPERTY_CELL_EXCHANGE_TYPE,		"ExchangeSelectionIndex");
+    PCR_CONSTASCII_STRING( PROPERTY_BOUND_CELL,		        "BoundCell");
+    PCR_CONSTASCII_STRING( PROPERTY_LIST_CELL_RANGE,		"CellRange");
     PCR_CONSTASCII_STRING( PROPERTY_AUTOLINEBREAK,          "AutomaticLineBreak");
     PCR_CONSTASCII_STRING( PROPERTY_TEXTTYPE,               "TextType");
     PCR_CONSTASCII_STRING( PROPERTY_RICHTEXT,               "RichText");
     PCR_CONSTASCII_STRING( PROPERTY_ROWSET,                 "RowSet");
 
     // services
-    PCR_CONSTASCII_STRING( SERVICE_COMPONENT_GROUPBOX,      "com.sun.star.form.component.GroupBox" );
-    PCR_CONSTASCII_STRING( SERVICE_COMPONENT_FIXEDTEXT,     "com.sun.star.form.component.FixedText" );
+    PCR_CONSTASCII_STRING( SERVICE_COMPONENT_GROUPBOX,		"com.sun.star.form.component.GroupBox" );
+    PCR_CONSTASCII_STRING( SERVICE_COMPONENT_FIXEDTEXT,		"com.sun.star.form.component.FixedText" );
     PCR_CONSTASCII_STRING( SERVICE_COMPONENT_FORMATTEDFIELD,"com.sun.star.form.component.FormattedField" );
-    PCR_CONSTASCII_STRING( SERVICE_DATABASE_CONTEXT,        "com.sun.star.sdb.DatabaseContext" );
+    PCR_CONSTASCII_STRING( SERVICE_DATABASE_CONTEXT,		"com.sun.star.sdb.DatabaseContext" );
 
     PCR_CONSTASCII_STRING( SERVICE_TEXT_DOCUMENT,           "com.sun.star.text.TextDocument" );
     PCR_CONSTASCII_STRING( SERVICE_WEB_DOCUMENT,            "com.sun.star.text.WebDocument" );
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx
index e86830db5624..51d11c86f1ec 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -281,7 +281,7 @@ namespace pcr
 
         impl_dispatch_throw( sURL );
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL UrlClickHandler::disposing( const EventObject& /*Source*/ ) throw (RuntimeException)
     {
@@ -335,14 +335,14 @@ namespace pcr
     {
         return getImplementationName_static();
     }
-
+    
     //--------------------------------------------------------------------
     ::sal_Bool SAL_CALL GenericPropertyHandler::supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException)
     {
         StlSyntaxSequence< ::rtl::OUString > aAllServices( getSupportedServiceNames() );
         return ::std::find( aAllServices.begin(), aAllServices.end(), ServiceName ) != aAllServices.end();
     }
-
+    
     //--------------------------------------------------------------------
     Sequence< ::rtl::OUString > SAL_CALL GenericPropertyHandler::getSupportedServiceNames(  ) throw (RuntimeException)
     {
@@ -354,7 +354,7 @@ namespace pcr
     {
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.GenericPropertyHandler" ) );
     }
-
+    
     //--------------------------------------------------------------------
     Sequence< ::rtl::OUString > SAL_CALL GenericPropertyHandler::getSupportedServiceNames_static(  ) throw (RuntimeException)
     {
@@ -362,7 +362,7 @@ namespace pcr
         aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.inspection.GenericPropertyHandler" ) );
         return aSupported;
     }
-
+    
     //--------------------------------------------------------------------
     Reference< XInterface > SAL_CALL GenericPropertyHandler::Create( const Reference< XComponentContext >& _rxContext )
     {
@@ -717,7 +717,7 @@ namespace pcr
             // not disposeAndClear: the listeners are (virtually) listeners at our introspectee, not
             // at this handler instance
     }
-
+    
     //--------------------------------------------------------------------
     IMPLEMENT_FORWARD_XCOMPONENT( GenericPropertyHandler, GenericPropertyHandler_Base );
 
diff --git a/extensions/source/propctrlr/genericpropertyhandler.hxx b/extensions/source/propctrlr/genericpropertyhandler.hxx
index 24beb828a0bf..4d5fc7a1e8ac 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.hxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace pcr
         PropertyMap                                                                         m_aProperties;
         /// property change listeners
         ::cppu::OInterfaceContainerHelper                                                   m_aPropertyListeners;
-        ::std::map< ::com::sun::star::uno::Type, ::rtl::Reference< IPropertyEnumRepresentation >, TypeLess >
+        ::std::map< ::com::sun::star::uno::Type, ::rtl::Reference< IPropertyEnumRepresentation >, TypeLess > 
                                                                                             m_aEnumConverters;
 
         /// has ->m_aProperties been initialized?
diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx
index fbdf4b18206e..9dcee3265d81 100644
--- a/extensions/source/propctrlr/handlerhelper.cxx
+++ b/extensions/source/propctrlr/handlerhelper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx
index 9be5b6add529..1505997e8292 100644
--- a/extensions/source/propctrlr/handlerhelper.hxx
+++ b/extensions/source/propctrlr/handlerhelper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace pcr
 
             @param _bSorted
                 determines whether the list entries should be sorted
-
+            
             @return
                 the newly created control
         */
@@ -110,7 +110,7 @@ namespace pcr
                 sal_Bool _bReadOnlyControl,
                 sal_Bool _bSorted
             );
-
+                
         /** creates an <member scope="com::sun::star::inspection">PropertyControlType::ComboBox</member>-type control
             and fills it with initial values
 
@@ -122,10 +122,10 @@ namespace pcr
 
             @param _bReadOnlyControl
                 determines whether the control should be read-only
-
+            
             @param _bSorted
                 determines whether the list entries should be sorted
-
+            
             @return
                 the newly created control
         */
@@ -153,7 +153,7 @@ namespace pcr
                 (<member scope="com::sun::star::inspection">XNumericControl::MaxValue</member>)
             @param _bReadOnlyControl
                 determines whether the control should be read-only
-
+            
             @return
                 the newly created control
         */
@@ -165,7 +165,7 @@ namespace pcr
                 const ::com::sun::star::beans::Optional< double >& _rMaxValue,
                 sal_Bool _bReadOnlyControl
             );
-
+                
         /** marks the document passed in our UNO context as modified
 
             The method looks up a value called "ContextDocument" in the given UNO component context,
diff --git a/extensions/source/propctrlr/inspectorhelpwindow.cxx b/extensions/source/propctrlr/inspectorhelpwindow.cxx
index 6182efbb495a..2ed90d583b86 100644
--- a/extensions/source/propctrlr/inspectorhelpwindow.cxx
+++ b/extensions/source/propctrlr/inspectorhelpwindow.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/inspectorhelpwindow.hxx b/extensions/source/propctrlr/inspectorhelpwindow.hxx
index e5f9d3f72863..bae38265ab29 100644
--- a/extensions/source/propctrlr/inspectorhelpwindow.hxx
+++ b/extensions/source/propctrlr/inspectorhelpwindow.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/inspectormodelbase.cxx b/extensions/source/propctrlr/inspectormodelbase.cxx
index 751673af491b..3402d28a4077 100644
--- a/extensions/source/propctrlr/inspectormodelbase.cxx
+++ b/extensions/source/propctrlr/inspectormodelbase.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,13 +205,13 @@ namespace pcr
     {
         return m_pProperties->convertFastPropertyValue( rConvertedValue, rOldValue, nHandle, rValue );
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL ImplInspectorModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception)
     {
         m_pProperties->setFastPropertyValue( nHandle, rValue );
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL ImplInspectorModel::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
     {
@@ -223,13 +223,13 @@ namespace pcr
     {
         return m_pProperties->hasHelpSection();
     }
-
+    
     //--------------------------------------------------------------------
     ::sal_Int32 SAL_CALL ImplInspectorModel::getMinHelpTextLines() throw (RuntimeException)
     {
         return m_pProperties->getMinHelpTextLines();
     }
-
+    
     //--------------------------------------------------------------------
     ::sal_Int32 SAL_CALL ImplInspectorModel::getMaxHelpTextLines() throw (RuntimeException)
     {
diff --git a/extensions/source/propctrlr/inspectormodelbase.hxx b/extensions/source/propctrlr/inspectormodelbase.hxx
index 0ca2ded6e19c..3c79dfe2d7c2 100644
--- a/extensions/source/propctrlr/inspectormodelbase.hxx
+++ b/extensions/source/propctrlr/inspectormodelbase.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/linedescriptor.hxx b/extensions/source/propctrlr/linedescriptor.hxx
index e6db8b65c090..84d11e17f4a2 100644
--- a/extensions/source/propctrlr/linedescriptor.hxx
+++ b/extensions/source/propctrlr/linedescriptor.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 pcr
     //========================================================================
     struct OLineDescriptor : public ::com::sun::star::inspection::LineDescriptor
     {
-        ::rtl::OUString             sName;              // the name of the property
+        ::rtl::OUString             sName;	            // the name of the property
         ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >
                                     xPropertyHandler;   // the handler for this property
         ::com::sun::star::uno::Any  aValue;             // the current value of the property
 
-        bool                        bUnknownValue    : 1;   // is the property value currently "unknown"? (PropertyState_AMBIGUOUS)
+        bool                        bUnknownValue	 : 1;   // is the property value currently "unknown"? (PropertyState_AMBIGUOUS)
         bool                        bReadOnly        : 1;
 
         OLineDescriptor()
diff --git a/extensions/source/propctrlr/listselectiondlg.cxx b/extensions/source/propctrlr/listselectiondlg.cxx
index 3bf379813739..9c8cfcd59aea 100644
--- a/extensions/source/propctrlr/listselectiondlg.cxx
+++ b/extensions/source/propctrlr/listselectiondlg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/listselectiondlg.hrc b/extensions/source/propctrlr/listselectiondlg.hrc
index cfd85be0a1aa..6419f530311b 100644
--- a/extensions/source/propctrlr/listselectiondlg.hrc
+++ b/extensions/source/propctrlr/listselectiondlg.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/listselectiondlg.hxx b/extensions/source/propctrlr/listselectiondlg.hxx
index 740e29c7a5f7..feaf8c0fa0e4 100644
--- a/extensions/source/propctrlr/listselectiondlg.hxx
+++ b/extensions/source/propctrlr/listselectiondlg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/listselectiondlg.src b/extensions/source/propctrlr/listselectiondlg.src
index 24a1d7f0a815..7b148e8a9908 100644
--- a/extensions/source/propctrlr/listselectiondlg.src
+++ b/extensions/source/propctrlr/listselectiondlg.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/modulepcr.cxx b/extensions/source/propctrlr/modulepcr.cxx
index 827ca1a648ba..06d89a385277 100644
--- a/extensions/source/propctrlr/modulepcr.cxx
+++ b/extensions/source/propctrlr/modulepcr.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/modulepcr.hxx b/extensions/source/propctrlr/modulepcr.hxx
index 8d18e6ea0169..458aff77b7bf 100644
--- a/extensions/source/propctrlr/modulepcr.hxx
+++ b/extensions/source/propctrlr/modulepcr.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/newdatatype.cxx b/extensions/source/propctrlr/newdatatype.cxx
index 44253137de0d..cf97f503caaf 100644
--- a/extensions/source/propctrlr/newdatatype.cxx
+++ b/extensions/source/propctrlr/newdatatype.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/newdatatype.hrc b/extensions/source/propctrlr/newdatatype.hrc
index 3dc8635b05f7..91f64128581a 100644
--- a/extensions/source/propctrlr/newdatatype.hrc
+++ b/extensions/source/propctrlr/newdatatype.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/newdatatype.hxx b/extensions/source/propctrlr/newdatatype.hxx
index e84f3ffe9ce7..e4fc0aec2549 100644
--- a/extensions/source/propctrlr/newdatatype.hxx
+++ b/extensions/source/propctrlr/newdatatype.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/newdatatype.src b/extensions/source/propctrlr/newdatatype.src
index 50fbad0be2f1..6cf39a322074 100644
--- a/extensions/source/propctrlr/newdatatype.src
+++ b/extensions/source/propctrlr/newdatatype.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx b/extensions/source/propctrlr/objectinspectormodel.cxx
index 7ed387cdf9ee..6c7a4f99149a 100644
--- a/extensions/source/propctrlr/objectinspectormodel.cxx
+++ b/extensions/source/propctrlr/objectinspectormodel.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/pcrcommon.cxx b/extensions/source/propctrlr/pcrcommon.cxx
index 55a9f8d4ae2b..b04ddba264d1 100644
--- a/extensions/source/propctrlr/pcrcommon.cxx
+++ b/extensions/source/propctrlr/pcrcommon.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx
index f6a601528160..f9a0fcda2489 100644
--- a/extensions/source/propctrlr/pcrcommon.hxx
+++ b/extensions/source/propctrlr/pcrcommon.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 _EXTENSIONS_PROPCTRLR_PCRCOMMON_HXX_
 #define _EXTENSIONS_PROPCTRLR_PCRCOMMON_HXX_
 
-#define EDITOR_LIST_APPEND              (sal_uInt16)-1
+#define EDITOR_LIST_APPEND	            (sal_uInt16)-1
 #define EDITOR_LIST_REPLACE_EXISTING    (sal_uInt16)-1
 
 /** === begin UNO includes === **/
diff --git a/extensions/source/propctrlr/pcrcommontypes.hxx b/extensions/source/propctrlr/pcrcommontypes.hxx
index 434f395af4e5..0c20bf3cad01 100644
--- a/extensions/source/propctrlr/pcrcommontypes.hxx
+++ b/extensions/source/propctrlr/pcrcommontypes.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/pcrcomponentcontext.cxx b/extensions/source/propctrlr/pcrcomponentcontext.cxx
index 70de26669887..afd60eff5baa 100644
--- a/extensions/source/propctrlr/pcrcomponentcontext.cxx
+++ b/extensions/source/propctrlr/pcrcomponentcontext.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/pcrcomponentcontext.hxx b/extensions/source/propctrlr/pcrcomponentcontext.hxx
index 41ec8c494196..bfd52cd32741 100644
--- a/extensions/source/propctrlr/pcrcomponentcontext.hxx
+++ b/extensions/source/propctrlr/pcrcomponentcontext.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/pcrmiscres.src b/extensions/source/propctrlr/pcrmiscres.src
index d547b52ed5ea..f898cf439983 100644
--- a/extensions/source/propctrlr/pcrmiscres.src
+++ b/extensions/source/propctrlr/pcrmiscres.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/pcrservices.cxx b/extensions/source/propctrlr/pcrservices.cxx
index 034aee9881ef..da6bbef37276 100644
--- a/extensions/source/propctrlr/pcrservices.cxx
+++ b/extensions/source/propctrlr/pcrservices.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ extern "C" void SAL_CALL pcr_initializeModule()
 
 extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
 component_getImplementationEnvironment(
-                const sal_Char  **ppEnvTypeName,
-                uno_Environment ** /*ppEnv*/
+                const sal_Char	**ppEnvTypeName,
+                uno_Environment	** /*ppEnv*/
             )
 {
     pcr_initializeModule();
@@ -108,8 +108,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
                 void* pRegistryKey
             )
 {
-    if (pRegistryKey)
-    try
+    if (pRegistryKey) 
+    try 
     {
         return ::pcr::PcrModule::getInstance().writeComponentInfos(
             static_cast<XMultiServiceFactory*>(pServiceManager),
diff --git a/extensions/source/propctrlr/pcrstrings.cxx b/extensions/source/propctrlr/pcrstrings.cxx
index 7e081ab54db1..378312fca422 100644
--- a/extensions/source/propctrlr/pcrstrings.cxx
+++ b/extensions/source/propctrlr/pcrstrings.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/pcrstrings.hxx b/extensions/source/propctrlr/pcrstrings.hxx
index e49577427b3c..413b1c6a6ffd 100644
--- a/extensions/source/propctrlr/pcrstrings.hxx
+++ b/extensions/source/propctrlr/pcrstrings.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx
index f02be18b2f3b..0a7b4acf1c82 100644
--- a/extensions/source/propctrlr/pcrunodialogs.cxx
+++ b/extensions/source/propctrlr/pcrunodialogs.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace pcr
     }
 
     //--------------------------------------------------------------------------
-    Dialog* OTabOrderDialog::createDialog( Window* _pParent )
+    Dialog*	OTabOrderDialog::createDialog( Window* _pParent )
     {
         return new TabOrderDialog( _pParent, m_xTabbingModel, m_xControlContext, m_aContext.getLegacyServiceFactory() );
     }
diff --git a/extensions/source/propctrlr/pcrunodialogs.hxx b/extensions/source/propctrlr/pcrunodialogs.hxx
index 24390001f491..5175cfe62eec 100644
--- a/extensions/source/propctrlr/pcrunodialogs.hxx
+++ b/extensions/source/propctrlr/pcrunodialogs.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index 50a6ed66bd65..8fd253a8ff6a 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace pcr
     using namespace ::com::sun::star::ucb;
     using namespace ::comphelper;
 
-#define THISREF()   static_cast< XController* >(this)
+#define THISREF()	static_cast< XController* >(this)
 
     //========================================================================
     //= OPropertyBrowserController
@@ -177,7 +177,7 @@ namespace pcr
     {
         return m_xModel;
     }
-
+    
     //--------------------------------------------------------------------
     void OPropertyBrowserController::impl_initializeView_nothrow()
     {
@@ -217,7 +217,7 @@ namespace pcr
     {
         if ( !m_xModel.is() )
             return false;
-
+        
         return m_xModel->getIsReadOnly();
     }
 
@@ -272,7 +272,7 @@ namespace pcr
 
         impl_bindToNewModel_nothrow( _inspectorModel );
     }
-
+    
     //--------------------------------------------------------------------
     Reference< XObjectInspectorUI > SAL_CALL OPropertyBrowserController::getInspectorUI() throw (RuntimeException)
     {
@@ -307,7 +307,7 @@ namespace pcr
         // we don't have any dispatches at all, right now
         return Reference< XDispatch >();
     }
-
+    
     //--------------------------------------------------------------------
     Sequence< Reference< XDispatch > > SAL_CALL OPropertyBrowserController::queryDispatches( const Sequence< DispatchDescriptor >& Requests ) throw (RuntimeException)
     {
@@ -315,9 +315,9 @@ namespace pcr
         sal_Int32 nLen = Requests.getLength();
         aReturn.realloc( nLen );
 
-                Reference< XDispatch >* pReturn     = aReturn.getArray();
-        const   Reference< XDispatch >* pReturnEnd  = aReturn.getArray() + nLen;
-        const   DispatchDescriptor*     pDescripts  = Requests.getConstArray();
+                Reference< XDispatch >* pReturn 	= aReturn.getArray();
+        const	Reference< XDispatch >* pReturnEnd	= aReturn.getArray() + nLen;
+        const	DispatchDescriptor* 	pDescripts	= Requests.getConstArray();
 
         for ( ; pReturn != pReturnEnd; ++ pReturn, ++pDescripts )
             *pReturn = queryDispatch( pDescripts->FeatureURL, pDescripts->FrameName, pDescripts->SearchFlags );
@@ -388,7 +388,7 @@ namespace pcr
         // Maybe it is intended to only announce the frame to the controller, and the instance doing this
         // announcement is responsible for calling setComponent, too.
         Reference< XWindow > xContainerWindow = m_xFrame->getContainerWindow();
-        VCLXWindow* pContainerWindow = VCLXWindow::GetImplementation(xContainerWindow);
+        VCLXWindow*	pContainerWindow = VCLXWindow::GetImplementation(xContainerWindow);
         Window* pParentWin = pContainerWindow ? pContainerWindow->GetWindow() : NULL;
         if (!pParentWin)
             throw RuntimeException(::rtl::OUString::createFromAscii("The frame is invalid. Unable to extract the container window."),*this);
@@ -623,7 +623,7 @@ namespace pcr
             xContainerWindow = m_xFrame->getContainerWindow();
 
         if ( xContainerWindow.get() == xSourceWindow.get() )
-        {   // our container window got the focus
+        {	// our container window got the focus
             if ( haveView() )
                 getPropertyBox().GrabFocus();
         }
@@ -1351,7 +1351,7 @@ namespace pcr
             InteractiveSelectionResult eResult =
                 handler->second->onInteractivePropertySelection( _rName, _bPrimary, aData,
                     m_pUIRequestComposer->getUIForPropertyHandler( handler->second ) );
-
+            
             switch ( eResult )
             {
             case InteractiveSelectionResult_Cancelled:
@@ -1398,7 +1398,7 @@ namespace pcr
 
             if ( rName.equals( PROPERTY_IMAGE_URL ) )
             {
-                // if the prop value is the PlaceHolder
+                // if the prop value is the PlaceHolder 
                 // can ignore it
                 rtl::OUString sVal;
                 _rValue >>= sVal;
@@ -1457,7 +1457,7 @@ namespace pcr
     {
         m_aControlObservers.notifyEach( &XPropertyControlObserver::focusGained, _Control );
     }
-
+    
     //--------------------------------------------------------------------
     void OPropertyBrowserController::valueChanged( const Reference< XPropertyControl >& _Control )
     {
@@ -1714,7 +1714,7 @@ namespace pcr
     {
         m_aControlObservers.addInterface( _Observer );
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL OPropertyBrowserController::revokeControlObserver( const Reference< XPropertyControlObserver >& _Observer ) throw (RuntimeException)
     {
diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx
index 6535ce6d3ca8..74d45dd48371 100644
--- a/extensions/source/propctrlr/propcontroller.hxx
+++ b/extensions/source/propctrlr/propcontroller.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace pcr
     //= OPropertyBrowserController
     //========================================================================
     // #95343#------------------------------------------------------------------------------------
-    typedef ::cppu::WeakImplHelper7 <   ::com::sun::star::lang::XServiceInfo
-                                    ,   ::com::sun::star::awt::XFocusListener
-                                    ,   ::com::sun::star::awt::XLayoutConstrains
-                                    ,   ::com::sun::star::beans::XPropertyChangeListener
+    typedef ::cppu::WeakImplHelper7 <	::com::sun::star::lang::XServiceInfo
+                                    ,	::com::sun::star::awt::XFocusListener
+                                    ,	::com::sun::star::awt::XLayoutConstrains
+                                    ,	::com::sun::star::beans::XPropertyChangeListener
                                     ,   ::com::sun::star::inspection::XPropertyControlFactory
                                     ,   ::com::sun::star::inspection::XObjectInspector
                                     ,   ::com::sun::star::lang::XInitialization
-                                    >   OPropertyBrowserController_Base;
+                                    >	OPropertyBrowserController_Base;
 
     class OPropertyBrowserController
                 :public ::comphelper::OMutexAndBroadcastHelper
@@ -132,8 +132,8 @@ namespace pcr
         // meta data about the properties
         OPropertyBrowserView*               m_pView;
 
-        ::rtl::OUString                     m_sPageSelection;
-        ::rtl::OUString                     m_sLastValidPageSelection;
+        ::rtl::OUString		                m_sPageSelection;
+        ::rtl::OUString		                m_sLastValidPageSelection;
 
         typedef ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >
                                                         PropertyHandlerRef;
@@ -223,8 +223,8 @@ namespace pcr
 
     protected:
         // IPropertyLineListener
-        virtual void    Clicked(    const ::rtl::OUString& _rName, sal_Bool _bPrimary );
-        virtual void    Commit(     const ::rtl::OUString& _rName, const ::com::sun::star::uno::Any& _rVal );
+        virtual void	Clicked(	const ::rtl::OUString& _rName, sal_Bool _bPrimary );
+        virtual void	Commit(		const ::rtl::OUString& _rName, const ::com::sun::star::uno::Any& _rVal );
 
         // IPropertyControlObserver
         virtual void    focusGained( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _Control );
diff --git a/extensions/source/propctrlr/propcontrolobserver.hxx b/extensions/source/propctrlr/propcontrolobserver.hxx
index d1d48ab8b80a..fc4fcf2b36e4 100644
--- a/extensions/source/propctrlr/propcontrolobserver.hxx
+++ b/extensions/source/propctrlr/propcontrolobserver.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/propertycomposer.cxx b/extensions/source/propctrlr/propertycomposer.cxx
index 4f88c2a0bed9..469a4606d397 100644
--- a/extensions/source/propctrlr/propertycomposer.cxx
+++ b/extensions/source/propctrlr/propertycomposer.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace pcr
             ::std::copy( _rBag.begin(), _rBag.end(), _rArray.getArray() );
         }
     }
-
+        
     //====================================================================
     //= PropertyComposer
     //====================================================================
@@ -140,28 +140,28 @@ namespace pcr
         MethodGuard aGuard( *this );
         return m_aSlaveHandlers[0]->getPropertyValue( _rPropertyName );
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL PropertyComposer::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException)
     {
         MethodGuard aGuard( *this );
         ::std::for_each( m_aSlaveHandlers.begin(), m_aSlaveHandlers.end(), SetPropertyValue( _rPropertyName, _rValue ) );
     }
-
+    
     //--------------------------------------------------------------------
     Any SAL_CALL PropertyComposer::convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException)
     {
         MethodGuard aGuard( *this );
         return m_aSlaveHandlers[0]->convertToPropertyValue( _rPropertyName, _rControlValue );
     }
-
+    
     //--------------------------------------------------------------------
     Any SAL_CALL PropertyComposer::convertToControlValue( const ::rtl::OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException)
     {
         MethodGuard aGuard( *this );
         return m_aSlaveHandlers[0]->convertToControlValue( _rPropertyName, _rPropertyValue, _rControlValueType );
     }
-
+    
     //--------------------------------------------------------------------
     PropertyState SAL_CALL PropertyComposer::getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException)
     {
@@ -200,21 +200,21 @@ namespace pcr
 
         return eState;
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL PropertyComposer::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         m_aPropertyListeners.addListener( _rxListener );
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL PropertyComposer::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         m_aPropertyListeners.removeListener( _rxListener );
     }
-
+    
     //--------------------------------------------------------------------
     Sequence< Property > SAL_CALL PropertyComposer::getSupportedProperties() throw (RuntimeException)
     {
@@ -270,7 +270,7 @@ namespace pcr
         copyBagToArray( m_aSupportedProperties, aSurvived );
         return aSurvived;
     }
-
+    
     //--------------------------------------------------------------------
     void uniteStringArrays( const PropertyComposer::HandlerArray& _rHandlers, Sequence< ::rtl::OUString > (SAL_CALL XPropertyHandler::*pGetter)( void ),
         Sequence< ::rtl::OUString >& /* [out] */ _rUnion )
@@ -300,7 +300,7 @@ namespace pcr
         uniteStringArrays( m_aSlaveHandlers, &XPropertyHandler::getSupersededProperties, aSuperseded );
         return aSuperseded;
     }
-
+    
     //--------------------------------------------------------------------
     Sequence< ::rtl::OUString > SAL_CALL PropertyComposer::getActuatingProperties( ) throw (RuntimeException)
     {
@@ -311,7 +311,7 @@ namespace pcr
         uniteStringArrays( m_aSlaveHandlers, &XPropertyHandler::getActuatingProperties, aActuating );
         return aActuating;
     }
-
+    
     //--------------------------------------------------------------------
     LineDescriptor SAL_CALL PropertyComposer::describePropertyLine( const ::rtl::OUString& _rPropertyName,
         const Reference< XPropertyControlFactory >& _rxControlFactory )
@@ -320,7 +320,7 @@ namespace pcr
         MethodGuard aGuard( *this );
         return m_aSlaveHandlers[0]->describePropertyLine( _rPropertyName, _rxControlFactory );
     }
-
+    
     //--------------------------------------------------------------------
     ::sal_Bool SAL_CALL PropertyComposer::isComposable( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException)
     {
@@ -378,7 +378,7 @@ namespace pcr
 
         return eResult;
     }
-
+    
     //--------------------------------------------------------------------
     void PropertyComposer::impl_ensureUIRequestComposer( const Reference< XObjectInspectorUI >& _rxInspectorUI )
     {
diff --git a/extensions/source/propctrlr/propertycomposer.hxx b/extensions/source/propctrlr/propertycomposer.hxx
index d57d4ad16cfb..645023ad71c9 100644
--- a/extensions/source/propctrlr/propertycomposer.hxx
+++ b/extensions/source/propctrlr/propertycomposer.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/propertycontrolextender.cxx b/extensions/source/propctrlr/propertycontrolextender.cxx
index 49e352331812..5b69e210489e 100644
--- a/extensions/source/propctrlr/propertycontrolextender.cxx
+++ b/extensions/source/propctrlr/propertycontrolextender.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -122,13 +122,13 @@ namespace pcr
             }
         }
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL PropertyControlExtender::keyReleased( const KeyEvent& /*_event*/ ) throw (RuntimeException)
     {
         // not interested in
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL PropertyControlExtender::disposing( const EventObject& Source ) throw (RuntimeException)
     {
diff --git a/extensions/source/propctrlr/propertycontrolextender.hxx b/extensions/source/propctrlr/propertycontrolextender.hxx
index 7346d0b8b1af..12e300cc2d5c 100644
--- a/extensions/source/propctrlr/propertycontrolextender.hxx
+++ b/extensions/source/propctrlr/propertycontrolextender.hxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx
index 657c59961430..ebab4b66dbcb 100644
--- a/extensions/source/propctrlr/propertyeditor.cxx
+++ b/extensions/source/propctrlr/propertyeditor.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx
index c4c2fd305662..eec51c6a03fa 100644
--- a/extensions/source/propctrlr/propertyeditor.hxx
+++ b/extensions/source/propctrlr/propertyeditor.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,14 +119,14 @@ namespace pcr
         void                        RemoveEntry( const ::rtl::OUString& _rName );
         void                        ChangeEntry( const OLineDescriptor& );
 
-        void    setPageActivationHandler(const Link& _rHdl) { m_aPageActivationHandler = _rHdl; }
-        Link    getPageActivationHandler() const { return m_aPageActivationHandler; }
+        void	setPageActivationHandler(const Link& _rHdl) { m_aPageActivationHandler = _rHdl; }
+        Link	getPageActivationHandler() const { return m_aPageActivationHandler; }
 
         // #95343# -------------------------------
         sal_Int32 getMinimumWidth();
         sal_Int32 getMinimumHeight();
 
-        void                        CommitModified();
+        void	                    CommitModified();
 
     protected:
         using Window::SetHelpText;
diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx
index ee5e4dd67cc4..2b4ee7768f5b 100644
--- a/extensions/source/propctrlr/propertyhandler.cxx
+++ b/extensions/source/propctrlr/propertyhandler.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace pcr
         ,m_pInfoService  ( new OPropertyInfoService )
     {
         DBG_CTOR( PropertyHandler, NULL );
-
+        
         m_xTypeConverter = Reference< XTypeConverter >(
             m_aContext.createComponent( "com.sun.star.script.Converter" ),
             UNO_QUERY_THROW
@@ -116,7 +116,7 @@ namespace pcr
         while ( readdListener->hasMoreElements() )
             addPropertyChangeListener( static_cast< XPropertyChangeListener* >( readdListener->next() ) );
     }
-
+    
     //--------------------------------------------------------------------
     void PropertyHandler::onNewComponent()
     {
@@ -251,7 +251,7 @@ namespace pcr
         DBG_ERROR( "PropertyHandler::onInteractivePropertySelection: not implemented!" );
         return InteractiveSelectionResult_Cancelled;
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL PropertyHandler::actuatingPropertyChanged( const ::rtl::OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException)
     {
@@ -266,14 +266,14 @@ namespace pcr
             throw NullPointerException();
         m_aPropertyListeners.addListener( _rxListener );
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL PropertyHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         m_aPropertyListeners.removeListener( _rxListener );
     }
-
+    
     //--------------------------------------------------------------------
     sal_Bool SAL_CALL PropertyHandler::suspend( sal_Bool /*_bSuspend*/ ) throw (RuntimeException)
     {
@@ -458,7 +458,7 @@ namespace pcr
         StlSyntaxSequence< ::rtl::OUString > aAllServices( getSupportedServiceNames() );
         return ::std::find( aAllServices.begin(), aAllServices.end(), ServiceName ) != aAllServices.end();
     }
-
+    
 //........................................................................
 }   // namespace pcr
 //........................................................................
diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx
index 1fffc177b82f..8e5fa68ea67c 100644
--- a/extensions/source/propctrlr/propertyhandler.hxx
+++ b/extensions/source/propctrlr/propertyhandler.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/propertyinfo.hxx b/extensions/source/propctrlr/propertyinfo.hxx
index 6e71ef58c7a1..4c46361f6d84 100644
--- a/extensions/source/propctrlr/propertyinfo.hxx
+++ b/extensions/source/propctrlr/propertyinfo.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace pcr
     class SAL_NO_VTABLE IPropertyInfoService
     {
     public:
-        virtual sal_Int32                           getPropertyId(const String& _rName) const = 0;
-        virtual String                              getPropertyTranslation(sal_Int32 _nId) const = 0;
-        virtual sal_Int32                           getPropertyHelpId(sal_Int32 _nId) const = 0;
-        virtual sal_Int16                           getPropertyPos(sal_Int32 _nId) const = 0;
+        virtual sal_Int32				            getPropertyId(const String& _rName) const = 0;
+        virtual String					            getPropertyTranslation(sal_Int32 _nId) const = 0;
+        virtual sal_Int32				            getPropertyHelpId(sal_Int32 _nId) const = 0;
+        virtual sal_Int16				            getPropertyPos(sal_Int32 _nId) const = 0;
         virtual sal_uInt32                          getPropertyUIFlags(sal_Int32 _nId) const = 0;
         virtual ::std::vector< ::rtl::OUString >    getPropertyEnumRepresentations(sal_Int32 _nId) const = 0;
 
diff --git a/extensions/source/propctrlr/propeventtranslation.cxx b/extensions/source/propctrlr/propeventtranslation.cxx
index 6ab21e547289..d3dabd93fe31 100644
--- a/extensions/source/propctrlr/propeventtranslation.cxx
+++ b/extensions/source/propctrlr/propeventtranslation.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace pcr
             m_xDelegator->propertyChange( aTranslatedEvent );
         }
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL PropertyEventTranslation::disposing( const EventObject& Source ) throw (RuntimeException)
     {
diff --git a/extensions/source/propctrlr/propeventtranslation.hxx b/extensions/source/propctrlr/propeventtranslation.hxx
index 284855e2c413..c5f5c8165b7c 100644
--- a/extensions/source/propctrlr/propeventtranslation.hxx
+++ b/extensions/source/propctrlr/propeventtranslation.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/proplinelistener.hxx b/extensions/source/propctrlr/proplinelistener.hxx
index 79eeaee28962..e1eb39e645fe 100644
--- a/extensions/source/propctrlr/proplinelistener.hxx
+++ b/extensions/source/propctrlr/proplinelistener.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace pcr
     class IPropertyLineListener
     {
     public:
-        virtual void    Clicked(    const ::rtl::OUString& _rName, sal_Bool _bPrimary ) = 0;
-        virtual void    Commit(     const ::rtl::OUString& _rName, const ::com::sun::star::uno::Any& _rVal ) = 0;
+        virtual void	Clicked(	const ::rtl::OUString& _rName, sal_Bool _bPrimary ) = 0;
+        virtual void	Commit(		const ::rtl::OUString& _rName, const ::com::sun::star::uno::Any& _rVal ) = 0;
     };
 
 //............................................................................
diff --git a/extensions/source/propctrlr/propres.src b/extensions/source/propctrlr/propres.src
index 23b11a932e34..6449f86f045c 100644
--- a/extensions/source/propctrlr/propres.src
+++ b/extensions/source/propctrlr/propres.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/propresid.hrc b/extensions/source/propctrlr/propresid.hrc
index 5328617735a9..e1fc83667ca2 100644
--- a/extensions/source/propctrlr/propresid.hrc
+++ b/extensions/source/propctrlr/propresid.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 // TODO: create a new resource range in <svl/solar.hrc>
 
-#define RID_PROPCONTROLLER_START        1000
+#define RID_PROPCONTROLLER_START		1000
     // arbitrary at the moment
-#define RID_FORMBROWSER_START           RID_PROPCONTROLLER_START + 2000
+#define RID_FORMBROWSER_START			RID_PROPCONTROLLER_START + 2000
 
 // -----------------------------------------------------------------------
 // - Strings
 // -----------------------------------------------------------------------
 
-#define RID_STR_STANDARD                    ( RID_PROPCONTROLLER_START +  0 )
-#define RID_STR_PROPPAGE_DEFAULT            ( RID_PROPCONTROLLER_START +  1 )
-#define RID_STR_PROPPAGE_DATA               ( RID_PROPCONTROLLER_START +  2 )
+#define	RID_STR_STANDARD					( RID_PROPCONTROLLER_START +  0 )
+#define	RID_STR_PROPPAGE_DEFAULT			( RID_PROPCONTROLLER_START +  1 )
+#define RID_STR_PROPPAGE_DATA				( RID_PROPCONTROLLER_START +  2 )
 #define RID_STR_HELP_SECTION_LABEL          ( RID_PROPCONTROLLER_START +  3 )
 #define RID_EMBED_IMAGE_PLACEHOLDER         ( RID_PROPCONTROLLER_START +  4 )
 #define RID_STR_TEXT_FORMAT                 ( RID_PROPCONTROLLER_START +  5 )
diff --git a/extensions/source/propctrlr/pushbuttonnavigation.cxx b/extensions/source/propctrlr/pushbuttonnavigation.cxx
index 6b96f6f0867f..6195b99374b3 100644
--- a/extensions/source/propctrlr/pushbuttonnavigation.cxx
+++ b/extensions/source/propctrlr/pushbuttonnavigation.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -123,7 +123,7 @@ namespace pcr
             m_xControlModel->getPropertyValue( PROPERTY_TARGET_URL ) >>= sTargetURL;
 
             sal_Int32 nNavigationURLIndex = lcl_getNavigationURLIndex( sTargetURL );
-            if ( nNavigationURLIndex >= 0)
+            if ( nNavigationURLIndex >= 0) 
                 // it actually *is* a virtual button type
                 nButtonType = s_nFirstVirtualButtonType + nNavigationURLIndex;
         }
diff --git a/extensions/source/propctrlr/pushbuttonnavigation.hxx b/extensions/source/propctrlr/pushbuttonnavigation.hxx
index d192326279d9..3626e4234eed 100644
--- a/extensions/source/propctrlr/pushbuttonnavigation.hxx
+++ b/extensions/source/propctrlr/pushbuttonnavigation.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx
index 7bba7ee4510a..d4237a52c6ac 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace pcr
         {
             // check wich service the allowed components must suppport
             sal_Int16 nClassId = 0;
-            try { nClassId = ::comphelper::getINT16(m_xControlModel->getPropertyValue(PROPERTY_CLASSID)); } catch(...) { }
+            try { nClassId = ::comphelper::getINT16(m_xControlModel->getPropertyValue(PROPERTY_CLASSID)); } catch(...) { } 
             m_sRequiredService = (FormComponentType::RADIOBUTTON == nClassId) ? SERVICE_COMPONENT_GROUPBOX : SERVICE_COMPONENT_FIXEDTEXT;
             m_aRequiredControlImage = m_aModelImages.GetImage((FormComponentType::RADIOBUTTON == nClassId) ? RID_SVXIMG_GROUPBOX : RID_SVXIMG_FIXEDTEXT);
 
@@ -126,7 +126,7 @@ namespace pcr
             // insert the root
             Image aRootImage = m_aModelImages.GetImage(RID_SVXIMG_FORMS);
             SvLBoxEntry* pRoot = m_aControlTree.InsertEntry(PcrRes(RID_STR_FORMS), aRootImage, aRootImage);
-
+            
             // build the tree
             m_pInitialSelection = NULL;
             m_bHaveAssignableControl = sal_False;
@@ -148,7 +148,7 @@ namespace pcr
         }
 
         if (!m_bHaveAssignableControl)
-        {   // no controls which can be assigned
+        {	// no controls which can be assigned
             m_aNoAssignment.Check(sal_True);
             m_aNoAssignment.Enable(sal_False);
         }
@@ -205,10 +205,10 @@ namespace pcr
                 continue;
 
             if (!xInfo->supportsService(m_sRequiredService))
-            {   // perhaps it is a container
+            {	// perhaps it is a container
                 Reference< XIndexAccess >  xCont(xAsSet, UNO_QUERY);
                 if (xCont.is() && xCont->getCount())
-                {   // yes -> step down
+                {	// yes -> step down
                     Image aFormImage = m_aModelImages.GetImage( RID_SVXIMG_FORM );
                     SvLBoxEntry* pCont = m_aControlTree.InsertEntry(sName, aFormImage, aFormImage, pContainerEntry);
                     sal_Int32 nContChildren = InsertEntries(xCont, pCont);
@@ -218,7 +218,7 @@ namespace pcr
                         ++nChildren;
                     }
                     else
-                    {   // oops, no valid childs -> remove the entry
+                    {	// oops, no valid childs -> remove the entry
                         m_aControlTree.ModelIsRemoving(pCont);
                         m_aControlTree.GetModel()->Remove(pCont);
                         m_aControlTree.ModelHasRemoved(pCont);
@@ -307,7 +307,7 @@ namespace pcr
     }
 
 //............................................................................
-}   // namespace pcr
+}	// namespace pcr
 //............................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx
index c455f48e1c68..bb713b875862 100644
--- a/extensions/source/propctrlr/selectlabeldialog.hxx
+++ b/extensions/source/propctrlr/selectlabeldialog.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,23 +49,23 @@ namespace pcr
             :public ModalDialog
             ,public PcrClient
     {
-        FixedText       m_aMainDesc;
-        SvTreeListBox   m_aControlTree;
-        CheckBox        m_aNoAssignment;
-        FixedLine       m_aSeparator;
-        OKButton        m_aOk;
-        CancelButton    m_aCancel;
+        FixedText		m_aMainDesc;
+        SvTreeListBox	m_aControlTree;
+        CheckBox		m_aNoAssignment;
+        FixedLine		m_aSeparator;
+        OKButton		m_aOk;
+        CancelButton	m_aCancel;
 
-        ImageList       m_aModelImages;
-        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >   m_xControlModel;
-        ::rtl::OUString m_sRequiredService;
-        Image           m_aRequiredControlImage;
-        SvLBoxEntry*    m_pInitialSelection;
-        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >   m_xInitialLabelControl;
+        ImageList		m_aModelImages;
+        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > 	m_xControlModel;
+        ::rtl::OUString	m_sRequiredService;
+        Image			m_aRequiredControlImage;
+        SvLBoxEntry*	m_pInitialSelection;
+        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > 	m_xInitialLabelControl;
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >   m_xSelectedControl;
-        SvLBoxEntry*    m_pLastSelected;
-        sal_Bool        m_bHaveAssignableControl;
+        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > 	m_xSelectedControl;
+        SvLBoxEntry*	m_pLastSelected;
+        sal_Bool		m_bHaveAssignableControl;
 
     public:
         OSelectLabelDialog(Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >  _xControlModel);
@@ -81,7 +81,7 @@ namespace pcr
     };
 
 //............................................................................
-}   // namespace pcr
+}	// namespace pcr
 //............................................................................
 
 #endif // _EXTENSIONS_PROPCTRLR_SELECTLABELDIALOG_HXX_
diff --git a/extensions/source/propctrlr/selectlabeldialog.src b/extensions/source/propctrlr/selectlabeldialog.src
index af536befb3bf..93cf7d24ece8 100644
--- a/extensions/source/propctrlr/selectlabeldialog.src
+++ b/extensions/source/propctrlr/selectlabeldialog.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ ModalDialog RID_DLG_SELECTLABELCONTROL
         Pos = MAP_APPFONT( 6, 29 );
         Size = MAP_APPFONT( 188, 83 );
         TabStop = TRUE;
-        Border  = TRUE ;
+        Border	= TRUE ;
     };
     CheckBox 1
     {
diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx
index 1e0e2e865d34..d7abbc8b6c7e 100644
--- a/extensions/source/propctrlr/sqlcommanddesign.cxx
+++ b/extensions/source/propctrlr/sqlcommanddesign.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace pcr
             }
         }
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL SQLCommandDesigner::disposing( const EventObject& Source ) throw (RuntimeException)
     {
diff --git a/extensions/source/propctrlr/sqlcommanddesign.hxx b/extensions/source/propctrlr/sqlcommanddesign.hxx
index 592bdc91fd04..f439f67840b8 100644
--- a/extensions/source/propctrlr/sqlcommanddesign.hxx
+++ b/extensions/source/propctrlr/sqlcommanddesign.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 5dea67099f86..6d3f3c9a1475 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -697,7 +697,7 @@ namespace pcr
             pColorTable = XColorTable::GetStdColorTable();
         }
 
-
+        
         DBG_ASSERT(pColorTable, "OColorControl::OColorControl: no color table!");
 
         if (pColorTable)
@@ -729,7 +729,7 @@ namespace pcr
 
                 getTypedControlWindow()->SelectEntry( aRgbCol );
                 if ( !getTypedControlWindow()->IsEntrySelected( aRgbCol ) )
-                {   // the given color is not part of the list -> insert a new entry with the hex code of the color
+                {	// the given color is not part of the list -> insert a new entry with the hex code of the color
                     String aStr = String::CreateFromAscii("0x");
                     aStr += MakeHexStr(nColor,8);
                     getTypedControlWindow()->InsertEntry( aRgbCol, aStr );
@@ -889,7 +889,7 @@ namespace pcr
         ::rtl::OUString* pIter = aRet.getArray();
         for (USHORT i = 0; i < nCount ; ++i,++pIter)
             *pIter = getTypedControlWindow()->GetEntry(i);
-
+        
         return aRet;
     }
 
@@ -959,7 +959,7 @@ namespace pcr
         ::rtl::OUString* pIter = aRet.getArray();
         for (USHORT i = 0; i < nCount ; ++i,++pIter)
             *pIter = getTypedControlWindow()->GetEntry(i);
-
+        
         return aRet;
     }
 
@@ -978,17 +978,17 @@ namespace pcr
     class OMultilineFloatingEdit : public FloatingWindow
     {
     private:
-        MultiLineEdit   m_aImplEdit;
+        MultiLineEdit	m_aImplEdit;
 
     protected:
-        virtual void    Resize();
+        virtual void	Resize();
 
     public:
                         OMultilineFloatingEdit(Window* _pParen);
         MultiLineEdit*  getEdit() { return &m_aImplEdit; }
 
     protected:
-        virtual long    PreNotify(NotifyEvent& _rNEvt);
+        virtual long	PreNotify(NotifyEvent& _rNEvt);
     };
 
     //------------------------------------------------------------------
@@ -1016,11 +1016,11 @@ namespace pcr
             const KeyCode& aKeyCode = _rNEvt.GetKeyEvent()->GetKeyCode();
             sal_uInt16 nKey = aKeyCode.GetCode();
 
-            if  (   (   (KEY_RETURN == nKey)
+            if	(	(	(KEY_RETURN == nKey)
                     && !aKeyCode.IsShift()
                     )
-                ||  (   (KEY_UP == nKey)
-                    &&  aKeyCode.IsMod2()
+                ||	(	(KEY_UP == nKey)
+                    &&	aKeyCode.IsMod2()
                     )
                 )
             {
@@ -1159,7 +1159,7 @@ namespace pcr
                 ShowDropDown( sal_True );
                 m_pFloatingEdit->getEdit()->GrabFocus();
                 m_pFloatingEdit->getEdit()->SetSelection( aSel );
-                Window* pFocusWin = Application::GetFocusWindow();
+                Window*	pFocusWin = Application::GetFocusWindow();
                 pFocusWin->KeyInput( *rNEvt.GetKeyEvent() );
             }
         }
@@ -1217,7 +1217,7 @@ namespace pcr
     }
 
     //------------------------------------------------------------------
-    #define STD_HEIGHT  100
+    #define STD_HEIGHT	100
     sal_Bool DropDownEditControl::ShowDropDown( sal_Bool bShow )
     {
         if (bShow)
diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx
index c480b508cd25..8fed840fc605 100644
--- a/extensions/source/propctrlr/standardcontrol.hxx
+++ b/extensions/source/propctrlr/standardcontrol.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -273,7 +273,7 @@ namespace pcr
         virtual void SAL_CALL setDisplayUnit( ::sal_Int16 _displayunit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
         virtual ::sal_Int16 SAL_CALL getValueUnit() throw (::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL setValueUnit( ::sal_Int16 _valueunit ) throw (::com::sun::star::uno::RuntimeException);
-
+    
     private:
         /** converts an API value (<code>double</code>, as passed into <code>set[Max|Min|]Value) into
             a <code>long</code> value which can be passed to our NumericField.
diff --git a/extensions/source/propctrlr/stlops.hxx b/extensions/source/propctrlr/stlops.hxx
index 3ac44fcf32d6..b0249ec57821 100644
--- a/extensions/source/propctrlr/stlops.hxx
+++ b/extensions/source/propctrlr/stlops.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace pcr
 
     //========================================================================
     struct PropertyLessByName
-                :public ::std::binary_function  <   ::com::sun::star::beans::Property,
+                :public ::std::binary_function	<	::com::sun::star::beans::Property,
                                                     ::com::sun::star::beans::Property,
                                                     bool
                                                 >
@@ -52,7 +52,7 @@ namespace pcr
 
     //========================================================================
     struct TypeLessByName
-                :public ::std::binary_function  <   ::com::sun::star::uno::Type,
+                :public ::std::binary_function	<	::com::sun::star::uno::Type,
                                                     ::com::sun::star::uno::Type,
                                                     bool
                                                 >
diff --git a/extensions/source/propctrlr/stringdefine.hxx b/extensions/source/propctrlr/stringdefine.hxx
index e5a27caa34f8..b7101590dd8b 100644
--- a/extensions/source/propctrlr/stringdefine.hxx
+++ b/extensions/source/propctrlr/stringdefine.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace pcr
     //============================================================
     struct ConstAsciiString
     {
-        const sal_Char* ascii;
-        sal_Int32       length;
+        const sal_Char*	ascii;
+        sal_Int32		length;
 
-        inline  operator const ::rtl::OUString& () const;
-        inline  operator const sal_Char* () const { return ascii; }
+        inline	operator const ::rtl::OUString& () const;
+        inline	operator const sal_Char* () const { return ascii; }
 
         inline ConstAsciiString(const sal_Char* _pAsciiZeroTerminated, const sal_Int32 _nLength);
         inline ~ConstAsciiString();
 
     private:
-        mutable ::rtl::OUString*    ustring;
+        mutable ::rtl::OUString*	ustring;
     };
 
     //------------------------------------------------------------
@@ -80,7 +80,7 @@ namespace pcr
 
     //============================================================
 
-#define CONST_ASCII_LENGTH(c)   \
+#define CONST_ASCII_LENGTH(c)	\
     (const sal_Char*)c, c.length()
 
     //============================================================
diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx
index f07d4d60f756..92133ebba8ca 100644
--- a/extensions/source/propctrlr/stringrepresentation.cxx
+++ b/extensions/source/propctrlr/stringrepresentation.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -426,7 +426,7 @@ bool StringRepresentation::convertGenericValueToString( const uno::Any& _rValue,
             ++i;
         }
         break;
-
+    
     // some structs
     case uno::TypeClass_STRUCT:
         OSL_ENSURE( false, "StringRepresentation::convertGenericValueToString(STRUCT): this is dead code - isn't it?" );
@@ -474,7 +474,7 @@ uno::Any StringRepresentation::convertStringToSimple( const ::rtl::OUString& _rV
             if ( m_aConstants.getLength() && m_aValues.getLength() )
             {
                 const ::rtl::OUString* pIter = m_aValues.getConstArray();
-                const ::rtl::OUString* pEnd   = pIter + m_aValues.getLength();
+                const ::rtl::OUString* pEnd	  = pIter + m_aValues.getLength();
                 for(sal_Int32 i = 0;pIter != pEnd;++pIter,++i)
                 {
                     if ( *pIter == _rValue )
@@ -579,7 +579,7 @@ bool StringRepresentation::convertStringToGenericValue( const ::rtl::OUString& _
             // weird enough, the string representation of dates, as used
             // by the control displaying dates, and thus as passed through the layers,
             // is YYYYMMDD.
-
+            
             _rValue <<= ::dbtools::DBTypeConversion::toDate(_rStringRep);
         }
         else if ( _rTargetType.equals( ::getCppuType( static_cast< util::Time* >( NULL ) ) ) )
diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx
index b14153383f6f..fee3f2a61831 100644
--- a/extensions/source/propctrlr/submissionhandler.cxx
+++ b/extensions/source/propctrlr/submissionhandler.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace pcr
 
         return aReturn;
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL SubmissionPropertyHandler::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException)
     {
@@ -221,7 +221,7 @@ namespace pcr
             OSL_ENSURE( sal_False, "SubmissionPropertyHandler::setPropertyValue: caught an exception!" );
         }
     }
-
+    
     //--------------------------------------------------------------------
     Sequence< ::rtl::OUString > SAL_CALL SubmissionPropertyHandler::getActuatingProperties( ) throw (RuntimeException)
     {
@@ -394,7 +394,7 @@ namespace pcr
 
         return aPropertyValue;
     }
-
+    
     //--------------------------------------------------------------------
     Any SAL_CALL SubmissionPropertyHandler::convertToControlValue( const ::rtl::OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException)
     {
diff --git a/extensions/source/propctrlr/submissionhandler.hxx b/extensions/source/propctrlr/submissionhandler.hxx
index 0ee0e8df8a03..1c2bd4082531 100644
--- a/extensions/source/propctrlr/submissionhandler.hxx
+++ b/extensions/source/propctrlr/submissionhandler.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index c21539e43d13..ae24730a4a7f 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/taborder.hrc b/extensions/source/propctrlr/taborder.hrc
index 00a6341d13a8..03be169a18eb 100644
--- a/extensions/source/propctrlr/taborder.hrc
+++ b/extensions/source/propctrlr/taborder.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx
index 9a0d99f68bf2..fbe134f79a9f 100644
--- a/extensions/source/propctrlr/taborder.hxx
+++ b/extensions/source/propctrlr/taborder.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/taborder.src b/extensions/source/propctrlr/taborder.src
index 73f12ff3ff89..fe55988f34af 100644
--- a/extensions/source/propctrlr/taborder.src
+++ b/extensions/source/propctrlr/taborder.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ ModalDialog RID_DLG_TABORDER
 
     Control CTRL_TREE
     {
-        Border              = TRUE;
+        Border				= TRUE;
         Pos                 = MAP_APPFONT ( 6, 14) ;
         Size                = MAP_APPFONT ( 90, 136 ) ;
-        TabStop             = TRUE;
-        HelpId              = HID_PROP_TABORDER_CONTROLS;
+        TabStop				= TRUE;
+        HelpId				= HID_PROP_TABORDER_CONTROLS;
     };
 
     PushButton PB_MOVE_UP
diff --git a/extensions/source/propctrlr/unourl.cxx b/extensions/source/propctrlr/unourl.cxx
index 63600fc4c827..136969621e07 100644
--- a/extensions/source/propctrlr/unourl.cxx
+++ b/extensions/source/propctrlr/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/extensions/source/propctrlr/unourl.hxx b/extensions/source/propctrlr/unourl.hxx
index e9eebdd6e409..8324751050dd 100644
--- a/extensions/source/propctrlr/unourl.hxx
+++ b/extensions/source/propctrlr/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/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx
index 4b7fbf18a5d8..a6dbea212338 100644
--- a/extensions/source/propctrlr/usercontrol.cxx
+++ b/extensions/source/propctrlr/usercontrol.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,7 +115,7 @@ namespace pcr
         {
             // else set the new format key, the text will be reformatted
             getTypedControlWindow()->SetFormatKey( nFormatKey );
-
+            
             SvNumberFormatter* pNF = getTypedControlWindow()->GetFormatter();
             const SvNumberformat* pEntry = pNF->GetEntry( nFormatKey );
             OSL_ENSURE( pEntry, "OFormatSampleControl::setValue: invalid format entry!" );
diff --git a/extensions/source/propctrlr/usercontrol.hxx b/extensions/source/propctrlr/usercontrol.hxx
index d5965600ae34..6bd985b2e3b7 100644
--- a/extensions/source/propctrlr/usercontrol.hxx
+++ b/extensions/source/propctrlr/usercontrol.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/xsddatatypes.cxx b/extensions/source/propctrlr/xsddatatypes.cxx
index 2b7b99692d87..d9c8cff9b807 100644
--- a/extensions/source/propctrlr/xsddatatypes.cxx
+++ b/extensions/source/propctrlr/xsddatatypes.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/xsddatatypes.hxx b/extensions/source/propctrlr/xsddatatypes.hxx
index c2015aa3a39c..22307028b2dd 100644
--- a/extensions/source/propctrlr/xsddatatypes.hxx
+++ b/extensions/source/propctrlr/xsddatatypes.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace pcr
 
     public:
         XSDDataType(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xsd::XDataType >& _rxDataType
+            const ::com::sun::star::uno::Reference< ::com::sun::star::xsd::XDataType >& _rxDataType 
         );
 
         // IReference
diff --git a/extensions/source/propctrlr/xsdvalidationhelper.cxx b/extensions/source/propctrlr/xsdvalidationhelper.cxx
index 7e6440ae5a8c..88d15f8c613f 100644
--- a/extensions/source/propctrlr/xsdvalidationhelper.cxx
+++ b/extensions/source/propctrlr/xsdvalidationhelper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/xsdvalidationhelper.hxx b/extensions/source/propctrlr/xsdvalidationhelper.hxx
index e3881cdbcbe9..4b514b75765d 100644
--- a/extensions/source/propctrlr/xsdvalidationhelper.hxx
+++ b/extensions/source/propctrlr/xsdvalidationhelper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
index c254800af14c..7555ecbad4ce 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx
index 9bcf9e4dd3e4..9763d43ba303 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/resource/oooresourceloader.cxx b/extensions/source/resource/oooresourceloader.cxx
index ff87b3d51724..59b71c143516 100644
--- a/extensions/source/resource/oooresourceloader.cxx
+++ b/extensions/source/resource/oooresourceloader.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -297,7 +297,7 @@ namespace res
     {
         return loadBundle( _baseName, Application::GetSettings().GetUILocale() );
     }
-
+    
     //--------------------------------------------------------------------
     Reference< XResourceBundle > SAL_CALL OpenOfficeResourceLoader::loadBundle( const ::rtl::OUString& _baseName, const Locale& _locale ) throw (MissingResourceException, RuntimeException)
     {
@@ -318,7 +318,7 @@ namespace res
 
         return xBundle;
     }
-
+    
     //--------------------------------------------------------------------
     ComponentInfo getComponentInfo_OpenOfficeResourceLoader()
     {
@@ -364,21 +364,21 @@ namespace res
         ::osl::MutexGuard aGuard( m_aMutex );
         return m_xParent;
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL OpenOfficeResourceBundle::setParent( const Reference< XResourceBundle >& _parent ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         m_xParent = _parent;
     }
-
+    
     //--------------------------------------------------------------------
     Locale SAL_CALL OpenOfficeResourceBundle::getLocale(  ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         return m_aLocale;
     }
-
+    
     //--------------------------------------------------------------------
     bool OpenOfficeResourceBundle::impl_getResourceTypeAndId_nothrow( const ::rtl::OUString& _key, ResourceTypePtr& _out_resourceType, sal_Int32& _out_resourceId ) const
     {
@@ -424,7 +424,7 @@ namespace res
         impl_getDirectElement_nothrow( _key, aElement );
         return aElement;
     }
-
+    
     //--------------------------------------------------------------------
     Any SAL_CALL OpenOfficeResourceBundle::getByName( const ::rtl::OUString& _key ) throw (NoSuchElementException, WrappedTargetException, RuntimeException)
     {
@@ -442,7 +442,7 @@ namespace res
 
         return aElement;
     }
-
+    
     //--------------------------------------------------------------------
     Sequence< ::rtl::OUString > SAL_CALL OpenOfficeResourceBundle::getElementNames(  ) throw (RuntimeException)
     {
@@ -451,7 +451,7 @@ namespace res
             // the (Simple)ResManager does not provide an API to enumerate the resources
         return Sequence< ::rtl::OUString >( );
     }
-
+    
     //--------------------------------------------------------------------
     ::sal_Bool SAL_CALL OpenOfficeResourceBundle::hasByName( const ::rtl::OUString& _key ) throw (RuntimeException)
     {
@@ -467,13 +467,13 @@ namespace res
 
         return sal_True;
     }
-
+    
     //--------------------------------------------------------------------
     Type SAL_CALL OpenOfficeResourceBundle::getElementType(  ) throw (RuntimeException)
     {
         return ::cppu::UnoType< Any >::get();
     }
-
+    
     //--------------------------------------------------------------------
     ::sal_Bool SAL_CALL OpenOfficeResourceBundle::hasElements(  ) throw (RuntimeException)
     {
diff --git a/extensions/source/resource/res_services.cxx b/extensions/source/resource/res_services.cxx
index 2239ef361cc7..c87e59f0db2c 100644
--- a/extensions/source/resource/res_services.cxx
+++ b/extensions/source/resource/res_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
@@ -78,7 +78,7 @@ sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, XRegistryKey
             Reference< XRegistryKey > xNewKey =
                 pRegistryKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") )
                     + loop->sImplementationName + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ) ) );
-
+    
             for( sal_Int32 i = 0; i < loop->aSupportedServices.getLength(); ++i )
                 xNewKey->createKey( loop->aSupportedServices.getConstArray()[i]);
 
@@ -91,7 +91,7 @@ sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, XRegistryKey
                 xNewKey->setStringValue( loop->aSupportedServices[ 0 ] );
             }
         }
-
+        
         return sal_True;
     }
     catch (Exception &)
@@ -124,7 +124,7 @@ void * SAL_CALL component_getFactory(
         }
     }
     return pRet;
-}
+}                                                                                                         
 
 }   // extern "C"
 
diff --git a/extensions/source/resource/res_services.hxx b/extensions/source/resource/res_services.hxx
index ac61f0e423ac..3f47764e51ba 100644
--- a/extensions/source/resource/res_services.hxx
+++ b/extensions/source/resource/res_services.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/resource/resource.cxx b/extensions/source/resource/resource.cxx
index e5a61e69e376..8ebd503c0d98 100644
--- a/extensions/source/resource/resource.cxx
+++ b/extensions/source/resource/resource.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include "res_services.hxx"
 
 #include <osl/mutex.hxx>
-#include <uno/lbnames.h>            // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
-#include <cppuhelper/factory.hxx>   // helper for factories
-#include <cppuhelper/implbase3.hxx> // helper for implementations
+#include <uno/lbnames.h>			// CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
+#include <cppuhelper/factory.hxx>	// helper for factories
+#include <cppuhelper/implbase3.hxx>	// helper for implementations
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/script/XInvocation.hpp>
@@ -69,36 +69,36 @@ public:
                                 ~ResourceService();
 
     // XServiceInfo
-    OUString SAL_CALL           getImplementationName() throw();
-    BOOL     SAL_CALL           supportsService(const OUString& ServiceName) throw();
-    Sequence< OUString > SAL_CALL   getSupportedServiceNames(void) throw();
+    OUString SAL_CALL			getImplementationName() throw();
+    BOOL 	 SAL_CALL			supportsService(const OUString& ServiceName) throw();
+    Sequence< OUString > SAL_CALL	getSupportedServiceNames(void) throw();
 
     static Sequence< OUString > getSupportedServiceNames_Static(void) throw();
-    static OUString             getImplementationName_Static() throw()
+    static OUString 			getImplementationName_Static() throw()
                                 {
                                     return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.extensions.ResourceService"));
                                 }
     static Reference< XInterface > Create( const Reference< XComponentContext >& _rxContext );
 
     // XExactName
-    OUString  SAL_CALL          getExactName( const OUString & ApproximateName ) throw(RuntimeException);
+    OUString  SAL_CALL			getExactName( const OUString & ApproximateName ) throw(RuntimeException);
 
     // XInvokation
     Reference< XIntrospectionAccess >  SAL_CALL getIntrospection(void)  throw(RuntimeException);
-    Any  SAL_CALL               invoke(const OUString& FunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam) throw(IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException);
-    void  SAL_CALL              setValue(const OUString& PropertyName, const Any& Value) throw(UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException);
-    Any  SAL_CALL               getValue(const OUString& PropertyName) throw(UnknownPropertyException, RuntimeException);
-    BOOL  SAL_CALL              hasMethod(const OUString& Name)  throw(RuntimeException);
-    BOOL  SAL_CALL              hasProperty(const OUString& Name)  throw(RuntimeException);
+    Any  SAL_CALL				invoke(const OUString& FunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam) throw(IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException);
+    void  SAL_CALL				setValue(const OUString& PropertyName, const Any& Value) throw(UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException);
+    Any  SAL_CALL				getValue(const OUString& PropertyName) throw(UnknownPropertyException, RuntimeException);
+    BOOL  SAL_CALL				hasMethod(const OUString& Name)  throw(RuntimeException);
+    BOOL  SAL_CALL				hasProperty(const OUString& Name)  throw(RuntimeException);
 private:
-    Reference< XTypeConverter >         getTypeConverter() const;
-    Reference< XInvocation >            getDefaultInvocation() const;
-
-    Reference< XMultiServiceFactory >   xSMgr;
-    Reference< XInvocation >            xDefaultInvocation;
-    Reference< XTypeConverter >         xTypeConverter;
-    OUString                                aFileName;
-    ResMgr *                            pResMgr;
+    Reference< XTypeConverter >			getTypeConverter() const;
+    Reference< XInvocation >			getDefaultInvocation() const;
+
+    Reference< XMultiServiceFactory >	xSMgr;
+    Reference< XInvocation >			xDefaultInvocation;
+    Reference< XTypeConverter >			xTypeConverter;
+    OUString								aFileName;
+    ResMgr *							pResMgr;
 };
 
 
@@ -187,7 +187,7 @@ Reference< XInvocation > ResourceService::getDefaultInvocation() const
 }
 
 // XExactName
-OUString    SAL_CALL ResourceService::getExactName( const OUString & ApproximateName ) throw(RuntimeException)
+OUString	SAL_CALL ResourceService::getExactName( const OUString & ApproximateName ) throw(RuntimeException)
 {
     OUString aName( ApproximateName );
     aName = aName.toAsciiLowerCase();
@@ -212,7 +212,7 @@ OUString    SAL_CALL ResourceService::getExactName( const OUString & Approximate
 }
 
 // XInvokation
-Reference< XIntrospectionAccess > SAL_CALL ResourceService::getIntrospection(void)
+Reference< XIntrospectionAccess > SAL_CALL ResourceService::getIntrospection(void)  
     throw(RuntimeException)
 {
     Reference< XInvocation > xI = getDefaultInvocation();
@@ -224,9 +224,9 @@ Reference< XIntrospectionAccess > SAL_CALL ResourceService::getIntrospection(voi
 // XInvokation
 Any SAL_CALL ResourceService::invoke
 (
-    const OUString& FunctionName,
-    const Sequence< Any >& Params,
-    Sequence< sal_Int16 >& OutParamIndex,
+    const OUString& FunctionName, 
+    const Sequence< Any >& Params, 
+    Sequence< sal_Int16 >& OutParamIndex, 
     Sequence< Any >& OutParam
 )
     throw(IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException)
@@ -245,16 +245,16 @@ Any SAL_CALL ResourceService::invoke
             throw IllegalArgumentException();
         if( !pResMgr )
             throw IllegalArgumentException();
-
+        
         Sequence< OUString > aStrings( Params.getLength() );
         Sequence< sal_Bool > aBools( Params.getLength() );
         const Any* pIn = Params.getConstArray();
         OUString* pOutString = aStrings.getArray();
         sal_Bool* pOutBool = aBools.getArray();
-
+        
         Reference< XTypeConverter > xC = getTypeConverter();
         bool bGetBranch = FunctionName.equalsAscii( "getString" ) || FunctionName.equalsAscii( "getStrings" );
-
+            
         SolarMutexGuard aGuard;
         for( sal_Int32 n = 0; n < nElements; n++ )
         {
@@ -270,7 +270,7 @@ Any SAL_CALL ResourceService::invoke
             }
             if( nId > 0xFFFF || nId < 0 )
                 throw IllegalArgumentException();
-
+            
             if( bGetBranch )
             {
                 ResId aId( (USHORT)nId, *pResMgr );
@@ -321,7 +321,7 @@ Any SAL_CALL ResourceService::invoke
             else
                 throw CannotConvertException();
         }
-
+        
         if( FunctionName.equalsAscii("getStringList") )
         {
             ResId aId( (USHORT)nId, *pResMgr );
@@ -368,7 +368,7 @@ Any SAL_CALL ResourceService::invoke
 }
 
 // XInvokation
-void SAL_CALL ResourceService::setValue(const OUString& PropertyName, const Any& Value)
+void SAL_CALL ResourceService::setValue(const OUString& PropertyName, const Any& Value) 
     throw(UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException)
 {
     if( PropertyName.equalsAscii("FileName") )
@@ -405,7 +405,7 @@ void SAL_CALL ResourceService::setValue(const OUString& PropertyName, const Any&
 }
 
 // XInvokation
-Any SAL_CALL ResourceService::getValue(const OUString& PropertyName)
+Any SAL_CALL ResourceService::getValue(const OUString& PropertyName) 
     throw(UnknownPropertyException, RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -420,7 +420,7 @@ Any SAL_CALL ResourceService::getValue(const OUString& PropertyName)
 }
 
 // XInvokation
-BOOL SAL_CALL ResourceService::hasMethod(const OUString& Name)
+BOOL SAL_CALL ResourceService::hasMethod(const OUString& Name)  
     throw(RuntimeException)
 {
     if( Name.equalsAscii("getString")     ||
@@ -442,7 +442,7 @@ BOOL SAL_CALL ResourceService::hasMethod(const OUString& Name)
 }
 
 // XInvokation
-BOOL SAL_CALL ResourceService::hasProperty(const OUString& Name)
+BOOL SAL_CALL ResourceService::hasProperty(const OUString& Name)  
     throw(RuntimeException)
 {
     if( Name.equalsAscii("FileName") )
diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx
index 61f52b916e5d..df48ec6cf155 100644
--- a/extensions/source/scanner/grid.cxx
+++ b/extensions/source/scanner/grid.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ ResId SaneResId( sal_uInt32 );
 
 /***********************************************************************
  *
- *  GridWindow
+ *	GridWindow
  *
  ***********************************************************************/
 
 // ---------------------------------------------------------------------
 
-GridWindow::GridWindow(double* pXValues, double* pYValues, int nValues, Window* pParent, BOOL bCutValues )
-:   ModalDialog( pParent, SaneResId( GRID_DIALOG ) ),
+GridWindow::GridWindow(double* pXValues, double* pYValues, int nValues, Window* pParent, BOOL bCutValues ) 
+:	ModalDialog( pParent, SaneResId( GRID_DIALOG ) ),
     m_aGridArea( 50, 15, 100, 100 ),
     m_pXValues( pXValues ),
     m_pOrigYValues( pYValues ),
@@ -272,7 +272,7 @@ void GridWindow::computeNew()
         std::sort(m_aHandles.begin(), m_aHandles.end());
         const int nSorted = m_aHandles.size();
         int i;
-
+    
         // get node arrays
         double* nodex = new double[ nSorted ];
         double* nodey = new double[ nSorted ];
diff --git a/extensions/source/scanner/grid.hrc b/extensions/source/scanner/grid.hrc
index 480598bf6c4f..fa364b909102 100644
--- a/extensions/source/scanner/grid.hrc
+++ b/extensions/source/scanner/grid.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #ifndef GRID_HRC
 #define GRID_HRC
 
-#define GRID_DIALOG                 1100
-#define GRID_DIALOG_OK_BTN          1
-#define GRID_DIALOG_CANCEL_BTN      2
-#define GRID_DIALOG_RESET_BTN       3
-#define GRID_DIALOG_TYPE_BOX            4
-#define GRID_DIALOG_HANDLE_BMP      5
+#define GRID_DIALOG					1100
+#define GRID_DIALOG_OK_BTN			1
+#define GRID_DIALOG_CANCEL_BTN		2
+#define GRID_DIALOG_RESET_BTN		3
+#define GRID_DIALOG_TYPE_BOX			4
+#define GRID_DIALOG_HANDLE_BMP		5
 
-#define RESET_TYPE_LINEAR_ASCENDING 10
-#define RESET_TYPE_LINEAR_DESCENDING    11
-#define RESET_TYPE_RESET                12
-#define RESET_TYPE_EXPONENTIAL      13
+#define RESET_TYPE_LINEAR_ASCENDING	10
+#define RESET_TYPE_LINEAR_DESCENDING	11
+#define RESET_TYPE_RESET				12
+#define RESET_TYPE_EXPONENTIAL		13
 
 #endif
diff --git a/extensions/source/scanner/grid.hxx b/extensions/source/scanner/grid.hxx
index 585f7913fbf4..d598b1a6a469 100644
--- a/extensions/source/scanner/grid.hxx
+++ b/extensions/source/scanner/grid.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,21 +38,21 @@ class GridWindow : public ModalDialog
     // helper class for handles
     struct impHandle
     {
-        Point           maPos;
-        sal_uInt16      mnOffX;
-        sal_uInt16      mnOffY;
+        Point			maPos;
+        sal_uInt16		mnOffX;
+        sal_uInt16		mnOffY;
 
-        impHandle(const Point& rPos, sal_uInt16 nX, sal_uInt16 nY)
-        :   maPos(rPos), mnOffX(nX), mnOffY(nY)
+        impHandle(const Point& rPos, sal_uInt16 nX, sal_uInt16 nY) 
+        :	maPos(rPos), mnOffX(nX), mnOffY(nY) 
         {
         }
-
-        bool operator<(const impHandle& rComp) const
-        {
-            return (maPos.X() < rComp.maPos.X());
+        
+        bool operator<(const impHandle& rComp) const 
+        { 
+            return (maPos.X() < rComp.maPos.X()); 
         }
 
-        void draw(Window& rWin, const BitmapEx& rBitmapEx)
+        void draw(Window& rWin, const BitmapEx& rBitmapEx) 
         {
             const Point aOffset(rWin.PixelToLogic(Point(mnOffX, mnOffY)));
             rWin.DrawBitmapEx(maPos - aOffset, rBitmapEx);
@@ -66,39 +66,39 @@ class GridWindow : public ModalDialog
         }
     };
 
-    Rectangle       m_aGridArea;
+    Rectangle		m_aGridArea;
 
-    double          m_fMinX;
-    double          m_fMinY;
-    double          m_fMaxX;
-    double          m_fMaxY;
+    double 			m_fMinX;
+    double			m_fMinY;
+    double			m_fMaxX;
+    double			m_fMaxY;
 
-    double          m_fChunkX;
-    double          m_fMinChunkX;
-    double          m_fChunkY;
-    double          m_fMinChunkY;
+    double			m_fChunkX;
+    double			m_fMinChunkX;
+    double			m_fChunkY;
+    double			m_fMinChunkY;
 
-    double*         m_pXValues;
-    double*         m_pOrigYValues;
-    int             m_nValues;
-    double*         m_pNewYValues;
+    double*			m_pXValues;
+    double*			m_pOrigYValues;
+    int				m_nValues;
+    double*			m_pNewYValues;
 
-    sal_uInt16      m_BmOffX;
-    sal_uInt16      m_BmOffY;
+    sal_uInt16		m_BmOffX;
+    sal_uInt16		m_BmOffY;
 
-    BOOL            m_bCutValues;
+    BOOL			m_bCutValues;
 
     // stuff for handles
-    std::vector< impHandle >    m_aHandles;
-    sal_uInt32                  m_nDragIndex;
+    std::vector< impHandle >	m_aHandles;
+    sal_uInt32					m_nDragIndex;
 
-    BitmapEx        m_aMarkerBitmap;
+    BitmapEx 		m_aMarkerBitmap;
 
-    OKButton        m_aOKButton;
-    CancelButton    m_aCancelButton;
+    OKButton		m_aOKButton;
+    CancelButton	m_aCancelButton;
 
-    ListBox         m_aResetTypeBox;
-    PushButton      m_aResetButton;
+    ListBox			m_aResetTypeBox;
+    PushButton		m_aResetButton;
 
 
     Point transform( double x, double y );
diff --git a/extensions/source/scanner/grid.src b/extensions/source/scanner/grid.src
index e7e8128cbc84..ddf593ef77ce 100644
--- a/extensions/source/scanner/grid.src
+++ b/extensions/source/scanner/grid.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 ModalDialog GRID_DIALOG
 {
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Pos = MAP_APPFONT ( 10 , 10 ) ;
-    Size = MAP_APPFONT ( 300, 200 ) ;
+    OutputSize = TRUE ; 
+    SVLook = TRUE ; 
+    Pos = MAP_APPFONT ( 10 , 10 ) ; 
+    Size = MAP_APPFONT ( 300, 200 ) ; 
     Moveable = TRUE ;
     Closeable = TRUE ;
 
@@ -43,13 +43,13 @@ ModalDialog GRID_DIALOG
     };
     CancelButton GRID_DIALOG_CANCEL_BTN
     {
-        Pos = MAP_APPFONT ( 245 , 25 ) ;
-        Size = MAP_APPFONT ( 50 , 15 ) ;
+        Pos = MAP_APPFONT ( 245 , 25 ) ; 
+        Size = MAP_APPFONT ( 50 , 15 ) ; 
     };
     ListBox GRID_DIALOG_TYPE_BOX
     {
-        Border = TRUE ;
-        Dropdown = TRUE ;
+        Border = TRUE ; 
+        Dropdown = TRUE ; 
         Pos = MAP_APPFONT( 245, 45 );
         Size = MAP_APPFONT( 50, 130 );
       };
diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx
index d6df2a30644a..717cf4c6140a 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,63 +60,63 @@ inline void dbg_msg( const char* pString, ... )
 }
 
 #define FAIL_SHUTDOWN_STATE( x, y, z ) \
-    if( x != SANE_STATUS_GOOD )                             \
-    {                                                       \
-        dump_state( "%s returned error %d (%s)\n",          \
-                 y, x, p_strstatus( x ) );                  \
-        DeInit();                                           \
-        return z;                                           \
+    if( x != SANE_STATUS_GOOD )								\
+    {														\
+        dump_state( "%s returned error %d (%s)\n",			\
+                 y, x, p_strstatus( x ) );					\
+        DeInit();											\
+        return z;											\
     }
 
 #define FAIL_STATE( x, y, z ) \
-    if( x != SANE_STATUS_GOOD )                             \
-    {                                                       \
-        dump_state( "%s returned error %d (%s)\n",          \
-                 y, x, p_strstatus( x ) );                  \
-        return z;                                           \
+    if( x != SANE_STATUS_GOOD )								\
+    {														\
+        dump_state( "%s returned error %d (%s)\n",			\
+                 y, x, p_strstatus( x ) );					\
+        return z;											\
     }
 
 #define DUMP_STATE( x, y ) \
-    if( x != SANE_STATUS_GOOD )                             \
-    {                                                       \
-        dump_state( "%s returned error %d (%s)\n",          \
-                 y, x, p_strstatus( x ) );                  \
+    if( x != SANE_STATUS_GOOD )								\
+    {														\
+        dump_state( "%s returned error %d (%s)\n",			\
+                 y, x, p_strstatus( x ) );					\
     }
 
 #define CHECK_STATE( x, y ) \
-    if( x != SANE_STATUS_GOOD )                             \
-    {                                                       \
-        dump_state( "%s returned error %d (%s)\n",          \
-                 y, x, p_strstatus( x ) );                  \
-    }                                                       \
+    if( x != SANE_STATUS_GOOD )								\
+    {														\
+        dump_state( "%s returned error %d (%s)\n",			\
+                 y, x, p_strstatus( x ) );					\
+    }														\
     else
 
-int             Sane::nRefCount = 0;
+int				Sane::nRefCount = 0;
 oslModule       Sane::pSaneLib = 0;
-SANE_Int        Sane::nVersion = 0;
-SANE_Device**   Sane::ppDevices = 0;
-int             Sane::nDevices = 0;
+SANE_Int		Sane::nVersion = 0;
+SANE_Device**	Sane::ppDevices = 0;
+int				Sane::nDevices = 0;
 
-SANE_Status     (*Sane::p_init)( SANE_Int*,
+SANE_Status		(*Sane::p_init)( SANE_Int*,
                                  SANE_Auth_Callback ) = 0;
-void            (*Sane::p_exit)() = 0;
-SANE_Status     (*Sane::p_get_devices)( const SANE_Device***,
+void			(*Sane::p_exit)() = 0;
+SANE_Status		(*Sane::p_get_devices)( const SANE_Device***,
                                         SANE_Bool ) = 0;
-SANE_Status     (*Sane::p_open)( SANE_String_Const, SANE_Handle ) = 0;
-void            (*Sane::p_close)( SANE_Handle ) = 0;
+SANE_Status		(*Sane::p_open)( SANE_String_Const, SANE_Handle ) = 0;
+void			(*Sane::p_close)( SANE_Handle ) = 0;
 const SANE_Option_Descriptor* (*Sane::p_get_option_descriptor)(
     SANE_Handle, SANE_Int ) = 0;
-SANE_Status     (*Sane::p_control_option)( SANE_Handle, SANE_Int,
+SANE_Status		(*Sane::p_control_option)( SANE_Handle, SANE_Int,
                                            SANE_Action, void*,
                                            SANE_Int* ) = 0;
-SANE_Status     (*Sane::p_get_parameters)( SANE_Handle,
+SANE_Status		(*Sane::p_get_parameters)( SANE_Handle,
                                            SANE_Parameters* ) = 0;
-SANE_Status     (*Sane::p_start)( SANE_Handle ) = 0;
-SANE_Status     (*Sane::p_read)( SANE_Handle, SANE_Byte*, SANE_Int,
+SANE_Status		(*Sane::p_start)( SANE_Handle ) = 0;
+SANE_Status		(*Sane::p_read)( SANE_Handle, SANE_Byte*, SANE_Int,
                                  SANE_Int* ) = 0;
-void            (*Sane::p_cancel)( SANE_Handle ) = 0;
-SANE_Status     (*Sane::p_set_io_mode)( SANE_Handle, SANE_Bool ) = 0;
-SANE_Status     (*Sane::p_get_select_fd)( SANE_Handle, SANE_Int* ) = 0;
+void			(*Sane::p_cancel)( SANE_Handle ) = 0;
+SANE_Status		(*Sane::p_set_io_mode)( SANE_Handle, SANE_Bool ) = 0;
+SANE_Status		(*Sane::p_get_select_fd)( SANE_Handle, SANE_Int* ) = 0;
 SANE_String_Const (*Sane::p_strstatus)( SANE_Status ) = 0;
 
 static BOOL bSaneSymbolLoadFailed = FALSE;
@@ -136,8 +136,8 @@ inline oslGenericFunction Sane::LoadSymbol( const char* pSymbolname )
 SANE_Status Sane::ControlOption( int nOption, SANE_Action nAction,
                                  void* pData )
 {
-    SANE_Status nStatus = SANE_STATUS_GOOD;
-    SANE_Int    nInfo = 0;
+    SANE_Status	nStatus = SANE_STATUS_GOOD;
+    SANE_Int	nInfo = 0;
 
     nStatus = p_control_option( maHandle, (SANE_Int)nOption,
                                 nAction, pData, &nInfo );
@@ -160,7 +160,7 @@ SANE_Status Sane::ControlOption( int nOption, SANE_Action nAction,
                  pAction );
     }
 #endif
-//  if( nInfo & ( SANE_INFO_RELOAD_OPTIONS | SANE_INFO_RELOAD_PARAMS ) )
+//	if( nInfo & ( SANE_INFO_RELOAD_OPTIONS | SANE_INFO_RELOAD_PARAMS ) )
     if( nInfo &  SANE_INFO_RELOAD_OPTIONS )
         ReloadOptions();
     return nStatus;
@@ -567,7 +567,7 @@ BOOL Sane::CheckConsistency( const char* pMes, BOOL bInit )
 BOOL Sane::Start( BitmapTransporter& rBitmap )
 {
     int nStream = 0, nLine = 0, i = 0;
-    SANE_Parameters aParams;
+    SANE_Parameters	aParams;
     FrameStyleType eType = FrameStyle_Gray;
     BOOL bSuccess = TRUE;
     BOOL bWidthSet = FALSE;
@@ -575,27 +575,27 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
     if( ! maHandle )
         return FALSE;
 
-    int nWidthMM    = 0;
-    int nHeightMM   = 0;
+    int nWidthMM	= 0;
+    int nHeightMM	= 0;
     double fTLx, fTLy, fBRx, fBRy, fResl = 0.0;
     int nOption;
-    if( ( nOption = GetOptionByName( "tl-x" ) ) != -1   &&
-        GetOptionValue( nOption, fTLx, 0 )              &&
+    if( ( nOption = GetOptionByName( "tl-x" ) ) != -1	&&
+        GetOptionValue( nOption, fTLx, 0 )				&&
         GetOptionUnit( nOption ) == SANE_UNIT_MM )
     {
-        if( ( nOption = GetOptionByName( "br-x" ) ) != -1   &&
-            GetOptionValue( nOption, fBRx, 0 )              &&
+        if( ( nOption = GetOptionByName( "br-x" ) ) != -1	&&
+            GetOptionValue( nOption, fBRx, 0 )				&&
             GetOptionUnit( nOption ) == SANE_UNIT_MM )
         {
             nWidthMM = (int)fabs(fBRx - fTLx);
         }
     }
-    if( ( nOption = GetOptionByName( "tl-y" ) ) != -1   &&
-        GetOptionValue( nOption, fTLy, 0 )              &&
+    if( ( nOption = GetOptionByName( "tl-y" ) ) != -1	&&
+        GetOptionValue( nOption, fTLy, 0 )				&&
         GetOptionUnit( nOption ) == SANE_UNIT_MM )
     {
-        if( ( nOption = GetOptionByName( "br-y" ) ) != -1   &&
-            GetOptionValue( nOption, fBRy, 0 )              &&
+        if( ( nOption = GetOptionByName( "br-y" ) ) != -1	&&
+            GetOptionValue( nOption, fBRy, 0 )				&&
             GetOptionUnit( nOption ) == SANE_UNIT_MM )
         {
             nHeightMM = (int)fabs(fBRy - fTLy);
@@ -836,9 +836,9 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
                     for( i = 0; i < (aParams.pixels_per_line); i++ )
                     {
                         UINT8 nRed, nGreen, nBlue;
-                        nRed    = _ReadValue( pFrame, aParams.depth );
-                        nGreen  = _ReadValue( pFrame, aParams.depth );
-                        nBlue   = _ReadValue( pFrame, aParams.depth );
+                        nRed	= _ReadValue( pFrame, aParams.depth );
+                        nGreen	= _ReadValue( pFrame, aParams.depth );
+                        nBlue	= _ReadValue( pFrame, aParams.depth );
                         aConverter << nBlue;
                         aConverter << nGreen;
                         aConverter << nRed;
diff --git a/extensions/source/scanner/sane.hxx b/extensions/source/scanner/sane.hxx
index fdc5e5011534..7cf91a5b9fc5 100644
--- a/extensions/source/scanner/sane.hxx
+++ b/extensions/source/scanner/sane.hxx
@@ -41,28 +41,28 @@
 
 class BitmapTransporter : public OWeakObject, AWT::XBitmap
 {
-    SvMemoryStream                      m_aStream;
+    SvMemoryStream						m_aStream;
     osl::Mutex                          m_aProtector;
 
 public:
 
                                         BitmapTransporter();
-    virtual                             ~BitmapTransporter();
+    virtual								~BitmapTransporter();
 
 
     // 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 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 AWT::Size SAL_CALL          getSize() throw();
-    virtual SEQ( sal_Int8 ) SAL_CALL    getDIB() throw();
-    virtual SEQ( sal_Int8 ) SAL_CALL    getMaskDIB() throw() { return SEQ( sal_Int8 )(); }
+    virtual AWT::Size SAL_CALL			getSize() throw();
+    virtual SEQ( sal_Int8 ) SAL_CALL	getDIB() throw();
+    virtual SEQ( sal_Int8 ) SAL_CALL	getMaskDIB() throw() { return SEQ( sal_Int8 )(); }
 
     // Misc
-    void                                lock() { m_aProtector.acquire(); }
-    void                                unlock() { m_aProtector.release(); }
-    SvMemoryStream&                     getStream() { return m_aStream; }
+    void								lock() { m_aProtector.acquire(); }
+    void								unlock() { m_aProtector.release(); }
+    SvMemoryStream&						getStream() { return m_aStream; }
 };
 
 // --------
@@ -72,46 +72,46 @@ public:
 class Sane
 {
 private:
-    static int              nRefCount;
+    static int				nRefCount;
     static oslModule        pSaneLib;
 
-    static SANE_Status      (*p_init)( SANE_Int*,
+    static SANE_Status		(*p_init)( SANE_Int*,
                                        SANE_Auth_Callback );
-    static void             (*p_exit)();
-    static SANE_Status      (*p_get_devices)( const SANE_Device***,
+    static void				(*p_exit)();
+    static SANE_Status		(*p_get_devices)( const SANE_Device***,
                                               SANE_Bool );
-    static SANE_Status      (*p_open)( SANE_String_Const, SANE_Handle );
-    static void             (*p_close)( SANE_Handle );
+    static SANE_Status		(*p_open)( SANE_String_Const, SANE_Handle );
+    static void				(*p_close)( SANE_Handle );
     static const SANE_Option_Descriptor* (*p_get_option_descriptor)(
         SANE_Handle, SANE_Int );
-    static SANE_Status      (*p_control_option)( SANE_Handle, SANE_Int,
+    static SANE_Status		(*p_control_option)( SANE_Handle, SANE_Int,
                                                  SANE_Action, void*,
                                                  SANE_Int* );
-    static SANE_Status      (*p_get_parameters)( SANE_Handle,
+    static SANE_Status		(*p_get_parameters)( SANE_Handle,
                                                  SANE_Parameters* );
-    static SANE_Status      (*p_start)( SANE_Handle );
-    static SANE_Status      (*p_read)( SANE_Handle, SANE_Byte*, SANE_Int,
+    static SANE_Status		(*p_start)( SANE_Handle );
+    static SANE_Status		(*p_read)( SANE_Handle, SANE_Byte*, SANE_Int,
                                        SANE_Int* );
-    static void             (*p_cancel)( SANE_Handle );
-    static SANE_Status      (*p_set_io_mode)( SANE_Handle, SANE_Bool );
-    static SANE_Status      (*p_get_select_fd)( SANE_Handle, SANE_Int* );
+    static void				(*p_cancel)( SANE_Handle );
+    static SANE_Status		(*p_set_io_mode)( SANE_Handle, SANE_Bool );
+    static SANE_Status		(*p_get_select_fd)( SANE_Handle, SANE_Int* );
     static SANE_String_Const (*p_strstatus)( SANE_Status );
 
-    static SANE_Int             nVersion;
-    static SANE_Device**        ppDevices;
-    static int                  nDevices;
+    static SANE_Int				nVersion;
+    static SANE_Device**		ppDevices;
+    static int					nDevices;
 
-    const SANE_Option_Descriptor**  mppOptions;
-    int                             mnOptions;
-    int                             mnDevice;
-    SANE_Handle                     maHandle;
+    const SANE_Option_Descriptor**	mppOptions;
+    int								mnOptions;
+    int								mnDevice;
+    SANE_Handle						maHandle;
 
-    Link                        maReloadOptionsLink;
+    Link						maReloadOptionsLink;
 
     inline oslGenericFunction
                     LoadSymbol( const char* );
-    void            Init();
-    void            DeInit();
+    void			Init();
+    void			DeInit();
 
     SANE_Status ControlOption( int, SANE_Action, void* );
 
@@ -121,64 +121,64 @@ public:
     Sane();
     ~Sane();
 
-    static BOOL         IsSane()
+    static BOOL			IsSane()
         { return pSaneLib ? TRUE : FALSE; }
-    BOOL            IsOpen()
+    BOOL			IsOpen()
         { return maHandle ? TRUE : FALSE; }
-    static int              CountDevices()
+    static int				CountDevices()
         { return nDevices; }
-    static String           GetName( int n )
+    static String			GetName( int n )
         { return String( ppDevices[n]->name ? ppDevices[n]->name : "", osl_getThreadTextEncoding() ); }
-    static String           GetVendor( int n )
+    static String			GetVendor( int n )
         { return String( ppDevices[n]->vendor ? ppDevices[n]->vendor : "", osl_getThreadTextEncoding() ); }
-    static String           GetModel( int n )
+    static String			GetModel( int n )
         { return String( ppDevices[n]->model ? ppDevices[n]->model : "", osl_getThreadTextEncoding() ); }
-    static String           GetType( int n )
+    static String			GetType( int n )
         { return String( ppDevices[n]->type ? ppDevices[n]->type : "", osl_getThreadTextEncoding() ); }
 
-    String          GetOptionName( int n )
+    String			GetOptionName( int n )
         { return String( mppOptions[n]->name ? (char*)mppOptions[n]->name : "", osl_getThreadTextEncoding() ); }
-    String          GetOptionTitle( int n )
+    String			GetOptionTitle( int n )
         { return String( mppOptions[n]->title ? (char*)mppOptions[n]->title : "", osl_getThreadTextEncoding() ); }
-    SANE_Value_Type GetOptionType( int n )
+    SANE_Value_Type	GetOptionType( int n )
         { return mppOptions[n]->type; }
-    SANE_Unit       GetOptionUnit( int n )
+    SANE_Unit		GetOptionUnit( int n )
         { return mppOptions[n]->unit; }
-    String          GetOptionUnitName( int n );
-    SANE_Int        GetOptionCap( int n )
+    String			GetOptionUnitName( int n );
+    SANE_Int		GetOptionCap( int n )
         { return mppOptions[n]->cap; }
     SANE_Constraint_Type GetOptionConstraintType( int n )
         { return mppOptions[n]->constraint_type; }
-    const char**    GetStringConstraint( int n )
+    const char**	GetStringConstraint( int n )
         { return (const char**)mppOptions[n]->constraint.string_list; }
-    int             GetRange( int, double*& );
+    int				GetRange( int, double*& );
 
-    inline int      GetOptionElements( int n );
-    int             GetOptionByName( const char* );
-    BOOL            GetOptionValue( int, BOOL& );
-    BOOL            GetOptionValue( int, ByteString& );
-    BOOL            GetOptionValue( int, double&, int nElement = 0 );
-    BOOL            GetOptionValue( int, double* );
+    inline int		GetOptionElements( int n );
+    int				GetOptionByName( const char* );
+    BOOL			GetOptionValue( int, BOOL& );
+    BOOL			GetOptionValue( int, ByteString& );
+    BOOL			GetOptionValue( int, double&, int nElement = 0 );
+    BOOL			GetOptionValue( int, double* );
 
-    BOOL            SetOptionValue( int, BOOL );
-    BOOL            SetOptionValue( int, const String& );
-    BOOL            SetOptionValue( int, double, int nElement = 0 );
-    BOOL            SetOptionValue( int, double* );
+    BOOL			SetOptionValue( int, BOOL );
+    BOOL			SetOptionValue( int, const String& );
+    BOOL			SetOptionValue( int, double, int nElement = 0 );
+    BOOL			SetOptionValue( int, double* );
 
-    BOOL            ActivateButtonOption( int );
+    BOOL			ActivateButtonOption( int );
 
-    int             CountOptions() { return mnOptions; }
-    int             GetDeviceNumber() { return mnDevice; }
+    int				CountOptions() { return mnOptions; }
+    int				GetDeviceNumber() { return mnDevice; }
 
-    BOOL            Open( const char* );
-    BOOL            Open( int );
-    void            Close();
-    void            ReloadDevices();
-    void            ReloadOptions();
+    BOOL			Open( const char* );
+    BOOL			Open( int );
+    void			Close();
+    void			ReloadDevices();
+    void			ReloadOptions();
 
-    BOOL            Start( BitmapTransporter& );
+    BOOL			Start( BitmapTransporter& );
 
-    inline Link     SetReloadOptionsHdl( const Link& rLink );
+    inline Link		SetReloadOptionsHdl( const Link& rLink );
 };
 
 inline int Sane::GetOptionElements( int n )
@@ -191,7 +191,7 @@ inline int Sane::GetOptionElements( int n )
     return 1;
 }
 
-inline Link Sane::SetReloadOptionsHdl( const Link& rLink )
+inline Link	Sane::SetReloadOptionsHdl( const Link& rLink )
 {
     Link aRet = maReloadOptionsLink;
     maReloadOptionsLink = rLink;
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index d1e8ed07ad58..98c654695ee4 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -122,10 +122,10 @@ SaneDlg::SaneDlg( Window* pParent, Sane& rSane ) :
         Bitmap( SaneResId( RID_SCAN_BITMAP_PLUS ) ),
         Bitmap( SaneResId( RID_SCAN_BITMAP_MINUS ) )
         );
-    maOptionBox.SetWindowBits( WB_HASLINES              |
-                               WB_HASBUTTONS            |
-                               WB_NOINITIALSELECTION    |
-                               WB_HASBUTTONSATROOT      |
+    maOptionBox.SetWindowBits( WB_HASLINES				|
+                               WB_HASBUTTONS			|
+                               WB_NOINITIALSELECTION	|
+                               WB_HASBUTTONSATROOT		|
                                WB_HASLINESATROOT
                                );
     FreeResource();
@@ -225,9 +225,9 @@ void SaneDlg::InitFields()
                     maReslBox.SetMax( (long)pDouble[1] );
                     maReslBox.InsertValue( (long)pDouble[0] );
                     // mh@openoffice.org: issue 68557: Can only select 75 and 2400 dpi in Scanner dialogue
-                    // scanner allows random setting of dpi resolution, a slider might be useful
+                    // scanner allows random setting of dpi resolution, a slider might be useful 
                     // support that
-                    // workaround: offer at least some more standard dpi resolution between
+                    // workaround: offer at least some more standard dpi resolution between 
                     // min and max value
                     int bGot300 = 0;
                     for ( int nRes = (long) pDouble[0] * 2; nRes < (long) pDouble[1]; nRes = nRes * 2 )
@@ -291,8 +291,8 @@ void SaneDlg::InitFields()
                 }
                 switch( i ) {
                     case 0: maTopLeft.X() = (int)fValue;break;
-                    case 1: maTopLeft.Y() = (int)fValue;break;
-                    case 2: maBottomRight.X() = (int)fValue;break;
+                    case 1:	maTopLeft.Y() = (int)fValue;break;
+                    case 2:	maBottomRight.X() = (int)fValue;break;
                     case 3: maBottomRight.Y() = (int)fValue;break;
                 }
             }
@@ -460,7 +460,7 @@ IMPL_LINK( SaneDlg, ClickBtnHdl, Button*, pButton )
                     aGrid.setBoundings( 0, mfMin, nElements, mfMax );
                     if( aGrid.Execute() && aGrid.getNewYValues() )
                         mrSane.SetOptionValue( mnCurrentOption, aGrid.getNewYValues() );
-
+                    
                     delete [] x;
                     delete [] y;
                 }
@@ -537,7 +537,7 @@ IMPL_LINK( SaneDlg, OptionsBoxSelectHdl, SvTreeListBox*, pBox )
             SANE_Constraint_Type nConstraint;
             switch( nType )
             {
-                case SANE_TYPE_BOOL:    EstablishBoolOption();break;
+                case SANE_TYPE_BOOL:	EstablishBoolOption();break;
                 case SANE_TYPE_STRING:
                     nConstraint = mrSane.GetOptionConstraintType( mnCurrentOption );
                     if( nConstraint == SANE_CONSTRAINT_STRING_LIST )
@@ -931,20 +931,20 @@ void SaneDlg::MouseMove( const MouseEvent& rMEvt )
         aMousePos = GetPixelPos( aLogicPos );
         switch( meDragDirection )
         {
-            case TopLeft:       maTopLeft = aMousePos; break;
-            case Top:           maTopLeft.Y() = aMousePos.Y(); break;
+            case TopLeft:		maTopLeft = aMousePos; break;
+            case Top:			maTopLeft.Y() = aMousePos.Y(); break;
             case TopRight:
                 maTopLeft.Y() = aMousePos.Y();
                 maBottomRight.X() = aMousePos.X();
                 break;
-            case Right:         maBottomRight.X() = aMousePos.X(); break;
-            case BottomRight:   maBottomRight = aMousePos; break;
-            case Bottom:        maBottomRight.Y() = aMousePos.Y(); break;
+            case Right:			maBottomRight.X() = aMousePos.X(); break;
+            case BottomRight:	maBottomRight = aMousePos; break;
+            case Bottom:		maBottomRight.Y() = aMousePos.Y(); break;
             case BottomLeft:
                 maTopLeft.X() = aMousePos.X();
                 maBottomRight.Y() = aMousePos.Y();
                 break;
-            case Left:          maTopLeft.X() = aMousePos.X(); break;
+            case Left:			maTopLeft.X() = aMousePos.X(); break;
             default: break;
         }
         int nSwap;
diff --git a/extensions/source/scanner/sanedlg.hrc b/extensions/source/scanner/sanedlg.hrc
index ca893122c9a9..711caff9ac2b 100644
--- a/extensions/source/scanner/sanedlg.hrc
+++ b/extensions/source/scanner/sanedlg.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,56 +27,56 @@
 #ifndef _SVT_SANEDLG_HRC
 #define _SVT_SANEDLG_HRC
 
-#define RID_SANE_DIALOG                 1000
-#define RID_SCAN_OK                        1
-#define RID_SCAN_CANCEL                    2
-#define RID_DEVICEINFO_BTN                 3
-#define RID_PREVIEW_BOX                    4
-#define RID_DEVICE_BOX_TXT                 5
-#define RID_DEVICE_BOX                     6
-#define RID_SCANAREA_BOX                   7
-#define RID_SCAN_LEFT_TXT                  8
-#define RID_SCAN_LEFT_BOX                  9
-#define RID_SCAN_TOP_BOX                  10
-#define RID_SCAN_TOP_TXT                  11
-#define RID_SCAN_RIGHT_TXT                12
-#define RID_SCAN_RIGHT_BOX                13
-#define RID_SCAN_BOTTOM_TXT               14
-#define RID_SCAN_BOTTOM_BOX               15
-#define RID_SCAN_RESOLUTION_TXT           16
-#define RID_SCAN_RESOLUTION_BOX           17
-#define RID_PREVIEW_BTN                   18
-#define RID_SCAN_OPTION_BOX               19
-#define RID_SCAN_OPTIONTITLE_TXT          20
-#define RID_SCAN_OPTION_DESC_TXT          21
-#define RID_SCAN_BOOL_OPTION_BOX          22
-#define RID_SCAN_OPTION_TXT               23
-#define RID_SCAN_STRING_OPTION_EDT        24
-#define RID_SCAN_QUANTUM_RANGE_BOX        25
-#define RID_SCAN_STRING_RANGE_BOX         26
-#define RID_SCAN_NUMERIC_OPTION_EDT       27
-#define RID_SCAN_BUTTON_OPTION_BTN        28
-#define RID_SCAN_NUMERIC_VECTOR_BOX       29
-#define RID_SCAN_NUMERIC_VECTOR_TXT       30
-#define RID_SCAN_BITMAP_PLUS              31
-#define RID_SCAN_BITMAP_MINUS             32
-#define RID_SCAN_ADVANCED_BOX             33
-#define RID_SCAN_ADVANCED_TXT             34
+#define RID_SANE_DIALOG					1000
+#define RID_SCAN_OK						   1
+#define RID_SCAN_CANCEL					   2
+#define RID_DEVICEINFO_BTN				   3
+#define RID_PREVIEW_BOX					   4
+#define RID_DEVICE_BOX_TXT				   5
+#define RID_DEVICE_BOX					   6
+#define RID_SCANAREA_BOX				   7
+#define RID_SCAN_LEFT_TXT				   8
+#define RID_SCAN_LEFT_BOX				   9
+#define RID_SCAN_TOP_BOX				  10
+#define RID_SCAN_TOP_TXT				  11
+#define RID_SCAN_RIGHT_TXT				  12
+#define RID_SCAN_RIGHT_BOX				  13
+#define RID_SCAN_BOTTOM_TXT				  14
+#define RID_SCAN_BOTTOM_BOX				  15
+#define RID_SCAN_RESOLUTION_TXT			  16
+#define RID_SCAN_RESOLUTION_BOX			  17
+#define RID_PREVIEW_BTN					  18
+#define RID_SCAN_OPTION_BOX				  19
+#define RID_SCAN_OPTIONTITLE_TXT		  20
+#define RID_SCAN_OPTION_DESC_TXT		  21
+#define RID_SCAN_BOOL_OPTION_BOX		  22
+#define RID_SCAN_OPTION_TXT				  23
+#define RID_SCAN_STRING_OPTION_EDT		  24
+#define RID_SCAN_QUANTUM_RANGE_BOX		  25
+#define RID_SCAN_STRING_RANGE_BOX		  26
+#define RID_SCAN_NUMERIC_OPTION_EDT		  27
+#define RID_SCAN_BUTTON_OPTION_BTN		  28
+#define RID_SCAN_NUMERIC_VECTOR_BOX		  29
+#define RID_SCAN_NUMERIC_VECTOR_TXT		  30
+#define RID_SCAN_BITMAP_PLUS			  31
+#define RID_SCAN_BITMAP_MINUS			  32
+#define RID_SCAN_ADVANCED_BOX			  33
+#define RID_SCAN_ADVANCED_TXT			  34
 
-#define RID_SANE_DEVICEINFO_TXT         1001
-#define RID_SANE_SCANERROR_TXT          1002
-#define RID_SANE_NORESOLUTIONOPTION_TXT 1003
-#define RID_SANE_NOSANELIB_TXT          1004
+#define RID_SANE_DEVICEINFO_TXT			1001
+#define RID_SANE_SCANERROR_TXT			1002
+#define RID_SANE_NORESOLUTIONOPTION_TXT	1003
+#define RID_SANE_NOSANELIB_TXT			1004
 
-#define SCAN_AREA_TOP       17
-#define SCAN_AREA_LEFT      8
+#define SCAN_AREA_TOP		17
+#define SCAN_AREA_LEFT		8
 #define PREVIEW_UPPER_LEFT  SCAN_AREA_LEFT
 #define PREVIEW_UPPER_TOP   SCAN_AREA_TOP + 80
 #define PREVIEW_WIDTH       113
 #define PREVIEW_HEIGHT      160
-#define PREVIEW_BOTTOM      PREVIEW_UPPER_TOP + PREVIEW_HEIGHT
-#define PREVIEW_RIGHT       PREVIEW_UPPER_LEFT + PREVIEW_WIDTH
-#define SECOND_COLUMN       PREVIEW_WIDTH + 20
-#define THIRD_COLUMN        SECOND_COLUMN + 135
+#define PREVIEW_BOTTOM		PREVIEW_UPPER_TOP + PREVIEW_HEIGHT
+#define PREVIEW_RIGHT		PREVIEW_UPPER_LEFT + PREVIEW_WIDTH
+#define SECOND_COLUMN		PREVIEW_WIDTH + 20
+#define THIRD_COLUMN		SECOND_COLUMN + 135
 
 #endif
diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx
index 8019f5b38d5c..cacd411afdb5 100644
--- a/extensions/source/scanner/sanedlg.hxx
+++ b/extensions/source/scanner/sanedlg.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ private:
     enum DragDirection { TopLeft, Top, TopRight, Right, BottomRight, Bottom,
                          BottomLeft, Left };
 
-    Sane&           mrSane;
-    Bitmap          maPreviewBitmap;
-    Rectangle       maPreviewRect;
-    Point           maTopLeft, maBottomRight;
-    Point           maMinTopLeft, maMaxBottomRight;
-    BOOL            mbDragEnable;
-    BOOL            mbIsDragging;
-    int             mnDragMode;
-    BOOL            mbDragDrawn;
-    DragDirection   meDragDirection;
-
-    MapMode         maMapMode;
-
-    Link            maOldLink;
-
-    OKButton        maOKButton;
-    CancelButton    maCancelButton;
-    PushButton      maDeviceInfoButton;
-    PushButton      maPreviewButton;
-    PushButton      maButtonOption;
-
-    FixedText       maOptionsTxt;
-    FixedText       maOptionTitle;
-    FixedText       maOptionDescTxt;
-    FixedText       maVectorTxt;
-
-    FixedText       maScanLeftTxt;
-    MetricField     maLeftField;
-    FixedText       maScanTopTxt;
-    MetricField     maTopField;
-    FixedText       maRightTxt;
-    MetricField     maRightField;
-    FixedText       maBottomTxt;
-    MetricField     maBottomField;
-
-    FixedText       maDeviceBoxTxt;
-    ListBox         maDeviceBox;
-    FixedText       maReslTxt;
-    NumericBox      maReslBox;
-    FixedText       maAdvancedTxt;
-    CheckBox        maAdvancedBox;
-
-    NumericField    maVectorBox;
-    ListBox         maQuantumRangeBox;
-    ListBox         maStringRangeBox;
-
-    FixedLine       maPreviewBox;
-    FixedLine       maAreaBox;
-
-    CheckBox        maBoolCheckBox;
-
-    Edit            maStringEdit;
-    Edit            maNumericEdit;
-
-    SvTreeListBox   maOptionBox;
-
-    int             mnCurrentOption;
-    int             mnCurrentElement;
-    double*         mpRange;
-    double          mfMin, mfMax;
+    Sane&			mrSane;
+    Bitmap			maPreviewBitmap;
+    Rectangle		maPreviewRect;
+    Point			maTopLeft, maBottomRight;
+    Point			maMinTopLeft, maMaxBottomRight;
+    BOOL			mbDragEnable;
+    BOOL			mbIsDragging;
+    int				mnDragMode;
+    BOOL			mbDragDrawn;
+    DragDirection	meDragDirection;
+
+    MapMode			maMapMode;
+
+    Link			maOldLink;
+    
+    OKButton		maOKButton;
+    CancelButton	maCancelButton;
+    PushButton		maDeviceInfoButton;
+    PushButton		maPreviewButton;
+    PushButton		maButtonOption;
+
+    FixedText		maOptionsTxt;
+    FixedText		maOptionTitle;
+    FixedText		maOptionDescTxt;
+    FixedText		maVectorTxt;
+
+    FixedText		maScanLeftTxt;
+    MetricField		maLeftField;
+    FixedText		maScanTopTxt;
+    MetricField		maTopField;
+    FixedText		maRightTxt;
+    MetricField		maRightField;
+    FixedText		maBottomTxt;
+    MetricField		maBottomField;
+
+    FixedText		maDeviceBoxTxt;
+    ListBox			maDeviceBox;
+    FixedText		maReslTxt;
+    NumericBox		maReslBox;
+    FixedText		maAdvancedTxt;
+    CheckBox		maAdvancedBox;
+
+    NumericField	maVectorBox;
+    ListBox			maQuantumRangeBox;
+    ListBox			maStringRangeBox;
+
+    FixedLine		maPreviewBox;
+    FixedLine		maAreaBox;
+
+    CheckBox		maBoolCheckBox;
+
+    Edit			maStringEdit;
+    Edit			maNumericEdit;
+
+    SvTreeListBox	maOptionBox;
+
+    int				mnCurrentOption;
+    int				mnCurrentElement;
+    double*			mpRange;
+    double			mfMin, mfMax;
 
     DECL_LINK( ClickBtnHdl, Button* );
     DECL_LINK( SelectHdl, ListBox* );
@@ -135,7 +135,7 @@ private:
 
     // helper
     BOOL SetAdjustedNumericalValue( const char* pOption, double fValue, int nElement = 0 );
-
+    
     virtual void Paint( const Rectangle& );
     virtual void MouseMove( const MouseEvent& rMEvt );
     virtual void MouseButtonDown( const MouseEvent& rMEvt );
diff --git a/extensions/source/scanner/sanedlg.src b/extensions/source/scanner/sanedlg.src
index 2c4cc338ab8a..2b41785c880d 100644
--- a/extensions/source/scanner/sanedlg.src
+++ b/extensions/source/scanner/sanedlg.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/scanner/scanner.cxx b/extensions/source/scanner/scanner.cxx
index e833c4f1d56d..97d8b925c1e4 100644
--- a/extensions/source/scanner/scanner.cxx
+++ b/extensions/source/scanner/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
@@ -58,7 +58,7 @@ ScannerManager::~ScannerManager()
 
 ANY SAL_CALL ScannerManager::queryInterface( const Type& rType ) throw( RuntimeException )
 {
-    const ANY aRet( cppu::queryInterface( rType,
+    const ANY aRet( cppu::queryInterface( rType, 
                                           static_cast< XScannerManager* >( this ),
                                           static_cast< AWT::XBitmap* >( this ) ) );
 
@@ -83,7 +83,7 @@ void SAL_CALL ScannerManager::release() throw()
 
 SEQ( sal_Int8 ) SAL_CALL ScannerManager::getMaskDIB() throw()
 {
-    return SEQ( sal_Int8 )();
+    return SEQ( sal_Int8 )(); 
 }
 
 // -----------------------------------------------------------------------------
@@ -98,9 +98,9 @@ OUString ScannerManager::getImplementationName_Static() throw()
 SEQ( OUString ) ScannerManager::getSupportedServiceNames_Static() throw ()
 {
     SEQ( OUString ) aSNS( 1 );
-
-    aSNS.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.scanner.ScannerManager" ) );
-
+    
+    aSNS.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.scanner.ScannerManager" ) ); 
+    
     return aSNS;
 }
 
diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx
index b263ecaa0802..f8420bd4483f 100644
--- a/extensions/source/scanner/scanner.hxx
+++ b/extensions/source/scanner/scanner.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ using namespace com::sun::star::scanner;
 // - Defines -
 // -----------
 
-#define REF( _def_Obj )                     Reference< _def_Obj >
-#define SEQ( _def_Obj )                     Sequence< _def_Obj >
-#define ANY                                 Any
-#define AWT                                 com::sun::star::awt
+#define REF( _def_Obj )						Reference< _def_Obj >
+#define SEQ( _def_Obj )						Sequence< _def_Obj > 
+#define ANY									Any 
+#define	AWT									com::sun::star::awt
 
 // ------------------
 // - ScannerManager -
@@ -66,42 +66,42 @@ class ScannerManager : public OWeakObject, XScannerManager, AWT::XBitmap
 protected:
 
     osl::Mutex                              maProtector;
-    void*                                   mpData;
+    void*									mpData;
 
-    void                                    AcquireData();
-    void                                    ReleaseData();
+    void									AcquireData();
+    void									ReleaseData();
 
 public:
 
                                             ScannerManager();
-    virtual                                 ~ScannerManager();
-
-    // XInterface
-    virtual ANY SAL_CALL                    queryInterface( const Type & rType ) throw( RuntimeException );
-    virtual void SAL_CALL                   acquire() throw();
-    virtual void SAL_CALL                   release() throw();
+    virtual									~ScannerManager();
+                                            
+    // XInterface										
+    virtual ANY SAL_CALL					queryInterface( const Type & rType ) throw( RuntimeException );
+    virtual void SAL_CALL					acquire() throw();
+    virtual void SAL_CALL					release() throw();
 
     // XScannerManager
-    virtual SEQ( ScannerContext ) SAL_CALL  getAvailableScanners() throw();
-    virtual BOOL SAL_CALL                   configureScanner( ScannerContext& scanner_context ) throw( ScannerException );
-    virtual void SAL_CALL                   startScan( const ScannerContext& scanner_context, const REF( com::sun::star::lang::XEventListener )& rxListener ) throw( ScannerException );
-    virtual ScanError SAL_CALL              getError( const ScannerContext& scanner_context ) throw( ScannerException );
-    virtual REF( AWT::XBitmap ) SAL_CALL    getBitmap( const ScannerContext& scanner_context ) throw( ScannerException );
+    virtual SEQ( ScannerContext ) SAL_CALL	getAvailableScanners() throw();
+    virtual BOOL SAL_CALL					configureScanner( ScannerContext& scanner_context ) throw( ScannerException );
+    virtual void SAL_CALL					startScan( const ScannerContext& scanner_context, const REF( com::sun::star::lang::XEventListener )& rxListener ) throw( ScannerException );
+    virtual ScanError SAL_CALL				getError( const ScannerContext& scanner_context ) throw( ScannerException );
+    virtual REF( AWT::XBitmap ) SAL_CALL	getBitmap( const ScannerContext& scanner_context ) throw( ScannerException );
 
     // XBitmap
-    virtual AWT::Size SAL_CALL              getSize() throw();
-    virtual SEQ( sal_Int8 ) SAL_CALL        getDIB() throw();
-    virtual SEQ( sal_Int8 ) SAL_CALL        getMaskDIB() throw();
+    virtual AWT::Size SAL_CALL				getSize() throw();
+    virtual SEQ( sal_Int8 ) SAL_CALL		getDIB() throw();
+    virtual SEQ( sal_Int8 ) SAL_CALL		getMaskDIB() throw();
 
     // Misc
-    static OUString                         getImplementationName_Static() throw();
-    static Sequence< OUString >             getSupportedServiceNames_Static() throw();
+    static OUString 						getImplementationName_Static() throw();
+    static Sequence< OUString > 			getSupportedServiceNames_Static() throw();
 
-    void                                    Lock() { maProtector.acquire(); }
-    void                                    Unlock() { maProtector.release(); }
+    void									Lock() { maProtector.acquire(); }
+    void									Unlock() { maProtector.release(); }
 
-    void*                                   GetData() const { return mpData; }
-    void                                    SetData( void* pData ) { ReleaseData(); mpData = pData; }
+    void*									GetData() const { return mpData; }
+    void									SetData( void* pData ) { ReleaseData(); mpData = pData; }
 };
 
 // -----------------------------------------------------------------------------
diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx
index 7043c3d9a971..0dcf457713b9 100644
--- a/extensions/source/scanner/scanunx.cxx
+++ b/extensions/source/scanner/scanunx.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,8 +66,8 @@ ANY SAL_CALL BitmapTransporter::queryInterface( const Type& rType ) throw( Runti
 AWT::Size BitmapTransporter::getSize() throw()
 {
     osl::MutexGuard aGuard( m_aProtector );
-    int         nPreviousPos = m_aStream.Tell();
-    AWT::Size   aRet;
+    int			nPreviousPos = m_aStream.Tell();
+    AWT::Size	aRet;
 
     // ensure that there is at least a header
     m_aStream.Seek( STREAM_SEEK_TO_END );
@@ -90,7 +90,7 @@ AWT::Size BitmapTransporter::getSize() throw()
 SEQ( sal_Int8 ) BitmapTransporter::getDIB() throw()
 {
     osl::MutexGuard aGuard( m_aProtector );
-    int         nPreviousPos = m_aStream.Tell();
+    int			nPreviousPos = m_aStream.Tell();
 
     // create return value
     m_aStream.Seek( STREAM_SEEK_TO_END );
@@ -110,11 +110,11 @@ SEQ( sal_Int8 ) BitmapTransporter::getDIB() throw()
 
 struct SaneHolder
 {
-    Sane                m_aSane;
-    REF( AWT::XBitmap ) m_xBitmap;
+    Sane				m_aSane;
+    REF( AWT::XBitmap )	m_xBitmap;
     osl::Mutex          m_aProtector;
-    ScanError           m_nError;
-    bool                m_bBusy;
+    ScanError			m_nError;
+    bool				m_bBusy;
 
     SaneHolder() : m_nError(ScanError_ScanErrorNone), m_bBusy(false) {}
 };
@@ -157,9 +157,9 @@ namespace
 
 class ScannerThread : public osl::Thread
 {
-    boost::shared_ptr<SaneHolder>               m_pHolder;
-    REF( com::sun::star::lang::XEventListener ) m_xListener;
-    ScannerManager*                             m_pManager; // just for the disposing call
+    boost::shared_ptr<SaneHolder>				m_pHolder;
+    REF( com::sun::star::lang::XEventListener )	m_xListener;
+    ScannerManager*								m_pManager; // just for the disposing call
 
 public:
     virtual void run();
@@ -193,9 +193,9 @@ ScannerThread::~ScannerThread()
 
 void ScannerThread::run()
 {
-    osl::MutexGuard         aGuard( m_pHolder->m_aProtector );
-    BitmapTransporter*  pTransporter = new BitmapTransporter;
-    REF( XInterface )   aIf( static_cast< OWeakObject* >( pTransporter ) );
+    osl::MutexGuard			aGuard( m_pHolder->m_aProtector );
+    BitmapTransporter*	pTransporter = new BitmapTransporter;
+    REF( XInterface )	aIf( static_cast< OWeakObject* >( pTransporter ) );
 
     m_pHolder->m_xBitmap = REF( AWT::XBitmap )( aIf, UNO_QUERY );
 
@@ -268,8 +268,8 @@ SEQ( ScannerContext ) ScannerManager::getAvailableScanners() throw()
     if( Sane::IsSane() )
     {
         SEQ( ScannerContext ) aRet(1);
-        aRet.getArray()[0].ScannerName      = ::rtl::OUString::createFromAscii( "SANE" );
-        aRet.getArray()[0].InternalData     = 0;
+        aRet.getArray()[0].ScannerName		= ::rtl::OUString::createFromAscii( "SANE" );
+        aRet.getArray()[0].InternalData		= 0;
         return aRet;
     }
 
@@ -306,7 +306,7 @@ BOOL ScannerManager::configureScanner( ScannerContext& scanner_context ) throw(
     SaneDlg aDlg( NULL, pHolder->m_aSane );
     BOOL bRet = (BOOL)aDlg.Execute();
     pHolder->m_bBusy = false;
-
+        
     return bRet;
 }
 
diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx
index 457be67d0f9b..a23181a66624 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,26 +61,26 @@ using namespace ::com::sun::star;
 // - Defines -
 // -----------
 
-#define TWAIN_SELECT            0x00000001UL
-#define TWAIN_ACQUIRE           0x00000002UL
-#define TWAIN_TERMINATE         0xFFFFFFFFUL
-
-#define TWAIN_EVENT_NONE        0x00000000UL
-#define TWAIN_EVENT_QUIT        0x00000001UL
-#define TWAIN_EVENT_SCANNING    0x00000002UL
-#define TWAIN_EVENT_XFER        0x00000004UL
-
-#define PFUNC                   (*pDSM)
-#define PTWAINMSG               MSG*
-#define FIXTODOUBLE( nFix )     ((double)nFix.Whole+(double)nFix.Frac/65536.)
-#define FIXTOLONG( nFix )       ((long)floor(FIXTODOUBLE(nFix)+0.5))
-
-#if defined WIN
-#define TWAIN_LIBNAME           "TWAIN.DLL"
-#define TWAIN_FUNCNAME          "DSM_Entry"
-#elif defined WNT
-#define TWAIN_LIBNAME           "TWAIN_32.DLL"
-#define TWAIN_FUNCNAME          "DSM_Entry"
+#define TWAIN_SELECT			0x00000001UL
+#define TWAIN_ACQUIRE			0x00000002UL
+#define TWAIN_TERMINATE			0xFFFFFFFFUL
+
+#define TWAIN_EVENT_NONE		0x00000000UL
+#define TWAIN_EVENT_QUIT		0x00000001UL
+#define TWAIN_EVENT_SCANNING	0x00000002UL
+#define TWAIN_EVENT_XFER		0x00000004UL
+
+#define PFUNC					(*pDSM)
+#define PTWAINMSG				MSG*
+#define FIXTODOUBLE( nFix ) 	((double)nFix.Whole+(double)nFix.Frac/65536.)
+#define FIXTOLONG( nFix )		((long)floor(FIXTODOUBLE(nFix)+0.5))
+                                
+#if defined WIN					
+#define TWAIN_LIBNAME			"TWAIN.DLL"
+#define TWAIN_FUNCNAME			"DSM_Entry"
+#elif defined WNT				
+#define TWAIN_LIBNAME			"TWAIN_32.DLL"
+#define TWAIN_FUNCNAME			"DSM_Entry"
 #endif
 
 // --------------
@@ -103,31 +103,31 @@ class ImpTwain : public ::cppu::WeakImplHelper1< util::XCloseListener >
 {
     friend LRESULT CALLBACK TwainMsgProc( int nCode, WPARAM wParam, LPARAM lParam );
 
-    uno::Reference< uno::XInterface >           mxSelfRef;
-    uno::Reference< scanner::XScannerManager >  mxMgr;
-    ScannerManager&                             mrMgr;
-    TW_IDENTITY                                 aAppIdent;
-    TW_IDENTITY                                 aSrcIdent;
-    Link                                        aNotifyLink;
-    DSMENTRYPROC                                pDSM;
+    uno::Reference< uno::XInterface >			mxSelfRef;
+    uno::Reference< scanner::XScannerManager >	mxMgr;
+    ScannerManager&								mrMgr;
+    TW_IDENTITY									aAppIdent;
+    TW_IDENTITY									aSrcIdent;
+    Link										aNotifyLink;
+    DSMENTRYPROC								pDSM;
     osl::Module*                                pMod;
-    ULONG                                       nCurState;
-    HWND                                        hTwainWnd;
-    HHOOK                                       hTwainHook;
-    bool                                        mbCloseFrameOnExit;
-
-    bool                                        ImplHandleMsg( void* pMsg );
-    void                                        ImplCreate();
-    void                                        ImplOpenSourceManager();
-    void                                        ImplOpenSource();
-    bool                                        ImplEnableSource();
-    void                                        ImplXfer();
-    void                                        ImplFallback( ULONG nEvent );
-    void                                        ImplSendCloseEvent();
-    void                                        ImplDeregisterCloseListener();
-    void                                        ImplRegisterCloseListener();
-    uno::Reference< frame::XFrame >             ImplGetActiveFrame();
-    uno::Reference< util::XCloseBroadcaster >   ImplGetActiveFrameCloseBroadcaster();
+    ULONG										nCurState;
+    HWND						                hTwainWnd;
+    HHOOK						                hTwainHook;
+    bool										mbCloseFrameOnExit;
+
+    bool						                ImplHandleMsg( void* pMsg );
+    void										ImplCreate();
+    void										ImplOpenSourceManager();
+    void										ImplOpenSource();
+    bool										ImplEnableSource();
+    void										ImplXfer();
+    void										ImplFallback( ULONG nEvent );
+    void 										ImplSendCloseEvent();
+    void 										ImplDeregisterCloseListener();
+    void 										ImplRegisterCloseListener();
+    uno::Reference< frame::XFrame > 			ImplGetActiveFrame();
+    uno::Reference< util::XCloseBroadcaster > 	ImplGetActiveFrameCloseBroadcaster();
 
                                                 DECL_LINK( ImplFallbackHdl, void* );
                                                 DECL_LINK( ImplDestroyHdl, void* );
@@ -144,10 +144,10 @@ public:
                                                 ImpTwain( ScannerManager& rMgr, const Link& rNotifyLink );
                                                 ~ImpTwain();
 
-    void                                        Destroy();
+    void						                Destroy();
 
-    bool                                        SelectSource();
-    bool                                        InitXfer();
+    bool						                SelectSource();
+    bool						                InitXfer(); 
 };
 
 // ---------
@@ -177,7 +177,7 @@ LRESULT CALLBACK TwainMsgProc( int nCode, WPARAM wParam, LPARAM lParam )
     {
         pMsg->message = WM_USER;
         pMsg->lParam = 0;
-
+        
         return 0;
     }
 }
@@ -206,8 +206,8 @@ ImpTwain::ImpTwain( ScannerManager& rMgr, const Link& rNotifyLink ) :
     aAppIdent.Version.Country = TWCY_USA;
     aAppIdent.ProtocolMajor = TWON_PROTOCOLMAJOR;
     aAppIdent.ProtocolMinor = TWON_PROTOCOLMINOR;
-    aAppIdent.SupportedGroups = DG_IMAGE | DG_CONTROL;
-    strncpy( aAppIdent.Version.Info, "8.0", 32 );
+    aAppIdent.SupportedGroups =	DG_IMAGE | DG_CONTROL;
+    strncpy( aAppIdent.Version.Info, "8.0", 32 ); 
     aAppIdent.Version.Info[32] = aAppIdent.Version.Info[33] = 0;
     strncpy( aAppIdent.Manufacturer, "Sun Microsystems", 32 );
     aAppIdent.Manufacturer[32] = aAppIdent.Manufacturer[33] = 0;
@@ -218,7 +218,7 @@ ImpTwain::ImpTwain( ScannerManager& rMgr, const Link& rNotifyLink ) :
 
     WNDCLASS aWc = { 0, &TwainWndProc, 0, sizeof( WNDCLASS ), GetModuleHandle( NULL ), NULL, NULL, NULL, NULL, "TwainClass" };
     RegisterClass( &aWc );
-
+    
     hTwainWnd = CreateWindowEx( WS_EX_TOPMOST, aWc.lpszClassName, "TWAIN", 0, 0, 0, 0, 0, HWND_DESKTOP, NULL, aWc.hInstance, 0 );
     hTwainHook = SetWindowsHookEx( WH_GETMESSAGE, &TwainMsgProc, NULL, GetCurrentThreadId() );
 
@@ -322,8 +322,8 @@ void ImpTwain::ImplOpenSource()
         if( ( PFUNC( &aAppIdent, NULL, DG_CONTROL, DAT_IDENTITY, MSG_GETDEFAULT, &aSrcIdent ) == TWRC_SUCCESS ) &&
             ( PFUNC( &aAppIdent, NULL, DG_CONTROL, DAT_IDENTITY, MSG_OPENDS, &aSrcIdent ) == TWRC_SUCCESS ) )
         {
-            TW_CAPABILITY   aCap = { CAP_XFERCOUNT, TWON_ONEVALUE, GlobalAlloc( GHND, sizeof( TW_ONEVALUE ) ) };
-            TW_ONEVALUE*    pVal = (TW_ONEVALUE*) GlobalLock( aCap.hContainer );
+            TW_CAPABILITY	aCap = { CAP_XFERCOUNT, TWON_ONEVALUE, GlobalAlloc( GHND, sizeof( TW_ONEVALUE ) ) };
+            TW_ONEVALUE*	pVal = (TW_ONEVALUE*) GlobalLock( aCap.hContainer );
 
             pVal->ItemType = TWTY_INT16, pVal->Item = 1;
             GlobalUnlock( aCap.hContainer );
@@ -370,9 +370,9 @@ bool ImpTwain::ImplEnableSource()
 
 bool ImpTwain::ImplHandleMsg( void* pMsg )
 {
-    TW_UINT16   nRet;
-    PTWAINMSG   pMess = (PTWAINMSG) pMsg;
-    TW_EVENT    aEvt = { pMess, MSG_NULL };
+    TW_UINT16	nRet;
+    PTWAINMSG	pMess = (PTWAINMSG) pMsg;
+    TW_EVENT	aEvt = { pMess, MSG_NULL };
 
     nRet = PFUNC( &aAppIdent, &aSrcIdent, DG_CONTROL, DAT_EVENT, MSG_PROCESSEVENT, &aEvt );
 
@@ -396,7 +396,7 @@ bool ImpTwain::ImplHandleMsg( void* pMsg )
                 ImplFallback( nEvent );
             }
             break;
-
+            
             case MSG_CLOSEDSREQ:
                 ImplFallback( TWAIN_EVENT_QUIT );
             break;
@@ -417,9 +417,9 @@ void ImpTwain::ImplXfer()
 {
     if( nCurState == 6 )
     {
-        TW_IMAGEINFO    aInfo;
-        TW_UINT32       hDIB = 0;
-        long            nWidth, nHeight, nXRes, nYRes;
+        TW_IMAGEINFO	aInfo;
+        TW_UINT32		hDIB = 0;
+        long			nWidth, nHeight, nXRes, nYRes;
 
         if( PFUNC( &aAppIdent, &aSrcIdent, DG_IMAGE, DAT_IMAGEINFO, MSG_GET, &aInfo ) == TWRC_SUCCESS )
         {
@@ -444,8 +444,8 @@ void ImpTwain::ImplXfer()
                     if( ( nXRes != -1 ) && ( nYRes != - 1 ) && ( nWidth != - 1 ) && ( nHeight != - 1 ) )
                     {
                         // set resolution of bitmap
-                        BITMAPINFOHEADER*   pBIH = (BITMAPINFOHEADER*) GlobalLock( (HGLOBAL) hDIB );
-                        static const double fFactor = 100.0 / 2.54;
+                        BITMAPINFOHEADER*	pBIH = (BITMAPINFOHEADER*) GlobalLock( (HGLOBAL) hDIB );
+                        static const double	fFactor = 100.0 / 2.54;
 
                         pBIH->biXPelsPerMeter = FRound( fFactor * nXRes );
                         pBIH->biYPelsPerMeter = FRound( fFactor * nYRes );
@@ -479,8 +479,8 @@ void ImpTwain::ImplFallback( ULONG nEvent )
 
 IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData )
 {
-    const ULONG nEvent = (ULONG) pData;
-    bool        bFallback = true;
+    const ULONG	nEvent = (ULONG) pData;
+    bool		bFallback = true;
 
     switch( nCurState )
     {
@@ -502,7 +502,7 @@ IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData )
         case( 5 ):
         {
             TW_USERINTERFACE aUI = { true, true, hTwainWnd };
-
+        
             PFUNC( &aAppIdent, &aSrcIdent, DG_CONTROL, DAT_USERINTERFACE, MSG_DISABLEDS, &aUI );
             nCurState = 4;
 
@@ -580,7 +580,7 @@ uno::Reference< frame::XFrame > ImpTwain::ImplGetActiveFrame()
             // query desktop instance
             uno::Reference< frame::XDesktop > xDesktop( xMgr->createInstance(
                                                             OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ), uno::UNO_QUERY );
-
+        
             if( xDesktop.is() )
             {
                 // query property set from desktop, which contains the currently active frame
@@ -603,7 +603,7 @@ uno::Reference< frame::XFrame > ImpTwain::ImplGetActiveFrame()
                     }
 
                     uno::Reference< frame::XFrame > xActiveFrame;
-
+                
                     if( (aActiveFrame >>= xActiveFrame) &&
                         xActiveFrame.is() )
                     {
@@ -644,7 +644,7 @@ void ImpTwain::ImplRegisterCloseListener()
     try
     {
         uno::Reference< util::XCloseBroadcaster > xCloseBroadcaster( ImplGetActiveFrameCloseBroadcaster() );
-
+        
         if( xCloseBroadcaster.is() )
         {
             xCloseBroadcaster->addCloseListener(this);
@@ -670,9 +670,9 @@ void ImpTwain::ImplDeregisterCloseListener()
 {
     try
     {
-        uno::Reference< util::XCloseBroadcaster > xCloseBroadcaster(
+        uno::Reference< util::XCloseBroadcaster > xCloseBroadcaster( 
             ImplGetActiveFrameCloseBroadcaster() );
-
+        
         if( xCloseBroadcaster.is() )
         {
             xCloseBroadcaster->removeCloseListener(this);
@@ -725,7 +725,7 @@ void ImpTwain::ImplSendCloseEvent()
     try
     {
         uno::Reference< util::XCloseable > xCloseable( ImplGetActiveFrame(), uno::UNO_QUERY );
-
+        
         if( xCloseable.is() )
             xCloseable->close( true );
     }
@@ -743,23 +743,23 @@ void ImpTwain::ImplSendCloseEvent()
 
 class Twain
 {
-    uno::Reference< lang::XEventListener >      mxListener;
-    uno::Reference< scanner::XScannerManager >  mxMgr;
-    const ScannerManager*                       mpCurMgr;
-    ImpTwain*                                   mpImpTwain;
-    TwainState                                  meState;
-
+    uno::Reference< lang::XEventListener >	    mxListener;
+    uno::Reference< scanner::XScannerManager >	mxMgr;
+    const ScannerManager*			            mpCurMgr;
+    ImpTwain* 						            mpImpTwain;
+    TwainState						            meState;
+                                                
                                                 DECL_LINK( ImpNotifyHdl, ImpTwain* );
-
-public:
-
+                                                        
+public:													
+                                                        
                                     Twain();
                                     ~Twain();
-
-    bool                            SelectSource( ScannerManager& rMgr );
-    bool                            PerformTransfer( ScannerManager& rMgr, const uno::Reference< lang::XEventListener >& rxListener );
-
-    TwainState                      GetState() const { return meState; }
+                                                        
+    bool							SelectSource( ScannerManager& rMgr );
+    bool							PerformTransfer( ScannerManager& rMgr, const uno::Reference< lang::XEventListener >& rxListener );
+                                                        
+    TwainState						GetState() const { return meState; }
 };
 
 // ------------------------------------------------------------------------
@@ -790,7 +790,7 @@ bool Twain::SelectSource( ScannerManager& rMgr )
         // #107835# hold reference to ScannerManager, to prevent premature death
         mxMgr = uno::Reference< scanner::XScannerManager >( static_cast< OWeakObject* >( const_cast< ScannerManager* >( mpCurMgr = &rMgr ) ),
                                                             uno::UNO_QUERY ),
-
+        
         meState = TWAIN_STATE_NONE;
         mpImpTwain = new ImpTwain( rMgr, LINK( this, Twain, ImpNotifyHdl ) );
         bRet = mpImpTwain->SelectSource();
@@ -812,7 +812,7 @@ bool Twain::PerformTransfer( ScannerManager& rMgr, const uno::Reference< lang::X
         // #107835# hold reference to ScannerManager, to prevent premature death
         mxMgr = uno::Reference< scanner::XScannerManager >( static_cast< OWeakObject* >( const_cast< ScannerManager* >( mpCurMgr = &rMgr ) ),
                                                             uno::UNO_QUERY ),
-
+        
         mxListener = rxListener;
         meState = TWAIN_STATE_NONE;
         mpImpTwain = new ImpTwain( rMgr, LINK( this, Twain, ImpNotifyHdl ) );
@@ -858,7 +858,7 @@ IMPL_LINK( Twain, ImpNotifyHdl, ImpTwain*, nEvent )
             if( mpImpTwain )
             {
                 meState = ( mpCurMgr->GetData() ? TWAIN_STATE_DONE : TWAIN_STATE_CANCELED );
-
+                
                 mpImpTwain->Destroy();
                 mpImpTwain = NULL;
                 mpCurMgr = NULL;
@@ -905,8 +905,8 @@ void ScannerManager::ReleaseData()
 
 AWT::Size ScannerManager::getSize() throw()
 {
-    AWT::Size   aRet;
-    HGLOBAL     hDIB = (HGLOBAL)(long) mpData;
+    AWT::Size	aRet;
+    HGLOBAL		hDIB = (HGLOBAL)(long) mpData;
 
     if( hDIB )
     {
@@ -915,7 +915,7 @@ AWT::Size ScannerManager::getSize() throw()
         if( pBIH )
         {
             aRet.Width = pBIH->biWidth;
-            aRet.Height = pBIH->biHeight;
+            aRet.Height = pBIH->biHeight; 
         }
         else
             aRet.Width = aRet.Height = 0;
@@ -936,13 +936,13 @@ SEQ( sal_Int8 ) ScannerManager::getDIB() throw()
 
     if( mpData )
     {
-        HGLOBAL             hDIB = (HGLOBAL)(long) mpData;
-        const sal_uInt32    nDIBSize = GlobalSize( hDIB );
-        BITMAPINFOHEADER*   pBIH = (BITMAPINFOHEADER*) GlobalLock( hDIB );
+        HGLOBAL				hDIB = (HGLOBAL)(long) mpData;
+        const sal_uInt32	nDIBSize = GlobalSize( hDIB );
+        BITMAPINFOHEADER*	pBIH = (BITMAPINFOHEADER*) GlobalLock( hDIB );
 
         if( pBIH )
         {
-            sal_uInt32  nColEntries;
+            sal_uInt32	nColEntries;
 
             switch( pBIH->biBitCount )
             {
@@ -972,8 +972,8 @@ SEQ( sal_Int8 ) ScannerManager::getDIB() throw()
             }
 
             aRet = SEQ( sal_Int8 )( sizeof( BITMAPFILEHEADER ) + nDIBSize );
-
-            sal_Int8*       pBuf = aRet.getArray();
+            
+            sal_Int8*		pBuf = aRet.getArray();
             SvMemoryStream* pMemStm = new SvMemoryStream( (char*) pBuf, sizeof( BITMAPFILEHEADER ), STREAM_WRITE );
 
             *pMemStm << 'B' << 'M' << (sal_uInt32) 0 << (sal_uInt32) 0;
@@ -995,8 +995,8 @@ SEQ( sal_Int8 ) ScannerManager::getDIB() throw()
 SEQ( ScannerContext ) SAL_CALL ScannerManager::getAvailableScanners() throw()
 {
     osl::MutexGuard aGuard( maProtector );
-    SEQ( ScannerContext )   aRet( 1 );
-
+    SEQ( ScannerContext )	aRet( 1 );
+    
     aRet.getArray()[0].ScannerName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TWAIN" ) );
     aRet.getArray()[0].InternalData = 0;
 
@@ -1005,11 +1005,11 @@ SEQ( ScannerContext ) SAL_CALL ScannerManager::getAvailableScanners() throw()
 
 // -----------------------------------------------------------------------------
 
-BOOL SAL_CALL ScannerManager::configureScanner( ScannerContext& rContext )
+BOOL SAL_CALL ScannerManager::configureScanner( ScannerContext& rContext ) 
     throw( ScannerException )
 {
     osl::MutexGuard aGuard( maProtector );
-    uno::Reference< XScannerManager >   xThis( this );
+    uno::Reference< XScannerManager >	xThis( this );
 
     if( rContext.InternalData != 0 || rContext.ScannerName != ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TWAIN" ) ) )
         throw ScannerException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Scanner does not exist" ) ), xThis, ScanError_InvalidContext );
@@ -1021,11 +1021,11 @@ BOOL SAL_CALL ScannerManager::configureScanner( ScannerContext& rContext )
 
 // -----------------------------------------------------------------------------
 
-void SAL_CALL ScannerManager::startScan( const ScannerContext& rContext, const uno::Reference< lang::XEventListener >& rxListener )
+void SAL_CALL ScannerManager::startScan( const ScannerContext& rContext, const uno::Reference< lang::XEventListener >& rxListener ) 
     throw( ScannerException )
 {
     osl::MutexGuard aGuard( maProtector );
-    uno::Reference< XScannerManager >   xThis( this );
+    uno::Reference< XScannerManager >	xThis( this );
 
     if( rContext.InternalData != 0 || rContext.ScannerName != ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TWAIN" ) ) )
         throw ScannerException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Scanner does not exist" ) ), xThis, ScanError_InvalidContext );
@@ -1040,17 +1040,17 @@ ScanError SAL_CALL ScannerManager::getError( const ScannerContext& rContext )
     throw( ScannerException )
 {
     osl::MutexGuard aGuard( maProtector );
-    uno::Reference< XScannerManager >   xThis( this );
+    uno::Reference< XScannerManager >	xThis( this );
 
     if( rContext.InternalData != 0 || rContext.ScannerName != ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TWAIN" ) ) )
         throw ScannerException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Scanner does not exist" ) ), xThis, ScanError_InvalidContext );
-
+    
     return( ( aTwain.GetState() == TWAIN_STATE_CANCELED ) ? ScanError_ScanCanceled : ScanError_ScanErrorNone );
 }
 
 // -----------------------------------------------------------------------------
 
-uno::Reference< awt::XBitmap > SAL_CALL ScannerManager::getBitmap( const ScannerContext& /*rContext*/ )
+uno::Reference< awt::XBitmap > SAL_CALL ScannerManager::getBitmap( const ScannerContext& /*rContext*/ ) 
     throw( ScannerException )
 {
     osl::MutexGuard aGuard( maProtector );
diff --git a/extensions/source/scanner/scnserv.cxx b/extensions/source/scanner/scnserv.cxx
index 9e58a0ece115..f77acc084a4e 100644
--- a/extensions/source/scanner/scnserv.cxx
+++ b/extensions/source/scanner/scnserv.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,13 +59,13 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, voi
         try
         {
             ::rtl::OUString aImplName( '/' );
-
+            
             aImplName += ScannerManager::getImplementationName_Static();
             aImplName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES/" ) );
             aImplName += ScannerManager::getImplementationName_Static();
 
             REF( XRegistryKey ) xNewKey1( static_cast< XRegistryKey* >( pRegistryKey )->createKey( aImplName ) );
-
+            
             bRet = sal_True;
         }
         catch( InvalidRegistryException& )
@@ -84,14 +84,14 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, voi
 extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
 {
     REF( ::com::sun::star::lang::XSingleServiceFactory ) xFactory;
-    void*                                                pRet = 0;
-
+    void*												 pRet = 0;
+    
     if( ::rtl::OUString::createFromAscii( pImplName ) == ScannerManager::getImplementationName_Static() )
     {
         xFactory = REF( ::com::sun::star::lang::XSingleServiceFactory )( ::cppu::createSingleFactory(
                         static_cast< ::com::sun::star::lang::XMultiServiceFactory* >( pServiceManager ),
                         ScannerManager::getImplementationName_Static(),
-                        ScannerManager_CreateInstance,
+                        ScannerManager_CreateInstance, 
                         ScannerManager::getSupportedServiceNames_Static() ) );
     }
 
@@ -100,7 +100,7 @@ extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void*
         xFactory->acquire();
         pRet = xFactory.get();
     }
-
+    
     return pRet;
 }
 
diff --git a/extensions/source/scanner/twain.cxx b/extensions/source/scanner/twain.cxx
index 2b6647e4e7d6..d2a6684f3a86 100644
--- a/extensions/source/scanner/twain.cxx
+++ b/extensions/source/scanner/twain.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 defined( WNT ) || defined (WIN)
 #include <tools/svwin.h>
-#endif
+#endif  
 #ifdef OS2
 #include <svpm.h>
 #endif // OS2
@@ -49,19 +49,19 @@
 // - Defines -
 // -----------
 
-#define PFUNC                       (*pDSM)
-#define FIXTODOUBLE( nFix )         ((double)nFix.Whole+(double)nFix.Frac/65536.)
-#define FIXTOLONG( nFix )           ((long)floor(FIXTODOUBLE(nFix)+0.5))
+#define PFUNC						(*pDSM)
+#define FIXTODOUBLE( nFix ) 		((double)nFix.Whole+(double)nFix.Frac/65536.)
+#define FIXTOLONG( nFix )			((long)floor(FIXTODOUBLE(nFix)+0.5))
 
 #if defined WIN
-#define TWAIN_LIBNAME               "TWAIN.DLL"
-#define TWAIN_FUNCNAME              "DSM_Entry"
+#define TWAIN_LIBNAME				"TWAIN.DLL"
+#define TWAIN_FUNCNAME				"DSM_Entry"
 #elif defined WNT
-#define TWAIN_LIBNAME               "TWAIN_32.DLL"
-#define TWAIN_FUNCNAME              "DSM_Entry"
+#define TWAIN_LIBNAME				"TWAIN_32.DLL"
+#define TWAIN_FUNCNAME				"DSM_Entry"
 #elif defined OS2
-#define TWAIN_LIBNAME               "twain"
-#define TWAIN_FUNCNAME              "DSM_ENTRY"
+#define TWAIN_LIBNAME				"twain"
+#define TWAIN_FUNCNAME				"DSM_ENTRY"
 #endif
 
 // -----------
@@ -101,7 +101,7 @@ static ImpTwain* pImpTwainInstance = NULL;
     {
         MSG* pMsg = (MSG*) lParam;
 
-        if( ( nCode < 0 ) ||
+        if( ( nCode < 0 ) || 
             ( pImpTwainInstance->hTwainWnd != pMsg->hwnd ) ||
             !pImpTwainInstance->ImplHandleMsg( (void*) lParam ) )
         {
@@ -111,7 +111,7 @@ static ImpTwain* pImpTwainInstance = NULL;
         {
             pMsg->message = WM_USER;
             pMsg->lParam = 0;
-
+            
             return 0;
         }
     }
@@ -124,11 +124,11 @@ static ImpTwain* pImpTwainInstance = NULL;
 
 ImpTwain::ImpTwain( const Link& rNotifyLink ) :
             aNotifyLink ( rNotifyLink ),
-            pDSM        ( NULL ),
-            pMod        ( NULL ),
-            hTwainWnd   ( 0 ),
-            hTwainHook  ( 0 ),
-            nCurState   ( 1 )
+            pDSM		( NULL ),
+            pMod		( NULL ),
+            hTwainWnd	( 0 ),
+            hTwainHook	( 0 ),
+            nCurState	( 1 )
 {
     pImpTwainInstance = this;
 
@@ -139,7 +139,7 @@ ImpTwain::ImpTwain( const Link& rNotifyLink ) :
     aAppIdent.Version.Country = TWCY_USA;
     aAppIdent.ProtocolMajor = TWON_PROTOCOLMAJOR;
     aAppIdent.ProtocolMinor = TWON_PROTOCOLMINOR;
-    aAppIdent.SupportedGroups = DG_IMAGE | DG_CONTROL;
+    aAppIdent.SupportedGroups =	DG_IMAGE | DG_CONTROL;
     strcpy( aAppIdent.Version.Info, "6.0" );
     strcpy( aAppIdent.Manufacturer, "Sun Microsystems");
     strcpy( aAppIdent.ProductFamily,"Office");
@@ -153,8 +153,8 @@ ImpTwain::ImpTwain( const Link& rNotifyLink ) :
 
 #else
 
-    HWND        hParentWnd = HWND_DESKTOP;
-    WNDCLASS    aWc = { 0, &TwainWndProc, 0, sizeof( WNDCLASS ), GetModuleHandle( NULL ),
+    HWND		hParentWnd = HWND_DESKTOP;
+    WNDCLASS	aWc = { 0, &TwainWndProc, 0, sizeof( WNDCLASS ), GetModuleHandle( NULL ), 
                         NULL, NULL, NULL, NULL, "TwainClass" };
 
     RegisterClass( &aWc );
@@ -275,11 +275,11 @@ void ImpTwain::ImplOpenSource()
 #ifdef OS2
 
             // negotiate capabilities
-
+            
 #else
 
-            TW_CAPABILITY   aCap = { CAP_XFERCOUNT, TWON_ONEVALUE, GlobalAlloc( GHND, sizeof( TW_ONEVALUE ) ) };
-            TW_ONEVALUE*    pVal = (TW_ONEVALUE*) GlobalLock( aCap.hContainer );
+            TW_CAPABILITY	aCap = { CAP_XFERCOUNT, TWON_ONEVALUE, GlobalAlloc( GHND, sizeof( TW_ONEVALUE ) ) };
+            TW_ONEVALUE*	pVal = (TW_ONEVALUE*) GlobalLock( aCap.hContainer );
 
             pVal->ItemType = TWTY_INT16, pVal->Item = 1;
             GlobalUnlock( aCap.hContainer );
@@ -318,9 +318,9 @@ BOOL ImpTwain::ImplEnableSource()
 
 BOOL ImpTwain::ImplHandleMsg( void* pMsg )
 {
-    TW_UINT16   nRet;
-    PTWAINMSG   pMess = (PTWAINMSG) pMsg;
-    TW_EVENT    aEvt = { pMess, MSG_NULL };
+    TW_UINT16	nRet;
+    PTWAINMSG	pMess = (PTWAINMSG) pMsg;
+    TW_EVENT	aEvt = { pMess, MSG_NULL };
 
     nRet = PFUNC( &aAppIdent, &aSrcIdent, DG_CONTROL, DAT_EVENT, MSG_PROCESSEVENT, &aEvt );
 
@@ -344,7 +344,7 @@ BOOL ImpTwain::ImplHandleMsg( void* pMsg )
                 ImplFallback( nEvent );
             }
             break;
-
+            
             case MSG_CLOSEDSREQ:
                 ImplFallback( TWAIN_EVENT_QUIT );
             break;
@@ -365,12 +365,12 @@ void ImpTwain::ImplXfer()
 {
     if( nCurState == 6 )
     {
-        TW_IMAGEINFO    aInfo;
-        TW_UINT32       hDIB = 0;
-        long            nWidth = aInfo.ImageWidth;
-        long            nHeight = aInfo.ImageLength;
-        long            nXRes = FIXTOLONG( aInfo.XResolution );
-        long            nYRes = FIXTOLONG( aInfo.YResolution );
+        TW_IMAGEINFO	aInfo;
+        TW_UINT32		hDIB = 0;
+        long			nWidth = aInfo.ImageWidth;
+        long			nHeight = aInfo.ImageLength;
+        long			nXRes = FIXTOLONG( aInfo.XResolution );
+        long			nYRes = FIXTOLONG( aInfo.YResolution );
 
         if( PFUNC( &aAppIdent, &aSrcIdent, DG_IMAGE, DAT_IMAGEINFO, MSG_GET, &aInfo ) == TWRC_SUCCESS )
         {
@@ -396,7 +396,7 @@ void ImpTwain::ImplXfer()
 
 #else // OS2
                 const ULONG nSize = GlobalSize( (HGLOBAL) hDIB );
-                char*       pBuf = (char*) GlobalLock( (HGLOBAL) hDIB );
+                char*		pBuf = (char*) GlobalLock( (HGLOBAL) hDIB );
 
                 if( pBuf )
                 {
@@ -438,8 +438,8 @@ void ImpTwain::ImplFallback( ULONG nEvent )
 
 IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData )
 {
-    const ULONG nEvent = (ULONG) pData;
-    BOOL        bFallback = TRUE;
+    const ULONG	nEvent = (ULONG) pData;
+    BOOL		bFallback = TRUE;
 
     switch( nCurState )
     {
@@ -461,7 +461,7 @@ IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData )
         case( 5 ):
         {
             TW_USERINTERFACE aUI = { TRUE, TRUE, hTwainWnd };
-
+        
             PFUNC( &aAppIdent, &aSrcIdent, DG_CONTROL, DAT_USERINTERFACE, MSG_DISABLEDS, &aUI );
             nCurState = 4;
         }
diff --git a/extensions/source/scanner/twain.hxx b/extensions/source/scanner/twain.hxx
index 446748c920fb..ca7d80240c43 100644
--- a/extensions/source/scanner/twain.hxx
+++ b/extensions/source/scanner/twain.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,14 +38,14 @@
 // - Defines -
 // -----------
 
-#define TWAIN_SELECT            0x00000001UL
-#define TWAIN_ACQUIRE           0x00000002UL
-#define TWAIN_TERMINATE         0xFFFFFFFFUL
+#define TWAIN_SELECT			0x00000001UL
+#define TWAIN_ACQUIRE			0x00000002UL
+#define TWAIN_TERMINATE			0xFFFFFFFFUL
 
-#define TWAIN_EVENT_NONE        0x00000000UL
-#define TWAIN_EVENT_QUIT        0x00000001UL
-#define TWAIN_EVENT_SCANNING    0x00000002UL
-#define TWAIN_EVENT_XFER        0x00000004UL
+#define TWAIN_EVENT_NONE		0x00000000UL
+#define TWAIN_EVENT_QUIT		0x00000001UL
+#define TWAIN_EVENT_SCANNING	0x00000002UL
+#define TWAIN_EVENT_XFER		0x00000004UL
 
 // ------------
 // - ImpTwain -
@@ -53,35 +53,35 @@
 
 class ImpTwain
 {
-    TW_IDENTITY                 aAppIdent;
-    TW_IDENTITY                 aSrcIdent;
-    Link                        aNotifyLink;
-    Bitmap                      aBitmap;
-    DSMENTRYPROC                pDSM;
+    TW_IDENTITY					aAppIdent;
+    TW_IDENTITY					aSrcIdent;
+    Link						aNotifyLink;
+    Bitmap						aBitmap;
+    DSMENTRYPROC				pDSM;
     osl::Module                 pMod;
-    ULONG                       nCurState;
+    ULONG						nCurState;
 
-    void                        ImplCreate();
-    void                        ImplOpenSourceManager();
-    void                        ImplOpenSource();
-    BOOL                        ImplEnableSource();
-    void                        ImplXfer();
-    void                        ImplFallback( ULONG nEvent );
+    void						ImplCreate();
+    void						ImplOpenSourceManager();
+    void						ImplOpenSource();
+    BOOL						ImplEnableSource();
+    void						ImplXfer();
+    void						ImplFallback( ULONG nEvent );
 
                                 DECL_LINK( ImplFallbackHdl, void* );
                                 DECL_LINK( ImplDestroyHdl, void* );
 
 public:
 
-    BOOL                        ImplHandleMsg( void* pMsg );
+    BOOL						ImplHandleMsg( void* pMsg );
 
 #ifdef OS2
-    HAB                         hAB;
-    HWND                        hTwainWnd;
-    long                        hTwainHook;
+    HAB							hAB;
+    HWND						hTwainWnd;
+    long						hTwainHook;
 #else
-    HWND                        hTwainWnd;
-    HHOOK                       hTwainHook;
+    HWND						hTwainWnd;
+    HHOOK						hTwainHook;
 #endif
 
 public:
@@ -89,11 +89,11 @@ public:
                                 ImpTwain( const Link& rNotifyLink );
                                 ~ImpTwain();
 
-    void                        Destroy();
+    void						Destroy();
 
-    BOOL                        SelectSource();
-    BOOL                        InitXfer();
-    Bitmap                      GetXferBitmap();
+    BOOL						SelectSource();
+    BOOL						InitXfer();
+    Bitmap						GetXferBitmap();
 };
 
 #endif // _TWAIN_HXX
diff --git a/extensions/source/svg/svgaction.cxx b/extensions/source/svg/svgaction.cxx
index 14cd09c7fa20..fd460f0c47b7 100644
--- a/extensions/source/svg/svgaction.cxx
+++ b/extensions/source/svg/svgaction.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,41 +41,41 @@
 // - statics -
 // -----------
 
-static const char   aXMLElemSVG[] = "svg";
-static const char   aXMLElemG[] = "g";
-static const char   aXMLElemDefs[] = "defs";
-static const char   aXMLElemClipPath[] = "clipPath";
-static const char   aXMLElemLine[] = "line";
-static const char   aXMLElemRect[] = "rect";
-static const char   aXMLElemEllipse[] = "ellipse";
-static const char   aXMLElemPath[] = "path";
-static const char   aXMLElemPolygon[] = "polygon";
-static const char   aXMLElemPolyLine[] = "polyline";
-static const char   aXMLElemText[] = "text";
-static const char   aXMLElemTSpan[] = "tspan";
-static const char   aXMLElemImage[] = "image";
-
-static const char   aXMLAttrTransform[] = "transform";
-static const char   aXMLAttrStyle[] = "style";
-static const char   aXMLAttrId[] = "id";
-
-static const char   aXMLAttrD[] = "d";
-static const char   aXMLAttrX[] = "x";
-static const char   aXMLAttrY[] = "y";
-static const char   aXMLAttrX1[] = "x1";
-static const char   aXMLAttrY1[] = "y1";
-static const char   aXMLAttrX2[] = "x2";
-static const char   aXMLAttrY2[] = "y2";
-static const char   aXMLAttrCX[] = "cx";
-static const char   aXMLAttrCY[] = "cy";
-static const char   aXMLAttrRX[] = "rx";
-static const char   aXMLAttrRY[] = "ry";
-static const char   aXMLAttrWidth[] = "width";
-static const char   aXMLAttrHeight[] = "height";
-static const char   aXMLAttrPoints[] = "points";
-static const char   aXMLAttrXLinkHRef[] = "xlink:href";
-
-static const sal_Unicode pBase64[] =
+static const char	aXMLElemSVG[] = "svg";
+static const char	aXMLElemG[] = "g";
+static const char	aXMLElemDefs[] = "defs";
+static const char	aXMLElemClipPath[] = "clipPath";
+static const char	aXMLElemLine[] = "line";
+static const char	aXMLElemRect[] = "rect";
+static const char	aXMLElemEllipse[] = "ellipse";
+static const char	aXMLElemPath[] = "path";
+static const char	aXMLElemPolygon[] = "polygon";
+static const char	aXMLElemPolyLine[] = "polyline";
+static const char	aXMLElemText[] = "text";
+static const char	aXMLElemTSpan[] = "tspan";
+static const char	aXMLElemImage[] = "image";
+
+static const char	aXMLAttrTransform[] = "transform";
+static const char	aXMLAttrStyle[] = "style";
+static const char	aXMLAttrId[] = "id";
+
+static const char	aXMLAttrD[] = "d";
+static const char	aXMLAttrX[] = "x";
+static const char	aXMLAttrY[] = "y";
+static const char	aXMLAttrX1[] = "x1";
+static const char	aXMLAttrY1[] = "y1";
+static const char	aXMLAttrX2[] = "x2";
+static const char	aXMLAttrY2[] = "y2";
+static const char	aXMLAttrCX[] = "cx";
+static const char	aXMLAttrCY[] = "cy";
+static const char	aXMLAttrRX[] = "rx";
+static const char	aXMLAttrRY[] = "ry";
+static const char	aXMLAttrWidth[] = "width";
+static const char	aXMLAttrHeight[] = "height";
+static const char	aXMLAttrPoints[] = "points";
+static const char	aXMLAttrXLinkHRef[] = "xlink:href";
+
+static const sal_Unicode pBase64[] = 
 {
     //0   1   2   3   4   5   6   7
      'A','B','C','D','E','F','G','H', // 0
@@ -119,8 +119,8 @@ FastString::FastString( sal_Char* pBufferForBase64Encoding, sal_uInt32 nBufLen )
         mnBufLen = mnCurLen = ( ( nQuadCount + ( nRest ? 1 : 0 ) ) << 2 );
         mpBuffer = new sal_Unicode[ mnBufLen * sizeof( sal_Unicode ) ];
 
-        sal_Char*       pTmpSrc = pBufferForBase64Encoding;
-        sal_Unicode*    pTmpDst = mpBuffer;
+        sal_Char*		pTmpSrc = pBufferForBase64Encoding;
+        sal_Unicode*	pTmpDst = mpBuffer;
 
         for( sal_uInt32 i = 0; i < nQuadCount; i++ )
         {
@@ -176,8 +176,8 @@ FastString& FastString::operator+=( const NMSP_RTL::OUString& rStr )
     {
         if( ( mnCurLen + rStr.getLength() ) > mnBufLen )
         {
-            const sal_uInt32    nNewBufLen = ( mnBufLen + ( ( ( mnCurLen + rStr.getLength() ) - mnBufLen ) / mnBufInc + 1 ) * mnBufInc );
-            sal_Unicode*        pNewBuffer = new sal_Unicode[ nNewBufLen * sizeof( sal_Unicode ) ];
+            const sal_uInt32	nNewBufLen = ( mnBufLen + ( ( ( mnCurLen + rStr.getLength() ) - mnBufLen ) / mnBufInc + 1 ) * mnBufInc );
+            sal_Unicode*		pNewBuffer = new sal_Unicode[ nNewBufLen * sizeof( sal_Unicode ) ];
 
             memcpy( pNewBuffer, mpBuffer, mnBufLen * sizeof( sal_Unicode )  );
             delete[] mpBuffer;
@@ -263,21 +263,21 @@ SVGAttributeWriter::~SVGAttributeWriter()
 NMSP_RTL::OUString SVGAttributeWriter::GetFontStyle( const Font& rFont )
 {
     FastString aStyle;
-
+    
     // font family
     aStyle += B2UCONST( "font-family:" );
-    aStyle += NMSP_RTL::OUString( rFont.GetName().GetToken( 0, ';' ) );
+    aStyle += NMSP_RTL::OUString( rFont.GetName().GetToken( 0, ';' ) ); 
 
     // font size
     aStyle += B2UCONST( ";" );
     aStyle += B2UCONST( "font-size:" );
     aStyle += mrParent.GetValueString( mrParent.ImplMap( Size( 0, rFont.GetHeight() ) ).Height(), mrParent.HasDoublePoints() );
-
+    
     // font style
     if( rFont.GetItalic() != ITALIC_NONE )
     {
         aStyle += B2UCONST( ";" );
-        aStyle += B2UCONST( "font-style:" );
+        aStyle += B2UCONST( "font-style:" ); 
 
         if( rFont.GetItalic() == ITALIC_OBLIQUE )
             aStyle += B2UCONST( "oblique" );
@@ -290,23 +290,23 @@ NMSP_RTL::OUString SVGAttributeWriter::GetFontStyle( const Font& rFont )
 
     switch( rFont.GetWeight() )
     {
-        case WEIGHT_THIN:           nFontWeight = 100; break;
-        case WEIGHT_ULTRALIGHT:     nFontWeight = 200; break;
-        case WEIGHT_LIGHT:          nFontWeight = 300; break;
-        case WEIGHT_SEMILIGHT:      nFontWeight = 400; break;
-        case WEIGHT_NORMAL:         nFontWeight = 400; break;
-        case WEIGHT_MEDIUM:         nFontWeight = 500; break;
-        case WEIGHT_SEMIBOLD:       nFontWeight = 600; break;
-        case WEIGHT_BOLD:           nFontWeight = 700; break;
-        case WEIGHT_ULTRABOLD:      nFontWeight = 800; break;
-        case WEIGHT_BLACK:          nFontWeight = 900; break;
-        default:                    nFontWeight = 400; break;
+        case WEIGHT_THIN:			nFontWeight = 100; break;
+        case WEIGHT_ULTRALIGHT:		nFontWeight = 200; break;
+        case WEIGHT_LIGHT:			nFontWeight = 300; break;
+        case WEIGHT_SEMILIGHT:		nFontWeight = 400; break;
+        case WEIGHT_NORMAL:			nFontWeight = 400; break;
+        case WEIGHT_MEDIUM:			nFontWeight = 500; break;
+        case WEIGHT_SEMIBOLD:		nFontWeight = 600; break;
+        case WEIGHT_BOLD:			nFontWeight = 700; break;
+        case WEIGHT_ULTRABOLD:		nFontWeight = 800; break;
+        case WEIGHT_BLACK:			nFontWeight = 900; break;
+        default:					nFontWeight = 400; break;
     }
 
     aStyle += B2UCONST( ";" );
     aStyle += B2UCONST( "font-weight:" );
     aStyle += NMSP_RTL::OUString::valueOf( nFontWeight );
-
+            
     // !!!
     // font-variant
     // font-stretch
@@ -339,7 +339,7 @@ NMSP_RTL::OUString SVGAttributeWriter::GetPaintStyle( const Color& rLineColor, c
 
     // line color
     aStyle += B2UCONST( "stroke:" );
-
+    
     if( rLineColor.GetTransparency() == 255 )
         aStyle += B2UCONST( "none" );
     else
@@ -366,7 +366,7 @@ NMSP_RTL::OUString SVGAttributeWriter::GetPaintStyle( const Color& rLineColor, c
     // fill color
     aStyle += B2UCONST( ";" );
     aStyle += B2UCONST( "fill:" );
-
+    
     if( rFillColor.GetTransparency() == 255 )
         aStyle += B2UCONST( "none" );
     else
@@ -490,11 +490,11 @@ NMSP_RTL::OUString SVGActionWriter::GetValueString( sal_Int32 nVal, sal_Bool bDo
         return NMSP_RTL::OUString::valueOf( nVal );
     else
     {
-        const double    fPoints = nVal * 72.0 / 2540.0;
-        const sal_Int32 nInt = (sal_Int32) fPoints;
-
-        return( ( NMSP_RTL::OUString::valueOf( nInt ) +=
-                NMSP_RTL::OUString::valueOf( (sal_Unicode) '.' ) ) +=
+        const double	fPoints = nVal * 72.0 / 2540.0;
+        const sal_Int32	nInt = (sal_Int32) fPoints;
+        
+        return( ( NMSP_RTL::OUString::valueOf( nInt ) += 
+                NMSP_RTL::OUString::valueOf( (sal_Unicode) '.' ) ) += 
                 NMSP_RTL::OUString::valueOf( labs( (sal_Int32) ( ( fPoints - nInt ) * 100.0 ) ) ) );
     }
 }
@@ -586,16 +586,16 @@ void SVGActionWriter::ImplWritePolygon( const Polygon& rPoly, sal_Bool bLineOnly
             ImplWritePolyPolygon( rPoly, bLineOnly, pStyle );
         else
         {
-            FastString                  aStyle;
-            FastString                  aPoints;
-            USHORT                      i = 0, nSize = rPoly.GetSize();
-            const NMSP_RTL::OUString    aBlank( B2UCONST( " " ) );
+            FastString					aStyle;
+            FastString					aPoints;
+            USHORT						i = 0, nSize = rPoly.GetSize();
+            const NMSP_RTL::OUString	aBlank( B2UCONST( " " ) );
 
             // points
             while( i < nSize )
             {
                 const Point aPolyPoint( ImplMap( rPoly[ i ] ) );
-
+                
                 aPoints += GetValueString( aPolyPoint.X(), mbDoublePoints );
                 aPoints += B2UCONST( "," );
                 aPoints += GetValueString( aPolyPoint.Y(), mbDoublePoints );
@@ -620,7 +620,7 @@ void SVGActionWriter::ImplWritePolygon( const Polygon& rPoly, sal_Bool bLineOnly
 
             // add point attribute
             mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrPoints, aPoints.GetString() );
-
+                
             // add style attribute
             if( aStyle.GetLength() )
                 mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, aStyle.GetString() );
@@ -644,16 +644,16 @@ void SVGActionWriter::ImplWritePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bo
             ImplWritePolygon( rPolyPoly[ 0 ], bLineOnly, pStyle );
         else
         {
-            FastString                  aStyle;
-            FastString                  aPathData;
-            const NMSP_RTL::OUString    aBlank( B2UCONST( " " ) );
-            const NMSP_RTL::OUString    aComma( B2UCONST( "," ) );
-            Point                       aPolyPoint;
+            FastString					aStyle;
+            FastString					aPathData;
+            const NMSP_RTL::OUString	aBlank( B2UCONST( " " ) );
+            const NMSP_RTL::OUString	aComma( B2UCONST( "," ) );
+            Point						aPolyPoint;
 
             for( long i = 0, nCount = rPolyPoly.Count(); i < nCount; i++ )
             {
-                const Polygon&  rPoly = rPolyPoly[ (USHORT) i ];
-                USHORT          n = 1, nSize = rPoly.GetSize();
+                const Polygon&	rPoly = rPolyPoly[ (USHORT) i ];
+                USHORT			n = 1, nSize = rPoly.GetSize();
 
                 if( nSize > 1 )
                 {
@@ -714,7 +714,7 @@ void SVGActionWriter::ImplWritePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bo
                 mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, aStyle.GetString() );
 
             // add path data attribute
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrD, aPathData.GetString() );
+            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrD, aPathData.GetString() );				
             {
                 // write polyline/polygon element
                 SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemPath, TRUE, TRUE );
@@ -730,9 +730,9 @@ void SVGActionWriter::ImplWriteGradientEx( const PolyPolygon& rPolyPoly, const G
 {
     if( rPolyPoly.Count() )
     {
-        SvXMLElementExport  aElemG( mrExport, XML_NAMESPACE_NONE, aXMLElemG, TRUE, TRUE );
-        FastString          aClipId;
-        FastString          aClipStyle;
+        SvXMLElementExport	aElemG( mrExport, XML_NAMESPACE_NONE, aXMLElemG, TRUE, TRUE );
+        FastString			aClipId;
+        FastString			aClipStyle;
 
         aClipId += B2UCONST( "clip" );
         aClipId += NMSP_RTL::OUString::valueOf( ImplGetNextClipId() );
@@ -756,8 +756,8 @@ void SVGActionWriter::ImplWriteGradientEx( const PolyPolygon& rPolyPoly, const G
         mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, aClipStyle.GetString() );
 
         {
-            GDIMetaFile         aTmpMtf;
-            SvXMLElementExport  aElemG2( mrExport, XML_NAMESPACE_NONE, aXMLElemG, TRUE, TRUE );
+            GDIMetaFile			aTmpMtf;
+            SvXMLElementExport	aElemG2( mrExport, XML_NAMESPACE_NONE, aXMLElemG, TRUE, TRUE );
 
             mpVDev->AddGradientActions( rPolyPoly.GetBoundRect(), rGradient, aTmpMtf );
             ImplWriteActions( aTmpMtf, pStyle );
@@ -767,18 +767,18 @@ void SVGActionWriter::ImplWriteGradientEx( const PolyPolygon& rPolyPoly, const G
 
 // -----------------------------------------------------------------------------
 
-void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
+void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText, 
                                      const sal_Int32* pDXArray, long nWidth,
                                      const NMSP_RTL::OUString* pStyle )
 {
-    String  aText( rText ); aText.EraseLeadingChars( ' ' );
-    UINT32  nLen = aText.Len(), i;
+    String	aText( rText ); aText.EraseLeadingChars( ' ' );
+    UINT32	nLen = aText.Len(), i;
 
     if( nLen )
     {
-        Size    aNormSize;
-        sal_Int32*  pOwnArray;
-        sal_Int32*  pDX;
+        Size	aNormSize;
+        sal_Int32*	pOwnArray;
+        sal_Int32*	pDX;
 
         // get text sizes
         if( pDXArray )
@@ -788,7 +788,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
             pDX = const_cast< sal_Int32* >( pDXArray );
         }
         else
-        {
+        {	
             pOwnArray = new sal_Int32[ nLen ];
             aNormSize = Size( mpVDev->GetTextArray( aText, pOwnArray ), 0 );
             pDX = pOwnArray;
@@ -807,11 +807,11 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
             }
         }
 
-        FastString          aStyle;
-        const Font&         rFont = mpVDev->GetFont();
-        const FontMetric    aMetric( mpVDev->GetFontMetric() );
-        Point               aBaseLinePos( rPos );
-        SvXMLElementExport* pTransform = NULL;
+        FastString			aStyle;
+        const Font&			rFont = mpVDev->GetFont();
+        const FontMetric	aMetric( mpVDev->GetFontMetric() );
+        Point				aBaseLinePos( rPos );
+        SvXMLElementExport*	pTransform = NULL;
 
         // leading whitespaces erased? => adjust position
         if( nLen < rText.Len() )
@@ -873,10 +873,10 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
 #ifdef _SVG_USE_TSPANS
         if( pDXArray )
         {
-            SvXMLElementExport          aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemText, TRUE, TRUE );
-            FastString                  aTSpanX;
-            const NMSP_RTL::OUString    aSpace( ' ' );
-            long                        i, nX, nCount;
+            SvXMLElementExport			aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemText, TRUE, TRUE );
+            FastString					aTSpanX;
+            const NMSP_RTL::OUString	aSpace( ' ' );
+            long						i, nX, nCount;
 
             aTSpanX += GetValueString( aPt.X(), mbDoublePoints );
             aTSpanX += aSpace;
@@ -927,30 +927,30 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
         // write strikeout if neccessary
         if( ( rFont.GetStrikeout() != STRIKEOUT_NONE ) || ( rFont.GetUnderline() != UNDERLINE_NONE ) )
         {
-            Polygon     aPoly( 4 );
-            const long  nLineHeight = Max( (long) FRound( aMetric.GetLineHeight() * 0.05 ), (long) 1 );
+            Polygon		aPoly( 4 );
+            const long	nLineHeight = Max( (long) FRound( aMetric.GetLineHeight() * 0.05 ), (long) 1 );
 
             if( rFont.GetStrikeout() )
             {
-                const long  nYLinePos = aBaseLinePos.Y() - FRound( aMetric.GetAscent() * 0.26 );
+                const long	nYLinePos = aBaseLinePos.Y() - FRound( aMetric.GetAscent() * 0.26 );
 
                 aPoly[ 0 ].X() = aBaseLinePos.X(); aPoly[ 0 ].Y() = nYLinePos - ( nLineHeight >> 1 );
                 aPoly[ 1 ].X() = aBaseLinePos.X() + aNormSize.Width() - 1; aPoly[ 1 ].Y() = aPoly[ 0 ].Y();
                 aPoly[ 2 ].X() = aPoly[ 1 ].X(); aPoly[ 2 ].Y() = aPoly[ 0 ].Y() + nLineHeight - 1;
                 aPoly[ 3 ].X() = aPoly[ 0 ].X(); aPoly[ 3 ].Y() = aPoly[ 2 ].Y();
-
+                        
                 ImplWritePolygon( aPoly, FALSE );
             }
 
             if( rFont.GetUnderline() )
             {
-                const long  nYLinePos = aBaseLinePos.Y() + ( nLineHeight << 1 );
+                const long	nYLinePos = aBaseLinePos.Y() + ( nLineHeight << 1 );
 
                 aPoly[ 0 ].X() = aBaseLinePos.X(); aPoly[ 0 ].Y() = nYLinePos - ( nLineHeight >> 1 );
                 aPoly[ 1 ].X() = aBaseLinePos.X() + aNormSize.Width() - 1; aPoly[ 1 ].Y() = aPoly[ 0 ].Y();
                 aPoly[ 2 ].X() = aPoly[ 1 ].X(); aPoly[ 2 ].Y() = aPoly[ 0 ].Y() + nLineHeight - 1;
                 aPoly[ 3 ].X() = aPoly[ 0 ].X(); aPoly[ 3 ].Y() = aPoly[ 2 ].Y();
-
+                        
                 ImplWritePolygon( aPoly, FALSE );
             }
         }
@@ -964,16 +964,16 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
 
 // -----------------------------------------------------------------------------
 
-void SVGActionWriter::ImplWriteBmp( const BitmapEx& rBmpEx,
+void SVGActionWriter::ImplWriteBmp( const BitmapEx& rBmpEx, 
                                     const Point& rPt, const Size& rSz,
                                     const Point& rSrcPt, const Size& rSrcSz,
                                     const NMSP_RTL::OUString* /*pStyle*/ )
 {
     if( !!rBmpEx )
     {
-        BitmapEx        aBmpEx( rBmpEx );
-         Point aPoint = Point();
-        const Rectangle aBmpRect( aPoint, rBmpEx.GetSizePixel() );
+        BitmapEx		aBmpEx( rBmpEx );
+         Point aPoint = Point(); 	
+        const Rectangle	aBmpRect( aPoint, rBmpEx.GetSizePixel() );
         const Rectangle aSrcRect( rSrcPt, rSrcSz );
 
         if( aSrcRect != aBmpRect )
@@ -985,24 +985,24 @@ void SVGActionWriter::ImplWriteBmp( const BitmapEx& rBmpEx,
 
             if( GraphicConverter::Export( aOStm, rBmpEx, CVT_PNG ) == ERRCODE_NONE )
             {
-                const Point                                 aPt( ImplMap( rPt ) );
-                const Size                                  aSz( ImplMap( rSz ) );
-                FastString                                  aImageData( (sal_Char*) aOStm.GetData(), aOStm.Tell() );
-                REF( NMSP_SAX::XExtendedDocumentHandler )   xExtDocHandler( mrExport.GetDocHandler(), NMSP_UNO::UNO_QUERY );
+                const Point									aPt( ImplMap( rPt ) );
+                const Size									aSz( ImplMap( rSz ) );
+                FastString									aImageData( (sal_Char*) aOStm.GetData(), aOStm.Tell() );
+                REF( NMSP_SAX::XExtendedDocumentHandler )	xExtDocHandler( mrExport.GetDocHandler(), NMSP_UNO::UNO_QUERY );
 
                 if( xExtDocHandler.is() )
                 {
-                    static const sal_uInt32     nPartLen = 64;
-                    const NMSP_RTL::OUString    aSpace( ' ' );
-                    const NMSP_RTL::OUString    aLineFeed( NMSP_RTL::OUString::valueOf( (sal_Unicode) 0x0a ) );
-                    NMSP_RTL::OUString          aString;
-                    NMSP_RTL::OUString          aImageString;
+                    static const sal_uInt32		nPartLen = 64;
+                    const NMSP_RTL::OUString	aSpace( ' ' );
+                    const NMSP_RTL::OUString	aLineFeed( NMSP_RTL::OUString::valueOf( (sal_Unicode) 0x0a ) );
+                    NMSP_RTL::OUString			aString;
+                    NMSP_RTL::OUString			aImageString;
 
                     aString = aLineFeed;
                     aString +=  B2UCONST( "<" );
                     aString += NMSP_RTL::OUString::createFromAscii( aXMLElemImage );
                     aString += aSpace;
-
+                    
                     aString += NMSP_RTL::OUString::createFromAscii( aXMLAttrX );
                     aString += B2UCONST( "=\"" );
                     aString += GetValueString( aPt.X(), mbDoublePoints );
@@ -1052,12 +1052,12 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL:
 
     for( ULONG i = 0, nCount = rMtf.GetActionCount(); i < nCount; i++ )
     {
-        const MetaAction*   pAction = rMtf.GetAction( i );
-        const USHORT        nType = pAction->GetType();
+        const MetaAction*	pAction = rMtf.GetAction( i );
+        const USHORT		nType = pAction->GetType();
 
         switch( nType )
         {
-            case( META_PIXEL_ACTION ):
+            case( META_PIXEL_ACTION	):
             {
                 const MetaPixelAction* pA = (const MetaPixelAction*) pAction;
 
@@ -1066,7 +1066,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL:
             }
             break;
 
-            case( META_POINT_ACTION ):
+            case( META_POINT_ACTION	):
             {
                 const MetaPointAction* pA = (const MetaPointAction*) pAction;
 
@@ -1078,7 +1078,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL:
             case( META_LINE_ACTION ):
             {
                 const MetaLineAction* pA = (const MetaLineAction*) pAction;
-
+                
                 mpContext->SetPaintAttr( mpVDev->GetLineColor(), mpVDev->GetLineColor() );
                 ImplWriteLine( pA->GetStartPoint(), pA->GetEndPoint(), NULL, pStyle );
             }
@@ -1091,7 +1091,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL:
             }
             break;
 
-            case( META_ROUNDRECT_ACTION ):
+            case( META_ROUNDRECT_ACTION	):
             {
                 const MetaRoundRectAction* pA = (const MetaRoundRectAction*) pAction;
 
@@ -1102,8 +1102,8 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL:
 
             case( META_ELLIPSE_ACTION ):
             {
-                const MetaEllipseAction*    pA = (const MetaEllipseAction*) pAction;
-                const Rectangle&            rRect = pA->GetRect();
+                const MetaEllipseAction*	pA = (const MetaEllipseAction*) pAction;
+                const Rectangle&			rRect = pA->GetRect();
 
                 mpContext->SetPaintAttr( mpVDev->GetLineColor(), mpVDev->GetFillColor() );
                 ImplWriteEllipse( rRect.Center(), rRect.GetWidth() >> 1, rRect.GetHeight() >> 1, pStyle );
@@ -1112,7 +1112,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL:
 
             case( META_ARC_ACTION ):
             case( META_PIE_ACTION ):
-            case( META_CHORD_ACTION ):
+            case( META_CHORD_ACTION	):
             case( META_POLYGON_ACTION ):
             {
                 Polygon aPoly;
@@ -1133,13 +1133,13 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL:
                     }
                     break;
 
-                    case( META_CHORD_ACTION ):
+                    case( META_CHORD_ACTION	):
                     {
                         const MetaChordAction* pA = (const MetaChordAction*) pAction;
                         aPoly = Polygon( pA->GetRect(), pA->GetStartPoint(), pA->GetEndPoint(), POLY_CHORD );
                     }
                     break;
-
+                    
                     case( META_POLYGON_ACTION ):
                         aPoly = ( (const MetaPolygonAction*) pAction )->GetPolygon();
                     break;
@@ -1155,8 +1155,8 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL:
 
             case( META_POLYLINE_ACTION ):
             {
-                const MetaPolyLineAction*   pA = (const MetaPolyLineAction*) pAction;
-                const Polygon&              rPoly = pA->GetPolygon();
+                const MetaPolyLineAction*	pA = (const MetaPolyLineAction*) pAction;
+                const Polygon&				rPoly = pA->GetPolygon();
 
                 if( rPoly.GetSize() )
                 {
@@ -1168,8 +1168,8 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL:
 
             case( META_POLYPOLYGON_ACTION ):
             {
-                const MetaPolyPolygonAction*    pA = (const MetaPolyPolygonAction*) pAction;
-                const PolyPolygon&              rPolyPoly = pA->GetPolyPolygon();
+                const MetaPolyPolygonAction*	pA = (const MetaPolyPolygonAction*) pAction;
+                const PolyPolygon&				rPolyPoly = pA->GetPolyPolygon();
 
                 if( rPolyPoly.Count() )
                 {
@@ -1181,8 +1181,8 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL:
 
             case( META_GRADIENT_ACTION ):
             {
-                const MetaGradientAction*   pA = (const MetaGradientAction*) pAction;
-                GDIMetaFile                 aTmpMtf;
+                const MetaGradientAction*	pA = (const MetaGradientAction*) pAction;
+                GDIMetaFile					aTmpMtf;
 
                 mpVDev->AddGradientActions( pA->GetRect(), pA->GetGradient(), aTmpMtf );
                 ImplWriteActions( aTmpMtf, pStyle );
@@ -1191,15 +1191,15 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL:
 
             case( META_GRADIENTEX_ACTION ):
             {
-                const MetaGradientExAction* pA = (const MetaGradientExAction*) pAction;
+                const MetaGradientExAction*	pA = (const MetaGradientExAction*) pAction;
                 ImplWriteGradientEx( pA->GetPolyPolygon(), pA->GetGradient(), pStyle );
             }
             break;
 
             case META_HATCH_ACTION:
             {
-                const MetaHatchAction*  pA = (const MetaHatchAction*) pAction;
-                GDIMetaFile             aTmpMtf;
+                const MetaHatchAction*	pA = (const MetaHatchAction*) pAction;
+                GDIMetaFile				aTmpMtf;
 
                 mpVDev->AddHatchActions( pA->GetPolyPolygon(), pA->GetHatch(), aTmpMtf );
                 ImplWriteActions( aTmpMtf, pStyle );
@@ -1208,8 +1208,8 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL:
 
             case( META_TRANSPARENT_ACTION ):
             {
-                const MetaTransparentAction*    pA = (const MetaTransparentAction*) pAction;
-                const PolyPolygon&              rPolyPoly = pA->GetPolyPolygon();
+                const MetaTransparentAction*	pA = (const MetaTransparentAction*) pAction;
+                const PolyPolygon&				rPolyPoly = pA->GetPolyPolygon();
 
                 if( rPolyPoly.Count() )
                 {
@@ -1221,15 +1221,15 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL:
 
             case( META_FLOATTRANSPARENT_ACTION ):
             {
-                const MetaFloatTransparentAction*   pA = (const MetaFloatTransparentAction*) pAction;
-                GDIMetaFile                         aTmpMtf( pA->GetGDIMetaFile() );
-                Point                               aSrcPt( aTmpMtf.GetPrefMapMode().GetOrigin() );
-                const Size                          aSrcSize( aTmpMtf.GetPrefSize() );
-                const Point                         aDestPt( pA->GetPoint() );
-                const Size                          aDestSize( pA->GetSize() );
-                const double                        fScaleX = aSrcSize.Width() ? (double) aDestSize.Width() / aSrcSize.Width() : 1.0;
-                const double                        fScaleY = aSrcSize.Height() ? (double) aDestSize.Height() / aSrcSize.Height() : 1.0;
-                long                                nMoveX, nMoveY;
+                const MetaFloatTransparentAction*	pA = (const MetaFloatTransparentAction*) pAction;
+                GDIMetaFile							aTmpMtf( pA->GetGDIMetaFile() );
+                Point								aSrcPt( aTmpMtf.GetPrefMapMode().GetOrigin() );
+                const Size							aSrcSize( aTmpMtf.GetPrefSize() );
+                const Point							aDestPt( pA->GetPoint() );
+                const Size							aDestSize( pA->GetSize() );
+                const double						fScaleX = aSrcSize.Width() ? (double) aDestSize.Width() / aSrcSize.Width() : 1.0;
+                const double						fScaleY = aSrcSize.Height() ? (double) aDestSize.Height() / aSrcSize.Height() : 1.0;
+                long								nMoveX, nMoveY;
 
                 if( fScaleX != 1.0 || fScaleY != 1.0 )
                 {
@@ -1250,21 +1250,21 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL:
 
             case( META_EPS_ACTION ):
             {
-                const MetaEPSAction*    pA = (const MetaEPSAction*) pAction;
-                const GDIMetaFile       aGDIMetaFile( pA->GetSubstitute() );
-                sal_Bool                bFound = sal_False;
+                const MetaEPSAction*	pA = (const MetaEPSAction*) pAction;
+                const GDIMetaFile		aGDIMetaFile( pA->GetSubstitute() );
+                sal_Bool				bFound = sal_False;
 
                 for( ULONG j = 0, nCount2 = aGDIMetaFile.GetActionCount(); ( j < nCount2 ) && !bFound; j++ )
                 {
                     const MetaAction* pSubstAct = aGDIMetaFile.GetAction( j );
-
+                    
                     if( pSubstAct->GetType() == META_BMPSCALE_ACTION )
                     {
                         bFound = sal_True;
                         const MetaBmpScaleAction* pBmpScaleAction = (const MetaBmpScaleAction*) pSubstAct;
                         mpContext->SetPaintAttr( mpVDev->GetLineColor(), mpVDev->GetFillColor() );
-                        ImplWriteBmp( pBmpScaleAction->GetBitmap(),
-                                      pA->GetPoint(), pA->GetSize(),
+                        ImplWriteBmp( pBmpScaleAction->GetBitmap(), 
+                                      pA->GetPoint(), pA->GetSize(), 
                                       Point(), pBmpScaleAction->GetBitmap().GetSizePixel(), pStyle );
                     }
                 }
@@ -1273,13 +1273,13 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL:
 
             case( META_COMMENT_ACTION ):
             {
-                const MetaCommentAction*    pA = (const MetaCommentAction*) pAction;
-                String                      aSkipComment;
+                const MetaCommentAction*	pA = (const MetaCommentAction*) pAction;
+                String						aSkipComment;
 
                 if( pA->GetComment().CompareIgnoreCaseToAscii( "XGRAD_SEQ_BEGIN" ) == COMPARE_EQUAL )
                 {
-                    const MetaGradientExAction* pGradAction = NULL;
-                    sal_Bool                    bDone = sal_False;
+                    const MetaGradientExAction*	pGradAction = NULL;
+                    sal_Bool					bDone = sal_False;
 
                     while( !bDone && ( ++i < nCount ) )
                     {
@@ -1287,7 +1287,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL:
 
                         if( pAction->GetType() == META_GRADIENTEX_ACTION )
                             pGradAction = (const MetaGradientExAction*) pAction;
-                        else if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
+                        else if( ( pAction->GetType() == META_COMMENT_ACTION ) && 
                                  ( ( (const MetaCommentAction*) pAction )->GetComment().CompareIgnoreCaseToAscii( "XGRAD_SEQ_END" ) == COMPARE_EQUAL ) )
                         {
                             bDone = sal_True;
@@ -1303,10 +1303,10 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL:
             case( META_BMP_ACTION ):
             {
                 const MetaBmpAction* pA = (const MetaBmpAction*) pAction;
-
+                
                 mpContext->SetPaintAttr( mpVDev->GetLineColor(), mpVDev->GetFillColor() );
-                ImplWriteBmp( pA->GetBitmap(),
-                              pA->GetPoint(), mpVDev->PixelToLogic( pA->GetBitmap().GetSizePixel() ),
+                ImplWriteBmp( pA->GetBitmap(), 
+                              pA->GetPoint(), mpVDev->PixelToLogic( pA->GetBitmap().GetSizePixel() ), 
                               Point(), pA->GetBitmap().GetSizePixel(), pStyle );
             }
             break;
@@ -1314,10 +1314,10 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL:
             case( META_BMPSCALE_ACTION ):
             {
                 const MetaBmpScaleAction* pA = (const MetaBmpScaleAction*) pAction;
-
+            
                 mpContext->SetPaintAttr( mpVDev->GetLineColor(), mpVDev->GetFillColor() );
-                ImplWriteBmp( pA->GetBitmap(),
-                              pA->GetPoint(), pA->GetSize(),
+                ImplWriteBmp( pA->GetBitmap(), 
+                              pA->GetPoint(), pA->GetSize(), 
                               Point(), pA->GetBitmap().GetSizePixel(), pStyle );
             }
             break;
@@ -1325,21 +1325,21 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL:
             case( META_BMPSCALEPART_ACTION ):
             {
                 const MetaBmpScalePartAction* pA = (const MetaBmpScalePartAction*) pAction;
-
+                
                 mpContext->SetPaintAttr( mpVDev->GetLineColor(), mpVDev->GetFillColor() );
-                ImplWriteBmp( pA->GetBitmap(),
-                              pA->GetDestPoint(), pA->GetDestSize(),
+                ImplWriteBmp( pA->GetBitmap(), 
+                              pA->GetDestPoint(), pA->GetDestSize(), 
                               pA->GetSrcPoint(), pA->GetSrcSize(), pStyle );
             }
             break;
 
-            case( META_BMPEX_ACTION ):
+            case( META_BMPEX_ACTION	):
             {
-                const MetaBmpExAction*  pA = (const MetaBmpExAction*) pAction;
-
+                const MetaBmpExAction*	pA = (const MetaBmpExAction*) pAction;
+                
                 mpContext->SetPaintAttr( mpVDev->GetLineColor(), mpVDev->GetFillColor() );
-                ImplWriteBmp( pA->GetBitmapEx(),
-                              pA->GetPoint(), mpVDev->PixelToLogic( pA->GetBitmapEx().GetSizePixel() ),
+                ImplWriteBmp( pA->GetBitmapEx(), 
+                              pA->GetPoint(), mpVDev->PixelToLogic( pA->GetBitmapEx().GetSizePixel() ), 
                               Point(), pA->GetBitmapEx().GetSizePixel(), pStyle );
             }
             break;
@@ -1347,10 +1347,10 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL:
             case( META_BMPEXSCALE_ACTION ):
             {
                 const MetaBmpExScaleAction* pA = (const MetaBmpExScaleAction*) pAction;
-
+            
                 mpContext->SetPaintAttr( mpVDev->GetLineColor(), mpVDev->GetFillColor() );
-                ImplWriteBmp( pA->GetBitmapEx(),
-                              pA->GetPoint(), pA->GetSize(),
+                ImplWriteBmp( pA->GetBitmapEx(), 
+                              pA->GetPoint(), pA->GetSize(), 
                               Point(), pA->GetBitmapEx().GetSizePixel(), pStyle );
             }
             break;
@@ -1358,10 +1358,10 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL:
             case( META_BMPEXSCALEPART_ACTION ):
             {
                 const MetaBmpExScalePartAction* pA = (const MetaBmpExScalePartAction*) pAction;
-
+                
                 mpContext->SetPaintAttr( mpVDev->GetLineColor(), mpVDev->GetFillColor() );
-                ImplWriteBmp( pA->GetBitmapEx(),
-                              pA->GetDestPoint(), pA->GetDestSize(),
+                ImplWriteBmp( pA->GetBitmapEx(), 
+                              pA->GetDestPoint(), pA->GetDestSize(), 
                               pA->GetSrcPoint(), pA->GetSrcSize(), pStyle );
             }
             break;
@@ -1373,7 +1373,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL:
                 mpContext->SetFontAttr( mpVDev->GetFont() );
                 mpContext->SetPaintAttr( COL_TRANSPARENT, mpVDev->GetFont().GetColor() );
                 ImplWriteText( pA->GetPoint(), String( pA->GetText(), pA->GetIndex(), pA->GetLen() ), NULL, 0, pStyle );
-            }
+            }			
             break;
 
             case( META_TEXTRECT_ACTION ):
@@ -1386,10 +1386,10 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL:
             }
             break;
 
-            case( META_TEXTARRAY_ACTION ):
+            case( META_TEXTARRAY_ACTION	):
             {
-                const MetaTextArrayAction*  pA = (const MetaTextArrayAction*) pAction;
-                const Point                 aPos( ImplMap( pA->GetPoint() ) );
+                const MetaTextArrayAction*	pA = (const MetaTextArrayAction*) pAction;
+                const Point					aPos( ImplMap( pA->GetPoint() ) );
 
                 mpContext->SetFontAttr( mpVDev->GetFont() );
                 mpContext->SetPaintAttr( COL_TRANSPARENT, mpVDev->GetFont().GetColor() );
@@ -1409,7 +1409,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL:
 
             case( META_CLIPREGION_ACTION ):
             case( META_ISECTRECTCLIPREGION_ACTION ):
-            case( META_ISECTREGIONCLIPREGION_ACTION ):
+            case( META_ISECTREGIONCLIPREGION_ACTION	):
             case( META_MOVECLIPREGION_ACTION ):
             {
                 ( (MetaAction*) pAction )->Execute( mpVDev );
@@ -1419,12 +1419,12 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL:
 
             case( META_REFPOINT_ACTION ):
             case( META_MAPMODE_ACTION ):
-            case( META_LINECOLOR_ACTION ):
-            case( META_FILLCOLOR_ACTION ):
+            case( META_LINECOLOR_ACTION	):
+            case( META_FILLCOLOR_ACTION	):
             case( META_TEXTLINECOLOR_ACTION ):
-            case( META_TEXTFILLCOLOR_ACTION ):
-            case( META_TEXTCOLOR_ACTION ):
-            case( META_TEXTALIGN_ACTION ):
+            case( META_TEXTFILLCOLOR_ACTION	):
+            case( META_TEXTCOLOR_ACTION	):
+            case( META_TEXTALIGN_ACTION	):
             case( META_FONT_ACTION ):
             case( META_PUSH_ACTION ):
             case( META_POP_ACTION ):
@@ -1435,9 +1435,9 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL:
 
             case( META_RASTEROP_ACTION ):
             case( META_MASK_ACTION ):
-            case( META_MASKSCALE_ACTION ):
-            case( META_MASKSCALEPART_ACTION ):
-            case( META_WALLPAPER_ACTION ):
+            case( META_MASKSCALE_ACTION	):
+            case( META_MASKSCALEPART_ACTION	):
+            case( META_WALLPAPER_ACTION	):
             case( META_TEXTLINE_ACTION ):
             case( META_LAYOUTMODE_ACTION ):
             {
diff --git a/extensions/source/svg/svgaction.hxx b/extensions/source/svg/svgaction.hxx
index b0ab5413ef17..9ec1e887f86e 100644
--- a/extensions/source/svg/svgaction.hxx
+++ b/extensions/source/svg/svgaction.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,27 +39,27 @@ class FastString
 {
 private:
 
-    NMSP_RTL::OUString          maString;
-    sal_Unicode*                mpBuffer;
-    sal_uInt32                  mnBufLen;
-    sal_uInt32                  mnCurLen;
-    sal_uInt32                  mnBufInc;
-    sal_uInt32                  mnPartPos;
-
-public:
-
+    NMSP_RTL::OUString			maString;
+    sal_Unicode*				mpBuffer;
+    sal_uInt32					mnBufLen;
+    sal_uInt32					mnCurLen;
+    sal_uInt32					mnBufInc;
+    sal_uInt32					mnPartPos;
+                                
+public:							
+                                
                                 FastString( sal_uInt32 nInitLen = 2048, sal_uInt32 nIncrement = 2048 );
                                 FastString( sal_Char* pBufferForBase64Encoding, sal_uInt32 nBufLen );
                                 ~FastString();
-
-    FastString&                 operator+=( const NMSP_RTL::OUString& rStr );
-
-    const NMSP_RTL::OUString&   GetString() const;
-    sal_Bool                    GetFirstPartString( const sal_uInt32 nPartLen, NMSP_RTL::OUString& rPartString );
-    sal_Bool                    GetNextPartString( const sal_uInt32 nPartLen, NMSP_RTL::OUString& rPartString );
-
-    sal_uInt32                  GetLength() const { return mnCurLen; }
-    void                        Clear() { mnCurLen = 0, maString = NMSP_RTL::OUString(); }
+                                
+    FastString&					operator+=( const NMSP_RTL::OUString& rStr );
+                        
+    const NMSP_RTL::OUString&	GetString() const;
+    sal_Bool					GetFirstPartString( const sal_uInt32 nPartLen, NMSP_RTL::OUString& rPartString );
+    sal_Bool					GetNextPartString( const sal_uInt32 nPartLen, NMSP_RTL::OUString& rPartString );
+
+    sal_uInt32					GetLength() const { return mnCurLen; }
+    void						Clear() { mnCurLen = 0, maString = NMSP_RTL::OUString(); }
 };
 
 // ----------------------
@@ -72,26 +72,26 @@ class SVGAttributeWriter
 {
 private:
 
-    Font                    maCurFont;
-    Color                   maCurLineColor;
-    Color                   maCurFillColor;
-    SVGActionWriter&        mrParent;
-    SvXMLExport&            mrExport;
-    SvXMLElementExport*     mpElemFont;
-    SvXMLElementExport*     mpElemPaint;
+    Font					maCurFont;
+    Color					maCurLineColor;
+    Color					maCurFillColor;
+    SVGActionWriter&		mrParent;
+    SvXMLExport&			mrExport;
+    SvXMLElementExport*		mpElemFont;
+    SvXMLElementExport*		mpElemPaint;
 
                             SVGAttributeWriter();
 
 public:
 
                             SVGAttributeWriter( SVGActionWriter& rParent, SvXMLExport& rExport );
-    virtual                 ~SVGAttributeWriter();
+    virtual					~SVGAttributeWriter();
 
-    NMSP_RTL::OUString      GetFontStyle( const Font& rFont );
-    NMSP_RTL::OUString      GetPaintStyle( const Color& rLineColor, const Color& rFillColor );
+    NMSP_RTL::OUString		GetFontStyle( const Font& rFont );
+    NMSP_RTL::OUString		GetPaintStyle( const Color& rLineColor, const Color& rFillColor );
 
-    void                    SetFontAttr( const Font& rFont );
-    void                    SetPaintAttr( const Color& rLineColor, const Color& rFillColor );
+    void					SetFontAttr( const Font& rFont );
+    void					SetPaintAttr( const Color& rLineColor, const Color& rFillColor );
 };
 
 // -------------------
@@ -108,42 +108,42 @@ class SVGActionWriter
 
 private:
 
-    Stack                   maContextStack;
-    SvXMLExport&            mrExport;
-    const GDIMetaFile&      mrMtf;
-    SVGAttributeWriter*     mpContext;
-    VirtualDevice*          mpVDev;
-    MapMode                 maTargetMapMode;
-    sal_Int32               mnCurClipId;
-    sal_Bool                mbDestroyVDev;
-    sal_Bool                mbPaintAttrChanged;
-    sal_Bool                mbFontAttrChanged;
-    sal_Bool                mbClipAttrChanged;
-    sal_Bool                mbDoublePoints;
-
-    SVGAttributeWriter*     ImplAcquireContext() { maContextStack.Push( mpContext = new SVGAttributeWriter( *this, mrExport ) ); return mpContext; }
-    void                    ImplReleaseContext() { delete (SVGAttributeWriter*) maContextStack.Pop(); mpContext = (SVGAttributeWriter*) maContextStack.Top(); }
-
-    long                    ImplMap( sal_Int32 nVal ) const;
-    Point                   ImplMap( const Point& rPt ) const;
-    Size                    ImplMap( const Size& rSz ) const;
-    inline Rectangle        ImplMap( const Rectangle& rRect ) const { return Rectangle( ImplMap( rRect.TopLeft() ), ImplMap( rRect.GetSize() ) ); }
-
-    void                    ImplWriteLine( const Point& rPt1, const Point& rPt2, const Color* pLineColor = NULL, const NMSP_RTL::OUString* pStyle = NULL );
-    void                    ImplWriteRect( const Rectangle& rRect, long nRadX = 0, long nRadY = 0, const NMSP_RTL::OUString* pStyle = NULL );
-    void                    ImplWriteEllipse( const Point& rCenter, long nRadX, long nRadY, const NMSP_RTL::OUString* pStyle = NULL );
-    void                    ImplWritePolygon( const Polygon& rPoly, sal_Bool bLineOnly, const NMSP_RTL::OUString* pStyle = NULL );
-    void                    ImplWritePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bool bLineOnly, const NMSP_RTL::OUString* pStyle = NULL );
-    void                    ImplWriteGradientEx( const PolyPolygon& rPolyPoly, const Gradient& rGradient, const NMSP_RTL::OUString* pStyle = NULL );
-    void                    ImplWriteText( const Point& rPos, const String& rText, const sal_Int32* pDXArray, long nWidth, const NMSP_RTL::OUString* pStyle = NULL );
-    void                    ImplWriteBmp( const BitmapEx& rBmpEx, const Point& rPt, const Size& rSz, const Point& rSrcPt, const Size& rSrcSz, const NMSP_RTL::OUString* pStyle = NULL );
-
-    void                    ImplCheckFontAttributes();
-    void                    ImplCheckPaintAttributes();
-
-    void                    ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL::OUString* pStyle = NULL );
-
-    sal_Int32               ImplGetNextClipId() { return mnCurClipId++; }
+    Stack					maContextStack;
+    SvXMLExport&			mrExport;
+    const GDIMetaFile&		mrMtf;
+    SVGAttributeWriter*		mpContext;
+    VirtualDevice*			mpVDev;
+    MapMode					maTargetMapMode;
+    sal_Int32				mnCurClipId;
+    sal_Bool				mbDestroyVDev;
+    sal_Bool				mbPaintAttrChanged;
+    sal_Bool				mbFontAttrChanged;
+    sal_Bool				mbClipAttrChanged;
+    sal_Bool				mbDoublePoints;
+
+    SVGAttributeWriter*		ImplAcquireContext() { maContextStack.Push( mpContext = new SVGAttributeWriter( *this, mrExport ) ); return mpContext; }
+    void					ImplReleaseContext() { delete (SVGAttributeWriter*)	maContextStack.Pop(); mpContext = (SVGAttributeWriter*) maContextStack.Top(); }
+
+    long					ImplMap( sal_Int32 nVal ) const; 
+    Point					ImplMap( const Point& rPt ) const;
+    Size					ImplMap( const Size& rSz ) const;
+    inline Rectangle		ImplMap( const Rectangle& rRect ) const { return Rectangle( ImplMap( rRect.TopLeft() ), ImplMap( rRect.GetSize() ) ); }
+
+    void					ImplWriteLine( const Point& rPt1, const Point& rPt2, const Color* pLineColor = NULL, const NMSP_RTL::OUString* pStyle = NULL );
+    void					ImplWriteRect( const Rectangle& rRect, long nRadX = 0, long nRadY = 0, const NMSP_RTL::OUString* pStyle = NULL );
+    void					ImplWriteEllipse( const Point& rCenter, long nRadX, long nRadY, const NMSP_RTL::OUString* pStyle = NULL );
+    void					ImplWritePolygon( const Polygon& rPoly, sal_Bool bLineOnly, const NMSP_RTL::OUString* pStyle = NULL );
+    void					ImplWritePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bool bLineOnly, const NMSP_RTL::OUString* pStyle = NULL );
+    void					ImplWriteGradientEx( const PolyPolygon& rPolyPoly, const Gradient& rGradient, const NMSP_RTL::OUString* pStyle = NULL );
+    void					ImplWriteText( const Point& rPos, const String& rText, const sal_Int32* pDXArray, long nWidth, const NMSP_RTL::OUString* pStyle = NULL );
+    void					ImplWriteBmp( const BitmapEx& rBmpEx, const Point& rPt, const Size& rSz, const Point& rSrcPt, const Size& rSrcSz, const NMSP_RTL::OUString* pStyle = NULL );
+
+    void					ImplCheckFontAttributes();
+    void					ImplCheckPaintAttributes();
+    
+    void					ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL::OUString* pStyle = NULL );
+
+    sal_Int32				ImplGetNextClipId() { return mnCurClipId++; }
 
                             SVGActionWriter();
 
@@ -153,13 +153,13 @@ public:
 
 public:
 
-                            SVGActionWriter( SvXMLExport& rExport, const GDIMetaFile& rMtf,
-                                             VirtualDevice* pParentVDev = NULL,
+                            SVGActionWriter( SvXMLExport& rExport, const GDIMetaFile& rMtf, 
+                                             VirtualDevice* pParentVDev = NULL, 
                                              sal_Bool bWriteDoublePoints = sal_False );
-    virtual                 ~SVGActionWriter();
+    virtual					~SVGActionWriter();
 
-    const VirtualDevice&    GetVDev() const { return *mpVDev; }
-    BOOL                    HasDoublePoints() const { return mbDoublePoints; }
+    const VirtualDevice&	GetVDev() const { return *mpVDev; }
+    BOOL					HasDoublePoints() const { return mbDoublePoints; }
 };
 
 #endif
diff --git a/extensions/source/svg/svgcom.hxx b/extensions/source/svg/svgcom.hxx
index d0441536944e..20ac4c24ee54 100644
--- a/extensions/source/svg/svgcom.hxx
+++ b/extensions/source/svg/svgcom.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,20 +57,20 @@
 
 // -----------------------------------------------------------------------------
 
-#define NMSP_CPPU       cppu
-#define NMSP_RTL        rtl
-#define NMSP_UNO        com::sun::star::uno
-#define NMSP_LANG       com::sun::star::lang
-#define NMSP_SAX        com::sun::star::xml::sax
-#define NMSP_SVG        com::sun::star::svg
+#define NMSP_CPPU		cppu
+#define NMSP_RTL		rtl
+#define NMSP_UNO		com::sun::star::uno
+#define NMSP_LANG		com::sun::star::lang
+#define NMSP_SAX		com::sun::star::xml::sax
+#define NMSP_SVG		com::sun::star::svg
 #define NMSP_REGISTRY   com::sun::star::registry
 
 
-#define REF( _def_Obj )                     NMSP_UNO::Reference< _def_Obj >
-#define SEQ( _def_Obj )                     NMSP_UNO::Sequence< _def_Obj >
-#define ANY                                 NMSP_UNO::Any
-#define B2UCONST( _def_pChar )              (NMSP_RTL::OUString(RTL_CONSTASCII_USTRINGPARAM(_def_pChar )))
-#define SVG_DTD_STRING                      B2UCONST( "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">" )
+#define REF( _def_Obj )						NMSP_UNO::Reference< _def_Obj >
+#define SEQ( _def_Obj )						NMSP_UNO::Sequence< _def_Obj > 
+#define ANY									NMSP_UNO::Any
+#define B2UCONST( _def_pChar )				(NMSP_RTL::OUString(RTL_CONSTASCII_USTRINGPARAM(_def_pChar )))
+#define SVG_DTD_STRING						B2UCONST( "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">" )
 
 #endif // _SYNCCOM_HXX
 
diff --git a/extensions/source/svg/svgprinter.cxx b/extensions/source/svg/svgprinter.cxx
index 15b42ce8841f..b52a181ccb38 100644
--- a/extensions/source/svg/svgprinter.cxx
+++ b/extensions/source/svg/svgprinter.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,65 +59,65 @@ class SVGPrinterExport : public SvXMLExport
 {
 private:
 
-    Printer                 maPrinter;
-    VirtualDevice*          mpVDev;
-    SvXMLElementExport*     mpOuterElement;
-    sal_uInt32              mnPage;
+    Printer					maPrinter;
+    VirtualDevice*			mpVDev;
+    SvXMLElementExport*		mpOuterElement;
+    sal_uInt32				mnPage;
 
                             SVGPrinterExport();
 
-    SvXMLElementExport*     ImplCreateSVGElement( const JobSetup& rSetup, Size& rOutputSize );
-    void                    ImplWriteMetaAttr( sal_Bool bOuter, sal_Bool bPage );
+    SvXMLElementExport*		ImplCreateSVGElement( const JobSetup& rSetup, Size& rOutputSize );
+    void					ImplWriteMetaAttr( sal_Bool bOuter, sal_Bool bPage );
 
 protected:
 
-    virtual void            _ExportMeta() {}
-    virtual void            _ExportStyles( BOOL /*bUsed*/ ) {}
-    virtual void            _ExportAutoStyles() {}
-    virtual void            _ExportContent() {}
-    virtual void            _ExportMasterStyles() {}
-    virtual sal_uInt32      exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) { (void)eClass; return 0; }
-
-public:
-
+    virtual void			_ExportMeta() {}
+    virtual void			_ExportStyles( BOOL /*bUsed*/ ) {}
+    virtual void			_ExportAutoStyles() {}
+    virtual void			_ExportContent() {}
+    virtual void			_ExportMasterStyles() {}
+    virtual sal_uInt32		exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) { (void)eClass; return 0; }
+                            
+public:						
+                            
     // #110680#
-    SVGPrinterExport(
+    SVGPrinterExport( 
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory,
-        const REF( NMSP_SAX::XDocumentHandler )& rxHandler,
+        const REF( NMSP_SAX::XDocumentHandler )& rxHandler, 
         const JobSetup& rSetup,
-        const NMSP_RTL::OUString& rJobName,
-        sal_uInt32 nCopies,
+        const NMSP_RTL::OUString& rJobName, 
+        sal_uInt32 nCopies, 
         sal_Bool bCollate );
 
-    virtual                 ~SVGPrinterExport();
+    virtual					~SVGPrinterExport();
 
-    virtual void            writePage( const JobSetup& rJobSetup, const GDIMetaFile& rMtf );
+    virtual void			writePage( const JobSetup& rJobSetup, const GDIMetaFile& rMtf );
 };
 
 // -----------------------------------------------------------------------------
 
 // #110680#
-SVGPrinterExport::SVGPrinterExport(
+SVGPrinterExport::SVGPrinterExport( 
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory,
-    const REF( NMSP_SAX::XDocumentHandler )& rxHandler,
+    const REF( NMSP_SAX::XDocumentHandler )& rxHandler, 
     const JobSetup& rSetup,
-    const NMSP_RTL::OUString& rJobName,
-    sal_uInt32 /*nCopies*/,
-    sal_Bool /*bCollate*/ )
-:   SvXMLExport( xServiceFactory, NMSP_RTL::OUString(), rxHandler ),
+    const NMSP_RTL::OUString& rJobName, 
+    sal_uInt32 /*nCopies*/, 
+    sal_Bool /*bCollate*/ ) 
+:	SvXMLExport( xServiceFactory, NMSP_RTL::OUString(), rxHandler ),
     mpVDev( NULL ),
     mnPage( 0 )
 {
     maPrinter.SetJobSetup( rSetup );
-
+    
     GetDocHandler()->startDocument();
 
     REF( NMSP_SAX::XExtendedDocumentHandler ) xExtDocHandler( GetDocHandler(), NMSP_UNO::UNO_QUERY );
 
     if( xExtDocHandler.is() )
     {
-        NMSP_RTL::OUString          aString;
-        const NMSP_RTL::OUString    aLineFeed( NMSP_RTL::OUString::valueOf( (sal_Unicode) 0x0a ) );
+        NMSP_RTL::OUString			aString;
+        const NMSP_RTL::OUString	aLineFeed( NMSP_RTL::OUString::valueOf( (sal_Unicode) 0x0a ) );
 
         // intro
         xExtDocHandler->unknown( ( aString = SVG_DTD_STRING ) += aLineFeed );
@@ -141,8 +141,8 @@ SVGPrinterExport::SVGPrinterExport(
 
     // write description
     SvXMLElementExport* pDescElem = new SvXMLElementExport( *this, XML_NAMESPACE_NONE, aXMLElemDesc, TRUE, TRUE );
-    NMSP_RTL::OUString  aDesc( B2UCONST( "document name: " ) );
-
+    NMSP_RTL::OUString	aDesc( B2UCONST( "document name: " ) );
+    
     GetDocHandler()->characters( aDesc += rJobName );
     delete pDescElem;
 
@@ -161,7 +161,7 @@ SVGPrinterExport::~SVGPrinterExport()
 
 // -----------------------------------------------------------------------------
 
-SvXMLElementExport* SVGPrinterExport::ImplCreateSVGElement( const JobSetup& rSetup, Size& rOutputSize )
+SvXMLElementExport*	SVGPrinterExport::ImplCreateSVGElement( const JobSetup& rSetup, Size& rOutputSize )
 {
     NMSP_RTL::OUString aAttr;
 
@@ -173,16 +173,16 @@ SvXMLElementExport* SVGPrinterExport::ImplCreateSVGElement( const JobSetup& rSet
 
     rOutputSize = maPrinter.PixelToLogic( maPrinter.GetOutputSizePixel(), mpVDev->GetMapMode() );
 
-    aAttr = SVGActionWriter::GetValueString( rOutputSize.Width(), sal_True );
+    aAttr = SVGActionWriter::GetValueString( rOutputSize.Width(), sal_True ); 
     AddAttribute( XML_NAMESPACE_NONE, aXMLAttrWidth, aAttr );
 
-    aAttr = SVGActionWriter::GetValueString( rOutputSize.Height(), sal_True );
+    aAttr = SVGActionWriter::GetValueString( rOutputSize.Height(), sal_True ); 
     AddAttribute( XML_NAMESPACE_NONE, aXMLAttrHeight, aAttr );
 
     aAttr = B2UCONST( "0.0 0.0 " );
-    aAttr += SVGActionWriter::GetValueString( rOutputSize.Width(), sal_True );
+    aAttr += SVGActionWriter::GetValueString( rOutputSize.Width(), sal_True ); 
     aAttr += B2UCONST( " " );
-    aAttr += SVGActionWriter::GetValueString( rOutputSize.Height(), sal_True );
+    aAttr += SVGActionWriter::GetValueString( rOutputSize.Height(), sal_True ); 
     AddAttribute( XML_NAMESPACE_NONE, aXMLAttrViewBox, aAttr );
 
     return( new SvXMLElementExport( *this, XML_NAMESPACE_NONE, aXMLElemSVG, TRUE, TRUE ) );
@@ -192,8 +192,8 @@ SvXMLElementExport* SVGPrinterExport::ImplCreateSVGElement( const JobSetup& rSet
 
 void SVGPrinterExport::ImplWriteMetaAttr( sal_Bool bOuter, sal_Bool bPage )
 {
-    SvXMLElementExport  aMetaData( *this, XML_NAMESPACE_NONE, aXMLElemMeta, TRUE, TRUE );
-    NMSP_RTL::OUString  aAttr;
+    SvXMLElementExport	aMetaData( *this, XML_NAMESPACE_NONE, aXMLElemMeta, TRUE, TRUE ); 
+    NMSP_RTL::OUString	aAttr;
 
     aAttr = bOuter ? B2UCONST( "true" ) : B2UCONST( "false" );
     AddAttribute( XML_NAMESPACE_NONE, aXMLAttrMetaSVGOuter, aAttr );
@@ -202,22 +202,22 @@ void SVGPrinterExport::ImplWriteMetaAttr( sal_Bool bOuter, sal_Bool bPage )
     AddAttribute( XML_NAMESPACE_NONE, aXMLAttrMetaSVGPage, aAttr );
 
     {
-        delete( new SvXMLElementExport( *this, XML_NAMESPACE_NONE, aXMLElemMetaSVG, TRUE, TRUE ) );
+        delete( new SvXMLElementExport( *this, XML_NAMESPACE_NONE, aXMLElemMetaSVG, TRUE, TRUE ) ); 
     }
 }
 
 // -----------------------------------------------------------------------------
 
 void SVGPrinterExport::writePage( const JobSetup& rSetup, const GDIMetaFile& rMtf )
-{
-    Size                aOutputSize;
-    NMSP_RTL::OUString  aAttr;
+{	
+    Size				aOutputSize;
+    NMSP_RTL::OUString	aAttr;
     SvXMLElementExport* pPageElem = ImplCreateSVGElement( rSetup, aOutputSize );
 
     // write description
     SvXMLElementExport* pDescElem = new SvXMLElementExport( *this, XML_NAMESPACE_NONE, aXMLElemDesc, TRUE, TRUE );
-    NMSP_RTL::OUString  aDesc( B2UCONST( "page: " ) );
-
+    NMSP_RTL::OUString	aDesc( B2UCONST( "page: " ) );
+    
     GetDocHandler()->characters( aDesc += NMSP_RTL::OUString::valueOf( (sal_Int32) ++mnPage ) );
     delete pDescElem;
 
@@ -284,17 +284,17 @@ void SAL_CALL SVGPrinter::release() throw()
 
 // -----------------------------------------------------------------------------
 
-sal_Bool SAL_CALL SVGPrinter::startJob( const REF( NMSP_SAX::XDocumentHandler )& rxHandler,
-                                        const SEQ( sal_Int8 )& rJobSetupSeq,
-                                        const NMSP_RTL::OUString& rJobName,
+sal_Bool SAL_CALL SVGPrinter::startJob( const REF( NMSP_SAX::XDocumentHandler )& rxHandler, 
+                                        const SEQ( sal_Int8 )& rJobSetupSeq, 
+                                        const NMSP_RTL::OUString& rJobName, 
                                         sal_uInt32 nCopies, sal_Bool bCollate ) throw( NMSP_UNO::RuntimeException )
 {
     const sal_Bool bRet = ( mpWriter == NULL );
 
     if( bRet )
     {
-        SvMemoryStream  aMemStm( (char*) rJobSetupSeq.getConstArray(), rJobSetupSeq.getLength(), STREAM_READ );
-        JobSetup        aJobSetup;
+        SvMemoryStream	aMemStm( (char*) rJobSetupSeq.getConstArray(), rJobSetupSeq.getLength(), STREAM_READ );
+        JobSetup		aJobSetup;
 
         aMemStm.SetCompressMode( COMPRESSMODE_FULL );
         aMemStm >> aJobSetup;
@@ -313,8 +313,8 @@ sal_Bool SAL_CALL SVGPrinter::startJob( const REF( NMSP_SAX::XDocumentHandler )&
 
 void SAL_CALL SVGPrinter::printPage( const SEQ( sal_Int8 )& rPrintPage ) throw( NMSP_UNO::RuntimeException )
 {
-    SvMemoryStream  aMemStm( (char*) rPrintPage.getConstArray(), rPrintPage.getLength(), STREAM_READ );
-    PrinterPage     aPage;
+    SvMemoryStream	aMemStm( (char*) rPrintPage.getConstArray(), rPrintPage.getLength(), STREAM_READ );
+    PrinterPage		aPage;
 
     aMemStm.SetCompressMode( COMPRESSMODE_FULL );
     aMemStm >> aPage;
diff --git a/extensions/source/svg/svgprinter.hxx b/extensions/source/svg/svgprinter.hxx
index bbc29a06b6f8..24b6bfcf0e13 100644
--- a/extensions/source/svg/svgprinter.hxx
+++ b/extensions/source/svg/svgprinter.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 class SVGPrinterExport;
 
 class SVGPrinter : public NMSP_CPPU::OWeakObject, NMSP_SVG::XSVGPrinter
-{
+{	
 private:
 
-    REF( NMSP_LANG::XMultiServiceFactory )  mxFact;
-    SVGPrinterExport*                       mpWriter;
-
+    REF( NMSP_LANG::XMultiServiceFactory )	mxFact;
+    SVGPrinterExport*						mpWriter;
+                                            
                                             SVGPrinter();
-
-public:
-
+                                            
+public:										
+                                            
                                             SVGPrinter( const REF( NMSP_LANG::XMultiServiceFactory )& rxMgr );
-    virtual                                 ~SVGPrinter();
-
-    // XInterface
-    virtual ANY SAL_CALL                    queryInterface( const NMSP_UNO::Type & rType ) throw( NMSP_UNO::RuntimeException );
-    virtual void SAL_CALL                   acquire() throw();
-    virtual void SAL_CALL                   release() throw();
-
+    virtual 								~SVGPrinter();
+                                            
+    // XInterface							
+    virtual ANY SAL_CALL					queryInterface( const NMSP_UNO::Type & rType ) throw( NMSP_UNO::RuntimeException );
+    virtual void SAL_CALL					acquire() throw();
+    virtual void SAL_CALL					release() throw();
+                                            
     // XSVGPrinter
-    virtual sal_Bool SAL_CALL               startJob( const REF( NMSP_SAX::XDocumentHandler )& rxHandler,
-                                                      const SEQ( sal_Int8 )& rJobSetup,
-                                                      const NMSP_RTL::OUString& rJobName,
+    virtual sal_Bool SAL_CALL				startJob( const REF( NMSP_SAX::XDocumentHandler )& rxHandler, 
+                                                      const SEQ( sal_Int8 )& rJobSetup, 
+                                                      const NMSP_RTL::OUString& rJobName, 
                                                       sal_uInt32 nCopies, sal_Bool bCollate ) throw( NMSP_UNO::RuntimeException );
-    virtual void SAL_CALL                   printPage( const SEQ( sal_Int8 )& rPrintPage ) throw( NMSP_UNO::RuntimeException );
-    virtual void SAL_CALL                   endJob() throw( NMSP_UNO::RuntimeException );
+    virtual void SAL_CALL					printPage( const SEQ( sal_Int8 )& rPrintPage ) throw( NMSP_UNO::RuntimeException );
+    virtual void SAL_CALL					endJob() throw( NMSP_UNO::RuntimeException );
 };
 
 #endif
diff --git a/extensions/source/svg/svguno.cxx b/extensions/source/svg/svguno.cxx
index 6cd5c258e66a..e94761253d34 100644
--- a/extensions/source/svg/svguno.cxx
+++ b/extensions/source/svg/svguno.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,8 +98,8 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, voi
 extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
 {
     REF( NMSP_LANG::XSingleServiceFactory ) xFactory;
-    void*                                   pRet = 0;
-
+    void*									pRet = 0;
+    
     if( rtl_str_compare( pImplName, "com.sun.star.comp.extensions.SVGWriter" ) == 0 )
     {
         const NMSP_RTL::OUString aServiceName( B2UCONST( "com.sun.star.svg.SVGWriter" ) );
@@ -124,7 +124,7 @@ extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void*
         xFactory->acquire();
         pRet = xFactory.get();
     }
-
+    
     return pRet;
 }
 
diff --git a/extensions/source/svg/svgwriter.cxx b/extensions/source/svg/svgwriter.cxx
index 30d5eded34ac..3116199d92b4 100644
--- a/extensions/source/svg/svgwriter.cxx
+++ b/extensions/source/svg/svgwriter.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,32 +45,32 @@ private:
 
 protected:
 
-    virtual void            _ExportMeta() {}
-    virtual void            _ExportStyles( BOOL /*bUsed*/ ) {}
-    virtual void            _ExportAutoStyles() {}
-    virtual void            _ExportContent() {}
-    virtual void            _ExportMasterStyles() {}
-    virtual sal_uInt32      exportDoc( enum ::xmloff::token::XMLTokenEnum /*eClass*/ ) { return 0; }
-
-public:
-
+    virtual void			_ExportMeta() {}
+    virtual void			_ExportStyles( BOOL /*bUsed*/ ) {}
+    virtual void			_ExportAutoStyles() {}
+    virtual void			_ExportContent() {}
+    virtual void			_ExportMasterStyles() {}
+    virtual sal_uInt32		exportDoc( enum ::xmloff::token::XMLTokenEnum /*eClass*/ ) { return 0; }
+                            
+public:						
+                            
     // #110680#
-    SVGMtfExport(
+    SVGMtfExport( 
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory,
         const REF( NMSP_SAX::XDocumentHandler )& rxHandler );
 
-    virtual                 ~SVGMtfExport();
+    virtual					~SVGMtfExport();
 
-    virtual void            writeMtf( const GDIMetaFile& rMtf );
+    virtual void			writeMtf( const GDIMetaFile& rMtf );
 };
 
 // -----------------------------------------------------------------------------
 
 // #110680#
-SVGMtfExport::SVGMtfExport(
+SVGMtfExport::SVGMtfExport( 
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory,
-    const REF( NMSP_SAX::XDocumentHandler )& rxHandler )
-:   SvXMLExport( xServiceFactory, NMSP_RTL::OUString(), rxHandler )
+    const REF( NMSP_SAX::XDocumentHandler )& rxHandler ) 
+:	SvXMLExport( xServiceFactory, NMSP_RTL::OUString(), rxHandler )
 {
     GetDocHandler()->startDocument();
 }
@@ -86,18 +86,18 @@ SVGMtfExport::~SVGMtfExport()
 
 void SVGMtfExport::writeMtf( const GDIMetaFile& rMtf )
 {
-    const Size                                  aSize( OutputDevice::LogicToLogic( rMtf.GetPrefSize(), rMtf.GetPrefMapMode(), MAP_MM ) );
-    NMSP_RTL::OUString                          aAttr;
-    REF( NMSP_SAX::XExtendedDocumentHandler )   xExtDocHandler( GetDocHandler(), NMSP_UNO::UNO_QUERY );
+    const Size									aSize( OutputDevice::LogicToLogic( rMtf.GetPrefSize(), rMtf.GetPrefMapMode(), MAP_MM ) );
+    NMSP_RTL::OUString							aAttr;
+    REF( NMSP_SAX::XExtendedDocumentHandler )	xExtDocHandler( GetDocHandler(), NMSP_UNO::UNO_QUERY );
 
     if( xExtDocHandler.is() )
         xExtDocHandler->unknown( SVG_DTD_STRING );
 
-    aAttr = NMSP_RTL::OUString::valueOf( aSize.Width() );
+    aAttr = NMSP_RTL::OUString::valueOf( aSize.Width() ); 
     aAttr += B2UCONST( "mm" );
     AddAttribute( XML_NAMESPACE_NONE, "width", aAttr );
 
-    aAttr = NMSP_RTL::OUString::valueOf( aSize.Height() );
+    aAttr = NMSP_RTL::OUString::valueOf( aSize.Height() ); 
     aAttr += B2UCONST( "mm" );
     AddAttribute( XML_NAMESPACE_NONE, "height", aAttr );
 
@@ -108,9 +108,9 @@ void SVGMtfExport::writeMtf( const GDIMetaFile& rMtf )
     AddAttribute( XML_NAMESPACE_NONE, "viewBox", aAttr );
 
     {
-        SvXMLElementExport  aSVG( *this, XML_NAMESPACE_NONE, "svg", TRUE, TRUE );
-        SVGActionWriter*    pWriter = new SVGActionWriter( *this, rMtf );
-
+        SvXMLElementExport	aSVG( *this, XML_NAMESPACE_NONE, "svg", TRUE, TRUE );
+        SVGActionWriter*	pWriter = new SVGActionWriter( *this, rMtf );
+        
         delete pWriter;
     }
 }
@@ -156,17 +156,17 @@ void SAL_CALL SVGWriter::release() throw()
 
 // -----------------------------------------------------------------------------
 
-void SAL_CALL SVGWriter::write( const REF( NMSP_SAX::XDocumentHandler )& rxDocHandler,
+void SAL_CALL SVGWriter::write( const REF( NMSP_SAX::XDocumentHandler )& rxDocHandler, 
                                 const SEQ( sal_Int8 )& rMtfSeq ) throw( NMSP_UNO::RuntimeException )
 {
-    SvMemoryStream  aMemStm( (char*) rMtfSeq.getConstArray(), rMtfSeq.getLength(), STREAM_READ );
-    GDIMetaFile     aMtf;
+    SvMemoryStream	aMemStm( (char*) rMtfSeq.getConstArray(), rMtfSeq.getLength(), STREAM_READ );
+    GDIMetaFile		aMtf;
 
     aMemStm.SetCompressMode( COMPRESSMODE_FULL );
     aMemStm >> aMtf;
 
     const REF( NMSP_SAX::XDocumentHandler ) xDocumentHandler( rxDocHandler );
-
+    
     // #110680#
     // SVGMtfExport* pWriter = new SVGMtfExport( xDocumentHandler );
     SVGMtfExport* pWriter = new SVGMtfExport( mxFact, xDocumentHandler );
diff --git a/extensions/source/svg/svgwriter.hxx b/extensions/source/svg/svgwriter.hxx
index 2622f83f0182..0da9762e2447 100644
--- a/extensions/source/svg/svgwriter.hxx
+++ b/extensions/source/svg/svgwriter.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 // -------------
 
 class SVGWriter : public NMSP_CPPU::OWeakObject, NMSP_SVG::XSVGWriter
-{
+{	
 private:
 
-    REF( NMSP_LANG::XMultiServiceFactory )  mxFact;
-
+    REF( NMSP_LANG::XMultiServiceFactory )	mxFact;
+                                            
                                             SVGWriter();
-
-public:
-
+                                            
+public:										
+                                            
                                             SVGWriter( const REF( NMSP_LANG::XMultiServiceFactory )& rxMgr );
-    virtual                                 ~SVGWriter();
-
-    // XInterface
-    virtual ANY SAL_CALL                    queryInterface( const NMSP_UNO::Type & rType ) throw( NMSP_UNO::RuntimeException );
-    virtual void SAL_CALL                   acquire() throw();
-    virtual void SAL_CALL                   release() throw();
-
-    // XSVGWriter
-    virtual void SAL_CALL                   write( const REF( NMSP_SAX::XDocumentHandler )& rxDocHandler,
+    virtual 								~SVGWriter();
+                                            
+    // XInterface							
+    virtual ANY SAL_CALL					queryInterface( const NMSP_UNO::Type & rType ) throw( NMSP_UNO::RuntimeException );
+    virtual void SAL_CALL					acquire() throw();
+    virtual void SAL_CALL					release() throw();
+                                            
+    // XSVGWriter							
+    virtual void SAL_CALL					write( const REF( NMSP_SAX::XDocumentHandler )& rxDocHandler,
                                                    const SEQ( sal_Int8 )& rMtfSeq ) throw( NMSP_UNO::RuntimeException );
 };
 
diff --git a/extensions/source/unoactivex/main/initwindowpeer.cxx b/extensions/source/unoactivex/main/initwindowpeer.cxx
index 5e88b5b489dd..195f5811e6a9 100644
--- a/extensions/source/unoactivex/main/initwindowpeer.cxx
+++ b/extensions/source/unoactivex/main/initwindowpeer.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/update/check/actionlistener.hxx b/extensions/source/update/check/actionlistener.hxx
index a1c4571900bf..e5df3dd5ad52 100644
--- a/extensions/source/update/check/actionlistener.hxx
+++ b/extensions/source/update/check/actionlistener.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx
index 68123924c567..ff1905be1cf2 100644
--- a/extensions/source/update/check/download.cxx
+++ b/extensions/source/update/check/download.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,17 +73,17 @@ static void openFile( OutData& out )
 {
     char * effective_url;
     curl_easy_getinfo(out.curl, CURLINFO_EFFECTIVE_URL, &effective_url);
-
+        
     double fDownloadSize;
     curl_easy_getinfo(out.curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &fDownloadSize);
-
+        
     rtl::OString aURL(effective_url);
-
+        
     // ensure no trailing '/'
     sal_Int32 nLen = aURL.getLength();
     while( (nLen > 0) && ('/' == aURL[nLen-1]) )
         aURL = aURL.copy(0, --nLen);
-
+        
     // extract file name last '/'
     sal_Int32 nIndex = aURL.lastIndexOf('/');
     if( nIndex > 0 )
@@ -91,48 +91,48 @@ static void openFile( OutData& out )
         out.File = out.DestinationDir + rtl::OStringToOUString(aURL.copy(nIndex), RTL_TEXTENCODING_UTF8);
 
         oslFileError rc;
-
+    
         // Give the user an overwrite warning if the target file exists
         const sal_Int32 openFlags = osl_File_OpenFlag_Write | osl_File_OpenFlag_Create;
         do
         {
             rc = osl_openFile(out.File.pData, &out.FileHandle, openFlags);
-
+            
             if( osl_File_E_EXIST == rc && ! out.Handler->downloadTargetExists(out.File) )
             {
                 out.StopCondition.set();
                 break;
             }
-
+        
         } while( osl_File_E_EXIST == rc );
-
+            
         if( osl_File_E_None == rc )
             out.Handler->downloadStarted(out.File, (sal_Int64) fDownloadSize);
-    }
+    }        
 }
 
 //------------------------------------------------------------------------------
 
-static inline rtl::OString
+static inline rtl::OString 
 getStringValue(const uno::Reference< container::XNameAccess >& xNameAccess, const rtl::OUString& aName)
 {
     rtl::OString aRet;
-
+    
     OSL_ASSERT(xNameAccess->hasByName(aName));
     uno::Any aValue = xNameAccess->getByName(aName);
-
+    
     return rtl::OUStringToOString(aValue.get<rtl::OUString>(), RTL_TEXTENCODING_UTF8);
 }
 
 //------------------------------------------------------------------------------
 
-static inline sal_Int32
-getInt32Value(const uno::Reference< container::XNameAccess >& xNameAccess,
+static inline sal_Int32 
+getInt32Value(const uno::Reference< container::XNameAccess >& xNameAccess, 
                     const rtl::OUString& aName, sal_Int32 nDefault=-1)
 {
     OSL_ASSERT(xNameAccess->hasByName(aName));
     uno::Any aValue = xNameAccess->getByName(aName);
-
+    
     sal_Int32 n=nDefault;
     aValue >>= n;
     return n;
@@ -140,19 +140,19 @@ getInt32Value(const uno::Reference< container::XNameAccess >& xNameAccess,
 
 //------------------------------------------------------------------------------
 
-static size_t
+static size_t 
 write_function( void *ptr, size_t size, size_t nmemb, void *stream )
 {
     OutData *out = reinterpret_cast < OutData * > (stream);
-
+    
     if( NULL == out->FileHandle )
         openFile(*out);
-
+    
     sal_uInt64 nBytesWritten = 0;
-
+    
     if( NULL != out->FileHandle )
         osl_writeFile(out->FileHandle, ptr, size * nmemb, &nBytesWritten);
-
+        
     return (size_t) nBytesWritten;
 }
 
@@ -165,9 +165,9 @@ progress_callback( void *clientp, double dltotal, double dlnow, double ultotal,
     (void) ulnow;
 
     OutData *out = reinterpret_cast < OutData * > (clientp);
-
+    
     OSL_ASSERT( out );
-
+    
     if( ! out->StopCondition.check() )
     {
         double fPercent = 0;
@@ -175,56 +175,56 @@ progress_callback( void *clientp, double dltotal, double dlnow, double ultotal,
             fPercent = (dlnow + out->Offset) * 100 / (dltotal + out->Offset);
         if( fPercent < 0 )
             fPercent = 0;
-
+        
         // Do not report progress for redirection replies
         long nCode;
         curl_easy_getinfo(out->curl, CURLINFO_RESPONSE_CODE, &nCode);
         if( (nCode != 302) && (nCode != 303) && (dltotal > 0) )
             out->Handler->downloadProgressAt((sal_Int8)fPercent);
-
+        
         return 0;
     }
-
+    
     // If stop condition is set, return non 0 value to abort
     return -1;
 }
 
 //------------------------------------------------------------------------------
 
-void
+void 
 Download::getProxyForURL(const rtl::OUString& rURL, rtl::OString& rHost, sal_Int32& rPort) const
 {
     if( !m_xContext.is() )
-        throw uno::RuntimeException(
-            UNISTRING( "Download: empty component context" ),
+        throw uno::RuntimeException( 
+            UNISTRING( "Download: empty component context" ), 
             uno::Reference< uno::XInterface >() );
-
+        
     uno::Reference< lang::XMultiComponentFactory > xServiceManager(m_xContext->getServiceManager());
-
+    
     if( !xServiceManager.is() )
-        throw uno::RuntimeException(
-            UNISTRING( "Download: unable to obtain service manager from component context" ),
+        throw uno::RuntimeException( 
+            UNISTRING( "Download: unable to obtain service manager from component context" ), 
             uno::Reference< uno::XInterface >() );
-
-    uno::Reference< lang::XMultiServiceFactory > xConfigProvider(
-        xServiceManager->createInstanceWithContext( UNISTRING( "com.sun.star.configuration.ConfigurationProvider" ), m_xContext ),
-        uno::UNO_QUERY_THROW);
-
+    
+    uno::Reference< lang::XMultiServiceFactory > xConfigProvider( 
+        xServiceManager->createInstanceWithContext( UNISTRING( "com.sun.star.configuration.ConfigurationProvider" ), m_xContext ), 
+        uno::UNO_QUERY_THROW); 
+    
     beans::PropertyValue aProperty;
     aProperty.Name  = UNISTRING( "nodepath" );
     aProperty.Value = uno::makeAny( UNISTRING("org.openoffice.Inet/Settings") );
 
     uno::Sequence< uno::Any > aArgumentList( 1 );
     aArgumentList[0] = uno::makeAny( aProperty );
-
-    uno::Reference< container::XNameAccess > xNameAccess(
-        xConfigProvider->createInstanceWithArguments(
+    
+    uno::Reference< container::XNameAccess > xNameAccess( 
+        xConfigProvider->createInstanceWithArguments( 
             UNISTRING("com.sun.star.configuration.ConfigurationAccess"), aArgumentList ),
         uno::UNO_QUERY_THROW );
-
+    
     OSL_ASSERT(xNameAccess->hasByName(UNISTRING("ooInetProxyType")));
     uno::Any aValue = xNameAccess->getByName(UNISTRING("ooInetProxyType"));
-
+    
     sal_Int32 nProxyType = aValue.get< sal_Int32 >();
     if( 0 != nProxyType ) // type 0 means "direct connection to the internet
     {
@@ -250,62 +250,62 @@ Download::getProxyForURL(const rtl::OUString& rURL, rtl::OString& rHost, sal_Int
 
 bool curl_run(const rtl::OUString& rURL, OutData& out, const rtl::OString& aProxyHost, sal_Int32 nProxyPort)
 {
-    /* Need to investigate further whether it is necessary to call
+    /* Need to investigate further whether it is necessary to call 
      * curl_global_init or not - leave it for now (as the ftp UCB content
      * provider does as well).
      */
-
+    
     CURL * pCURL = curl_easy_init();
     bool ret = false;
-
+    
     if( NULL != pCURL )
     {
         out.curl = pCURL;
-
+        
         rtl::OString aURL(rtl::OUStringToOString(rURL, RTL_TEXTENCODING_UTF8));
         curl_easy_setopt(pCURL, CURLOPT_URL, aURL.getStr());
-
+        
         // abort on http errors
         curl_easy_setopt(pCURL, CURLOPT_FAILONERROR, 1);
 
         // enable redirection
         curl_easy_setopt(pCURL, CURLOPT_FOLLOWLOCATION, 1);
-
+        
         // write function
         curl_easy_setopt(pCURL, CURLOPT_WRITEDATA, &out);
         curl_easy_setopt(pCURL, CURLOPT_WRITEFUNCTION, &write_function);
-
+        
         // progress handler - Condition::check unfortunatly is not defined const
         curl_easy_setopt(pCURL, CURLOPT_NOPROGRESS, 0);
         curl_easy_setopt(pCURL, CURLOPT_PROGRESSFUNCTION, &progress_callback);
         curl_easy_setopt(pCURL, CURLOPT_PROGRESSDATA, &out);
-
+        
         // proxy
         curl_easy_setopt(pCURL, CURLOPT_PROXY, aProxyHost.getStr());
         curl_easy_setopt(pCURL, CURLOPT_PROXYTYPE, CURLPROXY_HTTP);
         if( -1 != nProxyPort )
             curl_easy_setopt(pCURL, CURLOPT_PROXYPORT, nProxyPort);
-
+        
         if( out.Offset > 0 )
         {
-            // curl_off_t offset = nOffset; libcurl seems to be compiled with large
+            // curl_off_t offset = nOffset; libcurl seems to be compiled with large 
             // file support (and we not) ..
             sal_Int64 offset = (sal_Int64) out.Offset;
             curl_easy_setopt(pCURL, CURLOPT_RESUME_FROM_LARGE, offset);
         }
-
+        
         CURLcode cc = curl_easy_perform(pCURL);
 
         // treat zero byte downloads as errors
         if( NULL == out.FileHandle )
             openFile(out);
-
+    
         if( CURLE_OK == cc )
         {
             out.Handler->downloadFinished(out.File);
             ret = true;
         }
-
+        
         if ( CURLE_PARTIAL_FILE  == cc )
         {
             // this sometimes happens, when a user throws away his user data, but has already
@@ -318,7 +318,7 @@ bool curl_run(const rtl::OUString& rURL, OutData& out, const rtl::OString& aProx
                 ret = true;
             }
         }
-
+        
         // Avoid target file being removed
         else if( (CURLE_ABORTED_BY_CALLBACK == cc) || out.StopCondition.check() )
             ret = true;
@@ -327,7 +327,7 @@ bool curl_run(const rtl::OUString& rURL, OutData& out, const rtl::OString& aProx
         else
         {
             rtl::OString aMessage(RTL_CONSTASCII_STRINGPARAM("Unknown error"));
-
+            
             const char * error_message = curl_easy_strerror(cc);
             if( NULL != error_message )
                 aMessage = error_message;
@@ -357,20 +357,20 @@ bool curl_run(const rtl::OUString& rURL, OutData& out, const rtl::OString& aProx
             if ( !ret )
                 out.Handler->downloadStalled( rtl::OStringToOUString(aMessage, RTL_TEXTENCODING_UTF8) );
         }
-
+        
         curl_easy_cleanup(pCURL);
     }
-
+    
     return ret;
 }
 
 //------------------------------------------------------------------------------
 
-bool
+bool 
 Download::start(const rtl::OUString& rURL, const rtl::OUString& rFile, const rtl::OUString& rDestinationDir)
 {
     OSL_ASSERT( m_aHandler.is() );
-
+    
     OutData out(m_aCondition);
     rtl::OUString aFile( rFile );
 
@@ -430,13 +430,13 @@ Download::start(const rtl::OUString& rURL, const rtl::OUString& rFile, const rtl
         else if( osl_File_E_NOENT == rc ) // file has been deleted meanwhile ..
             out.File = rtl::OUString();
     }
-
+            
     rtl::OString aProxyHost;
     sal_Int32    nProxyPort = -1;
     getProxyForURL(rURL, aProxyHost, nProxyPort);
 
     bool ret = curl_run(rURL, out, aProxyHost, nProxyPort);
-
+    
     if( NULL != out.FileHandle )
     {
         osl_syncFile(out.FileHandle);
@@ -447,14 +447,14 @@ Download::start(const rtl::OUString& rURL, const rtl::OUString& rFile, const rtl
 //        if( ! ret )
 //            osl_removeFile(out.File.pData);
     }
-
+    
     m_aCondition.reset();
     return ret;
 }
 
 //------------------------------------------------------------------------------
 
-void
+void 
 Download::stop()
 {
     m_aCondition.set();
diff --git a/extensions/source/update/check/download.hxx b/extensions/source/update/check/download.hxx
index 00106660b4af..8aa9e4ea3184 100644
--- a/extensions/source/update/check/download.hxx
+++ b/extensions/source/update/check/download.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ struct DownloadInteractionHandler : public rtl::IReference
 
     // called if the destination file already exists, but resume is false
     virtual bool downloadTargetExists(const rtl::OUString& rFileName) = 0;
-
+    
     // called when curl reports an error
     virtual void downloadStalled(const rtl::OUString& rErrorMessage) = 0;
-
+    
     // progress handler
     virtual void downloadProgressAt(sal_Int8 nPercent) = 0;
-
+    
     // called on first progress notification
     virtual void downloadStarted(const rtl::OUString& rFileName, sal_Int64 nFileSize) = 0;
 
@@ -63,19 +63,19 @@ public:
 
     // returns true when the content of rURL was successfully written to rLocalFile
     bool start(const rtl::OUString& rURL, const rtl::OUString& rFile, const rtl::OUString& rDestinationDir);
-
+    
     // stops the download after the next write operation
     void stop();
-
+    
     // returns true if the stop condition is set
     bool isStopped() const
         { return sal_True == const_cast <Download *> (this)->m_aCondition.check(); };
-
+    
 protected:
 
     // Determines the appropriate proxy settings for the given URL. Returns true if a proxy should be used
     void getProxyForURL(const rtl::OUString& rURL, rtl::OString& rHost, sal_Int32& rPort) const;
-
+        
 private:
     osl::Condition m_aCondition;
     const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& m_xContext;
diff --git a/extensions/source/update/check/transform.pl b/extensions/source/update/check/transform.pl
index fb452ae0482c..760acf55e60e 100644
--- a/extensions/source/update/check/transform.pl
+++ b/extensions/source/update/check/transform.pl
@@ -5,7 +5,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
@@ -32,14 +32,14 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 while (<>) {
 
   if( /<prop/ ) {
-    $prop = $_;
+    $prop = $_;    
     next if( /Text/ || /Bubble/ );
   }
-
+  
   if( /<\/prop>/ ) {
     next if( $prop =~ /Text/ || $prop =~ /Bubble/ );
-  }
-
+  }  
+  
   if( /xml:lang/ ) {
     $lang = $_;
     $lang =~ s/.*xml:lang=\"//;
@@ -56,6 +56,6 @@ while (<>) {
     print $line;
     next;
   }
-
+  
   print;
 }
\ No newline at end of file
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index ccfcda6157cb..310d585649e8 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,17 +101,17 @@ rtl::OUString getReleaseNote(const UpdateInfo& rInfo, sal_uInt8 pos, bool autoDo
         }
         else if( (pos == iter->Pos2) && ((1 == iter->Pos) || (2 == iter->Pos)) && autoDownloadEnabled )
             return iter->URL2;
-
+        
         ++iter;
     }
-
-    return rtl::OUString();
+            
+    return rtl::OUString();    
 }
 
 //------------------------------------------------------------------------------
 
-namespace
-{
+namespace 
+{ 
 
 static inline rtl::OUString getBuildId()
 {
@@ -149,14 +149,14 @@ rtl::OUString getImageFromFileName(const rtl::OUString& aFile)
         {
             aUnpackPath = aUnpackPath.copy( 0, lastIndex+1 );
             aUnpackPath  += UNISTRING( "unpack_update" );
-        }
-
+        } 
+        
         oslFileHandle hOut = NULL;
         oslProcess hProcess = NULL;
-
+        
         rtl::OUString aSystemPath;
         osl::File::getSystemPathFromFileURL(aFile, aSystemPath);
-
+        
         oslProcessError rc = osl_executeProcess_WithRedirectedIO(
             aUnpackPath.pData,                                  // [in] Image name
             &aSystemPath.pData, 1,                              // [in] Arguments
@@ -167,12 +167,12 @@ rtl::OUString getImageFromFileName(const rtl::OUString& aFile)
             &hProcess,                                          // [out] Process handle
             NULL, &hOut, NULL                                   // [out] File handles for redirected I/O
         );
-
+        
         if( osl_Process_E_None == rc )
         {
             oslProcessInfo aInfo;
             aInfo.Size = sizeof(oslProcessInfo);
-
+            
             if( osl_Process_E_None == osl_getProcessInfo(hProcess, osl_Process_EXITCODE, &aInfo) )
             {
                 if( 0 == aInfo.Code )
@@ -180,7 +180,7 @@ rtl::OUString getImageFromFileName(const rtl::OUString& aFile)
                     sal_Char   szBuffer[4096];
                     sal_uInt64 nBytesRead = 0;
                     const sal_uInt64 nBytesToRead = sizeof(szBuffer) - 1;
-
+                    
                     rtl::OUString aImageName;
                     while( osl_File_E_None == osl_readFile(hOut, szBuffer, nBytesToRead, &nBytesRead) )
                     {
@@ -188,26 +188,26 @@ rtl::OUString getImageFromFileName(const rtl::OUString& aFile)
                         do
                         {
                             *pc = '\0'; --pc;
-                        }
+                        } 
                         while( ('\n' == *pc) || ('\r' == *pc) );
-
+                        
                         aImageName += rtl::OUString(szBuffer, pc - szBuffer + 1, osl_getThreadTextEncoding());
 
                         if( nBytesRead < nBytesToRead )
                             break;
                     }
-
+                    
                     if( osl::FileBase::E_None == osl::FileBase::getFileURLFromSystemPath(aImageName, aImageName) )
                         return aImageName;
                 }
             }
-
+            
             osl_closeFile(hOut);
             osl_freeProcessHandle(hProcess);
         }
-    }
+    }        
 #endif
-
+        
     return aFile;
 }
 
@@ -219,15 +219,15 @@ static uno::Reference< beans::XPropertySet > createMenuBarUI(
     const uno::Reference< task::XJob >& xJob)
 {
     if( !xContext.is() )
-        throw uno::RuntimeException(
+        throw uno::RuntimeException( 
             UNISTRING( "UpdateCheckJob: empty component context" ), uno::Reference< uno::XInterface > () );
 
     uno::Reference< lang::XMultiComponentFactory > xServiceManager(xContext->getServiceManager());
     if( !xServiceManager.is() )
-        throw uno::RuntimeException(
+        throw uno::RuntimeException( 
             UNISTRING( "UpdateCheckJob: unable to obtain service manager from component context" ), uno::Reference< uno::XInterface > () );
 
-    uno::Reference< beans::XPropertySet > xMenuBarUI =
+    uno::Reference< beans::XPropertySet > xMenuBarUI = 
         uno::Reference< beans::XPropertySet > (
             xServiceManager->createInstanceWithContext( UNISTRING( "com.sun.star.setup.UpdateCheckUI" ), xContext ),
             uno::UNO_QUERY_THROW);
@@ -244,7 +244,7 @@ static uno::Reference< beans::XPropertySet > createMenuBarUI(
 typedef sal_Bool (* OnlineCheckFunc) ();
 
 class UpdateCheckThread : public WorkerThread
-{
+{    
 
 public:
     UpdateCheckThread( osl::Condition& rCondition,
@@ -266,17 +266,17 @@ protected:
 private:
 
     /* Used to avoid dialup login windows (on platforms we know how to double this) */
-    inline bool hasInternetConnection() const
+    inline bool hasInternetConnection() const 
     {
         if(m_pHasInternetConnection != NULL )
             return (sal_True == m_pHasInternetConnection());
         return true;
     }
-
+    
     /* Creates a new instance of UpdateInformationProvider and returns this instance */
     inline uno::Reference<deployment::XUpdateInformationProvider> createProvider()
-    {
-        osl::MutexGuard aGuard(m_aMutex);
+    { 
+        osl::MutexGuard aGuard(m_aMutex); 
         m_xProvider = deployment::UpdateInformationProvider::create(m_xContext);
         return m_xProvider;
     };
@@ -288,19 +288,19 @@ private:
     /* Releases the remembered instance of UpdateInformationProvider if any */
     inline void clearProvider()
         { osl::MutexGuard aGuard(m_aMutex); m_xProvider.clear(); };
-
+        
     osl::Mutex      m_aMutex;
     osl::Module     m_aModule;
-
+        
 protected:
     osl::Condition& m_aCondition;
 
 private:
 
-//    const
+//    const 
     OnlineCheckFunc m_pHasInternetConnection;
 
-    const uno::Reference<uno::XComponentContext> m_xContext;
+    const uno::Reference<uno::XComponentContext> m_xContext;   
     uno::Reference<deployment::XUpdateInformationProvider> m_xProvider;
 };
 
@@ -308,32 +308,32 @@ private:
 class ManualUpdateCheckThread : public UpdateCheckThread
 {
 public:
-    ManualUpdateCheckThread( osl::Condition& rCondition, const uno::Reference<uno::XComponentContext>& xContext ) :
+    ManualUpdateCheckThread( osl::Condition& rCondition, const uno::Reference<uno::XComponentContext>& xContext ) : 
         UpdateCheckThread(rCondition, xContext) {};
 
     virtual void SAL_CALL run();
 };
-
+    
 
 class MenuBarButtonJob : public ::cppu::WeakImplHelper1< task::XJob >
 {
 public:
     MenuBarButtonJob(const rtl::Reference< UpdateCheck >& rUpdateCheck);
-
+    
     // XJob
-    virtual uno::Any SAL_CALL execute(const uno::Sequence<beans::NamedValue>&)
+    virtual uno::Any SAL_CALL execute(const uno::Sequence<beans::NamedValue>&) 
         throw (lang::IllegalArgumentException, uno::Exception);
-
+    
 private:
     rtl::Reference< UpdateCheck > m_aUpdateCheck;
 };
-
+    
 class DownloadThread :  public WorkerThread
 {
 public:
     DownloadThread(
         osl::Condition& rCondition,
-        const uno::Reference<uno::XComponentContext>& xContext,
+        const uno::Reference<uno::XComponentContext>& xContext, 
         const rtl::Reference< DownloadInteractionHandler >& rHandler,
         const rtl::OUString& rURL );
 
@@ -377,7 +377,7 @@ UpdateCheckThread::UpdateCheckThread( osl::Condition& rCondition,
     m_pHasInternetConnection(NULL),
     m_xContext(xContext)
 {
-
+    
 #ifdef WNT
     rtl::OUString aPath;
     if( osl_getExecutableFile(&aPath.pData) == osl_Process_E_None )
@@ -388,7 +388,7 @@ UpdateCheckThread::UpdateCheckThread( osl::Condition& rCondition,
             aPath = aPath.copy( 0, lastIndex+1 );
             aPath  += UNISTRING( "onlinecheck" );
         }
-
+        
         if ( m_aModule.load(aPath) )
         {
             m_pHasInternetConnection =
@@ -397,7 +397,7 @@ UpdateCheckThread::UpdateCheckThread( osl::Condition& rCondition,
         }
     }
 #endif
-
+    
     createSuspended();
 
     // actually run the thread
@@ -413,7 +413,7 @@ UpdateCheckThread::~UpdateCheckThread()
 //------------------------------------------------------------------------------
 
 
-void SAL_CALL
+void SAL_CALL 
 UpdateCheckThread::terminate()
 {
     // Cancel potentially hanging http request ..
@@ -424,11 +424,11 @@ UpdateCheckThread::terminate()
 
 //------------------------------------------------------------------------------
 
-void SAL_CALL
+void SAL_CALL 
 UpdateCheckThread::join()
 {
     uno::Reference< deployment::XUpdateInformationProvider > xProvider(getProvider());
-
+    
     // do not join during an update check until #i73893# is fixed
     if( ! xProvider.is() )
     {
@@ -438,18 +438,18 @@ UpdateCheckThread::join()
 
 //------------------------------------------------------------------------------
 
-void SAL_CALL
+void SAL_CALL 
 UpdateCheckThread::cancel()
 {
     uno::Reference< deployment::XUpdateInformationProvider > xProvider(getProvider());
-
+    
     if( xProvider.is() )
-        xProvider->cancel();
+        xProvider->cancel();   
 }
 
 //------------------------------------------------------------------------------
 
-bool
+bool 
 UpdateCheckThread::runCheck( bool & rbExtensionsChecked )
 {
     bool ret = false;
@@ -457,7 +457,7 @@ UpdateCheckThread::runCheck( bool & rbExtensionsChecked )
 
     UpdateInfo aInfo;
     rtl::Reference< UpdateCheck > aController(UpdateCheck::get());
-
+    
     if( checkForUpdates(aInfo, m_xContext, aController->getInteractionHandler(), createProvider()) )
     {
         aController->setUpdateInfo(aInfo);
@@ -506,53 +506,53 @@ UpdateCheckThread::run()
 
     osl::Condition::Result aResult = osl::Condition::result_timeout;
     TimeValue tv = { 10, 0 };
-
+    
     // Initial wait to avoid doing further time consuming tasks during start-up
     aResult = m_aCondition.wait(&tv);
-
+    
     try {
-
+        
         while( sal_True == schedule() )
         {
             /* Use cases:
              *  a) manual check requested from auto check thread - "last check" should not be checked (one time)
              *     a1) manual check was requested in the middle of a running auto check,
-             *         condition is set
+             *         condition is set 
              *     a2) manual check was requested while waiting for a retry,
-             *         condition is set
-             *     a3) manual check was requested while waiting for time to next
+             *         condition is set 
+             *     a3) manual check was requested while waiting for time to next 
              *         scheduled check elapsing, condition is set
              *     a4) manual check was requested during initial wait, condition is set
-             *  b) check interval got changed, condition may be set - same sub-cases as a),
+             *  b) check interval got changed, condition may be set - same sub-cases as a), 
              *     but "last check" should be honored
              *  c) normal auto check mode, condition not set - "last check" should be honored
              */
-
+                        
             // Accessing const members without synchronization
-            rtl::Reference< UpdateCheck > aController(UpdateCheck::get());
+            rtl::Reference< UpdateCheck > aController(UpdateCheck::get());            
             rtl::Reference< UpdateCheckConfig > rModel = UpdateCheckConfig::get(m_xContext, *aController);
-
+            
             // FIXME: remember last & offset ?
             sal_Int64 last   = rModel->getLastChecked();
             sal_Int64 offset = rModel->getCheckInterval();
-
+            
             rModel.clear();
-
+            
             // last == 0 means check immediately
             bool checkNow = ! (last > 0);
-
-            // Reset the condition to avoid busy loops
+            
+            // Reset the condition to avoid busy loops 
             if( osl::Condition::result_ok == aResult )
             {
                 m_aCondition.reset();
                 aResult = osl::Condition::result_timeout;
                 checkNow = aController->isDialogShowing();
             }
-
-            if( ! checkNow )
+            
+            if( ! checkNow ) 
             {
                 osl_getSystemTime(&systime);
-
+                
                 // Go back to sleep until time has elapsed
                 sal_Int64 next = last + offset;
                 if( last + offset > systime.Seconds )
@@ -565,21 +565,21 @@ UpdateCheckThread::run()
             }
 
             static sal_uInt8 n = 0;
-
+            
             if( ! hasInternetConnection() || ! runCheck( bExtensionsChecked ) )
             {
                 // the extension update check should be independent from the office update check
-                //
+                // 
                 osl_getSystemTime( &systime );
                 if ( nExtCheckTime.Seconds + offset < systime.Seconds )
                     bExtensionsChecked = false;
 
                 // Increase next by 15, 60, .. minutes
                 static const sal_Int32 nRetryInterval[] = { 900, 3600, 14400, 86400 };
-
+                
                 if( n < sizeof(nRetryInterval) / sizeof(sal_Int32) )
                     ++n;
-
+                
                 tv.Seconds = nRetryInterval[n-1];
                 aResult = m_aCondition.wait(&tv);
             }
@@ -590,12 +590,12 @@ UpdateCheckThread::run()
             }
         }
     }
-
+    
     catch(const uno::Exception& e) {
         // Silently catch all errors
         OSL_TRACE( "Caught exception: %s\n thread terminated.\n",
             rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr() );
-    }
+    }    
 }
 
 //------------------------------------------------------------------------------
@@ -613,20 +613,20 @@ ManualUpdateCheckThread::run()
         // Silently catch all errors
         OSL_TRACE( "Caught exception: %s\n thread terminated.\n",
             rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr() );
-    }
+    }    
 }
 
 //------------------------------------------------------------------------------
 
-MenuBarButtonJob::MenuBarButtonJob(const rtl::Reference< UpdateCheck >& rUpdateCheck) :
-    m_aUpdateCheck(rUpdateCheck)
+MenuBarButtonJob::MenuBarButtonJob(const rtl::Reference< UpdateCheck >& rUpdateCheck) : 
+    m_aUpdateCheck(rUpdateCheck) 
 {
 };
-
+    
 //------------------------------------------------------------------------------
 
-uno::Any SAL_CALL
-MenuBarButtonJob::execute(const uno::Sequence<beans::NamedValue>& )
+uno::Any SAL_CALL 
+MenuBarButtonJob::execute(const uno::Sequence<beans::NamedValue>& ) 
     throw (lang::IllegalArgumentException, uno::Exception)
 {
     if ( m_aUpdateCheck->shouldShowExtUpdDlg() )
@@ -640,8 +640,8 @@ MenuBarButtonJob::execute(const uno::Sequence<beans::NamedValue>& )
 //------------------------------------------------------------------------------
 
 DownloadThread::DownloadThread(osl::Condition& rCondition,
-                               const uno::Reference<uno::XComponentContext>& xContext,
-                               const rtl::Reference< DownloadInteractionHandler >& rHandler,
+                               const uno::Reference<uno::XComponentContext>& xContext, 
+                               const rtl::Reference< DownloadInteractionHandler >& rHandler, 
                                const rtl::OUString& rURL) :
     m_aCondition(rCondition),
     m_xContext(xContext),
@@ -658,8 +658,8 @@ DownloadThread::~DownloadThread()
 }
 
 //------------------------------------------------------------------------------
-
-void SAL_CALL
+        
+void SAL_CALL 
 DownloadThread::run()
 {
 #ifdef WNT
@@ -670,28 +670,28 @@ DownloadThread::run()
     while( schedule() )
     {
         rtl::Reference< UpdateCheckConfig > rModel = UpdateCheckConfig::get(m_xContext);
-
+        
         rtl::OUString aLocalFile = rModel->getLocalFileName();
         rtl::OUString aDownloadDest = rModel->getDownloadDestination();
 
         // release config class for now
         rModel.clear();
-
+            
         static sal_uInt8 n = 0;
         if( ! m_aDownload.start(m_aURL, aLocalFile, aDownloadDest ) )
         {
             // retry every 15s unless the dialog is not visible
             TimeValue tv;
             tv.Seconds = 15;
-
+            
             if( ! UpdateCheck::get()->isDialogShowing() )
             {
                 // Increase next by 1, 5, 15, 60, .. minutes
                 static const sal_Int16 nRetryInterval[] = { 60, 300, 900, 3600 };
-
+                
                 if( n < sizeof(nRetryInterval) / sizeof(sal_Int16) )
                     ++n;
-
+                
                 tv.Seconds = nRetryInterval[n-1];
             }
             m_aCondition.wait(&tv);
@@ -710,9 +710,9 @@ void SAL_CALL DownloadThread::cancel()
 {
     m_aDownload.stop();
     resume();
-
+    
     rtl::Reference< UpdateCheck > aController(UpdateCheck::get());
-    aController->cancelDownload();
+    aController->cancelDownload();   
 }
 
 //------------------------------------------------------------------------------
@@ -743,7 +743,7 @@ ShutdownThread::~ShutdownThread()
 }
 
 //------------------------------------------------------------------------------
-void SAL_CALL
+void SAL_CALL 
 ShutdownThread::run()
 {
     TimeValue tv = { 0, 250 };
@@ -752,16 +752,16 @@ ShutdownThread::run()
 
     // Tell QuickStarter not to veto ..
     uno::Reference< beans::XFastPropertySet > xQuickStarter(
-        UpdateCheck::createService(UNISTRING("com.sun.star.office.Quickstart"), m_xContext),
+        UpdateCheck::createService(UNISTRING("com.sun.star.office.Quickstart"), m_xContext), 
         uno::UNO_QUERY
     );
 
     if (xQuickStarter.is())
-        xQuickStarter->setFastPropertyValue(0, uno::makeAny(false));
+        xQuickStarter->setFastPropertyValue(0, uno::makeAny(false)); 
 
     // Shutdown the office
     uno::Reference< frame::XDesktop > xDesktop(
-        UpdateCheck::createService(UNISTRING("com.sun.star.frame.Desktop"), m_xContext),
+        UpdateCheck::createService(UNISTRING("com.sun.star.frame.Desktop"), m_xContext), 
         uno::UNO_QUERY);
 
     if( xDesktop.is() )
@@ -782,12 +782,12 @@ void SAL_CALL ShutdownThread::onTerminated()
 //------------------------------------------------------------------------------
 
 
-void
+void 
 UpdateCheck::initialize(const uno::Sequence< beans::NamedValue >& rValues,
                         const uno::Reference<uno::XComponentContext>& xContext)
 {
     osl::MutexGuard aGuard(m_aMutex);
-
+    
     if( NOT_INITIALIZED == m_eState )
     {
         NamedValueByNameAccess aNameAccess(rValues);
@@ -795,9 +795,9 @@ UpdateCheck::initialize(const uno::Sequence< beans::NamedValue >& rValues,
         m_xContext = xContext;
 
         rtl::OUString aUpdateEntryVersion = aModel.getUpdateEntryVersion();
-
+        
         aModel.getUpdateEntry(m_aUpdateInfo);
-
+        
         bool obsoleteUpdateInfo = isObsoleteUpdateInfo(aUpdateEntryVersion);
         bool bContinueDownload = false;
         bool bDownloadAvailable = false;
@@ -806,7 +806,7 @@ UpdateCheck::initialize(const uno::Sequence< beans::NamedValue >& rValues,
         m_bShowExtUpdDlg = false;
 
         rtl::OUString aLocalFileName = aModel.getLocalFileName();
-
+        
         if( aLocalFileName.getLength() > 0 )
         {
             bContinueDownload = true;
@@ -845,24 +845,24 @@ UpdateCheck::initialize(const uno::Sequence< beans::NamedValue >& rValues,
                 enableDownload(true, downloadPaused);
                 setUIState(downloadPaused ? UPDATESTATE_DOWNLOAD_PAUSED : UPDATESTATE_DOWNLOADING);
             }
-
+            
         }
         if ( !bContinueDownload )
         {
             // We do this intentionally only if no download is in progress ..
-            if( obsoleteUpdateInfo )
+            if( obsoleteUpdateInfo ) 
             {
                 // Bring-up release note for position 5 ..
                 const rtl::OUString aURL(getReleaseNote(m_aUpdateInfo, 5));
                 if( aURL.getLength() > 0 )
                     showReleaseNote(aURL);
-
-                // Data is outdated, probably due to installed update
+                
+                // Data is outdated, probably due to installed update 
                 rtl::Reference< UpdateCheckConfig > aConfig = UpdateCheckConfig::get( xContext, *this );
                 aConfig->clearUpdateFound();
                 aConfig->clearLocalFileName();
-
-
+    
+                
                 m_aUpdateInfo = UpdateInfo();
                 // Remove outdated release notes
                 storeReleaseNote( 1, rtl::OUString() );
@@ -882,25 +882,25 @@ UpdateCheck::initialize(const uno::Sequence< beans::NamedValue >& rValues,
 
 //------------------------------------------------------------------------------
 
-void
+void 
 UpdateCheck::cancel()
 {
     osl::ClearableMutexGuard aGuard(m_aMutex);
-
+    
     WorkerThread *pThread = m_pThread;
     UpdateState eUIState = getUIState(m_aUpdateInfo);
 
     aGuard.clear();
-
+    
     if( NULL != pThread )
         pThread->cancel();
-
+    
     setUIState(eUIState);
 }
 
 //------------------------------------------------------------------------------
 
-void
+void 
 UpdateCheck::download()
 {
     osl::ClearableMutexGuard aGuard(m_aMutex);
@@ -914,7 +914,7 @@ UpdateCheck::download()
         if( DOWNLOADING != eState )
         {
             shutdownThread(true);
-
+    
             osl::ClearableMutexGuard aGuard2(m_aMutex);
             enableDownload(true);
             aGuard2.clear();
@@ -929,30 +929,30 @@ UpdateCheck::download()
 
 //------------------------------------------------------------------------------
 
-void
+void 
 UpdateCheck::install()
 {
     osl::MutexGuard aGuard(m_aMutex);
-
+    
     const uno::Reference< c3s::XSystemShellExecute > xShellExecute(
         createService( UNISTRING( "com.sun.star.system.SystemShellExecute" ), m_xContext ),
         uno::UNO_QUERY );
-
+    
     try {
         // Construct install command ??
-
+        
         // Store release note for position 3 and 4
         rtl::OUString aURL(getReleaseNote(m_aUpdateInfo, 3));
         storeReleaseNote(1, aURL);
 
         aURL = getReleaseNote(m_aUpdateInfo, 4);
         storeReleaseNote(2, aURL);
-
+        
         if( xShellExecute.is() )
         {
             rtl::OUString aInstallImage(m_aImageName);
             osl::FileBase::getSystemPathFromFileURL(aInstallImage, aInstallImage);
-
+           
             rtl::OUString aParameter;
             sal_Int32 nFlags = c3s::SystemShellExecuteFlags::DEFAULTS;
 #if ( defined LINUX || defined SOLARIS )
@@ -960,9 +960,9 @@ UpdateCheck::install()
             aParameter = getBaseInstallation();
             if( aParameter.getLength() > 0 )
                 osl::FileBase::getSystemPathFromFileURL(aParameter, aParameter);
-
+            
             aParameter += UNISTRING(" &");
-#endif
+#endif            
 
             rtl::Reference< UpdateCheckConfig > rModel = UpdateCheckConfig::get( m_xContext );
             rModel->clearLocalFileName();
@@ -978,41 +978,41 @@ UpdateCheck::install()
 
 //------------------------------------------------------------------------------
 
-void
+void 
 UpdateCheck::pause()
 {
     osl::ClearableMutexGuard aGuard(m_aMutex);
-
+    
     if( NULL != m_pThread )
         m_pThread->suspend();
-
+    
     rtl::Reference< UpdateCheckConfig > rModel = UpdateCheckConfig::get(m_xContext);
     aGuard.clear();
-
+    
     rModel->storeDownloadPaused(true);
     setUIState(UPDATESTATE_DOWNLOAD_PAUSED);
 }
 
 //------------------------------------------------------------------------------
 
-void
+void 
 UpdateCheck::resume()
 {
     osl::ClearableMutexGuard aGuard(m_aMutex);
-
+    
     if( NULL != m_pThread )
         m_pThread->resume();
-
+    
     rtl::Reference< UpdateCheckConfig > rModel = UpdateCheckConfig::get(m_xContext);
     aGuard.clear();
-
+    
     rModel->storeDownloadPaused(false);
     setUIState(UPDATESTATE_DOWNLOADING);
 }
 
 //------------------------------------------------------------------------------
 
-void
+void 
 UpdateCheck::closeAfterFailure()
 {
     osl::ClearableMutexGuard aGuard(m_aMutex);
@@ -1027,16 +1027,16 @@ UpdateCheck::closeAfterFailure()
 
 //------------------------------------------------------------------------------
 
-void
+void 
 UpdateCheck::shutdownThread(bool join)
 {
     osl::ClearableMutexGuard aGuard(m_aMutex);
-
+    
     // copy thread object pointer to stack
     osl::Thread *pThread = m_pThread;
     m_pThread = NULL;
     aGuard.clear();
-
+    
     if( NULL != pThread )
     {
         pThread->terminate();
@@ -1051,22 +1051,22 @@ UpdateCheck::shutdownThread(bool join)
 
 //------------------------------------------------------------------------------
 
-void
+void 
 UpdateCheck::enableAutoCheck(bool enable)
 {
     if( enable )
         m_pThread = new UpdateCheckThread(m_aCondition, m_xContext);
-
-    m_eState = enable ? CHECK_SCHEDULED : DISABLED;
+    
+    m_eState = enable ? CHECK_SCHEDULED : DISABLED;    
 }
 
 //------------------------------------------------------------------------------
 
-void
+void 
 UpdateCheck::enableDownload(bool enable, bool paused)
 {
     OSL_ASSERT(NULL == m_pThread);
-
+    
     State eState = DISABLED;
     if( enable )
     {
@@ -1078,27 +1078,27 @@ UpdateCheck::enableDownload(bool enable, bool paused)
         }
         else
             eState = DOWNLOAD_PAUSED;
-
+        
         m_eState = eState;
     }
     else {
         enableAutoCheck(UpdateCheckConfig::get(m_xContext)->isAutoCheckEnabled());
     }
-
+    
 }
 
 //------------------------------------------------------------------------------
 
-bool
+bool 
 UpdateCheck::downloadTargetExists(const rtl::OUString& rFileName)
 {
     osl::ClearableMutexGuard aGuard(m_aMutex);
-
+    
     rtl::Reference< UpdateHandler > aUpdateHandler(getUpdateHandler());
     UpdateState eUIState = UPDATESTATE_DOWNLOADING;
-
+    
     bool cont = false;
-
+    
     if( aUpdateHandler->isVisible() )
     {
         cont = aUpdateHandler->showOverwriteWarning();
@@ -1118,16 +1118,16 @@ UpdateCheck::downloadTargetExists(const rtl::OUString& rFileName)
         m_aImageName = getImageFromFileName(rFileName);
         eUIState = UPDATESTATE_DOWNLOAD_AVAIL;
     }
-
+    
     if( !cont )
     {
         shutdownThread(false);
         enableDownload(false);
-
+        
         aGuard.clear();
         setUIState(eUIState);
-    }
-
+    }        
+    
     return cont;
 }
 
@@ -1135,48 +1135,48 @@ UpdateCheck::downloadTargetExists(const rtl::OUString& rFileName)
 bool UpdateCheck::checkDownloadDestination( const rtl::OUString& rFileName )
 {
     osl::ClearableMutexGuard aGuard(m_aMutex);
-
+    
     rtl::Reference< UpdateHandler > aUpdateHandler( getUpdateHandler() );
-
+    
     bool bReload = false;
-
+    
     if( aUpdateHandler->isVisible() )
     {
         bReload = aUpdateHandler->showOverwriteWarning( rFileName );
     }
-
+    
     return bReload;
 }
 
 //------------------------------------------------------------------------------
 
-void
+void 
 UpdateCheck::downloadStalled(const rtl::OUString& rErrorMessage)
 {
     osl::ClearableMutexGuard aGuard(m_aMutex);
     rtl::Reference< UpdateHandler > aUpdateHandler(getUpdateHandler());
     aGuard.clear();
-
+    
     aUpdateHandler->setErrorMessage(rErrorMessage);
     setUIState(UPDATESTATE_ERROR_DOWNLOADING);
 }
 
 //------------------------------------------------------------------------------
 
-void
+void 
 UpdateCheck::downloadProgressAt(sal_Int8 nPercent)
 {
     osl::ClearableMutexGuard aGuard(m_aMutex);
     rtl::Reference< UpdateHandler > aUpdateHandler(getUpdateHandler());
     aGuard.clear();
-
+    
     aUpdateHandler->setProgress(nPercent);
     setUIState(UPDATESTATE_DOWNLOADING);
 }
 
 //------------------------------------------------------------------------------
 
-void
+void 
 UpdateCheck::downloadStarted(const rtl::OUString& rLocalFileName, sal_Int64 nFileSize)
 {
     if ( nFileSize > 0 )
@@ -1195,20 +1195,20 @@ UpdateCheck::downloadStarted(const rtl::OUString& rLocalFileName, sal_Int64 nFil
 
 //------------------------------------------------------------------------------
 
-void
+void 
 UpdateCheck::downloadFinished(const rtl::OUString& rLocalFileName)
 {
     osl::ClearableMutexGuard aGuard(m_aMutex);
-
+    
     // no more retries
     m_pThread->terminate();
-
+    
     m_aImageName = getImageFromFileName(rLocalFileName);
     UpdateInfo aUpdateInfo(m_aUpdateInfo);
-
+    
     aGuard.clear();
     setUIState(UPDATESTATE_DOWNLOAD_AVAIL);
-
+    
     // Bring-up release note for position 2 ..
     rtl::Reference< UpdateCheckConfig > rModel = UpdateCheckConfig::get( m_xContext );
     const rtl::OUString aURL(getReleaseNote(aUpdateInfo, 2, rModel->isAutoDownloadEnabled()));
@@ -1222,12 +1222,12 @@ void
 UpdateCheck::cancelDownload()
 {
     shutdownThread(true);
-
+    
     osl::MutexGuard aGuard(m_aMutex);
     enableDownload(false);
-
+    
     rtl::Reference< UpdateCheckConfig > rModel = UpdateCheckConfig::get(m_xContext);
-
+    
     rtl::OUString aLocalFile(rModel->getLocalFileName());
     rModel->clearLocalFileName();
     rModel->storeDownloadPaused(false);
@@ -1240,7 +1240,7 @@ UpdateCheck::cancelDownload()
 
     /*oslFileError rc =*/ osl_removeFile(aLocalFile.pData);
     // FIXME: error handling ..
-
+    
 }
 
 //------------------------------------------------------------------------------
@@ -1249,10 +1249,10 @@ void
 UpdateCheck::showDialog(bool forceCheck)
 {
     osl::ResettableMutexGuard aGuard(m_aMutex);
-
+    
     bool update_found = m_aUpdateInfo.BuildId.getLength() > 0;
     bool bSetUIState = ! m_aUpdateHandler.is();
-
+    
     UpdateState eDialogState = UPDATESTATES_COUNT;
 
     switch( m_eState )
@@ -1269,15 +1269,15 @@ UpdateCheck::showDialog(bool forceCheck)
         else
             eDialogState = UPDATESTATE_UPDATE_NO_DOWNLOAD;
         break;
-
+            
     case DOWNLOADING:
         eDialogState = UPDATESTATE_DOWNLOADING;
         break;
-
+        
     case DOWNLOAD_PAUSED:
         eDialogState = UPDATESTATE_DOWNLOAD_PAUSED;
         break;
-
+        
     case NOT_INITIALIZED:
         OSL_ASSERT( false );
         break;
@@ -1289,9 +1289,9 @@ UpdateCheck::showDialog(bool forceCheck)
         setUIState(eDialogState, true); // suppress bubble as Dialog will be visible soon
         aGuard.reset();
     }
-
+ 
     getUpdateHandler()->setVisible(true);
-
+    
     // Run check in separate thread ..
     if( UPDATESTATE_CHECKING == eDialogState )
     {
@@ -1300,14 +1300,14 @@ UpdateCheck::showDialog(bool forceCheck)
             // destructs itself when done, not cancellable for now ..
             new ManualUpdateCheckThread(m_aCondition, m_xContext);
         }
-
+        
         m_aCondition.set();
     }
 }
 
 //------------------------------------------------------------------------------
 
-void
+void 
 UpdateCheck::setUpdateInfo(const UpdateInfo& aInfo)
 {
     osl::ClearableMutexGuard aGuard(m_aMutex);
@@ -1323,23 +1323,23 @@ UpdateCheck::setUpdateInfo(const UpdateInfo& aInfo)
     {
         if( iter->IsDirect )
             break;
-
+        
         ++iter;
     }
-
+    
     if( (iter != m_aUpdateInfo.Sources.begin()) &&
         (iter != m_aUpdateInfo.Sources.end()) &&
         iter->IsDirect )
     {
         m_aUpdateInfo.Sources.erase(m_aUpdateInfo.Sources.begin(), --iter);
     }
-
+       
     rtl::Reference< UpdateCheckConfig > rModel = UpdateCheckConfig::get(m_xContext, *this);
     OSL_ASSERT( rModel.is() );
-
+    
     // Decide whether to use alternate release note pos ..
     bool autoDownloadEnabled = rModel->isAutoDownloadEnabled();
-
+    
     std::vector< ReleaseNote >::iterator iter2 = m_aUpdateInfo.ReleaseNotes.begin();
     while( iter2 != m_aUpdateInfo.ReleaseNotes.end() )
     {
@@ -1350,22 +1350,22 @@ UpdateCheck::setUpdateInfo(const UpdateInfo& aInfo)
             iter2->Pos = iter2->Pos2;
             iter2->Pos2 = 0;
         }
-
+        
         ++iter2;
     }
-
+        
     // do not move below store/clear ..
     rModel->updateLastChecked();
-
+    
     UpdateState eUIState;
     if( m_aUpdateInfo.Sources.size() > 0 )
     {
         rModel->storeUpdateFound(aInfo, getBuildId());
-
+        
         if( m_aUpdateInfo.Sources[0].IsDirect )
         {
-            eUIState = UPDATESTATE_UPDATE_AVAIL;
-
+            eUIState = UPDATESTATE_UPDATE_AVAIL; 
+        
             if( rModel->isAutoDownloadEnabled() )
             {
                 shutdownThread(false);
@@ -1381,14 +1381,14 @@ UpdateCheck::setUpdateInfo(const UpdateInfo& aInfo)
         eUIState = UPDATESTATE_NO_UPDATE_AVAIL;
         rModel->clearUpdateFound();
     }
-
+    
     aGuard.clear();
     setUIState(eUIState, bSuppressBubble);
 }
 
 //------------------------------------------------------------------------------
 
-void
+void 
 UpdateCheck::setCheckFailedState()
 {
     setUIState(UPDATESTATE_ERROR_CHECKING);
@@ -1408,7 +1408,7 @@ void UpdateCheck::handleMenuBarUI( rtl::Reference< UpdateHandler > rUpdateHandle
         m_bShowExtUpdDlg = true;
     else
         m_bShowExtUpdDlg = false;
-
+        
     if( xMenuBarUI.is() )
     {
         if( UPDATESTATE_NO_UPDATE_AVAIL == eState )
@@ -1419,7 +1419,7 @@ void UpdateCheck::handleMenuBarUI( rtl::Reference< UpdateHandler > rUpdateHandle
         {
             xMenuBarUI->setPropertyValue( PROPERTY_TITLE, uno::makeAny(rUpdateHandler->getBubbleTitle(eState)) );
             xMenuBarUI->setPropertyValue( PROPERTY_TEXT, uno::makeAny(rUpdateHandler->getBubbleText(eState)) );
-
+            
             if( ! suppressBubble && ( ! rUpdateHandler->isVisible() || rUpdateHandler->isMinimized() ) )
                 xMenuBarUI->setPropertyValue( PROPERTY_SHOW_BUBBLE, uno::makeAny( sal_True ) );
 
@@ -1433,10 +1433,10 @@ void UpdateCheck::handleMenuBarUI( rtl::Reference< UpdateHandler > rUpdateHandle
 void UpdateCheck::setUIState(UpdateState eState, bool suppressBubble)
 {
     osl::ClearableMutexGuard aGuard(m_aMutex);
-
-    if( ! m_xMenuBarUI.is() &&
-        (DISABLED != m_eState) &&
-        ( m_bHasExtensionUpdate || (UPDATESTATE_NO_UPDATE_AVAIL != eState)) &&
+    
+    if( ! m_xMenuBarUI.is() && 
+        (DISABLED != m_eState) && 
+        ( m_bHasExtensionUpdate	|| (UPDATESTATE_NO_UPDATE_AVAIL != eState)) &&
         (UPDATESTATE_CHECKING != eState) &&
         (UPDATESTATE_ERROR_CHECKING != eState)
     )
@@ -1455,29 +1455,29 @@ void UpdateCheck::setUIState(UpdateState eState, bool suppressBubble)
 
     UpdateInfo aUpdateInfo(m_aUpdateInfo);
     rtl::OUString aImageName(m_aImageName);
-
+    
     aGuard.clear();
-
+    
     handleMenuBarUI( aUpdateHandler, eState, suppressBubble );
-
+    
     if( (UPDATESTATE_UPDATE_AVAIL == eState)
      || (UPDATESTATE_DOWNLOAD_PAUSED == eState)
      || (UPDATESTATE_DOWNLOADING == eState) )
     {
         uno::Reference< uno::XComponentContext > xContext(m_xContext);
 
-        rtl::OUString aDownloadDestination =
+        rtl::OUString aDownloadDestination = 
             UpdateCheckConfig::get(xContext, this)->getDownloadDestination();
 
         osl_getSystemPathFromFileURL(aDownloadDestination.pData, &aDownloadDestination.pData);
-
+        
         aUpdateHandler->setDownloadPath(aDownloadDestination);
     }
     else if( UPDATESTATE_DOWNLOAD_AVAIL == eState )
     {
         aUpdateHandler->setDownloadFile(aImageName);
     }
-
+    
     aUpdateHandler->setDescription(aUpdateInfo.Description);
     aUpdateHandler->setNextVersion(aUpdateInfo.Version);
     aUpdateHandler->setState(eState);
@@ -1485,11 +1485,11 @@ void UpdateCheck::setUIState(UpdateState eState, bool suppressBubble)
 
 //------------------------------------------------------------------------------
 
-UpdateState
+UpdateState 
 UpdateCheck::getUIState(const UpdateInfo& rInfo)
 {
     UpdateState eUIState = UPDATESTATE_NO_UPDATE_AVAIL;
-
+    
     if( rInfo.BuildId.getLength() > 0 )
     {
         if( rInfo.Sources[0].IsDirect )
@@ -1497,21 +1497,21 @@ UpdateCheck::getUIState(const UpdateInfo& rInfo)
         else
             eUIState = UPDATESTATE_UPDATE_NO_DOWNLOAD;
     }
-
+    
     return eUIState;
 }
 
 //------------------------------------------------------------------------------
 
-void
+void 
 UpdateCheck::showReleaseNote(const rtl::OUString& rURL) const
 {
     const uno::Reference< c3s::XSystemShellExecute > xShellExecute(
         createService( UNISTRING( "com.sun.star.system.SystemShellExecute" ), m_xContext ),
         uno::UNO_QUERY );
-
+    
     try {
-
+        
         if( xShellExecute.is() )
             xShellExecute->execute(rURL, rtl::OUString(), c3s::SystemShellExecuteFlags::DEFAULTS);
     } catch(c3s::SystemShellExecuteException&) {
@@ -1520,7 +1520,7 @@ UpdateCheck::showReleaseNote(const rtl::OUString& rURL) const
 
 //------------------------------------------------------------------------------
 
-bool
+bool 
 UpdateCheck::storeReleaseNote(sal_Int8 nNum, const rtl::OUString &rURL)
 {
     osl::FileBase::RC rc;
@@ -1572,12 +1572,12 @@ void UpdateCheck::showExtensionDialog()
     uno::Reference< uno::XInterface > xService;
 
     if( ! m_xContext.is() )
-        throw uno::RuntimeException(
+        throw uno::RuntimeException( 
             UNISTRING( "UpdateCheck::showExtensionDialog(): empty component context" ), uno::Reference< uno::XInterface > () );
 
     uno::Reference< lang::XMultiComponentFactory > xServiceManager( m_xContext->getServiceManager() );
     if( !xServiceManager.is() )
-        throw uno::RuntimeException(
+        throw uno::RuntimeException( 
             UNISTRING( "UpdateCheck::showExtensionDialog(): unable to obtain service manager from component context" ), uno::Reference< uno::XInterface > () );
 
     xService = xServiceManager->createInstanceWithContext( sServiceName, m_xContext );
@@ -1601,7 +1601,7 @@ UpdateCheck::getUpdateHandler()
 
 //------------------------------------------------------------------------------
 
-uno::Reference< task::XInteractionHandler >
+uno::Reference< task::XInteractionHandler > 
 UpdateCheck::getInteractionHandler() const
 {
     osl::MutexGuard aGuard(m_aMutex);
@@ -1616,44 +1616,44 @@ UpdateCheck::getInteractionHandler() const
 
 //------------------------------------------------------------------------------
 
-uno::Reference< uno::XInterface >
-UpdateCheck::createService(const rtl::OUString& rServiceName,
+uno::Reference< uno::XInterface > 
+UpdateCheck::createService(const rtl::OUString& rServiceName, 
                            const uno::Reference<uno::XComponentContext>& xContext)
 {
     if( !xContext.is() )
-        throw uno::RuntimeException(
-            UNISTRING( "UpdateCheckConfig: empty component context" ),
+        throw uno::RuntimeException( 
+            UNISTRING( "UpdateCheckConfig: empty component context" ), 
             uno::Reference< uno::XInterface >() );
-
+        
     const uno::Reference< lang::XMultiComponentFactory > xServiceManager(xContext->getServiceManager());
-
+    
     if( !xServiceManager.is() )
-        throw uno::RuntimeException(
-            UNISTRING( "UpdateCheckConfig: unable to obtain service manager from component context" ),
+        throw uno::RuntimeException( 
+            UNISTRING( "UpdateCheckConfig: unable to obtain service manager from component context" ), 
             uno::Reference< uno::XInterface >() );
-
+    
     return xServiceManager->createInstanceWithContext(rServiceName, xContext);
 }
 
 //------------------------------------------------------------------------------
 
-bool
+bool 
 UpdateCheck::isDialogShowing() const
-{
-    osl::MutexGuard aGuard(m_aMutex);
+{ 
+    osl::MutexGuard aGuard(m_aMutex); 
     return sal_True == m_aUpdateHandler.is() && m_aUpdateHandler->isVisible();
 };
 
 //------------------------------------------------------------------------------
 
-void
+void 
 UpdateCheck::autoCheckStatusChanged(bool enabled)
-{
+{ 
     osl::ClearableMutexGuard aGuard(m_aMutex);
-
+    
     if( (CHECK_SCHEDULED == m_eState) && !enabled )
         shutdownThread(false);
-
+        
     if( (DISABLED == m_eState) || (CHECK_SCHEDULED == m_eState) )
     {
         enableAutoCheck(enabled);
@@ -1665,27 +1665,27 @@ UpdateCheck::autoCheckStatusChanged(bool enabled)
 
 //------------------------------------------------------------------------------
 
-void
+void 
 UpdateCheck::autoCheckIntervalChanged()
-{
+{ 
     // just wake-up
     m_aCondition.set();
 };
 
 //------------------------------------------------------------------------------
 
-oslInterlockedCount SAL_CALL
+oslInterlockedCount SAL_CALL 
 UpdateCheck::acquire() SAL_THROW(())
-{
-    return ReferenceObject::acquire();
+{ 
+    return ReferenceObject::acquire(); 
 }
 
 //------------------------------------------------------------------------------
 
-oslInterlockedCount SAL_CALL
+oslInterlockedCount SAL_CALL 
 UpdateCheck::release() SAL_THROW(())
-{
-    return ReferenceObject::release();
+{ 
+    return ReferenceObject::release(); 
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/update/check/updatecheck.hxx b/extensions/source/update/check/updatecheck.hxx
index 0f0768919877..00d3ede1fe78 100644
--- a/extensions/source/update/check/updatecheck.hxx
+++ b/extensions/source/update/check/updatecheck.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 UpdateCheck;
 class UpdateCheckConfig;
 
 class UpdateCheckInitData {
-
+    
 public:
     inline rtl::Reference< UpdateCheck > SAL_CALL operator() () const;
 };
@@ -58,7 +58,7 @@ public:
     virtual void SAL_CALL cancel() = 0;
 };
 
-class UpdateCheck :
+class UpdateCheck : 
     public UpdateCheckConfigListener,
     public IActionListener,
     public DownloadInteractionHandler,
@@ -66,30 +66,30 @@ class UpdateCheck :
     public rtl::StaticWithInit< rtl::Reference< UpdateCheck >, UpdateCheckInitData >
 {
     UpdateCheck() : m_eState(NOT_INITIALIZED), m_eUpdateState(UPDATESTATES_COUNT), m_pThread(NULL) {};
-
+    
 public:
     inline SAL_CALL operator rtl::Reference< UpdateCheckConfigListener > ()
         { return static_cast< UpdateCheckConfigListener * > (this); }
-
+       
     void initialize(const com::sun::star::uno::Sequence<com::sun::star::beans::NamedValue>& rValues,
                     const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& xContext);
-
+        
     /* Returns an instance of the specified service obtained from the specified
      * component context
      */
-
+    
     static com::sun::star::uno::Reference< com::sun::star::uno::XInterface > createService(
-        const rtl::OUString& aServiceName,
+        const rtl::OUString& aServiceName, 
         const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& xContext);
-
+    
     // Update internal update info member
     void setUpdateInfo(const UpdateInfo& aInfo);
-
-    /* This method turns on the menubar icon, triggers the bubble window or
+    
+    /* This method turns on the menubar icon, triggers the bubble window or    
      * updates the dialog text when appropriate
      */
     void setUIState(UpdateState eState, bool suppressBubble = false);
-
+    
     // Returns the UI state that matches rInfo best
     static UpdateState getUIState(const UpdateInfo& rInfo);
 
@@ -98,7 +98,7 @@ public:
 
     // Executes the update check dialog for manual checks and downloads interaction
     void showDialog(bool forceCheck = false);
-
+        
     // Returns true if the update dialog is currently showing
     bool isDialogShowing() const;
     bool shouldShowExtUpdDlg() const { return ( m_bShowExtUpdDlg && m_bHasExtensionUpdate ); }
@@ -117,28 +117,28 @@ public:
 
     // Cancels the download action (and resumes checking if enabled)
     void cancelDownload();
-
+ 
     // Returns the XInteractionHandler of the UpdateHandler instance if present (and visible)
     com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > getInteractionHandler() const;
 
     // UpdateCheckConfigListener
-    virtual void autoCheckStatusChanged(bool enabled);
+    virtual void autoCheckStatusChanged(bool enabled); 
     virtual void autoCheckIntervalChanged();
 
-    // IActionListener
+    // IActionListener    
     void cancel();
     void download();
     void install();
     void pause();
     void resume();
     void closeAfterFailure();
-
+                
     // rtl::IReference
     virtual oslInterlockedCount SAL_CALL acquire() SAL_THROW(());
     virtual oslInterlockedCount SAL_CALL release() SAL_THROW(());
 
 private:
-
+    
     // Schedules or cancels next automatic check for updates
     void enableAutoCheck(bool enable);
 
@@ -168,19 +168,19 @@ private:
         DOWNLOADING,
         DOWNLOAD_PAUSED
     };
-
+        
     State m_eState;
     UpdateState m_eUpdateState;
 
     mutable osl::Mutex m_aMutex;
     WorkerThread *m_pThread;
     osl::Condition m_aCondition;
-
+    
     UpdateInfo m_aUpdateInfo;
     rtl::OUString m_aImageName;
     bool m_bHasExtensionUpdate;
     bool m_bShowExtUpdDlg;
-
+    
     rtl::Reference<UpdateHandler> m_aUpdateHandler;
     com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> m_xMenuBarUI;
     com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> m_xContext;
diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx
index 881fe2572d67..7f4227daedbe 100644
--- a/extensions/source/update/check/updatecheckconfig.cxx
+++ b/extensions/source/update/check/updatecheckconfig.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,20 +77,20 @@ namespace uno = com::sun::star::uno ;
 #define RELEASE_NOTE            "ReleaseNote"
 #define EXTENSION_PREFIX        "Extension_"
 
-static const sal_Char * const aUpdateEntryProperties[] = {
-    UPDATE_VERSION,
-    UPDATE_BUILDID,
-    UPDATE_DESCRIPTION,
-    DOWNLOAD_URL,
+static const sal_Char * const aUpdateEntryProperties[] = { 
+    UPDATE_VERSION, 
+    UPDATE_BUILDID, 
+    UPDATE_DESCRIPTION, 
+    DOWNLOAD_URL, 
     IS_DIRECT_DOWNLOAD,
     RELEASE_NOTE"1",
     RELEASE_NOTE"2",
     RELEASE_NOTE"3",
     RELEASE_NOTE"4",
     RELEASE_NOTE"5",
-    OLD_VERSION
+    OLD_VERSION 
 };
-
+    
 static const sal_uInt32 nUpdateEntryProperties = sizeof(aUpdateEntryProperties) / sizeof(sal_Char *);
 
 //------------------------------------------------------------------------------
@@ -101,7 +101,7 @@ NamedValueByNameAccess::~NamedValueByNameAccess()
 
 //------------------------------------------------------------------------------
 
-::com::sun::star::uno::Any
+::com::sun::star::uno::Any 
 NamedValueByNameAccess::getValue(const sal_Char * pName)
 {
     const sal_Int32 nLen = m_rValues.getLength();
@@ -124,7 +124,7 @@ UpdateCheckROModel::isAutoCheckEnabled() const
 
 //------------------------------------------------------------------------------
 
-bool
+bool 
 UpdateCheckROModel::isDownloadPaused() const
 {
     return sal_True == m_aNameAccess.getValue(DOWNLOAD_PAUSED).get< sal_Bool >();
@@ -132,31 +132,31 @@ UpdateCheckROModel::isDownloadPaused() const
 
 //------------------------------------------------------------------------------
 
-rtl::OUString
+rtl::OUString 
 UpdateCheckROModel::getStringValue(const sal_Char * pStr) const
 {
     uno::Any aAny( m_aNameAccess.getValue(pStr) );
     rtl::OUString aRet;
-
+    
     aAny >>= aRet;
-
+    
     return aRet;
 }
 
 //------------------------------------------------------------------------------
 
-rtl::OUString UpdateCheckROModel::getLocalFileName() const
-{
-    return getStringValue(LOCAL_FILE);
+rtl::OUString UpdateCheckROModel::getLocalFileName() const 
+{ 
+    return getStringValue(LOCAL_FILE); 
 };
 
 //------------------------------------------------------------------------------
 
-sal_Int64 UpdateCheckROModel::getDownloadSize() const
-{
+sal_Int64 UpdateCheckROModel::getDownloadSize() const 
+{ 
     uno::Any aAny( m_aNameAccess.getValue(DOWNLOAD_SIZE) );
     sal_Int64 nRet = -1;
-
+    
     aAny >>= nRet;
     return nRet;
 };
@@ -171,18 +171,18 @@ UpdateCheckROModel::getUpdateEntryVersion() const
 
 //------------------------------------------------------------------------------
 
-void
+void 
 UpdateCheckROModel::getUpdateEntry(UpdateInfo& rInfo) const
 {
     rInfo.BuildId = getStringValue(UPDATE_BUILDID);
     rInfo.Version = getStringValue(UPDATE_VERSION);
     rInfo.Description = getStringValue(UPDATE_DESCRIPTION);
-
+    
     sal_Bool isDirectDownload = sal_False;
     m_aNameAccess.getValue(IS_DIRECT_DOWNLOAD) >>= isDirectDownload;
-
+    
     rInfo.Sources.push_back( DownloadSource( isDirectDownload, getStringValue(DOWNLOAD_URL) ) );
-
+    
     rtl::OString aStr(RELEASE_NOTE);
     for(sal_Int32 n=1; n < 6; ++n )
     {
@@ -198,7 +198,7 @@ UpdateCheckROModel::getUpdateEntry(UpdateInfo& rInfo) const
 rtl::OUString UpdateCheckConfig::getDesktopDirectory()
 {
     rtl::OUString aRet;
-
+    
 #ifdef WNT
     WCHAR szPath[MAX_PATH];
 
@@ -218,7 +218,7 @@ rtl::OUString UpdateCheckConfig::getDesktopDirectory()
     if( osl::FileBase::E_None != aDocumentsDir.open() )
         aRet = aHomeDir;
 #endif
-
+    
     return aRet;
 }
 
@@ -227,7 +227,7 @@ rtl::OUString UpdateCheckConfig::getDesktopDirectory()
 rtl::OUString UpdateCheckConfig::getAllUsersDirectory()
 {
     rtl::OUString aRet;
-
+    
 #ifdef WNT
     WCHAR szPath[MAX_PATH];
 
@@ -235,12 +235,12 @@ rtl::OUString UpdateCheckConfig::getAllUsersDirectory()
     {
         aRet = rtl::OUString( reinterpret_cast< sal_Unicode * >(szPath) );
         osl::FileBase::RC rc;
-        rc = osl::FileBase::getFileURLFromSystemPath( aRet, aRet );
+        rc = osl::FileBase::getFileURLFromSystemPath( aRet, aRet ); 
     }
 #else
     osl::FileBase::getTempDirURL(aRet);
 #endif
-
+    
     return aRet;
 }
 
@@ -262,44 +262,44 @@ UpdateCheckConfig::~UpdateCheckConfig()
 //------------------------------------------------------------------------------
 
 ::rtl::Reference< UpdateCheckConfig >
-UpdateCheckConfig::get(
+UpdateCheckConfig::get( 
     const uno::Reference<uno::XComponentContext>& xContext,
     const ::rtl::Reference< UpdateCheckConfigListener >& rListener)
 {
     if( !xContext.is() )
-        throw uno::RuntimeException(
-            UNISTRING( "UpdateCheckConfig: empty component context" ),
+        throw uno::RuntimeException( 
+            UNISTRING( "UpdateCheckConfig: empty component context" ), 
             uno::Reference< uno::XInterface >() );
-
+        
     uno::Reference< lang::XMultiComponentFactory > xServiceManager(xContext->getServiceManager());
-
+    
     if( !xServiceManager.is() )
-        throw uno::RuntimeException(
-            UNISTRING( "UpdateCheckConfig: unable to obtain service manager from component context" ),
+        throw uno::RuntimeException( 
+            UNISTRING( "UpdateCheckConfig: unable to obtain service manager from component context" ), 
             uno::Reference< uno::XInterface >() );
-
-    uno::Reference< lang::XMultiServiceFactory > xConfigProvider(
-        xServiceManager->createInstanceWithContext( UNISTRING( "com.sun.star.configuration.ConfigurationProvider" ), xContext ),
-        uno::UNO_QUERY_THROW);
-
+    
+    uno::Reference< lang::XMultiServiceFactory > xConfigProvider( 
+        xServiceManager->createInstanceWithContext( UNISTRING( "com.sun.star.configuration.ConfigurationProvider" ), xContext ), 
+        uno::UNO_QUERY_THROW); 
+    
     beans::PropertyValue aProperty;
     aProperty.Name  = UNISTRING( "nodepath" );
     aProperty.Value = uno::makeAny( UNISTRING("org.openoffice.Office.Jobs/Jobs/UpdateCheck/Arguments") );
 
     uno::Sequence< uno::Any > aArgumentList( 1 );
     aArgumentList[0] = uno::makeAny( aProperty );
-
-    uno::Reference< container::XNameContainer > xContainer(
-        xConfigProvider->createInstanceWithArguments(
+    
+    uno::Reference< container::XNameContainer > xContainer( 
+        xConfigProvider->createInstanceWithArguments( 
             UNISTRING("com.sun.star.configuration.ConfigurationUpdateAccess"), aArgumentList ),
         uno::UNO_QUERY_THROW );
-
+    
     return new UpdateCheckConfig( xContainer, rListener );
 }
 
 //------------------------------------------------------------------------------
 
-bool
+bool 
 UpdateCheckConfig::isAutoCheckEnabled() const
 {
     sal_Bool nValue = sal_False;
@@ -309,7 +309,7 @@ UpdateCheckConfig::isAutoCheckEnabled() const
 
 //------------------------------------------------------------------------------
 
-bool
+bool 
 UpdateCheckConfig::isAutoDownloadEnabled() const
 {
     sal_Bool nValue = sal_False;
@@ -319,15 +319,15 @@ UpdateCheckConfig::isAutoDownloadEnabled() const
 
 //------------------------------------------------------------------------------
 
-rtl::OUString
+rtl::OUString 
 UpdateCheckConfig::getUpdateEntryVersion() const
 {
     rtl::OUString aValue;
-
+    
     // getByName is defined as non const in XNameAccess
     const_cast < UpdateCheckConfig *> (this)->getByName( UNISTRING( OLD_VERSION ) ) >>= aValue;
-
-    return aValue;
+    
+    return aValue;    
 }
 
 //------------------------------------------------------------------------------
@@ -336,10 +336,10 @@ sal_Int64
 UpdateCheckConfig::getLastChecked() const
 {
     sal_Int64 nValue = 0;
-
+    
     // getByName is defined as non const in XNameAccess
     const_cast < UpdateCheckConfig *> (this)->getByName( UNISTRING( LAST_CHECK ) ) >>= nValue;
-
+    
     return nValue;
 }
 
@@ -349,49 +349,49 @@ sal_Int64
 UpdateCheckConfig::getCheckInterval() const
 {
     sal_Int64 nValue = 0;
-
+    
     // getByName is defined as non const in XNameAccess
     const_cast < UpdateCheckConfig *> (this)->getByName( UNISTRING( CHECK_INTERVAL ) ) >>= nValue;
-
+    
     return nValue;
 }
 
 //------------------------------------------------------------------------------
 
-rtl::OUString
+rtl::OUString 
 UpdateCheckConfig::getLocalFileName() const
 {
     rtl::OUString aName = UNISTRING(LOCAL_FILE);
     rtl::OUString aRet;
-
+    
     if( m_xContainer->hasByName(aName) )
         m_xContainer->getByName(aName) >>= aRet;
-
-    return aRet;
+    
+    return aRet;    
 }
 
 //------------------------------------------------------------------------------
 
-rtl::OUString
+rtl::OUString 
 UpdateCheckConfig::getDownloadDestination() const
 {
     rtl::OUString aName = UNISTRING(DOWNLOAD_DESTINATION);
     rtl::OUString aRet;
-
+    
     const_cast <UpdateCheckConfig *> (this)->getByName(aName) >>= aRet;
-
-    return aRet;
+    
+    return aRet;    
 }
 
 //------------------------------------------------------------------------------
 
-void
+void 
 UpdateCheckConfig::storeLocalFileName(const rtl::OUString& rLocalFileName, sal_Int64 nFileSize)
 {
     const sal_uInt8 nItems = 2;
     const rtl::OUString aNameList[nItems] = { UNISTRING(LOCAL_FILE), UNISTRING(DOWNLOAD_SIZE) };
     const uno::Any aValueList[nItems] = { uno::makeAny(rLocalFileName), uno::makeAny(nFileSize) };
-
+    
     for( sal_uInt8 i=0; i < nItems; ++i )
     {
         if( m_xContainer->hasByName(aNameList[i]) )
@@ -399,30 +399,30 @@ UpdateCheckConfig::storeLocalFileName(const rtl::OUString& rLocalFileName, sal_I
         else
             m_xContainer->insertByName(aNameList[i], aValueList[i]);
     }
-
+    
     commitChanges();
 }
 
 //------------------------------------------------------------------------------
 
-void
+void 
 UpdateCheckConfig::clearLocalFileName()
 {
     const sal_uInt8 nItems = 2;
     const rtl::OUString aNameList[nItems] = { UNISTRING(LOCAL_FILE), UNISTRING(DOWNLOAD_SIZE) };
-
+    
     for( sal_uInt8 i=0; i < nItems; ++i )
     {
         if( m_xContainer->hasByName(aNameList[i]) )
             m_xContainer->removeByName(aNameList[i]);
     }
-
+    
     commitChanges();
 }
 
 //------------------------------------------------------------------------------
 
-void
+void 
 UpdateCheckConfig::storeDownloadPaused(bool paused)
 {
     replaceByName(UNISTRING(DOWNLOAD_PAUSED) , uno::makeAny(paused));
@@ -436,10 +436,10 @@ UpdateCheckConfig::updateLastChecked()
 {
     TimeValue systime;
     osl_getSystemTime(&systime);
-
+    
     sal_Int64 lastCheck = systime.Seconds;
 
-    replaceByName(UNISTRING(LAST_CHECK), uno::makeAny(lastCheck));
+    replaceByName(UNISTRING(LAST_CHECK), uno::makeAny(lastCheck));   
 }
 
 //------------------------------------------------------------------------------
@@ -449,47 +449,47 @@ UpdateCheckConfig::storeUpdateFound( const UpdateInfo& rInfo, const rtl::OUStrin
 
 {
     bool autoDownloadEnabled = isAutoDownloadEnabled();
-
-    uno::Any aValues[nUpdateEntryProperties] =
-    {
-        uno::makeAny(rInfo.Version),
-        uno::makeAny(rInfo.BuildId),
+    
+    uno::Any aValues[nUpdateEntryProperties] = 
+    { 
+        uno::makeAny(rInfo.Version), 
+        uno::makeAny(rInfo.BuildId), 
         uno::makeAny(rInfo.Description),
-        uno::makeAny(rInfo.Sources[0].URL),
+        uno::makeAny(rInfo.Sources[0].URL), 
         uno::makeAny(rInfo.Sources[0].IsDirect ? sal_True : sal_False),
         uno::makeAny(getReleaseNote(rInfo, 1, autoDownloadEnabled) ),
         uno::makeAny(getReleaseNote(rInfo, 2, autoDownloadEnabled) ),
         uno::makeAny(getReleaseNote(rInfo, 3, autoDownloadEnabled) ),
         uno::makeAny(getReleaseNote(rInfo, 4, autoDownloadEnabled) ),
         uno::makeAny(getReleaseNote(rInfo, 5, autoDownloadEnabled) ),
-        uno::makeAny(aCurrentBuild)
+        uno::makeAny(aCurrentBuild) 
     };
-
+    
     rtl::OUString aName;
     for( sal_uInt32 n=0; n < nUpdateEntryProperties; ++n )
     {
         aName = rtl::OUString::createFromAscii(aUpdateEntryProperties[n]);
-
+        
         if( m_xContainer->hasByName(aName) )
             m_xContainer->replaceByName(aName, aValues[n]);
         else
             m_xContainer->insertByName(aName,aValues[n]);
     }
-
+    
     commitChanges();
 }
 
 //------------------------------------------------------------------------------
 
-void
+void 
 UpdateCheckConfig::clearUpdateFound()
 {
     rtl::OUString aName;
-
+    
     for( sal_uInt32 n=0; n < nUpdateEntryProperties; ++n )
     {
         aName = rtl::OUString::createFromAscii(aUpdateEntryProperties[n]);
-
+        
         try {
             if( m_xContainer->hasByName(aName) )
                 m_xContainer->removeByName(aName);
@@ -510,7 +510,7 @@ UpdateCheckConfig::clearUpdateFound()
 
 //------------------------------------------------------------------------------
 
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString > 
 UpdateCheckConfig::getServiceNames()
 {
     uno::Sequence< rtl::OUString > aServiceList(1);
@@ -520,80 +520,80 @@ UpdateCheckConfig::getServiceNames()
 
 //------------------------------------------------------------------------------
 
-rtl::OUString
+rtl::OUString 
 UpdateCheckConfig::getImplName()
-{
+{ 
     return UNISTRING( "vnd.sun.UpdateCheckConfig");
 }
 
 //------------------------------------------------------------------------------
 
-uno::Type SAL_CALL
-UpdateCheckConfig::getElementType() throw (uno::RuntimeException)
-{
-    return m_xContainer->getElementType();
+uno::Type SAL_CALL 
+UpdateCheckConfig::getElementType() throw (uno::RuntimeException) 
+{ 
+    return m_xContainer->getElementType(); 
 }
 
 //------------------------------------------------------------------------------
 
-sal_Bool SAL_CALL
-UpdateCheckConfig::hasElements() throw (uno::RuntimeException)
-{
-    return m_xContainer->hasElements();
+sal_Bool SAL_CALL 
+UpdateCheckConfig::hasElements() throw (uno::RuntimeException) 
+{ 
+    return m_xContainer->hasElements(); 
 }
 
 //------------------------------------------------------------------------------
 
-uno::Any SAL_CALL
-UpdateCheckConfig::getByName( const ::rtl::OUString& aName )
+uno::Any SAL_CALL 
+UpdateCheckConfig::getByName( const ::rtl::OUString& aName ) 
     throw (container::NoSuchElementException, lang::WrappedTargetException,  uno::RuntimeException)
 {
     uno::Any aValue = m_xContainer->getByName( aName );
-
+    
     // Provide dynamic default value
     if( aName.equalsAscii(DOWNLOAD_DESTINATION) )
     {
         rtl::OUString aStr;
         aValue >>= aStr;
-
+        
         if( aStr.getLength() == 0 )
             aValue = uno::makeAny(getDesktopDirectory());
     }
-
+    
     return aValue;
 }
-
+    
 //------------------------------------------------------------------------------
 
-uno::Sequence< ::rtl::OUString > SAL_CALL
+uno::Sequence< ::rtl::OUString > SAL_CALL 
 UpdateCheckConfig::getElementNames(  ) throw (uno::RuntimeException)
 {
     return m_xContainer->getElementNames();
 }
-
+    
 //------------------------------------------------------------------------------
-
-sal_Bool SAL_CALL
+    
+sal_Bool SAL_CALL 
 UpdateCheckConfig::hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
 {
     return m_xContainer->hasByName( aName );
 }
-
+    
 //------------------------------------------------------------------------------
-
-void SAL_CALL
+    
+void SAL_CALL 
 UpdateCheckConfig::replaceByName( const ::rtl::OUString& aName, const uno::Any& aElement )
-    throw (lang::IllegalArgumentException, container::NoSuchElementException,
+    throw (lang::IllegalArgumentException, container::NoSuchElementException, 
            lang::WrappedTargetException, uno::RuntimeException)
 {
-    return m_xContainer->replaceByName( aName, aElement );
+    return m_xContainer->replaceByName( aName, aElement );   
 }
 
 //------------------------------------------------------------------------------
 // XChangesBatch
 
-void SAL_CALL
-UpdateCheckConfig::commitChanges()
+void SAL_CALL 
+UpdateCheckConfig::commitChanges() 
     throw (lang::WrappedTargetException, uno::RuntimeException)
 {
     uno::Reference< util::XChangesBatch > xChangesBatch(m_xContainer, uno::UNO_QUERY);
@@ -610,7 +610,7 @@ UpdateCheckConfig::commitChanges()
             for( sal_Int32 i=0; i<nChanges; ++i )
             {
                 aChangesSet[i].Accessor >>= aString;
-
+                
                 // FIXME: use non IgnoreAsciiCase version as soon as it becomes available
                 if( aString.endsWithIgnoreAsciiCaseAsciiL(AUTOCHECK_ENABLED "']", sizeof(AUTOCHECK_ENABLED)+1) )
                 {
@@ -630,25 +630,25 @@ UpdateCheckConfig::commitChanges()
 
 //------------------------------------------------------------------------------
 
-sal_Bool SAL_CALL
+sal_Bool SAL_CALL 
 UpdateCheckConfig::hasPendingChanges(  ) throw (uno::RuntimeException)
 {
     uno::Reference< util::XChangesBatch > xChangesBatch(m_xContainer, uno::UNO_QUERY);
     if( xChangesBatch.is() )
         return xChangesBatch->hasPendingChanges();
-
+    
     return sal_False;
 }
-
+    
 //------------------------------------------------------------------------------
-
-uno::Sequence< util::ElementChange > SAL_CALL
+    
+uno::Sequence< util::ElementChange > SAL_CALL 
 UpdateCheckConfig::getPendingChanges(  ) throw (uno::RuntimeException)
 {
     uno::Reference< util::XChangesBatch > xChangesBatch(m_xContainer, uno::UNO_QUERY);
     if( xChangesBatch.is() )
         return xChangesBatch->getPendingChanges();
-
+    
     return uno::Sequence< util::ElementChange >();
 }
 
@@ -658,7 +658,7 @@ void UpdateCheckConfig::storeExtensionVersion( const rtl::OUString& rExtensionNa
 {
     const rtl::OUString aExtName = UNISTRING( EXTENSION_PREFIX ) + rExtensionName;
     const uno::Any aValue = uno::makeAny( rVersion );
-
+    
     if( m_xContainer->hasByName( aExtName ) )
         m_xContainer->replaceByName( aExtName, aValue );
     else
@@ -715,7 +715,7 @@ bool UpdateCheckConfig::isVersionGreater( const rtl::OUString& rVersion1,
 
         if ( sSub1.getLength() < sSub2.getLength() ) {
             return true;
-        } else if ( sSub1.getLength() > sSub2.getLength() ) {
+        } else if ( sSub1.getLength() > sSub2.getLength() ) {            
             return false;
         } else if ( sSub1 < sSub2 ) {
             return true;
@@ -729,31 +729,31 @@ bool UpdateCheckConfig::isVersionGreater( const rtl::OUString& rVersion1,
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL
+    
+rtl::OUString SAL_CALL 
 UpdateCheckConfig::getImplementationName()  throw (uno::RuntimeException)
 {
     return getImplName();
 }
-
+    
 //------------------------------------------------------------------------------
-
-sal_Bool SAL_CALL
-UpdateCheckConfig::supportsService(rtl::OUString const & serviceName)
+    
+sal_Bool SAL_CALL 
+UpdateCheckConfig::supportsService(rtl::OUString const & serviceName) 
     throw (uno::RuntimeException)
 {
     uno::Sequence< rtl::OUString > aServiceNameList = getServiceNames();
-
+    
     for( sal_Int32 n=0; n < aServiceNameList.getLength(); n++ )
         if( aServiceNameList[n].equals(serviceName) )
             return sal_True;
-
-    return sal_False;
+    
+    return sal_False;   
 }
-
+    
 //------------------------------------------------------------------------------
-
-uno::Sequence< rtl::OUString > SAL_CALL
+    
+uno::Sequence< rtl::OUString > SAL_CALL 
 UpdateCheckConfig::getSupportedServiceNames()  throw (uno::RuntimeException)
 {
     return getServiceNames();
diff --git a/extensions/source/update/check/updatecheckconfig.hxx b/extensions/source/update/check/updatecheckconfig.hxx
index 7031ab196b0f..4149e9993aa7 100644
--- a/extensions/source/update/check/updatecheckconfig.hxx
+++ b/extensions/source/update/check/updatecheckconfig.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include "updatecheckconfiglistener.hxx"
 #include "updateinfo.hxx"
 
-/* Interface to acess configuration data read-only */
+/* Interface to acess configuration data read-only */ 
 struct IByNameAccess
 {
     virtual ::com::sun::star::uno::Any getValue(const sal_Char * pName) = 0;
@@ -47,14 +47,14 @@ struct IByNameAccess
 class NamedValueByNameAccess : public IByNameAccess
 {
     const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& m_rValues;
-
+    
 public:
     NamedValueByNameAccess(
         const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rValues) :
         m_rValues(rValues) {} ;
 
     virtual ~NamedValueByNameAccess();
-
+        
     virtual ::com::sun::star::uno::Any getValue(const sal_Char * pName);
 };
 
@@ -66,17 +66,17 @@ class UpdateCheckROModel
 {
 public:
     UpdateCheckROModel(IByNameAccess& aNameAccess) : m_aNameAccess(aNameAccess) {};
-
+    
     bool isAutoCheckEnabled() const;
     bool isDownloadPaused() const;
     rtl::OUString getLocalFileName() const;
     sal_Int64 getDownloadSize() const;
-
+    
     rtl::OUString getUpdateEntryVersion() const;
     void getUpdateEntry(UpdateInfo& rInfo) const;
-
+        
 private:
-
+    
     rtl::OUString getStringValue(const sal_Char *) const;
 
     IByNameAccess& m_aNameAccess;
@@ -84,7 +84,7 @@ private:
 
 
 
-/* This class implements the non published UNO service com.sun.star.setup.UpdateCheckConfig,
+/* This class implements the non published UNO service com.sun.star.setup.UpdateCheckConfig, 
  * which primary use is to be able to track changes done in the Toos -> Options page of this
  * component, as this is not supported by the OOo configuration for extendable groups.
  */
@@ -96,14 +96,14 @@ class UpdateCheckConfig : public ::cppu::WeakImplHelper3<
 {
     UpdateCheckConfig(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xContainer,
                       const ::rtl::Reference< UpdateCheckConfigListener >& rListener );
-
+    
     virtual ~UpdateCheckConfig();
 
 public:
-
+    
     static ::com::sun::star::uno::Sequence< rtl::OUString > getServiceNames();
     static rtl::OUString getImplName();
-
+    
     static ::rtl::Reference< UpdateCheckConfig > get(
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
         const ::rtl::Reference< UpdateCheckConfigListener >& rListener = ::rtl::Reference< UpdateCheckConfigListener >());
@@ -113,10 +113,10 @@ public:
     bool isAutoDownloadEnabled() const;
     rtl::OUString getUpdateEntryVersion() const;
 
-    /* Updates the timestamp of last check, but does not commit the change
-     * as either clearUpdateFound() or setUpdateFound() are expected to get
+    /* Updates the timestamp of last check, but does not commit the change 
+     * as either clearUpdateFound() or setUpdateFound() are expected to get 
      * called next.
-     */
+     */ 
     void updateLastChecked();
 
     /* Returns the date of the last successful check in seconds since 1970 */
@@ -128,11 +128,11 @@ public:
     /* Reset values of previously remembered update
      */
     void clearUpdateFound();
-
+    
     /* Stores the specified data of an available update
      */
     void storeUpdateFound(const UpdateInfo& rInfo, const rtl::OUString& aCurrentBuild);
-
+    
     // Returns the local file name of a started download
     rtl::OUString getLocalFileName() const;
 
@@ -141,13 +141,13 @@ public:
 
     // stores the local file name of a just started download
     void storeLocalFileName(const rtl::OUString& rFileName, sal_Int64 nFileSize);
-
+    
     // Removes the local file name of a download
     void clearLocalFileName();
-
+    
     // Stores the bool value for manually paused downloads
     void storeDownloadPaused(bool paused);
-
+    
     // Returns the directory that acts as the user's desktop
     static rtl::OUString getDesktopDirectory();
 
@@ -161,50 +161,50 @@ public:
                                 const rtl::OUString& rVersion );
 
     // XElementAccess
-    virtual ::com::sun::star::uno::Type SAL_CALL getElementType(  )
+    virtual ::com::sun::star::uno::Type SAL_CALL getElementType(  ) 
         throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL hasElements(  )
+    virtual sal_Bool SAL_CALL hasElements(  ) 
         throw (::com::sun::star::uno::RuntimeException);
-
+    
     // XNameAccess
-    virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName )
-        throw (::com::sun::star::container::NoSuchElementException,
-               ::com::sun::star::lang::WrappedTargetException,
+    virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) 
+        throw (::com::sun::star::container::NoSuchElementException, 
+               ::com::sun::star::lang::WrappedTargetException, 
                ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  )
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) 
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName )
+    virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) 
         throw (::com::sun::star::uno::RuntimeException);
-
+    
     // XNameReplace
     virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement )
-        throw (::com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::container::NoSuchElementException,
-               ::com::sun::star::lang::WrappedTargetException,
+        throw (::com::sun::star::lang::IllegalArgumentException, 
+               ::com::sun::star::container::NoSuchElementException, 
+               ::com::sun::star::lang::WrappedTargetException, 
                ::com::sun::star::uno::RuntimeException);
-
+    
     // XChangesBatch
-    virtual void SAL_CALL commitChanges(  )
-        throw (::com::sun::star::lang::WrappedTargetException,
+    virtual void SAL_CALL commitChanges(  ) 
+        throw (::com::sun::star::lang::WrappedTargetException, 
                ::com::sun::star::uno::RuntimeException);
     virtual ::sal_Bool SAL_CALL hasPendingChanges(  )
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::util::ElementChange > SAL_CALL getPendingChanges(  )
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::util::ElementChange > SAL_CALL getPendingChanges(  ) 
         throw (::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName()
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & serviceName)
+    virtual rtl::OUString SAL_CALL getImplementationName() 
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames()
+    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & serviceName) 
         throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() 
+        throw (::com::sun::star::uno::RuntimeException);   
 
 private:
 
     static rtl::OUString getSubVersion( const rtl::OUString& rVersion, sal_Int32 *nIndex );
     static bool isVersionGreater( const rtl::OUString& rVersion1, const rtl::OUString& rVersion2 );
-
+    
     const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xContainer;
     const ::rtl::Reference< UpdateCheckConfigListener > m_rListener;
 };
@@ -234,7 +234,7 @@ T getValue( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Name
             return value;
         }
     }
-
+    
     return T();
 }
 
diff --git a/extensions/source/update/check/updatecheckconfiglistener.hxx b/extensions/source/update/check/updatecheckconfiglistener.hxx
index fc7ee7926252..d0c79eb655fa 100644
--- a/extensions/source/update/check/updatecheckconfiglistener.hxx
+++ b/extensions/source/update/check/updatecheckconfiglistener.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 /* This interface should be implemented by classes acting
  * as controller (as in the MVC pattern).
  */
-
-struct UpdateCheckConfigListener : public rtl::IReference
+ 
+struct UpdateCheckConfigListener : public rtl::IReference 
 {
     virtual void autoCheckStatusChanged(bool enabled) = 0;
     virtual void autoCheckIntervalChanged() = 0;
diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx
index ede63876737b..995e4f526b22 100644
--- a/extensions/source/update/check/updatecheckjob.cxx
+++ b/extensions/source/update/check/updatecheckjob.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace uno = com::sun::star::uno ;
 
 #define UNISTRING(s) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))
 
-namespace
-{
+namespace 
+{ 
 
 class InitUpdateCheckJobThread : public osl::Thread
 {
@@ -73,13 +73,13 @@ private:
     bool m_bTerminating;
 };
 
-class UpdateCheckJob :
+class UpdateCheckJob : 
     public ::cppu::WeakImplHelper3< task::XJob, lang::XServiceInfo, frame::XTerminateListener >
-{
+{    
     virtual ~UpdateCheckJob();
-
+             
 public:
-
+    
     UpdateCheckJob(const uno::Reference<uno::XComponentContext>& xContext);
 
     static uno::Sequence< rtl::OUString > getServiceNames();
@@ -88,17 +88,17 @@ public:
     // Allows runtime exceptions to be thrown by const methods
     inline SAL_CALL operator uno::Reference< uno::XInterface > () const
         { return const_cast< cppu::OWeakObject * > (static_cast< cppu::OWeakObject const * > (this)); };
-
+    
     // XJob
-    virtual uno::Any SAL_CALL execute(const uno::Sequence<beans::NamedValue>&)
+    virtual uno::Any SAL_CALL execute(const uno::Sequence<beans::NamedValue>&) 
         throw (lang::IllegalArgumentException, uno::Exception);
-
+        
     // XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName()
+    virtual rtl::OUString SAL_CALL getImplementationName() 
         throw (uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & serviceName)
+    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);
 
     // XEventListener
@@ -160,7 +160,7 @@ void InitUpdateCheckJobThread::setTerminating() {
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 
-UpdateCheckJob::UpdateCheckJob( const uno::Reference<uno::XComponentContext>& xContext ) :
+UpdateCheckJob::UpdateCheckJob( const uno::Reference<uno::XComponentContext>& xContext ) : 
     m_xContext(xContext)
 {
     m_xDesktop.set( xContext->getServiceManager()->createInstanceWithContext( UNISTRING("com.sun.star.frame.Desktop"), xContext ), uno::UNO_QUERY );
@@ -171,12 +171,12 @@ UpdateCheckJob::UpdateCheckJob( const uno::Reference<uno::XComponentContext>& xC
 //------------------------------------------------------------------------------
 
 UpdateCheckJob::~UpdateCheckJob()
-{
+{    
 }
 
 //------------------------------------------------------------------------------
 
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString > 
 UpdateCheckJob::getServiceNames()
 {
     uno::Sequence< rtl::OUString > aServiceList(1);
@@ -186,17 +186,17 @@ UpdateCheckJob::getServiceNames()
 
 //------------------------------------------------------------------------------
 
-rtl::OUString
+rtl::OUString 
 UpdateCheckJob::getImplName()
-{
+{ 
     return UNISTRING( "vnd.sun.UpdateCheck");
 }
 
 
 //------------------------------------------------------------------------------
 
-uno::Any
-UpdateCheckJob::execute(const uno::Sequence<beans::NamedValue>& namedValues)
+uno::Any 
+UpdateCheckJob::execute(const uno::Sequence<beans::NamedValue>& namedValues) 
     throw (lang::IllegalArgumentException, uno::Exception)
 {
     for ( sal_Int32 n=namedValues.getLength(); n-- > 0; )
@@ -218,28 +218,28 @@ UpdateCheckJob::execute(const uno::Sequence<beans::NamedValue>& namedValues)
         }
     }
 
-    uno::Sequence<beans::NamedValue> aConfig =
+    uno::Sequence<beans::NamedValue> aConfig = 
         getValue< uno::Sequence<beans::NamedValue> > (namedValues, "JobConfig");
 
-    /* Determine the way we got invoked here -
+    /* Determine the way we got invoked here - 
      * see Developers Guide Chapter "4.7.2 Jobs" to understand the magic
      */
-
-    uno::Sequence<beans::NamedValue> aEnvironment =
+    
+    uno::Sequence<beans::NamedValue> aEnvironment = 
         getValue< uno::Sequence<beans::NamedValue> > (namedValues, "Environment");
-
+    
     rtl::OUString aEventName = getValue< rtl::OUString > (aEnvironment, "EventName");
-
+    
     m_pInitThread.reset(
         new InitUpdateCheckJobThread(
             m_xContext, aConfig,
             !aEventName.equalsAscii("onFirstVisibleTask")));
-
+    
     return uno::Any();
 }
 
 //------------------------------------------------------------------------------
-void UpdateCheckJob::handleExtensionUpdates( const uno::Sequence< beans::NamedValue > &rListProp )
+void UpdateCheckJob::handleExtensionUpdates( const uno::Sequence< beans::NamedValue > &rListProp ) 
 {
     try {
         uno::Sequence< uno::Sequence< rtl::OUString > > aList =
@@ -247,7 +247,7 @@ void UpdateCheckJob::handleExtensionUpdates( const uno::Sequence< beans::NamedVa
         bool bPrepareOnly = getValue< bool > ( rListProp, "prepareOnly" );
 
         // we will first store any new found updates and then check, if there are any
-        // pending updates.
+        // pending updates. 
         storeExtensionUpdateInfos( m_xContext, aList );
 
         if ( bPrepareOnly )
@@ -278,7 +278,7 @@ void UpdateCheckJob::handleExtensionUpdates( const uno::Sequence< beans::NamedVa
 
 //------------------------------------------------------------------------------
 
-rtl::OUString SAL_CALL
+rtl::OUString SAL_CALL 
 UpdateCheckJob::getImplementationName() throw (uno::RuntimeException)
 {
     return getImplName();
@@ -286,7 +286,7 @@ UpdateCheckJob::getImplementationName() throw (uno::RuntimeException)
 
 //------------------------------------------------------------------------------
 
-uno::Sequence< rtl::OUString > SAL_CALL
+uno::Sequence< rtl::OUString > SAL_CALL 
 UpdateCheckJob::getSupportedServiceNames() throw (uno::RuntimeException)
 {
     return getServiceNames();
@@ -294,15 +294,15 @@ UpdateCheckJob::getSupportedServiceNames() throw (uno::RuntimeException)
 
 //------------------------------------------------------------------------------
 
-sal_Bool SAL_CALL
+sal_Bool SAL_CALL 
 UpdateCheckJob::supportsService( rtl::OUString const & serviceName ) throw (uno::RuntimeException)
 {
     uno::Sequence< rtl::OUString > aServiceNameList = getServiceNames();
-
+    
     for( sal_Int32 n=0; n < aServiceNameList.getLength(); n++ )
         if( aServiceNameList[n].equals(serviceName) )
             return sal_True;
-
+    
     return sal_False;
 }
 
@@ -311,7 +311,7 @@ UpdateCheckJob::supportsService( rtl::OUString const & serviceName ) throw (uno:
 void SAL_CALL UpdateCheckJob::disposing( lang::EventObject const & rEvt )
     throw ( uno::RuntimeException )
 {
-    bool shutDown = ( rEvt.Source == m_xDesktop );
+    bool shutDown = ( rEvt.Source == m_xDesktop );       
 
     if ( shutDown && m_xDesktop.is() )
     {
@@ -341,7 +341,7 @@ void SAL_CALL UpdateCheckJob::notifyTermination( lang::EventObject const & rEvt
 
 //------------------------------------------------------------------------------
 
-static uno::Reference<uno::XInterface> SAL_CALL
+static uno::Reference<uno::XInterface> SAL_CALL 
 createJobInstance(const uno::Reference<uno::XComponentContext>& xContext)
 {
     return *new UpdateCheckJob(xContext);
@@ -349,7 +349,7 @@ createJobInstance(const uno::Reference<uno::XComponentContext>& xContext)
 
 //------------------------------------------------------------------------------
 
-static uno::Reference<uno::XInterface> SAL_CALL
+static uno::Reference<uno::XInterface> SAL_CALL 
 createConfigInstance(const uno::Reference<uno::XComponentContext>& xContext)
 {
     return *UpdateCheckConfig::get(xContext, *UpdateCheck::get());
@@ -357,7 +357,7 @@ createConfigInstance(const uno::Reference<uno::XComponentContext>& xContext)
 
 //------------------------------------------------------------------------------
 
-static const cppu::ImplementationEntry kImplementations_entries[] =
+static const cppu::ImplementationEntry kImplementations_entries[] = 
 {
     {
         createJobInstance,
@@ -380,16 +380,16 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
 
 //------------------------------------------------------------------------------
 
-extern "C" void SAL_CALL
-component_getImplementationEnvironment( const sal_Char **aEnvTypeName, uno_Environment **)
+extern "C" void SAL_CALL 
+component_getImplementationEnvironment( const sal_Char **aEnvTypeName, uno_Environment **) 
 {
     *aEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
 }
 
 //------------------------------------------------------------------------------
 
-extern "C" sal_Bool SAL_CALL
-component_writeInfo(void *pServiceManager, void *pRegistryKey)
+extern "C" sal_Bool SAL_CALL 
+component_writeInfo(void *pServiceManager, void *pRegistryKey) 
 {
     return cppu::component_writeInfoHelper(
         pServiceManager,
@@ -401,7 +401,7 @@ component_writeInfo(void *pServiceManager, void *pRegistryKey)
 //------------------------------------------------------------------------------
 
 extern "C" void *
-component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
+component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey) 
 {
     return cppu::component_getFactoryHelper(
         pszImplementationName,
diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx
index 364d975c537a..6210a8af77a7 100644
--- a/extensions/source/update/check/updatehdl.cxx
+++ b/extensions/source/update/check/updatehdl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -262,7 +262,7 @@ void UpdateHandler::setDownloadFile( const rtl::OUString& rFilePath )
     sal_Int32 nLast = rFilePath.lastIndexOf( '/' );
     if ( nLast != -1 )
     {
-        msDownloadFile = rFilePath.copy( nLast+1 );
+        msDownloadFile = rFilePath.copy( nLast+1 ); 
         const rtl::OUString aDownloadURL = rFilePath.copy( 0, nLast );
         osl::FileBase::getSystemPathFromFileURL( aDownloadURL, msDownloadPath );
     }
@@ -397,7 +397,7 @@ void SAL_CALL UpdateHandler::windowClosing( const lang::EventObject& e )
     awt::ActionEvent aActionEvt;
     aActionEvt.ActionCommand = COMMAND_CLOSE;
     aActionEvt.Source = e.Source;
-
+    
     actionPerformed( aActionEvt );
 }
 
@@ -449,8 +449,8 @@ void SAL_CALL UpdateHandler::handle( uno::Reference< task::XInteractionRequest >
             throw uno::RuntimeException( UNISTRING( "UpdateHandler: unable to obtain service manager from component context" ), *this );
 
         mxInteractionHdl = uno::Reference<task::XInteractionHandler> (
-                                xServiceManager->createInstanceWithContext(
-                                    UNISTRING( "com.sun.star.task.InteractionHandler" ),
+                                xServiceManager->createInstanceWithContext( 
+                                    UNISTRING( "com.sun.star.task.InteractionHandler" ), 
                                     mxContext),
                                 uno::UNO_QUERY_THROW);
         if( !mxInteractionHdl.is() )
@@ -514,7 +514,7 @@ void SAL_CALL UpdateHandler::notifyTermination( const lang::EventObject& )
 
         uno::Reference< lang::XComponent > xComponent( mxUpdDlg, uno::UNO_QUERY );
         if ( xComponent.is() )
-            xComponent->dispose();
+            xComponent->dispose(); 
 
         mxUpdDlg.clear();
     }
@@ -739,7 +739,7 @@ void UpdateHandler::loadStrings()
     msPauseBtn      = loadString( xBundle, RID_UPDATE_BTN_PAUSE );
     msResumeBtn     = loadString( xBundle, RID_UPDATE_BTN_RESUME );
     msCancelBtn     = loadString( xBundle, RID_UPDATE_BTN_CANCEL );
-
+    
     // all update states before UPDATESTATE_UPDATE_AVAIL don't have a bubble
     // so we can ignore them
     for ( int i=0; i < (int)(UPDATESTATES_COUNT - UPDATESTATE_UPDATE_AVAIL); i++ )
@@ -864,13 +864,13 @@ void UpdateHandler::setFullVersion( rtl::OUString& rString )
         throw uno::RuntimeException( UNISTRING( "getProductName: empty component context" ), *this );
 
     uno::Reference< lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager() );
-
+    
     if( !xServiceManager.is() )
         throw uno::RuntimeException( UNISTRING( "getProductName: unable to obtain service manager from component context" ), *this );
-
-    uno::Reference< lang::XMultiServiceFactory > xConfigurationProvider(
-        xServiceManager->createInstanceWithContext( UNISTRING( "com.sun.star.configuration.ConfigurationProvider" ), mxContext ),
-        uno::UNO_QUERY_THROW);
+    
+    uno::Reference< lang::XMultiServiceFactory > xConfigurationProvider( 
+        xServiceManager->createInstanceWithContext( UNISTRING( "com.sun.star.configuration.ConfigurationProvider" ), mxContext ), 
+        uno::UNO_QUERY_THROW); 
 
     beans::PropertyValue aProperty;
     aProperty.Name  = UNISTRING( "nodepath" );
@@ -881,7 +881,7 @@ void UpdateHandler::setFullVersion( rtl::OUString& rString )
 
     uno::Reference< uno::XInterface > xConfigAccess;
     xConfigAccess = xConfigurationProvider->createInstanceWithArguments( UNISTRING("com.sun.star.configuration.ConfigurationAccess"),
-                                                                         aArgumentList );
+                                                                         aArgumentList );                                    
 
     uno::Reference< container::XNameAccess > xNameAccess( xConfigAccess, uno::UNO_QUERY_THROW );
 
@@ -942,7 +942,7 @@ bool UpdateHandler::showWarning( const rtl::OUString &rWarningText ) const
 
     uno::Reference< awt::XControl > xControl( mxUpdDlg, uno::UNO_QUERY );
     if ( !xControl.is() ) return bRet;
-
+ 
     uno::Reference< awt::XWindowPeer > xPeer = xControl->getPeer();
     if ( !xPeer.is() ) return bRet;
 
@@ -977,7 +977,7 @@ bool UpdateHandler::showWarning( const rtl::OUString &rWarningText ) const
 
     uno::Reference< lang::XComponent > xComponent( xMsgBox, uno::UNO_QUERY );
     if ( xComponent.is() )
-        xComponent->dispose();
+        xComponent->dispose(); 
 
     return bRet;
 }
@@ -991,7 +991,7 @@ bool UpdateHandler::showWarning( const rtl::OUString &rWarningText,
 
     uno::Reference< awt::XControl > xControl( mxUpdDlg, uno::UNO_QUERY );
     if ( !xControl.is() ) return bRet;
-
+ 
     uno::Reference< awt::XWindowPeer > xPeer = xControl->getPeer();
     if ( !xPeer.is() ) return bRet;
 
@@ -1048,7 +1048,7 @@ bool UpdateHandler::showWarning( const rtl::OUString &rWarningText,
 
     uno::Reference< lang::XComponent > xComponent( xMsgBox, uno::UNO_QUERY );
     if ( xComponent.is() )
-        xComponent->dispose();
+        xComponent->dispose(); 
 
     return bRet;
 }
@@ -1114,7 +1114,7 @@ void UpdateHandler::showControls( short nControls )
         nShiftMe = (short)(nControls >> i);
         showControl( msButtonIDs[i], (bool)(nShiftMe & 0x01) );
     }
-
+        
     nShiftMe = (short)(nControls >> THROBBER_CTRL);
     startThrobber( (bool)(nShiftMe & 0x01) );
 
@@ -1145,10 +1145,10 @@ void UpdateHandler::createDialog()
     }
 
     uno::Reference< lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager() );
-
+    
     if( xServiceManager.is() )
     {
-        uno::Reference< frame::XDesktop > xDesktop(
+        uno::Reference< frame::XDesktop > xDesktop( 
                 xServiceManager->createInstanceWithContext( UNISTRING( "com.sun.star.frame.Desktop"), mxContext ),
                 uno::UNO_QUERY );
         if ( xDesktop.is() )
diff --git a/extensions/source/update/check/updatehdl.hrc b/extensions/source/update/check/updatehdl.hrc
index ad3d472eaf68..6d7b93086cb3 100644
--- a/extensions/source/update/check/updatehdl.hrc
+++ b/extensions/source/update/check/updatehdl.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
  *
  ************************************************************************/
 
- #define RID_UPDATE_HDL_START              1200
-
+ #define RID_UPDATE_HDL_START			   1200
+ 
  #define RID_UPDATE_STR_CHECKING            RID_UPDATE_HDL_START +  1
  #define RID_UPDATE_STR_NO_UPD_FOUND        RID_UPDATE_HDL_START +  2
  #define RID_UPDATE_STR_UPD_FOUND           RID_UPDATE_HDL_START +  3
@@ -60,7 +60,7 @@
  #define RID_UPDATE_BTN_PAUSE               RID_UPDATE_HDL_START + 33
  #define RID_UPDATE_BTN_RESUME              RID_UPDATE_HDL_START + 34
  #define RID_UPDATE_BTN_CANCEL              RID_UPDATE_HDL_START + 35
-
+ 
  #define RID_UPDATE_BUBBLE_TEXT_START       RID_UPDATE_HDL_START + 40
  #define RID_UPDATE_BUBBLE_UPDATE_AVAIL     RID_UPDATE_BUBBLE_TEXT_START + 0
  #define RID_UPDATE_BUBBLE_UPDATE_NO_DOWN   RID_UPDATE_BUBBLE_TEXT_START + 1
diff --git a/extensions/source/update/check/updatehdl.hxx b/extensions/source/update/check/updatehdl.hxx
index 6a6336530747..cc451df57336 100644
--- a/extensions/source/update/check/updatehdl.hxx
+++ b/extensions/source/update/check/updatehdl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ private:
     osl::Mutex              maMutex;
 
     rtl::OUString           msNextVersion;
-    rtl::OUString           msDownloadPath;
+    rtl::OUString           msDownloadPath;     
     rtl::OUString           msDownloadFile;
     rtl::OUString           msDescriptionMsg;
     rtl::OUString           msChecking;         // RID_UPDATE_STR_CHECKING
diff --git a/extensions/source/update/check/updatehdl.src b/extensions/source/update/check/updatehdl.src
index 58f88b7e4852..3dbc0b3676cf 100644
--- a/extensions/source/update/check/updatehdl.src
+++ b/extensions/source/update/check/updatehdl.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/update/check/updateinfo.hxx b/extensions/source/update/check/updateinfo.hxx
index 56ecf2ecfd69..0db0c4e6608d 100644
--- a/extensions/source/update/check/updateinfo.hxx
+++ b/extensions/source/update/check/updateinfo.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,10 +36,10 @@ struct DownloadSource
 {
     bool IsDirect;
     rtl::OUString URL;
-
+    
     DownloadSource(bool bIsDirect, const rtl::OUString& aURL) : IsDirect(bIsDirect), URL(aURL) {};
     DownloadSource(const DownloadSource& ds) : IsDirect(ds.IsDirect), URL(ds.URL) {};
-
+    
     DownloadSource & operator=( const DownloadSource & ds ) { IsDirect = ds.IsDirect; URL = ds.URL; return *this; };
 };
 
@@ -49,10 +49,10 @@ struct ReleaseNote
     rtl::OUString URL;
     sal_uInt8 Pos2;
     rtl::OUString URL2;
-
+    
     ReleaseNote(sal_uInt8 pos, const rtl::OUString aURL) : Pos(pos), URL(aURL), Pos2(0), URL2() {};
     ReleaseNote(sal_uInt8 pos, const rtl::OUString aURL, sal_uInt8 pos2, const rtl::OUString aURL2) : Pos(pos), URL(aURL), Pos2(pos2), URL2(aURL2) {};
-
+        
     ReleaseNote(const ReleaseNote& rn) :Pos(rn.Pos), URL(rn.URL), Pos2(rn.Pos2), URL2(rn.URL2) {};
     ReleaseNote & operator=( const ReleaseNote& rn) { Pos=rn.Pos; URL=rn.URL; Pos2=rn.Pos2; URL2=rn.URL2; return *this; };
 };
@@ -64,20 +64,20 @@ struct UpdateInfo
     rtl::OUString Description;
     std::vector< DownloadSource > Sources;
     std::vector< ReleaseNote > ReleaseNotes;
-
+    
     UpdateInfo() : BuildId(), Version(), Description(), Sources(), ReleaseNotes() {};
     UpdateInfo(const UpdateInfo& ui) : BuildId(ui.BuildId), Version(ui.Version), Description(ui.Description), Sources(ui.Sources), ReleaseNotes(ui.ReleaseNotes) {};
     inline UpdateInfo & operator=( const UpdateInfo& ui );
 };
 
-UpdateInfo & UpdateInfo::operator=( const UpdateInfo& ui )
+UpdateInfo & UpdateInfo::operator=( const UpdateInfo& ui ) 
 {
-    BuildId = ui.BuildId;
-    Version = ui.Version;
+    BuildId = ui.BuildId; 
+    Version = ui.Version; 
     Description = ui.Description;
-    Sources = ui.Sources;
-    ReleaseNotes = ui.ReleaseNotes;
-    return *this;
+    Sources = ui.Sources; 
+    ReleaseNotes = ui.ReleaseNotes; 
+    return *this; 
 }
 
 
diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx
index 9ba37b67308c..cafda1b8cc8f 100644
--- a/extensions/source/update/check/updateprotocol.cxx
+++ b/extensions/source/update/check/updateprotocol.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace xml = css::xml ;
 
 //------------------------------------------------------------------------------
 
-static bool
+static bool 
 getBootstrapData(
     uno::Sequence< ::rtl::OUString > & rRepositoryList,
     ::rtl::OUString & rBuildID,
@@ -89,7 +89,7 @@ getBootstrapData(
 //------------------------------------------------------------------------------
 
 // Returns 'true' if successfully connected to the update server
-bool
+bool 
 checkForUpdates(
     UpdateInfo& o_rUpdateInfo,
     uno::Reference< uno::XComponentContext > const & rxContext,
@@ -97,36 +97,36 @@ checkForUpdates(
     const uno::Reference< deployment::XUpdateInformationProvider >& rUpdateInfoProvider)
 {
     OSL_TRACE("checking for updates ..\n");
-
+   
     ::rtl::OUString myArch;
     ::rtl::OUString myOS;
-
+  
     rtl::Bootstrap::get(UNISTRING("_OS"), myOS);
     rtl::Bootstrap::get(UNISTRING("_ARCH"), myArch);
-
+    
     uno::Sequence< ::rtl::OUString > aRepositoryList;
     ::rtl::OUString aBuildID;
     ::rtl::OUString aInstallSetID;
-
+    
     if( ! ( getBootstrapData(aRepositoryList, aBuildID, aInstallSetID) && (aRepositoryList.getLength() > 0) ) )
         return false;
 
     if( !rxContext.is() )
-        throw uno::RuntimeException(
+        throw uno::RuntimeException( 
             UNISTRING( "checkForUpdates: empty component context" ), uno::Reference< uno::XInterface >() );
-
+            
     OSL_ASSERT( rxContext->getServiceManager().is() );
-
-    // XPath implementation
-    uno::Reference< xml::xpath::XXPathAPI > xXPath(
-        rxContext->getServiceManager()->createInstanceWithContext( UNISTRING( "com.sun.star.xml.xpath.XPathAPI" ), rxContext ),
-        uno::UNO_QUERY_THROW);
-
+            
+    // XPath implementation 
+    uno::Reference< xml::xpath::XXPathAPI > xXPath( 
+        rxContext->getServiceManager()->createInstanceWithContext( UNISTRING( "com.sun.star.xml.xpath.XPathAPI" ), rxContext ), 
+        uno::UNO_QUERY_THROW);    
+    
     xXPath->registerNS( UNISTRING("inst"), UNISTRING("http://installation.openoffice.org/description") );
 
     if( rxInteractionHandler.is() )
         rUpdateInfoProvider->setInteractionHandler(rxInteractionHandler);
-
+    
     try
     {
         uno::Reference< container::XEnumeration > aUpdateInfoEnumeration =
@@ -143,13 +143,13 @@ checkForUpdates(
         aBuffer.appendAscii("\' and inst:buildid>");
         aBuffer.append( aBuildID );
         aBuffer.appendAscii("]");
-
+        
         rtl::OUString aXPathExpression = aBuffer.makeStringAndClear();
 
         while( aUpdateInfoEnumeration->hasMoreElements() )
         {
             deployment::UpdateInformationEntry aEntry;
-
+            
             if( aUpdateInfoEnumeration->nextElement() >>= aEntry )
             {
                 uno::Reference< xml::dom::XNode > xNode( aEntry.UpdateDocument.get() );
@@ -161,22 +161,22 @@ checkForUpdates(
                     // ignore
                 }
 
-/*
-                o_rUpdateInfo.Sources.push_back( DownloadSource(true,
+/*                
+                o_rUpdateInfo.Sources.push_back( DownloadSource(true, 
                     UNISTRING("http://openoffice.bouncer.osuosl.org/?product=OpenOffice.org&os=solarissparcwjre&lang=en-US&version=2.2.1") ) );
 */
-
+                
                 sal_Int32 i, imax = xNodeList->getLength();
                 for( i = 0; i < imax; ++i )
                 {
                     uno::Reference< xml::dom::XNode > xNode2( xNodeList->item(i) );
-
+                
                     if( xNode2.is() )
                     {
                         uno::Reference< xml::dom::XElement > xParent(xNode2->getParentNode(), uno::UNO_QUERY_THROW);
                         rtl::OUString aType = xParent->getAttribute(UNISTRING("type"));
                         bool bIsDirect = ( sal_False == aType.equalsIgnoreAsciiCaseAscii("text/html") );
-
+                    
                         o_rUpdateInfo.Sources.push_back( DownloadSource(bIsDirect, xNode2->getNodeValue()) );
                     }
                 }
@@ -218,16 +218,16 @@ checkForUpdates(
                     if( xRelNote.is() )
                     {
                         sal_Int32 pos = xRelNote->getAttribute(UNISTRING("pos")).toInt32();
-
+                        
                         ReleaseNote aRelNote((sal_uInt8) pos, xRelNote->getAttribute(UNISTRING("src")));
-
+                        
                         if( xRelNote->hasAttribute(UNISTRING("src2")) )
                         {
                             pos = xRelNote->getAttribute(UNISTRING("pos2")).toInt32();
                             aRelNote.Pos2 = (sal_Int8) pos;
                             aRelNote.URL2 = xRelNote->getAttribute(UNISTRING("src2"));
                         }
-
+                        
                         o_rUpdateInfo.ReleaseNotes.push_back(aRelNote);
                     }
                 }
@@ -236,7 +236,7 @@ checkForUpdates(
                     ReleaseNote(1, UNISTRING("http://qa.openoffice.org/tests/online_update_test.html"))
                 );
 */
-
+                
                 if( o_rUpdateInfo.Sources.size() > 0 )
                     return true;
             }
@@ -246,7 +246,7 @@ checkForUpdates(
     {
         return false;
     }
-
+    
     return true;
 }
 
diff --git a/extensions/source/update/check/updateprotocol.hxx b/extensions/source/update/check/updateprotocol.hxx
index ef7d150867b0..3510367b0ebb 100644
--- a/extensions/source/update/check/updateprotocol.hxx
+++ b/extensions/source/update/check/updateprotocol.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ bool checkForPendingUpdates(
     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext
 );
 
-bool storeExtensionUpdateInfos(
+bool storeExtensionUpdateInfos( 
     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
     const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< rtl::OUString > > &rUpdateInfos
 );
diff --git a/extensions/source/update/check/updateprotocoltest.cxx b/extensions/source/update/check/updateprotocoltest.cxx
index bbcd225019c6..c9fe2f33c0eb 100644
--- a/extensions/source/update/check/updateprotocoltest.cxx
+++ b/extensions/source/update/check/updateprotocoltest.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ SAL_IMPLEMENT_MAIN()
 {
     (void) argv;
     (void) argc;
-
+    
     if( osl_getCommandArgCount() != 0 )
     {
         fprintf(stderr, "Usage: updateprotocoltest\n");
@@ -57,19 +57,19 @@ SAL_IMPLEMENT_MAIN()
 
     // create the initial component context
     uno::Reference< uno::XComponentContext > rComponentContext = cppu::defaultBootstrap_InitialComponentContext();
-
+ 
     // initialize UCB
     uno::Sequence< uno::Any > theArguments(2);
     theArguments[0] = uno::makeAny( UNISTRING( "Local") );
     theArguments[1] = uno::makeAny( UNISTRING( "Office") );
-
-    uno::Reference< uno::XInterface > xUCB =
-        rComponentContext->getServiceManager()->createInstanceWithArgumentsAndContext(
-            UNISTRING( "com.sun.star.ucb.UniversalContentBroker" ),
-            theArguments,
+    
+    uno::Reference< uno::XInterface > xUCB = 
+        rComponentContext->getServiceManager()->createInstanceWithArgumentsAndContext( 
+            UNISTRING( "com.sun.star.ucb.UniversalContentBroker" ), 
+            theArguments, 
             rComponentContext );
-
-
+ 
+    
     rtl::OUString aURL;
     rtl::OUString aVersion;
 
@@ -77,7 +77,7 @@ SAL_IMPLEMENT_MAIN()
     {
         if( checkForUpdates(rComponentContext, uno::Reference< task::XInteractionHandler > (), aURL, aVersion) )
         {
-            OSL_TRACE( "Update found: %s on %s",
+            OSL_TRACE( "Update found: %s on %s", 
                 rtl::OUStringToOString( aVersion, RTL_TEXTENCODING_UTF8).getStr(),
                 rtl::OUStringToOString( aURL, RTL_TEXTENCODING_UTF8).getStr());
         }
@@ -90,7 +90,7 @@ SAL_IMPLEMENT_MAIN()
     {
         OSL_TRACE( "unhandled exception caught" );
     }
-
+            
     return 0;
 }
 
diff --git a/extensions/source/update/check/updchk.xml b/extensions/source/update/check/updchk.xml
index 25d5d361e1d0..487034ecf180 100644
--- a/extensions/source/update/check/updchk.xml
+++ b/extensions/source/update/check/updchk.xml
@@ -8,8 +8,8 @@
         <description> The  </description>
         <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
         <language>c++</language>
-        <status value="beta"/>
-        <supported-service>com.sun.star.setup.UpdateCheck</supported-service>
+        <status value="beta"/>        
+        <supported-service>com.sun.star.setup.UpdateCheck</supported-service>		
         <service-dependency>...</service-dependency>
         <type>com.sun.star.beans.NamedValue</type>
         <type>com.sun.star.beans.PropertyValue</type>
diff --git a/extensions/source/update/feed/test/updatefeedtest.cxx b/extensions/source/update/feed/test/updatefeedtest.cxx
index a9bd65bc32d1..073eb92166ed 100644
--- a/extensions/source/update/feed/test/updatefeedtest.cxx
+++ b/extensions/source/update/feed/test/updatefeedtest.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,45 +64,45 @@ SAL_IMPLEMENT_MAIN()
 
     // create the initial component context
     uno::Reference< uno::XComponentContext > rComponentContext = cppu::defaultBootstrap_InitialComponentContext();
-
+ 
     // initialize UCB
     uno::Sequence< uno::Any > theArguments(2);
     theArguments[0] = uno::makeAny( UNISTRING( "Local") );
     theArguments[1] = uno::makeAny( UNISTRING( "Office") );
-
-    uno::Reference< uno::XInterface > xUCB =
-        rComponentContext->getServiceManager()->createInstanceWithArgumentsAndContext(
-            UNISTRING( "com.sun.star.ucb.UniversalContentBroker" ),
-            theArguments,
+    
+    uno::Reference< uno::XInterface > xUCB = 
+        rComponentContext->getServiceManager()->createInstanceWithArgumentsAndContext( 
+            UNISTRING( "com.sun.star.ucb.UniversalContentBroker" ), 
+            theArguments, 
             rComponentContext );
-
+ 
     // retrieve the update information provider
     uno::Reference< deployment::XUpdateInformationProvider > rUpdateInformationProvider =
         deployment::UpdateInformationProvider::create( rComponentContext );
-
+    
     uno::Sequence< rtl::OUString > theURLs(1);
     osl_getCommandArg( 0, &theURLs[0].pData );
     // theURLs[0] = UNISTRING( "http://localhost/~olli/atomfeed.xml" );
-
+    
     rtl::OUString aExtension = UNISTRING( "MyExtension" );
 
     try
     {
-        uno::Sequence< uno::Reference< xml::dom::XElement > > theUpdateInfo =
+        uno::Sequence< uno::Reference< xml::dom::XElement > > theUpdateInfo = 
             rUpdateInformationProvider->getUpdateInformation( theURLs, aExtension );
-
+        
         OSL_TRACE( "getUpdateInformation returns %d element(s)", theUpdateInfo.getLength() );
     }
     catch( const uno::Exception & e )
     {
         OSL_TRACE( "exception caught: %s", rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr());
     }
-    catch( ... )
+    catch( ... ) 
     {
         OSL_TRACE( "exception of undetermined type caught" );
     }
 
-
+                
     return 0;
 }
 
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index afc3ba1f76ed..ff1a10d86a17 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/update/feed/updatefeed.xml b/extensions/source/update/feed/updatefeed.xml
index 1b0557db3db2..b8606a643c93 100644
--- a/extensions/source/update/feed/updatefeed.xml
+++ b/extensions/source/update/feed/updatefeed.xml
@@ -8,13 +8,13 @@
         <description> The  </description>
         <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
         <language>c++</language>
-        <status value="beta"/>
-        <supported-service>com.sun.star.deployment.UpdateInformationProvider</supported-service>
+        <status value="beta"/>        
+        <supported-service>com.sun.star.deployment.UpdateInformationProvider</supported-service>		
         <service-dependency>...</service-dependency>
         <type>com.sun.star.beans.NamedValue</type>
         <type>com.sun.star.beans.PropertyValue</type>
         <type>com.sun.star.container.XNameReplace</type>
-        <type>com.sun.star.deployment.UpdateInformationProvider</type>
+        <type>com.sun.star.deployment.UpdateInformationProvider</type>		
         <type>com.sun.star.io.XInputStream</type>
         <type>com.sun.star.io.XOutputStream</type>
         <type>com.sun.star.lang.XComponent</type>
diff --git a/extensions/source/update/tools/ztool.cxx b/extensions/source/update/tools/ztool.cxx
index fbcf02e66a65..3695823110b6 100644
--- a/extensions/source/update/tools/ztool.cxx
+++ b/extensions/source/update/tools/ztool.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,6 +61,6 @@ main( int argc, char **argv )
     return 0;
 }
 
-
+    
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index 550705ee4a67..fe784a7d5630 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -397,7 +397,7 @@ void UpdateCheckUI::AddMenuBarIcon( SystemWindow *pSysWin, bool bAddEventHdl )
                     aBuf.appendAscii( "\n\n" );
                 aBuf.append( maBubbleText );
             }
-
+                
             Image aImage = GetMenuBarIcon( pActiveMBar );
             mnIconID = pActiveMBar->AddMenuBarButton( aImage,
                                     LINK( this, UpdateCheckUI, ClickHdl ),
@@ -585,7 +585,7 @@ BubbleWindow * UpdateCheckUI::GetBubbleWindow()
     Rectangle aIconRect = mpIconMBar->GetMenuBarButtonRectPixel( mnIconID );
     if( aIconRect.IsEmpty() )
         return NULL;
-
+    
     BubbleWindow* pBubbleWin = mpBubbleWin;
 
     if ( !pBubbleWin ) {
@@ -596,7 +596,7 @@ BubbleWindow * UpdateCheckUI::GetBubbleWindow()
         mbBubbleChanged = false;
     }
     else if ( mbBubbleChanged ) {
-        pBubbleWin->SetTitleAndText( XubString( maBubbleTitle ),
+        pBubbleWin->SetTitleAndText( XubString( maBubbleTitle ), 
                                      XubString( maBubbleText ),
                                      maBubbleImage );
         mbBubbleChanged = false;
diff --git a/extensions/source/update/ui/updatecheckui.hrc b/extensions/source/update/ui/updatecheckui.hrc
index 3d92e4579f58..3b451fa99d77 100644
--- a/extensions/source/update/ui/updatecheckui.hrc
+++ b/extensions/source/update/ui/updatecheckui.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,10 +25,10 @@
  *
  ************************************************************************/
 
- #define RID_UPDATECHECKUI_START            1100
-
+ #define RID_UPDATECHECKUI_START			1100
+ 
  #define RID_UPDATE_AVAIL_IMAGES            RID_UPDATECHECKUI_START + 1
-
+ 
  #define RID_UPDATE_AVAILABLE_16            RID_UPDATECHECKUI_START + 1
  #define RID_UPDATE_AVAILABLE_26            RID_UPDATECHECKUI_START + 2
  #define RID_UPDATE_AVAILABLE_16_HC         RID_UPDATECHECKUI_START + 3
diff --git a/extensions/source/update/ui/updatecheckui.src b/extensions/source/update/ui/updatecheckui.src
index 39b6f44dce4d..813e3e19b9e2 100644
--- a/extensions/source/update/ui/updatecheckui.src
+++ b/extensions/source/update/ui/updatecheckui.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/source/update/ui/updchkui.xml b/extensions/source/update/ui/updchkui.xml
index a9005d8b255f..6c7625ad3358 100644
--- a/extensions/source/update/ui/updchkui.xml
+++ b/extensions/source/update/ui/updchkui.xml
@@ -8,8 +8,8 @@
         <description> The  </description>
         <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
         <language>c++</language>
-        <status value="beta"/>
-        <supported-service>com.sun.star.setup.UpdateCheckUI</supported-service>
+        <status value="beta"/>        
+        <supported-service>com.sun.star.setup.UpdateCheckUI</supported-service>		
         <service-dependency>...</service-dependency>
         <type>com.sun.star.document.XEventBroadcaster</type>
         <type>com.sun.star.document.XEventListener</type>
diff --git a/extensions/source/xmlextract/xmxcom.hxx b/extensions/source/xmlextract/xmxcom.hxx
index e44419b633fd..a3ce42f843c9 100644
--- a/extensions/source/xmlextract/xmxcom.hxx
+++ b/extensions/source/xmlextract/xmxcom.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,18 +48,18 @@
 
 // -----------------------------------------------------------------------------
 
-#define NMSP_CPPU       ::cppu
-#define NMSP_RTL        ::rtl
-#define NMSP_UNO        ::com::sun::star::uno
-#define NMSP_LANG       ::com::sun::star::lang
-#define NMSP_IO         ::com::sun::star::io
+#define NMSP_CPPU		::cppu
+#define NMSP_RTL		::rtl
+#define NMSP_UNO		::com::sun::star::uno
+#define NMSP_LANG		::com::sun::star::lang
+#define NMSP_IO			::com::sun::star::io
 #define NMSP_REGISTRY   ::com::sun::star::registry
 
 
-#define REF( _def_Obj )                     NMSP_UNO::Reference< _def_Obj >
-#define SEQ( _def_Obj )                     NMSP_UNO::Sequence< _def_Obj >
-#define ANY                                 NMSP_UNO::Any
-#define B2UCONST( _def_pChar )              (NMSP_RTL::OUString(RTL_CONSTASCII_USTRINGPARAM(_def_pChar )))
+#define REF( _def_Obj )						NMSP_UNO::Reference< _def_Obj >
+#define SEQ( _def_Obj )						NMSP_UNO::Sequence< _def_Obj > 
+#define ANY									NMSP_UNO::Any
+#define B2UCONST( _def_pChar )				(NMSP_RTL::OUString(RTL_CONSTASCII_USTRINGPARAM(_def_pChar )))
 
 #endif // _XMXCOM_HXX
 
diff --git a/extensions/source/xmlextract/xmxtrct.cxx b/extensions/source/xmlextract/xmxtrct.cxx
index b738c7fa5b1e..7a5b1a87a574 100644
--- a/extensions/source/xmlextract/xmxtrct.cxx
+++ b/extensions/source/xmlextract/xmxtrct.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 class XMXLockBytes : public SvLockBytes
 {
-    REF( NMSP_IO::XInputStream )    mxIStm;
-    SEQ( sal_Int8 )                 maSeq;
+    REF( NMSP_IO::XInputStream ) 	mxIStm;
+    SEQ( sal_Int8 )					maSeq;
 
                                     XMXLockBytes();
 
 public:
 
                                     XMXLockBytes( const REF( NMSP_IO::XInputStream )& rxIStm );
-    virtual                         ~XMXLockBytes();
+    virtual							~XMXLockBytes();
 
-    virtual ErrCode                 ReadAt( sal_Size nPos, void* pBuffer, sal_Size nCount, sal_Size* pRead ) const;
-    virtual ErrCode                 WriteAt( sal_Size nPos, const void* pBuffer, sal_Size nCount, sal_Size* pWritten );
-    virtual ErrCode                 Flush() const;
-    virtual ErrCode                 SetSize( sal_Size nSize );
-    virtual ErrCode                 Stat( SvLockBytesStat*, SvLockBytesStatFlag ) const;
+    virtual ErrCode					ReadAt( sal_Size nPos, void* pBuffer, sal_Size nCount, sal_Size* pRead ) const;
+    virtual ErrCode					WriteAt( sal_Size nPos, const void* pBuffer, sal_Size nCount, sal_Size* pWritten );
+    virtual ErrCode					Flush() const;
+    virtual ErrCode					SetSize( sal_Size nSize );
+    virtual ErrCode					Stat( SvLockBytesStat*, SvLockBytesStatFlag ) const;
 };
 
 // ------------------------------------------------------------------------
@@ -66,8 +66,8 @@ XMXLockBytes::XMXLockBytes( const REF( NMSP_IO::XInputStream )& rxIStm ) :
 {
     if( mxIStm.is() )
     {
-        const sal_uInt32    nBytesToRead = 65535;
-        sal_uInt32          nRead;
+        const sal_uInt32	nBytesToRead = 65535;
+        sal_uInt32			nRead;
 
         do
         {
@@ -96,8 +96,8 @@ XMXLockBytes::~XMXLockBytes()
 
 ErrCode XMXLockBytes::ReadAt( sal_Size nPos, void* pBuffer, sal_Size nCount, sal_Size* pRead ) const
 {
-    const sal_Size      nSeqLen = maSeq.getLength();
-    ErrCode             nErr = ERRCODE_NONE;
+    const sal_Size		nSeqLen = maSeq.getLength();
+    ErrCode				nErr = ERRCODE_NONE;
 
     if( nPos < nSeqLen )
     {
@@ -165,11 +165,11 @@ REF( NMSP_IO::XInputStream ) SAL_CALL XMLExtractor::extract( const REF( NMSP_IO:
 
     if( rxIStm.is() )
     {
-        SvStream        aIStm( new XMXLockBytes( rxIStm ) );
-        SvStorageRef    aStorage( new SvStorage( aIStm ) );
-        String          aStmName;
-        const String    aFormat1( String::CreateFromAscii( "XMLFormat" ) );
-        const String    aFormat2( String::CreateFromAscii( "XMLFormat2" ) );
+        SvStream		aIStm( new XMXLockBytes( rxIStm ) );
+        SvStorageRef	aStorage( new SvStorage( aIStm ) );
+        String			aStmName;
+        const String	aFormat1( String::CreateFromAscii( "XMLFormat" ) );
+        const String	aFormat2( String::CreateFromAscii( "XMLFormat2" ) );
 
         if( aStorage->IsContained( aFormat2 ) )
             aStmName = aFormat2;
@@ -182,8 +182,8 @@ REF( NMSP_IO::XInputStream ) SAL_CALL XMLExtractor::extract( const REF( NMSP_IO:
 
             if( xStream.Is() )
             {
-                SvMemoryStream* pMemStm = new SvMemoryStream( 65535, 65535 );
-                ZCodec          aCodec;
+                SvMemoryStream*	pMemStm = new SvMemoryStream( 65535, 65535 );
+                ZCodec			aCodec;
 
                 aCodec.BeginCompression( ZCODEC_BEST_COMPRESSION );
                 aCodec.Decompress( *xStream, *pMemStm );
diff --git a/extensions/source/xmlextract/xmxtrct.hxx b/extensions/source/xmlextract/xmxtrct.hxx
index 264609b8d6a7..8b972530bd98 100644
--- a/extensions/source/xmlextract/xmxtrct.hxx
+++ b/extensions/source/xmlextract/xmxtrct.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,20 +36,20 @@
 // ----------------
 
 class XMLExtractor : public ::cppu::WeakImplHelper1< NMSP_IO::XXMLExtractor >
-{
+{	
 private:
 
-    REF( NMSP_LANG::XMultiServiceFactory )          mxFact;
-
+    REF( NMSP_LANG::XMultiServiceFactory )			mxFact;
+                                            
                                                     XMLExtractor();
-
-public:
-
+                                            
+public:										
+                                            
                                                     XMLExtractor( const REF( NMSP_LANG::XMultiServiceFactory )& rxMgr );
-    virtual                                         ~XMLExtractor();
-
-    // XXMLExtractor
-    virtual REF( NMSP_IO::XInputStream ) SAL_CALL   extract( const REF( NMSP_IO::XInputStream )& rxIStm ) throw( NMSP_UNO::RuntimeException );
+    virtual 										~XMLExtractor();
+                                            
+    // XXMLExtractor							
+    virtual REF( NMSP_IO::XInputStream ) SAL_CALL	extract( const REF( NMSP_IO::XInputStream )& rxIStm ) throw( NMSP_UNO::RuntimeException );
 };
 
 #endif
diff --git a/extensions/source/xmlextract/xmxuno.cxx b/extensions/source/xmlextract/xmxuno.cxx
index 7cb63ea4d13c..ac28ccc7e1ad 100644
--- a/extensions/source/xmlextract/xmxuno.cxx
+++ b/extensions/source/xmlextract/xmxuno.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ sal_Bool SAL_CALL component_writeInfo(
             REF( NMSP_REGISTRY::XRegistryKey ) xNewKey(
                 reinterpret_cast< NMSP_REGISTRY::XRegistryKey * >( pRegistryKey )->createKey(
                     NMSP_RTL::OUString( RTL_CONSTASCII_USTRINGPARAM("/com.sun.star.comp.io.XMLExtractor/UNO/SERVICES/com.sun.star.io.XMLExtractor") ) ) );
-
+            
             return sal_True;
         }
         catch (NMSP_REGISTRY::InvalidRegistryException &)
@@ -78,7 +78,7 @@ void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     void * pRet = 0;
-
+    
     if (rtl_str_compare( pImplName, "com.sun.star.comp.io.XMLExtractor" ) == 0)
     {
         NMSP_RTL::OUString aServiceName( B2UCONST( "com.sum.star.io.XMLExtractor" ) );
@@ -88,14 +88,14 @@ void * SAL_CALL component_getFactory(
             NMSP_RTL::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.io.XMLExtractor") ),
             create_XMLExtractor,
             SEQ( NMSP_RTL::OUString )( &aServiceName, 1 ) ) );
-
+        
         if (xFactory.is())
         {
             xFactory->acquire();
             pRet = xFactory.get();
         }
     }
-
+    
     return pRet;
 }
 }
diff --git a/extensions/stardiv/fontest/fontest.idl b/extensions/stardiv/fontest/fontest.idl
index c000a5f0470b..85d8916199dc 100644
--- a/extensions/stardiv/fontest/fontest.idl
+++ b/extensions/stardiv/fontest/fontest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/stardiv/oinstchk/oinstchk.idl b/extensions/stardiv/oinstchk/oinstchk.idl
index 04b3fbcd8a67..5c1a3b159cdf 100644
--- a/extensions/stardiv/oinstchk/oinstchk.idl
+++ b/extensions/stardiv/oinstchk/oinstchk.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/test/ole/AxTestComponents/AxTestComponents.cpp b/extensions/test/ole/AxTestComponents/AxTestComponents.cpp
index 283cffd5f0bc..7d82204aa917 100644
--- a/extensions/test/ole/AxTestComponents/AxTestComponents.cpp
+++ b/extensions/test/ole/AxTestComponents/AxTestComponents.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 @@
 
 
 // Note: Proxy/Stub Information
-//      To build a separate proxy/stub DLL,
+//      To build a separate proxy/stub DLL, 
 //      run nmake -f AxTestComponentsps.mk in the project directory.
 
 #include "stdafx.h"
@@ -96,6 +96,6 @@ STDAPI DllUnregisterServer(void)
 }
 
 
-//VT_I4 size_t V_ERROR VARIANT VARIANT_FALSE CComVariant FADF_EMBEDDED
+//VT_I4 size_t V_ERROR VARIANT VARIANT_FALSE CComVariant FADF_EMBEDDED    
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/test/ole/AxTestComponents/AxTestComponents.idl b/extensions/test/ole/AxTestComponents/AxTestComponents.idl
index 707d85f58941..ad8cca5d2928 100644
--- a/extensions/test/ole/AxTestComponents/AxTestComponents.idl
+++ b/extensions/test/ole/AxTestComponents/AxTestComponents.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,37 +124,37 @@ import "ocidl.idl";
         [id(70), helpstring("method inMulDimArrayByte2")] HRESULT inMulDimArrayByte2([in] SAFEARRAY(unsigned char) val);
         [id(71), helpstring("method outMore")] HRESULT outMore([out]long* val1, [out]long* val2);
 
-        [id(72), helpstring("method optional1")]
+        [id(72), helpstring("method optional1")] 
         HRESULT optional1([in] long val1, [in, optional] VARIANT* val2);
-        [id(73), helpstring("method optional2")]
+        [id(73), helpstring("method optional2")] 
         HRESULT optional2([out] long* val1, [out, optional] VARIANT* val2);
-        [id(74), helpstring("method optional3")]
+        [id(74), helpstring("method optional3")] 
         HRESULT optional3([in, optional] VARIANT* val1, [in, optional] VARIANT* val2);
-        [id(75), helpstring("method optional4")]
+        [id(75), helpstring("method optional4")] 
         HRESULT optional4([in, out, optional] VARIANT* val1, [in, out, optional] VARIANT* val2);
-        [id(76), helpstring("method optional5")]
+        [id(76), helpstring("method optional5")] 
         HRESULT optional5([out, optional] VARIANT* val1, [out, optional] VARIANT* val2);
         //midl creates for val4 a BSTR "4" as default value in the TLB. The midl complains
         //but the error message seems to be not for this case.
         //in defaultvalue2 val4 has an VT_I4 in the TLB. This must be a bug!
-        [id(77), helpstring("method defaultvalue1")]
-        HRESULT defaultvalue1([in, defaultvalue(1)] long val1,
+        [id(77), helpstring("method defaultvalue1")] 
+        HRESULT defaultvalue1([in, defaultvalue(1)] long val1, 
                               [in, defaultvalue(2)] double* val2,
                              // [in, defaultvalue(3)] VARIANT val3, //ok
                               [in, defaultvalue(4)] VARIANT* val4);
 
         // bug im midl: when val3 and val4 are pointers then the generated header cretates
         // for all params default values:
-        //HRESULT STDMETHODCALLTYPE defaultvalue2(
+        //HRESULT STDMETHODCALLTYPE defaultvalue2( 
         //            /* [defaultvalue][in] */ long *val1 = 10,
         //    /* [defaultvalue][in] */ double *val2 = 3.14,
         //    /* [defaultvalue][in] */ VARIANT *val3 = 10,
         //    /* [defaultvalue][in] */ VARIANT *val4 = 100) = 0;
-        // And that does not compile.
-        //Therefore we must not include the midl generated header, instead use
+        // And that does not compile. 
+        //Therefore we must not include the midl generated header, instead use 
         // #import to create the interface header
-        [id(78), helpstring("method defaultvalue2")]
-        HRESULT defaultvalue2([in, out, defaultvalue(1)]long* val1,
+        [id(78), helpstring("method defaultvalue2")] 
+        HRESULT defaultvalue2([in, out, defaultvalue(1)]long* val1, 
                               [in, out, defaultvalue(2)] double* val2,
                              // [in, out, defaultvalue(3)] VARIANT *val3,
                               [in, out, defaultvalue(4)] VARIANT *val4);
@@ -164,7 +164,7 @@ import "ocidl.idl";
         [id(80), helpstring("method varargfunc2")]
         HRESULT varargfunc2([out] long* val1, [out] SAFEARRAY(VARIANT)* val2);
 
-
+        
         [id(86), helpstring("method inSequenceByteDim2")] HRESULT inSequenceByteDim2([in] SAFEARRAY(byte) val);
         [id(87), helpstring("method inCurrency")] HRESULT inCurrency([in] CY val);
         [id(88), helpstring("method outCurrency")] HRESULT outCurrency([out] CY* val);
@@ -195,9 +195,9 @@ import "ocidl.idl";
         [propputref, id(107), helpstring("property prprefVariant")] HRESULT prprefVariant([in] VARIANT* newVal);
         [propget, id(108), helpstring("property prprefDecimal")] HRESULT prprefDecimal([out, retval] DECIMAL* pVal);
         [propputref, id(108), helpstring("property prprefDecimal")] HRESULT prprefDecimal([in] DECIMAL* newVal);
-        [id(109), helpstring("method optional6")] HRESULT optional6([in,optional] VARIANT* val1,
+        [id(109), helpstring("method optional6")] HRESULT optional6([in,optional] VARIANT* val1, 
             [in,optional] VARIANT * val2, [in,optional] VARIANT* val3, [in,optional] VARIANT* val4);
-        [id(110), helpstring("method optional7")] HRESULT optional7([out,optional] VARIANT* val1,
+        [id(110), helpstring("method optional7")] HRESULT optional7([out,optional] VARIANT* val1, 
             [out,optional] VARIANT * val2, [out,optional] VARIANT* val3, [out,optional] VARIANT* val4);
 
         [propget, id(111), helpstring("property prpMultiArg1")] HRESULT prpMultiArg1([in,out,optional] VARIANT* val1, [in,out,optional] VARIANT* val2, [out, optional, retval] VARIANT* pVal);
diff --git a/extensions/test/ole/AxTestComponents/Basic.cpp b/extensions/test/ole/AxTestComponents/Basic.cpp
index 4fa950922801..fab6e68f59c0 100644
--- a/extensions/test/ole/AxTestComponents/Basic.cpp
+++ b/extensions/test/ole/AxTestComponents/Basic.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 @@
 
 /////////////////////////////////////////////////////////////////////////////
 // CBasic
-CBasic::CBasic():   m_cPrpByte(0),m_nPrpShort(0),m_lPrpLong(0),m_fPrpFloat(0), m_dPrpDouble(0),m_PrpArray(0),
+CBasic::CBasic():	m_cPrpByte(0),m_nPrpShort(0),m_lPrpLong(0),m_fPrpFloat(0), m_dPrpDouble(0),m_PrpArray(0), 
 m_safearray(NULL), m_bool(VARIANT_FALSE),
 m_arByte(0), m_arShort(0), m_arLong(0), m_arString(0), m_arVariant(0), m_arFloat(0),
 m_arDouble(0), m_arObject(0), m_arByteDim2(0), m_date(0.), m_scode(0)
@@ -103,7 +103,7 @@ STDMETHODIMP CBasic::inDouble(double val)
 
 STDMETHODIMP CBasic::inVariant(VARIANT val)
 {
-    m_var1 = val;
+    m_var1 = val;	
     return S_OK;
 }
 
@@ -210,7 +210,7 @@ STDMETHODIMP CBasic::inoutArray(LPSAFEARRAY *val)
 
 STDMETHODIMP CBasic::inoutObject(IDispatch **val)
 {
-    CComPtr<IDispatch> disp = *val;
+    CComPtr<IDispatch> disp = *val;	
     if (*val)
         (*val)->Release();
     *val = m_obj;
@@ -284,7 +284,7 @@ STDMETHODIMP CBasic::outObject(IDispatch* *val)
     *val = m_obj;
     if (m_obj)
         (*val)->AddRef();
-
+    
     return S_OK;
 }
 
@@ -439,7 +439,7 @@ STDMETHODIMP CBasic::put_prpObject(IDispatch *newVal)
     return S_OK;
 }
 
-STDMETHODIMP CBasic::mixed1(
+STDMETHODIMP CBasic::mixed1( 
             /* [out][in] */ unsigned char *aChar,
             /* [out][in] */ float *aFloat,
             /* [out][in] */ VARIANT *aVar)
@@ -537,13 +537,13 @@ void CBasic::printArray( LPSAFEARRAY val, BSTR message, VARTYPE type)
     hr= SafeArrayGetLBound( val, 1, &lbound);
     hr= SafeArrayGetUBound( val, 1, &ubound);
     long length= ubound - lbound +1;
-
+    
     CComVariant varElement;
     char buf[1024];
     sprintf( buf,"%s", W2A(message));
 
     for( long i= 0; i < length ; i++)
-    {
+    {	
         char tmp[1024];
         long data=0;
         CComVariant var;
@@ -573,7 +573,7 @@ void CBasic::printArray( LPSAFEARRAY val, BSTR message, VARTYPE type)
             sprintf( tmp, "%f \n", *(double*) &data);
             break;
         case VT_DISPATCH:
-            // we assume the objects are instances of this component and have the
+            // we assume the objects are instances of this component and have the 
             // property prpString set.
             hr= SafeArrayGetElement( val, &i, (void*)&data);
             IDispatch* pdisp= ( IDispatch*) data;
@@ -590,8 +590,8 @@ void CBasic::printArray( LPSAFEARRAY val, BSTR message, VARTYPE type)
 
         strcat( buf, tmp);
     }
-    MessageBox( NULL, _T(A2T(buf)), _T("AxTestComponents.Basic"), MB_OK);
-
+    MessageBox( NULL, _T(A2T(buf)), _T("AxTestComponents.Basic"), MB_OK);	
+    
 }
 // V_ERROR OLECHAR VARIANT VT_UI1
 
@@ -765,7 +765,7 @@ STDMETHODIMP CBasic::inMulDimArrayByte(LPSAFEARRAY val)
 // 3-dimensionales array
 STDMETHODIMP CBasic::inMulDimArrayByte2(LPSAFEARRAY val)
 {
-
+    
     // TODO: Add your implementation code here
     //printMulArray( val, VT_UI1);
     return S_OK;
@@ -829,7 +829,7 @@ void CBasic::printMulArray( SAFEARRAY* val, VARTYPE type)
 
         }
 
-
+        
     }
     else if( dims == 3 )
     {
@@ -921,12 +921,12 @@ STDMETHODIMP CBasic::optional3(/*[in, optional]*/ VARIANT* val1,/*[in, optional]
 {
     //if (val1->vt != VT_ERROR)
         m_var1 = *val1;
-
+        
     //if (val2->vt != VT_ERROR)
         m_var2 = *val2;
     return S_OK;
 }
-
+    
 STDMETHODIMP CBasic::optional4(/*[in, out, optional]*/ VARIANT* val1,
                                /*[in, out, optional]*/ VARIANT* val2)
 {
@@ -967,7 +967,7 @@ STDMETHODIMP CBasic::defaultvalue1(/*[in, defaultvalue(10)]*/ long val1,
 {
     m_long = val1;
     m_double = *val2;
-//  m_var1 = val3;
+//	m_var1 = val3;
     m_var2 = *val4;
     return S_OK;
 }
@@ -979,17 +979,17 @@ STDMETHODIMP CBasic::defaultvalue2(/*[in, out, defaultvalue(10)]*/ long* val1,
     HRESULT hr = S_OK;
     long aLong = *val1;
     double aDouble = *val2;
-//  CComVariant var1(*val3);
+//	CComVariant var1(*val3);
     CComVariant var2(*val4);
     *val1 = m_long;
     *val2 = m_double;
     //if (FAILED(hr = VariantCopy(val3, &m_var1)))
-    //  return hr;
+    //	return hr;
     if (FAILED(hr = VariantCopy(val4, &m_var2)))
         return hr;
     m_long = aLong;
     m_double = aDouble;
-//  m_var1 = var1;
+//	m_var1 = var1;
     m_var2 = var2;
     return hr;
 }
@@ -1006,7 +1006,7 @@ STDMETHODIMP CBasic::varargfunc1(/*[in]*/ long val1,/*[in]*/ LPSAFEARRAY val2)
     if (FAILED(hr = SafeArrayCopy(val2, & m_safearray)))
     {
         if (hr != E_INVALIDARG)
-            return hr;
+            return hr;	
     }
     return S_OK;
 }
@@ -1187,7 +1187,7 @@ STDMETHODIMP CBasic::get_prpRefLong(long* pVal)
 
 STDMETHODIMP CBasic::putref_prpRefLong(long* newVal)
 {
-    m_long = * newVal;
+    m_long = * newVal;	
     return S_OK;
 }
 
@@ -1242,7 +1242,7 @@ STDMETHODIMP CBasic::optional7(VARIANT* val1, VARIANT* val2, VARIANT* val3, VARI
         return hr;
     if (FAILED(hr = VariantCopy(val4, & m_var4)))
         return hr;
-
+    
     return S_OK;
 }
 
diff --git a/extensions/test/ole/AxTestComponents/Basic.h b/extensions/test/ole/AxTestComponents/Basic.h
index 08d63062f13b..eb67ce8bbb21 100644
--- a/extensions/test/ole/AxTestComponents/Basic.h
+++ b/extensions/test/ole/AxTestComponents/Basic.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 @@
 
 /////////////////////////////////////////////////////////////////////////////
 // CBasic
-class ATL_NO_VTABLE CBasic :
+class ATL_NO_VTABLE CBasic : 
     public CComObjectRootEx<CComSingleThreadModel>,
     public CComCoClass<CBasic, &CLSID_Basic>,
     public IDispatchImpl<IBasic, &IID_IBasic, &LIBID_AXTESTCOMPONENTSLib>
@@ -54,7 +54,7 @@ public:
     END_COM_MAP()
 
     // IBasic
-public:
+public:  
     STDMETHOD(outMore)(/*[out]*/long* val1, /*[out]*/long* val2);
     STDMETHOD(inMulDimArrayByte2)(LPSAFEARRAY val);
     STDMETHOD(inMulDimArrayByte)(LPSAFEARRAY val);
@@ -83,7 +83,7 @@ public:
     STDMETHOD(inSequenceShort)(LPSAFEARRAY ar);
     STDMETHOD(inSequenceByte)(LPSAFEARRAY ar);
     STDMETHOD(inSequenceLong)(LPSAFEARRAY  ar);
-    STDMETHOD(mixed1)(
+    STDMETHOD(mixed1)( 
         /* [out][in] */ unsigned char *aChar,
         /* [out][in] */ float *aFloat,
         /* [out][in] */ VARIANT *aVar);
diff --git a/extensions/test/ole/AxTestComponents/Foo.cpp b/extensions/test/ole/AxTestComponents/Foo.cpp
index 6d6ae3b7a0bd..6eacea7727be 100644
--- a/extensions/test/ole/AxTestComponents/Foo.cpp
+++ b/extensions/test/ole/AxTestComponents/Foo.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/extensions/test/ole/AxTestComponents/Foo.h b/extensions/test/ole/AxTestComponents/Foo.h
index 375d09878fa9..a4024ea01a7a 100644
--- a/extensions/test/ole/AxTestComponents/Foo.h
+++ b/extensions/test/ole/AxTestComponents/Foo.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,12 +35,12 @@
 
 /////////////////////////////////////////////////////////////////////////////
 // CBasic
-class ATL_NO_VTABLE CFoo :
+class ATL_NO_VTABLE CFoo : 
     public CComObjectRootEx<CComSingleThreadModel>,
     public CComCoClass<CFoo, &CLSID_Foo>,
     public IFoo
 
-//  public IDispatchImpl<IFoo, &__uuidof(IFoo), &LIBID_AXTESTCOMPONENTSLib, /* wMajor = */ 1, /* wMinor = */ 0>
+//	public IDispatchImpl<IFoo, &__uuidof(IFoo), &LIBID_AXTESTCOMPONENTSLib, /* wMajor = */ 1, /* wMinor = */ 0>
 {
 public:
     CFoo();
diff --git a/extensions/test/ole/AxTestComponents/StdAfx.cpp b/extensions/test/ole/AxTestComponents/StdAfx.cpp
index 36dc86fc2eba..d881698b27d3 100644
--- a/extensions/test/ole/AxTestComponents/StdAfx.cpp
+++ b/extensions/test/ole/AxTestComponents/StdAfx.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/extensions/test/ole/AxTestComponents/StdAfx.h b/extensions/test/ole/AxTestComponents/StdAfx.h
index ab7782f42659..a46eeeb618af 100644
--- a/extensions/test/ole/AxTestComponents/StdAfx.h
+++ b/extensions/test/ole/AxTestComponents/StdAfx.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/extensions/test/ole/AxTestComponents/resource.h b/extensions/test/ole/AxTestComponents/resource.h
index a3c9b0c20f46..b926189183ec 100644
--- a/extensions/test/ole/AxTestComponents/resource.h
+++ b/extensions/test/ole/AxTestComponents/resource.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 @@
 //#define IDR_FOO                         501
 
 // Next default values for new objects
-//
+// 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        201
diff --git a/extensions/test/ole/EventListenerSample/EventListener/EventListener.cpp b/extensions/test/ole/EventListenerSample/EventListener/EventListener.cpp
index 768f9ec29b68..9512ec4c2372 100644
--- a/extensions/test/ole/EventListenerSample/EventListener/EventListener.cpp
+++ b/extensions/test/ole/EventListenerSample/EventListener/EventListener.cpp
@@ -3,7 +3,7 @@
 
 
 // Note: Proxy/Stub Information
-//      To build a separate proxy/stub DLL,
+//      To build a separate proxy/stub DLL, 
 //      run nmake -f EventListenerps.mk in the project directory.
 
 #include "stdafx.h"
diff --git a/extensions/test/ole/EventListenerSample/EventListener/EvtListener.h b/extensions/test/ole/EventListenerSample/EventListener/EvtListener.h
index 24552b9a9641..2bc0a6a9aef9 100644
--- a/extensions/test/ole/EventListenerSample/EventListener/EvtListener.h
+++ b/extensions/test/ole/EventListenerSample/EventListener/EvtListener.h
@@ -8,7 +8,7 @@
 
 /////////////////////////////////////////////////////////////////////////////
 // CEvtListener
-class ATL_NO_VTABLE CEvtListener :
+class ATL_NO_VTABLE CEvtListener : 
     public CComObjectRootEx<CComSingleThreadModel>,
     public CComCoClass<CEvtListener, &CLSID_EvtListener>,
     public IDispatchImpl<IEvtListener, &IID_IEvtListener, &LIBID_EVENTLISTENERLib>
diff --git a/extensions/test/ole/EventListenerSample/EventListener/resource.h b/extensions/test/ole/EventListenerSample/EventListener/resource.h
index fef53bef1f1f..70bf51a6f1ff 100644
--- a/extensions/test/ole/EventListenerSample/EventListener/resource.h
+++ b/extensions/test/ole/EventListenerSample/EventListener/resource.h
@@ -7,7 +7,7 @@
 #define IDR_EVTLISTENER                 101
 
 // Next default values for new objects
-//
+// 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        201
diff --git a/extensions/test/ole/MfcControl/MfcControlCtl.cpp b/extensions/test/ole/MfcControl/MfcControlCtl.cpp
index 9aab5e79a3ac..399fb5db95c2 100644
--- a/extensions/test/ole/MfcControl/MfcControlCtl.cpp
+++ b/extensions/test/ole/MfcControl/MfcControlCtl.cpp
@@ -196,7 +196,7 @@ void CMfcControlCtrl::OnResetState()
 // CMfcControlCtrl message handlers
 
 
-short CMfcControlCtrl::inShort(short val)
+short CMfcControlCtrl::inShort(short val) 
 {
     char buf[256];
     sprintf( buf, "inByte: value= %d", val);
@@ -204,7 +204,7 @@ short CMfcControlCtrl::inShort(short val)
     return val+1;
 }
 
-long CMfcControlCtrl::inLong(long val)
+long CMfcControlCtrl::inLong(long val) 
 {
     char buf[256];
     sprintf( buf, "inLong: value= %d", val);
@@ -212,7 +212,7 @@ long CMfcControlCtrl::inLong(long val)
     return val+1;
 }
 
-BSTR CMfcControlCtrl::inString(BSTR* val)
+BSTR CMfcControlCtrl::inString(BSTR* val) 
 {
     CString strResult;
     strResult= *val;
@@ -223,7 +223,7 @@ BSTR CMfcControlCtrl::inString(BSTR* val)
     return strResult.AllocSysString();
 }
 
-float CMfcControlCtrl::inFloat(float val)
+float CMfcControlCtrl::inFloat(float val) 
 {
     char buf[256];
     sprintf( buf, "inFloat: value= %f", val);
@@ -231,7 +231,7 @@ float CMfcControlCtrl::inFloat(float val)
     return val+1;
 }
 
-double CMfcControlCtrl::inDouble(double val)
+double CMfcControlCtrl::inDouble(double val) 
 {
     char buf[256];
     sprintf( buf, "inDouble: value= %g", val);
@@ -239,7 +239,7 @@ double CMfcControlCtrl::inDouble(double val)
     return val+1;
 }
 
-VARIANT CMfcControlCtrl::inVariant(const VARIANT FAR& val)
+VARIANT CMfcControlCtrl::inVariant(const VARIANT FAR& val) 
 {
     VARIANT vaResult;
     VariantInit(&vaResult);
@@ -254,7 +254,7 @@ VARIANT CMfcControlCtrl::inVariant(const VARIANT FAR& val)
     return _variant_t( L" a string from CMfcControlCtrl::inVariant");
 }
 
-LPDISPATCH CMfcControlCtrl::inObject(LPDISPATCH val)
+LPDISPATCH CMfcControlCtrl::inObject(LPDISPATCH val) 
 {
     char buf[256];
     _bstr_t bstr;
@@ -278,47 +278,47 @@ LPDISPATCH CMfcControlCtrl::inObject(LPDISPATCH val)
 }
 
 
-void CMfcControlCtrl::outShort(short* val)
+void CMfcControlCtrl::outShort(short* val) 
 {
     *val= 123;
 }
 
-void CMfcControlCtrl::outLong(long* val)
+void CMfcControlCtrl::outLong(long* val) 
 {
     *val= 1234;
 }
 
-void CMfcControlCtrl::outString(BSTR FAR* val)
+void CMfcControlCtrl::outString(BSTR FAR* val) 
 {
-    *val= SysAllocString(L"A string from CMfcControlCtrl::outString ");
+    *val= SysAllocString(L"A string from CMfcControlCtrl::outString ");             
 }
 
-void CMfcControlCtrl::outFloat(float* val)
+void CMfcControlCtrl::outFloat(float* val) 
 {
     *val= 3.14f;
 }
 
-void CMfcControlCtrl::outDouble(double* val)
+void CMfcControlCtrl::outDouble(double* val) 
 {
     *val= 3.145;
 }
 
-void CMfcControlCtrl::outVariant(VARIANT FAR* val)
+void CMfcControlCtrl::outVariant(VARIANT FAR* val) 
 {
     VariantInit( val);
     val->vt= VT_BSTR;
     val->bstrVal= SysAllocString( L"a string in a VARIANT");
 }
 
-void CMfcControlCtrl::outObject(LPDISPATCH FAR* val)
+void CMfcControlCtrl::outObject(LPDISPATCH FAR* val) 
 {
     //{BFE10EBE-8584-11D4-005004526AB4}
     HRESULT hr= S_OK;
     CLSID clsTestControl;
-    hr= CLSIDFromProgID( L"AxTestComponents.Basic", &clsTestControl);
+    hr= CLSIDFromProgID( L"AxTestComponents.Basic", &clsTestControl); 
 
     IDispatch* pDisp= NULL;
-    hr= CoCreateInstance( clsTestControl, NULL, CLSCTX_ALL, __uuidof(IDispatch), (void**)&pDisp);
+    hr=	CoCreateInstance( clsTestControl, NULL, CLSCTX_ALL, __uuidof(IDispatch), (void**)&pDisp);
 
     if( SUCCEEDED( hr) && val)
     {
diff --git a/extensions/test/ole/MfcControl/MfcControlCtl.h b/extensions/test/ole/MfcControl/MfcControlCtl.h
index ea06425a3fcd..f6d4379658b9 100644
--- a/extensions/test/ole/MfcControl/MfcControlCtl.h
+++ b/extensions/test/ole/MfcControl/MfcControlCtl.h
@@ -35,7 +35,7 @@ protected:
     DECLARE_OLECREATE_EX(CMfcControlCtrl)    // Class factory and guid
     DECLARE_OLETYPELIB(CMfcControlCtrl)      // GetTypeInfo
     DECLARE_PROPPAGEIDS(CMfcControlCtrl)     // Property page IDs
-    DECLARE_OLECTLTYPE(CMfcControlCtrl)     // Type name and misc status
+    DECLARE_OLECTLTYPE(CMfcControlCtrl)		// Type name and misc status
 
 // Message maps
     //{{AFX_MSG(CMfcControlCtrl)
diff --git a/extensions/test/ole/MfcControl/StdAfx.h b/extensions/test/ole/MfcControl/StdAfx.h
index b0a8f50346c7..4df599c412e3 100644
--- a/extensions/test/ole/MfcControl/StdAfx.h
+++ b/extensions/test/ole/MfcControl/StdAfx.h
@@ -10,19 +10,19 @@
 //      or project specific include files that are used frequently,
 //      but are changed infrequently
 
-#define VC_EXTRALEAN        // Exclude rarely-used stuff from Windows headers
+#define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
 
 #include <afxctl.h>         // MFC support for ActiveX Controls
 #include <afxext.h>         // MFC extensions
-#include <afxdtctl.h>       // MFC support for Internet Explorer 4 Comon Controls
+#include <afxdtctl.h>		// MFC support for Internet Explorer 4 Comon Controls
 #ifndef _AFX_NO_AFXCMN_SUPPORT
-#include <afxcmn.h>         // MFC support for Windows Common Controls
+#include <afxcmn.h>			// MFC support for Windows Common Controls
 #endif // _AFX_NO_AFXCMN_SUPPORT
 
 // Delete the two includes below if you do not wish to use the MFC
 //  database classes
-#include <afxdb.h>          // MFC database classes
-#include <afxdao.h>         // MFC DAO database classes
+#include <afxdb.h>			// MFC database classes
+#include <afxdao.h>			// MFC DAO database classes
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
diff --git a/extensions/test/ole/OleClient/axhost.cxx b/extensions/test/ole/OleClient/axhost.cxx
index 5c96023af26c..93d5721b3b49 100644
--- a/extensions/test/ole/OleClient/axhost.cxx
+++ b/extensions/test/ole/OleClient/axhost.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/extensions/test/ole/OleClient/axhost.hxx b/extensions/test/ole/OleClient/axhost.hxx
index 9857eaa8e28d..88b870f849c5 100644
--- a/extensions/test/ole/OleClient/axhost.hxx
+++ b/extensions/test/ole/OleClient/axhost.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 CComModule _Module;
 #include <atlhost.h>
 
 
-class HostWin: public CWindowImpl<HostWin, CWindow,
+class HostWin: public CWindowImpl<HostWin, CWindow, 
                CWinTraits< WS_CAPTION|WS_POPUPWINDOW|WS_VISIBLE, 0> >
 {
     CComBSTR controlName;
diff --git a/extensions/test/ole/OleClient/clientTest.cxx b/extensions/test/ole/OleClient/clientTest.cxx
index 684644e47cec..4a79eead82df 100644
--- a/extensions/test/ole/OleClient/clientTest.cxx
+++ b/extensions/test/ole/OleClient/clientTest.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ extern "C" int __cdecl main( int , char **)
         return -1;
     }
 
-
+    
     _Module.Init( ObjectMap, GetModuleHandle( NULL));
 
     if( FAILED(hr=doTest()))
@@ -152,17 +152,17 @@ bool doParameterTest(const Reference<XInvocation> & inv)
     Sequence<Any> seqNamed5(arArgs, 1);
     arArgs[0] <<= arg2;
     Sequence<Any> seqNamed6(arArgs, 1);
-
+    
     arArgs[0] <<= (sal_Int32) 123;
     arArgs[1] <<= (sal_Int32) 456;
     Sequence<Any> seqPositional(arArgs, 2);
     arArgs[0] <<= (sal_Int32) 123;
     Sequence<Any> seqPositional2(arArgs, 1);
-
+    
     arArgs[0] <<= Any();
     arArgs[1] <<= Any();
     Sequence<Any> seqPositional3(arArgs, 2);
-
+    
     arArgs[0] <<= (sal_Int32) 123;
     arArgs[1] <<= SCode(DISP_E_PARAMNOTFOUND);
     Sequence<Any> seqOutOpt1(arArgs, 2);
@@ -180,7 +180,7 @@ bool doParameterTest(const Reference<XInvocation> & inv)
     arArgs1[2] <<= (sal_Int32) 0;
     arArgs1[3] <<= (sal_Int32) 0;
     Sequence<Any> seqMix0(arArgs1, 4);
-
+    
     arArgs1[0] <<= (sal_Int32) 123;
     arArgs1[1] <<= (sal_Int32) 456;
     arArgs1[2] <<= arg3;
@@ -215,7 +215,7 @@ bool doParameterTest(const Reference<XInvocation> & inv)
     inv->invoke(OUString(L"optional5"), seqPositional, seqIndices, seqOut);
     if ( ! checkOutArgs(seqOut, seqIndices, seqPositional))
         return false;
-
+    
     //2 optional args, 1 provided
     seqIndices.realloc(0);
     seqOut.realloc(0);
@@ -241,7 +241,7 @@ bool doParameterTest(const Reference<XInvocation> & inv)
     inv->invoke(OUString(L"optional5"), seqPositional3, seqIndices, seqOut);
     if ( ! checkOutArgs(seqOut, seqIndices, seqOutOpt2))
         return false;
-
+    
     //named args --------------------------------------------
 
     // 2 named args, correct position
@@ -289,7 +289,7 @@ bool doParameterTest(const Reference<XInvocation> & inv)
     inv->invoke(OUString(L"optional5"), seqNamed4, seqIndices, seqOut);
     if ( ! checkOutArgs(seqOut, seqIndices, seqNamed2 ))
         return false;
-
+    
 
     //2 args, 1 provided (correct order)
     seqIndices.realloc(0);
@@ -351,8 +351,8 @@ bool doParameterTest(const Reference<XInvocation> & inv)
     inv->invoke(OUString(L"optional7"), seqMix2Out, seqIndices, seqOut);
     if ( ! checkOutArgs(seqOut, seqIndices, seqMix2Out))
          return false;
-
-
+ 
+    
     return true;
 }
 bool doPropertyTest(const Reference<XInvocation> & inv)
@@ -379,7 +379,7 @@ bool doPropertyTest(const Reference<XInvocation> & inv)
     Any inrefDecimal, outrefDecimal;
     Any inParamsLong, outParamsLong;
     Reference<XInterface> xintUnknown(getComObject(L"AxTestComponents.Foo"));
-
+    
     inBool <<= (sal_Bool) sal_True;
     inv->setValue(OUString(L"prpBool"), inBool);
     outBool = inv->getValue(OUString(L"prpBool"));
@@ -393,7 +393,7 @@ bool doPropertyTest(const Reference<XInvocation> & inv)
     outShort = inv->getValue(OUString(L"prpShort"));
 
     inLong <<= ( sal_Int32) 1234567;
-    inv->setValue(OUString(L"prpLong"), inLong  // TODO: Add your implementation code here
+    inv->setValue(OUString(L"prpLong"), inLong	// TODO: Add your implementation code here
 );
     outLong = inv->getValue(OUString(L"prpLong"));
 
@@ -420,7 +420,7 @@ bool doPropertyTest(const Reference<XInvocation> & inv)
     inUnknown <<= xintUnknown;
     inv->setValue(OUString(L"prpUnknown"), inUnknown);
     outUnknown = inv->getValue(OUString(L"prpUnknown"));
-
+    
     Currency cur(99999);
     inCY <<= cur;
     inv->setValue(OUString(L"prpCurrency"), inCY);
@@ -444,7 +444,7 @@ bool doPropertyTest(const Reference<XInvocation> & inv)
     inrefLong <<= (sal_Int32) 123456;
     inv->setValue(OUString(L"prprefLong"), inrefLong);
     outrefLong = inv->getValue(OUString(L"prprefLong"));
-
+    
     inrefVariant <<= OUString(L"A string in an any");
     inv->setValue(OUString(L"prprefVariant"), inrefVariant);
     outrefVariant = inv->getValue(OUString(L"prprefVariant"));
@@ -456,7 +456,7 @@ bool doPropertyTest(const Reference<XInvocation> & inv)
 
     if (inBool != outBool || inByte != outByte || inShort != outShort || inLong != outLong
          || inFloat != outFloat || inDouble != outDouble || inString != outString
-         || inVariant != outVariant || inObject != outObject
+         || inVariant != outVariant || inObject != outObject 
         || inUnknown != outUnknown || inCY != outCY
         || inDate != outDate || inDecimal != outDecimal || inSCode != outSCode
         || inrefLong != outrefLong ||inrefVariant != outrefVariant
@@ -486,7 +486,7 @@ bool doPropertyWithArgumentTest(const Reference<XInvocation> & inv)
     Sequence<Any> seqMultiArgPut2(arMultiArgs, 2);
 
     arMultiArgs[0] <<= NamedArgument(OUString(L"val2"), makeAny((sal_Int32) 1));
-    arMultiArgs[1] <<= PropertyPutArgument(makeAny((sal_Int32) 3));
+    arMultiArgs[1] <<= PropertyPutArgument(makeAny((sal_Int32) 3));   
     Sequence<Any> seqMultiArgPut3(arMultiArgs, 2);
 
     arMultiArgs[0] <<= NamedArgument(OUString(L"val2"), makeAny((sal_Int32) 1));
@@ -501,12 +501,12 @@ bool doPropertyWithArgumentTest(const Reference<XInvocation> & inv)
     arMultiArgs[1] <<= makeAny((sal_Int32) 2);
     Sequence<Any> seqMultiArgGet1(arMultiArgs, 2);
     Sequence<Any> seqMultiArgGet2(arMultiArgs, 1);
-
+    
 
     arMultiArgs[0] <<= makeAny((sal_Int32) 0);
     arMultiArgs[1] <<= PropertyPutArgument(makeAny((sal_Int32) 0));
     Sequence<Any> seqMultiArgPut5(arMultiArgs, 2);
-
+    
     arMultiArgs[0] <<= makeAny((sal_Int32) 1);
     arMultiArgs[1] <<= PropertyPutArgument(makeAny((sal_Int32) 2));
     Sequence<Any> seqMultiArgPut6(arMultiArgs, 2);
@@ -518,7 +518,7 @@ bool doPropertyWithArgumentTest(const Reference<XInvocation> & inv)
     arMultiArgs[0] = makeAny((sal_Int32) 0);
     arMultiArgs[1] = makeAny((sal_Int32) 0);
     Sequence<Any> seqMultiVoid2(arMultiArgs, 2);
-
+    
     //[propput, ...] HRESULT prpMultiArg1([in,out,optional] VARIANT* val1, [in,out,optional] VARIANT* val2, [in] VARIANT* newVal);
     //[propget, ...] HRESULT prpMultiArg1([in,out,optional] VARIANT* val1, [in,out,optional] VARIANT* val2, [out, optional, retval] VARIANT* pVal);
     seqIndices.realloc( 0);
@@ -552,7 +552,7 @@ bool doPropertyWithArgumentTest(const Reference<XInvocation> & inv)
 
     arMultiArgs[0] = makeAny((sal_Int32) 1);
     arMultiArgs[1] = makeAny((SCode(DISP_E_PARAMNOTFOUND)));
-
+                          
     if (anyRet != ((PropertyPutArgument const *) seqMultiArgPut2[1].getValue())->Value
         || ! checkOutArgs(seqOut, seqIndices, Sequence<Any>(arMultiArgs, 2)))
     {
@@ -617,7 +617,7 @@ bool doPropertyWithArgumentTest(const Reference<XInvocation> & inv)
     if ( anyRet !=  ((PropertyPutArgument const*) seqMultiArgPut6[1].getValue())->Value
          || !checkOutArgs(seqOut, seqIndices, seqMultiArgGet2))
         return false;
-
+    
 
     //hasProperty, hasMethod
     if (inv->hasProperty(OUSTR("prpMultiArg1")))
@@ -631,7 +631,7 @@ bool doPropertyWithArgumentTest(const Reference<XInvocation> & inv)
     if ( ! inv->hasMethod(OUSTR("inLong")))
         return false;
 
-    return true;
+    return true;    
 }
 bool doSimpleTest(const Reference<XInvocation> & inv)
 {
@@ -656,9 +656,9 @@ bool doSimpleTest(const Reference<XInvocation> & inv)
     Any inrefVariant, outrefVariant;
     Any inrefDecimal, outrefDecimal;
 
-    Reference<XInterface> xIntFoo(getComObject(L"AxTestComponents.Foo"));
+    Reference<XInterface> xIntFoo(getComObject(L"AxTestComponents.Foo"));	
     //###################################################################################
-    //  in and out parameter
+    //	in and out parameter
     //###################################################################################
     sal_Bool aBool = sal_True;
     inBool.setValue(&aBool, getCppuBooleanType());
@@ -746,7 +746,7 @@ bool doSimpleTest(const Reference<XInvocation> & inv)
     seqOut.realloc(0);
     inv->invoke(OUString(L"outDate"), Sequence< Any > (& outDate, 1), seqIndices, seqOut);
     outDate <<= seqOut[0];
-
+    
     Decimal dec(3, 0, 0xffffffff, 0xffffffff, 0xfffffff0);
     inDecimal <<= dec;
     inv->invoke(OUString(L"inDecimal"), Sequence<Any>( & inDecimal, 1), seqIndices, seqOut);
@@ -765,12 +765,12 @@ bool doSimpleTest(const Reference<XInvocation> & inv)
 
     if (inBool != outBool || inByte != outByte || inShort != outShort || inLong != outLong
         || inFloat != outFloat || inDouble != outDouble || inString != outString
-        || inVariant != outVariant || inObject != outObject || inUnknown != outUnknown
+        || inVariant != outVariant || inObject != outObject || inUnknown != outUnknown 
         || inCY != outCY
         || inDate != outDate || inDecimal != outDecimal || inSCode != outSCode)
         return false;
     //###################################################################################
-    //  in/out parameter
+    //	in/out parameter
     //###################################################################################
     outBool = Any();
     seqIndices.realloc( 0);
@@ -783,7 +783,7 @@ bool doSimpleTest(const Reference<XInvocation> & inv)
     seqOut.realloc(0);
     inv->invoke(OUString(L"inoutByte"), Sequence< Any > ( & inByte, 1), seqIndices, seqOut);
     outByte <<= seqOut[0];
-
+    
     outShort = Any();
     seqIndices.realloc( 0);
     seqOut.realloc(0);
@@ -801,7 +801,7 @@ bool doSimpleTest(const Reference<XInvocation> & inv)
     seqOut.realloc(0);
     inv->invoke(OUString(L"inoutString"), Sequence< Any > ( & inString, 1), seqIndices, seqOut);
     outString <<= seqOut[0];
-
+    
     outFloat = Any();
     seqIndices.realloc( 0);
     seqOut.realloc(0);
@@ -837,7 +837,7 @@ bool doSimpleTest(const Reference<XInvocation> & inv)
     seqOut.realloc(0);
     inv->invoke(OUString(L"inoutDate"), Sequence< Any > ( & inDate, 1), seqIndices, seqOut);
     outDate <<= seqOut[0];
-
+    
     outDecimal = Any();
     seqIndices.realloc( 0);
     seqOut.realloc(0);
@@ -857,7 +857,7 @@ bool doSimpleTest(const Reference<XInvocation> & inv)
         return false;
 
     //###################################################################################
-    //  in byref parameters
+    //	in byref parameters
     //###################################################################################
 
     inrefLong <<= (sal_Int32) 1234;
@@ -866,7 +866,7 @@ bool doSimpleTest(const Reference<XInvocation> & inv)
     seqOut.realloc(0);
     inv->invoke(OUString(L"outLong"), Sequence< Any > (& outrefLong, 1), seqIndices, seqOut);
     outrefLong <<= seqOut[0];
-
+    
     inrefVariant <<= OUString(L" A string in an any");
     inv->invoke(OUString(L"inrefVariant"), Sequence< Any > ( & inrefVariant, 1), seqIndices, seqOut);
     seqIndices.realloc( 0);
@@ -888,7 +888,7 @@ bool doSimpleTest(const Reference<XInvocation> & inv)
 
 
     //###################################################################################
-    //  mixed parameter
+    //	mixed parameter
     //###################################################################################
     // mixed1
     seqIndices.realloc( 0);
@@ -898,7 +898,7 @@ bool doSimpleTest(const Reference<XInvocation> & inv)
     param[1] = inFloat;
     param[2] = inVariant;
     inv->invoke(OUString(L"mixed1"), Sequence< Any >(param, 3), seqIndices, seqOut);
-
+    
     if (seqOut.getLength() != 3 || inByte != seqOut[0] || inFloat != seqOut[1]
         || inVariant != seqOut[2])
             return false;
@@ -911,7 +911,7 @@ bool doSimpleSequenceTest(const Reference<XInvocation> & inv)
     Sequence<sal_Int16> seqIndices;
     Sequence<Any> seqOut;
     Any voidAny;
-    Any inArAny;
+    Any inArAny; 
     Any outArray;
     Any inArBool, outArBool;
     Any inArByte, outArByte;
@@ -935,7 +935,7 @@ bool doSimpleSequenceTest(const Reference<XInvocation> & inv)
     Sequence<Any> seq_1( arAnyStrTmp, 3);
     inArAny <<= seq_1;
     //###################################################################################
-    //  in, out Sequences
+    //	in, out Sequences
     //###################################################################################
     //Test sequence containing Anys of Strings
     inv->invoke(OUString(L"inArray"), Sequence< Any > ( & inArAny, 1), seqIndices, seqOut);
@@ -954,7 +954,7 @@ bool doSimpleSequenceTest(const Reference<XInvocation> & inv)
     sal_Int8 arByte[]={1,2,3};
     Sequence<sal_Int8> seqByte(arByte, 3);
     inArByte <<= seqByte;
-    inv->invoke(OUString(L"inSequenceByte"),Sequence<Any>( & inArByte, 1), seqIndices, seqOut);
+    inv->invoke(OUString(L"inSequenceByte"),Sequence<Any>( & inArByte, 1), seqIndices, seqOut);	
     seqIndices.realloc(0);
     seqOut.realloc(0);
     inv->invoke(OUString(L"outSequenceByte"), Sequence< Any >( & voidAny, 1), seqIndices, seqOut);
@@ -963,7 +963,7 @@ bool doSimpleSequenceTest(const Reference<XInvocation> & inv)
     sal_Int16 arShort[]={4,5,6};
     Sequence<sal_Int16> seqShort(arShort, 3);
     inArShort<<= seqShort;
-    inv->invoke(OUString(L"inSequenceShort"),Sequence< Any >( & inArShort, 1), seqIndices, seqOut);
+    inv->invoke(OUString(L"inSequenceShort"),Sequence< Any >( & inArShort, 1), seqIndices, seqOut);	
     seqIndices.realloc(0);
     seqOut.realloc(0);
     inv->invoke(OUString(L"outSequenceShort"), Sequence< Any >( & voidAny, 1), seqIndices, seqOut);
@@ -972,19 +972,19 @@ bool doSimpleSequenceTest(const Reference<XInvocation> & inv)
     sal_Int32 arLong[] = {7,8,9};
     Sequence<sal_Int32> seqLong(arLong, 3);
     inArLong <<= seqLong;
-    inv->invoke(OUString(L"inSequenceLong"),Sequence< Any > ( & inArLong, 1), seqIndices, seqOut);
+    inv->invoke(OUString(L"inSequenceLong"),Sequence< Any > ( & inArLong, 1), seqIndices, seqOut);	
     seqIndices.realloc(0);
     seqOut.realloc(0);
     inv->invoke(OUString(L"outSequenceLong"), Sequence< Any >( & voidAny, 1), seqIndices, seqOut);
     outArLong <<= seqOut[0];
 
-    inv->invoke(OUString(L"inSequenceLong"),Sequence< Any > ( & inArLong, 1), seqIndices, seqOut);
+    inv->invoke(OUString(L"inSequenceLong"),Sequence< Any > ( & inArLong, 1), seqIndices, seqOut);	
     seqIndices.realloc(0);
     seqOut.realloc(0);
     inv->invoke(OUString(L"outSequenceLong"), Sequence< Any >( & voidAny, 1), seqIndices, seqOut);
     outArLong <<= seqOut[0];
 
-    inv->invoke( OUString(L"inSequenceString"),Sequence< Any > ( & inArString, 1), seqIndices, seqOut);
+    inv->invoke( OUString(L"inSequenceString"),Sequence< Any > ( & inArString, 1), seqIndices, seqOut);	
     seqIndices.realloc(0);
     seqOut.realloc(0);
     inv->invoke(OUString(L"outSequenceString"), Sequence< Any >( & voidAny, 1), seqIndices, seqOut);
@@ -993,7 +993,7 @@ bool doSimpleSequenceTest(const Reference<XInvocation> & inv)
     float arFloat[]={3.14f, 31.4f, 314.f};
     Sequence<float> seqFloat( arFloat, 3);
     inArFloat <<= seqFloat;
-    inv->invoke( OUString(L"inSequenceFloat"),Sequence< Any > ( & inArFloat, 1), seqIndices, seqOut);
+    inv->invoke( OUString(L"inSequenceFloat"),Sequence< Any > ( & inArFloat, 1), seqIndices, seqOut);	
     seqIndices.realloc(0);
     seqOut.realloc(0);
     inv->invoke(OUString(L"outSequenceFloat"), Sequence< Any >( & voidAny, 1), seqIndices, seqOut);
@@ -1002,30 +1002,30 @@ bool doSimpleSequenceTest(const Reference<XInvocation> & inv)
     double arDouble[]={3.145, 31.45, 3145.};
     Sequence<double> seqDouble( arDouble, 3);
     inArDouble <<= seqDouble;
-    inv->invoke(OUString(L"inSequenceDouble"),Sequence< Any >( & inArDouble, 1), seqIndices, seqOut);
+    inv->invoke(OUString(L"inSequenceDouble"),Sequence< Any >( & inArDouble, 1), seqIndices, seqOut);	
     seqIndices.realloc(0);
     seqOut.realloc(0);
     inv->invoke(OUString(L"outSequenceDouble"), Sequence< Any >( & voidAny, 1), seqIndices, seqOut);
     outArDouble <<= seqOut[0];
 
     Sequence<Reference<XInvocation> > seqObj(2);
-    seqObj[0]=  getComObject(L"AxTestComponents.Basic");
-    seqObj[1]=  getComObject(L"AxTestComponents.Basic");
+    seqObj[0]= 	getComObject(L"AxTestComponents.Basic");	
+    seqObj[1]= 	getComObject(L"AxTestComponents.Basic");
     inArObject <<= seqObj;
-    inv->invoke(OUString(L"inSequenceObject"),Sequence< Any >( & inArObject, 1), seqIndices, seqOut);
+    inv->invoke(OUString(L"inSequenceObject"),Sequence< Any >( & inArObject, 1), seqIndices, seqOut);	
     seqIndices.realloc(0);
     seqOut.realloc(0);
     inv->invoke(OUString(L"outSequenceObject"), Sequence< Any >( & voidAny, 1), seqIndices, seqOut);
     outArObject <<= seqOut[0];
-
-    if ( ! equalSequences(inArByte, outArByte) || ! equalSequences(inArShort, outArShort)
+    
+    if ( ! equalSequences(inArByte, outArByte) || ! equalSequences(inArShort, outArShort) 
         || ! equalSequences(inArLong, outArLong) || ! equalSequences(inArString, outArray)
         || ! equalSequences(inArFloat, outArFloat) || ! equalSequences(inArDouble, outArDouble)
         || ! equalSequences(inArString, outArString)  || ! equalSequences(inArObject, outArObject))
         return false;
 
     //###################################################################################
-    //  in/out Sequences
+    //	in/out Sequences
     //###################################################################################
     seqIndices.realloc(0);
     seqOut.realloc(0);
@@ -1033,35 +1033,35 @@ bool doSimpleSequenceTest(const Reference<XInvocation> & inv)
     inv->invoke(OUString(L"inoutArray"), Sequence< Any >( & inArString, 1), seqIndices, seqOut);
     outArray <<= seqOut[0];
 
-    inv->invoke(OUString(L"inoutSequenceByte"), Sequence<Any>( & inArByte, 1), seqIndices, seqOut);
+    inv->invoke(OUString(L"inoutSequenceByte"), Sequence<Any>( & inArByte, 1), seqIndices, seqOut);	
     inv->invoke(OUString(L"inoutSequenceByte"), Sequence<Any>( & inArByte, 1), seqIndices, seqOut);
     outArByte <<= seqOut[0];
 
-    inv->invoke(OUString(L"inoutSequenceShort"), Sequence<Any>( & inArShort, 1), seqIndices, seqOut);
+    inv->invoke(OUString(L"inoutSequenceShort"), Sequence<Any>( & inArShort, 1), seqIndices, seqOut);	
     inv->invoke(OUString(L"inoutSequenceShort"), Sequence<Any>( & inArShort, 1), seqIndices, seqOut);
     outArShort <<= seqOut[0];
 
-    inv->invoke(OUString(L"inoutSequenceLong"), Sequence<Any>( & inArLong, 1), seqIndices, seqOut);
+    inv->invoke(OUString(L"inoutSequenceLong"), Sequence<Any>( & inArLong, 1), seqIndices, seqOut);	
     inv->invoke(OUString(L"inoutSequenceLong"), Sequence< Any >( & inArLong, 1), seqIndices, seqOut);
     outArLong <<= seqOut[0];
 
-    inv->invoke(OUString(L"inoutSequenceString"), Sequence<Any>( & inArString, 1), seqIndices, seqOut);
+    inv->invoke(OUString(L"inoutSequenceString"), Sequence<Any>( & inArString, 1), seqIndices, seqOut);	
     inv->invoke(OUString(L"inoutSequenceString"), Sequence<Any>( & inArString, 1), seqIndices, seqOut);
     outArString <<= seqOut[0];
 
-    inv->invoke(OUString(L"inoutSequenceFloat"), Sequence<Any>( & inArFloat, 1), seqIndices, seqOut);
+    inv->invoke(OUString(L"inoutSequenceFloat"), Sequence<Any>( & inArFloat, 1), seqIndices, seqOut);	
     inv->invoke(OUString(L"inoutSequenceFloat"), Sequence<Any>( & inArFloat, 1), seqIndices, seqOut);
     outArFloat <<= seqOut[0];
 
-    inv->invoke(OUString(L"inoutSequenceDouble"), Sequence<Any>( & inArDouble, 1), seqIndices, seqOut);
+    inv->invoke(OUString(L"inoutSequenceDouble"), Sequence<Any>( & inArDouble, 1), seqIndices, seqOut);	
     inv->invoke(OUString(L"inoutSequenceDouble"), Sequence<Any>( & inArDouble, 1), seqIndices, seqOut);
     outArDouble <<= seqOut[0];
 
-    inv->invoke(OUString(L"inoutSequenceObject"), Sequence<Any>( & inArObject, 1), seqIndices, seqOut);
+    inv->invoke(OUString(L"inoutSequenceObject"), Sequence<Any>( & inArObject, 1), seqIndices, seqOut);	
     inv->invoke(OUString(L"inoutSequenceObject"), Sequence<Any>( & inArObject, 1), seqIndices, seqOut);
     outArObject <<= seqOut[0];
 
-    if ( ! equalSequences(inArByte, outArByte) || ! equalSequences(inArShort, outArShort)
+    if ( ! equalSequences(inArByte, outArByte) || ! equalSequences(inArShort, outArShort) 
         || ! equalSequences(inArLong, outArLong) || ! equalSequences(inArString, outArray)
         || ! equalSequences(inArFloat, outArFloat) || ! equalSequences(inArDouble, outArDouble)
         || ! equalSequences(inArString, outArString)  || ! equalSequences(inArObject, outArObject))
@@ -1082,7 +1082,7 @@ HRESULT doTest()
 
     Sequence< sal_Int16> seqIndices;
     Sequence<Any> seqOut;
-
+    
     Any aAny;
     Any anyOut;
     char buff[1024];
@@ -1097,9 +1097,9 @@ HRESULT doTest()
     if (! doPropertyTest(inv))
     {
         fprintf(stdout, "### Test failed!\n");
-        return E_FAIL;
+        return E_FAIL;        
     }
-
+    
     if ( ! doSimpleSequenceTest(inv))
     {
         fprintf(stdout, "### Test failed! \n");
@@ -1118,15 +1118,15 @@ HRESULT doTest()
         return E_FAIL;
     }
 
-
+    
 
 
 
 //
-//  //###################################################################################
-//  //  in multi Sequences
-//  //###################################################################################
-//  // inMulDimArrayLong
+//	//###################################################################################
+//	//	in multi Sequences
+//	//###################################################################################
+//	// inMulDimArrayLong
     sal_Int32 arLongi[]={1,2,3};
     sal_Int32 arLongi2[]={4,5,6,7};
     sal_Int32 arLongi3[]={8,9,10,11,12};
@@ -1141,10 +1141,10 @@ HRESULT doTest()
     seq2i[2]= seqLongi3;
     seqAny<<= seq2i;
     // dimension length 3,5
-    inv->invoke( OUString(L"inMulDimArrayLong"),Sequence< Any > ( &seqAny, 1), seqIndices, seqOut);
-//
+    inv->invoke( OUString(L"inMulDimArrayLong"),Sequence< Any > ( &seqAny, 1), seqIndices, seqOut);	
+//	
     //inMulDimArrayVariant
-    inv->invoke( OUString(L"inMulDimArrayVariant"),Sequence< Any > ( &seqAny, 1), seqIndices, seqOut);
+    inv->invoke( OUString(L"inMulDimArrayVariant"),Sequence< Any > ( &seqAny, 1), seqIndices, seqOut);	
 
     //inMulDimArrayLong2
     sal_Int32 arLongii1[]={1,2,3};
@@ -1167,12 +1167,12 @@ HRESULT doTest()
 
     seq2ii2[0]= seqLongii4;
     seq2ii2[1]= seqLongii5;
-
+    
     Sequence< Sequence< Sequence< sal_Int32> > >  seq3ii(2);
     seq3ii[0]=seq2ii;
     seq3ii[1]=seq2ii2;
     seqAny<<= seq3ii;
-    inv->invoke( OUString(L"inMulDimArrayLong2"),Sequence< Any > ( &seqAny, 1), seqIndices, seqOut);
+    inv->invoke( OUString(L"inMulDimArrayLong2"),Sequence< Any > ( &seqAny, 1), seqIndices, seqOut);	
 
     // inMulDimArrayByte2
     sal_Int8 arByteii1[]={1,2,3};
@@ -1195,27 +1195,27 @@ HRESULT doTest()
 
     seq2Byteii2[0]= seqByteii4;
     seq2Byteii2[1]= seqByteii5;
-
+    
     Sequence< Sequence< Sequence< sal_Int8> > >  seq3Byteii(2);
     seq3Byteii[0]=seq2Byteii;
     seq3Byteii[1]=seq2Byteii2;
     seqAny<<= seq3Byteii;
-    inv->invoke( OUString(L"inMulDimArrayByte2"),Sequence< Any > ( &seqAny, 1), seqIndices, seqOut);
+    inv->invoke( OUString(L"inMulDimArrayByte2"),Sequence< Any > ( &seqAny, 1), seqIndices, seqOut);	
 
 
 
     //###################################################################################
     //###################################################################################
     //###################################################################################
-    //  Tests with a MFC ActiveX control, ( pure dispinterface)
+    //	Tests with a MFC ActiveX control, ( pure dispinterface)
     //###################################################################################
 
     //###################################################################################
-    //  in parameter MFC ActiveX
+    //	in parameter MFC ActiveX
     //###################################################################################
     // unsigned char is not supported by MFC
-    //  aAny <<= ( sal_Int8) 127;
-    //  invMfc->invoke( OUString(L"inByte"), Sequence< Any > ( &aAny, 1), seqIndices, seqOut);
+    //	aAny <<= ( sal_Int8) 127;
+    //	invMfc->invoke( OUString(L"inByte"), Sequence< Any > ( &aAny, 1), seqIndices, seqOut);
     if ( ! invMfc.is())
         return hr;
     aAny <<= static_cast<sal_Int16>(-1);
@@ -1239,12 +1239,12 @@ HRESULT doTest()
 
     aAny <<= OUString( L" A string in an any");
     aAny=invMfc->invoke( OUString(L"inVariant"), Sequence< Any > ( &aAny, 1), seqIndices, seqOut);
-
+    
     // Tests with Sequences later.
-    //  OUString arStr4[]= {L"string0", L"string1", L"string2"};
-    //  Sequence<OUString> seqStr4( arStr4, 3);
-    //  aAny <<= seqStr4;
-    //  invMfc->invoke( OUString(L"inArray"), Sequence< Any > ( &aAny, 1), seqIndices, seqOut);
+    //	OUString arStr4[]= {L"string0", L"string1", L"string2"};
+    //	Sequence<OUString> seqStr4( arStr4, 3);
+    //	aAny <<= seqStr4;
+    //	invMfc->invoke( OUString(L"inArray"), Sequence< Any > ( &aAny, 1), seqIndices, seqOut);
 
 
     Reference < XInvocation > inv5= getComObject(L"AxTestComponents.Basic");
@@ -1254,11 +1254,11 @@ HRESULT doTest()
     aAny <<= inv5;
     aAny=invMfc->invoke( OUString(L"inObject"), Sequence< Any > ( &aAny, 1), seqIndices, seqOut);
 //
-//  //###################################################################################
-//  //  out parameter MFC ActiveX
-//  //###################################################################################
-//
-//  // outShort
+//	//###################################################################################
+//	//	out parameter MFC ActiveX
+//	//###################################################################################
+//	
+//	// outShort
     aAny= invMfc->invoke( OUString(L"outShort"), Sequence< Any > ( &aAny, 1), seqIndices, seqOut);
     anyOut<<= seqOut[0];
     sprintf(buff, "MFC outShort %d",  *(sal_Int16*)anyOut.getValue());
@@ -1308,9 +1308,9 @@ HRESULT doTest()
 
 
     //###################################################################################
-    //  Sequence parameter MFC ActiveX
+    //	Sequence parameter MFC ActiveX
     //###################################################################################
-    // Sequences are not directly supported.
+    // Sequences are not directly supported. 
 
 
     delete pWin;
diff --git a/extensions/test/ole/OleClient/funcs.cxx b/extensions/test/ole/OleClient/funcs.cxx
index 231f5bc825db..665814341d3e 100644
--- a/extensions/test/ole/OleClient/funcs.cxx
+++ b/extensions/test/ole/OleClient/funcs.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ template< class T >
 bool equalSequences(const Sequence<T>& seqIn, const Sequence<Any> & returned);
 
 
-Reference< XMultiServiceFactory > objectFactory;//
+Reference< XMultiServiceFactory > objectFactory;// 
 
 
 Reference<XMultiServiceFactory> getMultiServiceFactory()
@@ -76,10 +76,10 @@ Reference<XInvocation> getComObject( OUString progId)
 {
     HRESULT hr= S_OK;
     Reference< XInvocation > ret;
-//  Reference<XMultiServiceFactory> fac;
+//	Reference<XMultiServiceFactory> fac;
     if(  ! objectFactory.is())
-    {   Reference<XMultiServiceFactory> mgr= getMultiServiceFactory();
-        Reference<XInterface> xInt= mgr->createInstance(
+    {	Reference<XMultiServiceFactory> mgr= getMultiServiceFactory();
+        Reference<XInterface> xInt= mgr->createInstance( 
             OUString(L"com.sun.star.bridge.oleautomation.Factory"));
         objectFactory= Reference<XMultiServiceFactory>::query(  xInt);
     }
@@ -107,8 +107,8 @@ Reference<XInvocation> convertComObject( IUnknown* pUnk)
     any <<= ( sal_uInt32)&var;
     sal_uInt8 arId[16];
     rtl_getGlobalProcessId( arId);
-    Any target= xSuppl->createBridge( any, Sequence<sal_Int8>( (sal_Int8*)arId, 16), OLE, UNO );
-
+    Any target=	xSuppl->createBridge( any, Sequence<sal_Int8>( (sal_Int8*)arId, 16), OLE, UNO );
+    
     Reference<XInvocation> ret;
     target>>= ret;
     return ret;
@@ -121,7 +121,7 @@ Reference<XInvocation> convertComObject( IUnknown* pUnk)
 
   The number of items in value must be the
   same as the number of provided parameter during the  call on the  method.
-
+  
   The parameter outArgs, indices correspond to the sequences which are
   arguments to XInvocation::invoke
  */
@@ -169,7 +169,7 @@ bool checkOutArgs(const Sequence<Any> & outArgs,
     return true;
 }
 
-/* The returned sequence always contains Any elements
+/* The returned sequence always contains Any elements 
 */
 bool equalSequences(const Any& orig, const Any& returned)
 {
@@ -180,13 +180,13 @@ bool equalSequences(const Any& orig, const Any& returned)
     }
     TypeDescription td(orig.getValueTypeRef());
     typelib_IndirectTypeDescription * indirect_td = (typelib_IndirectTypeDescription *) td.get();
-
+    
     switch (indirect_td->pType->eTypeClass)
     {
         case TypeClass_CHAR:
             {
                 Sequence<sal_Unicode> seq;
-                orig >>= seq;
+                orig >>= seq;	
                 Sequence<Any> seq2;
                 returned >>= seq2;
                 return equalSequences(seq, seq2);
@@ -194,7 +194,7 @@ bool equalSequences(const Any& orig, const Any& returned)
         case TypeClass_BOOLEAN:
             {
                 Sequence<sal_Bool> seq;
-                orig >>= seq;
+                orig >>= seq;	
                 Sequence<Any> seq2;
                 returned >>= seq2;
                 return equalSequences(seq, seq2);
@@ -202,7 +202,7 @@ bool equalSequences(const Any& orig, const Any& returned)
         case TypeClass_BYTE:
             {
                 Sequence<sal_Int8> seq;
-                orig >>= seq;
+                orig >>= seq;	
                 Sequence<Any> seq2;
                 returned >>= seq2;
                 return equalSequences(seq, seq2);
@@ -210,7 +210,7 @@ bool equalSequences(const Any& orig, const Any& returned)
         case TypeClass_SHORT:
             {
                 Sequence<sal_Int16> seq;
-                orig >>= seq;
+                orig >>= seq;	
                 Sequence<Any> seq2;
                 returned >>= seq2;
                 return equalSequences(seq, seq2);
@@ -218,7 +218,7 @@ bool equalSequences(const Any& orig, const Any& returned)
         case TypeClass_LONG:
             {
                 Sequence<sal_Int32> seq;
-                orig >>= seq;
+                orig >>= seq;	
                 Sequence<Any> seq2;
                 returned >>= seq2;
                 return equalSequences(seq, seq2);
@@ -226,7 +226,7 @@ bool equalSequences(const Any& orig, const Any& returned)
         case TypeClass_FLOAT:
             {
                 Sequence<float> seq;
-                orig >>= seq;
+                orig >>= seq;	
                 Sequence<Any> seq2;
                 returned >>= seq2;
                 return equalSequences(seq, seq2);
@@ -234,7 +234,7 @@ bool equalSequences(const Any& orig, const Any& returned)
         case TypeClass_DOUBLE:
             {
                 Sequence<double> seq;
-                orig >>= seq;
+                orig >>= seq;	
                 Sequence<Any> seq2;
                 returned >>= seq2;
                 return equalSequences(seq, seq2);
@@ -242,7 +242,7 @@ bool equalSequences(const Any& orig, const Any& returned)
         case TypeClass_STRING:
             {
                 Sequence<OUString> seq;
-                orig >>= seq;
+                orig >>= seq;		
                 Sequence<Any> seq2;
                 returned >>= seq2;
                 return equalSequences(seq, seq2);
@@ -250,7 +250,7 @@ bool equalSequences(const Any& orig, const Any& returned)
         case TypeClass_ANY:
             {
                 Sequence<Any> seq;
-                orig >>= seq;
+                orig >>= seq;	
                 Sequence<Any> seq2;
                 returned >>= seq2;
                 return equalSequences(seq, seq2);
@@ -258,7 +258,7 @@ bool equalSequences(const Any& orig, const Any& returned)
         case TypeClass_SEQUENCE:
             {
                 //Sequence<sal_Unicode> seq;
-                //orig >>= seq;
+                //orig >>= seq;	
                 //Sequence<Any> seq2;
                 //returned >>= seq2;
                 //return equalSequences(seq, seq2);
@@ -267,7 +267,7 @@ bool equalSequences(const Any& orig, const Any& returned)
         case TypeClass_INTERFACE:
             {
                 Sequence<Reference<XInvocation> > seq;
-                orig >>= seq;
+                orig >>= seq;	
                 Sequence<Any> seq2;
                 returned >>= seq2;
                 return equalSequences(seq, seq2);
@@ -292,16 +292,16 @@ bool equalSequences(const Sequence<T>& seqIn, const Sequence<Any> & seqOut)
         if (anyIn != anyOut)
             return false;
     }
-
+    
     return true;
 }
 
 void printSequence( Sequence<Any>& val)
 {
 
-//  typelib_TypeDescription* desc;
-//  val.getValueTypeDescription( &desc);
-//  typelib_typedescription_release( desc);
+//	typelib_TypeDescription* desc;
+//	val.getValueTypeDescription( &desc);
+//	typelib_typedescription_release( desc);
 
     USES_CONVERSION;
     char buff[1024];
diff --git a/extensions/test/ole/OleConverterVar1/convTest.cxx b/extensions/test/ole/OleConverterVar1/convTest.cxx
index 6cc6e47462ac..7e89e660d40b 100644
--- a/extensions/test/ole/OleConverterVar1/convTest.cxx
+++ b/extensions/test/ole/OleConverterVar1/convTest.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ int __cdecl _tmain( int argc, _TCHAR * argv[] )
         return -1;
     }
 
-
+    
     _Module.Init( ObjectMap, GetModuleHandle( NULL));
 
     if( FAILED(hr=doTest()))
@@ -107,16 +107,16 @@ double _double[]= {12345, 1234.5, 123.45, 12.345, 1.2345};
 CComVariant _variant[]= {L"variant 1", L"variant2", L"variant3"};
 wchar_t _wchar[]= {L'1', L'2', L'3', L'A', L' '};
 BSTR _bstr[]={L"Ich", L"bin", L"ein", L"Hamburger", L"Jung"};
-SmartArray<char>            arByte( _c, 5, VT_I1);
-SmartArray< short>          arShort( _short, 5, VT_I2);
+SmartArray<char>			arByte( _c, 5, VT_I1);
+SmartArray< short>			arShort( _short, 5, VT_I2);
 //SmartArray< unsigned short> arUShort( _ushort, 5, VT_UI2);
-SmartArray< long>           arLong( _long, 5, VT_I4);
-//SmartArray< unsigned long>    arULong( _ulong, 5, VT_UI4);
-//SmartArray< float>            arFloat( _float, 5, VT_R4 );
-SmartArray< double>         arDouble( _double, 5, VT_R8 );
+SmartArray< long>			arLong( _long, 5, VT_I4);
+//SmartArray< unsigned long>	arULong( _ulong, 5, VT_UI4);
+//SmartArray< float>			arFloat( _float, 5, VT_R4 );
+SmartArray< double>			arDouble( _double, 5, VT_R8 );
 //SmartArray< unsigned short> arWChar( _wchar, 5, VT_UI2 );
-SmartArray< wchar_t* >      arString( _bstr, 5, VT_BSTR);
-SmartArray< VARIANT >        arVariant( _variant, 3, VT_VARIANT);
+SmartArray< wchar_t* >		arString( _bstr, 5, VT_BSTR);
+SmartArray< VARIANT >		 arVariant( _variant, 3, VT_VARIANT);
 
 
 HRESULT doTest()
@@ -128,7 +128,7 @@ HRESULT doTest()
     putenv("UNO_TYPES=types.rdb");
     putenv("UNO_SERVICES=services.rdb");
     Reference<XComponentContext> xContext = defaultBootstrap_InitialComponentContext();
-
+    
     Reference< XMultiComponentFactory > mgr = xContext->getServiceManager();//createRegistryServiceFactory( OUString(L"services.rdb"));
     Reference< XInterface > xIntSupplier= mgr->createInstanceWithContext(
         OUString(L"com.sun.star.bridge.OleBridgeSupplierVar1"), xContext);
@@ -139,12 +139,12 @@ HRESULT doTest()
     any <<= xOletest;
     sal_uInt8 arId[16];
     rtl_getGlobalProcessId( arId);
-    Any target= xSuppl->createBridge( any, Sequence<sal_Int8>( (sal_Int8*)arId, 16), UNO, OLE);
+    Any target=	xSuppl->createBridge( any, Sequence<sal_Int8>( (sal_Int8*)arId, 16), UNO, OLE);
     CComDispatchDriver oletest;
     if (target.getValueTypeClass() == getCppuType((sal_uInt32*) 0).getTypeClass())
     {
         VARIANT* pVariant = *(VARIANT**)target.getValue();
-
+        
         oletest= pVariant->pdispVal;
 
         VariantClear(pVariant);
@@ -156,22 +156,22 @@ HRESULT doTest()
     CComVariant varParam2;
     CComVariant varParam3;
     CComVariant varParam4;
-
+    
     long value= 100;
     varParam1.vt= VT_I1 | VT_BYREF;
     varParam1.plVal= &value;
 
-    // Testing the caching of DISPIDs and the process of aquiring member information
+    // Testing the caching of DISPIDs and the process of aquiring member information 
     // on demand in IDispatch::Invoke
     // Step through the corresponding IDispatch implementation of the ole bridge
-    hr= oletest.Invoke1(static_cast<LPCOLESTR>(L"testinout_methodByte"), &varParam1, &varRet);
-    hr= oletest.Invoke1(static_cast<LPCOLESTR>(L"testinout_methodByte"), &varParam1, &varRet);
+    hr=	oletest.Invoke1(static_cast<LPCOLESTR>(L"testinout_methodByte"), &varParam1, &varRet);
+    hr=	oletest.Invoke1(static_cast<LPCOLESTR>(L"testinout_methodByte"), &varParam1, &varRet);
     // Name ok but different case
-    hr= oletest.Invoke1(static_cast<LPCOLESTR>(L"Testinout_methodByte"), &varParam1, &varRet);
-    hr= oletest.Invoke1(static_cast<LPCOLESTR>(L"Testinout_methodByte"), &varParam1, &varRet);
+    hr=	oletest.Invoke1(static_cast<LPCOLESTR>(L"Testinout_methodByte"), &varParam1, &varRet);
+    hr=	oletest.Invoke1(static_cast<LPCOLESTR>(L"Testinout_methodByte"), &varParam1, &varRet);
     // not existing member
-    hr= oletest.Invoke1(static_cast<LPCOLESTR>(L"Testinout"), &varParam1, &varRet);
-    hr= oletest.Invoke1(static_cast<LPCOLESTR>(L"Testinout"), &varParam1, &varRet);
+    hr=	oletest.Invoke1(static_cast<LPCOLESTR>(L"Testinout"), &varParam1, &varRet);
+    hr=	oletest.Invoke1(static_cast<LPCOLESTR>(L"Testinout"), &varParam1, &varRet);
 
     // Property
     varParam1.vt= VT_ARRAY | VT_I1;
@@ -222,14 +222,14 @@ HRESULT doTest()
 
     LPOLESTR attrib= L"AttrByte";
     hr = oletest.p->GetIDsOfNames(IID_NULL, &attrib, 1, LOCALE_USER_DEFAULT, &dispid);
-
+    
     hr = oletest.p->Invoke( dispid, IID_NULL, LOCALE_USER_DEFAULT,
         DISPATCH_METHOD | DISPATCH_PROPERTYPUTREF, &params, &varRet, NULL, NULL);
 
     hr = oletest.p->Invoke( dispid, IID_NULL, LOCALE_USER_DEFAULT,
         DISPATCH_METHOD | DISPATCH_PROPERTYGET, &params, &varRet, NULL, NULL);
 
-
+ 
 
     CComVariant varByteArray;
     varByteArray.vt= VT_ARRAY | VT_I1;
@@ -269,36 +269,36 @@ HRESULT doTest()
     CComVariant varUnkArray;
     varUnkArray.vt= VT_ARRAY | VT_UNKNOWN;
     varUnkArray.parray= (SAFEARRAY*)arUnknown;
-
+    
     // preparing out parameter;
     char byteOut;
-    CComVariant varOutByte;     //###
+    CComVariant varOutByte;		//###
     varOutByte.vt= VT_BYREF | VT_UI1;
     V_I1REF(&varOutByte)= &byteOut;
     short shortOut;
-    CComVariant varOutShort;    //###
+    CComVariant varOutShort;	//###
     varOutShort.vt= VT_BYREF | VT_I2;
     V_I2REF( &varOutShort)= &shortOut;
     long longOut;
-    CComVariant varOutLong;     //###
+    CComVariant varOutLong;		//###
     varOutLong.vt= VT_BYREF | VT_I4;
     V_I4REF( &varOutLong)= &longOut;
     double doubleOut;
-    CComVariant varOutDouble;   //###
+    CComVariant varOutDouble;	//###
     varOutDouble.vt= VT_BYREF | VT_R8;
     V_R8REF( &varOutDouble)= &doubleOut;
     BSTR bstrOut= NULL;
-    CComVariant varOutString;   //###
+    CComVariant varOutString;	//###
     varOutString.vt= VT_BYREF | VT_BSTR;
     V_BSTRREF(&varOutString)= &bstrOut;
     CComVariant variantOut;
-    CComVariant varOutAny;      //###
+    CComVariant varOutAny;		//###
     varOutAny.vt= VT_BYREF | VT_VARIANT;
     V_VARIANTREF(&varOutAny)= &variantOut;
 
     CComPtr<IDispatch> dispOut;
     CComVariant varOutXInterface; //###
-    varOutXInterface.vt= VT_BYREF |VT_DISPATCH;
+    varOutXInterface.vt= VT_BYREF |VT_DISPATCH;	
     V_DISPATCHREF(&varOutXInterface)= &dispOut.p;
 
     // In Parameter ( all of type Sequence ###########################################################
@@ -307,43 +307,43 @@ HRESULT doTest()
 
     OutputDebugStringA("methodByte | Params: \n");
     printVariant( varByteArray);
-    hr= oletest.Invoke1(static_cast<LPCOLESTR>(L"methodByte"), &varByteArray, &varRet);
+    hr=	oletest.Invoke1(static_cast<LPCOLESTR>(L"methodByte"), &varByteArray, &varRet);
     OutputDebugStringA("methodByte  | return value \n");
     printVariant( varRet);
 
     OutputDebugStringA("methodShort | Params: \n");
     printVariant( varShortArray);
-    hr= oletest.Invoke1(static_cast<LPCOLESTR>(L"methodShort"), &varShortArray, &varRet);
+    hr=	oletest.Invoke1(static_cast<LPCOLESTR>(L"methodShort"), &varShortArray, &varRet);
     OutputDebugStringA("methodShort  | return value \n");
     printVariant( varRet);
 
     OutputDebugStringA("methodLong | Params: \n");
     printVariant( varLongArray);
-    hr= oletest.Invoke1(static_cast<LPCOLESTR>(L"methodLong"), &varLongArray, &varRet);
+    hr=	oletest.Invoke1(static_cast<LPCOLESTR>(L"methodLong"), &varLongArray, &varRet);
     OutputDebugStringA("methodLong  | return value \n");
     printVariant( varRet);
 
     OutputDebugStringA("methodDouble | Params: \n");
     printVariant( varDoubleArray);
-    hr= oletest.Invoke1(static_cast<LPCOLESTR>(L"methodDouble"), &varDoubleArray, &varRet);
+    hr=	oletest.Invoke1(static_cast<LPCOLESTR>(L"methodDouble"), &varDoubleArray, &varRet);
     OutputDebugStringA("methodDouble  | return value \n");
     printVariant( varRet);
 
     OutputDebugStringA("methodString | Params: \n");
     printVariant( varStringArray);
-    hr= oletest.Invoke1(static_cast<LPCOLESTR>(L"methodString"), &varStringArray, &varRet);
+    hr=	oletest.Invoke1(static_cast<LPCOLESTR>(L"methodString"), &varStringArray, &varRet);
     OutputDebugStringA("methodString  | return value \n");
     printVariant( varRet);
 
     OutputDebugStringA("methodAny | Params: \n");
     printVariant( varArray);
-    hr= oletest.Invoke1(static_cast<LPCOLESTR>(L"methodAny"), &varArray, &varRet);
+    hr=	oletest.Invoke1(static_cast<LPCOLESTR>(L"methodAny"), &varArray, &varRet);
     OutputDebugStringA("methodAny  | return value \n");
     printVariant( varRet);
 
     OutputDebugStringA("methodXInterface | Params: \n");
     printVariant( varUnkArray);
-    hr= oletest.Invoke1(static_cast<LPCOLESTR>(L"methodXInterface"), &varUnkArray, &varRet);
+    hr=	oletest.Invoke1(static_cast<LPCOLESTR>(L"methodXInterface"), &varUnkArray, &varRet);
     OutputDebugStringA("methodAny  | return value \n");
     printVariant( varRet);
 
@@ -351,44 +351,44 @@ HRESULT doTest()
     OutputDebugString( _T("Out parameter ###########################################\n\n"));
 
     OutputDebugString(_T("testout_methodByte  \n"));
-    hr= oletest.InvokeN(static_cast<LPCOLESTR>(L"testout_methodByte"), &varOutByte, 1, &varRet);
+    hr=	oletest.InvokeN(static_cast<LPCOLESTR>(L"testout_methodByte"), &varOutByte, 1, &varRet);
     OutputDebugString(_T("testout_methodByte  | out value: \n"));
     printVariant( varOutByte);
 
     OutputDebugString(_T("testout_methodShort \n"));
-    hr= oletest.Invoke1(static_cast<LPCOLESTR>(L"testout_methodShort"), &varOutShort, &varRet);
+    hr=	oletest.Invoke1(static_cast<LPCOLESTR>(L"testout_methodShort"), &varOutShort, &varRet);
     OutputDebugString(_T("testout_methodShort  | out value: \n"));
     printVariant( varOutShort);
 
     OutputDebugString(_T("testout_methodLong \n"));
-    hr= oletest.Invoke1(static_cast<LPCOLESTR>(L"testout_methodLong"), &varOutLong, &varRet);
+    hr=	oletest.Invoke1(static_cast<LPCOLESTR>(L"testout_methodLong"), &varOutLong, &varRet);
     OutputDebugString(_T("testout_methodLong  | out value: \n"));
     printVariant( varOutLong);
 
     OutputDebugString(_T("testout_methodDouble \n"));
-    hr= oletest.Invoke1(static_cast<LPCOLESTR>(L"testout_methodDouble"), &varOutDouble, &varRet);
+    hr=	oletest.Invoke1(static_cast<LPCOLESTR>(L"testout_methodDouble"), &varOutDouble, &varRet);
     OutputDebugString(_T("testout_methodDouble  | out value: \n"));
     printVariant( varOutDouble);
 
     OutputDebugString(_T("testout_methodString \n"));
-    hr= oletest.Invoke1(static_cast<LPCOLESTR>(L"testout_methodString"), &varOutString, &varRet);
+    hr=	oletest.Invoke1(static_cast<LPCOLESTR>(L"testout_methodString"), &varOutString, &varRet);
     OutputDebugString(_T("testout_methodString  | out value: \n"));
     printVariant( varOutString);
 
     OutputDebugString(_T("testout_methodAny \n"));
-    hr= oletest.Invoke1(static_cast<LPCOLESTR>(L"testout_methodAny"), &varOutAny, &varRet);
+    hr=	oletest.Invoke1(static_cast<LPCOLESTR>(L"testout_methodAny"), &varOutAny, &varRet);
     OutputDebugString(_T("methodAny  | out value: \n"));
     printVariant( varOutAny);
 
     OutputDebugString(_T("testout_methodXInterface \n"));
-    hr= oletest.Invoke1(static_cast<LPCOLESTR>(L"testout_methodXInterface"), &varOutXInterface, &varRet);
+    hr=	oletest.Invoke1(static_cast<LPCOLESTR>(L"testout_methodXInterface"), &varOutXInterface, &varRet);
     OutputDebugString(_T("methodAny  | out value: \n"));
     printVariant( varOutXInterface);
     CComDispatchDriver outDisp( *varOutXInterface.ppdispVal);
     CComVariant varAttr3;
     outDisp.GetPropertyByName(L"AttrAny2", &varAttr3);
     ATLTRACE("property OleTest.AttrAny2: %s", W2T(varAttr3.bstrVal));
-
+    
     OutputDebugString(_T("testout_methodMulParams1 ( 2 out Parameter) \n"));
     long longOut2=0;
     CComVariant _params[2];
@@ -396,18 +396,18 @@ HRESULT doTest()
     _params[0]= varOutLong;
     _params[1].vt= VT_BYREF | VT_I4;
     V_I4REF(& _params[1])= &longOut2;
-    hr= oletest.InvokeN( static_cast<LPCOLESTR>(L"testout_methodMulParams1"), (VARIANT*)&_params, 2);
+    hr=	oletest.InvokeN( static_cast<LPCOLESTR>(L"testout_methodMulParams1"), (VARIANT*)&_params, 2);
     OutputDebugString(_T("testout_methodMulParams1  | out values: \n"));
     printVariant( _params[1]);
     printVariant( _params[0]);
-
+    
     OutputDebugString(_T("testout_methodMulParams2 ( 3 out Parameter) \n"));
     CComVariant _params2[3];
     _params2[2]= varOutLong;
     _params2[1].vt= VT_BYREF | VT_I4;
     V_I4REF(& _params2[1])= &longOut2;
     _params2[0]= varOutString;
-    hr= oletest.InvokeN( static_cast<LPCOLESTR>( L"testout_methodMulParams2"), (VARIANT*)&_params2, 3);
+    hr=	oletest.InvokeN( static_cast<LPCOLESTR>( L"testout_methodMulParams2"), (VARIANT*)&_params2, 3);
     OutputDebugString(_T("testout_methodMulParams2  | out values: \n"));
     printVariant( _params2[2]);
     printVariant( _params2[1]);
@@ -417,42 +417,42 @@ HRESULT doTest()
     CComVariant _params3[2];
     _params3[1]= CComBSTR(L" In string");
     _params3[0]= varOutString;
-    hr= oletest.InvokeN( static_cast<LPCOLESTR>( L"testout_methodMulParams3"), (VARIANT*)&_params3, 2);
+    hr=	oletest.InvokeN( static_cast<LPCOLESTR>( L"testout_methodMulParams3"), (VARIANT*)&_params3, 2);
     OutputDebugString(_T("testout_methodMulParams3  | out values: \n"));
     printVariant( _params3[1]);
     printVariant( _params3[0]);
-
+    
     //In Out Parameter ###########################################################################
     OutputDebugString( _T("In Out parameter ###########################################\n\n"));
 
     *V_I1REF(&varOutByte)= 5;
     ATLTRACE(_T("testinout_methodByte | in value: %d \n"), *V_I1REF(&varOutByte));
-    hr= oletest.InvokeN(static_cast<LPCOLESTR>(L"testinout_methodByte"), &varOutByte, 1, &varRet);
+    hr=	oletest.InvokeN(static_cast<LPCOLESTR>(L"testinout_methodByte"), &varOutByte, 1, &varRet);
     OutputDebugString(_T("testinout_methodByte  | out value: \n"));
     printVariant( varOutByte);
 
     OutputDebugString(_T("testinout_methodShort | in value= 1000 \n"));
     *V_UI2REF(&varOutShort)= 1000;
-    hr= oletest.Invoke1(static_cast<LPCOLESTR>(L"testinout_methodShort"), &varOutShort, &varRet);
+    hr=	oletest.Invoke1(static_cast<LPCOLESTR>(L"testinout_methodShort"), &varOutShort, &varRet);
     OutputDebugString(_T("testinout_methodShort  | out value: \n"));
     printVariant( varOutShort);
 
     OutputDebugString(_T("testinout_methodLong | in value= 10000 \n"));
     *V_UI4REF(&varOutLong)= 10000;
-    hr= oletest.Invoke1(static_cast<LPCOLESTR>(L"testinout_methodLong"), &varOutLong, &varRet);
+    hr=	oletest.Invoke1(static_cast<LPCOLESTR>(L"testinout_methodLong"), &varOutLong, &varRet);
     OutputDebugString(_T("testinout_methodLong  | out value: \n"));
     printVariant( varOutLong);
 
     *V_R8REF(&varOutDouble)= 3.14;
     ATLTRACE(_T("testinou_methodDouble in value: %f \n"),*V_R8REF(&varOutDouble));
-    hr= oletest.Invoke1(static_cast<LPCOLESTR>(L"testinout_methodDouble"), &varOutDouble, &varRet);
+    hr=	oletest.Invoke1(static_cast<LPCOLESTR>(L"testinout_methodDouble"), &varOutDouble, &varRet);
     OutputDebugString(_T("testinout_methodDouble  | out value: \n"));
     printVariant( varOutDouble);
 
     SysFreeString( *V_BSTRREF(&varOutString));
     *V_BSTRREF(&varOutString)= SysAllocString( L"this is a in string");
     ATLTRACE(_T("testinout_methodString | value: %s \n"), W2T(*V_BSTRREF(&varOutString)));
-    hr= oletest.Invoke1(static_cast<LPCOLESTR>(L"testinout_methodString"), &varOutString, &varRet);
+    hr=	oletest.Invoke1(static_cast<LPCOLESTR>(L"testinout_methodString"), &varOutString, &varRet);
     OutputDebugString(_T("testinout_methodString  | out value: \n"));
     printVariant( varOutString);
 
@@ -461,7 +461,7 @@ HRESULT doTest()
     outVar1.vt= VT_BYREF | VT_VARIANT;
     outVar1.pvarVal= &var1;
     ATLTRACE(_T("testinout_methodAny | parameter: %s\n"), W2T(var1.bstrVal));
-    hr= oletest.Invoke1(static_cast<LPCOLESTR>(L"testinout_methodAny"), &varOutAny, &varRet);
+    hr=	oletest.Invoke1(static_cast<LPCOLESTR>(L"testinout_methodAny"), &varOutAny, &varRet);
     OutputDebugString(_T("testinout_methodAny  | out value: \n"));
     printVariant( varOutAny);
 
@@ -472,7 +472,7 @@ HRESULT doTest()
     (*varOutIFace.ppunkVal)->AddRef();
     OutputDebugString(_T("testinout_methodXInterface | in value: \n"));
     printVariant(varOutIFace);
-    hr= oletest.Invoke1(static_cast<LPCOLESTR>(L"testinout_methodXInterface"), &varOutIFace, &varRet);
+    hr=	oletest.Invoke1(static_cast<LPCOLESTR>(L"testinout_methodXInterface"), &varOutIFace, &varRet);
     OutputDebugString(_T("testinout_methodXInterface  | out value: \n"));
     printVariant( varOutIFace);
 
@@ -489,8 +489,8 @@ HRESULT doTest()
     varRet.Clear();
     hr= oletest.GetPropertyByName( static_cast<LPCOLESTR>(L"AttrByte"), &varRet);
     printVariant( varRet);
-
-
+    
+    
     return S_OK;
 
 
@@ -502,7 +502,7 @@ void printVariant( VARIANT & _var)
     HRESULT hr;
     USES_CONVERSION;
     CComVariant var;
-    hr= VariantCopyInd( &var, &_var);
+    hr=	VariantCopyInd( &var, &_var); 
     if( var.vt & VT_ARRAY)
     {
         VARTYPE type= var.vt ^ VT_ARRAY;
@@ -522,7 +522,7 @@ void printVariant( VARIANT & _var)
         OutputDebugString( _T("# Array \n"));
         for( long i= 0; i < count; i++)
         {
-//          CComVariant variantValue;
+//			CComVariant variantValue;
             TCHAR *buf[256];
             wsprintf( (TCHAR*)buf, _T("%d : "), i);
             OutputDebugString( (TCHAR*)buf);
@@ -602,15 +602,15 @@ void printVariant( VARIANT & _var)
             break;
         case VT_I4: wsprintf( (TCHAR*)buf, _T(" VT_I4: %d \n"), V_I4( &var) );
             break;
-        case VT_R8:
+        case VT_R8: 
             {
+                
+//				int     decimal,   sign;
+//				char    *buffer;
+//				int     precision = 14;
+//				double  source = 3.1415926535;
 
-//              int     decimal,   sign;
-//              char    *buffer;
-//              int     precision = 14;
-//              double  source = 3.1415926535;
-
-//              buffer = _ecvt( V_R8(&var), precision, &decimal, &sign );
+//				buffer = _ecvt( V_R8(&var), precision, &decimal, &sign );
                 sprintf( (TCHAR*)buf, _T(" VT_R8: %f \n"),V_R8( &var) );
             break;
             }
@@ -635,7 +635,7 @@ void printVariant( VARIANT & _var)
 
                 break;
             }
-
+            
 
         case VT_BSTR:
             {
diff --git a/extensions/test/ole/OleConverterVar1/smartarray.h b/extensions/test/ole/OleConverterVar1/smartarray.h
index 13b5337cd11e..f38c93d88cd2 100644
--- a/extensions/test/ole/OleConverterVar1/smartarray.h
+++ b/extensions/test/ole/OleConverterVar1/smartarray.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,14 +42,14 @@ public:
         rgsabound[0].cElements= count;
         rgsabound[0].lLbound= 0;
         m_array= SafeArrayCreate( destVartype, 1, rgsabound);
-        SafeArrayLock( m_array);
-
+        SafeArrayLock( m_array);	
+        
         void* pData;
         if( m_array && (SUCCEEDED( SafeArrayAccessData( m_array, (void**)&pData)) ) )
         {
 
             for( int i=0; i< count; i++)
-            {
+            {	
                 CComVariant varSource( parParams[i]);
                 switch (destVartype)
                 {
@@ -121,18 +121,18 @@ public:
                         VARIANT *pVariant= (VARIANT*)pData;
                         hr= VariantCopy( &pVariant[i], &varSource); break;
                     }
-//              case VT_UNKNOWN:
-//                  {
-//                      long* pUnk= (long*)pData;
-//                      pUnk[i]= reinterpret_cast<long>(parParams[i]);
-//                      ((IUnknown*)pUnk[i])->AddRef(); break;
-//                  }
-//              case VT_DISPATCH:
-//                  {
-//                      long* pDisp= (long*)pData;
-//                      pDisp[i]= (long)parParams[i];
-//                      ((IDispatch*)pDisp[i])->AddRef(); break;
-//                  }
+//				case VT_UNKNOWN:
+//					{
+//						long* pUnk= (long*)pData;
+//						pUnk[i]= reinterpret_cast<long>(parParams[i]);
+//						((IUnknown*)pUnk[i])->AddRef(); break;
+//					}
+//				case VT_DISPATCH:
+//					{
+//						long* pDisp= (long*)pData;
+//						pDisp[i]= (long)parParams[i];
+//						((IDispatch*)pDisp[i])->AddRef(); break;
+//					}
                 default:
                     hr= E_FAIL;
                 }
@@ -145,7 +145,7 @@ public:
         }
         SafeArrayUnaccessData( m_array);
     }
-    ~SmartArray(){
+    ~SmartArray(){ 
         SafeArrayUnlock( m_array);
         SafeArrayDestroy( m_array );
     }
@@ -162,44 +162,44 @@ class SmartArray<IUnknown*>
     SAFEARRAY *m_array;
 public:
 
-    SmartArray( sourceType * parParams, int count, VARTYPE destVartype);
-//  {
-//      ATLTRACE("SmartArray<IUnknown>");
-//      HRESULT hr= S_OK;
-//      SAFEARRAYBOUND rgsabound[1];
-//      rgsabound[0].cElements= count;
-//      rgsabound[0].lLbound= 0;
-//      m_array= SafeArrayCreateVector( VT_UNKNOWN, 0, count);
-//      SafeArrayLock( m_array);
+    SmartArray( sourceType * parParams, int count, VARTYPE destVartype); 
+//	{
+//		ATLTRACE("SmartArray<IUnknown>");
+//		HRESULT hr= S_OK;
+//		SAFEARRAYBOUND rgsabound[1];
+//		rgsabound[0].cElements= count;
+//		rgsabound[0].lLbound= 0;
+//		m_array= SafeArrayCreateVector( VT_UNKNOWN, 0, count);
+//		SafeArrayLock( m_array);	
+//		
+//		IUnknown* *pData;
+//		if( m_array && (SUCCEEDED( SafeArrayAccessData( m_array, (void**)&pData)) ) )
+//		{
 //
-//      IUnknown* *pData;
-//      if( m_array && (SUCCEEDED( SafeArrayAccessData( m_array, (void**)&pData)) ) )
-//      {
+//			for( int i=0; i< count; i++)
+//			{	
+//				CComVariant varSource( parParams[i]);
+//				switch (destVartype)
+//				{
 //
-//          for( int i=0; i< count; i++)
-//          {
-//              CComVariant varSource( parParams[i]);
-//              switch (destVartype)
-//              {
-//
-//              case VT_UNKNOWN:
-//                  {
-//                      pData[i]= parParams[i];
-//                      pData[i]->AddRef();
-//                  }
-//              default:
-//                  hr= E_FAIL;
-//              }
-//          }
-//          if( FAILED( hr))
-//          {
-//              SafeArrayDestroy( m_array);
-//              m_array= NULL;
-//          }
-//      }
-//      SafeArrayUnaccessData( m_array);
-//  }
-    ~SmartArray(){
+//				case VT_UNKNOWN:
+//					{
+//						pData[i]= parParams[i];
+//						pData[i]->AddRef();
+//					}
+//				default:
+//					hr= E_FAIL;
+//				}
+//			}
+//			if( FAILED( hr))
+//			{
+//				SafeArrayDestroy( m_array);
+//				m_array= NULL;
+//			}
+//		}
+//		SafeArrayUnaccessData( m_array);
+//	}
+    ~SmartArray(){ 
         SafeArrayUnlock( m_array);
         SafeArrayDestroy( m_array );
     }
@@ -218,13 +218,13 @@ template <> SmartArray <IUnknown*>::SmartArray(sourceType * parParams, int count
     rgsabound[0].cElements= count;
     rgsabound[0].lLbound= 0;
     m_array= SafeArrayCreateVector( VT_UNKNOWN, 0, count);
-    SafeArrayLock( m_array);
-
+    SafeArrayLock( m_array);	
+    
     IUnknown* *pData;
     if( m_array && (SUCCEEDED( SafeArrayAccessData( m_array, (void**)&pData)) ) )
     {
         for( int i=0; i< count; i++)
-        {
+        {	
             pData[i]= parParams[i];
             pData[i]->AddRef();
         }
diff --git a/extensions/test/ole/cpnt/cpnt.cxx b/extensions/test/ole/cpnt/cpnt.cxx
index c44728b9def5..589d27f438c2 100644
--- a/extensions/test/ole/cpnt/cpnt.cxx
+++ b/extensions/test/ole/cpnt/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
@@ -65,7 +65,7 @@ using namespace oletest;
 using namespace rtl;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
-using namespace com::sun::star::beans;
+using namespace com::sun::star::beans; 
 using namespace com::sun::star::registry;
 using namespace com::sun::star::script;
 using namespace com::sun::star::reflection;
@@ -136,7 +136,7 @@ class OComponent : public WeakImplHelper7<
     Reference<XInvocation> m_attr_xinvocation;
 
 public:
-    OComponent( const Reference<XMultiServiceFactory> & rFactory ) :
+    OComponent( const Reference<XMultiServiceFactory> & rFactory ) : 
       m_rFactory( rFactory ), m_arrayConstructor(0) {}
     ~OComponent();
 public: // XTestSequence
@@ -157,7 +157,7 @@ public: // XTestSequence
     virtual Sequence< Sequence< Sequence< sal_Int32 > > > SAL_CALL methodSequence2(const Sequence< Sequence< Sequence< sal_Int32 > > >& aSeq) throw( RuntimeException );
     virtual Sequence< Reference<XEventListener> > SAL_CALL methodXEventListeners( const Sequence<Reference<XEventListener> >& aSeq) throw( RuntimeException);
     virtual Sequence< Sequence<Reference<XEventListener > > > SAL_CALL methodXEventListenersMul( const Sequence<Sequence<Reference<XEventListener > > >& aSeq ) throw (RuntimeException);
-
+    
     virtual Sequence< sal_Int8 > SAL_CALL getAttrByte(void) throw( RuntimeException );
     virtual void SAL_CALL setAttrByte(const Sequence< sal_Int8 >& AttrByte_) throw( RuntimeException );
     virtual Sequence< float > SAL_CALL getAttrFloat(void)  throw( RuntimeException) ;
@@ -263,7 +263,7 @@ public: // XTestSequence
     virtual void SAL_CALL setAttrAny2(const Any& AttrAny2_) throw( RuntimeException ) ;
 
 
-    // XTestStruct
+    // XTestStruct 
     virtual void SAL_CALL methodStruct(const Property& aProp) throw( RuntimeException );
 
     virtual Property SAL_CALL retMethodStruct(void) throw( RuntimeException );
@@ -280,25 +280,25 @@ public: // XTestSequence
     virtual Any SAL_CALL other_methodAny( const Any& rAny, const OUString& typeInAny )
         throw (RuntimeException);
 
-
+    
     // XTestOutParameters ------------------------------------------------------------------------
 //     virtual void SAL_CALL out_test(sal_Int8 rIn) throw( RuntimeException );
 
-//  virtual void SAL_CALL out_methodByte(sal_Int8& rOut) throw( RuntimeException );
-//  virtual void SAL_CALL out_methodFloat(float& rOut) throw( RuntimeException );
-//  virtual void SAL_CALL out_methodDouble(double& rOut) throw( RuntimeException );
-//  virtual void SAL_CALL out_methodBool(sal_Bool& rOut) throw( RuntimeException );
-//  virtual void SAL_CALL out_methodShort(sal_Int16& rOut) throw( RuntimeException );
-//  virtual void SAL_CALL out_methodUShort(sal_uInt16& rOut) throw( RuntimeException );
-//  virtual void SAL_CALL out_methodLong(sal_Int32& rOut) throw( RuntimeException );
-//  virtual void SAL_CALL out_methodULong(sal_uInt32& rOut) throw( RuntimeException );
-//  virtual void SAL_CALL out_methodHyper(sal_Int64& rOut) throw( RuntimeException );
-//  virtual void SAL_CALL out_methodUHyper(sal_uInt64& rOut) throw( RuntimeException );
+// 	virtual void SAL_CALL out_methodByte(sal_Int8& rOut) throw( RuntimeException );
+// 	virtual void SAL_CALL out_methodFloat(float& rOut) throw( RuntimeException );
+// 	virtual void SAL_CALL out_methodDouble(double& rOut) throw( RuntimeException );
+// 	virtual void SAL_CALL out_methodBool(sal_Bool& rOut) throw( RuntimeException );
+// 	virtual void SAL_CALL out_methodShort(sal_Int16& rOut) throw( RuntimeException );
+// 	virtual void SAL_CALL out_methodUShort(sal_uInt16& rOut) throw( RuntimeException );
+// 	virtual void SAL_CALL out_methodLong(sal_Int32& rOut) throw( RuntimeException );
+// 	virtual void SAL_CALL out_methodULong(sal_uInt32& rOut) throw( RuntimeException );
+// 	virtual void SAL_CALL out_methodHyper(sal_Int64& rOut) throw( RuntimeException );
+// 	virtual void SAL_CALL out_methodUHyper(sal_uInt64& rOut) throw( RuntimeException );
 //     virtual void SAL_CALL out_methodString(OUString& rOut) throw( RuntimeException );
-//  virtual void SAL_CALL out_methodChar(sal_Unicode& rOut) throw( RuntimeException );
-//  virtual void SAL_CALL out_methodAny(Any& rOut) throw( RuntimeException );
-//  virtual void SAL_CALL out_methodSequence(Sequence< sal_Int32 >& rOut) throw( RuntimeException );
-//  virtual void SAL_CALL out_methodSequence2(Sequence< Sequence< sal_Int32 > >& rOut) throw( RuntimeException );
+// 	virtual void SAL_CALL out_methodChar(sal_Unicode& rOut) throw( RuntimeException );
+// 	virtual void SAL_CALL out_methodAny(Any& rOut) throw( RuntimeException );
+// 	virtual void SAL_CALL out_methodSequence(Sequence< sal_Int32 >& rOut) throw( RuntimeException );
+// 	virtual void SAL_CALL out_methodSequence2(Sequence< Sequence< sal_Int32 > >& rOut) throw( RuntimeException );
 //     virtual void SAL_CALL out_methodMulParams1(sal_Int32& rout1, sal_Int32& rout2) throw( RuntimeException );
 //     virtual void SAL_CALL out_methodMulParams2(sal_Int32& rout1, sal_Int32& rout2, OUString& rout3) throw( RuntimeException );
 //     virtual void SAL_CALL out_methodMulParams3(const OUString& sin, OUString& sout) throw( RuntimeException );
@@ -322,7 +322,7 @@ public: // XTestSequence
     virtual Reference<XInvocation > SAL_CALL in_methodInvocation( const Reference< XInvocation >& inv ) throw (RuntimeException);
     virtual SimpleStruct SAL_CALL in_methodStruct( const SimpleStruct& aStruct ) throw (RuntimeException);
     virtual void SAL_CALL in_methodAll( sal_Int8 b, float f, double d, sal_Bool boo, sal_Int16 sh, sal_uInt16 us, sal_Int32 l, sal_uInt32 ul, const OUString& s, sal_Unicode c, const Any& a, const Type& t, const Reference<XInvocation>& inv ) throw (RuntimeException);
-
+    
     // XTestInterfaces --------------------------------------------------------------------------
     virtual void SAL_CALL testInterface(  const Reference< XCallback >& xCallback, sal_Int32 mode ) throw(RuntimeException);
     virtual void SAL_CALL testInterface2(  const Reference< XSimple >& xSimple, sal_Int32 mode ) throw(RuntimeException);
@@ -355,10 +355,10 @@ OComponent::~OComponent()
 // Funktions ==============================================================================
 
 Reference<XInterface> SAL_CALL OComponent_CreateInstance( const Reference<XMultiServiceFactory> & rSMgr ) throw(RuntimeException)
-{
-//  Reference<XInterface> xService(static_cast<XWeak*>(new OComponent( rSMgr )), UNO_QUERY);
+{	
+//	Reference<XInterface> xService(static_cast<XWeak*>(new OComponent( rSMgr )), UNO_QUERY);
     OComponent* o= new OComponent( rSMgr );
-    Reference<XInterface> xService(static_cast<XIdentity*>(o), UNO_QUERY);
+    Reference<XInterface> xService(static_cast<XIdentity*>(o), UNO_QUERY);    
     return xService;
 }
 
@@ -366,12 +366,12 @@ Sequence<OUString> OComponent_getSupportedServiceNames(void)
 {
     Sequence<OUString> aRet(1);
     aRet.getArray()[0] = SERVICE_NAME;//ODataInputStream_getImplementationName();
-
+    
     return aRet;
 }
 
 
-extern "C" sal_Bool SAL_CALL component_writeInfo(   void * /*pServiceManager*/, void * pRegistryKey )
+extern "C" sal_Bool SAL_CALL component_writeInfo(	void * /*pServiceManager*/, void * pRegistryKey )
 {
     if(pRegistryKey)
     {
@@ -402,11 +402,11 @@ extern "C" void * SAL_CALL component_getFactory(
         {
             Reference<XMultiServiceFactory> xMulFac(
                 reinterpret_cast< XMultiServiceFactory*>(pServiceManager));
-
-            Sequence<OUString> seqServiceNames;
-            Reference<XSingleServiceFactory> xFactory = createOneInstanceFactory( xMulFac, SERVICE_NAME,
+            
+            Sequence<OUString> seqServiceNames;		
+            Reference<XSingleServiceFactory> xFactory = createOneInstanceFactory( xMulFac, SERVICE_NAME, 
                                         OComponent_CreateInstance, seqServiceNames);
-
+                
             if (xFactory.is())
             {
                 xFactory->acquire();
@@ -414,7 +414,7 @@ extern "C" void * SAL_CALL component_getFactory(
             }
         }
     }
-    return  pRet;
+    return	pRet;
 }
 
 extern "C" void SAL_CALL component_getImplementationEnvironment(
@@ -425,16 +425,16 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
 
 
 // XTestSequence ============================================================================
-Sequence<sal_Int8> SAL_CALL OComponent::methodByte(const Sequence< sal_Int8 >& aSeq) throw( RuntimeException )
-{
+Sequence<sal_Int8> SAL_CALL OComponent::methodByte(const Sequence< sal_Int8 >& aSeq) throw( RuntimeException ) 
+{	
     sal_Int8 _x;
     for( sal_Int16 i= 0; i < aSeq.getLength(); i++){
         _x= aSeq.getConstArray()[i];
     }
     return aSeq;
 }
-Sequence<float> SAL_CALL OComponent::methodFloat(const Sequence< float>& aSeq) throw( RuntimeException )
-{
+Sequence<float> SAL_CALL OComponent::methodFloat(const Sequence< float>& aSeq) throw( RuntimeException ) 
+{	
     float _x;
     for( sal_Int16 i= 0; i < aSeq.getLength(); i++){
         _x= aSeq.getConstArray()[i];
@@ -468,12 +468,12 @@ Sequence< sal_Int16 > SAL_CALL OComponent::methodShort(const Sequence< sal_Int16
 Sequence< sal_uInt16 > SAL_CALL OComponent::methodUShort(const Sequence< sal_uInt16 >& aSeq) throw( RuntimeException )
 {
     sal_uInt16 _x;
-    for( sal_Int16 i= 0; i < aSeq.getLength(); i++){
+    for( sal_Int16 i= 0; i < aSeq.getLength(); i++){  
         _x= aSeq.getConstArray()[i];
     }
     return aSeq;
 }
-Sequence< sal_Int32 > SAL_CALL OComponent::methodLong(const Sequence< sal_Int32 >& aSeq) throw( RuntimeException)
+Sequence< sal_Int32 > SAL_CALL OComponent::methodLong(const Sequence< sal_Int32 >& aSeq) throw( RuntimeException) 
 {
     sal_Int32 _x;
     for( sal_Int16 i= 0; i < aSeq.getLength(); i++)  {
@@ -481,7 +481,7 @@ Sequence< sal_Int32 > SAL_CALL OComponent::methodLong(const Sequence< sal_Int32
     }
     return aSeq;
 }
-Sequence< sal_uInt32 > SAL_CALL OComponent::methodULong(const Sequence< sal_uInt32 >& aSeq) throw( RuntimeException)
+Sequence< sal_uInt32 > SAL_CALL OComponent::methodULong(const Sequence< sal_uInt32 >& aSeq) throw( RuntimeException)  
 {
     sal_uInt32 _x;
     for( sal_Int16 i= 0; i < aSeq.getLength(); i++){
@@ -489,7 +489,7 @@ Sequence< sal_uInt32 > SAL_CALL OComponent::methodULong(const Sequence< sal_uInt
     }
     return aSeq;
 }
-Sequence< OUString > SAL_CALL OComponent::methodString(const Sequence< OUString >& aSeq) throw( RuntimeException)
+Sequence< OUString > SAL_CALL OComponent::methodString(const Sequence< OUString >& aSeq) throw( RuntimeException) 
 {
     OUString _x;
     for( sal_Int16 i= 0; i < aSeq.getLength(); i++) {
@@ -497,7 +497,7 @@ Sequence< OUString > SAL_CALL OComponent::methodString(const Sequence< OUString
     }
     return aSeq;
 }
-Sequence< sal_Unicode > SAL_CALL OComponent::methodChar(const Sequence< sal_Unicode >& aSeq) throw( RuntimeException)
+Sequence< sal_Unicode > SAL_CALL OComponent::methodChar(const Sequence< sal_Unicode >& aSeq) throw( RuntimeException) 
 {
     sal_Unicode _x;
     for( sal_Int16 i= 0; i < aSeq.getLength(); i++){
@@ -505,7 +505,7 @@ Sequence< sal_Unicode > SAL_CALL OComponent::methodChar(const Sequence< sal_Unic
     }
     return aSeq;
 }
-Sequence< Any > SAL_CALL OComponent::methodAny(const Sequence< Any >& aSeq) throw( RuntimeException)
+Sequence< Any > SAL_CALL OComponent::methodAny(const Sequence< Any >& aSeq) throw( RuntimeException) 
 {
     Any _x;
     for( sal_Int16 i= 0; i < aSeq.getLength(); i++){
@@ -527,7 +527,7 @@ Sequence< Type > SAL_CALL OComponent::methodType(const Sequence< Type >& aSeq) t
     return aSeq;
 }
 //Sequence< Reference< XInterface> > SAL_CALL methodXInterface ( const Sequence< Reference < XInterface> >& aSeq)
-//  throw (RuntimeException)
+//	throw (RuntimeException)
 Sequence< Reference< XInterface > > SAL_CALL OComponent::methodXInterface( const Sequence< Reference< XInterface > >& aSeq ) throw(RuntimeException)
 {
     for( sal_Int32 i= 0; i < aSeq.getLength(); i++)
@@ -540,7 +540,7 @@ Sequence< Reference< XInterface > > SAL_CALL OComponent::methodXInterface( const
     return aSeq;
 }
 
-Sequence< Sequence< sal_Int32 > > SAL_CALL OComponent::methodSequence(const Sequence< Sequence< sal_Int32 > >& aSeq) throw( RuntimeException)
+Sequence< Sequence< sal_Int32 > > SAL_CALL OComponent::methodSequence(const Sequence< Sequence< sal_Int32 > >& aSeq) throw( RuntimeException) 
 {
     sal_Int32 value;
     for( sal_Int16 i= 0; i < aSeq.getLength(); i++){
@@ -551,7 +551,7 @@ Sequence< Sequence< sal_Int32 > > SAL_CALL OComponent::methodSequence(const Sequ
     }
     return aSeq;
 }
-Sequence< Sequence< Sequence< sal_Int32 > > > SAL_CALL OComponent::methodSequence2(const Sequence< Sequence< Sequence< sal_Int32 > > >& aSeq)
+Sequence< Sequence< Sequence< sal_Int32 > > > SAL_CALL OComponent::methodSequence2(const Sequence< Sequence< Sequence< sal_Int32 > > >& aSeq) 
     throw( RuntimeException )
 {
     sal_Int32 value;
@@ -577,10 +577,10 @@ Sequence< Reference< XEventListener> > SAL_CALL OComponent::methodXEventListener
     for( int i= 0; i < aSeq.getLength(); i++)
     {
         listener= aSeq[i];
-
+        
         listener->disposing( EventObject() );
     }
-
+    
     return aSeq;
 }
 
@@ -589,7 +589,7 @@ Sequence< Sequence<Reference<XEventListener > > > SAL_CALL OComponent::methodXEv
     Reference<XEventListener> listener;
     for( int i= 0; i < aSeq.getLength(); i++)
     {
-        Sequence<Reference<XEventListener> > seqInner= aSeq[i];
+        Sequence<Reference<XEventListener> > seqInner= aSeq[i]; 
         for( int j= 0; j < seqInner.getLength(); j++)
         {
             listener= seqInner[j];
@@ -601,7 +601,7 @@ Sequence< Sequence<Reference<XEventListener > > > SAL_CALL OComponent::methodXEv
 
 //---------------------------------------------------------------------------------------------
 
-Sequence< sal_Int8 > SAL_CALL OComponent::getAttrByte(void) throw( RuntimeException)
+Sequence< sal_Int8 > SAL_CALL OComponent::getAttrByte(void) throw( RuntimeException) 
 {
     return m_seqByte;
 }
@@ -627,8 +627,8 @@ void SAL_CALL OComponent::setAttrDouble(const Sequence< double >& AttrDouble_) t
     m_seqDouble= AttrDouble_;
 }
 
-Sequence< sal_Bool > SAL_CALL OComponent::getAttrBool(void)  throw( RuntimeException)
-{
+Sequence< sal_Bool > SAL_CALL OComponent::getAttrBool(void)  throw( RuntimeException) 
+{	
     return m_seqBool;
 }
 
@@ -637,7 +637,7 @@ void SAL_CALL OComponent::setAttrBool(const Sequence< sal_Bool >& AttrBool_) thr
     m_seqBool= AttrBool_;
 }
 
-Sequence< sal_Int16 > SAL_CALL OComponent::getAttrShort(void)  throw( RuntimeException)
+Sequence< sal_Int16 > SAL_CALL OComponent::getAttrShort(void)  throw( RuntimeException) 
 {
     return m_seqShort;
 }
@@ -655,7 +655,7 @@ void SAL_CALL OComponent::setAttrUShort(const Sequence< sal_uInt16 >& AttrUShort
     m_seqUShort= AttrUShort_;
 }
 
-Sequence< sal_Int32 > SAL_CALL OComponent::getAttrLong(void)  throw( RuntimeException)
+Sequence< sal_Int32 > SAL_CALL OComponent::getAttrLong(void)  throw( RuntimeException) 
 {
     return m_seqLong;
 }
@@ -686,12 +686,12 @@ Sequence< sal_Unicode > SAL_CALL OComponent::getAttrChar(void)  throw( RuntimeEx
 {
     return m_seqChar;
 }
-void SAL_CALL OComponent::setAttrChar(const Sequence< sal_Unicode >& AttrChar_) throw( RuntimeException)
+void SAL_CALL OComponent::setAttrChar(const Sequence< sal_Unicode >& AttrChar_) throw( RuntimeException) 
 {
     m_seqChar= AttrChar_;
 }
 
-Sequence< Any > SAL_CALL OComponent::getAttrAny(void) throw( RuntimeException)
+Sequence< Any > SAL_CALL OComponent::getAttrAny(void) throw( RuntimeException) 
 {
     return m_seqAny;
 }
@@ -711,7 +711,7 @@ void SAL_CALL OComponent::setAttrType( const Sequence< Type >& AttrType_) throw(
 }
 
 
-Sequence< Sequence< sal_Int32 > > SAL_CALL OComponent::getAttrSequence(void)  throw( RuntimeException)
+Sequence< Sequence< sal_Int32 > > SAL_CALL OComponent::getAttrSequence(void)  throw( RuntimeException) 
 {
     return m_seq1;
 }
@@ -735,7 +735,7 @@ Sequence< Sequence< Sequence< sal_Int32 > > > SAL_CALL OComponent::getAttrSequen
 {
     return m_seq2;
 }
-void SAL_CALL OComponent::setAttrSequence2(const Sequence< Sequence< Sequence< sal_Int32 > > >& AttrSequence2_)
+void SAL_CALL OComponent::setAttrSequence2(const Sequence< Sequence< Sequence< sal_Int32 > > >& AttrSequence2_) 
     throw( RuntimeException )
 {
     m_seq2= AttrSequence2_;
@@ -771,7 +771,7 @@ void SAL_CALL OComponent::setAFloat( float _afloat ) throw (RuntimeException)
 {
     m_attr_float = _afloat;
 }
-
+    
 double SAL_CALL OComponent::getADouble() throw (RuntimeException)
 {
     return m_attr_double;
@@ -943,7 +943,7 @@ void SAL_CALL OComponent::testout_methodChar(sal_Unicode& rOut) throw( RuntimeEx
 {
     rOut= m_char;
 }
-void SAL_CALL OComponent::testout_methodAny(Any& rOut) throw( RuntimeException)
+void SAL_CALL OComponent::testout_methodAny(Any& rOut) throw( RuntimeException) 
 {
     rOut = m_any;
 }
@@ -953,7 +953,7 @@ void SAL_CALL OComponent::testout_methodType(Type& rOut) throw( RuntimeException
     rOut = m_type;
 }
 
-void SAL_CALL OComponent::testout_methodSequence(Sequence< sal_Int32 >& rOut) throw( RuntimeException)
+void SAL_CALL OComponent::testout_methodSequence(Sequence< sal_Int32 >& rOut) throw( RuntimeException) 
 {
     rOut.realloc(10);
     for( sal_Int16 i= 0; i < rOut.getLength(); i++) rOut.getArray()[i]= i;
@@ -993,9 +993,9 @@ void SAL_CALL OComponent::testout_methodMulParams4( float in1, float& out1, sal_
 void SAL_CALL OComponent::testout_methodXInterface( Reference< XInterface >& rOut ) throw(RuntimeException)
 {
     rOut = m_xinterface;
-//  OUString string( L"Property Any");
-//  m_any <<= string;
-//  rOut=  Reference<XInterface> (static_cast<XTestSequence*>(this), UNO_QUERY);
+// 	OUString string( L"Property Any");
+// 	m_any <<= string;
+// 	rOut=  Reference<XInterface> (static_cast<XTestSequence*>(this), UNO_QUERY);
 }
 
 // XTestInParameters ------------------------------------------------------------
@@ -1023,7 +1023,7 @@ sal_Int16 SAL_CALL OComponent::in_methodShort( sal_Int16 rIn ) throw (RuntimeExc
 {
     m_int16 = rIn;
     return rIn;
-}
+}	
 sal_uInt16 SAL_CALL OComponent::in_methodUShort( sal_uInt16 rIn ) throw (RuntimeException)
 {
     m_uint16 = rIn;
@@ -1187,19 +1187,19 @@ void SAL_CALL OComponent::testinout_methodString(OUString& rOut) throw( RuntimeE
     rOut = m_string;
     m_string = tmp;
 }
-void SAL_CALL OComponent::testinout_methodChar(sal_Unicode& rOut) throw( RuntimeException)
+void SAL_CALL OComponent::testinout_methodChar(sal_Unicode& rOut) throw( RuntimeException) 
 {
     sal_Unicode tmp = rOut;
     rOut = m_char;
     m_char = tmp;
 }
-void SAL_CALL OComponent::testinout_methodAny(Any& rOut) throw( RuntimeException)
+void SAL_CALL OComponent::testinout_methodAny(Any& rOut) throw( RuntimeException) 
 {
     Any tmp = rOut;
     rOut = m_any;
     m_any = tmp;
 }
-void SAL_CALL OComponent::testinout_methodType(Type& rOut) throw( RuntimeException)
+void SAL_CALL OComponent::testinout_methodType(Type& rOut) throw( RuntimeException) 
 {
     Type tmp = rOut;
     rOut = m_type;
@@ -1207,9 +1207,9 @@ void SAL_CALL OComponent::testinout_methodType(Type& rOut) throw( RuntimeExcepti
 }
 
 
-void SAL_CALL OComponent::testinout_methodSequence(Sequence< sal_Int32 >& rOut) throw( RuntimeException)
+void SAL_CALL OComponent::testinout_methodSequence(Sequence< sal_Int32 >& rOut) throw( RuntimeException) 
 {
-
+    
     sal_Int32* arr= rOut.getArray();
     for ( sal_Int32 i=0; i < rOut.getLength(); i++)
     {
@@ -1250,27 +1250,27 @@ void SAL_CALL OComponent::testinout_methodXInterface2( Reference< XInterface > &
     Reference<XInterface> tmp = rOut;
     rOut = m_xinterface;
     m_xinterface = tmp;
-//  Reference<XTestSequence> xTest( rOut, UNO_QUERY);
-//  if( xTest.is())
-//  {
-//      Any any= xTest->getAttrAny2();
-//      OUString _s;
-//      any >>= _s;
-//      OUString string= _s + OUString((L" this string was written in the UNO component to the inout pararmeter"));
-//      any <<= string;
-//      xTest->setAttrAny2( any);
-//  }
-
-}
-Any SAL_CALL OComponent::methodAnyTest1(const Any& rIn) throw( RuntimeException )
+// 	Reference<XTestSequence> xTest( rOut, UNO_QUERY);
+// 	if( xTest.is())
+// 	{
+// 		Any any= xTest->getAttrAny2();
+// 		OUString _s;
+// 		any >>= _s;
+// 		OUString string= _s + OUString((L" this string was written in the UNO component to the inout pararmeter"));
+// 		any <<= string;	   
+// 		xTest->setAttrAny2( any);
+// 	}
+    
+}
+Any SAL_CALL OComponent::methodAnyTest1(const Any& rIn) throw( RuntimeException ) 
 {
     return rIn;
 }
-Any SAL_CALL OComponent::getAttrAny2(void)  throw( RuntimeException )
+Any SAL_CALL OComponent::getAttrAny2(void)  throw( RuntimeException ) 
 {
     return m_any;
 }
-void SAL_CALL OComponent::setAttrAny2(const Any& AttrAny2_) throw( RuntimeException )
+void SAL_CALL OComponent::setAttrAny2(const Any& AttrAny2_) throw( RuntimeException ) 
 {
     m_any= AttrAny2_;
 }
@@ -1297,7 +1297,7 @@ Property SAL_CALL OComponent::retMethodStruct(void) throw( RuntimeException )
     return a;
 }
 
-Property SAL_CALL OComponent::getAttrStruct(void) throw( RuntimeException)
+Property SAL_CALL OComponent::getAttrStruct(void) throw( RuntimeException) 
 {
     Property a(L"OleTest_Property", 255, getCppuType( (Reference<XInterface>*)0), PropertyAttribute::MAYBEVOID |
         PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED |
@@ -1313,7 +1313,7 @@ void SAL_CALL OComponent::setAttrStruct(const Property& AttrStruct_) throw( Runt
     buff[0]= 0;
     sprintf( buff,"Property::Attribute : %d \n Property::Handle : %d \n Property::Name : %S",
         AttrStruct_.Attributes, AttrStruct_.Handle, (const sal_Unicode*)AttrStruct_.Name);
-//  MessageBox( NULL, A2T(buff), _T("OleTest: setAttrStruct"), MB_OK);
+//	MessageBox( NULL, A2T(buff), _T("OleTest: setAttrStruct"), MB_OK);
 }
 
 Property SAL_CALL OComponent::methodStruct2( const Property& aProp ) throw (RuntimeException)
@@ -1347,7 +1347,7 @@ Any SAL_CALL OComponent::other_methodAny( const Any& rAny, const OUString& typeI
         throw (RuntimeException)
 {
     Type expectedType;
-    typelib_TypeDescription * pDesc= NULL;
+    typelib_TypeDescription	* pDesc= NULL;
     typelib_typedescription_getByName( &pDesc, typeInAny.pData );
     if( pDesc)
     {
@@ -1356,96 +1356,96 @@ Any SAL_CALL OComponent::other_methodAny( const Any& rAny, const OUString& typeI
     }
     if (rAny.getValueType() != expectedType)
         throw RuntimeException();
-
+    
     return rAny;
 }
 
 // XTestOutParameters ============================================================================
-// void SAL_CALL OComponent::out_test(sal_Int8 rIn) throw( RuntimeException )
+// void SAL_CALL OComponent::out_test(sal_Int8 rIn) throw( RuntimeException ) 
 // {
 // }
 
 // void SAL_CALL OComponent::out_methodByte(sal_Int8& rOut) throw( RuntimeException )
 // {
-//  rOut= 100;
+// 	rOut= 100;
 // }
 
 // void SAL_CALL OComponent::out_methodDouble(double& rOut) throw( RuntimeException )
 // {
-//  rOut= 3.14;
+// 	rOut= 3.14;
 // }
 // void SAL_CALL OComponent::out_methodFloat(float& rOut) throw( RuntimeException )
 // {
-//  rOut= 3.14;
+// 	rOut= 3.14;
 // }
-// void SAL_CALL OComponent::out_methodBool(sal_Bool& rOut) throw( RuntimeException )
+// void SAL_CALL OComponent::out_methodBool(sal_Bool& rOut) throw( RuntimeException ) 
 // {
-//  rOut= sal_True;
+// 	rOut= sal_True;
 // }
-// void SAL_CALL OComponent::out_methodShort(sal_Int16& rOut) throw( RuntimeException )
+// void SAL_CALL OComponent::out_methodShort(sal_Int16& rOut) throw( RuntimeException ) 
 // {
-//  rOut= -100;
+// 	rOut= -100;
 // }
-// void SAL_CALL OComponent::out_methodUShort(sal_uInt16& rOut) throw( RuntimeException )
+// void SAL_CALL OComponent::out_methodUShort(sal_uInt16& rOut) throw( RuntimeException ) 
 // {
-//  rOut= 100;
+// 	rOut= 100;
 // }
-// void SAL_CALL OComponent::out_methodLong(sal_Int32& rOut) throw( RuntimeException )
+// void SAL_CALL OComponent::out_methodLong(sal_Int32& rOut) throw( RuntimeException ) 
 // {
-//  rOut= -100;
+// 	rOut= -100;
 // }
 
 // void SAL_CALL OComponent::out_methodULong(sal_uInt32& rOut) throw( RuntimeException )
 // {
-//  rOut= 100;
+// 	rOut= 100;
 // }
 // void SAL_CALL OComponent::out_methodHyper(sal_Int64& rOut) throw( RuntimeException )
 // {
-
+    
 // }
 
 // void SAL_CALL OComponent::out_methodUHyper(sal_uInt64& rOut) throw( RuntimeException )
 // {
 // }
 
-// void SAL_CALL OComponent::out_methodString(OUString& rOut) throw( RuntimeException )
+// void SAL_CALL OComponent::out_methodString(OUString& rOut) throw( RuntimeException ) 
 // {
-//  rOut= L"I'm a string";
+// 	rOut= L"I'm a string";
 // }
-// void SAL_CALL OComponent::out_methodChar(sal_Unicode& rOut) throw( RuntimeException )
+// void SAL_CALL OComponent::out_methodChar(sal_Unicode& rOut) throw( RuntimeException ) 
 // {
-//  rOut= 'A';
+// 	rOut= 'A';
 // }
 // void SAL_CALL OComponent::out_methodAny(Any& rOut) throw( RuntimeException)
 // {
-//  Any a;
+// 	Any a;
 //     a <<= OUString( L"Hi");
-//  rOut= a;
+// 	rOut= a;
 // }
 // void SAL_CALL OComponent::out_methodSequence(Sequence< sal_Int32 >& rOut) throw( RuntimeException )
 // {
-//  Sequence< sal_Int32 > aseq(10);
-//  for( sal_Int16 i= 0; i < aseq.getLength(); i++) aseq.getArray()[i]= i;
-//  rOut= aseq;
+// 	Sequence< sal_Int32 > aseq(10);
+// 	for( sal_Int16 i= 0; i < aseq.getLength(); i++) aseq.getArray()[i]= i;
+// 	rOut= aseq;
 // }
 // void SAL_CALL OComponent::out_methodSequence2(Sequence< Sequence< sal_Int32 > >& rOut) throw( RuntimeException )
 // {
-//  rOut= Sequence< Sequence< sal_Int32 > >();
+// 	rOut= Sequence< Sequence< sal_Int32 > >();
 // }
 // void SAL_CALL OComponent::out_methodMulParams1(sal_Int32& rout1, sal_Int32& rout2) throw( RuntimeException )
 // {
-//  rout1= 111;
-//  rout2= 222;
+// 	rout1= 111;
+// 	rout2= 222;
 // }
 // void SAL_CALL OComponent::out_methodMulParams2(sal_Int32& rout1, sal_Int32& rout2, OUString& rout3) throw( RuntimeException )
 // {
-//  rout1= 111;
-//  rout2= 222;
-//  rout3= L"this is a neet little string";
+// 	rout1= 111;
+// 	rout2= 222;
+// 	rout3= L"this is a neet little string";
 // }
 // void SAL_CALL OComponent::out_methodMulParams3(const OUString& sin, OUString& sout) throw( RuntimeException )
 // {
-//  sout= L"this is a neet little string";
+// 	sout= L"this is a neet little string";
 // }
 
 // XTestInterfaces -------------------------------------------------------------------------------------
@@ -1469,15 +1469,15 @@ void SAL_CALL OComponent::testInterface(  const Reference< XCallback >& xCallbac
     sal_Int8 aByte;
     sal_Int16 aShort;
     sal_Int32 aLong;
-//  sal_uInt16 aUShort;
-//  sal_uInt32 aULong;
+// 	sal_uInt16 aUShort;
+// 	sal_uInt32 aULong;
 
     switch( mode)
     {
     case 1:
          xCallback->func1(); break;
     case 2:
-        xSimple=    xCallback->returnInterface();
+        xSimple=	xCallback->returnInterface();
         xSimple->func(L"XCallback::returnInterface");
         break;
 
@@ -1579,23 +1579,23 @@ void SAL_CALL OComponent::testInterface(  const Reference< XCallback >& xCallbac
             SimpleStruct aSimpleStruct;
             SimpleEnum aSimpleEnum;
             Sequence<Any> seqAny;
-            Any         aAny;
-            sal_Bool    aBool;
+            Any			aAny;
+            sal_Bool	aBool;
             sal_Unicode aChar;
-            OUString    aString;
-            float       aFloat;
-            double      aDouble;
-            sal_Int8    aByte;
-            sal_Int16   aShort;
-            sal_Int32   aLong;
-//          sal_uInt16  aUShort;
-//          sal_uInt32  aULong;
+            OUString	aString;
+            float		aFloat;
+            double		aDouble;
+            sal_Int8	aByte;
+            sal_Int16	aShort;
+            sal_Int32	aLong;
+//			sal_uInt16	aUShort;
+//			sal_uInt32	aULong;
             xCallback->outValuesAll( xSimple, aSimpleStruct, aSimpleEnum, seqAny, aAny, aBool,
                 aChar, aString,
             aFloat, aDouble,
             aByte,
             aShort, aLong);
-
+            
             MessageBox( NULL, _T("XCallback::outValuesAll returned"), _T("OleTest::testInterface"), MB_OK);
             break;
         }
@@ -1647,7 +1647,7 @@ void SAL_CALL OComponent::testInterface(  const Reference< XCallback >& xCallbac
                 // a Struct should now contain a different message
                 MessageBox( NULL, W2T(aStruct.message), _T("OleTest in out parameter"), MB_OK);
             }
-
+        
         }
         break;
         }
@@ -1684,7 +1684,7 @@ void SAL_CALL OComponent::testInterface(  const Reference< XCallback >& xCallbac
 
                 }
             }
-
+        
         break;
         }
     case 104:
@@ -1815,10 +1815,10 @@ void SAL_CALL OComponent::testInterface(  const Reference< XCallback >& xCallbac
         sal_Int16 aShort= 0xff;
         sal_Int32 aLong= 0xffe;
 
-        xCallback->inoutValuesAll( aXSimple, aStruct, aEnum, aSeq,
-            aAny, aBool, aChar, aString,  aFloat, aDouble,
+        xCallback->inoutValuesAll( aXSimple, aStruct, aEnum, aSeq, 
+            aAny, aBool, aChar, aString,  aFloat, aDouble, 
             aByte, aShort,  aLong );
-
+        
         aXSimple->func(L"XSimple called from OleTest");
         MessageBox( NULL, W2T(aStruct.message), _T("OleTest"), MB_OK);
 
@@ -1856,7 +1856,7 @@ void SAL_CALL OComponent::testInterface(  const Reference< XCallback >& xCallbac
         const int LISTENERS= 3;
         Reference<XEventListener> arListeners[LISTENERS];
         EventObject arEvents[LISTENERS];
-
+        
         for( int i= 0; i < LISTENERS; i++)
         {
             Reference<XInterface> aList= static_cast<XWeak*>( new EventListener());
@@ -1867,7 +1867,7 @@ void SAL_CALL OComponent::testInterface(  const Reference< XCallback >& xCallbac
                                        Sequence<EventObject>(arEvents, LISTENERS));
         break;
     }
-
+        
     // ############################################################################
     // Call a COM object that has not been passed as parameter to a UNO component and
     // hence no type information are available in the COM wrapper
@@ -1875,30 +1875,30 @@ void SAL_CALL OComponent::testInterface(  const Reference< XCallback >& xCallbac
     case 300:
         {
             Reference<XInterface> xIntFact = m_rFactory->createInstance(L"com.sun.star.bridge.oleautomation.Factory");
-
+            
             Reference<XMultiServiceFactory> oleFact(xIntFact, UNO_QUERY);
 
             Reference<XInterface> xIntCallback= oleFact->createInstance(L"XCallback_Impl.Callback");
             Reference<XInvocation> xInv( xIntCallback, UNO_QUERY);
 //Any SAL_CALL invoke( const OUString& aFunctionName, const Sequence<Any >& aParams,Sequence< sal_Int16 >& aOutParamIndex,
-//          Sequence<Any >& aOutParam );
+//			Sequence<Any >& aOutParam );
             Sequence<sal_Int16> seqIndizes;
             Sequence<Any> seqOutParams;
             xInv->invoke( OUString( L"outValuesAll"), Sequence<Any>(), seqIndizes, seqOutParams);
 
-//          void outValuesAll( [out] oletest::XSimple outInterface,
-//                     [out] SimpleStruct outStruct ,
-//                     [out] SimpleEnum outEnum,
-//                     [out] sequence<any> outSeqAny,
-//                     [out] any outAny,
-//                     [out] boolean outBool,
-//                     [out] char outChar,
-//                     [out] string outString,
-//                     [out] float outFloat,
-//                     [out] double outDouble,
-//                     [out] byte   outByte,
-//                     [out] short outShort,
-//                     [out] long outLong);
+//			void outValuesAll( [out] oletest::XSimple outInterface,
+//					   [out] SimpleStruct outStruct ,
+//					   [out] SimpleEnum outEnum,
+//					   [out] sequence<any> outSeqAny,
+//					   [out] any outAny,
+//					   [out] boolean outBool,
+//					   [out] char outChar,
+//					   [out] string outString,
+//					   [out] float outFloat,
+//					   [out] double outDouble,
+//					   [out] byte	outByte,
+//					   [out] short outShort,
+//					   [out] long outLong);
             if( seqOutParams.getLength() == 12)
             {
                 Reference<XSimple> xSimple= *(XSimple**)seqOutParams[0].getValue();
@@ -1914,7 +1914,7 @@ void SAL_CALL OComponent::testInterface(  const Reference< XCallback >& xCallbac
                     OUString _s;
                     seqAny[i] >>= _s;
                 }
-
+                
                 Any _any= *(Any*)seqOutParams[4].getValue();
                 sal_Bool _bool= *(sal_Bool*)seqOutParams[5].getValue();
                 sal_Unicode _char= *( sal_Unicode*) seqOutParams[6].getValue();
@@ -1934,7 +1934,7 @@ void SAL_CALL OComponent::testInterface(  const Reference< XCallback >& xCallbac
         // in / out parameter
         {
             Reference<XInterface> xIntFact = m_rFactory->createInstance(L"com.sun.star.bridge.oleautomation.Factory");
-
+            
             Reference<XMultiServiceFactory> oleFact(xIntFact, UNO_QUERY);
 
             Reference<XInterface> xIntCallback= oleFact->createInstance(L"XCallback_Impl.Callback");
@@ -1970,7 +1970,7 @@ void SAL_CALL OComponent::testInterface(  const Reference< XCallback >& xCallbac
             arSeqAny[0] <<= OUString( L"string 0");
             arSeqAny[1] <<= OUString( L"string 1");
             arSeqAny[2] <<= OUString( L"string 2");
-
+            
             arAny[3] <<=  Sequence< Any >( arAny, 3);
 
             OUString str(L" Ein Any param");
@@ -1989,9 +1989,9 @@ void SAL_CALL OComponent::testInterface(  const Reference< XCallback >& xCallbac
             arAny[11] <<= _short;
             sal_Int32 _long= -1;
             arAny[12] <<= _long;
-//
+//			
             Sequence<Any> params( arAny, 13);
-
+            
             xInv->invoke( OUString( L"inoutValuesAll"), params, seqIndizes, seqOutParams);
 
             if( seqOutParams.getLength() == 12)
@@ -2009,7 +2009,7 @@ void SAL_CALL OComponent::testInterface(  const Reference< XCallback >& xCallbac
                     OUString _s;
                     seqAny[i] >>= _s;
                 }
-
+                
                 Any _any= *(Any*)seqOutParams[4].getValue();
                 sal_Bool _bool= *(sal_Bool*)seqOutParams[5].getValue();
                 sal_Unicode _char= *( sal_Unicode*) seqOutParams[6].getValue();
@@ -2027,11 +2027,11 @@ void SAL_CALL OComponent::testInterface(  const Reference< XCallback >& xCallbac
         }
     case 303:
         // in parameter
-//  void inValues( [in] char aChar, [in] long aLong, [in] string aString);
+//	void inValues( [in] char aChar, [in] long aLong, [in] string aString);
         {
             Reference<XInterface> xIntFact = m_rFactory->createInstance(
                 L"com.sun.star.bridge.oleautomation.Factory");
-
+            
             Reference<XMultiServiceFactory> oleFact(xIntFact, UNO_QUERY);
 
             Reference<XInterface> xIntCallback= oleFact->createInstance(L"XCallback_Impl.Callback");
@@ -2056,7 +2056,7 @@ void SAL_CALL OComponent::testInterface(  const Reference< XCallback >& xCallbac
     // ############################################################################
 
     case 400:
-        Reference<XSimple> simple=  xCallback->getsimple();
+        Reference<XSimple> simple=	xCallback->getsimple();
         simple->func(L"OleTest calls on XSimple");
         break;
 
diff --git a/extensions/test/ole/cppToUno/testcppuno.cxx b/extensions/test/ole/cppToUno/testcppuno.cxx
index 6c4745a0f5cd..d1606c343d73 100644
--- a/extensions/test/ole/cppToUno/testcppuno.cxx
+++ b/extensions/test/ole/cppToUno/testcppuno.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,14 +70,14 @@ int __cdecl _tmain( int /*argc*/, _TCHAR * /*argv[]*/ )
         return -1;
     }
 
-
+    
     if( FAILED(hr=doTest()))
     {
         _com_error err( hr);
         const TCHAR * errMsg= err.ErrorMessage();
         MessageBox( NULL, errMsg, "Test failed", MB_ICONERROR);
     }
-
+    
     CoUninitialize();
     return 0;
 }
@@ -104,11 +104,11 @@ HRESULT doTest()
 
         // disp contains now oletest.OleTest
 
-        // one dimensional array
+        // one dimensional array 
         par= SafeArrayCreateVector( VT_UI1, 0, 5);
         unsigned char arbyte[]= { 1,2,3,4,5};
         for(long i= 0; i < 5;i++)
-            hr= SafeArrayPutElement( par, &i, &arbyte[i]);
+            hr=	SafeArrayPutElement( par, &i, &arbyte[i]);
 
         result.Clear();
         param1.vt= VT_ARRAY| VT_UI1;
@@ -131,7 +131,7 @@ HRESULT doTest()
         long uBound2;
         hr= SafeArrayGetUBound( par, 1, &uBound1);
         hr= SafeArrayGetUBound( par, 2, &uBound2);
-
+        
         long index2[2];
         memset( index2, 0, 2 * sizeof( long) );
         long dimLengths[]={3,2};
@@ -147,28 +147,28 @@ HRESULT doTest()
         long (*dataL)[2][3];
         hr= SafeArrayAccessData( par, (void**)&pdata);
         dataL= (long(*)[2][3])pdata;
-
+        
         for (long i= 0; i < 2; i ++)
         {
             for(long j= 0; j < 3; j++)
                 data= (*dataL)[i][j];
         }
         hr= SafeArrayUnaccessData(par);
-
+        
         result.Clear();
         param1.vt= VT_ARRAY | VT_I4;
         param1.byref= par;
         disp.Invoke1(L"methodSequence", &param1, &result);
-
+        
         SAFEARRAY* arRet= result.parray;
-
+        
         for(long i= 0; i < 2 ; i++)
         {
             CComVariant varx;
             varx.Clear();
             hr= SafeArrayGetElement( arRet, &i, &varx);
             SAFEARRAY* ari= varx.parray;
-
+            
             for( j= 0; j < 3; j++)
             {
                 CComVariant varj;
@@ -188,7 +188,7 @@ HRESULT doTest()
 // left index is least significant
 bool incrementMultidimensionalIndex(
     sal_Int32 dimensions,
-    const sal_Int32 * parDimensionLengths,
+    const sal_Int32 * parDimensionLengths, 
     sal_Int32 * parMultidimensionalIndex)
 {
     if( dimensions < 1)
@@ -196,7 +196,7 @@ bool incrementMultidimensionalIndex(
 
     bool ret= sal_True;
     bool carry= sal_True; // to get into the while loop
-
+    
     sal_Int32 currentDimension= 0; //most significant is 1
     while( carry)
     {
diff --git a/extensions/test/ole/cpptest/cpptest.cxx b/extensions/test/ole/cpptest/cpptest.cxx
index ef6f44e5d1c7..9582415dfdfe 100644
--- a/extensions/test/ole/cpptest/cpptest.cxx
+++ b/extensions/test/ole/cpptest/cpptest.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ int main(int /*argc*/, char** /*argv*/)
         const TCHAR * errMsg= err.ErrorMessage();
         MessageBox( NULL, errMsg, "Test failed", MB_ICONERROR);
     }
-
+    
     CoUninitialize();
     return 0;
 }
@@ -82,7 +82,7 @@ HRESULT doTest()
     _variant_t varP1(L"com.sun.star.frame.Desktop");
     _variant_t varRet;
     CComDispatchDriver dispMgr(starManager);
-    if (FAILED(hr=  dispMgr.Invoke1(L"createInstance", &varP1, &varRet)))
+    if (FAILED(hr=	dispMgr.Invoke1(L"createInstance", &varP1, &varRet)))
     {
         fprintf(stderr,"createInstance of Desktop failed\n");
         return hr;
@@ -110,7 +110,7 @@ HRESULT doTest()
     CComDispatchDriver dispDoc(varRet.pdispVal);
     varRet.Clear();
     return S_OK;
-
+    
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/test/ole/idl/oletest.idl b/extensions/test/ole/idl/oletest.idl
index 61d668dc0580..c62c236de052 100644
--- a/extensions/test/ole/idl/oletest.idl
+++ b/extensions/test/ole/idl/oletest.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ interface XTestSequence: com::sun::star::uno::XInterface
     sequence<unsigned long> methodULong( [in] sequence<unsigned long> aSeq);
     sequence<string> methodString( [in] sequence<string> aSeq);
     sequence<char> methodChar( [in] sequence<char> aSeq);
-    sequence<any> methodAny ( [in] sequence<any> aSeq);
-    sequence<type> methodType   ( [in] sequence<type> aSeq);
+    sequence<any> methodAny	( [in] sequence<any> aSeq);
+    sequence<type> methodType	( [in] sequence<type> aSeq);
     sequence<com::sun::star::uno::XInterface> methodXInterface ( [in] sequence<com::sun::star::uno::XInterface> aSeq);
     sequence< sequence <long> > methodSequence( [in] sequence< sequence< long > > aSeq);
     sequence< sequence <sequence <long> > > methodSequence2( [in] sequence< sequence< sequence<long> > > aSeq);
@@ -83,7 +83,7 @@ interface XTestSequence: com::sun::star::uno::XInterface
     [attribute] any AAny;
     [attribute] type AType;
     [attribute] com::sun::star::uno::XInterface  AXInterface;
-    [attribute] com::sun::star::script::XInvocation  AXInvocation;
+    [attribute] com::sun::star::script::XInvocation  AXInvocation;    
 
     void testout_methodByte( [out] byte rOut );
     void testout_methodFloat( [out] float rOut);
@@ -97,8 +97,8 @@ interface XTestSequence: com::sun::star::uno::XInterface
      void testout_methodUHyper( [out] unsigned hyper rOut);
     void testout_methodString( [out] string rOut);
     void testout_methodChar( [out] char rOut);
-    void testout_methodAny  ( [out] any rOut);
-    void testout_methodType ( [out] type rOut);
+    void testout_methodAny	( [out] any rOut);
+    void testout_methodType	( [out] type rOut);
     void testout_methodSequence( [out] sequence< long > rOut);
     void testout_methodSequence2( [out] sequence < sequence< long > > rOut);
     void testout_methodXInterface( [out] com::sun::star::uno::XInterface rOut);
@@ -120,8 +120,8 @@ interface XTestSequence: com::sun::star::uno::XInterface
     void testinout_methodUHyper( [inout] unsigned hyper rOut);
     void testinout_methodString( [inout] string rOut);
     void testinout_methodChar( [inout] char rOut);
-    void testinout_methodAny    ( [inout] any rOut);
-    void testinout_methodType   ( [inout] type rOut);
+    void testinout_methodAny	( [inout] any rOut);
+    void testinout_methodType	( [inout] type rOut);
     void testinout_methodSequence( [inout] sequence< long > rOut);
     void testinout_methodSequence2( [inout] sequence < sequence< long > > rOut);
     void testinout_methodXInterface( [inout] com::sun::star::script::XInvocation rOut);
@@ -135,7 +135,7 @@ interface XTestStruct: com::sun::star::uno::XInterface
 {
 // Method taking structs as arguments
     void methodStruct( [in] com::sun::star::beans::Property aProp);
-//  Methods returning structs
+//	Methods returning structs
     com::sun::star::beans::Property retMethodStruct();
 // Attributes as structs
     [attribute] com::sun::star::beans::Property AttrStruct;
@@ -163,8 +163,8 @@ interface XTestInParameters: com::sun::star::uno::XInterface
     unsigned hyper in_methodUHyper( [in] unsigned hyper rIn);
     string in_methodString( [in] string rIn);
     char in_methodChar( [in] char rIn);
-    any in_methodAny    ( [in] any rIn);
-    type in_methodType  ( [in] type rIn);
+    any in_methodAny	( [in] any rIn);
+    type in_methodType	( [in] type rIn);
     com::sun::star::uno::XInterface in_methodXInterface([in] com::sun::star::uno::XInterface rIn);
     com::sun::star::script::XInvocation in_methodInvocation( [in] com::sun::star::script::XInvocation inv);
     SimpleStruct in_methodStruct( [in] SimpleStruct aStruct);
@@ -242,7 +242,7 @@ interface XCallback: com::sun::star::uno::XInterface
                        [out] string outString,
                        [out] float outFloat,
                        [out] double outDouble,
-                       [out] byte   outByte,
+                       [out] byte	outByte,
                        [out] short outShort,
                        [out] long outLong);
 // IN OUT parameters
@@ -280,7 +280,7 @@ interface XCallback: com::sun::star::uno::XInterface
     void inSeqByte( [in] sequence<byte> val);
     void inSeqXEventListener( [in] sequence<com::sun::star::lang::XEventListener> listener, [in]
                               sequence<com::sun::star::lang::EventObject> events);
-
+    
     // Attributes
     [attribute] oletest::XSimple simple;
 
diff --git a/extensions/test/ole/unloading/unloadTest.cxx b/extensions/test/ole/unloading/unloadTest.cxx
index 85f2de33db47..ccedf0bd2f74 100644
--- a/extensions/test/ole/unloading/unloadTest.cxx
+++ b/extensions/test/ole/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
@@ -89,7 +89,7 @@ sal_Bool test1()
     osl_unloadModule( hMod);
 
     rtl_unloadUnusedModules( NULL);
-
+    
     OUString sFactoryFunc( RTL_CONSTASCII_USTRINGPARAM("component_getFactory"));
     void* pSymbol= osl_getSymbol( hMod,sFactoryFunc.pData);
     // true, instance alive
@@ -145,7 +145,7 @@ sal_Bool test3()
     Reference<XSimpleRegistry> xreg= createSimpleRegistry();
     xreg->open( OUString( RTL_CONSTASCII_USTRINGPARAM("services.rdb")),
                 sal_False, sal_False );
-
+    
     Reference< XComponentContext > context= bootstrap_InitialComponentContext(xreg);
 
     Reference<XMultiComponentFactory> fac= context->getServiceManager();
@@ -172,18 +172,18 @@ sal_Bool test3()
     Reference<XComponent> xcomp( context, UNO_QUERY);
     xcomp->dispose();
 
-//  for (int i=0; i < 10; i++)
-//  {
-//      Reference<XSimpleRegistry> xreg= createSimpleRegistry();
-//      xreg->open( OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")),
-//                             sal_False, sal_False );
-//      Reference< XComponentContext > context= bootstrap_InitialComponentContext(xreg);
-//      Reference<XComponent> xcomp( context, UNO_QUERY);
-//      xcomp->dispose();
+//	for (int i=0; i < 10; i++)
+//	{	
+//		Reference<XSimpleRegistry> xreg= createSimpleRegistry();
+//		xreg->open( OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")),
+//							   sal_False, sal_False );
+//		Reference< XComponentContext > context= bootstrap_InitialComponentContext(xreg);	
+//		Reference<XComponent> xcomp( context, UNO_QUERY);
+//		xcomp->dispose();
 //
-//  }
+//	}
 
-//  return sal_True;
+//	return sal_True;
     return bTest1 && bTest2;
 }
 
@@ -217,7 +217,7 @@ sal_Bool test4()
     // ApplicationRegistration is a one-instance-service, therefore kill service manager first
     Reference<XComponent> xcomp( context, UNO_QUERY);
     xcomp->dispose();
-
+    
     }
     rtl_unloadUnusedModules( NULL);
     pSymbol= osl_getSymbol( hMod,sFactoryFunc.pData);
diff --git a/extensions/test/ole/unoTocomCalls/Test/StdAfx.cpp b/extensions/test/ole/unoTocomCalls/Test/StdAfx.cpp
index a5d05fe90aa9..36ed10eddb1a 100644
--- a/extensions/test/ole/unoTocomCalls/Test/StdAfx.cpp
+++ b/extensions/test/ole/unoTocomCalls/Test/StdAfx.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
@@ -26,8 +26,8 @@
  *
  ************************************************************************/
 // stdafx.cpp : source file that includes just the standard includes
-//  Test.pch will be the pre-compiled header
-//  stdafx.obj will contain the pre-compiled type information
+//	Test.pch will be the pre-compiled header
+//	stdafx.obj will contain the pre-compiled type information
 
 #include "stdafx.h"
 
diff --git a/extensions/test/ole/unoTocomCalls/Test/StdAfx.h b/extensions/test/ole/unoTocomCalls/Test/StdAfx.h
index 408c5cd1fa87..65fffc04cffe 100644
--- a/extensions/test/ole/unoTocomCalls/Test/StdAfx.h
+++ b/extensions/test/ole/unoTocomCalls/Test/StdAfx.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,7 +37,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#define WIN32_LEAN_AND_MEAN     // Exclude rarely-used stuff from Windows headers
+#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
 
 #include <stdio.h>
 #include <windows.h>
diff --git a/extensions/test/ole/unoTocomCalls/Test/Test.cpp b/extensions/test/ole/unoTocomCalls/Test/Test.cpp
index 27a2229a4d5d..fcb121be6b2a 100644
--- a/extensions/test/ole/unoTocomCalls/Test/Test.cpp
+++ b/extensions/test/ole/unoTocomCalls/Test/Test.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
@@ -47,7 +47,7 @@ int main(int argc, char* argv[])
         return -1;
     }
 
-
+    
     _Module.Init( ObjectMap, GetModuleHandle( NULL));
 
     if( FAILED(hr=doTest()))
@@ -61,7 +61,7 @@ int main(int argc, char* argv[])
     _Module.Term();
     CoUninitialize();
 
-
+    
     return 0;
 }
 
@@ -78,7 +78,7 @@ HRESULT doTest()
     CComDispatchDriver manager( spUnk);
     CComVariant param( L"oletest.OleTest");
     CComVariant retVal;
-    hr= manager.Invoke1((LPCOLESTR)L"createInstance", &param, &retVal );
+    hr=	manager.Invoke1((LPCOLESTR)L"createInstance", &param, &retVal );
 
     CComDispatchDriver oletest( retVal.punkVal);
 
@@ -92,7 +92,7 @@ HRESULT doTest()
 
 
     //######################################################################
-    //  out parameters
+    //	out parameters
     //######################################################################
     CComVariant param1( paramDisp);
     CComVariant param2(1);
@@ -149,13 +149,13 @@ HRESULT doTest()
     hr= oletest.Invoke2(L"testInterface", &param1, &param2);
 
     // XCallback::outSeqByte
-    // Does not work currently because Sequences are always converted to
+    // Does not work currently because Sequences are always converted to 
     // SAFEARRAY( VARIANT)
-    //  param2= 32;
-    //  hr= oletest.Invoke2(L"testInterface", &param1, &param2);
-
+    //	param2= 32;
+    //	hr= oletest.Invoke2(L"testInterface", &param1, &param2);
+    
     //######################################################################
-    //  in / out parameters
+    //	in / out parameters
     //######################################################################
     // XCallback::inoutInterface
     param2= 100;
@@ -200,7 +200,7 @@ HRESULT doTest()
     param2=120;
     hr= oletest.Invoke2(L"testInterface", &param1, &param2);
     //######################################################################
-    //  in  parameters
+    //	in  parameters
     //######################################################################
     // XCallback::inValues
     param2= 200;
@@ -213,7 +213,7 @@ HRESULT doTest()
     param2= 202;
     hr= oletest.Invoke2(L"testInterface", &param1, &param2);
     //######################################################################
-    //  The UNO test component OleTest calls on XCallback_Impl.Callback directly
+    //	The UNO test component OleTest calls on XCallback_Impl.Callback directly
     // that is the COM object has not been past a parameter but rather OleTest
     // creates the COM object itself
     //######################################################################
@@ -244,6 +244,6 @@ HRESULT doTest()
     return hr;
 }
 // VARIANT CComVariant VT_UNKNOWN VT_DISPATCH V_UI1 CComDispatchDriver WINAPI
-
+ 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.cpp b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.cpp
index b8e9847b18a7..ea21a969552e 100644
--- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.cpp
+++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.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
@@ -43,7 +43,7 @@ STDMETHODIMP CCallback::func1()
 STDMETHODIMP CCallback::returnInterface(IDispatch **ppdisp)
 {
     if( ! ppdisp)
-        return E_POINTER;
+        return E_POINTER;	
     CComPtr<IDispatch> spDisp;
     spDisp.CoCreateInstance( L"XCallback_Impl.Simple");
     *ppdisp= spDisp;
@@ -53,15 +53,15 @@ STDMETHODIMP CCallback::returnInterface(IDispatch **ppdisp)
 
 STDMETHODIMP CCallback::outInterface(IDispatch **ppdisp)
 {
-//  return S_OK;
+//	return S_OK;
     if( ! ppdisp)
-        return E_POINTER;
+        return E_POINTER;	
     CComPtr<IDispatch> spDisp;
     spDisp.CoCreateInstance( L"XCallback_Impl.Simple");
     *ppdisp= spDisp;
     (*ppdisp)->AddRef();
 
-//  MessageBox( NULL, _T("CCallback::outInterface"), _T(""), MB_OK);
+//	MessageBox( NULL, _T("CCallback::outInterface"), _T(""), MB_OK);
     return S_OK;
 }
 
@@ -76,7 +76,7 @@ STDMETHODIMP CCallback::outValuesMixed(long val, long *pval, BSTR string)
 }
 
 
-STDMETHODIMP CCallback::outValuesAll(
+STDMETHODIMP CCallback::outValuesAll( 
             /* [out] */ IDispatch __RPC_FAR *__RPC_FAR *ppdisp,
             /* [out] */ IDispatch __RPC_FAR *__RPC_FAR *ppSimpleStruct,
             /* [out] */ long __RPC_FAR *aSimpleEnum,
@@ -92,11 +92,11 @@ STDMETHODIMP CCallback::outValuesAll(
             /* [out] */ long __RPC_FAR *aLong)
 //)
 {
-//  if( ! ppdisp || ! ppSimpleStruct || ! aSimpleEnum ||
-//      ! outSeq || !varAny ||! aBool || ! aChar ||
-//      ! aString || ! aFloat || ! aDouble || ! aByte ||
-//      ! aShort || ! aLong || ! aUShort || ! aULong)
-//      return E_POINTER;
+//	if( ! ppdisp || ! ppSimpleStruct || ! aSimpleEnum ||
+//		! outSeq || !varAny ||! aBool || ! aChar ||
+//		! aString || ! aFloat || ! aDouble || ! aByte ||
+//		! aShort || ! aLong || ! aUShort || ! aULong)
+//		return E_POINTER;
 
     HRESULT hr=S_OK;
     hr= outInterface( ppdisp);
@@ -117,11 +117,11 @@ STDMETHODIMP CCallback::outValuesAll(
 
 STDMETHODIMP CCallback::outStruct(IDispatch **outStruct)
 {
-//  return S_OK;
+//	return S_OK;	
     if( !outStruct)
         return E_POINTER;
     HRESULT hr= E_FAIL;
-//  MessageBox( NULL, _T("CCallback::outStruct"), _T(""), MB_OK);
+//	MessageBox( NULL, _T("CCallback::outStruct"), _T(""), MB_OK);
 
     CComPtr<IDispatch> _dispMgr;
     if( SUCCEEDED(hr= _dispMgr.CoCreateInstance(L"com.sun.star.ServiceManager")))
@@ -130,14 +130,14 @@ STDMETHODIMP CCallback::outStruct(IDispatch **outStruct)
         CComVariant param1(L"com.sun.star.reflection.CoreReflection");
         CComVariant varRet;
         hr= manager.Invoke1( L"createInstance", &param1, &varRet);
-
+        
         CComDispatchDriver reflection( varRet.pdispVal);
         param1= L"oletest.SimpleStruct";
         varRet.Clear();
         hr= reflection.Invoke1( L"forName", &param1, &varRet);
 
         CComDispatchDriver classSimpleStruct( varRet.pdispVal);
-
+        
         CComPtr<IDispatch> dispStruct;
         param1.vt= VT_DISPATCH | VT_BYREF;
         param1.ppdispVal= &dispStruct;
@@ -146,7 +146,7 @@ STDMETHODIMP CCallback::outStruct(IDispatch **outStruct)
             // Set the value
             CComDispatchDriver simpleStruct( dispStruct);
             param1=L" this is a property string";
-            hr= simpleStruct.PutPropertyByName(L"message", &param1);
+            hr=	simpleStruct.PutPropertyByName(L"message", &param1);
             *outStruct= dispStruct;
             (*outStruct)->AddRef();
             hr= S_OK;
@@ -165,14 +165,14 @@ STDMETHODIMP CCallback::outEnum(long *outEnum)
 
 STDMETHODIMP CCallback::outSeqAny(LPSAFEARRAY* outSeq)
 {
-//  _CrtDbgBreak();
+//	_CrtDbgBreak();
     SAFEARRAY* pArr= SafeArrayCreateVector( VT_VARIANT, 0, 3);
     CComVariant var[3];
     var[0]=L" variant 0";
     var[1]=L" variant 1";
     var[2]=L"variant 2";
     for( long i=0; i<3; i++)
-    {
+    {	
         SafeArrayPutElement( pArr, &i, (void*)&var[i]);
     }
 
@@ -298,7 +298,7 @@ STDMETHODIMP CCallback::inoutStruct(IDispatch **inoutVal)
     hr= outStruct( &dispStruct.p);
     var.Clear();
     var= L"This struct was created in XCallback_Imp.Callback";
-    hr= dispStruct.PutPropertyByName(L"message", &var);
+    hr=	dispStruct.PutPropertyByName(L"message", &var);
 
     *inoutVal= dispStruct;
     (*inoutVal)->AddRef();
@@ -332,7 +332,7 @@ STDMETHODIMP CCallback::inoutSeqAny(LPSAFEARRAY *pArray)
         var.Clear();
         hr= SafeArrayGetElement( *pArray, &i, (void*)&var);
     }
-
+    
     SafeArrayDestroy( *pArray);
 
     outSeqAny( pArray);
@@ -368,7 +368,7 @@ STDMETHODIMP CCallback::inoutChar(short *inoutVal)
         return E_POINTER;
     USES_CONVERSION;
     char buff[256];
-    sprintf( buff, "character value: %C", *inoutVal);
+    sprintf( buff, "character value: %C", *inoutVal); 
     MessageBox( NULL, A2T(buff), _T("XCallback_Impl.Callback"), MB_OK);
     *inoutVal= L'B';
     return S_OK;
@@ -426,7 +426,7 @@ STDMETHODIMP CCallback::inoutLong(long* inoutVal)
     return S_OK;
 }
 
-STDMETHODIMP CCallback::inoutValuesAll(
+STDMETHODIMP CCallback::inoutValuesAll( 
             /* [out][in] */ IDispatch __RPC_FAR *__RPC_FAR *aXSimple,
             /* [out][in] */ IDispatch __RPC_FAR *__RPC_FAR *aStruct,
             /* [out][in] */ long __RPC_FAR *aEnum,
@@ -457,7 +457,7 @@ STDMETHODIMP CCallback::inoutValuesAll(
 
     return S_OK;
 }
-
+ 
 
 STDMETHODIMP CCallback::inValues(short aChar, long aLong, BSTR aString)
 {
@@ -504,7 +504,7 @@ STDMETHODIMP CCallback::inSeqXEventListener( LPSAFEARRAY listeners, LPSAFEARRAY
             CComDispatchDriver disp( varListener.pdispVal);
             hr= disp.Invoke1(L"disposing", &varEvent);
         }
-
+        
     }
 
     return S_OK;
diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.h b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.h
index 645f62c18c93..02cb6cff483f 100644
--- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.h
+++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.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 @@
 
 /////////////////////////////////////////////////////////////////////////////
 // CCallback
-class ATL_NO_VTABLE CCallback :
+class ATL_NO_VTABLE CCallback : 
     public CComObjectRootEx<CComSingleThreadModel>,
     public CComCoClass<CCallback, &CLSID_Callback>,
     public IDispatchImpl<ICallback, &IID_ICallback, &LIBID_XCALLBACK_IMPLLib>
@@ -72,7 +72,7 @@ public:
     STDMETHOD(inoutEnum)(/*[in,out]*/ long * inoutVal);
     STDMETHOD(inoutStruct)(/*[in,out]*/ IDispatch** inoutVal);
     STDMETHOD(inoutInterface)(/*[in,out]*/ IDispatch** ppdisp);
-    STDMETHOD(inoutValuesAll)(
+    STDMETHOD(inoutValuesAll)( 
             /* [out][in] */ IDispatch __RPC_FAR *__RPC_FAR *aXSimple,
             /* [out][in] */ IDispatch __RPC_FAR *__RPC_FAR *aStruct,
             /* [out][in] */ long __RPC_FAR *aEnum,
@@ -86,7 +86,7 @@ public:
             /* [out][in] */ unsigned char __RPC_FAR *aByte,
             /* [out][in] */ short __RPC_FAR *aShort,
             /* [out][in] */ long __RPC_FAR *aLong);
-
+ 
     STDMETHOD(outByte)( unsigned char* outByte);
     STDMETHOD(outLong)(/*[out]*/ long* outLong);
     STDMETHOD(outShort)(/*[out]*/ short *outShort);
@@ -99,7 +99,7 @@ public:
     STDMETHOD(outSeqAny)(/*[out]*/LPSAFEARRAY* outSeq);
     STDMETHOD(outEnum)(/*[out]*/ long* outEnum);
     STDMETHOD(outStruct)(/*[out]*/ IDispatch** outStruct);
-            virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE outValuesAll(
+            virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE outValuesAll( 
             /* [out] */ IDispatch __RPC_FAR *__RPC_FAR *ppdisp,
             /* [out] */ IDispatch __RPC_FAR *__RPC_FAR *ppSimpleStruct,
             /* [out] */ long __RPC_FAR *aSimpleEnum,
@@ -113,19 +113,19 @@ public:
             /* [out] */ unsigned char __RPC_FAR *aByte,
             /* [out] */ short __RPC_FAR *aShort,
             /* [out] */ long __RPC_FAR *aLong);
-//              );
+//				);
 //
-//  STDMETHOD(outValuesAll)(
-//          /*[out]*/ IDispatch** ppdisp,
-//          /*[out]*/ IUnknown** ppSimpleStruct,
-//          /*[out]*/ long* aSimpleEnum,
-//          /*[out]*/ VARIANT* ArrayAny,
-//          /*[out]*/ VARIANT* varAny,
-//          /*[out]*/ VARIANT_BOOL * aBool,
-//          /*[out]*/ unsigned short* aChar,
-//          /*[out]*/ BSTR* aString, /*[out]*/ float* aFloat,
-//          /*[out]*/ double* aDouble,
-//          /*[out]*/ signed char* aByte, /*[out]*/ short* aShort, /*[out]*/long* aLong, /*[out]*/ unsigned short* aUShort, /*[out]*/ unsigned long* aULong);
+//	STDMETHOD(outValuesAll)(
+//			/*[out]*/ IDispatch** ppdisp, 
+//			/*[out]*/ IUnknown** ppSimpleStruct, 
+//			/*[out]*/ long* aSimpleEnum, 
+//			/*[out]*/ VARIANT* ArrayAny, 
+//			/*[out]*/ VARIANT* varAny, 
+//			/*[out]*/ VARIANT_BOOL * aBool, 
+//			/*[out]*/ unsigned short* aChar, 
+//			/*[out]*/ BSTR* aString, /*[out]*/ float* aFloat, 
+//			/*[out]*/ double* aDouble, 
+//			/*[out]*/ signed char* aByte, /*[out]*/ short* aShort, /*[out]*/long* aLong, /*[out]*/ unsigned short* aUShort, /*[out]*/ unsigned long* aULong);
     STDMETHOD(outValuesMixed)(/*[in]*/ long val, /*[out]*/ long* pval, /*[in]*/ BSTR string);
     STDMETHOD(outInterface)(/*[out]*/ IDispatch** ppdisp);
     STDMETHOD(returnInterface)(/*[out, retval]*/ IDispatch** ppdisp);
@@ -133,6 +133,6 @@ public:
 };
 
 #endif //__CALLBACK_H_
-
+ 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.cpp b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.cpp
index e3a738960ee5..34a5075db803 100644
--- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.cpp
+++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.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
@@ -60,9 +60,9 @@ STDMETHODIMP CSimple::func3(BSTR message)
 STDMETHODIMP CSimple::get__implementedInterfaces(LPSAFEARRAY *pVal)
 {
     HRESULT hr= S_OK;
-    SAFEARRAY *pArr=    SafeArrayCreateVector( VT_BSTR, 0, 3);
+    SAFEARRAY *pArr=	SafeArrayCreateVector( VT_BSTR, 0, 3);
     if( pArr)
-    {   long index=0;
+    {	long index=0;
         BSTR name1= SysAllocString(L"oletest.XSimple");
         BSTR name2= SysAllocString(L"oletest.XSimple2");
         BSTR name3= SysAllocString(L"oletest.XSimple3");
diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.h b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.h
index c911cb325240..e76795925573 100644
--- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.h
+++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.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 @@
 
 /////////////////////////////////////////////////////////////////////////////
 // CSimple
-class ATL_NO_VTABLE CSimple :
+class ATL_NO_VTABLE CSimple : 
     public CComObjectRootEx<CComSingleThreadModel>,
     public CComCoClass<CSimple, &CLSID_Simple>,
     public IDispatchImpl<ISimple, &IID_ISimple, &LIBID_XCALLBACK_IMPLLib>
@@ -55,8 +55,8 @@ END_COM_MAP()
 
 // ISimple
 public:
-
-    STDMETHOD(get__implementedInterfaces)(/*[out, retval]*/ LPSAFEARRAY *pVal);
+ 
+    STDMETHOD(get__implementedInterfaces)(/*[out, retval]*/ LPSAFEARRAY	*pVal);
     STDMETHOD(func3)(/*[in]*/ BSTR message);
     STDMETHOD(func2)(/*[in]*/ BSTR message);
     STDMETHOD(func)( BSTR message);
diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.cpp b/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.cpp
index 38d4c2357e81..902524bdf104 100644
--- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.cpp
+++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.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/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h b/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h
index 0bb223891626..f692fae959e7 100644
--- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h
+++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.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/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.cpp b/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.cpp
index eb5095730702..78585a01bc83 100644
--- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.cpp
+++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.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,7 +29,7 @@
 
 
 // Note: Proxy/Stub Information
-//      To build a separate proxy/stub DLL,
+//      To build a separate proxy/stub DLL, 
 //      run nmake -f XCallback_Implps.mk in the project directory.
 
 #include "stdafx.h"
diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.idl b/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.idl
index 2bb44a4b70be..5532432130c8 100644
--- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.idl
+++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ import "ocidl.idl";
         [id(2), helpstring("method returnInterface")] HRESULT returnInterface([out, retval] IDispatch** ppdisp);
         [id(3), helpstring("method outInterface")] HRESULT outInterface([out] IDispatch** ppdisp);
         [id(4), helpstring("method outValuesMixed")] HRESULT outValuesMixed([in] long val, [out] long* pval, [in] BSTR string);
-        [id(5), helpstring("method outValuesAll")] HRESULT outValuesAll([out] IDispatch** ppdisp, [out] IDispatch** ppSimpleStruct, [out] long* aSimpleEnum,
-        [out] SAFEARRAY( VARIANT)* outSeq,
-        [out] VARIANT* varAny,
+        [id(5), helpstring("method outValuesAll")] HRESULT outValuesAll([out] IDispatch** ppdisp, [out] IDispatch** ppSimpleStruct, [out] long* aSimpleEnum, 
+        [out] SAFEARRAY( VARIANT)* outSeq, 
+        [out] VARIANT* varAny, 
         [out] VARIANT_BOOL * aBool,
            [out] short* aChar,
             [out] BSTR* aString ,
-            [out] float* aFloat,
-            [out] double* aDouble,
+            [out] float* aFloat, 
+            [out] double* aDouble, 
             [out] unsigned char*  aByte,
-            [out] short* aShort,
+            [out] short* aShort, 
             [out]long* aLong);
-//      );
+//		);
         [id(6), helpstring("method outStruct")] HRESULT outStruct([out] IDispatch** outStruct);
         [id(7), helpstring("method outEnum")] HRESULT outEnum([out] long* outEnum);
         [id(8), helpstring("method outSeqAny")] HRESULT outSeqAny([out] SAFEARRAY( VARIANT)* outSeq);
diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/resource.h b/extensions/test/ole/unoTocomCalls/XCallback_Impl/resource.h
index afdbe7bcd552..d041b3790555 100644
--- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/resource.h
+++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/resource.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 @@
 #define IDR_SIMPLESTRUCT                103
 
 // Next default values for new objects
-//
+// 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        201
diff --git a/extensions/test/pgp/TestPGP.java b/extensions/test/pgp/TestPGP.java
index 15bf2b1fcef1..41f21f3b767a 100644
--- a/extensions/test/pgp/TestPGP.java
+++ b/extensions/test/pgp/TestPGP.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
@@ -67,7 +67,7 @@ import com.sun.star.pgp.*;
 
 
 public class TestPGP {
-
+    
 
     static void doSomething(Object r) throws com.sun.star.uno.Exception, IOException, Exception {
         XNamingService rName = (XNamingService)UnoRuntime.queryInterface(XNamingService.class, r);
@@ -75,7 +75,7 @@ public class TestPGP {
         if(rName != null) {
             System.err.println("got the remote naming service !");
             Object rXsmgr = rName.getRegisteredObject("StarOffice.ServiceManager");
-
+            
             XMultiServiceFactory rSmgr = (XMultiServiceFactory)UnoRuntime.queryInterface(XMultiServiceFactory.class, rXsmgr);
             if(rSmgr != null) {
                 System.err.println("got the remote service manager !");
@@ -86,7 +86,7 @@ public class TestPGP {
                 System.err.println(" couldn't get XSet from ServiceFactory");
                 return;
             }
-//              try{
+//  			try{
             SimplePGPMailerFactoryReg mailerReg= new SimplePGPMailerFactoryReg();
             XSingleServiceFactory factory= mailerReg.getServiceFactory(
                 "com.sun.star.pgp.SimplePGPMailerImpl", rSmgr, null, null);
@@ -98,10 +98,10 @@ public class TestPGP {
             set.insert(factory );
             System.err.println("PGP factory inserted into service manager");
 
-//              }catch(Exception e ){
-//                  System.err.println( "exception caught in TestPGP");
-//              }
-
+//  			}catch(Exception e ){
+//  				System.err.println( "exception caught in TestPGP");
+//  			}
+                
         }
     }
 
@@ -115,32 +115,32 @@ public class TestPGP {
     };
 
     public static void main(String argv[]) throws Exception {
-        if(argv.length != 1)    {
+        if(argv.length != 1)	{
             System.err.println("usage : testoffice protocol:host:port");
             System.exit(-1);
         }
 
-//          try {
+//  		try {
             com.sun.star.comp.servicemanager.ServiceManager smgr = new com.sun.star.comp.servicemanager.ServiceManager();
             smgr.addFactories(neededServices, null);
 
               XConnector  xConnector  = (XConnector)smgr.createInstance("com.sun.star.connection.Connector");
               XConnection xConnection = xConnector.connect(argv[0]);
-
+            
             String rootOid = "classic_uno";
               IBridge iBridge = UnoRuntime.getBridgeByName("java", null, "remote", null, new Object[]{"iiop", xConnection, null});
 
             Object rInitialObject = iBridge.mapInterfaceFrom(rootOid, XInterface.class);
-//              Object rInitialObject = xBridge.getInstance("NamingService");
-
+//  			Object rInitialObject = xBridge.getInstance("NamingService");
+            
             if(rInitialObject != null) {
                 System.err.println("got the remote object");
                 doSomething(rInitialObject);
             }
-//          }
-//          catch (Exception exception) {
-//              System.err.println("Exception thrown:" + exception);
-//          }
+//  		}
+//  		catch (Exception exception) {
+//  			System.err.println("Exception thrown:" + exception);
+//  		}
     }
 }
 
diff --git a/extensions/test/sax/factory.hxx b/extensions/test/sax/factory.hxx
index 267e7b6649ee..a2d22acdade5 100644
--- a/extensions/test/sax/factory.hxx
+++ b/extensions/test/sax/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
@@ -27,7 +27,7 @@
  ************************************************************************/
 XInterfaceRef OSaxWriterTest_CreateInstance( const XMultiServiceFactoryRef & rSMgr ) THROWS((Exception));
 UString     OSaxWriterTest_getServiceName( ) THROWS( () );
-UString     OSaxWriterTest_getImplementationName( ) THROWS( () );
+UString 	OSaxWriterTest_getImplementationName( ) THROWS( () );
 Sequence<UString> OSaxWriterTest_getSupportedServiceNames( ) THROWS( () );
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/test/sax/testsax.cxx b/extensions/test/sax/testsax.cxx
index 0fc3691a47dc..74a947dd34dc 100644
--- a/extensions/test/sax/testsax.cxx
+++ b/extensions/test/sax/testsax.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,25 +127,25 @@ public:
     }
 
 public: // refcounting
-    BOOL                        queryInterface( Uik aUik, XInterfaceRef & rOut );
-    void                        acquire()                        { OWeakObject::acquire(); }
-    void                        release()                        { OWeakObject::release(); }
-    void*                       getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
+    BOOL						queryInterface( Uik aUik, XInterfaceRef & rOut );
+    void 						acquire() 						 { OWeakObject::acquire(); }
+    void 						release() 						 { OWeakObject::release(); }
+    void* 						getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
 
 public:
     virtual void testInvariant(const UString& TestName, const XInterfaceRef& TestObject)
-                                                                THROWS( (   IllegalArgumentException,
+                                                                THROWS( (	IllegalArgumentException,
                                                                             UsrSystemException) );
 
-    virtual INT32 test( const UString& TestName,
+    virtual INT32 test(	const UString& TestName,
                         const XInterfaceRef& TestObject,
-                        INT32 hTestHandle)                      THROWS( (   IllegalArgumentException,
+                        INT32 hTestHandle) 						THROWS( (	IllegalArgumentException,
                                                                             UsrSystemException) );
 
-    virtual BOOL testPassed(void)                               THROWS( (   UsrSystemException) );
-    virtual Sequence< UString > getErrors(void)                 THROWS( (UsrSystemException) );
-    virtual Sequence< UsrAny > getErrorExceptions(void)         THROWS( (UsrSystemException) );
-    virtual Sequence< UString > getWarnings(void)               THROWS( (UsrSystemException) );
+    virtual BOOL testPassed(void) 								THROWS( (	UsrSystemException) );
+    virtual Sequence< UString > getErrors(void) 				THROWS( (UsrSystemException) );
+    virtual Sequence< UsrAny > getErrorExceptions(void) 		THROWS( (UsrSystemException) );
+    virtual Sequence< UString > getWarnings(void) 				THROWS( (UsrSystemException) );
 
 private:
     void testSimple( const XParserRef &r );
@@ -155,9 +155,9 @@ private:
     void testPerformance( const XParserRef &rParser );
 
 private:
-    Sequence<UsrAny>        m_seqExceptions;
-    Sequence<UString>       m_seqErrors;
-    Sequence<UString>       m_seqWarnings;
+    Sequence<UsrAny>  		m_seqExceptions;
+    Sequence<UString> 		m_seqErrors;
+    Sequence<UString> 		m_seqWarnings;
     XMultiServiceFactoryRef m_rFactory;
 };
 
@@ -181,7 +181,7 @@ UString     OSaxParserTest_getServiceName( ) THROWS( () )
     return L"test.com.sun.star.xml.sax.Parser";
 }
 
-UString     OSaxParserTest_getImplementationName( ) THROWS( () )
+UString 	OSaxParserTest_getImplementationName( ) THROWS( () )
 {
     return L"test.extensions.xml.sax.Parser";
 }
@@ -209,7 +209,7 @@ BOOL OSaxParserTest::queryInterface( Uik uik , XInterfaceRef &rOut )
 
 
 void OSaxParserTest::testInvariant( const UString& TestName, const XInterfaceRef& TestObject )
-                                                                THROWS( (   IllegalArgumentException,
+                                                                THROWS( (	IllegalArgumentException,
                                                                             UsrSystemException) )
 {
     if( L"com.sun.star.xml.sax.Parser" == TestName ) {
@@ -220,9 +220,9 @@ void OSaxParserTest::testInvariant( const UString& TestName, const XInterfaceRef
 }
 
 
-INT32 OSaxParserTest::test( const UString& TestName,
+INT32 OSaxParserTest::test(	const UString& TestName,
                         const XInterfaceRef& TestObject,
-                        INT32 hTestHandle)                      THROWS( (   IllegalArgumentException,
+                        INT32 hTestHandle) 						THROWS( (	IllegalArgumentException,
                                                                             UsrSystemException) )
 {
     if( L"com.sun.star.xml.sax.Parser" == TestName )  {
@@ -273,25 +273,25 @@ INT32 OSaxParserTest::test( const UString& TestName,
 
 
 
-BOOL OSaxParserTest::testPassed(void)                                       THROWS( (UsrSystemException) )
+BOOL OSaxParserTest::testPassed(void) 										THROWS( (UsrSystemException) )
 {
     return m_seqErrors.getLen() == 0;
 }
 
 
-Sequence< UString > OSaxParserTest::getErrors(void)                             THROWS( (UsrSystemException) )
+Sequence< UString > OSaxParserTest::getErrors(void) 							THROWS( (UsrSystemException) )
 {
     return m_seqErrors;
 }
 
 
-Sequence< UsrAny > OSaxParserTest::getErrorExceptions(void)                     THROWS( (UsrSystemException) )
+Sequence< UsrAny > OSaxParserTest::getErrorExceptions(void) 					THROWS( (UsrSystemException) )
 {
     return m_seqExceptions;
 }
 
 
-Sequence< UString > OSaxParserTest::getWarnings(void)                       THROWS( (UsrSystemException) )
+Sequence< UString > OSaxParserTest::getWarnings(void) 						THROWS( (UsrSystemException) )
 {
     return m_seqWarnings;
 }
@@ -360,10 +360,10 @@ public:
 
 
 public:
-    BOOL                        queryInterface( Uik aUik, XInterfaceRef & rOut );
-    void                        acquire()                        { OWeakObject::acquire(); }
-    void                        release()                        { OWeakObject::release(); }
-    void*                       getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
+    BOOL						queryInterface( Uik aUik, XInterfaceRef & rOut );
+    void 						acquire() 						 { OWeakObject::acquire(); }
+    void 						release() 						 { OWeakObject::release(); }
+    void* 						getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
 
 
 public: // Error handler
@@ -420,7 +420,7 @@ public: // ExtendedDocumentHandler
             printf( "<%s> " , USTRING_TO_PCHAR( aName ) );
 
             for( i = 0 ; i < xAttribs->getLength() ; i ++ ) {
-                printf( "(%s,%s,'%s')" ,    USTRING_TO_PCHAR( xAttribs->getNameByIndex( i ) ) ,
+                printf( "(%s,%s,'%s')" ,	USTRING_TO_PCHAR( xAttribs->getNameByIndex( i ) ) ,
                                             USTRING_TO_PCHAR( xAttribs->getTypeByIndex( i ) ) ,
                                             USTRING_TO_PCHAR( xAttribs->getValueByIndex( i ) ) );
             }
@@ -547,7 +547,7 @@ BOOL TestDocumentHandler::queryInterface( Uik aUik , XInterfaceRef & rOut )
 
 
 
-void OSaxParserTest::testSimple(    const XParserRef &rParser )
+void OSaxParserTest::testSimple( 	const XParserRef &rParser )
 {
 
     char TestString[] =
@@ -585,21 +585,21 @@ void OSaxParserTest::testSimple(    const XParserRef &rParser )
         InputSource source;
 
         source.aInputStream = rInStream;
-        source.sSystemId    = sInput;
+        source.sSystemId 	= sInput;
 
         TestDocumentHandler *pDocHandler = new TestDocumentHandler( m_rFactory , FALSE );
         XDocumentHandlerRef rDocHandler( (XDocumentHandler *) pDocHandler , USR_QUERY );
-        XEntityResolverRef  rEntityResolver( (XEntityResolver *) pDocHandler , USR_QUERY );
+        XEntityResolverRef 	rEntityResolver( (XEntityResolver *) pDocHandler , USR_QUERY );
 
         rParser->setDocumentHandler( rDocHandler );
         rParser->setEntityResolver( rEntityResolver );
 
         try {
             rParser->parseStream( source );
-            ERROR_ASSERT( pDocHandler->m_iElementCount      == 4 , "wrong element count"    );
-            ERROR_ASSERT( pDocHandler->m_iAttributeCount    == 2 , "wrong attribut count"   );
-            ERROR_ASSERT( pDocHandler->m_iCharCount         == 130 , "wrong char count"     );
-            ERROR_ASSERT( pDocHandler->m_iWhitespaceCount   == 0, "wrong whitespace count" );
+            ERROR_ASSERT( pDocHandler->m_iElementCount 		== 4 , "wrong element count" 	);
+            ERROR_ASSERT( pDocHandler->m_iAttributeCount 	== 2 , "wrong attribut count" 	);
+            ERROR_ASSERT( pDocHandler->m_iCharCount 		== 130 , "wrong char count" 	);
+            ERROR_ASSERT( pDocHandler->m_iWhitespaceCount 	== 0, "wrong whitespace count" );
         }
         catch( SAXParseException& e ) {
             BUILD_ERROR( 1 , USTRING_TO_PCHAR( e.Message ) );
@@ -646,28 +646,28 @@ void OSaxParserTest::testNamespaces( const XParserRef &rParser )
         InputSource source;
 
         source.aInputStream = rInStream;
-        source.sSystemId    = sInput;
+        source.sSystemId 	= sInput;
 
         TestDocumentHandler *pDocHandler = new TestDocumentHandler( m_rFactory , FALSE );
         XDocumentHandlerRef rDocHandler( (XDocumentHandler *) pDocHandler , USR_QUERY );
-        XEntityResolverRef  rEntityResolver( (XEntityResolver *) pDocHandler , USR_QUERY );
+        XEntityResolverRef 	rEntityResolver( (XEntityResolver *) pDocHandler , USR_QUERY );
 
         rParser->setDocumentHandler( rDocHandler );
         rParser->setEntityResolver( rEntityResolver );
 
         try {
             rParser->parseStream( source );
-            ERROR_ASSERT( pDocHandler->m_iElementCount      == 6 , "wrong element count"    );
-            ERROR_ASSERT( pDocHandler->m_iAttributeCount    == 2 , "wrong attribut count"   );
-            ERROR_ASSERT( pDocHandler->m_iCharCount         == 33, "wrong char count"       );
-            ERROR_ASSERT( pDocHandler->m_iWhitespaceCount   == 0 , "wrong whitespace count" );
+            ERROR_ASSERT( pDocHandler->m_iElementCount 		== 6 , "wrong element count" 	);
+            ERROR_ASSERT( pDocHandler->m_iAttributeCount 	== 2 , "wrong attribut count" 	);
+            ERROR_ASSERT( pDocHandler->m_iCharCount 		== 33, "wrong char count" 		);
+            ERROR_ASSERT( pDocHandler->m_iWhitespaceCount 	== 0 , "wrong whitespace count" );
         }
         catch( SAXParseException& e ) {
             BUILD_ERROR( 1 , USTRING_TO_PCHAR( e.Message ) );
         }
         catch( SAXException& e ) {
             BUILD_ERROR( 1 , USTRING_TO_PCHAR( e.Message ) );
-
+                
         }
         catch( Exception& e ) {
             BUILD_ERROR( 1 , USTRING_TO_PCHAR( e.Message ) );
@@ -675,12 +675,12 @@ void OSaxParserTest::testNamespaces( const XParserRef &rParser )
         catch(...) {
             BUILD_ERROR( 1 , "unknown exception" );
         }
-    }
+    }  	
 }
 
 void OSaxParserTest::testEncoding( const XParserRef &rParser )
 {
-    char TestString[] =
+    char TestString[] = 
     "<?xml version='1.0' encoding=\"iso-8859-1\"?>\n"
       "<!-- all elements here are explicitly in the HTML namespace -->\n"
       "<html:html xmlns:html='http://www.w3.org/TR/REC-html40'>\n"
@@ -692,23 +692,23 @@ void OSaxParserTest::testEncoding( const XParserRef &rParser )
     Sequence<BYTE> seqBytes( strlen( TestString ) );
     memcpy( seqBytes.getArray() , TestString , strlen( TestString ) );
 
-
+    
     XInputStreamRef rInStream;
     UString sInput;
 
     rInStream = createStreamFromSequence( seqBytes , m_rFactory );
     sInput = UString( L"internal" );
-
+    
     if( rParser.is() ) {
         InputSource source;
 
         source.aInputStream = rInStream;
-        source.sSystemId    = sInput;
-
+        source.sSystemId 	= sInput;
+        
         TestDocumentHandler *pDocHandler = new TestDocumentHandler( m_rFactory , FALSE );
         XDocumentHandlerRef rDocHandler( (XDocumentHandler *) pDocHandler , USR_QUERY );
-        XEntityResolverRef  rEntityResolver( (XEntityResolver *) pDocHandler , USR_QUERY );
-
+        XEntityResolverRef 	rEntityResolver( (XEntityResolver *) pDocHandler , USR_QUERY );
+    
         rParser->setDocumentHandler( rDocHandler );
         rParser->setEntityResolver( rEntityResolver );
         try {
@@ -719,7 +719,7 @@ void OSaxParserTest::testEncoding( const XParserRef &rParser )
         }
         catch( SAXException& e ) {
             BUILD_ERROR( 1 , USTRING_TO_PCHAR( e.Message ) );
-
+                
         }
         catch( Exception& e ) {
             BUILD_ERROR( 1 , USTRING_TO_PCHAR( e.Message ) );
@@ -732,24 +732,24 @@ void OSaxParserTest::testEncoding( const XParserRef &rParser )
 
 }
 
-void OSaxParserTest::testFile( const XParserRef & rParser )
+void OSaxParserTest::testFile( const XParserRef & rParser ) 
 {
-
+        
     XInputStreamRef rInStream = createStreamFromFile( "testsax.xml" , m_rFactory );
     UString sInput = UString( PCHAR_TO_USTRING( "testsax.xml" ) );
 
-
+    
     if( rParser.is() && rInStream.is() ) {
         InputSource source;
 
         source.aInputStream = rInStream;
-        source.sSystemId    = sInput;
-
+        source.sSystemId 	= sInput;
+        
         TestDocumentHandler *pDocHandler = new TestDocumentHandler( m_rFactory , TRUE );
         XDocumentHandlerRef rDocHandler( (XDocumentHandler *) pDocHandler , USR_QUERY );
-        XEntityResolverRef  rEntityResolver( (XEntityResolver *) pDocHandler , USR_QUERY );
-        XErrorHandlerRef    rErrorHandler( ( XErrorHandler * )pDocHandler , USR_QUERY );
-
+        XEntityResolverRef 	rEntityResolver( (XEntityResolver *) pDocHandler , USR_QUERY );
+        XErrorHandlerRef	rErrorHandler( ( XErrorHandler * )pDocHandler , USR_QUERY );
+        
         rParser->setDocumentHandler( rDocHandler );
         rParser->setEntityResolver( rEntityResolver );
         rParser->setErrorHandler( rErrorHandler );
@@ -764,30 +764,30 @@ void OSaxParserTest::testFile( const XParserRef & rParser )
                 SAXParseException *pEx;
                 if( any.getReflection() == SAXParseException_getReflection() ) {
                     pEx = ( SAXParseException * ) any.get();
-                    printf( "%s\n" , UStringToString( pEx->Message , CHARSET_SYSTEM ).GetStr()  );
+                    printf( "%s\n" , UStringToString( pEx->Message , CHARSET_SYSTEM ).GetStr()  );	
                     any = pEx->WrappedException;
                 }
                 else {
-                    break;
+                    break;	
                 }
             }
         }
         catch( SAXException& e ) {
-            printf( "%s\n" , UStringToString( e.Message , CHARSET_SYSTEM ).GetStr()  );
-
+            printf( "%s\n" , UStringToString( e.Message , CHARSET_SYSTEM ).GetStr()  );	
+                
         }
         catch( Exception& e ) {
             printf( "normal exception ! %s\n", e.getName() );
         }
         catch(...) {
-            printf( "any exception !!!!\n" );
+            printf( "any exception !!!!\n" );	
         }
-    }
+    }	
 }
 
-void OSaxParserTest::testPerformance( const XParserRef & rParser )
+void OSaxParserTest::testPerformance( const XParserRef & rParser ) 
 {
-
+        
     XInputStreamRef rInStream = createStreamFromFile( "testPerformance.xml" , m_rFactory );
     UString sInput = UString( PCHAR_TO_USTRING( "testperformance.xml" ) );
 
@@ -795,13 +795,13 @@ void OSaxParserTest::testPerformance( const XParserRef & rParser )
         InputSource source;
 
         source.aInputStream = rInStream;
-        source.sSystemId    = sInput;
-
+        source.sSystemId 	= sInput;
+        
         TestDocumentHandler *pDocHandler = new TestDocumentHandler( m_rFactory , FALSE );
         XDocumentHandlerRef rDocHandler( (XDocumentHandler *) pDocHandler , USR_QUERY );
-        XEntityResolverRef  rEntityResolver( (XEntityResolver *) pDocHandler , USR_QUERY );
-        XErrorHandlerRef    rErrorHandler( ( XErrorHandler * )pDocHandler , USR_QUERY );
-
+        XEntityResolverRef 	rEntityResolver( (XEntityResolver *) pDocHandler , USR_QUERY );
+        XErrorHandlerRef	rErrorHandler( ( XErrorHandler * )pDocHandler , USR_QUERY );
+        
         rParser->setDocumentHandler( rDocHandler );
         rParser->setEntityResolver( rEntityResolver );
         rParser->setErrorHandler( rErrorHandler );
@@ -811,12 +811,12 @@ void OSaxParserTest::testPerformance( const XParserRef & rParser )
             osl_getSystemTime( &aStartTime );
             rParser->parseStream( source );
             osl_getSystemTime( &aEndTime );
-
+            
             double fStart = (double)aStartTime.Seconds + ((double)aStartTime.Nanosec / 1000000000.0);
             double fEnd = (double)aEndTime.Seconds + ((double)aEndTime.Nanosec / 1000000000.0);
-
+            
             printf( "Performance reading : %g s\n" , fEnd - fStart );
-
+            
         }
         catch( SAXParseException& e ) {
             UsrAny any;
@@ -825,25 +825,25 @@ void OSaxParserTest::testPerformance( const XParserRef & rParser )
                 SAXParseException *pEx;
                 if( any.getReflection() == SAXParseException_getReflection() ) {
                     pEx = ( SAXParseException * ) any.get();
-                    printf( "%s\n" , UStringToString( pEx->Message , CHARSET_SYSTEM ).GetStr()  );
+                    printf( "%s\n" , UStringToString( pEx->Message , CHARSET_SYSTEM ).GetStr()  );	
                     any = pEx->WrappedException;
                 }
                 else {
-                    break;
+                    break;	
                 }
             }
         }
         catch( SAXException& e ) {
-            printf( "%s\n" , UStringToString( e.Message , CHARSET_SYSTEM ).GetStr()  );
-
+            printf( "%s\n" , UStringToString( e.Message , CHARSET_SYSTEM ).GetStr()  );	
+                
         }
         catch( Exception& e ) {
             printf( "normal exception ! %s\n", e.getName() );
         }
         catch(...) {
-            printf( "any exception !!!!\n" );
+            printf( "any exception !!!!\n" );	
         }
-    }
+    }	
 
 }
 
@@ -854,7 +854,7 @@ BOOL EXTERN_SERVICE_CALLTYPE exService_writeRegEntry(
         const UNO_INTERFACE(XRegistryKey)* xUnoKey)
 
 {
-    XRegistryKeyRef   xKey;
+    XRegistryKeyRef   xKey;	
     uno2smart(xKey, *xUnoKey);
 
     UString str = UString( L"/" ) + OSaxParserTest_getImplementationName() + UString( L"/UNO/SERVICES" );
@@ -873,15 +873,15 @@ UNO_INTERFACE(XInterface) EXTERN_SERVICE_CALLTYPE exService_getFactory
 (
     const wchar_t* implementationName,
     const UNO_INTERFACE(XMultiServiceFactory)* xUnoFact,
-    const UNO_INTERFACE(XRegistryKey)*
+    const UNO_INTERFACE(XRegistryKey)* 
 )
 {
     UNO_INTERFACE(XInterface) xUnoRet = {0, 0};
 
-    XInterfaceRef           xRet;
+    XInterfaceRef 			xRet;
     XMultiServiceFactoryRef xSMgr;
-    UString                 aImplementationName(implementationName);
-
+    UString					aImplementationName(implementationName);
+    
     uno2smart(xSMgr, *xUnoFact);
 
     if (aImplementationName == OSaxWriterTest_getImplementationName() )
@@ -899,8 +899,8 @@ UNO_INTERFACE(XInterface) EXTERN_SERVICE_CALLTYPE exService_getFactory
     if (xRet.is())
     {
         smart2uno(xRet, xUnoRet);
-    }
-
+    }   
+    
     return xUnoRet;
 }
 
diff --git a/extensions/test/sax/testwriter.cxx b/extensions/test/sax/testwriter.cxx
index 692dcb1647ad..f4930dfec5fa 100644
--- a/extensions/test/sax/testwriter.cxx
+++ b/extensions/test/sax/testwriter.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -123,7 +123,7 @@ public:
 
 
 public: // refcounting
-    BOOL                        queryInterface( Uik aUik, XInterfaceRef & rOut )
+    BOOL						queryInterface( Uik aUik, XInterfaceRef & rOut )
     {
         if( XOutputStream::getSmartUik() == aUik ) {
             rOut = (XOutputStream *) this;
@@ -132,9 +132,9 @@ public: // refcounting
 
         return TRUE;
     }
-    void                        acquire()                        { OWeakObject::acquire(); }
-    void                        release()                        { OWeakObject::release(); }
-    void*                       getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
+    void 						acquire() 						 { OWeakObject::acquire(); }
+    void 						release() 						 { OWeakObject::release(); }
+    void* 						getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
 
 public:
     virtual void writeBytes(const Sequence< BYTE >& aData)
@@ -189,25 +189,25 @@ public:
     ~OSaxWriterTest() {}
 
 public: // refcounting
-    BOOL                        queryInterface( Uik aUik, XInterfaceRef & rOut );
-    void                        acquire()                        { OWeakObject::acquire(); }
-    void                        release()                        { OWeakObject::release(); }
-    void*                       getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
+    BOOL						queryInterface( Uik aUik, XInterfaceRef & rOut );
+    void 						acquire() 						 { OWeakObject::acquire(); }
+    void 						release() 						 { OWeakObject::release(); }
+    void* 						getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
 
 public:
     virtual void testInvariant(const UString& TestName, const XInterfaceRef& TestObject)
-                                                                THROWS( (   IllegalArgumentException,
+                                                                THROWS( (	IllegalArgumentException,
                                                                             UsrSystemException) );
 
-    virtual INT32 test( const UString& TestName,
+    virtual INT32 test(	const UString& TestName,
                         const XInterfaceRef& TestObject,
-                        INT32 hTestHandle)                      THROWS( (   IllegalArgumentException,
+                        INT32 hTestHandle) 						THROWS( (	IllegalArgumentException,
                                                                             UsrSystemException) );
 
-    virtual BOOL testPassed(void)                               THROWS( (   UsrSystemException) );
-    virtual Sequence< UString > getErrors(void)                 THROWS( (UsrSystemException) );
-    virtual Sequence< UsrAny > getErrorExceptions(void)         THROWS( (UsrSystemException) );
-    virtual Sequence< UString > getWarnings(void)               THROWS( (UsrSystemException) );
+    virtual BOOL testPassed(void) 								THROWS( (	UsrSystemException) );
+    virtual Sequence< UString > getErrors(void) 				THROWS( (UsrSystemException) );
+    virtual Sequence< UsrAny > getErrorExceptions(void) 		THROWS( (UsrSystemException) );
+    virtual Sequence< UString > getWarnings(void) 				THROWS( (UsrSystemException) );
 
 private:
     void testSimple( const XExtendedDocumentHandlerRef &r );
@@ -217,9 +217,9 @@ private:
     void writeParagraph( const XExtendedDocumentHandlerRef &r , const UString & s);
 
 private:
-    Sequence<UsrAny>        m_seqExceptions;
-    Sequence<UString>       m_seqErrors;
-    Sequence<UString>       m_seqWarnings;
+    Sequence<UsrAny>  		m_seqExceptions;
+    Sequence<UString> 		m_seqErrors;
+    Sequence<UString> 		m_seqWarnings;
     XMultiServiceFactoryRef m_rFactory;
 
 };
@@ -228,7 +228,7 @@ private:
 
 /*----------------------------------------
 *
-*   Attributlist implementation
+* 	Attributlist implementation
 *
 *----------------------------------------*/
 struct AttributeListImpl_impl;
@@ -242,10 +242,10 @@ public:
     ~AttributeListImpl();
 
 public:
-    BOOL                    queryInterface( Uik aUik, XInterfaceRef & rOut );
-    void                    acquire()                        { OWeakObject::acquire(); }
-    void                    release()                        { OWeakObject::release(); }
-    void*                   getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
+    BOOL					queryInterface( Uik aUik, XInterfaceRef & rOut );
+    void 					acquire() 						 { OWeakObject::acquire(); }
+    void 					release() 						 { OWeakObject::release(); }
+    void* 					getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
 
 public:
     virtual INT16 getLength(void) THROWS( (UsrSystemException) );
@@ -269,9 +269,9 @@ struct TagAttribute
     TagAttribute(){}
     TagAttribute( const UString &sName, const UString &sType , const UString &sValue )
     {
-        this->sName     = sName;
-        this->sType     = sType;
-        this->sValue    = sValue;
+        this->sName 	= sName;
+        this->sType 	= sType;
+        this->sValue 	= sValue;
     }
 
     UString sName;
@@ -379,7 +379,7 @@ AttributeListImpl::~AttributeListImpl()
 }
 
 
-void AttributeListImpl::addAttribute(   const UString &sName ,
+void AttributeListImpl::addAttribute( 	const UString &sName ,
                                         const UString &sType ,
                                         const UString &sValue )
 {
@@ -421,7 +421,7 @@ UString     OSaxWriterTest_getServiceName( ) THROWS( () )
     return L"test.com.sun.star.xml.sax.Writer";
 }
 
-UString     OSaxWriterTest_getImplementationName( ) THROWS( () )
+UString 	OSaxWriterTest_getImplementationName( ) THROWS( () )
 {
     return L"test.extensions.xml.sax.Writer";
 }
@@ -449,7 +449,7 @@ BOOL OSaxWriterTest::queryInterface( Uik uik , XInterfaceRef &rOut )
 
 
 void OSaxWriterTest::testInvariant( const UString& TestName, const XInterfaceRef& TestObject )
-                                                                THROWS( (   IllegalArgumentException,
+                                                                THROWS( (	IllegalArgumentException,
                                                                             UsrSystemException) )
 {
     if( L"com.sun.star.xml.sax.Writer" == TestName ) {
@@ -467,9 +467,9 @@ void OSaxWriterTest::testInvariant( const UString& TestName, const XInterfaceRef
 }
 
 
-INT32 OSaxWriterTest::test( const UString& TestName,
+INT32 OSaxWriterTest::test(	const UString& TestName,
                         const XInterfaceRef& TestObject,
-                        INT32 hTestHandle)                      THROWS( (   IllegalArgumentException,
+                        INT32 hTestHandle) 						THROWS( (	IllegalArgumentException,
                                                                             UsrSystemException) )
 {
     if( L"com.sun.star.xml.sax.Writer" == TestName )  {
@@ -517,25 +517,25 @@ INT32 OSaxWriterTest::test( const UString& TestName,
 
 
 
-BOOL OSaxWriterTest::testPassed(void)                                       THROWS( (UsrSystemException) )
+BOOL OSaxWriterTest::testPassed(void) 										THROWS( (UsrSystemException) )
 {
     return m_seqErrors.getLen() == 0;
 }
 
 
-Sequence< UString > OSaxWriterTest::getErrors(void)                             THROWS( (UsrSystemException) )
+Sequence< UString > OSaxWriterTest::getErrors(void) 							THROWS( (UsrSystemException) )
 {
     return m_seqErrors;
 }
 
 
-Sequence< UsrAny > OSaxWriterTest::getErrorExceptions(void)                     THROWS( (UsrSystemException) )
+Sequence< UsrAny > OSaxWriterTest::getErrorExceptions(void) 					THROWS( (UsrSystemException) )
 {
     return m_seqExceptions;
 }
 
 
-Sequence< UString > OSaxWriterTest::getWarnings(void)                       THROWS( (UsrSystemException) )
+Sequence< UString > OSaxWriterTest::getWarnings(void) 						THROWS( (UsrSystemException) )
 {
     return m_seqWarnings;
 }
@@ -584,7 +584,7 @@ void OSaxWriterTest::testSimple( const XExtendedDocumentHandlerRef &r )
 
     r->startDocument();
 
-    pList->addAttribute( L"Arg1" , L"CDATA" , L"bla\n   u" );
+    pList->addAttribute( L"Arg1" , L"CDATA" , L"bla\n	u" );
     pList->addAttribute( L"Arg2" , L"CDATA" , L"blub" );
 
     r->startElement( L"tag1"  , rList );
@@ -664,13 +664,13 @@ void OSaxWriterTest::testExceptions( const XExtendedDocumentHandlerRef & r )
     }
 
     r->startDocument();
-
+    
     r->startElement( L"huhu" , rList );
     r->startCDATA();
 
     {
         BOOL bException = TRUE;
-        try {
+        try { 
             r->startElement( L"huhu" , rList );
             bException = FALSE;
         }
@@ -679,7 +679,7 @@ void OSaxWriterTest::testExceptions( const XExtendedDocumentHandlerRef & r )
         }
         ERROR_ASSERT( bException , "expected exception not thrown !" );
     }
-
+    
     r->endCDATA();
     r->endElement( L"hi" );
 
@@ -691,22 +691,22 @@ void OSaxWriterTest::testDTD(const  XExtendedDocumentHandlerRef &r )
 {
     OFileWriter *pw = new OFileWriter("outputDTD.xml");
     AttributeListImpl *pList = new AttributeListImpl;
-
+    
     XAttributeListRef rList( (XAttributeList *) pList , USR_QUERY );
     XOutputStreamRef ref( ( XOutputStream * ) pw , USR_QUERY );
-
+    
     XActiveDataSourceRef source( r , USR_QUERY );
-
+    
     ERROR_ASSERT( ref.is() , "no output stream" );
     ERROR_ASSERT( source.is() , "no active data source" );
-
+    
     source->setOutputStream( ref );
 
-
+    
     r->startDocument();
     r->unknown( L"<!DOCTYPE iCalendar >\n" );
     r->startElement( L"huhu" , rList );
-
+    
     r->endElement( L"huhu" );
     r->endDocument();
 }
@@ -720,15 +720,15 @@ void OSaxWriterTest::testPerformance(const  XExtendedDocumentHandlerRef &r )
                             L"wohl > Zeilenumbrueche halbwegs richtig macht oder ob er die Zeile "
                             L"bis zum bitteren Ende schreibt.";
 
-
+    
     XAttributeListRef rList( (XAttributeList *) pList , USR_QUERY );
     XOutputStreamRef ref( ( XOutputStream * ) pw , USR_QUERY );
-
+    
     XActiveDataSourceRef source( r , USR_QUERY );
-
+    
     ERROR_ASSERT( ref.is() , "no output stream" );
     ERROR_ASSERT( source.is() , "no active data source" );
-
+    
     source->setOutputStream( ref );
 
     TimeValue aStartTime, aEndTime;
@@ -747,8 +747,8 @@ void OSaxWriterTest::testPerformance(const  XExtendedDocumentHandlerRef &r )
             r->ignorableWhitespace( L"");
             r->startElement( L"huhu" , rList );
             r->characters( testParagraph );
-//          writeParagraph( r , testParagraph );
-
+//			writeParagraph( r , testParagraph );
+            
             r->ignorableWhitespace( L"");
             r->endElement( L"huhu" );
         }
@@ -758,7 +758,7 @@ void OSaxWriterTest::testPerformance(const  XExtendedDocumentHandlerRef &r )
         r->ignorableWhitespace( L"");
         r->endElement( UString( L"tag" ) + UString::valueOf( i2 ) );
     }
-
+    
     r->endDocument();
 
     osl_getSystemTime( &aEndTime );
diff --git a/extensions/test/stm/datatest.cxx b/extensions/test/stm/datatest.cxx
index 6886f99f8b31..7fb7bde49b00 100644
--- a/extensions/test/stm/datatest.cxx
+++ b/extensions/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
@@ -77,25 +77,25 @@ public:
     ODataStreamTest( const XMultiServiceFactoryRef & rFactory ) : m_rFactory( rFactory ){}
 
 public: // refcounting
-    BOOL                        queryInterface( Uik aUik, XInterfaceRef & rOut );
-    void                        acquire()                        { OWeakObject::acquire(); }
-    void                        release()                        { OWeakObject::release(); }
-    void*                       getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
+    BOOL						queryInterface( Uik aUik, XInterfaceRef & rOut );
+    void 						acquire() 						 { OWeakObject::acquire(); }
+    void 						release() 						 { OWeakObject::release(); }
+    void* 						getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
 
 public:
     virtual void testInvariant(const UString& TestName, const XInterfaceRef& TestObject)
-                                                                THROWS( (   IllegalArgumentException,
+                                                                THROWS( (	IllegalArgumentException,
                                                                             UsrSystemException) );
 
-    virtual INT32 test( const UString& TestName,
+    virtual INT32 test(	const UString& TestName,
                         const XInterfaceRef& TestObject,
-                        INT32 hTestHandle)                      THROWS( (   IllegalArgumentException,
+                        INT32 hTestHandle) 						THROWS( (	IllegalArgumentException,
                                                                             UsrSystemException) );
 
-    virtual BOOL testPassed(void)                               THROWS( (   UsrSystemException) );
-    virtual Sequence< UString > getErrors(void)                 THROWS( (UsrSystemException) );
-    virtual Sequence< UsrAny > getErrorExceptions(void)         THROWS( (UsrSystemException) );
-    virtual Sequence< UString > getWarnings(void)               THROWS( (UsrSystemException) );
+    virtual BOOL testPassed(void) 								THROWS( (	UsrSystemException) );
+    virtual Sequence< UString > getErrors(void) 				THROWS( (UsrSystemException) );
+    virtual Sequence< UsrAny > getErrorExceptions(void) 		THROWS( (UsrSystemException) );
+    virtual Sequence< UString > getWarnings(void) 				THROWS( (UsrSystemException) );
 
 private:
     void testSimple( const XDataInputStreamRef & , const XDataOutputStreamRef &);
@@ -122,7 +122,7 @@ BOOL ODataStreamTest::queryInterface( Uik uik , XInterfaceRef &rOut )
 
 
 void ODataStreamTest::testInvariant( const UString& TestName, const XInterfaceRef& TestObject )
-                                                                THROWS( (   IllegalArgumentException,
+                                                                THROWS( (	IllegalArgumentException,
                                                                             UsrSystemException) )
 {
     if( L"com.sun.star.io.DataInputStream" == TestName ) {
@@ -144,10 +144,10 @@ void ODataStreamTest::testInvariant( const UString& TestName, const XInterfaceRe
         XOutputStreamRef output( TestObject , USR_QUERY );
         XDataOutputStreamRef dataOutput( TestObject , USR_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" );
 
     }
 
@@ -162,14 +162,14 @@ void ODataStreamTest::testInvariant( const UString& TestName, const XInterfaceRe
 }
 
 
-INT32 ODataStreamTest::test(    const UString& TestName,
+INT32 ODataStreamTest::test(	const UString& TestName,
                         const XInterfaceRef& TestObject,
-                        INT32 hTestHandle)                      THROWS( (   IllegalArgumentException,
+                        INT32 hTestHandle) 						THROWS( (	IllegalArgumentException,
                                                                             UsrSystemException) )
 {
-    if( L"com.sun.star.io.DataInputStream" == TestName ||
+    if( L"com.sun.star.io.DataInputStream" == TestName || 
         L"com.sun.star.io.DataOutputStream" == TestName )  {
-
+        
         try {
             if( 0 == hTestHandle ) {
                 testInvariant( TestName , TestObject );
@@ -181,13 +181,13 @@ INT32 ODataStreamTest::test(    const UString& TestName,
                 XDataInputStreamRef rInput( TestObject , USR_QUERY );
                 XDataOutputStreamRef rOutput( TestObject , USR_QUERY );
 
-
+                
                 XInterfaceRef x = m_rFactory->createInstance( L"com.sun.star.io.Pipe");
 
                 XInputStreamRef  rPipeInput( x , USR_QUERY );
                 XOutputStreamRef rPipeOutput( x , USR_QUERY );
-
-                if( ! rSink.is() ) {
+                
+                if( ! rSink.is() ) {					
                     x = m_rFactory->createInstance( L"com.sun.star.io.DataInputStream" );
                     x->queryInterface( XDataInputStream::getSmartUik() , rInput );
                     x->queryInterface( XActiveDataSink::getSmartUik() , rSink );
@@ -209,7 +209,7 @@ INT32 ODataStreamTest::test(    const UString& TestName,
 
                 if( 1 == hTestHandle ) {
                     testSimple( rInput , rOutput );
-                }
+                }	
             }
         }
         catch( Exception& e )  {
@@ -218,9 +218,9 @@ INT32 ODataStreamTest::test(    const UString& TestName,
         catch(...) {
             BUILD_ERROR( 0 , "unknown exception (Exception is  not base class)" );
         }
-
+        
         hTestHandle ++;
-
+        
         if( hTestHandle >= 2) {
             // all tests finished.
             hTestHandle = -1;
@@ -230,34 +230,34 @@ INT32 ODataStreamTest::test(    const UString& TestName,
         BUILD_ERROR( 0 , "service not supported by test." );
     }
     return hTestHandle;
-}
+}													
 
 
 
-BOOL ODataStreamTest::testPassed(void)                                      THROWS( (UsrSystemException) )
+BOOL ODataStreamTest::testPassed(void) 										THROWS( (UsrSystemException) )
 {
-    return m_seqErrors.getLen() == 0;
+    return m_seqErrors.getLen() == 0;	
 }
 
 
-Sequence< UString > ODataStreamTest::getErrors(void)                            THROWS( (UsrSystemException) )
+Sequence< UString > ODataStreamTest::getErrors(void) 							THROWS( (UsrSystemException) )
 {
     return m_seqErrors;
 }
 
 
-Sequence< UsrAny > ODataStreamTest::getErrorExceptions(void)                    THROWS( (UsrSystemException) )
+Sequence< UsrAny > ODataStreamTest::getErrorExceptions(void) 					THROWS( (UsrSystemException) )
 {
     return m_seqExceptions;
 }
 
 
-Sequence< UString > ODataStreamTest::getWarnings(void)                      THROWS( (UsrSystemException) )
+Sequence< UString > ODataStreamTest::getWarnings(void) 						THROWS( (UsrSystemException) )
 {
     return m_seqWarnings;
 }
 
-void ODataStreamTest::testSimple(   const XDataInputStreamRef &rInput,
+void ODataStreamTest::testSimple( 	const XDataInputStreamRef &rInput, 
                                     const XDataOutputStreamRef &rOutput )
 {
     rOutput->writeLong( 0x34ff3c );
@@ -265,89 +265,89 @@ void ODataStreamTest::testSimple(   const XDataInputStreamRef &rInput,
 
     ERROR_ASSERT( 0x34ff3c ==  rInput->readLong() , "long read/write mismatch" );
     ERROR_ASSERT( 0x34ff3d ==  rInput->readLong() , "long read/write mismatch" );
-
+    
     rOutput->writeByte( 0x87 );
     ERROR_ASSERT( 0x87 == rInput->readByte() , "byte read/write mismatch" );
-
+    
     rOutput->writeBoolean( 25 );
     ERROR_ASSERT( rInput->readBoolean() , "boolean read/write mismatch" );
-
+    
     rOutput->writeBoolean( FALSE );
     ERROR_ASSERT( ! rInput->readBoolean() , "boolean read/write mismatch" );
-
+    
     rOutput->writeFloat( (float) 42.42 );
     ERROR_ASSERT( rInput->readFloat() == ((float)42.42) , "float read/write mismatch" );
-
+    
     rOutput->writeDouble( (double) 42.42 );
     ERROR_ASSERT( rInput->readDouble() == 42.42 , "double read/write mismatch" );
-
+    
     rOutput->writeUTF( L"Live long and prosper !" );
     ERROR_ASSERT( rInput->readUTF() == L"Live long and prosper !" ,
                     "UTF read/write mismatch" );
-
+    
     Sequence<wchar_t> wc(0x10001);
     for( int i = 0 ; i < 0x10000  ; i ++ ) {
-        wc.getArray()[i] = L'c';
+        wc.getArray()[i] = L'c';	
     }
     wc.getArray()[0x10000] = 0;
     UString str( wc.getArray() , 0x10000 );
     rOutput->writeUTF( str );
     ERROR_ASSERT( rInput->readUTF() == str , "error reading 64k block" );
-
+    
     rOutput->closeOutput();
     try {
         rInput->readLong();
-        ERROR_ASSERT( 0 , "eof-exception does not occur !" );
+        ERROR_ASSERT( 0 , "eof-exception does not occur !" );	
     }
     catch ( IOException& e ){
-        //ok
+        //ok	
         e.getName();
     }
-    catch(...)  {
+    catch(...)	{
         ERROR_ASSERT( 0 , "wrong exception after reading beyond eof" );
     }
-
-    ERROR_ASSERT( ! rInput->readBytes( Sequence<BYTE> (1) , 1 ),
+    
+    ERROR_ASSERT( ! rInput->readBytes( Sequence<BYTE> (1) , 1 ), 	
                     "stream must be on eof !" );
-
+                    
     rInput->closeInput();
-
+    
     try {
         rOutput->writeByte( 1 );
         ERROR_ASSERT( 0 , "writing still possible though chain must be interrupted" );
     }
-    catch( IOException& e )
+    catch( IOException& e ) 
     {
         e.getName();
-        // ok
+        // ok	
     }
     catch( ... ) {
-        ERROR_ASSERT( 0 , "IOException  expected, but another exception was thrown" );
+        ERROR_ASSERT( 0 , "IOException	expected, but another exception was thrown" );
     }
-
+    
 }
 
 
 
-/**
+/** 
 * for external binding
 *
 *
 **/
 XInterfaceRef ODataStreamTest_CreateInstance( const XMultiServiceFactoryRef & rSMgr ) THROWS((Exception))
-{
+{	
     ODataStreamTest *p = new ODataStreamTest( rSMgr );
-    XInterfaceRef xService = *p;
+    XInterfaceRef xService = *p;	
     return xService;
 }
 
 Sequence<UString> ODataStreamTest_getSupportedServiceNames( int i) THROWS( () )
 {
     Sequence<UString> aRet(1);
-
+    
     aRet.getArray()[0] = ODataStreamTest_getImplementationName( i);
-
-
+    
+    
     return aRet;
 }
 
@@ -355,19 +355,19 @@ UString     ODataStreamTest_getServiceName( int i) THROWS( () )
 {
     if( 1 == i ) {
         return L"test.com.sun.star.io.DataInputStream";
-    }
+    } 
     else {
-        return L"test.com.sun.star.io.DataOutputStream";
+        return L"test.com.sun.star.io.DataOutputStream";	
     }
 }
 
-UString     ODataStreamTest_getImplementationName( int i) THROWS( () )
+UString 	ODataStreamTest_getImplementationName( int i) THROWS( () )
 {
     if( 1 == i ) {
         return L"test.com.sun.star.comp.extensions.stm.DataInputStream";
     }
     else {
-        return L"test.com.sun.star.comp.extensions.stm.DataOutputStream";
+        return L"test.com.sun.star.comp.extensions.stm.DataOutputStream";	
     }
 }
 
@@ -379,7 +379,7 @@ UString     ODataStreamTest_getImplementationName( int i) THROWS( () )
 *
 *
 *------------------------------------------------------*/
-class MyPersistObject :
+class MyPersistObject : 
             public XPersistObject,
             public XPropertySet,
             public OWeakObject
@@ -391,12 +391,12 @@ public:
         {}
     ~MyPersistObject()
         {}
-
+    
 public:
-    BOOL                        queryInterface( Uik aUik, XInterfaceRef & rOut );
-    void                        acquire()                        { OWeakObject::acquire(); }
-    void                        release()                        { OWeakObject::release(); }
-    void*                       getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
+    BOOL						queryInterface( Uik aUik, XInterfaceRef & rOut );
+    void 						acquire() 						 { OWeakObject::acquire(); }
+    void 						release() 						 { OWeakObject::release(); }
+    void* 						getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
 
 public:
     virtual UString getServiceName(void) const THROWS( (UsrSystemException) );
@@ -405,72 +405,72 @@ public:
 
 public:
 
-    virtual XPropertySetInfoRef getPropertySetInfo(void) const  THROWS( (UsrSystemException) );
-    virtual void setPropertyValue(const UString& aPropertyName, const UsrAny& aValue)
-                                                                THROWS( (   UnknownPropertyException,
-                                                                            PropertyVetoException,
+    virtual XPropertySetInfoRef getPropertySetInfo(void) const 	THROWS( (UsrSystemException) );
+    virtual void setPropertyValue(const UString& aPropertyName, const UsrAny& aValue) 
+                                                                THROWS( (	UnknownPropertyException, 
+                                                                            PropertyVetoException, 
                                                                             IllegalArgumentException,
-                                                                            WrappedTargetException,
+                                                                            WrappedTargetException, 
                                                                             UsrSystemException) );
-    virtual UsrAny getPropertyValue(const UString& PropertyName) const
-                                                                THROWS( (   UnknownPropertyException,
-                                                                            WrappedTargetException,
+    virtual UsrAny getPropertyValue(const UString& PropertyName) const 
+                                                                THROWS( (	UnknownPropertyException, 
+                                                                            WrappedTargetException, 
                                                                             UsrSystemException) );
-    virtual void addPropertyChangeListener( const UString& aPropertyName,
-                                            const XPropertyChangeListenerRef& xListener)
-                                                                THROWS( (   UnknownPropertyException,
-                                                                            WrappedTargetException,
+    virtual void addPropertyChangeListener(	const UString& aPropertyName, 
+                                            const XPropertyChangeListenerRef& xListener) 
+                                                                THROWS( (	UnknownPropertyException, 
+                                                                            WrappedTargetException, 
                                                                             UsrSystemException) );
-    virtual void removePropertyChangeListener(  const UString& aPropertyName,
-                                                const XPropertyChangeListenerRef& aListener)
-                                                                THROWS( (   UnknownPropertyException,
-                                                                            WrappedTargetException,
+    virtual void removePropertyChangeListener(	const UString& aPropertyName, 
+                                                const XPropertyChangeListenerRef& aListener) 
+                                                                THROWS( (	UnknownPropertyException, 
+                                                                            WrappedTargetException, 
                                                                             UsrSystemException) );
-    virtual void addVetoableChangeListener(     const UString& PropertyName,
-                                                const XVetoableChangeListenerRef& aListener)
-                                                                THROWS( (   UnknownPropertyException,
-                                                                            WrappedTargetException,
+    virtual void addVetoableChangeListener(		const UString& PropertyName, 
+                                                const XVetoableChangeListenerRef& aListener) 
+                                                                THROWS( (	UnknownPropertyException,
+                                                                            WrappedTargetException, 
                                                                             UsrSystemException) );
-    virtual void removeVetoableChangeListener(  const UString& PropertyName,
-                                                const XVetoableChangeListenerRef& aListener)
-                                                                THROWS( (   UnknownPropertyException,
-                                                                            WrappedTargetException,
+    virtual void removeVetoableChangeListener(	const UString& PropertyName, 
+                                                const XVetoableChangeListenerRef& aListener) 
+                                                                THROWS( (	UnknownPropertyException, 
+                                                                            WrappedTargetException, 
                                                                             UsrSystemException) );
 
 public:
-    INT32   m_l;
-    float   m_f;
-    double  m_d;
-    BOOL    m_b;
-    BYTE    m_byte;
-    wchar_t m_c;
-    UString m_s;
-    XPersistObjectRef   m_ref;
+    INT32	m_l;
+    float	m_f;
+    double	m_d;
+    BOOL	m_b;
+    BYTE	m_byte;
+    wchar_t	m_c;
+    UString	m_s;
+    XPersistObjectRef 	m_ref;
     UString m_sServiceName;
 };
 
 
 
-XPropertySetInfoRef MyPersistObject::getPropertySetInfo(void) const     THROWS( (UsrSystemException) )
+XPropertySetInfoRef MyPersistObject::getPropertySetInfo(void) const 	THROWS( (UsrSystemException) )
 {
-    return XPropertySetInfoRef();
+    return XPropertySetInfoRef();	
 }
 
-void MyPersistObject::setPropertyValue(const UString& aPropertyName, const UsrAny& aValue)
-                                                                THROWS( (   UnknownPropertyException,
-                                                                            PropertyVetoException,
+void MyPersistObject::setPropertyValue(const UString& aPropertyName, const UsrAny& aValue) 
+                                                                THROWS( (	UnknownPropertyException, 
+                                                                            PropertyVetoException, 
                                                                             IllegalArgumentException,
-                                                                            WrappedTargetException,
+                                                                            WrappedTargetException, 
                                                                             UsrSystemException) )
 {
     if( L"long" == aPropertyName  ) {
-        m_l = aValue.getINT32();
+        m_l = aValue.getINT32();	
     }
     else if ( L"float" == aPropertyName ) {
-        m_f = aValue.getFloat();
+        m_f = aValue.getFloat();	
     }
     else if( L"double" == aPropertyName ) {
-        m_d = aValue.getDouble();
+        m_d = aValue.getDouble();	
     }
     else if( L"bool" == aPropertyName ) {
         m_b = aValue.getBOOL();
@@ -479,14 +479,14 @@ void MyPersistObject::setPropertyValue(const UString& aPropertyName, const UsrAn
         m_byte = aValue.getBYTE();
     }
     else if( L"char" == aPropertyName ) {
-        m_c = aValue.getChar();
+        m_c = aValue.getChar();	
     }
     else if( L"string" == aPropertyName ) {
-        m_s = aValue.getString();
+        m_s = aValue.getString();	
     }
     else if( L"object" == aPropertyName ) {
         if( aValue.getReflection() == XPersistObject_getReflection() ) {
-            XPersistObjectRef *pRef = (XPersistObjectRef*) aValue.get();
+            XPersistObjectRef *pRef = (XPersistObjectRef*) aValue.get();	
             if( pRef ) {
                 m_ref = *pRef;
             }
@@ -502,20 +502,20 @@ void MyPersistObject::setPropertyValue(const UString& aPropertyName, const UsrAn
 }
 
 
-UsrAny MyPersistObject::getPropertyValue(const UString& aPropertyName) const
-                                                                THROWS( (   UnknownPropertyException,
-                                                                            WrappedTargetException,
+UsrAny MyPersistObject::getPropertyValue(const UString& aPropertyName) const 
+                                                                THROWS( (	UnknownPropertyException, 
+                                                                            WrappedTargetException, 
                                                                             UsrSystemException) )
 {
     UsrAny aValue;
     if( L"long" == aPropertyName  ) {
-        aValue.setINT32( m_l );
+        aValue.setINT32( m_l );	
     }
     else if ( L"float" == aPropertyName ) {
-        aValue.setFloat( m_f );
+        aValue.setFloat( m_f );	
     }
     else if( L"double" == aPropertyName ) {
-        aValue.setDouble( m_d );
+        aValue.setDouble( m_d );	
     }
     else if( L"bool" == aPropertyName ) {
         aValue.setBOOL( m_b );
@@ -524,10 +524,10 @@ UsrAny MyPersistObject::getPropertyValue(const UString& aPropertyName) const
         aValue.setBYTE( m_byte );
     }
     else if( L"char" == aPropertyName ) {
-        aValue.setChar( m_c );
+        aValue.setChar( m_c );	
     }
     else if( L"string" == aPropertyName ) {
-        aValue.setString( m_s );
+        aValue.setString( m_s );	
     }
     else if( L"object" == aPropertyName ) {
         aValue.set( &m_ref , XPersistObject_getReflection() );
@@ -536,53 +536,53 @@ UsrAny MyPersistObject::getPropertyValue(const UString& aPropertyName) const
 }
 
 
-void MyPersistObject::addPropertyChangeListener(    const UString& aPropertyName,
-                                                    const XPropertyChangeListenerRef& xListener)
-                                                                THROWS( (   UnknownPropertyException,
-                                                                            WrappedTargetException,
+void MyPersistObject::addPropertyChangeListener(	const UString& aPropertyName, 
+                                                    const XPropertyChangeListenerRef& xListener) 
+                                                                THROWS( (	UnknownPropertyException, 
+                                                                            WrappedTargetException, 
                                                                             UsrSystemException) )
 {
-
+    
 }
 
-void MyPersistObject::removePropertyChangeListener( const UString& aPropertyName,
-                                                    const XPropertyChangeListenerRef& aListener)
-                                                                THROWS( (   UnknownPropertyException,
-                                                                            WrappedTargetException,
+void MyPersistObject::removePropertyChangeListener(	const UString& aPropertyName, 
+                                                    const XPropertyChangeListenerRef& aListener) 
+                                                                THROWS( (	UnknownPropertyException, 
+                                                                            WrappedTargetException, 
                                                                             UsrSystemException) )
 {
 }
-void MyPersistObject::addVetoableChangeListener(const UString& PropertyName,
-                                                const XVetoableChangeListenerRef& aListener)
-                                                                THROWS( (   UnknownPropertyException,
-                                                                            WrappedTargetException,
+void MyPersistObject::addVetoableChangeListener(const UString& PropertyName, 
+                                                const XVetoableChangeListenerRef& aListener) 
+                                                                THROWS( (	UnknownPropertyException,
+                                                                            WrappedTargetException, 
                                                                             UsrSystemException) )
 {
-
+    
 }
 
-void MyPersistObject::removeVetoableChangeListener( const UString& PropertyName,
-                                    const XVetoableChangeListenerRef& aListener)
-                                                                THROWS( (   UnknownPropertyException,
-                                                                            WrappedTargetException,
+void MyPersistObject::removeVetoableChangeListener(	const UString& PropertyName, 
+                                    const XVetoableChangeListenerRef& aListener) 
+                                                                THROWS( (	UnknownPropertyException, 
+                                                                            WrappedTargetException, 
                                                                             UsrSystemException) )
 {
-
+    
 }
 
 
-
+    
 BOOL MyPersistObject::queryInterface( Uik aUik , XInterfaceRef &rOut )
 {
     if( XPersistObject::getSmartUik() == aUik ) {
-        rOut = ( XPersistObject * ) this;
+        rOut = ( XPersistObject * ) this;	
     }
     else if( XPropertySet::getSmartUik() == aUik ) {
-        rOut = ( XPropertySet * ) this;
+        rOut = ( XPropertySet * ) this;	
     }
     else
         return OWeakObject::queryInterface( aUik , rOut );
-
+        
     return TRUE;
 }
 
@@ -591,7 +591,7 @@ UString MyPersistObject::getServiceName() const THROWS( (UsrSystemException) )
     return m_sServiceName;
 }
 
-void MyPersistObject::write( const XObjectOutputStreamRef & rOut )
+void MyPersistObject::write( const XObjectOutputStreamRef & rOut ) 
                                                     THROWS( (IOException,UsrSystemException))
 {
     rOut->writeLong( m_l);
@@ -605,7 +605,7 @@ void MyPersistObject::write( const XObjectOutputStreamRef & rOut )
 }
 
 
-void MyPersistObject::read( const XObjectInputStreamRef & rIn )
+void MyPersistObject::read( const XObjectInputStreamRef & rIn ) 
                                                     THROWS( (IOException, UsrSystemException) )
 {
     m_l = rIn->readLong();
@@ -618,11 +618,11 @@ void MyPersistObject::read( const XObjectInputStreamRef & rIn )
     m_ref = rIn->readObject();
 }
 
-XInterfaceRef OMyPersistObject_CreateInstance( const XMultiServiceFactoryRef & rSMgr )
+XInterfaceRef OMyPersistObject_CreateInstance( const XMultiServiceFactoryRef & rSMgr ) 
                                                     THROWS((Exception))
-{
+{	
     MyPersistObject *p = new MyPersistObject( );
-    XInterfaceRef xService = *p;
+    XInterfaceRef xService = *p;	
     return xService;
 }
 
@@ -638,7 +638,7 @@ UString     OMyPersistObject_getServiceName( ) THROWS( () )
     return L"test.com.sun.star.io.PersistTest";
 }
 
-UString     OMyPersistObject_getImplementationName( ) THROWS( () )
+UString 	OMyPersistObject_getImplementationName( ) THROWS( () )
 {
     return L"test.com.sun.star.io.PersistTest";
 }
@@ -651,22 +651,22 @@ class OObjectStreamTest :
 {
 public:
     OObjectStreamTest( const XMultiServiceFactoryRef &r) : ODataStreamTest(r) {}
-public: // refcounting
-    BOOL                        queryInterface( Uik aUik, XInterfaceRef & rOut );
+public: // refcounting	
+    BOOL						queryInterface( Uik aUik, XInterfaceRef & rOut );
 
-public:
-    virtual void testInvariant(const UString& TestName, const XInterfaceRef& TestObject)
-                                                                THROWS( (   IllegalArgumentException,
+public:	
+    virtual void testInvariant(const UString& TestName, const XInterfaceRef& TestObject) 
+                                                                THROWS( (	IllegalArgumentException, 
                                                                             UsrSystemException) );
 
-    virtual INT32 test( const UString& TestName,
-                        const XInterfaceRef& TestObject,
-                        INT32 hTestHandle)                      THROWS( (   IllegalArgumentException,
+    virtual INT32 test(	const UString& TestName, 
+                        const XInterfaceRef& TestObject, 
+                        INT32 hTestHandle) 						THROWS( (	IllegalArgumentException, 
                                                                             UsrSystemException) );
 
 
 private:
-    void OObjectStreamTest::testObject(     const XObjectOutputStreamRef &rOut,
+    void OObjectStreamTest::testObject( 	const XObjectOutputStreamRef &rOut, 
                                             const XObjectInputStreamRef &rIn );
 
 private:
@@ -679,23 +679,23 @@ BOOL OObjectStreamTest::queryInterface( Uik uik , XInterfaceRef &rOut )
 {
     if( XSimpleTest::getSmartUik() == uik ) {
         rOut = (XSimpleTest *) this;
-    }
+    }	
     else {
         return ODataStreamTest::queryInterface( uik , rOut );
-    }
+    }	
     return TRUE;
 }
 
 
-void OObjectStreamTest::testInvariant( const UString& TestName, const XInterfaceRef& TestObject )
-                                                                THROWS( (   IllegalArgumentException,
+void OObjectStreamTest::testInvariant( const UString& TestName, const XInterfaceRef& TestObject ) 
+                                                                THROWS( (	IllegalArgumentException, 
                                                                             UsrSystemException) )
 {
-
+    
 
     if( L"com.sun.star.io.ObjectInputStream" == TestName ) {
         ODataStreamTest::testInvariant( TestName , TestObject );
-        XObjectInputStreamRef dataInput( TestObject , USR_QUERY );
+        XObjectInputStreamRef dataInput( TestObject , USR_QUERY );		
         XMarkableStreamRef markable( TestObject , USR_QUERY );
         ERROR_ASSERT( dataInput.is() , "XObjectInputStream cannot be queried" );
         ERROR_ASSERT(   markable.is() , "XMarkableStream cannot be queried" );
@@ -704,7 +704,7 @@ void OObjectStreamTest::testInvariant( const UString& TestName, const XInterface
         ODataStreamTest::testInvariant( TestName , TestObject );
         XMarkableStreamRef markable( TestObject , USR_QUERY );
         XObjectOutputStreamRef dataOutput( TestObject , USR_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" );
     }
 
@@ -718,57 +718,57 @@ void OObjectStreamTest::testInvariant( const UString& TestName, const XInterface
 
 }
 
-INT32 OObjectStreamTest::test(  const UString& TestName,
-                        const XInterfaceRef& TestObject,
-                        INT32 hTestHandle)                      THROWS( (   IllegalArgumentException,
+INT32 OObjectStreamTest::test(	const UString& TestName, 
+                        const XInterfaceRef& TestObject, 
+                        INT32 hTestHandle) 						THROWS( (	IllegalArgumentException, 
                                                                             UsrSystemException) )
 {
-    if( L"com.sun.star.io.ObjectInputStream" == TestName ||
+    if( L"com.sun.star.io.ObjectInputStream" == TestName || 
         L"com.sun.star.io.ObjectOutputStream" == TestName )  {
-
+        
         try {
             if( 0 == hTestHandle ) {
                 testInvariant( TestName , TestObject );
             }
             else if( DATASTREAM_TEST_MAX_HANDLE >= hTestHandle ) {
                 INT32 hOldHandle = hTestHandle;
-                hTestHandle = ODataStreamTest::test( L"com.sun.star.io.DataInputStream" ,
+                hTestHandle = ODataStreamTest::test( L"com.sun.star.io.DataInputStream" , 
                                                         TestObject , hTestHandle );
                 if( hTestHandle == -1 ){
                     hTestHandle = hOldHandle;
                 }
             }
             else {
-
+                
                 XActiveDataSinkRef rSink( TestObject, USR_QUERY );
                 XActiveDataSourceRef rSource( TestObject , USR_QUERY );
 
                 XObjectInputStreamRef rInput( TestObject , USR_QUERY );
                 XObjectOutputStreamRef rOutput( TestObject , USR_QUERY );
 
-
+                
                 XInterfaceRef x = m_rFactory->createInstance( L"com.sun.star.io.Pipe");
 
                 XInputStreamRef  rPipeInput( x , USR_QUERY );
                 XOutputStreamRef rPipeOutput( x , USR_QUERY );
-
+                
                 x = m_rFactory->createInstance( L"com.sun.star.io.MarkableInputStream" );
-                XInputStreamRef     markableInput( x , USR_QUERY );
+                XInputStreamRef 	markableInput( x , USR_QUERY );
                 XActiveDataSinkRef markableSink( x , USR_QUERY );
-
+                
                 x = m_rFactory->createInstance( L"com.sun.star.io.MarkableOutputStream" );
-                XOutputStreamRef    markableOutput( x , USR_QUERY );
-                XActiveDataSourceRef    markableSource( x , USR_QUERY );
-
-                OSL_ASSERT( markableInput.is()  );
+                XOutputStreamRef 	markableOutput( x , USR_QUERY );
+                XActiveDataSourceRef	markableSource( x , USR_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( L"com.sun.star.io.ObjectInputStream" );
                     x->queryInterface( XObjectInputStream::getSmartUik() , rInput );
                     x->queryInterface( XActiveDataSink::getSmartUik() , rSink );
@@ -781,7 +781,7 @@ INT32 OObjectStreamTest::test(  const UString& TestName,
 
                 OSL_ASSERT( rPipeInput.is() );
                 OSL_ASSERT( rPipeOutput.is() );
-
+                
                 rSink->setInputStream( markableInput );
                 rSource->setOutputStream( markableOutput );
 
@@ -793,7 +793,7 @@ INT32 OObjectStreamTest::test(  const UString& TestName,
                 }
                 rInput->closeInput();
                 rOutput->closeOutput();
-
+                
             }
         }
         catch( Exception& e )  {
@@ -802,9 +802,9 @@ INT32 OObjectStreamTest::test(  const UString& 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;
@@ -814,7 +814,7 @@ INT32 OObjectStreamTest::test(  const UString& TestName,
         BUILD_ERROR( 0 , "service not supported by test." );
     }
     return hTestHandle;
-}
+}													
 
 
 BOOL compareMyPropertySet( XPropertySetRef &r1 , XPropertySetRef &r2 )
@@ -823,35 +823,35 @@ BOOL compareMyPropertySet( XPropertySetRef &r1 , XPropertySetRef &r2 )
 
     if( r1->getPropertyValue( L"long" ).getReflection() == Void_getReflection() ||
         r2->getPropertyValue( L"long" ).getReflection() == Void_getReflection() ) {
-
+        
         // one of the objects is not the correct propertyset !
         return FALSE;
     }
-
-    b = b && (  r1->getPropertyValue( L"long" ).getINT32() ==
+    
+    b = b && ( 	r1->getPropertyValue( L"long" ).getINT32() == 
                 r2->getPropertyValue( L"long" ).getINT32() );
 
-    b = b && (  r1->getPropertyValue( L"float" ).getFloat() ==
+    b = b && ( 	r1->getPropertyValue( L"float" ).getFloat() == 
                 r2->getPropertyValue( L"float" ).getFloat() );
-
-    b = b && (  r1->getPropertyValue( L"double" ).getDouble() ==
+    
+    b = b && ( 	r1->getPropertyValue( L"double" ).getDouble() == 
                 r2->getPropertyValue( L"double" ).getDouble() );
 
-    b = b && (  r1->getPropertyValue( L"bool" ).getBOOL() ==
+    b = b && ( 	r1->getPropertyValue( L"bool" ).getBOOL() == 
                 r2->getPropertyValue( L"bool" ).getBOOL() );
-
-    b = b && (  r1->getPropertyValue( L"byte" ).getBYTE() ==
+                
+    b = b && ( 	r1->getPropertyValue( L"byte" ).getBYTE() == 
                 r2->getPropertyValue( L"byte" ).getBYTE() );
-
-    b = b && (  r1->getPropertyValue( L"char" ).getChar() ==
+                
+    b = b && ( 	r1->getPropertyValue( L"char" ).getChar() == 
                 r2->getPropertyValue( L"char" ).getChar() );
 
-    b = b && (  r1->getPropertyValue( L"string" ).getString() ==
+    b = b && ( 	r1->getPropertyValue( L"string" ).getString() == 
                 r2->getPropertyValue( L"string" ).getString() );
 
     UsrAny o1 = r1->getPropertyValue( L"object" );
     UsrAny o2 = r2->getPropertyValue( L"object" );
-
+    
     if( o1.getReflection() == XPersistObject_getReflection() ) {
 
         if( o2.getReflection() == XPersistObject_getReflection() ) {
@@ -859,34 +859,34 @@ BOOL compareMyPropertySet( XPropertySetRef &r1 , XPropertySetRef &r2 )
             XPersistObjectRef rPersist2 = *((XPersistObjectRef*) o2.get());
             XPropertySetRef rProp1( rPersist1 , USR_QUERY );
             XPropertySetRef rProp2( rPersist2 , USR_QUERY );
-
-            if( rProp1.is() && rProp2.is() && ! ( rProp1 == rProp2 )
+                        
+            if( rProp1.is() && rProp2.is() && ! ( rProp1 == rProp2 ) 
                 &&( rProp1 != r1 )) {
                     compareMyPropertySet( rProp1 , rProp2 );
-            }
+            }		
         }
         else {
-            b = FALSE;
+            b = FALSE;	
         }
     }
     else {
         if( o2.getReflection() == XPersistObject_getReflection() ) {
-            b = FALSE;
+            b = FALSE;	
         }
     }
 
     return b;
 }
 
-void OObjectStreamTest::testObject(     const XObjectOutputStreamRef &rOut,
+void OObjectStreamTest::testObject( 	const XObjectOutputStreamRef &rOut, 
                                         const XObjectInputStreamRef &rIn )
 {
     ERROR_ASSERT( rOut.is() , "no objectOutputStream" );
     ERROR_ASSERT( rIn.is() , "no objectInputStream" );
-
+    
     XMultiServiceFactoryRef xProv = getProcessServiceManager();
     ERROR_ASSERT( xProv.is() , "no global service manager" );
-
+    
 
     // tests, if saving an object with an unknown service name allows
     // reading the data behind the object !
@@ -920,40 +920,40 @@ void OObjectStreamTest::testObject(     const XObjectOutputStreamRef &rOut,
         XPersistObjectRef persistRef( x , USR_QUERY );
 
         ERROR_ASSERT( persistRef.is() , "couldn't instantiate PersistTest object" );
-
+        
         XPropertySetRef rProp( persistRef , USR_QUERY );
         ERROR_ASSERT( rProp.is() , "test object is no property set " );
-
+    
         UsrAny any;
         any.setINT32( 0x83482 );
         rProp->setPropertyValue( L"long" , any );
-
+        
         any.setFloat( 42.23 );
         rProp->setPropertyValue( L"float" , any );
 
-        any.setDouble(  233.321412 );
+        any.setDouble( 	233.321412 );
         rProp->setPropertyValue( L"double" , any );
-
+        
         any.setBOOL( TRUE );
         rProp->setPropertyValue( L"bool" , any );
 
         any.setBYTE( 130 );
         rProp->setPropertyValue( L"byte" , any );
-
+        
         any.setChar( 'h' );
         rProp->setPropertyValue( L"char" , any );
-
+        
         any.setString( L"hi du !" );
         rProp->setPropertyValue( L"string" , any );
-
+        
         any.set( &persistRef, XPersistObject_getReflection() ); // try a self reference
         rProp->setPropertyValue( L"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" );
-        XPersistObjectRef xReadPersistRef   =   rIn->readObject( );
-
+        XPersistObjectRef xReadPersistRef	= 	rIn->readObject( );
+        
         XPropertySetRef rPropRead( xReadPersistRef , USR_QUERY );
         ERROR_ASSERT( compareMyPropertySet( rProp , rPropRead ) , "objects has not been read properly !" );
 
@@ -965,68 +965,68 @@ void OObjectStreamTest::testObject(     const XObjectOutputStreamRef &rOut,
     {
         XMarkableStreamRef markableOut( rOut , USR_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 ++ ) {
 
             XInterfaceRef x = xProv->createInstance(L"test.com.sun.star.io.PersistTest");
             XPersistObjectRef persistRef( x , USR_QUERY );
-
+        
             XPropertySetRef rProp( persistRef , USR_QUERY );
             ERROR_ASSERT( rProp.is() , "test object is no property set " );
-
+        
             UsrAny any;
             any.setINT32( 0x83482 );
             rProp->setPropertyValue( L"long" , any );
-
+            
             any.setFloat( 42.23 );
             rProp->setPropertyValue( L"float" , any );
-
-            any.setDouble(  233.321412 );
+    
+            any.setDouble( 	233.321412 );
             rProp->setPropertyValue( L"double" , any );
-
+            
             any.setBOOL( TRUE );
             rProp->setPropertyValue( L"bool" , any );
-
+    
             any.setBYTE( 130 );
             rProp->setPropertyValue( L"byte" , any );
-
+            
             any.setChar( 'h' );
             rProp->setPropertyValue( L"char" , any );
-
+            
             any.setString( L"hi du !" );
             rProp->setPropertyValue( L"string" , any );
-
-
+            
+            
             x = xProv->createInstance(L"test.com.sun.star.io.PersistTest");
             XPersistObjectRef persist2ndRef( x , USR_QUERY );
-
-
+            
+    
             // Note : persist2ndRef contains coincident values, but also coincident values must be
-            // saved properly !
+            // saved properly !		
             any.set( &persist2ndRef, XPersistObject_getReflection() ); // try a self reference
             rProp->setPropertyValue( L"object" , any );
-
+            
             // simply test, if markable operations and object operations do not interfere
             INT32 nMark = markableOut->createMark();
 
-            // do read and write
-            rOut->writeObject( persistRef );
-
+            // do read and write 
+            rOut->writeObject( persistRef );	
+            
             // further markable tests !
             INT32 nOffset = markableOut->offsetToMark( nMark );
             markableOut->jumpToMark( nMark );
             markableOut->deleteMark( nMark );
             markableOut->jumpToFurthest();
-
+            
 
 
 
 
             ERROR_ASSERT( 0 != rIn->available() , "no data arrived at input" );
-            XPersistObjectRef xReadPersistRef   =   rIn->readObject( );
-
+            XPersistObjectRef xReadPersistRef	= 	rIn->readObject( );
+            
             XPropertySetRef rProp1( persistRef , USR_QUERY );
             XPropertySetRef rProp2( xReadPersistRef , USR_QUERY );
             ERROR_ASSERT( compareMyPropertySet( rProp1, rProp2) , "objects has not been read properly !" );
@@ -1036,9 +1036,9 @@ void OObjectStreamTest::testObject(     const XObjectOutputStreamRef &rOut,
 
 
 XInterfaceRef OObjectStreamTest_CreateInstance( const XMultiServiceFactoryRef & rSMgr ) THROWS((Exception))
-{
+{	
     OObjectStreamTest *p = new OObjectStreamTest( rSMgr );
-    XInterfaceRef xService = *p;
+    XInterfaceRef xService = *p;	
     return xService;
 }
 
@@ -1053,19 +1053,19 @@ UString     OObjectStreamTest_getServiceName( int i) THROWS( () )
 {
     if( 1 == i ) {
         return L"test.com.sun.star.io.ObjectInputStream";
-    }
+    } 
     else {
-        return L"test.com.sun.star.io.ObjectOutputStream";
+        return L"test.com.sun.star.io.ObjectOutputStream";	
     }
 }
 
-UString     OObjectStreamTest_getImplementationName( int i) THROWS( () )
+UString 	OObjectStreamTest_getImplementationName( int i) THROWS( () )
 {
     if( 1 == i ) {
         return L"test.com.sun.star.comp.extensions.stm.ObjectInputStream";
     }
     else {
-        return L"test.com.sun.star.comp.extensions.stm.ObjectOutputStream";
+        return L"test.com.sun.star.comp.extensions.stm.ObjectOutputStream";	
     }
 }
 
diff --git a/extensions/test/stm/marktest.cxx b/extensions/test/stm/marktest.cxx
index 3043d119c122..1c3c5a0f9d01 100644
--- a/extensions/test/stm/marktest.cxx
+++ b/extensions/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
@@ -66,29 +66,29 @@ public:
     ~OMarkableOutputStreamTest();
 
 public: // refcounting
-    BOOL                        queryInterface( Uik aUik, XInterfaceRef & rOut );
-    void                        acquire()                        { OWeakObject::acquire(); }
-    void                        release()                        { OWeakObject::release(); }
-    void*                       getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
+    BOOL						queryInterface( Uik aUik, XInterfaceRef & rOut );
+    void 						acquire() 						 { OWeakObject::acquire(); }
+    void 						release() 						 { OWeakObject::release(); }
+    void* 						getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
 
 public: // implementation names
-    static Sequence< UString >  getSupportedServiceNames_Static(void) THROWS( () );
-    static UString              getImplementationName_Static() THROWS( () );
+    static Sequence< UString > 	getSupportedServiceNames_Static(void) THROWS( () );
+    static UString 				getImplementationName_Static() THROWS( () );
 
 public:
     virtual void testInvariant(const UString& TestName, const XInterfaceRef& TestObject)
-                                                                THROWS( (   IllegalArgumentException,
+                                                                THROWS( (	IllegalArgumentException,
                                                                             UsrSystemException) );
 
-    virtual INT32 test( const UString& TestName,
+    virtual INT32 test(	const UString& TestName,
                         const XInterfaceRef& TestObject,
-                        INT32 hTestHandle)                      THROWS( (   IllegalArgumentException,
+                        INT32 hTestHandle) 						THROWS( (	IllegalArgumentException,
                                                                             UsrSystemException) );
 
-    virtual BOOL testPassed(void)                               THROWS( (   UsrSystemException) );
-    virtual Sequence< UString > getErrors(void)                 THROWS( (UsrSystemException) );
-    virtual Sequence< UsrAny > getErrorExceptions(void)         THROWS( (UsrSystemException) );
-    virtual Sequence< UString > getWarnings(void)               THROWS( (UsrSystemException) );
+    virtual BOOL testPassed(void) 								THROWS( (	UsrSystemException) );
+    virtual Sequence< UString > getErrors(void) 				THROWS( (UsrSystemException) );
+    virtual Sequence< UsrAny > getErrorExceptions(void) 		THROWS( (UsrSystemException) );
+    virtual Sequence< UString > getWarnings(void) 				THROWS( (UsrSystemException) );
 
 private:
     void testSimple( const XOutputStreamRef &r, const XInputStreamRef &rInput );
@@ -126,7 +126,7 @@ BOOL OMarkableOutputStreamTest::queryInterface( Uik uik , XInterfaceRef &rOut )
 
 
 void OMarkableOutputStreamTest::testInvariant( const UString& TestName, const XInterfaceRef& TestObject )
-                                                                THROWS( (   IllegalArgumentException,
+                                                                THROWS( (	IllegalArgumentException,
                                                                             UsrSystemException) )
 {
     XServiceInfoRef info( TestObject, USR_QUERY );
@@ -139,9 +139,9 @@ void OMarkableOutputStreamTest::testInvariant( const UString& TestName, const XI
 }
 
 
-INT32 OMarkableOutputStreamTest::test(  const UString& TestName,
+INT32 OMarkableOutputStreamTest::test(	const UString& TestName,
                         const XInterfaceRef& TestObject,
-                        INT32 hTestHandle)                      THROWS( (   IllegalArgumentException,
+                        INT32 hTestHandle) 						THROWS( (	IllegalArgumentException,
                                                                             UsrSystemException) )
 {
     if( L"com.sun.star.io.MarkableOutputStream" == TestName )  {
@@ -190,13 +190,13 @@ INT32 OMarkableOutputStreamTest::test(  const UString& TestName,
 
 
 
-BOOL OMarkableOutputStreamTest::testPassed(void)                        THROWS( (UsrSystemException) )
+BOOL OMarkableOutputStreamTest::testPassed(void) 						THROWS( (UsrSystemException) )
 {
     return m_seqErrors.getLen() == 0;
 }
 
 
-Sequence< UString > OMarkableOutputStreamTest::getErrors(void)      THROWS( (UsrSystemException) )
+Sequence< UString > OMarkableOutputStreamTest::getErrors(void) 		THROWS( (UsrSystemException) )
 {
     return m_seqErrors;
 }
@@ -208,13 +208,13 @@ Sequence< UsrAny > OMarkableOutputStreamTest::getErrorExceptions(void) THROWS( (
 }
 
 
-Sequence< UString > OMarkableOutputStreamTest::getWarnings(void)        THROWS( (UsrSystemException) )
+Sequence< UString > OMarkableOutputStreamTest::getWarnings(void) 		THROWS( (UsrSystemException) )
 {
     return m_seqWarnings;
 }
 
 
-void OMarkableOutputStreamTest::testSimple(     const XOutputStreamRef &rOutput ,
+void OMarkableOutputStreamTest::testSimple(  	const XOutputStreamRef &rOutput ,
                                                 const XInputStreamRef &rInput )
 {
     XMarkableStreamRef rMarkable( rOutput , USR_QUERY );
@@ -404,7 +404,7 @@ UString     OMarkableOutputStreamTest_getServiceName() THROWS( () )
     return L"test.com.sun.star.io.MarkableOutputStream";
 }
 
-UString     OMarkableOutputStreamTest_getImplementationName() THROWS( () )
+UString 	OMarkableOutputStreamTest_getImplementationName() THROWS( () )
 {
     return L"test.com.sun.starextensions.stm.MarkableOutputStream";
 }
@@ -428,29 +428,29 @@ public:
     ~OMarkableInputStreamTest();
 
 public: // refcounting
-    BOOL                        queryInterface( Uik aUik, XInterfaceRef & rOut );
-    void                        acquire()                        { OWeakObject::acquire(); }
-    void                        release()                        { OWeakObject::release(); }
-    void*                       getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
+    BOOL						queryInterface( Uik aUik, XInterfaceRef & rOut );
+    void 						acquire() 						 { OWeakObject::acquire(); }
+    void 						release() 						 { OWeakObject::release(); }
+    void* 						getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
 
 public: // implementation names
-    static Sequence< UString >  getSupportedServiceNames_Static(void) THROWS( () );
-    static UString              getImplementationName_Static() THROWS( () );
+    static Sequence< UString > 	getSupportedServiceNames_Static(void) THROWS( () );
+    static UString 				getImplementationName_Static() THROWS( () );
 
 public:
     virtual void testInvariant(const UString& TestName, const XInterfaceRef& TestObject)
-                                                                THROWS( (   IllegalArgumentException,
+                                                                THROWS( (	IllegalArgumentException,
                                                                             UsrSystemException) );
 
-    virtual INT32 test( const UString& TestName,
+    virtual INT32 test(	const UString& TestName,
                         const XInterfaceRef& TestObject,
-                        INT32 hTestHandle)                      THROWS( (   IllegalArgumentException,
+                        INT32 hTestHandle) 						THROWS( (	IllegalArgumentException,
                                                                             UsrSystemException) );
 
-    virtual BOOL testPassed(void)                               THROWS( (   UsrSystemException) );
-    virtual Sequence< UString > getErrors(void)                 THROWS( (UsrSystemException) );
-    virtual Sequence< UsrAny > getErrorExceptions(void)         THROWS( (UsrSystemException) );
-    virtual Sequence< UString > getWarnings(void)               THROWS( (UsrSystemException) );
+    virtual BOOL testPassed(void) 								THROWS( (	UsrSystemException) );
+    virtual Sequence< UString > getErrors(void) 				THROWS( (UsrSystemException) );
+    virtual Sequence< UsrAny > getErrorExceptions(void) 		THROWS( (UsrSystemException) );
+    virtual Sequence< UString > getWarnings(void) 				THROWS( (UsrSystemException) );
 
 private:
     void testSimple( const XOutputStreamRef &r, const XInputStreamRef &rInput );
@@ -488,7 +488,7 @@ BOOL OMarkableInputStreamTest::queryInterface( Uik uik , XInterfaceRef &rOut )
 
 
 void OMarkableInputStreamTest::testInvariant( const UString& TestName, const XInterfaceRef& TestObject )
-                                                                THROWS( (   IllegalArgumentException,
+                                                                THROWS( (	IllegalArgumentException,
                                                                             UsrSystemException) )
 {
     if( L"com.sun.star.io.MarkableInputStream" == TestName )  {
@@ -506,9 +506,9 @@ void OMarkableInputStreamTest::testInvariant( const UString& TestName, const XIn
 }
 
 
-INT32 OMarkableInputStreamTest::test(   const UString& TestName,
+INT32 OMarkableInputStreamTest::test(	const UString& TestName,
                         const XInterfaceRef& TestObject,
-                        INT32 hTestHandle)                      THROWS( (   IllegalArgumentException,
+                        INT32 hTestHandle) 						THROWS( (	IllegalArgumentException,
                                                                             UsrSystemException) )
 {
     if( L"com.sun.star.io.MarkableInputStream" == TestName )  {
@@ -557,31 +557,31 @@ INT32 OMarkableInputStreamTest::test(   const UString& TestName,
 
 
 
-BOOL OMarkableInputStreamTest::testPassed(void)                                         THROWS( (UsrSystemException) )
+BOOL OMarkableInputStreamTest::testPassed(void) 										THROWS( (UsrSystemException) )
 {
     return m_seqErrors.getLen() == 0;
 }
 
 
-Sequence< UString > OMarkableInputStreamTest::getErrors(void)                           THROWS( (UsrSystemException) )
+Sequence< UString > OMarkableInputStreamTest::getErrors(void) 							THROWS( (UsrSystemException) )
 {
     return m_seqErrors;
 }
 
 
-Sequence< UsrAny > OMarkableInputStreamTest::getErrorExceptions(void)                   THROWS( (UsrSystemException) )
+Sequence< UsrAny > OMarkableInputStreamTest::getErrorExceptions(void) 					THROWS( (UsrSystemException) )
 {
     return m_seqExceptions;
 }
 
 
-Sequence< UString > OMarkableInputStreamTest::getWarnings(void)                         THROWS( (UsrSystemException) )
+Sequence< UString > OMarkableInputStreamTest::getWarnings(void) 						THROWS( (UsrSystemException) )
 {
     return m_seqWarnings;
 }
 
 
-void OMarkableInputStreamTest::testSimple(      const XOutputStreamRef &rOutput ,
+void OMarkableInputStreamTest::testSimple(  	const XOutputStreamRef &rOutput ,
                                                 const XInputStreamRef &rInput )
 {
     XMarkableStreamRef rMarkable( rInput , USR_QUERY );
@@ -635,7 +635,7 @@ void OMarkableInputStreamTest::testSimple(      const XOutputStreamRef &rOutput
     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();
@@ -668,7 +668,7 @@ Sequence<UString> OMarkableInputStreamTest_getSupportedServiceNames(void) THROWS
 {
     Sequence<UString> aRet(1);
     aRet.getArray()[0] = OMarkableInputStreamTest_getImplementationName();
-
+    
     return aRet;
 }
 
@@ -677,7 +677,7 @@ UString     OMarkableInputStreamTest_getServiceName() THROWS( () )
     return L"test.com.sun.star.io.MarkableInputStream";
 }
 
-UString     OMarkableInputStreamTest_getImplementationName() THROWS( () )
+UString 	OMarkableInputStreamTest_getImplementationName() THROWS( () )
 {
     return L"test.com.sun.star.extensions.stm.MarkableInputStream";
 }
diff --git a/extensions/test/stm/pipetest.cxx b/extensions/test/stm/pipetest.cxx
index cf74aa2f33c0..d3de76bd9766 100644
--- a/extensions/test/stm/pipetest.cxx
+++ b/extensions/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
@@ -46,8 +46,8 @@
 #include <string.h>
 
 #include "testfactreg.hxx"
-#define IMPLEMENTATION_NAME L"test.com.sun.star.comp.extensions.stm.Pipe"
-#define SERVICE_NAME        L"test.com.sun.star.io.Pipe"
+#define IMPLEMENTATION_NAME	L"test.com.sun.star.comp.extensions.stm.Pipe"
+#define SERVICE_NAME		L"test.com.sun.star.io.Pipe"
 
 #ifndef _VOS_NO_NAMESPACE
 using namespace usr;
@@ -104,29 +104,29 @@ public:
     ~OPipeTest();
 
 public: // refcounting
-    BOOL                        queryInterface( Uik aUik, XInterfaceRef & rOut );
-    void                        acquire()                        { OWeakObject::acquire(); }
-    void                        release()                        { OWeakObject::release(); }
-    void*                       getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
+    BOOL						queryInterface( Uik aUik, XInterfaceRef & rOut );
+    void 						acquire() 						 { OWeakObject::acquire(); }
+    void 						release() 						 { OWeakObject::release(); }
+    void* 						getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
 
 public: // implementation names
-    static Sequence< UString >  getSupportedServiceNames_Static(void) THROWS( () );
-    static UString              getImplementationName_Static() THROWS( () );
+    static Sequence< UString > 	getSupportedServiceNames_Static(void) THROWS( () );
+    static UString 				getImplementationName_Static() THROWS( () );
 
 public:
     virtual void testInvariant(const UString& TestName, const XInterfaceRef& TestObject)
-                                                                THROWS( (   IllegalArgumentException,
+                                                                THROWS( (	IllegalArgumentException,
                                                                             UsrSystemException) );
 
-    virtual INT32 test( const UString& TestName,
+    virtual INT32 test(	const UString& TestName,
                         const XInterfaceRef& TestObject,
-                        INT32 hTestHandle)                      THROWS( (   IllegalArgumentException,
+                        INT32 hTestHandle) 						THROWS( (	IllegalArgumentException,
                                                                             UsrSystemException) );
 
-    virtual BOOL testPassed(void)                               THROWS( (   UsrSystemException) );
-    virtual Sequence< UString > getErrors(void)                 THROWS( (UsrSystemException) );
-    virtual Sequence< UsrAny > getErrorExceptions(void)         THROWS( (UsrSystemException) );
-    virtual Sequence< UString > getWarnings(void)               THROWS( (UsrSystemException) );
+    virtual BOOL testPassed(void) 								THROWS( (	UsrSystemException) );
+    virtual Sequence< UString > getErrors(void) 				THROWS( (UsrSystemException) );
+    virtual Sequence< UsrAny > getErrorExceptions(void) 		THROWS( (UsrSystemException) );
+    virtual Sequence< UString > getWarnings(void) 				THROWS( (UsrSystemException) );
 
 private:
     void testSimple( const XInterfaceRef & );
@@ -166,7 +166,7 @@ BOOL OPipeTest::queryInterface( Uik uik , XInterfaceRef &rOut )
 
 
 void OPipeTest::testInvariant( const UString& TestName, const XInterfaceRef& TestObject )
-                                                                THROWS( (   IllegalArgumentException,
+                                                                THROWS( (	IllegalArgumentException,
                                                                             UsrSystemException) )
 {
     XServiceInfoRef info( TestObject, USR_QUERY );
@@ -180,9 +180,9 @@ void OPipeTest::testInvariant( const UString& TestName, const XInterfaceRef& Tes
 }
 
 
-INT32 OPipeTest::test(  const UString& TestName,
+INT32 OPipeTest::test(	const UString& TestName,
                         const XInterfaceRef& TestObject,
-                        INT32 hTestHandle)                      THROWS( (   IllegalArgumentException,
+                        INT32 hTestHandle) 						THROWS( (	IllegalArgumentException,
                                                                             UsrSystemException) )
 {
     if( L"com.sun.star.io.Pipe" == TestName )  {
@@ -222,25 +222,25 @@ INT32 OPipeTest::test(  const UString& TestName,
 
 
 
-BOOL OPipeTest::testPassed(void)                                        THROWS( (UsrSystemException) )
+BOOL OPipeTest::testPassed(void) 										THROWS( (UsrSystemException) )
 {
     return m_seqErrors.getLen() == 0;
 }
 
 
-Sequence< UString > OPipeTest::getErrors(void)                          THROWS( (UsrSystemException) )
+Sequence< UString > OPipeTest::getErrors(void) 							THROWS( (UsrSystemException) )
 {
     return m_seqErrors;
 }
 
 
-Sequence< UsrAny > OPipeTest::getErrorExceptions(void)                  THROWS( (UsrSystemException) )
+Sequence< UsrAny > OPipeTest::getErrorExceptions(void) 					THROWS( (UsrSystemException) )
 {
     return m_seqExceptions;
 }
 
 
-Sequence< UString > OPipeTest::getWarnings(void)                        THROWS( (UsrSystemException) )
+Sequence< UString > OPipeTest::getWarnings(void) 						THROWS( (UsrSystemException) )
 {
     return m_seqWarnings;
 }
@@ -283,7 +283,7 @@ void OPipeTest::testSimple( const XInterfaceRef &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.getLen()-5] ) ),
                         "write/read mismatich" );
 
@@ -303,7 +303,7 @@ void OPipeTest::testSimple( const XInterfaceRef &r )
         ERROR_ASSERT( 0 , "writing on a closed stream does not cause an exception" );
     }
     catch (IOException& e ) {
-        e;      // just to suppress warning during compile
+        e; 		// just to suppress warning during compile
     }
 
     ERROR_ASSERT(! input->readBytes( seqRead , 1 ), "eof not found !" );
@@ -314,7 +314,7 @@ void OPipeTest::testSimple( const XInterfaceRef &r )
         ERROR_ASSERT( 0 , "reading from a closed stream does not cause an exception" );
     }
     catch( IOException& e ) {
-        e;          // just to suppress warning during compile
+        e;  		// just to suppress warning during compile
     }
 
 }
@@ -342,7 +342,7 @@ void OPipeTest::testBufferResizing( const XInterfaceRef &r )
 
     for( i = 0 ; i < iMax ; i ++ ) {
         input->readBytes( seqRead, createIntSeq(i).getLen() );
-        ERROR_ASSERT( ! strcmp(     (char*) seqRead.getArray() ,
+        ERROR_ASSERT( ! strcmp( 	(char*) seqRead.getArray() ,
                                     (char*) createIntSeq(i).getArray() ) ,
                         "written/read mismatch\n" );
     }
@@ -381,7 +381,7 @@ void OPipeTest::testMultithreading( const XInterfaceRef &r )
             break;
         }
 
-        ERROR_ASSERT( ! strcmp(     (char*) seqRead.getArray() ,
+        ERROR_ASSERT( ! strcmp( 	(char*) seqRead.getArray() ,
                                     (char*) createIntSeq(i).getArray() ) ,
                         "written/read mismatch\n" );
     }
@@ -390,7 +390,7 @@ void OPipeTest::testMultithreading( const XInterfaceRef &r )
     input->closeInput();
 }
 
-/*  {
+/*	{
         try {
             XInterfaceRef x = xSMgr->createInstance( strService );
 
@@ -398,7 +398,7 @@ void OPipeTest::testMultithreading( const XInterfaceRef &r )
             XOutputStreamRef output( x , USR_QUERY );
 
             OSL_ASSERT( output.is() );
-            while(  TRUE ) {
+            while(	TRUE ) {
                 // basic read/write
                 Sequence<BYTE> seqWrite( 500 );
                 output->writeBytes( seqWrite );
@@ -442,7 +442,7 @@ UString     OPipeTest_getServiceName() THROWS( () )
     return SERVICE_NAME;
 }
 
-UString     OPipeTest_getImplementationName() THROWS( () )
+UString 	OPipeTest_getImplementationName() THROWS( () )
 {
     return IMPLEMENTATION_NAME;
 }
diff --git a/extensions/test/stm/testfactreg.cxx b/extensions/test/stm/testfactreg.cxx
index 9c9e1c050a6c..0ebfa87c57d1 100644
--- a/extensions/test/stm/testfactreg.cxx
+++ b/extensions/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
@@ -30,7 +30,7 @@
 #include "precompiled_extensions.hxx"
 #include <string.h>
 
-#include <usr/reflserv.hxx>  // for EXTERN_SERVICE_CALLTYPE
+#include <usr/reflserv.hxx>  // for EXTERN_SERVICE_CALLTYPE 
 
 #include <usr/factoryhlp.hxx>
 #include "testfactreg.hxx"
@@ -49,7 +49,7 @@ BOOL EXTERN_SERVICE_CALLTYPE exService_writeRegEntry(
         const UNO_INTERFACE(XRegistryKey)* xUnoKey)
 
 {
-    XRegistryKeyRef   xKey;
+    XRegistryKeyRef   xKey;	
     uno2smart(xKey, *xUnoKey);
 
     UString str = UString( L"/" ) + OPipeTest_getImplementationName() + UString( L"/UNO/SERVICES" );
@@ -92,15 +92,15 @@ UNO_INTERFACE(XInterface) EXTERN_SERVICE_CALLTYPE exService_getFactory
 (
     const wchar_t* implementationName,
     const UNO_INTERFACE(XMultiServiceFactory)* xUnoFact,
-    const UNO_INTERFACE(XRegistryKey)*
+    const UNO_INTERFACE(XRegistryKey)* 
 )
 {
     UNO_INTERFACE(XInterface) xUnoRet = {0, 0};
 
-    XInterfaceRef           xRet;
+    XInterfaceRef 			xRet;
     XMultiServiceFactoryRef xSMgr;
-    UString                 aImplementationName(implementationName);
-
+    UString					aImplementationName(implementationName);
+    
     uno2smart(xSMgr, *xUnoFact);
 
     if (aImplementationName == OPipeTest_getImplementationName() )
@@ -112,43 +112,43 @@ UNO_INTERFACE(XInterface) EXTERN_SERVICE_CALLTYPE exService_getFactory
     else if( aImplementationName == ODataStreamTest_getImplementationName(1) ) {
         xRet = createSingleFactory( xSMgr , implementationName,
                                     ODataStreamTest_CreateInstance,
-                                    ODataStreamTest_getSupportedServiceNames(1) );
+                                    ODataStreamTest_getSupportedServiceNames(1) );	
     }
     else if( aImplementationName == ODataStreamTest_getImplementationName(2) ) {
         xRet = createSingleFactory( xSMgr , implementationName,
                                     ODataStreamTest_CreateInstance,
-                                    ODataStreamTest_getSupportedServiceNames(2) );
+                                    ODataStreamTest_getSupportedServiceNames(2) );	
     }
     else if( aImplementationName == OObjectStreamTest_getImplementationName(1) ) {
         xRet = createSingleFactory( xSMgr , implementationName,
                                     OObjectStreamTest_CreateInstance,
-                                    OObjectStreamTest_getSupportedServiceNames(1) );
+                                    OObjectStreamTest_getSupportedServiceNames(1) );	
     }
     else if( aImplementationName == OObjectStreamTest_getImplementationName(2) ) {
         xRet = createSingleFactory( xSMgr , implementationName,
                                     OObjectStreamTest_CreateInstance,
-                                    OObjectStreamTest_getSupportedServiceNames(2) );
+                                    OObjectStreamTest_getSupportedServiceNames(2) );	
     }
     else if( aImplementationName == OMarkableOutputStreamTest_getImplementationName() ) {
         xRet = createSingleFactory( xSMgr , implementationName,
                                     OMarkableOutputStreamTest_CreateInstance,
-                                    OMarkableOutputStreamTest_getSupportedServiceNames() );
+                                    OMarkableOutputStreamTest_getSupportedServiceNames() );	
     }
     else if( aImplementationName == OMarkableInputStreamTest_getImplementationName() ) {
         xRet = createSingleFactory( xSMgr , implementationName,
                                     OMarkableInputStreamTest_CreateInstance,
-                                    OMarkableInputStreamTest_getSupportedServiceNames() );
+                                    OMarkableInputStreamTest_getSupportedServiceNames() );	
     }
     else if( aImplementationName == OMyPersistObject_getImplementationName() ) {
         xRet = createSingleFactory( xSMgr , implementationName,
                                     OMyPersistObject_CreateInstance,
-                                    OMyPersistObject_getSupportedServiceNames() );
+                                    OMyPersistObject_getSupportedServiceNames() );	
     }
     if (xRet.is())
     {
         smart2uno(xRet, xUnoRet);
-    }
-
+    }   
+    
     return xUnoRet;
 }
 
@@ -163,7 +163,7 @@ Sequence<BYTE> createSeq( char * p )
     return seq;
 }
 
-Sequence<BYTE> createIntSeq( INT32 i )
+Sequence<BYTE> createIntSeq( INT32 i ) 
 {
     char pcCount[20];
     sprintf( pcCount , "%d" , i );
diff --git a/extensions/test/stm/testfactreg.hxx b/extensions/test/stm/testfactreg.hxx
index 81c22d00b351..07e192a94071 100644
--- a/extensions/test/stm/testfactreg.hxx
+++ b/extensions/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
@@ -28,32 +28,32 @@
 XInterfaceRef OPipeTest_CreateInstance( const XMultiServiceFactoryRef & rSMgr ) THROWS((Exception));
 Sequence<UString> OPipeTest_getSupportedServiceNames(void) THROWS( () );
 UString     OPipeTest_getServiceName() THROWS( () );
-UString     OPipeTest_getImplementationName() THROWS( () );
+UString 	OPipeTest_getImplementationName() THROWS( () );
 
 XInterfaceRef ODataStreamTest_CreateInstance( const XMultiServiceFactoryRef & rSMgr ) THROWS((Exception));
 Sequence<UString> ODataStreamTest_getSupportedServiceNames( int i) THROWS( () );
 UString     ODataStreamTest_getServiceName( int i) THROWS( ( ) );
-UString     ODataStreamTest_getImplementationName( int i) THROWS( () );
+UString 	ODataStreamTest_getImplementationName( int i) THROWS( () );
 
 XInterfaceRef OMarkableOutputStreamTest_CreateInstance( const XMultiServiceFactoryRef & rSMgr ) THROWS((Exception));
 Sequence<UString> OMarkableOutputStreamTest_getSupportedServiceNames(void) THROWS( () );
 UString     OMarkableOutputStreamTest_getServiceName() THROWS( () );
-UString     OMarkableOutputStreamTest_getImplementationName() THROWS( () );
+UString 	OMarkableOutputStreamTest_getImplementationName() THROWS( () );
 
 XInterfaceRef OMarkableInputStreamTest_CreateInstance( const XMultiServiceFactoryRef & rSMgr ) THROWS((Exception));
 Sequence<UString> OMarkableInputStreamTest_getSupportedServiceNames(void) THROWS( () );
 UString     OMarkableInputStreamTest_getServiceName() THROWS( () );
-UString     OMarkableInputStreamTest_getImplementationName() THROWS( () );
+UString 	OMarkableInputStreamTest_getImplementationName() THROWS( () );
 
 XInterfaceRef OObjectStreamTest_CreateInstance( const XMultiServiceFactoryRef & rSMgr ) THROWS((Exception));
 Sequence<UString> OObjectStreamTest_getSupportedServiceNames( int i) THROWS( () );
 UString     OObjectStreamTest_getServiceName( int i) THROWS( () );
-UString     OObjectStreamTest_getImplementationName( int i) THROWS( () );
+UString 	OObjectStreamTest_getImplementationName( int i) THROWS( () );
 
-XInterfaceRef       OMyPersistObject_CreateInstance( const XMultiServiceFactoryRef & rSMgr ) THROWS((Exception));
-Sequence<UString>   OMyPersistObject_getSupportedServiceNames( ) THROWS( () );
-UString             OMyPersistObject_getServiceName( ) THROWS( () );
-UString             OMyPersistObject_getImplementationName( ) THROWS( () );
+XInterfaceRef 		OMyPersistObject_CreateInstance( const XMultiServiceFactoryRef & rSMgr ) THROWS((Exception));
+Sequence<UString> 	OMyPersistObject_getSupportedServiceNames( ) THROWS( () );
+UString     		OMyPersistObject_getServiceName( ) THROWS( () );
+UString 			OMyPersistObject_getImplementationName( ) THROWS( () );
 
 Sequence<BYTE> createSeq( char * p );
 Sequence<BYTE> createIntSeq( INT32 i );
@@ -75,7 +75,7 @@ Sequence<BYTE> createIntSeq( INT32 i );
         m_seqErrors.getArray()[ m_seqErrors.getLen()-1] = StringToOUString( str , CHARSET_SYSTEM ); \
         }\
         ((void)0)
-
+        
 
 #define WARNING_ASSERT(expr, Message) \
         if( ! (expr) ) { \
diff --git a/extensions/util/hidother.src b/extensions/util/hidother.src
index e890400d6ad8..48f2e8ec8aba 100644
--- a/extensions/util/hidother.src
+++ b/extensions/util/hidother.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,54 +31,54 @@
 #include "../inc/propctrlr.hrc"
 #include "../inc/update.hrc"
 
-hidspecial HID_ABSPILOT                         { HelpId = HID_ABSPILOT; }
-hidspecial HID_ABSPILOT_CANCEL                  { HelpId = HID_ABSPILOT_CANCEL; }
-hidspecial HID_ABSPILOT_FINISH                  { HelpId = HID_ABSPILOT_FINISH; }
-hidspecial HID_ABSPILOT_NEXT                    { HelpId = HID_ABSPILOT_NEXT; }
-hidspecial HID_ABSPILOT_PREVIOUS                { HelpId = HID_ABSPILOT_PREVIOUS; }
+hidspecial HID_ABSPILOT							{ HelpId = HID_ABSPILOT; }
+hidspecial HID_ABSPILOT_CANCEL					{ HelpId = HID_ABSPILOT_CANCEL; }
+hidspecial HID_ABSPILOT_FINISH					{ HelpId = HID_ABSPILOT_FINISH; }
+hidspecial HID_ABSPILOT_NEXT					{ HelpId = HID_ABSPILOT_NEXT; }
+hidspecial HID_ABSPILOT_PREVIOUS				{ HelpId = HID_ABSPILOT_PREVIOUS; }
 
-hidspecial HID_BIB_ADDRESS_POS                  { HelpId = HID_BIB_ADDRESS_POS; }
-hidspecial HID_BIB_ANNOTE_POS                   { HelpId = HID_BIB_ANNOTE_POS; }
-hidspecial HID_BIB_AUTHORITYTYPE_POS            { HelpId = HID_BIB_AUTHORITYTYPE_POS; }
-hidspecial HID_BIB_AUTHOR_POS                   { HelpId = HID_BIB_AUTHOR_POS; }
-hidspecial HID_BIB_BOOKTITLE_POS                { HelpId = HID_BIB_BOOKTITLE_POS; }
-hidspecial HID_BIB_CHANGESOURCE                 { HelpId = HID_BIB_CHANGESOURCE; }
-hidspecial HID_BIB_CHAPTER_POS                  { HelpId = HID_BIB_CHAPTER_POS; }
-hidspecial HID_BIB_CONTROL_PAGE                 { HelpId = HID_BIB_CONTROL_PAGE; }
-hidspecial HID_BIB_CONTROL_PARENT               { HelpId = HID_BIB_CONTROL_PARENT; }
-hidspecial HID_BIB_CUSTOM1_POS                  { HelpId = HID_BIB_CUSTOM1_POS; }
-hidspecial HID_BIB_CUSTOM2_POS                  { HelpId = HID_BIB_CUSTOM2_POS; }
-hidspecial HID_BIB_CUSTOM3_POS                  { HelpId = HID_BIB_CUSTOM3_POS; }
-hidspecial HID_BIB_CUSTOM4_POS                  { HelpId = HID_BIB_CUSTOM4_POS; }
-hidspecial HID_BIB_CUSTOM5_POS                  { HelpId = HID_BIB_CUSTOM5_POS; }
-hidspecial HID_BIB_DB_GRIDCTRL                  { HelpId = HID_BIB_DB_GRIDCTRL; }
-hidspecial HID_BIB_DB_TBX                       { HelpId = HID_BIB_DB_TBX; }
+hidspecial HID_BIB_ADDRESS_POS					{ HelpId = HID_BIB_ADDRESS_POS; }
+hidspecial HID_BIB_ANNOTE_POS					{ HelpId = HID_BIB_ANNOTE_POS; }
+hidspecial HID_BIB_AUTHORITYTYPE_POS			{ HelpId = HID_BIB_AUTHORITYTYPE_POS; }
+hidspecial HID_BIB_AUTHOR_POS					{ HelpId = HID_BIB_AUTHOR_POS; }
+hidspecial HID_BIB_BOOKTITLE_POS				{ HelpId = HID_BIB_BOOKTITLE_POS; }
+hidspecial HID_BIB_CHANGESOURCE					{ HelpId = HID_BIB_CHANGESOURCE; }
+hidspecial HID_BIB_CHAPTER_POS					{ HelpId = HID_BIB_CHAPTER_POS; }
+hidspecial HID_BIB_CONTROL_PAGE					{ HelpId = HID_BIB_CONTROL_PAGE; }
+hidspecial HID_BIB_CONTROL_PARENT				{ HelpId = HID_BIB_CONTROL_PARENT; }
+hidspecial HID_BIB_CUSTOM1_POS					{ HelpId = HID_BIB_CUSTOM1_POS; }
+hidspecial HID_BIB_CUSTOM2_POS					{ HelpId = HID_BIB_CUSTOM2_POS; }
+hidspecial HID_BIB_CUSTOM3_POS					{ HelpId = HID_BIB_CUSTOM3_POS; }
+hidspecial HID_BIB_CUSTOM4_POS					{ HelpId = HID_BIB_CUSTOM4_POS; }
+hidspecial HID_BIB_CUSTOM5_POS					{ HelpId = HID_BIB_CUSTOM5_POS; }
+hidspecial HID_BIB_DB_GRIDCTRL					{ HelpId = HID_BIB_DB_GRIDCTRL; }
+hidspecial HID_BIB_DB_TBX						{ HelpId = HID_BIB_DB_TBX; }
 hidspecial HID_BIB_DELETE_RECORD                { HelpId = HID_BIB_DELETE_RECORD; }
-hidspecial HID_BIB_EDITION_POS                  { HelpId = HID_BIB_EDITION_POS; }
-hidspecial HID_BIB_EDITOR_POS                   { HelpId = HID_BIB_EDITOR_POS; }
-hidspecial HID_BIB_HOWPUBLISHED_POS             { HelpId = HID_BIB_HOWPUBLISHED_POS; }
-hidspecial HID_BIB_IDENTIFIER_POS               { HelpId = HID_BIB_IDENTIFIER_POS; }
+hidspecial HID_BIB_EDITION_POS					{ HelpId = HID_BIB_EDITION_POS; }
+hidspecial HID_BIB_EDITOR_POS					{ HelpId = HID_BIB_EDITOR_POS; }
+hidspecial HID_BIB_HOWPUBLISHED_POS				{ HelpId = HID_BIB_HOWPUBLISHED_POS; }
+hidspecial HID_BIB_IDENTIFIER_POS				{ HelpId = HID_BIB_IDENTIFIER_POS; }
 hidspecial HID_BIB_INSERT_RECORD                { HelpId = HID_BIB_INSERT_RECORD; }
-hidspecial HID_BIB_INSTITUTION_POS              { HelpId = HID_BIB_INSTITUTION_POS; }
-hidspecial HID_BIB_ISBN_POS                     { HelpId = HID_BIB_ISBN_POS; }
-hidspecial HID_BIB_JOURNAL_POS                  { HelpId = HID_BIB_JOURNAL_POS; }
-hidspecial HID_BIB_MAPPINGDLG                   { HelpId = HID_BIB_MAPPINGDLG; }
-hidspecial HID_BIB_MONTH_POS                    { HelpId = HID_BIB_MONTH_POS; }
-hidspecial HID_BIB_NOTE_POS                     { HelpId = HID_BIB_NOTE_POS; }
-hidspecial HID_BIB_NUMBER_POS                   { HelpId = HID_BIB_NUMBER_POS; }
-hidspecial HID_BIB_ORGANIZATIONS_POS            { HelpId = HID_BIB_ORGANIZATIONS_POS; }
-hidspecial HID_BIB_PAGES_POS                    { HelpId = HID_BIB_PAGES_POS; }
-hidspecial HID_BIB_PUBLISHER_POS                { HelpId = HID_BIB_PUBLISHER_POS; }
-hidspecial HID_BIB_REPORTTYPE_POS               { HelpId = HID_BIB_REPORTTYPE_POS; }
-hidspecial HID_BIB_SCHOOL_POS                   { HelpId = HID_BIB_SCHOOL_POS; }
-hidspecial HID_BIB_SERIES_POS                   { HelpId = HID_BIB_SERIES_POS; }
-hidspecial HID_BIB_TBX_AUTOFILTER               { HelpId = HID_BIB_TBX_AUTOFILTER; }
-hidspecial HID_BIB_TBX_SEARCH                   { HelpId = HID_BIB_TBX_SEARCH; }
-hidspecial HID_BIB_TBX_TABLE                    { HelpId = HID_BIB_TBX_TABLE; }
-hidspecial HID_BIB_TITLE_POS                    { HelpId = HID_BIB_TITLE_POS; }
-hidspecial HID_BIB_URL_POS                      { HelpId = HID_BIB_URL_POS; }
-hidspecial HID_BIB_VOLUME_POS                   { HelpId = HID_BIB_VOLUME_POS; }
-hidspecial HID_BIB_YEAR_POS                     { HelpId = HID_BIB_YEAR_POS; }
+hidspecial HID_BIB_INSTITUTION_POS				{ HelpId = HID_BIB_INSTITUTION_POS; }
+hidspecial HID_BIB_ISBN_POS						{ HelpId = HID_BIB_ISBN_POS; }
+hidspecial HID_BIB_JOURNAL_POS					{ HelpId = HID_BIB_JOURNAL_POS; }
+hidspecial HID_BIB_MAPPINGDLG					{ HelpId = HID_BIB_MAPPINGDLG; }
+hidspecial HID_BIB_MONTH_POS					{ HelpId = HID_BIB_MONTH_POS; }
+hidspecial HID_BIB_NOTE_POS						{ HelpId = HID_BIB_NOTE_POS; }
+hidspecial HID_BIB_NUMBER_POS					{ HelpId = HID_BIB_NUMBER_POS; }
+hidspecial HID_BIB_ORGANIZATIONS_POS			{ HelpId = HID_BIB_ORGANIZATIONS_POS; }
+hidspecial HID_BIB_PAGES_POS					{ HelpId = HID_BIB_PAGES_POS; }
+hidspecial HID_BIB_PUBLISHER_POS				{ HelpId = HID_BIB_PUBLISHER_POS; }
+hidspecial HID_BIB_REPORTTYPE_POS				{ HelpId = HID_BIB_REPORTTYPE_POS; }
+hidspecial HID_BIB_SCHOOL_POS					{ HelpId = HID_BIB_SCHOOL_POS; }
+hidspecial HID_BIB_SERIES_POS					{ HelpId = HID_BIB_SERIES_POS; }
+hidspecial HID_BIB_TBX_AUTOFILTER				{ HelpId = HID_BIB_TBX_AUTOFILTER; }
+hidspecial HID_BIB_TBX_SEARCH					{ HelpId = HID_BIB_TBX_SEARCH; }
+hidspecial HID_BIB_TBX_TABLE					{ HelpId = HID_BIB_TBX_TABLE; }
+hidspecial HID_BIB_TITLE_POS					{ HelpId = HID_BIB_TITLE_POS; }
+hidspecial HID_BIB_URL_POS						{ HelpId = HID_BIB_URL_POS; }
+hidspecial HID_BIB_VOLUME_POS					{ HelpId = HID_BIB_VOLUME_POS; }
+hidspecial HID_BIB_YEAR_POS						{ HelpId = HID_BIB_YEAR_POS; }
 
 hidspecial HID_CHECK_FOR_UPD_CANCEL             { HelpId = HID_CHECK_FOR_UPD_CANCEL; }
 hidspecial HID_CHECK_FOR_UPD_CLOSE              { HelpId = HID_CHECK_FOR_UPD_CLOSE; }
@@ -131,19 +131,19 @@ hidspecial HID_EVT_UNLOADING                    { HelpId = HID_EVT_UNLOADING; }
 hidspecial HID_FIELDLINK_DETAIL_COLUMN          { HelpId = HID_FIELDLINK_DETAIL_COLUMN; }
 hidspecial HID_FIELDLINK_MASTER_COLUMN          { HelpId = HID_FIELDLINK_MASTER_COLUMN; }
 
-hidspecial HID_GRIDWIZARD_CANCEL                { HelpId = HID_GRIDWIZARD_CANCEL; }
-hidspecial HID_GRIDWIZARD_FINISH                { HelpId = HID_GRIDWIZARD_FINISH; }
-hidspecial HID_GRIDWIZARD_NEXT                  { HelpId = HID_GRIDWIZARD_NEXT; }
-hidspecial HID_GRIDWIZARD_PREVIOUS              { HelpId = HID_GRIDWIZARD_PREVIOUS; };
-hidspecial HID_GROUPWIZARD_CANCEL               { HelpId = HID_GROUPWIZARD_CANCEL; }
-hidspecial HID_GROUPWIZARD_FINISH               { HelpId = HID_GROUPWIZARD_FINISH; }
-hidspecial HID_GROUPWIZARD_NEXT                 { HelpId = HID_GROUPWIZARD_NEXT; }
-hidspecial HID_GROUPWIZARD_PREVIOUS             { HelpId = HID_GROUPWIZARD_PREVIOUS; }
+hidspecial HID_GRIDWIZARD_CANCEL				{ HelpId = HID_GRIDWIZARD_CANCEL; }
+hidspecial HID_GRIDWIZARD_FINISH				{ HelpId = HID_GRIDWIZARD_FINISH; }
+hidspecial HID_GRIDWIZARD_NEXT					{ HelpId = HID_GRIDWIZARD_NEXT; }
+hidspecial HID_GRIDWIZARD_PREVIOUS				{ HelpId = HID_GRIDWIZARD_PREVIOUS; };
+hidspecial HID_GROUPWIZARD_CANCEL				{ HelpId = HID_GROUPWIZARD_CANCEL; }
+hidspecial HID_GROUPWIZARD_FINISH				{ HelpId = HID_GROUPWIZARD_FINISH; }
+hidspecial HID_GROUPWIZARD_NEXT					{ HelpId = HID_GROUPWIZARD_NEXT; }
+hidspecial HID_GROUPWIZARD_PREVIOUS				{ HelpId = HID_GROUPWIZARD_PREVIOUS; }
 
-hidspecial HID_LISTWIZARD_CANCEL                { HelpId = HID_LISTWIZARD_CANCEL; }
-hidspecial HID_LISTWIZARD_FINISH                { HelpId = HID_LISTWIZARD_FINISH; }
-hidspecial HID_LISTWIZARD_NEXT                  { HelpId = HID_LISTWIZARD_NEXT; }
-hidspecial HID_LISTWIZARD_PREVIOUS              { HelpId = HID_LISTWIZARD_PREVIOUS; }
+hidspecial HID_LISTWIZARD_CANCEL				{ HelpId = HID_LISTWIZARD_CANCEL; }
+hidspecial HID_LISTWIZARD_FINISH				{ HelpId = HID_LISTWIZARD_FINISH; }
+hidspecial HID_LISTWIZARD_NEXT					{ HelpId = HID_LISTWIZARD_NEXT; }
+hidspecial HID_LISTWIZARD_PREVIOUS				{ HelpId = HID_LISTWIZARD_PREVIOUS; }
 
 hidspecial HID_PROP_ALIGN                       { HelpId = HID_PROP_ALIGN; }
 hidspecial HID_PROP_ALLOW_ADDITIONS             { HelpId = HID_PROP_ALLOW_ADDITIONS; }
@@ -265,7 +265,7 @@ hidspecial HID_PROP_SCROLLVALUEMIN              { HelpId = HID_PROP_SCROLLVALUE_
 hidspecial HID_PROP_SCROLLVALUE_MAX             { HelpId = HID_PROP_SCROLLVALUE_MAX; }
 hidspecial HID_PROP_SCROLLVALUE_MIN             { HelpId = HID_PROP_SCROLLVALUE_MIN; }
 hidspecial HID_PROP_SEARCHING                   { HelpId = HID_PROP_SEARCHING; }
-hidspecial HID_PROP_SELECTEDITEMS               { HelpId = HID_PROP_SELECTEDITEMS; }
+hidspecial HID_PROP_SELECTEDITEMS				{ HelpId = HID_PROP_SELECTEDITEMS; }
 hidspecial HID_PROP_SELECTION_TYPE              { HelpId = HID_PROP_SELECTION_TYPE; }
 hidspecial HID_PROP_SHOWS_HANDLES               { HelpId = HID_PROP_SHOWS_HANDLES; }
 hidspecial HID_PROP_SHOWS_ROOT_HANDLES          { HelpId = HID_PROP_SHOWS_ROOT_HANDLES; }
@@ -342,7 +342,7 @@ hidspecial HID_PROP_XSD_WHITESPACES             { HelpId = HID_PROP_XSD_WHITESPA
 
 hidspecial HID_SELECTION_TLB                    { HelpId = HID_SELECTION_TLB; }
 
-hidspecial UID_ABSPILOT_HELP                    { HelpId = UID_ABSPILOT_HELP; }
+hidspecial UID_ABSPILOT_HELP					{ HelpId = UID_ABSPILOT_HELP; }
 hidspecial UID_BIB_FRAME_WINDOW                 { HelpId = UID_BIB_FRAME_WINDOW;}
 
 hidspecial UID_BRWEVT_ACTIONPERFORMED           { HelpId = UID_BRWEVT_ACTIONPERFORMED; }
@@ -391,25 +391,25 @@ hidspecial UID_FIELDLINK_MASTER3                { HelpId = UID_FIELDLINK_MASTER3
 hidspecial UID_FIELDLINK_MASTER4                { HelpId = UID_FIELDLINK_MASTER4; }
 
 hidspecial UID_PROP_ADD_DATA_TYPE               { HelpId = UID_PROP_ADD_DATA_TYPE; }
+hidspecial UID_PROP_DLG_ATTR_DATASOURCE			{ HelpId = UID_PROP_DLG_ATTR_DATASOURCE; }
 hidspecial UID_PROP_DLG_ATTR_DATASOURCE         { HelpId = UID_PROP_DLG_ATTR_DATASOURCE; }
-hidspecial UID_PROP_DLG_ATTR_DATASOURCE         { HelpId = UID_PROP_DLG_ATTR_DATASOURCE; }
-hidspecial UID_PROP_DLG_ATTR_TARGET_URL         { HelpId = UID_PROP_DLG_ATTR_TARGET_URL; }
+hidspecial UID_PROP_DLG_ATTR_TARGET_URL			{ HelpId = UID_PROP_DLG_ATTR_TARGET_URL; }
 hidspecial UID_PROP_DLG_ATTR_TARGET_URL         { HelpId = UID_PROP_DLG_ATTR_TARGET_URL; }
-hidspecial UID_PROP_DLG_BACKGROUNDCOLOR         { HelpId = UID_PROP_DLG_BACKGROUNDCOLOR; }
+hidspecial UID_PROP_DLG_BACKGROUNDCOLOR			{ HelpId = UID_PROP_DLG_BACKGROUNDCOLOR; }
 hidspecial UID_PROP_DLG_BACKGROUNDCOLOR         { HelpId = UID_PROP_DLG_BACKGROUNDCOLOR; }
 hidspecial UID_PROP_DLG_BIND_EXPRESSION         { HelpId = UID_PROP_DLG_BIND_EXPRESSION; }
 hidspecial UID_PROP_DLG_BORDERCOLOR             { HelpId = UID_PROP_DLG_BORDERCOLOR; }
+hidspecial UID_PROP_DLG_CONTROLLABEL			{ HelpId = UID_PROP_DLG_CONTROLLABEL; }
 hidspecial UID_PROP_DLG_CONTROLLABEL            { HelpId = UID_PROP_DLG_CONTROLLABEL; }
-hidspecial UID_PROP_DLG_CONTROLLABEL            { HelpId = UID_PROP_DLG_CONTROLLABEL; }
-hidspecial UID_PROP_DLG_FILLCOLOR               { HelpId = UID_PROP_DLG_FILLCOLOR; }
+hidspecial UID_PROP_DLG_FILLCOLOR				{ HelpId = UID_PROP_DLG_FILLCOLOR; }
 hidspecial UID_PROP_DLG_FILLCOLOR               { HelpId = UID_PROP_DLG_FILLCOLOR; }
 hidspecial UID_PROP_DLG_FILTER                  { HelpId = UID_PROP_DLG_FILTER; }
-hidspecial UID_PROP_DLG_FONT_TYPE               { HelpId = UID_PROP_DLG_FONT_TYPE; }
+hidspecial UID_PROP_DLG_FONT_TYPE				{ HelpId = UID_PROP_DLG_FONT_TYPE; }
 hidspecial UID_PROP_DLG_FONT_TYPE               { HelpId = UID_PROP_DLG_FONT_TYPE; }
 hidspecial UID_PROP_DLG_FORMLINKFIELDS          { HelpId = UID_PROP_DLG_FORMLINKFIELDS; }
+hidspecial UID_PROP_DLG_IMAGE_URL				{ HelpId = UID_PROP_DLG_IMAGE_URL; }
 hidspecial UID_PROP_DLG_IMAGE_URL               { HelpId = UID_PROP_DLG_IMAGE_URL; }
-hidspecial UID_PROP_DLG_IMAGE_URL               { HelpId = UID_PROP_DLG_IMAGE_URL; }
-hidspecial UID_PROP_DLG_NUMBER_FORMAT           { HelpId = UID_PROP_DLG_NUMBER_FORMAT; }
+hidspecial UID_PROP_DLG_NUMBER_FORMAT			{ HelpId = UID_PROP_DLG_NUMBER_FORMAT; }
 hidspecial UID_PROP_DLG_NUMBER_FORMAT           { HelpId = UID_PROP_DLG_NUMBER_FORMAT; }
 hidspecial UID_PROP_DLG_ORDER                   { HelpId = UID_PROP_DLG_ORDER; }
 hidspecial UID_PROP_DLG_SELECTION               { HelpId = UID_PROP_DLG_SELECTION; }
diff --git a/extensions/workben/pythonautotest.cxx b/extensions/workben/pythonautotest.cxx
index aab403885835..1b44b17ef392 100644
--- a/extensions/workben/pythonautotest.cxx
+++ b/extensions/workben/pythonautotest.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,34 +63,34 @@ class MyPythonRoot :
 {
 public:
     MyPythonRoot() { m_iTestValue = 15; }
-    BOOL                queryInterface( Uik aUik, XInterfaceRef & rOut );
-    void                acquire()                        { OWeakObject::acquire(); }
-    void                release()                        { OWeakObject::release(); }
-    void*               getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
+    BOOL				queryInterface( Uik aUik, XInterfaceRef & rOut );
+    void 				acquire() 						 { OWeakObject::acquire(); }
+    void 				release() 						 { OWeakObject::release(); }
+    void* 				getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
 
 public:
-    XIntrospectionAccessRef getIntrospection(void) const        THROWS( (UsrSystemException) )
+    XIntrospectionAccessRef getIntrospection(void) const 		THROWS( (UsrSystemException) )
                 { return XIntrospectionAccessRef();  }
 
-    UsrAny                  invoke( const UString& FunctionName,
+    UsrAny					invoke(	const UString& FunctionName,
                                     const Sequence< UsrAny >& Params,
                                     Sequence< INT16 >& OutParamIndex,
                                     Sequence< UsrAny >& OutParam)
-                                                                THROWS( (   IllegalArgumentException,
+                                                                THROWS( (	IllegalArgumentException,
                                                                             CannotConvertException,
                                                                             InvocationTargetException,
                                                                             UsrSystemException) );
-    void                    setValue(const UString& PropertyName, const UsrAny& Value)
-                                                                THROWS( (   UnknownPropertyException,
+    void					setValue(const UString& PropertyName, const UsrAny& Value)
+                                                                THROWS( (	UnknownPropertyException,
                                                                             CannotConvertException,
                                                                             InvocationTargetException,
                                                                             UsrSystemException) );
 
-    UsrAny                  getValue(const UString& PropertyName)
-                                                                THROWS( (   UnknownPropertyException,
+    UsrAny					getValue(const UString& PropertyName)
+                                                                THROWS( (	UnknownPropertyException,
                                                                             UsrSystemException) );
-    BOOL                    hasMethod(const UString& Name) const THROWS( (UsrSystemException) );
-    BOOL                    hasProperty(const UString& Name) const THROWS( (UsrSystemException) );
+    BOOL					hasMethod(const UString& Name) const THROWS( (UsrSystemException) );
+    BOOL					hasProperty(const UString& Name) const THROWS( (UsrSystemException) );
 
 
     void getTestValueViaInout( int &inout )
@@ -125,11 +125,11 @@ BOOL MyPythonRoot::queryInterface( Uik aUik, XInterfaceRef &rOut )
 
 }
 
-UsrAny  MyPythonRoot::invoke(   const UString& FunctionName,
+UsrAny	MyPythonRoot::invoke(	const UString& FunctionName,
                                 const Sequence< UsrAny >& Params,
                                 Sequence< INT16 >& OutParamIndex,
                                 Sequence< UsrAny >& OutParam)
-                                                                THROWS( (   IllegalArgumentException,
+                                                                THROWS( (	IllegalArgumentException,
                                                                             CannotConvertException,
                                                                             InvocationTargetException,
                                                                             UsrSystemException) )
@@ -152,8 +152,8 @@ UsrAny  MyPythonRoot::invoke(   const UString& FunctionName,
     return UsrAny();
 }
 
-void    MyPythonRoot::setValue(const UString& PropertyName, const UsrAny& Value)
-                                                                THROWS( (   UnknownPropertyException,
+void	MyPythonRoot::setValue(const UString& PropertyName, const UsrAny& Value)
+                                                                THROWS( (	UnknownPropertyException,
                                                                             CannotConvertException,
                                                                             InvocationTargetException,
                                                                             UsrSystemException) )
@@ -166,8 +166,8 @@ void    MyPythonRoot::setValue(const UString& PropertyName, const UsrAny& Value)
     }
 }
 
-UsrAny  MyPythonRoot::getValue(const UString& PropertyName)
-                                                                THROWS( (   UnknownPropertyException,
+UsrAny	MyPythonRoot::getValue(const UString& PropertyName)
+                                                                THROWS( (	UnknownPropertyException,
                                                                             UsrSystemException) )
 {
     UsrAny aRet;
@@ -183,7 +183,7 @@ UsrAny  MyPythonRoot::getValue(const UString& PropertyName)
 }
 
 
-BOOL    MyPythonRoot::hasMethod(const UString& Name) const      THROWS( (UsrSystemException) )
+BOOL	MyPythonRoot::hasMethod(const UString& Name) const 		THROWS( (UsrSystemException) )
 {
     if( L"printTestValue" == Name ) {
         return TRUE;
@@ -198,7 +198,7 @@ BOOL    MyPythonRoot::hasMethod(const UString& Name) const      THROWS( (UsrSyst
 }
 
 
-BOOL    MyPythonRoot::hasProperty(const UString& Name) const THROWS( (UsrSystemException) )
+BOOL	MyPythonRoot::hasProperty(const UString& Name) const THROWS( (UsrSystemException) )
 {
     if( L"TestValue" == Name ) {
         return TRUE;
@@ -237,10 +237,10 @@ public:
         }
     }
 
-    BOOL                queryInterface( Uik aUik, XInterfaceRef & rOut );
-    void                acquire()                        { OWeakObject::acquire(); }
-    void                release()                        { OWeakObject::release(); }
-    void*               getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
+    BOOL				queryInterface( Uik aUik, XInterfaceRef & rOut );
+    void 				acquire() 						 { OWeakObject::acquire(); }
+    void 				release() 						 { OWeakObject::release(); }
+    void* 				getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
 
 
     void attach( XDebuggingRef *p )
@@ -331,7 +331,7 @@ void checkInvokation( const XInvokationRef &xInvoke )
     any = (*pRef)->invoke( L"count" , seq , Sequence<INT16>(), Sequence<UsrAny>() );
     int nOldSize = any.getINT32();
 
-    any = (*pRef)->invoke( L"append" , seq  , Sequence<INT16>(), Sequence<UsrAny>() );
+    any = (*pRef)->invoke( L"append" , seq	, Sequence<INT16>(), Sequence<UsrAny>() );
     any = (*pRef)->invoke( L"count" , seq , Sequence<INT16>(), Sequence<UsrAny>() );
 
     OSL_ASSERT( nOldSize + 1 == any.getINT32() );
@@ -343,32 +343,32 @@ class PythonCodeLibrary :
         public OWeakObject
 {
 
-    BOOL                queryInterface( Uik aUik, XInterfaceRef & rOut );
-    void                acquire()                        { OWeakObject::acquire(); }
-    void                release()                        { OWeakObject::release(); }
-    void*               getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
+    BOOL				queryInterface( Uik aUik, XInterfaceRef & rOut );
+    void 				acquire() 						 { OWeakObject::acquire(); }
+    void 				release() 						 { OWeakObject::release(); }
+    void* 				getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
 
 
-    virtual BOOL isFunction(const UString& FunctionName)            THROWS( (UsrSystemException) )
+    virtual BOOL isFunction(const UString& FunctionName) 			THROWS( (UsrSystemException) )
       {
           return FALSE;
       }
 
-    virtual BOOL isValidPath(const UString& PathName)               THROWS( (UsrSystemException) )
+    virtual BOOL isValidPath(const UString& PathName) 				THROWS( (UsrSystemException) )
     {
         return FALSE;
     }
 
-    virtual Sequence< UString > getModuleNames(void)                THROWS( (UsrSystemException) )
+    virtual Sequence< UString > getModuleNames(void) 				THROWS( (UsrSystemException) )
     {
         return Sequence<UString> ();
     }
 
-    virtual UString getModuleSource(const UString& ModulName)       THROWS( (UsrSystemException) )
+    virtual UString getModuleSource(const UString& ModulName) 		THROWS( (UsrSystemException) )
     {
         if( ModulName == L"testmodul" ) {
             return UString( L"def testmethod():\n"
-                            L"  return 42\n");
+                            L"	return 42\n");
         }
         return UString();
     }
@@ -430,7 +430,7 @@ int __LOADONCALLAPI main (int argc, char **argv)
 
 
     // execute a simple script
-    xEngine->run(   L"nIntTest = 5\n"
+    xEngine->run( 	L"nIntTest = 5\n"
                     L"list = [2,3,4]\n" , XInterfaceRef(), Sequence<UsrAny> () );
 
     /****
@@ -457,9 +457,9 @@ int __LOADONCALLAPI main (int argc, char **argv)
     //  call a python method !
     {
         xEngine->run( L"def foo():\n"
-                      L"    return 'this is foo'\n" , XInterfaceRef() , Sequence<UsrAny> () );
-        OSL_ASSERT( xInvoke->hasMethod( L"foo" ) );
-        UsrAny any = xInvoke->invoke(   L"foo" ,
+                      L"	return 'this is foo'\n" , XInterfaceRef() , Sequence<UsrAny> () );
+        OSL_ASSERT( xInvoke->hasMethod(	L"foo" ) );
+        UsrAny any = xInvoke->invoke(	L"foo" ,
                                         Sequence<UsrAny>(),
                                         Sequence<INT16>() ,
                                         Sequence<UsrAny> () );
@@ -556,7 +556,7 @@ int __LOADONCALLAPI main (int argc, char **argv)
         XLibraryAccessRef xLibrary( ( XLibraryAccess * ) new PythonCodeLibrary , USR_QUERY );
         xEngine->setLibraryAccess( xLibrary );
 
-        xEngine->run(   L"import testmodul\n"
+        xEngine->run( 	L"import testmodul\n"
                         L"x = testmodul.testmethod()\n" , XInterfaceRef() , Sequence<UsrAny>() );
         UsrAny any = xInvoke->getValue( L"x" );
         OSL_ASSERT( any.getReflection()->getTypeClass() == TypeClass_LONG );
@@ -566,7 +566,7 @@ int __LOADONCALLAPI main (int argc, char **argv)
     // check other imports
     {
         // Check, if the libraries are available at run time
-        xEngine->run(   L"import math\n"
+        xEngine->run(	L"import math\n"
                         L"dMathTest = math.exp(0)\n"  , XInterfaceRef() , Sequence<UsrAny> () );
 
         OSL_ASSERT( xInvoke->hasProperty( L"dMathTest" ) );
@@ -578,7 +578,7 @@ int __LOADONCALLAPI main (int argc, char **argv)
 
     // Test connection to root object !
     {
-        xEngine->run(   L"x = stardiv.root.TestValue\n"
+        xEngine->run( 	L"x = stardiv.root.TestValue\n"
                         L"y = stardiv.inout(5)\n"
                         L"stardiv.root.getTestValueViaInout(y)\n"
                         L"z = y.value\n" , XInterfaceRef() , Sequence<UsrAny> () );
diff --git a/extensions/workben/pythontest.cxx b/extensions/workben/pythontest.cxx
index dfb3fa3e0019..85a99532a698 100644
--- a/extensions/workben/pythontest.cxx
+++ b/extensions/workben/pythontest.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,10 +86,10 @@ public:
         }
     }
 
-    BOOL                queryInterface( Uik aUik, XInterfaceRef & rOut );
-    void                acquire()                        { OWeakObject::acquire(); }
-    void                release()                        { OWeakObject::release(); }
-    void*               getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
+    BOOL				queryInterface( Uik aUik, XInterfaceRef & rOut );
+    void 				acquire() 						 { OWeakObject::acquire(); }
+    void 				release() 						 { OWeakObject::release(); }
+    void* 				getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); }
 
 
     void attach( XDebuggingRef *p , XEngineRef *pEngine , XInvokationRef *pInvokation )
@@ -152,10 +152,10 @@ protected:
 
     osl::Condition m_aDebugCondition;
     XDebuggingRef *m_pDebuggingRef;
-    XEngineRef  *m_pEngineRef;
+    XEngineRef	*m_pEngineRef;
     XInvokationRef *m_pInvokationRef;
     int m_bIsRunning;
-    int m_bIsTerminating;       // The listeners ignore everything when set
+    int m_bIsTerminating;		// The listeners ignore everything when set
 };
 
 
@@ -205,13 +205,13 @@ void CmdDebugger::cmdLine()
             }
             else if( ! strncmp( pcLine , "sbp" , 3 ) ){
                 if( m_bIsRunning ) {
-                    (*m_pDebuggingRef)->setBreakPoint(  UString( L"<string>" ),
+                    (*m_pDebuggingRef)->setBreakPoint( 	UString( L"<string>" ),
                                                         atoi(&pcLine[3]) , TRUE );
                 }
             }
             else if( ! strncmp( pcLine , "rbp" , 3 ) ){
                 if( m_bIsRunning ) {
-                    (*m_pDebuggingRef)->setBreakPoint(  UString( L"<string>" ),
+                    (*m_pDebuggingRef)->setBreakPoint( 	UString( L"<string>" ),
                                                         atoi(&pcLine[3]) , FALSE );
                 }
             }
@@ -319,7 +319,7 @@ void CmdDebugger::cmdLine()
                                    "    dump Variable      : dv varname [CallStack]\n"
                                    "    set Variable       : sv varname value [CallStack]\n"
                                    "globals via XInvokation Interface :\n"
-                                   "    dump Global vars   : id\n"
+                                   "	dump Global vars   : id\n"
                                    "    dump Variable      : idv varname\n"
                                    "    set Variable       : isv varname value\n"
                                    "ContextInformation : ci\n"
@@ -352,8 +352,8 @@ void CmdDebugger::dumpIntrospectionToStream( const XIntrospectionAccessRef &ref,
     iMax = seqProp.getLen();
     Property *aProp = seqProp.getArray();
     for( i = 0; i < iMax ; i ++ ) {
-        fprintf( f, "  %s %s\n" ,   USTRING_TO_PCHAR( aProp[i].Type->getName() ),
-                                        USTRING_TO_PCHAR( aProp[i].Name ) );
+        fprintf( f, "  %s %s\n" , 	USTRING_TO_PCHAR( aProp[i].Type->getName() ),
+                                        USTRING_TO_PCHAR( aProp[i].Name	) );
     }
 
 }
@@ -369,7 +369,7 @@ void CmdDebugger::dumpVarToStream( const char *pc , const UsrAny &aValue, FILE *
         fprintf( f, "ENUM %s : %d\n", pc ,  aValue.getEnumAsINT32() );
     }
     else if( TypeClass_STRING == type ) {
-        fprintf( f, "STRING %s : %s\n" , pc ,  USTRING_TO_PCHAR( aValue.getString())     );
+        fprintf( f, "STRING %s : %s\n" , pc ,  USTRING_TO_PCHAR( aValue.getString())	 );
     }
     else if( TypeClass_BOOLEAN == type ) {
         fprintf( f, "BOOL %s : %d\n", pc , aValue.getBOOL() );
@@ -387,7 +387,7 @@ void CmdDebugger::dumpVarToStream( const char *pc , const UsrAny &aValue, FILE *
         fprintf( f, "UINT16 %s : %d\n", pc , (INT32) aValue.getUINT16() );
     }
     else if( TypeClass_UNSIGNED_BYTE == type ) {
-        fprintf( f, "Byte %s : %d\n", pc ,  (INT32) aValue.getBYTE() );
+        fprintf( f, "Byte %s : %d\n", pc ,	(INT32) aValue.getBYTE() );
     }
     else if( TypeClass_UNSIGNED_INT == type ) {
         fprintf( f, "UINT32 %s : %d\n", pc , aValue.getUINT32() );
@@ -519,7 +519,7 @@ int __LOADONCALLAPI main (int argc, char **argv)
 
     if( argc >1 && ! strcmp( argv[1] , "1" ) ) {
         fprintf( stderr, "one thread only\n" );
-        Script = UString(   L"print 'Hello World'\n" );
+        Script = UString( 	L"print 'Hello World'\n" );
         xEngine->runAsync( Script ,  XInterfaceRef(), args , XEngineListenerRef() );
     }
     else if( argc >1 && ! strcmp( argv[1] , "2" ) )  {
diff --git a/extensions/workben/testcomponent.cxx b/extensions/workben/testcomponent.cxx
index 705d451da5be..e32a53769830 100644
--- a/extensions/workben/testcomponent.cxx
+++ b/extensions/workben/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
@@ -72,7 +72,7 @@ int __LOADONCALLAPI main (int argc, char **argv)
 #endif
 
     // create service manager
-//  XMultiServiceFactoryRef xSMgr = getProcessServiceManager();
+//	XMultiServiceFactoryRef xSMgr = getProcessServiceManager();
     XMultiServiceFactoryRef xSMgr = createRegistryServiceManager();
     OSL_ASSERT( xSMgr.is() );
     registerUsrServices( xSMgr );
@@ -81,18 +81,18 @@ int __LOADONCALLAPI main (int argc, char **argv)
     XImplementationRegistrationRef xReg;
     XSimpleRegistryRef xSimpleReg;
 
-    try {
+    try	{
         // Create registration service
         XInterfaceRef x = xSMgr->createInstance(
             UString::createFromAscii( "com.sun.star.registry.ImplementationRegistration" ) );
         x->queryInterface( XImplementationRegistration::getSmartUik() , xReg );
 
-/*      x = xSMgr->createInstance( L"stardiv.uno.repos.SimpleRegistry" );
+/*		x = xSMgr->createInstance( L"stardiv.uno.repos.SimpleRegistry" );
         OSL_ASSERT( x.is() );
         x->queryInterface( XSimpleRegistry::getSmartUik() , xSimpleReg );
         OSL_ASSERT( xSimpleReg.is() );
         xSimpleReg->open( L"testcomp.rdb" , FALSE , TRUE );
-*/  }
+*/	}
     catch( Exception& e ) {
         printf( "%s\n" , OWStringToOString( e.getName() , CHARSET_SYSTEM ).getStr() );
         exit(1);
@@ -165,15 +165,15 @@ int __LOADONCALLAPI main (int argc, char **argv)
         XInterfaceRef x = xSMgr->createInstance( OStringToOWString( argv[1] , CHARSET_SYSTEM ) );
         if( ! x.is() ) {
             printf( "Couldn't instantiate service !\n" );
-            exit( 1 );
+            exit( 1 );	
         }
 
         // do the test
-        try {
+        try {		
             nNewHandle = xTest->test( OStringToOWString( argv[1] , CHARSET_SYSTEM ) , x , nHandle );
         }
         catch ( Exception& e ) {
-            printf( "testcomponent : uncaught exception %s\n" ,
+            printf( "testcomponent : uncaught exception %s\n" , 
                         OWStringToOString( e.getName(), CHARSET_SYSTEM ).getStr() );
             exit(1);
         }
@@ -181,25 +181,25 @@ int __LOADONCALLAPI main (int argc, char **argv)
             printf( "testcomponent : uncaught unknown exception\n"  );
             exit(1);
         }
-
-
+        
+        
         // print errors and warning
         Sequence<UString> seqErrors = xTest->getErrors();
         Sequence<UString> seqWarnings = xTest->getWarnings();
         if( seqWarnings.getLen() > nWarningCount ) {
             printf( "Warnings during test %d!\n" , nHandle );
             for( ; nWarningCount < seqWarnings.getLen() ; nWarningCount ++ ) {
-                printf( "Warning\n%s\n---------\n" ,
+                printf( "Warning\n%s\n---------\n" , 
                     OWStringToOString( seqWarnings.getArray()[nWarningCount], CHARSET_SYSTEM ).getStr() );
-            }
+            }			
         }
 
 
         if( seqErrors.getLen() > nErrorCount ) {
             printf( "Errors during test %d!\n" , nHandle );
             for( ; nErrorCount < seqErrors.getLen() ; nErrorCount ++ ) {
-                printf( "%s\n" ,
-                            OWStringToOString(
+                printf( "%s\n" , 
+                            OWStringToOString( 
                                     seqErrors.getArray()[nErrorCount], CHARSET_SYSTEM ).getStr() );
             }
         }
@@ -211,7 +211,7 @@ int __LOADONCALLAPI main (int argc, char **argv)
         printf( "Test passed !\n" );
     }
     else {
-        printf( "Test failed !\n" );
+        printf( "Test failed !\n" );	
     }
 
     XComponentRef rComp( xSMgr , USR_QUERY );
diff --git a/extensions/workben/testframecontrol.cxx b/extensions/workben/testframecontrol.cxx
index 11025e604648..ba5d53de11c3 100644
--- a/extensions/workben/testframecontrol.cxx
+++ b/extensions/workben/testframecontrol.cxx
@@ -58,41 +58,41 @@ class Listener_Impl
 public:
     SMART_UNO_DECLARATION( Listener_Impl, UsrObject );
 
-    virtual BOOL        queryInterface( Uik aUik, XInterfaceRef& rOut );
+    virtual BOOL		queryInterface( Uik aUik, XInterfaceRef& rOut );
 
     // XMouseListener
-    virtual void        mousePressed( const VclMouseEvent& evt );
-    virtual void        mouseReleased( const VclMouseEvent& evt );
-    virtual void        mouseEntered( const VclMouseEvent& evt );
-    virtual void        mouseExited( const VclMouseEvent& evt );
+    virtual void		mousePressed( const VclMouseEvent& evt );
+    virtual void		mouseReleased( const VclMouseEvent& evt );
+    virtual void		mouseEntered( const VclMouseEvent& evt );
+    virtual void		mouseExited( const VclMouseEvent& evt );
 
     // XMouseMotionListener
-    virtual void        mouseDragged( const VclMouseEvent& evt );
-    virtual void        mouseMoved( const VclMouseEvent& evt );
+    virtual void		mouseDragged( const VclMouseEvent& evt );
+    virtual void		mouseMoved( const VclMouseEvent& evt );
 
     // XKeyListener
-    virtual void        keyPressed( const VclKeyEvent& evt );
-    virtual void        keyReleased( const VclKeyEvent& evt );
+    virtual void		keyPressed( const VclKeyEvent& evt );
+    virtual void		keyReleased( const VclKeyEvent& evt );
 
     // XFocusListener
-    virtual void        focusGained( const FocusEvent& evt );
-    virtual void        focusLost( const FocusEvent& evt );
+    virtual void		focusGained( const FocusEvent& evt );
+    virtual void		focusLost( const FocusEvent& evt );
 
     // XWindowListener
-    virtual void        windowResized( const WindowEvent& evt );
-    virtual void        windowMoved( const WindowEvent& evt );
-    virtual void        windowShown( const EventObject& evt );
-    virtual void        windowHidden( const EventObject& evt );
+    virtual void		windowResized( const WindowEvent& evt );
+    virtual void		windowMoved( const WindowEvent& evt );
+    virtual void		windowShown( const EventObject& evt );
+    virtual void		windowHidden( const EventObject& evt );
 
     // XPaintListener
-    virtual void        windowPaint( const PaintEvent& evt );
+    virtual void		windowPaint( const PaintEvent& evt );
 
     // XEventListener
-    virtual void        disposing( const EventObject& evt );
+    virtual void		disposing( const EventObject& evt );
 
 public:
-    void                addAllListeners( const XControlRef& xControl );
-    void                removeAllListeners( const XControlRef& xControl );
+    void				addAllListeners( const XControlRef& xControl );
+    void				removeAllListeners( const XControlRef& xControl );
 };
 
 //--------------------------------------------------------------------------------------------------
@@ -153,28 +153,28 @@ BOOL Listener_Impl::queryInterface( Uik aUik, XInterfaceRef& rOut )
 
 //--------------------------------------------------------------------------------------------------
 // XMouseListener
-void Listener_Impl::mousePressed( const VclMouseEvent& evt )    {}
-void Listener_Impl::mouseReleased( const VclMouseEvent& evt )   {}
-void Listener_Impl::mouseEntered( const VclMouseEvent& evt )    {}
-void Listener_Impl::mouseExited( const VclMouseEvent& evt )     {}
+void Listener_Impl::mousePressed( const VclMouseEvent& evt )	{}
+void Listener_Impl::mouseReleased( const VclMouseEvent& evt )	{}
+void Listener_Impl::mouseEntered( const VclMouseEvent& evt )	{}
+void Listener_Impl::mouseExited( const VclMouseEvent& evt )		{}
 
 // XMouseMotionListener
-void Listener_Impl::mouseDragged( const VclMouseEvent& evt )    {}
-void Listener_Impl::mouseMoved( const VclMouseEvent& evt )      {}
+void Listener_Impl::mouseDragged( const VclMouseEvent& evt )	{}
+void Listener_Impl::mouseMoved( const VclMouseEvent& evt )		{}
 
 // XKeyListener
-void Listener_Impl::keyPressed( const VclKeyEvent& evt )        {}
-void Listener_Impl::keyReleased( const VclKeyEvent& evt )       {}
+void Listener_Impl::keyPressed( const VclKeyEvent& evt )		{}
+void Listener_Impl::keyReleased( const VclKeyEvent& evt )		{}
 
 // XFocusListener
-void Listener_Impl::focusGained( const FocusEvent& evt )        {}
-void Listener_Impl::focusLost( const FocusEvent& evt )          {}
+void Listener_Impl::focusGained( const FocusEvent& evt )		{}
+void Listener_Impl::focusLost( const FocusEvent& evt )			{}
 
 // XWindowListener
-void Listener_Impl::windowResized( const WindowEvent& evt )     {}
-void Listener_Impl::windowMoved( const WindowEvent& evt )       {}
-void Listener_Impl::windowShown( const EventObject& evt )       {}
-void Listener_Impl::windowHidden( const EventObject& evt )      {}
+void Listener_Impl::windowResized( const WindowEvent& evt )		{}
+void Listener_Impl::windowMoved( const WindowEvent& evt )		{}
+void Listener_Impl::windowShown( const EventObject& evt )		{}
+void Listener_Impl::windowHidden( const EventObject& evt )		{}
 
 // XPaintListener
 void Listener_Impl::windowPaint( const PaintEvent& evt )
@@ -193,7 +193,7 @@ void Listener_Impl::windowPaint( const PaintEvent& evt )
 }
 
 // XEventListener
-void Listener_Impl::disposing( const EventObject& evt )     {}
+void Listener_Impl::disposing( const EventObject& evt )		{}
 
 
 //==================================================================================================
@@ -205,17 +205,17 @@ public:
     virtual void        ShowStatusText( const XubString& rText );
 
 public:
-                        FrameControlApplication()       {}
+                        FrameControlApplication()		{}
 
 private:
-    void                init();
-    void                deinit();
+    void				init();
+    void				deinit();
 
 private:
-    Listener_Impl*      _pListener;
-    XControlRef         _xControl;
+    Listener_Impl*		_pListener;
+    XControlRef			_xControl;
 
-    WorkWindow*         _pWorkWin;
+    WorkWindow*			_pWorkWin;
 };
 
 FrameControlApplication g_App;
@@ -281,7 +281,7 @@ void FrameControlApplication::deinit()
     {
 
         _pListener->removeAllListeners( _xControl );
-        _xControl->dispose();   // disposing event should occur
+        _xControl->dispose();	// disposing event should occur
         _pListener->release();
         _pListener = NULL;
 
@@ -296,8 +296,8 @@ void FrameControlApplication::deinit()
 //--------------------------------------------------------------------------------------------------
 void FrameControlApplication::Main()
 {
-//      void TestErrcodes();
-//      TestErrcodes();
+//  	void TestErrcodes();
+//  	TestErrcodes();
 
     EnterMultiThread();
     SetAppName( "RadioActiveControl-Demo" );
diff --git a/extensions/workben/testpgp.cxx b/extensions/workben/testpgp.cxx
index 6027a68e4d70..1a7902c618db 100644
--- a/extensions/workben/testpgp.cxx
+++ b/extensions/workben/testpgp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -737,7 +737,7 @@ int SAL_CALL main (int argc, char **argv)
                 printf ("Error: no PGPEncoder interface.\n");
                 exit (4);
             }
-
+            
             DataSource_Impl *source = new DataSource_Impl (fd);
             source->setBuffer (buffer);
 
diff --git a/extensions/workben/testresource.cxx b/extensions/workben/testresource.cxx
index 069f33c631b7..73852cfc12e0 100644
--- a/extensions/workben/testresource.cxx
+++ b/extensions/workben/testresource.cxx
@@ -43,7 +43,7 @@ using namespace usr;
 class MyApp : public Application
 {
 public:
-    void        Main();
+    void		Main();
 };
 
 MyApp aMyApp;
diff --git a/extensions/workben/testresource.src b/extensions/workben/testresource.src
index d74ed571e5ca..5a9fc3a8a607 100644
--- a/extensions/workben/testresource.src
+++ b/extensions/workben/testresource.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,4 +27,4 @@
 String 1000
 {
     Text = "Hello";
-};
+};	
diff --git a/forms/inc/pch/precompiled_forms.cxx b/forms/inc/pch/precompiled_forms.cxx
index b925dcfc6605..990b15d0e6ba 100644
--- a/forms/inc/pch/precompiled_forms.cxx
+++ b/forms/inc/pch/precompiled_forms.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/inc/pch/precompiled_forms.hxx b/forms/inc/pch/precompiled_forms.hxx
index 371183f1a99c..77e339408760 100644
--- a/forms/inc/pch/precompiled_forms.hxx
+++ b/forms/inc/pch/precompiled_forms.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/qa/complex/forms/CheckOGroupBoxModel.java b/forms/qa/complex/forms/CheckOGroupBoxModel.java
index 8a2ae5c7f0e4..b1d42ba60c13 100755
--- a/forms/qa/complex/forms/CheckOGroupBoxModel.java
+++ b/forms/qa/complex/forms/CheckOGroupBoxModel.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/forms/qa/integration/forms/BooleanValidator.java b/forms/qa/integration/forms/BooleanValidator.java
index 3cba1273d63f..4353703a4a92 100644
--- a/forms/qa/integration/forms/BooleanValidator.java
+++ b/forms/qa/integration/forms/BooleanValidator.java
@@ -21,7 +21,7 @@ public class BooleanValidator extends integration.forms.ControlValidator
         m_preventChecked = preventChecked;
         m_converter = new com.sun.star.uno.AnyConverter();
     }
-
+    
     public String explainInvalid( Object Value )
     {
         try
@@ -38,7 +38,7 @@ public class BooleanValidator extends integration.forms.ControlValidator
         }
         return "";
     }
-
+    
     public boolean isValid( Object Value )
     {
         try
diff --git a/forms/qa/integration/forms/CellBinding.java b/forms/qa/integration/forms/CellBinding.java
index 3bf171d82465..07a8fddd6279 100644
--- a/forms/qa/integration/forms/CellBinding.java
+++ b/forms/qa/integration/forms/CellBinding.java
@@ -398,7 +398,7 @@ public class CellBinding extends complexlib.ComplexTestCase
         }
         return true;
     }
-
+    
     /* ------------------------------------------------------------------ */
     /** verifies that the content of a given cell equals a given string
     */
@@ -425,7 +425,7 @@ public class CellBinding extends complexlib.ComplexTestCase
         );
         cell.setString( text );
     }
-
+   
     /* ------------------------------------------------------------------ */
     /** sets a numeric value in a given cell
     */
@@ -436,7 +436,7 @@ public class CellBinding extends complexlib.ComplexTestCase
         );
         cell.setValue( value );
     }
-
+   
     /* ------------------------------------------------------------------ */
     /** sets a numeric value in a given cell
     */
@@ -450,7 +450,7 @@ public class CellBinding extends complexlib.ComplexTestCase
         String[][] args = new String[][] { new String[] { "=INVALID_FUNCTION()" } };
         cell.setFormulaArray( args );
     }
-
+   
     /* ------------------------------------------------------------------ */
     /** binds the given control model to the given cell in the first sheet,
      *  using the given service name for the binding
@@ -469,7 +469,7 @@ public class CellBinding extends complexlib.ComplexTestCase
         NamedValue[] parameters = new NamedValue[] { new NamedValue() };
         parameters[0].Name = "BoundCell";
         parameters[0].Value = address;
-
+        
         XValueBinding cellBinding = (XValueBinding)UnoRuntime.queryInterface( XValueBinding.class,
             m_document.createInstanceWithArguments( _bindingServiceName, parameters )
         );
@@ -492,7 +492,7 @@ public class CellBinding extends complexlib.ComplexTestCase
     {
         CellRangeAddress listSourceAddress = new CellRangeAddress( (short)0, (int)_sourceCol, (int)_rowStart, (int)_sourceCol, (int)_rowEnd );
         NamedValue addressParameter = new NamedValue( "CellRange", listSourceAddress );
-
+        
         XListEntrySource listSource = (XListEntrySource)UnoRuntime.queryInterface( XListEntrySource.class,
             m_document.createInstanceWithArguments( "com.sun.star.table.CellRangeListSource", new NamedValue[]{ addressParameter } )
         );
diff --git a/forms/qa/integration/forms/ControlValidation.java b/forms/qa/integration/forms/ControlValidation.java
index c480ded16a4b..059101801f37 100644
--- a/forms/qa/integration/forms/ControlValidation.java
+++ b/forms/qa/integration/forms/ControlValidation.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/forms/qa/integration/forms/ControlValidator.java b/forms/qa/integration/forms/ControlValidator.java
index 969a9d2f46aa..746115998d8f 100644
--- a/forms/qa/integration/forms/ControlValidator.java
+++ b/forms/qa/integration/forms/ControlValidator.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,20 +32,20 @@ package integration.forms;
  */
 public abstract class ControlValidator implements com.sun.star.form.validation.XValidator
 {
-
+    
     /** Creates a new instance of ControlValidator */
     public ControlValidator()
     {
     }
-
+    
     public void addValidityConstraintListener(com.sun.star.form.validation.XValidityConstraintListener xValidityConstraintListener)
     {
     }
-
+    
     public void removeValidityConstraintListener(com.sun.star.form.validation.XValidityConstraintListener xValidityConstraintListener)
     {
     }
-
+    
     protected boolean isVoid( Object Value )
     {
         try
diff --git a/forms/qa/integration/forms/DateValidator.java b/forms/qa/integration/forms/DateValidator.java
index 1ae2bbe48058..526ba1031c4b 100644
--- a/forms/qa/integration/forms/DateValidator.java
+++ b/forms/qa/integration/forms/DateValidator.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,12 +34,12 @@ import com.sun.star.form.binding.*;
  */
 public class DateValidator extends integration.forms.ControlValidator
 {
-
+    
     /** Creates a new instance of NumericValidator */
     public DateValidator( )
     {
     }
-
+    
     public String explainInvalid( Object Value )
     {
         try
@@ -60,7 +60,7 @@ public class DateValidator extends integration.forms.ControlValidator
         }
         return "";
     }
-
+    
     public boolean isValid( Object Value )
     {
         try
diff --git a/forms/qa/integration/forms/DocumentHelper.java b/forms/qa/integration/forms/DocumentHelper.java
index 524f6b939afb..f4dbac80b26c 100644
--- a/forms/qa/integration/forms/DocumentHelper.java
+++ b/forms/qa/integration/forms/DocumentHelper.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
@@ -185,7 +185,7 @@ public class DocumentHelper
      *  of the document, they will become invalid.
      *  The Model instance itself, at which you called reload, will still be valid, it will
      *  automatically update its internal state after the reload.
-     *
+     * 
      *  Another consequence is that if the document does not have a view at all, it cannot
      *  be reloaded.
      */
diff --git a/forms/qa/integration/forms/DocumentType.java b/forms/qa/integration/forms/DocumentType.java
index cc52e6a1aabc..88455824a33b 100644
--- a/forms/qa/integration/forms/DocumentType.java
+++ b/forms/qa/integration/forms/DocumentType.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/forms/qa/integration/forms/DocumentViewHelper.java b/forms/qa/integration/forms/DocumentViewHelper.java
index afd89841a8d2..9260d680f58c 100644
--- a/forms/qa/integration/forms/DocumentViewHelper.java
+++ b/forms/qa/integration/forms/DocumentViewHelper.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 @@ import org.openoffice.xforms.XMLDocument;
 */
 public class DocumentViewHelper
 {
-    private     XMultiServiceFactory    m_orb;
+    private     XMultiServiceFactory	m_orb;
     private     XController             m_controller;
     private     DocumentHelper          m_document;
 
diff --git a/forms/qa/integration/forms/FormComponent.java b/forms/qa/integration/forms/FormComponent.java
index 6e6676fff94f..75bb5958d711 100644
--- a/forms/qa/integration/forms/FormComponent.java
+++ b/forms/qa/integration/forms/FormComponent.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/forms/qa/integration/forms/FormControlTest.java b/forms/qa/integration/forms/FormControlTest.java
index 7fdf68dea796..58af651942d7 100644
--- a/forms/qa/integration/forms/FormControlTest.java
+++ b/forms/qa/integration/forms/FormControlTest.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
@@ -496,7 +496,7 @@ public class FormControlTest extends complexlib.ComplexTestCase implements XSQLE
         XPropertySet dataSourceSettings = (XPropertySet)UnoRuntime.queryInterface( XPropertySet.class,
             m_dataSourceProps.getPropertyValue( "Settings" ) );
         dataSourceSettings.setPropertyValue( "FormsCheckRequiredFields", new Boolean( false ) );
-
+        
         return m_dataSource != null;
     }
 
@@ -514,12 +514,12 @@ public class FormControlTest extends complexlib.ComplexTestCase implements XSQLE
     /* ------------------------------------------------------------------ */
     private void createSampleDocument() throws com.sun.star.uno.Exception, java.lang.Exception
     {
-
+        
         m_document = DocumentHelper.blankTextDocument( m_orb );
         m_formLayer = new FormLayer( m_document );
 
         // insert some controls
-        XPropertySet xIDField =     m_formLayer.insertControlLine( "DatabaseNumericField",  "ID",               "",       3 );
+        XPropertySet xIDField =	    m_formLayer.insertControlLine( "DatabaseNumericField",  "ID",               "",       3 );
                                     m_formLayer.insertControlLine( "DatabaseFormattedField","f_integer",        "",       11 );
                                     m_formLayer.insertControlLine( "DatabaseTextField",     "f_text",           "",       19 );
         XPropertySet xReqField =    m_formLayer.insertControlLine( "DatabaseTextField",     "f_required_text",  "",       27 );
diff --git a/forms/qa/integration/forms/FormLayer.java b/forms/qa/integration/forms/FormLayer.java
index d1b50f0d246c..087424ee43d4 100644
--- a/forms/qa/integration/forms/FormLayer.java
+++ b/forms/qa/integration/forms/FormLayer.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
@@ -168,7 +168,7 @@ public class FormLayer
     }
 
     /** creates a pair of controls, namely a label control, and another control labeled by it
-     *
+     * 
      * @param _formComponentServiceName
      *      the service name for the control which is not the label control
      * @param _label
@@ -203,7 +203,7 @@ public class FormLayer
 
         return field;
     }
-
+        
     /* ------------------------------------------------------------------ */
     /** creates a line of controls, consisting of a label and a field for data input.
 
diff --git a/forms/qa/integration/forms/FormPropertyBags.java b/forms/qa/integration/forms/FormPropertyBags.java
index c2cd36289a42..d6fab4bda945 100644
--- a/forms/qa/integration/forms/FormPropertyBags.java
+++ b/forms/qa/integration/forms/FormPropertyBags.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/forms/qa/integration/forms/ImageComparison.java b/forms/qa/integration/forms/ImageComparison.java
index 87f2c82f928d..859d1b1bbce8 100644
--- a/forms/qa/integration/forms/ImageComparison.java
+++ b/forms/qa/integration/forms/ImageComparison.java
@@ -12,7 +12,7 @@ package integration.forms;
  */
 public final class ImageComparison implements com.sun.star.awt.XImageConsumer
 {
-
+    
     private byte[] m_referenceBytes;
     private int m_referencePosition;
     private java.io.FileOutputStream m_stream;
@@ -38,15 +38,15 @@ public final class ImageComparison implements com.sun.star.awt.XImageConsumer
             m_notifyDone.notify();
         }
     }
-
+    
     public void init(int param, int param1)
     {
     }
-
+    
     public void setColorModel(short param, int[] values, int param2, int param3, int param4, int param5)
     {
     }
-
+    
     public void setPixelsByBytes(int param, int param1, int param2, int param3, byte[] values, int param5, int param6)
     {
         if ( m_referencePosition == -1 )
@@ -65,9 +65,9 @@ public final class ImageComparison implements com.sun.star.awt.XImageConsumer
             ++m_referencePosition;
         }
     }
-
+    
     public void setPixelsByLongs(int param, int param1, int param2, int param3, int[] values, int param5, int param6)
     {
     }
-
+    
 }
diff --git a/forms/qa/integration/forms/ListBox.java b/forms/qa/integration/forms/ListBox.java
index 6e50291d6525..11af2682023e 100644
--- a/forms/qa/integration/forms/ListBox.java
+++ b/forms/qa/integration/forms/ListBox.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/forms/qa/integration/forms/ListSelection.java b/forms/qa/integration/forms/ListSelection.java
index 24a5290dc1d4..e26acd69c349 100644
--- a/forms/qa/integration/forms/ListSelection.java
+++ b/forms/qa/integration/forms/ListSelection.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/forms/qa/integration/forms/ListSelectionValidator.java b/forms/qa/integration/forms/ListSelectionValidator.java
index 4f25b162712d..489772047401 100644
--- a/forms/qa/integration/forms/ListSelectionValidator.java
+++ b/forms/qa/integration/forms/ListSelectionValidator.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 @@ public class ListSelectionValidator extends integration.forms.ControlValidator
     public ListSelectionValidator()
     {
     }
-
+    
     public String explainInvalid( Object Value )
     {
         try
@@ -52,7 +52,7 @@ public class ListSelectionValidator extends integration.forms.ControlValidator
         }
         return "";
     }
-
+    
     public boolean isValid( Object Value )
     {
         try
@@ -67,5 +67,5 @@ public class ListSelectionValidator extends integration.forms.ControlValidator
         }
         return false;
     }
-
+    
 }
diff --git a/forms/qa/integration/forms/MasterDetailForms.java b/forms/qa/integration/forms/MasterDetailForms.java
index cd51abc3e446..90f9f511cf55 100644
--- a/forms/qa/integration/forms/MasterDetailForms.java
+++ b/forms/qa/integration/forms/MasterDetailForms.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
@@ -72,7 +72,7 @@ public class MasterDetailForms extends complexlib.ComplexTestCase implements com
     public MasterDetailForms()
     {
     }
-
+    
     /* ------------------------------------------------------------------ */
     public String[] getTestMethodNames()
     {
@@ -96,7 +96,7 @@ public class MasterDetailForms extends complexlib.ComplexTestCase implements com
 
     /* ------------------------------------------------------------------ */
     /** creates the table structure needed for the test
-     */
+     */ 
     private void impl_createTableStructure( final HsqlDatabase _databaseDocument ) throws SQLException
     {
         HsqlColumnDescriptor[] masterColumns = {
@@ -383,7 +383,7 @@ public class MasterDetailForms extends complexlib.ComplexTestCase implements com
             m_loaded = false;
         }
     }
-
+ 
     /** assures that the (integer) values in the given columns of our master and detail forms are identical
      */
     private void verifyColumnValueIdentity( final String masterColName, final String detailColName ) throws SQLException
@@ -394,7 +394,7 @@ public class MasterDetailForms extends complexlib.ComplexTestCase implements com
         int masterValue = m_masterResult.getInt( locateMasterCols.findColumn( masterColName ) );
         int detailValue = m_detailResult.getInt( locateDetailCols.findColumn( detailColName ) );
 
-        assure( "values in linked column pair " + detailColName + "->" + masterColName + " (" +
+        assure( "values in linked column pair " + detailColName + "->" + masterColName + " (" + 
             detailValue + "->" + masterValue + ") do not match (master position: " + m_masterResult.getRow()  + ")!",
             masterValue == detailValue );
     }
diff --git a/forms/qa/integration/forms/NumericValidator.java b/forms/qa/integration/forms/NumericValidator.java
index 4fed12c4fd2b..cc8662c24a8c 100644
--- a/forms/qa/integration/forms/NumericValidator.java
+++ b/forms/qa/integration/forms/NumericValidator.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,12 +34,12 @@ import com.sun.star.form.binding.*;
  */
 public class NumericValidator extends integration.forms.ControlValidator
 {
-
+    
     /** Creates a new instance of NumericValidator */
     public NumericValidator( )
     {
     }
-
+    
     public String explainInvalid( Object Value )
     {
         try
@@ -58,7 +58,7 @@ public class NumericValidator extends integration.forms.ControlValidator
         }
         return "";
     }
-
+    
     public boolean isValid( Object Value )
     {
         try
@@ -77,7 +77,7 @@ public class NumericValidator extends integration.forms.ControlValidator
         }
         return false;
     }
-
+    
     private boolean isProperRange( double value)
     {
         return ( value >= 0 ) && ( value <= 100 );
diff --git a/forms/qa/integration/forms/RadioButtons.java b/forms/qa/integration/forms/RadioButtons.java
index 3ce02787b330..4a731a6d2e1f 100644
--- a/forms/qa/integration/forms/RadioButtons.java
+++ b/forms/qa/integration/forms/RadioButtons.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/forms/qa/integration/forms/SingleControlValidation.java b/forms/qa/integration/forms/SingleControlValidation.java
index 637e9c9e4e26..50490a44db73 100644
--- a/forms/qa/integration/forms/SingleControlValidation.java
+++ b/forms/qa/integration/forms/SingleControlValidation.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
@@ -71,7 +71,7 @@ public class SingleControlValidation implements XFormComponentValidityListener
         m_formLayer = new FormLayer( m_document );
         createControls( columnPos, rowPos, formComponentService, controlCount, controlHeight );
     }
-
+    
     /* ------------------------------------------------------------------ */
     public XPropertySet getInputField()
     {
@@ -155,7 +155,7 @@ public class SingleControlValidation implements XFormComponentValidityListener
     {
         // not interested in
     }
-
+    
     /* ------------------------------------------------------------------ */
     /* XFormComponentValidityListener overridables                        */
     /* ------------------------------------------------------------------ */
@@ -187,5 +187,5 @@ public class SingleControlValidation implements XFormComponentValidityListener
             e.printStackTrace( System.out );
         }
     }
-
+    
 }
diff --git a/forms/qa/integration/forms/SpreadsheetDocument.java b/forms/qa/integration/forms/SpreadsheetDocument.java
index 8f156fe8e3b6..91d348998302 100644
--- a/forms/qa/integration/forms/SpreadsheetDocument.java
+++ b/forms/qa/integration/forms/SpreadsheetDocument.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/forms/qa/integration/forms/SpreadsheetView.java b/forms/qa/integration/forms/SpreadsheetView.java
index 19f7bd429290..819cca3f4d17 100644
--- a/forms/qa/integration/forms/SpreadsheetView.java
+++ b/forms/qa/integration/forms/SpreadsheetView.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 @@ import integration.forms.DocumentHelper;
  */
 public class SpreadsheetView extends integration.forms.DocumentViewHelper
 {
-
+    
     /** Creates a new instance of SpreadsheetView */
     public SpreadsheetView( XMultiServiceFactory orb, DocumentHelper document, XController controller )
     {
diff --git a/forms/qa/integration/forms/TableCellTextBinding.java b/forms/qa/integration/forms/TableCellTextBinding.java
index 6517ed5c90f0..f6b38013ef46 100644
--- a/forms/qa/integration/forms/TableCellTextBinding.java
+++ b/forms/qa/integration/forms/TableCellTextBinding.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/forms/qa/integration/forms/TestCase.java b/forms/qa/integration/forms/TestCase.java
index aeaa8048f92c..6498515b6cc4 100644
--- a/forms/qa/integration/forms/TestCase.java
+++ b/forms/qa/integration/forms/TestCase.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/forms/qa/integration/forms/TestSkeleton.java b/forms/qa/integration/forms/TestSkeleton.java
index 2736395ff400..c5471d097be8 100644
--- a/forms/qa/integration/forms/TestSkeleton.java
+++ b/forms/qa/integration/forms/TestSkeleton.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/forms/qa/integration/forms/TextValidator.java b/forms/qa/integration/forms/TextValidator.java
index db340f93abcc..e59d77013490 100644
--- a/forms/qa/integration/forms/TextValidator.java
+++ b/forms/qa/integration/forms/TextValidator.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,7 +34,7 @@ import com.sun.star.form.binding.*;
  */
 public class TextValidator extends integration.forms.ControlValidator
 {
-
+    
     /** Creates a new instance of NumericValidator */
     public TextValidator( )
     {
@@ -56,7 +56,7 @@ public class TextValidator extends integration.forms.ControlValidator
         }
         return "";
     }
-
+    
     public boolean isValid( Object Value )
     {
         try
@@ -73,7 +73,7 @@ public class TextValidator extends integration.forms.ControlValidator
         }
         return false;
     }
-
+    
     private boolean isProperChunks( String value )
     {
         return ( value.length() % 3 ) == 0;
diff --git a/forms/qa/integration/forms/TimeValidator.java b/forms/qa/integration/forms/TimeValidator.java
index 116f98455d94..3ed3b6756209 100644
--- a/forms/qa/integration/forms/TimeValidator.java
+++ b/forms/qa/integration/forms/TimeValidator.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,12 +34,12 @@ import com.sun.star.form.binding.*;
  */
 public class TimeValidator extends integration.forms.ControlValidator
 {
-
+    
     /** Creates a new instance of NumericValidator */
     public TimeValidator( )
     {
     }
-
+    
     public String explainInvalid( Object Value )
     {
         try
@@ -59,7 +59,7 @@ public class TimeValidator extends integration.forms.ControlValidator
         }
         return "";
     }
-
+    
     public boolean isValid( Object Value )
     {
         try
diff --git a/forms/qa/integration/forms/ValueBinding.java b/forms/qa/integration/forms/ValueBinding.java
index cec1b6d200c2..e53c1d2b1936 100644
--- a/forms/qa/integration/forms/ValueBinding.java
+++ b/forms/qa/integration/forms/ValueBinding.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/forms/qa/integration/forms/WaitForInput.java b/forms/qa/integration/forms/WaitForInput.java
index f0109aa485d4..8a71c8f0662c 100644
--- a/forms/qa/integration/forms/WaitForInput.java
+++ b/forms/qa/integration/forms/WaitForInput.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
@@ -28,8 +28,8 @@ package integration.forms;
 
 class WaitForInput extends java.lang.Thread
 {
-    private Object      m_aToNotify;
-    private boolean     m_bDone;
+    private Object		m_aToNotify;
+    private boolean		m_bDone;
 
     public WaitForInput( Object aToNotify )
     {
diff --git a/forms/qa/integration/forms/XMLFormSettings.java b/forms/qa/integration/forms/XMLFormSettings.java
index e3881bfa861d..c8b28d3f44be 100644
--- a/forms/qa/integration/forms/XMLFormSettings.java
+++ b/forms/qa/integration/forms/XMLFormSettings.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
@@ -59,7 +59,7 @@ public class XMLFormSettings extends complexlib.ComplexTestCase
     public XMLFormSettings()
     {
     }
-
+    
     /* ------------------------------------------------------------------ */
     public String[] getTestMethodNames()
     {
@@ -67,7 +67,7 @@ public class XMLFormSettings extends complexlib.ComplexTestCase
             "checkExternalData"
         };
     }
-
+    
     /* ------------------------------------------------------------------ */
     public String getTestObjectName()
     {
diff --git a/forms/qa/org/openoffice/xforms/Instance.java b/forms/qa/org/openoffice/xforms/Instance.java
index 5e4e04741995..8986be44b897 100644
--- a/forms/qa/org/openoffice/xforms/Instance.java
+++ b/forms/qa/org/openoffice/xforms/Instance.java
@@ -27,9 +27,9 @@ public class Instance
     }
 
     /** creates a new element in the instance
-     *
+     * 
      * The element will be inserted immediately below the root node of the instance.
-     *
+     * 
      * @param _elementName
      *      the name of the to-be-created element
      * @return
@@ -42,9 +42,9 @@ public class Instance
     }
 
     /** creates a new element in the instance
-     *
+     * 
      * The element will be inserted immediately below the root node of the instance.
-     *
+     * 
      * @param _elementName
      *      the name of the to-be-created element
      * @param _initialNodeValue
@@ -59,9 +59,9 @@ public class Instance
     }
 
     /** creates a new element in the instance
-     *
+     * 
      * The element will be inserted immediately below a given XNode.
-     *
+     * 
      * @param _parentElement
      *      the node whose child shall be created
      * @param _elementName
@@ -76,9 +76,9 @@ public class Instance
     }
 
     /** creates a new element in the instance
-     *
+     * 
      * The element will be inserted immediately below a given XNode.
-     *
+     * 
      * @param _parentElement
      *      the node whose child shall be created
      * @param _elementName
@@ -132,7 +132,7 @@ public class Instance
     }
 
     /** creates an attribute for the root node of the instance
-     *
+     * 
      * @param _attribName
      *      the name of the to-be-created attribute
      * @return
@@ -145,7 +145,7 @@ public class Instance
     }
 
     /** creates an attribute for the root node of the instance
-     *
+     * 
      * @param _attribName
      *      the name of the to-be-created attribute
      * @param _initialNodeValue
@@ -160,7 +160,7 @@ public class Instance
     }
 
     /** creates an attribute for the given node
-     *
+     * 
      * @param _parentElement
      *      the element at which the attribute should be created
      * @param _attribName
@@ -175,7 +175,7 @@ public class Instance
     }
 
     /** creates an attribute for the given node
-     *
+     * 
      * @param _parentElement
      *      the element at which the attribute should be created
      * @param _attribName
diff --git a/forms/qa/org/openoffice/xforms/Model.java b/forms/qa/org/openoffice/xforms/Model.java
index ee4ed6caa7e8..a4a76f2130bd 100644
--- a/forms/qa/org/openoffice/xforms/Model.java
+++ b/forms/qa/org/openoffice/xforms/Model.java
@@ -49,7 +49,7 @@ public class Model
     }
 
     /** creates a binding for the given DOM node
-     *
+     * 
      * @param _node
      *      the DOM node to create a binding for
      * @param _dataType
diff --git a/forms/source/component/BaseListBox.hxx b/forms/source/component/BaseListBox.hxx
index 01d63db5659f..184acbad2bdb 100644
--- a/forms/source/component/BaseListBox.hxx
+++ b/forms/source/component/BaseListBox.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 frm
 {
 
-const sal_uInt16 ENTRY_NOT_FOUND =  0xFFFF;
-const sal_uInt16 BOUNDCOLUMN     =  0x0001;
+const sal_uInt16 ENTRY_NOT_FOUND =	0xFFFF;
+const sal_uInt16 BOUNDCOLUMN	 =	0x0001;
 
 //.........................................................................
 }
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index da060f997052..8d9b8c8a088f 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -120,12 +120,12 @@ OButtonModel::~OButtonModel()
 void OButtonModel::describeFixedProperties( Sequence< Property >& _rProps ) const
 {
     BEGIN_DESCRIBE_PROPERTIES( 6, OClickableImageBaseModel )
-        DECL_PROP1( BUTTONTYPE,             FormButtonType,             BOUND );
+        DECL_PROP1( BUTTONTYPE,		        FormButtonType,				BOUND );
         DECL_PROP1( DEFAULT_STATE,          sal_Int16,                  BOUND );
-        DECL_PROP1( DISPATCHURLINTERNAL,    sal_Bool,                   BOUND );
-        DECL_PROP1( TARGET_URL,             ::rtl::OUString,            BOUND );
-        DECL_PROP1( TARGET_FRAME,           ::rtl::OUString,            BOUND );
-        DECL_PROP1( TABINDEX,               sal_Int16,                  BOUND );
+        DECL_PROP1( DISPATCHURLINTERNAL,	sal_Bool,				    BOUND );
+        DECL_PROP1( TARGET_URL,		        ::rtl::OUString,			BOUND );
+        DECL_PROP1( TARGET_FRAME,	        ::rtl::OUString,			BOUND );
+        DECL_PROP1( TABINDEX,		        sal_Int16,					BOUND );
     END_DESCRIBE_PROPERTIES();
 }
 
@@ -134,7 +134,7 @@ IMPLEMENT_DEFAULT_CLONING( OButtonModel )
 
 // XServiceInfo
 //------------------------------------------------------------------------------
-StringSequence  OButtonModel::getSupportedServiceNames() throw()
+StringSequence	OButtonModel::getSupportedServiceNames() throw()
 {
     StringSequence aSupported = OClickableImageBaseModel::getSupportedServiceNames();
     aSupported.realloc( aSupported.getLength() + 1 );
@@ -148,7 +148,7 @@ StringSequence  OButtonModel::getSupportedServiceNames() throw()
 //------------------------------------------------------------------------------
 ::rtl::OUString OButtonModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
 {
-    return FRM_COMPONENT_COMMANDBUTTON; // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_COMMANDBUTTON;	// old (non-sun) name for compatibility !
 }
 
 //------------------------------------------------------------------------------
@@ -156,7 +156,7 @@ void OButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream) thr
 {
     OClickableImageBaseModel::write(_rxOutStream);
 
-    _rxOutStream->writeShort(0x0003);   // Version
+    _rxOutStream->writeShort(0x0003); 	// Version
 
     {
         OStreamSection aSection( _rxOutStream.get() );
@@ -177,7 +177,7 @@ void OButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) throw
 {
     OClickableImageBaseModel::read(_rxInStream);
 
-    sal_uInt16 nVersion = _rxInStream->readShort();     // Version
+    sal_uInt16 nVersion = _rxInStream->readShort(); 	// Version
     switch (nVersion)
     {
         case 0x0001:
@@ -364,7 +364,7 @@ Sequence<Type> OButtonControl::_getTypes()
 }
 
 //------------------------------------------------------------------------------
-StringSequence  OButtonControl::getSupportedServiceNames() throw()
+StringSequence	OButtonControl::getSupportedServiceNames() throw()
 {
     StringSequence aSupported = OClickableImageBaseControl::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 1);
@@ -776,7 +776,7 @@ void SAL_CALL OButtonControl::releaseDispatchProviderInterceptor( const Referenc
 }
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx
index b866c55b3b1c..511077d4032f 100644
--- a/forms/source/component/Button.hxx
+++ b/forms/source/component/Button.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -123,7 +123,7 @@ typedef ::cppu::ImplHelper3 <   ::com::sun::star::awt::XButton
                             ,   ::com::sun::star::beans::XPropertyChangeListener
                             >   OButtonControl_BASE;
 
-class OButtonControl    :public OButtonControl_BASE
+class OButtonControl	:public OButtonControl_BASE
                         ,public OClickableImageBaseControl
                         ,public OFormNavigationHelper
 {
@@ -204,7 +204,7 @@ private:
 };
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 #endif // _FRM_BUTTON_HXX_
diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx
index 11ccbe16690a..bc69702ede28 100644
--- a/forms/source/component/CheckBox.cxx
+++ b/forms/source/component/CheckBox.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ InterfaceRef SAL_CALL OCheckBoxControl_CreateInstance(const Reference<XMultiServ
 }
 
 //------------------------------------------------------------------------------
-StringSequence SAL_CALL OCheckBoxControl::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException)
+StringSequence SAL_CALL	OCheckBoxControl::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException)
 {
     StringSequence aSupported = OBoundControl::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 1);
@@ -119,7 +119,7 @@ IMPLEMENT_DEFAULT_CLONING( OCheckBoxModel )
 
 // XServiceInfo
 //------------------------------------------------------------------------------
-StringSequence SAL_CALL OCheckBoxModel::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException)
+StringSequence SAL_CALL	OCheckBoxModel::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException)
 {
     StringSequence aSupported = OReferenceValueComponent::getSupportedServiceNames();
 
@@ -145,14 +145,14 @@ StringSequence SAL_CALL OCheckBoxModel::getSupportedServiceNames() throw(::com::
 void OCheckBoxModel::describeFixedProperties( Sequence< Property >& _rProps ) const
 {
     BEGIN_DESCRIBE_PROPERTIES( 1, OReferenceValueComponent )
-        DECL_PROP1(TABINDEX,        sal_Int16,          BOUND);
+        DECL_PROP1(TABINDEX,		sal_Int16,			BOUND);
     END_DESCRIBE_PROPERTIES();
 }
 
 //------------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OCheckBoxModel::getServiceName() throw(RuntimeException)
 {
-    return FRM_COMPONENT_CHECKBOX;  // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_CHECKBOX;	// old (non-sun) name for compatibility !
 }
 
 //------------------------------------------------------------------------------
diff --git a/forms/source/component/CheckBox.hxx b/forms/source/component/CheckBox.hxx
index f5620b310947..6ae342c4045b 100644
--- a/forms/source/component/CheckBox.hxx
+++ b/forms/source/component/CheckBox.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,20 +38,20 @@ namespace frm
 //==================================================================
 //= OCheckBoxModel
 //==================================================================
-class OCheckBoxModel    :public OReferenceValueComponent
+class OCheckBoxModel	:public OReferenceValueComponent
 {
 protected:
-    sal_Int16   getState(const ::com::sun::star::uno::Any& rValue);
+    sal_Int16	getState(const ::com::sun::star::uno::Any& rValue);
 
 public:
     DECLARE_DEFAULT_LEAF_XTOR( OCheckBoxModel );
 
     // XServiceInfo
     IMPLEMENTATION_NAME(OCheckBoxModel);
-    virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
+    virtual StringSequence SAL_CALL	getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
 
     // XPersistObject
-    virtual ::rtl::OUString SAL_CALL    getServiceName() throw(::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL	getServiceName() throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL
         write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL
@@ -81,7 +81,7 @@ public:
 
     // XServiceInfo
     IMPLEMENTATION_NAME(OCheckBoxControl);
-    virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
+    virtual StringSequence SAL_CALL	getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
 };
 
 //.........................................................................
diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx
index d64ebab3ed8c..af41076175d0 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -259,7 +259,7 @@ OGridColumn::OGridColumn( const OGridColumn* _pOriginal )
         }
 
         if ( m_xAggregate.is() )
-        {   // don't omit this brackets - they ensure that the following temporary is properly deleted
+        {	// don't omit this brackets - they ensure that the following temporary is properly deleted
             m_xAggregate->setDelegator( static_cast< ::cppu::OWeakObject* >( this ) );
         }
     }
diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx
index 4068a7b88590..76c526cdc302 100644
--- a/forms/source/component/Columns.hxx
+++ b/forms/source/component/Columns.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,23 +59,23 @@ namespace frm
 //==================================================================
 typedef ::cppu::WeakAggComponentImplHelper2 <   ::com::sun::star::lang::XUnoTunnel
                                             ,   ::com::sun::star::util::XCloneable > OGridColumn_BASE;
-class OGridColumn   :public ::comphelper::OBaseMutex
+class OGridColumn	:public ::comphelper::OBaseMutex
                     ,public OGridColumn_BASE
                     ,public OPropertySetAggregationHelper
                     ,public OCloneableAggregation
 {
 protected:
 // [properties]
-    ::com::sun::star::uno::Any  m_aWidth;                   // column width
-    ::com::sun::star::uno::Any  m_aAlign;                   // column alignment
-    ::com::sun::star::uno::Any  m_aHidden;                  // column hidden?
+    ::com::sun::star::uno::Any	m_aWidth;					// column width
+    ::com::sun::star::uno::Any	m_aAlign;					// column alignment
+    ::com::sun::star::uno::Any	m_aHidden;					// column hidden?
 // [properties]
 
     ::comphelper::ComponentContext  m_aContext;
-    ::rtl::OUString                 m_aModelName;
+    ::rtl::OUString				    m_aModelName;
 
 // [properties]
-    ::rtl::OUString             m_aLabel;                   // Name der Spalte
+    ::rtl::OUString				m_aLabel;					// Name der Spalte
 // [properties]
 
 public:
@@ -92,8 +92,8 @@ public:
     virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence<sal_Int8>& _rIdentifier) throw(::com::sun::star::uno::RuntimeException);
 
     // XTypeProvider
-    virtual ::com::sun::star::uno::Sequence<sal_Int8>           SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
-    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);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type>	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
 
     // OComponentHelper
     virtual void SAL_CALL disposing();
@@ -130,28 +130,28 @@ protected:
     virtual OGridColumn* createCloneColumn() const = 0;
 };
 
-#define DECL_COLUMN(ClassName)                                                                              \
-class ClassName                                                                                             \
-    :public OGridColumn                                                                                     \
-    ,public OAggregationArrayUsageHelper< ClassName >                                                       \
-{                                                                                                           \
-public:                                                                                                     \
+#define DECL_COLUMN(ClassName)										                                        \
+class ClassName														                                        \
+    :public OGridColumn												                                        \
+    ,public OAggregationArrayUsageHelper< ClassName >				                                        \
+{																	                                        \
+public:																                                        \
     ClassName(const ::comphelper::ComponentContext& _rContext );                                            \
     ClassName(const ClassName* _pCloneFrom);                                                                \
                                                                                                             \
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException);  \
-    virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();                                         \
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException);	\
+    virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();	                                        \
                                                                                                             \
-    virtual void fillProperties(                                                                            \
-        ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps,          \
-        ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rAggregateProps  \
-        ) const;                                                                                            \
+    virtual void fillProperties(	                                                                        \
+        ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps,	        \
+        ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rAggregateProps	\
+        ) const;	                                                                                        \
                                                                                                             \
     virtual OGridColumn* createCloneColumn() const;                                                         \
 };
 
 
-#define IMPL_COLUMN(ClassName, Model, bAllowDropDown)                               \
+#define IMPL_COLUMN(ClassName, Model, bAllowDropDown)								\
     ClassName::ClassName( const ::comphelper::ComponentContext& _rContext ) \
     :OGridColumn(_rContext, Model) \
 { \
@@ -187,16 +187,16 @@ OGridColumn* ClassName::createCloneColumn() const \
 } \
  \
 // column type ids
-#define TYPE_CHECKBOX       0
-#define TYPE_COMBOBOX       1
+#define TYPE_CHECKBOX		0
+#define TYPE_COMBOBOX		1
 #define TYPE_CURRENCYFIELD  2
-#define TYPE_DATEFIELD      3
-#define TYPE_FORMATTEDFIELD 4
-#define TYPE_LISTBOX        5
-#define TYPE_NUMERICFIELD   6
-#define TYPE_PATTERNFIELD   7
-#define TYPE_TEXTFIELD      8
-#define TYPE_TIMEFIELD      9
+#define TYPE_DATEFIELD		3
+#define TYPE_FORMATTEDFIELD	4
+#define TYPE_LISTBOX		5
+#define TYPE_NUMERICFIELD	6
+#define TYPE_PATTERNFIELD	7
+#define TYPE_TEXTFIELD		8
+#define TYPE_TIMEFIELD		9
 
 // liste aller bekannten columns
 const StringSequence& getColumnTypes();
@@ -217,7 +217,7 @@ DECL_COLUMN(FormattedFieldColumn)
 #endif // _FRM_COLUMNS_HXX
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index 899289025e7b..02d15508abe5 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -316,11 +316,11 @@ sal_Bool OComboBoxModel::convertFastPropertyValue(
 void OComboBoxModel::describeFixedProperties( Sequence< Property >& _rProps ) const
 {
     BEGIN_DESCRIBE_PROPERTIES( 6, OBoundControlModel )
-        DECL_PROP1(TABINDEX,            sal_Int16,                  BOUND);
-        DECL_PROP1(LISTSOURCETYPE,      ListSourceType, BOUND);
-        DECL_PROP1(LISTSOURCE,          ::rtl::OUString,            BOUND);
-        DECL_BOOL_PROP1(EMPTY_IS_NULL,                              BOUND);
-        DECL_PROP1(DEFAULT_TEXT,        ::rtl::OUString,            BOUND);
+        DECL_PROP1(TABINDEX,			sal_Int16,					BOUND);
+        DECL_PROP1(LISTSOURCETYPE,		ListSourceType, BOUND);
+        DECL_PROP1(LISTSOURCE,			::rtl::OUString,			BOUND);
+        DECL_BOOL_PROP1(EMPTY_IS_NULL,								BOUND);
+        DECL_PROP1(DEFAULT_TEXT,		::rtl::OUString,			BOUND);
         DECL_PROP1(STRINGITEMLIST,      Sequence< ::rtl::OUString >,BOUND);
     END_DESCRIBE_PROPERTIES();
 }
@@ -337,7 +337,7 @@ void OComboBoxModel::describeAggregateProperties( Sequence< Property >& _rAggreg
 //------------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OComboBoxModel::getServiceName() throw(RuntimeException)
 {
-    return FRM_COMPONENT_COMBOBOX;  // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_COMBOBOX;	// old (non-sun) name for compatibility !
 }
 
 //------------------------------------------------------------------------------
@@ -347,10 +347,10 @@ void SAL_CALL OComboBoxModel::write(const Reference<stario::XObjectOutputStream>
     OBoundControlModel::write(_rxOutStream);
 
     // Version
-    // Version 0x0002:  EmptyIsNull
-    // Version 0x0003:  ListSource->Seq
-    // Version 0x0004:  DefaultText
-    // Version 0x0005:  HelpText
+    // Version 0x0002:	EmptyIsNull
+    // Version 0x0003:	ListSource->Seq
+    // Version 0x0004:	DefaultText
+    // Version 0x0005:	HelpText
     _rxOutStream->writeShort(0x0006);
 
     // Maskierung fuer any
@@ -452,7 +452,7 @@ void SAL_CALL OComboBoxModel::read(const Reference<stario::XObjectInputStream>&
         m_bEmptyIsNull = bNull;
     }
 
-    if (nVersion > 0x0003)  // nVersion == 4
+    if (nVersion > 0x0003)	// nVersion == 4
         _rxInStream >> m_aDefaultText;
 
     // Stringliste muss geleert werden, wenn eine Listenquelle gesetzt ist
@@ -572,7 +572,7 @@ void OComboBoxModel::loadData( bool _bForce )
                     m_aListRowSet.setCommand( aStatement.makeStringAndClear() );
                     bExecuteRowSet = true;
                 }
-            }   break;
+            }	break;
             case ListSourceType_QUERY:
             {
                 m_aListRowSet.setCommandFromQuery( m_aListSource );
@@ -611,7 +611,7 @@ void OComboBoxModel::loadData( bool _bForce )
         return;
     }
 
-    ::std::vector< ::rtl::OUString >    aStringList;
+    ::std::vector< ::rtl::OUString >	aStringList;
     aStringList.reserve(16);
     try
     {
diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx
index 0a45a2fa78d9..3f88658ce9b3 100644
--- a/forms/source/component/ComboBox.hxx
+++ b/forms/source/component/ComboBox.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,20 +63,20 @@ class OComboBoxModel
             ,public OErrorBroadcaster
 {
     CachedRowSet                            m_aListRowSet;          // the row set to fill the list
-    ::com::sun::star::uno::Any              m_aBoundColumn;         // obsolet
-    ::rtl::OUString                         m_aListSource;          //
-    ::rtl::OUString                         m_aDefaultText;         // DefaultText
+    ::com::sun::star::uno::Any				m_aBoundColumn; 		// obsolet
+    ::rtl::OUString 						m_aListSource;			//
+    ::rtl::OUString 						m_aDefaultText; 		// DefaultText
     ::com::sun::star::uno::Any              m_aLastKnownValue;
 
-    StringSequence                          m_aDesignModeStringItems;
+    StringSequence							m_aDesignModeStringItems;
         // upon loading, in some cases we reset fill our string item list ourself. We don't want
         // to lose the user's items then, so we remember them here.
 
 
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter> m_xFormatter;
 
-    ::com::sun::star::form::ListSourceType  m_eListSourceType;      // type der list source
-    sal_Bool                                m_bEmptyIsNull;         // LeerString wird als NULL interpretiert
+    ::com::sun::star::form::ListSourceType	m_eListSourceType;		// type der list source
+    sal_Bool								m_bEmptyIsNull; 		// LeerString wird als NULL interpretiert
 
     ::std::auto_ptr< ::dbtools::FormattedColumnValue >
                                             m_pValueFormatter;
@@ -84,7 +84,7 @@ class OComboBoxModel
 
 
 protected:
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type>   _getTypes();
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type>	_getTypes();
 
 public:
     DECLARE_DEFAULT_LEAF_XTOR( OComboBoxModel );
@@ -111,7 +111,7 @@ public:
     virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException);
 
     // XPersistObject
-    virtual ::rtl::OUString SAL_CALL    getServiceName() throw(::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL	getServiceName() throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL
         write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL
@@ -137,8 +137,8 @@ protected:
                             translateDbColumnToControlValue( );
     virtual sal_Bool        commitControlValueToDbColumn( bool _bPostReset );
 
-    virtual void            onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm );
-    virtual void            onDisconnectedDbColumn();
+    virtual void		    onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm );
+    virtual void		    onDisconnectedDbColumn();
 
     virtual ::com::sun::star::uno::Any
                             getDefaultForReset() const;
diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx
index efcbaeae18e1..808863d2fbf4 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,15 +112,15 @@ void OCurrencyModel::implConstruct()
             sal_Bool bPrependCurrencySymbol;
             switch ( aLocaleInfo.getCurrPositiveFormat() )
             {
-                case 0: // $1
+                case 0:	// $1
                     sCurrencySymbol = String(aLocaleInfo.getCurrSymbol());
                     bPrependCurrencySymbol = sal_True;
                     break;
-                case 1: // 1$
+                case 1:	// 1$
                     sCurrencySymbol = String(aLocaleInfo.getCurrSymbol());
                     bPrependCurrencySymbol = sal_False;
                     break;
-                case 2: // $ 1
+                case 2:	// $ 1
                     sCurrencySymbol = ::rtl::OUString(String(aLocaleInfo.getCurrSymbol())) + ::rtl::OUString::createFromAscii(" ");
                     bPrependCurrencySymbol = sal_True;
                     break;
@@ -199,17 +199,17 @@ void OCurrencyModel::describeFixedProperties( Sequence< Property >& _rProps ) co
 {
     BEGIN_DESCRIBE_PROPERTIES( 2, OEditBaseModel )
         // Value auf transient setzen
-//      ModifyPropertyAttributes(_rAggregateProps, PROPERTY_VALUE, PropertyAttribute::TRANSIENT, 0);
+//		ModifyPropertyAttributes(_rAggregateProps, PROPERTY_VALUE, PropertyAttribute::TRANSIENT, 0);
 
-        DECL_PROP3(DEFAULT_VALUE,       double,             BOUND, MAYBEDEFAULT, MAYBEVOID);
-        DECL_PROP1(TABINDEX,        sal_Int16,              BOUND);
+        DECL_PROP3(DEFAULT_VALUE,		double,				BOUND, MAYBEDEFAULT, MAYBEVOID);
+        DECL_PROP1(TABINDEX,		sal_Int16,				BOUND);
     END_DESCRIBE_PROPERTIES();
 }
 
 //------------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OCurrencyModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
 {
-    return FRM_COMPONENT_CURRENCYFIELD; // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_CURRENCYFIELD;	// old (non-sun) name for compatibility !
 }
 
 //------------------------------------------------------------------------------
@@ -264,7 +264,7 @@ void OCurrencyModel::resetNoBroadcast()
 }
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Currency.hxx b/forms/source/component/Currency.hxx
index b36585e52e39..49f19d98deee 100644
--- a/forms/source/component/Currency.hxx
+++ b/forms/source/component/Currency.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 frm
 class OCurrencyModel
                 :public OEditBaseModel
 {
-    ::com::sun::star::uno::Any          m_aSaveValue;
+    ::com::sun::star::uno::Any			m_aSaveValue;
 
 protected:
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes();
@@ -95,7 +95,7 @@ public:
 };
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 #endif // _FORMS_CURRENCY_HXX_
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 248fbb44c0b9..cb4273631a9d 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -506,7 +506,7 @@ ODatabaseForm::~ODatabaseForm()
     ::rtl::OUString aName;
     ::rtl::OUString aValue;
 
-    for (   HtmlSuccessfulObjListIterator pSuccObj = aSuccObjList.begin();
+    for	(	HtmlSuccessfulObjListIterator pSuccObj = aSuccObjList.begin();
             pSuccObj < aSuccObjList.end();
             ++pSuccObj
         )
@@ -529,7 +529,7 @@ ODatabaseForm::~ODatabaseForm()
         aResult.append(aName);
         aResult.append(sal_Unicode('='));
         aResult.append(aValue);
-
+        
         if (pSuccObj < aSuccObjList.end() - 1)
         {
             if ( _bURLEncoded )
@@ -569,7 +569,7 @@ Sequence<sal_Int8> ODatabaseForm::GetDataMultiPartEncoded(const Reference<XContr
 
     // Liste zu ::rtl::OUString zusammensetzen
     ::rtl::OUString aResult;
-    for (   HtmlSuccessfulObjListIterator pSuccObj = aSuccObjList.begin();
+    for	(	HtmlSuccessfulObjListIterator pSuccObj = aSuccObjList.begin();
             pSuccObj < aSuccObjList.end();
             ++pSuccObj
         )
@@ -640,7 +640,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc
     xComponentSet->getPropertyValue( PROPERTY_NAME ) >>= aName;
     if( !aName.getLength() && nClassId != FormComponentType::IMAGEBUTTON)
         return;
-    else    // Name um den Prefix erweitern
+    else	// Name um den Prefix erweitern
         aName = rNamePrefix + aName;
 
     switch( nClassId )
@@ -719,11 +719,11 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc
             // MIB: Spezial-Behandlung fuer Multiline-Edit nur dann, wenn
             // es auch ein Control dazu gibt.
             Any aTmp = xComponentSet->getPropertyValue( PROPERTY_MULTILINE );
-            sal_Bool bMulti =   rxSubmitButton.is()
+            sal_Bool bMulti =	rxSubmitButton.is()
                             && (aTmp.getValueType().getTypeClass() == TypeClass_BOOLEAN)
                             && getBOOL(aTmp);
             ::rtl::OUString sText;
-            if ( bMulti )   // Bei MultiLineEdit Text am Control abholen
+            if ( bMulti )	// Bei MultiLineEdit Text am Control abholen
             {
 
                 Reference<XControlContainer>  xControlContainer(rxSubmitButton->getContext(), UNO_QUERY);
@@ -788,7 +788,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc
                 }
                 rList.push_back( HtmlSuccessfulObj(aName, aText) );
             }
-        }   break;
+        }	break;
         case FormComponentType::DATEFIELD:
         {
             // <name>=<wert> // Wert wird als Datum im Format (MM-DD-YYYY)
@@ -811,7 +811,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc
                 }
                 rList.push_back( HtmlSuccessfulObj(aName, aText) );
             }
-        }   break;
+        }	break;
         case FormComponentType::TIMEFIELD:
         {
             // <name>=<wert> // Wert wird als Zeit im Format (HH:MM:SS) angegeben
@@ -834,7 +834,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc
                 }
                 rList.push_back( HtmlSuccessfulObj(aName, aText) );
             }
-        }   break;
+        }	break;
 
         // starform
         case FormComponentType::HIDDENCONTROL:
@@ -953,7 +953,7 @@ void ODatabaseForm::FillSuccessfulList( HtmlSuccessfulObjList& rList,
     // Liste loeschen
     rList.clear();
     // Ueber Components iterieren
-    Reference<XPropertySet>         xComponentSet;
+    Reference<XPropertySet> 		xComponentSet;
     ::rtl::OUString aPrefix;
 
     // we know already how many objects should be appended,
@@ -972,7 +972,7 @@ void ODatabaseForm::Encode( ::rtl::OUString& rString ) const
     ::rtl::OUString aResult;
 
     // Immer ANSI #58641
-//  rString.Convert(CHARSET_SYSTEM, CHARSET_ANSI);
+//	rString.Convert(CHARSET_SYSTEM, CHARSET_ANSI);
 
 
     // Zeilenendezeichen werden als CR dargestellt
@@ -994,17 +994,17 @@ void ODatabaseForm::Encode( ::rtl::OUString& rString ) const
         {
             switch( nCharCode )
             {
-                case 13:    // CR
-                    aResult += ::rtl::OUString::createFromAscii("%0D%0A");  // Hex-Darstellung CR LF
+                case 13:	// CR
+                    aResult += ::rtl::OUString::createFromAscii("%0D%0A");	// Hex-Darstellung CR LF
                     break;
 
 
                 // Netscape Sonderbehandlung
-                case 42:    // '*'
-                case 45:    // '-'
-                case 46:    // '.'
-                case 64:    // '@'
-                case 95:    // '_'
+                case 42:	// '*'
+                case 45:	// '-'
+                case 46:	// '.'
+                case 64:	// '@'
+                case 95:	// '_'
                     aResult += UniString(nCharCode);
                     break;
 
@@ -1026,7 +1026,7 @@ void ODatabaseForm::Encode( ::rtl::OUString& rString ) const
     }
 
 
-    // Spaces durch '+' ersetzen
+    // Spaces durch	'+' ersetzen
     aResult = aResult.replace(' ', '+');
 
     rString = aResult;
@@ -1165,10 +1165,10 @@ bool ODatabaseForm::hasValidParent() const
         {
             Reference< XPropertySet >  xSet( m_xParent, UNO_QUERY );
             Reference< XLoadable > xLoad( m_xParent, UNO_QUERY );
-            if  (   xLoad->isLoaded()
-                &&  (   xResultSet->isBeforeFirst()
-                    ||  xResultSet->isAfterLast()
-                    ||  getBOOL( xSet->getPropertyValue( PROPERTY_ISNEW ) )
+            if	(	xLoad->isLoaded()
+                &&	(	xResultSet->isBeforeFirst()
+                    ||	xResultSet->isAfterLast()
+                    ||	getBOOL( xSet->getPropertyValue( PROPERTY_ISNEW ) )
                     )
                 )
                 // the parent form is loaded and on a "virtual" row -> not valid
@@ -1281,7 +1281,7 @@ sal_Bool ODatabaseForm::executeRowSet(::osl::ResettableMutexGuard& _rClearForNot
     if (bSuccess)
     {
         // adjust the privilege property
-        //  m_nPrivileges;
+        //	m_nPrivileges;
         m_xAggregateSet->getPropertyValue(PROPERTY_PRIVILEGES) >>= m_nPrivileges;
         if (!m_bAllowInsert)
             m_nPrivileges &= ~Privilege::INSERT;
@@ -1409,7 +1409,7 @@ void ODatabaseForm::describeFixedAndAggregateProperties(
         RemoveProperty( _rAggregateProps, PROPERTY_FILTER );
         RemoveProperty( _rAggregateProps, PROPERTY_APPLYFILTER );
 
-        DECL_IFACE_PROP4(ACTIVE_CONNECTION, XConnection,                    BOUND, TRANSIENT, MAYBEVOID, CONSTRAINED);
+        DECL_IFACE_PROP4(ACTIVE_CONNECTION,	XConnection,	                BOUND, TRANSIENT, MAYBEVOID, CONSTRAINED);
         DECL_BOOL_PROP2 ( APPLYFILTER,                                      BOUND, MAYBEDEFAULT            );
         DECL_PROP1      ( NAME,             ::rtl::OUString,                BOUND                          );
         DECL_PROP1      ( MASTERFIELDS,     Sequence< ::rtl::OUString >,    BOUND                          );
@@ -1512,9 +1512,9 @@ void ODatabaseForm::fire( sal_Int32* pnHandles, const Any* pNewValues, const Any
                 break;
 
         if ((nPos < nCount) && (pNewValues[nPos].getValueType().getTypeClass() == TypeClass_BOOLEAN) && getBOOL(pNewValues[nPos]))
-        {   // yeah, we found it, and it changed to TRUE
+        {	// yeah, we found it, and it changed to TRUE
             if (nPos == 0)
-            {   // just cut the first element
+            {	// just cut the first element
                 ++pnHandles;
                 ++pNewValues;
                 ++pOldValues;
@@ -1524,7 +1524,7 @@ void ODatabaseForm::fire( sal_Int32* pnHandles, const Any* pNewValues, const Any
                 // just cut the last element
                 --nCount;
             else
-            {   // split into two base class calls
+            {	// split into two base class calls
                 OPropertySetAggregationHelper::fire(pnHandles, pNewValues, pOldValues, nPos, bVetoable);
                 ++nPos;
                 OPropertySetAggregationHelper::fire(pnHandles + nPos, pNewValues + nPos, pOldValues + nPos, nCount - nPos, bVetoable);
@@ -2392,7 +2392,7 @@ void ODatabaseForm::_propertyChanged(const PropertyChangeEvent& evt) throw( Runt
         sal_Int32 nHandle = PROPERTY_ID_ACTIVE_CONNECTION;
         fire(&nHandle, &evt.NewValue, &evt.OldValue, 1, sal_False);
     }
-    else    // it was one of the statement relevant props
+    else	// it was one of the statement relevant props
     {
         // if the statement has changed we have to delete the parameter info
         invlidateParameters();
@@ -2607,7 +2607,7 @@ void SAL_CALL ODatabaseForm::disposing(const EventObject& Source) throw( Runtime
 
     // does the disposing come from the aggregate ?
     if (m_xAggregate.is())
-    {   // no -> forward it
+    {	// no -> forward it
         com::sun::star::uno::Reference<com::sun::star::lang::XEventListener> xListener;
         if (query_aggregation(m_xAggregate, xListener))
             xListener->disposing(Source);
@@ -2726,7 +2726,7 @@ sal_Bool ODatabaseForm::canShareConnection( const Reference< XPropertySet >& _rx
             // and it's really a data source name (not empty)
             bCanShareConnection = sal_True;
         else
-        {   // the data source name is empty
+        {	// the data source name is empty
             // -> ook for the URL
             ::rtl::OUString sParentURL;
             ::rtl::OUString sMyURL;
@@ -2752,7 +2752,7 @@ sal_Bool ODatabaseForm::canShareConnection( const Reference< XPropertySet >& _rx
 
         bCanShareConnection =
                 ( sParentUser == sMyUser )
-            &&  ( sParentPwd == sMyPwd );
+            &&	( sParentPwd == sMyPwd );
     }
 
     return bCanShareConnection;
@@ -2898,7 +2898,7 @@ void ODatabaseForm::load_impl(sal_Bool bCausedByParentForm, sal_Bool bMoveToFirs
 
     // if we don't have a connection, we are not intended to be a database form or the aggregate was not able
     // to establish a connection
-    sal_Bool bConnected = implEnsureConnection();
+    sal_Bool bConnected	= implEnsureConnection();
 
     // we don't have to execute if we do not have a command to execute
     sal_Bool bExecute = bConnected && m_xAggregateSet.is() && getString(m_xAggregateSet->getPropertyValue(PROPERTY_COMMAND)).getLength();
@@ -3230,7 +3230,7 @@ sal_Bool SAL_CALL ODatabaseForm::approveRowChange(const RowChangeEvent& event) t
 //------------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseForm::approveRowSetChange(const EventObject& event) throw( RuntimeException )
 {
-    if (event.Source == InterfaceRef(static_cast<XWeak*>(this)))    // ignore our aggregate as we handle this approve ourself
+    if (event.Source == InterfaceRef(static_cast<XWeak*>(this)))	// ignore our aggregate as we handle this approve ourself
     {
         ::osl::ClearableMutexGuard aGuard( m_aMutex );
         bool bWasLoaded = isLoaded();
@@ -3803,7 +3803,7 @@ void SAL_CALL ODatabaseForm::propertyChange( const PropertyChangeEvent& evt ) th
 
 // com::sun::star::lang::XServiceInfo
 //------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseForm::getImplementationName_Static()
+::rtl::OUString	SAL_CALL ODatabaseForm::getImplementationName_Static()
 {
     return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.forms.ODatabaseForm" ) );
 }
@@ -3844,7 +3844,7 @@ Sequence< ::rtl::OUString > SAL_CALL ODatabaseForm::getSupportedServiceNames_Sta
 }
 
 //------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseForm::getImplementationName() throw( RuntimeException )
+::rtl::OUString	SAL_CALL ODatabaseForm::getImplementationName() throw( RuntimeException )
 {
     return getImplementationName_Static();
 }
@@ -3885,13 +3885,13 @@ sal_Bool SAL_CALL ODatabaseForm::supportsService(const ::rtl::OUString& ServiceN
 // com::sun::star::io::XPersistObject
 //------------------------------------------------------------------------------
 
-const sal_uInt16 CYCLE              = 0x0001;
-const sal_uInt16 DONTAPPLYFILTER    = 0x0002;
+const sal_uInt16 CYCLE				= 0x0001;
+const sal_uInt16 DONTAPPLYFILTER	= 0x0002;
 
 //------------------------------------------------------------------------------
 ::rtl::OUString ODatabaseForm::getServiceName() throw( RuntimeException )
 {
-    return FRM_COMPONENT_FORM;  // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_FORM;	// old (non-sun) name for compatibility !
 }
 
 //------------------------------------------------------------------------------
@@ -3943,7 +3943,7 @@ void SAL_CALL ODatabaseForm::write(const Reference<XObjectOutputStream>& _rxOutS
             default : DBG_ERROR("ODatabaseForm::write : wrong CommandType !");
         }
     }
-    _rxOutStream->writeShort((sal_Int16)eTranslated);           // former DataSelectionType
+    _rxOutStream->writeShort((sal_Int16)eTranslated);			// former DataSelectionType
 
     // very old versions expect a CursorType here
     _rxOutStream->writeShort(DatabaseCursorType_KEYSET);
@@ -4064,16 +4064,16 @@ void SAL_CALL ODatabaseForm::read(const Reference<XObjectInputStream>& _rxInStre
     if (m_xAggregateSet.is())
         m_xAggregateSet->setPropertyValue(PROPERTY_INSERTONLY, makeAny(bInsertOnly));
 
-    m_bAllowInsert      = _rxInStream->readBoolean();
-    m_bAllowUpdate      = _rxInStream->readBoolean();
-    m_bAllowDelete      = _rxInStream->readBoolean();
+    m_bAllowInsert		= _rxInStream->readBoolean();
+    m_bAllowUpdate		= _rxInStream->readBoolean();
+    m_bAllowDelete		= _rxInStream->readBoolean();
 
     // html stuff
     ::rtl::OUString sTmp;
     _rxInStream >> sTmp;
     m_aTargetURL = INetURLObject::decode( sTmp, '%', INetURLObject::DECODE_UNAMBIGUOUS);
-    m_eSubmitMethod     = (FormSubmitMethod)_rxInStream->readShort();
-    m_eSubmitEncoding       = (FormSubmitEncoding)_rxInStream->readShort();
+    m_eSubmitMethod		= (FormSubmitMethod)_rxInStream->readShort();
+    m_eSubmitEncoding		= (FormSubmitEncoding)_rxInStream->readShort();
     _rxInStream >> m_aTargetFrame;
 
     if (nVersion > 1)
@@ -4090,7 +4090,7 @@ void SAL_CALL ODatabaseForm::read(const Reference<XObjectInputStream>& _rxInStre
             m_xAggregateSet->setPropertyValue(PROPERTY_SORT, makeAny(sAggregateProp));
     }
 
-    sal_uInt16 nAnyMask = 0;
+    sal_uInt16 nAnyMask	= 0;
     if (nVersion > 2)
     {
         nAnyMask = _rxInStream->readShort();
@@ -4111,11 +4111,11 @@ void ODatabaseForm::implInserted( const ElementDescription* _pElement )
 {
     OFormComponents::implInserted( _pElement );
 
-    Reference< XSQLErrorBroadcaster >   xBroadcaster( _pElement->xInterface, UNO_QUERY );
-    Reference< XForm >                  xForm       ( _pElement->xInterface, UNO_QUERY );
+    Reference< XSQLErrorBroadcaster >	xBroadcaster( _pElement->xInterface, UNO_QUERY );
+    Reference< XForm >					xForm		( _pElement->xInterface, UNO_QUERY );
 
     if ( xBroadcaster.is() && !xForm.is() )
-    {   // the object is an error broadcaster, but no form itself -> add ourself as listener
+    {	// the object is an error broadcaster, but no form itself -> add ourself as listener
         xBroadcaster->addSQLErrorListener( this );
     }
 }
@@ -4128,7 +4128,7 @@ void ODatabaseForm::implRemoved(const InterfaceRef& _rxObject)
     Reference<XSQLErrorBroadcaster>  xBroadcaster(_rxObject, UNO_QUERY);
     Reference<XForm>  xForm(_rxObject, UNO_QUERY);
     if (xBroadcaster.is() && !xForm.is())
-    {   // the object is an error broadcaster, but no form itself -> remove ourself as listener
+    {	// the object is an error broadcaster, but no form itself -> remove ourself as listener
         xBroadcaster->removeSQLErrorListener(this);
     }
 }
@@ -4158,7 +4158,7 @@ void SAL_CALL ODatabaseForm::setName(const ::rtl::OUString& aName) throw( Runtim
 }
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx
index 75249a2b8adf..06790e48aca1 100644
--- a/forms/source/component/DatabaseForm.hxx
+++ b/forms/source/component/DatabaseForm.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,16 +96,16 @@ namespace frm
 //= html tools
 //========================================================================
 
-const sal_uInt16 SUCCESSFUL_REPRESENT_TEXT          = 0x0001;
-const sal_uInt16 SUCCESSFUL_REPRESENT_FILE          = 0x0002;
+const sal_uInt16 SUCCESSFUL_REPRESENT_TEXT			= 0x0001;
+const sal_uInt16 SUCCESSFUL_REPRESENT_FILE			= 0x0002;
 
 //------------------------------------------------------------------------------
 class HtmlSuccessfulObj
 {
 public:
-    ::rtl::OUString     aName;
-    ::rtl::OUString     aValue;
-    sal_uInt16          nRepresentation;
+    ::rtl::OUString		aName;
+    ::rtl::OUString		aValue;
+    sal_uInt16			nRepresentation;
 
     HtmlSuccessfulObj( const ::rtl::OUString& _rName, const ::rtl::OUString& _rValue,
         sal_uInt16 _nRepresent = SUCCESSFUL_REPRESENT_TEXT )
@@ -147,7 +147,7 @@ typedef ::cppu::ImplHelper4 <   ::com::sun::star::lang::XServiceInfo
                             ,   ::com::sun::star::sdbc::XWarningsSupplier
                             >   ODatabaseForm_BASE2;
 
-typedef ::cppu::ImplHelper7<    ::com::sun::star::sdbc::XCloseable,
+typedef ::cppu::ImplHelper7<	::com::sun::star::sdbc::XCloseable,
                                 ::com::sun::star::sdbc::XRowSet,
                                 ::com::sun::star::sdb::XCompletedExecution,
                                 ::com::sun::star::sdb::XRowSetApproveBroadcaster,
@@ -156,7 +156,7 @@ typedef ::cppu::ImplHelper7<    ::com::sun::star::sdbc::XCloseable,
                                 ::com::sun::star::sdbc::XParameters > ODatabaseForm_BASE3;
 
 
-class ODatabaseForm :public OFormComponents
+class ODatabaseForm	:public OFormComponents
                     ,public OPropertySetAggregationHelper
                     ,public OPropertyChangeListener
                     ,public ODatabaseForm_BASE1
@@ -166,65 +166,65 @@ class ODatabaseForm :public OFormComponents
 {
     friend class OFormSubmitResetThread;
 
-    OImplementationIdsRef               m_aHoldIdHelper;
+    OImplementationIdsRef				m_aHoldIdHelper;
 
         // listener administration
-    ::cppu::OInterfaceContainerHelper   m_aLoadListeners;
-    ::cppu::OInterfaceContainerHelper   m_aRowSetApproveListeners;
-    ::cppu::OInterfaceContainerHelper   m_aRowSetListeners;
-    ::cppu::OInterfaceContainerHelper   m_aSubmitListeners;
-    ::cppu::OInterfaceContainerHelper   m_aErrorListeners;
+    ::cppu::OInterfaceContainerHelper	m_aLoadListeners;
+    ::cppu::OInterfaceContainerHelper	m_aRowSetApproveListeners;
+    ::cppu::OInterfaceContainerHelper	m_aRowSetListeners;
+    ::cppu::OInterfaceContainerHelper	m_aSubmitListeners;
+    ::cppu::OInterfaceContainerHelper	m_aErrorListeners;
     ResetListeners                      m_aResetListeners;
-    ::osl::Mutex                        m_aResetSafety;
-    ::com::sun::star::uno::Any          m_aCycle;
-    ::com::sun::star::uno::Any          m_aIgnoreResult; // set when we are a subform and our master form positioned on a new row
-    ::com::sun::star::uno::Sequence< ::rtl::OUString >                      m_aMasterFields;
-    ::com::sun::star::uno::Sequence< ::rtl::OUString >                      m_aDetailFields;
+    ::osl::Mutex						m_aResetSafety;
+    ::com::sun::star::uno::Any			m_aCycle;
+    ::com::sun::star::uno::Any			m_aIgnoreResult; // set when we are a subform and our master form positioned on a new row
+    ::com::sun::star::uno::Sequence< ::rtl::OUString >						m_aMasterFields;
+    ::com::sun::star::uno::Sequence< ::rtl::OUString >						m_aDetailFields;
 
     // the object doin' most of the work - an SDB-rowset
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation>      m_xAggregate;
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation> 		m_xAggregate;
     // same object, interface as member because of performance reasons
-    ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>          m_xAggregateAsRowSet;
+    ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet> 			m_xAggregateAsRowSet;
 
     PropertyBagHelper           m_aPropertyBagHelper;
     ::dbtools::WarningsContainer    m_aWarnings;
-    OPropertyChangeMultiplexer* m_pAggregatePropertyMultiplexer;
+    OPropertyChangeMultiplexer*	m_pAggregatePropertyMultiplexer;
     // Verwaltung der ControlGruppen
-    OGroupManager*              m_pGroupManager;
+    OGroupManager*				m_pGroupManager;
     ::dbtools::ParameterManager m_aParameterManager;
     ::dbtools::FilterManager    m_aFilterManager;
-    Timer*                      m_pLoadTimer;
+    Timer*						m_pLoadTimer;
 
-    OFormSubmitResetThread*     m_pThread;
-    ::rtl::OUString             m_sCurrentErrorContext;
+    OFormSubmitResetThread*		m_pThread;
+    ::rtl::OUString				m_sCurrentErrorContext;
                 // will be used as additional context information
                 // when an exception is catched and forwarded to the listeners
 
-    INT32                       m_nResetsPending;
-//  <overwritten_properties>
-    sal_Int32                   m_nPrivileges;
+    INT32						m_nResetsPending;
+//	<overwritten_properties>
+    sal_Int32					m_nPrivileges;
     sal_Bool                    m_bInsertOnly;
-//  </overwritten_properties>
+//	</overwritten_properties>
 
-//  <properties>
+//	<properties>
     ::com::sun::star::uno::Any  m_aControlBorderColorFocus;
     ::com::sun::star::uno::Any  m_aControlBorderColorMouse;
     ::com::sun::star::uno::Any  m_aControlBorderColorInvalid;
     ::com::sun::star::uno::Any  m_aDynamicControlBorder;
-    ::rtl::OUString             m_sName;
-    ::rtl::OUString             m_aTargetURL;
-    ::rtl::OUString             m_aTargetFrame;
-    ::com::sun::star::form::FormSubmitMethod    m_eSubmitMethod;
-    ::com::sun::star::form::FormSubmitEncoding  m_eSubmitEncoding;
-    ::com::sun::star::form::NavigationBarMode   m_eNavigation;
-    sal_Bool                    m_bAllowInsert : 1;
-    sal_Bool                    m_bAllowUpdate : 1;
-    sal_Bool                    m_bAllowDelete : 1;
-//  </properties>
-    sal_Bool                    m_bLoaded : 1;
-    sal_Bool                    m_bSubForm : 1;
-    sal_Bool                    m_bForwardingConnection : 1;    // sal_True if we're setting the ActiveConnection on the aggregate
-    sal_Bool                    m_bSharingConnection : 1;       // sal_True if the connection we're using is shared with out parent
+    ::rtl::OUString				m_sName;
+    ::rtl::OUString				m_aTargetURL;
+    ::rtl::OUString				m_aTargetFrame;
+    ::com::sun::star::form::FormSubmitMethod	m_eSubmitMethod;
+    ::com::sun::star::form::FormSubmitEncoding	m_eSubmitEncoding;
+    ::com::sun::star::form::NavigationBarMode	m_eNavigation;
+    sal_Bool					m_bAllowInsert : 1;
+    sal_Bool					m_bAllowUpdate : 1;
+    sal_Bool					m_bAllowDelete : 1;
+//	</properties>
+    sal_Bool					m_bLoaded : 1;
+    sal_Bool					m_bSubForm : 1;
+    sal_Bool					m_bForwardingConnection : 1;	// sal_True if we're setting the ActiveConnection on the aggregate
+    sal_Bool					m_bSharingConnection : 1;		// sal_True if the connection we're using is shared with out parent
 
 public:
     ODatabaseForm(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory);
@@ -249,7 +249,7 @@ public:
     virtual sal_Bool SAL_CALL convertFastPropertyValue(::com::sun::star::uno::Any& rConvertedValue, ::com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::lang::IllegalArgumentException);
     virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) throw ( ::com::sun::star::uno::Exception );
 
-    ::com::sun::star::uno::Any  SAL_CALL getFastPropertyValue( sal_Int32 nHandle )
+    ::com::sun::star::uno::Any	SAL_CALL getFastPropertyValue( sal_Int32 nHandle )
        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
     void fire( sal_Int32 * pnHandles, const ::com::sun::star::uno::Any * pNewValues, const ::com::sun::star::uno::Any * pOldValues, sal_Int32 nCount, sal_Bool bVetoable );
 
@@ -263,8 +263,8 @@ public:
                             getPropertiesInterface();
 
     // com::sun::star::beans::XPropertyState
-    virtual ::com::sun::star::beans::PropertyState getPropertyStateByHandle(sal_Int32 nHandle);
-    virtual void setPropertyToDefaultByHandle(sal_Int32 nHandle);
+    virtual	::com::sun::star::beans::PropertyState getPropertyStateByHandle(sal_Int32 nHandle);
+    virtual	void setPropertyToDefaultByHandle(sal_Int32 nHandle);
     virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle(sal_Int32 nHandle) const;
 
     // com::sun::star::sdbc::XSQLErrorBroadcaster
@@ -386,15 +386,15 @@ public:
 
     // com::sun::star::lang::XServiceInfo
     virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName)  throw(::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getImplementationName()  throw(::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString	SAL_CALL getImplementationName()  throw(::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()  throw(::com::sun::star::uno::RuntimeException);
 
     // com::sun::star::lang::XServiceInfo - static version
-    static  ::rtl::OUString SAL_CALL getImplementationName_Static();
-    static  ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static();
-    static  ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getCurrentServiceNames_Static();
-    static  ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getCompatibleServiceNames_Static();
-    static  ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory );
+    static	::rtl::OUString	SAL_CALL getImplementationName_Static();
+    static	::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static();
+    static	::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getCurrentServiceNames_Static();
+    static	::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getCompatibleServiceNames_Static();
+    static	::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory );
 
     // com::sun::star::io::XPersistObject
     virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException);
@@ -465,39 +465,39 @@ protected:
 private:
     sal_Bool executeRowSet(::osl::ResettableMutexGuard& _rClearForNotifies, sal_Bool bMoveToFirst = sal_True,
                     const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxCompletionHandler = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >());
-    bool    fillParameters(::osl::ResettableMutexGuard& _rClearForNotifies,
+    bool	fillParameters(::osl::ResettableMutexGuard& _rClearForNotifies,
                     const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxCompletionHandler = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >());
-    void    updateParameterInfo();
-    bool    hasValidParent() const;
+    void	updateParameterInfo();
+    bool	hasValidParent() const;
 
     // impl methods
-    void    load_impl(sal_Bool bCausedByParentForm, sal_Bool bMoveToFirst = sal_True,
+    void	load_impl(sal_Bool bCausedByParentForm, sal_Bool bMoveToFirst = sal_True,
         const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxCompletionHandler = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >())
         throw(::com::sun::star::uno::RuntimeException);
-    void    reload_impl(sal_Bool bMoveToFirst,
+    void	reload_impl(sal_Bool bMoveToFirst,
         const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxCompletionHandler = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >())
         throw(::com::sun::star::uno::RuntimeException);
-    void    submit_impl(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& Control, const ::com::sun::star::awt::MouseEvent& MouseEvt, bool _bAproveByListeners);
-    void    reset_impl(bool _bAproveByListeners);
+    void	submit_impl(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& Control, const ::com::sun::star::awt::MouseEvent& MouseEvt, bool _bAproveByListeners);
+    void	reset_impl(bool _bAproveByListeners);
 
-    sal_Bool    implEnsureConnection();
+    sal_Bool	implEnsureConnection();
 
     // connection sharing
 
     /// checks if we can re-use (aka share) the connection of the given parent
-    sal_Bool    canShareConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxParentProps );
+    sal_Bool	canShareConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxParentProps );
 
     /// starts sharing the connection with the parent
-    void        doShareConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxParentProps );
+    void		doShareConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxParentProps );
 
     /// stops sharing the connection with the parent
-    void        stopSharingConnection( );
+    void		stopSharingConnection( );
 
     /// called when the connection which we share with our parent is beeing disposed
-    void        disposingSharedConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn );
+    void		disposingSharedConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn );
 
     /// checks if we currently share our connection with our parent
-    sal_Bool    isSharingConnection( ) const { return m_bSharingConnection; }
+    sal_Bool	isSharingConnection( ) const { return m_bSharingConnection; }
 
     /** calls our row set approval listeners
 
@@ -518,20 +518,20 @@ private:
     );
 
     /// invalidate all our parameter-related stuff
-    void        invlidateParameters();
+    void		invlidateParameters();
 
-    void        saveInsertOnlyState( );
-    void        restoreInsertOnlyState( );
+    void		saveInsertOnlyState( );
+    void		restoreInsertOnlyState( );
 
     // error handling
-    void    onError(const ::com::sun::star::sdb::SQLErrorEvent& _rEvent);
-    void    onError(const ::com::sun::star::sdbc::SQLException&, const ::rtl::OUString& _rContextDescription);
+    void	onError(const ::com::sun::star::sdb::SQLErrorEvent& _rEvent);
+    void	onError(const ::com::sun::star::sdbc::SQLException&, const ::rtl::OUString& _rContextDescription);
 
     // html tools
     ::rtl::OUString         GetDataEncoded(bool _bURLEncoded,const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt);
-    ::rtl::OUString         GetDataURLEncoded(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt);
-    ::rtl::OUString         GetDataTextEncoded(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt);
-    ::com::sun::star::uno::Sequence<sal_Int8>   GetDataMultiPartEncoded(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt,
+    ::rtl::OUString			GetDataURLEncoded(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt);
+    ::rtl::OUString			GetDataTextEncoded(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt);
+    ::com::sun::star::uno::Sequence<sal_Int8>	GetDataMultiPartEncoded(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt,
                                              ::rtl::OUString& rContentType);
 
     void AppendComponent(HtmlSuccessfulObjList& rList, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& xComponentSet, const ::rtl::OUString& rNamePrefix,
@@ -560,7 +560,7 @@ inline void ODatabaseForm::submitNBC(const ::com::sun::star::uno::Reference< ::c
 }
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 #endif // _FRM_DATABASEFORM_HXX_
diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx
index 74e0444093a1..7a935862c716 100644
--- a/forms/source/component/Date.cxx
+++ b/forms/source/component/Date.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -172,7 +172,7 @@ StringSequence SAL_CALL ODateModel::getSupportedServiceNames() throw()
 //------------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL ODateModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
 {
-    return FRM_COMPONENT_DATEFIELD; // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_DATEFIELD;	// old (non-sun) name for compatibility !
 }
 
 // XPropertySet
@@ -180,10 +180,10 @@ StringSequence SAL_CALL ODateModel::getSupportedServiceNames() throw()
 void ODateModel::describeFixedProperties( Sequence< Property >& _rProps ) const
 {
     BEGIN_DESCRIBE_PROPERTIES( 4, OEditBaseModel )
-        DECL_PROP3(DEFAULT_DATE,            sal_Int32,              BOUND, MAYBEDEFAULT, MAYBEVOID);
-        DECL_PROP1(TABINDEX,                sal_Int16,              BOUND);
-        DECL_PROP1(FORMATKEY,               sal_Int32,              TRANSIENT);
-        DECL_IFACE_PROP2(FORMATSSUPPLIER,   XNumberFormatsSupplier, READONLY, TRANSIENT);
+        DECL_PROP3(DEFAULT_DATE,			sal_Int32,				BOUND, MAYBEDEFAULT, MAYBEVOID);
+        DECL_PROP1(TABINDEX,				sal_Int16,				BOUND);
+        DECL_PROP1(FORMATKEY,				sal_Int32,				TRANSIENT);
+        DECL_IFACE_PROP2(FORMATSSUPPLIER,	XNumberFormatsSupplier,	READONLY, TRANSIENT);
     END_DESCRIBE_PROPERTIES();
 }
 
@@ -359,7 +359,7 @@ Sequence< Type > ODateModel::getSupportedBindingTypes()
 }
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Date.hxx b/forms/source/component/Date.hxx
index 790c8f027bfb..3b7c56cf2d18 100644
--- a/forms/source/component/Date.hxx
+++ b/forms/source/component/Date.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class ODateModel
                 :public OEditBaseModel
                 ,public OLimitedFormats
 {
-    ::com::sun::star::uno::Any      m_aSaveValue;
-    sal_Bool                        m_bDateTimeField;
+    ::com::sun::star::uno::Any		m_aSaveValue;
+    sal_Bool			            m_bDateTimeField;
 
 protected:
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes();
@@ -96,7 +96,7 @@ protected:
 
     virtual void            resetNoBroadcast();
 
-    virtual void            onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm );
+    virtual void		    onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm );
 
 protected:
     DECLARE_XCLONEABLE();
@@ -127,7 +127,7 @@ public:
 };
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 #endif // _FORMS_DATE_HXX_
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index 229ae6e0a954..799816cdce11 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 OEditControl::disposing()
 
 // XServiceInfo
 //------------------------------------------------------------------------------
-StringSequence  OEditControl::getSupportedServiceNames() throw()
+StringSequence	OEditControl::getSupportedServiceNames() throw()
 {
     StringSequence aSupported = OBoundControl::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 1);
@@ -239,7 +239,7 @@ void OEditControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw (
         Reference<XPropertySet>  xFCSet;
         for( sal_Int32 nIndex=0; nIndex < nCount; nIndex++ )
         {
-            //  Any aElement(xElements->getByIndex(nIndex));
+            //	Any aElement(xElements->getByIndex(nIndex));
             xElements->getByIndex(nIndex) >>= xFCSet;
             OSL_ENSURE(xFCSet.is(),"OEditControl::keyPressed: No XPropertySet!");
 
@@ -351,7 +351,7 @@ void OEditModel::disposing()
 //------------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OEditModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
 {
-    return FRM_COMPONENT_EDIT;  // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_EDIT;	// old (non-sun) name for compatibility !
 }
 
 // XServiceInfo
@@ -398,11 +398,11 @@ void SAL_CALL OEditModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle )
 void OEditModel::describeFixedProperties( Sequence< Property >& _rProps ) const
 {
     BEGIN_DESCRIBE_PROPERTIES( 5, OEditBaseModel )
-        DECL_PROP2(PERSISTENCE_MAXTEXTLENGTH,sal_Int16,         READONLY, TRANSIENT);
-        DECL_PROP2(DEFAULT_TEXT,        ::rtl::OUString,        BOUND, MAYBEDEFAULT);
-        DECL_BOOL_PROP1(EMPTY_IS_NULL,                          BOUND);
-        DECL_PROP1(TABINDEX,            sal_Int16,              BOUND);
-        DECL_BOOL_PROP2(FILTERPROPOSAL,                         BOUND, MAYBEDEFAULT);
+        DECL_PROP2(PERSISTENCE_MAXTEXTLENGTH,sal_Int16,			READONLY, TRANSIENT);
+        DECL_PROP2(DEFAULT_TEXT,		::rtl::OUString,		BOUND, MAYBEDEFAULT);
+        DECL_BOOL_PROP1(EMPTY_IS_NULL,							BOUND);
+        DECL_PROP1(TABINDEX,			sal_Int16,				BOUND);
+        DECL_BOOL_PROP2(FILTERPROPOSAL,							BOUND, MAYBEDEFAULT);
     END_DESCRIBE_PROPERTIES();
 }
 
@@ -558,7 +558,7 @@ void OEditModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw
     sal_Int16 nOldTextLen = 0;
     // bin ich gerade loaded und habe dazu zeitweilig die MaxTextLen umgesetzt ?
     if ( m_bMaxTextLenModified )
-    {   // -> fuer die Dauer des Speicherns meinem aggregierten Model die alte TextLen einreden
+    {	// -> fuer die Dauer des Speicherns meinem aggregierten Model die alte TextLen einreden
 
         // before doing this we have to save the current text value of the aggregate, as this may be affected by resetting the text len
         // FS - 08.12.99 - 70606
@@ -571,7 +571,7 @@ void OEditModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw
     OEditBaseModel::write(_rxOutStream);
 
     if ( m_bMaxTextLenModified )
-    {   // wieder zuruecksetzen
+    {	// wieder zuruecksetzen
         m_xAggregateSet->setPropertyValue(PROPERTY_MAXTEXTLEN, makeAny(nOldTextLen));
         // and reset the text
         // First we set it to an empty string : Without this the second setPropertyValue would not do anything as it thinks
@@ -593,8 +593,8 @@ void OEditModel::read(const Reference<XObjectInputStream>& _rxInStream) throw (
     if (m_xAggregateSet.is())
     {
         Any aDefaultControl = m_xAggregateSet->getPropertyValue(PROPERTY_DEFAULTCONTROL);
-        if  (   (aDefaultControl.getValueType().getTypeClass() == TypeClass_STRING)
-            &&  (getString(aDefaultControl).compareTo(STARDIV_ONE_FORM_CONTROL_TEXTFIELD) == COMPARE_EQUAL)
+        if	(	(aDefaultControl.getValueType().getTypeClass() == TypeClass_STRING)
+            &&	(getString(aDefaultControl).compareTo(STARDIV_ONE_FORM_CONTROL_TEXTFIELD) == COMPARE_EQUAL)
             )
         {
             m_xAggregateSet->setPropertyValue( PROPERTY_DEFAULTCONTROL, makeAny( (::rtl::OUString)STARDIV_ONE_FORM_CONTROL_EDIT ) );
@@ -625,7 +625,7 @@ void OEditModel::onConnectedDbColumn( const Reference< XInterface >& _rxForm )
 
         if ( m_pValueFormatter->getKeyType() != NumberFormat::SCIENTIFIC )
         {
-            m_bMaxTextLenModified = getINT16(m_xAggregateSet->getPropertyValue(PROPERTY_MAXTEXTLEN)) != 0;
+            m_bMaxTextLenModified =	getINT16(m_xAggregateSet->getPropertyValue(PROPERTY_MAXTEXTLEN)) != 0;
             if ( !m_bMaxTextLenModified )
             {
                 sal_Int32 nFieldLen = 0;
@@ -656,7 +656,7 @@ void OEditModel::onDisconnectedDbColumn()
     if ( hasField() && m_bMaxTextLenModified )
     {
         Any aVal;
-        aVal <<= (sal_Int16)0;  // nur wenn es 0 war, habe ich es in onConnectedDbColumn umgesetzt
+        aVal <<= (sal_Int16)0;	// nur wenn es 0 war, habe ich es in onConnectedDbColumn umgesetzt
         m_xAggregateSet->setPropertyValue(PROPERTY_MAXTEXTLEN, aVal);
         m_bMaxTextLenModified = sal_False;
     }
diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx
index e3c84612443f..055b5dd4fd57 100644
--- a/forms/source/component/Edit.hxx
+++ b/forms/source/component/Edit.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class OEditModel
     ::com::sun::star::uno::Any  m_aLastKnownValue;
     ::std::auto_ptr< ::dbtools::FormattedColumnValue >
                                 m_pValueFormatter;
-    sal_Bool                    m_bMaxTextLenModified : 1;  // set to <TRUE/> when we change the MaxTextLen of the aggregate
+    sal_Bool					m_bMaxTextLenModified : 1;	// set to <TRUE/> when we change the MaxTextLen of the aggregate
 
-    sal_Bool                    m_bWritingFormattedFake : 1;
+    sal_Bool					m_bWritingFormattedFake : 1;
         // are we writing something which should be interpreted as formatted upon reading?
 
 protected:
@@ -64,7 +64,7 @@ protected:
 
     friend InterfaceRef SAL_CALL OEditModel_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory);
     friend class OFormattedFieldWrapper;
-    friend class OFormattedModel;   // temporary
+    friend class OFormattedModel;	// temporary
 
 public:
     virtual void SAL_CALL disposing();
@@ -114,7 +114,7 @@ protected:
     virtual void            onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm );
     virtual void            onDisconnectedDbColumn();
 
-    virtual sal_Bool        approveDbColumnType( sal_Int32 _nColumnType );
+    virtual sal_Bool		approveDbColumnType( sal_Int32 _nColumnType );
 
     virtual void            resetNoBroadcast();
 
@@ -130,7 +130,7 @@ private:
 //==================================================================
 //= OEditControl
 //==================================================================
-typedef ::cppu::ImplHelper3<    ::com::sun::star::awt::XFocusListener,
+typedef ::cppu::ImplHelper3<	::com::sun::star::awt::XFocusListener,
                                 ::com::sun::star::awt::XKeyListener,
                                 ::com::sun::star::form::XChangeBroadcaster > OEditControl_BASE;
 
@@ -140,8 +140,8 @@ class OEditControl : public OBoundControl
     ::cppu::OInterfaceContainerHelper
                         m_aChangeListeners;
 
-    ::rtl::OUString         m_aHtmlChangeValue;
-    sal_uInt32              m_nKeyEvent;
+    ::rtl::OUString			m_aHtmlChangeValue;
+    sal_uInt32 				m_nKeyEvent;
 
 public:
     OEditControl(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory);
diff --git a/forms/source/component/EditBase.cxx b/forms/source/component/EditBase.cxx
index 10903bdfee55..6afff3637ce7 100644
--- a/forms/source/component/EditBase.cxx
+++ b/forms/source/component/EditBase.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::util;
 
-const sal_uInt16 DEFAULT_LONG    =  0x0001;
-const sal_uInt16 DEFAULT_DOUBLE  =  0x0002;
-const sal_uInt16 FILTERPROPOSAL  =  0x0004;
+const sal_uInt16 DEFAULT_LONG	 =	0x0001;
+const sal_uInt16 DEFAULT_DOUBLE  =	0x0002;
+const sal_uInt16 FILTERPROPOSAL  =	0x0004;
 
 DBG_NAME( OEditBaseModel )
 //------------------------------------------------------------------
@@ -104,7 +104,7 @@ void OEditBaseModel::write(const Reference<XObjectOutputStream>& _rxOutStream) t
     _rxOutStream->writeShort(nVersionId);
 
     // Name
-    _rxOutStream->writeShort(0);    // obsolete
+    _rxOutStream->writeShort(0);	// obsolete
     _rxOutStream << m_aDefaultText;
 
     // Maskierung fuer any
@@ -114,7 +114,7 @@ void OEditBaseModel::write(const Reference<XObjectOutputStream>& _rxOutStream) t
     else if (m_aDefault.getValueType().getTypeClass() == TypeClass_DOUBLE)
         nAnyMask |= DEFAULT_DOUBLE;
 
-    if (m_bFilterProposal)  // da boolean, kein Wert speichern
+    if (m_bFilterProposal)	// da boolean, kein Wert speichern
         nAnyMask |= FILTERPROPOSAL;
 
     _rxOutStream->writeBoolean(m_bEmptyIsNull);
@@ -209,7 +209,7 @@ void OEditBaseModel::readCommonEditProperties(const Reference<XObjectInputStream
 {
     sal_Int32 nLen = _rxInStream->readLong();
 
-    Reference<XMarkableStream>  xMark(_rxInStream, UNO_QUERY);
+    Reference<XMarkableStream>	xMark(_rxInStream, UNO_QUERY);
     DBG_ASSERT(xMark.is(), "OBoundControlModel::readCommonProperties : can only work with markable streams !");
     sal_Int32 nMark = xMark->createMark();
 
@@ -227,7 +227,7 @@ void OEditBaseModel::readCommonEditProperties(const Reference<XObjectInputStream
 //------------------------------------------------------------------------------
 void OEditBaseModel::writeCommonEditProperties(const Reference<XObjectOutputStream>& _rxOutStream)
 {
-    Reference<XMarkableStream>  xMark(_rxOutStream, UNO_QUERY);
+    Reference<XMarkableStream>	xMark(_rxOutStream, UNO_QUERY);
     DBG_ASSERT(xMark.is(), "OEditBaseModel::writeCommonProperties : can only work with markable streams !");
     sal_Int32 nMark = xMark->createMark();
 
diff --git a/forms/source/component/EditBase.hxx b/forms/source/component/EditBase.hxx
index 497fd570d522..0a070c06e5ef 100644
--- a/forms/source/component/EditBase.hxx
+++ b/forms/source/component/EditBase.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,20 +41,20 @@
 #include <com/sun/star/lang/XComponent.hpp>
 
 // persistence flags for use with the version id
-#define PF_HANDLE_COMMON_PROPS  0x8000
+#define PF_HANDLE_COMMON_PROPS	0x8000
     // Derived classes which use their own persistence methods (read/write) and have an own
     // version handling therein may want to clear this flag in getPersistenceFlags.
     // If done so, this class will write an version without a call to writeCommonEditProperties.
-#define PF_FAKE_FORMATTED_FIELD 0x4000
+#define PF_FAKE_FORMATTED_FIELD	0x4000
     // .... hmmm .... a fake, as the name suggests. see OFormattedFieldWrapper
-#define PF_RESERVED_2           0x2000
-#define PF_RESERVED_3           0x1000
-#define PF_RESERVED_4           0x0800
-#define PF_RESERVED_5           0x0400
-#define PF_RESERVED_6           0x0200
-#define PF_RESERVED_7           0x0100
+#define PF_RESERVED_2			0x2000
+#define PF_RESERVED_3			0x1000
+#define PF_RESERVED_4			0x0800
+#define PF_RESERVED_5			0x0400
+#define PF_RESERVED_6			0x0200
+#define PF_RESERVED_7			0x0100
 
-#define PF_SPECIAL_FLAGS        0xFF00
+#define PF_SPECIAL_FLAGS		0xFF00
 
 //.........................................................................
 namespace frm
@@ -63,19 +63,19 @@ namespace frm
 //==================================================================
 //= OEditBaseModel
 //==================================================================
-class OEditBaseModel :  public OBoundControlModel
+class OEditBaseModel :	public OBoundControlModel
 {
-    sal_Int16                   m_nLastReadVersion;
+    sal_Int16					m_nLastReadVersion;
 
 protected:
-// [properties]         fuer all Editierfelder
-    ::com::sun::star::uno::Any  m_aDefault;
-    ::rtl::OUString             m_aDefaultText;             // default value
-    sal_Bool                    m_bEmptyIsNull : 1;         // empty string will be interepreted as NULL when committing
-    sal_Bool                    m_bFilterProposal : 1;      // use a list of possible value in filtermode
+// [properties]			fuer all Editierfelder
+    ::com::sun::star::uno::Any	m_aDefault;
+    ::rtl::OUString				m_aDefaultText;				// default value
+    sal_Bool					m_bEmptyIsNull : 1;			// empty string will be interepreted as NULL when committing
+    sal_Bool					m_bFilterProposal : 1;		// use a list of possible value in filtermode
 // [properties]
 
-    sal_Int16   getLastReadVersion() const { return m_nLastReadVersion; }
+    sal_Int16	getLastReadVersion() const { return m_nLastReadVersion; }
 
 public:
     DECLARE_DEFAULT_BOUND_XTOR( OEditBaseModel );
diff --git a/forms/source/component/EventThread.cxx b/forms/source/component/EventThread.cxx
index 7e16c62715e0..1f383024c0a4 100644
--- a/forms/source/component/EventThread.cxx
+++ b/forms/source/component/EventThread.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,8 +137,8 @@ void OComponentEventThread::addEvent( const EventObject* _pEvt,
     // Daten in die Queue stellen
     m_aEvents.push_back( cloneEvent( _pEvt ) );
 
-    Reference<XWeak>        xWeakControl(rControl, UNO_QUERY);
-    Reference<XAdapter> xControlAdapter = xWeakControl.is() ? xWeakControl->queryAdapter() : Reference<XAdapter>();
+    Reference<XWeak>		xWeakControl(rControl, UNO_QUERY);
+    Reference<XAdapter>	xControlAdapter = xWeakControl.is() ? xWeakControl->queryAdapter() : Reference<XAdapter>();
     m_aControls.push_back( xControlAdapter );
 
     m_aFlags.push_back( bFlag );
@@ -248,7 +248,7 @@ void OComponentEventThread::run()
 }
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx
index 195a354fbd7a..f0568ef4fd24 100644
--- a/forms/source/component/EventThread.hxx
+++ b/forms/source/component/EventThread.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 frm
 // ***************************************************************************************************
 // ***************************************************************************************************
 
-typedef ::osl::Thread   OComponentEventThread_TBASE;
+typedef ::osl::Thread	OComponentEventThread_TBASE;
 class OComponentEventThread
             :public OComponentEventThread_TBASE
             ,public ::com::sun::star::lang::XEventListener
@@ -58,16 +58,16 @@ class OComponentEventThread
 {
     DECLARE_STL_VECTOR(::com::sun::star::lang::EventObject*, ThreadEvents);
     DECLARE_STL_VECTOR(::com::sun::star::uno::Reference< ::com::sun::star::uno::XAdapter> , ThreadObjects);
-    DECLARE_STL_VECTOR(sal_Bool,    ThreadBools);
+    DECLARE_STL_VECTOR(sal_Bool,	ThreadBools);
 
     ::osl::Mutex                    m_aMutex;
-    ::osl::Condition                m_aCond;            // Queue gefuellt?
-    ThreadEvents                    m_aEvents;          // Event-Queue
-    ThreadObjects                   m_aControls;        // Control fuer Submit
-    ThreadBools                     m_aFlags;           // Flags fuer Submit/Reset
+    ::osl::Condition 				m_aCond;			// Queue gefuellt?
+    ThreadEvents 					m_aEvents;			// Event-Queue
+    ThreadObjects	 				m_aControls;		// Control fuer Submit
+    ThreadBools						m_aFlags;			// Flags fuer Submit/Reset
 
-    ::cppu::OComponentHelper*                   m_pCompImpl;    // Implementierung des Controls
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent>   m_xComp;        // ::com::sun::star::lang::XComponent des Controls
+    ::cppu::OComponentHelper*					m_pCompImpl;	// Implementierung des Controls
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent>	m_xComp;		// ::com::sun::star::lang::XComponent des Controls
 
 protected:
 
@@ -113,14 +113,14 @@ public:
     void SAL_CALL operator delete( void * p ) throw() { osl::Thread::operator delete(p); }
 
 private:
-    void    implStarted( );
-    void    implTerminated( );
+    void	implStarted( );
+    void	implTerminated( );
 
     void    impl_clearEventQueue();
 };
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 #endif // _FRM_EVENT_THREAD_HXX_
diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx
index 4e4b62dc6131..b6003a391f02 100644
--- a/forms/source/component/File.cxx
+++ b/forms/source/component/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
@@ -84,7 +84,7 @@ Sequence<Type> OFileControlModel::_getTypes()
 
 // XServiceInfo
 //------------------------------------------------------------------------------
-StringSequence  OFileControlModel::getSupportedServiceNames() throw(RuntimeException)
+StringSequence	OFileControlModel::getSupportedServiceNames() throw(RuntimeException)
 {
     StringSequence aSupported = OControlModel::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 1);
@@ -205,15 +205,15 @@ sal_Bool OFileControlModel::convertFastPropertyValue(Any& rConvertedValue, Any&
 void OFileControlModel::describeFixedProperties( Sequence< Property >& _rProps ) const
 {
     BEGIN_DESCRIBE_PROPERTIES( 2, OControlModel )
-        DECL_PROP1(DEFAULT_TEXT,    ::rtl::OUString,    BOUND);
-        DECL_PROP1(TABINDEX,        sal_Int16,          BOUND);
+        DECL_PROP1(DEFAULT_TEXT,	::rtl::OUString,	BOUND);
+        DECL_PROP1(TABINDEX,		sal_Int16,			BOUND);
     END_DESCRIBE_PROPERTIES();
 }
 
 //------------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OFileControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
 {
-    return FRM_COMPONENT_FILECONTROL;   // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_FILECONTROL;	// old (non-sun) name for compatibility !
 }
 
 //------------------------------------------------------------------------------
@@ -253,7 +253,7 @@ void OFileControlModel::read(const Reference<stario::XObjectInputStream>& _rxInS
     }
 
     // Nach dem Lesen die Defaultwerte anzeigen
-//  _reset();
+//	_reset();
 }
 
 //-----------------------------------------------------------------------------
@@ -291,7 +291,7 @@ void OFileControlModel::removeResetListener(const Reference<XResetListener>& _rx
 //------------------------------------------------------------------------------
 void OFileControlModel::_reset()
 {
-    {   // release our mutex once (it's acquired in the calling method !), as setting aggregate properties
+    {	// release our mutex once (it's acquired in the calling method !), as setting aggregate properties
         // may cause any uno controls belonging to us to lock the solar mutex, which is potentially dangerous with
         // our own mutex locked
         // FS - 72451 - 31.01.00
@@ -301,7 +301,7 @@ void OFileControlModel::_reset()
 }
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/File.hxx b/forms/source/component/File.hxx
index 02a09eedc198..4f0c56f13a3b 100644
--- a/forms/source/component/File.hxx
+++ b/forms/source/component/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
@@ -43,8 +43,8 @@ class OFileControlModel
                 :public OControlModel
                 ,public ::com::sun::star::form::XReset
 {
-    ::cppu::OInterfaceContainerHelper       m_aResetListeners;
-    ::rtl::OUString                         m_sDefaultValue;
+    ::cppu::OInterfaceContainerHelper		m_aResetListeners;
+    ::rtl::OUString							m_sDefaultValue;
 
 protected:
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes();
@@ -97,7 +97,7 @@ protected:
 };
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 #endif // _FORMS_FILE_HXX_
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index 362c0fc77097..1add42bb0d3f 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace frm
     }
 
     //---------------------------------------------------------------------
-    Any SAL_CALL OFilterControl::queryAggregation( const Type & rType ) throw(RuntimeException)
+    Any	SAL_CALL OFilterControl::queryAggregation( const Type & rType ) throw(RuntimeException)
     {
         Any aRet = UnoControl::queryAggregation( rType);
         if(!aRet.hasValue())
@@ -511,7 +511,7 @@ namespace frm
                 Reference< XTextComponent >  xText( getPeer(), UNO_QUERY );
                 if (xText.is())
                     aText = xText->getText();
-            }   break;
+            }	break;
             default:
                 return sal_True;
         }
@@ -592,7 +592,7 @@ namespace frm
                     m_aText = aText;
                     xVclWindow->setProperty( PROPERTY_STATE, aValue );
                 }
-            }   break;
+            }	break;
             case FormComponentType::RADIOBUTTON:
             {
                 Reference< XVclWindowPeer >  xVclWindow( getPeer(), UNO_QUERY );
@@ -607,7 +607,7 @@ namespace frm
                     m_aText = aText;
                     xVclWindow->setProperty(PROPERTY_STATE, aValue);
                 }
-            }   break;
+            }	break;
             case FormComponentType::LISTBOX:
             {
                 Reference< XListBox >  xListBox( getPeer(), UNO_QUERY );
@@ -713,7 +713,7 @@ namespace frm
             Sequence< Any > aArgs(2);
             aArgs[0] <<= PropertyValue(::rtl::OUString::createFromAscii("SQLException"), 0, makeAny( _rExcept ), PropertyState_DIRECT_VALUE);
             aArgs[1] <<= PropertyValue(::rtl::OUString::createFromAscii("ParentWindow"), 0, makeAny( m_xMessageParent ), PropertyState_DIRECT_VALUE);
-
+            
             static ::rtl::OUString s_sDialogServiceName = ::rtl::OUString::createFromAscii( "com.sun.star.sdb.ErrorMessageDialog" );
 
             Reference< XExecutableDialog > xErrorDialog( m_aContext.createComponentWithArguments( s_sDialogServiceName, aArgs ), UNO_QUERY );
@@ -849,7 +849,7 @@ namespace frm
     }
 
     //---------------------------------------------------------------------
-    ::rtl::OUString SAL_CALL OFilterControl::getImplementationName_Static()
+    ::rtl::OUString	SAL_CALL OFilterControl::getImplementationName_Static()
     {
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.forms.OFilterControl" ) );
     }
@@ -870,7 +870,7 @@ namespace frm
     }
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Filter.hxx b/forms/source/component/Filter.hxx
index 8bac596b016d..fcb75fc00ea4 100644
--- a/forms/source/component/Filter.hxx
+++ b/forms/source/component/Filter.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,78 +56,78 @@ namespace frm
     //=====================================================================
     // OFilterControl
     //=====================================================================
-    typedef ::cppu::ImplHelper5 <   ::com::sun::star::awt::XTextComponent
-                                ,   ::com::sun::star::awt::XFocusListener
-                                ,   ::com::sun::star::awt::XItemListener
-                                ,   ::com::sun::star::form::XBoundComponent
-                                ,   ::com::sun::star::lang::XInitialization
-                                >   OFilterControl_BASE;
-
-    class OFilterControl    :public UnoControl
+    typedef ::cppu::ImplHelper5	<	::com::sun::star::awt::XTextComponent
+                                ,	::com::sun::star::awt::XFocusListener
+                                ,	::com::sun::star::awt::XItemListener
+                                ,	::com::sun::star::form::XBoundComponent
+                                ,	::com::sun::star::lang::XInitialization
+                                >	OFilterControl_BASE;
+
+    class OFilterControl	:public UnoControl
                             ,public OFilterControl_BASE
                             ,public ::svxform::OParseContextClient
     {
-        TextListenerMultiplexer     m_aTextListeners;
+        TextListenerMultiplexer		m_aTextListeners;
 
         ::comphelper::ComponentContext                                                          m_aContext;
-        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >               m_xField;
-        ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >            m_xFormatter;
-        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >                 m_xConnection;
-        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >           m_xMetaData;
-        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >                      m_xMessageParent;
-
-        ::rtl::OUString                 m_aText;
-        ::connectivity::OSQLParser      m_aParser;
-        sal_Int16                       m_nControlClass;        // which kind of control do we use?
-        sal_Bool                        m_bFilterList : 1;
-        sal_Bool                        m_bMultiLine : 1;
-        sal_Bool                        m_bFilterListFilled : 1;
+        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > 				m_xField;
+        ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > 			m_xFormatter;
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > 			    m_xConnection;
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > 			m_xMetaData;
+        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >						m_xMessageParent;
+
+        ::rtl::OUString					m_aText;
+        ::connectivity::OSQLParser		m_aParser;
+        sal_Int16						m_nControlClass;		// which kind of control do we use?
+        sal_Bool						m_bFilterList : 1;
+        sal_Bool						m_bMultiLine : 1;
+        sal_Bool						m_bFilterListFilled : 1;
 
     private:
-//      OFilterControl(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB);
+//		OFilterControl(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB);
 
         void implInitFilterList();
 
     public:
-        OFilterControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB );
+        OFilterControl(	const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB );
 
         DECLARE_UNO3_AGG_DEFAULTS(OFilterControl,OWeakAggObject);
-        ::com::sun::star::uno::Any  SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+        ::com::sun::star::uno::Any	SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
 
-        virtual ::rtl::OUString GetComponentServiceName();
-        virtual void SAL_CALL   createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > & rxToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >  & rParentPeer ) throw( ::com::sun::star::uno::RuntimeException );
+        virtual ::rtl::OUString	GetComponentServiceName();
+        virtual void SAL_CALL	createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > & rxToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >  & rParentPeer ) throw( ::com::sun::star::uno::RuntimeException );
 
     // ::com::sun::star::lang::XComponent
-        virtual void SAL_CALL   dispose(void) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL	dispose(void) throw( ::com::sun::star::uno::RuntimeException );
 
     // ::com::sun::star::awt::XTextComponent
-        virtual void            SAL_CALL addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener > & l ) throw( ::com::sun::star::uno::RuntimeException );
-        virtual void            SAL_CALL removeTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener > & l ) throw( ::com::sun::star::uno::RuntimeException );
-        virtual void            SAL_CALL setText( const ::rtl::OUString& aText ) throw( ::com::sun::star::uno::RuntimeException );
-        virtual void            SAL_CALL insertText( const ::com::sun::star::awt::Selection& rSel, const ::rtl::OUString& aText ) throw( ::com::sun::star::uno::RuntimeException );
-        virtual ::rtl::OUString SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException );
-        virtual ::rtl::OUString SAL_CALL getSelectedText() throw( ::com::sun::star::uno::RuntimeException );
-        virtual void            SAL_CALL setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void			SAL_CALL addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener > & l ) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void			SAL_CALL removeTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener > & l ) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void			SAL_CALL setText( const ::rtl::OUString& aText ) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void			SAL_CALL insertText( const ::com::sun::star::awt::Selection& rSel, const ::rtl::OUString& aText ) throw( ::com::sun::star::uno::RuntimeException );
+        virtual ::rtl::OUString	SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException );
+        virtual ::rtl::OUString	SAL_CALL getSelectedText() throw( ::com::sun::star::uno::RuntimeException );
+        virtual void			SAL_CALL setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw( ::com::sun::star::uno::RuntimeException );
         virtual ::com::sun::star::awt::Selection SAL_CALL getSelection() throw( ::com::sun::star::uno::RuntimeException );
-        virtual sal_Bool        SAL_CALL isEditable() throw( ::com::sun::star::uno::RuntimeException );
-        virtual void            SAL_CALL setEditable( sal_Bool bEditable ) throw( ::com::sun::star::uno::RuntimeException );
-        virtual void            SAL_CALL setMaxTextLen( sal_Int16 nLength ) throw( ::com::sun::star::uno::RuntimeException );
-        virtual sal_Int16       SAL_CALL getMaxTextLen() throw( ::com::sun::star::uno::RuntimeException );
+        virtual sal_Bool		SAL_CALL isEditable() throw( ::com::sun::star::uno::RuntimeException );
+        virtual void			SAL_CALL setEditable( sal_Bool bEditable ) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void			SAL_CALL setMaxTextLen( sal_Int16 nLength ) throw( ::com::sun::star::uno::RuntimeException );
+        virtual sal_Int16		SAL_CALL getMaxTextLen() throw( ::com::sun::star::uno::RuntimeException );
 
     // ::com::sun::star::form::XBoundComponent
-        virtual void            SAL_CALL addUpdateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener > & /*l*/) throw( ::com::sun::star::uno::RuntimeException ) {}
-        virtual void            SAL_CALL removeUpdateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener > & /*l*/) throw( ::com::sun::star::uno::RuntimeException ) {}
-        virtual sal_Bool        SAL_CALL commit() throw( ::com::sun::star::uno::RuntimeException );
+        virtual void			SAL_CALL addUpdateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener > & /*l*/) throw( ::com::sun::star::uno::RuntimeException ) {}
+        virtual void			SAL_CALL removeUpdateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener > & /*l*/) throw( ::com::sun::star::uno::RuntimeException ) {}
+        virtual sal_Bool		SAL_CALL commit() throw( ::com::sun::star::uno::RuntimeException );
 
     // ::com::sun::star::lang::XEventListener
-        virtual void            SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void			SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException );
 
     // ::com::sun::star::awt::XFocusListener
-        virtual void            SAL_CALL focusGained(const ::com::sun::star::awt::FocusEvent& e) throw( ::com::sun::star::uno::RuntimeException );
-        virtual void            SAL_CALL focusLost(const ::com::sun::star::awt::FocusEvent& e) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void			SAL_CALL focusGained(const ::com::sun::star::awt::FocusEvent& e) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void			SAL_CALL focusLost(const ::com::sun::star::awt::FocusEvent& e) throw( ::com::sun::star::uno::RuntimeException );
 
     // ::com::sun::star::awt::XItemListener
-        virtual void            SAL_CALL itemStateChanged(const ::com::sun::star::awt::ItemEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void			SAL_CALL itemStateChanged(const ::com::sun::star::awt::ItemEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException );
 
     // ::com::sun::star::util::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);
@@ -138,9 +138,9 @@ namespace frm
         virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
 
         // com::sun::star::lang::XServiceInfo - static version
-        static  ::rtl::OUString SAL_CALL getImplementationName_Static();
-        static  ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static();
-        static  ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory );
+        static	::rtl::OUString	SAL_CALL getImplementationName_Static();
+        static	::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static();
+        static	::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory );
 
     protected:
         virtual void PrepareWindowDescriptor( ::com::sun::star::awt::WindowDescriptor& rDesc );
@@ -151,7 +151,7 @@ namespace frm
         void displayException( const ::com::sun::star::sdb::SQLContext& _rExcept );
     };
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 #endif // FORMS_COMPONENT_FILTER_HXX
diff --git a/forms/source/component/FixedText.cxx b/forms/source/component/FixedText.cxx
index 2a27fbc2d4c5..31ac6221616f 100644
--- a/forms/source/component/FixedText.cxx
+++ b/forms/source/component/FixedText.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ void OFixedTextModel::describeAggregateProperties( Sequence< Property >& _rAggre
 //------------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OFixedTextModel::getServiceName() throw(RuntimeException)
 {
-    return FRM_COMPONENT_FIXEDTEXT; // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_FIXEDTEXT;	// old (non-sun) name for compatibility !
 }
 
 //------------------------------------------------------------------------------
diff --git a/forms/source/component/FixedText.hxx b/forms/source/component/FixedText.hxx
index a6b92a1e510f..d9db90885065 100644
--- a/forms/source/component/FixedText.hxx
+++ b/forms/source/component/FixedText.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,10 +46,10 @@ public:
 
 // XServiceInfo
     IMPLEMENTATION_NAME(OFixedTextModel);
-    virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
+    virtual StringSequence SAL_CALL	getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
 
 // XPersistObject
-    virtual ::rtl::OUString SAL_CALL    getServiceName() throw(::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL	getServiceName() throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL
         write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 768eaca5f489..c8b108ed53df 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -302,7 +302,7 @@ void SAL_CALL OControl::disposing(const com::sun::star::lang::EventObject& _rEve
 
     // does the disposing come from the aggregate ?
     if (xAggAsIface != InterfaceRef(_rEvent.Source, UNO_QUERY))
-    {   // no -> forward it
+    {	// no -> forward it
                 Reference<com::sun::star::lang::XEventListener> xListener;
         if (query_aggregation(m_xAggregate, xListener))
             xListener->disposing(_rEvent);
@@ -422,7 +422,7 @@ OBoundControl::~OBoundControl()
     DBG_DTOR(frm_OBoundControl, NULL);
 }
 // -----------------------------------------------------------------------------
-Sequence< Type> OBoundControl::_getTypes()
+Sequence< Type>	OBoundControl::_getTypes()
 {
     return TypeBag( OControl::_getTypes(), OBoundControl_BASE::getTypes() ).getTypes();
 }
@@ -605,7 +605,7 @@ OControlModel::OControlModel(
         // #i37342# / 2004-11-19 / frank.schoenheit@sun.com
 {
     DBG_CTOR(OControlModel, NULL);
-    if (_rUnoControlModelTypeName.getLength())  // the is a model we have to aggregate
+    if (_rUnoControlModelTypeName.getLength())	// the is a model we have to aggregate
     {
         increment(m_refCount);
 
@@ -1812,7 +1812,7 @@ sal_Bool OBoundControlModel::convertFastPropertyValue(
             throw com::sun::star::lang::IllegalArgumentException();
         case PROPERTY_ID_CONTROLLABEL:
             if (!_rValue.hasValue())
-            {   // property set to void
+            {	// property set to void
                 _rConvertedValue = Any();
                 getFastPropertyValue(_rOldValue, _nHandle);
                 bModified = m_xLabelControl.is();
@@ -1871,7 +1871,7 @@ void OBoundControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, co
             DBG_ASSERT(!rValue.hasValue() || (rValue.getValueType().getTypeClass() == TypeClass_INTERFACE),
                 "OBoundControlModel::setFastPropertyValue_NoBroadcast : invalid argument !");
             if (!rValue.hasValue())
-            {   // set property to "void"
+            {	// set property to "void"
                 Reference<com::sun::star::lang::XComponent> xComp(m_xLabelControl, UNO_QUERY);
                 if (xComp.is())
                     xComp->removeEventListener(static_cast<com::sun::star::lang::XEventListener*>(static_cast<XPropertyChangeListener*>(this)));
@@ -1953,7 +1953,7 @@ void SAL_CALL OBoundControlModel::propertyChange( const PropertyChangeEvent& evt
     {
         OSL_ENSURE( evt.Source == m_xExternalBinding, "OBoundControlModel::propertyChange: where did this come from?" );
 
-        // our binding has properties which can control properties of ourself
+        // our binding has properties which can control properties of ourself 
         ::rtl::OUString sBindingControlledProperty;
         bool bForwardToLabelControl = false;
         if ( evt.PropertyName.equals( PROPERTY_READONLY ) )
@@ -2486,9 +2486,9 @@ void OBoundControlModel::reset() throw (RuntimeException)
     // @author fs@openoffice.org
 
     sal_Bool bSimpleReset =
-                        (   !m_xColumn.is()                     // no connection to a database column
-                        ||  (   m_xCursor.is()                  // OR   we have an improperly positioned cursor
-                            &&  bInvalidCursorPosition
+                        (   !m_xColumn.is()						// no connection to a database column
+                        ||	(	m_xCursor.is()					// OR	we have an improperly positioned cursor
+                            &&	bInvalidCursorPosition
                             )
                         ||  hasExternalValueBinding()           // OR we have an external value binding
                         );
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index 8bafb3f893b4..5958726516e4 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -227,7 +227,7 @@ OFormattedControl::OFormattedControl(const Reference<XMultiServiceFactory>& _rxF
 
     increment(m_refCount);
     {
-        Reference<XWindow>  xComp;
+        Reference<XWindow>	xComp;
         if (query_aggregation(m_xAggregate, xComp))
         {
             xComp->addKeyListener(this);
@@ -265,7 +265,7 @@ void OFormattedControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) thr
         return;
 
     // Steht das Control in einem Formular mit einer Submit-URL?
-    Reference<com::sun::star::beans::XPropertySet>  xSet(getModel(), UNO_QUERY);
+    Reference<com::sun::star::beans::XPropertySet>	xSet(getModel(), UNO_QUERY);
     if( !xSet.is() )
         return;
 
@@ -274,7 +274,7 @@ void OFormattedControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) thr
     if( !xParent.is() )
         return;
 
-    Reference<com::sun::star::beans::XPropertySet>  xFormSet(xParent, UNO_QUERY);
+    Reference<com::sun::star::beans::XPropertySet>	xFormSet(xParent, UNO_QUERY);
     if( !xFormSet.is() )
         return;
 
@@ -288,10 +288,10 @@ void OFormattedControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) thr
     if( nCount > 1 )
     {
 
-        Reference<com::sun::star::beans::XPropertySet>  xFCSet;
+        Reference<com::sun::star::beans::XPropertySet>	xFCSet;
         for( sal_Int32 nIndex=0; nIndex < nCount; nIndex++ )
         {
-            //  Any aElement(xElements->getByIndex(nIndex));
+            //	Any aElement(xElements->getByIndex(nIndex));
             xElements->getByIndex(nIndex) >>= xFCSet;
 
             if (hasProperty(PROPERTY_CLASSID, xFCSet) &&
@@ -323,14 +323,14 @@ IMPL_LINK(OFormattedControl, OnKeyPressed, void*, /*EMPTYARG*/)
 
     Reference<XFormComponent>  xFComp(getModel(), UNO_QUERY);
     InterfaceRef  xParent = xFComp->getParent();
-    Reference<XSubmit>  xSubmit(xParent, UNO_QUERY);
+    Reference<XSubmit>	xSubmit(xParent, UNO_QUERY);
     if (xSubmit.is())
         xSubmit->submit( Reference<XControl> (), ::com::sun::star::awt::MouseEvent() );
     return 0L;
 }
 
 //------------------------------------------------------------------------------
-StringSequence  OFormattedControl::getSupportedServiceNames() throw()
+StringSequence	OFormattedControl::getSupportedServiceNames() throw()
 {
     StringSequence aSupported = OBoundControl::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 1);
@@ -463,9 +463,9 @@ Sequence< Type > OFormattedModel::_getTypes()
 void OFormattedModel::describeFixedProperties( Sequence< Property >& _rProps ) const
 {
     BEGIN_DESCRIBE_PROPERTIES( 3, OEditBaseModel )
-        DECL_BOOL_PROP1(EMPTY_IS_NULL,                          BOUND);
-        DECL_PROP1(TABINDEX,            sal_Int16,              BOUND);
-        DECL_BOOL_PROP2(FILTERPROPOSAL,                         BOUND, MAYBEDEFAULT);
+        DECL_BOOL_PROP1(EMPTY_IS_NULL,							BOUND);
+        DECL_PROP1(TABINDEX,			sal_Int16,				BOUND);
+        DECL_BOOL_PROP2(FILTERPROPOSAL, 						BOUND, MAYBEDEFAULT);
     END_DESCRIBE_PROPERTIES();
 }
 
@@ -577,7 +577,7 @@ void OFormattedModel::_propertyChanged( const com::sun::star::beans::PropertyCha
                     ::osl::MutexGuard aGuard( m_aMutex );
 
                     Reference<XNumberFormatsSupplier> xSupplier( calcFormatsSupplier() );
-                    m_nKeyType  = getNumberFormatType(xSupplier->getNumberFormats(), getINT32( evt.NewValue ) );
+                    m_nKeyType	= getNumberFormatType(xSupplier->getNumberFormats(), getINT32( evt.NewValue ) );
 
                     // as m_aSaveValue (which is used by commitControlValueToDbColumn) is format dependent we have
                     // to recalc it, which is done by translateDbColumnToControlValue
@@ -655,7 +655,7 @@ Reference<XNumberFormatsSupplier>  OFormattedModel::calcFormFormatsSupplier() co
     Reference<XForm>  xNextParentForm(xParent, UNO_QUERY);
     while (!xNextParentForm.is() && xParent.is())
     {
-        xParent         = xParent.query( xParent->getParent() );
+        xParent 		= xParent.query( xParent->getParent() );
         xNextParentForm = xNextParentForm.query( xParent );
     }
 
@@ -712,14 +712,14 @@ void OFormattedModel::onConnectedDbColumn( const Reference< XInterface >& _rxFor
 
     DBG_ASSERT(m_xAggregateSet.is(), "OFormattedModel::onConnectedDbColumn : have no aggregate !");
     if (m_xAggregateSet.is())
-    {   // all the following doesn't make any sense if we have no aggregate ...
+    {	// all the following doesn't make any sense if we have no aggregate ...
         Any aSupplier = m_xAggregateSet->getPropertyValue(PROPERTY_FORMATSSUPPLIER);
         DBG_ASSERT( aSupplier.hasValue(), "OFormattedModel::onConnectedDbColumn : invalid property value !" );
         // das sollte im Constructor oder im read auf was richtiges gesetzt worden sein
 
         Any aFmtKey = m_xAggregateSet->getPropertyValue(PROPERTY_FORMATKEY);
         if ( !(aFmtKey >>= nFormatKey ) )
-        {   // nobody gave us a format to use. So we examine the field we're bound to for a
+        {	// nobody gave us a format to use. So we examine the field we're bound to for a 
             // format key, and use it ourself, too
             sal_Int32 nType = DataType::VARCHAR;
             if (xField.is())
@@ -735,7 +735,7 @@ void OFormattedModel::onConnectedDbColumn( const Reference< XInterface >& _rxFor
                 m_bOriginalNumeric = getBOOL(getPropertyValue(PROPERTY_TREATASNUMERIC));
 
                 if (!aFmtKey.hasValue())
-                {   // we aren't bound to a field (or this field's format is invalid)
+                {	// we aren't bound to a field (or this field's format is invalid)
                     // -> determine the standard text (or numeric) format of the supplier
                     Reference<XNumberFormatTypes>  xTypes(xSupplier->getNumberFormats(), UNO_QUERY);
                     if (xTypes.is())
@@ -789,7 +789,7 @@ void OFormattedModel::onConnectedDbColumn( const Reference< XInterface >& _rxFor
 
     Reference<XNumberFormatsSupplier>  xSupplier = calcFormatsSupplier();
     m_bNumeric = getBOOL( getPropertyValue( PROPERTY_TREATASNUMERIC ) );
-    m_nKeyType  = getNumberFormatType( xSupplier->getNumberFormats(), nFormatKey );
+    m_nKeyType	= getNumberFormatType( xSupplier->getNumberFormats(), nFormatKey );
     xSupplier->getNumberFormatSettings()->getPropertyValue( ::rtl::OUString::createFromAscii("NullDate") ) >>= m_aNullDate;
 
     OEditBaseModel::onConnectedDbColumn( _rxForm );
@@ -800,7 +800,7 @@ void OFormattedModel::onDisconnectedDbColumn()
 {
     OEditBaseModel::onDisconnectedDbColumn();
     if (m_xOriginalFormatter.is())
-    {   // unser aggregiertes Model hatte keinerlei Format-Informationen
+    {	// unser aggregiertes Model hatte keinerlei Format-Informationen
         m_xAggregateSet->setPropertyValue(PROPERTY_FORMATSSUPPLIER, makeAny(m_xOriginalFormatter));
         m_xAggregateSet->setPropertyValue(PROPERTY_FORMATKEY, Any());
         setPropertyValue(PROPERTY_TREATASNUMERIC, makeAny((sal_Bool)m_bOriginalNumeric));
@@ -808,7 +808,7 @@ void OFormattedModel::onDisconnectedDbColumn()
     }
 
     m_nFieldType = DataType::OTHER;
-    m_nKeyType   = NumberFormat::UNDEFINED;
+    m_nKeyType	 = NumberFormat::UNDEFINED;
     m_aNullDate  = DBTypeConversion::getStandardDate();
 }
 
@@ -849,11 +849,11 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
 
         Reference<XNumberFormats>  xFormats = xSupplier->getNumberFormats();
 
-        ::rtl::OUString         sFormatDescription;
-        LanguageType    eFormatLanguage = LANGUAGE_DONTKNOW;
+        ::rtl::OUString 		sFormatDescription;
+        LanguageType	eFormatLanguage = LANGUAGE_DONTKNOW;
 
         static const ::rtl::OUString s_aLocaleProp = ::rtl::OUString::createFromAscii("Locale");
-        Reference<com::sun::star::beans::XPropertySet>  xFormat = xFormats->getByKey(nKey);
+        Reference<com::sun::star::beans::XPropertySet>	xFormat = xFormats->getByKey(nKey);
         if (hasProperty(s_aLocaleProp, xFormat))
         {
             Any aLocale = xFormat->getPropertyValue(s_aLocaleProp);
@@ -908,7 +908,7 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
                     _rxOutStream->writeShort(0x0001);
                     _rxOutStream->writeDouble(::comphelper::getDouble(aEffectiveValue));
                     break;
-                default:    // void and all unknown states
+                default:	// void and all unknown states
                     DBG_ASSERT(!aEffectiveValue.hasValue(), "FmXFormattedModel::write : unknown property value type !");
                     _rxOutStream->writeShort(0x0002);
                     break;
@@ -949,7 +949,7 @@ void OFormattedModel::read(const Reference<XObjectInputStream>& _rxInStream) thr
 
                     nKey = xFormats->queryKey(sFormatDescription, aDescriptionLanguage, sal_False);
                     if (nKey == (sal_Int32)-1)
-                    {   // noch nicht vorhanden in meinem Formatter ...
+                    {	// noch nicht vorhanden in meinem Formatter ...
                         nKey = xFormats->addNew(sFormatDescription, aDescriptionLanguage);
                     }
                 }
@@ -958,7 +958,7 @@ void OFormattedModel::read(const Reference<XObjectInputStream>& _rxInStream) thr
                 readCommonEditProperties(_rxInStream);
 
             if (nVersion == 0x0003)
-            {   // since version 3 there is a "skippable" block at this position
+            {	// since version 3 there is a "skippable" block at this position
                 Reference< XDataInputStream > xIn(_rxInStream, UNO_QUERY);
                 OStreamSection aDownCompat(xIn);
 
@@ -1032,10 +1032,10 @@ sal_Bool OFormattedModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
     if ( aControlValue != m_aSaveValue )
     {
         // Leerstring + EmptyIsNull = void
-        if  (   !aControlValue.hasValue()
-            ||  (   ( aControlValue.getValueType().getTypeClass() == TypeClass_STRING )
-                &&  ( getString( aControlValue ).getLength() == 0 )
-                &&  m_bEmptyIsNull
+        if	(	!aControlValue.hasValue()
+            ||	(	( aControlValue.getValueType().getTypeClass() == TypeClass_STRING )
+                &&	( getString( aControlValue ).getLength() == 0 )
+                &&	m_bEmptyIsNull
                 )
             )
             m_xColumnUpdate->updateNull();
diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx
index 9891a71bf654..a2cdf4285a27 100644
--- a/forms/source/component/FormattedField.hxx
+++ b/forms/source/component/FormattedField.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,15 +48,15 @@ namespace frm
     {
         // das Original, falls ich die Format-Properties meines aggregierten Models gefaket, d.h. von dem Feld, an das
         // ich gebunden bin, weitergereicht habe (nur gueltig wenn loaded)
-        ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier>   m_xOriginalFormatter;
-        ::com::sun::star::util::Date        m_aNullDate;
-        ::com::sun::star::uno::Any          m_aSaveValue;
-
-        sal_Int32                           m_nFieldType;
-        sal_Int16                           m_nKeyType;
-        sal_Bool                            m_bOriginalNumeric      : 1,
-                                            m_bNumeric              : 1;    // analog fuer TreatAsNumeric-Property
-
+        ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier>	m_xOriginalFormatter;
+        ::com::sun::star::util::Date		m_aNullDate;
+        ::com::sun::star::uno::Any			m_aSaveValue;
+
+        sal_Int32							m_nFieldType;
+        sal_Int16							m_nKeyType;
+        sal_Bool							m_bOriginalNumeric		: 1,
+                                            m_bNumeric				: 1;	// analog fuer TreatAsNumeric-Property
+                                            
     protected:
         ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier>  calcDefaultFormatsSupplier() const;
         ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier>  calcFormFormatsSupplier() const;
@@ -156,10 +156,10 @@ namespace frm
     //= OFormattedControl
     //==================================================================
     typedef ::cppu::ImplHelper1< ::com::sun::star::awt::XKeyListener> OFormattedControl_BASE;
-    class OFormattedControl :    public OBoundControl
+    class OFormattedControl :	 public OBoundControl
                                 ,public OFormattedControl_BASE
     {
-        sal_uInt32              m_nKeyEvent;
+        sal_uInt32				m_nKeyEvent;
 
     public:
         OFormattedControl(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory);
diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx
index 53f340fd9d70..161046d0ce1e 100644
--- a/forms/source/component/FormattedFieldWrapper.cxx
+++ b/forms/source/component/FormattedFieldWrapper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ OFormattedFieldWrapper::OFormattedFieldWrapper(const Reference<XMultiServiceFact
             m_pEditPart->acquire();
         }
         if (m_xAggregate.is())
-        {   // has to be in it's own block because of the temporary variable created by *this
+        {	// has to be in it's own block because of the temporary variable created by *this
             m_xAggregate->setDelegator(static_cast<XWeak*>(this));
         }
         decrement(m_refCount);
@@ -127,13 +127,13 @@ OFormattedFieldWrapper::OFormattedFieldWrapper( const OFormattedFieldWrapper* _p
             }
         }
         if ( m_xAggregate.is() )
-        {   // has to be in it's own block because of the temporary variable created by *this
+        {	// has to be in it's own block because of the temporary variable created by *this
             m_xAggregate->setDelegator( static_cast< XWeak* >( this ) );
         }
         decrement( m_refCount );
     }
     else
-    {   // the clone source does not yet have an aggregate -> we don't yet need one, too
+    {	// the clone source does not yet have an aggregate -> we don't yet need one, too
     }
 }
 
@@ -156,7 +156,7 @@ Any SAL_CALL OFormattedFieldWrapper::queryAggregation(const Type& _rType) throw
     Any aReturn;
 
     if (_rType.equals( ::getCppuType( static_cast< Reference< XTypeProvider >* >(NULL) ) ) )
-    {   // a XTypeProvider interface needs a working aggregate - we don't want to give the type provider
+    {	// a XTypeProvider interface needs a working aggregate - we don't want to give the type provider
         // of our base class (OFormattedFieldWrapper_Base) to the caller as it supplies nearly nothing
         ensureAggregate();
         if (m_xAggregate.is())
@@ -168,7 +168,7 @@ Any SAL_CALL OFormattedFieldWrapper::queryAggregation(const Type& _rType) throw
         aReturn = OFormattedFieldWrapper_Base::queryAggregation(_rType);
 
         if ((_rType.equals( ::getCppuType( static_cast< Reference< XServiceInfo >* >(NULL) ) ) ) && aReturn.hasValue())
-        {   // somebody requested an XServiceInfo interface and our base class provided it
+        {	// somebody requested an XServiceInfo interface and our base class provided it
             // check our aggregate if it has one, too
             ensureAggregate();
         }
@@ -270,14 +270,14 @@ void SAL_CALL OFormattedFieldWrapper::write(const Reference<XObjectOutputStream>
 void SAL_CALL OFormattedFieldWrapper::read(const Reference<XObjectInputStream>& _rxInStream) throw( IOException, RuntimeException )
 {
     if (m_xAggregate.is())
-    {   //  we alread did a decision if we're an EditModel or a FormattedModel
+    {	//  we alread did a decision if we're an EditModel or a FormattedModel
 
         // if we act as formatted, we have to read the edit part first
         if (m_xFormattedPart.is())
         {
             // two possible cases:
             // a) the stuff was written by a version which didn't work with an Edit header (all intermediate
-            //      versions >5.1 && <=568)
+            //		versions >5.1 && <=568)
             // b) it was written by a version using edit headers
             // as we can distinguish a) from b) only after we have read the edit part, we need to remember the
             // position
@@ -289,7 +289,7 @@ void SAL_CALL OFormattedFieldWrapper::read(const Reference<XObjectInputStream>&
                 // this only works because an edit model can read the stuff written by a formatted model (maybe with
                 // some assertions) , but not vice versa
             if (!m_pEditPart->lastReadWasFormattedFake())
-            {   // case a), written with a version without the edit part fake, so seek to the start position, again
+            {	// case a), written with a version without the edit part fake, so seek to the start position, again
                 xInMarkable->jumpToMark(nBeforeEditPart);
             }
             xInMarkable->deleteMark(nBeforeEditPart);
@@ -318,7 +318,7 @@ void SAL_CALL OFormattedFieldWrapper::read(const Reference<XObjectInputStream>&
         // yes -> all fine
         pNewAggregate = pBasicReader;
     else
-    {   // no -> substitute it with a formatted model
+    {	// no -> substitute it with a formatted model
 
         // let the formmatted model do the reading
         OFormattedModel* pFormattedReader = new OFormattedModel(m_xServiceFactory);
@@ -341,7 +341,7 @@ void SAL_CALL OFormattedFieldWrapper::read(const Reference<XObjectInputStream>&
         DBG_ASSERT(m_xAggregate.is(), "OFormattedFieldWrapper::read : the OEditModel didn't have an XAggregation interface !");
     }
     if (m_xAggregate.is())
-    {   // has to be in it's own block because of the temporary variable created by *this
+    {	// has to be in it's own block because of the temporary variable created by *this
         m_xAggregate->setDelegator(static_cast<XWeak*>(this));
     }
     decrement(m_refCount);
@@ -386,7 +386,7 @@ void OFormattedFieldWrapper::ensureAggregate()
         }
     }
     if (m_xAggregate.is())
-    {   // has to be in it's own block because of the temporary variable created by *this
+    {	// has to be in it's own block because of the temporary variable created by *this
         m_xAggregate->setDelegator(static_cast<XWeak*>(this));
     }
     decrement(m_refCount);
diff --git a/forms/source/component/FormattedFieldWrapper.hxx b/forms/source/component/FormattedFieldWrapper.hxx
index d7726ee428fa..42f861d30666 100644
--- a/forms/source/component/FormattedFieldWrapper.hxx
+++ b/forms/source/component/FormattedFieldWrapper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class OEditModel;
 //==================================================================
 //= OFormattedFieldWrapper
 //==================================================================
-typedef ::cppu::WeakAggImplHelper3  <   ::com::sun::star::io::XPersistObject
-                                    ,   ::com::sun::star::lang::XServiceInfo
-                                    ,   ::com::sun::star::util::XCloneable
-                                    >   OFormattedFieldWrapper_Base;
+typedef ::cppu::WeakAggImplHelper3	<	::com::sun::star::io::XPersistObject
+                                    ,	::com::sun::star::lang::XServiceInfo
+                                    ,	::com::sun::star::util::XCloneable
+                                    >	OFormattedFieldWrapper_Base;
 
 class OFormattedFieldWrapper : public OFormattedFieldWrapper_Base
 {
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xServiceFactory;
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>	m_xServiceFactory;
 
 protected:
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation>      m_xAggregate;
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation> 		m_xAggregate;
 
-    OEditModel*     m_pEditPart;
+    OEditModel*		m_pEditPart;
         // if we act as formatted this is used to write the EditModel part
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XPersistObject>     m_xFormattedPart;
+    ::com::sun::star::uno::Reference< ::com::sun::star::io::XPersistObject> 	m_xFormattedPart;
         // if we act as formatted, this is the PersistObject interface of our aggregate, used
         // to read and write the FormattedModel part
 
diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx
index b6629e91cb94..cf69c0015910 100644
--- a/forms/source/component/FormsCollection.cxx
+++ b/forms/source/component/FormsCollection.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -182,7 +182,7 @@ InterfaceRef  OFormsCollection::getParent() throw( RuntimeException )
 }
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/FormsCollection.hxx b/forms/source/component/FormsCollection.hxx
index df547f1f6238..8a9ef988a40c 100644
--- a/forms/source/component/FormsCollection.hxx
+++ b/forms/source/component/FormsCollection.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace frm
 // oder aussen einen Context uebergeben bekommen
 //==================================================================
 typedef ::cppu::OComponentHelper FormsCollectionComponentBase;
-typedef ::cppu::ImplHelper2<    ::com::sun::star::container::XChild
+typedef ::cppu::ImplHelper2<	::com::sun::star::container::XChild
                                 ,::com::sun::star::lang::XServiceInfo > OFormsCollection_BASE;
 
     // else MSVC kills itself on some statements
@@ -55,9 +55,9 @@ class OFormsCollection
         ,public OInterfaceContainer
         ,public OFormsCollection_BASE
 {
-    ::osl::Mutex                m_aMutex;
-    OImplementationIdsRef       m_aHoldIdHelper;
-    ::comphelper::InterfaceRef  m_xParent;          // Parent
+    ::osl::Mutex				m_aMutex;
+    OImplementationIdsRef		m_aHoldIdHelper;
+    ::comphelper::InterfaceRef 	m_xParent;			// Parent
 
 public:
     OFormsCollection(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory);
@@ -96,7 +96,7 @@ public:
 };
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index 701f143c1c0a..7626cc6e14ae 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,15 +72,15 @@ using namespace ::com::sun::star::view;
 
 namespace WritingMode2 = ::com::sun::star::text::WritingMode2;
 
-const sal_uInt16 ROWHEIGHT          =   0x0001;
-const sal_uInt16 FONTTYPE           =   0x0002;
-const sal_uInt16 FONTSIZE           =   0x0004;
-const sal_uInt16 FONTATTRIBS        =   0x0008;
-const sal_uInt16 TABSTOP            =   0x0010;
-const sal_uInt16 TEXTCOLOR          =   0x0020;
-const sal_uInt16 FONTDESCRIPTOR     =   0x0040;
-const sal_uInt16 RECORDMARKER       =   0x0080;
-const sal_uInt16 BACKGROUNDCOLOR    =   0x0100;
+const sal_uInt16 ROWHEIGHT			=	0x0001;
+const sal_uInt16 FONTTYPE			=	0x0002;
+const sal_uInt16 FONTSIZE			=	0x0004;
+const sal_uInt16 FONTATTRIBS		=	0x0008;
+const sal_uInt16 TABSTOP			=	0x0010;
+const sal_uInt16 TEXTCOLOR			=	0x0020;
+const sal_uInt16 FONTDESCRIPTOR 	=	0x0040;
+const sal_uInt16 RECORDMARKER		=	0x0080;
+const sal_uInt16 BACKGROUNDCOLOR	=	0x0100;
 
 //------------------------------------------------------------------
 InterfaceRef SAL_CALL OGridControlModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
@@ -288,7 +288,7 @@ void SAL_CALL OGridControlModel::setParent( const InterfaceRef& i_Parent ) throw
 }
 
 //------------------------------------------------------------------------------
-Sequence< Type > SAL_CALL OGridControlModel::getTypes(  ) throw(RuntimeException)
+Sequence< Type > SAL_CALL OGridControlModel::getTypes(	) throw(RuntimeException)
 {
     return concatSequences(
         concatSequences(
@@ -388,16 +388,16 @@ Reference<XPropertySet>  OGridControlModel::createColumn(sal_Int32 nTypeId) cons
     Reference<XPropertySet>  xReturn;
     switch (nTypeId)
     {
-        case TYPE_CHECKBOX:         xReturn = new CheckBoxColumn( getContext() ); break;
-        case TYPE_COMBOBOX:         xReturn = new ComboBoxColumn( getContext() ); break;
-        case TYPE_CURRENCYFIELD:    xReturn = new CurrencyFieldColumn( getContext() ); break;
-        case TYPE_DATEFIELD:        xReturn = new DateFieldColumn( getContext() ); break;
-        case TYPE_LISTBOX:          xReturn = new ListBoxColumn( getContext() ); break;
-        case TYPE_NUMERICFIELD:     xReturn = new NumericFieldColumn( getContext() ); break;
-        case TYPE_PATTERNFIELD:     xReturn = new PatternFieldColumn( getContext() ); break;
-        case TYPE_TEXTFIELD:        xReturn = new TextFieldColumn( getContext() ); break;
-        case TYPE_TIMEFIELD:        xReturn = new TimeFieldColumn( getContext() ); break;
-        case TYPE_FORMATTEDFIELD:   xReturn = new FormattedFieldColumn( getContext() ); break;
+        case TYPE_CHECKBOX: 		xReturn = new CheckBoxColumn( getContext() ); break;
+        case TYPE_COMBOBOX: 		xReturn = new ComboBoxColumn( getContext() ); break;
+        case TYPE_CURRENCYFIELD:	xReturn = new CurrencyFieldColumn( getContext() ); break;
+        case TYPE_DATEFIELD:		xReturn = new DateFieldColumn( getContext() ); break;
+        case TYPE_LISTBOX:			xReturn = new ListBoxColumn( getContext() ); break;
+        case TYPE_NUMERICFIELD: 	xReturn = new NumericFieldColumn( getContext() ); break;
+        case TYPE_PATTERNFIELD: 	xReturn = new PatternFieldColumn( getContext() ); break;
+        case TYPE_TEXTFIELD:		xReturn = new TextFieldColumn( getContext() ); break;
+        case TYPE_TIMEFIELD:		xReturn = new TimeFieldColumn( getContext() ); break;
+        case TYPE_FORMATTEDFIELD:	xReturn = new FormattedFieldColumn( getContext() ); break;
         default:
             DBG_ERROR("OGridControlModel::createColumn: Unknown Column");
             break;
@@ -458,41 +458,41 @@ void OGridControlModel::_reset()
 void OGridControlModel::describeFixedProperties( Sequence< Property >& _rProps ) const
 {
     BEGIN_DESCRIBE_BASE_PROPERTIES( 37 )
-        DECL_PROP1(NAME,                ::rtl::OUString,    BOUND);
-        DECL_PROP2(CLASSID,             sal_Int16,          READONLY, TRANSIENT);
-        DECL_PROP1(TAG,                 ::rtl::OUString,    BOUND);
-        DECL_PROP1(TABINDEX,            sal_Int16,          BOUND);
-        DECL_PROP3(TABSTOP,             sal_Bool,           BOUND, MAYBEDEFAULT, MAYBEVOID);
-        DECL_PROP2(HASNAVIGATION,       sal_Bool,           BOUND, MAYBEDEFAULT);
-        DECL_PROP1(ENABLED,             sal_Bool,           BOUND);
-        DECL_PROP2(ENABLEVISIBLE,       sal_Bool,           BOUND, MAYBEDEFAULT);
-        DECL_PROP1(BORDER,              sal_Int16,          BOUND);
-        DECL_PROP2(BORDERCOLOR,         sal_Int16,          BOUND, MAYBEVOID);
-        DECL_PROP1(DEFAULTCONTROL,      ::rtl::OUString,    BOUND);
-        DECL_PROP3(TEXTCOLOR,           sal_Int32,          BOUND, MAYBEDEFAULT, MAYBEVOID);
-        DECL_PROP3(BACKGROUNDCOLOR,     sal_Int32,          BOUND, MAYBEDEFAULT, MAYBEVOID);
-        DECL_PROP2(FONT,                FontDescriptor,     BOUND, MAYBEDEFAULT);
-        DECL_PROP3(ROWHEIGHT,           sal_Int32,          BOUND, MAYBEDEFAULT, MAYBEVOID);
-        DECL_PROP1(HELPTEXT,            ::rtl::OUString,    BOUND);
-        DECL_PROP1(FONT_NAME,           ::rtl::OUString,    MAYBEDEFAULT);
-        DECL_PROP1(FONT_STYLENAME,      ::rtl::OUString,    MAYBEDEFAULT);
-        DECL_PROP1(FONT_FAMILY,         sal_Int16,          MAYBEDEFAULT);
-        DECL_PROP1(FONT_CHARSET,        sal_Int16,          MAYBEDEFAULT);
-        DECL_PROP1(FONT_HEIGHT,         float,              MAYBEDEFAULT);
-        DECL_PROP1(FONT_WEIGHT,         float,              MAYBEDEFAULT);
-        DECL_PROP1(FONT_SLANT,          sal_Int16,          MAYBEDEFAULT);
-        DECL_PROP1(FONT_UNDERLINE,      sal_Int16,          MAYBEDEFAULT);
-        DECL_BOOL_PROP1(FONT_WORDLINEMODE,                  MAYBEDEFAULT);
-        DECL_PROP3(TEXTLINECOLOR,       sal_Int32,          BOUND, MAYBEDEFAULT, MAYBEVOID);
-        DECL_PROP2(FONTEMPHASISMARK,    sal_Int16,          BOUND, MAYBEDEFAULT);
-        DECL_PROP2(FONTRELIEF,          sal_Int16,          BOUND, MAYBEDEFAULT);
-        DECL_PROP1(FONT_STRIKEOUT,      sal_Int16,          MAYBEDEFAULT);
-        DECL_PROP2(RECORDMARKER,        sal_Bool,           BOUND, MAYBEDEFAULT );
-        DECL_PROP2(PRINTABLE,           sal_Bool,           BOUND, MAYBEDEFAULT );
-        DECL_PROP4(CURSORCOLOR,         sal_Int32,          BOUND, MAYBEDEFAULT, MAYBEVOID , TRANSIENT);
-        DECL_PROP3(ALWAYSSHOWCURSOR,    sal_Bool,           BOUND, MAYBEDEFAULT, TRANSIENT);
-        DECL_PROP3(DISPLAYSYNCHRON,     sal_Bool,           BOUND, MAYBEDEFAULT, TRANSIENT);
-        DECL_PROP2(HELPURL,             ::rtl::OUString,    BOUND, MAYBEDEFAULT);
+        DECL_PROP1(NAME,				::rtl::OUString,	BOUND);
+        DECL_PROP2(CLASSID, 			sal_Int16,			READONLY, TRANSIENT);
+        DECL_PROP1(TAG, 				::rtl::OUString,	BOUND);
+        DECL_PROP1(TABINDEX,			sal_Int16,			BOUND);
+        DECL_PROP3(TABSTOP, 			sal_Bool,			BOUND, MAYBEDEFAULT, MAYBEVOID);
+        DECL_PROP2(HASNAVIGATION,		sal_Bool,			BOUND, MAYBEDEFAULT);
+        DECL_PROP1(ENABLED, 			sal_Bool,			BOUND);
+        DECL_PROP2(ENABLEVISIBLE,		sal_Bool,			BOUND, MAYBEDEFAULT);
+        DECL_PROP1(BORDER,				sal_Int16,			BOUND);
+        DECL_PROP2(BORDERCOLOR,	        sal_Int16,			BOUND, MAYBEVOID);
+        DECL_PROP1(DEFAULTCONTROL,		::rtl::OUString,	BOUND);
+        DECL_PROP3(TEXTCOLOR,			sal_Int32,			BOUND, MAYBEDEFAULT, MAYBEVOID);
+        DECL_PROP3(BACKGROUNDCOLOR, 	sal_Int32,			BOUND, MAYBEDEFAULT, MAYBEVOID);
+        DECL_PROP2(FONT,				FontDescriptor, 	BOUND, MAYBEDEFAULT);
+        DECL_PROP3(ROWHEIGHT,			sal_Int32,			BOUND, MAYBEDEFAULT, MAYBEVOID);
+        DECL_PROP1(HELPTEXT,			::rtl::OUString,	BOUND);
+        DECL_PROP1(FONT_NAME,			::rtl::OUString,	MAYBEDEFAULT);
+        DECL_PROP1(FONT_STYLENAME,		::rtl::OUString,	MAYBEDEFAULT);
+        DECL_PROP1(FONT_FAMILY, 		sal_Int16,			MAYBEDEFAULT);
+        DECL_PROP1(FONT_CHARSET,		sal_Int16,			MAYBEDEFAULT);
+        DECL_PROP1(FONT_HEIGHT, 		float,				MAYBEDEFAULT);
+        DECL_PROP1(FONT_WEIGHT, 		float,				MAYBEDEFAULT);
+        DECL_PROP1(FONT_SLANT,			sal_Int16,			MAYBEDEFAULT);
+        DECL_PROP1(FONT_UNDERLINE,		sal_Int16,			MAYBEDEFAULT);
+        DECL_BOOL_PROP1(FONT_WORDLINEMODE,					MAYBEDEFAULT);
+        DECL_PROP3(TEXTLINECOLOR,		sal_Int32,			BOUND, MAYBEDEFAULT, MAYBEVOID);
+        DECL_PROP2(FONTEMPHASISMARK,	sal_Int16,			BOUND, MAYBEDEFAULT);
+        DECL_PROP2(FONTRELIEF,			sal_Int16,			BOUND, MAYBEDEFAULT);
+        DECL_PROP1(FONT_STRIKEOUT,		sal_Int16,			MAYBEDEFAULT);
+        DECL_PROP2(RECORDMARKER,		sal_Bool,			BOUND, MAYBEDEFAULT );
+        DECL_PROP2(PRINTABLE,			sal_Bool,			BOUND, MAYBEDEFAULT );
+        DECL_PROP4(CURSORCOLOR, 		sal_Int32,			BOUND, MAYBEDEFAULT, MAYBEVOID , TRANSIENT);
+        DECL_PROP3(ALWAYSSHOWCURSOR,	sal_Bool,			BOUND, MAYBEDEFAULT, TRANSIENT);
+        DECL_PROP3(DISPLAYSYNCHRON, 	sal_Bool,			BOUND, MAYBEDEFAULT, TRANSIENT);
+        DECL_PROP2(HELPURL, 			::rtl::OUString,	BOUND, MAYBEDEFAULT);
         DECL_PROP2(WRITING_MODE,        sal_Int16,          BOUND, MAYBEDEFAULT);
         DECL_PROP3(CONTEXT_WRITING_MODE,sal_Int16,          BOUND, MAYBEDEFAULT, TRANSIENT);
     END_DESCRIBE_PROPERTIES();
@@ -811,7 +811,7 @@ void OGridControlModel::gotColumn( const Reference< XInterface >& _rxColumn )
 void OGridControlModel::lostColumn(const Reference< XInterface >& _rxColumn)
 {
     if ( m_xSelection == _rxColumn )
-    {   // the currently selected element was replaced
+    {	// the currently selected element was replaced
         m_xSelection.clear();
         EventObject aEvt( static_cast< XWeak* >( this ) );
         m_aSelectListeners.notifyEach( &XSelectionChangeListener::selectionChanged, aEvt );
@@ -883,7 +883,7 @@ void OGridControlModel::approveNewElement( const Reference< XPropertySet >& _rxO
 //------------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OGridControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
 {
-    return FRM_COMPONENT_GRID;  // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_GRID;	// old (non-sun) name for compatibility !
 }
 
 //------------------------------------------------------------------------------
@@ -891,7 +891,7 @@ void OGridControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream
 {
     OControlModel::write(_rxOutStream);
 
-    Reference<XMarkableStream>  xMark(_rxOutStream, UNO_QUERY);
+    Reference<XMarkableStream>	xMark(_rxOutStream, UNO_QUERY);
 
     // 1. Version
     _rxOutStream->writeShort(0x0008);
@@ -1009,7 +1009,7 @@ void OGridControlModel::read(const Reference<XObjectInputStream>& _rxInStream) t
 {
     OControlModel::read(_rxInStream);
 
-    Reference<XMarkableStream>  xMark(_rxInStream, UNO_QUERY);
+    Reference<XMarkableStream>	xMark(_rxInStream, UNO_QUERY);
 
     // 1. Version
     sal_Int16 nVersion = _rxInStream->readShort();
@@ -1159,7 +1159,7 @@ void OGridControlModel::read(const Reference<XObjectInputStream>& _rxInStream) t
 }
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Grid.hxx b/forms/source/component/Grid.hxx
index 5b4b645d77f0..7077ffc59e9e 100644
--- a/forms/source/component/Grid.hxx
+++ b/forms/source/component/Grid.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,55 +57,55 @@ class OGridColumn;
     struct ColumnDescription : public ElementDescription
     {
     public:
-        OGridColumn*                pColumn;        // not owned by this instance! only to prevent duplicate XUnoTunnel usage
+        OGridColumn*				pColumn;		// not owned by this instance! only to prevent duplicate XUnoTunnel usage
     };
 
 //==================================================================
 // OGridControlModel
 //==================================================================
-typedef ::cppu::ImplHelper7 <   ::com::sun::star::awt::XControlModel
-                            ,   ::com::sun::star::form::XGridColumnFactory
-                            ,   ::com::sun::star::form::XReset
-                            ,   ::com::sun::star::view::XSelectionSupplier
-                            ,   ::com::sun::star::sdb::XSQLErrorListener
+typedef ::cppu::ImplHelper7 <	::com::sun::star::awt::XControlModel
+                            ,	::com::sun::star::form::XGridColumnFactory
+                            ,	::com::sun::star::form::XReset
+                            ,	::com::sun::star::view::XSelectionSupplier
+                            ,	::com::sun::star::sdb::XSQLErrorListener
                             ,   ::com::sun::star::sdb::XRowSetSupplier
                             ,   ::com::sun::star::sdb::XRowSetChangeBroadcaster
-                            >   OGridControlModel_BASE;
-
+                            >	OGridControlModel_BASE;
+ 
 class OGridControlModel :public OControlModel
                         ,public OInterfaceContainer
                         ,public OErrorBroadcaster
                         ,public FontControlModel
                         ,public OGridControlModel_BASE
 {
-    ::cppu::OInterfaceContainerHelper       m_aSelectListeners,
+    ::cppu::OInterfaceContainerHelper		m_aSelectListeners,
                                             m_aResetListeners,
                                             m_aRowSetChangeListeners;
 
 // [properties]
-    ::com::sun::star::uno::Any              m_aRowHeight;           // Zeilenhoehe
-    ::com::sun::star::uno::Any              m_aTabStop;
-    ::com::sun::star::uno::Any              m_aBackgroundColor;
-    ::com::sun::star::uno::Any              m_aCursorColor;             // transient
+    ::com::sun::star::uno::Any				m_aRowHeight;			// Zeilenhoehe
+    ::com::sun::star::uno::Any				m_aTabStop;
+    ::com::sun::star::uno::Any				m_aBackgroundColor;
+    ::com::sun::star::uno::Any				m_aCursorColor; 			// transient
     ::com::sun::star::uno::Any              m_aBorderColor;
-    ::rtl::OUString                         m_aDefaultControl;
-    ::rtl::OUString                         m_sHelpText;
+    ::rtl::OUString 						m_aDefaultControl;
+    ::rtl::OUString 						m_sHelpText;
 // [properties]
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >       m_xSelection;
+    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >		m_xSelection;
 
 // [properties]
-    ::rtl::OUString             m_sHelpURL;                 // URL
-    sal_Int16                   m_nBorder;
+    ::rtl::OUString 			m_sHelpURL; 				// URL
+    sal_Int16					m_nBorder;
     sal_Int16                   m_nWritingMode;
     sal_Int16                   m_nContextWritingMode;
-    sal_Bool                    m_bEnableVisible    : 1;
-    sal_Bool                    m_bEnable           : 1;
-    sal_Bool                    m_bNavigation       : 1;
-    sal_Bool                    m_bRecordMarker     : 1;
-    sal_Bool                    m_bPrintable        : 1;
-    sal_Bool                    m_bAlwaysShowCursor : 1;    // transient
-    sal_Bool                    m_bDisplaySynchron  : 1;    // transient
+    sal_Bool					m_bEnableVisible	: 1;
+    sal_Bool					m_bEnable			: 1;
+    sal_Bool					m_bNavigation		: 1;
+    sal_Bool					m_bRecordMarker 	: 1;
+    sal_Bool					m_bPrintable		: 1;
+    sal_Bool					m_bAlwaysShowCursor : 1;    // transient
+    sal_Bool					m_bDisplaySynchron	: 1;    // transient
 // [properties]
 
 protected:
@@ -214,7 +214,7 @@ protected:
 };
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 
diff --git a/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx
index 702a3aba1905..a6a781fe6455 100644
--- a/forms/source/component/GroupBox.cxx
+++ b/forms/source/component/GroupBox.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ OGroupBoxModel::OGroupBoxModel( const OGroupBoxModel* _pOriginal, const Referenc
 
 // XServiceInfo
 //------------------------------------------------------------------------------
-StringSequence SAL_CALL OGroupBoxModel::getSupportedServiceNames() throw(RuntimeException)
+StringSequence SAL_CALL	OGroupBoxModel::getSupportedServiceNames() throw(RuntimeException)
 {
     StringSequence aSupported = OControlModel::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 1);
@@ -108,7 +108,7 @@ void OGroupBoxModel::describeAggregateProperties( Sequence< Property >& _rAggreg
 //------------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OGroupBoxModel::getServiceName() throw(RuntimeException)
 {
-    return FRM_COMPONENT_GROUPBOX;  // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_GROUPBOX;	// old (non-sun) name for compatibility !
 }
 
 //------------------------------------------------------------------------------
@@ -158,7 +158,7 @@ OGroupBoxControl::OGroupBoxControl(const Reference<starlang::XMultiServiceFactor
 }
 
 //------------------------------------------------------------------------------
-StringSequence SAL_CALL OGroupBoxControl::getSupportedServiceNames() throw(RuntimeException)
+StringSequence SAL_CALL	OGroupBoxControl::getSupportedServiceNames() throw(RuntimeException)
 {
     StringSequence aSupported = OControl::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 1);
diff --git a/forms/source/component/GroupBox.hxx b/forms/source/component/GroupBox.hxx
index a7b0411af451..1c0af9dc13ce 100644
--- a/forms/source/component/GroupBox.hxx
+++ b/forms/source/component/GroupBox.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,10 +46,10 @@ public:
 
     // XServiceInfo
     IMPLEMENTATION_NAME(OGroupBoxModel);
-    virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
+    virtual StringSequence SAL_CALL	getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
 
     // XPersistObject
-    virtual ::rtl::OUString SAL_CALL    getServiceName() throw(::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL	getServiceName() throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL
         write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL
@@ -74,7 +74,7 @@ public:
 
     // XServiceInfo
     IMPLEMENTATION_NAME(OGroupBoxControl);
-    virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
+    virtual StringSequence SAL_CALL	getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
 };
 
 //.........................................................................
diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx
index c9b8e4616e73..8e31c5c317aa 100644
--- a/forms/source/component/GroupManager.cxx
+++ b/forms/source/component/GroupManager.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ public:
     {
         return
             reinterpret_cast<sal_Int64>(lhs.m_xComponent.get())
-        <   reinterpret_cast<sal_Int64>(rhs.m_xComponent.get());
+        <	reinterpret_cast<sal_Int64>(rhs.m_xComponent.get());
     }
 };
 
@@ -350,7 +350,7 @@ void SAL_CALL OGroupManager::propertyChange(const PropertyChangeEvent& evt) thro
     Reference<XPropertySet>  xSet(evt.Source, UNO_QUERY);
 
     // Component aus Gruppe entfernen
-    ::rtl::OUString     sGroupName;
+    ::rtl::OUString		sGroupName;
     if (hasProperty( PROPERTY_GROUP_NAME, xSet ))
         xSet->getPropertyValue( PROPERTY_GROUP_NAME ) >>= sGroupName;
     if (evt.PropertyName == PROPERTY_NAME) {
@@ -425,9 +425,9 @@ sal_Int32 OGroupManager::getGroupCount()
 void OGroupManager::getGroup(sal_Int32 nGroup, Sequence< Reference<XControlModel> >& _rGroup, ::rtl::OUString& _rName)
 {
     OSL_ENSURE(nGroup >= 0 && (size_t)nGroup < m_aActiveGroupMap.size(),"OGroupManager::getGroup: Invalid group index!");
-    OGroupArr::iterator aGroupPos   = m_aActiveGroupMap[nGroup];
-    _rName                          = aGroupPos->second.GetGroupName();
-    _rGroup                         = aGroupPos->second.GetControlModels();
+    OGroupArr::iterator aGroupPos	= m_aActiveGroupMap[nGroup];
+    _rName							= aGroupPos->second.GetGroupName();
+    _rGroup							= aGroupPos->second.GetControlModels();
 }
 
 //------------------------------------------------------------------
@@ -506,7 +506,7 @@ void OGroupManager::RemoveElement( const Reference<XPropertySet>& xSet )
         return;
 
     // Component aus Gruppe entfernen
-    ::rtl::OUString     sGroupName( GetGroupName( xSet ) );
+    ::rtl::OUString		sGroupName( GetGroupName( xSet ) );
 
     removeFromGroupMap(sGroupName,xSet);
 }
@@ -527,7 +527,7 @@ void OGroupManager::RemoveElement( const Reference<XPropertySet>& xSet )
 }
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx
index aa2218856282..119144c1c5bd 100644
--- a/forms/source/component/GroupManager.hxx
+++ b/forms/source/component/GroupManager.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -95,7 +95,7 @@ namespace frm
             _rCompareOp
         );
         if ((aExistentPos != _rArray.end()) && (*aExistentPos == _rNewElement))
-        {   // we have a valid "lower or equal" element and it's really "equal"
+        {	// we have a valid "lower or equal" element and it's really "equal"
             nPos = aExistentPos - _rArray.begin();
             return sal_True;
         }
@@ -106,11 +106,11 @@ namespace frm
 //========================================================================
 class OGroupComp
 {
-    ::rtl::OUString m_aName;
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>    m_xComponent;
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>     m_xControlModel;
-    sal_Int32   m_nPos;
-    sal_Int16   m_nTabIndex;
+    ::rtl::OUString	m_aName;
+    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> 	m_xComponent;
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> 	m_xControlModel;
+    sal_Int32	m_nPos;
+    sal_Int16	m_nTabIndex;
 
     friend class OGroupCompLess;
 
@@ -122,10 +122,10 @@ public:
     sal_Bool operator==( const OGroupComp& rComp ) const;
 
     inline const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& GetComponent() const { return m_xComponent; }
-    inline const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>&   GetControlModel() const { return m_xControlModel; }
+    inline const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>&	GetControlModel() const { return m_xControlModel; }
 
-    sal_Int32   GetPos() const { return m_nPos; }
-    sal_Int16   GetTabIndex() const { return m_nTabIndex; }
+    sal_Int32	GetPos() const { return m_nPos; }
+    sal_Int16	GetTabIndex() const { return m_nTabIndex; }
     ::rtl::OUString GetName() const { return m_aName; }
 };
 
@@ -135,9 +135,9 @@ DECLARE_STL_VECTOR(OGroupComp, OGroupCompArr);
 class OGroupComp;
 class OGroupCompAcc
 {
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>    m_xComponent;
-
-    OGroupComp                                      m_aGroupComp;
+    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> 	m_xComponent;
+    
+    OGroupComp										m_aGroupComp;
 
     friend class OGroupCompAccLess;
 
@@ -146,8 +146,8 @@ public:
 
     sal_Bool operator==( const OGroupCompAcc& rCompAcc ) const;
 
-    inline const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>&  GetComponent() const { return m_xComponent; }
-    const OGroupComp&   GetGroupComponent() const { return m_aGroupComp; }
+    inline const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>&	GetComponent() const { return m_xComponent; }
+    const OGroupComp&	GetGroupComponent() const { return m_aGroupComp; }
 };
 
 DECLARE_STL_VECTOR(OGroupCompAcc, OGroupCompAccArr);
@@ -155,18 +155,18 @@ DECLARE_STL_VECTOR(OGroupCompAcc, OGroupCompAccArr);
 //========================================================================
 class OGroup
 {
-    OGroupCompArr       m_aCompArray;
-    OGroupCompAccArr    m_aCompAccArray;
+    OGroupCompArr		m_aCompArray;
+    OGroupCompAccArr	m_aCompAccArray;
 
     ::rtl::OUString m_aGroupName;
-    sal_uInt16  m_nInsertPos;               // Die Einfugeposition der GroupComps wird von der Gruppe bestimmt.
+    sal_uInt16	m_nInsertPos;				// Die Einfugeposition der GroupComps wird von der Gruppe bestimmt.
 
     friend class OGroupLess;
 
 public:
     OGroup( const ::rtl::OUString& rGroupName );
 #ifdef DBG_UTIL
-    OGroup( const OGroup& _rSource );   // just to ensure the DBG_CTOR call
+    OGroup( const OGroup& _rSource );	// just to ensure the DBG_CTOR call
 #endif
     virtual ~OGroup();
 
@@ -186,11 +186,11 @@ DECLARE_STL_USTRINGACCESS_MAP(OGroup, OGroupArr);
 DECLARE_STL_VECTOR(OGroupArr::iterator, OActiveGroups);
 
 //========================================================================
-class OGroupManager : public ::cppu::WeakImplHelper2< ::com::sun::star::beans::XPropertyChangeListener, ::com::sun::star::container::XContainerListener>
+class OGroupManager	: public ::cppu::WeakImplHelper2< ::com::sun::star::beans::XPropertyChangeListener, ::com::sun::star::container::XContainerListener>
 {
-    OGroup*         m_pCompGroup;           // Alle Components nach TabIndizes sortiert
-    OGroupArr       m_aGroupArr;            // Alle Components nach Gruppen sortiert
-    OActiveGroups   m_aActiveGroupMap;      // In dieser Map werden die Indizes aller Gruppen gehalten,
+    OGroup*			m_pCompGroup;			// Alle Components nach TabIndizes sortiert
+    OGroupArr		m_aGroupArr;			// Alle Components nach Gruppen sortiert
+    OActiveGroups	m_aActiveGroupMap;		// In dieser Map werden die Indizes aller Gruppen gehalten,
                                         // die mehr als 1 Element haben
 
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer >
@@ -227,7 +227,7 @@ public:
 
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 #endif // _FRM_GROUPMANAGER_HXX_
diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx
index 6f1e595d7e79..d291a9818a72 100644
--- a/forms/source/component/Hidden.cxx
+++ b/forms/source/component/Hidden.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,16 +130,16 @@ sal_Bool OHiddenModel::convertFastPropertyValue(
 void OHiddenModel::describeFixedProperties( Sequence< Property >& _rProps ) const
 {
     BEGIN_DESCRIBE_BASE_PROPERTIES(4)
-        DECL_PROP2(CLASSID,         sal_Int16,          READONLY, TRANSIENT);
-        DECL_PROP1(HIDDEN_VALUE,    ::rtl::OUString,    BOUND);
-        DECL_PROP1(NAME,            ::rtl::OUString,    BOUND);
-        DECL_PROP1(TAG,             ::rtl::OUString,    BOUND);
+        DECL_PROP2(CLASSID,			sal_Int16,			READONLY, TRANSIENT);
+        DECL_PROP1(HIDDEN_VALUE,	::rtl::OUString,	BOUND);
+        DECL_PROP1(NAME,			::rtl::OUString,	BOUND);
+        DECL_PROP1(TAG,				::rtl::OUString,	BOUND);
     END_DESCRIBE_PROPERTIES();
 }
 
 // XServiceInfo
 //------------------------------------------------------------------------------
-StringSequence SAL_CALL OHiddenModel::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException)
+StringSequence SAL_CALL	OHiddenModel::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException)
 {
     StringSequence aSupported( 2 );
     aSupported[ 0 ] = FRM_SUN_COMPONENT_HIDDENCONTROL;
@@ -150,7 +150,7 @@ StringSequence SAL_CALL OHiddenModel::getSupportedServiceNames() throw(::com::su
 //------------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OHiddenModel::getServiceName() throw(RuntimeException)
 {
-    return FRM_COMPONENT_HIDDEN;    // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_HIDDEN;	// old (non-sun) name for compatibility !
 }
 
 //------------------------------------------------------------------------------
diff --git a/forms/source/component/Hidden.hxx b/forms/source/component/Hidden.hxx
index 640b91dbd3c1..98bbcdd6c086 100644
--- a/forms/source/component/Hidden.hxx
+++ b/forms/source/component/Hidden.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 frm
 class OHiddenModel
         :public OControlModel
 {
-    ::rtl::OUString     m_sHiddenValue;
+    ::rtl::OUString		m_sHiddenValue;
 
 public:
     DECLARE_DEFAULT_LEAF_XTOR( OHiddenModel );
@@ -56,10 +56,10 @@ public:
 
     // XServiceInfo
     IMPLEMENTATION_NAME(OHiddenModel);
-    virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
+    virtual StringSequence SAL_CALL	getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
 
     // XPersistObject
-    virtual ::rtl::OUString SAL_CALL    getServiceName() throw(::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL	getServiceName() throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL
         write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL
diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx
index 926ed5c57e55..2b6165f5fac8 100644
--- a/forms/source/component/ImageButton.cxx
+++ b/forms/source/component/ImageButton.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ OImageButtonModel::~OImageButtonModel()
 
 // XServiceInfo
 //------------------------------------------------------------------------------
-StringSequence  OImageButtonModel::getSupportedServiceNames() throw()
+StringSequence	OImageButtonModel::getSupportedServiceNames() throw()
 {
     StringSequence aSupported = OClickableImageBaseModel::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 1);
@@ -115,7 +115,7 @@ void OImageButtonModel::describeFixedProperties( Sequence< Property >& _rProps )
 //------------------------------------------------------------------------------
 ::rtl::OUString OImageButtonModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
 {
-    return FRM_COMPONENT_IMAGEBUTTON;   // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_IMAGEBUTTON;	// old (non-sun) name for compatibility !
 }
 
 //------------------------------------------------------------------------------
@@ -192,7 +192,7 @@ Sequence<Type> OImageButtonControl::_getTypes()
 }
 
 //------------------------------------------------------------------------------
-StringSequence  OImageButtonControl::getSupportedServiceNames() throw()
+StringSequence	OImageButtonControl::getSupportedServiceNames() throw()
 {
     StringSequence aSupported = OClickableImageBaseControl::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 1);
@@ -269,7 +269,7 @@ void SAL_CALL OImageButtonControl::mouseExited(const awt::MouseEvent& /*e*/) thr
 
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/ImageButton.hxx b/forms/source/component/ImageButton.hxx
index cd5e4f7758a1..2507e3666b5c 100644
--- a/forms/source/component/ImageButton.hxx
+++ b/forms/source/component/ImageButton.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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:
 };
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 #endif // _FRM_IMAGE_BUTTON_HXX_
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index 6caf6f4b530a..e888fcaa0169 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,8 +67,8 @@
 
 #include <memory>
 
-#define ID_OPEN_GRAPHICS            1
-#define ID_CLEAR_GRAPHICS           2
+#define ID_OPEN_GRAPHICS			1
+#define	ID_CLEAR_GRAPHICS			2
 
 //.........................................................................
 namespace frm
@@ -213,7 +213,7 @@ IMPLEMENT_DEFAULT_CLONING( OImageControlModel )
 
 // XServiceInfo
 //------------------------------------------------------------------------------
-StringSequence  OImageControlModel::getSupportedServiceNames() throw()
+StringSequence	OImageControlModel::getSupportedServiceNames() throw()
 {
     StringSequence aSupported = OBoundControlModel::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 1);
@@ -370,7 +370,7 @@ void OImageControlModel::describeAggregateProperties( Sequence< Property >& /* [
 //------------------------------------------------------------------------------
 ::rtl::OUString OImageControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
 {
-    return FRM_COMPONENT_IMAGECONTROL;  // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_IMAGECONTROL;	// old (non-sun) name for compatibility !
 }
 
 //------------------------------------------------------------------------------
@@ -416,8 +416,8 @@ void OImageControlModel::read(const Reference<XObjectInputStream>& _rxInStream)
     }
     // Nach dem Lesen die Defaultwerte anzeigen
     if ( getControlSource().getLength() )
-    {   // (not if we don't have a control source - the "State" property acts like it is persistent, then
-        ::osl::MutexGuard aGuard(m_aMutex); // resetNoBroadcast expects this mutex guarding
+    {	// (not if we don't have a control source - the "State" property acts like it is persistent, then
+        ::osl::MutexGuard aGuard(m_aMutex);	// resetNoBroadcast expects this mutex guarding
         resetNoBroadcast();
     }
 }
@@ -574,7 +574,7 @@ Any OImageControlModel::translateDbColumnToControlValue()
 {
     switch ( lcl_getImageStoreType( getFieldType() ) )
     {
-    case ImageStoreBinary:
+    case ImageStoreBinary: 
     {
         Reference< XInputStream > xImageStream( m_xColumn->getBinaryStream() );
         if ( m_xColumn->wasNull() )
@@ -619,7 +619,7 @@ void OImageControlModel::doSetControlValue( const Any& _rValue )
         GetImageProducer()->setImage( xInStream );
         bStartProduction = true;
     }
-    break;
+    break; 
 
     case ImageStoreLink:
     {
@@ -756,7 +756,7 @@ Any SAL_CALL OImageControlControl::queryAggregation(const Type& _rType) throw (R
 }
 
 //------------------------------------------------------------------------------
-StringSequence  OImageControlControl::getSupportedServiceNames() throw()
+StringSequence	OImageControlControl::getSupportedServiceNames() throw()
 {
     StringSequence aSupported = OBoundControl::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 1);
@@ -932,7 +932,7 @@ void OImageControlControl::mousePressed(const ::com::sun::star::awt::MouseEvent&
 
             awt::Rectangle aRect( e.X, e.Y, 0, 0 );
             if ( ( e.X < 0 ) || ( e.Y < 0 ) )
-            {   // context menu triggered by keyboard
+            {	// context menu triggered by keyboard
                 // position it in the center of the control
                 // 102205 - 16.08.2002 - fs@openoffice.org
                 Reference< XWindow > xWindow( static_cast< ::cppu::OWeakObject* >( this ), UNO_QUERY );
@@ -1019,7 +1019,7 @@ void SAL_CALL OImageControlControl::mouseExited(const awt::MouseEvent& /*e*/) th
 }
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx
index 65c3f0dc872e..65f1a6a6a2c2 100644
--- a/forms/source/component/ImageControl.hxx
+++ b/forms/source/component/ImageControl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class OImageControlModel
                 :public OImageControlModel_Base
                 ,public OBoundControlModel
 {
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageProducer>    m_xImageProducer;
-    ImageProducer*                                  m_pImageProducer;
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageProducer> 	m_xImageProducer;
+    ImageProducer*									m_pImageProducer;
     bool                                            m_bExternalGraphic;
-    sal_Bool                                        m_bReadOnly;
+    sal_Bool										m_bReadOnly;
     ::rtl::OUString                                 m_sImageURL;
-    ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject >
+    ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > 
                                                     m_xGraphicObject;
     ::rtl::OUString                                 m_sDocumentURL;
 
@@ -129,7 +129,7 @@ protected:
                             getControlValue( ) const;
     virtual void            doSetControlValue( const ::com::sun::star::uno::Any& _rValue );
 
-    virtual sal_Bool        approveDbColumnType(sal_Int32 _nColumnType);
+    virtual sal_Bool		approveDbColumnType(sal_Int32 _nColumnType);
 
     virtual void            resetNoBroadcast();
 
@@ -195,7 +195,7 @@ public:
     virtual void SAL_CALL disposing();
 
 private:
-    void    implClearGraphics( sal_Bool _bForce );
+    void	implClearGraphics( sal_Bool _bForce );
     bool    implInsertGraphics();
 
     /** determines whether the control does currently have an empty grahic set
@@ -204,7 +204,7 @@ private:
 };
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 #endif // _FRM_IMAGE_CONTROL_HXX_
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 3be8f97f112b..c8d0c722ccc6 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx
index cd1302c35fcc..a46442ec54b6 100644
--- a/forms/source/component/ListBox.hxx
+++ b/forms/source/component/ListBox.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,20 +76,20 @@ class OListBoxModel :public OBoundControlModel
     ::connectivity::ORowSetValue                m_aSaveValue;
 
     // <properties>
-    ::com::sun::star::form::ListSourceType      m_eListSourceType;      // type der list source
-    ::com::sun::star::uno::Any                  m_aBoundColumn;
+    ::com::sun::star::form::ListSourceType		m_eListSourceType;		// type der list source
+    ::com::sun::star::uno::Any					m_aBoundColumn;
     ValueList                                   m_aListSourceValues;
     ValueList                                   m_aBoundValues;
-    ::com::sun::star::uno::Sequence<sal_Int16>  m_aDefaultSelectSeq;    // DefaultSelected
+    ::com::sun::star::uno::Sequence<sal_Int16>	m_aDefaultSelectSeq;	// DefaultSelected
     // </properties>
 
-    sal_Int16                                   m_nNULLPos;             // position of the NULL value in our list
+    sal_Int16				                    m_nNULLPos;             // position of the NULL value in our list
     sal_Int32                                   m_nBoundColumnType;
 
 private:
     ::connectivity::ORowSetValue getFirstSelectedValue() const;
 
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type>   _getTypes();
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type>	_getTypes();
 
 public:
     DECLARE_DEFAULT_LEAF_XTOR( OListBoxModel );
@@ -118,7 +118,7 @@ protected:
     virtual void SAL_CALL   setPropertyValues(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     // XPersistObject
-    virtual ::rtl::OUString SAL_CALL    getServiceName() throw(::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL	getServiceName() throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL
         write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL
@@ -154,8 +154,8 @@ protected:
                             translateControlValueToExternalValue( ) const;
     virtual sal_Bool        commitControlValueToDbColumn( bool _bPostReset );
 
-    virtual void            onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm );
-    virtual void            onDisconnectedDbColumn();
+    virtual void		    onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm );
+    virtual void		    onDisconnectedDbColumn();
 
     virtual ::com::sun::star::uno::Any
                             getDefaultForReset() const;
@@ -197,7 +197,7 @@ typedef ::cppu::ImplHelper4 <   ::com::sun::star::awt::XFocusListener
 
 class ChangeListeners;
 
-class OListBoxControl   :public OBoundControl
+class OListBoxControl	:public OBoundControl
                         ,public OListBoxControl_BASE
                         ,public IEventProcessor
 {
@@ -205,8 +205,8 @@ private:
     ::cppu::OInterfaceContainerHelper       m_aChangeListeners;
     ::cppu::OInterfaceContainerHelper       m_aItemListeners;
 
-    ::com::sun::star::uno::Any              m_aCurrentSelection;
-    Timer                                   m_aChangeTimer;
+    ::com::sun::star::uno::Any				m_aCurrentSelection;
+    Timer									m_aChangeTimer;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XListBox >
                                             m_xAggregateListBox;
@@ -216,7 +216,7 @@ private:
 
 protected:
     // UNO Anbindung
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type>   _getTypes();
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type>	_getTypes();
 
 public:
     OListBoxControl(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory);
diff --git a/forms/source/component/Numeric.cxx b/forms/source/component/Numeric.cxx
index b722c8058f4d..5dc45da96f9d 100644
--- a/forms/source/component/Numeric.cxx
+++ b/forms/source/component/Numeric.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -155,15 +155,15 @@ StringSequence ONumericModel::getSupportedServiceNames() throw()
 void ONumericModel::describeFixedProperties( Sequence< Property >& _rProps ) const
 {
     BEGIN_DESCRIBE_PROPERTIES( 2, OEditBaseModel )
-        DECL_PROP3(DEFAULT_VALUE,   double,             BOUND, MAYBEDEFAULT, MAYBEVOID);
-        DECL_PROP1(TABINDEX,        sal_Int16,          BOUND);
+        DECL_PROP3(DEFAULT_VALUE,	double,				BOUND, MAYBEDEFAULT, MAYBEVOID);
+        DECL_PROP1(TABINDEX,		sal_Int16,			BOUND);
     END_DESCRIBE_PROPERTIES();
 }
 
 //------------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL ONumericModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
 {
-    return FRM_COMPONENT_NUMERICFIELD;  // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_NUMERICFIELD;	// old (non-sun) name for compatibility !
 }
 
 //------------------------------------------------------------------------------
@@ -218,7 +218,7 @@ void ONumericModel::resetNoBroadcast()
 }
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Numeric.hxx b/forms/source/component/Numeric.hxx
index 7cef3c7ef5bb..f87cf90081b7 100644
--- a/forms/source/component/Numeric.hxx
+++ b/forms/source/component/Numeric.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class ONumericModel
                 :public OEditBaseModel
 {
 private:
-    ::com::sun::star::uno::Any          m_aSaveValue;
+    ::com::sun::star::uno::Any			m_aSaveValue;
 protected:
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes();
 
@@ -93,7 +93,7 @@ public:
 };
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 #endif // _FORMS_NUMERIC_HXX_
diff --git a/forms/source/component/Pattern.cxx b/forms/source/component/Pattern.cxx
index 1600af87649d..b600553db60f 100644
--- a/forms/source/component/Pattern.cxx
+++ b/forms/source/component/Pattern.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/component/Pattern.hxx b/forms/source/component/Pattern.hxx
index 9460bb42fa4e..d4d09a3387aa 100644
--- a/forms/source/component/Pattern.hxx
+++ b/forms/source/component/Pattern.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx
index abf2e33ae11b..4afd4741cea1 100644
--- a/forms/source/component/RadioButton.cxx
+++ b/forms/source/component/RadioButton.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ InterfaceRef SAL_CALL ORadioButtonControl_CreateInstance(const Reference<XMultiS
 }
 
 //------------------------------------------------------------------------------
-StringSequence SAL_CALL ORadioButtonControl::getSupportedServiceNames() throw(RuntimeException)
+StringSequence SAL_CALL	ORadioButtonControl::getSupportedServiceNames() throw(RuntimeException)
 {
     StringSequence aSupported = OBoundControl::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 1);
@@ -87,9 +87,9 @@ void SAL_CALL ORadioButtonControl::createPeer(const Reference<starawt::XToolkit>
 
     // switch off the auto-toggle, we do this ourself ....
     // (formerly this switch-off was done in the toolkit - but the correct place is here ...)
-//  Reference< XVclWindowPeer >  xVclWindowPeer( getPeer(), UNO_QUERY );
-//  if (xVclWindowPeer.is())
-//      xVclWindowPeer->setProperty(::rtl::OUString::createFromAscii("AutoToggle"), ::cppu::bool2any(sal_False));
+//	Reference< XVclWindowPeer >  xVclWindowPeer( getPeer(), UNO_QUERY );
+//	if (xVclWindowPeer.is())
+//		xVclWindowPeer->setProperty(::rtl::OUString::createFromAscii("AutoToggle"), ::cppu::bool2any(sal_False));
     // new order: do _not_ switch off the auto toggle because:
     // * today, it is not necessary anymore to handle the toggling ourself (everything works fine without it)
     // * without auto toggle, the AccessibleEvents as fired by the radio buttons are
@@ -141,7 +141,7 @@ IMPLEMENT_DEFAULT_CLONING( ORadioButtonModel )
 
 // XServiceInfo
 //------------------------------------------------------------------------------
-StringSequence SAL_CALL ORadioButtonModel::getSupportedServiceNames() throw(RuntimeException)
+StringSequence SAL_CALL	ORadioButtonModel::getSupportedServiceNames() throw(RuntimeException)
 {
     StringSequence aSupported = OReferenceValueComponent::getSupportedServiceNames();
 
@@ -179,15 +179,15 @@ void ORadioButtonModel::SetSiblingPropsTo(const ::rtl::OUString& rPropName, cons
     {
         Reference<XPropertySet> xMyProps;
         query_interface(static_cast<XWeak*>(this), xMyProps);
-        ::rtl::OUString sCurrentGroup;
+        ::rtl::OUString	sCurrentGroup;
         sal_Int32 nNumSiblings = xIndexAccess->getCount();
         for (sal_Int32 i=0; i<nNumSiblings; ++i)
         {
-            Reference<XPropertySet> xSiblingProperties(*(InterfaceRef*)xIndexAccess->getByIndex(i).getValue(), UNO_QUERY);
+            Reference<XPropertySet>	xSiblingProperties(*(InterfaceRef*)xIndexAccess->getByIndex(i).getValue(), UNO_QUERY);
             if (!xSiblingProperties.is())
                 continue;
             if (xMyProps == xSiblingProperties)
-                continue;   // mich selber nicht umsetzen
+                continue;	// mich selber nicht umsetzen
 
             // nur wenn es ein Radio-Button ist
             if (!hasProperty(PROPERTY_CLASSID, xSiblingProperties))
@@ -212,13 +212,13 @@ void ORadioButtonModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, cons
 
     // if the label control changed ...
     if (nHandle == PROPERTY_ID_CONTROLLABEL)
-    {   // ... forward this to our siblings
+    {	// ... forward this to our siblings
         SetSiblingPropsTo(PROPERTY_CONTROLLABEL, rValue);
     }
 
     // wenn sich die ControlSource-Eigenschaft geaendert hat ...
     if (nHandle == PROPERTY_ID_CONTROLSOURCE)
-    {   // ... muss ich allen meinen Siblings, die in der selben RadioButton-Gruppe sind wie ich, auch die
+    {	// ... muss ich allen meinen Siblings, die in der selben RadioButton-Gruppe sind wie ich, auch die
         // neue ControlSource mitgeben
         SetSiblingPropsTo(PROPERTY_CONTROLSOURCE, rValue);
     }
@@ -234,7 +234,7 @@ void ORadioButtonModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, cons
         sal_Int16 nValue;
         rValue >>= nValue;
         if (1 == nValue)
-        {   // bei allen Radios der selben Gruppe das 'default checked' ruecksetzen, denn wie schon der highlander wusste :
+        {	// bei allen Radios der selben Gruppe das 'default checked' ruecksetzen, denn wie schon der highlander wusste :
             // es kann nur einen geben.
             Any aZero;
             nValue = 0;
@@ -259,7 +259,7 @@ void ORadioButtonModel::setControlSource()
         query_interface(static_cast<XWeak*>(this), xMyProps);
         for (sal_Int32 i=0; i<xIndexAccess->getCount(); ++i)
         {
-            Reference<XPropertySet> xSiblingProperties(*(InterfaceRef*)xIndexAccess->getByIndex(i).getValue(), UNO_QUERY);
+            Reference<XPropertySet>	xSiblingProperties(*(InterfaceRef*)xIndexAccess->getByIndex(i).getValue(), UNO_QUERY);
             if (!xSiblingProperties.is())
                 continue;
 
@@ -294,14 +294,14 @@ void ORadioButtonModel::setControlSource()
 void ORadioButtonModel::describeFixedProperties( Sequence< Property >& _rProps ) const
 {
     BEGIN_DESCRIBE_PROPERTIES( 1, OReferenceValueComponent )
-        DECL_PROP1(TABINDEX,            sal_Int16,                  BOUND);
+        DECL_PROP1(TABINDEX,			sal_Int16,					BOUND);
     END_DESCRIBE_PROPERTIES();
 }
 
 //------------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL ORadioButtonModel::getServiceName() throw(RuntimeException)
 {
-    return FRM_COMPONENT_RADIOBUTTON;   // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_RADIOBUTTON;	// old (non-sun) name for compatibility !
 }
 
 //------------------------------------------------------------------------------
diff --git a/forms/source/component/RadioButton.hxx b/forms/source/component/RadioButton.hxx
index 0ffd8a2ba9b5..d562152ed067 100644
--- a/forms/source/component/RadioButton.hxx
+++ b/forms/source/component/RadioButton.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,21 +38,21 @@ namespace frm
 //==================================================================
 // ORadioButtonModel
 //==================================================================
-class ORadioButtonModel     :public OReferenceValueComponent
+class ORadioButtonModel		:public OReferenceValueComponent
 {
 public:
     DECLARE_DEFAULT_LEAF_XTOR( ORadioButtonModel );
 
     // XServiceInfo
     IMPLEMENTATION_NAME(ORadioButtonModel);
-    virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
+    virtual StringSequence SAL_CALL	getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
 
     // OPropertySetHelper
     virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue )
                 throw (::com::sun::star::uno::Exception);
 
     // XPersistObject
-    virtual ::rtl::OUString SAL_CALL    getServiceName() throw(::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL	getServiceName() throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL
         write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL
@@ -99,7 +99,7 @@ public:
 
     // XServiceInfo
     IMPLEMENTATION_NAME(ORadioButtonControl);
-    virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
+    virtual StringSequence SAL_CALL	getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
 
 protected:
     // XControl
diff --git a/forms/source/component/Time.cxx b/forms/source/component/Time.cxx
index 0f0bb6336b33..5918dd201dcc 100644
--- a/forms/source/component/Time.cxx
+++ b/forms/source/component/Time.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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::io;
 using namespace ::com::sun::star::lang;
 
 //==================================================================
-//=
+//= 
 //==================================================================
 
 //==================================================================
@@ -169,7 +169,7 @@ IMPLEMENT_DEFAULT_CLONING( OTimeModel )
 //------------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OTimeModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
 {
-    return FRM_COMPONENT_TIMEFIELD; // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_TIMEFIELD;	// old (non-sun) name for compatibility !
 }
 
 // XPropertySet
@@ -177,10 +177,10 @@ IMPLEMENT_DEFAULT_CLONING( OTimeModel )
 void OTimeModel::describeFixedProperties( Sequence< Property >& _rProps ) const
 {
     BEGIN_DESCRIBE_PROPERTIES( 4, OEditBaseModel )
-        DECL_PROP3(DEFAULT_TIME,            sal_Int32,              BOUND, MAYBEDEFAULT, MAYBEVOID);
-        DECL_PROP1(TABINDEX,                sal_Int16,              BOUND);
-        DECL_PROP1(FORMATKEY,               sal_Int32,              TRANSIENT);
-        DECL_IFACE_PROP2(FORMATSSUPPLIER,   XNumberFormatsSupplier, READONLY, TRANSIENT);
+        DECL_PROP3(DEFAULT_TIME,			sal_Int32,				BOUND, MAYBEDEFAULT, MAYBEVOID);
+        DECL_PROP1(TABINDEX,				sal_Int16,				BOUND);
+        DECL_PROP1(FORMATKEY,				sal_Int32,				TRANSIENT);
+        DECL_IFACE_PROP2(FORMATSSUPPLIER,	XNumberFormatsSupplier,	READONLY, TRANSIENT);
     END_DESCRIBE_PROPERTIES();
 }
 
@@ -361,7 +361,7 @@ Sequence< Type > OTimeModel::getSupportedBindingTypes()
 }
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Time.hxx b/forms/source/component/Time.hxx
index 60aadc6e5e26..5d6a8a66e59e 100644
--- a/forms/source/component/Time.hxx
+++ b/forms/source/component/Time.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class OTimeModel
                 ,public OLimitedFormats
 {
 private:
-    ::com::sun::star::uno::Any      m_aSaveValue;
-    sal_Bool                        m_bDateTimeField;
+    ::com::sun::star::uno::Any		m_aSaveValue;
+    sal_Bool			            m_bDateTimeField;
 
 protected:
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes();
@@ -96,7 +96,7 @@ protected:
                             getDefaultForReset() const;
     virtual void            resetNoBroadcast();
 
-    virtual void            onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm );
+    virtual void		    onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm );
 
 protected:
     DECLARE_XCLONEABLE();
@@ -127,7 +127,7 @@ public:
 };
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 #endif // _FORMS_TIME_HXX_
diff --git a/forms/source/component/cachedrowset.cxx b/forms/source/component/cachedrowset.cxx
index ac277e8310ec..8d4bc6b9ef0a 100644
--- a/forms/source/component/cachedrowset.cxx
+++ b/forms/source/component/cachedrowset.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/component/cachedrowset.hxx b/forms/source/component/cachedrowset.hxx
index 6c0ebc645367..09f3250910d9 100644
--- a/forms/source/component/cachedrowset.hxx
+++ b/forms/source/component/cachedrowset.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index 2c62e7960f69..b08d9190fa9a 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include <comphelper/container.hxx>
 #include <comphelper/listenernotification.hxx>
 #include <svtools/imageresourceaccess.hxx>
-#define LOCAL_URL_PREFIX    '#'
+#define LOCAL_URL_PREFIX	'#'
 
 //.........................................................................
 namespace frm
@@ -138,7 +138,7 @@ namespace frm
     {
         m_pFeatureInterception->registerDispatchProviderInterceptor( _rxInterceptor  );
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL OClickableImageBaseControl::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException)
     {
@@ -282,7 +282,7 @@ namespace frm
                     getString(xSet->getPropertyValue(PROPERTY_TARGET_URL));
 
                 if (aURL.Complete.getLength() && (LOCAL_URL_PREFIX == aURL.Complete.getStr()[0]))
-                {   // the URL contains a local URL only. Since the URLTransformer does not handle this case correctly
+                {	// the URL contains a local URL only. Since the URLTransformer does not handle this case correctly
                     // (it can't: it does not know the document URL), we have to take care for this ourself.
                     // The real solution would be to not allow such relative URLs (there is a rule that at runtime, all
                     // URLs have to be absolute), but for compatibility reasons this is no option.
@@ -489,10 +489,10 @@ namespace frm
         implConstruct();
 
         // copy properties
-        m_eButtonType           = _pOriginal->m_eButtonType;
-        m_sTargetURL            = _pOriginal->m_sTargetURL;
-        m_sTargetFrame          = _pOriginal->m_sTargetFrame;
-        m_bDispatchUrlInternal  = _pOriginal->m_bDispatchUrlInternal;
+        m_eButtonType			= _pOriginal->m_eButtonType;
+        m_sTargetURL			= _pOriginal->m_sTargetURL;
+        m_sTargetFrame			= _pOriginal->m_sTargetFrame;
+        m_bDispatchUrlInternal	= _pOriginal->m_bDispatchUrlInternal;
     }
 
     //------------------------------------------------------------------------------
@@ -624,10 +624,10 @@ namespace frm
     {
         switch (nHandle)
         {
-            case PROPERTY_ID_BUTTONTYPE             : rValue <<= m_eButtonType; break;
-            case PROPERTY_ID_TARGET_URL             : rValue <<= m_sTargetURL; break;
-            case PROPERTY_ID_TARGET_FRAME           : rValue <<= m_sTargetFrame; break;
-            case PROPERTY_ID_DISPATCHURLINTERNAL    : rValue <<= m_bDispatchUrlInternal; break;
+            case PROPERTY_ID_BUTTONTYPE				: rValue <<= m_eButtonType; break;
+            case PROPERTY_ID_TARGET_URL				: rValue <<= m_sTargetURL; break;
+            case PROPERTY_ID_TARGET_FRAME			: rValue <<= m_sTargetFrame; break;
+            case PROPERTY_ID_DISPATCHURLINTERNAL	: rValue <<= m_bDispatchUrlInternal; break;
             default:
                 OControlModel::getFastPropertyValue(rValue, nHandle);
         }
@@ -692,12 +692,12 @@ namespace frm
         ImageProducer *pImgProd = GetImageProducer();
         // grab the ImageURL
         rtl::OUString sURL;
-        getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ) ) >>= sURL;
+        getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ) ) >>= sURL;       
         if (!m_pMedium)
         {
             if ( ::svt::GraphicAccess::isSupportedURL( sURL )  )
                 pImgProd->SetImage( sURL );
-            else
+            else 
                 // caution: the medium may be NULL if somebody gave us a invalid URL to work with
                 // 11/24/2000 - 79667 - FS
                 pImgProd->SetImage(String());
@@ -739,7 +739,7 @@ namespace frm
             // we treat an invalid URL like we would treat no URL
             return;
 
-        if (rURL.getLength() && !::svt::GraphicAccess::isSupportedURL( rURL ) )
+        if (rURL.getLength() && !::svt::GraphicAccess::isSupportedURL( rURL ) ) 
        {
             if (m_pMedium)
                 delete m_pMedium;
@@ -897,10 +897,10 @@ namespace frm
     {
         switch (nHandle)
         {
-            case PROPERTY_ID_BUTTONTYPE             : return makeAny( FormButtonType_PUSH );
-            case PROPERTY_ID_TARGET_URL             :
-            case PROPERTY_ID_TARGET_FRAME           : return makeAny( ::rtl::OUString() );
-            case PROPERTY_ID_DISPATCHURLINTERNAL    : return makeAny( sal_False );
+            case PROPERTY_ID_BUTTONTYPE				: return makeAny( FormButtonType_PUSH );
+            case PROPERTY_ID_TARGET_URL				:
+            case PROPERTY_ID_TARGET_FRAME			: return makeAny( ::rtl::OUString() );
+            case PROPERTY_ID_DISPATCHURLINTERNAL	: return makeAny( sal_False );
             default:
                 return OControlModel::getPropertyDefaultByHandle(nHandle);
         }
diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx
index 816a2aeb827d..9091d8b23765 100644
--- a/forms/source/component/clickableimage.hxx
+++ b/forms/source/component/clickableimage.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,17 +67,17 @@ namespace frm
                                     ,public OPropertyChangeListener
     {
     protected:
-        ::com::sun::star::form::FormButtonType  m_eButtonType;      // Art des Buttons (push,submit,reset)
-        ::rtl::OUString                         m_sTargetURL;       // URL fuer den URL-Button
-        ::rtl::OUString                         m_sTargetFrame;     // TargetFrame zum Oeffnen
+        ::com::sun::star::form::FormButtonType	m_eButtonType;		// Art des Buttons (push,submit,reset)
+        ::rtl::OUString							m_sTargetURL;		// URL fuer den URL-Button
+        ::rtl::OUString							m_sTargetFrame;		// TargetFrame zum Oeffnen
 
         // ImageProducer stuff
-        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageProducer>    m_xProducer;
-        SfxMedium*                              m_pMedium;          // Download-Medium
-        ImageProducer*                          m_pProducer;
-        sal_Bool                                m_bDispatchUrlInternal; // property: is not allowed to set : 1
-        sal_Bool                                m_bDownloading : 1; // laeuft ein Download?
-        sal_Bool                                m_bProdStarted : 1;
+        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageProducer>  	m_xProducer;
+        SfxMedium*								m_pMedium;			// Download-Medium
+        ImageProducer*							m_pProducer;
+        sal_Bool								m_bDispatchUrlInternal; // property: is not allowed to set : 1
+        sal_Bool								m_bDownloading : 1;	// laeuft ein Download?
+        sal_Bool 								m_bProdStarted : 1;
 
         // XSubmission stuff
         ::com::sun::star::uno::Reference< ::com::sun::star::form::submission::XSubmission >
@@ -96,7 +96,7 @@ namespace frm
 
         ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes();
         inline sal_Bool isDispatchUrlInternal() const { return m_bDispatchUrlInternal; }
-        inline void     setDispatchUrlInternal(sal_Bool _bDispatch) { m_bDispatchUrlInternal = _bDispatch; }
+        inline void		setDispatchUrlInternal(sal_Bool _bDispatch) { m_bDispatchUrlInternal = _bDispatch; }
 
     public:
         DECLARE_DEFAULT_XTOR( OClickableImageBaseModel );
@@ -289,7 +289,7 @@ namespace frm
     };
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 #endif // FORMS_SOURCE_CLICKABLEIMAGE_HXX
diff --git a/forms/source/component/cloneable.cxx b/forms/source/component/cloneable.cxx
index 368c3b701d02..8b876f6319ab 100644
--- a/forms/source/component/cloneable.cxx
+++ b/forms/source/component/cloneable.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace frm
     //------------------------------------------------------------------
     Reference< XAggregation > OCloneableAggregation::createAggregateClone( const OCloneableAggregation* _pOriginal )
     {
-        Reference< XCloneable > xAggregateCloneable;    // will be the aggregate's XCloneable
-        Reference< XAggregation > xAggregateClone;      // will be the aggregate's clone
+        Reference< XCloneable > xAggregateCloneable;	// will be the aggregate's XCloneable
+        Reference< XAggregation > xAggregateClone;		// will be the aggregate's clone
 
         if ( query_aggregation( _pOriginal->m_xAggregate, xAggregateCloneable ) )
         {
@@ -64,7 +64,7 @@ namespace frm
     }
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/entrylisthelper.cxx b/forms/source/component/entrylisthelper.cxx
index c894f3fce150..1d24c68674a2 100644
--- a/forms/source/component/entrylisthelper.cxx
+++ b/forms/source/component/entrylisthelper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/component/entrylisthelper.hxx b/forms/source/component/entrylisthelper.hxx
index 64f99feb740f..1713ffe24660 100644
--- a/forms/source/component/entrylisthelper.hxx
+++ b/forms/source/component/entrylisthelper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 frm
     typedef ::cppu::ImplHelper3 <      ::com::sun::star::form::binding::XListEntrySink
                                 ,   ::com::sun::star::form::binding::XListEntryListener
                                 ,   ::com::sun::star::util::XRefreshable
-                                >   OEntryListHelper_BASE;
+                                >	OEntryListHelper_BASE;
 
     class OEntryListHelper : public OEntryListHelper_BASE
     {
diff --git a/forms/source/component/errorbroadcaster.cxx b/forms/source/component/errorbroadcaster.cxx
index 40d1afd06c22..575a65d461eb 100644
--- a/forms/source/component/errorbroadcaster.cxx
+++ b/forms/source/component/errorbroadcaster.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace frm
     }
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/errorbroadcaster.hxx b/forms/source/component/errorbroadcaster.hxx
index 86e96c1fce7e..38a808322ae0 100644
--- a/forms/source/component/errorbroadcaster.hxx
+++ b/forms/source/component/errorbroadcaster.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace frm
     //=====================================================================
     //= OErrorBroadcaster
     //=====================================================================
-    typedef ::cppu::ImplHelper1 <   ::com::sun::star::sdb::XSQLErrorBroadcaster
-                                >   OErrorBroadcaster_BASE;
+    typedef ::cppu::ImplHelper1	<	::com::sun::star::sdb::XSQLErrorBroadcaster
+                                >	OErrorBroadcaster_BASE;
 
     class OErrorBroadcaster : public OErrorBroadcaster_BASE
     {
     private:
-        ::cppu::OBroadcastHelper&           m_rBHelper;
-        ::cppu::OInterfaceContainerHelper   m_aErrorListeners;
+        ::cppu::OBroadcastHelper&			m_rBHelper;
+        ::cppu::OInterfaceContainerHelper	m_aErrorListeners;
 
     protected:
         OErrorBroadcaster( ::cppu::OBroadcastHelper& _rBHelper );
@@ -68,7 +68,7 @@ namespace frm
     };
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 #endif // FORMS_ERRORBROADCASTER_HXX
diff --git a/forms/source/component/findpos.cxx b/forms/source/component/findpos.cxx
index 86c07c080113..40732f806e97 100644
--- a/forms/source/component/findpos.cxx
+++ b/forms/source/component/findpos.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/component/findpos.hxx b/forms/source/component/findpos.hxx
index 28d33311ae9b..1a583a909026 100644
--- a/forms/source/component/findpos.hxx
+++ b/forms/source/component/findpos.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/component/formcontrolfont.cxx b/forms/source/component/formcontrolfont.cxx
index f1488c85846a..518b48e76f4a 100644
--- a/forms/source/component/formcontrolfont.cxx
+++ b/forms/source/component/formcontrolfont.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx
index ceeeccaffa79..d168678dadd6 100644
--- a/forms/source/component/imgprod.cxx
+++ b/forms/source/component/imgprod.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,8 +47,8 @@
 
 class ImgProdLockBytes : public SvLockBytes
 {
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >      xStmRef;
-    ::com::sun::star::uno::Sequence<sal_Int8>       maSeq;
+    ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > 		xStmRef;
+    ::com::sun::star::uno::Sequence<sal_Int8>		maSeq;
 
                         ImgProdLockBytes() {};
 
@@ -56,13 +56,13 @@ public:
 
                         ImgProdLockBytes( SvStream* pStm, sal_Bool bOwner );
                         ImgProdLockBytes( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > & rStreamRef );
-    virtual             ~ImgProdLockBytes();
+    virtual				~ImgProdLockBytes();
 
-    virtual ErrCode     ReadAt( sal_Size nPos, void* pBuffer, sal_Size nCount, sal_Size* pRead ) const;
-    virtual ErrCode     WriteAt( sal_Size nPos, const void* pBuffer, sal_Size nCount, sal_Size* pWritten );
-    virtual ErrCode     Flush() const;
-    virtual ErrCode     SetSize( sal_Size nSize );
-    virtual ErrCode     Stat( SvLockBytesStat*, SvLockBytesStatFlag ) const;
+    virtual ErrCode		ReadAt( sal_Size nPos, void* pBuffer, sal_Size nCount, sal_Size* pRead ) const;
+    virtual ErrCode		WriteAt( sal_Size nPos, const void* pBuffer, sal_Size nCount, sal_Size* pWritten );
+    virtual ErrCode		Flush() const;
+    virtual ErrCode		SetSize( sal_Size nSize );
+    virtual ErrCode		Stat( SvLockBytesStat*, SvLockBytesStatFlag ) const;
 };
 
 // ------------------------------------------------------------------------
@@ -79,13 +79,13 @@ ImgProdLockBytes::ImgProdLockBytes( ::com::sun::star::uno::Reference< ::com::sun
 {
     if( xStmRef.is() )
     {
-        const sal_uInt32    nBytesToRead = 65535;
-        sal_uInt32          nRead;
+        const sal_uInt32	nBytesToRead = 65535;
+        sal_uInt32			nRead;
 
         do
         {
             ::com::sun::star::uno::Sequence< sal_Int8 > aReadSeq;
-
+            
             nRead = xStmRef->readSomeBytes( aReadSeq, nBytesToRead );
 
             if( nRead )
@@ -188,8 +188,8 @@ ErrCode ImgProdLockBytes::Stat( SvLockBytesStat* pStat, SvLockBytesStatFlag eFla
 // -----------------
 
 ImageProducer::ImageProducer() :
-    mpStm       ( NULL ),
-    mbConsInit  ( sal_False )
+    mpStm		( NULL ),
+    mbConsInit	( sal_False )
 {
     mpGraphic = new Graphic;
     DBG_ASSERT( Application::GetFilterHdl().IsSet(), "ImageProducer::ImageProducer(): No filter handler set" );
@@ -333,8 +333,8 @@ void ImageProducer::startProduction() throw(::com::sun::star::uno::RuntimeExcept
         if ( bNotifyEmptyGraphics )
         {
             // reset image
-            List    aTmp;
-            void*   pCons;
+            List	aTmp;
+            void*	pCons;
 
             // create temporary list to hold interfaces
             for( pCons = maConsList.First(); pCons; pCons = maConsList.Next() )
@@ -382,8 +382,8 @@ void ImageProducer::ImplUpdateData( const Graphic& rGraphic )
 
     if( mbConsInit && maConsList.Count() )
     {
-        List    aTmp;
-        void*   pCons;
+        List	aTmp;
+        void*	pCons;
 
         ImplUpdateConsumer( rGraphic );
         mbConsInit = sal_False;
@@ -406,10 +406,10 @@ void ImageProducer::ImplUpdateData( const Graphic& rGraphic )
 
 void ImageProducer::ImplInitConsumer( const Graphic& rGraphic )
 {
-    Bitmap              aBmp( rGraphic.GetBitmapEx().GetBitmap() );
-    BitmapReadAccess*   pBmpAcc = aBmp.AcquireReadAccess();
+    Bitmap				aBmp( rGraphic.GetBitmapEx().GetBitmap() );
+    BitmapReadAccess*	pBmpAcc = aBmp.AcquireReadAccess();
 
-    if( pBmpAcc )
+    if(	pBmpAcc )
     {
         List             aTmp;
         void *           pCons;
@@ -418,7 +418,7 @@ void ImageProducer::ImplInitConsumer( const Graphic& rGraphic )
         sal_uInt32       nGMask = 0;
         sal_uInt32       nBMask = 0;
         sal_uInt32       nAMask = 0;
-        ::com::sun::star::uno::Sequence< sal_Int32 >    aRGBPal;
+        ::com::sun::star::uno::Sequence< sal_Int32 >	aRGBPal;
 
         if( pBmpAcc->HasPalette() )
         {
@@ -427,7 +427,7 @@ void ImageProducer::ImplInitConsumer( const Graphic& rGraphic )
             if( nPalCount )
             {
                 aRGBPal = ::com::sun::star::uno::Sequence< sal_Int32 >( nPalCount + 1 );
-
+                
                 sal_Int32* pTmp = aRGBPal.getArray();
 
                 for( sal_uInt32 i = 0; i < nPalCount; i++, pTmp++ )
@@ -485,24 +485,24 @@ void ImageProducer::ImplInitConsumer( const Graphic& rGraphic )
 
 void ImageProducer::ImplUpdateConsumer( const Graphic& rGraphic )
 {
-    BitmapEx            aBmpEx( rGraphic.GetBitmapEx() );
-    Bitmap              aBmp( aBmpEx.GetBitmap() );
-    BitmapReadAccess*   pBmpAcc = aBmp.AcquireReadAccess();
+    BitmapEx			aBmpEx( rGraphic.GetBitmapEx() );
+    Bitmap				aBmp( aBmpEx.GetBitmap() );
+    BitmapReadAccess*	pBmpAcc = aBmp.AcquireReadAccess();
 
     if( pBmpAcc )
     {
-        List                aTmp;
-        void*               pCons;
-        Bitmap              aMask( aBmpEx.GetMask() );
-        BitmapReadAccess*   pMskAcc = !!aMask ? aMask.AcquireReadAccess() : NULL;
-        const long          nWidth = pBmpAcc->Width();
-        const long          nHeight = pBmpAcc->Height();
-        const long          nStartX = 0L;
-        const long          nEndX = nWidth - 1L;
-        const long          nStartY = 0L;
-        const long          nEndY = nHeight - 1L;
-        const long          nPartWidth = nEndX - nStartX + 1;
-        const long          nPartHeight = nEndY - nStartY + 1;
+        List				aTmp;
+        void*				pCons;
+        Bitmap				aMask( aBmpEx.GetMask() );
+        BitmapReadAccess*	pMskAcc = !!aMask ? aMask.AcquireReadAccess() : NULL;
+        const long			nWidth = pBmpAcc->Width();
+        const long			nHeight = pBmpAcc->Height();
+        const long			nStartX = 0L;
+        const long			nEndX = nWidth - 1L;
+        const long			nStartY = 0L;
+        const long			nEndY = nHeight - 1L;
+        const long			nPartWidth = nEndX - nStartX + 1;
+        const long			nPartHeight = nEndY - nStartY + 1;
 
         if( !pMskAcc )
         {
@@ -521,8 +521,8 @@ void ImageProducer::ImplUpdateConsumer( const Graphic& rGraphic )
 
             if( mnTransIndex < 256 )
             {
-                ::com::sun::star::uno::Sequence<sal_Int8>   aData( nPartWidth * nPartHeight );
-                sal_Int8*                                   pTmp = aData.getArray();
+                ::com::sun::star::uno::Sequence<sal_Int8>	aData( nPartWidth * nPartHeight );
+                sal_Int8*									pTmp = aData.getArray();
 
                 for( long nY = nStartY; nY <= nEndY; nY++ )
                 {
@@ -543,8 +543,8 @@ void ImageProducer::ImplUpdateConsumer( const Graphic& rGraphic )
             }
             else
             {
-                ::com::sun::star::uno::Sequence<sal_Int32>  aData( nPartWidth * nPartHeight );
-                sal_Int32*                                  pTmp = aData.getArray();
+                ::com::sun::star::uno::Sequence<sal_Int32>	aData( nPartWidth * nPartHeight );
+                sal_Int32*									pTmp = aData.getArray();
 
                 for( long nY = nStartY; nY <= nEndY; nY++ )
                 {
@@ -565,9 +565,9 @@ void ImageProducer::ImplUpdateConsumer( const Graphic& rGraphic )
         }
         else
         {
-            ::com::sun::star::uno::Sequence<sal_Int32>  aData( nPartWidth * nPartHeight );
-            const BitmapColor                           aWhite( pMskAcc->GetBestMatchingColor( Color( COL_WHITE ) ) );
-            sal_Int32*                                  pTmp = aData.getArray();
+            ::com::sun::star::uno::Sequence<sal_Int32> 	aData( nPartWidth * nPartHeight );
+            const BitmapColor							aWhite( pMskAcc->GetBestMatchingColor( Color( COL_WHITE ) ) );
+            sal_Int32*									pTmp = aData.getArray();
 
             for( long nY = nStartY; nY <= nEndY; nY++ )
             {
diff --git a/forms/source/component/imgprod.hxx b/forms/source/component/imgprod.hxx
index ee949ce56575..d6ec50c58f58 100644
--- a/forms/source/component/imgprod.hxx
+++ b/forms/source/component/imgprod.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,45 +55,45 @@ namespace com { namespace sun { namespace star { namespace io {
 }}}}
 
 
-class ImageProducer :   public ::com::sun::star::awt::XImageProducer,
-                        public ::com::sun::star::lang::XInitialization,
+class ImageProducer :	public ::com::sun::star::awt::XImageProducer, 
+                        public ::com::sun::star::lang::XInitialization, 
                         public ::cppu::OWeakObject
 {
 private:
 
-    ::rtl::OUString maURL;
-    List            maConsList;
-    Graphic*        mpGraphic;
-    SvStream*       mpStm;
-    sal_uInt32      mnTransIndex;
-    sal_Bool        mbConsInit;
+    ::rtl::OUString	maURL;
+    List			maConsList;
+    Graphic*		mpGraphic;
+    SvStream*		mpStm;
+    sal_uInt32		mnTransIndex;
+    sal_Bool		mbConsInit;
     Link            maDoneHdl;
 
-    sal_Bool        ImplImportGraphic( Graphic& rGraphic );
-    void            ImplUpdateData( const Graphic& rGraphic );
-    void            ImplInitConsumer( const Graphic& rGraphic );
-    void            ImplUpdateConsumer( const Graphic& rGraphic );
+    sal_Bool		ImplImportGraphic( Graphic& rGraphic );
+    void			ImplUpdateData( const Graphic& rGraphic );
+    void			ImplInitConsumer( const Graphic& rGraphic );
+    void			ImplUpdateConsumer( const Graphic& rGraphic );
 
 public:
 
                     ImageProducer();
                     ~ImageProducer();
 
-    void            SetImage( const ::rtl::OUString& rPath );
-    void            SetImage( SvStream& rStm );
+    void			SetImage( const ::rtl::OUString& rPath );
+    void			SetImage( SvStream& rStm );
 
-    void            NewDataAvailable();
+    void			NewDataAvailable();
 
     void            SetDoneHdl( const Link& i_rHdl ) { maDoneHdl = i_rHdl; }
     const Link&     GetDoneHdl() const { return maDoneHdl; }
 
     // ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::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(); }
-
+    ::com::sun::star::uno::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(); }
+    
     // MT: ???
-    void            setImage( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > & rStmRef );
+    void			setImage( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > & rStmRef );
 
     // ::com::sun::star::awt::XImageProducer
     void SAL_CALL addConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& rxConsumer ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx
index 7799779d4b3f..c0c38b083d0a 100644
--- a/forms/source/component/navigationbar.cxx
+++ b/forms/source/component/navigationbar.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace frm
     IMPLEMENT_DEFAULT_CLONING( ONavigationBarModel )
 
     //------------------------------------------------------------------
-    ::rtl::OUString SAL_CALL ONavigationBarModel::getImplementationName()  throw(RuntimeException)
+    ::rtl::OUString	SAL_CALL ONavigationBarModel::getImplementationName()  throw(RuntimeException)
     {
         return getImplementationName_Static();
     }
@@ -182,7 +182,7 @@ namespace frm
     }
 
     //------------------------------------------------------------------
-    ::rtl::OUString SAL_CALL ONavigationBarModel::getImplementationName_Static()
+    ::rtl::OUString	SAL_CALL ONavigationBarModel::getImplementationName_Static()
     {
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.form.ONavigationBarModel" ) );
     }
diff --git a/forms/source/component/navigationbar.hxx b/forms/source/component/navigationbar.hxx
index e410a13c64f6..4af073777748 100644
--- a/forms/source/component/navigationbar.hxx
+++ b/forms/source/component/navigationbar.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace frm
     //==================================================================
     typedef ::cppu::ImplHelper1 <   ::com::sun::star::awt::XControlModel
                                 > ONavigationBarModel_BASE;
-
+ 
     class ONavigationBarModel
                         :public OControlModel
                         ,public FontControlModel
@@ -81,9 +81,9 @@ namespace frm
         DECLARE_DEFAULT_LEAF_XTOR( ONavigationBarModel );
 
         // XServiceInfo - static version
-        static  ::rtl::OUString SAL_CALL getImplementationName_Static();
-        static  ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static();
-        static  ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory );
+        static	::rtl::OUString	SAL_CALL getImplementationName_Static();
+        static	::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static();
+        static	::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory );
 
     protected:
         // UNO
@@ -91,7 +91,7 @@ namespace frm
         virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException);
 
         // XServiceInfo
-        virtual ::rtl::OUString SAL_CALL getImplementationName()  throw(::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString	SAL_CALL getImplementationName()  throw(::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()  throw(::com::sun::star::uno::RuntimeException);
 
         // XTypeProvider
diff --git a/forms/source/component/propertybaghelper.cxx b/forms/source/component/propertybaghelper.cxx
index 508c05ac5ca1..0d439bad7b11 100644
--- a/forms/source/component/propertybaghelper.cxx
+++ b/forms/source/component/propertybaghelper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/component/refvaluecomponent.cxx b/forms/source/component/refvaluecomponent.cxx
index ab32ff5bcce3..e23b0fc00685 100644
--- a/forms/source/component/refvaluecomponent.cxx
+++ b/forms/source/component/refvaluecomponent.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 frm
     using namespace ::com::sun::star::form::binding;
 
     //====================================================================
-    //=
+    //= 
     //====================================================================
     //--------------------------------------------------------------------
     OReferenceValueComponent::OReferenceValueComponent( const Reference< XMultiServiceFactory>& _rxFactory, const ::rtl::OUString& _rUnoControlModelTypeName, const ::rtl::OUString& _rDefault, sal_Bool _bSupportNoCheckRefValue )
@@ -59,7 +59,7 @@ namespace frm
     }
 
     //--------------------------------------------------------------------
-    OReferenceValueComponent::OReferenceValueComponent( const OReferenceValueComponent* _pOriginal, const   Reference< XMultiServiceFactory>& _rxFactory )
+    OReferenceValueComponent::OReferenceValueComponent( const OReferenceValueComponent* _pOriginal, const	Reference< XMultiServiceFactory>& _rxFactory )
         :OBoundControlModel( _pOriginal, _rxFactory )
     {
         m_sReferenceValue           = _pOriginal->m_sReferenceValue;
@@ -99,7 +99,7 @@ namespace frm
             OBoundControlModel::getFastPropertyValue( _rValue, _nHandle );
         }
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL OReferenceValueComponent::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw (Exception)
     {
@@ -128,7 +128,7 @@ namespace frm
             OBoundControlModel::setFastPropertyValue_NoBroadcast( _nHandle, _rValue );
         }
     }
-
+    
     //--------------------------------------------------------------------
     sal_Bool SAL_CALL OReferenceValueComponent::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw (IllegalArgumentException)
     {
@@ -154,7 +154,7 @@ namespace frm
         }
         return bModified;
     }
-
+    
     //------------------------------------------------------------------------------
     Any OReferenceValueComponent::getDefaultForReset() const
     {
diff --git a/forms/source/component/refvaluecomponent.hxx b/forms/source/component/refvaluecomponent.hxx
index f88fb5e93f41..bb56ba8b4a69 100644
--- a/forms/source/component/refvaluecomponent.hxx
+++ b/forms/source/component/refvaluecomponent.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace frm
         // <properties>
         ::rtl::OUString     m_sReferenceValue;          // the reference value to use for data exchange
         ::rtl::OUString     m_sNoCheckReferenceValue;   // the reference value to be exchanged when the control is not checked
-        ToggleState         m_eDefaultChecked;          // the default check state
+        ToggleState			m_eDefaultChecked;          // the default check state
         // </properties>
 
         sal_Bool            m_bSupportSecondRefValue;       // do we support the SecondaryRefValue property?
diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx
index 98c47b258d51..13c509859407 100644
--- a/forms/source/component/scrollbar.cxx
+++ b/forms/source/component/scrollbar.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 frm
     //= helper
     //====================================================================
     //--------------------------------------------------------------------
-    Any translateExternalDoubleToControlIntValue(
+    Any translateExternalDoubleToControlIntValue( 
         const Any& _rExternalValue, const Reference< XPropertySet >& _rxProperties,
         const ::rtl::OUString& _rMinValueName, const ::rtl::OUString& _rMaxValueName )
     {
@@ -297,7 +297,7 @@ namespace frm
     //--------------------------------------------------------------------
     Any OScrollBarModel::translateExternalValueToControlValue( const Any& _rExternalValue ) const
     {
-        return translateExternalDoubleToControlIntValue( _rExternalValue, m_xAggregateSet,
+        return translateExternalDoubleToControlIntValue( _rExternalValue, m_xAggregateSet, 
             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScrollValueMin" ) ),
             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScrollValueMax" ) ) );
     }
diff --git a/forms/source/component/scrollbar.hxx b/forms/source/component/scrollbar.hxx
index 93a946268a14..a7b4e323fa50 100644
--- a/forms/source/component/scrollbar.hxx
+++ b/forms/source/component/scrollbar.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx
index 06c6d4f63618..9d3232022dc8 100644
--- a/forms/source/component/spinbutton.cxx
+++ b/forms/source/component/spinbutton.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace frm
     //= OSpinButtonModel
     //====================================================================
     // implemented elsewhere
-    Any translateExternalDoubleToControlIntValue(
+    Any translateExternalDoubleToControlIntValue( 
         const Any& _rExternalValue, const Reference< XPropertySet >& _rxProperties,
         const ::rtl::OUString& _rMinValueName, const ::rtl::OUString& _rMaxValueName );
     Any translateControlIntToExternalDoubleValue( const Any& _rControlIntValue );
@@ -253,7 +253,7 @@ namespace frm
     //--------------------------------------------------------------------
     Any OSpinButtonModel::translateExternalValueToControlValue( const Any& _rExternalValue ) const
     {
-        return translateExternalDoubleToControlIntValue( _rExternalValue, m_xAggregateSet,
+        return translateExternalDoubleToControlIntValue( _rExternalValue, m_xAggregateSet, 
             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SpinValueMin" ) ),
             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SpinValueMax" ) ) );
     }
diff --git a/forms/source/component/spinbutton.hxx b/forms/source/component/spinbutton.hxx
index 2b811ab97459..54348e580d44 100644
--- a/forms/source/component/spinbutton.hxx
+++ b/forms/source/component/spinbutton.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/helper/commanddescriptionprovider.cxx b/forms/source/helper/commanddescriptionprovider.cxx
index 292528db1d53..e61810f607ce 100644
--- a/forms/source/helper/commanddescriptionprovider.cxx
+++ b/forms/source/helper/commanddescriptionprovider.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/helper/commandimageprovider.cxx b/forms/source/helper/commandimageprovider.cxx
index c8025bb66f1a..504ead723f40 100644
--- a/forms/source/helper/commandimageprovider.cxx
+++ b/forms/source/helper/commandimageprovider.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/helper/controlfeatureinterception.cxx b/forms/source/helper/controlfeatureinterception.cxx
index 78746c7f4918..0a292e969878 100644
--- a/forms/source/helper/controlfeatureinterception.cxx
+++ b/forms/source/helper/controlfeatureinterception.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace frm
         m_xFirstDispatchInterceptor->setMasterDispatchProvider( NULL );
             // it's the first of the interceptor chain
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL ControlFeatureInterception::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException )
     {
@@ -89,7 +89,7 @@ namespace frm
         Reference< XDispatchProviderInterceptor >  xChainWalk( m_xFirstDispatchInterceptor );
 
         if ( m_xFirstDispatchInterceptor == _rxInterceptor )
-        {   // our chain will have a new first element
+        {	// our chain will have a new first element
             Reference< XDispatchProviderInterceptor >  xSlave( m_xFirstDispatchInterceptor->getSlaveDispatchProvider(), UNO_QUERY );
             m_xFirstDispatchInterceptor = xSlave;
         }
diff --git a/forms/source/helper/formnavigation.cxx b/forms/source/helper/formnavigation.cxx
index 5ac563e63373..7394fcaadec8 100644
--- a/forms/source/helper/formnavigation.cxx
+++ b/forms/source/helper/formnavigation.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace frm
     void OFormNavigationHelper::updateDispatches()
     {
         if ( !m_nConnectedFeatures )
-        {   // we don't have any dispatchers yet -> do the initial connect
+        {	// we don't have any dispatchers yet -> do the initial connect
             connectDispatchers();
             return;
         }
@@ -211,7 +211,7 @@ namespace frm
     void OFormNavigationHelper::connectDispatchers()
     {
         if ( m_nConnectedFeatures )
-        {   // already connected -> just do an update
+        {	// already connected -> just do an update
             updateDispatches();
             return;
         }
@@ -251,7 +251,7 @@ namespace frm
             {
                 if ( aFeature->second.xDispatcher.is() )
                     aFeature->second.xDispatcher->removeStatusListener( static_cast< XStatusListener* >( this ), aFeature->second.aURL );
-
+            
                 aFeature->second.xDispatcher = NULL;
                 aFeature->second.bCachedState = sal_False;
                 aFeature->second.aCachedAdditionalState.clear();
diff --git a/forms/source/helper/resettable.cxx b/forms/source/helper/resettable.cxx
index 4748d74f68df..94380fe7c5a5 100644
--- a/forms/source/helper/resettable.cxx
+++ b/forms/source/helper/resettable.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/helper/urltransformer.cxx b/forms/source/helper/urltransformer.cxx
index 852fd5483ddd..8788fa6bde1f 100644
--- a/forms/source/helper/urltransformer.cxx
+++ b/forms/source/helper/urltransformer.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/helper/windowstateguard.cxx b/forms/source/helper/windowstateguard.cxx
index a35ebd68ff44..f20e9c5caf2b 100644
--- a/forms/source/helper/windowstateguard.cxx
+++ b/forms/source/helper/windowstateguard.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,32 +153,32 @@ namespace frm
         ::osl::MutexGuard aGuard( m_aMutex );
         impl_ensureEnabledState_nothrow();
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL WindowStateGuard_Impl::windowDisabled( const EventObject& /*e*/ ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         impl_ensureEnabledState_nothrow();
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL WindowStateGuard_Impl::windowResized( const WindowEvent& /*e*/ ) throw (RuntimeException)
     {
         // not interested in
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL WindowStateGuard_Impl::windowMoved( const WindowEvent& /*e*/ ) throw (RuntimeException)
     {
         // not interested in
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL WindowStateGuard_Impl::windowShown( const EventObject& /*e*/ ) throw (RuntimeException)
     {
         // not interested in
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL WindowStateGuard_Impl::windowHidden( const EventObject& /*e*/ ) throw (RuntimeException)
     {
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index d9f009ce21ae..a51426d441f6 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace frm
     virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);   \
 
     // old macro for quickly implementing XServiceInfo::getImplementationName
-    #define IMPLEMENTATION_NAME(ImplName)                                       \
+    #define IMPLEMENTATION_NAME(ImplName)										\
     virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException) \
         { return ::rtl::OUString::createFromAscii("com.sun.star.comp.forms.") + ::rtl::OUString::createFromAscii(#ImplName); }
 
@@ -168,17 +168,17 @@ namespace frm
 //= OControl
 //= base class for form layer controls
 //=========================================================================
-typedef ::cppu::ImplHelper3 <   ::com::sun::star::awt::XControl
-                            ,   ::com::sun::star::lang::XEventListener
-                            ,   ::com::sun::star::lang::XServiceInfo
+typedef ::cppu::ImplHelper3	<	::com::sun::star::awt::XControl
+                            ,	::com::sun::star::lang::XEventListener
+                            ,	::com::sun::star::lang::XServiceInfo
                             > OControl_BASE;
 
-class OControl  :public ::cppu::OComponentHelper
+class OControl	:public ::cppu::OComponentHelper
                 ,public OControl_BASE
 {
 protected:
     ::osl::Mutex                                m_aMutex;
-    OImplementationIdsRef                       m_aHoldIdHelper;
+    OImplementationIdsRef						m_aHoldIdHelper;
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >
                                                 m_xControl;
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation>
@@ -232,16 +232,16 @@ protected:
         if you passed <FALSE/> to the <arg>_bSetDelegator</arg> parameter of the
         <type>OControl</type> constructor.
     */
-    void    doSetDelegator();
-    void    doResetDelegator();
+    void	doSetDelegator();
+    void	doResetDelegator();
 
 // UNO
     DECLARE_UNO3_AGG_DEFAULTS(OControl, OComponentHelper);
     virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException);
 
 // XTypeProvider
-    virtual ::com::sun::star::uno::Sequence<sal_Int8>           SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
-    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);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type>	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
 
 // OComponentHelper
     virtual void SAL_CALL disposing();
@@ -258,27 +258,27 @@ protected:
     virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException);
 
 // XServiceInfo
-    virtual sal_Bool SAL_CALL           supportsService(const ::rtl::OUString& ServiceName) throw (::com::sun::star::uno::RuntimeException);
-    virtual StringSequence SAL_CALL     getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL    getImplementationName() throw(::com::sun::star::uno::RuntimeException) = 0;
+    virtual sal_Bool SAL_CALL			supportsService(const ::rtl::OUString& ServiceName) throw (::com::sun::star::uno::RuntimeException);
+    virtual StringSequence SAL_CALL		getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL	getImplementationName() throw(::com::sun::star::uno::RuntimeException) = 0;
 
 // XServiceInfo - static version
-    static  StringSequence SAL_CALL     getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException);
+    static  StringSequence SAL_CALL		getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException);
 
 // XControl
-    virtual void                                        SAL_CALL setContext(const InterfaceRef& Context) throw (::com::sun::star::uno::RuntimeException);
-    virtual InterfaceRef                                SAL_CALL getContext() throw (::com::sun::star::uno::RuntimeException);
-    virtual void                                        SAL_CALL createPeer(const ::com::sun::star::uno::Reference<starawt::XToolkit>& Toolkit, const ::com::sun::star::uno::Reference<starawt::XWindowPeer>& Parent) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Reference<starawt::XWindowPeer>  SAL_CALL getPeer() throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool                                    SAL_CALL setModel(const ::com::sun::star::uno::Reference<starawt::XControlModel>& Model) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Reference<starawt::XControlModel>    SAL_CALL getModel() throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Reference<starawt::XView>            SAL_CALL getView() throw (::com::sun::star::uno::RuntimeException);
-    virtual void                                        SAL_CALL setDesignMode(sal_Bool bOn) throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool                                    SAL_CALL isDesignMode() throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool                                    SAL_CALL isTransparent() throw (::com::sun::star::uno::RuntimeException);
+    virtual void										SAL_CALL setContext(const InterfaceRef& Context) throw (::com::sun::star::uno::RuntimeException);
+    virtual InterfaceRef								SAL_CALL getContext() throw (::com::sun::star::uno::RuntimeException);
+    virtual void										SAL_CALL createPeer(const ::com::sun::star::uno::Reference<starawt::XToolkit>& Toolkit, const ::com::sun::star::uno::Reference<starawt::XWindowPeer>& Parent) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference<starawt::XWindowPeer>	SAL_CALL getPeer() throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool									SAL_CALL setModel(const ::com::sun::star::uno::Reference<starawt::XControlModel>& Model) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference<starawt::XControlModel>	SAL_CALL getModel() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference<starawt::XView>			SAL_CALL getView() throw (::com::sun::star::uno::RuntimeException);
+    virtual void										SAL_CALL setDesignMode(sal_Bool bOn) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool									SAL_CALL isDesignMode() throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool									SAL_CALL isTransparent() throw (::com::sun::star::uno::RuntimeException);
 
 protected:
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type>   _getTypes();
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type>	_getTypes();
         // overwrite this and call the base class if you have additional types
 
     ::com::sun::star::uno::Sequence< ::rtl::OUString > getAggregateServiceNames();
@@ -293,11 +293,11 @@ private:
 //==================================================================
 typedef ::cppu::ImplHelper1 <   ::com::sun::star::form::XBoundControl
                             >  OBoundControl_BASE;
-class OBoundControl :public OControl
+class OBoundControl	:public OControl
                     ,public OBoundControl_BASE
 {
 protected:
-    sal_Bool    m_bLocked : 1;
+    sal_Bool	m_bLocked : 1;
 
     ::rtl::OUString m_sOriginalHelpText;                // as long as the text/value is invalid, we change the help text of our peer
     ::com::sun::star::awt::FontDescriptor
@@ -317,8 +317,8 @@ public:
     virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException);
 
     // XBoundControl
-    virtual sal_Bool SAL_CALL   getLock() throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL       setLock(sal_Bool _bLock) throw(::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL	getLock() throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL		setLock(sal_Bool _bLock) throw(::com::sun::star::uno::RuntimeException);
         // default implementation just disables the controls, overwrite _setLock to change this behaviour
 
     // XControl
@@ -331,9 +331,9 @@ public:
     virtual void SAL_CALL disposing();
 
 protected:
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type>   _getTypes();
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type>	_getTypes();
     // implement the lock setting
-    virtual void         _setLock(sal_Bool _bLock);
+    virtual void		 _setLock(sal_Bool _bLock);
 };
 
 //==================================================================
@@ -341,16 +341,16 @@ protected:
 //= model of a form layer control
 //==================================================================
 
-typedef ::cppu::ImplHelper7 <   ::com::sun::star::form::XFormComponent
-                            ,   ::com::sun::star::io::XPersistObject
-                            ,   ::com::sun::star::container::XNamed
-                            ,   ::com::sun::star::lang::XServiceInfo
-                            ,   ::com::sun::star::util::XCloneable
-                            ,   ::com::sun::star::beans::XPropertyContainer
-                            ,   ::com::sun::star::beans::XPropertyAccess
-                            >   OControlModel_BASE;
+typedef ::cppu::ImplHelper7	<	::com::sun::star::form::XFormComponent
+                            ,	::com::sun::star::io::XPersistObject
+                            ,	::com::sun::star::container::XNamed
+                            ,	::com::sun::star::lang::XServiceInfo
+                            ,	::com::sun::star::util::XCloneable
+                            ,	::com::sun::star::beans::XPropertyContainer
+                            ,	::com::sun::star::beans::XPropertyAccess
+                            >	OControlModel_BASE;
 
-class OControlModel :public ::cppu::OComponentHelper
+class OControlModel	:public ::cppu::OComponentHelper
                     ,public OPropertySetAggregationHelper
                     ,public OControlModel_BASE
                     ,public OCloneableAggregation
@@ -363,39 +363,39 @@ protected:
     ::osl::Mutex                    m_aMutex;
     oslInterlockedCount             m_lockCount;
 
-    InterfaceRef                    m_xParent;                  // ParentComponent
-    OImplementationIdsRef           m_aHoldIdHelper;
+    InterfaceRef					m_xParent;					// ParentComponent
+    OImplementationIdsRef			m_aHoldIdHelper;
     PropertyBagHelper               m_aPropertyBagHelper;
 
     const ::comphelper::ComponentContext&
         getContext() const { return m_aContext; }
 
 // <properties>
-    ::rtl::OUString                 m_aName;                    // name of the control
-    ::rtl::OUString                 m_aTag;                     // tag for additional data
-    sal_Int16                       m_nTabIndex;                // index within the taborder
-    sal_Int16                       m_nClassId;                 // type of the control
+    ::rtl::OUString					m_aName;					// name of the control
+    ::rtl::OUString					m_aTag;						// tag for additional data
+    sal_Int16						m_nTabIndex;				// index within the taborder
+    sal_Int16						m_nClassId;					// type of the control
     sal_Bool                        m_bNativeLook;              // should the control use the native platform look?
 // </properties>
 
 
 protected:
     OControlModel(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rFactory,   // factory to create the aggregate with
-        const ::rtl::OUString& _rUnoControlModelTypeName,                       // service name of te model to aggregate
-        const ::rtl::OUString& rDefault = ::rtl::OUString(),                    // service name of the default control
-        const sal_Bool _bSetDelegator = sal_True                                // set to FALSE if you want to call setDelegator later (after returning from this ctor)
+        const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rFactory,	// factory to create the aggregate with
+        const ::rtl::OUString& _rUnoControlModelTypeName,						// service name of te model to aggregate
+        const ::rtl::OUString& rDefault = ::rtl::OUString(),					// service name of the default control
+        const sal_Bool _bSetDelegator = sal_True								// set to FALSE if you want to call setDelegator later (after returning from this ctor)
     );
     OControlModel(
-        const OControlModel* _pOriginal,                                        // the original object to clone
-        const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rFactory,   // factory to create the aggregate with
+        const OControlModel* _pOriginal,										// the original object to clone
+        const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rFactory,	// factory to create the aggregate with
         const sal_Bool _bCloneAggregate = sal_True,                             // should the aggregate of the original be cloned, too?
-        const sal_Bool _bSetDelegator = sal_True                                // set to FALSE if you want to call setDelegator later (after returning from this ctor)
+        const sal_Bool _bSetDelegator = sal_True								// set to FALSE if you want to call setDelegator later (after returning from this ctor)
     );
     virtual ~OControlModel();
 
     /** to be called after a OBoundControlModel (a derivee, respectively) has been cloned
-
+    
         <p>This method contains late initializations which cannot be done in the
         constructor of this base class, since the virtual method of derived classes do
         not yet work there.</p>
@@ -404,13 +404,13 @@ protected:
 
     using OComponentHelper::rBHelper;
 
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type>   _getTypes();
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type>	_getTypes();
 
-    void    readHelpTextCompatibly(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& _rxInStream);
-    void    writeHelpTextCompatibly(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& _rxOutStream);
+    void	readHelpTextCompatibly(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& _rxInStream);
+    void	writeHelpTextCompatibly(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& _rxOutStream);
 
-    void    doSetDelegator();
-    void    doResetDelegator();
+    void	doSetDelegator();
+    void	doResetDelegator();
 
     ::com::sun::star::uno::Sequence< ::rtl::OUString > getAggregateServiceNames();
 
@@ -419,34 +419,34 @@ public:
     virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException);
 
 // XTypeProvider
-    virtual ::com::sun::star::uno::Sequence<sal_Int8>           SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
-    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);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type>	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
 
 // OComponentHelper
     virtual void SAL_CALL disposing();
 
 // XNamed
-    virtual ::rtl::OUString SAL_CALL    getName() throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL               setName(const ::rtl::OUString& aName) throw(::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL	getName() throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL				setName(const ::rtl::OUString& aName) throw(::com::sun::star::uno::RuntimeException);
 
 // XServiceInfo
-    virtual sal_Bool SAL_CALL           supportsService(const ::rtl::OUString& ServiceName) throw (::com::sun::star::uno::RuntimeException);
-    virtual StringSequence SAL_CALL     getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL    getImplementationName() throw(::com::sun::star::uno::RuntimeException) = 0;
+    virtual sal_Bool SAL_CALL			supportsService(const ::rtl::OUString& ServiceName) throw (::com::sun::star::uno::RuntimeException);
+    virtual StringSequence SAL_CALL		getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL	getImplementationName() throw(::com::sun::star::uno::RuntimeException) = 0;
 
 // XSericeInfo - static version(s)
-    static  StringSequence SAL_CALL     getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException);
+    static  StringSequence SAL_CALL		getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException);
 
 // XPersistObject
-    virtual ::rtl::OUString SAL_CALL    getServiceName() throw(::com::sun::star::uno::RuntimeException) = 0;
+    virtual ::rtl::OUString SAL_CALL	getServiceName() throw(::com::sun::star::uno::RuntimeException) = 0;
     virtual void SAL_CALL
         write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL
         read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
 
 // XChild (base of XFormComponent)
-    virtual InterfaceRef SAL_CALL   getParent() throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL           setParent(const InterfaceRef& Parent) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException);
+    virtual InterfaceRef SAL_CALL	getParent() throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL			setParent(const InterfaceRef& Parent) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException);
 
 // XEventListener
     virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException);
@@ -461,8 +461,8 @@ public:
     using ::cppu::OPropertySetHelper::getFastPropertyValue;
 
 // ::com::sun::star::beans::XPropertyState
-    virtual ::com::sun::star::beans::PropertyState getPropertyStateByHandle(sal_Int32 nHandle);
-    virtual void setPropertyToDefaultByHandle(sal_Int32 nHandle);
+    virtual	::com::sun::star::beans::PropertyState getPropertyStateByHandle(sal_Int32 nHandle);
+    virtual	void setPropertyToDefaultByHandle(sal_Int32 nHandle);
     virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const;
 
 // XCloneable
@@ -538,18 +538,18 @@ public:
 
 //==================================================================
 // simple destructor
-#define DECLARE_DEFAULT_DTOR( classname )   \
+#define DECLARE_DEFAULT_DTOR( classname )	\
     ~classname() \
 
 // constructor for cloning a class
 #define DECLARE_DEFAULT_CLONE_CTOR( classname )  \
     classname( \
         const classname* _pOriginal, \
-        const   ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory \
+        const	::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory \
     ); \
 
 // all xtors for an inner class of the object hierarchy
-#define DECLARE_DEFAULT_XTOR( classname )   \
+#define DECLARE_DEFAULT_XTOR( classname )	\
     classname( \
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory, \
         const ::rtl::OUString& _rUnoControlModelTypeName, \
@@ -559,7 +559,7 @@ public:
     DECLARE_DEFAULT_DTOR( classname )   \
 
 // all xtors for an inner class of the object hierarchy which is *bound*
-#define DECLARE_DEFAULT_BOUND_XTOR( classname ) \
+#define DECLARE_DEFAULT_BOUND_XTOR( classname )	\
     classname( \
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory, \
         const ::rtl::OUString& _rUnoControlModelTypeName, \
@@ -571,7 +571,7 @@ public:
     DECLARE_DEFAULT_DTOR( classname )   \
 
 // all xtors for a leas class of the object hierarchy
-#define DECLARE_DEFAULT_LEAF_XTOR( classname )  \
+#define DECLARE_DEFAULT_LEAF_XTOR( classname )	\
     classname( \
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory \
     ); \
@@ -598,11 +598,11 @@ public:
 //= OBoundControlModel
 //= model of a form layer control which is bound to a data source field
 //==================================================================
-typedef ::cppu::ImplHelper4 <   ::com::sun::star::form::XLoadListener
+typedef ::cppu::ImplHelper4 <	::com::sun::star::form::XLoadListener
                             ,   ::com::sun::star::form::XReset
-                            ,   ::com::sun::star::beans::XPropertyChangeListener
-                            ,   ::com::sun::star::sdb::XRowSetChangeListener
-                            >   OBoundControlModel_BASE1;
+                            ,	::com::sun::star::beans::XPropertyChangeListener
+                            ,	::com::sun::star::sdb::XRowSetChangeListener
+                            >	OBoundControlModel_BASE1;
 
 // separated into an own base class since derivees can disable the support for this
 // interface, thus we want to easily exclude it in the queryInterface and getTypes
@@ -619,7 +619,7 @@ typedef ::cppu::ImplHelper2 <   ::com::sun::star::form::validation::XValidityCon
                             ,   ::com::sun::star::form::validation::XValidatableFormComponent
                             >   OBoundControlModel_VALIDATION;
 
-class OBoundControlModel    :public OControlModel
+class OBoundControlModel	:public OControlModel
                             ,public OBoundControlModel_BASE1
                             ,public OBoundControlModel_COMMITTING
                             ,public OBoundControlModel_BINDING
@@ -641,7 +641,7 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable >
                                         m_xAmbientForm;
 
-    ::rtl::OUString                     m_sValuePropertyName;
+    ::rtl::OUString					    m_sValuePropertyName;
     sal_Int32                           m_nValuePropertyAggregateHandle;
     sal_Int32                           m_nFieldType;
     ::com::sun::star::uno::Type         m_aValuePropertyType;
@@ -658,9 +658,9 @@ private:
     ::com::sun::star::uno::Type         m_aExternalValueType;
 
 // <properties>
-    ::rtl::OUString                     m_aControlSource;           // Datenquelle, Name des Feldes
+    ::rtl::OUString						m_aControlSource;			// Datenquelle, Name des Feldes
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
-                                        m_xLabelControl;            // reference to a sibling control (model) which is our label
+                                        m_xLabelControl;			// reference to a sibling control (model) which is our label
     sal_Bool                            m_bInputRequired;
 // </properties>
 
@@ -668,13 +668,13 @@ private:
                                 m_pAggPropMultiplexer;
 
     bool                        m_bFormListening            : 1;    // are we currently a XLoadListener at our ambient form?
-    sal_Bool                    m_bLoaded                   : 1;
-    sal_Bool                    m_bRequired                 : 1;
-    const sal_Bool              m_bCommitable               : 1;    // do we support XBoundComponent?
+    sal_Bool					m_bLoaded		            : 1;
+    sal_Bool					m_bRequired		            : 1;
+    const sal_Bool              m_bCommitable	            : 1;    // do we support XBoundComponent?
     const sal_Bool              m_bSupportsExternalBinding  : 1;    // do we support XBindableValue?
-    const sal_Bool              m_bSupportsValidation       : 1;    // do we support XValidatable?
-    sal_Bool                    m_bForwardValueChanges      : 1;    // do we currently handle changes in the bound database field?
-    sal_Bool                    m_bTransferingValue         : 1;    // true if we're currently transfering our value to an external binding
+    const sal_Bool			    m_bSupportsValidation       : 1;    // do we support XValidatable?
+    sal_Bool					m_bForwardValueChanges      : 1;    // do we currently handle changes in the bound database field?
+    sal_Bool			        m_bTransferingValue         : 1;    // true if we're currently transfering our value to an external binding
     sal_Bool                    m_bIsCurrentValueValid      : 1;    // flag specifying whether our current value is valid, relative to our external validator
     sal_Bool                    m_bBindingControlsRO        : 1;    // is our ReadOnly property currently controlled by our external binding?
     sal_Bool                    m_bBindingControlsEnable    : 1;    // is our Enabled property currently controlled by our external binding?
@@ -682,7 +682,7 @@ private:
     ValueChangeInstigator       m_eControlValueChangeInstigator;
 
 protected:
-    ::rtl::OUString                     m_aLabelServiceName;
+    ::rtl::OUString					    m_aLabelServiceName;
         // when setting the label for our control (property FM_PROP_CONTROLLABEL, member m_xLabelControl),
         // we accept only objects supporting an XControlModel interface, an XServiceInfo interface and
         // support for a service (XServiceInfo::supportsService) determined by this string.
@@ -708,14 +708,14 @@ protected:
     OBoundControlModel(
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rFactory,
                                                             // factory to create the aggregate with
-        const ::rtl::OUString& _rUnoControlModelTypeName,   // service name of te model to aggregate
-        const ::rtl::OUString& _rDefault,                   // service name of the default control
-        const sal_Bool _bCommitable,                        // is the control (model) commitable ?
+        const ::rtl::OUString& _rUnoControlModelTypeName,	// service name of te model to aggregate
+        const ::rtl::OUString& _rDefault,					// service name of the default control
+        const sal_Bool _bCommitable,						// is the control (model) commitable ?
         const sal_Bool _bSupportExternalBinding,            // set to TRUE if you want to support XBindableValue
         const sal_Bool _bSupportsValidation                 // set to TRUE if you want to support XValidatable
     );
     OBoundControlModel(
-        const OBoundControlModel* _pOriginal,               // the original object to clone
+        const OBoundControlModel* _pOriginal,				// the original object to clone
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rFactory
                                                             // factory to create the aggregate with
     );
@@ -953,12 +953,12 @@ protected:
     */
     virtual void            onDisconnectedValidator( );
 
-    /** nFieldType ist der Typ des Feldes, an das das Model gebunden werden soll.
+    /**	nFieldType ist der Typ des Feldes, an das das Model gebunden werden soll.
         Das Binden erfolgt genau dann, wenn Rueckgabewert sal_True.
         Die Standard-Implementation erlaubt alles ausser den drei binary-Typen und
         FieldType_OTHER.
     */
-    virtual sal_Bool        approveDbColumnType(sal_Int32 _nColumnType);
+    virtual sal_Bool		approveDbColumnType(sal_Int32 _nColumnType);
 
     /** retrieves the current value of the control, in a shape which can be used with our
         external validator.
@@ -986,10 +986,10 @@ protected:
         (unfortunally). So derived classes may use the following to methods. They secure the written
         data with marks, so any new common properties in newer versions will be skipped by older ones.
     */
-    void    writeCommonProperties(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream);
-    void    readCommonProperties(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream);
+    void	writeCommonProperties(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream);
+    void	readCommonProperties(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream);
     // the next method may be used in derived classes's read when an unknown version is encountered
-    void    defaultCommonProperties();
+    void	defaultCommonProperties();
 
     /** called to reset the control to some kind of default.
 
@@ -1004,7 +1004,7 @@ protected:
     */
     virtual void            resetNoBroadcast();
 
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type>   _getTypes();
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type>	_getTypes();
 
     /// sets m_xField to the given new value, without notifying our listeners
     void    impl_setField_noNotify(
@@ -1047,7 +1047,7 @@ public:
     virtual StringSequence SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo - static version
-    static  StringSequence SAL_CALL getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException);
+    static  StringSequence SAL_CALL	getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException);
 
     // XChild
     virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException);
@@ -1264,7 +1264,7 @@ private:
         @precond
             our mutex is currently locked exactly once
     */
-    void        connectValidator(
+    void        connectValidator( 
                     const ::com::sun::star::uno::Reference< ::com::sun::star::form::validation::XValidator >& _rxValidator
                 );
 
diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx
index 57f530765a37..ebe3a67039d8 100644
--- a/forms/source/inc/InterfaceContainer.hxx
+++ b/forms/source/inc/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
@@ -69,18 +69,18 @@ namespace frm
     struct ElementDescription
     {
     public:
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >       xInterface;
-        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >   xPropertySet;
-        ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild >     xChild;
-        ::com::sun::star::uno::Any                                                  aElementTypeInterface;
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >		xInterface;
+        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >	xPropertySet;
+        ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild >		xChild;
+        ::com::sun::star::uno::Any													aElementTypeInterface;
 
     public:
         ElementDescription( );
         virtual ~ElementDescription();
 
     private:
-        ElementDescription( const ElementDescription& );            // never implemented
-        ElementDescription& operator=( const ElementDescription& ); // never implemented
+        ElementDescription( const ElementDescription& );			// never implemented
+        ElementDescription& operator=( const ElementDescription& );	// never implemented
     };
 
 typedef ::std::vector<InterfaceRef> OInterfaceArray;
@@ -100,22 +100,22 @@ typedef ::cppu::ImplHelper8 <   ::com::sun::star::container::XNameContainer
                             ,   ::com::sun::star::util::XCloneable
                             > OInterfaceContainer_BASE;
 
-class OInterfaceContainer : public OInterfaceContainer_BASE
+class OInterfaceContainer :	public OInterfaceContainer_BASE
 {
 protected:
-    ::osl::Mutex&                           m_rMutex;
+    ::osl::Mutex&							m_rMutex;
 
-    OInterfaceArray                         m_aItems;
-    OInterfaceMap                           m_aMap;
-    ::cppu::OInterfaceContainerHelper       m_aContainerListeners;
+    OInterfaceArray							m_aItems;
+    OInterfaceMap							m_aMap;
+    ::cppu::OInterfaceContainerHelper		m_aContainerListeners;
 
     const ::com::sun::star::uno::Type       m_aElementType;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>     m_xServiceFactory;
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>		m_xServiceFactory;
 
 
     // EventManager
-    ::com::sun::star::uno::Reference< ::com::sun::star::script::XEventAttacherManager>  m_xEventAttacher;
+    ::com::sun::star::uno::Reference< ::com::sun::star::script::XEventAttacherManager> 	m_xEventAttacher;
 
 public:
     OInterfaceContainer(
@@ -247,7 +247,7 @@ protected:
 
         @precond <arg>_nIndex</arg> is a valid index
         @precond our mutex is locked exactly once, by the guard specified with <arg>_rClearBeforeNotify</arg>
-
+          
     */
     void implReplaceByIndex(
             const sal_Int32 _nIndex,
@@ -259,7 +259,7 @@ protected:
 
         @precond <arg>_nIndex</arg> is a valid index
         @precond our mutex is locked exactly once, by the guard specified with <arg>_rClearBeforeNotify</arg>
-
+          
     */
     void implRemoveByIndex(
             const sal_Int32 _nIndex,
@@ -282,7 +282,7 @@ private:
         efVersionSO5x,
         efVersionSO6x
     };
-    void    transformEvents( const EventFormat _eTargetFormat );
+    void	transformEvents( const EventFormat _eTargetFormat );
 
     void    impl_createEventAttacher_nothrow();
 };
@@ -298,8 +298,8 @@ class OFormComponents   :public FormComponentsBase
                         ,public OFormComponents_BASE
 {
 protected:
-    ::osl::Mutex                m_aMutex;
-    ::comphelper::InterfaceRef  m_xParent;
+    ::osl::Mutex				m_aMutex;
+    ::comphelper::InterfaceRef 	m_xParent;
 
 public:
     OFormComponents(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory);
@@ -322,7 +322,7 @@ public:
     using OInterfaceContainer::disposing;
 };
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 #endif          // _FRM_INTERFACE_CONTAINER_HXX_
diff --git a/forms/source/inc/cloneable.hxx b/forms/source/inc/cloneable.hxx
index 5500d6dac708..d08caa881137 100644
--- a/forms/source/inc/cloneable.hxx
+++ b/forms/source/inc/cloneable.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace frm
     class OCloneableAggregation
     {
     protected:
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation>  m_xAggregate;
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation>	m_xAggregate;
 
     protected:
         static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > createAggregateClone( const OCloneableAggregation* _pOriginal );
     };
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 #endif // FORMS_COMPONENT_CLONEABLE_HXX
diff --git a/forms/source/inc/commanddescriptionprovider.hxx b/forms/source/inc/commanddescriptionprovider.hxx
index 702040b1b284..986f24a79a3d 100644
--- a/forms/source/inc/commanddescriptionprovider.hxx
+++ b/forms/source/inc/commanddescriptionprovider.hxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/inc/commandimageprovider.hxx b/forms/source/inc/commandimageprovider.hxx
index 8fece35e50e9..f17b72283350 100644
--- a/forms/source/inc/commandimageprovider.hxx
+++ b/forms/source/inc/commandimageprovider.hxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/inc/componenttools.hxx b/forms/source/inc/componenttools.hxx
index 6632e59858dc..8b20881e585f 100644
--- a/forms/source/inc/componenttools.hxx
+++ b/forms/source/inc/componenttools.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/inc/controlfeatureinterception.hxx b/forms/source/inc/controlfeatureinterception.hxx
index d3c9aa3c91e3..9bb80965688c 100644
--- a/forms/source/inc/controlfeatureinterception.hxx
+++ b/forms/source/inc/controlfeatureinterception.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/inc/featuredispatcher.hxx b/forms/source/inc/featuredispatcher.hxx
index 760a8c4b6455..bca3431d6bcf 100644
--- a/forms/source/inc/featuredispatcher.hxx
+++ b/forms/source/inc/featuredispatcher.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/inc/formcontrolfont.hxx b/forms/source/inc/formcontrolfont.hxx
index 1a6df9d30ce3..1460aa0cff1a 100644
--- a/forms/source/inc/formcontrolfont.hxx
+++ b/forms/source/inc/formcontrolfont.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace frm
     private:
         // <properties>
         ::com::sun::star::awt::FontDescriptor   m_aFont;
-        sal_Int16                               m_nFontRelief;
-        sal_Int16                               m_nFontEmphasis;
-        ::com::sun::star::uno::Any              m_aTextLineColor;
+        sal_Int16								m_nFontRelief;
+        sal_Int16								m_nFontEmphasis;
+        ::com::sun::star::uno::Any				m_aTextLineColor;
         ::com::sun::star::uno::Any              m_aTextColor;
         // </properties>
 
diff --git a/forms/source/inc/formnavigation.hxx b/forms/source/inc/formnavigation.hxx
index 6e56e4f54519..095ecba2c9ac 100644
--- a/forms/source/inc/formnavigation.hxx
+++ b/forms/source/inc/formnavigation.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/inc/forms_module.hxx b/forms/source/inc/forms_module.hxx
index 866de89fab6c..6eed7b8fe477 100644
--- a/forms/source/inc/forms_module.hxx
+++ b/forms/source/inc/forms_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
@@ -68,24 +68,24 @@ namespace FORMS_MODULE_NAMESPACE
 
     protected:
         // auto registration administration
-        static  ::com::sun::star::uno::Sequence< ::rtl::OUString >*
+        static	::com::sun::star::uno::Sequence< ::rtl::OUString >*
             s_pImplementationNames;
-        static  ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >*
+        static	::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >*
             s_pSupportedServices;
-        static  ::com::sun::star::uno::Sequence< sal_Int64 >*
+        static	::com::sun::star::uno::Sequence< sal_Int64 >*
             s_pCreationFunctionPointers;
-        static  ::com::sun::star::uno::Sequence< sal_Int64 >*
+        static	::com::sun::star::uno::Sequence< sal_Int64 >*
             s_pFactoryFunctionPointers;
 
     public:
         /** register a component implementing a service with the given data.
-            @param  _rImplementationName
+            @param	_rImplementationName
                         the implementation name of the component
-            @param  _rServiceNames
+            @param	_rServiceNames
                         the services the component supports
-            @param  _pCreateFunction
+            @param	_pCreateFunction
                         a function for creating an instance of the component
-            @param  _pFactoryFunction
+            @param	_pFactoryFunction
                         a function for creating a factory for that component
             @see revokeComponent
         */
@@ -96,7 +96,7 @@ namespace FORMS_MODULE_NAMESPACE
             FactoryInstantiation _pFactoryFunction);
 
         /** revoke the registration for the specified component
-            @param  _rImplementationName
+            @param	_rImplementationName
                 the implementation name of the component
         */
         static void revokeComponent(
@@ -106,9 +106,9 @@ namespace FORMS_MODULE_NAMESPACE
             <p>writes the registration information of all components which are currently registered into the
             specified registry.<p/>
             <p>Usually used from within component_writeInfo.<p/>
-            @param  _rxServiceManager
+            @param	_rxServiceManager
                         the service manager
-            @param  _rRootKey
+            @param	_rRootKey
                         the registry key under which the information will be stored
             @return
                         sal_True if the registration of all implementations was successfull, sal_False otherwise
@@ -119,9 +119,9 @@ namespace FORMS_MODULE_NAMESPACE
 
         /** creates a Factory for the component with the given implementation name.
             <p>Usually used from within component_getFactory.<p/>
-            @param  _rxServiceManager
+            @param	_rxServiceManager
                         a pointer to an XMultiServiceFactory interface as got in component_getFactory
-            @param  _pImplementationName
+            @param	_pImplementationName
                         the implementation name of the component
             @return
                         the XInterface access to a factory for the component
@@ -329,7 +329,7 @@ namespace FORMS_MODULE_NAMESPACE
            } \
 
 //.........................................................................
-}   // namespace FORMS_MODULE_NAMESPACE
+}	// namespace FORMS_MODULE_NAMESPACE
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/inc/forms_module_impl.hxx b/forms/source/inc/forms_module_impl.hxx
index 3269eec68df0..cef7914ca96f 100644
--- a/forms/source/inc/forms_module_impl.hxx
+++ b/forms/source/inc/forms_module_impl.hxx
@@ -28,10 +28,10 @@ namespace FORMS_MODULE_NAMESPACE
     //- registration helper
     //--------------------------------------------------------------------------
 
-    Sequence< ::rtl::OUString >*                OFormsModule::s_pImplementationNames = NULL;
-    Sequence< Sequence< ::rtl::OUString > >*    OFormsModule::s_pSupportedServices = NULL;
-    Sequence< sal_Int64 >*                      OFormsModule::s_pCreationFunctionPointers = NULL;
-    Sequence< sal_Int64 >*                      OFormsModule::s_pFactoryFunctionPointers = NULL;
+    Sequence< ::rtl::OUString >*				OFormsModule::s_pImplementationNames = NULL;
+    Sequence< Sequence< ::rtl::OUString > >*	OFormsModule::s_pSupportedServices = NULL;
+    Sequence< sal_Int64 >*						OFormsModule::s_pCreationFunctionPointers = NULL;
+    Sequence< sal_Int64 >*						OFormsModule::s_pFactoryFunctionPointers = NULL;
 
     //--------------------------------------------------------------------------
     void OFormsModule::registerComponent(
@@ -52,9 +52,9 @@ namespace FORMS_MODULE_NAMESPACE
         OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
             "OFormsModule::registerComponent : inconsistent state (the pointers (2)) !");
 
-        OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
-                    &&  (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
-                    &&  (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
+        OSL_ENSURE(	(s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
+                    &&	(s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
+                    &&	(s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
             "OFormsModule::registerComponent : inconsistent state !");
 
         sal_Int32 nOldLen = s_pImplementationNames->getLength();
@@ -79,9 +79,9 @@ namespace FORMS_MODULE_NAMESPACE
         }
         OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
             "OFormsModule::revokeComponent : inconsistent state (the pointers) !");
-        OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
-                    &&  (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
-                    &&  (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
+        OSL_ENSURE(	(s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
+                    &&	(s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
+                    &&	(s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
             "OFormsModule::revokeComponent : inconsistent state !");
 
         sal_Int32 nLen = s_pImplementationNames->getLength();
@@ -121,9 +121,9 @@ namespace FORMS_MODULE_NAMESPACE
         }
         OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
             "OFormsModule::writeComponentInfos : inconsistent state (the pointers) !");
-        OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
-                    &&  (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
-                    &&  (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
+        OSL_ENSURE(	(s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
+                    &&	(s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
+                    &&	(s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
             "OFormsModule::writeComponentInfos : inconsistent state !");
 
         sal_Int32 nLen = s_pImplementationNames->getLength();
@@ -170,9 +170,9 @@ namespace FORMS_MODULE_NAMESPACE
         }
         OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
             "OFormsModule::getComponentFactory : inconsistent state (the pointers) !");
-        OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
-                    &&  (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
-                    &&  (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
+        OSL_ENSURE(	(s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
+                    &&	(s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
+                    &&	(s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
             "OFormsModule::getComponentFactory : inconsistent state !");
 
 
diff --git a/forms/source/inc/frm_module.hxx b/forms/source/inc/frm_module.hxx
index 0a5342f2bcff..9ed02c2345bc 100644
--- a/forms/source/inc/frm_module.hxx
+++ b/forms/source/inc/frm_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
diff --git a/forms/source/inc/frm_resource.hrc b/forms/source/inc/frm_resource.hrc
index a35707cb1708..3e7ef035bed6 100644
--- a/forms/source/inc/frm_resource.hrc
+++ b/forms/source/inc/frm_resource.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,29 +33,29 @@
 #endif
 
 //------------------------------------------------------------------------------
-#define RID_FRM_STRINGS_START       RID_FORMLAYER_START
+#define	RID_FRM_STRINGS_START		RID_FORMLAYER_START
 
 
 
 //------------------------------------------------------------------------------
 //- String-IDs
-#define RID_BASELISTBOX_ERROR_FILLLIST          ( RID_FRM_STRINGS_START +  0 )
-#define RID_STR_IMPORT_GRAPHIC                  ( RID_FRM_STRINGS_START +  1 )
-#define RID_STR_CONTROL_SUBSTITUTED_NAME        ( RID_FRM_STRINGS_START +  2 )
-#define RID_STR_CONTROL_SUBSTITUTED_EPXPLAIN    ( RID_FRM_STRINGS_START +  3 )
-#define RID_STR_READERROR                       ( RID_FRM_STRINGS_START +  4 )
-#define RID_STR_CONNECTERROR                    ( RID_FRM_STRINGS_START +  5 )
-#define RID_ERR_LOADING_FORM                    ( RID_FRM_STRINGS_START +  6 )
-#define RID_ERR_REFRESHING_FORM                 ( RID_FRM_STRINGS_START +  7 )
-#define RID_STR_ERR_INSERTRECORD                ( RID_FRM_STRINGS_START +  8 )
-#define RID_STR_ERR_UPDATERECORD                ( RID_FRM_STRINGS_START +  9 )
-#define RID_STR_ERR_DELETERECORD                ( RID_FRM_STRINGS_START + 10 )
-#define RID_STR_ERR_DELETERECORDS               ( RID_FRM_STRINGS_START + 11 )
-#define RID_STR_NEED_NON_NULL_OBJECT            ( RID_FRM_STRINGS_START + 12 )
-#define RID_STR_OPEN_GRAPHICS                   ( RID_FRM_STRINGS_START + 13 )
-#define RID_STR_CLEAR_GRAPHICS                  ( RID_FRM_STRINGS_START + 14 )
-#define RID_STR_INVALIDSTREAM                   ( RID_FRM_STRINGS_START + 15 )
-#define RID_STR_SYNTAXERROR                     ( RID_FRM_STRINGS_START + 16 )
+#define RID_BASELISTBOX_ERROR_FILLLIST			( RID_FRM_STRINGS_START +  0 )
+#define RID_STR_IMPORT_GRAPHIC					( RID_FRM_STRINGS_START +  1 )
+#define RID_STR_CONTROL_SUBSTITUTED_NAME		( RID_FRM_STRINGS_START +  2 )
+#define RID_STR_CONTROL_SUBSTITUTED_EPXPLAIN	( RID_FRM_STRINGS_START +  3 )
+#define RID_STR_READERROR						( RID_FRM_STRINGS_START +  4 )
+#define RID_STR_CONNECTERROR					( RID_FRM_STRINGS_START +  5 )
+#define RID_ERR_LOADING_FORM					( RID_FRM_STRINGS_START +  6 )
+#define RID_ERR_REFRESHING_FORM					( RID_FRM_STRINGS_START +  7 )
+#define RID_STR_ERR_INSERTRECORD				( RID_FRM_STRINGS_START +  8 )
+#define RID_STR_ERR_UPDATERECORD				( RID_FRM_STRINGS_START +  9 )
+#define RID_STR_ERR_DELETERECORD				( RID_FRM_STRINGS_START + 10 )
+#define RID_STR_ERR_DELETERECORDS				( RID_FRM_STRINGS_START + 11 )
+#define RID_STR_NEED_NON_NULL_OBJECT			( RID_FRM_STRINGS_START + 12 )
+#define RID_STR_OPEN_GRAPHICS					( RID_FRM_STRINGS_START + 13 )
+#define RID_STR_CLEAR_GRAPHICS					( RID_FRM_STRINGS_START + 14 )
+#define RID_STR_INVALIDSTREAM					( RID_FRM_STRINGS_START + 15 )
+#define RID_STR_SYNTAXERROR						( RID_FRM_STRINGS_START + 16 )
 #define RID_STR_INCOMPATIBLE_TYPES              ( RID_FRM_STRINGS_START + 17 )
 #define RID_STR_INVALID_VALIDATOR               ( RID_FRM_STRINGS_START + 18 )
 #define RID_STR_LABEL_RECORD                    ( RID_FRM_STRINGS_START + 19 )
diff --git a/forms/source/inc/frm_resource.hxx b/forms/source/inc/frm_resource.hxx
index 503a0050e4e6..bb217960d46c 100644
--- a/forms/source/inc/frm_resource.hxx
+++ b/forms/source/inc/frm_resource.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 frm
     //==================================================================
     class ResourceManager
     {
-        static SimpleResMgr*    m_pImpl;
+        static SimpleResMgr*	m_pImpl;
 
     private:
         // no instantiation allowed
diff --git a/forms/source/inc/frm_strings.hxx b/forms/source/inc/frm_strings.hxx
index 57d4ff9bccd5..98c4fa634487 100644
--- a/forms/source/inc/frm_strings.hxx
+++ b/forms/source/inc/frm_strings.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,17 +39,17 @@ namespace frm
 
     struct ConstAsciiString
     {
-        const sal_Char* ascii;
-        sal_Int32       length;
+        const sal_Char*	ascii;
+        sal_Int32		length;
 
-        inline  operator       ::rtl::OUString () const;
-        inline  operator const sal_Char*       () const { return ascii; }
+        inline	operator       ::rtl::OUString () const;
+        inline	operator const sal_Char*       () const { return ascii; }
 
         inline ConstAsciiString(const sal_Char* _pAsciiZeroTerminated, const sal_Int32 _nLength);
         inline ~ConstAsciiString();
 
     private:
-        mutable ::rtl::OUString*    ustring;
+        mutable ::rtl::OUString*	ustring;
     };
 
     //------------------------------------------------------------
diff --git a/forms/source/inc/ids.hxx b/forms/source/inc/ids.hxx
index db009f959b44..204713ea9263 100644
--- a/forms/source/inc/ids.hxx
+++ b/forms/source/inc/ids.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/inc/limitedformats.hxx b/forms/source/inc/limitedformats.hxx
index 92e4d49e0034..6c75a5bed4e7 100644
--- a/forms/source/inc/limitedformats.hxx
+++ b/forms/source/inc/limitedformats.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace frm
     class OLimitedFormats
     {
     private:
-        static sal_Int32    s_nInstanceCount;
-        static ::osl::Mutex s_aMutex;
+        static sal_Int32	s_nInstanceCount;
+        static ::osl::Mutex	s_aMutex;
         static ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >
                             s_xStandardFormats;
 
     protected:
-        sal_Int32           m_nFormatEnumPropertyHandle;
-        const sal_Int16     m_nTableId;
+        sal_Int32			m_nFormatEnumPropertyHandle;
+        const sal_Int16		m_nTableId;
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet >
                             m_xAggregate;
 
@@ -78,19 +78,19 @@ namespace frm
         );
 
     protected:
-        void        getFormatKeyPropertyValue( ::com::sun::star::uno::Any& _rValue ) const;
-        sal_Bool    convertFormatKeyPropertyValue(
+        void		getFormatKeyPropertyValue( ::com::sun::star::uno::Any& _rValue ) const;
+        sal_Bool	convertFormatKeyPropertyValue(
                         ::com::sun::star::uno::Any& _rConvertedValue,
                         ::com::sun::star::uno::Any& _rOldValue,
-                const   ::com::sun::star::uno::Any& _rNewValue
+                const	::com::sun::star::uno::Any& _rNewValue
             );
-        void        setFormatKeyPropertyValue( const ::com::sun::star::uno::Any& _rNewValue );
+        void		setFormatKeyPropertyValue( const ::com::sun::star::uno::Any& _rNewValue );
         // setFormatKeyPropertyValue should only be called with a value got from convertFormatKeyPropertyValue!
 
         ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >
                     getFormatsSupplier() const { return s_xStandardFormats; }
 
-    private:
+    private:	
         void acquireSupplier(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB);
         void releaseSupplier();
 
@@ -99,7 +99,7 @@ namespace frm
     };
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 #endif // _FORMS_LIMITED_FORMATS_HXX_
diff --git a/forms/source/inc/listenercontainers.hxx b/forms/source/inc/listenercontainers.hxx
index 59f8c3a604ef..4c12b69c8cb5 100644
--- a/forms/source/inc/listenercontainers.hxx
+++ b/forms/source/inc/listenercontainers.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/inc/property.hrc b/forms/source/inc/property.hrc
index b0216f4f63b6..8ba6e87a48f2 100644
--- a/forms/source/inc/property.hrc
+++ b/forms/source/inc/property.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx
index d12a0d030e61..35e8162bb505 100644
--- a/forms/source/inc/property.hxx
+++ b/forms/source/inc/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
@@ -59,8 +59,8 @@ class PropertyInfoService
     //..................................................................
     struct PropertyAssignment
     {
-        ::rtl::OUString     sName;
-        sal_Int32           nHandle;
+        ::rtl::OUString		sName;
+        sal_Int32			nHandle;
 
         PropertyAssignment() { nHandle = -1; }
         PropertyAssignment(const PropertyAssignment& _rSource)
@@ -71,7 +71,7 @@ class PropertyInfoService
     };
 
     DECLARE_STL_VECTOR(PropertyAssignment, PropertyMap);
-    static PropertyMap      s_AllKnownProperties;
+    static PropertyMap		s_AllKnownProperties;
 
     //..................................................................
     // comparing two PropertyAssignment's
@@ -94,8 +94,8 @@ public:
     PropertyInfoService() { }
 
 public:
-    static sal_Int32            getPropertyId(const ::rtl::OUString& _rName);
-    static ::rtl::OUString      getPropertyName(sal_Int32 _nHandle);
+    static sal_Int32			getPropertyId(const ::rtl::OUString& _rName);
+    static ::rtl::OUString		getPropertyName(sal_Int32 _nHandle);
 
 private:
     static void initialize();
@@ -106,7 +106,7 @@ private:
 class ConcreteInfoService : public ::comphelper::IPropertyInfoService
 {
 public:
-    virtual sal_Int32 getPreferedPropertyId(const ::rtl::OUString& _rName);
+    virtual	sal_Int32 getPreferedPropertyId(const ::rtl::OUString& _rName);
 };
 
 //------------------------------------------------------------------------------
@@ -122,79 +122,79 @@ public:
     *pProperties++ = com::sun::star::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, ::getCppuType(reinterpret_cast< com::sun::star::uno::Reference< type >* >(NULL)),
 
 //------------------------------------------------------------------------------
-#define BEGIN_DESCRIBE_PROPERTIES( count, baseclass )   \
+#define BEGIN_DESCRIBE_PROPERTIES( count, baseclass )	\
     baseclass::describeFixedProperties( _rProps ); \
     sal_Int32 nOldCount = _rProps.getLength(); \
-    _rProps.realloc( nOldCount + ( count ) );   \
+    _rProps.realloc( nOldCount + ( count ) );	\
     ::com::sun::star::beans::Property* pProperties = _rProps.getArray() + nOldCount;       \
 
 //------------------------------------------------------------------------------
-#define BEGIN_DESCRIBE_BASE_PROPERTIES( count ) \
-    _rProps.realloc( count );   \
+#define BEGIN_DESCRIBE_BASE_PROPERTIES( count )	\
+    _rProps.realloc( count );	\
     ::com::sun::star::beans::Property* pProperties = _rProps.getArray();       \
 
 //------------------------------------------------------------------------------
-#define BEGIN_DESCRIBE_AGGREGATION_PROPERTIES( count, aggregate )   \
-    _rProps.realloc( count );   \
+#define BEGIN_DESCRIBE_AGGREGATION_PROPERTIES( count, aggregate )	\
+    _rProps.realloc( count );	\
     ::com::sun::star::beans::Property* pProperties = _rProps.getArray();       \
     \
-    if (aggregate.is()) \
-        _rAggregateProps = aggregate->getPropertySetInfo()->getProperties();    \
+    if (aggregate.is())	\
+        _rAggregateProps = aggregate->getPropertySetInfo()->getProperties();	\
 
 // ===
 //------------------------------------------------------------------------------
-#define DECL_PROP0(varname, type)   \
+#define DECL_PROP0(varname, type)	\
     DECL_PROP_IMPL(varname, type) 0)
 
 //------------------------------------------------------------------------------
-#define DECL_PROP1(varname, type, attrib1)  \
+#define DECL_PROP1(varname, type, attrib1)	\
         DECL_PROP_IMPL(varname, type) com::sun::star::beans::PropertyAttribute::attrib1)
 
 //------------------------------------------------------------------------------
-#define DECL_PROP2(varname, type, attrib1, attrib2) \
+#define DECL_PROP2(varname, type, attrib1, attrib2)	\
         DECL_PROP_IMPL(varname, type) com::sun::star::beans::PropertyAttribute::attrib1 | com::sun::star::beans::PropertyAttribute::attrib2)
 
 //------------------------------------------------------------------------------
-#define DECL_PROP3(varname, type, attrib1, attrib2, attrib3)    \
+#define DECL_PROP3(varname, type, attrib1, attrib2, attrib3)	\
         DECL_PROP_IMPL(varname, type) com::sun::star::beans::PropertyAttribute::attrib1 | com::sun::star::beans::PropertyAttribute::attrib2 | com::sun::star::beans::PropertyAttribute::attrib3)
 
 //------------------------------------------------------------------------------
-#define DECL_PROP4(varname, type, attrib1, attrib2, attrib3, attrib4)   \
+#define DECL_PROP4(varname, type, attrib1, attrib2, attrib3, attrib4)	\
         DECL_PROP_IMPL(varname, type) com::sun::star::beans::PropertyAttribute::attrib1 | com::sun::star::beans::PropertyAttribute::attrib2 | com::sun::star::beans::PropertyAttribute::attrib3 | com::sun::star::beans::PropertyAttribute::attrib4)
 
 // === some property types require special handling
 // === such as interfaces
 //------------------------------------------------------------------------------
-#define DECL_IFACE_PROP0(varname, type) \
+#define DECL_IFACE_PROP0(varname, type)	\
     DECL_IFACE_PROP_IMPL(varname, type) 0)
 
 //------------------------------------------------------------------------------
-#define DECL_IFACE_PROP1(varname, type, attrib1)    \
+#define DECL_IFACE_PROP1(varname, type, attrib1)	\
     DECL_IFACE_PROP_IMPL(varname, type) starbeans::PropertyAttribute::attrib1)
 
 //------------------------------------------------------------------------------
-#define DECL_IFACE_PROP2(varname, type, attrib1, attrib2)   \
+#define DECL_IFACE_PROP2(varname, type, attrib1, attrib2)	\
         DECL_IFACE_PROP_IMPL(varname, type) com::sun::star::beans::PropertyAttribute::attrib1 | com::sun::star::beans::PropertyAttribute::attrib2)
 
 //------------------------------------------------------------------------------
-#define DECL_IFACE_PROP3(varname, type, attrib1, attrib2, attrib3)  \
+#define DECL_IFACE_PROP3(varname, type, attrib1, attrib2, attrib3)	\
     DECL_IFACE_PROP_IMPL(varname, type) starbeans::PropertyAttribute::attrib1 | starbeans::PropertyAttribute::attrib2 | starbeans::PropertyAttribute::attrib3)
 
 //------------------------------------------------------------------------------
-#define DECL_IFACE_PROP4(varname, type, attrib1, attrib2, attrib3, attrib4) \
+#define DECL_IFACE_PROP4(varname, type, attrib1, attrib2, attrib3, attrib4)	\
     DECL_IFACE_PROP_IMPL(varname, type) starbeans::PropertyAttribute::attrib1 | starbeans::PropertyAttribute::attrib2 | starbeans::PropertyAttribute::attrib3 | PropertyAttribute::attrib4)
 
 // === or Boolean properties
 //------------------------------------------------------------------------------
-#define DECL_BOOL_PROP0(varname)    \
+#define DECL_BOOL_PROP0(varname)	\
     DECL_BOOL_PROP_IMPL(varname) 0)
 
 //------------------------------------------------------------------------------
-#define DECL_BOOL_PROP1(varname, attrib1)   \
+#define DECL_BOOL_PROP1(varname, attrib1)	\
         DECL_BOOL_PROP_IMPL(varname) com::sun::star::beans::PropertyAttribute::attrib1)
 
 //------------------------------------------------------------------------------
-#define DECL_BOOL_PROP2(varname, attrib1, attrib2)  \
+#define DECL_BOOL_PROP2(varname, attrib1, attrib2)	\
         DECL_BOOL_PROP_IMPL(varname) com::sun::star::beans::PropertyAttribute::attrib1 | com::sun::star::beans::PropertyAttribute::attrib2)
 
 //------------------------------------------------------------------------------
@@ -203,8 +203,8 @@ public:
 
 // ===
 //------------------------------------------------------------------------------
-#define END_DESCRIBE_PROPERTIES()   \
-    DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(), "<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?"); \
+#define END_DESCRIBE_PROPERTIES()	\
+    DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(), "<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");	\
 
 //==============================================================================
 //------------------------------------------------------------------------------
diff --git a/forms/source/inc/propertybaghelper.hxx b/forms/source/inc/propertybaghelper.hxx
index 5bb10583ea37..b8c0fbe16c75 100644
--- a/forms/source/inc/propertybaghelper.hxx
+++ b/forms/source/inc/propertybaghelper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/inc/resettable.hxx b/forms/source/inc/resettable.hxx
index d1af14b7718b..f40383e484d5 100644
--- a/forms/source/inc/resettable.hxx
+++ b/forms/source/inc/resettable.hxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/inc/services.hxx b/forms/source/inc/services.hxx
index 450b8adcd346..f71436ffba76 100644
--- a/forms/source/inc/services.hxx
+++ b/forms/source/inc/services.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,16 +84,16 @@ namespace frm
     // service names for compatibility
     // -----------------------
     FORMS_CONSTASCII_STRING( FRM_COMPONENT_FORM, "stardiv.one.form.component.Form" );
-    FORMS_CONSTASCII_STRING( FRM_COMPONENT_EDIT, "stardiv.one.form.component.Edit" );           // compatibility
+    FORMS_CONSTASCII_STRING( FRM_COMPONENT_EDIT, "stardiv.one.form.component.Edit" );			// compatibility
     FORMS_CONSTASCII_STRING( FRM_COMPONENT_TEXTFIELD, "stardiv.one.form.component.TextField" );
     FORMS_CONSTASCII_STRING( FRM_COMPONENT_LISTBOX, "stardiv.one.form.component.ListBox" );
     FORMS_CONSTASCII_STRING( FRM_COMPONENT_COMBOBOX, "stardiv.one.form.component.ComboBox" );
     FORMS_CONSTASCII_STRING( FRM_COMPONENT_RADIOBUTTON, "stardiv.one.form.component.RadioButton" );
-    FORMS_CONSTASCII_STRING( FRM_COMPONENT_GROUPBOX, "stardiv.one.form.component.GroupBox" );       // compatibility
-    FORMS_CONSTASCII_STRING( FRM_COMPONENT_FIXEDTEXT, "stardiv.one.form.component.FixedText" );     // compatibility
+    FORMS_CONSTASCII_STRING( FRM_COMPONENT_GROUPBOX, "stardiv.one.form.component.GroupBox" );		// compatibility
+    FORMS_CONSTASCII_STRING( FRM_COMPONENT_FIXEDTEXT, "stardiv.one.form.component.FixedText" );		// compatibility
     FORMS_CONSTASCII_STRING( FRM_COMPONENT_COMMANDBUTTON, "stardiv.one.form.component.CommandButton" );
     FORMS_CONSTASCII_STRING( FRM_COMPONENT_CHECKBOX, "stardiv.one.form.component.CheckBox" );
-    FORMS_CONSTASCII_STRING( FRM_COMPONENT_GRID, "stardiv.one.form.component.Grid" );           // compatibility
+    FORMS_CONSTASCII_STRING( FRM_COMPONENT_GRID, "stardiv.one.form.component.Grid" );			// compatibility
     FORMS_CONSTASCII_STRING( FRM_COMPONENT_GRIDCONTROL, "stardiv.one.form.component.GridControl" );
     FORMS_CONSTASCII_STRING( FRM_COMPONENT_IMAGEBUTTON, "stardiv.one.form.component.ImageButton" );
     FORMS_CONSTASCII_STRING( FRM_COMPONENT_FILECONTROL, "stardiv.one.form.component.FileControl" );
diff --git a/forms/source/inc/togglestate.hxx b/forms/source/inc/togglestate.hxx
index 4d2d418798d1..77076916b887 100644
--- a/forms/source/inc/togglestate.hxx
+++ b/forms/source/inc/togglestate.hxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/inc/urltransformer.hxx b/forms/source/inc/urltransformer.hxx
index ead8a5963f22..aecc29541280 100644
--- a/forms/source/inc/urltransformer.hxx
+++ b/forms/source/inc/urltransformer.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/inc/windowstateguard.hxx b/forms/source/inc/windowstateguard.hxx
index 2123d41ffdf0..b93959f268c7 100644
--- a/forms/source/inc/windowstateguard.hxx
+++ b/forms/source/inc/windowstateguard.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx
index 9235b085d14a..fd54c4c61395 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/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
@@ -106,7 +106,7 @@ Sequence< ScriptEventDescriptor >
 lcl_stripVbaEvents( const Sequence< ScriptEventDescriptor >& sEvents )
 {
     Sequence< ScriptEventDescriptor > sStripped( sEvents.getLength() );
-
+    
     const ScriptEventDescriptor* pDesc = sEvents.getConstArray();
     const ScriptEventDescriptor* pEnd = ( pDesc + sEvents.getLength() );
     sal_Int32 nCopied = 0;
@@ -139,7 +139,7 @@ void OInterfaceContainer::impl_addVbEvents_nolck_nothrow(  const sal_Int32 i_nIn
                 break;
 
             ::osl::MutexGuard aGuard( m_rMutex );
-            bool hasVBABindings = lcl_hasVbaEvents( m_xEventAttacher->getScriptEvents( i_nIndex ) );
+            bool hasVBABindings = lcl_hasVbaEvents( m_xEventAttacher->getScriptEvents( i_nIndex ) );  
             if ( hasVBABindings )
                 break;
 
@@ -306,7 +306,7 @@ namespace
         _rSave.reserve( _nItemCount );
 
         // copy the events
-        for (sal_Int32 i=0; i<_nItemCount; ++i)
+        for (sal_Int32 i=0; i<_nItemCount; ++i) 
             _rSave.push_back(_rxManager->getScriptEvents( i ));
     }
 
@@ -378,14 +378,14 @@ struct TransformEventTo52Format : public ::std::unary_function< ScriptEventDescr
     void operator()( ScriptEventDescriptor& _rDescriptor )
     {
         if ( 0 == _rDescriptor.ScriptType.compareToAscii( "StarBasic" ) )
-        {   // it's a starbasic macro
+        {	// it's a starbasic macro
             sal_Int32 nPrefixLength = _rDescriptor.ScriptCode.indexOf( ':' );
             if ( 0 <= nPrefixLength )
-            {   // the macro name does not already contain a :
+            {	// the macro name does not already contain a :
 #ifdef DBG_UTIL
                 const ::rtl::OUString sPrefix = _rDescriptor.ScriptCode.copy( 0, nPrefixLength );
-                DBG_ASSERT( 0 == sPrefix.compareToAscii( "document" )
-                        ||  0 == sPrefix.compareToAscii( "application" ),
+                DBG_ASSERT(	0 == sPrefix.compareToAscii( "document" )
+                        ||	0 == sPrefix.compareToAscii( "application" ),
                         "TransformEventTo52Format: invalid (unknown) prefix!" );
 #endif
                 // cut the prefix
@@ -401,9 +401,9 @@ struct TransformEventTo60Format : public ::std::unary_function< ScriptEventDescr
     void operator()( ScriptEventDescriptor& _rDescriptor )
     {
         if ( 0 == _rDescriptor.ScriptType.compareToAscii( "StarBasic" ) )
-        {   // it's a starbasic macro
+        {	// it's a starbasic macro
             if ( _rDescriptor.ScriptCode.indexOf( ':' ) < 0 )
-            {   // the macro name does not already contain a :
+            {	// the macro name does not already contain a :
                 // -> default the type to "document"
                 ::rtl::OUString sNewScriptCode( RTL_CONSTASCII_USTRINGPARAM( "document:" ) );
                 sNewScriptCode += _rDescriptor.ScriptCode;
@@ -434,8 +434,8 @@ void OInterfaceContainer::transformEvents( const EventFormat _eTargetFormat )
             if ( aChildEvents.getLength() )
             {
                 // the "iterators" for the events for this child
-                ScriptEventDescriptor* pChildEvents     =                       aChildEvents.getArray();
-                ScriptEventDescriptor* pChildEventsEnd  =   pChildEvents    +   aChildEvents.getLength();
+                ScriptEventDescriptor* pChildEvents		=						aChildEvents.getArray();
+                ScriptEventDescriptor* pChildEventsEnd	=	pChildEvents	+	aChildEvents.getLength();
 
                 // do the transformation
                 if ( efVersionSO6x == _eTargetFormat )
@@ -482,7 +482,7 @@ void SAL_CALL OInterfaceContainer::readEvents(const Reference<XObjectInputStream
         OInterfaceArray::const_iterator aAttachEnd = m_aItems.end();
         for ( sal_Int32 i=0; aAttach != aAttachEnd; ++aAttach, ++i )
         {
-            Reference< XInterface > xAsIFace( *aAttach, UNO_QUERY );    // important to normalize this ....
+            Reference< XInterface > xAsIFace( *aAttach, UNO_QUERY );	// important to normalize this ....
             Reference< XPropertySet > xAsSet( xAsIFace, UNO_QUERY );
             m_xEventAttacher->attach( i, xAsIFace, makeAny( xAsSet ) );
         }
@@ -601,11 +601,11 @@ void SAL_CALL OInterfaceContainer::read( const Reference< XObjectInputStream >&
                 try
                 {
                     implInsert(
-                        m_aItems.size(),    // position
-                        xElement,           // element to insert
-                        sal_False,          // no event attacher manager handling
-                        NULL,               // not yet approved - let implInsert do it
-                        sal_True            // fire the event
+                        m_aItems.size(),	// position
+                        xElement,			// element to insert
+                        sal_False,			// no event attacher manager handling
+                        NULL,				// not yet approved - let implInsert do it
+                        sal_True			// fire the event
                     );
                 }
                 catch( const Exception& )
@@ -827,7 +827,7 @@ void OInterfaceContainer::approveNewElement( const Reference< XPropertySet >& _r
         _pElement->xPropertySet = _rxObject;
         _pElement->xChild = xChild;
         _pElement->aElementTypeInterface = aCorrectType;
-        _pElement->xInterface = Reference< XInterface >( _rxObject, UNO_QUERY );    // normalized XInterface
+        _pElement->xInterface = Reference< XInterface >( _rxObject, UNO_QUERY );	// normalized XInterface
     }
 }
 
@@ -843,7 +843,7 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper
     ::std::auto_ptr< ElementDescription > aAutoDeleteMetaData;
     ElementDescription* pElementMetaData = _pApprovalResult;
     if ( !pElementMetaData )
-    {   // not yet approved by the caller -> do ourself
+    {	// not yet approved by the caller -> do ourself
         pElementMetaData = createElementMetaData();
         DBG_ASSERT( pElementMetaData, "OInterfaceContainer::implInsert: createElementMetaData returned nonsense!" );
 
@@ -895,19 +895,19 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper
     {
         Reference< XEventAttacherManager > xMgr ( pElementMetaData->xInterface, UNO_QUERY );
         if ( xMgr.is() )
-        {
+        { 
             OInterfaceContainer* pIfcMgr = dynamic_cast< OInterfaceContainer* >( xMgr.get() );
             sal_Int32 nLen = pIfcMgr->getCount();
             for ( sal_Int32 i = 0; (i < nLen) && pIfcMgr ; ++i )
-            {
+            {	
                 // add fake events to the control at index i
                 pIfcMgr->impl_addVbEvents_nolck_nothrow( i );
-            }
+            }	
         }
         else
         {
             // add fake events to the control at index i
-            impl_addVbEvents_nolck_nothrow( _nIndex );
+            impl_addVbEvents_nolck_nothrow( _nIndex );	
         }
     }
 
@@ -1141,11 +1141,11 @@ void SAL_CALL OInterfaceContainer::insertByName(const ::rtl::OUString& _rName, c
     }
     catch( const IllegalArgumentException& )
     {
-        throw;  // allowed to leave
+        throw;	// allowed to leave
     }
     catch( const ElementExistException& )
     {
-        throw;  // allowed to leave
+        throw;	// allowed to leave
     }
     catch( const Exception& )
     {
@@ -1366,7 +1366,7 @@ InterfaceRef OFormComponents::getParent() throw( RuntimeException )
 }
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/misc/componenttools.cxx b/forms/source/misc/componenttools.cxx
index abd4c96f5482..f1e3fb0586dc 100644
--- a/forms/source/misc/componenttools.cxx
+++ b/forms/source/misc/componenttools.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/misc/frm_module.cxx b/forms/source/misc/frm_module.cxx
index e1f4fcaf8bc9..684112b50629 100644
--- a/forms/source/misc/frm_module.cxx
+++ b/forms/source/misc/frm_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
diff --git a/forms/source/misc/frm_strings.cxx b/forms/source/misc/frm_strings.cxx
index 62c4a1ee5b8d..f5650e832576 100644
--- a/forms/source/misc/frm_strings.cxx
+++ b/forms/source/misc/frm_strings.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/misc/ids.cxx b/forms/source/misc/ids.cxx
index c9b0265bd533..ee0605790d4d 100644
--- a/forms/source/misc/ids.cxx
+++ b/forms/source/misc/ids.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/misc/limitedformats.cxx b/forms/source/misc/limitedformats.cxx
index 8d2e13e0ea69..d63cb79cd96c 100644
--- a/forms/source/misc/limitedformats.cxx
+++ b/forms/source/misc/limitedformats.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace frm
     using namespace ::com::sun::star::form;
     using namespace ::com::sun::star::beans;
 
-    sal_Int32                               OLimitedFormats::s_nInstanceCount(0);
-    ::osl::Mutex                            OLimitedFormats::s_aMutex;
-    Reference< XNumberFormatsSupplier >     OLimitedFormats::s_xStandardFormats;
+    sal_Int32								OLimitedFormats::s_nInstanceCount(0);
+    ::osl::Mutex							OLimitedFormats::s_aMutex;
+    Reference< XNumberFormatsSupplier >		OLimitedFormats::s_xStandardFormats;
 
     //=====================================================================
     //=
@@ -89,8 +89,8 @@ namespace frm
     struct FormatEntry
     {
         const sal_Char* pDescription;
-        sal_Int32       nKey;
-        LocaleType      eLocale;
+        sal_Int32		nKey;
+        LocaleType		eLocale;
     };
 
     //---------------------------------------------------------------------
@@ -267,7 +267,7 @@ namespace frm
 
             // seek to the nValue'th entry
             sal_Int32 nLookup = 0;
-            for (   ;
+            for	(	;
                     (NULL != pFormats->pDescription) && (nLookup < nValue);
                     ++pFormats, ++nLookup
                 )
@@ -305,7 +305,7 @@ namespace frm
 
             // look for the entry with the given format key
             sal_Int32 nTablePosition = 0;
-            for (   ;
+            for	(	;
                     (NULL != pFormats->pDescription) && (nNewFormat != pFormats->nKey);
                     ++pFormats, ++nTablePosition
                 )
@@ -323,7 +323,7 @@ namespace frm
             }
 
             if (!_rOldValue.hasValue())
-            {   // did not reach the end of the table (means we found nNewFormat)
+            {	// did not reach the end of the table (means we found nNewFormat)
                 // -> go to the end to ensure that _rOldValue is set
                 while (pFormats->pDescription)
                 {
@@ -341,7 +341,7 @@ namespace frm
             OSL_ENSURE(_rOldValue.hasValue(), "OLimitedFormats::convertFormatKeyPropertyValue: did not find the old enum value in the table!");
 
             if (!bFoundIt)
-            {   // somebody gave us an format which we can't translate
+            {	// somebody gave us an format which we can't translate
                 ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii("This control supports only a very limited number of formats.");
                 throw IllegalArgumentException(sMessage, NULL, 2);
             }
@@ -358,7 +358,7 @@ namespace frm
         OSL_ENSURE(m_xAggregate.is() && (-1 != m_nFormatEnumPropertyHandle), "OLimitedFormats::setFormatKeyPropertyValue: not initialized!");
 
         if (m_xAggregate.is())
-        {   // this is to be called after convertFormatKeyPropertyValue, where
+        {	// this is to be called after convertFormatKeyPropertyValue, where
             // we translated the format key into a enum value.
             // So now we can simply forward this enum value to our aggreate
             m_xAggregate->setFastPropertyValue(m_nFormatEnumPropertyHandle, _rNewValue);
@@ -370,7 +370,7 @@ namespace frm
     {
         ::osl::MutexGuard aGuard(s_aMutex);
         if ((1 == ++s_nInstanceCount) && _rxORB.is())
-        {   // create the standard formatter
+        {	// create the standard formatter
 
             Sequence< Any > aInit(1);
             aInit[0] <<= getLocale(ltEnglishUS);
@@ -398,7 +398,7 @@ namespace frm
     }
 
 //.........................................................................
-}   // namespace frm
+}	// namespace frm
 //.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/misc/listenercontainers.cxx b/forms/source/misc/listenercontainers.cxx
index 56297368ff74..641be686b161 100644
--- a/forms/source/misc/listenercontainers.cxx
+++ b/forms/source/misc/listenercontainers.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/misc/property.cxx b/forms/source/misc/property.cxx
index 0d97609f0eb7..4e95fa85ca17 100644
--- a/forms/source/misc/property.cxx
+++ b/forms/source/misc/property.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ sal_Int32 PropertyInfoService::getPropertyId(const ::rtl::OUString& _rName)
 
     sal_Int32 nHandle = -1;
     if (aPair.first != aPair.second)
-    {   // we found something _and_ we have an identity
+    {	// we found something _and_ we have an identity
         nHandle = aPair.first->nHandle;
     }
 
diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx
index 2732b86bfc8f..a06f4bee89c9 100644
--- a/forms/source/misc/services.cxx
+++ b/forms/source/misc/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
@@ -103,17 +103,17 @@ DECLARE_SERVICE_INFO(ImageProducer)
 
 //---------------------------------------------------------------------------------------
 
-static Sequence< ::rtl::OUString >                      s_aClassImplementationNames;
-static Sequence<Sequence< ::rtl::OUString > >   s_aClassServiceNames;
-static Sequence<sal_Int64>                              s_aFactories;
+static Sequence< ::rtl::OUString >						s_aClassImplementationNames;
+static Sequence<Sequence< ::rtl::OUString > >	s_aClassServiceNames;
+static Sequence<sal_Int64>								s_aFactories;
     // need to use sal_Int64 instead of ComponentInstantiation, as ComponentInstantiation has no cppuType, so
     // it can't be used with sequences
 
 //---------------------------------------------------------------------------------------
 void registerClassInfo(
-        ::rtl::OUString _rClassImplName,                                // the ImplName of the class
-        const Sequence< ::rtl::OUString >& _rServiceNames,      // the services supported by this class
-        ::cppu::ComponentInstantiation _pCreateFunction                 // the method for instantiating such a class
+        ::rtl::OUString _rClassImplName,								// the ImplName of the class
+        const Sequence< ::rtl::OUString >& _rServiceNames,		// the services supported by this class
+        ::cppu::ComponentInstantiation _pCreateFunction					// the method for instantiating such a class
         )
 {
     sal_Int32 nCurrentLength = s_aClassImplementationNames.getLength();
diff --git a/forms/source/resource/frm_resource.cxx b/forms/source/resource/frm_resource.cxx
index 93746147f3cd..c8d65eb914fd 100644
--- a/forms/source/resource/frm_resource.cxx
+++ b/forms/source/resource/frm_resource.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 frm
         if (m_pImpl)
         {
             // no that we have a impl class make sure it's deleted on unloading the library
-            static ResourceManager::EnsureDelete    s_aDeleteTheImplClas;
+            static ResourceManager::EnsureDelete	s_aDeleteTheImplClas;
         }
     }
 
diff --git a/forms/source/resource/strings.src b/forms/source/resource/strings.src
index 96f2c1d95dfb..54cf3d56a617 100644
--- a/forms/source/resource/strings.src
+++ b/forms/source/resource/strings.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/resource/xforms.src b/forms/source/resource/xforms.src
index 4efa63320a6f..b01f5c8cb3a5 100644
--- a/forms/source/resource/xforms.src
+++ b/forms/source/resource/xforms.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/richtext/attributedispatcher.cxx b/forms/source/richtext/attributedispatcher.cxx
index 0599aef47105..b93370868900 100644
--- a/forms/source/richtext/attributedispatcher.cxx
+++ b/forms/source/richtext/attributedispatcher.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace frm
         if ( m_pMasterDispatcher )
             m_pMasterDispatcher->executeAttribute( m_nAttributeId, NULL );
     }
-
+    
     //--------------------------------------------------------------------
     void OAttributeDispatcher::onAttributeStateChanged( AttributeId _nAttributeId, const AttributeState& /*_rState*/ )
     {
diff --git a/forms/source/richtext/attributedispatcher.hxx b/forms/source/richtext/attributedispatcher.hxx
index 3dafb5c3f53f..df52d3bff6cf 100644
--- a/forms/source/richtext/attributedispatcher.hxx
+++ b/forms/source/richtext/attributedispatcher.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/richtext/clipboarddispatcher.cxx b/forms/source/richtext/clipboarddispatcher.cxx
index 02a44fef4c42..fa387f56aead 100644
--- a/forms/source/richtext/clipboarddispatcher.cxx
+++ b/forms/source/richtext/clipboarddispatcher.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/richtext/clipboarddispatcher.hxx b/forms/source/richtext/clipboarddispatcher.hxx
index b41527036ef9..8019dda3cc3c 100644
--- a/forms/source/richtext/clipboarddispatcher.hxx
+++ b/forms/source/richtext/clipboarddispatcher.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/richtext/featuredispatcher.cxx b/forms/source/richtext/featuredispatcher.cxx
index 7514d4a2a35f..174b97585f46 100644
--- a/forms/source/richtext/featuredispatcher.cxx
+++ b/forms/source/richtext/featuredispatcher.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace frm
                 newStatusListener( _rxControl );
             }
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL ORichTextFeatureDispatcher::removeStatusListener( const Reference< XStatusListener >& _rxControl, const URL& /*_rURL*/ ) throw (RuntimeException)
     {
diff --git a/forms/source/richtext/featuredispatcher.hxx b/forms/source/richtext/featuredispatcher.hxx
index 2eb80a914c40..5fff974d722b 100644
--- a/forms/source/richtext/featuredispatcher.hxx
+++ b/forms/source/richtext/featuredispatcher.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/richtext/parametrizedattributedispatcher.cxx b/forms/source/richtext/parametrizedattributedispatcher.cxx
index a13f165af945..45ff2e5abed8 100644
--- a/forms/source/richtext/parametrizedattributedispatcher.cxx
+++ b/forms/source/richtext/parametrizedattributedispatcher.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/richtext/parametrizedattributedispatcher.hxx b/forms/source/richtext/parametrizedattributedispatcher.hxx
index 0f911dbf4df8..f5f91bd81a88 100644
--- a/forms/source/richtext/parametrizedattributedispatcher.hxx
+++ b/forms/source/richtext/parametrizedattributedispatcher.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index dd71a80f9172..f277eac23127 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -279,7 +279,7 @@ namespace frm
     }
 
     //------------------------------------------------------------------
-    ::rtl::OUString SAL_CALL ORichTextControl::getImplementationName()  throw( RuntimeException )
+    ::rtl::OUString	SAL_CALL ORichTextControl::getImplementationName()  throw( RuntimeException )
     {
         return getImplementationName_Static();
     }
@@ -291,7 +291,7 @@ namespace frm
     }
 
     //------------------------------------------------------------------
-    ::rtl::OUString SAL_CALL ORichTextControl::getImplementationName_Static()
+    ::rtl::OUString	SAL_CALL ORichTextControl::getImplementationName_Static()
     {
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.form.ORichTextControl" ) );
     }
diff --git a/forms/source/richtext/richtextcontrol.hxx b/forms/source/richtext/richtextcontrol.hxx
index ad16b0fc9c42..05ee2935513e 100644
--- a/forms/source/richtext/richtextcontrol.hxx
+++ b/forms/source/richtext/richtextcontrol.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,9 +74,9 @@ namespace frm
 
     public:
         // XServiceInfo - static version
-        static  ::rtl::OUString SAL_CALL getImplementationName_Static();
-        static  ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static();
-        static  ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory );
+        static	::rtl::OUString	SAL_CALL getImplementationName_Static();
+        static	::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static();
+        static	::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory );
 
     protected:
         // UNO
@@ -87,7 +87,7 @@ namespace frm
         virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& _rToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& _rParent ) throw( ::com::sun::star::uno::RuntimeException );
 
         // XServiceInfo
-        virtual ::rtl::OUString SAL_CALL getImplementationName()  throw(::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString	SAL_CALL getImplementationName()  throw(::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()  throw(::com::sun::star::uno::RuntimeException);
 
         // XTypeProvider
diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx
index a627c6d0e4e3..13a371b0d19c 100644
--- a/forms/source/richtext/richtextengine.cxx
+++ b/forms/source/richtext/richtextengine.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/richtext/richtextengine.hxx b/forms/source/richtext/richtextengine.hxx
index c571f51e9aaf..0c24d28c1539 100644
--- a/forms/source/richtext/richtextengine.hxx
+++ b/forms/source/richtext/richtextengine.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx
index 244291bc81f9..b2c9541086a2 100644
--- a/forms/source/richtext/richtextimplcontrol.cxx
+++ b/forms/source/richtext/richtextimplcontrol.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/richtext/richtextimplcontrol.hxx b/forms/source/richtext/richtextimplcontrol.hxx
index a79efcf1b89d..c16e749758a0 100644
--- a/forms/source/richtext/richtextimplcontrol.hxx
+++ b/forms/source/richtext/richtextimplcontrol.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx
index 42accca83e79..7deb75f7426e 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/richtext/richtextmodel.hxx b/forms/source/richtext/richtextmodel.hxx
index 18c083d02c80..6be38c0408fd 100644
--- a/forms/source/richtext/richtextmodel.hxx
+++ b/forms/source/richtext/richtextmodel.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace frm
         sal_Bool                    m_bMultiLine;
         // </properties_for_awt_edit_compatibility>
 
-        ::std::auto_ptr<RichTextEngine>
+        ::std::auto_ptr<RichTextEngine>             
                                     m_pEngine;
         bool                        m_bSettingEngineText;
 
diff --git a/forms/source/richtext/richtextunowrapper.cxx b/forms/source/richtext/richtextunowrapper.cxx
index fd1e5cc74e5a..1f4f833ad52f 100644
--- a/forms/source/richtext/richtextunowrapper.cxx
+++ b/forms/source/richtext/richtextunowrapper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/richtext/richtextunowrapper.hxx b/forms/source/richtext/richtextunowrapper.hxx
index ef9ecbe57338..9605156b274a 100644
--- a/forms/source/richtext/richtextunowrapper.hxx
+++ b/forms/source/richtext/richtextunowrapper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index 53e7d9091f80..d41480a98f98 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/richtext/richtextvclcontrol.hxx b/forms/source/richtext/richtextvclcontrol.hxx
index 4ea84a925519..b113e41ef0ef 100644
--- a/forms/source/richtext/richtextvclcontrol.hxx
+++ b/forms/source/richtext/richtextvclcontrol.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/richtext/richtextviewport.cxx b/forms/source/richtext/richtextviewport.cxx
index 5d6bff8e85bb..22688981ddfb 100644
--- a/forms/source/richtext/richtextviewport.cxx
+++ b/forms/source/richtext/richtextviewport.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/richtext/richtextviewport.hxx b/forms/source/richtext/richtextviewport.hxx
index 2e89fe9a5a74..b99320c06285 100644
--- a/forms/source/richtext/richtextviewport.hxx
+++ b/forms/source/richtext/richtextviewport.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx
index 3b43f137ab6a..392425ecce56 100644
--- a/forms/source/richtext/rtattributehandler.cxx
+++ b/forms/source/richtext/rtattributehandler.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/richtext/rtattributehandler.hxx b/forms/source/richtext/rtattributehandler.hxx
index 87e192032c38..da4a82cabb0f 100644
--- a/forms/source/richtext/rtattributehandler.hxx
+++ b/forms/source/richtext/rtattributehandler.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/richtext/rtattributes.hxx b/forms/source/richtext/rtattributes.hxx
index c15eca82f587..2dae7a3e56f4 100644
--- a/forms/source/richtext/rtattributes.hxx
+++ b/forms/source/richtext/rtattributes.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/richtext/specialdispatchers.cxx b/forms/source/richtext/specialdispatchers.cxx
index 1cbd2520ee3b..c36742bd7de5 100644
--- a/forms/source/richtext/specialdispatchers.cxx
+++ b/forms/source/richtext/specialdispatchers.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace frm
             getEditView()->SetSelection( ESelection( 0, 0, nLastParaNumber, nParaLen ) );
         }
     }
-
+    
     //--------------------------------------------------------------------
     FeatureStateEvent OSelectAllDispatcher::buildStatusEvent() const
     {
@@ -144,7 +144,7 @@ namespace frm
 
         pEngine->SetVertical( !pEngine->IsVertical() );
     }
-
+    
     //--------------------------------------------------------------------
     FeatureStateEvent OTextDirectionDispatcher::buildStatusEvent() const
     {
diff --git a/forms/source/richtext/specialdispatchers.hxx b/forms/source/richtext/specialdispatchers.hxx
index 4f8c48a6bd84..e050f024aceb 100644
--- a/forms/source/richtext/specialdispatchers.hxx
+++ b/forms/source/richtext/specialdispatchers.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/richtext/textattributelistener.hxx b/forms/source/richtext/textattributelistener.hxx
index 51ea48f42af1..2febc3a458f0 100644
--- a/forms/source/richtext/textattributelistener.hxx
+++ b/forms/source/richtext/textattributelistener.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index 601af810779b..e857787f6012 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,7 +158,7 @@ namespace frm
     {
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.forms.FormOperations" ) );
     }
-
+    
     //--------------------------------------------------------------------
     Sequence< ::rtl::OUString > FormOperations::getSupportedServiceNames_Static(  ) throw(RuntimeException)
     {
@@ -166,13 +166,13 @@ namespace frm
         aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.runtime.FormOperations" ) );
         return aNames;
     }
-
+    
     //--------------------------------------------------------------------
     Reference< XInterface > SAL_CALL FormOperations::Create(const Reference< XMultiServiceFactory >& _rxFactory )
     {
         return *new FormOperations( _rxFactory );
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL FormOperations::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException)
     {
@@ -194,13 +194,13 @@ namespace frm
 
         throw IllegalArgumentException( ::rtl::OUString(), *this, 0 );
     }
-
+    
     //--------------------------------------------------------------------
     ::rtl::OUString SAL_CALL FormOperations::getImplementationName(  ) throw (RuntimeException)
     {
         return getImplementationName_Static();
     }
-
+    
     //--------------------------------------------------------------------
     ::sal_Bool SAL_CALL FormOperations::supportsService( const ::rtl::OUString& _ServiceName ) throw (RuntimeException)
     {
@@ -209,7 +209,7 @@ namespace frm
         const ::rtl::OUString* pEnd = aSupportedServiceNames.getConstArray() + aSupportedServiceNames.getLength();
         return ::std::find( pBegin, pEnd, _ServiceName ) != pEnd;
     }
-
+    
     //--------------------------------------------------------------------
     Sequence< ::rtl::OUString > SAL_CALL FormOperations::getSupportedServiceNames(  ) throw (RuntimeException)
     {
@@ -222,35 +222,35 @@ namespace frm
         MethodGuard aGuard( *this );
         return m_xCursor;
     }
-
+    
     //--------------------------------------------------------------------
     Reference< XResultSetUpdate > SAL_CALL FormOperations::getUpdateCursor() throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         return m_xUpdateCursor;
     }
-
+    
     //--------------------------------------------------------------------
     Reference< XFormController > SAL_CALL FormOperations::getController() throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         return m_xController;
     }
-
+    
     //--------------------------------------------------------------------
     Reference< XFeatureInvalidation > SAL_CALL FormOperations::getFeatureInvalidation() throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         return m_xFeatureInvalidation;
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL FormOperations::setFeatureInvalidation( const Reference< XFeatureInvalidation > & _rxFeatureInvalidation ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         m_xFeatureInvalidation = _rxFeatureInvalidation;
     }
-
+    
     //--------------------------------------------------------------------
     FeatureState SAL_CALL FormOperations::getState( ::sal_Int16 _nFeature ) throw (RuntimeException)
     {
@@ -262,9 +262,9 @@ namespace frm
         try
         {
             // some checks for basic pre-requisites
-            if  (   !m_xLoadableForm.is()
+            if	(	!m_xLoadableForm.is()
                 ||  !m_xLoadableForm->isLoaded()
-                ||  !m_xCursorProperties.is()
+                ||	!m_xCursorProperties.is()
                 )
             {
                 return aState;
@@ -433,7 +433,7 @@ namespace frm
 
         return aState;
     }
-
+    
     //--------------------------------------------------------------------
     ::sal_Bool SAL_CALL FormOperations::isEnabled( ::sal_Int16 _nFeature ) throw (RuntimeException)
     {
@@ -442,7 +442,7 @@ namespace frm
         FeatureState aState( getState( _nFeature ) );
         return aState.Enabled;
     }
-
+    
     //--------------------------------------------------------------------
     namespace
     {
@@ -734,7 +734,7 @@ namespace frm
 
         impl_invalidateAllSupportedFeatures_nothrow( aGuard );
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL FormOperations::executeWithArguments( ::sal_Int16 _nFeature, const Sequence< NamedValue >& _rArguments ) throw (RuntimeException, IllegalArgumentException, SQLException, WrappedTargetException)
     {
@@ -826,7 +826,7 @@ namespace frm
         }
         return bResult;
     }
-
+    
     //--------------------------------------------------------------------
     ::sal_Bool SAL_CALL FormOperations::commitCurrentControl() throw (RuntimeException, SQLException)
     {
@@ -891,7 +891,7 @@ namespace frm
         }
         return bIs;
     }
-
+    
     //--------------------------------------------------------------------
     ::sal_Bool SAL_CALL FormOperations::isModifiedRow() throw (RuntimeException, WrappedTargetException)
     {
@@ -916,19 +916,19 @@ namespace frm
 
         impl_invalidateAllSupportedFeatures_nothrow( aGuard );
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL FormOperations::rowChanged( const EventObject& /*_Event*/ ) throw (RuntimeException)
     {
         // not interested in
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL FormOperations::rowSetChanged( const EventObject& /*_Event*/ ) throw (RuntimeException)
     {
         // not interested in
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL FormOperations::modified( const EventObject& /*_Source*/ ) throw( RuntimeException )
     {
@@ -941,7 +941,7 @@ namespace frm
             impl_invalidateModifyDependentFeatures_nothrow( aGuard );
         }
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL FormOperations::propertyChange( const PropertyChangeEvent& _rEvent ) throw (RuntimeException)
     {
@@ -989,13 +989,13 @@ namespace frm
             impl_invalidateAllSupportedFeatures_nothrow( aGuard );
         }
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL FormOperations::disposing( const EventObject& /*_Source*/ ) throw (RuntimeException)
     {
         // TODO: should we react on this? Or is this the responsibility of our owner to dispose us?
     }
-
+    
     //--------------------------------------------------------------------
     void SAL_CALL FormOperations::disposing()
     {
@@ -1524,7 +1524,7 @@ namespace frm
 
 
             if ( !m_xLoadableForm->isLoaded() )
-            {   // something went wrong -> restore the original state
+            {	// something went wrong -> restore the original state
                 try
                 {
                     m_xParser->setOrder( sOriginalSort );
@@ -1597,7 +1597,7 @@ namespace frm
 
 
             if ( !m_xLoadableForm->isLoaded() )
-            {   // something went wrong -> restore the original state
+            {	// something went wrong -> restore the original state
                 try
                 {
                     m_xParser->setOrder( sOriginalFilter );
diff --git a/forms/source/runtime/formoperations.hxx b/forms/source/runtime/formoperations.hxx
index 3699a2474f72..1d6d028fd7ad 100644
--- a/forms/source/runtime/formoperations.hxx
+++ b/forms/source/runtime/formoperations.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx
index 673501803f29..5e73342d680d 100644
--- a/forms/source/solar/component/navbarcontrol.cxx
+++ b/forms/source/solar/component/navbarcontrol.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -217,7 +217,7 @@ namespace frm
     }
 
     //------------------------------------------------------------------
-    ::rtl::OUString SAL_CALL ONavigationBarControl::getImplementationName()  throw( RuntimeException )
+    ::rtl::OUString	SAL_CALL ONavigationBarControl::getImplementationName()  throw( RuntimeException )
     {
         return getImplementationName_Static();
     }
@@ -229,7 +229,7 @@ namespace frm
     }
 
     //------------------------------------------------------------------
-    ::rtl::OUString SAL_CALL ONavigationBarControl::getImplementationName_Static()
+    ::rtl::OUString	SAL_CALL ONavigationBarControl::getImplementationName_Static()
     {
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.form.ONavigationBarControl" ) );
     }
@@ -297,7 +297,7 @@ namespace frm
 
         // we want a faster repeating rate for the slots in this
         // toolbox
-        AllSettings aSettings = pNavBar->GetSettings();
+        AllSettings	aSettings = pNavBar->GetSettings();
         MouseSettings aMouseSettings = aSettings.GetMouseSettings();
         aMouseSettings.SetButtonRepeat( 10 );
         aSettings.SetMouseSettings( aMouseSettings );
diff --git a/forms/source/solar/component/navbarcontrol.hxx b/forms/source/solar/component/navbarcontrol.hxx
index 864ff225e8de..8c5bd8b45524 100644
--- a/forms/source/solar/component/navbarcontrol.hxx
+++ b/forms/source/solar/component/navbarcontrol.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace frm
 
     public:
         // XServiceInfo - static version
-        static  ::rtl::OUString SAL_CALL getImplementationName_Static();
-        static  ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static();
-        static  ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory );
+        static	::rtl::OUString	SAL_CALL getImplementationName_Static();
+        static	::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static();
+        static	::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory );
 
     protected:
         // UNO
@@ -84,7 +84,7 @@ namespace frm
         virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& _rToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& _rParent ) throw( ::com::sun::star::uno::RuntimeException );
 
         // XServiceInfo
-        virtual ::rtl::OUString SAL_CALL getImplementationName()  throw(::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString	SAL_CALL getImplementationName()  throw(::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()  throw(::com::sun::star::uno::RuntimeException);
 
         // XTypeProvider
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index 7e5974971283..bdc4e981d1a2 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/solar/inc/navtoolbar.hxx b/forms/source/solar/inc/navtoolbar.hxx
index 03343e5d2d8b..2caba050b81a 100644
--- a/forms/source/solar/inc/navtoolbar.hxx
+++ b/forms/source/solar/inc/navtoolbar.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/xforms/NameContainer.hxx b/forms/source/xforms/NameContainer.hxx
index b4481a5434d8..fe8a6a480986 100644
--- a/forms/source/xforms/NameContainer.hxx
+++ b/forms/source/xforms/NameContainer.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ protected:
         return findItem( rName ) != maItems.end();
     }
 
-    T getItem( const rtl::OUString& rName )
+    T getItem( const rtl::OUString& rName ) 
     {
         OSL_ENSURE( hasItem( rName ), "can't get non-existant item" );
         return maItems[ rName ];
@@ -123,7 +123,7 @@ public:
     //
 
     virtual com::sun::star::uno::Any SAL_CALL getByName(
-        const rtl::OUString& rName )
+        const rtl::OUString& rName ) 
         throw( com::sun::star::container::NoSuchElementException,
                com::sun::star::lang::WrappedTargetException,
                com::sun::star::uno::RuntimeException )
diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx
index 0ec73fc116b0..853e42964430 100644
--- a/forms/source/xforms/binding.cxx
+++ b/forms/source/xforms/binding.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -248,7 +248,7 @@ bool Binding::isValid()
         isValid_DataType() &&
         maMIP.isConstraint() &&
         ( ! maMIP.isRequired() ||
-             ( maBindingExpression.hasValue() &&
+             ( maBindingExpression.hasValue() && 
                maBindingExpression.getString().getLength() > 0 ) );
 }
 
@@ -292,7 +292,7 @@ OUString Binding::explainInvalid()
         if( sReason.getLength() == 0 )
         {
             // no explanation given by data type? Then give generic message
-            sReason = getResource( RID_STR_XFORMS_INVALID_VALUE,
+            sReason = getResource( RID_STR_XFORMS_INVALID_VALUE, 
                                    maMIP.getTypeName() );
         }
     }
@@ -300,7 +300,7 @@ OUString Binding::explainInvalid()
     {
         sReason = maMIP.getConstraintExplanation();
     }
-    else if( maMIP.isRequired() && maBindingExpression.hasValue() &&
+    else if( maMIP.isRequired() && maBindingExpression.hasValue() && 
         ( maBindingExpression.getString().getLength() == 0 )  )
     {
         sReason = getResource( RID_STR_XFORMS_REQUIRED );
@@ -342,7 +342,7 @@ Binding::IntSequence_t Binding::getUnoTunnelID()
 Binding* SAL_CALL Binding::getBinding( const Reference<XPropertySet>& xPropertySet )
 {
     Reference<XUnoTunnel> xTunnel( xPropertySet, UNO_QUERY );
-    return xTunnel.is()
+    return xTunnel.is() 
         ? reinterpret_cast<Binding*>( xTunnel->getSomething(getUnoTunnelID()))
         : NULL;
 }
@@ -522,7 +522,7 @@ Model* Binding::getModelImpl() const
 Model* Binding::getModelImpl( const Model_t& xModel ) const
 {
     Reference<XUnoTunnel> xTunnel( xModel, UNO_QUERY );
-    Model* pModel = xTunnel.is()
+    Model* pModel = xTunnel.is() 
         ? reinterpret_cast<Model*>(
             xTunnel->getSomething( Model::getUnoTunnelID() ) )
         : NULL;
@@ -539,13 +539,13 @@ void lcl_addListenerToNode( Reference<XNode> xNode,
                                    xListener, false );
         xTarget->addEventListener( OUSTRING("DOMCharacterDataModified"),
                                    xListener, true );
-        xTarget->addEventListener( OUSTRING("DOMAttrModified"),
+        xTarget->addEventListener( OUSTRING("DOMAttrModified"), 
                                    xListener, false );
-        xTarget->addEventListener( OUSTRING("DOMAttrModified"),
+        xTarget->addEventListener( OUSTRING("DOMAttrModified"), 
                                    xListener, true );
-        xTarget->addEventListener( OUSTRING("DOMAttrModified"),
+        xTarget->addEventListener( OUSTRING("DOMAttrModified"), 
                                    xListener, true );
-        xTarget->addEventListener( OUSTRING("xforms-generic"),
+        xTarget->addEventListener( OUSTRING("xforms-generic"), 
                                    xListener, true );
     }
 }
@@ -560,11 +560,11 @@ void lcl_removeListenerFromNode( Reference<XNode> xNode,
                                       xListener, false );
         xTarget->removeEventListener( OUSTRING("DOMCharacterDataModified"),
                                       xListener, true );
-        xTarget->removeEventListener( OUSTRING("DOMAttrModified"),
+        xTarget->removeEventListener( OUSTRING("DOMAttrModified"), 
                                       xListener, false );
-        xTarget->removeEventListener( OUSTRING("DOMAttrModified"),
+        xTarget->removeEventListener( OUSTRING("DOMAttrModified"), 
                                       xListener, true );
-        xTarget->removeEventListener( OUSTRING("xforms-generic"),
+        xTarget->removeEventListener( OUSTRING("xforms-generic"), 
                                       xListener, true );
     }
 }
@@ -585,7 +585,7 @@ void lcl_removeListenerFromNode( Reference<XNode> xNode,
         OSL_ENSURE( aIter->is(), "no node?" );
 
         // create proper evaluation context for this MIP
-        aVector.push_back( EvaluationContext( *aIter, getModel(),
+        aVector.push_back( EvaluationContext( *aIter, getModel(), 
                                               getBindingNamespaces(),
                                               nCount, aNodes.size() ) );
     }
@@ -614,16 +614,16 @@ void Binding::bind( bool bForceRebind )
     if( ! maBindingExpression.getNode().is() )
     {
         // 1b) create node (if valid element name)
-        if( isValidQName( maBindingExpression.getExpression(),
+        if( isValidQName( maBindingExpression.getExpression(), 
                           aContext.mxNamespaces ) )
         {
-            aContext.mxContextNode->appendChild(
-                Reference<XNode>(
-                    aContext.mxContextNode->getOwnerDocument()->createElement(
+            aContext.mxContextNode->appendChild( 
+                Reference<XNode>( 
+                    aContext.mxContextNode->getOwnerDocument()->createElement( 
                         maBindingExpression.getExpression() ),
                     UNO_QUERY ) );
             maBindingExpression.evaluate( aContext );
-            OSL_ENSURE( maBindingExpression.getNode().is(),
+            OSL_ENSURE( maBindingExpression.getNode().is(), 
                         "we should bind to the newly inserted node!" );
         }
     }
@@ -643,8 +643,8 @@ void Binding::bind( bool bForceRebind )
                  aIter++ )
                 maEventNodes.push_back( *aIter );
         else
-            maEventNodes.push_back(
-                Reference<XNode>( aContext.mxContextNode->getOwnerDocument(),
+            maEventNodes.push_back( 
+                Reference<XNode>( aContext.mxContextNode->getOwnerDocument(), 
                                   UNO_QUERY_THROW ) );
         for( PathExpression::NodeVector_t::iterator aIter2 = maEventNodes.begin();
              aIter2 != maEventNodes.end();
@@ -744,13 +744,13 @@ void Binding::valueModified()
     // control will query once the value has changed)
     Reference<XInterface> xSource = static_cast<XPropertySet*>( this );
     ::std::for_each( maModifyListeners.begin(),
-              maModifyListeners.end(),
+              maModifyListeners.end(), 
               ::std::bind2nd( ::std::ptr_fun( lcl_modified ), xSource ) );
     ::std::for_each( maListEntryListeners.begin(),
-              maListEntryListeners.end(),
+              maListEntryListeners.end(), 
               ::std::bind2nd( ::std::ptr_fun( lcl_listentry ), xSource ) );
     ::std::for_each( maValidityListeners.begin(),
-              maValidityListeners.end(),
+              maValidityListeners.end(), 
               ::std::bind2nd( ::std::ptr_fun( lcl_validate ), xSource ) );
 
     // now distribute MIPs to childs
@@ -837,7 +837,7 @@ Binding::XDataType_t Binding::getDataType()
     OSL_ENSURE( getModel().is(), "need model" );
     OSL_ENSURE( getModel()->getDataTypeRepository().is(), "need types" );
 
-    Reference<XDataTypeRepository> xRepository(
+    Reference<XDataTypeRepository> xRepository( 
         getModel()->getDataTypeRepository(), UNO_QUERY );
     OUString sTypeName = maMIP.getTypeName();
 
@@ -971,7 +971,7 @@ void Binding::_setNamespaces( const XNameContainer_t& rNamespaces,
                               bool bBinding )
 {
     Model* pModel = getModelImpl();
-    XNameContainer_t xModelNamespaces = ( pModel != NULL )
+    XNameContainer_t xModelNamespaces = ( pModel != NULL ) 
                                             ? pModel->getNamespaces()
                                             : NULL;
     OSL_ENSURE( ( pModel != NULL ) == xModelNamespaces.is(), "no model nmsp?");
@@ -992,10 +992,10 @@ void Binding::_setNamespaces( const XNameContainer_t& rNamespaces,
 
         // determine whether the namespace should go into model's or
         // into binding's namespaces
-        bool bLocal =
+        bool bLocal = 
             ! xModelNamespaces.is()
             || mxNamespaces->hasByName( rName )
-            || ( bBinding
+            || ( bBinding 
                  && xModelNamespaces.is()
                  && xModelNamespaces->hasByName( rName ) );
 
@@ -1051,20 +1051,20 @@ void Binding::_checkBindingID()
 // XValueBinding
 //
 
-Binding::Sequence_Type_t Binding::getSupportedValueTypes()
+Binding::Sequence_Type_t Binding::getSupportedValueTypes() 
     throw( RuntimeException )
 {
     return Convert::get().getTypes();
 }
 
-sal_Bool Binding::supportsType( const Type_t& rType )
+sal_Bool Binding::supportsType( const Type_t& rType ) 
     throw( RuntimeException )
 {
     return Convert::get().hasType( rType );
 }
 
 Binding::Any_t Binding::getValue( const Type_t& rType )
-    throw( IncompatibleTypesException,
+    throw( IncompatibleTypesException, 
            RuntimeException )
 {
     // first, check for model
@@ -1081,18 +1081,18 @@ Binding::Any_t Binding::getValue( const Type_t& rType )
             Convert &rConvert = Convert::get();
             result = rConvert.toAny(pathExpr,rType);
         }
-
-//      return maBindingExpression.hasValue()
+    
+//		return maBindingExpression.hasValue() 
   //      ? Convert::get().toAny( maBindingExpression.getString(), rType )
     //    : Any();
 
         return result;
 }
 
-void Binding::setValue( const Any_t& aValue )
-    throw( IncompatibleTypesException,
-           InvalidBindingStateException,
-           NoSupportException,
+void Binding::setValue( const Any_t& aValue ) 
+    throw( IncompatibleTypesException, 
+           InvalidBindingStateException, 
+           NoSupportException, 
            RuntimeException )
 {
     // first, check for model
@@ -1196,8 +1196,8 @@ void Binding::addListEntryListener( const XListEntryListener_t& xListener )
            RuntimeException )
 {
     OSL_ENSURE( xListener.is(), "need listener!" );
-    if( ::std::find( maListEntryListeners.begin(),
-              maListEntryListeners.end(),
+    if( ::std::find( maListEntryListeners.begin(), 
+              maListEntryListeners.end(), 
               xListener)
         == maListEntryListeners.end() )
         maListEntryListeners.push_back( xListener );
@@ -1207,15 +1207,15 @@ void Binding::removeListEntryListener( const XListEntryListener_t& xListener )
     throw( NullPointerException,
            RuntimeException )
 {
-    XListEntryListeners_t::iterator aIter =
-        ::std::find( maListEntryListeners.begin(), maListEntryListeners.end(),
+    XListEntryListeners_t::iterator aIter = 
+        ::std::find( maListEntryListeners.begin(), maListEntryListeners.end(), 
               xListener );
     if( aIter != maListEntryListeners.end() )
         maListEntryListeners.erase( aIter );
 }
 
 
-//
+// 
 // XValidator
 //
 
@@ -1256,8 +1256,8 @@ void Binding::removeValidityConstraintListener(
     throw( NullPointerException,
            RuntimeException )
 {
-    XValidityConstraintListeners_t::iterator aIter =
-        ::std::find( maValidityListeners.begin(), maValidityListeners.end(),
+    XValidityConstraintListeners_t::iterator aIter = 
+        ::std::find( maValidityListeners.begin(), maValidityListeners.end(), 
               xListener );
     if( aIter != maValidityListeners.end() )
         maValidityListeners.erase( aIter );
@@ -1265,7 +1265,7 @@ void Binding::removeValidityConstraintListener(
 
 
 
-//
+// 
 // xml::dom::event::XEventListener
 //
 
@@ -1367,7 +1367,7 @@ void Binding::initializePropertySet()
     initializePropertyValueCache( HANDLE_ExternalData );
 }
 
-void Binding::addModifyListener(
+void Binding::addModifyListener( 
     const XModifyListener_t& xListener )
     throw( RuntimeException )
 {
@@ -1386,7 +1386,7 @@ void Binding::removeModifyListener(
     const XModifyListener_t& xListener )
     throw( RuntimeException )
 {
-    ModifyListeners_t::iterator aIter =
+    ModifyListeners_t::iterator aIter = 
         ::std::find( maModifyListeners.begin(), maModifyListeners.end(), xListener );
     if( aIter != maModifyListeners.end() )
         maModifyListeners.erase( aIter );
diff --git a/forms/source/xforms/binding.hxx b/forms/source/xforms/binding.hxx
index ba538441df91..b61a5597d831 100644
--- a/forms/source/xforms/binding.hxx
+++ b/forms/source/xforms/binding.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 // forward declaractions
 namespace xforms
 {
-    class Model;
+    class Model; 
     class EvaluationContext;
 }
 namespace com { namespace sun { namespace star {
     namespace xml {
         namespace xpath { class XXPathAPI; }
-        namespace dom
-        {
-            class XNode;
+        namespace dom 
+        { 
+            class XNode; 
             class XNodeList;
         }
-    }
+    } 
     namespace container { class XNameContainer; }
     namespace xforms { class XModel; }
     namespace xsd { class XDataType; }
@@ -130,7 +130,7 @@ private:
     /// an XPath-expression to be instantiated on the data instance
     PathExpression maBindingExpression;
 
-    /// an XPath-expression to determine read-only status
+    /// an XPath-expression to determine read-only status 
     BoolExpression maReadonly;
 
     /// an XPath-expression to determine relevance
@@ -154,7 +154,7 @@ private:
     /// a type name
     rtl::OUString msTypeName;
 
-    /// modify listeners
+    /// modify listeners 
     ModifyListeners_t maModifyListeners;
 
     /// list entry listener
@@ -192,7 +192,7 @@ public:
 
     Model_t getModel() const;   /// get XForms model
     void _setModel( const Model_t& ); /// set XForms model (only called by Model)
-
+    
 
     rtl::OUString getModelID() const;   /// get ID of XForms model
 
@@ -223,7 +223,7 @@ public:
     void setType( const rtl::OUString& );  /// set type name MIP (static)
 
     // a binding expression can only be interpreted with respect to
-    // suitable namespace declarations. We collect those in the model and in a binding.
+    // suitable namespace declarations. We collect those in the model and in a binding. 
 
     // access to a binding's namespace
     // (set-method only changes local namespaces (but may add to model))
@@ -246,7 +246,7 @@ public:
     // - type (static; default: xsd:string)
     // - minOccurs/maxOccurs (computed XPath; default: 0/inf)
     // - p3ptype (static; no default)
-
+    
 
 
 
@@ -260,7 +260,7 @@ public:
     XNodeList_t getXNodeList();
 
     /// heuristically determine whether this binding is simple binding
-    /// (here: simple binding == does not depend on other parts of the
+    /// (here: simple binding == does not depend on other parts of the 
     ///                          instance, it's not a 'dynamic' binding)
     bool isSimpleBinding() const;
 
@@ -344,7 +344,7 @@ private:
     /// bind this binding, and pre-compute the affected nodes
     void bind( bool bForceRebind = false );
 
-    /// the binding value has been changed:
+    /// the binding value has been changed: 
     ///   trigger a modified event on all modified listeners
     void valueModified();
 
@@ -397,20 +397,20 @@ public:
 
 public:
 
-    virtual Sequence_Type_t SAL_CALL getSupportedValueTypes()
+    virtual Sequence_Type_t SAL_CALL getSupportedValueTypes() 
         throw( RuntimeException_t );
 
-    virtual sal_Bool SAL_CALL supportsType( const Type_t& aType )
+    virtual sal_Bool SAL_CALL supportsType( const Type_t& aType ) 
         throw( RuntimeException_t );
 
     virtual Any_t SAL_CALL getValue( const Type_t& aType )
-        throw( IncompatibleTypesException_t,
+        throw( IncompatibleTypesException_t, 
                RuntimeException_t );
 
-    virtual void SAL_CALL setValue( const Any_t& aValue )
-        throw( IncompatibleTypesException_t,
+    virtual void SAL_CALL setValue( const Any_t& aValue ) 
+        throw( IncompatibleTypesException_t, 
                InvalidBindingStateException_t,
-               NoSupportException_t,
+               NoSupportException_t, 
                RuntimeException_t );
 
 
@@ -443,7 +443,7 @@ public:
     // XValidator:
     //
 
-    virtual sal_Bool SAL_CALL isValid(
+    virtual sal_Bool SAL_CALL isValid( 
         const Any_t& )
         throw( RuntimeException_t );
 
@@ -469,7 +469,7 @@ public:
 
 public:
 
-    virtual void SAL_CALL addModifyListener(
+    virtual void SAL_CALL addModifyListener( 
         const XModifyListener_t& xListener )
         throw( RuntimeException_t );
 
@@ -495,12 +495,12 @@ public:
 
 
 
-    //
+    // 
     // xml::dom::event::XEventListener
     //   receive an event if our node changed
     //
 
-    virtual void SAL_CALL handleEvent(
+    virtual void SAL_CALL handleEvent( 
         const XEvent_t& xEvent )
         throw( RuntimeException_t );
 
diff --git a/forms/source/xforms/boolexpression.cxx b/forms/source/xforms/boolexpression.cxx
index 9abf5590f70d..6a8750121021 100644
--- a/forms/source/xforms/boolexpression.cxx
+++ b/forms/source/xforms/boolexpression.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/xforms/boolexpression.hxx b/forms/source/xforms/boolexpression.hxx
index 8da5d58ad3c0..1419ad431c19 100644
--- a/forms/source/xforms/boolexpression.hxx
+++ b/forms/source/xforms/boolexpression.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/xforms/collection.hxx b/forms/source/xforms/collection.hxx
index 0ba804c8e608..cebe52417ec2 100644
--- a/forms/source/xforms/collection.hxx
+++ b/forms/source/xforms/collection.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,28 +166,28 @@ public:
 
 
     // XElementAccess
-    virtual Type_t SAL_CALL getElementType()
+    virtual Type_t SAL_CALL getElementType() 
         throw( RuntimeException_t )
     {
         return getCppuType( static_cast<T*>( NULL ) );
     }
 
-    virtual sal_Bool SAL_CALL hasElements()
+    virtual sal_Bool SAL_CALL hasElements() 
         throw( RuntimeException_t )
     {
         return hasItems();
     }
 
     // XIndexAccess : XElementAccess
-    virtual sal_Int32 SAL_CALL getCount()
+    virtual sal_Int32 SAL_CALL getCount() 
         throw( RuntimeException_t )
     {
         return countItems();
     }
 
-    virtual Any_t SAL_CALL getByIndex( sal_Int32 nIndex )
-        throw( IndexOutOfBoundsException_t,
-               WrappedTargetException_t,
+    virtual Any_t SAL_CALL getByIndex( sal_Int32 nIndex ) 
+        throw( IndexOutOfBoundsException_t, 
+               WrappedTargetException_t, 
                RuntimeException_t)
     {
         if( isValidIndex( nIndex ) )
@@ -197,11 +197,11 @@ public:
     }
 
     // XIndexReplace : XIndexAccess
-    virtual void SAL_CALL replaceByIndex( sal_Int32 nIndex,
-                                          const Any_t& aElement )
-        throw( IllegalArgumentException_t,
-               IndexOutOfBoundsException_t,
-               WrappedTargetException_t,
+    virtual void SAL_CALL replaceByIndex( sal_Int32 nIndex, 
+                                          const Any_t& aElement ) 
+        throw( IllegalArgumentException_t, 
+               IndexOutOfBoundsException_t, 
+               WrappedTargetException_t, 
                RuntimeException_t)
     {
         T t;
@@ -221,18 +221,18 @@ public:
         return new Enumeration( this );
     }
 
-
+    
     // XSet : XEnumerationAccess
-    virtual sal_Bool SAL_CALL has( const Any_t& aElement )
+    virtual sal_Bool SAL_CALL has( const Any_t& aElement ) 
         throw( RuntimeException_t )
     {
         T t;
         return ( aElement >>= t ) ? hasItem( t ) : sal_False;
     }
-
+  
     virtual void SAL_CALL insert( const Any_t& aElement )
         throw( IllegalArgumentException_t,
-               ElementExistException_t,
+               ElementExistException_t, 
                RuntimeException_t )
     {
         T t;
@@ -262,7 +262,7 @@ public:
 
 
     // XContainer
-    virtual void SAL_CALL addContainerListener(
+    virtual void SAL_CALL addContainerListener( 
         const XContainerListener_t& xListener )
         throw( RuntimeException_t )
     {
@@ -277,7 +277,7 @@ public:
         throw( RuntimeException_t )
     {
         OSL_ENSURE( xListener.is(), "need listener!" );
-        Listeners_t::iterator aIter =
+        Listeners_t::iterator aIter = 
             std::find( maListeners.begin(), maListeners.end(), xListener );
         if( aIter != maListeners.end() )
             maListeners.erase( aIter );
@@ -289,7 +289,7 @@ protected:
     void _elementInserted( sal_Int32 nPos )
     {
         OSL_ENSURE( isValidIndex(nPos), "invalid index" );
-        com::sun::star::container::ContainerEvent aEvent(
+        com::sun::star::container::ContainerEvent aEvent( 
             static_cast<com::sun::star::container::XIndexReplace*>( this ),
             com::sun::star::uno::makeAny( nPos ),
             com::sun::star::uno::makeAny( getItem( nPos ) ),
@@ -304,7 +304,7 @@ protected:
 
     void _elementRemoved( const T& aOld )
     {
-        com::sun::star::container::ContainerEvent aEvent(
+        com::sun::star::container::ContainerEvent aEvent( 
             static_cast<com::sun::star::container::XIndexReplace*>( this ),
             com::sun::star::uno::Any(),
             com::sun::star::uno::makeAny( aOld ),
@@ -320,7 +320,7 @@ protected:
     void _elementReplaced( const sal_Int32 nPos, const T& aNew )
     {
         OSL_ENSURE( isValidIndex(nPos), "invalid index" );
-        com::sun::star::container::ContainerEvent aEvent(
+        com::sun::star::container::ContainerEvent aEvent( 
             static_cast<com::sun::star::container::XIndexReplace*>( this ),
             com::sun::star::uno::makeAny( nPos ),
             com::sun::star::uno::makeAny( getItem( nPos ) ),
diff --git a/forms/source/xforms/computedexpression.cxx b/forms/source/xforms/computedexpression.cxx
index cb8cb9e99ab7..ad9421ab4f7f 100644
--- a/forms/source/xforms/computedexpression.cxx
+++ b/forms/source/xforms/computedexpression.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ using com::sun::star::util::SearchAlgorithms_REGEXP;
 namespace xforms
 {
 
-ComputedExpression::ComputedExpression()
+ComputedExpression::ComputedExpression() 
     : msExpression(),
       mbIsEmpty( true ),
       mbIsSimple( true ),
@@ -109,8 +109,8 @@ bool ComputedExpression::_checkExpression( const sal_Char* pExpression ) const
     aSearchOptions.algorithmType = SearchAlgorithms_REGEXP;
     aSearchOptions.searchString = String( pExpression, RTL_TEXTENCODING_ASCII_US );
     utl::TextSearch aTextSearch( aSearchOptions );
-
-    xub_StrLen nLength =
+    
+    xub_StrLen nLength = 
         static_cast<xub_StrLen>( msExpression.getLength() );
     xub_StrLen nStart = 0;
     xub_StrLen nEnd = nLength;
@@ -118,7 +118,7 @@ bool ComputedExpression::_checkExpression( const sal_Char* pExpression ) const
 
     // our expression is static only if 1) we found our regexp, and 2)
     // the regexp goes from beginning to end.
-    return ( nLength == 0  ||  nSearch != 0 )
+    return ( nLength == 0  ||  nSearch != 0 ) 
         && ( nStart == 0  &&  nEnd == nLength );
 }
 
@@ -141,7 +141,7 @@ const OUString ComputedExpression::_getExpressionForEvaluation() const
     return msExpression;
 }
 
-bool ComputedExpression::_evaluate(
+bool ComputedExpression::_evaluate( 
     const xforms::EvaluationContext& rContext,
     const OUString& sExpression )
 {
@@ -151,7 +151,7 @@ bool ComputedExpression::_evaluate(
     mxResult.clear();
     try
     {
-        mxResult = _getXPathAPI(rContext)->eval( rContext.mxContextNode,
+        mxResult = _getXPathAPI(rContext)->eval( rContext.mxContextNode, 
                                                  sExpression );
     }
     catch( const Exception& )
@@ -168,14 +168,14 @@ bool ComputedExpression::evaluate( const EvaluationContext& rContext )
     // an older result); neither for empty expressions
     if( mbIsEmpty || (mxResult.is() && mbIsSimple) )
         return true;
-
+    
     return _evaluate( rContext, _getExpressionForEvaluation() );
 }
 
 
 bool ComputedExpression::hasValue() const
 {
-    return mxResult.is() &&
+    return mxResult.is() && 
            mxResult->getObjectType() != XPathObjectType_XPATH_UNDEFINED;
 }
 
@@ -205,8 +205,8 @@ bool ComputedExpression::getBool( bool bDefault ) const
 Reference<XXPathAPI> ComputedExpression::_getXPathAPI(const xforms::EvaluationContext& aContext)
 {
     // create XPath API, then register namespaces
-    Reference<XXPathAPI> xXPath( createInstance(
-                            OUSTRING( "com.sun.star.xml.xpath.XPathAPI" ) ),
+    Reference<XXPathAPI> xXPath( createInstance( 
+                            OUSTRING( "com.sun.star.xml.xpath.XPathAPI" ) ), 
                                  UNO_QUERY_THROW );
     OSL_ENSURE( xXPath.is(), "cannot get XPath API" );
 
@@ -220,8 +220,8 @@ Reference<XXPathAPI> ComputedExpression::_getXPathAPI(const xforms::EvaluationCo
     aValue.Value <<= aContext.mxContextNode;
     aSequence[1] <<= aValue;
     Reference<XMultiServiceFactory> aFactory = comphelper::getProcessServiceFactory();
-    Reference< XXPathExtension > aExtension( aFactory->createInstanceWithArguments(
-        OUSTRING( "com.sun.star.comp.xml.xpath.XFormsExtension"), aSequence), UNO_QUERY_THROW);
+    Reference< XXPathExtension > aExtension( aFactory->createInstanceWithArguments( 
+        OUSTRING( "com.sun.star.comp.xml.xpath.XFormsExtension"), aSequence), UNO_QUERY_THROW);    
     xXPath->registerExtensionInstance(aExtension);
 
     // register namespaces
diff --git a/forms/source/xforms/computedexpression.hxx b/forms/source/xforms/computedexpression.hxx
index 316571d906ba..8d1ef01ab5a1 100644
--- a/forms/source/xforms/computedexpression.hxx
+++ b/forms/source/xforms/computedexpression.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 // forward declaractions
 namespace com { namespace sun { namespace star
-{
+{ 
     namespace xml
     {
         namespace dom { class XNode; }
diff --git a/forms/source/xforms/convert.cxx b/forms/source/xforms/convert.cxx
index 4e7ecbab2561..1f391631bd08 100644
--- a/forms/source/xforms/convert.cxx
+++ b/forms/source/xforms/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
@@ -222,18 +222,18 @@ namespace
 
     // ------------------------------------------------------------------------
     Any lcl_toAny_bool( const OUString& rStr )
-    {
+    { 
         bool b = ( rStr == OUSTRING("true")  ||  rStr == OUSTRING("1") );
         return makeAny( b );
     }
 
     // ------------------------------------------------------------------------
     OUString lcl_toXSD_double( const Any& rAny )
-    {
+    { 
         double f = 0.0;
         rAny >>= f;
 
-        return rtl::math::isFinite( f )
+        return rtl::math::isFinite( f ) 
             ? rtl::math::doubleToUString( f, rtl_math_StringFormat_Automatic,
                                         rtl_math_DecimalPlaces_Max, '.',
                                         sal_True )
@@ -242,9 +242,9 @@ namespace
 
     // ------------------------------------------------------------------------
     Any lcl_toAny_double( const OUString& rString )
-    {
+    { 
         rtl_math_ConversionStatus eStatus;
-        double f = rtl::math::stringToDouble(
+        double f = rtl::math::stringToDouble( 
             rString, sal_Unicode('.'), sal_Unicode(','), &eStatus, NULL );
         return ( eStatus == rtl_math_ConversionStatus_Ok ) ? makeAny( f ) : Any();
     }
@@ -549,7 +549,7 @@ rtl::OUString Convert::toXSD( const Any_t& rAny )
     return aIter != maMap.end() ? aIter->second.first( rAny ) : OUString();
 }
 
-Convert::Any_t Convert::toAny( const rtl::OUString& rValue,
+Convert::Any_t Convert::toAny( const rtl::OUString& rValue, 
                                const Type_t& rType )
 {
     Map_t::iterator aIter = maMap.find( rType );
diff --git a/forms/source/xforms/convert.hxx b/forms/source/xforms/convert.hxx
index 684ba4311af8..86c624d5811c 100644
--- a/forms/source/xforms/convert.hxx
+++ b/forms/source/xforms/convert.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/xforms/datatyperepository.cxx b/forms/source/xforms/datatyperepository.cxx
index a4bce7e66db3..a5c5f8b51281 100644
--- a/forms/source/xforms/datatyperepository.cxx
+++ b/forms/source/xforms/datatyperepository.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/xforms/datatyperepository.hxx b/forms/source/xforms/datatyperepository.hxx
index e2f61cdaaf35..07e09d3cc06e 100644
--- a/forms/source/xforms/datatyperepository.hxx
+++ b/forms/source/xforms/datatyperepository.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx
index d9278a4a0860..ce88648dbc05 100644
--- a/forms/source/xforms/datatypes.cxx
+++ b/forms/source/xforms/datatypes.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace xforms
         static void lcl_initializePatternMatcher( ::std::auto_ptr< RegexMatcher >& _rpMatcher, const ::rtl::OUString& _rPattern )
         {
             UErrorCode nMatchStatus = U_ZERO_ERROR;
-            UnicodeString aIcuPattern( reinterpret_cast<const UChar *>(_rPattern.getStr()), _rPattern.getLength() );    // UChar != sal_Unicode in MinGW
+            UnicodeString aIcuPattern( reinterpret_cast<const UChar *>(_rPattern.getStr()), _rPattern.getLength() );	// UChar != sal_Unicode in MinGW
             _rpMatcher.reset( new RegexMatcher( aIcuPattern, 0, nMatchStatus ) );
             OSL_ENSURE( U_SUCCESS( nMatchStatus ), "lcl_initializePatternMatcher: invalid pattern property!" );
                 // if asserts, then something changed our pattern without going to convertFastPropertyValue/checkPropertySanity
@@ -222,7 +222,7 @@ namespace xforms
         static bool lcl_matchString( RegexMatcher& _rMatcher, const ::rtl::OUString& _rText )
         {
             UErrorCode nMatchStatus = U_ZERO_ERROR;
-            UnicodeString aInput( reinterpret_cast<const UChar *>(_rText.getStr()), _rText.getLength() );   // UChar != sal_Unicode in MinGW
+            UnicodeString aInput( reinterpret_cast<const UChar *>(_rText.getStr()), _rText.getLength() );	// UChar != sal_Unicode in MinGW
             _rMatcher.reset( aInput );
             if ( _rMatcher.matches( nMatchStatus ) )
             {
@@ -296,7 +296,7 @@ namespace xforms
             ::rtl::OUString sPattern;
             OSL_VERIFY( _rNewValue >>= sPattern );
 
-            UnicodeString aIcuPattern( reinterpret_cast<const UChar *>(sPattern.getStr()), sPattern.getLength() );  // UChar != sal_Unicode in MinGW
+            UnicodeString aIcuPattern( reinterpret_cast<const UChar *>(sPattern.getStr()), sPattern.getLength() );	// UChar != sal_Unicode in MinGW
             UErrorCode nMatchStatus = U_ZERO_ERROR;
             RegexMatcher aMatcher( aIcuPattern, 0, nMatchStatus );
             if ( U_FAILURE( nMatchStatus ) )
@@ -770,7 +770,7 @@ namespace xforms
     }
 
     //====================================================================
-    //=
+    //= 
     //====================================================================
 #define DEFAULT_IMPLEMNENT_SUBTYPE( classname, typeclass )      \
     classname::classname( const ::rtl::OUString& _rName )       \
diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx
index 83ac51b551f4..f38484127240 100644
--- a/forms/source/xforms/datatypes.hxx
+++ b/forms/source/xforms/datatypes.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -353,7 +353,7 @@ namespace xforms
     };
 
     //====================================================================
-    //=
+    //= 
     //====================================================================
 #define DEFAULT_DECLARE_SUBTYPE( classname, valuetype )         \
     class classname;                                            \
diff --git a/forms/source/xforms/datatypes_impl.hxx b/forms/source/xforms/datatypes_impl.hxx
index cc0b2c5b3b35..4ebd822a203c 100644
--- a/forms/source/xforms/datatypes_impl.hxx
+++ b/forms/source/xforms/datatypes_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/forms/source/xforms/enumeration.cxx b/forms/source/xforms/enumeration.cxx
index 82a9118f7e66..8187d5d0fc2e 100644
--- a/forms/source/xforms/enumeration.cxx
+++ b/forms/source/xforms/enumeration.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/xforms/enumeration.hxx b/forms/source/xforms/enumeration.hxx
index 395f29dd4845..c2b08db42d85 100644
--- a/forms/source/xforms/enumeration.hxx
+++ b/forms/source/xforms/enumeration.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 com { namespace sun { namespace star {
 } } }
 
 /** implement XEnumeration based on container::XIndexAccess */
-class Enumeration
+class Enumeration 
     : public cppu::WeakImplHelper1<com::sun::star::container::XEnumeration>
 {
     com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> mxContainer;
diff --git a/forms/source/xforms/evaluationcontext.hxx b/forms/source/xforms/evaluationcontext.hxx
index a5f8b32d5df3..9cbfea858ec1 100644
--- a/forms/source/xforms/evaluationcontext.hxx
+++ b/forms/source/xforms/evaluationcontext.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ public:
           mnContextSize( 0 )
     { }
 
-    EvaluationContext(
+    EvaluationContext( 
         const com::sun::star::uno::Reference<com::sun::star::xml::dom::XNode>& xContextNode,
         const com::sun::star::uno::Reference<com::sun::star::xforms::XModel>& xModel,
         const com::sun::star::uno::Reference<com::sun::star::container::XNameContainer>& xNamespaces,
diff --git a/forms/source/xforms/mip.cxx b/forms/source/xforms/mip.cxx
index a8bcda632d34..0a645d3b7f1e 100644
--- a/forms/source/xforms/mip.cxx
+++ b/forms/source/xforms/mip.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 xforms
 
 
 MIP::MIP()
-{
+{ 
     resetReadonly();
     resetRequired();
     resetRelevant();
diff --git a/forms/source/xforms/mip.hxx b/forms/source/xforms/mip.hxx
index ad0db3e05916..3ce4d1c505e1 100644
--- a/forms/source/xforms/mip.hxx
+++ b/forms/source/xforms/mip.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,8 +106,8 @@ public:
     rtl::OUString getConstraintExplanation() const;
 
     // - calculate (computed XPath; default: has none (false))
-    //   (for calculate, we only store whether a calculate MIP is present;
-    //    the actual calculate value is handled my changing the instance
+    //   (for calculate, we only store whether a calculate MIP is present; 
+    //    the actual calculate value is handled my changing the instance 
     //    directly)
     bool hasCalculate() const;
     void setHasCalculate( bool );
diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx
index f7939cff3baf..5c9bf8a4bf97 100644
--- a/forms/source/xforms/model.cxx
+++ b/forms/source/xforms/model.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -576,8 +576,8 @@ void Model::refresh()
 void SAL_CALL Model::submitWithInteraction(
     const rtl::OUString& sID,
     const XInteractionHandler_t& _rxHandler )
-    throw( VetoException,
-           WrappedTargetException,
+    throw( VetoException, 
+           WrappedTargetException, 
            RuntimeException )
 {
     DBG_INVARIANT();
diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx
index 03db8210f388..b6987661940f 100644
--- a/forms/source/xforms/model.hxx
+++ b/forms/source/xforms/model.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/xforms/model_helper.hxx b/forms/source/xforms/model_helper.hxx
index 064d60f3ab71..d010296c47be 100644
--- a/forms/source/xforms/model_helper.hxx
+++ b/forms/source/xforms/model_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
@@ -148,7 +148,7 @@ sal_Int32 lcl_findInstance( const InstanceCollection*,
 
 
 // get values from Sequence<PropertyValue> describing an Instance
-void getInstanceData(
+void getInstanceData( 
     const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&,
     rtl::OUString* pID,
     com::sun::star::uno::Reference<com::sun::star::xml::dom::XDocument>*,
@@ -156,7 +156,7 @@ void getInstanceData(
     bool* pURLOnce );
 
 // set values on Sequence<PropertyValue> for an Instance
-void setInstanceData(
+void setInstanceData( 
     com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&,
     const rtl::OUString* pID,
     const com::sun::star::uno::Reference<com::sun::star::xml::dom::XDocument>*,
diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx
index 244e1443e6cb..ddcd7cc23d1e 100644
--- a/forms/source/xforms/model_ui.cxx
+++ b/forms/source/xforms/model_ui.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -186,14 +186,14 @@ void lcl_OutInstance( OUStringBuffer& rBuffer,
                       Model* pModel )
 {
     Reference<XDocument> xDoc = xNode->getOwnerDocument();
-
+    
     if( xDoc != pModel->getDefaultInstance() )
     {
         rBuffer.insert( 0, OUSTRING("')") );
 
         // iterate over instances, and find the right one
         OUString sInstanceName;
-        Reference<XEnumeration> xEnum =
+        Reference<XEnumeration> xEnum = 
             pModel->getInstances()->createEnumeration();
         while( ( sInstanceName.getLength() == 0 ) && xEnum->hasMoreElements() )
         {
@@ -370,7 +370,7 @@ OUString Model::getBindingName( const XPropertySet_t& xBinding,
     xBinding->getPropertyValue( OUSTRING("BindingID" ) ) >>= sID;
     OUString sExpression;
     xBinding->getPropertyValue( OUSTRING("BindingExpression" ) ) >>= sExpression;
-
+    
     OUStringBuffer aBuffer;
     if( sID.getLength() > 0 )
     {
@@ -431,7 +431,7 @@ Model::XDocument_t Model::newInstance( const rtl::OUString& sName,
     XDocument_t xInstance = getDocumentBuilder()->newDocument();
     DBG_ASSERT( xInstance.is(), "failed to create DOM instance" );
 
-    Reference<XNode>( xInstance, UNO_QUERY_THROW )->appendChild(
+    Reference<XNode>( xInstance, UNO_QUERY_THROW )->appendChild( 
         Reference<XNode>( xInstance->createElement( OUSTRING("instanceData") ),
                           UNO_QUERY_THROW ) );
 
@@ -521,7 +521,7 @@ void Model::removeInstance( const rtl::OUString& sName )
         mpInstances->removeItem( mpInstances->getItem( nPos ) );
 }
 
-Reference<XNameContainer> lcl_getModels(
+Reference<XNameContainer> lcl_getModels( 
     const Reference<com::sun::star::frame::XModel>& xComponent )
 {
     Reference<XNameContainer> xRet;
@@ -560,7 +560,7 @@ void Model::renameModel( const Reference<com::sun::star::frame::XModel>& xCmp,
     throw( RuntimeException )
 {
     Reference<XNameContainer> xModels = lcl_getModels( xCmp );
-    if( xModels.is()
+    if( xModels.is() 
         && xModels->hasByName( sFrom )
         && ! xModels->hasByName( sTo ) )
     {
@@ -576,7 +576,7 @@ void Model::removeModel( const Reference<com::sun::star::frame::XModel>& xCmp,
     throw( RuntimeException )
 {
     Reference<XNameContainer> xModels = lcl_getModels( xCmp );
-    if( xModels.is()
+    if( xModels.is() 
         && xModels->hasByName( sName ) )
     {
         xModels->removeByName( sName );
@@ -588,11 +588,11 @@ Model::XNode_t Model::createElement( const XNode_t& xParent,
     throw( RuntimeException )
 {
     Reference<XNode> xNode;
-    if( xParent.is()
+    if( xParent.is() 
         && isValidXMLName( sName ) )
     {
         // TODO: implement proper namespace handling
-        xNode.set( xParent->getOwnerDocument()->createElement( sName ),
+        xNode.set( xParent->getOwnerDocument()->createElement( sName ), 
                    UNO_QUERY );
     }
     return xNode;
@@ -604,7 +604,7 @@ Model::XNode_t Model::createAttribute( const XNode_t& xParent,
 {
     Reference<XNode> xNode;
     Reference<XElement> xElement( xParent, UNO_QUERY );
-    if( xParent.is()
+    if( xParent.is() 
         && xElement.is()
         && isValidXMLName( sName ) )
     {
@@ -639,7 +639,7 @@ Model::XNode_t Model::renameNode( const XNode_t& xNode,
         return xNode;
 
     // note old binding expression so we can adjust bindings below
-    OUString sOldDefaultBindingExpression =
+    OUString sOldDefaultBindingExpression = 
         getDefaultBindingExpressionForNode( xNode );
 
     Reference<XDocument> xDoc = xNode->getOwnerDocument();
@@ -691,14 +691,14 @@ Model::XNode_t Model::renameNode( const XNode_t& xNode,
     if( xNew.is() )
     {
         // iterate over bindings and replace default expressions
-        OUString sNewDefaultBindingExpression =
+        OUString sNewDefaultBindingExpression = 
             getDefaultBindingExpressionForNode( xNew );
         for( sal_Int32 n = 0; n < mpBindings->countItems(); n++ )
         {
             Binding* pBinding = Binding::getBinding(
                 mpBindings->Collection<XPropertySet_t>::getItem( n ) );
 
-            if( pBinding->getBindingExpression()
+            if( pBinding->getBindingExpression() 
                     == sOldDefaultBindingExpression )
                 pBinding->setBindingExpression( sNewDefaultBindingExpression );
         }
@@ -757,7 +757,7 @@ Model::XPropertySet_t Model::getBindingForNode( const XNode_t& xNode,
     if( bCreate  &&  pBestBinding == NULL )
     {
         pBestBinding = new Binding();
-        pBestBinding->setBindingExpression(
+        pBestBinding->setBindingExpression( 
             getDefaultBindingExpressionForNode( xNode ) );
         mpBindings->addItem( pBestBinding );
     }
@@ -812,7 +812,7 @@ OUString lcl_serializeForDisplay( const Reference<XNodeList>& xNodes )
     for( sal_Int32 i = 0; i < nLength; i++ )
     {
         Reference<XNode> xCurrent = xNodes->item( i );
-
+        
         switch ( xCurrent->getNodeType() )
         {
         case NodeType_DOCUMENT_NODE:
@@ -842,14 +842,14 @@ OUString lcl_serializeForDisplay( const Reference<XNodeList>& xNodes )
     if ( nAttributeNodes )
         // had only attribute nodes
         return sResult;
-
+    
     // serialize fragment
     CSerializationAppXML aSerialization;
     aSerialization.setSource( xFragment );
     aSerialization.serialize();
 
     // copy stream into buffer
-    Reference<XTextInputStream> xTextInputStream(
+    Reference<XTextInputStream> xTextInputStream( 
         createInstance( OUSTRING("com.sun.star.io.TextInputStream") ),
         UNO_QUERY );
     Reference<XActiveDataSink>( xTextInputStream, UNO_QUERY_THROW )
@@ -927,7 +927,7 @@ OUString lcl_serializeForDisplay( const Reference<XXPathObject>& xResult )
     return aBuffer.makeStringAndClear();
 }
 
-OUString Model::getResultForExpression(
+OUString Model::getResultForExpression( 
     const XPropertySet_t& xBinding,
     sal_Bool bIsBindingExpression,
     const OUString& sExpression )
@@ -950,7 +950,7 @@ OUString Model::getResultForExpression(
     else
     {
         // MIP (not binding): iterate over bindings contexts
-        std::vector<EvaluationContext> aContext =
+        std::vector<EvaluationContext> aContext = 
             pBinding->getMIPEvaluationContexts();
         for( std::vector<EvaluationContext>::iterator aIter = aContext.begin();
              aIter != aContext.end();
@@ -976,7 +976,7 @@ sal_Bool Model::isValidPrefixName( const OUString& sName )
     return ::isValidPrefixName( sName, NULL );
 }
 
-void Model::setNodeValue(
+void Model::setNodeValue( 
     const XNode_t& xNode,
     const rtl::OUString& sValue )
     throw( RuntimeException )
@@ -989,7 +989,7 @@ void Model::setNodeValue(
 // helper functions from model_helper.hxx
 //
 
-void xforms::getInstanceData(
+void xforms::getInstanceData( 
     const Sequence<PropertyValue>& aValues,
     OUString* pID,
     Reference<XDocument>* pInstance,
@@ -1013,7 +1013,7 @@ void xforms::getInstanceData(
     }
 }
 
-void xforms::setInstanceData(
+void xforms::setInstanceData( 
     Sequence<PropertyValue>& aSequence,
     const OUString* _pID,
     const Reference<XDocument>* _pInstance,
diff --git a/forms/source/xforms/namedcollection.hxx b/forms/source/xforms/namedcollection.hxx
index 2b06343c4a40..cba79e2f053e 100644
--- a/forms/source/xforms/namedcollection.hxx
+++ b/forms/source/xforms/namedcollection.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ protected:
 public:
 
     // XElementAccess
-    virtual typename Collection<T>::Type_t SAL_CALL getElementType()
+    virtual typename Collection<T>::Type_t SAL_CALL getElementType() 
         throw( typename Collection<T>::RuntimeException_t )
     {
         return Collection<T>::getElementType();
@@ -116,14 +116,14 @@ public:
     virtual typename Collection<T>::Any_t SAL_CALL getByName(
         const rtl::OUString& aName )
         throw( typename Collection<T>::NoSuchElementException_t,
-               typename Collection<T>::WrappedTargetException_t,
+               typename Collection<T>::WrappedTargetException_t, 
                typename Collection<T>::RuntimeException_t )
     {
         if( hasItem( aName ) )
             return com::sun::star::uno::makeAny( getItem( aName ) );
         else
             throw typename Collection<T>::NoSuchElementException_t();
-
+                
     }
 
     virtual Names_t SAL_CALL getElementNames()
diff --git a/forms/source/xforms/pathexpression.cxx b/forms/source/xforms/pathexpression.cxx
index 6494059f56bb..8115aa1abed2 100644
--- a/forms/source/xforms/pathexpression.cxx
+++ b/forms/source/xforms/pathexpression.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ using namespace std;
 namespace xforms
 {
 
-PathExpression::PathExpression()
+PathExpression::PathExpression() 
     : ComputedExpression(),
       maNodes()
 {
@@ -94,7 +94,7 @@ void PathExpression::setExpression( const OUString& rExpression )
     // whether it contains only 'simple' (i.e. static) conditions. For
     // now, we check whether it only contains number positions.
     // (TODO: Only works for names containing only ASCII letters+digits.)
-    mbIsSimple =
+    mbIsSimple = 
         _checkExpression( "( */@?[a-zA-Z0-9:]+( *\\[ *[0-9 ]+ *\\] *)?)+" );
 
     maNodes.clear();
diff --git a/forms/source/xforms/pathexpression.hxx b/forms/source/xforms/pathexpression.hxx
index a6d89186e9ff..72363edcd1e0 100644
--- a/forms/source/xforms/pathexpression.hxx
+++ b/forms/source/xforms/pathexpression.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 // forward declaractions
 namespace com { namespace sun { namespace star
-{
-    namespace xml { namespace dom
+{ 
+    namespace xml { namespace dom 
     {
-        class XNodeList;
+        class XNodeList; 
         namespace events { class XEventListener; }
     } }
 } } }
diff --git a/forms/source/xforms/propertysetbase.cxx b/forms/source/xforms/propertysetbase.cxx
index dd2c3f139098..aba016dac286 100644
--- a/forms/source/xforms/propertysetbase.cxx
+++ b/forms/source/xforms/propertysetbase.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/xforms/propertysetbase.hxx b/forms/source/xforms/propertysetbase.hxx
index 27556b1381f8..62987dea20b2 100644
--- a/forms/source/xforms/propertysetbase.hxx
+++ b/forms/source/xforms/propertysetbase.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -251,7 +251,7 @@ protected:
     void notifyAndCachePropertyValue( sal_Int32 nHandle );
 
     /** initializes the property value cache for the given property, with its current value
-
+    
         Usually used to initialize the cache with values which are different from default
         constructed values. Say you have a boolean property whose initial state
         is <TRUE/>. Say you call <member>notifyAndCachePropertyValue</member> the first time: it will
@@ -339,7 +339,7 @@ public:
     /** constructs a PropertyChangeNotifier
         @param rPropertySet
             the property set implementation whose property is going to be changed. Note
-            that this property set implementation must live at least as long as the
+            that this property set implementation must live at least as long as the 
             PropertyChangeNotifier instance does.
         @param nHandle
             the handle of the property which is going to be changed. Must be a valid property
diff --git a/forms/source/xforms/resourcehelper.cxx b/forms/source/xforms/resourcehelper.cxx
index 1fec9f3502d0..412e528527b6 100644
--- a/forms/source/xforms/resourcehelper.cxx
+++ b/forms/source/xforms/resourcehelper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/xforms/resourcehelper.hxx b/forms/source/xforms/resourcehelper.hxx
index 0b429cd0eeb7..a392a6e3eb6c 100644
--- a/forms/source/xforms/resourcehelper.hxx
+++ b/forms/source/xforms/resourcehelper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx
index deafc88cb5e9..828846c47276 100644
--- a/forms/source/xforms/submission.cxx
+++ b/forms/source/xforms/submission.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -348,7 +348,7 @@ bool Submission::doSubmit( const Reference< XInteractionHandler >& xHandler )
         Reference< XDocument > aInstanceDoc = getInstanceDocument(xResult);
         aResult = xSubmission->replace(getReplace(), aInstanceDoc, Reference< XFrame >());
     }
-
+        
     return ( aResult == CSubmission::SUCCESS );
 }
 
@@ -501,10 +501,10 @@ OUString lcl_message( const OUString& rID, const OUString& rText )
     return aMessage.makeStringAndClear();
 }
 
-void SAL_CALL Submission::submitWithInteraction(
-    const Reference<XInteractionHandler>& _rxHandler )
-    throw ( VetoException,
-            WrappedTargetException,
+void SAL_CALL Submission::submitWithInteraction( 
+    const Reference<XInteractionHandler>& _rxHandler ) 
+    throw ( VetoException, 
+            WrappedTargetException, 
             RuntimeException )
 {
     // as long as this class is not really threadsafe, we need to copy
@@ -526,14 +526,14 @@ void SAL_CALL Submission::submitWithInteraction(
     bool bValid = pModel->isValid();
     if( ! bValid )
     {
-        InvalidDataOnSubmitException aInvalidDataException(
+        InvalidDataOnSubmitException aInvalidDataException( 
             lcl_message(sID, OUSTRING(" due to invalid data") ), *this );
 
         if( _rxHandler.is() )
         {
             // labouriously create interaction request
-            comphelper::OInteractionRequest* pRequest
-                = new comphelper::OInteractionRequest(
+            comphelper::OInteractionRequest* pRequest 
+                = new comphelper::OInteractionRequest( 
                     makeAny( aInvalidDataException ) );
             Reference<XInteractionRequest> xRequest = pRequest;
 
@@ -577,7 +577,7 @@ void SAL_CALL Submission::submitWithInteraction(
     catch( const Exception& e )
     {
         // exception caught: re-throw as wrapped target exception
-        throw WrappedTargetException(
+        throw WrappedTargetException( 
             lcl_message( sID, OUSTRING(" due to exception being thrown") ),
             *this, makeAny( e ) );
     }
@@ -586,10 +586,10 @@ void SAL_CALL Submission::submitWithInteraction(
     {
         mxModel->rebuild();
     }
-    else
+    else 
     {
         // other failure: throw wrapped target exception, too.
-        throw WrappedTargetException(
+        throw WrappedTargetException( 
             lcl_message( sID, OUString() ), *this, Any() );
     }
 }
@@ -658,7 +658,7 @@ Reference< XDocument > Submission::getInstanceDocument(const Reference< XXPathOb
         if (aList->getLength() > 0)
             aDocument = aList->item(0)->getOwnerDocument();
     }
-    return aDocument;
+    return aDocument;            
 }
 
 Reference< XDocumentFragment > Submission::createSubmissionDocument(const Reference< XXPathObject >& aObj, sal_Bool bRemoveWSNodes)
diff --git a/forms/source/xforms/submission.hxx b/forms/source/xforms/submission.hxx
index b0c377844cb1..3077a946a062 100644
--- a/forms/source/xforms/submission.hxx
+++ b/forms/source/xforms/submission.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ private:
     com::sun::star::uno::Reference< com::sun::star::xml::dom::XDocumentFragment >
         createSubmissionDocument(const com::sun::star::uno::Reference< com::sun::star::xml::xpath::XXPathObject >& aObject,
                                  sal_Bool bRemoveWSNodes = sal_False);
-    com::sun::star::uno::Reference< com::sun::star::xml::dom::XDocument >
+    com::sun::star::uno::Reference< com::sun::star::xml::dom::XDocument > 
         getInstanceDocument(const com::sun::star::uno::Reference< com::sun::star::xml::xpath::XXPathObject >& aObject);
 
     com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory > m_aFactory;
diff --git a/forms/source/xforms/submission/replace.cxx b/forms/source/xforms/submission/replace.cxx
index da5968bc0123..3523059050af 100644
--- a/forms/source/xforms/submission/replace.cxx
+++ b/forms/source/xforms/submission/replace.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/xforms/submission/serialization.hxx b/forms/source/xforms/submission/serialization.hxx
index 966a3f9e0ae8..c1daa6edaba8 100644
--- a/forms/source/xforms/submission/serialization.hxx
+++ b/forms/source/xforms/submission/serialization.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ public:
     that control aspects of the serialization
     eachs serialization may support individual properties
     */
-    void setProperties(const CSS::uno::Sequence< CSS::beans::NamedValue >& props)
+    void setProperties(const CSS::uno::Sequence< CSS::beans::NamedValue >& props) 
     {
         m_properties.clear();
         rtl::OUString aValue;
@@ -88,7 +88,7 @@ public:
 
     /**
     get the serialized bytes.
-    reads up to buffer->getLength() bytes and returns the number of
+    reads up to buffer->getLength() bytes and returns the number of 
     bytes read.
     returns -1 on error
     */
diff --git a/forms/source/xforms/submission/serialization_app_xml.cxx b/forms/source/xforms/submission/serialization_app_xml.cxx
index 76989ad7fdfb..2e90215c8642 100644
--- a/forms/source/xforms/submission/serialization_app_xml.cxx
+++ b/forms/source/xforms/submission/serialization_app_xml.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 CSerializationAppXML::CSerializationAppXML()
     : m_aFactory(utl::getProcessServiceFactory())
-    , m_aPipe(CSS::uno::Reference< CSS::io::XOutputStream > (m_aFactory->createInstance(
+    , m_aPipe(CSS::uno::Reference< CSS::io::XOutputStream > (m_aFactory->createInstance( 
         rtl::OUString::createFromAscii("com.sun.star.io.Pipe")), CSS::uno::UNO_QUERY))
 {
     OSL_ENSURE(m_aPipe.is(), "cannot create Pipe");
 }
 
-CSS::uno::Reference< CSS::io::XInputStream >
+CSS::uno::Reference< CSS::io::XInputStream > 
 CSerializationAppXML::getInputStream()
 {
     // The pipes output is provided through it's
@@ -58,7 +58,7 @@ CSerializationAppXML::getInputStream()
     return CSS::uno::Reference< CSS::io::XInputStream >(m_aPipe, CSS::uno::UNO_QUERY);
 }
 
-void
+void 
 CSerializationAppXML::serialize_node(const CSS::uno::Reference< CSS::xml::dom::XNode >& rNode)
 {
     CSS::uno::Reference< CSS::xml::dom::XNode > aNode = rNode;
@@ -66,13 +66,13 @@ CSerializationAppXML::serialize_node(const CSS::uno::Reference< CSS::xml::dom::X
     {
         CSS::uno::Reference< CSS::xml::dom::XDocument > aDoc(rNode, CSS::uno::UNO_QUERY_THROW);
         aNode = CSS::uno::Reference< CSS::xml::dom::XNode >(aDoc->getDocumentElement(), CSS::uno::UNO_QUERY_THROW);
-    }
+    } 
     if (aNode->getNodeType() != CSS::xml::dom::NodeType_ELEMENT_NODE)
         return;
 
     // clone the node to a new document and serialize that document
     CSS::uno::Reference< CSS::lang::XUnoTunnel > aTunnel(aNode, CSS::uno::UNO_QUERY);
-    if (aTunnel.is())
+    if (aTunnel.is()) 
     {
         xmlNodePtr aNodePtr = reinterpret_cast< xmlNodePtr >( aTunnel->getSomething(CSS::uno::Sequence< sal_Int8 >()) );
         xmlDocPtr aDocPtr = xmlNewDoc((xmlChar*)"1.0");
@@ -82,9 +82,9 @@ CSerializationAppXML::serialize_node(const CSS::uno::Reference< CSS::xml::dom::X
             xmlChar *buffer = NULL;
             sal_Int32 size = 0;
             xmlDocDumpMemory(aDocPtr, &buffer, (int*)&size);
-
+        
             // write the xml into the pipe through it's XOutputStream interface
-            m_aPipe->writeBytes(CSS::uno::Sequence< sal_Int8 >((sal_Int8*)buffer, size));
+            m_aPipe->writeBytes(CSS::uno::Sequence< sal_Int8 >((sal_Int8*)buffer, size));            
             xmlFree(buffer);
         }
 
@@ -109,7 +109,7 @@ CSerializationAppXML::serialize_nodeset()
 
 void
 CSerializationAppXML::serialize()
-{
+{    
     if (!m_aFragment.is()) return;
 
     CSS::uno::Reference< CSS::xml::dom::XNode > cur = m_aFragment->getFirstChild();
diff --git a/forms/source/xforms/submission/serialization_app_xml.hxx b/forms/source/xforms/submission/serialization_app_xml.hxx
index 9564961bbbc9..406d5aa597df 100644
--- a/forms/source/xforms/submission/serialization_app_xml.hxx
+++ b/forms/source/xforms/submission/serialization_app_xml.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ private:
 
     void serialize_node(const CSS::uno::Reference< CSS::xml::dom::XNode >& aNode);
     void serialize_nodeset();
-
+    
 public:
     CSerializationAppXML();
 
diff --git a/forms/source/xforms/submission/serialization_urlencoded.cxx b/forms/source/xforms/submission/serialization_urlencoded.cxx
index cb6403c8d13e..9220e9c76a39 100644
--- a/forms/source/xforms/submission/serialization_urlencoded.cxx
+++ b/forms/source/xforms/submission/serialization_urlencoded.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/xforms/submission/serialization_urlencoded.hxx b/forms/source/xforms/submission/serialization_urlencoded.hxx
index a5e9a4eb1060..b3501762a96d 100644
--- a/forms/source/xforms/submission/serialization_urlencoded.hxx
+++ b/forms/source/xforms/submission/serialization_urlencoded.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/xforms/submission/submission.hxx b/forms/source/xforms/submission/submission.hxx
index d01fb8fb0aba..098db603f935 100644
--- a/forms/source/xforms/submission/submission.hxx
+++ b/forms/source/xforms/submission/submission.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,7 +115,7 @@ public:
     }
 };
 
-class CSubmission
+class CSubmission 
 {
 
 protected:
diff --git a/forms/source/xforms/submission/submission_get.cxx b/forms/source/xforms/submission/submission_get.cxx
index 95d1ce3ce2be..8fb5e39a2cc6 100644
--- a/forms/source/xforms/submission/submission_get.cxx
+++ b/forms/source/xforms/submission/submission_get.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,12 +52,12 @@ using namespace std;
 
 
 CSubmissionGet::CSubmissionGet(const rtl::OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment)
-    : CSubmission(aURL, aFragment)
+    : CSubmission(aURL, aFragment) 
 {
 }
 
 CSubmission::SubmissionResult CSubmissionGet::submit(const CSS::uno::Reference< CSS::task::XInteractionHandler >& aInteractionHandler)
-{
+{    
     // GET always uses apllicatin/x-www-formurlencoded
     auto_ptr< CSerialization > apSerialization(new CSerializationURLEncoded());
     apSerialization->setSource(m_aFragment);
@@ -84,7 +84,7 @@ CSubmission::SubmissionResult CSubmissionGet::submit(const CSS::uno::Reference<
         OStringBuffer aUTF8QueryURL(OUStringToOString(m_aURLObj.GetMainURL(INetURLObject::NO_DECODE),
             RTL_TEXTENCODING_UTF8));
         OStringBuffer aQueryString;
-
+        
         const sal_Int32 size = 1024;
         sal_Int32 n = 0;
         Sequence< sal_Int8 > aByteBuffer(size);
diff --git a/forms/source/xforms/submission/submission_get.hxx b/forms/source/xforms/submission/submission_get.hxx
index a9dfbbf3e0b6..73d32e07468a 100644
--- a/forms/source/xforms/submission/submission_get.hxx
+++ b/forms/source/xforms/submission/submission_get.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/xforms/submission/submission_post.cxx b/forms/source/xforms/submission/submission_post.cxx
index fc2fde7d3668..20b00c879822 100644
--- a/forms/source/xforms/submission/submission_post.cxx
+++ b/forms/source/xforms/submission/submission_post.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,12 +52,12 @@ using namespace std;
 
 
 CSubmissionPost::CSubmissionPost(const rtl::OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment)
-    : CSubmission(aURL, aFragment)
+    : CSubmission(aURL, aFragment) 
 {
 }
 
 CSubmission::SubmissionResult CSubmissionPost::submit(const CSS::uno::Reference< CSS::task::XInteractionHandler >& aInteractionHandler)
-{
+{    
     // PUT always uses application/xml
     CSS::uno::Reference< XCommandEnvironment > aEnvironment;
     auto_ptr< CSerialization > apSerialization(createSerialization(aInteractionHandler,aEnvironment));
@@ -66,7 +66,7 @@ CSubmission::SubmissionResult CSubmissionPost::submit(const CSS::uno::Reference<
         ucbhelper::Content aContent(m_aURLObj.GetMainURL(INetURLObject::NO_DECODE), aEnvironment);
 
         // use post command
-
+            
         OUString aCommandName = OUString::createFromAscii("post");
         PostCommandArgument2 aPostArgument;
         aPostArgument.Source = apSerialization->getInputStream();
@@ -88,7 +88,7 @@ CSubmission::SubmissionResult CSubmissionPost::submit(const CSS::uno::Reference<
         // xOut->closeOutput();
 
         try {
-            // m_aResultStream = CSS::uno::Reference< XInputStream >(aSink, UNO_QUERY_THROW);
+            // m_aResultStream = CSS::uno::Reference< XInputStream >(aSink, UNO_QUERY_THROW); 
             m_aResultStream = aSink->getInputStream();
         } catch (Exception&) {
             OSL_ENSURE(sal_False, "Cannot open reply stream from content");
@@ -99,7 +99,7 @@ CSubmission::SubmissionResult CSubmissionPost::submit(const CSS::uno::Reference<
         OSL_ENSURE(sal_False, "Exception during UCB operatration.");
         return UNKNOWN_ERROR;
     }
-
+    
 
     return SUCCESS;
 }
diff --git a/forms/source/xforms/submission/submission_post.hxx b/forms/source/xforms/submission/submission_post.hxx
index 86f040f951de..542e1252187f 100644
--- a/forms/source/xforms/submission/submission_post.hxx
+++ b/forms/source/xforms/submission/submission_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/forms/source/xforms/submission/submission_put.cxx b/forms/source/xforms/submission/submission_put.cxx
index a9f9681014be..573bcabd5afb 100644
--- a/forms/source/xforms/submission/submission_put.cxx
+++ b/forms/source/xforms/submission/submission_put.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ using namespace std;
 
 
 CSubmissionPut::CSubmissionPut(const rtl::OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment)
-    : CSubmission(aURL, aFragment)
+    : CSubmission(aURL, aFragment) 
 {
 }
 
 CSubmission::SubmissionResult CSubmissionPut::submit(const CSS::uno::Reference< CSS::task::XInteractionHandler >& aInteractionHandler)
-{
+{    
     CSS::uno::Reference< XCommandEnvironment > aEnvironment;
     auto_ptr< CSerialization > apSerialization(createSerialization(aInteractionHandler,aEnvironment));
 
@@ -66,7 +66,7 @@ CSubmission::SubmissionResult CSubmissionPut::submit(const CSS::uno::Reference<
         CSS::uno::Reference< XInputStream > aInStream = apSerialization->getInputStream();
         aContent.writeStream(aInStream, sal_True);
         //aContent.closeStream();
-
+        
         // no content as a result of put...
 
     } catch (Exception&)
@@ -75,7 +75,7 @@ CSubmission::SubmissionResult CSubmissionPut::submit(const CSS::uno::Reference<
         OSL_ENSURE(sal_False, "Exception during UCB operatration.");
         return UNKNOWN_ERROR;
     }
-
+    
 
     return SUCCESS;
 }
diff --git a/forms/source/xforms/submission/submission_put.hxx b/forms/source/xforms/submission/submission_put.hxx
index acdb15e490c8..61d5a24369be 100644
--- a/forms/source/xforms/submission/submission_put.hxx
+++ b/forms/source/xforms/submission/submission_put.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/xforms/unohelper.cxx b/forms/source/xforms/unohelper.cxx
index 475f366401a6..b6d16a30c417 100644
--- a/forms/source/xforms/unohelper.cxx
+++ b/forms/source/xforms/unohelper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,14 +68,14 @@ Reference<XInterface> xforms::createInstance( const OUString& sServiceName )
     return xInstance;
 }
 
-void xforms::copy( const Reference<XPropertySet>& xFrom,
+void xforms::copy( const Reference<XPropertySet>& xFrom, 
                    Reference<XPropertySet>& xTo )
 {
     OSL_ENSURE( xFrom.is(), "no source" );
     OSL_ENSURE( xTo.is(), "no target" );
 
     // get property names & infos, and iterate over target properties
-    Sequence<Property> aProperties =
+    Sequence<Property> aProperties = 
         xTo->getPropertySetInfo()->getProperties();
     sal_Int32 nProperties = aProperties.getLength();
     const Property* pProperties = aProperties.getConstArray();
diff --git a/forms/source/xforms/unohelper.hxx b/forms/source/xforms/unohelper.hxx
index 76125cf1dcee..95a6bb613e97 100644
--- a/forms/source/xforms/unohelper.hxx
+++ b/forms/source/xforms/unohelper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/xforms/warnings_guard_unicode_regex.h b/forms/source/xforms/warnings_guard_unicode_regex.h
index 68f0022d7966..dd82f0c6a1bc 100644
--- a/forms/source/xforms/warnings_guard_unicode_regex.h
+++ b/forms/source/xforms/warnings_guard_unicode_regex.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/forms/source/xforms/xforms_services.cxx b/forms/source/xforms/xforms_services.cxx
index 6ef347dd0c4c..c10016afcdac 100644
--- a/forms/source/xforms/xforms_services.cxx
+++ b/forms/source/xforms/xforms_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
@@ -53,18 +53,18 @@ using com::sun::star::container::XNameContainer;
 using rtl::OUString;
 
 
-namespace frm
+namespace frm 
 {
 
 Reference<XInterface> Model_CreateInstance(
-    const Reference<XMultiServiceFactory>& )
+    const Reference<XMultiServiceFactory>& ) 
     throw( RuntimeException )
 {
     return static_cast<XPropertySet*>( new xforms::Model );
 }
 
 Reference<XInterface> XForms_CreateInstance(
-    const Reference<XMultiServiceFactory>& )
+    const Reference<XMultiServiceFactory>& ) 
     throw( RuntimeException )
 {
     return static_cast<XNameContainer*>( new NameContainer<Reference<XPropertySet> >() );
diff --git a/forms/source/xforms/xforms_services.hxx b/forms/source/xforms/xforms_services.hxx
index c1e4dc459dc0..32a7c43e6387 100644
--- a/forms/source/xforms/xforms_services.hxx
+++ b/forms/source/xforms/xforms_services.hxx
@@ -9,21 +9,21 @@ namespace com { namespace sun { namespace star {
 } } }
 
 
-namespace frm
+namespace frm 
 {
-    com::sun::star::uno::Reference<com::sun::star::uno::XInterface>
+    com::sun::star::uno::Reference<com::sun::star::uno::XInterface> 
     SAL_CALL Binding_CreateInstance(
-        const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>& _rxFactory)
+        const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>& _rxFactory) 
         throw( com::sun::star::uno::RuntimeException );
 
-    com::sun::star::uno::Reference<com::sun::star::uno::XInterface>
+    com::sun::star::uno::Reference<com::sun::star::uno::XInterface> 
     SAL_CALL Model_CreateInstance(
-        const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>& _rxFactory)
+        const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>& _rxFactory) 
         throw( com::sun::star::uno::RuntimeException );
 
-    com::sun::star::uno::Reference<com::sun::star::uno::XInterface>
+    com::sun::star::uno::Reference<com::sun::star::uno::XInterface> 
     SAL_CALL XForms_CreateInstance(
-        const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>& _rxFactory)
+        const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>& _rxFactory) 
         throw( com::sun::star::uno::RuntimeException );
 }
 
diff --git a/forms/source/xforms/xformsevent.cxx b/forms/source/xforms/xformsevent.cxx
index 236284165bd2..06801ce3bae9 100644
--- a/forms/source/xforms/xformsevent.cxx
+++ b/forms/source/xforms/xformsevent.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 namespace com {
 namespace sun {
 namespace star {
-namespace xforms {
+namespace xforms {  
 
 using rtl::OUString;
 using com::sun::star::uno::RuntimeException;
 
-void SAL_CALL XFormsEventConcrete::initXFormsEvent(const OUString& typeArg,
+void SAL_CALL XFormsEventConcrete::initXFormsEvent(const OUString& typeArg, 
     sal_Bool canBubbleArg, sal_Bool cancelableArg)
     throw (RuntimeException)
 {
@@ -90,7 +90,7 @@ void SAL_CALL XFormsEventConcrete::preventDefault() throw (RuntimeException)
 {
 }
 
-void SAL_CALL XFormsEventConcrete::initEvent(const OUString& eventTypeArg, sal_Bool canBubbleArg,
+void SAL_CALL XFormsEventConcrete::initEvent(const OUString& eventTypeArg, sal_Bool canBubbleArg, 
     sal_Bool cancelableArg) throw (RuntimeException)
 {
     m_eventType = eventTypeArg;
diff --git a/forms/source/xforms/xformsevent.hxx b/forms/source/xforms/xformsevent.hxx
index 806abe6e3e62..7437425cb57e 100644
--- a/forms/source/xforms/xformsevent.hxx
+++ b/forms/source/xforms/xformsevent.hxx
@@ -11,12 +11,12 @@
 namespace com {
 namespace sun {
 namespace star {
-namespace xforms {
+namespace xforms {  
 
 class XFormsEventConcrete : public cppu::WeakImplHelper1< XFormsEvent > {
 
     public:
-
+ 
         typedef com::sun::star::uno::RuntimeException RuntimeException_t;
         typedef com::sun::star::uno::Reference< com::sun::star::xml::dom::events::XEventTarget > XEventTarget_t;
         typedef com::sun::star::xml::dom::events::PhaseType PhaseType_t;
@@ -36,19 +36,19 @@ class XFormsEventConcrete : public cppu::WeakImplHelper1< XFormsEvent > {
         virtual void SAL_CALL preventDefault() throw (RuntimeException_t);
 
         virtual void SAL_CALL initXFormsEvent(
-                            const rtl::OUString& typeArg,
-                            sal_Bool canBubbleArg,
+                            const rtl::OUString& typeArg, 
+                            sal_Bool canBubbleArg, 
                             sal_Bool cancelableArg )
                             throw (RuntimeException_t);
 
         virtual void SAL_CALL initEvent(
-            const rtl::OUString& eventTypeArg,
-            sal_Bool canBubbleArg,
-            sal_Bool cancelableArg)
+            const rtl::OUString& eventTypeArg, 
+            sal_Bool canBubbleArg, 
+            sal_Bool cancelableArg) 
             throw (RuntimeException_t);
 
     private:
-
+        
         sal_Bool m_canceled;
 
     protected:
diff --git a/forms/source/xforms/xmlhelper.cxx b/forms/source/xforms/xmlhelper.cxx
index 14c9b73163e1..02683333e7cd 100644
--- a/forms/source/xforms/xmlhelper.cxx
+++ b/forms/source/xforms/xmlhelper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/xforms/xmlhelper.hxx b/forms/source/xforms/xmlhelper.hxx
index 7c102cc8aeaa..e5fc6ea6abda 100644
--- a/forms/source/xforms/xmlhelper.hxx
+++ b/forms/source/xforms/xmlhelper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/xforms/xpathlib/extension.cxx b/forms/source/xforms/xpathlib/extension.cxx
index 26bc2b7640fc..26dfb55d4b6b 100644
--- a/forms/source/xforms/xpathlib/extension.cxx
+++ b/forms/source/xforms/xpathlib/extension.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/forms/source/xforms/xpathlib/extension.hxx b/forms/source/xforms/xpathlib/extension.hxx
index c44a80f9860f..e0caea013200 100644
--- a/forms/source/xforms/xpathlib/extension.hxx
+++ b/forms/source/xforms/xpathlib/extension.hxx
@@ -18,7 +18,7 @@
 
 
 
-class CLibxml2XFormsExtension : public cppu::WeakImplHelper2<
+class CLibxml2XFormsExtension : public cppu::WeakImplHelper2< 
     com::sun::star::xml::xpath::XXPathExtension, com::sun::star::lang::XInitialization>
 {
 private:
diff --git a/forms/source/xforms/xpathlib/xpathlib.cxx b/forms/source/xforms/xpathlib/xpathlib.cxx
index 49918c7c8b6f..21170a6001a7 100644
--- a/forms/source/xforms/xpathlib/xpathlib.cxx
+++ b/forms/source/xforms/xpathlib/xpathlib.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/javainstaller2/build.xml b/javainstaller2/build.xml
index 477d489f886d..235b18b94ee2 100755
--- a/javainstaller2/build.xml
+++ b/javainstaller2/build.xml
@@ -13,7 +13,7 @@
   <property name="classes.dir"            value="classes"/>
   <property name="source.dir"             location="${basedir}/src/${name}"/>
   <property name="build.dir"              location="${out}/misc"/>
-  <property name="dist.dir"               location="${out}/bin"/>
+  <property name="dist.dir"               location="${out}/bin"/>  
   <property name="compile.debug"          value="true"/>
   <property name="compile.optimize"       value="false"/>
   <property name="lib.dir"                location="{$basedir}/lib"/>
@@ -38,7 +38,7 @@
     <mkdir dir="${build.dir}"/>
     <mkdir dir="${build.dir}/${classes.dir}"/>
     <mkdir dir="${build.dir}/${classes.dir}/${name}"/>
-    <mkdir dir="${dist.dir}"/>
+    <mkdir dir="${dist.dir}"/>        
   </target>
 
   <!-- show information about current sub target in recursive builds -->
@@ -72,18 +72,18 @@
     <copy todir="${build.dir}/${classes.dir}/${name}/org/openoffice/setup/Icons">
       <fileset dir="${source.dir}/org/openoffice/setup/Icons" includes="*.gif,*.png"/>
     </copy>
-  </target>
+  </target>  
 
   <target name="jar-javainstaller" depends="compile-javainstaller" unless="jarFile.uptodate">
     <jar file="${dist.dir}/${name}.jar">
         <fileset dir="${build.dir}/${classes.dir}/${name}" includes="**/*"/>
         <manifest>
-          <attribute name="Main-Class" value="org.openoffice.setup.Main"/>
-        </manifest>
+          <attribute name="Main-Class" value="org.openoffice.setup.Main"/> 
+        </manifest>         
     </jar>
   </target>
 
-  <!-- CLEAN UP OUTPUT TREES -->
+  <!-- CLEAN UP OUTPUT TREES -->    
   <target name="clean" unless="jarFile.uptodate">
    <!-- <delete dir="${build.dir}"/> -->
   </target>
@@ -94,12 +94,12 @@
     <java jar="${dist.dir}/${name}.jar" fork="true"/>
      <!-- </java> -->
   </target>
-
+  
   <target name="debug" depends="jar-javainstaller">
     <echo message="Starting for debugging: java -jar ${dist.dir}/${name}.jar" />
     <java jar="${dist.dir}/${name}.jar" fork="true"/>
-     <!-- </java> -->
+     <!-- </java> -->  
 </target>
-
-
+  
+     
 </project>
diff --git a/javainstaller2/src/Helpfiles/create_helpfiles.pl b/javainstaller2/src/Helpfiles/create_helpfiles.pl
index 7fb1ac836faf..6a842a99c5a6 100755
--- a/javainstaller2/src/Helpfiles/create_helpfiles.pl
+++ b/javainstaller2/src/Helpfiles/create_helpfiles.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
@@ -79,20 +79,20 @@ for ( my $i = 0; $i <= $#{$allhelpfilenames}; $i++ )
   for ( my $j = 0; $j <= $#{$alllanguages}; $j++ )
   {
     my $language = ${$alllanguages}[$j];
-
+    
     # Creating content of help file
     my $helpfilecontent = collect_helpfile_content($helpfilename, $ulffile, $language);
-
+    
     # Saving helpfile
     my $savefilename = $helpfilename . "_" . $language . ".html";
     $savefilename = $outputpath . $separator . $savefilename;
-    save_file($savefilename, $helpfilecontent);
+    save_file($savefilename, $helpfilecontent);  
 
     if ( $language eq $defaultlanguage )
     {
       $savefilename = $helpfilename . ".html";
       $savefilename = $outputpath . $separator . $savefilename;
-      save_file($savefilename, $helpfilecontent);
+      save_file($savefilename, $helpfilecontent);  
     }
   }
 }
@@ -102,7 +102,7 @@ exit;
 sub main::read_directory
 {
   my ($dir, $ext) = @_;
-
+  
   my @content = ();
   my $direntry;
   opendir(DIR, $dir);
@@ -139,13 +139,13 @@ sub main::collect_helpfile_content
 
   my @helpfilecontent = ();
   my $stringhash = create_string_hash($ulffile, $language);
-
+  
   # Collecting all strings for one html file.
   # For "Prologue_de.html" all files need to begin with "STRING_PROLOGUE_X"
   # The "X" is the ordering number.
-
+  
   my $basestring = "STRING_" . uc($helpfilename) . "_";
-
+  
   for ( my $i = 0; $i <= 10; $i++ )  # 10 strings possible for each html file
   {
     my $key = $basestring . $i;
@@ -155,16 +155,16 @@ sub main::collect_helpfile_content
       push(@helpfilecontent, $content);
     }
   }
-
+  
   return \@helpfilecontent;
 }
 
 sub main::collect_helpfile_names
 {
     my ($helpfilecontent) = @_;
-
+    
     my @allhelpfiles = ();
-
+    
     for ( my $i = 0; $i <= $#{$helpfilecontent}; $i++ )
     {
         if ( ${$helpfilecontent}[$i] =~ /^\s*#/ ) { next; }  # comment line
@@ -173,7 +173,7 @@ sub main::collect_helpfile_names
         $filename =~ s/\s//g;
         push(@allhelpfiles, $filename);
     }
-
+    
     return \@allhelpfiles;
 }
 
@@ -183,31 +183,31 @@ sub main::get_all_languages
 
   my @languages = ();
   my $record = 0;
-
+  
   for ( my $i = 0; $i <= $#{$ulffile}; $i++ )
   {
     if (( ${$ulffile}[$i] =~ /^\s*\[.*]\s*$/ ) && ( $record )) { last; }
     if (( ${$ulffile}[$i] =~ /^\s*\[.*]\s*$/ ) && ( $record == 0 )) { $record = 1; }
-
+    
     if (( $record ) && ( ${$ulffile}[$i] =~ /^\s*(.+?)\s*\=/ ))
     {
       $language = $1;
       push(@languages, $language);
     }
   }
-
+  
   my $languagestring = "";
   for ( my $i = 0; $i <= $#languages; $i++ ) { $languagestring = $languagestring . $languages[$i] . ","; }
   $languagestring =~ s/,\s*$//;
   print "Languages: $languagestring\n";
-
+    
   return \@languages;
 }
 
 sub main::create_string_hash
 {
   my ($ulffile, $language) = @_;
-
+  
   my %stringhash = ();
   my $key = "";
   my $value_defined = 0;
@@ -222,24 +222,24 @@ sub main::create_string_hash
 
     if (( ${$ulffile}[$i] =~ /^\s*\Q$defaultlanguage\E\s*=\s*\"(.*)\"\s*$/ ) && ( ! $value_defined ))
     {
-      $value = $1;  # defaulting to english
+      $value = $1;	# defaulting to english
       $stringhash{$key} = $value;
     }
-
+        
     if (( ${$ulffile}[$i] =~ /^\s*\Q$language\E\s*=\s*\"(.*)\"\s*$/ ) && ( ! $value_defined ))
     {
       $value = $1;
       $stringhash{$key} = $value;
       $value_defined = 1;
     }
-  }
+  }  
 
   # additional replacement for ${LANGUAGE}, not defined in ulf file
   my $languagekey = "LANGUAGE";
   $stringhash{$languagekey} = $language;
 
   # print_hash(\%stringhash);
-
+  
   return \%stringhash;
 }
 
@@ -248,7 +248,7 @@ sub main::print_hash
   my ( $hashref ) = @_;
 
   print "Hash contains:\n";
-
+  
   my $key;
   foreach $key (keys %{$hashref} ) { print "Key: $key, Value: $hashref->{$key}\n"; }
 }
@@ -256,13 +256,13 @@ sub main::print_hash
 sub main::save_file
 {
   my ($filename, $filecontent) = @_;
-
+  
   if ( open( OUT, ">$filename" ) )
   {
     print OUT @{$filecontent};
-    close( OUT);
+    close( OUT);	
   }
-
+  
   push(@allnewpropertyfiles, $filename);
   print "Created file: $filename\n";
 }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/AcceptLicenseCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/AcceptLicenseCtrl.java
index 025b96a7990d..8a1f390f8450 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/AcceptLicenseCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/AcceptLicenseCtrl.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 @@ public class AcceptLicenseCtrl extends PanelController {
         super("AcceptLicense", new AcceptLicense());
         helpFile = "String_Helpfile_AcceptLicense";
     }
-
+    
     public String getNext() {
         InstallData data = InstallData.getInstance();
 
@@ -48,23 +48,23 @@ public class AcceptLicenseCtrl extends PanelController {
             if ( data.olderVersionExists() ) {
                 return new String("InstallationImminent");
             } else if ( data.sameVersionExists() ) {
-                return new String("ChooseComponents");
+                return new String("ChooseComponents");            
             } else {
                 return new String("ChooseInstallationType");
             }
         } else {
-            return new String("ChooseDirectory");
+            return new String("ChooseDirectory");            
         }
     }
-
+    
     public String getPrevious() {
         return new String("Prologue");
-    }
+    }  
 
     public final String getHelpFileName () {
         return this.helpFile;
     }
-
+ 
     public void beforeShow() {
         String StringInstall = ResourceManager.getString("String_AcceptLicense");
         getSetupFrame().setButtonText(StringInstall, getSetupFrame().BUTTON_NEXT);
@@ -73,5 +73,5 @@ public class AcceptLicenseCtrl extends PanelController {
 
         getSetupFrame().setButtonSelected(getSetupFrame().BUTTON_CANCEL);
     }
-
+    
 }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseComponentsCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseComponentsCtrl.java
index e6eeda82d7b6..1ab3edc7a6cb 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseComponentsCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseComponentsCtrl.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,15 +52,15 @@ public class ChooseComponentsCtrl extends PanelController {
     public String getNext() {
         return new String("InstallationImminent");
     }
-
+    
     public String getPrevious() {
 
         InstallData data = InstallData.getInstance();
-
+        
         if ( data.isRootInstallation() ) {
             if ( data.sameVersionExists() ) {
                 if ( data.hideEula() ) {
-                    return new String("Prologue");
+                    return new String("Prologue");            
                 } else {
                     return new String("AcceptLicense");
                 }
@@ -69,7 +69,7 @@ public class ChooseComponentsCtrl extends PanelController {
             }
         } else {
             if ( data.sameVersionExists() ) {
-                return new String("ChooseDirectory");
+                return new String("ChooseDirectory");            
             } else {
                 return new String("ChooseInstallationType");
             }
@@ -79,11 +79,11 @@ public class ChooseComponentsCtrl extends PanelController {
     public final String getHelpFileName () {
         return this.helpFile;
     }
-
+    
     public void beforeShow() {
 
         InstallData data = InstallData.getInstance();
-
+        
         // Setting the package size for node modules, that have hidden children
         // -> Java module has three hidden children and 0 byte size
 
@@ -92,39 +92,39 @@ public class ChooseComponentsCtrl extends PanelController {
             ModuleCtrl.setModuleSize(packageData);
             data.setModuleSizeSet(true);
         }
-
+        
         if ( data.sameVersionExists() ) {
             ChooseComponents panel = (ChooseComponents)getPanel();
             String dialogTitle = ResourceManager.getString("String_ChooseComponents1_Maintain");
             panel.setTitleText(dialogTitle);
         }
-
+        
     }
-
+    
     public boolean afterShow(boolean nextButtonPressed) {
         boolean repeatDialog = false;
 
         InstallData data = InstallData.getInstance();
         PackageDescription packageData = SetupDataProvider.getPackageDescription();
-
+        
         if ( nextButtonPressed ) {
-
+            
             // Check, if at least one visible module was selected for installation
             data.setVisibleModulesChecked(false);
             ModuleCtrl.checkVisibleModulesInstall(packageData, data);
-
+        
             if ( data.visibleModulesChecked() ) {
 
                 // Check, if at least one application module was selected for installation
                 // (not necessary, if an older product is updated or additional modules are
                 // added in maintenance mode).
-
+                
                 boolean applicationSelected = false;
                 if ( data.olderVersionExists() || data.sameVersionExists() ) {
-                    applicationSelected = true;
+                    applicationSelected = true;            
                 } else {
                     data.setApplicationModulesChecked(false);
-                    ModuleCtrl.checkApplicationSelection(packageData, data);
+                    ModuleCtrl.checkApplicationSelection(packageData, data); 
                     applicationSelected = data.applicationModulesChecked();
                 }
 
@@ -133,16 +133,16 @@ public class ChooseComponentsCtrl extends PanelController {
                     // Check, if at least one language module was selected for installation
                     // (not necessary, if an older product is updated or additional modules are
                     // added in maintenance mode).
-
+                
                     boolean languageSelected = false;
                     if ( data.olderVersionExists() || data.sameVersionExists() || ( ! data.isMultiLingual())) {
-                        languageSelected = true;
+                        languageSelected = true;            
                     } else {
                         data.setLanguageModulesChecked(false);
-                        ModuleCtrl.checkLanguageSelection(packageData, data);
+                        ModuleCtrl.checkLanguageSelection(packageData, data); 
                         languageSelected = data.languageModulesChecked();
                     }
-
+                
                     if ( languageSelected ) {
 
                         // Set module settings for hidden modules.
@@ -175,7 +175,7 @@ public class ChooseComponentsCtrl extends PanelController {
                                          ResourceManager.getString("String_No_Language_Selected_2");
                         String title = ResourceManager.getString("String_Change_Selection");
                         Informer.showInfoMessage(message, title);
-                        repeatDialog = true;
+                        repeatDialog = true;                    
                     }
                 } else {
                     String message = ResourceManager.getString("String_No_Application_Selected_1") + "\n" +
@@ -183,7 +183,7 @@ public class ChooseComponentsCtrl extends PanelController {
                     String title = ResourceManager.getString("String_Change_Selection");
                     Informer.showInfoMessage(message, title);
                     repeatDialog = true;
-                }
+                }    
             } else {  // no modules selected for installation
                 String message = ResourceManager.getString("String_No_Components_Selected_1") + "\n" +
                                  ResourceManager.getString("String_No_Components_Selected_2");
@@ -195,10 +195,10 @@ public class ChooseComponentsCtrl extends PanelController {
             // Saving typical selection state values (always if back button is pressed!).
             // System.err.println("Saving custom selection states");
             ModuleCtrl.saveCustomSelectionStates(packageData);
-            data.setCustomSelectionStateSaved(true);
+            data.setCustomSelectionStateSaved(true);            
         }
-
+        
         return repeatDialog;
     }
-
+    
 }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseDirectoryCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseDirectoryCtrl.java
index 4a3bfab8452e..deecd854e77c 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseDirectoryCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseDirectoryCtrl.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 @@ import org.openoffice.setup.Util.PackageCollector;
 public class ChooseDirectoryCtrl extends PanelController {
 
     private String helpFile;
-
+    
     public ChooseDirectoryCtrl() {
         super("ChooseDirectory", new ChooseDirectory());
         helpFile = "String_Helpfile_ChooseDirectory";
@@ -66,17 +66,17 @@ public class ChooseDirectoryCtrl extends PanelController {
         if ( data.olderVersionExists() ) {
             return new String("InstallationImminent");
         } else if ( data.sameVersionExists() ) {
-            return new String("ChooseComponents");
+            return new String("ChooseComponents");            
         } else {
             return new String("ChooseInstallationType");
         }
     }
-
+    
     public String getPrevious() {
         InstallData data = InstallData.getInstance();
 
         if ( data.hideEula() ) {
-            return new String("Prologue");
+            return new String("Prologue");            
         } else {
             return new String("AcceptLicense");
         }
@@ -94,14 +94,14 @@ public class ChooseDirectoryCtrl extends PanelController {
         }
         // mask spaces
         // s.replaceAll(" ", "\\ ");
-
+        
         return s;
     }
 
     public void beforeShow() {
         ChooseDirectory panel = (ChooseDirectory)getPanel();
         InstallData data = InstallData.getInstance();
-
+        
         if ( data.getInstallDir() == null ) {
             String installDir = data.getDefaultDir();
 
@@ -127,7 +127,7 @@ public class ChooseDirectoryCtrl extends PanelController {
         dir = removeEndingDelimiter(dir);
         InstallData data = InstallData.getInstance();
         data.setInstallDir(dir);
-
+        
         File installDefaultDir = new File(dir, data.getDefaultDir());
         data.setInstallDefaultDir(installDefaultDir.getPath());
 
@@ -167,13 +167,13 @@ public class ChooseDirectoryCtrl extends PanelController {
             }
 
             // Additional tasks, if the directory is okay
-
+            
             if ( ! repeatDialog ) {
                 // Calculate available disc space
                 int discSpace = SystemManager.calculateDiscSpace(dir);
                 data.setAvailableDiscSpace(discSpace);
 
-                Installer installer = InstallerFactory.getInstance();
+                Installer installer = InstallerFactory.getInstance();                
 
                 // Is this a new directory, or one that was already set before.
                 // In this case, the database does not need to be evaluated again.
@@ -183,12 +183,12 @@ public class ChooseDirectoryCtrl extends PanelController {
                     String oldDatabasePath = data.getDatabasePath();
                     // Setting the database path
                     installer.defineDatabasePath();
-
+                    
                     if (( oldDatabasePath == null ) || ( ! oldDatabasePath.equals(data.getDatabasePath()))) {
                         data.setDatabaseAnalyzed(false);
                         data.setDatabaseQueried(false);
                     } else {
-                        data.setDatabaseAnalyzed(true);
+                        data.setDatabaseAnalyzed(true);                        
                     }
                 }
 
@@ -202,16 +202,16 @@ public class ChooseDirectoryCtrl extends PanelController {
                     InstallChangeCtrl.checkInstallChange(data);
                     // InstallChangeCtrl.checkInstallChange(data, panel);
                 }
-
+                                
                 // At this point it is clear, whether the update-Package is installed or not.
                 // If it is installed, it is also clear, in which version it is installed.
-                // Therefore the following dialog is also defined.
-
+                // Therefore the following dialog is also defined.                
+                
                 if ( data.newerVersionExists() ) {
                     // This can happen only in installation with user privileges.
-                    // Installations with root privileges have cancelled installation
+                    // Installations with root privileges have cancelled installation 
                     // already at first dialog.
-                    // Possibility to select a new directory, in which no
+                    // Possibility to select a new directory, in which no 
                     // newer product exists
                     String message = ResourceManager.getString("String_Newer_Version_Installed_Found") + "\n" + data.getInstallDir() + "\n" +
                                      ResourceManager.getString("String_Newer_Version_Database") + ": " + data.getDatabasePath() + "\n" +
@@ -221,15 +221,15 @@ public class ChooseDirectoryCtrl extends PanelController {
 
                     repeatDialog = true;
                 }
-
+                
                 // If an older version is found, and the update is forbidden, the user
                 // can select another installation directory.
 
                 if ( data.olderVersionExists() && data.dontUpdate() ) {
                     // This can happen only in installation with user privileges.
-                    // Installations with root privileges have cancelled installation
+                    // Installations with root privileges have cancelled installation 
                     // already at first dialog (InstallChangeCtrl.java).
-                    // Possibility to select a new directory, in which no
+                    // Possibility to select a new directory, in which no 
                     // older product exists
                     String message = ResourceManager.getString("String_Older_Version_Installed_Found") + "\n" + data.getInstallDir() + "\n" +
                                      ResourceManager.getString("String_Newer_Version_Database") + ": " + data.getDatabasePath() + "\n" +
@@ -249,7 +249,7 @@ public class ChooseDirectoryCtrl extends PanelController {
                 }
             }
         }
-
+        
         return repeatDialog;
     }
 
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseInstallationTypeCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseInstallationTypeCtrl.java
index 25432ae7def3..ee7bea2e6f30 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseInstallationTypeCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseInstallationTypeCtrl.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,47 +41,47 @@ import java.util.Vector;
 import org.openoffice.setup.Util.PackageCollector;
 
 public class ChooseInstallationTypeCtrl extends PanelController implements ActionListener {
-
+ 
     private String helpFile;
-
+    
     public ChooseInstallationTypeCtrl() {
         super("ChooseInstallationType", new ChooseInstallationType());
         helpFile = "String_Helpfile_ChooseInstallationType";
     }
-
+    
     public String getNext() {
 
         InstallData data = InstallData.getInstance();
-
+        
         if ( data.getInstallationType().equals(data.getCustomActionCommand()) ) {
             return new String("ChooseComponents");
         } else if ( data.getInstallationType().equals(data.getTypicalActionCommand()) ) {
-            return new String("InstallationImminent");
+            return new String("InstallationImminent");            
         } else {
-            System.err.println("Error: Unknown installation type!" );
-            return new String("Error");
+            System.err.println("Error: Unknown installation type!" );            
+            return new String("Error");            
         }
     }
-
+    
     public String getPrevious() {
 
         InstallData data = InstallData.getInstance();
-
+        
         if ( data.isRootInstallation() ) {
             if ( data.hideEula() ) {
-                return new String("Prologue");
+                return new String("Prologue");            
             } else {
                 return new String("AcceptLicense");
             }
         } else {
             return new String("ChooseDirectory");
         }
-    }
+    }  
 
     public final String getHelpFileName () {
         return this.helpFile;
     }
-
+ 
     public void beforeShow() {
 
         InstallData data = InstallData.getInstance();
@@ -91,22 +91,22 @@ public class ChooseInstallationTypeCtrl extends PanelController implements Actio
         panel.setTypicalActionCommand(data.getTypicalActionCommand());
         panel.setCustomActionCommand(data.getCustomActionCommand());
     }
-
+    
     public boolean afterShow(boolean nextButtonPressed) {
         boolean repeatDialog = false;
         ChooseInstallationType panel = (ChooseInstallationType)getPanel();
         panel.removeActionListener((ChooseInstallationTypeCtrl)this);
-
+        
         if ( nextButtonPressed ) {
-
+        
             InstallData data = InstallData.getInstance();
             PackageDescription packageData = SetupDataProvider.getPackageDescription();
 
             if ( data.getInstallationType().equals(data.getTypicalActionCommand()) ) {
-
+                
                 // If typical selection state values have been saved before,
                 // it is now time to restore them
-
+                
                 if ( data.typicalSelectionStateSaved()) {
                     // System.err.println("Restoring typical selection states");
                     ModuleCtrl.restoreTypicalSelectionStates(packageData);
@@ -125,7 +125,7 @@ public class ChooseInstallationTypeCtrl extends PanelController implements Actio
                 if ( data.logModuleStates() ) {
                     Dumper.logModuleStates(packageData, "ChooseInstallationType: After setHiddenModuleSettingsInstall");
                 }
-
+                
                 // Collecting packages to install
                 Vector installPackages = new Vector();
                 PackageCollector.collectInstallPackages(packageData, installPackages);
@@ -134,7 +134,7 @@ public class ChooseInstallationTypeCtrl extends PanelController implements Actio
                 // Check disc space
                 if ( Calculator.notEnoughDiscSpace(data) ) {
                     repeatDialog = true;
-                }
+                } 
             }
 
             // Custom installation type
@@ -145,7 +145,7 @@ public class ChooseInstallationTypeCtrl extends PanelController implements Actio
                     ModuleCtrl.saveTypicalSelectionStates(packageData);
                     data.setTypicalSelectionStateSaved(true);
                 }
-
+                
                 // Setting custom selection state values, if they have been saved before.
                 if ( data.customSelectionStateSaved() ) {
                     // System.err.println("Restoring custom selection states");
@@ -156,19 +156,19 @@ public class ChooseInstallationTypeCtrl extends PanelController implements Actio
 
         return repeatDialog;
     }
-
+    
     public void actionPerformed(ActionEvent evt) {
 
         InstallData data = InstallData.getInstance();
 
         if (evt.getActionCommand().equals(data.getTypicalActionCommand())) {
             data.setInstallationType(data.getTypicalActionCommand());
-            // System.err.println("Setting installation type: " +  data.getTypicalActionCommand());
+            // System.err.println("Setting installation type: " +  data.getTypicalActionCommand());            
         } else if (evt.getActionCommand().equals(data.getCustomActionCommand())) {
             data.setInstallationType(data.getCustomActionCommand());
-            // System.err.println("Setting installation type: " +  data.getCustomActionCommand());
+            // System.err.println("Setting installation type: " +  data.getCustomActionCommand());            
         }
-
+ 
     }
-
+    
 }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseUninstallationComponentsCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseUninstallationComponentsCtrl.java
index 15ae15654d28..69f01439a188 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseUninstallationComponentsCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseUninstallationComponentsCtrl.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,19 +45,19 @@ public class ChooseUninstallationComponentsCtrl extends PanelController {
         super("ChooseUninstallationComponents", new ChooseUninstallationComponents());
         helpFile = "String_Helpfile_ChooseUninstallationComponents";
     }
-
+    
     public String getNext() {
         return new String("UninstallationImminent");
     }
-
+    
     public String getPrevious() {
         return new String("ChooseUninstallationType");
-    }
+    }  
 
     public final String getHelpFileName () {
         return this.helpFile;
     }
-
+    
     public boolean afterShow(boolean nextButtonPressed) {
         boolean repeatDialog = false;
 
@@ -79,7 +79,7 @@ public class ChooseUninstallationComponentsCtrl extends PanelController {
                                  ResourceManager.getString("String_No_Uninstallcomponents_Selected_2");
                 String title = ResourceManager.getString("String_Nothing_To_Uninstall");
                 Informer.showInfoMessage(message, title);
-                repeatDialog = true;
+                repeatDialog = true;            
             } else {
                 // Check, if all visible modules are selected for uninstallation.
                 // Then this shall be handled as complete uninstallation
@@ -89,12 +89,12 @@ public class ChooseUninstallationComponentsCtrl extends PanelController {
 
                 // If this is not a complete uninstallation, at least one language
                 // module or one application module has to be installed.
-
+                
                 if ( ! data.isMaskedCompleteUninstallation() ) {
 
                     data.setApplicationModulesChecked(false);
                     ModuleCtrl.checkApplicationModulesUninstall(packageData, data);
-
+                    
                     if ( ! data.applicationModulesChecked() ) {
 
                         String message = ResourceManager.getString("String_All_Applicationcomponents_Selected_1") + "\n" +
@@ -122,10 +122,10 @@ public class ChooseUninstallationComponentsCtrl extends PanelController {
         } else {  // the back button was pressed
             // Saving typical selection state values (always if back button is pressed!).
             ModuleCtrl.saveCustomSelectionStates(packageData);
-            data.setCustomSelectionStateSaved(true);
+            data.setCustomSelectionStateSaved(true);            
         }
-
+        
         return repeatDialog;
     }
-
+    
 }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseUninstallationTypeCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseUninstallationTypeCtrl.java
index d1c5e69430db..e24f3859fbad 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseUninstallationTypeCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/ChooseUninstallationTypeCtrl.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,32 +37,32 @@ import org.openoffice.setup.SetupData.SetupDataProvider;
 import org.openoffice.setup.Util.ModuleCtrl;
 
 public class ChooseUninstallationTypeCtrl extends PanelController implements ActionListener {
-
+ 
     private String helpFile;
-
+    
     public ChooseUninstallationTypeCtrl() {
         super("ChooseUninstallationType", new ChooseUninstallationType());
         helpFile = "String_Helpfile_ChooseUninstallationType";
     }
-
+    
     public String getNext() {
 
         InstallData data = InstallData.getInstance();
-
+        
         if ( data.getInstallationType().equals(data.getCustomActionCommand()) ) {
             return new String("ChooseUninstallationComponents");
         } else if ( data.getInstallationType().equals(data.getTypicalActionCommand()) ) {
-            return new String("UninstallationImminent");
+            return new String("UninstallationImminent");            
         } else {
-            System.err.println("Error: Unknown uninstallation type!" );
-            return new String("Error");
+            System.err.println("Error: Unknown uninstallation type!" );            
+            return new String("Error");            
         }
     }
-
+    
     public String getPrevious() {
         return new String("UninstallationPrologue");
-    }
-
+    }  
+ 
     public void beforeShow() {
 
         InstallData data = InstallData.getInstance();
@@ -75,20 +75,20 @@ public class ChooseUninstallationTypeCtrl extends PanelController implements Act
 
     public boolean afterShow(boolean nextButtonPressed) {
         boolean repeatDialog = false;
-
+        
         ChooseUninstallationType panel = (ChooseUninstallationType)getPanel();
         panel.removeActionListener((ChooseUninstallationTypeCtrl)this);
-
+        
         if ( nextButtonPressed ) {
 
             InstallData data = InstallData.getInstance();
             PackageDescription packageData = SetupDataProvider.getPackageDescription();
-
+            
             // Typical uninstallation type
             if ( data.getInstallationType().equals(data.getTypicalActionCommand()) ) {
                 // If typical selection state values have been saved before,
                 // it is now time to restore them
-
+                
                 if ( data.typicalSelectionStateSaved()) {
                     ModuleCtrl.restoreTypicalSelectionStates(packageData);
                 }
@@ -100,7 +100,7 @@ public class ChooseUninstallationTypeCtrl extends PanelController implements Act
                 if ( ! data.typicalSelectionStateSaved()) {
                     ModuleCtrl.saveTypicalSelectionStates(packageData);
                     data.setTypicalSelectionStateSaved(true);
-                }
+                }                
 
                 // Setting custom selection state values, if they have been saved before.
                 if ( data.customSelectionStateSaved() ) {
@@ -111,23 +111,23 @@ public class ChooseUninstallationTypeCtrl extends PanelController implements Act
 
         return repeatDialog;
     }
-
+    
     public void actionPerformed(ActionEvent evt) {
 
         InstallData data = InstallData.getInstance();
 
         if (evt.getActionCommand().equals(data.getTypicalActionCommand())) {
             data.setInstallationType(data.getTypicalActionCommand());
-            // System.err.println("Setting uninstallation type: " +  data.getTypicalActionCommand());
+            // System.err.println("Setting uninstallation type: " +  data.getTypicalActionCommand());            
         } else if (evt.getActionCommand().equals(data.getCustomActionCommand())) {
             data.setInstallationType(data.getCustomActionCommand());
-            // System.err.println("Setting uninstallation type: " +  data.getCustomActionCommand());
+            // System.err.println("Setting uninstallation type: " +  data.getCustomActionCommand());            
         }
-
+ 
     }
 
     public final String getHelpFileName () {
         return this.helpFile;
     }
-
+    
 }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationCompletedCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationCompletedCtrl.java
index fc14c238da0b..39342969dca2 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationCompletedCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationCompletedCtrl.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
@@ -48,7 +48,7 @@ public class InstallationCompletedCtrl extends PanelController {
         super("InstallationCompleted", new installationCompleted());
         helpFile = "String_Helpfile_InstallationCompleted";
     }
-
+            
     public void beforeShow() {
         InstallData installData = InstallData.getInstance();
         ProductDescription productData = SetupDataProvider.getProductDescription();
@@ -58,12 +58,12 @@ public class InstallationCompletedCtrl extends PanelController {
         getSetupFrame().setButtonEnabled(false, getSetupFrame().BUTTON_HELP);
         getSetupFrame().removeButtonIcon(getSetupFrame().BUTTON_NEXT);
         getSetupFrame().setButtonSelected(getSetupFrame().BUTTON_NEXT);
-
+        
         installationCompleted panel = (installationCompleted)getPanel();
         panel.setDetailsButtonActionCommand(getSetupFrame().ACTION_DETAILS);
         panel.addDetailsButtonActionListener(getSetupFrame().getSetupActionListener());
 
-        if ( installData.isAbortedInstallation() ) {
+        if ( installData.isAbortedInstallation() ) { 
             String titleText = ResourceManager.getString("String_InstallationCompleted1_Abort");
             panel.setTitleText(titleText);
             String dialogText = ResourceManager.getString("String_InstallationCompleted2_Abort");
@@ -72,7 +72,7 @@ public class InstallationCompletedCtrl extends PanelController {
             String titleText = ResourceManager.getString("String_InstallationCompleted1_Error");
             panel.setTitleText(titleText);
             String dialogText = ResourceManager.getString("String_InstallationCompleted2_Error");
-            panel.setDialogText(dialogText);
+            panel.setDialogText(dialogText);            
         }
 
         htmlInfoText = InfoCtrl.setHtmlFrame("header", htmlInfoText);
@@ -83,27 +83,27 @@ public class InstallationCompletedCtrl extends PanelController {
     public void duringShow() {
         Thread t = new Thread() {
             public void run() {
-                PackageDescription packageData = SetupDataProvider.getPackageDescription();
+                PackageDescription packageData = SetupDataProvider.getPackageDescription();                
                 Installer installer = InstallerFactory.getInstance();
                 installer.postInstall(packageData);
             }
         };
 
-        t.start();
+        t.start(); 
     }
 
     public String getNext() {
         return null;
     }
-
+    
     public String getPrevious() {
         return null;
     }
-
+    
     public final String getHelpFileName () {
         return this.helpFile;
     }
-
+    
     public String getDialogText() {
         return htmlInfoText;
     }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationImminentCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationImminentCtrl.java
index 0130607acc36..b2629f6137c2 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationImminentCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationImminentCtrl.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,11 +50,11 @@ public class InstallationImminentCtrl extends PanelController {
         super("InstallationImminent", new InstallationImminent());
         helpFile = "String_Helpfile_InstallationImminent";
     }
-
+    
     public String getNext() {
         return new String("InstallationOngoing");
     }
-
+    
     public String getPrevious() {
 
         InstallData data = InstallData.getInstance();
@@ -62,7 +62,7 @@ public class InstallationImminentCtrl extends PanelController {
         if ( data.isRootInstallation() ) {
             if ( data.olderVersionExists() ) {
                 if ( data.hideEula() ) {
-                    return new String("Prologue");
+                    return new String("Prologue");            
                 } else {
                     return new String("AcceptLicense");
                 }
@@ -72,10 +72,10 @@ public class InstallationImminentCtrl extends PanelController {
                 if ( data.getInstallationType().equals(data.getCustomActionCommand()) ) {
                     return new String("ChooseComponents");
                 } else if ( data.getInstallationType().equals(data.getTypicalActionCommand()) ) {
-                    return new String("ChooseInstallationType");
+                    return new String("ChooseInstallationType");            
                 } else {
-                    System.err.println("Error: Unknown installation type!" );
-                    return new String("Error");
+                    System.err.println("Error: Unknown installation type!" );            
+                    return new String("Error");            
                 }
             }
         } else {
@@ -87,14 +87,14 @@ public class InstallationImminentCtrl extends PanelController {
                 if ( data.getInstallationType().equals(data.getCustomActionCommand()) ) {
                     return new String("ChooseComponents");
                 } else if ( data.getInstallationType().equals(data.getTypicalActionCommand()) ) {
-                    return new String("ChooseInstallationType");
+                    return new String("ChooseInstallationType");            
                 } else {
-                    System.err.println("Error: Unknown installation type!" );
-                    return new String("Error");
+                    System.err.println("Error: Unknown installation type!" );            
+                    return new String("Error");            
                 }
             }
         }
-    }
+    }  
 
     public final String getHelpFileName () {
         return this.helpFile;
@@ -103,7 +103,7 @@ public class InstallationImminentCtrl extends PanelController {
     public void beforeShow() {
         String StringInstall = ResourceManager.getString("String_Install");
         getSetupFrame().setButtonText(StringInstall, getSetupFrame().BUTTON_NEXT);
-
+        
         ProductDescription productData = SetupDataProvider.getProductDescription();
         PackageDescription packageData = SetupDataProvider.getPackageDescription();
         // Dumper.dumpPackageSettings(packageData);
@@ -115,7 +115,7 @@ public class InstallationImminentCtrl extends PanelController {
         InstallationImminent panel = (InstallationImminent)getPanel();
         panel.setInfoText(htmlInfoText);
         panel.setCaretPosition();
-
+        
         // Update mode
         InstallData data = InstallData.getInstance();
         if ( data.olderVersionExists() ) {
@@ -149,7 +149,7 @@ public class InstallationImminentCtrl extends PanelController {
                 repeatDialog = true;
             }
         }
-
+        
         return repeatDialog;
     }
 }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationOngoingCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationOngoingCtrl.java
index b435b480eaea..2cdaa16cb561 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationOngoingCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationOngoingCtrl.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,20 +46,20 @@ public class InstallationOngoingCtrl extends PanelController {
     private String helpFile;
     private String nextDialog = new String("InstallationCompleted");
     private String previousDialog = new String("InstallationImminent");
-
+            
     public InstallationOngoingCtrl() {
         super("InstallationOngoing", new InstallationOngoing());
         helpFile = "String_Helpfile_InstallationOngoing";
     }
-
+    
     public String getNext() {
         return new String("InstallationCompleted");
     }
-
+    
     public String getPrevious() {
         return new String("InstallationImminent");
     }
-
+    
     public final String getHelpFileName () {
         return this.helpFile;
     }
@@ -89,15 +89,15 @@ public class InstallationOngoingCtrl extends PanelController {
             PackageCollector.sortPackages(installData.getOldPackages(), sortedUninstallPackages, "uninstall");
             installData.setOldPackages(sortedUninstallPackages);
         }
-
+         
         Installer installer = InstallerFactory.getInstance();
         installer.preInstallationOngoing();
     }
-
+   
     public void duringShow() {
-
+        
         Thread t = new Thread() {
-
+        
             InstallData installData = InstallData.getInstance();
             InstallationOngoing panel = (InstallationOngoing)getPanel();
             Vector installPackages = installData.getInstallPackages();
@@ -130,10 +130,10 @@ public class InstallationOngoingCtrl extends PanelController {
 
                     installer.installPackage(packageData);
                     installedPackages.add(packageData);
-
+                    
                     if ( installData.isAbortedInstallation() ) {
                         break;
-                    }
+                    }                    
                 }
 
                 if ( installData.isMajorUpgrade() ) {
@@ -167,8 +167,8 @@ public class InstallationOngoingCtrl extends PanelController {
                         SystemManager.deleteFile(removeFile);
                     }
                 }
-
-                installer.postInstallationOngoing();
+                
+                installer.postInstallationOngoing();        
 
                 String next = getNext();
                 getSetupFrame().setCurrentPanel(next, false, true);
@@ -186,7 +186,7 @@ public class InstallationOngoingCtrl extends PanelController {
 
         InstallData installData = InstallData.getInstance();
         if ( ! installData.isAbortedInstallation() ) {
-            InfoDir.prepareUninstallation();
+            InfoDir.prepareUninstallation();        
         }
 
         return repeatDialog;
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/PrologueCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/PrologueCtrl.java
index 85c682f9dee6..0d3fc1f2fcdb 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/PrologueCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/PrologueCtrl.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,18 +40,18 @@ import org.openoffice.setup.Util.ModuleCtrl;
 import org.openoffice.setup.Util.SystemManager;
 
 public class PrologueCtrl extends PanelController {
-
+    
     private String helpFile;
 
     public PrologueCtrl() {
         super("Prologue", new Prologue());
         helpFile = "String_Helpfile_Prologue";
     }
-
+    
     // public void beforeShow() {
     public void duringShow() {
         getSetupFrame().setButtonEnabled(false, getSetupFrame().BUTTON_PREVIOUS);
-
+        
         Thread t = new Thread() {
             public void run() {
                 InstallData installData = InstallData.getInstance();
@@ -60,7 +60,7 @@ public class PrologueCtrl extends PanelController {
 
                     Controller.checkPackagePathExistence(installData);
                     Controller.checkPackageFormat(installData);
-
+                    
                     if (( installData.getOSType().equalsIgnoreCase("SunOS") ) && ( installData.isMultiLingual() )) {
                         Controller.collectSystemLanguages(installData);
                     }
@@ -81,12 +81,12 @@ public class PrologueCtrl extends PanelController {
 
                     if (( installData.getOSType().equalsIgnoreCase("SunOS") ) && ( installData.isMultiLingual() )) {
                         ModuleCtrl.checkLanguagesPackages(packageData, installData);
-
+                        
                         // int count = installData.getPreselectedLanguages();
                         // System.err.println("Number of preselected language packages: " + count);
-
+                        
                         if ( installData.getPreselectedLanguages() == 0 ) {
-                            // Something misterious happened. Setting all languages again.
+                            // Something misterious happened. Setting all languages again. 
                             ModuleCtrl.setLanguagesPackages(packageData);
                         }
 
@@ -145,11 +145,11 @@ public class PrologueCtrl extends PanelController {
 
                         // Setting macro
                         SetupDataProvider.setNewMacro("DIR", dir); // important for string replacement
-
+                        
                         // Calculate available disc space
                         int discSpace = SystemManager.calculateDiscSpace(dir);
                         installData.setAvailableDiscSpace(discSpace);
-
+                        
                         if ( ! installData.databaseAnalyzed()) {
                             ModuleCtrl.defaultDatabaseAnalysis(installData);
                             installData.setDatabaseAnalyzed(true);
@@ -162,13 +162,13 @@ public class PrologueCtrl extends PanelController {
         };
         t.start();
     }
-
+    
     public boolean afterShow(boolean nextButtonPressed) {
         boolean repeatDialog = false;
         getSetupFrame().setButtonEnabled(true, getSetupFrame().BUTTON_PREVIOUS);
         return repeatDialog;
     }
-
+    
     public String getNext() {
         InstallData data = InstallData.getInstance();
 
@@ -177,24 +177,24 @@ public class PrologueCtrl extends PanelController {
                 if ( data.olderVersionExists() ) {
                     return new String("InstallationImminent");
                 } else if ( data.sameVersionExists() ) {
-                    return new String("ChooseComponents");
+                    return new String("ChooseComponents");            
                 } else {
                     return new String("ChooseInstallationType");
                 }
             } else {
-                return new String("ChooseDirectory");
-            }
+                return new String("ChooseDirectory");            
+            }            
         } else {
             return new String("AcceptLicense");
         }
     }
-
+    
     public String getPrevious() {
         return null;
     }
-
+    
     public final String getHelpFileName() {
         return this.helpFile;
     }
-
+    
 }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationCompletedCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationCompletedCtrl.java
index 837f28546728..cb895dc43772 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationCompletedCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationCompletedCtrl.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,23 +51,23 @@ public class UninstallationCompletedCtrl extends PanelController {
     public void beforeShow() {
         InstallData installData = InstallData.getInstance();
         ProductDescription productData = SetupDataProvider.getProductDescription();
-
+        
         getSetupFrame().setButtonEnabled(false, getSetupFrame().BUTTON_PREVIOUS);
         getSetupFrame().setButtonEnabled(false, getSetupFrame().BUTTON_CANCEL);
         getSetupFrame().setButtonEnabled(false, getSetupFrame().BUTTON_HELP);
         getSetupFrame().removeButtonIcon(getSetupFrame().BUTTON_NEXT);
         getSetupFrame().setButtonSelected(getSetupFrame().BUTTON_NEXT);
-
+        
         UninstallationCompleted panel = (UninstallationCompleted)getPanel();
         panel.setDetailsButtonActionCommand(getSetupFrame().ACTION_DETAILS);
         panel.addDetailsButtonActionListener(getSetupFrame().getSetupActionListener());
-
+        
         if (( installData.isCustomInstallation() ) && ( ! installData.isMaskedCompleteUninstallation() )) {
             String dialogText = ResourceManager.getString("String_UninstallationCompleted2_Partial");
-            panel.setDialogText(dialogText);
+            panel.setDialogText(dialogText);            
         }
-
-        if ( installData.isAbortedInstallation() ) {
+        
+        if ( installData.isAbortedInstallation() ) { 
             String titleText = ResourceManager.getString("String_UninstallationCompleted1_Abort");
             panel.setTitleText(titleText);
             String dialogText = ResourceManager.getString("String_UninstallationCompleted2_Abort");
@@ -76,26 +76,26 @@ public class UninstallationCompletedCtrl extends PanelController {
             String titleText = ResourceManager.getString("String_UninstallationCompleted1_Error");
             panel.setTitleText(titleText);
             String dialogText = ResourceManager.getString("String_UninstallationCompleted2_Error");
-            panel.setDialogText(dialogText);
+            panel.setDialogText(dialogText);            
         }
 
         htmlInfoText = InfoCtrl.setHtmlFrame("header", htmlInfoText);
         htmlInfoText = InfoCtrl.setInstallLogInfoText(productData, htmlInfoText);
         htmlInfoText = InfoCtrl.setHtmlFrame("end", htmlInfoText);
     }
-
+    
     public String getNext() {
         return null;
     }
-
+    
     public String getPrevious() {
         return null;
     }
-
+    
     public final String getHelpFileName () {
         return this.helpFile;
     }
-
+    
     public String getDialogText() {
         return htmlInfoText;
     }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationImminentCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationImminentCtrl.java
index 00b7ff25de31..d8f74a50ab32 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationImminentCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationImminentCtrl.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,11 +46,11 @@ public class UninstallationImminentCtrl extends PanelController {
         super("UninstallationImminent", new UninstallationImminent());
         helpFile = "String_Helpfile_UninstallationImminent";
     }
-
+    
     public String getNext() {
         return new String("UninstallationOngoing");
     }
-
+    
     public String getPrevious() {
 
         InstallData data = InstallData.getInstance();
@@ -58,12 +58,12 @@ public class UninstallationImminentCtrl extends PanelController {
         if ( data.getInstallationType().equals(data.getCustomActionCommand()) ) {
             return new String("ChooseUninstallationComponents");
         } else if ( data.getInstallationType().equals(data.getTypicalActionCommand()) ) {
-            return new String("ChooseUninstallationType");
+            return new String("ChooseUninstallationType");            
         } else {
-            System.err.println("Error: Unknown uninstallation type!" );
-            return new String("Error");
+            System.err.println("Error: Unknown uninstallation type!" );            
+            return new String("Error");            
         }
-    }
+    }  
 
     public final String getHelpFileName () {
         return this.helpFile;
@@ -72,7 +72,7 @@ public class UninstallationImminentCtrl extends PanelController {
     public void beforeShow() {
         String StringInstall = ResourceManager.getString("String_Uninstall");
         getSetupFrame().setButtonText(StringInstall, getSetupFrame().BUTTON_NEXT);
-
+        
         ProductDescription productData = SetupDataProvider.getProductDescription();
         PackageDescription packageData = SetupDataProvider.getPackageDescription();
 
@@ -88,7 +88,7 @@ public class UninstallationImminentCtrl extends PanelController {
         // System.err.println("\nUninstallation module state dump 3:");
         // Dumper.dumpModuleStates(packageData);
     }
-
+    
     public void duringShow() {
         UninstallationImminent panel = (UninstallationImminent)getPanel();
         panel.setTabOrder();
@@ -105,8 +105,8 @@ public class UninstallationImminentCtrl extends PanelController {
             // System.err.println("\nUninstallation module state dump 4:");
             // Dumper.dumpModuleStates(packageData);
         }
-
+        
         return repeatDialog;
     }
-
+        
 }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationOngoingCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationOngoingCtrl.java
index a5065cc0e905..4c95d13e4c70 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationOngoingCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationOngoingCtrl.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 @@ import java.util.Vector;
 public class UninstallationOngoingCtrl extends PanelController {
 
     private String helpFile;
-
+            
     public UninstallationOngoingCtrl() {
         super("UninstallationOngoing", new UninstallationOngoing());
         helpFile = "String_Helpfile_UninstallationOngoing";
@@ -50,7 +50,7 @@ public class UninstallationOngoingCtrl extends PanelController {
     public String getNext() {
         return new String("UninstallationCompleted");
     }
-
+    
     public String getPrevious() {
         return new String("UninstallationImminent");
     }
@@ -58,7 +58,7 @@ public class UninstallationOngoingCtrl extends PanelController {
     public final String getHelpFileName () {
         return this.helpFile;
     }
-
+    
     public void beforeShow() {
         getSetupFrame().setButtonEnabled(false, getSetupFrame().BUTTON_PREVIOUS);
         getSetupFrame().setButtonEnabled(false, getSetupFrame().BUTTON_NEXT);
@@ -80,27 +80,27 @@ public class UninstallationOngoingCtrl extends PanelController {
         data.setInstallPackages(sortedPackages);
 
         // collectPackages(packageData);
-
+        
         Installer installer = InstallerFactory.getInstance();
         installer.preInstallationOngoing();
     }
-
+   
     public void duringShow() {
 
         Thread t = new Thread() {
-
+        
             UninstallationOngoing panel = (UninstallationOngoing)getPanel();
             InstallData installData = InstallData.getInstance();
             Vector uninstallPackages = installData.getInstallPackages();
-
+            
             public void run() {
                 LogManager.setCommandsHeaderLine("Uninstallation");
                 Installer installer = InstallerFactory.getInstance();
-
+                                
                 for (int i = 0; i < uninstallPackages.size(); i++) {
                     PackageDescription packageData = (PackageDescription) uninstallPackages.get(i);
                     int progress = java.lang.Math.round((100*(i+1))/uninstallPackages.size());
-                    panel.setProgressValue(progress);
+                    panel.setProgressValue(progress);            
                     panel.setProgressText(packageData.getPackageName());
 
                     installer.uninstallPackage(packageData);
@@ -109,21 +109,21 @@ public class UninstallationOngoingCtrl extends PanelController {
                         break;
                     }
                 }
-
+                
                 if ( installData.isAbortedInstallation() ) {
                     LogManager.setCommandsHeaderLine("Uninstallation aborted!");
                     // undoing the uninstallation is not possible
                 }
 
-                installer.postUninstallationOngoing();
+                installer.postUninstallationOngoing();        
 
-                String next = getNext();
-                getSetupFrame().setCurrentPanel(next, false, true);
+                String next = getNext();        
+                getSetupFrame().setCurrentPanel(next, false, true);                
             }
          };
-
+        
          t.start();
-
+ 
     }
 
     public boolean afterShow(boolean nextButtonPressed) {
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationPrologueCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationPrologueCtrl.java
index 1e35db23454d..bd3519497ebd 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationPrologueCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationPrologueCtrl.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
@@ -48,7 +48,7 @@ import org.openoffice.setup.ResourceManager;
 public class UninstallationPrologueCtrl extends PanelController {
 
     private String helpFile;
-
+    
     public UninstallationPrologueCtrl() {
         super("UninstallationPrologue", new UninstallationPrologue());
         helpFile = "String_Helpfile_UninstallationPrologue";
@@ -57,11 +57,11 @@ public class UninstallationPrologueCtrl extends PanelController {
     public String getNext() {
         return new String("ChooseUninstallationType");
     }
-
+    
     public String getPrevious() {
         return null;
     }
-
+    
     public final String getHelpFileName () {
         return this.helpFile;
     }
@@ -77,7 +77,7 @@ public class UninstallationPrologueCtrl extends PanelController {
         // for (int i = 0; i < infoFileContent.size(); i++) {
         //    System.out.println(infoFileContent.get(i));
         // }
-
+        
         // Iterator m = map.entrySet().iterator();
         // while ( m.hasNext() ) {
         //     Map.Entry entry = (Map.Entry) m.next();
@@ -86,7 +86,7 @@ public class UninstallationPrologueCtrl extends PanelController {
 
         return map;
     }
-
+    
     private void setNewInstallData(HashMap map) {
         InstallData data = InstallData.getInstance();
         // adding information to installData
@@ -97,16 +97,16 @@ public class UninstallationPrologueCtrl extends PanelController {
         data.setAdminFileNameNoRelocNoDepends((String)map.get("AdminFileNoRelocNoDepends"));
         data.setDatabasePath((String)map.get("DatabasePath"));
         data.setInstallDir((String)map.get("InstallationDir"));
-        data.setStoredInstallationPrivileges((String)map.get("InstallationPrivileges"));
+        data.setStoredInstallationPrivileges((String)map.get("InstallationPrivileges"));        
         data.setGetUidPath((String)map.get("GetUidFile"));
     }
-
+    
     private void readInfoFile() {
         HashMap map = getInfoFileData();
         setNewInstallData(map);
         Dumper.dumpNewInstallData();
     }
-
+    
     private void checkUninstallPrivileges() {
         InstallData data = InstallData.getInstance();
         // data.setStoredInstallationPrivileges((String)map.get("InstallationPrivileges"));
@@ -120,7 +120,7 @@ public class UninstallationPrologueCtrl extends PanelController {
                 Informer.showErrorMessage(message, title);
                 String log = "<b>Error: Wrong uninstallation privileges (currently Root)!</b><br>";
                 System.err.println(log);
-                // LogManager.addLogfileComment(log);
+                // LogManager.addLogfileComment(log);                
             } else {
                 String message = ResourceManager.getString("String_UninstallationPrologue_Wrong_Privileges_Current_User");
                 String title = ResourceManager.getString("String_Error");
@@ -129,15 +129,15 @@ public class UninstallationPrologueCtrl extends PanelController {
                 System.err.println(log);
                 // LogManager.addLogfileComment(log);
             }
-            System.exit(1);
+            System.exit(1);            
         }
 
     }
-
+    
     public void beforeShow() {
         getSetupFrame().setButtonEnabled(false, getSetupFrame().BUTTON_PREVIOUS);
         // System.err.println("\nUninstallation module state dump 1:");
-        // PackageDescription packageData = SetupDataProvider.getPackageDescription();
+        // PackageDescription packageData = SetupDataProvider.getPackageDescription();                        
         // ModuleCtrl.dumpModuleStates(packageData);
         getSetupFrame().setButtonSelected(getSetupFrame().BUTTON_NEXT);
     }
@@ -149,15 +149,15 @@ public class UninstallationPrologueCtrl extends PanelController {
                 InstallData installData = InstallData.getInstance();
                 if ( ! installData.databaseAnalyzed() ) {
                     getSetupFrame().setButtonEnabled(false, getSetupFrame().BUTTON_NEXT);
-
+                
                     // now it is time to read the infoFile in directory "installData.getInfoRoot()"
                     readInfoFile();
-
+                    
                     // controlling the installation privileges. Are the original installation privileges
                     // identical with the current deinstallation privileges?
                     checkUninstallPrivileges();
 
-                    PackageDescription packageData = SetupDataProvider.getPackageDescription();
+                    PackageDescription packageData = SetupDataProvider.getPackageDescription();                
                     Installer installer = InstallerFactory.getInstance();
                     installer.preUninstall(packageData);
 
@@ -173,8 +173,8 @@ public class UninstallationPrologueCtrl extends PanelController {
                 }
             }
         };
-
-        t.start();
+        
+        t.start(); 
     }
 
     public boolean afterShow(boolean nextButtonPressed) {
@@ -182,5 +182,5 @@ public class UninstallationPrologueCtrl extends PanelController {
         getSetupFrame().setButtonEnabled(true, getSetupFrame().BUTTON_PREVIOUS);
         return repeatDialog;
     }
-
+    
 }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/DeckOfPanels.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/DeckOfPanels.java
index c433307ed2f1..1471b068f6dc 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/DeckOfPanels.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/DeckOfPanels.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,20 +33,20 @@ public class DeckOfPanels {
 
     private PanelController mCurrent;
     private HashMap mDeck;
-
+    
     public DeckOfPanels() {
         mDeck = new HashMap();
         mCurrent = null;
     }
-
+    
     void addPanel(PanelController panel, String name) {
             mDeck.put(name, panel);
     }
-
+    
     public PanelController getCurrentPanel () {
         return mCurrent;
     }
-
+    
     public PanelController setCurrentPanel(String name) {
         mCurrent = (PanelController)mDeck.get(name);
         return mCurrent;
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Dialogs/DatabaseDialog.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Dialogs/DatabaseDialog.java
index 9df39ec2d517..2d0682bbdd9c 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Dialogs/DatabaseDialog.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Dialogs/DatabaseDialog.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 @@ import javax.swing.border.EmptyBorder;
 import org.openoffice.setup.ResourceManager;
 
 public class DatabaseDialog extends JDialog {
-
+    
     public DatabaseDialog(SetupFrame setupFrame) {
 
         // super(setupFrame.getDialog());
@@ -48,12 +48,12 @@ public class DatabaseDialog extends JDialog {
 
         setTitle(text1);
         this.getContentPane().setLayout(new java.awt.BorderLayout());
-
+        
         JPanel toppanel = new JPanel();
         toppanel.setLayout(new java.awt.BorderLayout());
         toppanel.setBorder(new EmptyBorder(new Insets(50, 50, 50, 50)));
 
-        PanelLabel label1 = new PanelLabel(text2);
+        PanelLabel label1 = new PanelLabel(text2);        
         toppanel.add(label1, BorderLayout.NORTH);
 
         Container contentPane = this.getContentPane();
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Dialogs/DetailsDialog.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Dialogs/DetailsDialog.java
index c21d1e663cae..af72ef8cee3d 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Dialogs/DetailsDialog.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Dialogs/DetailsDialog.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 DetailsDialog extends JDialog implements ActionListener {
     private JButton okButton;
     private String helpFileName;
     private String helpFileString;
-
+    
     public DetailsDialog(SetupFrame setupFrame) {
 
         super(setupFrame.getDialog());
@@ -61,14 +61,14 @@ public class DetailsDialog extends JDialog implements ActionListener {
 
         String dialogTitle = ResourceManager.getString("String_InstallationCompleted_Button");
         String dialogText = setupFrame.getCurrentPanel().getDialogText();
-
+                
         setTitle(dialogTitle);
         this.getContentPane().setLayout(new java.awt.BorderLayout());
-
+        
         JPanel toppanel = new JPanel();
         toppanel.setLayout(new java.awt.BorderLayout());
         toppanel.setBorder(new EmptyBorder(new Insets(5, 10, 5, 10)));
-
+        
         JPanel buttonpanel = new JPanel();
         buttonpanel.setLayout(new java.awt.FlowLayout());
         buttonpanel.setBorder(new EmptyBorder(new Insets(5, 10, 5, 10)));
@@ -101,39 +101,39 @@ public class DetailsDialog extends JDialog implements ActionListener {
         okButton.addActionListener(this);
 
         JSeparator separator = new JSeparator();
-
+        
         // toppanel.add(label1, BorderLayout.NORTH);
-        // toppanel.add(label2, BorderLayout.CENTER);
-        buttonpanel.add(okButton);
+        // toppanel.add(label2, BorderLayout.CENTER);  
+        buttonpanel.add(okButton);  
 
         this.getContentPane().add(toppanel, BorderLayout.NORTH);
         this.getContentPane().add(editorScrollPane, BorderLayout.CENTER);
         this.getContentPane().add(buttonpanel, BorderLayout.SOUTH);
-
+        
         // JScrollBar ScrollBar = editorScrollPane.getVerticalScrollBar();
         // if ( ScrollBar.isShowing() ) {
         //     editorPane.setFocusable(false);
         // } else {
-        //     editorPane.setFocusable(true);
+        //     editorPane.setFocusable(true);            
         // }
-
-        // Setting tab-order and focus on okButton
+        
+        // Setting tab-order and focus on okButton 
         DialogFocusTraversalPolicy policy = new DialogFocusTraversalPolicy(new JComponent[] {okButton, editorScrollPane});
         this.setFocusTraversalPolicy(policy);  // set policy
         this.setFocusCycleRoot(true); // enable policy
     }
-
+ 
      private JEditorPane createEditorPane(String dialogText) {
         JEditorPane editorPane = new JEditorPane();
         editorPane.setEditable(false);
         editorPane.setContentType("text/html");
-        editorPane.setText(dialogText);
+        editorPane.setText(dialogText);        
         return editorPane;
-    }
-
+    }     
+     
     public void actionPerformed (java.awt.event.ActionEvent evt) {
         setVisible(false);
-        dispose();
+        dispose(); 
     }
 
 }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Dialogs/HelpDialog.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Dialogs/HelpDialog.java
index 3fd9b1976e0c..ecc8afdcebc6 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Dialogs/HelpDialog.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Dialogs/HelpDialog.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,22 +53,22 @@ public class HelpDialog extends JDialog implements ActionListener {
     private JScrollPane editorScrollPane;
     private String helpFileName;
     private String helpFileString;
-
+    
     public HelpDialog(SetupFrame setupFrame) {
 
         super(setupFrame.getDialog());
 
         InstallData data = InstallData.getInstance();
-
+        
         helpFileString = setupFrame.getCurrentPanel().getHelpFileName();
         helpFileName = ResourceManager.getFileName(helpFileString);
         // String dialogName = setupFrame.getCurrentPanel().getName();
-
-        String helpTitle = ResourceManager.getString("String_Help");
+        
+        String helpTitle = ResourceManager.getString("String_Help");    
         setTitle(helpTitle);
         // setLayout(new java.awt.BorderLayout());
         this.getContentPane().setLayout(new java.awt.BorderLayout());
-
+        
         JPanel toppanel = new JPanel();
         toppanel.setLayout(new java.awt.BorderLayout());
         toppanel.setBorder(new EmptyBorder(new Insets(5, 10, 5, 10)));
@@ -89,11 +89,11 @@ public class HelpDialog extends JDialog implements ActionListener {
         // String helpTitle1 = null;
         // InstallData data = InstallData.getInstance();
         // if ( data.isInstallationMode() ) {
-        //     helpTitle1 = ResourceManager.getString("String_Help_Title_1");
+        //     helpTitle1 = ResourceManager.getString("String_Help_Title_1");    
         // } else {
         //     helpTitle1 = ResourceManager.getString("String_Help_Title_1_Uninstallation");
         // }
-
+            
         // PanelLabel label1 = new PanelLabel(helpTitle1, true);
         // String helpTitle2 = ResourceManager.getString("String_Help_Title_2");
         // PanelLabel label2 = new PanelLabel(helpTitle2);
@@ -105,21 +105,21 @@ public class HelpDialog extends JDialog implements ActionListener {
         if ( data.useRtl() ) { okButton.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
 
         JSeparator separator = new JSeparator();
-
+        
         // toppanel.add(label1, BorderLayout.NORTH);
-        // toppanel.add(label2, BorderLayout.CENTER);
-        buttonpanel.add(okButton);
+        // toppanel.add(label2, BorderLayout.CENTER);  
+        buttonpanel.add(okButton);  
 
         this.getContentPane().add(toppanel, BorderLayout.NORTH);
         this.getContentPane().add(editorScrollPane, BorderLayout.CENTER);
         this.getContentPane().add(buttonpanel, BorderLayout.SOUTH);
 
-        // Setting tab-order and focus on okButton
+        // Setting tab-order and focus on okButton 
         DialogFocusTraversalPolicy policy = new DialogFocusTraversalPolicy(new JComponent[] {okButton, editorScrollPane});
         this.setFocusTraversalPolicy(policy);  // set policy
         this.setFocusCycleRoot(true); // enable policy
     }
-
+ 
      private JEditorPane createEditorPane() {
         JEditorPane editorPane = new JEditorPane();
         editorPane.setEditable(false);
@@ -145,10 +145,10 @@ public class HelpDialog extends JDialog implements ActionListener {
         else {
             System.err.println("Did not find html directory");
         }
-
+        
         return editorPane;
     }
-
+    
 //    public void setTabForScrollPane() {
 //        JScrollBar ScrollBar = editorScrollPane.getVerticalScrollBar();
 //        editorPane.setFocusable(true);
@@ -157,10 +157,10 @@ public class HelpDialog extends JDialog implements ActionListener {
 //            editorPane.setFocusable(false);
 //        }
 //    }
-
+    
     public void actionPerformed (java.awt.event.ActionEvent evt) {
         setVisible(false);
-        dispose();
+        dispose(); 
     }
 
 }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java
index 358ebd489db4..30a222d3b162 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.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
@@ -113,7 +113,7 @@ public class InstallData
     static private Vector installPackages = new Vector();
     static private Vector oldPackages = new Vector();
     static private Vector systemLanguages = new Vector();
-
+    
     public static InstallData getInstance()
     {
       if (instance == null) {
@@ -150,20 +150,20 @@ public class InstallData
         }
     }
 
-    private void setInstallationMode() {
+    private void setInstallationMode() {        
         // Exists a directory "uninstalldata" below the resource root?
         File uninstallDir = new File(resourceRoot, uninstallDirName);
         File installDir = new File(resourceRoot, installDirName);
-
+        
         if ( SystemManager.exists_directory(uninstallDir.getPath())) {
             isInstallationMode = false;
             isUninstallationMode = true;
             infoRoot = uninstallDir;
-            System.err.println("Mode: uninstallation");
+            System.err.println("Mode: uninstallation");            
         } else if ( SystemManager.exists_directory(installDir.getPath())) {
             isInstallationMode = true;
             isUninstallationMode = false;
-            infoRoot = installDir;
+            infoRoot = installDir;         
             System.err.println("Mode: installation");
         } else {
             // isInstallationMode = null;
@@ -174,7 +174,7 @@ public class InstallData
             System.exit(1);
         }
     }
-
+    
     private void setSolarisUserInstall() {
         if (( isUserInstallation ) && (osType.equalsIgnoreCase("SunOS"))) {
             isSolarisUserInstallation = true;
@@ -189,7 +189,7 @@ public class InstallData
         File htmlDirectory = getInfoRoot("html");
         ResourceManager.checkFileExistence(htmlDirectory);
     }
-
+    
     private void setBidiSupport() {
         Locale locale = Locale.getDefault();
         if (( locale.getLanguage().equals(new Locale("he", "", "").getLanguage()) )
@@ -197,11 +197,11 @@ public class InstallData
             useRtl = true;
         }
     }
-
+    
     private void setInstallationPrivileges(boolean isUserInstallation) {
         if ( isUserInstallation ) {
             installationPrivileges = "user";
-        } else {
+        } else {            
             installationPrivileges = "root";
         }
     }
@@ -231,9 +231,9 @@ public class InstallData
     }
 
     public File getResourceRoot(String subDirectory) {
-
+        
         File dir = getResourceRoot();
-
+        
         if (dir != null) {
             dir = new File(dir, subDirectory);
             if (!dir.exists()) {
@@ -320,7 +320,7 @@ public class InstallData
     public String getUninstallDirName() {
         return uninstallDirName;
     }
-
+    
     public String getInstallDir() {
         return installDir;
     }
@@ -383,7 +383,7 @@ public class InstallData
     public String getLocalTempPath() {
         return localTempPath;
     }
-
+    
     public void setLocalTempPath(String path) {
         localTempPath = path;
     }
@@ -391,7 +391,7 @@ public class InstallData
     public int getAvailableDiscSpace() {
         return availableDiscSpace;
     }
-
+    
     public void setAvailableDiscSpace(int space) {
         availableDiscSpace = space;
     }
@@ -399,7 +399,7 @@ public class InstallData
     public int getPreselectedLanguages() {
         return preselectedLanguages;
     }
-
+    
     public void setPreselectedLanguages(int count) {
         preselectedLanguages = count;
     }
@@ -435,7 +435,7 @@ public class InstallData
     public void setAdminFileNameNoRelocNoDepends(String fileName) {
         adminFileNameNoRelocNoDepends = fileName;
     }
-
+    
     public String getGetUidPath() {
         return getUidPath;
     }
@@ -455,7 +455,7 @@ public class InstallData
     public void setStillRunning(boolean running) {
         stillRunning = running;
     }
-
+    
     public boolean stillRunning() {
         return stillRunning;
     }
@@ -463,7 +463,7 @@ public class InstallData
     public void setStillAnalyzing(boolean running) {
         stillAnalyzing = running;
     }
-
+    
     public boolean stillAnalyzing() {
         return stillAnalyzing;
     }
@@ -471,7 +471,7 @@ public class InstallData
     public void setDatabaseAnalyzed(boolean analyzed) {
         databaseAnalyzed = analyzed;
     }
-
+    
     public boolean databaseAnalyzed() {
         return databaseAnalyzed;
     }
@@ -479,7 +479,7 @@ public class InstallData
     public void setModuleSizeSet(boolean set) {
         moduleSizeSet = set;
     }
-
+    
     public boolean moduleSizeSet() {
         return moduleSizeSet;
     }
@@ -487,7 +487,7 @@ public class InstallData
     public void setPreInstallDone(boolean done) {
         preInstallDone = done;
     }
-
+    
     public boolean preInstallDone() {
         return preInstallDone;
     }
@@ -495,7 +495,7 @@ public class InstallData
     public boolean isChangeInstallation() {
         return isChangeInstallation;
     }
-
+    
     public void setIsChangeInstallation(boolean changeInstallation) {
         isChangeInstallation = changeInstallation;
     }
@@ -511,7 +511,7 @@ public class InstallData
     public boolean isAbortedInstallation() {
         return isAbortedInstallation;
     }
-
+    
     public void setIsAbortedInstallation(boolean abortedInstallation) {
         isAbortedInstallation = abortedInstallation;
     }
@@ -519,7 +519,7 @@ public class InstallData
     public boolean isErrorInstallation() {
         return isErrorInstallation;
     }
-
+    
     public void setIsErrorInstallation(boolean errorInstallation) {
         isErrorInstallation = errorInstallation;
     }
@@ -527,7 +527,7 @@ public class InstallData
     public boolean isMultiLingual() {
         return isMultiLingual;
     }
-
+    
     public void setIsMultiLingual(boolean multiLingual) {
         isMultiLingual = multiLingual;
     }
@@ -535,11 +535,11 @@ public class InstallData
     public boolean logModuleStates() {
         return logModuleStates;
     }
-
+    
     public void setLogModuleStates(boolean log) {
         logModuleStates = log;
     }
-
+    
     public boolean visibleModulesChecked() {
         return visibleModulesChecked;
     }
@@ -567,7 +567,7 @@ public class InstallData
     public boolean isMaskedCompleteUninstallation() {
         return isMaskedCompleteUninstallation;
     }
-
+    
     public void setMaskedCompleteUninstallation(boolean masked) {
         isMaskedCompleteUninstallation = masked;
     }
@@ -575,7 +575,7 @@ public class InstallData
     public boolean typicalSelectionStateSaved() {
         return typicalSelectionStateSaved;
     }
-
+    
     public void setTypicalSelectionStateSaved(boolean saved) {
         typicalSelectionStateSaved = saved;
     }
@@ -583,7 +583,7 @@ public class InstallData
     public boolean customSelectionStateSaved() {
         return customSelectionStateSaved;
     }
-
+    
     public void setCustomSelectionStateSaved(boolean saved) {
         customSelectionStateSaved = saved;
     }
@@ -591,7 +591,7 @@ public class InstallData
     public boolean startSelectionStateSaved() {
         return startSelectionStateSaved;
     }
-
+    
     public void setStartSelectionStateSaved(boolean saved) {
         startSelectionStateSaved = saved;
     }
@@ -699,7 +699,7 @@ public class InstallData
     public HashMap getDatabaseMap() {
         return databaseMap;
     }
-
+    
     public void setDatabaseMap(HashMap map) {
         databaseMap = map;
     }
@@ -711,7 +711,7 @@ public class InstallData
     public Vector getInstallPackages() {
         return installPackages;
     }
-
+    
     public void setInstallPackages(Vector packages) {
         installPackages = packages;
     }
@@ -719,7 +719,7 @@ public class InstallData
     public Vector getOldPackages() {
         return oldPackages;
     }
-
+    
     public void setOldPackages(Vector packages) {
         oldPackages = packages;
     }
@@ -727,7 +727,7 @@ public class InstallData
     public Vector getSystemLanguages() {
         return systemLanguages;
     }
-
+    
     public void setSystemLanguages(Vector languages) {
         systemLanguages = languages;
     }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/Installer.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/Installer.java
index 43ae1a369bd3..76e407622094 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/Installer.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/Installer.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 @@ import org.openoffice.setup.InstallData;
 import org.openoffice.setup.SetupData.PackageDescription;
 
 public abstract class Installer {
-
+    
     public Installer() {
     }
 
@@ -70,7 +70,7 @@ public abstract class Installer {
     public abstract void installPackage(PackageDescription packageData);
 
     public abstract void uninstallPackage(PackageDescription packageData);
-
+    
     public abstract boolean isPackageInstalled(PackageDescription packageData, InstallData installData);
 
     public abstract boolean isInstalledPackageOlder(PackageDescription packageData, InstallData installData);
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/InstallerFactory.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/InstallerFactory.java
index 04e2cf2b4808..c141dfb4b4b7 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/InstallerFactory.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/InstallerFactory.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 InstallerFactory
     }
 
     private static Installer createInstaller() {
-
+        
         InstallData data = InstallData.getInstance();
         if ( data.getOSType().equalsIgnoreCase("Linux")) {
             instance = new LinuxInstaller();
@@ -60,7 +60,7 @@ public class InstallerFactory
             Informer.showErrorMessage(message, title);
             System.exit(1);
         }
-
+        
         return instance;
     }
 
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java
index 4383904569c0..204c9e18ea83 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.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,13 +43,13 @@ import java.util.Map;
 import java.util.Vector;
 
 public class LinuxInstaller extends Installer {
-
+    
     LinuxHelper helper = new LinuxHelper();
-
+    
     public LinuxInstaller() {
         super();
     }
-
+    
     public void preInstall(PackageDescription packageData) {
         InstallData installData = InstallData.getInstance();
         // Collecting package names
@@ -108,8 +108,8 @@ public class LinuxInstaller extends Installer {
         String installDir = null;
         InstallData installData = InstallData.getInstance();
 
-        String packageName = packageData.getPkgRealName();
-
+        String packageName = packageData.getPkgRealName(); 
+        
         if ( packageName != null ) {
             String rpmCommand = "rpm -q --queryformat %{INSTALLPREFIX} " + packageName;
             String[] rpmCommandArray = new String[5];
@@ -118,19 +118,19 @@ public class LinuxInstaller extends Installer {
             rpmCommandArray[2] = "--queryformat";
             rpmCommandArray[3] = "%{INSTALLPREFIX}";
             rpmCommandArray[4] = packageName;
-
+            
             Vector returnVector = new Vector();
             Vector returnErrorVector = new Vector();
             int returnValue = ExecuteProcess.executeProcessReturnVector(rpmCommandArray, returnVector, returnErrorVector);
             String returnString = (String) returnVector.get(0);
             returnString = returnString.replaceAll("//","/");
-
+            
             String log = rpmCommand + "<br><b>Returns: " + returnString + "</b><br>";
             LogManager.addCommandsLogfileComment(log);
-
-            installDir = returnString;
+            
+            installDir = returnString;            
         }
-
+        
         return installDir;
     }
 
@@ -142,7 +142,7 @@ public class LinuxInstaller extends Installer {
         // String log = "<br><b>Package: " + packageData.getName() + "</b>";
         // LogManager.addCommandsLogfileComment(log);
         String log = "";
-
+        
         // setting installDir
         String installDir = data.getInstallDir();
         String packagePath = data.getPackagePath();
@@ -160,55 +160,55 @@ public class LinuxInstaller extends Installer {
         } else {
             log = "<b>Package Name: " + packageName + "</b>";
             LogManager.addCommandsLogfileComment(log);
-
+        
             File completePackage = new File(packagePath, packageName);
             packageName = completePackage.getPath();
             packageName = "\"" + packageName + "\""; // Quoting is necessary, if the path the the packages contains white spaces.
-
+        
             if ( completePackage.exists() ) {
                 String relocations = helper.getRelocationString(packageData, packageName);
                 if ( relocations != null ) {
                     // Problem: If Prefix = "/" the packages are not relocatable with RPM version 3.x .
-                    // Therefore Prefix has to be "/opt" in spec file, although packages shall not be
+                    // Therefore Prefix has to be "/opt" in spec file, although packages shall not be 
                     // relocatable (except for installations with root privileges). So /opt has to be
-                    // listed left and right of equal sign: --relocate /opt=<installDir>/opt
+                    // listed left and right of equal sign: --relocate /opt=<installDir>/opt 
                     // -> /opt has to be added to the installDir
                     File localInstallDir = new File(installDir, relocations);  // "/" -> "/opt"
                     String localInstallDirString = localInstallDir.getPath();
 
                     // Fixing problem with installation directory and RPM version 3.x
-                    String fixedInstallDir = helper.fixInstallationDirectory(localInstallDirString);
+                    String fixedInstallDir = helper.fixInstallationDirectory(localInstallDirString);    
                     relocations = relocations + "=" + fixedInstallDir;
                     // relocations: "/opt/staroffice8=" + fixedInstallDir;
                 }
-
-                // Some packages have to be installed with parameter "--force", if the link "/usr/bin/soffice"
+                
+                // Some packages have to be installed with parameter "--force", if the link "/usr/bin/soffice" 
                 // already exists. These pacakges return true with methode "useForce()".
                 boolean useForce = false;
                 if ( packageData.useForce() ) {
                     File sofficeLink = new File("/usr/bin/soffice");
                     if ( sofficeLink.exists() ) { useForce = true; }
                 }
-
+                
                 // On Debian based systems, rpms can be installed with the switch --force-debian, if a rpm
                 // is installed.
 
                 String forceDebianString = "";
                 String nodepsString = "";
-
+                
                 if ( ! data.debianInvestigated() ) {
                     helper.investigateDebian(data);
                     data.setDebianInvestigated(true);
                 }
-
+                
                 if ( data.isDebianSystem() ) {
                     nodepsString = "--nodeps";
-
+                    
                     if ( data.useForceDebian() ) {
                         forceDebianString = "--force-debian";
                     }
                 }
-
+                
                 String databasePath = null;
                 String databaseString = "";
                 boolean useLocalDatabase = false;
@@ -220,63 +220,63 @@ public class LinuxInstaller extends Installer {
                         data.setDatabasePath(databasePath);
                     }
                 }
-
+        
                 if (( databasePath != null ) && (! databasePath.equalsIgnoreCase("null"))) {
                     databaseString = "--dbpath";
                     useLocalDatabase = true;
                 }
-
-                // Defining a Vector that contains the full rpm command. Then the string array can be
+                
+                // Defining a Vector that contains the full rpm command. Then the string array can be 
                 // created dynamically. Otherwise there would be too many different scenarios.
-
+                
                 Vector rpmVector = new Vector();
-
+                
                 rpmVector.add("rpm");
                 rpmVector.add("--upgrade");
                 rpmVector.add("--ignoresize");
-
+                
                 if ( useForce ) {
                     rpmVector.add("--force");
                 }
-
+                
                 if ( ! forceDebianString.equals("") ) {
                     rpmVector.add(forceDebianString);
                 }
-
+                
                 if ( ! nodepsString.equals("") ) {
                     rpmVector.add(nodepsString);
                 }
-
+                
                 rpmVector.add("-vh");
-
+                
                 if ( relocations != null ) {
                     rpmVector.add("--relocate");
                     rpmVector.add(relocations);
                 }
-
+                
                 if ( useLocalDatabase ) {
                     rpmVector.add(databaseString);
                     rpmVector.add(databasePath);
                 }
-
+                
                 rpmVector.add(packageName);
-
+                
                 // Creating String and StringArray for rpm command
-
+                
                 int capacity = rpmVector.size();
-
+                
                 String rpmCommand = "";
                 String[] rpmCommandArray = new String[capacity];
-
+                                
                 for (int i = 0; i < rpmVector.size(); i++) {
                     rpmCommandArray[i] = (String)rpmVector.get(i);
                     rpmCommand = rpmCommand + " " + (String)rpmVector.get(i);
                 }
-
+                
                 rpmCommand = rpmCommand.trim();
-
+                
                 // Staring rpm process
-
+                
                 Vector returnVector = new Vector();
                 Vector returnErrorVector = new Vector();
                 // int returnValue = SystemManager.executeProcessReturnVector(rpmCommand, returnVector, returnErrorVector);
@@ -285,7 +285,7 @@ public class LinuxInstaller extends Installer {
                 if ( returnValue == 0 ) {
                     log = rpmCommand + "<br><b>Returns: " + returnValue + " Successful installation</b><br>";
                     LogManager.addCommandsLogfileComment(log);
-                } else {    // an error occured during installation
+                } else {    // an error occured during installation 
                     if ( packageData.installCanFail() ) {
                         log = rpmCommand + "<br><b>Returns: " + returnValue + " Problem during installation. Can be ignored.</b><br>";
                         LogManager.addCommandsLogfileComment(log);
@@ -323,19 +323,19 @@ public class LinuxInstaller extends Installer {
         // LogManager.addCommandsLogfileComment(log);
 
         String rpmPackageName = packageData.getPackageName();
-
+        
         if (( rpmPackageName.equals("")) || ( rpmPackageName == null )) {
             log = "<b>No package name specified. Nothing to do</b>";
             LogManager.addCommandsLogfileComment(log);
         } else {
             log = "<b>Package Name: " + rpmPackageName + "</b>";
             LogManager.addCommandsLogfileComment(log);
-
+ 
             String packageName = packageData.getPkgRealName();
             String databasePath = data.getDatabasePath();
             String databaseString = "";
             boolean useLocalDatabase = false;
-
+        
             if (( databasePath != null ) && (! databasePath.equalsIgnoreCase("null"))) {
                 databaseString = "--dbpath";
                 useLocalDatabase = true;
@@ -346,56 +346,56 @@ public class LinuxInstaller extends Installer {
 
             String forceDebianString = "";
             String nodepsString = "";
-
+                
             if ( ! data.debianInvestigated() ) {
                 helper.investigateDebian(data);
                 data.setDebianInvestigated(true);
             }
-
+                
             if ( data.isDebianSystem() ) {
                 nodepsString = "--nodeps";
-
+                    
                 if ( data.useForceDebian() ) {
                     forceDebianString = "--force-debian";
                 }
             }
 
-            // Defining a Vector that contains the full rpm command. Then the string array can be
+            // Defining a Vector that contains the full rpm command. Then the string array can be 
             // created dynamically. Otherwise there would be too many different scenarios.
-
+                
             Vector rpmVector = new Vector();
-
+                
             rpmVector.add("rpm");
-
+                
             if ( ! forceDebianString.equals("") ) {
                 rpmVector.add(forceDebianString);
             }
-
+                
             if ( ! nodepsString.equals("") ) {
                 rpmVector.add(nodepsString);
             }
-
+                
             rpmVector.add("-ev");
-
+                
             if ( useLocalDatabase ) {
                 rpmVector.add(databaseString);
                 rpmVector.add(databasePath);
             }
-
+                
             rpmVector.add(packageName);
-
+                
             // Creating String and StringArray for rpm command
-
+                
             int capacity = rpmVector.size();
-
+                
             String rpmCommand = "";
             String[] rpmCommandArray = new String[capacity];
-
+                                
             for (int i = 0; i < rpmVector.size(); i++) {
                 rpmCommandArray[i] = (String)rpmVector.get(i);
                 rpmCommand = rpmCommand + " " + (String)rpmVector.get(i);
             }
-
+            
             rpmCommand = rpmCommand.trim();
 
             // Starting rpm process
@@ -406,8 +406,8 @@ public class LinuxInstaller extends Installer {
 
             if ( returnValue == 0 ) {
                 log = rpmCommand + "<br><b>Returns: " + returnValue + " Successful uninstallation</b><br>";
-                LogManager.addCommandsLogfileComment(log);
-            } else {    // an error occured during installation
+                LogManager.addCommandsLogfileComment(log);                        
+            } else {    // an error occured during installation                    
                 if ( packageData.uninstallCanFail() ) {
                     log = rpmCommand + "<br><b>Returns: " + returnValue + " Problem during uninstallation. Can be ignored.</b><br>";
                     LogManager.addCommandsLogfileComment(log);
@@ -422,23 +422,23 @@ public class LinuxInstaller extends Installer {
             }
         }
     }
-
+     
     public boolean isPackageInstalledClassic(PackageDescription packageData, InstallData installData) {
-
+        
         boolean isInstalled = false;
         boolean doCheck = false;
-
-        // only checking existing packages (and always at uninstallation)
+        
+        // only checking existing packages (and always at uninstallation)        
         if ( (packageData.pkgExists()) || (installData.isUninstallationMode()) ) {
             doCheck = true;
         }
-
+        
         String rpmPackageName = packageData.getPackageName();
 
         if ( rpmPackageName.equals("") ) {
             rpmPackageName = null;
         }
-
+                
         if (( rpmPackageName != null ) && ( doCheck )) {
 
             String databaseString = "";
@@ -450,17 +450,17 @@ public class LinuxInstaller extends Installer {
             if (installData.isUserInstallation()) {
                 databasePath = installData.getDatabasePath();
             }
-
+        
             if (( databasePath != null ) && (! databasePath.equals("null"))) {
                 databaseString = "--dbpath";
                 useLocalDatabase = true;
             }
-
+            
             if (packageName != null) {
-
+                
                 String rpmCommand;
                 String[] rpmCommandArray;
-
+                
                 if (useLocalDatabase) {
                     rpmCommand = "rpm" + " " + databaseString + " " + databasePath + " --query " + packageName;
                     rpmCommandArray = new String[5];
@@ -468,7 +468,7 @@ public class LinuxInstaller extends Installer {
                     rpmCommandArray[1] = databaseString;
                     rpmCommandArray[2] = databasePath;
                     rpmCommandArray[3] = "--query";
-                    rpmCommandArray[4] = packageName;
+                    rpmCommandArray[4] = packageName; 
                 } else {
                     rpmCommand = "rpm" + " --query " + packageName;
                     rpmCommandArray = new String[3];
@@ -476,7 +476,7 @@ public class LinuxInstaller extends Installer {
                     rpmCommandArray[1] = "--query";
                     rpmCommandArray[2] = packageName;
                 }
-
+                
                 int returnValue = ExecuteProcess.executeProcessReturnValue(rpmCommandArray);
 
                 if ( returnValue == 0 ) {
@@ -493,26 +493,26 @@ public class LinuxInstaller extends Installer {
 
         return isInstalled;
     }
-
+    
     private void queryAllDatabase(InstallData installData) {
 
         String databaseString = "";
         String databasePath = null;
         HashMap map = new HashMap();;
         boolean useLocalDatabase = false;
-
+    
         if (installData.isUserInstallation()) {
             databasePath = installData.getDatabasePath();
         }
-
+    
         if (( databasePath != null ) && (! databasePath.equals("null"))) {
             databaseString = "--dbpath";
             useLocalDatabase = true;
         }
-
+     
         String rpmCommand;
         String[] rpmCommandArray;
-
+        
         if (useLocalDatabase) {
             rpmCommand = "rpm" + " " + databaseString + " " + databasePath + " --query" + " -a";
             rpmCommandArray = new String[5];
@@ -520,7 +520,7 @@ public class LinuxInstaller extends Installer {
             rpmCommandArray[1] = databaseString;
             rpmCommandArray[2] = databasePath;
             rpmCommandArray[3] = "--query";
-            rpmCommandArray[4] = "-a";
+            rpmCommandArray[4] = "-a"; 
         } else {
             rpmCommand = "rpm" + " --query" + " -a";
             rpmCommandArray = new String[3];
@@ -528,15 +528,15 @@ public class LinuxInstaller extends Installer {
             rpmCommandArray[1] = "--query";
             rpmCommandArray[2] = "-a";
         }
-
+    
         Vector returnVector = new Vector();
         Vector returnErrorVector = new Vector();
         int returnValue = ExecuteProcess.executeProcessReturnVector(rpmCommandArray, returnVector, returnErrorVector);
-
+    
         String log = rpmCommand + "<br><b>Returns: " + returnValue + "</b><br>";
         LogManager.addCommandsLogfileComment(log);
         String value = "1";
-
+        
         if ( ! returnVector.isEmpty()) {
             for (int i = 0; i < returnVector.size(); i++) {
                 String onePackage = (String)returnVector.get(i);
@@ -548,15 +548,15 @@ public class LinuxInstaller extends Installer {
         }
 
         installData.setDatabaseQueried(true);
-        installData.setDatabaseMap(map);
+        installData.setDatabaseMap(map);    
     }
 
     public boolean isPackageInstalled(PackageDescription packageData, InstallData installData) {
-
+        
         boolean isInstalled = false;
         boolean doCheck = false;
-
-        // only checking existing packages (and always at uninstallation)
+        
+        // only checking existing packages (and always at uninstallation)        
         if ( (packageData.pkgExists()) || (installData.isUninstallationMode()) ) {
             doCheck = true;
         }
@@ -566,10 +566,10 @@ public class LinuxInstaller extends Installer {
         if ( rpmPackageName.equals("") ) {
             rpmPackageName = null;
         }
-
+                
         if (( rpmPackageName != null ) && ( doCheck )) {
             String packageName = packageData.getPkgRealName();
-
+            
             if (packageName != null) {
 
                 HashMap map = null;
@@ -578,13 +578,13 @@ public class LinuxInstaller extends Installer {
                 }
 
                 map = installData.getDatabaseMap();
-
+                
                 if ( map.containsKey(packageName)) {
                     isInstalled = true;
-                }
+                }                
             } else {
-                System.err.println("Error: No packageName defined for package: " + packageData.getPackageName());
-            }
+                System.err.println("Error: No packageName defined for package: " + packageData.getPackageName());                
+            }                
         }
 
         return isInstalled;
@@ -605,39 +605,39 @@ public class LinuxInstaller extends Installer {
     }
 
     private boolean findOlderPackage(PackageDescription packageData, InstallData installData, boolean checkIfInstalledIsOlder) {
-
+        
         // The information about the new package is stored in packageData (the version and the release).
         // This information can be stored in xpd files. If it is not stored in xpd files, it is determined
         // during installation process by querying the rpm file. This process costs much time and should
         // therefore be done by the process, that creates the xpd files. On the other hand this requires,
         // that the xpd files contain the correct information.
-
+        
         boolean isOlder = false;
-
+        
         // get the version of the installed package
         String rpmPackageName = packageData.getPackageName();
         String log;
-
+        
         if ( rpmPackageName.equals("")) {
             rpmPackageName = null;
         }
-
+ 
         if ( rpmPackageName != null ) {
             String databaseString = "";
             String databasePath = null;
-            String packageName =  packageData.getPkgRealName();
+            String packageName =  packageData.getPkgRealName(); 
             Vector allPackages = null;
             boolean useLocalDatabase = false;
 
             if (installData.isUserInstallation()) {
                 databasePath = installData.getDatabasePath();
             }
-
+        
             if (( databasePath != null ) && (! databasePath.equals("null"))) {
                 databaseString = "--dbpath";
                 useLocalDatabase = true;
             }
-
+            
             if (packageName != null) {
                 // Collect information about the installed package by querying the database.
                 // Instead of rpm file name, the real package name has to be used.
@@ -654,7 +654,7 @@ public class LinuxInstaller extends Installer {
                     rpmCommandArray[3] = "-q";
                     rpmCommandArray[4] = "--queryformat";
                     rpmCommandArray[5] = "%{VERSION}\\n";
-                    rpmCommandArray[6] = packageName;
+                    rpmCommandArray[6] = packageName;                    
                 } else {
                     rpmCommand = "rpm" + " -q --queryformat %{VERSION}\\n " + packageName;
                     rpmCommandArray = new String[5];
@@ -677,13 +677,13 @@ public class LinuxInstaller extends Installer {
                     installData.setInstalledProductMinor(productMinor);
                     installData.setInstalledProductMinorSet(true);
                 }
-
+                
                 if (useLocalDatabase) {
                     rpmCommand = "rpm" + " " + databaseString + " " + databasePath + " -q --queryformat %{RELEASE}\\n " + packageName;
                     rpmCommandArray[5] = "%{RELEASE}\\n";
                 } else {
                     rpmCommand = "rpm" + " -q --queryformat %{RELEASE}\\n " + packageName;
-                    rpmCommandArray[3] = "%{RELEASE}\\n";
+                    rpmCommandArray[3] = "%{RELEASE}\\n";                    
                 }
 
                 Vector releaseVector = new Vector();
@@ -694,7 +694,7 @@ public class LinuxInstaller extends Installer {
                 LogManager.addCommandsLogfileComment(log);
 
                 isOlder = helper.compareVersionAndRelease(version, release, packageData, checkIfInstalledIsOlder);
-
+                
                 if ( checkIfInstalledIsOlder ) {
                     if ( isOlder ) {
                         LogManager.addCommandsLogfileComment("<b>-> Installed package is older</b><br>");
@@ -706,11 +706,11 @@ public class LinuxInstaller extends Installer {
                         LogManager.addCommandsLogfileComment("<b>-> Package in installation set is older</b><br>");
                     } else {
                         LogManager.addCommandsLogfileComment("<b>-> Package in installation set is not older</b><br>");
-                    }
+                    }                    
                 }
 
             } else {
-                System.err.println("Error: No packageName defined for package: " + rpmPackageName);
+                System.err.println("Error: No packageName defined for package: " + rpmPackageName);                
             }
         }
 
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/SolarisInstaller.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/SolarisInstaller.java
index 7aacc5557fa6..3bcdd3410d47 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/SolarisInstaller.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/SolarisInstaller.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,13 +41,13 @@ import java.util.HashMap;
 import java.util.Vector;
 
 public class SolarisInstaller extends Installer {
-
+    
     SolarisHelper helper = new SolarisHelper();
-
+    
     public SolarisInstaller() {
         super();
     }
-
+ 
     public void defineDatabasePath() {
 
         InstallData data = InstallData.getInstance();
@@ -68,14 +68,14 @@ public class SolarisInstaller extends Installer {
             if ( ! databasePath.equals(oldDatabasePath) ) {
                 data.setDatabaseAnalyzed(false);
                 data.setDatabaseQueried(false);
-            }
+            }        
         }
     }
 
     public void preInstallationOngoing() {
         // an admin file has to be created for user and for root installation
         InstallData data = InstallData.getInstance();
-
+        
         if ( data.isInstallationMode()) {
             boolean makeRelocatableAdminFile = true;
             boolean removeDepends = true;
@@ -99,7 +99,7 @@ public class SolarisInstaller extends Installer {
             // Solaris 10 needs to have local temp directory for pkgadd
             // removeLocalTempDir();
         // }
-
+        
         helper.removeSolarisLockFile();
     }
 
@@ -115,15 +115,15 @@ public class SolarisInstaller extends Installer {
             data.setStillRunning(false);
         }
     }
-
+    
     public void postUninstallationOngoing() {
-        helper.removeSolarisLockFile();
+        helper.removeSolarisLockFile();        
     }
-
+    
     public String getChangeInstallDir(PackageDescription packageData) {
         String installDir = null;
-        String packageName = packageData.getPackageName();
-
+        String packageName = packageData.getPackageName(); 
+       
         if ( packageName != null ) {
             String pkgCommand = "pkginfo -r" + " " + packageName;
             String[] pkgCommandArray = new String[3];
@@ -134,16 +134,16 @@ public class SolarisInstaller extends Installer {
             Vector returnErrorVector = new Vector();
             int returnValue = ExecuteProcess.executeProcessReturnVector(pkgCommandArray, returnVector, returnErrorVector);
             String returnString = (String) returnVector.get(0);
-
+            
             String log = pkgCommand + "<br><b>Returns: " + returnString + "</b><br>";
             LogManager.addCommandsLogfileComment(log);
 
-            installDir = returnString;
+            installDir = returnString;            
         }
-
+        
         return installDir;
     }
-
+        
     public void installPackage(PackageDescription packageData) {
         InstallData data = InstallData.getInstance();
 
@@ -159,7 +159,7 @@ public class SolarisInstaller extends Installer {
         }
 
         String packageName = packageData.getPackageName();
-
+        
         if (( packageName.equals("")) || ( packageName == null )) {
             log = "<b>No package name specified. Nothing to do</b>";
             LogManager.addCommandsLogfileComment(log);
@@ -215,10 +215,10 @@ public class SolarisInstaller extends Installer {
                     pkgCommandArray[6] = packageName;
                     returnValue = ExecuteProcess.executeProcessReturnVector(pkgCommandArray, returnVector, returnErrorVector);
                 }
-
+                
                 if ( returnValue == 0 ) {
                     log = pkgCommand + "<br><b>Returns: " + returnValue + " Successful installation</b><br>";
-                    LogManager.addCommandsLogfileComment(log);
+                    LogManager.addCommandsLogfileComment(log);                        
                 } else {    // an error occured during installation
                     if ( packageData.installCanFail() ) {
                         log = pkgCommand + "<br><b>Returns: " + returnValue + " Problem during installation. Can be ignored.</b><br>";
@@ -252,7 +252,7 @@ public class SolarisInstaller extends Installer {
 
         String log = "<br><b>Package: " + packageData.getName() + "</b>";
         LogManager.addCommandsLogfileComment(log);
-
+       
         String installRoot = data.getInstallDir();
         String packageName = packageData.getPackageName();
         String adminFileName = "";
@@ -271,7 +271,7 @@ public class SolarisInstaller extends Installer {
                 adminFileName = data.getAdminFileNameNoReloc();
             }
         }
-
+        
         String pkgCommand = "";
         String[] pkgCommandArray;
         int returnValue;
@@ -306,8 +306,8 @@ public class SolarisInstaller extends Installer {
 
         if ( returnValue == 0 ) {
             log = pkgCommand + "<br><b>Returns: " + returnValue + " Successful uninstallation</b><br>";
-            LogManager.addCommandsLogfileComment(log);
-        } else {    // an error occured during installation
+            LogManager.addCommandsLogfileComment(log);                        
+        } else {    // an error occured during installation                    
             if ( packageData.uninstallCanFail() ) {
                 log = pkgCommand + "<br><b>Returns: " + returnValue + " Problem during uninstallation. Can be ignored.</b><br>";
                 LogManager.addCommandsLogfileComment(log);
@@ -335,12 +335,12 @@ public class SolarisInstaller extends Installer {
         if (installData.isUserInstallation()) {
             rootPath = installData.getDatabasePath();
         }
-
+    
         if (( rootPath != null ) && (! rootPath.equals("null"))) {
             rootString = "-R";
             useLocalRoot = true;
         }
-
+        
         if (useLocalRoot) {
             pkgCommand = "pkginfo " + rootString + " " + rootPath + " " + packageName;
             pkgCommandArray = new String[4];
@@ -357,16 +357,16 @@ public class SolarisInstaller extends Installer {
 
         // Vector returnVector = new Vector();
         int returnValue = ExecuteProcess.executeProcessReturnValue(pkgCommandArray);
-
+        
         if ( returnValue == 0 ) {
             isInstalled = true;
             String log = pkgCommand + "<br><b>Returns: " + returnValue + " Package is installed" + "</b><br>";
             LogManager.addCommandsLogfileComment(log);
         } else {
             String log = pkgCommand + "<br><b>Returns: " + returnValue + " Package is not installed" + "</b><br>";
-            LogManager.addCommandsLogfileComment(log);
+            LogManager.addCommandsLogfileComment(log);                
         }
-
+        
         return isInstalled;
     }
 
@@ -382,12 +382,12 @@ public class SolarisInstaller extends Installer {
         if (installData.isUserInstallation()) {
             rootPath = installData.getDatabasePath();
         }
-
+    
         if (( rootPath != null ) && (! rootPath.equals("null"))) {
             rootString = "-R";
             useLocalRoot = true;
         }
-
+        
         if (useLocalRoot) {
             pkgCommand = "pkginfo " + rootString + " " + rootPath;
             pkgCommandArray = new String[4];
@@ -405,11 +405,11 @@ public class SolarisInstaller extends Installer {
         Vector returnVector = new Vector();
         Vector returnErrorVector = new Vector();
         int returnValue = ExecuteProcess.executeProcessReturnVector(pkgCommandArray, returnVector, returnErrorVector);
-
+    
         String log = pkgCommand + "<br><b>Returns: " + returnValue + "</b><br>";
         LogManager.addCommandsLogfileComment(log);
         String value = "1";
-
+        
         if ( ! returnVector.isEmpty()) {
             for (int i = 0; i < returnVector.size(); i++) {
                 String onePackage = (String)returnVector.get(i);
@@ -434,35 +434,35 @@ public class SolarisInstaller extends Installer {
         }
 
         map = installData.getDatabaseMap();
-
+                
         if ( map.containsKey(packageName)) {
             isInstalled = true;
-        }
+        }                
 
         return isInstalled;
     }
 
     public boolean isPackageInstalled(PackageDescription packageData, InstallData installData) {
         boolean isInstalled = false;
-
+        
         String packageName = packageData.getPackageName();
 
         if ( packageName.equals("")) {
             packageName = null;
         }
-
+                
         if ( packageName != null ) {
-            isInstalled = isPackageNameInstalled(packageName, installData);
+            isInstalled = isPackageNameInstalled(packageName, installData);            
         }
 
         return isInstalled;
-    }
+    }    
 
     public boolean isInstallSetPackageOlder(PackageDescription packageData, InstallData installData) {
         boolean installSetPackageIsOlder = false;
         boolean checkIfInstalledIsOlder = false;
         installSetPackageIsOlder = findOlderPackage(packageData, installData, checkIfInstalledIsOlder);
-        return installSetPackageIsOlder;
+        return installSetPackageIsOlder;    
     }
 
     public boolean isInstalledPackageOlder(PackageDescription packageData, InstallData installData) {
@@ -507,7 +507,7 @@ public class SolarisInstaller extends Installer {
                 pkgCommandArray[2] = rootString;
                 pkgCommandArray[3] = rootPath;
                 pkgCommandArray[4] = packageName;
-
+                
             } else {
                 // String pkgCommand = "pkginfo -l" + rootString + " " + rootPath + " " + packageName + " | grep VERSION:";
                 pkgCommand = "pkginfo -x " + packageName;
@@ -540,7 +540,7 @@ public class SolarisInstaller extends Installer {
                 installData.setInstalledProductMinor(productMinor);
                 installData.setInstalledProductMinorSet(true);
             }
-
+                        
             if (( installedPackageVersion != null ) && ( newPackageVersion != null )) {
                 if ( checkIfInstalledIsOlder ) {
                     firstPackageIsOlder = helper.comparePackageVersions(installedPackageVersion, newPackageVersion);
@@ -548,7 +548,7 @@ public class SolarisInstaller extends Installer {
                     firstPackageIsOlder = helper.comparePackageVersions(newPackageVersion, installedPackageVersion);
                 }
             }
-        }
+        }        
 
         if ( checkIfInstalledIsOlder ) {
             if ( firstPackageIsOlder ) {
@@ -556,7 +556,7 @@ public class SolarisInstaller extends Installer {
                 LogManager.addCommandsLogfileComment(log);
             } else {
                 log = "<b>-> Installed package is not older</b><br>";
-                LogManager.addCommandsLogfileComment(log);
+                LogManager.addCommandsLogfileComment(log);                
             }
         } else {
             if ( firstPackageIsOlder ) {
@@ -564,9 +564,9 @@ public class SolarisInstaller extends Installer {
                 LogManager.addCommandsLogfileComment(log);
             } else {
                 log = "<b>-> Package in installation set is not older</b><br>";
-                LogManager.addCommandsLogfileComment(log);
-            }
-        }
+                LogManager.addCommandsLogfileComment(log);                
+            }        
+        }       
 
         return firstPackageIsOlder;
     }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java
index 91e8463fdc03..fb8bfa96a838 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.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 java.io.File;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Vector;public class LinuxHelper {
-
+    
     public LinuxHelper() {
         super();
     }
@@ -110,21 +110,21 @@ import java.util.Vector;public class LinuxHelper {
     }
 
     private HashMap analyzeVersionString(String versionString) {
-
+        
         boolean errorOccured = false;
-
+        
         Integer micro = null;
         Integer minor = null;
         Integer major = null;
         Integer release = null;
-
+        
         String microString = null;
         String minorString = null;
         String majorString = null;
         String releaseString = null;
-
+        
         int pos = versionString.lastIndexOf("_");  // this is a jre RPM (1.5.0_06)
-
+        
         if ( pos > -1 ) {
             try {
                 releaseString = versionString.substring(pos+1, versionString.length());
@@ -137,7 +137,7 @@ import java.util.Vector;public class LinuxHelper {
                 int releaseInt = Integer.parseInt(releaseString);
                 release = new Integer(releaseInt);
             } catch (NumberFormatException ex) {
-                System.err.println("Error: Could not convert " + releaseString + " to integer");
+                System.err.println("Error: Could not convert " + releaseString + " to integer");                            
                 errorOccured = true;
             }
         }
@@ -150,23 +150,23 @@ import java.util.Vector;public class LinuxHelper {
             pos = substring.lastIndexOf(".");  // returns "-1", if not found
             if ( pos == -1 ) {
                 versionString = versionString + ".0";
-                // System.err.println("Warning: Changing from " + compareString + " to " + versionString);
+                // System.err.println("Warning: Changing from " + compareString + " to " + versionString);            
             }
         } else {
-            versionString = versionString + ".0.0";
+            versionString = versionString + ".0.0";            
         }
-
+                    
         // the standard analyzing mechanism
         pos = versionString.lastIndexOf(".");  // returns "-1", if not found
-
+        
         if ( pos > -1 )
         {
             try {
                 microString = versionString.substring(pos+1, versionString.length());
                 versionString = versionString.substring(0, pos);
             } catch (IndexOutOfBoundsException ex) {
-                System.err.println("Error: Could not get substring from " + versionString);
-                errorOccured = true;
+                System.err.println("Error: Could not get substring from " + versionString);            
+                errorOccured = true;                
             }
 
             pos = versionString.lastIndexOf(".");
@@ -175,7 +175,7 @@ import java.util.Vector;public class LinuxHelper {
                     minorString = versionString.substring(pos+1, versionString.length());
                     majorString = versionString.substring(0, pos);
                 } catch (IndexOutOfBoundsException ex) {
-                    System.err.println("Error: Could not get substring from " + versionString);
+                    System.err.println("Error: Could not get substring from " + versionString);            
                     errorOccured = true;
                 }
                 try {
@@ -186,36 +186,36 @@ import java.util.Vector;public class LinuxHelper {
                     minor = new Integer(minorInt);
                     major = new Integer(majorInt);
                 } catch (NumberFormatException ex) {
-                    System.err.println("Error: Could not convert " + microString + "," +
-                                       minorString + " or " + majorString + " to integer");
+                    System.err.println("Error: Could not convert " + microString + "," + 
+                                       minorString + " or " + majorString + " to integer");                            
                     errorOccured = true;
                 }
             }
         }
-
+          
         // if ( microString == null ) { microString = ""; }
         // if ( majorString == null ) { majorString = ""; }
         // if ( releaseString == null ) { releaseString = ""; }
         // if ( minorString == null ) { minorString = ""; }
         // System.err.println("Major " + majorString + " Minor: " + minorString + " Micro: " + microString + " Release: " + releaseString);
-
+        
         if ( errorOccured ) {
             micro = null;
             minor = null;
             major = null;
             release = null;
         }
-
+        
         HashMap hashRpm = new HashMap();
-
+        
         hashRpm.put("micro", micro);
         hashRpm.put("minor", minor);
         hashRpm.put("major", major);
         hashRpm.put("release", release);
-
+        
         // If one of this values is "null", procedure "compareTwoRpms" always delivers false.
         // This means, that the installed package is not older.
-
+        
         // System.err.println("Analyzed: " + "micro: " + hashRpm.get("micro").toString() + " minor: " + hashRpm.get("minor").toString() + " major: " + hashRpm.get("major").toString());
 
         return hashRpm;
@@ -223,7 +223,7 @@ import java.util.Vector;public class LinuxHelper {
 
     private HashMap analyzeReleaseString(HashMap hashRpm, String releaseString) {
         int release;
-
+        
         try {
             release = Integer.parseInt(releaseString);
             Integer releaseObj = new Integer(release);
@@ -233,13 +233,13 @@ import java.util.Vector;public class LinuxHelper {
             // JRE often contain a string like "FCS"
             // System.err.println("Error: Could not convert " + releaseString + " to integer");
             hashRpm.put("release", null);
-        }
+        } 
 
         return hashRpm;
     }
 
     public int getInstalledMinor(String version) {
-
+    
         int minor = 0;
         int pos = version.indexOf(".");
         if ( pos > -1 ) {
@@ -250,14 +250,14 @@ import java.util.Vector;public class LinuxHelper {
                 reduced = reduced.substring(0, pos);
                 minor = Integer.parseInt(reduced);
             }
-        }
+        }    	
 
         return minor;
     }
-
+    
     private boolean compareTwoRpms(HashMap hash1, HashMap hash2) {
         boolean hash1IsOlder = false;
-
+        
         if (( hash1.get("major") != null ) && ( hash2.get("major") != null )) {
             if ( ((Integer)hash1.get("major")).intValue() < ((Integer)hash2.get("major")).intValue() ) {
                 hash1IsOlder = true;
@@ -284,19 +284,19 @@ import java.util.Vector;public class LinuxHelper {
 
         return hash1IsOlder;
     }
-
+    
     public boolean compareVersionAndRelease(String versionString, String releaseString, PackageDescription packageData, boolean checkIfInstalledIsOlder) {
         // version and release are gotten from the rpm database. packageData contains
         // the information about the rpm, that shall be installed. It has to be installed,
         // if the installed product defined by version and release is older.
-        // version is something like "2.0.3", release something like "164".
+        // version is something like "2.0.3", release something like "164". 
         // An exception is the jre package, where version is "1.5.0_06" and release "fcs".
 
         HashMap installedRpm = analyzeVersionString(versionString);
         if ( installedRpm.get("release") == null ) {
             installedRpm = analyzeReleaseString(installedRpm, releaseString);
         }
-
+        
         // System.err.println("Package: " + packageData.getPackageName());
         // String outputString = "Installed RPM: ";
         // if ( installedRpm.get("major") != null ) { outputString = outputString + " major: " + installedRpm.get("major").toString(); }
@@ -326,15 +326,15 @@ import java.util.Vector;public class LinuxHelper {
         // System.err.println(outputString);
 
         boolean firstIsOlder = false;
-
+        
         if ( checkIfInstalledIsOlder ) {
             firstIsOlder = compareTwoRpms(installedRpm, notInstalledRpm);
             // System.err.println("Result: Installed RPM is older: " + firstIsOlder);
         } else {
-            firstIsOlder = compareTwoRpms(notInstalledRpm, installedRpm);
+            firstIsOlder = compareTwoRpms(notInstalledRpm, installedRpm);        
             // System.err.println("Result: Not installed RPM is older: " + firstIsOlder);
         }
-
+        
         return firstIsOlder;
     }
 
@@ -361,7 +361,7 @@ import java.util.Vector;public class LinuxHelper {
             } else {
                 packageData.setPkgExists(false);
             }
-
+            
         }
 
         for (Enumeration e = packageData.children(); e.hasMoreElements(); ) {
@@ -377,23 +377,23 @@ import java.util.Vector;public class LinuxHelper {
         // String databaseDir = SystemManager.getParentDirectory(installDir);
         String linuxDatabaseName = ".RPM_OFFICE_DATABASE";
         File databaseFile = new File(databaseDir, linuxDatabaseName);
-        databasePath = databaseFile.getPath();
+        databasePath = databaseFile.getPath();        
         return databasePath;
     }
-
+  
     public void investigateDebian(InstallData data) {
-
+        
         // First check: Is this a Debian system?
-
+        
         String dpkgFile = "/usr/bin/dpkg";
-
+        
         if ( new File(dpkgFile).exists() ) {
-
+            
             data.setIsDebianSystem(true);
-
+        
             // Second check: If this is a Debian system, is "--force-debian" required? Older
             // versions do not support "--force-debian".
-
+        
             // String rpmQuery = "rpm --help;
             String[] rpmQueryArray = new String[2];
             rpmQueryArray[0] = "rpm";
@@ -402,9 +402,9 @@ import java.util.Vector;public class LinuxHelper {
             Vector returnVector = new Vector();
             Vector returnErrorVector = new Vector();
             int returnValue = ExecuteProcess.executeProcessReturnVector(rpmQueryArray, returnVector, returnErrorVector);
-
+        
             // Checking if the return vector contains the string "force-debian"
-
+       
             for (int i = 0; i < returnVector.size(); i++) {
                 String line = (String) returnVector.get(i);
                 if ( line.indexOf("force-debian") > -1 ) {
@@ -412,8 +412,8 @@ import java.util.Vector;public class LinuxHelper {
                 }
             }
         }
-    }
-
+    } 
+    
     public void getLinuxFileInfo(PackageDescription packageData) {
         // analyzing a string like "openoffice-core01-2.0.3-159" as "name-version-release"
         InstallData data = InstallData.getInstance();
@@ -441,7 +441,7 @@ import java.util.Vector;public class LinuxHelper {
             PackageDescription child = (PackageDescription) e.nextElement();
             getLinuxFileInfo(child);
         }
-
+        
     }
 
     public void setFullPackageNameAtUninstall(PackageDescription packageData, HashMap packageNames) {
@@ -466,7 +466,7 @@ import java.util.Vector;public class LinuxHelper {
 
     public String getRelocationString(PackageDescription packageData, String packageName) {
         String relocationString = null;
-
+        
         if ( packageData.isRelocatable() ) {
             // String rpmQuery = "rpm -qp --qf %{PREFIXES}" + " " + packageName;
             String[] rpmQueryArray = new String[5];
@@ -475,32 +475,32 @@ import java.util.Vector;public class LinuxHelper {
             rpmQueryArray[2] = "--qf";
             rpmQueryArray[3] = "%{PREFIXES}";
             rpmQueryArray[4] = packageName;
-
+            
             Vector returnVector = new Vector();
             Vector returnErrorVector = new Vector();
             int returnValue = ExecuteProcess.executeProcessReturnVector(rpmQueryArray, returnVector, returnErrorVector);
             relocationString = (String) returnVector.get(0);
         }
-
+        
         return relocationString;
     }
 
     public void createPackageNameFileAtPostinstall(InstallData data, PackageDescription packageData) {
-
+ 
         // The file "packageNames" must not be an own database! It must be possible to install
         // and deinstall RPMs without this GUI installer. Therefore the file packageNames is
         // not always up to date. Nevertheless it makes the deinstallation faster, because of
         // all packages, whose "real" package name is not defined in xpd files (for example
-        // "openoffice-core01-2.0.3-159.rpm" hat the "real" name "openoffice-core01" that is
-        // used for deinstallation) this can be read in this file. Otherwise it would be
+        // "openoffice-core01-2.0.3-159.rpm" hat the "real" name "openoffice-core01" that is 
+        // used for deinstallation) this can be read in this file. Otherwise it would be 
         // neccessary to determine the "real" name with a database question.
-        // The version and release that are also stored in file "packageNames" must not be
+        // The version and release that are also stored in file "packageNames" must not be 
         // used for deinstallation because they are probably not up to date.
-
-        File destDir = new File(data.getInstallDefaultDir(), data.getProductDir());
+        
+        File destDir = new File(data.getInstallDefaultDir(), data.getProductDir());      
         File uninstallDir = new File(destDir, data.getUninstallDirName());
-        String fileName = "packageNames";
-        File packageNamesFile = new File(uninstallDir, fileName);
+        String fileName = "packageNames";        
+        File packageNamesFile = new File(uninstallDir, fileName);        
         Vector packageNames = new Vector();
         getPackageNamesContent(packageData, packageNames);
         SystemManager.saveCharFileVector(packageNamesFile.getPath(), packageNames);
@@ -516,15 +516,15 @@ import java.util.Vector;public class LinuxHelper {
         HashMap map = Converter.convertVectorToHashmap(fileContent);
         return map;
     }
-
+    
     public void saveModulesLogFile(InstallData data) {
         if ( data.logModuleStates() ) {
             Vector logContent = LogManager.getModulesLogFile();
-            File destDir = new File(data.getInstallDefaultDir(), data.getProductDir());
+            File destDir = new File(data.getInstallDefaultDir(), data.getProductDir());      
             File uninstallDir = new File(destDir, data.getUninstallDirName());
-            File modulesLogFile = new File(uninstallDir, "moduleSettingsLog.txt");
-            SystemManager.saveCharFileVector(modulesLogFile.getPath(), logContent);
-        }
+            File modulesLogFile = new File(uninstallDir, "moduleSettingsLog.txt");        
+            SystemManager.saveCharFileVector(modulesLogFile.getPath(), logContent);    
+        }    
     }
 
     public String fixInstallationDirectory(String installDir) {
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java
index ad3460159262..7a99b7ffbd1e 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.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,10 +41,10 @@ import java.util.HashMap;
 import java.util.Vector;
 
 public class SolarisHelper {
-
+    
     public SolarisHelper() {
     }
-
+    
     private void createLocalTempDir() {
         String mktempString = "/usr/bin/mktemp";
         File mktemp = new File(mktempString);
@@ -60,26 +60,26 @@ public class SolarisHelper {
             Vector returnErrorVector = new Vector();
             int returnValue = ExecuteProcess.executeProcessReturnVector(mktempCommandArray, returnVector, returnErrorVector);
             String uniqueLocalDir = (String) returnVector.get(0);
-
+                        
             data.setLocalTempPath(uniqueLocalDir);
-
+            
             String log = mktempCommand + "<br><b>Returns: " + uniqueLocalDir + "</b><br>";
             LogManager.addCommandsLogfileComment(log);
-
+            
             String installRoot = data.getInstallDir();
             File installRootTemp = new File(installRoot, "tmp");
-
+            
             if ( installRootTemp.exists() ) {
                 SystemManager.removeDirectory(installRootTemp);
             }
-
+            
             String linkCommand = "ln -s " + uniqueLocalDir + " " + installRootTemp.getPath();
             String[] linkCommandArray = new String[4];
             linkCommandArray[0] = "ln";
             linkCommandArray[1] = "-s";
             linkCommandArray[2] = uniqueLocalDir;
             linkCommandArray[3] = installRootTemp.getPath();
-
+            
             // Vector returnVector = new Vector();
             returnValue = ExecuteProcess.executeProcessReturnValue(linkCommandArray);
 
@@ -87,16 +87,16 @@ public class SolarisHelper {
             LogManager.addCommandsLogfileComment(log);
         }
     }
-
+    
     private void removeLocalTempDir() {
         InstallData data = InstallData.getInstance();
-
+        
         if ( data.getLocalTempPath() != null ) {
             File installRootTemp = new File(data.getInstallDir(), "tmp");
             if ( installRootTemp.exists() ) {
                 installRootTemp.delete(); // removing the link
                 SystemManager.createDirectory(installRootTemp);
-            }
+            }            
 
             File localTemp = new File(data.getLocalTempPath());
             if ( localTemp.exists() ) {
@@ -104,12 +104,12 @@ public class SolarisHelper {
             }
         }
     }
-
+    
     private Vector getAdminFileContent(boolean relocatable, boolean rdepends) {
 
         Vector adminFile = new Vector();
         InstallData data = InstallData.getInstance();
-
+        
         // if ( relocatable ) {
         //     String installDir =  data.getInstallDir();
         //     // installDir = installDir.replace(" ", "\\ ");
@@ -121,41 +121,41 @@ public class SolarisHelper {
         adminFile.add(mailLine);
 
         String conflictLine = "conflict=nochange";
-        if ( data.isUserInstallation() ) { conflictLine = "conflict=nochange"; }
+        if ( data.isUserInstallation() ) { conflictLine = "conflict=nochange"; }        
         adminFile.add(conflictLine);
 
         String runlevelLine = "runlevel=nocheck";
         adminFile.add(runlevelLine);
 
         String setuidLine = "setuid=quit";
-        if ( data.isUserInstallation() ) { setuidLine = "setuid=nocheck"; }
+        if ( data.isUserInstallation() ) { setuidLine = "setuid=nocheck"; }        
         adminFile.add(setuidLine);
 
         String actionLine = "action=nocheck";
         adminFile.add(actionLine);
 
         String partialLine = "partial=quit";
-        if ( data.isUserInstallation() ) { partialLine = "partial=nocheck"; }
+        if ( data.isUserInstallation() ) { partialLine = "partial=nocheck"; }        
         adminFile.add(partialLine);
 
         String instanceLine = "instance=unique";
         adminFile.add(instanceLine);
-
+        
         // String idependLine = "idepend=quit";
         String idependLine = "idepend=nocheck";
-        // if ( data.isUserInstallation() ) { idependLine = "idepend=nocheck"; }
+        // if ( data.isUserInstallation() ) { idependLine = "idepend=nocheck"; }        
         adminFile.add(idependLine);
 
         // String rdependLine = "rdepend=nocheck";
         String rdependLine = "rdepend=quit";
         if ( ! rdepends ) { rdependLine = "rdepend=nocheck"; }
-        if ( data.isUserInstallation() ) { rdependLine = "rdepend=nocheck"; }
+        if ( data.isUserInstallation() ) { rdependLine = "rdepend=nocheck"; }        
         adminFile.add(rdependLine);
 
         String spaceLine = "space=quit";
-        if ( data.isUserInstallation() ) { spaceLine = "space=nocheck"; }
+        if ( data.isUserInstallation() ) { spaceLine = "space=nocheck"; }        
         adminFile.add(spaceLine);
-
+        
         return adminFile;
     }
 
@@ -169,7 +169,7 @@ public class SolarisHelper {
 
         return mainVersion;
     }
-
+ 
     private String getPackageRevision(String version) {
         String revision = null;
 
@@ -180,7 +180,7 @@ public class SolarisHelper {
 
         return revision;
     }
-
+    
     private Vector getVectorOfNumbers(String version) {
         Vector numbers = new Vector();
         int pos = -1;
@@ -194,10 +194,10 @@ public class SolarisHelper {
             }
         } while ( pos > -1 );
 
-        numbers.add(version);
+        numbers.add(version);        
         return numbers;
     }
-
+    
     private int getMinimum(int a, int b) {
         int minimum;
 
@@ -209,10 +209,10 @@ public class SolarisHelper {
 
         return minimum;
     }
-
+    
     private String compareVersion(String firstVersion, String secondVersion) {
         // comparing strings with syntax 2.0.0
-        String comparison = "bothPackagesAreEqual";
+        String comparison = "bothPackagesAreEqual";        
         Vector firstVector = getVectorOfNumbers(firstVersion);
         Vector secondVector = getVectorOfNumbers(secondVersion);
 
@@ -232,7 +232,7 @@ public class SolarisHelper {
                 break;
             } else if ( second_ < first ) {
                 comparison = "secondPackageIsOlder";
-                break;
+                break;                
             }
         }
 
@@ -244,22 +244,22 @@ public class SolarisHelper {
             Vector logContent = LogManager.getModulesLogFile();
             File baseDir = new File(data.getInstallDefaultDir(), data.getProductDir());
             File uninstallDir = new File(baseDir, data.getUninstallDirName());
-            File modulesLogFile = new File(uninstallDir, "moduleSettingsLog.txt");
+            File modulesLogFile = new File(uninstallDir, "moduleSettingsLog.txt");        
             // System.err.println("Saving file: " + modulesLogFile.getPath());
             SystemManager.saveCharFileVector(modulesLogFile.getPath(), logContent);
-        }
+        }    
     }
 
     public void removeSolarisLockFile() {
         String lockFileName = "/tmp/.ai.pkg.zone.lock-afdb66cf-1dd1-11b2-a049-000d560ddc3e";
         File lockFile = new File(lockFileName);
-
+        
         if ( lockFile.exists() ) {
             // System.err.println("Found file: " + lockFileName);
             boolean deleted = lockFile.delete();
-        }
+        }        
     }
-
+    
     public String getSolarisDatabasePath(InstallData data) {
         String databasePath = null;
         databasePath = data.getInstallDir();
@@ -270,19 +270,19 @@ public class SolarisHelper {
         InstallData data = InstallData.getInstance();
         Vector removeFiles = data.getRemoveFiles();
         String adminFileName = "";
-
+        
         if ( relocatable ) {
             if ( rdepends ) {
                 adminFileName = "adminFileReloc";
             } else {
-                adminFileName = "adminFileRelocNoDepends";
+                adminFileName = "adminFileRelocNoDepends";            	
             }
         } else {
             if ( rdepends ) {
                 adminFileName = "adminFileNoReloc";
             } else {
                 adminFileName = "adminFileNoRelocNoDepends";
-            }
+            }     
         }
 
         Vector fileContent = getAdminFileContent(relocatable, rdepends);
@@ -292,7 +292,7 @@ public class SolarisHelper {
         if ( relocatable ) {
             if ( rdepends ) {
                 data.setAdminFileNameReloc(completeAdminFileName);
-            } else {
+            } else {            
                 data.setAdminFileNameRelocNoDepends(completeAdminFileName);
             }
         } else {
@@ -302,7 +302,7 @@ public class SolarisHelper {
                 data.setAdminFileNameNoRelocNoDepends(completeAdminFileName);
             }
         }
-
+        
         if ( ! adminFile.exists() ) {
             // only saving, if it did not exist
             SystemManager.saveCharFileVector(completeAdminFileName, fileContent);
@@ -322,11 +322,11 @@ public class SolarisHelper {
         env.put("LD_PRELOAD_32", data.getGetUidPath());
         data.setShellEnvironment(env);
     }
-
+    
     public String getVersionString(Vector returnVector) {
         String versionString = null;
         String versionLine = null;
-
+        
         for (int i = 0; i < returnVector.size(); i++) {
             String line = (String) returnVector.get(i);
             int pos = line.indexOf("REV=");
@@ -341,13 +341,13 @@ public class SolarisHelper {
             int pos = versionLine.lastIndexOf(" ");
             versionString = versionLine.substring(pos + 1, versionLine.length());
         }
-
+        
         return versionString;
     }
 
     public int getInstalledMinor(String version) {
-
-        int minor = 0;
+    
+        int minor = 0;	
 
         int pos = version.indexOf(".");
         if ( pos > -1 ) {
@@ -358,7 +358,7 @@ public class SolarisHelper {
                 reduced = reduced.substring(0, pos);
                 minor = Integer.parseInt(reduced);
             }
-        }
+        }    	
 
         return minor;
     }
@@ -375,7 +375,7 @@ public class SolarisHelper {
         if (( firstPackageMainVersion != null ) && ( secondPackageMainVersion != null )) {
             comparison = compareVersion(firstPackageMainVersion, secondPackageMainVersion);
         }
-
+        
         if ( comparison.equals("firstPackageIsOlder") ) {
             firstPackageIsOlder = true;
         } else if ( comparison.equals("secondPackageIsOlder") ) {
@@ -388,7 +388,7 @@ public class SolarisHelper {
                 comparison = compareVersion(firstPackageRevision, secondPackageRevision);
                 if ( comparison.equals("firstPackageIsOlder") ) {
                     firstPackageIsOlder = true;
-                } else {
+                } else {                    
                     firstPackageIsOlder = false;
                 }
             }
@@ -400,5 +400,5 @@ public class SolarisHelper {
 
         return firstPackageIsOlder;
     }
-
+    
 }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Main.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Main.java
index 75a2af9b3117..623b1a51e363 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Main.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Main.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
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 package org.openoffice.setup;
 
 import org.openoffice.setup.Controller.AcceptLicenseCtrl;
@@ -44,7 +44,7 @@ import org.openoffice.setup.Controller.PrologueCtrl;
 // import org.openoffice.setup.Util.Dumper;
 
 public class Main {
-
+ 
     public static void main(String[] args) {
         // try {
         //    UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
@@ -84,9 +84,9 @@ public class Main {
             frame.addPanel(controller5, controller5.getName());
             PanelController controller6 = new UninstallationCompletedCtrl();
             frame.addPanel(controller6, controller6.getName());
-            frame.setCurrentPanel(controller1.getName(), false, true);
+            frame.setCurrentPanel(controller1.getName(), false, true);            
         }
-
+                
         int ret = frame.showFrame();
 
         while ( data.stillRunning() ) {
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/AcceptLicense.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/AcceptLicense.java
index 42c1f91cdb13..a9e68b4db91e 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/AcceptLicense.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/AcceptLicense.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,33 +46,33 @@ public class AcceptLicense extends JPanel {
 
         setLayout(new java.awt.BorderLayout());
         setBorder(new EmptyBorder(new Insets(10, 10, 10, 10)));
-
+  
         String titletext = ResourceManager.getString("String_AcceptLicense1");
         PanelTitle titlebox = new PanelTitle(titletext);
         add(titlebox, BorderLayout.NORTH);
 
         JPanel contentpanel = new JPanel();
         contentpanel.setLayout(new java.awt.BorderLayout());
-
+       
         String text1 = ResourceManager.getString("String_AcceptLicense2");
         PanelLabel label1 = new PanelLabel(text1);
-
+        
         String text2 = ResourceManager.getString("String_AcceptLicense3");
         PanelLabel label2 = new PanelLabel(text2, true);
 
         JEditorPane editorPane = createEditorPane();
         JScrollPane editorScrollPane = new JScrollPane(editorPane);
-
+        
         editorScrollPane.setPreferredSize(new Dimension(250, 145));
         editorScrollPane.setBorder(new EmptyBorder(new Insets(5, 10, 5, 10)));
-
+        
         contentpanel.add(label1, BorderLayout.NORTH);
         contentpanel.add(editorScrollPane, BorderLayout.CENTER);
-        contentpanel.add(label2, BorderLayout.SOUTH);
-
+        contentpanel.add(label2, BorderLayout.SOUTH);                
+        
         add(contentpanel, BorderLayout.CENTER);
     }
-
+    
     private JEditorPane createEditorPane() {
         JEditorPane editorPane = new JEditorPane();
         editorPane.setEditable(false);
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/ChooseComponents.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/ChooseComponents.java
index 89f76db06227..70ac3fe72c73 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/ChooseComponents.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/ChooseComponents.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
@@ -57,19 +57,19 @@ import org.openoffice.setup.InstallData;
 public class ChooseComponents extends JPanel implements MouseListener, KeyListener, TreeSelectionListener {
 
     private JTree componentTree;
-    private PanelLabel descriptionLabel;
+    private PanelLabel descriptionLabel;    
     private PanelLabel sizeLabel;
-
+    
     private String sizeString;
     private PanelTitle titleBox;
-
+    
     public ChooseComponents() {
 
         InstallData data = InstallData.getInstance();
 
         setLayout(new BorderLayout());
         setBorder(new EmptyBorder(new Insets(10, 10, 10, 10)));
-
+              
         String titleText    = ResourceManager.getString("String_ChooseComponents1");
         String subtitleText = ResourceManager.getString("String_ChooseComponents2");
         titleBox = new PanelTitle(titleText, subtitleText, 2, 40);
@@ -88,25 +88,25 @@ public class ChooseComponents extends JPanel implements MouseListener, KeyListen
         componentTree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
         componentTree.addTreeSelectionListener(this);
         // if ( data.useRtl() ) { componentTree.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
-
+       
         String BorderTitle = ResourceManager.getString("String_ChooseComponents3");
         TitledBorder PanelBorder = BorderFactory.createTitledBorder(BorderTitle);
-
+        
         BorderLayout PanelLayout = new BorderLayout();
         PanelLayout.setHgap(20);
         JPanel DescriptionPanel = new JPanel();
         DescriptionPanel.setBorder(PanelBorder);
         DescriptionPanel.setLayout(PanelLayout);
-
+        
         String DescriptionText = "";
-        descriptionLabel = new PanelLabel(DescriptionText, 3, 20);
+        descriptionLabel = new PanelLabel(DescriptionText, 3, 20);        
         sizeString = ResourceManager.getString("String_ChooseComponents4");
         sizeLabel = new PanelLabel(sizeString, 1, 5);
-
+        
         DescriptionPanel.add(descriptionLabel, BorderLayout.CENTER);
         DescriptionPanel.add(sizeLabel, BorderLayout.EAST);
         if ( data.useRtl() ) { DescriptionPanel.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
-
+        
         add(new JScrollPane(componentTree), BorderLayout.CENTER);
         add(DescriptionPanel, BorderLayout.SOUTH);
     }
@@ -122,16 +122,16 @@ public class ChooseComponents extends JPanel implements MouseListener, KeyListen
 
             DefaultTreeModel model = (DefaultTreeModel)componentTree.getModel();
             // model.nodeChanged(node);
-
-            // The following line was included because of task i78481.
+            
+            // The following line was included because of task i78481. 
             // In Java 1.6 nodeChanged does not work correctly.
             model.nodeStructureChanged(node);
-
+            
             descriptionLabel.setText(nodeInfo.getDescription());
             sizeLabel.setText(sizeString + nodeInfo.getSize());
         }
     }
-
+ 
     /**
      * Implement the MouseListener Interface
      */
@@ -146,14 +146,14 @@ public class ChooseComponents extends JPanel implements MouseListener, KeyListen
         if ((selPath != null) && (componentTree.getPathBounds(selPath).getX() + 20 >= event.getX())) {
             updateNode((DefaultMutableTreeNode)selPath.getLastPathComponent());
         }
-    }
+    } 
     public void mouseReleased(MouseEvent e) {
     }
-
+    
     /**
      * Implement the KeyListener Interface
      */
-    public void keyPressed(KeyEvent event)  {
+    public void keyPressed(KeyEvent event)  {   
     }
     public void keyReleased(KeyEvent event) {
     }
@@ -165,9 +165,9 @@ public class ChooseComponents extends JPanel implements MouseListener, KeyListen
             }
         }
     }
-
-    /**
-     * Implement the TreeSelectionListener Interface.
+    
+    /** 
+     * Implement the TreeSelectionListener Interface. 
      */
     public void valueChanged(TreeSelectionEvent event) {
         DefaultMutableTreeNode node = (DefaultMutableTreeNode)componentTree.getLastSelectedPathComponent();
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/ChooseDirectory.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/ChooseDirectory.java
index 15d44fa2d179..43c86ef03bf6 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/ChooseDirectory.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/ChooseDirectory.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
@@ -48,74 +48,74 @@ import javax.swing.JTextField;
 import javax.swing.border.EmptyBorder;
 
 public class ChooseDirectory extends JPanel implements ActionListener {
-
+    
     private JFileChooser directoryChooser;
     private JFileChooser directoryChooserRootdir;
     private JButton      directoryButton;
     private JButton      directoryButtonRootdir;
     private JTextField   directoryField;
     private JTextField   directoryFieldRootdir;
-    private PanelLabel   databaseProgress;
+    private PanelLabel   databaseProgress;    
     private PanelTitle   titleBox;
-
+    
     public ChooseDirectory() {
-
+        
         setLayout(new java.awt.BorderLayout());
         setBorder(new EmptyBorder(new Insets(10, 10, 10, 10)));
-
+        
         String titleText    = ResourceManager.getString("String_ChooseDirectory1");
         String subtitleText = ResourceManager.getString("String_ChooseDirectory2");
 
         titleBox = new PanelTitle(titleText, subtitleText);
         titleBox.addVerticalStrut(10);
         add(titleBox, BorderLayout.NORTH);
-
+        
         Box contentBox   = new Box(BoxLayout.Y_AXIS);
-
+        
         JPanel contentPanel = new JPanel();
         contentPanel.setLayout(new GridBagLayout());
-
+        
         directoryChooser = new JFileChooser();
         directoryChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
-
+        
         String browseText = ResourceManager.getString("String_ChooseDirectory3");
         directoryButton = new JButton(browseText);
         directoryButton.addActionListener(this);
-
+        
         directoryField = new JTextField();
-
+        
         GridBagConstraints constraints = new GridBagConstraints();
-
+        
         constraints.gridx = 0;
         constraints.gridy = 0;
         constraints.weightx = 1;
         constraints.weighty = 0;
         constraints.fill = GridBagConstraints.HORIZONTAL;
-
+        
         contentPanel.add(directoryField, constraints);
-
+        
         constraints.gridx = 1;
         constraints.gridy = 0;
         constraints.weightx = 0;
         constraints.weighty = 0;
         constraints.fill = GridBagConstraints.HORIZONTAL;
-
+        
         contentPanel.add(directoryButton, constraints);
-
+        
         constraints.gridx = 0;
         constraints.gridy = 1;
         constraints.weightx = 0;
         constraints.weighty = 1;
         constraints.fill = GridBagConstraints.VERTICAL;
-
+        
         contentPanel.add(new JPanel(), constraints);
-
+        
         contentBox.add(contentPanel);
-
+        
         // defining a place for text output
         databaseProgress = new PanelLabel(""); // planned for database progress
         contentBox.add(databaseProgress);
-
+        
         add(contentBox, BorderLayout.CENTER);
     }
 
@@ -126,7 +126,7 @@ public class ChooseDirectory extends JPanel implements ActionListener {
     public void setTitleText(String s) {
         titleBox.setTitle(s);
     }
-
+    
     public void setDirectory(String dir) {
         directoryField.setText(dir);
     }
@@ -146,21 +146,21 @@ public class ChooseDirectory extends JPanel implements ActionListener {
     public String getDirectory() {
         return directoryField.getText();
     }
-
+    
     public void setRootDirectory(String dir) {
         directoryFieldRootdir.setText(dir);
     }
-
+    
     public String getRootDirectory() {
         return directoryFieldRootdir.getText();
     }
-
+    
     public void actionPerformed(ActionEvent e) {
-
+        
         //Handle open button action.
         if (e.getSource() == directoryButton) {
             int ReturnValue = directoryChooser.showOpenDialog(ChooseDirectory.this);
-
+            
             if (ReturnValue == JFileChooser.APPROVE_OPTION) {
                 File file = directoryChooser.getSelectedFile();
                 directoryField.setText(file.getAbsolutePath());
@@ -168,10 +168,10 @@ public class ChooseDirectory extends JPanel implements ActionListener {
                 // do nothing for now
             }
         }
-
+        
         if (e.getSource() == directoryButtonRootdir) {
             int ReturnValue = directoryChooserRootdir.showOpenDialog(ChooseDirectory.this);
-
+            
             if (ReturnValue == JFileChooser.APPROVE_OPTION) {
                 File file = directoryChooserRootdir.getSelectedFile();
                 directoryFieldRootdir.setText(file.getAbsolutePath());
@@ -179,7 +179,7 @@ public class ChooseDirectory extends JPanel implements ActionListener {
                 // do nothing for now
             }
         }
-
+        
     }
-
+    
 }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/ChooseInstallationType.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/ChooseInstallationType.java
index 74a72c936800..f4b3cb4fa42a 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/ChooseInstallationType.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/ChooseInstallationType.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
@@ -56,35 +56,35 @@ public class ChooseInstallationType extends JPanel {
 
         setLayout(new BorderLayout());
         setBorder(new EmptyBorder(new Insets(10, 10, 10, 10)));
-
+               
         String titleText    = ResourceManager.getString("String_ChooseInstallationType1");
         String subtitleText = ResourceManager.getString("String_ChooseInstallationType2");
         PanelTitle titleBox = new PanelTitle(titleText, subtitleText);
         titleBox.addVerticalStrut(20);
-
+        
         if ( data.useRtl() ) { titleBox.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
-
-        add(titleBox, BorderLayout.NORTH);
-
+        
+        add(titleBox, BorderLayout.NORTH); 
+        
         String borderTitle = ResourceManager.getString("String_ChooseInstallationType3");
         TitledBorder PanelBorder = BorderFactory.createTitledBorder(borderTitle);
-
+        
         JPanel contentPanel = new JPanel();
         contentPanel.setBorder(PanelBorder);
         contentPanel.setLayout(new GridBagLayout());
         if ( data.useRtl() ) { contentPanel.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
-
+        
             GridBagConstraints constraints = new GridBagConstraints();
             constraints.insets = new Insets(0, 0, 0, 10);
             // constraints.anchor = GridBagConstraints.NORTHWEST;
-
+       
             String typicalText = ResourceManager.getString("String_ChooseInstallationType4");
-            PanelLabel typicalComment = new PanelLabel(typicalText, true);
+            PanelLabel typicalComment = new PanelLabel(typicalText, true);         
             if ( data.useRtl() ) { typicalComment.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
             String customText  = ResourceManager.getString("String_ChooseInstallationType5");
             PanelLabel customComment  = new PanelLabel(customText, true);
             if ( data.useRtl() ) { customComment.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
-
+        
             ButtonGroup group = new ButtonGroup();
 
             String typicalButtonText = ResourceManager.getString("String_ChooseInstallationType6");
@@ -96,7 +96,7 @@ public class ChooseInstallationType extends JPanel {
             custom  = new JRadioButton(customButtonText,  false);
             custom.setMnemonic(KeyEvent.VK_U);
             if ( data.useRtl() ) { custom.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
-
+          
             group.add(typical);
             group.add(custom);
 
@@ -107,13 +107,13 @@ public class ChooseInstallationType extends JPanel {
             constraints.fill = GridBagConstraints.VERTICAL;
 
         contentPanel.add(new JPanel(), constraints);
-
+        
             constraints.gridx = 0;
             constraints.gridy = 1;
             constraints.weightx = 0;
             constraints.weighty = 0;
             constraints.fill = GridBagConstraints.HORIZONTAL;
-
+       
         contentPanel.add(typical, constraints);
 
             constraints.gridx = 1;
@@ -121,7 +121,7 @@ public class ChooseInstallationType extends JPanel {
             constraints.weightx = 1;
             constraints.weighty = 0;
             constraints.fill = GridBagConstraints.HORIZONTAL;
-
+        
         contentPanel.add(typicalComment, constraints);
 
             constraints.gridx = 0;
@@ -129,23 +129,23 @@ public class ChooseInstallationType extends JPanel {
             constraints.weightx = 0;
             constraints.weighty = 1;
             constraints.fill = GridBagConstraints.VERTICAL;
-
+        
         contentPanel.add(new JPanel(), constraints);
-
+    
             constraints.gridx = 0;
             constraints.gridy = 3;
             constraints.weightx = 0;
             constraints.weighty = 0;
             constraints.fill = GridBagConstraints.HORIZONTAL;
-
+        
         contentPanel.add(custom, constraints);
-
+        
             constraints.gridx = 1;
             constraints.gridy = 3;
             constraints.weightx = 1;
             constraints.weighty = 0;
             constraints.fill = GridBagConstraints.HORIZONTAL;
-
+        
         contentPanel.add(customComment, constraints);
 
             constraints.gridx = 0;
@@ -153,9 +153,9 @@ public class ChooseInstallationType extends JPanel {
             constraints.weightx = 0;
             constraints.weighty = 1;
             constraints.fill = GridBagConstraints.VERTICAL;
-
+        
         contentPanel.add(new JPanel(), constraints);
-
+        
         add(contentPanel, BorderLayout.CENTER);
     }
 
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/ChooseUninstallationComponents.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/ChooseUninstallationComponents.java
index 81de5505bc3c..782046bd13c9 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/ChooseUninstallationComponents.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/ChooseUninstallationComponents.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,25 +58,25 @@ import org.openoffice.setup.InstallData;
 public class ChooseUninstallationComponents extends JPanel implements MouseListener, KeyListener, TreeSelectionListener {
 
     private JTree componentTree;
-    private PanelLabel descriptionLabel;
+    private PanelLabel descriptionLabel;    
     private PanelLabel sizeLabel;
-
+    
     private String sizeString;
-
+    
     public ChooseUninstallationComponents() {
 
         InstallData data = InstallData.getInstance();
 
         setLayout(new BorderLayout());
         setBorder(new EmptyBorder(new Insets(10, 10, 10, 10)));
-
+              
         String titleText    = ResourceManager.getString("String_ChooseComponents1");
         String subtitleText = ResourceManager.getString("String_ChooseUninstallationComponents2");
         PanelTitle titleBox = new PanelTitle(titleText, subtitleText, 2, 40);
         // PanelTitle titleBox = new PanelTitle(titleText, subtitleText);
         titleBox.addVerticalStrut(20);
         add(titleBox, BorderLayout.NORTH);
-
+                
         DefaultMutableTreeNode root = SetupDataProvider.createTree();
 
         componentTree = new JTree(root);
@@ -89,30 +89,30 @@ public class ChooseUninstallationComponents extends JPanel implements MouseListe
         componentTree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
         componentTree.addTreeSelectionListener(this);
         // if ( data.useRtl() ) { componentTree.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
-
+       
         String BorderTitle = ResourceManager.getString("String_ChooseComponents3");
         TitledBorder PanelBorder = BorderFactory.createTitledBorder(BorderTitle);
-
+        
         BorderLayout PanelLayout = new BorderLayout();
         PanelLayout.setHgap(20);
         JPanel DescriptionPanel = new JPanel();
         DescriptionPanel.setBorder(PanelBorder);
         DescriptionPanel.setLayout(PanelLayout);
-
+        
         String DescriptionText = "";
-        descriptionLabel = new PanelLabel(DescriptionText, 3, 20);
+        descriptionLabel = new PanelLabel(DescriptionText, 3, 20);        
         sizeString = ResourceManager.getString("String_ChooseComponents4");
         sizeLabel = new PanelLabel(sizeString, 1, 5);
         if ( data.useRtl() ) { descriptionLabel.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
-
+        
         DescriptionPanel.add(descriptionLabel, BorderLayout.CENTER);
         DescriptionPanel.add(sizeLabel, BorderLayout.EAST);
         if ( data.useRtl() ) { DescriptionPanel.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
-
+        
         add(new JScrollPane(componentTree), BorderLayout.CENTER);
         add(DescriptionPanel, BorderLayout.SOUTH);
     }
-
+    
     private void updateNode(DefaultMutableTreeNode node) {
         if (node != null) {
             DisplayPackageDescription nodeInfo = (DisplayPackageDescription)node.getUserObject();
@@ -120,12 +120,12 @@ public class ChooseUninstallationComponents extends JPanel implements MouseListe
 
             DefaultTreeModel model = (DefaultTreeModel)componentTree.getModel();
             model.nodeChanged(node);
-
+            
             descriptionLabel.setText(nodeInfo.getDescription());
             sizeLabel.setText(sizeString + nodeInfo.getSize());
         }
     }
-
+ 
     /**
      * Implement the MouseListener Interface
      */
@@ -140,14 +140,14 @@ public class ChooseUninstallationComponents extends JPanel implements MouseListe
         if ((selPath != null) && (componentTree.getPathBounds(selPath).getX() + 20 >= event.getX())) {
             updateNode((DefaultMutableTreeNode)selPath.getLastPathComponent());
         }
-    }
+    } 
     public void mouseReleased(MouseEvent e) {
     }
-
+    
     /**
      * Implement the KeyListener Interface
      */
-    public void keyPressed(KeyEvent event)  {
+    public void keyPressed(KeyEvent event)  {   
     }
     public void keyReleased(KeyEvent event) {
     }
@@ -159,9 +159,9 @@ public class ChooseUninstallationComponents extends JPanel implements MouseListe
             }
         }
     }
-
-    /**
-     * Implement the TreeSelectionListener Interface.
+    
+    /** 
+     * Implement the TreeSelectionListener Interface. 
      */
     public void valueChanged(TreeSelectionEvent event) {
         DefaultMutableTreeNode node = (DefaultMutableTreeNode)componentTree.getLastSelectedPathComponent();
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/ChooseUninstallationType.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/ChooseUninstallationType.java
index 45e29ba575de..e589cd3d82fc 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/ChooseUninstallationType.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/ChooseUninstallationType.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,35 +53,35 @@ public class ChooseUninstallationType extends JPanel {
     public ChooseUninstallationType() {
 
         InstallData data = InstallData.getInstance();
-
+        
         setLayout(new BorderLayout());
         setBorder(new EmptyBorder(new Insets(10, 10, 10, 10)));
-
+               
         String titleText    = ResourceManager.getString("String_ChooseUninstallationType1");
         String subtitleText = ResourceManager.getString("String_ChooseUninstallationType2");
         PanelTitle titleBox = new PanelTitle(titleText, subtitleText);
         titleBox.addVerticalStrut(20);
-        add(titleBox, BorderLayout.NORTH);
-
+        add(titleBox, BorderLayout.NORTH); 
+        
         String borderTitle = ResourceManager.getString("String_ChooseUninstallationType1");
         TitledBorder PanelBorder = BorderFactory.createTitledBorder(borderTitle);
-
+        
         JPanel contentPanel = new JPanel();
         contentPanel.setBorder(PanelBorder);
         contentPanel.setLayout(new GridBagLayout());
         if ( data.useRtl() ) { contentPanel.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
-
+        
             GridBagConstraints constraints = new GridBagConstraints();
             constraints.insets = new Insets(0, 0, 0, 10);
             // constraints.anchor = GridBagConstraints.NORTHWEST;
-
+       
             String completeText = ResourceManager.getString("String_ChooseUninstallationType4");
-            PanelLabel completeComment = new PanelLabel(completeText, true);
+            PanelLabel completeComment = new PanelLabel(completeText, true);         
             if ( data.useRtl() ) { completeComment.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
             String customText  = ResourceManager.getString("String_ChooseUninstallationType5");
             PanelLabel customComment  = new PanelLabel(customText, true);
             if ( data.useRtl() ) { customComment.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
-
+        
             ButtonGroup group = new ButtonGroup();
 
             String completeButtonText = ResourceManager.getString("String_ChooseUninstallationType6");
@@ -92,7 +92,7 @@ public class ChooseUninstallationType extends JPanel {
             custom  = new JRadioButton(customButtonText,  false);
             custom.setMnemonic(KeyEvent.VK_U);
             if ( data.useRtl() ) { custom.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
-
+          
             group.add(complete);
             group.add(custom);
 
@@ -103,13 +103,13 @@ public class ChooseUninstallationType extends JPanel {
             constraints.fill = GridBagConstraints.VERTICAL;
 
         contentPanel.add(new JPanel(), constraints);
-
+        
             constraints.gridx = 0;
             constraints.gridy = 1;
             constraints.weightx = 0;
             constraints.weighty = 0;
             constraints.fill = GridBagConstraints.HORIZONTAL;
-
+       
         contentPanel.add(complete, constraints);
 
             constraints.gridx = 1;
@@ -117,7 +117,7 @@ public class ChooseUninstallationType extends JPanel {
             constraints.weightx = 1;
             constraints.weighty = 0;
             constraints.fill = GridBagConstraints.HORIZONTAL;
-
+        
         contentPanel.add(completeComment, constraints);
 
             constraints.gridx = 0;
@@ -125,23 +125,23 @@ public class ChooseUninstallationType extends JPanel {
             constraints.weightx = 0;
             constraints.weighty = 1;
             constraints.fill = GridBagConstraints.VERTICAL;
-
+        
         contentPanel.add(new JPanel(), constraints);
-
+    
             constraints.gridx = 0;
             constraints.gridy = 3;
             constraints.weightx = 0;
             constraints.weighty = 0;
             constraints.fill = GridBagConstraints.HORIZONTAL;
-
+        
         contentPanel.add(custom, constraints);
-
+        
             constraints.gridx = 1;
             constraints.gridy = 3;
             constraints.weightx = 1;
             constraints.weighty = 0;
             constraints.fill = GridBagConstraints.HORIZONTAL;
-
+        
         contentPanel.add(customComment, constraints);
 
             constraints.gridx = 0;
@@ -149,9 +149,9 @@ public class ChooseUninstallationType extends JPanel {
             constraints.weightx = 0;
             constraints.weighty = 1;
             constraints.fill = GridBagConstraints.VERTICAL;
-
+        
         contentPanel.add(new JPanel(), constraints);
-
+        
         add(contentPanel, BorderLayout.CENTER);
     }
 
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/InstallationImminent.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/InstallationImminent.java
index 7fda225f55d9..fa6e55b789e8 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/InstallationImminent.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/InstallationImminent.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,39 +47,39 @@ public class InstallationImminent extends JPanel {
     private JEditorPane ProductInformation;
     private JScrollPane ProductPane;
     private PanelTitle titlebox;
-
+    
     public InstallationImminent() {
 
         InstallData data = InstallData.getInstance();
 
         setLayout(new java.awt.BorderLayout());
         setBorder(new EmptyBorder(new Insets(10, 10, 10, 10)));
-
+ 
         String titletext = ResourceManager.getString("String_InstallationImminent1");
         titlebox = new PanelTitle(titletext);
         add(titlebox, BorderLayout.NORTH);
-
+       
         JPanel contentpanel = new JPanel();
         contentpanel.setLayout(new java.awt.BorderLayout());
         if ( data.useRtl() ) { contentpanel.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
-
+       
         String text1 = ResourceManager.getString("String_InstallationImminent2");
         PanelLabel label1 = new PanelLabel(text1);
         if ( data.useRtl() ) { label1.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
-
+           
         ProductInformation = new JEditorPane("text/html", getInfoText());
         ProductInformation.setEditable(false);
         if ( data.useRtl() ) { ProductInformation.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
-
+       
         ProductPane = new JScrollPane(ProductInformation);
         ProductPane.setPreferredSize(new Dimension(250, 145));
         ProductPane.setBorder(new EmptyBorder(10, 0, 10, 0));
         if ( data.useRtl() ) { ProductPane.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
-
-        contentpanel.add(label1, BorderLayout.NORTH);
+ 
+        contentpanel.add(label1, BorderLayout.NORTH);        
         contentpanel.add(ProductPane, BorderLayout.CENTER);
-
-        add(contentpanel, BorderLayout.CENTER);
+ 
+        add(contentpanel, BorderLayout.CENTER);        
     }
 
     public void setInfoText(String text) {
@@ -94,20 +94,20 @@ public class InstallationImminent extends JPanel {
     public String getInfoText() {
         return infoText;
     }
-
+    
     public void updateInfoText() {
         ProductInformation.setText(infoText);
     }
-
+    
     public void setTabOrder() {
         JScrollBar ScrollBar = ProductPane.getVerticalScrollBar();
         if ( ScrollBar.isShowing() ) {
             ProductInformation.setFocusable(true);
         } else {
             ProductInformation.setFocusable(false);
-        }
+        }    
     }
-
+    
     public void setCaretPosition() {
         ProductInformation.setCaretPosition(0);
     }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/InstallationOngoing.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/InstallationOngoing.java
index 7daf033ab3bd..ac64418cb893 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/InstallationOngoing.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/InstallationOngoing.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,14 +49,14 @@ public class InstallationOngoing extends JPanel {
     private JButton mStopButton;
     private String mTitle = "";
     private PanelTitle mTitlebox;
-
+    
     public InstallationOngoing() {
 
         InstallData data = InstallData.getInstance();
 
         setLayout(new java.awt.BorderLayout());
         setBorder(new EmptyBorder(new Insets(10, 10, 10, 10)));
-
+        
         // String titleText = ResourceManager.getString("String_InstallationOngoing1");
         // PanelTitle titlebox = new PanelTitle(titleText);
         // PanelTitle titlebox = new PanelTitle(mTitle);
@@ -89,14 +89,14 @@ public class InstallationOngoing extends JPanel {
         contentbox.add(Box.createVerticalStrut(10));
         contentbox.add(innerbox);
         contentbox.add(Box.createVerticalStrut(20));
-
+        
         add(contentbox, BorderLayout.SOUTH);
     }
-
+    
     public void setProgressText(String s) {
         currentProgress.setText(s);
     }
-
+    
     public void setProgressValue(int i) {
         progressBar.setValue(i);
     }
@@ -113,9 +113,9 @@ public class InstallationOngoing extends JPanel {
     public void addStopButtonActionListener(SetupActionListener actionListener) {
         mStopButton.addActionListener(actionListener);
     }
-
+    
     public void setStopButtonEnabled(boolean enabled) {
         mStopButton.setEnabled(enabled);
     }
-
+  
 }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/Prologue.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/Prologue.java
index 5209c98241ee..20d64f2981eb 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/Prologue.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/Prologue.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,10 +42,10 @@ public class Prologue extends JPanel {
     public Prologue() {
 
         InstallData data = InstallData.getInstance();
-
+        
         setLayout(new java.awt.BorderLayout());
         setBorder(new EmptyBorder(new Insets(10, 10, 10, 10)));
-
+        
         String titleText = ResourceManager.getString("String_Prologue1");
         PanelTitle titleBox = new PanelTitle(titleText);
         if ( data.useRtl() ) { titleBox.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
@@ -53,24 +53,24 @@ public class Prologue extends JPanel {
 
         JPanel contentPanel = new JPanel();
         contentPanel.setLayout(new java.awt.BorderLayout());
-
+        
         String text1 = ResourceManager.getString("String_Prologue2");
         PanelLabel label1 = new PanelLabel(text1, true);
         if ( data.useRtl() ) { label1.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
         String text2 = ResourceManager.getString("String_Prologue3");
         PanelLabel label2 = new PanelLabel(text2);
         if ( data.useRtl() ) { label2.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
-
+ 
         contentPanel.add(label1, BorderLayout.NORTH);
-        contentPanel.add(label2, BorderLayout.CENTER);
-
+        contentPanel.add(label2, BorderLayout.CENTER);  
+        
         if ( data.isUserInstallation() ) {
             String text3 = ResourceManager.getString("String_Prologue4");
             PanelLabel label3 = new PanelLabel(text3, true);
             if ( data.useRtl() ) { label3.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
-            contentPanel.add(label3, BorderLayout.SOUTH);
+            contentPanel.add(label3, BorderLayout.SOUTH);  
         }
-
-        add(contentPanel, BorderLayout.CENTER);
+        
+        add(contentPanel, BorderLayout.CENTER);      
     }
 }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/UninstallationCompleted.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/UninstallationCompleted.java
index 1c724fc47c86..2f224bb6a78e 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/UninstallationCompleted.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/UninstallationCompleted.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 UninstallationCompleted extends JPanel {
 
         setLayout(new java.awt.BorderLayout());
         setBorder(new EmptyBorder(new Insets(10, 10, 10, 10)));
-
+      
         String titleText = ResourceManager.getString("String_UninstallationCompleted1");
         titleBox = new PanelTitle(titleText);
         add(titleBox, BorderLayout.NORTH);
@@ -64,7 +64,7 @@ public class UninstallationCompleted extends JPanel {
         if ( data.useRtl() ) { contentPanel.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
 
         String dialogText = ResourceManager.getString("String_UninstallationCompleted2");
-        varLabel = new PanelLabel(dialogText, true);
+        varLabel = new PanelLabel(dialogText, true);      
         String text2 = ResourceManager.getString("String_InstallationCompleted3");
         PanelLabel label2 = new PanelLabel(text2);
         if ( data.useRtl() ) { label2.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
@@ -77,18 +77,18 @@ public class UninstallationCompleted extends JPanel {
 
         JPanel ButtonPanel = new JPanel();
         ButtonPanel.setLayout(new BorderLayout());
-        ButtonPanel.setBorder(new EmptyBorder(new Insets(5, 10, 5, 10)));
+        ButtonPanel.setBorder(new EmptyBorder(new Insets(5, 10, 5, 10)));       
         ButtonPanel.setPreferredSize(new Dimension(120, 44));
         ButtonPanel.add(mDetailsButton, BorderLayout.NORTH);
         if ( data.useRtl() ) { ButtonPanel.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
 
         contentPanel.add(varLabel, BorderLayout.NORTH);
         contentPanel.add(ButtonPanel, BorderLayout.EAST);
-        contentPanel.add(label2, BorderLayout.CENTER);
-
-        add(contentPanel, BorderLayout.CENTER);
+        contentPanel.add(label2, BorderLayout.CENTER);  
+        
+        add(contentPanel, BorderLayout.CENTER);      
     }
-
+    
     public void setDetailsButtonActionCommand(String actionCommand) {
         mDetailsButton.setActionCommand(actionCommand);
     }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/UninstallationImminent.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/UninstallationImminent.java
index fdef8958a676..c20d577a4dab 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/UninstallationImminent.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/UninstallationImminent.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,38 +46,38 @@ public class UninstallationImminent extends JPanel {
     private String infoText;
     private JEditorPane ProductInformation;
     private JScrollPane ProductPane;
-
+    
     public UninstallationImminent() {
 
         InstallData data = InstallData.getInstance();
-
+        
         setLayout(new java.awt.BorderLayout());
         setBorder(new EmptyBorder(new Insets(10, 10, 10, 10)));
-
+ 
         String titletext = ResourceManager.getString("String_UninstallationImminent1");
         PanelTitle titlebox = new PanelTitle(titletext);
         add(titlebox, BorderLayout.NORTH);
-
+       
         JPanel contentpanel = new JPanel();
         contentpanel.setLayout(new java.awt.BorderLayout());
         if ( data.useRtl() ) { contentpanel.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
-
+       
         String text1 = ResourceManager.getString("String_UninstallationImminent2");
         PanelLabel label1 = new PanelLabel(text1);
         if ( data.useRtl() ) { label1.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
-
+           
         ProductInformation = new JEditorPane("text/html", getInfoText());
         ProductInformation.setEditable(false);
         if ( data.useRtl() ) { ProductInformation.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
-
+        
         ProductPane = new JScrollPane(ProductInformation);
         ProductPane.setPreferredSize(new Dimension(250, 145));
         ProductPane.setBorder(new EmptyBorder(10, 0, 10, 0));
         if ( data.useRtl() ) { ProductPane.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
-
-        contentpanel.add(label1, BorderLayout.NORTH);
+ 
+        contentpanel.add(label1, BorderLayout.NORTH);        
         contentpanel.add(ProductPane, BorderLayout.CENTER);
-
+ 
         add(contentpanel, BorderLayout.CENTER);
     }
 
@@ -89,15 +89,15 @@ public class UninstallationImminent extends JPanel {
     public String getInfoText() {
         return infoText;
     }
-
+    
     public void updateInfoText() {
         ProductInformation.setText(infoText);
     }
-
+    
     public void setTabOrder() {
         JScrollBar ScrollBar = ProductPane.getVerticalScrollBar();
         if ( ScrollBar.isShowing() ) {
-            ProductInformation.setFocusable(true);
+            ProductInformation.setFocusable(true);            
         } else {
             ProductInformation.setFocusable(false);
         }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/UninstallationOngoing.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/UninstallationOngoing.java
index 6934308d6b47..18e841450f68 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/UninstallationOngoing.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/UninstallationOngoing.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 UninstallationOngoing extends JPanel {
     private PanelLabel currentProgress;
     private JProgressBar progressBar;
     private JButton mStopButton;
-
+    
     public UninstallationOngoing() {
 
         InstallData data = InstallData.getInstance();
@@ -77,7 +77,7 @@ public class UninstallationOngoing extends JPanel {
         String progressButtonText = ResourceManager.getString("String_InstallationOngoing3");
         mStopButton.setText(progressButtonText);
         mStopButton.setEnabled(true);
-
+        
         innerbox.add(progressBar);
         innerbox.add(Box.createHorizontalStrut(10));
         innerbox.add(mStopButton);
@@ -105,5 +105,5 @@ public class UninstallationOngoing extends JPanel {
     public void addStopButtonActionListener(SetupActionListener actionListener) {
         mStopButton.addActionListener(actionListener);
     }
-
+    
 }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/UninstallationPrologue.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/UninstallationPrologue.java
index d8ec108298b4..af6020119339 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/UninstallationPrologue.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/UninstallationPrologue.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,22 +41,22 @@ public class UninstallationPrologue extends JPanel {
 
         setLayout(new java.awt.BorderLayout());
         setBorder(new EmptyBorder(new Insets(10, 10, 10, 10)));
-
+        
         String titleText    = ResourceManager.getString("String_Prologue1");
         PanelTitle titleBox = new PanelTitle(titleText);
         add(titleBox, BorderLayout.NORTH);
-
+         
         JPanel contentPanel = new JPanel();
         contentPanel.setLayout(new java.awt.BorderLayout());
-
+        
         String text1 = ResourceManager.getString("String_UninstallationPrologue2");
         PanelLabel label1 = new PanelLabel(text1, true);
         String text2 = ResourceManager.getString("String_Prologue3");
         PanelLabel label2 = new PanelLabel(text2);
-
+ 
         contentPanel.add(label1, BorderLayout.NORTH);
-        contentPanel.add(label2, BorderLayout.CENTER);
-
-        add(contentPanel, BorderLayout.CENTER);
+        contentPanel.add(label2, BorderLayout.CENTER);  
+        
+        add(contentPanel, BorderLayout.CENTER);      
     }
 }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/installationCompleted.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/installationCompleted.java
index e34636da8d6f..00c1627da2dd 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/installationCompleted.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/installationCompleted.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,10 +51,10 @@ public class installationCompleted extends JPanel {
     public installationCompleted() {
 
         InstallData data = InstallData.getInstance();
-
+        
         setLayout(new java.awt.BorderLayout());
         setBorder(new EmptyBorder(new Insets(10, 10, 10, 10)));
-
+      
         String titleText = ResourceManager.getString("String_InstallationCompleted1");
         titleBox = new PanelTitle(titleText);
         add(titleBox, BorderLayout.NORTH);
@@ -64,7 +64,7 @@ public class installationCompleted extends JPanel {
         if ( data.useRtl() ) { contentPanel.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
 
         String dialogText = ResourceManager.getString("String_InstallationCompleted2");
-        varLabel = new PanelLabel(dialogText, true);
+        varLabel = new PanelLabel(dialogText, true);      
         String text2 = ResourceManager.getString("String_InstallationCompleted3");
         PanelLabel label2 = new PanelLabel(text2);
         if ( data.useRtl() ) { label2.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
@@ -77,18 +77,18 @@ public class installationCompleted extends JPanel {
 
         JPanel ButtonPanel = new JPanel();
         ButtonPanel.setLayout(new BorderLayout());
-        ButtonPanel.setBorder(new EmptyBorder(new Insets(5, 10, 5, 10)));
+        ButtonPanel.setBorder(new EmptyBorder(new Insets(5, 10, 5, 10)));       
         ButtonPanel.setPreferredSize(new Dimension(120, 44));
         ButtonPanel.add(mDetailsButton, BorderLayout.NORTH);
         if ( data.useRtl() ) { ButtonPanel.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
 
         contentPanel.add(varLabel, BorderLayout.NORTH);
         contentPanel.add(ButtonPanel, BorderLayout.EAST);
-        contentPanel.add(label2, BorderLayout.CENTER);
-
-        add(contentPanel, BorderLayout.CENTER);
+        contentPanel.add(label2, BorderLayout.CENTER);  
+        
+        add(contentPanel, BorderLayout.CENTER);      
     }
-
+    
     public void setDetailsButtonActionCommand(String actionCommand) {
         mDetailsButton.setActionCommand(actionCommand);
     }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/PanelController.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/PanelController.java
index 51a063e9ebd4..af146077dd1e 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/PanelController.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/PanelController.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
@@ -24,35 +24,35 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 package org.openoffice.setup;
 
 import javax.swing.JPanel;
 
 public abstract class PanelController {
-
+    
     private SetupFrame frame;
     private JPanel panel;
     private String name;
     private String next;
     private String prev;
-
+    
     private PanelController () {
     }
-
+    
     public PanelController (String name, JPanel panel) {
         this.name  = name;
         this.panel = panel;
     }
-
+   
     public final JPanel getPanel () {
         return this.panel;
     }
-
+    
     public final void setPanel (JPanel panel) {
         this.panel = panel;
     }
-
+    
     public final String getName () {
         return this.name;
     }
@@ -60,14 +60,14 @@ public abstract class PanelController {
     public final void setName (String name) {
         this.name = name;
     }
-
+    
     final void setSetupFrame (SetupFrame frame) {
         this.frame = frame;
     }
-
+    
     public final SetupFrame getSetupFrame () {
         return this.frame;
-    }
+    }   
 
     public String getNext () {
         return null;
@@ -80,18 +80,18 @@ public abstract class PanelController {
     public String getPrevious () {
         return null;
     }
-
+    
     public void beforeShow () {
     }
-
+ 
     public void duringShow () {
     }
-
+ 
     public boolean afterShow (boolean nextButtonPressed) {
         boolean repeatDialog = false;
         return repeatDialog;
     }
-
+    
     public abstract String getHelpFileName();
 
 }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/PanelHelper/PanelLabel.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/PanelHelper/PanelLabel.java
index 4fec3cfdb1c5..f6b5977c23e6 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/PanelHelper/PanelLabel.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/PanelHelper/PanelLabel.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,7 +35,7 @@ import javax.swing.UIManager;
 import org.openoffice.setup.InstallData;
 
 public class PanelLabel extends JTextArea {
-
+    
     static private Color BackgroundColor;
     static private Color TextColor;
     static private Font  TextFont;
@@ -47,36 +47,36 @@ public class PanelLabel extends JTextArea {
         super(text, rows, columns);
         init(true);
     }
-
+    
     public PanelLabel(String text, boolean multiline) {
         super(text);
         init(multiline);
     }
-
+    
     public PanelLabel(String text) {
         super(text);
         init(false);
     }
-
+    
     private void init(boolean multiline) {
         setEditable(false);
         setBackground(BackgroundColor);
         setForeground(TextColor);
         setFont(TextFont);
         setFocusable(false);
-
+        
         InstallData data = InstallData.getInstance();
         if ( data.useRtl() ) { setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
-
+        
         if (multiline) {
             setLineWrap(true);
             setWrapStyleWord(true);
         }
     }
-
+    
     static {
         BackgroundColor = (Color)UIManager.get("Label.background");
         TextColor       = (Color)UIManager.get("Label.foreground");
         TextFont        = ((Font)UIManager.get("Label.font")).deriveFont(Font.PLAIN);
-    }
+    }  
 }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/PanelHelper/PanelTitle.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/PanelHelper/PanelTitle.java
index 6b383473e541..929a3fc3046b 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/PanelHelper/PanelTitle.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/PanelHelper/PanelTitle.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,9 +37,9 @@ import javax.swing.JSeparator;
 import org.openoffice.setup.InstallData;
 
 public class PanelTitle extends Box {
-
+    
     private JLabel TitleLabel;
-
+    
     public PanelTitle() {
          super(BoxLayout.PAGE_AXIS);
     }
@@ -53,16 +53,16 @@ public class PanelTitle extends Box {
         super(BoxLayout.PAGE_AXIS);
         init(title, subtitle, 0, 0);
     }
-
+    
     public PanelTitle(String title) {
         super (BoxLayout.PAGE_AXIS);
         init(title, null, 0, 0);
     }
-
+    
     public void addVerticalStrut(int strut) {
         add(createVerticalStrut(strut));
     }
-
+    
     public void setTitle(String title) {
         TitleLabel.setText(title);
     }
@@ -70,9 +70,9 @@ public class PanelTitle extends Box {
     // public void setSubtitle(String subtitle) {
     //     SubtitleLabel.setText(subtitle);
     // }
-
+    
     private void init(String title, String subtitle, int rows, int columns) {
-
+ 
         InstallData data = InstallData.getInstance();
 
         TitleLabel = new JLabel(title);
@@ -85,19 +85,19 @@ public class PanelTitle extends Box {
             TitlePanel.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0));
         }
         TitlePanel.add(TitleLabel);
-
+        
         add(createVerticalStrut(10));
         add(TitlePanel);
         add(createVerticalStrut(10));
         add(new JSeparator());
         add(createVerticalStrut(20));
-
+        
         if (subtitle != null) {
             PanelLabel SubtitleLabel = null;
             if ( rows > 0 ) {
                 SubtitleLabel = new PanelLabel(subtitle, rows, columns );
             } else {
-                SubtitleLabel = new PanelLabel(subtitle);
+                SubtitleLabel = new PanelLabel(subtitle);            
             }
             SubtitleLabel.setFocusable(false);
             // PanelLabel SubtitleLabel = new PanelLabel(subtitle, true);
@@ -109,7 +109,7 @@ public class PanelTitle extends Box {
                 SubtitlePanel.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0));
             }
             SubtitlePanel.add(SubtitleLabel);
-
+            
             add(SubtitlePanel);
         }
     }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/PanelHelper/TreeNodeRenderer.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/PanelHelper/TreeNodeRenderer.java
index 7b9253d60ba8..914c6d9cc735 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/PanelHelper/TreeNodeRenderer.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/PanelHelper/TreeNodeRenderer.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 javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeCellRenderer;
 
 public class TreeNodeRenderer extends DefaultTreeCellRenderer {
-
+    
     ImageIcon    InstallIcon;
     ImageIcon    InstalledIcon;
     ImageIcon    DontInstallIcon;
@@ -55,12 +55,12 @@ public class TreeNodeRenderer extends DefaultTreeCellRenderer {
     public Component getTreeCellRendererComponent(
                         JTree tree, Object value, boolean sel, boolean expanded,
                         boolean leaf, int row, boolean hasFocus)    {
-
+        
         super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus);
 
         DefaultMutableTreeNode node = (DefaultMutableTreeNode) value;
         Object nodeObject = node.getUserObject();
-
+        
         if (DisplayPackageDescription.is(nodeObject)) {
             DisplayPackageDescription nodeInfo = (DisplayPackageDescription)nodeObject;
 
@@ -75,7 +75,7 @@ public class TreeNodeRenderer extends DefaultTreeCellRenderer {
                 default: setIcon(InstalledIcon); break;
             }
         }
-
+ 
         if (sel) {
             setBackground(super.getBackgroundSelectionColor());
             setForeground(textSelectionColor);
@@ -83,7 +83,7 @@ public class TreeNodeRenderer extends DefaultTreeCellRenderer {
             setBackground(super.getBackgroundNonSelectionColor());
             setForeground(textSelectionColor);
         }
-
+        
         return this;
     }
 }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/ResourceManager.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/ResourceManager.java
index e0c28b96b512..2e015ec13508 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/ResourceManager.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/ResourceManager.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,47 +40,47 @@ import java.util.ResourceBundle;
 import javax.swing.ImageIcon;
 
 public class ResourceManager {
-
+    
     static PropertyResourceBundle stringResourceBundle;
     static PropertyResourceBundle fileNameResourceBundle;
     static HashMap setupFiles = new HashMap();  // required, because it is not possible to set values in fileNameResourceBundle
-
+    
     private ResourceManager() {
     }
-
+    
     static public void checkFileExistence(File htmlDirectory) {
 
         for (Enumeration e = fileNameResourceBundle.getKeys(); e.hasMoreElements(); ) {
-            String key = (String) e.nextElement();
+            String key = (String) e.nextElement();            
             String fileName = (String)(fileNameResourceBundle.getObject(key));
 
             if ( ! fileName.endsWith("html") ) {
                 // no check of existence for non-html files
-                setupFiles.put(key, fileName);
+                setupFiles.put(key, fileName);            
                 // System.err.println("Using file: " + fileName);
             }
 
             if ( fileName.endsWith("html") ) {
                 boolean fileExists = true;
-
+            
                 File file = new File(htmlDirectory, fileName);
                 File newFile = null;
 
                 if ( file.exists() ) {
-                    setupFiles.put(key, fileName);
+                    setupFiles.put(key, fileName);                
                     // System.err.println("Using file: " + fileName);
                 } else {
                     fileExists = false;
                     // try to use english version
                     int pos1 = fileName.lastIndexOf("_");
-
+                
                     if ( pos1 > 0 ) {
                         int pos2 = fileName.lastIndexOf(".");
                         String newFileName = fileName.substring(0, pos1) + fileName.substring(pos2, fileName.length());
                         newFile = new File(htmlDirectory, newFileName);
                         if ( newFile.exists() ) {
                             fileExists = true;
-                            setupFiles.put(key, newFileName);
+                            setupFiles.put(key, newFileName);                
                             // System.err.println("Using file: " + fileName);
                         } else {
                             // Introducing fallback to a very special simple html page
@@ -90,11 +90,11 @@ public class ResourceManager {
                                 fileExists = true;
                                 setupFiles.put(key, simplePage);
                                 // System.err.println("Using file: " + fileName);
-                            }
+                            }                
                         }
                     }
                 }
-
+            
                 if ( ! fileExists ) {
                     if ( newFile != null ) {
                         System.err.println("ERROR: Neither file \"" + file.getPath() +
@@ -104,10 +104,10 @@ public class ResourceManager {
                     }
                     System.exit(1);
                 }
-            }
-        }
+            }      
+        }	
     }
-
+    
     static public String getString(String key) {
         String value = (String)(stringResourceBundle.getObject(key));
         if (value != null && (value.indexOf('$') >= 0)) {
@@ -121,11 +121,11 @@ public class ResourceManager {
         // String value = (String)(fileNameResourceBundle.getObject(key));
         return value;
     }
-
+    
     static public ImageIcon getIcon(String key) {
-
+        
         String name = getFileName(key);
-
+        
         try {
             Class c = Class.forName("org.openoffice.setup.ResourceManager");
             URL url = c.getResource(name);
@@ -133,7 +133,7 @@ public class ResourceManager {
                 return new ImageIcon(url);
             } else {
                 System.err.println("Error: file not found: " + name);
-            }
+            }             
         } catch (ClassNotFoundException e) {
             System.err.println(e);
         }
@@ -142,14 +142,14 @@ public class ResourceManager {
     }
 
     static public ImageIcon getIconFromPath(File file) {
-
+        
         try {
             URL url = file.toURL();
             if (url != null) {
                 return new ImageIcon(url);
             } else {
                 System.err.println("Error: file not found: " + file.getPath());
-            }
+            }             
         } catch (MalformedURLException e) {
             System.err.println(e);
         }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupActionListener.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupActionListener.java
index 1fd8aa72ac2e..0be6672dd091 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupActionListener.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupActionListener.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,9 +36,9 @@ import javax.swing.JDialog;
 import javax.swing.JOptionPane;
 
 public class SetupActionListener implements ActionListener {
-
+    
     private SetupFrame setupFrame;
-
+    
     public SetupActionListener(SetupFrame setup) {
         setupFrame = setup;
     }
@@ -53,7 +53,7 @@ public class SetupActionListener implements ActionListener {
             } else {
                 StringCancelDialog = ResourceManager.getString("String_Cancel_Dialog_Uninstallation");
             }
-            StringCancelDialogTitle = ResourceManager.getString("String_Cancel_Dialog_Title");
+            StringCancelDialogTitle = ResourceManager.getString("String_Cancel_Dialog_Title");            
             JDialog dialog = setupFrame.getDialog();
             int n = JOptionPane.showConfirmDialog(dialog, StringCancelDialog, StringCancelDialogTitle,
                                                       JOptionPane.YES_NO_OPTION);
@@ -70,7 +70,7 @@ public class SetupActionListener implements ActionListener {
                 StringStopDialogTitle = ResourceManager.getString("String_Stop_Dialog_Title");
             } else {
                 StringStopDialog = ResourceManager.getString("String_Stop_Dialog_Uninstallation");
-                StringStopDialogTitle = ResourceManager.getString("String_Stop_Dialog_Title_Uninstallation");
+                StringStopDialogTitle = ResourceManager.getString("String_Stop_Dialog_Title_Uninstallation");                
             }
             JDialog dialog = setupFrame.getDialog();
             int n = JOptionPane.showConfirmDialog(dialog, StringStopDialog, StringStopDialogTitle,
@@ -84,14 +84,14 @@ public class SetupActionListener implements ActionListener {
             // panel.setStopButtonSelected();
         } else if (evt.getActionCommand().equals(SetupFrame.ACTION_PREVIOUS)) {
             PanelController panel = setupFrame.getCurrentPanel();
-            String previous = panel.getPrevious();
+            String previous = panel.getPrevious();        
             setupFrame.setCurrentPanel(previous, true, false);
         } else if (evt.getActionCommand().equals(SetupFrame.ACTION_NEXT)) {
             PanelController panel = setupFrame.getCurrentPanel();
-            String next = panel.getNext();
-            if (next == null) {
+            String next = panel.getNext();        
+            if (next == null) { 
                 setupFrame.close(SetupFrame.CODE_OK);
-            } else {
+            } else { 
                 setupFrame.setCurrentPanel(next, false, true);
             }
         } else if (evt.getActionCommand().equals(SetupFrame.ACTION_DETAILS)) {
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/DisplayPackageDescription.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/DisplayPackageDescription.java
index f7926c4fd314..76ddef130e8b 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/DisplayPackageDescription.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/DisplayPackageDescription.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 @@ public class DisplayPackageDescription {
 
     private PackageDescription data;
     private int size  = 0;
-
+    
     public DisplayPackageDescription(PackageDescription data) {
         this.data = data;
         // Setting default module settings for modules, that are not hidden
@@ -49,21 +49,21 @@ public class DisplayPackageDescription {
     public String getDescription() {
         return data.getDescription();
     }
-
+    
     public int getSize() {
         return size;     // using local size
     }
-
+    
     public int getState() {
         return data.getSelectionState();
     }
-
+    
     private int getSize(TreeNode peerNode) {
         // return peerNode.isLeaf() ? data.getAccumulatedSize() : data.getSize();
         // using size from PackageDescription, which is pkgSize (and that is defined in xpd file)
         return data.getSize();
     }
-
+    
     public void setState(TreeNode node, int newState) {
         if ((data.getSelectionState() != PackageDescription.IGNORE) && data.isOptional()) {
             data.setSelectionState(newState);
@@ -72,12 +72,12 @@ public class DisplayPackageDescription {
         if (!node.isLeaf()) {
             size = data.getSize();  // -> that is the value defined in xpd file
 
-            for (Enumeration e = node.children(); e.hasMoreElements();) {
+            for (Enumeration e = node.children(); e.hasMoreElements();) {               
                 TreeNode child = (TreeNode)e.nextElement();
                 DisplayPackageDescription childInfo = getInfo(child);
-
+                
                 childInfo.setState(child, newState);
-
+                
                 if (childInfo.isSelected())   {
                     size += childInfo.getSize(child);
                 }
@@ -90,9 +90,9 @@ public class DisplayPackageDescription {
     public void toggleState(TreeNode node) {
 
         int state = data.getSelectionState();
-
+        
         if (state != PackageDescription.IGNORE) {
-
+            
             if (state == PackageDescription.REMOVE) {
                 setState(node, PackageDescription.DONT_REMOVE);
             } else if ((state == PackageDescription.DONT_REMOVE) || (state == PackageDescription.REMOVE_SOME)) {
@@ -102,7 +102,7 @@ public class DisplayPackageDescription {
             } else {
                 setState(node, PackageDescription.DONT_INSTALL);
             }
-
+            
             if (!node.isLeaf()) {
                 updateState(node);
             }
@@ -110,16 +110,16 @@ public class DisplayPackageDescription {
             try {
                 TreeNode parent = node.getParent();
                 DisplayPackageDescription parentInfo = getInfo(parent);
-
+                
                 parentInfo.updateState(parent);
                 try {
                     TreeNode grandpa = parent.getParent();
                     DisplayPackageDescription grandpaInfo = getInfo(grandpa);
-
+                
                     grandpaInfo.updateState(grandpa);
                 } catch (java.lang.IllegalArgumentException e) {
                     /* ignore */
-                }
+                }           
 
             } catch (java.lang.IllegalArgumentException e) {
                 /* ignore */
@@ -133,10 +133,10 @@ public class DisplayPackageDescription {
         InstallData installdata = InstallData.getInstance();
         size = data.getSize();  // -> that is the value defined in xpd file
 
-        for (Enumeration e = node.children(); e.hasMoreElements();) {
+        for (Enumeration e = node.children(); e.hasMoreElements();) {            
             TreeNode child = (TreeNode) e.nextElement();
             DisplayPackageDescription childInfo = getInfo(child);
-
+            
             int childState = childInfo.getState();
 
             if ((state == PackageDescription.DONT_KNOW) || (state == PackageDescription.IGNORE)) {
@@ -152,7 +152,7 @@ public class DisplayPackageDescription {
                 size += childInfo.getSize(child);
             }
         }
-
+        
         data.setSelectionState(state);
 
     }
@@ -160,8 +160,8 @@ public class DisplayPackageDescription {
     public void updateSize(TreeNode node)
     {
         size = data.getSize();  // -> that is the value defined in xpd file
-
-        for (Enumeration e = node.children(); e.hasMoreElements();) {
+        
+        for (Enumeration e = node.children(); e.hasMoreElements();) {            
             TreeNode child = (TreeNode) e.nextElement();
             DisplayPackageDescription childInfo = getInfo(child);
             if (childInfo.isSelected()) {
@@ -173,23 +173,23 @@ public class DisplayPackageDescription {
     public String toString() {
         return data.getName();
     }
-
+    
     static public boolean is(Object o) {
-        return (o != null)
+        return (o != null) 
             && (o.getClass().getName().equals("org.openoffice.setup.SetupData.DisplayPackageDescription"));
     }
-
+    
     public boolean isSelected() {
         int state = data.getSelectionState();
-        return     (state == PackageDescription.INSTALL) || (state == PackageDescription.INSTALL_SOME)
+        return     (state == PackageDescription.INSTALL) || (state == PackageDescription.INSTALL_SOME) 
                 || (state == PackageDescription.REMOVE)  || (state == PackageDescription.REMOVE_SOME);
     }
-
+    
     private DisplayPackageDescription getInfo(TreeNode node) throws java.lang.IllegalArgumentException {
         if (node == null) {
             throw new java.lang.IllegalArgumentException();
         }
-
+        
         DisplayPackageDescription info = (DisplayPackageDescription)((DefaultMutableTreeNode)node).getUserObject();
         if ((info != null) && is(info)) {
             return info;
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/PackageDescription.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/PackageDescription.java
index 4ed331bff2d7..aa6969750186 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/PackageDescription.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/PackageDescription.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
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+ 
 package org.openoffice.setup.SetupData;
 
 import org.openoffice.setup.Util.Parser;
@@ -42,7 +42,7 @@ import javax.swing.tree.TreeNode;
  * @author Ingo Schmidt
  */
 public class PackageDescription implements TreeNode {
-
+    
     public final static int NOTA_UNIT= 0;
     public final static int RPM_UNIT = 1;
     public final static int PKG_UNIT = 2;
@@ -50,7 +50,7 @@ public class PackageDescription implements TreeNode {
      * public final static int TAR_UNIT = 4;
      * public final static int TGZ_UNIT = 5;
      */
-
+    
     public final static int DONT_INSTALL      = 0;
     public final static int INSTALL           = 1;
     public final static int INSTALL_SOME      = 2;
@@ -59,14 +59,14 @@ public class PackageDescription implements TreeNode {
     public final static int REMOVE_SOME       = 5;
     public final static int IGNORE            = 6;
     public final static int DONT_KNOW         = 7;
-
+    
     /* hierarchy information */
     private Vector children           = null;
     private PackageDescription parent = null;
-
+    
     /* did the user select this package */
     private int     usrSelectionState = DONT_KNOW;
-
+    
     /* display information */
     private String  dpyName            = "";
     private String  dpyDescription     = "";
@@ -80,7 +80,7 @@ public class PackageDescription implements TreeNode {
     private boolean isOptional  = true;
     private boolean dontUninstall = false;
     private boolean allChildrenHidden = false;
-
+            
     /* package information */
     private String  pkgMD5Sum   = "";
     private String  pkgFileName = "";
@@ -106,41 +106,41 @@ public class PackageDescription implements TreeNode {
     private boolean isNewInstalled = false;
     private boolean wasAlreadyInstalled = false;
     private boolean ignoreDependsForUninstall = false;
-
+    
     /* Saving the default selection state. This is necessary, if the user chooses
-     * the custom installation type, makes changes, and then changes into
+     * the custom installation type, makes changes, and then changes into 
      * the typical installation set. Then all user settings have to be removed again.
      * On the other hand, if the user then changes to the custom installation type
      * again, he probably wants to see the settings he has done before.
      */
-
+    
     private int     typicalSelectionState = DONT_KNOW;  // Saving settings for typical installation
     private int     customSelectionState = DONT_KNOW;   // Saving settings for custom installation
     private int     startSelectionState = DONT_KNOW;    // Saving settings at start of installation
 
     public PackageDescription() {}
-
-    /**
-     * construct only with package information to wrap
+    
+    /** 
+     * construct only with package information to wrap 
      */
     protected PackageDescription(XMLPackageDescription p) {
         this(p, (PackageDescription)null);
     }
-
+    
     private PackageDescription(XMLPackageDescription descriptionData, PackageDescription parent) {
-
+   
         this.parent = parent;
         children = new Vector();
         parse(descriptionData);
-
+ 
         /* sort according to display sort key */
         Collections.sort(children, new PackageComparator());
      }
-
+    
     /**
      * retrieve information about the package properties
      */
-
+    
     public String getName() {
         return dpyName;
     }
@@ -148,7 +148,7 @@ public class PackageDescription implements TreeNode {
     public void setName(String name) {
         dpyName = name;
     }
-
+    
     public String getDescription() {
         return dpyDescription;
     }
@@ -156,11 +156,11 @@ public class PackageDescription implements TreeNode {
     public String getCheckSolaris() {
         return checkSolaris;
     }
-
+    
     public int getSize() {
         return pkgSize;
     }
-
+    
     public void setSize(int size) {
         pkgSize = size;
     }
@@ -180,7 +180,7 @@ public class PackageDescription implements TreeNode {
     //         // Should only be accumulated for selected modules
     //         PackageDescription data = (PackageDescription) e.nextElement();
     //         size += data.getSize();
-    //     }
+    //     }      
     //
     //     return size;
     // }
@@ -188,7 +188,7 @@ public class PackageDescription implements TreeNode {
     public boolean isOptional() {
         return isOptional;
     }
-
+    
     public boolean isHidden() {
         return isHidden;
     }
@@ -268,7 +268,7 @@ public class PackageDescription implements TreeNode {
     public boolean isDefault() {
         return isDefault;
     }
-
+    
     public String getMD5() {
         return pkgMD5Sum;
     }
@@ -280,7 +280,7 @@ public class PackageDescription implements TreeNode {
     public void setIsRelocatable(boolean relocatable) {
         isRelocatable = relocatable;
     }
-
+    
     public String getPackageName() {
         return pkgFileName;
     }
@@ -301,7 +301,7 @@ public class PackageDescription implements TreeNode {
     public int getSelectionState() {
         return usrSelectionState;
     }
-
+    
     public void setSelectionState(int state) {
         usrSelectionState = state;
     }
@@ -309,15 +309,15 @@ public class PackageDescription implements TreeNode {
     public int getCustomSelectionState() {
         return customSelectionState;
     }
-
+    
     public void setCustomSelectionState(int state) {
         customSelectionState = state;
     }
-
+    
      public int getTypicalSelectionState() {
         return typicalSelectionState;
     }
-
+    
     public void setTypicalSelectionState(int state) {
         typicalSelectionState = state;
     }
@@ -325,11 +325,11 @@ public class PackageDescription implements TreeNode {
     public int getStartSelectionState() {
         return startSelectionState;
     }
-
+    
     public void setStartSelectionState(int state) {
         startSelectionState = state;
     }
-
+    
     public boolean isAllChildrenHidden() {
         return allChildrenHidden;
     }
@@ -341,11 +341,11 @@ public class PackageDescription implements TreeNode {
     public void setIsHidden(boolean hidden) {
         isHidden = hidden;
     }
-
+    
     public boolean pkgExists() {
         return pkgExists;
     }
-
+    
     public void setPkgExists(boolean exists) {
         pkgExists = exists;
     }
@@ -395,11 +395,11 @@ public class PackageDescription implements TreeNode {
      */
     private String getLocalizedValue(XMLPackageDescription packageData, String section, Locale l) {
         String localizedValue = "";
-
+    
         String countryString  = l.getCountry();
         String languageString = l.getLanguage();
         String localeString   = languageString + "_" + countryString;
-
+        
         XMLPackageDescription subPackage = packageData.getElement(section, "lang", localeString);
         if (subPackage == null) {
             subPackage = packageData.getElement(section, "lang", languageString);
@@ -408,21 +408,21 @@ public class PackageDescription implements TreeNode {
             }
         }
         if (subPackage != null) {
-            localizedValue = subPackage.getValue();
+            localizedValue = subPackage.getValue();            
         }
-
+        
         return localizedValue;
     }
-
+    
     /**
      * parse the wrapped package description
      */
-
+    
     private void parse(XMLPackageDescription data) {
-
+        
         XMLPackageDescription section;
         XMLPackageDescription subSection;
-
+        
         /* information about how to display the node */
         section = data.getElement("display");
         if (section != null) {
@@ -436,7 +436,7 @@ public class PackageDescription implements TreeNode {
             Locale locale = Locale.getDefault();
             dpyName        = getLocalizedValue(section, "name",        locale);
             dpyDescription = getLocalizedValue(section, "description", locale);
-
+            
             subSection = section.getElement("sortkey");
             if (subSection != null) {
                 String sort = subSection.getValue();
@@ -520,7 +520,7 @@ public class PackageDescription implements TreeNode {
             }
 
         }
-
+        
         /* query information about the physical (rpm/pkg/msi...) package itself */
         section = data.getElement("installunit");
         if (section != null) {
@@ -532,7 +532,7 @@ public class PackageDescription implements TreeNode {
                     pkgType = PKG_UNIT;
                 }
             }
-
+            
             subSection = section.getElement("size");
             if (subSection != null) {
                 String sz = subSection.getValue();
@@ -548,7 +548,7 @@ public class PackageDescription implements TreeNode {
             }
             subSection = section.getElement("md5");
             if (subSection != null) {
-                pkgMD5Sum = subSection.getValue();
+                pkgMD5Sum = subSection.getValue(); 
             }
             subSection = section.getElement("name");
             if (subSection != null) {
@@ -578,7 +578,7 @@ public class PackageDescription implements TreeNode {
             }
 
         }
-
+        
         /* line up the subpackages */
         for (Enumeration enumPackages = data.elements(); enumPackages.hasMoreElements(); ) {
             XMLPackageDescription p = (XMLPackageDescription) enumPackages.nextElement();
@@ -586,44 +586,44 @@ public class PackageDescription implements TreeNode {
                 children.add(new PackageDescription(p, this));
             }
         }
-    }
-
+    }    
+    
     /**
      * sort according to the display sortkey
      */
-
+    
     private class PackageComparator implements Comparator {
         public int compare(Object w1, Object w2) {
             return ((PackageDescription) w1).dpySortKey - ((PackageDescription) w2).dpySortKey;
         }
     }
-
+    
     /**
      * implement a TreeNode interface for convenient travelling through the data
      */
-
+    
     private class PackageEnumeration implements Enumeration {
-
+    
         Enumeration e;
 
         protected PackageEnumeration() {
             e = children.elements();
-        }
+        }         
         public boolean hasMoreElements() {
             return e.hasMoreElements();
         }
         public Object nextElement() {
             return e.nextElement();
-        }
+        } 
     }
 
     /**
-     * TreeNode interface
+     * TreeNode interface 
      */
     public Enumeration children() {
         return new PackageEnumeration();
     }
-
+    
     public boolean getAllowsChildren() {
         return true;
     }
@@ -639,11 +639,11 @@ public class PackageDescription implements TreeNode {
     public int getChildCount() {
         return children.size();
     }
-
+    
     public int getIndex(TreeNode node) {
         return children.indexOf(node);
     }
-
+    
 //    public PackageDescription getParent() {
 //        return parent;
 //    }
@@ -655,5 +655,5 @@ public class PackageDescription implements TreeNode {
     public boolean isLeaf() {
         return children.size() == 0;
     }
-
+    
 }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/ProductDescription.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/ProductDescription.java
index e5933a996834..f2bdc6161964 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/ProductDescription.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/ProductDescription.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,31 +40,31 @@ import java.util.regex.Pattern;
  * @author Christof Pintaske
  */
 public class ProductDescription {
-
+    
     private class Pair {
         public Pattern search;
         public String  replacement;
-
+        
         public Pair(Pattern key, String value) {
             search      = key;
             replacement = value;
         }
     }
-
+    
     private Vector macro;   /* macro list with precompiled regex patterns */
     private HashMap map;    /* conventional key-value pairs */
     private String backslashText = "THIS_IS_A_BACKSLASH";
-
-    /**
+    
+    /** 
      * read properties from package description data
      */
-
+ 
     protected ProductDescription(XMLPackageDescription descriptionData) {
         macro = new Vector();
         map   = new HashMap();
         parse(descriptionData);
      }
-
+    
     /**
      * retrieve information about general installation properties
      */
@@ -104,21 +104,21 @@ public class ProductDescription {
             System.out.println("Key: " + pair.search.pattern() + " Value: " + pair.replacement );
         }
     }
-
+    
     public String get(String key) {
         return (String) map.get(key);
     }
 
     private boolean doMaskBackslash(String[] arr) {
         boolean changed = false;
-
+        
         int index = arr[0].indexOf('\\');
         if ( index >= 0 ) {
             arr[0] = arr[0].replaceAll("\\", backslashText);
             // arr[0] = arr[0].replace("\\", backslashText);
             changed = true;
         }
-
+        
         return changed;
     }
 
@@ -129,9 +129,9 @@ public class ProductDescription {
     }
 
     public String replaceMacros(String s) {
-
+        
         String result = s;
-
+        
         for (int i = 0; i < macro.size(); i++) {
             Pair pair = (Pair) macro.get(i);
             Pattern pattern = pair.search;
@@ -152,13 +152,13 @@ public class ProductDescription {
 
         return result;
     }
-
+    
     /**
      * parse the wrapped package description
      */
-
+    
     private void parse(XMLPackageDescription data) {
-
+        
         XMLPackageDescription section;
 
         /* product description is a leaf at the root */
@@ -167,7 +167,7 @@ public class ProductDescription {
             if (section != null) {
                 parse(section);
             }
-        } else {
+        } else {       
             InstallData installData = InstallData.getInstance();
 
             /* check for a default installation directory */
@@ -176,8 +176,8 @@ public class ProductDescription {
                 String value = section.getValue();
                 if (value != null) {
                     installData.setDefaultDir(value);
-                    // installData.setInstallDir(value);
-                }
+                    // installData.setInstallDir(value); 
+                }            
             }
 
             /* check for a default product directory */
@@ -186,7 +186,7 @@ public class ProductDescription {
                 String value = section.getValue();
                 if (value != null) {
                     installData.setProductDir(value);
-                }
+                }            
             }
 
             /* check for the package format of this installation set */
@@ -195,7 +195,7 @@ public class ProductDescription {
                 String value = section.getValue();
                 if (value != null) {
                     installData.setPackageFormat(value);
-                }
+                }            
             }
 
             /* check for the package directory of this installation set */
@@ -204,7 +204,7 @@ public class ProductDescription {
                 String value = section.getValue();
                 if ((value != null) && (! value.equals(""))) {
                     installData.setPackageSubdir(value);
-                }
+                }            
             }
 
             /* check for the architecture of this installation set */
@@ -213,7 +213,7 @@ public class ProductDescription {
                 String value = section.getValue();
                 if ((value != null) && (! value.equals(""))) {
                     installData.setArchitecture(value);
-                }
+                }            
             }
 
            section = data.getElement("multilingual");
@@ -222,7 +222,7 @@ public class ProductDescription {
                 if ((value != null) && (! value.equals(""))) {
                     boolean multilingualValue = Parser.parseBoolean(value);
                     installData.setIsMultiLingual(multilingualValue);
-                }
+                }            
             }
 
             /* check for the update behaviour of this installation set */
@@ -243,7 +243,7 @@ public class ProductDescription {
                 if (value != null) {
                     int intValue = Integer.parseInt(value);
                     installData.setProductMinor(intValue);
-                }
+                }            
             }
 
             section = data.getElement("hideeula");
@@ -252,7 +252,7 @@ public class ProductDescription {
                 if ((value != null) && (! value.equals(""))) {
                     boolean hideeulaValue = Parser.parseBoolean(value);
                     installData.setHideEula(hideeulaValue);
-                }
+                }            
             }
 
             /* check for any macro definitions */
@@ -261,7 +261,7 @@ public class ProductDescription {
                 if (p.getKey().equals("macro")) {
                     String  key     = p.getAttribute("key");
                     String  value   = p.getValue();
-
+                                        
                     if ((key != null) && (value != null)) {
                         String  match   = "\\$\\{" + key + "\\}";
                         Pattern pattern = Pattern.compile(match, Pattern.CASE_INSENSITIVE);
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/SetupDataProvider.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/SetupDataProvider.java
index 55b6b06a86e0..f83657cd6b64 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/SetupDataProvider.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/SetupDataProvider.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,7 +74,7 @@ public class SetupDataProvider {
         DefaultMutableTreeNode node = new DefaultMutableTreeNode();
 
         node.setUserObject(new DisplayPackageDescription(data));
-
+        
         for (Enumeration e = data.children(); e.hasMoreElements(); ) {
             PackageDescription child = (PackageDescription) e.nextElement();
 
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/XMLPackageDescription.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/XMLPackageDescription.java
index ab7aef57b526..c660e43d3454 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/XMLPackageDescription.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/XMLPackageDescription.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
@@ -48,25 +48,25 @@ public class XMLPackageDescription {
      * fill the package description tree by handling the SAXParser events
      */
     private class PackageDescriptionHandler extends DefaultHandler {
-
+        
         private XMLPackageDescription root;
         private Stack stack;
-
+        
         public PackageDescriptionHandler(XMLPackageDescription base) {
             root  = base;
             stack = new Stack();
         }
-
+        
         private PackageDescriptionHandler() {
             /* forbidden */
         }
-
+        
         public XMLPackageDescription getDescription() {
             return root;
         }
-
+        
         /* implement the DefaultHandler interface */
-
+        
         public void characters(char[] ch, int start, int length) {
             XMLPackageDescription entity = (XMLPackageDescription) stack.peek();
             entity.value = entity.value == null ? new String(ch, start, length)
@@ -81,12 +81,12 @@ public class XMLPackageDescription {
         public void startElement(String uri, String localName, String qName, Attributes attributes) {
             XMLPackageDescription parent = (XMLPackageDescription) stack.peek();
             XMLPackageDescription entity = new XMLPackageDescription();
-
+            
             entity.key = qName;
             for (int i = 0; i < attributes.getLength(); i++) {
                 entity.attributes.put(attributes.getQName(i), attributes.getValue(i));
             }
-
+            
             parent.add(entity);
             stack.push(entity);
         }
@@ -106,11 +106,11 @@ public class XMLPackageDescription {
             System.err.println("Warning:" + e);
         }
     }
-
+    
     /**
      * general storage for XML elements
      */
-
+    
     private String key;             /* XML element name       */
     private String value;           /* XML element characters */
     private Hashtable attributes;   /* XML element attributes */
@@ -122,11 +122,11 @@ public class XMLPackageDescription {
         attributes = new Hashtable();
         children   = new Vector();
     }
-
+    
     private void add(XMLPackageDescription p) {
         children.add(p);
     }
-
+    
     /**
      * helper routines to find content information
      */
@@ -134,12 +134,12 @@ public class XMLPackageDescription {
         return key;
     }
     protected String getAttribute(String key) {
-        return (String) attributes.get(key);
+        return (String) attributes.get(key);        
     }
     protected String getValue() {
         return value;
     }
-    protected XMLPackageDescription getElement(String key) {
+    protected XMLPackageDescription getElement(String key) {        
         return getElement(key, null, null);
     }
     protected XMLPackageDescription getElement(String key, String attrKey, String attrValue) {
@@ -165,7 +165,7 @@ public class XMLPackageDescription {
 
         if ((self != null) && self.equals(name))
             return this;
-
+        
         XMLPackageDescription found = null;
         for (Enumeration e = children.elements(); e.hasMoreElements();) {
             XMLPackageDescription child = (XMLPackageDescription) e.nextElement();
@@ -175,24 +175,24 @@ public class XMLPackageDescription {
                     break;
                 }
             }
-        }
+        }        
         return found;
     }
-
-    /**
+    
+    /** 
      * adjust the tree so that all children have a matching parent and not just
      * the ones they got by reading files in random order
      */
-    private void adjust(XMLPackageDescription root) {
+    private void adjust(XMLPackageDescription root) {        
         String self = (String) attributes.get("name");
-
+        
         for (int i = children.size() - 1; i >= 0; --i) {
             XMLPackageDescription child = (XMLPackageDescription) children.elementAt(i);
             String childParentName = child.getAttribute("parent");
             if (childParentName != null) {
-
+                
                 child.adjust(root);
-
+                
                 if ((childParentName != null) && (childParentName.length() > 0) && (! childParentName.equals(self))) {
                     XMLPackageDescription newParent = root.findPackage(childParentName);
                     if (newParent != null) {
@@ -203,10 +203,10 @@ public class XMLPackageDescription {
             }
         }
     }
-
+    
     protected void read() {
         PackageDescriptionHandler handler = new PackageDescriptionHandler(this);
-
+        
         try {
             SAXParserFactory factory = SAXParserFactory.newInstance();
             SAXParser parser = factory.newSAXParser();
@@ -236,36 +236,36 @@ public class XMLPackageDescription {
         } catch (SAXException ex) {
             ex.printStackTrace();
         }
-
+        
         adjust(this);
     }
-
+    
     /* provide an iterator through the children */
     protected class Elements implements Enumeration {
-
+        
         Enumeration e;
 
         protected Elements() {
             e = children.elements();
-        }
+        }         
         public boolean hasMoreElements() {
             return e.hasMoreElements();
         }
         public Object nextElement() {
             return e.nextElement();
-        }
+        }     
     }
-
+    
     protected Enumeration elements() {
         return new Elements();
     }
-
-
+    
+    
     // FIXME: remove it, dump() is for testing only
     public void dump() {
         dump("");
     }
-
+    
     // FIXME: remove it, dump(String) is for testing only
     public void dump(String indent) {
         final String space = "    ";
@@ -280,7 +280,7 @@ public class XMLPackageDescription {
         if (key != null) {
             System.out.print(">");
         }
-
+        
         if ((value != null) && (value.length() > 0)) {
             String trimmedValue = value.trim();
             if (trimmedValue.length() > 60) {
@@ -290,7 +290,7 @@ public class XMLPackageDescription {
                 System.out.print(trimmedValue);
             }
         }
-
+        
         for (Enumeration e = children.elements() ; e.hasMoreElements() ;) {
             XMLPackageDescription current = (XMLPackageDescription) e.nextElement();
             System.out.println();
@@ -301,7 +301,7 @@ public class XMLPackageDescription {
             System.out.print(indent);
         }
         if (key != null) {
-           System.out.print("</" + key + ">");
+           System.out.print("</" + key + ">"); 
         }
     }
 }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupFrame.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupFrame.java
index 98b7e0a1b7fc..49467eb6c93a 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupFrame.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupFrame.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,7 +51,7 @@ public class SetupFrame extends WindowAdapter {
     String StringFinish;
     String StringHelp;
     String StringAppTitle;
-
+    
     Icon   IconStarOffice;
 
     public static final String ACTION_NEXT      = "ActionNext";
@@ -64,7 +64,7 @@ public class SetupFrame extends WindowAdapter {
     public static final int CODE_OK         = 0;
     public static final int CODE_CANCEL     = 1;
     public static final int CODE_ERROR      = 2;
-
+     
     public static final int BUTTON_NEXT     = 1;
     public static final int BUTTON_PREVIOUS = 2;
     public static final int BUTTON_CANCEL   = 3;
@@ -79,9 +79,9 @@ public class SetupFrame extends WindowAdapter {
 
     private JPanel      mCardPanel;
     private CardLayout  mCardLayout;
-
+    
     private SetupActionListener mActionListener;
-    private DeckOfPanels        mDeck;
+    private DeckOfPanels        mDeck; 
 
     public SetupFrame() {
 
@@ -90,41 +90,41 @@ public class SetupFrame extends WindowAdapter {
         StringCancel     = ResourceManager.getString("String_Cancel");
         StringFinish     = ResourceManager.getString("String_Finish");
         StringHelp       = ResourceManager.getString("String_Help");
-
+        
         InstallData data = InstallData.getInstance();
         if ( data.isInstallationMode() ) {
-            StringAppTitle   = ResourceManager.getString("String_ApplicationTitle");
+            StringAppTitle   = ResourceManager.getString("String_ApplicationTitle");        
         } else {
-            StringAppTitle   = ResourceManager.getString("String_ApplicationTitleUninstallation");
+            StringAppTitle   = ResourceManager.getString("String_ApplicationTitleUninstallation");            
         }
-
+        
         // The setup icon has to be flexible for customization, not included into the jar file
         File iconFile = data.getInfoRoot("images");
         iconFile = new File(iconFile, "Setup.gif");
         IconStarOffice   = ResourceManager.getIconFromPath(iconFile);
-
+           
         mActionListener = new SetupActionListener(this);
-        mDeck           = new DeckOfPanels();
-
+        mDeck           = new DeckOfPanels(); 
+        
         mDialog = new JDialog();
         mDialog.setTitle(StringAppTitle);
         initFrame();
     }
-
+    
     public void addPanel(PanelController panel, String name) {
         mCardPanel.add(panel.getPanel(), name);
         panel.setSetupFrame(this);
         mDeck.addPanel(panel, name);
-    }
-
+    }  
+   
     public PanelController getCurrentPanel() {
         return mDeck.getCurrentPanel();
     }
-
+ 
     public void setCurrentPanel(String name, boolean ignoreRepeat, boolean isNext) {
         if (name == null)
             close(CODE_ERROR);
-
+        
         PanelController panel = mDeck.getCurrentPanel();
         boolean repeatDialog = false;
         if (panel != null) {
@@ -136,11 +136,11 @@ public class SetupFrame extends WindowAdapter {
                 repeatDialog = false;
             }
         }
-
+            
         if ( repeatDialog ) {
             name = panel.getName();
         }
-
+        
         panel = mDeck.setCurrentPanel(name);
         if (panel != null)
         {
@@ -158,7 +158,7 @@ public class SetupFrame extends WindowAdapter {
         setButtonText(StringPrevious,   BUTTON_PREVIOUS);
         // setButtonEnabled((panel.getPrevious() != null), BUTTON_PREVIOUS);
         // setButtonEnabled((panel.getNext() != null),     BUTTON_CANCEL);
-        if (panel.getNext() == null) {
+        if (panel.getNext() == null) {   
             setButtonText(StringFinish, BUTTON_NEXT);
         } else {
             setButtonText(StringNext,   BUTTON_NEXT);
@@ -200,23 +200,23 @@ public class SetupFrame extends WindowAdapter {
             case BUTTON_HELP:       mHelpButton.setIcon(null);           break;
         }
     }
-
+    
     public SetupActionListener getSetupActionListener() {
         return mActionListener;
     }
-
+            
     void close(int code) {
         mDialog.dispose();
     }
-
+    
     public JDialog getDialog() {
         return mDialog;
     }
-
+    
     public int showFrame() {
         mDialog.pack();
         mDialog.setLocationRelativeTo(null);
-        mDialog.setModal(true);
+        mDialog.setModal(true);    
         mDialog.setResizable(false);
         // mDialog.setMinimumSize(new Dimension(679, 459));
         mDialog.setVisible(true);
@@ -224,27 +224,27 @@ public class SetupFrame extends WindowAdapter {
 
         return 0;
     }
-
+    
     private void initFrame() {
 
         mDialog.getContentPane().setLayout(new BorderLayout());
-
-        mCardLayout = new CardLayout();
+        
+        mCardLayout = new CardLayout(); 
         mCardPanel  = new JPanel();
-        mCardPanel.setBorder(new EmptyBorder(new Insets(5, 10, 5, 10)));
+        mCardPanel.setBorder(new EmptyBorder(new Insets(5, 10, 5, 10)));       
         mCardPanel.setLayout(mCardLayout);
-
+        
         mPreviousButton = new JButton();
         mNextButton     = new JButton();
         mCancelButton   = new JButton();
-        mHelpButton     = new JButton();
-
+        mHelpButton     = new JButton();       
+ 
         mPreviousButton.setHorizontalTextPosition(JButton.RIGHT);
         mNextButton.setHorizontalTextPosition(JButton.LEFT);
-
+        
         mPreviousButton.setIcon(ResourceManager.getIcon("Icon_Previous"));
         mNextButton.setIcon(ResourceManager.getIcon("Icon_Next"));
-
+        
         mPreviousButton.setActionCommand(ACTION_PREVIOUS);
         mNextButton.setActionCommand(ACTION_NEXT);
         mCancelButton.setActionCommand(ACTION_CANCEL);
@@ -254,7 +254,7 @@ public class SetupFrame extends WindowAdapter {
         mNextButton.addActionListener(mActionListener);
         mCancelButton.addActionListener(mActionListener);
         mHelpButton.addActionListener(mActionListener);
-
+        
         InstallData data = InstallData.getInstance();
 
         if (data.useRtl()) {
@@ -263,9 +263,9 @@ public class SetupFrame extends WindowAdapter {
             mCancelButton.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT);
             mHelpButton.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT);
         }
-
+        
         Box ButtonBox   = new Box(BoxLayout.X_AXIS);
-        ButtonBox.setBorder(new EmptyBorder(new Insets(5, 10, 5, 10)));
+        ButtonBox.setBorder(new EmptyBorder(new Insets(5, 10, 5, 10)));       
         ButtonBox.add(mPreviousButton);
         ButtonBox.add(Box.createHorizontalStrut(10));
         ButtonBox.add(mNextButton);
@@ -276,14 +276,14 @@ public class SetupFrame extends WindowAdapter {
         if (data.useRtl()) {
             ButtonBox.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT);
         }
-
+        
         JPanel ButtonPanel = new JPanel();
         JSeparator Separator = new JSeparator();
         ButtonPanel.setLayout(new BorderLayout());
         ButtonPanel.setPreferredSize(new Dimension(612, 44));
         ButtonPanel.add(Separator, BorderLayout.NORTH);
         ButtonPanel.add(ButtonBox, java.awt.BorderLayout.EAST);
-
+ 
         JPanel IconPanel = new JPanel();
         JLabel Icon = new JLabel();
         Icon.setIcon(IconStarOffice);
@@ -291,10 +291,10 @@ public class SetupFrame extends WindowAdapter {
 //        IconPanel.setBorder(new EmptyBorder(new Insets(10, 10, 10, 10)));
         IconPanel.setLayout(new BorderLayout());
         IconPanel.add(Icon);
-
+        
         mDialog.getContentPane().add(ButtonPanel, java.awt.BorderLayout.SOUTH);
         mDialog.getContentPane().add(mCardPanel, java.awt.BorderLayout.CENTER);
-        mDialog.getContentPane().add(IconPanel, java.awt.BorderLayout.WEST);
+        mDialog.getContentPane().add(IconPanel, java.awt.BorderLayout.WEST); 
     }
 
 }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/AbortInstaller.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/AbortInstaller.java
index 7df874a31fbc..88fe3e38255b 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/AbortInstaller.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/AbortInstaller.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,13 +31,13 @@ import org.openoffice.setup.InstallData;
 import java.util.Vector;
 
 public class AbortInstaller {
-
+    
     private AbortInstaller() {
     }
 
     static public void abortInstallProcess() {
         InstallData installData = InstallData.getInstance();
-        installData.setIsAbortedInstallation(true);
+        installData.setIsAbortedInstallation(true);      
 
         if ( installData.isInstallationMode() ) {
             String log = "<b>Installation was aborted</b><br>";
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Calculator.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Calculator.java
index 2042cc738c52..18726b4dde60 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Calculator.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Calculator.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 org.openoffice.setup.InstallData;
 import org.openoffice.setup.ResourceManager;
 
 public class Calculator {
-
+    
     private Calculator() {
     }
 
@@ -46,7 +46,7 @@ public class Calculator {
             int size = packageData.getSize();
             value = value + size;
         }
-
+            
         return value;
     }
 
@@ -56,13 +56,13 @@ public class Calculator {
         if ( required < available ) {
             missingDiscSpace = false;
         }
-
+        
         // missingDiscSpace = true; // for testing reasons
         return missingDiscSpace;
     }
 
     static public boolean notEnoughDiscSpace(InstallData data) {
-
+        
         Vector installPackages = data.getInstallPackages();
         // Calculate size of selected modules
         int installationSize = calculateInstallSize(installPackages);
@@ -81,7 +81,7 @@ public class Calculator {
             String title = ResourceManager.getString("String_Error");
             Informer.showErrorMessage(message, title);
         }
-
+        
         return insufficientDiscSpace;
     }
 
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Controller.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Controller.java
index bbca464fd72a..37b56ca1eb90 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Controller.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Controller.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,7 +35,7 @@ import org.openoffice.setup.SetupData.SetupDataProvider;
 import org.openoffice.setup.Util.LogManager;
 
 public class Controller {
-
+    
     private Controller() {
     }
 
@@ -52,12 +52,12 @@ public class Controller {
     static public void checkPackageFormat(InstallData installData) {
         String packageFormat = installData.getPackageFormat();
         String os = installData.getOSType();
-
+        
         boolean notSupportedPackageFormat = true;
-
+        
         // Show warnings for currently not supported combinations of OS and package format.
         // This has to be adapted if further OS or package formats are supported.
-
+        
         if (( os.equalsIgnoreCase("SunOS") ) && ( packageFormat.equalsIgnoreCase("pkg") )) {
             notSupportedPackageFormat = false;
         }
@@ -65,9 +65,9 @@ public class Controller {
         if (( os.equalsIgnoreCase("Linux") ) && ( packageFormat.equalsIgnoreCase("rpm") )) {
             notSupportedPackageFormat = false;
         }
-
+        
         // Inform user about not supported package format and exit program
-
+        
         if ( notSupportedPackageFormat ) {
             System.err.println("Error: Package format not supported by this OS!");
             String mainmessage = ResourceManager.getString("String_Packageformat_Not_Supported");
@@ -94,16 +94,16 @@ public class Controller {
         pkgCommandArray[0] = "locale";
         pkgCommandArray[1] = "-a";
         returnValue = ExecuteProcess.executeProcessReturnVector(pkgCommandArray, returnVector, returnErrorVector);
-
+        
         if ( returnValue == 0 ) {
             log = pkgCommand + "<br><b>Returns: " + returnValue + " Successful command</b><br>";
-            LogManager.addCommandsLogfileComment(log);
+            LogManager.addCommandsLogfileComment(log);                        
 
             // System.err.println("Available languages 1: ");
             // for (int i = 0; i < returnVector.size(); i++) {
             //     System.err.println(returnVector.get(i));
             // }
-
+            
             // Collecting "en-US" instead of "en-US.UTF8"
             Vector realVector = new Vector();
 
@@ -115,7 +115,7 @@ public class Controller {
                 }
                 if ( ! realVector.contains(oneLang)) {
                     realVector.add(oneLang);
-                }
+                }            
             }
 
             // System.err.println("Available languages 2: ");
@@ -124,7 +124,7 @@ public class Controller {
             // }
 
             installData.setSystemLanguages(realVector);
-        } else {    // an error occured
+        } else {    // an error occured                    
             log = pkgCommand + "<br><b>Returns: " + returnValue + " An error occured</b><br>";
             LogManager.addCommandsLogfileComment(log);
             System.err.println("Error in command: " + pkgCommand);
@@ -132,7 +132,7 @@ public class Controller {
                 LogManager.addCommandsLogfileComment((String)returnErrorVector.get(i));
                 System.err.println(returnErrorVector.get(i));
             }
-        }
+        }    	
     }
 
     static public boolean createdSubDirectory(String dir) {
@@ -156,11 +156,11 @@ public class Controller {
             Informer.showErrorMessage(message, title);
             errorShown = true;
         }
-
+                
         if ( SystemManager.exists_directory(testDir.getPath()) ) {
             testDir.delete();
         }
-
+        
         return createdDirectory;
     }
 
@@ -174,16 +174,16 @@ public class Controller {
             // title = ResourceManager.getString("String_Error");
             // Informer.showErrorMessage(message, title);
         }
-
+        
         if ( ! createdDirectory ) {
             String message = ResourceManager.getString("String_ChooseDirectory_No_Success") + ": " + dir;
             String title = ResourceManager.getString("String_Error");
             Informer.showErrorMessage(message, title);
         }
-
+        
         return createdDirectory;
     }
-
+    
     static public boolean reducedRootWritePrivileges() {
         Vector vec = new Vector();
         File dir = new File("/usr");
@@ -196,7 +196,7 @@ public class Controller {
         // Check for zones. If "zonename" is successful and the name is not "global",
         // this is a "sparse zone".
         // Alternative: Simply always check, if root has write access in selected directories.
-
+        
         for (int i = 0; i < vec.size(); i++) {
             File directory = (File)vec.get(i);
             if ( directory.exists() ) {
@@ -210,32 +210,32 @@ public class Controller {
                     restrictedWritePrivilges = true;
                     System.err.println("Restricted Root privileges. No write access in " + directory.getPath());
                     break;
-                }
+                } 
             }
         }
-
+        
         return restrictedWritePrivilges;
     }
-
+    
     static public void checkForNewerVersion(InstallData installData) {
         LogManager.setCommandsHeaderLine("Checking change installation");
         InstallChangeCtrl.checkInstallChange(installData);
-
+                
         if ( installData.newerVersionExists() ) {
             // Inform user about a newer version installed
             SetupDataProvider.setNewMacro("DIR", installData.getInstallDefaultDir()); // important for string replacement
 
             System.err.println("Error: A newer version is already installed in " + installData.getInstallDefaultDir() + " !");
-            String message1 = ResourceManager.getString("String_Newer_Version_Installed_Found")
+            String message1 = ResourceManager.getString("String_Newer_Version_Installed_Found") 
                             + "\n" + installData.getInstallDefaultDir() + "\n";
             String message2 = ResourceManager.getString("String_Newer_Version_Installed_Remove");
             String message = message1 + "\n" + message2;
             String title = ResourceManager.getString("String_Error");
             Informer.showErrorMessage(message, title);
-            System.exit(1);
+            System.exit(1);                   
         }
     }
-
+    
     static public void checkForUidFile(InstallData installData) {
         // check existence of getuid.so
         File getuidFile = Controller.findUidFile(installData);
@@ -262,12 +262,12 @@ public class Controller {
 
             if ( getuidpath != null ) {
                 getuidFile = new File(getuidpath);
-
+                
                 if (( getuidFile.isDirectory() ) && ( ! getuidFile.isFile() )) {
                     // Testing, if GETUID_PATH only contains the path, not the filename
                     String defaultfilename = "getuid.so";
                     getuidFile = new File(getuidpath, defaultfilename);
-
+                    
                     if ( ! getuidFile.exists() ) {
                         getuidFile = null;
                     }
@@ -284,7 +284,7 @@ public class Controller {
         } else {
             getuidFile = new File(data.getGetUidPath());
         }
-
+        
         return getuidFile;
     }
 
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Converter.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Converter.java
index 411351b1139d..d83499338a62 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Converter.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Converter.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.util.Map;
 import java.util.Vector;
 
 public class Converter {
-
+    
     private Converter() {
     }
 
@@ -44,7 +44,7 @@ public class Converter {
 
         Iterator m = map.entrySet().iterator();
         int counter = 0;
-
+        
         while ( m.hasNext() ) {
             Map.Entry entry = (Map.Entry) m.next();
             String env = entry.getKey() + "=" + entry.getValue();
@@ -54,14 +54,14 @@ public class Converter {
 
         return myStringArray;
     }
-
+    
     static public HashMap convertVectorToHashmap(Vector vec) {
         HashMap map = new HashMap();
 
         for (int i = 0; i < vec.size(); i++) {
             String key = null;
             String value = null;
-
+            
             String line = (String)vec.get(i);
             int position = line.indexOf("=");
             if ( position > -1 ) {
@@ -69,12 +69,12 @@ public class Converter {
                 value = line.substring(position + 1, line.length());
             } else {
                 key = line;
-                value = null;
+                value = null;                
             }
-
+            
             map.put(key, value);
         }
-
+        
         return map;
     }
 
@@ -82,7 +82,7 @@ public class Converter {
         Vector vec = new Vector();
 
         Iterator m = hash.entrySet().iterator();
-
+        
         while ( m.hasNext() ) {
             Map.Entry entry = (Map.Entry) m.next();
             String line = entry.getKey() + "=" + entry.getValue();
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/DialogFocusTraversalPolicy.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/DialogFocusTraversalPolicy.java
index ae9950841968..8ab47a819a13 100644
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/DialogFocusTraversalPolicy.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/DialogFocusTraversalPolicy.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,30 +31,30 @@ import java.awt.FocusTraversalPolicy;
 import javax.swing.JComponent;
 
 public class DialogFocusTraversalPolicy extends FocusTraversalPolicy {
-
+    
     private JComponent order[];
     private java.util.List list;
-
+    
     public DialogFocusTraversalPolicy(JComponent _order[]) {
         order = _order;
         list = java.util.Arrays.asList(order);
     }
 
-    public java.awt.Component getFirstComponent(java.awt.Container focusCycleRoot) {
+    public java.awt.Component getFirstComponent(java.awt.Container focusCycleRoot) { 
         return order[0];
-    }
+    } 
 
-    public java.awt.Component getLastComponent(java.awt.Container focusCycleRoot) {
+    public java.awt.Component getLastComponent(java.awt.Container focusCycleRoot) { 
         return order[order.length - 1];
     }
 
     public java.awt.Component getComponentAfter(java.awt.Container focusCycleRoot, java.awt.Component aComponent) {
-        int index = 0,x = -1;
-        index = list.indexOf(aComponent);
+        int index = 0,x = -1; 
+        index = list.indexOf(aComponent); 
         index++; // increasing automatically
-        if(!order[index % order.length].isEnabled() ||
+        if(!order[index % order.length].isEnabled() || 
            !order[index % order.length].isVisible()) {
-            x = index;
+            x = index; 
             index = -1;
             for (; x != order.length; x++) {
                 if(order[x].isEnabled() && order[x].isVisible()) {
@@ -62,9 +62,9 @@ public class DialogFocusTraversalPolicy extends FocusTraversalPolicy {
                     break;
                 }
             }
-            if(index == -1) {
-                x = list.indexOf(aComponent);
-                for(int y = 0; y <= x; y++) {
+            if(index == -1) { 
+                x = list.indexOf(aComponent); 
+                for(int y = 0; y <= x; y++) { 
                     if(order[y].isEnabled() && order[x].isVisible()) {
                         index = y;
                         break;
@@ -72,26 +72,26 @@ public class DialogFocusTraversalPolicy extends FocusTraversalPolicy {
                 }
             }
         }
-        return order[ index % order.length];
+        return order[ index % order.length]; 
     }
 
     public java.awt.Component getComponentBefore(java.awt.Container focusCycleRoot, java.awt.Component aComponent) {
-        int index = list.indexOf(aComponent), x = -1;
+        int index = list.indexOf(aComponent), x = -1; 
         index--;
         if(!order[(index + order.length) % order.length].isEnabled() ||
            !order[(index + order.length) % order.length].isVisible()) {
-            x = index;
-            index = -1;
-            for(; x >= 0; x--) {
-                if(order[x].isEnabled() && order[x].isVisible()) {
+            x = index; 
+            index = -1; 
+            for(; x >= 0; x--) { 
+                if(order[x].isEnabled() && order[x].isVisible()) { 
                     index = x;
                     break;
                 }
             }
-            // if nothing has changed
+            // if nothing has changed 
             if(index == -1) {
                 x = list.indexOf(aComponent);
-                for(int y = order.length -1; y >= x; y--) {
+                for(int y = order.length -1; y >= x; y--) { 
                     if(order[y].isEnabled() && order[x].isVisible()) {
                         index = y;
                         break;
@@ -99,14 +99,14 @@ public class DialogFocusTraversalPolicy extends FocusTraversalPolicy {
                 }
             }
         }
-        return order[ (index + order.length) % order.length];
+        return order[ (index + order.length) % order.length]; 
     }
 
-    public java.awt.Component getDefaultComponent(java.awt.Container focusCycleRoot) {
+    public java.awt.Component getDefaultComponent(java.awt.Container focusCycleRoot) { 
         return order[0];
     }
 
-    public java.awt.Component getInitialComponent(java.awt.Window window) {
+    public java.awt.Component getInitialComponent(java.awt.Window window) { 
         return order[0];
     }
 
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Dumper.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Dumper.java
index 3024b0f1a676..38027dd5826c 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Dumper.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Dumper.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,12 +37,12 @@ import java.util.Vector;
 
 
 public class Dumper {
-
+    
     private Dumper() {
     }
 
     static public void dumpPackageSettings(PackageDescription packageData) {
-
+ 
         if ( packageData.isLeaf() ) {
             System.out.println("Name: " + packageData.getName() +
                                " State: " + packageData.getSelectionState()  +
@@ -51,29 +51,29 @@ public class Dumper {
             System.out.println("Nod-Name: " + packageData.getName() +
                                " State: " + packageData.getSelectionState());
         }
-
+        
         for (Enumeration e = packageData.children(); e.hasMoreElements(); ) {
             PackageDescription child = (PackageDescription) e.nextElement();
             dumpPackageSettings(child);
-        }
+        }      
 
     }
 
     static public void dumpModuleStates(PackageDescription packageData) {
 
-        System.err.println("Name: " + packageData.getName() +
+        System.err.println("Name: " + packageData.getName() + 
                            " State: " + packageData.getSelectionState() +
                            " " + packageData.getPackageName());
 
         for (Enumeration e = packageData.children(); e.hasMoreElements(); ) {
             PackageDescription child = (PackageDescription) e.nextElement();
             dumpModuleStates(child);
-        }
+        }        
     }
-
+    
     static private String getStateString(int state) {
         String stateString = null;
-
+        
         if ( state == 0 ) {
             stateString = "DONT_INSTALL";
         } else if ( state == 1 ) {
@@ -100,76 +100,76 @@ public class Dumper {
     static private void logModuleStatesHelper(PackageDescription packageData) {
         int state = packageData.getSelectionState();
         String stateStr = getStateString(state);
-
-        LogManager.addModulesLogfileComment("Name: " + packageData.getName() +
+        
+        LogManager.addModulesLogfileComment("Name: " + packageData.getName() + 
                            " State: " + stateStr +
                            " " + packageData.getPackageName());
 
-        // System.err.println("Name: " + packageData.getName() +
+        // System.err.println("Name: " + packageData.getName() + 
         //                    " State: " + stateStr +
         //                    " " + packageData.getPackageName());
-
+        
         for (Enumeration e = packageData.children(); e.hasMoreElements(); ) {
             PackageDescription child = (PackageDescription) e.nextElement();
             logModuleStatesHelper(child);
-        }
+        }        
     }
 
     static public void logModuleStates(PackageDescription packageData, String text) {
         LogManager.setModulesLogFileHeaderLine(text);
         logModuleStatesHelper(packageData);
     }
-
+    
     static public void logPackagesToInstall(Vector packages, String text) {
         PackageDescription packageData = null;
         LogManager.setModulesLogFileHeaderLine(text);
         for (int i = 0; i < packages.size(); i++) {
             packageData = (PackageDescription)packages.get(i);
-            LogManager.addModulesLogfileComment("Name: " + packageData.getName() +
+            LogManager.addModulesLogfileComment("Name: " + packageData.getName() + 
                                                 " " + packageData.getPackageName());
-        }
+        }    
     }
 
     static public void dumpInstallPackages(PackageDescription packageData) {
-
+ 
         if (( packageData.isLeaf() ) && ( packageData.getSelectionState() == packageData.INSTALL )) {
             System.out.println("Now installing: " + packageData.getPackageName());
         }
-
+        
         for (Enumeration e = packageData.children(); e.hasMoreElements(); ) {
             PackageDescription child = (PackageDescription) e.nextElement();
             dumpInstallPackages(child);
         }
     }
-
+    
     static public void dumpUninstallPackages(PackageDescription packageData) {
-
+ 
         if (( packageData.isLeaf() ) && ( packageData.getSelectionState() == packageData.REMOVE )) {
             System.out.println("Now uninstalling: " + packageData.getPackageName());
         }
-
+        
         for (Enumeration e = packageData.children(); e.hasMoreElements(); ) {
             PackageDescription child = (PackageDescription) e.nextElement();
             dumpUninstallPackages(child);
         }
     }
-
+    
     static public void dumpAllRpmInfo(PackageDescription packageData) {
 
         if (( packageData.getPackageName() != null ) && ( ! packageData.getPackageName().equals(""))) {
             if ( packageData.pkgExists() ) {
                 System.err.println("RPM data: " + packageData.getPkgRealName() + " : " +
                                                   packageData.getPkgVersion() + " : " +
-                                                  packageData.getPkgRelease() + " : " +
-                                                  packageData.getPackageName() );
+                                                  packageData.getPkgRelease() + " : " + 
+                                                  packageData.getPackageName() );            
             }
         }
 
         for (Enumeration e = packageData.children(); e.hasMoreElements(); ) {
             PackageDescription child = (PackageDescription) e.nextElement();
             dumpAllRpmInfo(child);
-        }
-
+        }        
+        
     }
 
     static public void dumpNewInstallData() {
@@ -181,7 +181,7 @@ public class Dumper {
         System.err.println("AdminFileNoRelocNoDepends: " + data.getAdminFileNameNoRelocNoDepends());
         System.err.println("DatabasePath: " + data.getDatabasePath());
         System.err.println("InstallDir: " + data.getInstallDir());
-        System.err.println("Original privileges: " + data.getStoredInstallationPrivileges());
+        System.err.println("Original privileges: " + data.getStoredInstallationPrivileges());        
         System.err.println("getuid.so File: " + data.getGetUidPath());
     }
 
@@ -191,12 +191,12 @@ public class Dumper {
         int size = properties.size();
         Iterator m = properties.entrySet().iterator();
         int counter = 0;
-
+        
         while ( m.hasNext() ) {
             Map.Entry entry = (Map.Entry) m.next();
             String env = entry.getKey() + "=" + entry.getValue();
             System.err.println(env);
-        }
+        }        
     }
 
 }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ExecuteProcess.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ExecuteProcess.java
index c86d4204fcc1..4bf3e6164c60 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ExecuteProcess.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ExecuteProcess.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.io.InputStreamReader;
 import java.util.Vector;
 
 public class ExecuteProcess {
-
+    
     private ExecuteProcess() {
     }
 
@@ -57,10 +57,10 @@ public class ExecuteProcess {
     static public int executeProcessReturnVector(String[] command, Vector returnVector, Vector returnErrorVector) {
         // usage of String arrays because of blanks in pathes
         int returnValue = -3;
-
+        
         try {
             Process p = Runtime.getRuntime().exec(command);
-
+            
             BufferedReader in = new BufferedReader(new InputStreamReader(p.getInputStream()));
             BufferedReader errorIn = new BufferedReader(new InputStreamReader(p.getErrorStream()));
             for ( String s; ( s = in.readLine()) != null; ) {
@@ -78,14 +78,14 @@ public class ExecuteProcess {
         } catch ( IOException ioe ) {
             System.err.println("IOError: " + ioe );
         }
-
+        
         return returnValue;
-    }
+    }            
 
     static public int executeProcessReturnVectorEnv(String[] command, String[] envP, Vector returnVector, Vector returnErrorVector) {
         // usage of String arrays because of blanks in pathes
         int returnValue = -3;
-
+        
         try {
             Process p = Runtime.getRuntime().exec(command, envP);
 
@@ -98,16 +98,16 @@ public class ExecuteProcess {
             for ( String t; ( t = errorIn.readLine()) != null; ) {
                 returnErrorVector.add(t);
             }
-
+            
             p.waitFor();
             returnValue = p.exitValue();
-
+            
         } catch ( InterruptedException ioe ) {
             System.err.println("Interrupted Exception Error: " + ioe );
         } catch ( IOException ioe ) {
             System.err.println("IOError: " + ioe );
         }
-
+        
         return returnValue;
     }
 
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/FileExtensionFilter.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/FileExtensionFilter.java
index 35a7c0b6dcbc..b8b94f7fe3c0 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/FileExtensionFilter.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/FileExtensionFilter.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 @@ import java.io.File;
 import java.io.FilenameFilter;
 
 public class FileExtensionFilter implements FilenameFilter {
-
+ 
     private String fileExtension;
 
     public FileExtensionFilter(String extension) {
@@ -40,7 +40,7 @@ public class FileExtensionFilter implements FilenameFilter {
             fileExtension = "." + fileExtension;
         }
     }
-
+        
     public boolean accept(File dir, String name) {
         if (name.endsWith(fileExtension)) {
             File candidate = new File(dir, name);
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InfoCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InfoCtrl.java
index d5e9023a821e..f24984e6600f 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InfoCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InfoCtrl.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,7 +34,7 @@ import java.util.Enumeration;
 import java.util.Vector;
 
 public class InfoCtrl {
-
+    
     private InfoCtrl() {
     }
 
@@ -45,7 +45,7 @@ public class InfoCtrl {
         else if ( position.equals("end")) {
             htmlInfoText = htmlInfoText + "</FONT></BODY></HTML>";
         }
-
+        
         return htmlInfoText;
     }
 
@@ -58,12 +58,12 @@ public class InfoCtrl {
         htmlInfoText = htmlInfoText + oneline + "<br>";
 
         return htmlInfoText;
-    }
-
+    }    
+    
     static public String setReadyToInstallInfoText(PackageDescription packageData, String htmlInfoText) {
         // setHtmlInfoText(packageData, 0);
         InstallData data = InstallData.getInstance();
-        if ( data.isInstallationMode() ) {
+        if ( data.isInstallationMode() ) {            
             htmlInfoText = setReadyToInstallInfoText(packageData, "", htmlInfoText);
         } else {
             htmlInfoText = setReadyToUninstallInfoText(packageData, "", htmlInfoText);
@@ -101,10 +101,10 @@ public class InfoCtrl {
                 htmlInfoText = setReadyToInstallInfoText(child, indent, htmlInfoText);
             }
         }
-
+        
         return htmlInfoText;
     }
-
+    
     // private void setReadyToUninstallInfoText(PackageDescription packageData, Integer indent, String htmlInfoText) {
     static private String setReadyToUninstallInfoText(PackageDescription packageData, String indent, String htmlInfoText) {
         // String spacer = "<spacer type=horizontal size=" + indent.toString() + ">";
@@ -153,7 +153,7 @@ public class InfoCtrl {
         }
 
         htmlInfoText = htmlInfoText + separatorline + "<br>";
-
+        
         htmlInfoText = LogManager.publishLogfileContent(htmlInfoText, separatorline);
         htmlInfoText = LogManager.publishCommandsLogfileContent(htmlInfoText);
 
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InfoDir.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InfoDir.java
index 97b3073c3c32..1c27e6c97206 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InfoDir.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InfoDir.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.io.File;
 import java.util.Vector;
 
 public class InfoDir {
-
+    
     private InfoDir() {
     }
 
@@ -41,12 +41,12 @@ public class InfoDir {
         InstallData data = InstallData.getInstance();
         File jarFile = data.getJarFilePath();
         String destFile = null;
-
+        
         if ( jarFile != null ) {
             String sourceDir = jarFile.getParent();
             File sourceFileFile = new File(sourceDir, fileName);
             String sourceFile = sourceFileFile.getPath();
-
+            
             // String jarFileName = jarFile.getName();
             File destDir = new File(data.getInstallDefaultDir(), data.getProductDir());
             File destFileFile = new File(destDir, fileName);
@@ -54,7 +54,7 @@ public class InfoDir {
 
             boolean success = SystemManager.copy(sourceFile, destFile);
         }
-
+        
         return destFile;
     }
 
@@ -76,14 +76,14 @@ public class InfoDir {
             destDir.mkdir();
             SystemManager.copyAllFiles(sourceDir, destDir, fileExtension);
             SystemManager.setUnixPrivilegesDirectory(destDir, fileExtension, unixRights);
-        }
+        }        
     }
 
     static private void copyInstallDirectoryDoubleSubdir(File destBaseDir, String dir1, String dir2) {
         InstallData data = InstallData.getInstance();
         File sourceDir1 = data.getInfoRoot(dir1);
         File sourceDir = new File(sourceDir1, dir2);
-
+        
         destBaseDir.mkdir();
         File destDir1 = new File(destBaseDir, dir1);
         destDir1.mkdir();
@@ -92,7 +92,7 @@ public class InfoDir {
 
         SystemManager.copyAllFiles(sourceDir, destDir);
     }
-
+    
     static private File createUninstallDir() {
         InstallData data = InstallData.getInstance();
         File baseDir = new File(data.getInstallDefaultDir(), data.getProductDir());
@@ -100,7 +100,7 @@ public class InfoDir {
         baseDir.mkdir();
         return baseDir;
     }
-
+    
     static private void copyGetUidSoFile(File dir) {
         InstallData data = InstallData.getInstance();
         String uidFileSource = data.getGetUidPath();
@@ -111,9 +111,9 @@ public class InfoDir {
             String uidFileDest = destFile.getPath();
             boolean success = SystemManager.copy(uidFileSource, uidFileDest);
             data.setGetUidPath(uidFileDest);
-        }
+        }        
     }
-
+    
     static private void copyJreFile(File dir) {
         InstallData data = InstallData.getInstance();
         String jrefilename = System.getProperty("JRE_FILE");
@@ -122,9 +122,9 @@ public class InfoDir {
             // For Solaris, JRE_FILE can already contain the complete path.
             // Otherwise it contains only the filename
             File jreFile = new File(jrefilename);
-
+            
             if ( ! jreFile.exists()) {
-                jreFile = new File(data.getPackagePath(), jrefilename);
+                jreFile = new File(data.getPackagePath(), jrefilename);            
             }
 
             if ( jreFile.exists() ) {
@@ -133,16 +133,16 @@ public class InfoDir {
                 destDir.mkdir();
                 String onlyFileName = jreFile.getName();
                 File destFile = new File(destDir, onlyFileName);
-
+                
                 // In maintenance mode the file already exists
                 if ( ! destFile.exists() ) {
                     String jreFileDest = destFile.getPath();
-                    boolean success = SystemManager.copy(jreFileSource, jreFileDest);
+                    boolean success = SystemManager.copy(jreFileSource, jreFileDest);        
                 }
             }
-        }
+        }   	
     }
-
+    
     static private void moveAdminFiles(File dir) {
         InstallData data = InstallData.getInstance();
 
@@ -163,7 +163,7 @@ public class InfoDir {
             data.setAdminFileNameRelocNoDepends(destFile.getPath());
             sourceFile.delete();
         }
-
+        
         if ( data.getAdminFileNameNoReloc() != null ) {
             File sourceFile = new File(data.getAdminFileNameNoReloc());
             String fileName = sourceFile.getName();
@@ -182,31 +182,31 @@ public class InfoDir {
             sourceFile.delete();
         }
     }
-
+    
     static private void createInfoFile(File dir) {
         Vector fileContent = new Vector();
         String line = null;
         InstallData data = InstallData.getInstance();
-
+        
         line = "PackagePath=" + data.getPackagePath();
         fileContent.add(line);
         line = "InstallationPrivileges=" + data.getInstallationPrivileges();
         fileContent.add(line);
-        line = "AdminFileReloc=" + data.getAdminFileNameReloc();
+        line = "AdminFileReloc=" + data.getAdminFileNameReloc(); 
         fileContent.add(line);
-        line = "AdminFileRelocNoDepends=" + data.getAdminFileNameRelocNoDepends();
+        line = "AdminFileRelocNoDepends=" + data.getAdminFileNameRelocNoDepends(); 
         fileContent.add(line);
-        line = "AdminFileNoReloc=" + data.getAdminFileNameNoReloc();
+        line = "AdminFileNoReloc=" + data.getAdminFileNameNoReloc(); 
         fileContent.add(line);
-        line = "AdminFileNoRelocNoDepends=" + data.getAdminFileNameNoRelocNoDepends();
+        line = "AdminFileNoRelocNoDepends=" + data.getAdminFileNameNoRelocNoDepends(); 
         fileContent.add(line);
-        line = "InstallationDir=" + data.getInstallDir();
+        line = "InstallationDir=" + data.getInstallDir();        
         fileContent.add(line);
         line = "DatabasePath=" + data.getDatabasePath();
         fileContent.add(line);
         line = "GetUidFile=" + data.getGetUidPath();
         fileContent.add(line);
-
+        
         String infoFileName = "infoFile";
         File infoFile = new File(dir, infoFileName);
         SystemManager.saveCharFileVector(infoFile.getPath(), fileContent);
@@ -216,7 +216,7 @@ public class InfoDir {
         InstallData data = InstallData.getInstance();
         File jarFile = data.getJarFilePath();
         SystemManager.deleteFile(jarFile);
-
+        
         String jarFilePath = jarFile.getParent();
         File setupFile = new File(jarFilePath, "setup");
         SystemManager.deleteFile(setupFile);
@@ -238,7 +238,7 @@ public class InfoDir {
         }
 
         if ( ! data.getGetUidPath().equals("null") ) {
-            SystemManager.deleteFile(new File(data.getGetUidPath()));
+            SystemManager.deleteFile(new File(data.getGetUidPath()));            
         }
     }
 
@@ -262,7 +262,7 @@ public class InfoDir {
             }
         }
     }
-
+    
     static private void removeInforoot() {
         InstallData data = InstallData.getInstance();
         SystemManager.removeDirectory(data.getInfoRoot());
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Informer.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Informer.java
index 7a3046a1dda0..918d459626d3 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Informer.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Informer.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,7 +30,7 @@ package org.openoffice.setup.Util;
 import javax.swing.JOptionPane;
 
 public class Informer {
-
+    
     private Informer() {
     }
 
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InstallChangeCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InstallChangeCtrl.java
index 55d2c0a8d0cb..c00f6a6e1d7d 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InstallChangeCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InstallChangeCtrl.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 @@ import java.util.Enumeration;
 
 
 public class InstallChangeCtrl {
-
+    
     private InstallChangeCtrl() {
     }
 
@@ -52,7 +52,7 @@ public class InstallChangeCtrl {
             }
         }
     }
-
+    
     static private void setChangeInstallDir(InstallData installData, Installer installer) {
         // setting the new install dir after analyzing the installation directory
         // of the installed update package.
@@ -68,7 +68,7 @@ public class InstallChangeCtrl {
     // static public void checkInstallChange(InstallData data, ChooseDirectory panel) {
     static public void checkInstallChange(InstallData data) {
 
-        Installer installer = InstallerFactory.getInstance();
+        Installer installer = InstallerFactory.getInstance();            
         PackageDescription packageData = SetupDataProvider.getPackageDescription();
 
         if ( data.getUpdatePackage() == null ) {
@@ -80,7 +80,7 @@ public class InstallChangeCtrl {
             // resetting values, if database was changed during user installation
             data.setOlderVersionExists(false);
             data.setNewerVersionExists(false);
-            data.setSameVersionExists(false);
+            data.setSameVersionExists(false);        	
 
             boolean packageIsInstalled = installer.isPackageInstalled(data.getUpdatePackage(), data);
             if ( packageIsInstalled ) {
@@ -101,12 +101,12 @@ public class InstallChangeCtrl {
                     {
                         data.setMajorUpgrade(true);
                         System.err.println("Major Upgrade");
-                    }
+                    }                    
                 } else if ( installer.isInstallSetPackageOlder(data.getUpdatePackage(), data) ) {
                     data.setNewerVersionExists(true);
                     System.err.println("A newer product is installed");
                 } else {
-                    data.setSameVersionExists(true);
+                    data.setSameVersionExists(true);        	
                     System.err.println("Same product is installed");
                 }
 
@@ -122,7 +122,7 @@ public class InstallChangeCtrl {
                 // directory (ChooseDirectoryCtrl.java).
                 if ( data.isRootInstallation() && data.dontUpdate() && data.olderVersionExists() ) {
                     System.err.println("Error: An older version is already installed in directory " + data.getInstallDir() + "!");
-                    String message1 = ResourceManager.getString("String_Older_Version_Installed_Found")
+                    String message1 = ResourceManager.getString("String_Older_Version_Installed_Found") 
                                     + "\n" + data.getInstallDir() + "\n";
                     String message2 = ResourceManager.getString("String_Older_Version_Installed_Remove");
                     String message = message1 + "\n" + message2;
@@ -131,7 +131,7 @@ public class InstallChangeCtrl {
                     System.exit(1);
                 }
             }
-        }
+        }   
     }
 
 }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/LogManager.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/LogManager.java
index 3be95469b532..fcafd5aaaf9f 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/LogManager.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/LogManager.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,14 +35,14 @@ public class LogManager {
     static private Vector commandsLogFile;  /* collects all system commands information during installation */
     static private Vector saveLogFile;  /* contains the content of the saved log file */
     static private Vector modulesLogFile;
-
+    
     private LogManager() {
     }
 
     static public Vector getSaveLogfile() {
         return saveLogFile;
     }
-
+    
     static public void addLogfileComment(String text) {
         logfile.add(text);
     }
@@ -54,7 +54,7 @@ public class LogManager {
     static public void addModulesLogfileComment(String text) {
         modulesLogFile.add(text);
     }
-
+    
     static public void setCommandsHeaderLine(String text) {
         String line = "*************************************";
         commandsLogFile.add("");
@@ -70,16 +70,16 @@ public class LogManager {
         modulesLogFile.add(text);
         modulesLogFile.add(line);
     }
-
+  
     static public String publishLogfileContent(String text, String separatorline) {
         for (int i = 0; i < logfile.size(); i++) {
             text = text + logfile.get(i) + "<br>";
-        }
+        }    
 
         if ( ! logfile.isEmpty() ) {
-            text = text + separatorline + "<br>";
+            text = text + separatorline + "<br>";            
         }
-
+  
         return text;
     }
 
@@ -90,11 +90,11 @@ public class LogManager {
 
         return text;
     }
-
+    
     static public Vector getModulesLogFile() {
         return modulesLogFile;
     }
-
+    
     static {
         logfile = new Vector();
         commandsLogFile = new Vector();
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java
index 8d43fb4d01f1..e869254f4bda 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.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,10 +40,10 @@ import org.openoffice.setup.SetupData.SetupDataProvider;
 import org.openoffice.setup.Util.Informer;
 
 public class ModuleCtrl {
-
+    
     private ModuleCtrl() {
     }
-
+    
     static public void setModuleSize(PackageDescription packageData) {
         // Setting the package size for visible node modules, that have hidden children
         // -> Java module has three hidden children and 0 byte size
@@ -51,7 +51,7 @@ public class ModuleCtrl {
         if (( ! packageData.isLeaf() ) && ( ! packageData.isHidden() )) {
             boolean setNewSize = false;
             int size = packageData.getSize();
-
+            
             for (Enumeration e = packageData.children(); e.hasMoreElements(); ) {
                 PackageDescription child = (PackageDescription) e.nextElement();
                 // if (( child.isHidden() ) && ( child.getSelectionState() == PackageDescription.DONT_KNOW )) {
@@ -60,7 +60,7 @@ public class ModuleCtrl {
                     size = size + child.getSize();
                 }
             }
-
+            
             if ( setNewSize ) {
                 packageData.setSize(size);
             }
@@ -72,14 +72,14 @@ public class ModuleCtrl {
         }
 
     }
-
+    
     static public void setDefaultModuleSettings(PackageDescription data) {
         // Setting default module settings for modules, that are not hidden
         // Hidden modules do not get a defined state now
         boolean isInstalled = false;
         InstallData installdata = InstallData.getInstance();
         boolean isUninstall = installdata.isUninstallationMode();
-
+        
         if (isUninstall) {
             isInstalled = true;
         }
@@ -97,24 +97,24 @@ public class ModuleCtrl {
                 System.err.println("NEVER");
             } else if (data.isDefault()) {
                 data.setSelectionState(PackageDescription.INSTALL);
-            } else if ( ! data.isDefault()) {
+            } else if ( ! data.isDefault()) {                
                 data.setSelectionState(PackageDescription.DONT_INSTALL);
             } else {
                 data.setSelectionState(PackageDescription.DONT_INSTALL);
             }
         }
     }
-
+    
     static public void setParentDefaultModuleSettings(PackageDescription packageData) {
         // Setting the module states of parent modules.
         // Called after ChooseDirectoryCtrl.java, because
-        // the database has to be known. In user installation it is important,
+        // the database has to be known. In user installation it is important, 
         // that the installation directory is known, to find the database.
         // Called during uninstallation in UninstallationPrologueCtrl.java
 
         // Iteration before setting the module states. Because of this, all children
         // get their final setting before the parent.
-
+        
         for (Enumeration e = packageData.children(); e.hasMoreElements(); ) {
             PackageDescription child = (PackageDescription) e.nextElement();
             setParentDefaultModuleSettings(child);
@@ -130,12 +130,12 @@ public class ModuleCtrl {
 
             // System.err.println("    STATE before iterating over children: " + state);
 
-            for (Enumeration e = packageData.children(); e.hasMoreElements();) {
+            for (Enumeration e = packageData.children(); e.hasMoreElements();) {            
                 PackageDescription child = (PackageDescription) e.nextElement();
                 int childState = child.getSelectionState();
 
                 // System.err.println("    Child: " + child.getName() + " : " + childState);
-
+                
                 if ( childState != PackageDescription.IGNORE) {
                     allChildrenIgnored = false;
                 }
@@ -147,9 +147,9 @@ public class ModuleCtrl {
                 if ( ! child.isHidden() ) {
                     allChildrenHidden = false;
                 }
-
+                
                 if ((state == PackageDescription.DONT_KNOW) || (state == PackageDescription.IGNORE)) {
-                    state = childState;
+                    state = childState;          
                 // } else if ((state != childState) && (childState != PackageDescription.IGNORE)) {
                 } else if ((state != childState) && (childState != PackageDescription.IGNORE) && (childState != PackageDescription.DONT_KNOW)) {
                     if ( installdata.isUninstallationMode() ) {
@@ -158,14 +158,14 @@ public class ModuleCtrl {
                         state = PackageDescription.INSTALL_SOME;
                     }
                 }
-
+                
                 // System.err.println("    NEW state after child: " + state);
             }
 
             if ( allChildrenIgnored ) {
                 state = PackageDescription.IGNORE;
             }
-
+            
             if ( installdata.isInstallationMode() ) {
                 if (( state == PackageDescription.INSTALL_SOME ) && ( ! atLeastOneInstalled )) {
                     state = PackageDescription.DONT_INSTALL;
@@ -177,7 +177,7 @@ public class ModuleCtrl {
                 // System.err.println("Setting allChildrenHidden for module " + packageData.getName() );
             }
 
-            // If older version exist, only modules without packages shall be updated,
+            // If older version exist, only modules without packages shall be updated, 
             // because all packages are already determined by querying the database.
             if ( installdata.olderVersionExists() ) {
                 if ( packageData.getPackageName().equals("") ) {
@@ -201,14 +201,14 @@ public class ModuleCtrl {
                     // System.err.println("Setting 1 INSTALL flag to: " + packageData.getName());
                 }
             }
-
+            
             // INSTALL_SOME is not valid for leaves
             if (( packageData.getSelectionState() == packageData.INSTALL_SOME ) && ( packageData.isLeaf() )) {
                 packageData.setSelectionState(packageData.INSTALL);
                 // System.err.println("Setting 2 INSTALL flag to: " + packageData.getName());
             }
         }
-
+        
         for (Enumeration e = packageData.children(); e.hasMoreElements(); ) {
             PackageDescription child = (PackageDescription) e.nextElement();
             setHiddenModuleSettingsInstall(child);
@@ -216,19 +216,19 @@ public class ModuleCtrl {
     }
 
     static public void setHiddenModuleSettingsUninstall(PackageDescription packageData) {
-        InstallData data = InstallData.getInstance();
+        InstallData data = InstallData.getInstance();            
         // update selection states for hidden modules during uninstallation
         if (( packageData.isHidden() ) && ( packageData.getSelectionState() != packageData.IGNORE )) {
             // System.err.println("Package name: " + packageData.getName());
             // System.err.println("Selection: " + packageData.getSelectionState());
-
+            
             PackageDescription parent = (PackageDescription)packageData.getParent();
             if ( parent != null ) {
                 packageData.setSelectionState(parent.getSelectionState());
                 // Hidden modules at root module have to be uninstalled at complete uninstallation
                 // In Uninstallation the complete is the typical installation type
                 if (( parent.getName() == "" ) && ( data.isTypicalInstallation() ))  {
-                    packageData.setSelectionState(packageData.REMOVE);
+                    packageData.setSelectionState(packageData.REMOVE);                    
                 }
                 // Hidden modules at root module must not be uninstalled at custom uninstallation
                 // But if all visible modules are selected for uninstallation, this shall be handled
@@ -240,7 +240,7 @@ public class ModuleCtrl {
                     }
                 }
             }
-
+            
             // REMOVE_SOME is not valid for leaves
             // if ( data.isTypicalInstallation() ) {
             if (( packageData.getSelectionState() == packageData.REMOVE_SOME ) && ( packageData.isLeaf() )) {
@@ -249,7 +249,7 @@ public class ModuleCtrl {
             // }
 
         }
-
+        
         for (Enumeration e = packageData.children(); e.hasMoreElements(); ) {
             PackageDescription child = (PackageDescription) e.nextElement();
             setHiddenModuleSettingsUninstall(child);
@@ -258,7 +258,7 @@ public class ModuleCtrl {
 
     static private boolean checkRequiredCoreModule(PackageDescription packageData) {
 
-        // This function uses a similar mechanism to determine
+        // This function uses a similar mechanism to determine 
         // core modules as function "setHiddenModuleSettingsInstall"
         // -> only hidden parents, until there is a module without name (getName)
         // Only searching until grandpa.
@@ -280,26 +280,26 @@ public class ModuleCtrl {
                         if ( grandpa != null ) {
                             if (( grandpa.getName().equals("") ) || ( grandpa.getName() == null )) {
                                 requiredCoreModule = true;
-                            }
+                            }                            
                         }
                     }
                 }
             }
         }
-
+        
         return requiredCoreModule;
     }
-
+    
     static public void setDatabaseSettings(PackageDescription packageData, InstallData installData, Installer installer) {
         // Analyzing the system database and setting the module states.
         // Called during installation in ChooseInstallationTypeCtrl.java, because
-        // the database has to be known. In user installation it is important,
+        // the database has to be known. In user installation it is important, 
         // the the installation directory is known, to find the database.
         // Called during uninstallation in UninstallationPrologueCtrl.java
 
         boolean isUninstall = installData.isUninstallationMode();
         boolean isInstalled = installer.isPackageInstalled(packageData, installData);
-
+                        
         if (isUninstall) {
             if (isInstalled) {
                 packageData.setSelectionState(PackageDescription.REMOVE);
@@ -319,16 +319,16 @@ public class ModuleCtrl {
                 packageData.setSelectionState(PackageDescription.IGNORE);
             }
         } else {
-            boolean goodDepends = true;
+            boolean goodDepends = true;            
             if ( installData.getOSType().equalsIgnoreCase("SunOS") ) {
                 if (( installData.isRootInstallation() ) && ( packageData.getCheckSolaris() != null ) && ( ! packageData.getCheckSolaris().equals("") )) {
                     // the package has to be installed. Creating a new package with only packagename
                     if ( ! installer.isPackageNameInstalled(packageData.getCheckSolaris(), installData) ) {
-                        goodDepends = false;
+                        goodDepends = false; 
                     }
                 }
             }
-
+            
             if ( ! goodDepends ) {
                 // The package dependencies are not valid -> ignoring package.
                 packageData.setSelectionState(PackageDescription.IGNORE);
@@ -344,14 +344,14 @@ public class ModuleCtrl {
                             packageData.setSelectionState(PackageDescription.IGNORE);
                         } else {
                             // This is also something like migrating feature states
-                            packageData.setSelectionState(PackageDescription.INSTALL);
+                            packageData.setSelectionState(PackageDescription.INSTALL); 
                         }
                     } else {  // no version check done -> so what is a good setting for already installed packages?
                         if ( installData.olderVersionExists() ) {  // should never be the case in this function
-                            packageData.setSelectionState(PackageDescription.INSTALL);
+                            packageData.setSelectionState(PackageDescription.INSTALL);                    		
                         } else {
-                            packageData.setSelectionState(PackageDescription.IGNORE);
-                        }
+                            packageData.setSelectionState(PackageDescription.IGNORE);                    		
+                        }	
                     }
                 }
                 else {
@@ -383,22 +383,22 @@ public class ModuleCtrl {
                         }
                     }
                 }
-            }
-        }
+            }        
+        }      
 
         for (Enumeration e = packageData.children(); e.hasMoreElements(); ) {
             PackageDescription child = (PackageDescription) e.nextElement();
             setDatabaseSettings(child, installData, installer);
-        }
+        }        
     }
 
     static public void setShowInUserInstallFlags(PackageDescription packageData) {
 
         // This function is not needed during deinstallation, because a
-        // module that could not be selected during installation, is always
+        // module that could not be selected during installation, is always 
         // not installed during deinstallation and therefore gets "IGNORE"
         // in function setDatabaseSettings
-
+        
         if ( ! packageData.showInUserInstall() ) {
             packageData.setSelectionState(PackageDescription.IGNORE);
             // too late to hide the module
@@ -427,10 +427,10 @@ public class ModuleCtrl {
     static public void setShowInUserInstallOnlyFlags(PackageDescription packageData) {
 
         // This function is not needed during deinstallation, because a
-        // module that could not be selected during installation, is always
+        // module that could not be selected during installation, is always 
         // not installed during deinstallation and therefore gets "IGNORE"
         // in function setDatabaseSettings
-
+        
         if ( packageData.showInUserInstallOnly() ) {
             packageData.setSelectionState(PackageDescription.IGNORE);
             // too late to hide the module
@@ -460,17 +460,17 @@ public class ModuleCtrl {
 
         // This function is needed during installation for the language modules,
         // if there is only one language in the installation set. In this case the language
-        // modules are hidden (no selection possible) and therefore get no value in
-        // setDefaultModuleSettings(). This default value is set now.
+        // modules are hidden (no selection possible) and therefore get no value in 
+        // setDefaultModuleSettings(). This default value is set now. 
 
         if ( packageData.showMultiLingualOnly() ) {
             packageData.setSelectionState(PackageDescription.INSTALL);
         }
-
+        
         for (Enumeration e = packageData.children(); e.hasMoreElements(); ) {
             PackageDescription child = (PackageDescription) e.nextElement();
             setHiddenLanguageModuleDefaultSettings(child);
-        }
+        }    	
     }
 
     static private boolean packageExists(PackageDescription packageData, InstallData installData) {
@@ -493,11 +493,11 @@ public class ModuleCtrl {
     }
 
     static public void disableNonExistingPackages(PackageDescription packageData, InstallData installData) {
-        if ((( packageData.getPackageName() == null ) || ( packageData.getPackageName().equals("") ))
+        if ((( packageData.getPackageName() == null ) || ( packageData.getPackageName().equals("") )) 
                && packageData.isLeaf() ) {
-            packageData.setSelectionState(PackageDescription.IGNORE);
+            packageData.setSelectionState(PackageDescription.IGNORE);                        
         } else if ( ! packageExists(packageData, installData) ) {
-            packageData.setSelectionState(PackageDescription.IGNORE);
+            packageData.setSelectionState(PackageDescription.IGNORE);            
         }
 
         for (Enumeration e = packageData.children(); e.hasMoreElements(); ) {
@@ -525,11 +525,11 @@ public class ModuleCtrl {
         for (Enumeration e = packageData.children(); e.hasMoreElements(); ) {
             PackageDescription child = (PackageDescription) e.nextElement();
             setDontUninstallUserInstallOnylFlags(child);
-        }
+        }    	
     }
 
-    static public void checkVisibleModulesInstall(PackageDescription packageData, InstallData data) {
-        boolean setToTrue = false;
+    static public void checkVisibleModulesInstall(PackageDescription packageData, InstallData data) {        
+        boolean setToTrue = false;        
 
         if (( ! packageData.isHidden() ) && ( packageData.getSelectionState() == packageData.INSTALL )) {
             setToTrue = true;
@@ -541,11 +541,11 @@ public class ModuleCtrl {
                 PackageDescription child = (PackageDescription) e.nextElement();
                 checkVisibleModulesInstall(child, data);
             }
-        }
+        }        
     }
 
     static public void checkApplicationSelection(PackageDescription packageData, InstallData data) {
-        boolean setToTrue = false;
+        boolean setToTrue = false;        
 
         if (( packageData.isApplicationPackage() ) &&
             ( ! packageData.isHidden() ) &&
@@ -559,11 +559,11 @@ public class ModuleCtrl {
                 PackageDescription child = (PackageDescription) e.nextElement();
                 checkApplicationSelection(child, data);
             }
-        }
+        }        
     }
 
     static public void checkLanguageSelection(PackageDescription packageData, InstallData data) {
-        boolean setToTrue = false;
+        boolean setToTrue = false;        
 
         if (( packageData.showMultiLingualOnly() ) &&
             ( ! packageData.isHidden() ) &&
@@ -577,12 +577,12 @@ public class ModuleCtrl {
                 PackageDescription child = (PackageDescription) e.nextElement();
                 checkLanguageSelection(child, data);
             }
-        }
+        }        
     }
 
-    static public void checkVisibleModulesUninstall(PackageDescription packageData, InstallData data) {
-        boolean setToTrue = false;
-
+    static public void checkVisibleModulesUninstall(PackageDescription packageData, InstallData data) {        
+        boolean setToTrue = false;        
+        
         if (( ! packageData.isHidden() ) && ( packageData.getSelectionState() == packageData.REMOVE )) {
             // ignoring the top level module, that has the state REMOVE (but no name)
             if (( packageData.getName() != null ) && ( ! packageData.getName().equals("") )) {
@@ -596,11 +596,11 @@ public class ModuleCtrl {
                 PackageDescription child = (PackageDescription) e.nextElement();
                 checkVisibleModulesUninstall(child, data);
             }
-        }
+        }        
     }
 
-    static public void checkApplicationModulesUninstall(PackageDescription packageData, InstallData data) {
-        boolean setToTrue = false;
+    static public void checkApplicationModulesUninstall(PackageDescription packageData, InstallData data) {        
+        boolean setToTrue = false;        
 
         // At least one language module should not be uninstalled. Then this function returns true.
         // An exeption is the complete uninstallation or the masked complete uninstallation.
@@ -618,11 +618,11 @@ public class ModuleCtrl {
                 PackageDescription child = (PackageDescription) e.nextElement();
                 checkApplicationModulesUninstall(child, data);
             }
-        }
+        }        
     }
 
-    static public void checkLanguageModulesUninstall(PackageDescription packageData, InstallData data) {
-        boolean setToTrue = false;
+    static public void checkLanguageModulesUninstall(PackageDescription packageData, InstallData data) {        
+        boolean setToTrue = false;        
 
         // At least one language module should not be uninstalled. Then this function returns true.
         // An exeption is the complete uninstallation or the masked complete uninstallation.
@@ -640,16 +640,16 @@ public class ModuleCtrl {
                 PackageDescription child = (PackageDescription) e.nextElement();
                 checkLanguageModulesUninstall(child, data);
             }
-        }
+        }        
     }
-
+    
     static public void checkMaskedCompleteUninstallation(PackageDescription packageData, InstallData data) {
-        boolean setToFalse = false;
+        boolean setToFalse = false;        
 
         // If there is at least one visible module, that is not selected for removal
         // this is no masked complete uninstallation
-
-        if (( ! packageData.isHidden() )
+        
+        if (( ! packageData.isHidden() ) 
                  && ( packageData.getSelectionState() != packageData.REMOVE )
                  && ( packageData.getSelectionState() != packageData.IGNORE )) {
             // ignoring the top level module, that has no name
@@ -660,7 +660,7 @@ public class ModuleCtrl {
                 // System.err.println("Caused by: " + packageData.getName() + " with " + packageData.getSelectionState());
             }
         }
-
+        
         if ( ! setToFalse ) {
             for (Enumeration e = packageData.children(); e.hasMoreElements(); ) {
                 PackageDescription child = (PackageDescription) e.nextElement();
@@ -668,7 +668,7 @@ public class ModuleCtrl {
             }
         }
     }
-
+  
     static public void saveTypicalSelectionStates(PackageDescription packageData) {
         packageData.setTypicalSelectionState(packageData.getSelectionState());
 
@@ -704,14 +704,14 @@ public class ModuleCtrl {
             restoreTypicalSelectionStates(child);
         }
     }
-
+    
     static public void restoreCustomSelectionStates(PackageDescription packageData) {
         packageData.setSelectionState(packageData.getCustomSelectionState());
 
         for (Enumeration e = packageData.children(); e.hasMoreElements(); ) {
             PackageDescription child = (PackageDescription) e.nextElement();
             restoreCustomSelectionStates(child);
-        }
+        }        
     }
 
     static public void restoreStartSelectionStates(PackageDescription packageData) {
@@ -720,14 +720,14 @@ public class ModuleCtrl {
         for (Enumeration e = packageData.children(); e.hasMoreElements(); ) {
             PackageDescription child = (PackageDescription) e.nextElement();
             restoreStartSelectionStates(child);
-        }
+        }        
     }
-
-    static public void setUpdateOlderProductSettings(PackageDescription packageData, InstallData data, Installer installer) {
+    
+    static public void setUpdateOlderProductSettings(PackageDescription packageData, InstallData data, Installer installer) {        
         if (( packageData.getPackageName() != null ) && ( ! packageData.getPackageName().equals(""))) {
             if ( installer.isPackageInstalled(packageData, data) ) {
                 packageData.setSelectionState(PackageDescription.INSTALL);
-
+                
                 // Special handling for jre package, because this is not necessarily older, if an older product is updated.
                 if ( packageData.isJavaPackage() ) {
                     if ( ! installer.isInstalledPackageOlder(packageData, data) ) {
@@ -777,16 +777,16 @@ public class ModuleCtrl {
                             Vector oldPackages = data.getOldPackages();
                             oldPackages.add(localPackage);
                             data.setOldPackages(oldPackages);
-                        }
+                        }                    
                     }
                 }
             }
         }
-
+                    
         for (Enumeration e = packageData.children(); e.hasMoreElements(); ) {
             PackageDescription child = (PackageDescription) e.nextElement();
             setUpdateOlderProductSettings(child, data, installer);
-        }
+        }    
     }
 
     static public void checkLanguagesPackages(PackageDescription packageData, InstallData installData) {
@@ -820,7 +820,7 @@ public class ModuleCtrl {
             PackageDescription child = (PackageDescription) e.nextElement();
             checkLanguagesPackages(child, installData);
         }
-    }
+    }       
 
     static public void setLanguagesPackages(PackageDescription packageData) {
         if (( packageData.getPkgLanguage() != null ) && ( ! packageData.getPkgLanguage().equals(""))) {
@@ -832,8 +832,8 @@ public class ModuleCtrl {
             PackageDescription child = (PackageDescription) e.nextElement();
             setLanguagesPackages(child);
         }
-    }
-
+    }       
+    
     static public void setRequiredNewCoreModules(PackageDescription packageData, InstallData installData) {
         // Special handling for core modules, which are required, but not installed.
         boolean isRequiredCoreModule = checkRequiredCoreModule(packageData);
@@ -867,11 +867,11 @@ public class ModuleCtrl {
             setRequiredNewCoreModules(child, installData);
         }
     }
-
+    
     static public void defaultDatabaseAnalysis(InstallData data) {
 
         PackageDescription packageData = SetupDataProvider.getPackageDescription();
-        Installer installer = InstallerFactory.getInstance();
+        Installer installer = InstallerFactory.getInstance();                
 
         // restore default settings
         if ( data.startSelectionStateSaved() ) {
@@ -924,17 +924,17 @@ public class ModuleCtrl {
             // disable packages, that are not valid in user installation
             if ( data.isUserInstallation() ) {
                 ModuleCtrl.setShowInUserInstallFlags(packageData);
-
+ 
                 if ( data.logModuleStates() ) {
                     Dumper.logModuleStates(packageData, "ChooseDirectory: After setShowInUserInstallFlags");
-                }
+                }                   
             }
             else { // disable packages, that are not valid in root installation
                 ModuleCtrl.setShowInUserInstallOnlyFlags(packageData);
-
+ 
                 if ( data.logModuleStates() ) {
                     Dumper.logModuleStates(packageData, "ChooseDirectory: After setShowInUserInstallOnlyFlags");
-                }
+                }            	
             }
 
             // Setting parent module settings. Only required for displaying correct module settings before starting installation.
@@ -943,7 +943,7 @@ public class ModuleCtrl {
             if ( data.logModuleStates() ) {
                 Dumper.logModuleStates(packageData, "ChooseDirectory: After setParentDefaultModuleSettings");
             }
-
+            
             // Collecting packages to install
             // This has to be done here, because "ChooseInstallationType" and "ChooseComponents"
             // are not called.
@@ -971,7 +971,7 @@ public class ModuleCtrl {
 
             // ModuleCtrl.analyzeDatabase();
             ModuleCtrl.disableNonExistingPackages(packageData, data);
-
+ 
             if ( data.logModuleStates() ) {
                 Dumper.logModuleStates(packageData, "ChooseDirectory: After disableNonExistingPackages");
             }
@@ -979,16 +979,16 @@ public class ModuleCtrl {
             // disable packages, that are not valid in user installation
             if ( data.isUserInstallation() ) {
                 ModuleCtrl.setShowInUserInstallFlags(packageData);
-
+ 
                 if ( data.logModuleStates() ) {
                     Dumper.logModuleStates(packageData, "ChooseDirectory: After setShowInUserInstallFlags");
-                }
+                }                   
             } else { // disable packages, that are not valid in root installation
                 ModuleCtrl.setShowInUserInstallOnlyFlags(packageData);
-
+ 
                 if ( data.logModuleStates() ) {
                     Dumper.logModuleStates(packageData, "ChooseDirectory: After setShowInUserInstallOnlyFlags");
-                }
+                }            	
             }
 
             // Problem: If all submodules have flag IGNORE, the parent can also get IGNORE
@@ -999,6 +999,6 @@ public class ModuleCtrl {
                 Dumper.logModuleStates(packageData, "ChooseDirectory: After setParentDefaultModuleSettings");
             }
         }
-    }
+    } 
 
 }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/PackageCollector.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/PackageCollector.java
index 4e1c4d5866e2..0f915d65a504 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/PackageCollector.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/PackageCollector.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,55 +33,55 @@ import java.util.Enumeration;
 import java.util.Vector;
 
 public class PackageCollector {
-
+    
     private PackageCollector() {
     }
 
     static public void collectInstallPackages(PackageDescription packageData, Vector allPackages) {
-
+                
         if (( packageData.isLeaf() ) && ( packageData.getSelectionState() == packageData.INSTALL )) {
             allPackages.add(packageData);
             // System.err.println("Adding to collector 1: " + packageData.getPackageName());
         }
-
-        // also allowing packages at nodes!
+        
+        // also allowing packages at nodes! 
         if (( ! packageData.isLeaf() ) &&
                 ( packageData.getPackageName() != null ) &&
                 ( ! packageData.getPackageName().equals("")) &&
                 (( packageData.getSelectionState() == packageData.INSTALL ) ||
                 ( packageData.getSelectionState() == packageData.INSTALL_SOME ))) {
-            allPackages.add(packageData);
+            allPackages.add(packageData);            
             // System.err.println("Adding to collector 2: " + packageData.getPackageName());
         }
-
+        
         for (Enumeration e = packageData.children(); e.hasMoreElements(); ) {
             PackageDescription child = (PackageDescription) e.nextElement();
             collectInstallPackages(child, allPackages);
         }
-
+        
     }
 
     static public void collectUninstallPackages(PackageDescription packageData, Vector allPackages) {
         if (( packageData.isLeaf() ) && ( packageData.getSelectionState() == packageData.REMOVE )) {
             allPackages.add(0, packageData);
         }
-
-        // also allowing packages at nodes!
+ 
+        // also allowing packages at nodes! 
         if (( ! packageData.isLeaf() ) &&
                 ( packageData.getPackageName() != null ) &&
                 ( ! packageData.getPackageName().equals("")) &&
                 ( packageData.getSelectionState() == packageData.REMOVE )) {
             allPackages.add(0, packageData);
         }
-
+                
         for (Enumeration e = packageData.children(); e.hasMoreElements(); ) {
             PackageDescription child = (PackageDescription) e.nextElement();
             collectUninstallPackages(child, allPackages);
-        }
+        }   
     }
 
     // Special handling for packages, that change their name, and therefore need to be uninstalled
-
+    
     // static public void findOldPackages( InstallData installData ) {
     //
     //    String basis = "ooobasis3";
@@ -118,12 +118,12 @@ public class PackageCollector {
     //                    localName = localName.replace(search, replace);
     //                    localPackage.setName(localName);
     //                }
-
+                    
     //                oldPackages.add(localPackage);
     //            }
     //        }
     //    }
-
+        
     //    // reverse order for uninstallation
     //    int number = oldPackages.size();
     //    for (int i = 0; i < number; i++) {
@@ -131,7 +131,7 @@ public class PackageCollector {
     //            PackageDescription oldPackageData = (PackageDescription) oldPackages.remove(i);
     //            oldPackages.add(0,oldPackageData);
     //        }
-    //    }
+    //    }       
 
     //    installData.setOldPackages(oldPackages);
     // }
@@ -140,7 +140,7 @@ public class PackageCollector {
         for (int i = 0; i < allPackages.size(); i++) {
             boolean integrated = false;
             PackageDescription packageData = (PackageDescription) allPackages.get(i);
-
+            
             if ( i == 0 ) {
                 sortedPackages.add(packageData);
                 integrated = true;
@@ -149,21 +149,21 @@ public class PackageCollector {
                 for (int j = 0; j < sortedPackages.size(); j++) {
                     PackageDescription sortedPackageData = (PackageDescription) sortedPackages.get(j);
                     int compare = sortedPackageData.getOrder();
-
+                
                     if ( position < compare ) {
                         sortedPackages.add(j, packageData);
                         integrated = true;
                         break;
                     }
                 }
-
+                
                 // no break used -> adding at the end
                 if ( ! integrated ) {
                     sortedPackages.add(packageData);
                 }
             }
         }
-
+        
         // reverse order for uninstallation
         if ( mode.equalsIgnoreCase("uninstall")) {
             int number = sortedPackages.size();
@@ -173,7 +173,7 @@ public class PackageCollector {
                     sortedPackages.add(0,sortPackageData);
                 }
             }
-        }
+        } 
     }
 
 }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Parser.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Parser.java
index 6c22222fa27d..f7cd60660679 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Parser.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Parser.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
@@ -28,14 +28,14 @@
 package org.openoffice.setup.Util;
 
 public class Parser {
-
+    
     private Parser() {
     }
 
     static public boolean parseBoolean(String input) {
         boolean value;
         if ( input.equalsIgnoreCase("true")) {
-            value = true;
+            value = true;    
         } else if ( input.equalsIgnoreCase("false")) {
             value = false;
         } else {
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/SystemManager.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/SystemManager.java
index f0a3619054bb..65e184f79603 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/SystemManager.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/SystemManager.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,13 +44,13 @@ import java.util.Properties;
 import java.util.Vector;
 
 public class SystemManager {
-
+    
     private SystemManager() {
     }
-
+    
     /* the installation root is where the classes reside */
     static public File getJarFilePath() {
-
+        
         File jarFile = null;
 
         try {
@@ -74,7 +74,7 @@ public class SystemManager {
         if ( jarFile != null ) {
             System.err.println("Jar file: " + jarFile.getPath());
         } else {
-            System.err.println("No jar file used for installation!");
+            System.err.println("No jar file used for installation!");            
         }
 
         return jarFile;
@@ -82,7 +82,7 @@ public class SystemManager {
 
     /* the installation root is where the classes reside */
     static public File getResourceRoot() {
-
+        
         File dir = null;
 
         try {
@@ -112,14 +112,14 @@ public class SystemManager {
         if ( dir != null ) {
             // System.err.println("Resource Root: " + dir.getPath());
         } else {
-            System.err.println("No resource root found!");
+            System.err.println("No resource root found!");            
         }
-
+       
         return dir;
     }
-
+    
     static public String getPackagePath(String subdir) {
-
+        
         String path = null;
 
         File dir = getResourceRoot();
@@ -132,7 +132,7 @@ public class SystemManager {
                 path = dir.getPath();
             }
         }
-
+        
         if ( path != null ) {
             if ( ! path.endsWith("/")) {
                 path = path + "/";
@@ -142,9 +142,9 @@ public class SystemManager {
         if ( path != null ) {
             System.err.println("Path to packages: " + path);
         } else {
-            System.err.println("No path to packages found!");
+            System.err.println("No path to packages found!");            
         }
-
+        
         return path;
     }
 
@@ -154,7 +154,7 @@ public class SystemManager {
         found = file.exists();
         return found;
     }
-
+    
     static public boolean exists_directory(String directory) {
         File dir = new File(directory);
         return dir.exists();
@@ -168,12 +168,12 @@ public class SystemManager {
         }
         catch (SecurityException ex) {
             throw ex;
-        }
-
+        } 
+                
         return created;
     }
 
-    static public String getParentDirectory(String dir) {
+    static public String getParentDirectory(String dir) { 
         File installFile = new File(dir);
         String parentDir = installFile.getParent();
         if ( parentDir == null ) {
@@ -183,11 +183,11 @@ public class SystemManager {
     }
 
     static public String getInstallationPrivileges() {
-
+        
         String type = "";
         String user = java.lang.System.getProperty("user.name");
         // System.out.println("UserHome: " + java.lang.System.getProperty("user.home"));
-
+        
         if ( user.equalsIgnoreCase("root")) {
             type = "root";
             System.err.println("Root privileges");
@@ -195,15 +195,15 @@ public class SystemManager {
             type = "user";
             System.err.println("User privileges");
         }
-
+        
         return type;
     }
 
     static public boolean isUserInstallation() {
-
+        
         boolean isUserInstallation = false;
         String user = java.lang.System.getProperty("user.name");
-
+        
         if ( user.equalsIgnoreCase("root")) {
             isUserInstallation = false;
             System.err.println("Root privileges");
@@ -211,21 +211,21 @@ public class SystemManager {
             isUserInstallation = true;
             System.err.println("User privileges");
         }
-
+        
         return isUserInstallation;
     }
 
     static public boolean isRootInstallation() {
-
+        
         boolean isRootInstallation = false;
         String user = java.lang.System.getProperty("user.name");
-
+        
         if ( user.equalsIgnoreCase("root")) {
             isRootInstallation = true;
         } else {
             isRootInstallation = false;
         }
-
+        
         return isRootInstallation;
     }
 
@@ -234,7 +234,7 @@ public class SystemManager {
         System.err.println("OS: " + osVersion);
         return osVersion;
     }
-
+    
     static public String getOSArchitecture() {
         String osArchitecture = java.lang.System.getProperty("os.arch");
         System.out.println("OSArchitecture: " + osArchitecture);
@@ -256,7 +256,7 @@ public class SystemManager {
         HashMap myMap = new HashMap(props);
         return myMap;
     }
-
+    
     static public void dumpStringArray(String[] myStringArray) {
         for (int i = 0; i < myStringArray.length; i++) {
             System.out.println(myStringArray[i]);
@@ -267,7 +267,7 @@ public class SystemManager {
         Vector fileContent = readCharFileVector(baseFileName);
         saveCharFileVector(dumpFileName, fileContent);
     }
-
+    
     static public Vector readCharFileVector(String fileName) {
         Vector fileContent = new Vector();
 
@@ -290,8 +290,8 @@ public class SystemManager {
 
         return fileContent;
     }
-
-
+    
+    
     static public void saveCharFileVector(String fileName, Vector fileContent) {
         FileWriter fw = null;
         try
@@ -311,7 +311,7 @@ public class SystemManager {
             try {
                 if ( fw != null ) fw.close();
             } catch (IOException e) {}
-        }
+        }        
     }
 
     static public void copyAllFiles(File source, File dest) {
@@ -322,7 +322,7 @@ public class SystemManager {
             }
         }
     }
-
+    
     static public void copyAllFiles(File source, File dest, String ext) {
         File[] file = source.listFiles(new FileExtensionFilter(ext));
         if (file != null) {
@@ -334,7 +334,7 @@ public class SystemManager {
 
     // second parameter can be a complete file name or an existing directory
     static public boolean copy(String source, String dest) {
-
+        
         // is the second parameter a file name or a directory?
         File dir = new File(dest);
         if ( dir.isDirectory() ) {
@@ -343,7 +343,7 @@ public class SystemManager {
             File destFile = new File(dest, fileName);
             dest = destFile.getPath();
         }
-
+        
         boolean file_copied = false;
         FileInputStream fis;
         BufferedInputStream bis;
@@ -369,7 +369,7 @@ public class SystemManager {
         } catch (IOException e) {
             System.out.println("Dateien wurden nicht kopiert!");
         }
-
+        
         return file_copied;
     }
 
@@ -377,7 +377,7 @@ public class SystemManager {
         boolean success = false;
         if ( file.exists() && file != null ) {
             success = file.delete();
-        }
+        }        
         return success;
     }
 
@@ -388,8 +388,8 @@ public class SystemManager {
         }
         catch (SecurityException ex) {
             throw ex;
-        }
-
+        } 
+                
         return created;
     }
 
@@ -397,7 +397,7 @@ public class SystemManager {
         if ( dir.exists() && dir.isDirectory() ) {
             File[] file = dir.listFiles();
             if (file != null) {
-                for (int i = 0; i < file.length; i++) {
+                for (int i = 0; i < file.length; i++) {                
                     deleteFile(file[i]);
                 }
             }
@@ -413,8 +413,8 @@ public class SystemManager {
 
         if ( logStatesEnv != null ) {
             logStates = true;
-        }
-
+        }   
+             
         return logStates;
     }
 
@@ -435,7 +435,7 @@ public class SystemManager {
             }
         }
     }
-
+    
     static public int calculateDiscSpace(String directory) {
         String command = "df -k " + directory;
         String[] commandArray = new String[3];
@@ -455,18 +455,18 @@ public class SystemManager {
                 // The fourth value is the available disc space (if the first value is a path)
                 // Otherwise it can also be the third value, if the first is not a path.
                 // If the first value is not a path, the string starts with white spaces.
-
+                
                 int position = 3;
                 if ( returnLine.startsWith(" ")) {
                     position = 2;
                 }
-
+                
                 returnLine = returnLine.trim();
                 String[] returnArray = returnLine.split("\\s+");
 
                 if ( returnArray.length > 3 ) {
                     String sizeString = returnArray[position];
-
+                    
                     // Special handling for very large hard discs that cannot be converted to int
                     if ( sizeString.length() >= Integer.toString(Integer.MAX_VALUE).length() ) {
                         sizeString = Integer.toString(Integer.MAX_VALUE);
@@ -480,5 +480,5 @@ public class SystemManager {
 
         return size;
     }
-
+    
 }
diff --git a/javainstaller2/src/Properties/create_property.pl b/javainstaller2/src/Properties/create_property.pl
index 02712bb234c5..a84479147887 100755
--- a/javainstaller2/src/Properties/create_property.pl
+++ b/javainstaller2/src/Properties/create_property.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
@@ -78,7 +78,7 @@ for ( my $i = 0; $i <= $#{$all_template_files}; $i++ )
     print "Using translation file: $complete_jlf_file_name\n";
     $jlf_file = read_file($complete_jlf_file_name);
   }
-
+ 
   for ( my $j = 0; $j <= $#{$alllanguages}; $j++ )
   {
     my $language = ${$alllanguages}[$j];
@@ -86,7 +86,7 @@ for ( my $i = 0; $i <= $#{$all_template_files}; $i++ )
     my $stringhash = create_string_hash($jlf_file, $language);
     create_property_file($template_file, $stringhash);
     my $filename = generate_filename($template_file_name, $language);
-
+    
     if ( $language eq $defaultlanguage )
     {
       # Creating language indenpendent english file
@@ -97,7 +97,7 @@ for ( my $i = 0; $i <= $#{$all_template_files}; $i++ )
     else
     {
       # Saving the non-english files
-      save_file($outputpath, $filename, $template_file);
+      save_file($outputpath, $filename, $template_file);  
     }
   }
 }
@@ -107,7 +107,7 @@ exit;
 sub main::read_directory
 {
   my ($dir, $ext) = @_;
-
+  
   my @content = ();
   my $direntry;
   opendir(DIR, $dir);
@@ -141,12 +141,12 @@ sub main::read_file
 sub main::get_jlf_file_name
 {
   my ($tempfilename) = @_;
-
+  
   my $jlffilename = "";
-
+  
   if ( $tempfilename =~ /^\s*(\w+)_template/ ) { $tempfilename = $1; }
   $jlffilename = $tempfilename . "\.jlf";
-
+  
   return $jlffilename;
 }
 
@@ -159,31 +159,31 @@ sub main::get_all_languages
 
   my $first_jlf_file_name = $inputpath . $separator . ${$alljlffiles}[0];
   my $jlffile = read_file($first_jlf_file_name);
-
+  
   for ( my $i = 0; $i <= $#{$jlffile}; $i++ )
   {
     if (( ${$jlffile}[$i] =~ /^\s*\[.*]\s*$/ ) && ( $record )) { last; }
     if (( ${$jlffile}[$i] =~ /^\s*\[.*]\s*$/ ) && ( $record == 0 )) { $record = 1; }
-
+    
     if (( $record ) && ( ${$jlffile}[$i] =~ /^\s*(.+?)\s*\=/ ))
     {
       $language = $1;
       push(@languages, $language);
     }
   }
-
+  
   my $languagestring = "";
   for ( my $i = 0; $i <= $#languages; $i++ ) { $languagestring = $languagestring . $languages[$i] . ","; }
   $languagestring =~ s/,\s*$//;
   print "Languages: $languagestring\n";
-
+    
   return \@languages;
 }
 
 sub main::create_string_hash
 {
   my ($jlffile, $language) = @_;
-
+  
   my %stringhash = ();
   my $key = "";
   my $value_defined = 0;
@@ -198,24 +198,24 @@ sub main::create_string_hash
 
     if (( ${$jlffile}[$i] =~ /^\s*\Q$defaultlanguage\E\s*=\s*\"(.*)\"\s*$/ ) && ( ! $value_defined ))
     {
-      $value = $1;  # defaulting to english
+      $value = $1;	# defaulting to english
       $stringhash{$key} = $value;
     }
-
+        
     if (( ${$jlffile}[$i] =~ /^\s*\Q$language\E\s*=\s*\"(.*)\"\s*$/ ) && ( ! $value_defined ))
     {
       $value = $1;
       $stringhash{$key} = $value;
       $value_defined = 1;
     }
-  }
+  }  
 
   # additional replacement for ${LANGUAGE}, not defined in jlf file
   my $languagekey = "LANGUAGE";
   $stringhash{$languagekey} = $language;
 
   # print_hash(\%stringhash);
-
+  
   return \%stringhash;
 }
 
@@ -224,7 +224,7 @@ sub main::print_hash
   my ( $hashref ) = @_;
 
   print "Hash contains:\n";
-
+  
   my $key;
   foreach $key (keys %{$hashref} ) { print "Key: $key, Value: $hashref->{$key}\n"; }
 }
@@ -232,13 +232,13 @@ sub main::print_hash
 sub main::create_property_file
 {
   my ($template_file, $stringhash) = @_;
-
+ 
   for ( my $i = 0; $i <= $#{$template_file}; $i++ )
   {
-    if ( ${$template_file}[$i] =~ /\$\{(\w+)\}/ )
+    if ( ${$template_file}[$i] =~ /\$\{(\w+)\}/ ) 
     {
       my $key = $1;
-
+      
       if ( exists($stringhash->{$key}) )
       {
         my $value = $stringhash->{$key};
@@ -250,7 +250,7 @@ sub main::create_property_file
         exit;
       }
     }
-  }
+  }  
 }
 
 sub main::generate_filename
@@ -264,7 +264,7 @@ sub main::generate_filename
     $onelanguage =~ s/-/_/;   # zh-TW -> zh_TW
     $onelanguage = "_" . $onelanguage;
     $filename =~ s/_template\./$onelanguage\./;
-  }
+  } 
   else
   {
     $filename =~ s/_template//;
@@ -289,15 +289,15 @@ sub make_propertyfile_language_independent
 sub main::save_file
 {
   my ($outputpath, $filename, $filecontent) = @_;
-
+  
   $filename = $outputpath . $separator . $filename;
 
   if ( open( OUT, ">$filename" ) )
   {
     print OUT @{$filecontent};
-    close( OUT);
+    close( OUT);	
   }
-
+  
   push(@allnewpropertyfiles, $filename);
   print "Created file: $filename\n";
 }
diff --git a/lingucomponent/inc/pch/precompiled_lingucomponent.cxx b/lingucomponent/inc/pch/precompiled_lingucomponent.cxx
index b3a9344e85fb..250f31762b78 100644
--- a/lingucomponent/inc/pch/precompiled_lingucomponent.cxx
+++ b/lingucomponent/inc/pch/precompiled_lingucomponent.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/lingucomponent/inc/pch/precompiled_lingucomponent.hxx b/lingucomponent/inc/pch/precompiled_lingucomponent.hxx
index 60a1eda3f924..0aeb34493502 100644
--- a/lingucomponent/inc/pch/precompiled_lingucomponent.hxx
+++ b/lingucomponent/inc/pch/precompiled_lingucomponent.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx
index 1d4fde69ad79..6d2fe012b5a2 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <cppuhelper/factory.hxx>   // helper for factories
+#include <cppuhelper/factory.hxx>	// helper for factories
 #include <rtl/string.hxx>
 
 #include <com/sun/star/registry/XRegistryKey.hpp>
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
index be160664c562..be2c7242155b 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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/uno/Reference.h>
 #include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp>
 
-#include <cppuhelper/factory.hxx>   // helper for factories
+#include <cppuhelper/factory.hxx>	// helper for factories
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <i18npool/mslangid.hxx>
 #include <unotools/pathoptions.hxx>
@@ -91,7 +91,7 @@ using namespace linguistic;
 
 
 Hyphenator::Hyphenator() :
-    aEvtListeners   ( GetLinguMutex() )
+    aEvtListeners	( GetLinguMutex() )
 {
     bDisposing = FALSE;
     pPropHelper = NULL;
@@ -123,11 +123,11 @@ PropertyHelper_Hyphen & Hyphenator::GetPropHelper_Impl()
 
     if (!pPropHelper)
     {
-        Reference< XPropertySet >   xPropSet( GetLinguProperties(), UNO_QUERY );
+        Reference< XPropertySet	>	xPropSet( GetLinguProperties(), UNO_QUERY );
 
-        pPropHelper = new PropertyHelper_Hyphen ((XHyphenator *) this, xPropSet );
+        pPropHelper	= new PropertyHelper_Hyphen ((XHyphenator *) this, xPropSet );
         xPropHelper = pPropHelper;
-        pPropHelper->AddAsPropListener();   //! after a reference is established
+        pPropHelper->AddAsPropListener();	//! after a reference is established
     }
     return *pPropHelper;
 
@@ -137,7 +137,7 @@ PropertyHelper_Hyphen & Hyphenator::GetPropHelper_Impl()
 Sequence< Locale > SAL_CALL Hyphenator::getLocales()
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     // this routine should return the locales supported by the installed
     // dictionaries.
@@ -266,7 +266,7 @@ Sequence< Locale > SAL_CALL Hyphenator::getLocales()
 sal_Bool SAL_CALL Hyphenator::hasLocale(const Locale& rLocale)
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     BOOL bRes = FALSE;
     if (!aSuppLocales.getLength())
@@ -618,7 +618,7 @@ Reference< XPossibleHyphens > SAL_CALL
       lcword = new char[wordlen+1];
       hyphens = new char[wordlen+5];
       char ** rep = NULL; // replacements of discretionary hyphenation
-      int * pos = NULL; // array of [hyphenation point] minus [deletion position]
+      int * pos = NULL; // array of [hyphenation point] minus [deletion position] 
       int * cut = NULL; // length of deletions in original word
 
       // copy converted word into simple char buffer
@@ -774,7 +774,7 @@ sal_Bool SAL_CALL
             const Reference< XLinguServiceEventListener >& rxLstnr )
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     BOOL bRes = FALSE;
     if (!bDisposing && rxLstnr.is())
@@ -790,7 +790,7 @@ sal_Bool SAL_CALL
             const Reference< XLinguServiceEventListener >& rxLstnr )
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     BOOL bRes = FALSE;
     if (!bDisposing && rxLstnr.is())
@@ -806,7 +806,7 @@ OUString SAL_CALL
     Hyphenator::getServiceDisplayName( const Locale& /*rLocale*/ )
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
     return A2OU( "Libhyphen Hyphenator" );
 }
 
@@ -815,14 +815,14 @@ void SAL_CALL
     Hyphenator::initialize( const Sequence< Any >& rArguments )
         throw(Exception, RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     if (!pPropHelper)
     {
         INT32 nLen = rArguments.getLength();
         if (2 == nLen)
         {
-            Reference< XPropertySet >   xPropSet;
+            Reference< XPropertySet	>	xPropSet;
             rArguments.getConstArray()[0] >>= xPropSet;
             //rArguments.getConstArray()[1] >>= xDicList;
 
@@ -832,7 +832,7 @@ void SAL_CALL
             //! when the object is not longer used.
             pPropHelper = new PropertyHelper_Hyphen( (XHyphenator *) this, xPropSet );
             xPropHelper = pPropHelper;
-            pPropHelper->AddAsPropListener();   //! after a reference is established
+            pPropHelper->AddAsPropListener();	//! after a reference is established
         }
         else {
             DBG_ERROR( "wrong number of arguments in sequence" );
@@ -846,12 +846,12 @@ void SAL_CALL
     Hyphenator::dispose()
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     if (!bDisposing)
     {
         bDisposing = TRUE;
-        EventObject aEvtObj( (XHyphenator *) this );
+        EventObject	aEvtObj( (XHyphenator *) this );
         aEvtListeners.disposeAndClear( aEvtObj );
     }
 }
@@ -861,7 +861,7 @@ void SAL_CALL
     Hyphenator::addEventListener( const Reference< XEventListener >& rxListener )
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     if (!bDisposing && rxListener.is())
         aEvtListeners.addInterface( rxListener );
@@ -872,7 +872,7 @@ void SAL_CALL
     Hyphenator::removeEventListener( const Reference< XEventListener >& rxListener )
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     if (!bDisposing && rxListener.is())
         aEvtListeners.removeInterface( rxListener );
@@ -886,7 +886,7 @@ void SAL_CALL
 OUString SAL_CALL Hyphenator::getImplementationName()
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     return getImplementationName_Static();
 }
@@ -895,7 +895,7 @@ OUString SAL_CALL Hyphenator::getImplementationName()
 sal_Bool SAL_CALL Hyphenator::supportsService( const OUString& ServiceName )
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     Sequence< OUString > aSNL = getSupportedServiceNames();
     const OUString * pArray = aSNL.getConstArray();
@@ -909,7 +909,7 @@ sal_Bool SAL_CALL Hyphenator::supportsService( const OUString& ServiceName )
 Sequence< OUString > SAL_CALL Hyphenator::getSupportedServiceNames()
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     return getSupportedServiceNames_Static();
 }
@@ -918,9 +918,9 @@ Sequence< OUString > SAL_CALL Hyphenator::getSupportedServiceNames()
 Sequence< OUString > Hyphenator::getSupportedServiceNames_Static()
         throw()
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
-    Sequence< OUString > aSNS( 1 ); // auch mehr als 1 Service moeglich
+    Sequence< OUString > aSNS( 1 );	// auch mehr als 1 Service moeglich
     aSNS.getArray()[0] = A2OU( SN_HYPHENATOR );
     return aSNS;
 }
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
index 71916c4844a9..d7456abc1e73 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #ifndef _LINGU2_HYPHENIMP_HXX_
 #define _LINGU2_HYPHENIMP_HXX_
 
-#include <uno/lbnames.h>            // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
-#include <cppuhelper/implbase1.hxx> // helper for implementations
-#include <cppuhelper/implbase6.hxx> // helper for implementations
+#include <uno/lbnames.h>			// CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
+#include <cppuhelper/implbase1.hxx>	// helper for implementations
+#include <cppuhelper/implbase6.hxx>	// helper for implementations
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceDisplayName.hpp>
@@ -83,15 +83,15 @@ class Hyphenator :
         XServiceDisplayName
     >
 {
-    Sequence< Locale >                      aSuppLocales;
+    Sequence< Locale >						aSuppLocales;
         HDInfo * aDicts;
-        sal_Int32 numdict;
+        sal_Int32 numdict;	
 
-    ::cppu::OInterfaceContainerHelper       aEvtListeners;
-    Reference< XPropertyChangeListener >    xPropHelper;
+    ::cppu::OInterfaceContainerHelper		aEvtListeners;
+    Reference< XPropertyChangeListener >	xPropHelper;
     Reference< XMultiServiceFactory > rSMgr;
     linguistic::PropertyHelper_Hyphen *     pPropHelper;
-    BOOL                                    bDisposing;
+    BOOL									bDisposing;
 
     // disallow copy-constructor and assignment-operator for now
     Hyphenator(const Hyphenator &);
@@ -105,24 +105,24 @@ class Hyphenator :
 
 public:
     Hyphenator();
-
+    
     virtual ~Hyphenator();
 
     // XSupportedLocales (for XHyphenator)
-    virtual Sequence< Locale > SAL_CALL getLocales()
+    virtual Sequence< Locale > SAL_CALL getLocales() 
         throw(RuntimeException);
-    virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale )
+    virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) 
         throw(RuntimeException);
-
+    
     // XHyphenator
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL
     hyphenate( const ::rtl::OUString& aWord,
            const ::com::sun::star::lang::Locale& aLocale,
-           sal_Int16 nMaxLeading,
+           sal_Int16 nMaxLeading,                                                                       
            const ::com::sun::star::beans::PropertyValues& aProperties )
         throw(::com::sun::star::lang::IllegalArgumentException,
               ::com::sun::star::uno::RuntimeException);
-
+                  
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL
     queryAlternativeSpelling( const ::rtl::OUString& aWord,
                   const ::com::sun::star::lang::Locale& aLocale,
@@ -130,43 +130,43 @@ public:
                   const ::com::sun::star::beans::PropertyValues& aProperties )
         throw(::com::sun::star::lang::IllegalArgumentException,
               ::com::sun::star::uno::RuntimeException);
-
+                         
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XPossibleHyphens > SAL_CALL
     createPossibleHyphens( const ::rtl::OUString& aWord,
                    const ::com::sun::star::lang::Locale& aLocale,
                    const ::com::sun::star::beans::PropertyValues& aProperties )
         throw(::com::sun::star::lang::IllegalArgumentException,
-              ::com::sun::star::uno::RuntimeException);
+              ::com::sun::star::uno::RuntimeException);                                                                  
 
     // XLinguServiceEventBroadcaster
-    virtual sal_Bool SAL_CALL
-        addLinguServiceEventListener(
-            const Reference< XLinguServiceEventListener >& rxLstnr )
+    virtual sal_Bool SAL_CALL 
+        addLinguServiceEventListener( 
+            const Reference< XLinguServiceEventListener >& rxLstnr ) 
             throw(RuntimeException);
-    virtual sal_Bool SAL_CALL
-        removeLinguServiceEventListener(
-            const Reference< XLinguServiceEventListener >& rxLstnr )
+    virtual sal_Bool SAL_CALL 
+        removeLinguServiceEventListener( 
+            const Reference< XLinguServiceEventListener >& rxLstnr ) 
             throw(RuntimeException);
-
+    
     // XServiceDisplayName
-    virtual OUString SAL_CALL
-        getServiceDisplayName( const Locale& rLocale )
+    virtual OUString SAL_CALL 
+        getServiceDisplayName( const Locale& rLocale ) 
             throw(RuntimeException);
 
     // XInitialization
-    virtual void SAL_CALL
-        initialize( const Sequence< Any >& rArguments )
+    virtual void SAL_CALL 
+        initialize( const Sequence< Any >& rArguments ) 
             throw(Exception, RuntimeException);
 
     // XComponent
-    virtual void SAL_CALL
-        dispose()
+    virtual void SAL_CALL 
+        dispose() 
             throw(RuntimeException);
-    virtual void SAL_CALL
-        addEventListener( const Reference< XEventListener >& rxListener )
+    virtual void SAL_CALL 
+        addEventListener( const Reference< XEventListener >& rxListener ) 
             throw(RuntimeException);
-    virtual void SAL_CALL
-        removeEventListener( const Reference< XEventListener >& rxListener )
+    virtual void SAL_CALL 
+        removeEventListener( const Reference< XEventListener >& rxListener ) 
             throw(RuntimeException);
 
     ////////////////////////////////////////////////////////////
@@ -174,20 +174,20 @@ public:
     //
 
     // XServiceInfo
-    virtual OUString SAL_CALL
-        getImplementationName()
+    virtual OUString SAL_CALL 
+        getImplementationName() 
             throw(RuntimeException);
-    virtual sal_Bool SAL_CALL
-        supportsService( const OUString& rServiceName )
+    virtual sal_Bool SAL_CALL 
+        supportsService( const OUString& rServiceName ) 
             throw(RuntimeException);
-    virtual Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
+    virtual Sequence< OUString > SAL_CALL 
+        getSupportedServiceNames() 
             throw(RuntimeException);
 
 
-    static inline OUString
+    static inline OUString	
         getImplementationName_Static() throw();
-    static Sequence< OUString >
+    static Sequence< OUString >	
         getSupportedServiceNames_Static() throw();
 
 
diff --git a/lingucomponent/source/languageguessing/altstrfunc.cxx b/lingucomponent/source/languageguessing/altstrfunc.cxx
index 35e989a4f7e7..5461a2267ab0 100644
--- a/lingucomponent/source/languageguessing/altstrfunc.cxx
+++ b/lingucomponent/source/languageguessing/altstrfunc.cxx
@@ -2,7 +2,7 @@
 /***************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/lingucomponent/source/languageguessing/altstrfunc.hxx b/lingucomponent/source/languageguessing/altstrfunc.hxx
index 6a45106b9bcf..5ddeda4eea3b 100644
--- a/lingucomponent/source/languageguessing/altstrfunc.hxx
+++ b/lingucomponent/source/languageguessing/altstrfunc.hxx
@@ -2,7 +2,7 @@
 /***************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/lingucomponent/source/languageguessing/guess.cxx b/lingucomponent/source/languageguessing/guess.cxx
index 3885a417a82a..2a377dc0f891 100644
--- a/lingucomponent/source/languageguessing/guess.cxx
+++ b/lingucomponent/source/languageguessing/guess.cxx
@@ -2,7 +2,7 @@
 /***************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/lingucomponent/source/languageguessing/guess.hxx b/lingucomponent/source/languageguessing/guess.hxx
index 5b601ed7c6e9..b05913bb2721 100644
--- a/lingucomponent/source/languageguessing/guess.hxx
+++ b/lingucomponent/source/languageguessing/guess.hxx
@@ -2,7 +2,7 @@
 /***************************************************************************
  *
  * DO NOT ALTER 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 @@ using namespace std;
  */
 class Guess{
     public:
-
+        
         /**
          * Default init
          */
         Guess();
-
+        
         /**
          * Init from a string like [en-UK-utf8] and the rank
          */
@@ -60,9 +60,9 @@ class Guess{
         string GetLanguage();
         string GetCountry();
         string GetEncoding();
-
+        
         bool operator==(string lang);
-
+        
     protected:
         string language_str;
         string country_str;
diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx
index 0efe7eebf200..d6b2c3c24c05 100644
--- a/lingucomponent/source/languageguessing/guesslang.cxx
+++ b/lingucomponent/source/languageguessing/guesslang.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class LangGuess_Impl :
 public:
     explicit LangGuess_Impl(css::uno::Reference< css::uno::XComponentContext > const & rxContext);
 
-    // XServiceInfo implementation
+    // XServiceInfo	implementation
     virtual OUString SAL_CALL getImplementationName(  ) throw(RuntimeException);
     virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException);
     virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(RuntimeException);
diff --git a/lingucomponent/source/languageguessing/simpleguesser.cxx b/lingucomponent/source/languageguessing/simpleguesser.cxx
index b4c37d490c74..8bc444b8f586 100644
--- a/lingucomponent/source/languageguessing/simpleguesser.cxx
+++ b/lingucomponent/source/languageguessing/simpleguesser.cxx
@@ -2,7 +2,7 @@
 /***************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/lingucomponent/source/languageguessing/simpleguesser.hxx b/lingucomponent/source/languageguessing/simpleguesser.hxx
index 4a164c7e35da..ee76b0781dcf 100644
--- a/lingucomponent/source/languageguessing/simpleguesser.hxx
+++ b/lingucomponent/source/languageguessing/simpleguesser.hxx
@@ -2,7 +2,7 @@
 /***************************************************************************
  *
  * DO NOT ALTER 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 @@ class SimpleGuesser{
 public:
     /**inits the object with conf file "./conf.txt"*/
     SimpleGuesser();
-
+    
     /** Compares the current Simpleguesser with an other
      * @param SimpleGuesser& sg the other guesser to compare
      */
@@ -55,51 +55,51 @@ public:
      * destroy the object
      */
     ~SimpleGuesser();
-
+    
     /**
      * Analyze a text and return the most probable languages of the text
      * @param char* text is the text to analyze
      * @return the list of guess
      */
     vector<Guess> GuessLanguage(char* text);
-
+    
     /**
      * Analyze a text and return the most probable language of the text
      * @param char* text is the text to analyze
      * @return the guess (containing language)
      */
     Guess GuessPrimaryLanguage(char* text);
-
+    
     /**
      * List all available languages (possibly to be in guesses)
      * @return the list of languages
      */
     vector<Guess> GetAvailableLanguages();
-
+    
     /**
      * List all languages (possibly in guesses or not)
      * @return the list of languages
      */
     vector<Guess> GetAllManagedLanguages();
-
+    
     /**
      * List all Unavailable languages (disable for any reason)
      * @return the list of languages
      */
     vector<Guess> GetUnavailableLanguages();
-
+    
     /**
      * Mark a language enabled
      * @param string lang the language to enable (build like language-COUNTRY-encoding)
      */
     void EnableLanguage(string lang);
-
+    
     /**
      * Mark a language disabled
      * @param string lang the language to disable (build like language-COUNTRY-encoding)
      */
     void DisableLanguage(string lang);
-
+    
     /**
      * Load a new DB of fingerprints
      * @param const char* thePathOfConfFile self explaining
@@ -108,13 +108,13 @@ public:
     void SetDBPath(const char* thePathOfConfFile, const char* prefix);
 
 protected:
-
+    
     //Where typical fingerprints (n-gram tables) are stored
     void* h;
-
+    
     //Is used to select languages into the fingerprints DB, the mask is used to indicate if we want enabled disabled or both
     vector<Guess> GetManagedLanguages(const char mask);
-
+    
     //Like getManagedLanguages, this function enable or disable a language and it depends of the mask
     void XableLanguage(string lang, char mask);
 };
diff --git a/lingucomponent/source/lingutil/lingutil.cxx b/lingucomponent/source/lingutil/lingutil.cxx
index de7cdc3f4539..728a67399f3d 100644
--- a/lingucomponent/source/lingutil/lingutil.cxx
+++ b/lingucomponent/source/lingutil/lingutil.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,33 +129,33 @@ std::vector< SvtLinguConfigDictionaryEntry > GetOldStyleDics( const char *pDicTy
     bool bThes  = false;
     if (strcmp( pDicType, "DICT" ) == 0)
     {
-        aFormatName     = A2OU("DICT_SPELL");
-        aDicExtension   = String::CreateFromAscii( ".dic" );
+        aFormatName		= A2OU("DICT_SPELL");
+        aDicExtension	= String::CreateFromAscii( ".dic" );
 #ifdef SYSTEM_DICTS
-        aSystemDir      = A2OU( DICT_SYSTEM_DIR );
-        aSystemSuffix       = aDicExtension;
+        aSystemDir		= A2OU( DICT_SYSTEM_DIR );
+        aSystemSuffix		= aDicExtension;
 #endif
         bSpell = true;
     }
     else if (strcmp( pDicType, "HYPH" ) == 0)
     {
-        aFormatName     = A2OU("DICT_HYPH");
-        aDicExtension   = String::CreateFromAscii( ".dic" );
+        aFormatName		= A2OU("DICT_HYPH");
+        aDicExtension	= String::CreateFromAscii( ".dic" );
 #ifdef SYSTEM_DICTS
-        aSystemDir      = A2OU( HYPH_SYSTEM_DIR );
-        aSystemPrefix       = A2OU( "hyph_" );
-        aSystemSuffix       = aDicExtension;
+        aSystemDir		= A2OU( HYPH_SYSTEM_DIR );
+        aSystemPrefix		= A2OU( "hyph_" );
+        aSystemSuffix		= aDicExtension;
 #endif
         bHyph = true;
     }
     else if (strcmp( pDicType, "THES" ) == 0)
     {
-        aFormatName     = A2OU("DICT_THES");
-        aDicExtension   = String::CreateFromAscii( ".dat" );
+        aFormatName		= A2OU("DICT_THES");
+        aDicExtension	= String::CreateFromAscii( ".dat" );
 #ifdef SYSTEM_DICTS
-        aSystemDir      = A2OU( THES_SYSTEM_DIR );
-        aSystemPrefix       = A2OU( "th_" );
-        aSystemSuffix       = A2OU( "_v2.dat" );
+        aSystemDir		= A2OU( THES_SYSTEM_DIR );
+        aSystemPrefix		= A2OU( "th_" );
+        aSystemSuffix		= A2OU( "_v2.dat" );
 #endif
         bThes = true;
     }
diff --git a/lingucomponent/source/lingutil/lingutil.hxx b/lingucomponent/source/lingutil/lingutil.hxx
index 7b0299c58267..f0fb20de4451 100644
--- a/lingucomponent/source/lingutil/lingutil.hxx
+++ b/lingucomponent/source/lingutil/lingutil.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ String GetDirectoryPathFromFileURL( const String &rFileURL );
 // to be use to get a short path name under Windows that still can be used with
 // the 'fopen' call. This is necessary since under Windows there seems to be
 // a restriction of only about 110-130 characters length to a path name in order
-// for it to work with 'fopen'. And that length is usually easily exceeded
+// for it to work with 'fopen'. And that length is usually easily exceeded 
 // when using extensions...
 rtl::OString Win_GetShortPathName( const rtl::OUString &rLongPathName );
 #endif
diff --git a/lingucomponent/source/spellcheck/macosxspell/macreg.cxx b/lingucomponent/source/spellcheck/macosxspell/macreg.cxx
index 5ca87d292c7c..c9b3cb3f9135 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macreg.cxx
+++ b/lingucomponent/source/spellcheck/macosxspell/macreg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 "precompiled_lingucomponent.hxx"
 
 
-#include <cppuhelper/factory.hxx>   // helper for factories
+#include <cppuhelper/factory.hxx>	// helper for factories
 #include <rtl/string.hxx>
 
 #include <com/sun/star/registry/XRegistryKey.hpp>
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx b/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
index f9392cf379bd..2b32e810df9d 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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/linguistic2/XSearchableDictionaryList.hpp>
 
 #include <com/sun/star/linguistic2/SpellFailure.hpp>
-#include <cppuhelper/factory.hxx>   // helper for factories
+#include <cppuhelper/factory.hxx>	// helper for factories
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <tools/debug.hxx>
 #include <unotools/processfactory.hxx>
@@ -91,7 +91,7 @@ const sal_Char *dbg_dump(rtl_uString *pStr)
 ///////////////////////////////////////////////////////////////////////////
 
 MacSpellChecker::MacSpellChecker() :
-    aEvtListeners   ( GetLinguMutex() )
+    aEvtListeners	( GetLinguMutex() )
 {
 //    aDicts = NULL;
     aDEncs = NULL;
@@ -101,7 +101,7 @@ MacSpellChecker::MacSpellChecker() :
     pPropHelper = NULL;
     numdict = 0;
     NSApplicationLoad();
-    NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+    NSAutoreleasePool* pool	= [[NSAutoreleasePool alloc] init];
     macSpell = [NSSpellChecker sharedSpellChecker];
     macTag = [NSSpellChecker uniqueSpellDocumentTag];
     [pool release];
@@ -134,11 +134,11 @@ PropertyHelper_Spell & MacSpellChecker::GetPropHelper_Impl()
 {
     if (!pPropHelper)
     {
-        Reference< XPropertySet >   xPropSet( GetLinguProperties(), UNO_QUERY );
+        Reference< XPropertySet	>	xPropSet( GetLinguProperties(), UNO_QUERY );
 
-        pPropHelper = new PropertyHelper_Spell( (XSpellChecker *) this, xPropSet );
+        pPropHelper	= new PropertyHelper_Spell( (XSpellChecker *) this, xPropSet );
         xPropHelper = pPropHelper;
-        pPropHelper->AddAsPropListener();   //! after a reference is established
+        pPropHelper->AddAsPropListener();	//! after a reference is established
     }
     return *pPropHelper;
 }
@@ -147,7 +147,7 @@ PropertyHelper_Spell & MacSpellChecker::GetPropHelper_Impl()
 Sequence< Locale > SAL_CALL MacSpellChecker::getLocales()
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
         // this routine should return the locales supported by the installed
         // dictionaries.  So here we need to parse both the user edited
@@ -258,7 +258,7 @@ Sequence< Locale > SAL_CALL MacSpellChecker::getLocales()
 sal_Bool SAL_CALL MacSpellChecker::hasLocale(const Locale& rLocale)
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     BOOL bRes = FALSE;
     if (!aSuppLocales.getLength())
@@ -302,7 +302,7 @@ INT16 MacSpellChecker::GetSpellFailure( const OUString &rWord, const Locale &rLo
     if (n)
     {
         aEnc = 0;
-        NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+        NSAutoreleasePool* pool	= [[NSAutoreleasePool alloc] init];
         NSString* aNSStr = [[NSString alloc] initWithCharacters: nWord.getStr() length: nWord.getLength()];
         NSString* aLang = [[NSString alloc] initWithCharacters: rLocale.Language.getStr() length: rLocale.Language.getLength()];
         if(rLocale.Country.getLength()>0)
@@ -343,7 +343,7 @@ sal_Bool SAL_CALL
             const PropertyValues& rProperties )
         throw(IllegalArgumentException, RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
      if (rLocale == Locale()  ||  !rWord.getLength())
         return TRUE;
@@ -409,7 +409,7 @@ Reference< XSpellAlternatives >
 
     if (n)
     {
-        NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+        NSAutoreleasePool* pool	= [[NSAutoreleasePool alloc] init];
         NSString* aNSStr = [[NSString alloc] initWithCharacters: nWord.getStr() length: nWord.getLength()];
         NSString* aLang = [[NSString alloc] initWithCharacters: rLocale.Language.getStr() length: rLocale.Language.getLength() ];
         if(rLocale.Country.getLength()>0)
@@ -457,7 +457,7 @@ Reference< XSpellAlternatives > SAL_CALL
             const PropertyValues& rProperties )
         throw(IllegalArgumentException, RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
      if (rLocale == Locale()  ||  !rWord.getLength())
         return NULL;
@@ -493,7 +493,7 @@ sal_Bool SAL_CALL
             const Reference< XLinguServiceEventListener >& rxLstnr )
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     BOOL bRes = FALSE;
     if (!bDisposing && rxLstnr.is())
@@ -509,7 +509,7 @@ sal_Bool SAL_CALL
             const Reference< XLinguServiceEventListener >& rxLstnr )
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     BOOL bRes = FALSE;
     if (!bDisposing && rxLstnr.is())
@@ -525,7 +525,7 @@ OUString SAL_CALL
     MacSpellChecker::getServiceDisplayName( const Locale& /*rLocale*/ )
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
     return A2OU( "Mac OS X Spell Checker" );
 }
 
@@ -534,14 +534,14 @@ void SAL_CALL
     MacSpellChecker::initialize( const Sequence< Any >& rArguments )
         throw(Exception, RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     if (!pPropHelper)
     {
         INT32 nLen = rArguments.getLength();
         if (2 == nLen)
         {
-            Reference< XPropertySet >   xPropSet;
+            Reference< XPropertySet	>	xPropSet;
             rArguments.getConstArray()[0] >>= xPropSet;
             //rArguments.getConstArray()[1] >>= xDicList;
 
@@ -551,7 +551,7 @@ void SAL_CALL
             //! when the object is not longer used.
             pPropHelper = new PropertyHelper_Spell( (XSpellChecker *) this, xPropSet );
             xPropHelper = pPropHelper;
-            pPropHelper->AddAsPropListener();   //! after a reference is established
+            pPropHelper->AddAsPropListener();	//! after a reference is established
         }
         else
             DBG_ERROR( "wrong number of arguments in sequence" );
@@ -564,12 +564,12 @@ void SAL_CALL
     MacSpellChecker::dispose()
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     if (!bDisposing)
     {
         bDisposing = TRUE;
-        EventObject aEvtObj( (XSpellChecker *) this );
+        EventObject	aEvtObj( (XSpellChecker *) this );
         aEvtListeners.disposeAndClear( aEvtObj );
     }
 }
@@ -579,7 +579,7 @@ void SAL_CALL
     MacSpellChecker::addEventListener( const Reference< XEventListener >& rxListener )
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     if (!bDisposing && rxListener.is())
         aEvtListeners.addInterface( rxListener );
@@ -590,7 +590,7 @@ void SAL_CALL
     MacSpellChecker::removeEventListener( const Reference< XEventListener >& rxListener )
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     if (!bDisposing && rxListener.is())
         aEvtListeners.removeInterface( rxListener );
@@ -604,7 +604,7 @@ void SAL_CALL
 OUString SAL_CALL MacSpellChecker::getImplementationName()
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     return getImplementationName_Static();
 }
@@ -613,7 +613,7 @@ OUString SAL_CALL MacSpellChecker::getImplementationName()
 sal_Bool SAL_CALL MacSpellChecker::supportsService( const OUString& ServiceName )
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     Sequence< OUString > aSNL = getSupportedServiceNames();
     const OUString * pArray = aSNL.getConstArray();
@@ -627,7 +627,7 @@ sal_Bool SAL_CALL MacSpellChecker::supportsService( const OUString& ServiceName
 Sequence< OUString > SAL_CALL MacSpellChecker::getSupportedServiceNames()
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     return getSupportedServiceNames_Static();
 }
@@ -636,9 +636,9 @@ Sequence< OUString > SAL_CALL MacSpellChecker::getSupportedServiceNames()
 Sequence< OUString > MacSpellChecker::getSupportedServiceNames_Static()
         throw()
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
-    Sequence< OUString > aSNS( 1 ); // auch mehr als 1 Service moeglich
+    Sequence< OUString > aSNS( 1 );	// auch mehr als 1 Service moeglich
     aSNS.getArray()[0] = A2OU( SN_SPELLCHECKER );
     return aSNS;
 }
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
index 36d43c638fc2..624794e3214c 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 _MACSPELLIMP_H_
 #define _MACSPELLIMP_H_
 
-#include <uno/lbnames.h>            // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
-#include <cppuhelper/implbase1.hxx> // helper for implementations
-#include <cppuhelper/implbase6.hxx> // helper for implementations
+#include <uno/lbnames.h>			// CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
+#include <cppuhelper/implbase1.hxx>	// helper for implementations
+#include <cppuhelper/implbase6.hxx>	// helper for implementations
 
 #ifdef MACOSX
 #include <premac.h>
@@ -82,13 +82,13 @@ class MacSpellChecker :
         Locale *                           aDLocs;
         OUString *                         aDNames;
         sal_Int32                          numdict;
-        NSSpellChecker *                    macSpell;
-        int                                 macTag;   //unique tag for this doc
+        NSSpellChecker *					macSpell;
+        int 								macTag;   //unique tag for this doc
 
-    ::cppu::OInterfaceContainerHelper       aEvtListeners;
-    Reference< XPropertyChangeListener >    xPropHelper;
+    ::cppu::OInterfaceContainerHelper		aEvtListeners;
+    Reference< XPropertyChangeListener >	xPropHelper;
     linguistic::PropertyHelper_Spell *      pPropHelper;
-    BOOL                                    bDisposing;
+    BOOL									bDisposing;
 
     // disallow copy-constructor and assignment-operator for now
     MacSpellChecker(const MacSpellChecker &);
@@ -100,7 +100,7 @@ class MacSpellChecker :
         return pPropHelper ? *pPropHelper : GetPropHelper_Impl();
     }
 
-    INT16   GetSpellFailure( const OUString &rWord, const Locale &rLocale );
+    INT16	GetSpellFailure( const OUString &rWord, const Locale &rLocale );
     Reference< XSpellAlternatives >
             GetProposals( const OUString &rWord, const Locale &rLocale );
 
@@ -109,54 +109,54 @@ public:
     virtual ~MacSpellChecker();
 
     // XSupportedLocales (for XSpellChecker)
-    virtual Sequence< Locale > SAL_CALL
-        getLocales()
+    virtual Sequence< Locale > SAL_CALL 
+        getLocales() 
             throw(RuntimeException);
-    virtual sal_Bool SAL_CALL
-        hasLocale( const Locale& rLocale )
+    virtual sal_Bool SAL_CALL 
+        hasLocale( const Locale& rLocale ) 
             throw(RuntimeException);
 
     // XSpellChecker
-    virtual sal_Bool SAL_CALL
-        isValid( const OUString& rWord, const Locale& rLocale,
-                const PropertyValues& rProperties )
-            throw(IllegalArgumentException,
+    virtual sal_Bool SAL_CALL 
+        isValid( const OUString& rWord, const Locale& rLocale, 
+                const PropertyValues& rProperties ) 
+            throw(IllegalArgumentException, 
                   RuntimeException);
-    virtual Reference< XSpellAlternatives > SAL_CALL
-        spell( const OUString& rWord, const Locale& rLocale,
-                const PropertyValues& rProperties )
-            throw(IllegalArgumentException,
+    virtual Reference< XSpellAlternatives > SAL_CALL 
+        spell( const OUString& rWord, const Locale& rLocale, 
+                const PropertyValues& rProperties ) 
+            throw(IllegalArgumentException, 
                   RuntimeException);
 
     // XLinguServiceEventBroadcaster
-    virtual sal_Bool SAL_CALL
-        addLinguServiceEventListener(
-            const Reference< XLinguServiceEventListener >& rxLstnr )
+    virtual sal_Bool SAL_CALL 
+        addLinguServiceEventListener( 
+            const Reference< XLinguServiceEventListener >& rxLstnr ) 
             throw(RuntimeException);
-    virtual sal_Bool SAL_CALL
-        removeLinguServiceEventListener(
-            const Reference< XLinguServiceEventListener >& rxLstnr )
+    virtual sal_Bool SAL_CALL 
+        removeLinguServiceEventListener( 
+            const Reference< XLinguServiceEventListener >& rxLstnr ) 
             throw(RuntimeException);
-
+    
     // XServiceDisplayName
-    virtual OUString SAL_CALL
-        getServiceDisplayName( const Locale& rLocale )
+    virtual OUString SAL_CALL 
+        getServiceDisplayName( const Locale& rLocale ) 
             throw(RuntimeException);
 
     // XInitialization
-    virtual void SAL_CALL
-        initialize( const Sequence< Any >& rArguments )
+    virtual void SAL_CALL 
+        initialize( const Sequence< Any >& rArguments ) 
             throw(Exception, RuntimeException);
 
     // XComponent
-    virtual void SAL_CALL
-        dispose()
+    virtual void SAL_CALL 
+        dispose() 
             throw(RuntimeException);
-    virtual void SAL_CALL
-        addEventListener( const Reference< XEventListener >& rxListener )
+    virtual void SAL_CALL 
+        addEventListener( const Reference< XEventListener >& rxListener ) 
             throw(RuntimeException);
-    virtual void SAL_CALL
-        removeEventListener( const Reference< XEventListener >& rxListener )
+    virtual void SAL_CALL 
+        removeEventListener( const Reference< XEventListener >& rxListener ) 
             throw(RuntimeException);
 
     ////////////////////////////////////////////////////////////
@@ -164,20 +164,20 @@ public:
     //
 
     // XServiceInfo
-    virtual OUString SAL_CALL
-        getImplementationName()
+    virtual OUString SAL_CALL 
+        getImplementationName() 
             throw(RuntimeException);
-    virtual sal_Bool SAL_CALL
-        supportsService( const OUString& rServiceName )
+    virtual sal_Bool SAL_CALL 
+        supportsService( const OUString& rServiceName ) 
             throw(RuntimeException);
-    virtual Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
+    virtual Sequence< OUString > SAL_CALL 
+        getSupportedServiceNames() 
             throw(RuntimeException);
 
 
-    static inline OUString
+    static inline OUString	
         getImplementationName_Static() throw();
-    static Sequence< OUString >
+    static Sequence< OUString >	
         getSupportedServiceNames_Static() throw();
 };
 
diff --git a/lingucomponent/source/spellcheck/spell/sreg.cxx b/lingucomponent/source/spellcheck/spell/sreg.cxx
index 3508e9b319ba..233f818bba91 100644
--- a/lingucomponent/source/spellcheck/spell/sreg.cxx
+++ b/lingucomponent/source/spellcheck/spell/sreg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 "precompiled_lingucomponent.hxx"
 
 
-#include <cppuhelper/factory.hxx>   // helper for factories
+#include <cppuhelper/factory.hxx>	// helper for factories
 #include <rtl/string.hxx>
 
 #include <com/sun/star/registry/XRegistryKey.hpp>
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 559cffe21e30..1cc0cec62c89 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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/linguistic2/XSearchableDictionaryList.hpp>
 
 #include <com/sun/star/linguistic2/SpellFailure.hpp>
-#include <cppuhelper/factory.hxx>   // helper for factories
+#include <cppuhelper/factory.hxx>	// helper for factories
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <tools/debug.hxx>
 #include <unotools/processfactory.hxx>
@@ -74,7 +74,7 @@ using namespace linguistic;
 ///////////////////////////////////////////////////////////////////////////
 
 SpellChecker::SpellChecker() :
-    aEvtListeners   ( GetLinguMutex() )
+    aEvtListeners	( GetLinguMutex() )
 {
         aDicts = NULL;
     aDEncs = NULL;
@@ -112,11 +112,11 @@ PropertyHelper_Spell & SpellChecker::GetPropHelper_Impl()
 {
     if (!pPropHelper)
     {
-        Reference< XPropertySet >   xPropSet( GetLinguProperties(), UNO_QUERY );
+        Reference< XPropertySet	>	xPropSet( GetLinguProperties(), UNO_QUERY );
 
-        pPropHelper = new PropertyHelper_Spell( (XSpellChecker *) this, xPropSet );
+        pPropHelper	= new PropertyHelper_Spell( (XSpellChecker *) this, xPropSet );
         xPropHelper = pPropHelper;
-        pPropHelper->AddAsPropListener();   //! after a reference is established
+        pPropHelper->AddAsPropListener();	//! after a reference is established
     }
     return *pPropHelper;
 }
@@ -252,7 +252,7 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales()
 sal_Bool SAL_CALL SpellChecker::hasLocale(const Locale& rLocale)
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     BOOL bRes = FALSE;
     if (!aSuppLocales.getLength())
@@ -362,7 +362,7 @@ sal_Bool SAL_CALL
             const PropertyValues& rProperties )
         throw(IllegalArgumentException, RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
      if (rLocale == Locale()  ||  !rWord.getLength())
         return TRUE;
@@ -488,7 +488,7 @@ Reference< XSpellAlternatives > SAL_CALL
             const PropertyValues& rProperties )
         throw(IllegalArgumentException, RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
      if (rLocale == Locale()  ||  !rWord.getLength())
         return NULL;
@@ -524,7 +524,7 @@ sal_Bool SAL_CALL
             const Reference< XLinguServiceEventListener >& rxLstnr )
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     BOOL bRes = FALSE;
     if (!bDisposing && rxLstnr.is())
@@ -540,7 +540,7 @@ sal_Bool SAL_CALL
             const Reference< XLinguServiceEventListener >& rxLstnr )
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     BOOL bRes = FALSE;
     if (!bDisposing && rxLstnr.is())
@@ -556,7 +556,7 @@ OUString SAL_CALL
     SpellChecker::getServiceDisplayName( const Locale& /*rLocale*/ )
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
     return A2OU( "Hunspell SpellChecker" );
 }
 
@@ -565,14 +565,14 @@ void SAL_CALL
     SpellChecker::initialize( const Sequence< Any >& rArguments )
         throw(Exception, RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     if (!pPropHelper)
     {
         INT32 nLen = rArguments.getLength();
         if (2 == nLen)
         {
-            Reference< XPropertySet >   xPropSet;
+            Reference< XPropertySet	>	xPropSet;
             rArguments.getConstArray()[0] >>= xPropSet;
             //rArguments.getConstArray()[1] >>= xDicList;
 
@@ -582,7 +582,7 @@ void SAL_CALL
             //! when the object is not longer used.
             pPropHelper = new PropertyHelper_Spell( (XSpellChecker *) this, xPropSet );
             xPropHelper = pPropHelper;
-            pPropHelper->AddAsPropListener();   //! after a reference is established
+            pPropHelper->AddAsPropListener();	//! after a reference is established
         }
         else {
             DBG_ERROR( "wrong number of arguments in sequence" );
@@ -596,12 +596,12 @@ void SAL_CALL
     SpellChecker::dispose()
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     if (!bDisposing)
     {
         bDisposing = TRUE;
-        EventObject aEvtObj( (XSpellChecker *) this );
+        EventObject	aEvtObj( (XSpellChecker *) this );
         aEvtListeners.disposeAndClear( aEvtObj );
     }
 }
@@ -611,7 +611,7 @@ void SAL_CALL
     SpellChecker::addEventListener( const Reference< XEventListener >& rxListener )
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     if (!bDisposing && rxListener.is())
         aEvtListeners.addInterface( rxListener );
@@ -622,7 +622,7 @@ void SAL_CALL
     SpellChecker::removeEventListener( const Reference< XEventListener >& rxListener )
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     if (!bDisposing && rxListener.is())
         aEvtListeners.removeInterface( rxListener );
@@ -636,7 +636,7 @@ void SAL_CALL
 OUString SAL_CALL SpellChecker::getImplementationName()
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     return getImplementationName_Static();
 }
@@ -645,7 +645,7 @@ OUString SAL_CALL SpellChecker::getImplementationName()
 sal_Bool SAL_CALL SpellChecker::supportsService( const OUString& ServiceName )
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     Sequence< OUString > aSNL = getSupportedServiceNames();
     const OUString * pArray = aSNL.getConstArray();
@@ -659,7 +659,7 @@ sal_Bool SAL_CALL SpellChecker::supportsService( const OUString& ServiceName )
 Sequence< OUString > SAL_CALL SpellChecker::getSupportedServiceNames()
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     return getSupportedServiceNames_Static();
 }
@@ -668,9 +668,9 @@ Sequence< OUString > SAL_CALL SpellChecker::getSupportedServiceNames()
 Sequence< OUString > SpellChecker::getSupportedServiceNames_Static()
         throw()
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
-    Sequence< OUString > aSNS( 1 ); // auch mehr als 1 Service moeglich
+    Sequence< OUString > aSNS( 1 );	// auch mehr als 1 Service moeglich
     aSNS.getArray()[0] = A2OU( SN_SPELLCHECKER );
     return aSNS;
 }
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.hxx b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
index 7dfa8ea38ced..937681e117a8 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.hxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 _LINGU2_SPELLIMP_HXX_
 #define _LINGU2_SPELLIMP_HXX_
 
-#include <uno/lbnames.h>            // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
-#include <cppuhelper/implbase1.hxx> // helper for implementations
-#include <cppuhelper/implbase6.hxx> // helper for implementations
+#include <uno/lbnames.h>			// CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
+#include <cppuhelper/implbase1.hxx>	// helper for implementations
+#include <cppuhelper/implbase6.hxx>	// helper for implementations
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceDisplayName.hpp>
@@ -76,10 +76,10 @@ class SpellChecker :
         OUString *                         aDNames;
         sal_Int32                          numdict;
 
-    ::cppu::OInterfaceContainerHelper       aEvtListeners;
-    Reference< XPropertyChangeListener >    xPropHelper;
+    ::cppu::OInterfaceContainerHelper		aEvtListeners;
+    Reference< XPropertyChangeListener >	xPropHelper;
     linguistic::PropertyHelper_Spell *      pPropHelper;
-    BOOL                                    bDisposing;
+    BOOL									bDisposing;
 
     // disallow copy-constructor and assignment-operator for now
     SpellChecker(const SpellChecker &);
@@ -91,7 +91,7 @@ class SpellChecker :
         return pPropHelper ? *pPropHelper : GetPropHelper_Impl();
     }
 
-    INT16   GetSpellFailure( const OUString &rWord, const Locale &rLocale );
+    INT16	GetSpellFailure( const OUString &rWord, const Locale &rLocale );
     Reference< XSpellAlternatives >
             GetProposals( const OUString &rWord, const Locale &rLocale );
 
@@ -100,54 +100,54 @@ public:
     virtual ~SpellChecker();
 
     // XSupportedLocales (for XSpellChecker)
-    virtual Sequence< Locale > SAL_CALL
-        getLocales()
+    virtual Sequence< Locale > SAL_CALL 
+        getLocales() 
             throw(RuntimeException);
-    virtual sal_Bool SAL_CALL
-        hasLocale( const Locale& rLocale )
+    virtual sal_Bool SAL_CALL 
+        hasLocale( const Locale& rLocale ) 
             throw(RuntimeException);
 
     // XSpellChecker
-    virtual sal_Bool SAL_CALL
-        isValid( const OUString& rWord, const Locale& rLocale,
-                const PropertyValues& rProperties )
-            throw(IllegalArgumentException,
+    virtual sal_Bool SAL_CALL 
+        isValid( const OUString& rWord, const Locale& rLocale, 
+                const PropertyValues& rProperties ) 
+            throw(IllegalArgumentException, 
                   RuntimeException);
-    virtual Reference< XSpellAlternatives > SAL_CALL
-        spell( const OUString& rWord, const Locale& rLocale,
-                const PropertyValues& rProperties )
-            throw(IllegalArgumentException,
+    virtual Reference< XSpellAlternatives > SAL_CALL 
+        spell( const OUString& rWord, const Locale& rLocale, 
+                const PropertyValues& rProperties ) 
+            throw(IllegalArgumentException, 
                   RuntimeException);
 
     // XLinguServiceEventBroadcaster
-    virtual sal_Bool SAL_CALL
-        addLinguServiceEventListener(
-            const Reference< XLinguServiceEventListener >& rxLstnr )
+    virtual sal_Bool SAL_CALL 
+        addLinguServiceEventListener( 
+            const Reference< XLinguServiceEventListener >& rxLstnr ) 
             throw(RuntimeException);
-    virtual sal_Bool SAL_CALL
-        removeLinguServiceEventListener(
-            const Reference< XLinguServiceEventListener >& rxLstnr )
+    virtual sal_Bool SAL_CALL 
+        removeLinguServiceEventListener( 
+            const Reference< XLinguServiceEventListener >& rxLstnr ) 
             throw(RuntimeException);
-
+    
     // XServiceDisplayName
-    virtual OUString SAL_CALL
-        getServiceDisplayName( const Locale& rLocale )
+    virtual OUString SAL_CALL 
+        getServiceDisplayName( const Locale& rLocale ) 
             throw(RuntimeException);
 
     // XInitialization
-    virtual void SAL_CALL
-        initialize( const Sequence< Any >& rArguments )
+    virtual void SAL_CALL 
+        initialize( const Sequence< Any >& rArguments ) 
             throw(Exception, RuntimeException);
 
     // XComponent
-    virtual void SAL_CALL
-        dispose()
+    virtual void SAL_CALL 
+        dispose() 
             throw(RuntimeException);
-    virtual void SAL_CALL
-        addEventListener( const Reference< XEventListener >& rxListener )
+    virtual void SAL_CALL 
+        addEventListener( const Reference< XEventListener >& rxListener ) 
             throw(RuntimeException);
-    virtual void SAL_CALL
-        removeEventListener( const Reference< XEventListener >& rxListener )
+    virtual void SAL_CALL 
+        removeEventListener( const Reference< XEventListener >& rxListener ) 
             throw(RuntimeException);
 
     ////////////////////////////////////////////////////////////
@@ -155,20 +155,20 @@ public:
     //
 
     // XServiceInfo
-    virtual OUString SAL_CALL
-        getImplementationName()
+    virtual OUString SAL_CALL 
+        getImplementationName() 
             throw(RuntimeException);
-    virtual sal_Bool SAL_CALL
-        supportsService( const OUString& rServiceName )
+    virtual sal_Bool SAL_CALL 
+        supportsService( const OUString& rServiceName ) 
             throw(RuntimeException);
-    virtual Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
+    virtual Sequence< OUString > SAL_CALL 
+        getSupportedServiceNames() 
             throw(RuntimeException);
 
 
-    static inline OUString
+    static inline OUString	
         getImplementationName_Static() throw();
-    static Sequence< OUString >
+    static Sequence< OUString >	
         getSupportedServiceNames_Static() throw();
 };
 
diff --git a/lingucomponent/source/thesaurus/libnth/nthesdta.cxx b/lingucomponent/source/thesaurus/libnth/nthesdta.cxx
index a3ed73c6150f..35840b9f5d12 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesdta.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesdta.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ using namespace com::sun::star::linguistic2;
 
 namespace linguistic
 {
-
+    
 ///////////////////////////////////////////////////////////////////////////
 
-Meaning::Meaning(
+Meaning::Meaning( 
 #if 0
             const OUString &rTerm, INT16 nLang,
             const PropertyHelper_Thes &rHelper ) :
@@ -61,7 +61,7 @@ Meaning::Meaning(
     aSyn        ( Sequence< OUString >(1) ),
     aTerm       (rTerm),
     nLanguage   (nLang)
-
+        
 {
 #if 0
     // this is for future use by a german thesaurus when one exists
@@ -78,7 +78,7 @@ Meaning::~Meaning()
 OUString SAL_CALL Meaning::getMeaning()
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
     return aTerm;
 }
 
@@ -86,7 +86,7 @@ OUString SAL_CALL Meaning::getMeaning()
 Sequence< OUString > SAL_CALL Meaning::querySynonyms()
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
         return aSyn;
 }
 
@@ -105,7 +105,7 @@ void Meaning::SetMeaning( const OUString &rTerm )
 
 ///////////////////////////////////////////////////////////////////////////
 
-}   // namespace linguistic
+}	// namespace linguistic
 
 
 
diff --git a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
index 989a2ea4b480..fa8b3db6e9b0 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <tools/solar.h>
 
-#include <uno/lbnames.h>            // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
-#include <cppuhelper/implbase1.hxx> // helper for implementations
+#include <uno/lbnames.h>			// CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
+#include <cppuhelper/implbase1.hxx>	// helper for implementations
 
 
 namespace linguistic
@@ -47,13 +47,13 @@ class Meaning :
         ::com::sun::star::linguistic2::XMeaning
     >
 {
-    ::com::sun::star::uno::Sequence< ::rtl::OUString >  aSyn;   // list of synonyms, may be empty.
-    ::rtl::OUString         aTerm;
-    INT16               nLanguage;
+    ::com::sun::star::uno::Sequence< ::rtl::OUString >	aSyn;	// list of synonyms, may be empty.
+    ::rtl::OUString			aTerm;
+    INT16				nLanguage;
 
 #if 0
         // this is for future use by a German thesaurus
-        BOOL                            bIsGermanPreReform;
+        BOOL                            bIsGermanPreReform; 
 #endif
 
     // disallow copy-constructor and assignment-operator for now
@@ -79,7 +79,7 @@ public:
 
     // non-interface specific functions
         void    SetSynonyms(
-                    const ::com::sun::star::uno::Sequence< ::rtl::OUString >
+                    const ::com::sun::star::uno::Sequence< ::rtl::OUString > 
                     &rSyn );
 
         void    SetMeaning(const ::rtl::OUString  &rTerm );
@@ -90,7 +90,7 @@ public:
 
 ///////////////////////////////////////////////////////////////////////////
 
-}   // namespace linguistic
+}	// namespace linguistic
 
 #endif
 
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
index 834514d71e43..243503ef8576 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <stdio.h>
 #include <com/sun/star/uno/Reference.h>
 
-#include <cppuhelper/factory.hxx>   // helper for factories
+#include <cppuhelper/factory.hxx>	// helper for factories
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <i18npool/mslangid.hxx>
@@ -92,7 +92,7 @@ static uno::Reference< XLinguServiceManager > GetLngSvcMgr_Impl()
 }
 
 Thesaurus::Thesaurus() :
-    aEvtListeners   ( GetLinguMutex() )
+    aEvtListeners	( GetLinguMutex() )
 {
     bDisposing = FALSE;
     pPropHelper = NULL;
@@ -141,11 +141,11 @@ PropertyHelper_Thes & Thesaurus::GetPropHelper_Impl()
 {
     if (!pPropHelper)
     {
-        Reference< XPropertySet >   xPropSet( GetLinguProperties(), UNO_QUERY );
+        Reference< XPropertySet	>	xPropSet( GetLinguProperties(), UNO_QUERY );
 
-        pPropHelper = new PropertyHelper_Thes( (XThesaurus *) this, xPropSet );
+        pPropHelper	= new PropertyHelper_Thes( (XThesaurus *) this, xPropSet );
         xPropHelper = pPropHelper;
-        pPropHelper->AddAsPropListener();   //! after a reference is established
+        pPropHelper->AddAsPropListener();	//! after a reference is established
     }
     return *pPropHelper;
 }
@@ -284,7 +284,7 @@ Sequence< Locale > SAL_CALL Thesaurus::getLocales()
 sal_Bool SAL_CALL Thesaurus::hasLocale(const Locale& rLocale)
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     BOOL bRes = FALSE;
     if (!aSuppLocales.getLength())
@@ -567,7 +567,7 @@ OUString SAL_CALL
     Thesaurus::getServiceDisplayName( const Locale& /*rLocale*/ )
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
     return A2OU( "OpenOffice.org New Thesaurus" );
 }
 
@@ -576,14 +576,14 @@ void SAL_CALL
     Thesaurus::initialize( const Sequence< Any >& rArguments )
         throw(Exception, RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     if (!pPropHelper)
     {
         INT32 nLen = rArguments.getLength();
         if (1 == nLen)
         {
-            Reference< XPropertySet >   xPropSet;
+            Reference< XPropertySet	>	xPropSet;
             rArguments.getConstArray()[0] >>= xPropSet;
 
             //! Pointer allows for access of the non-UNO functions.
@@ -592,7 +592,7 @@ void SAL_CALL
             //! when the object is not longer used.
             pPropHelper = new PropertyHelper_Thes( (XThesaurus *) this, xPropSet );
             xPropHelper = pPropHelper;
-            pPropHelper->AddAsPropListener();   //! after a reference is established
+            pPropHelper->AddAsPropListener();	//! after a reference is established
         }
         else
             DBG_ERROR( "wrong number of arguments in sequence" );
@@ -663,12 +663,12 @@ void SAL_CALL
     Thesaurus::dispose()
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     if (!bDisposing)
     {
         bDisposing = TRUE;
-        EventObject aEvtObj( (XThesaurus *) this );
+        EventObject	aEvtObj( (XThesaurus *) this );
         aEvtListeners.disposeAndClear( aEvtObj );
     }
 }
@@ -678,7 +678,7 @@ void SAL_CALL
     Thesaurus::addEventListener( const Reference< XEventListener >& rxListener )
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     if (!bDisposing && rxListener.is())
         aEvtListeners.addInterface( rxListener );
@@ -689,7 +689,7 @@ void SAL_CALL
     Thesaurus::removeEventListener( const Reference< XEventListener >& rxListener )
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     if (!bDisposing && rxListener.is())
         aEvtListeners.removeInterface( rxListener );
@@ -703,7 +703,7 @@ void SAL_CALL
 OUString SAL_CALL Thesaurus::getImplementationName()
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
     return getImplementationName_Static();
 }
 
@@ -711,7 +711,7 @@ OUString SAL_CALL Thesaurus::getImplementationName()
 sal_Bool SAL_CALL Thesaurus::supportsService( const OUString& ServiceName )
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
     Sequence< OUString > aSNL = getSupportedServiceNames();
     const OUString * pArray = aSNL.getConstArray();
@@ -725,7 +725,7 @@ sal_Bool SAL_CALL Thesaurus::supportsService( const OUString& ServiceName )
 Sequence< OUString > SAL_CALL Thesaurus::getSupportedServiceNames()
         throw(RuntimeException)
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
     return getSupportedServiceNames_Static();
 }
 
@@ -733,9 +733,9 @@ Sequence< OUString > SAL_CALL Thesaurus::getSupportedServiceNames()
 Sequence< OUString > Thesaurus::getSupportedServiceNames_Static()
         throw()
 {
-    MutexGuard  aGuard( GetLinguMutex() );
+    MutexGuard	aGuard( GetLinguMutex() );
 
-    Sequence< OUString > aSNS( 1 ); // auch mehr als 1 Service moeglich
+    Sequence< OUString > aSNS( 1 );	// auch mehr als 1 Service moeglich
     aSNS.getArray()[0] = A2OU( SN_THESAURUS );
     return aSNS;
 }
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
index ef1a0b28ba80..ab7401e62b72 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 _LINGU2_THESIMP_HXX_
 #define _LINGU2_THESIMP_HXX_
 
-#include <uno/lbnames.h>            // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
-#include <cppuhelper/implbase1.hxx> // helper for implementations
-#include <cppuhelper/implbase5.hxx> // helper for implementations
+#include <uno/lbnames.h>			// CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
+#include <cppuhelper/implbase1.hxx>	// helper for implementations
+#include <cppuhelper/implbase5.hxx>	// helper for implementations
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/lang/XComponent.hpp>
@@ -85,7 +85,7 @@ class Thesaurus :
 {
     Sequence< Locale >                      aSuppLocales;
 
-    ::cppu::OInterfaceContainerHelper       aEvtListeners;
+    ::cppu::OInterfaceContainerHelper		aEvtListeners;
     Reference< XPropertyChangeListener >    xPropHelper;
     linguistic::PropertyHelper_Thes *       pPropHelper;
     BOOL                                    bDisposing;
@@ -117,39 +117,39 @@ public:
     virtual ~Thesaurus();
 
     // XSupportedLocales (for XThesaurus)
-    virtual Sequence< Locale > SAL_CALL
-        getLocales()
+    virtual Sequence< Locale > SAL_CALL 
+        getLocales() 
             throw(RuntimeException);
-    virtual sal_Bool SAL_CALL
-        hasLocale( const Locale& rLocale )
+    virtual sal_Bool SAL_CALL 
+        hasLocale( const Locale& rLocale ) 
             throw(RuntimeException);
 
     // XThesaurus
-  virtual Sequence< Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL
-        queryMeanings( const OUString& rTerm, const Locale& rLocale,
-                const PropertyValues& rProperties )
-            throw(IllegalArgumentException,
+  virtual Sequence< Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL 
+        queryMeanings( const OUString& rTerm, const Locale& rLocale, 
+                const PropertyValues& rProperties ) 
+            throw(IllegalArgumentException, 
                   RuntimeException);
 
     // XServiceDisplayName
-    virtual OUString SAL_CALL
-        getServiceDisplayName( const Locale& rLocale )
+    virtual OUString SAL_CALL 
+        getServiceDisplayName( const Locale& rLocale ) 
             throw(RuntimeException);
 
     // XInitialization
-    virtual void SAL_CALL
-        initialize( const Sequence< Any >& rArguments )
+    virtual void SAL_CALL 
+        initialize( const Sequence< Any >& rArguments ) 
             throw(Exception, RuntimeException);
 
     // XComponent
-    virtual void SAL_CALL
-        dispose()
+    virtual void SAL_CALL 
+        dispose() 
             throw(RuntimeException);
-    virtual void SAL_CALL
-        addEventListener( const Reference< XEventListener >& rxListener )
+    virtual void SAL_CALL 
+        addEventListener( const Reference< XEventListener >& rxListener ) 
             throw(RuntimeException);
-    virtual void SAL_CALL
-        removeEventListener( const Reference< XEventListener >& rxListener )
+    virtual void SAL_CALL 
+        removeEventListener( const Reference< XEventListener >& rxListener ) 
             throw(RuntimeException);
 
     ////////////////////////////////////////////////////////////
@@ -157,20 +157,20 @@ public:
     //
 
     // XServiceInfo
-    virtual OUString SAL_CALL
-        getImplementationName()
+    virtual OUString SAL_CALL 
+        getImplementationName() 
             throw(RuntimeException);
-    virtual sal_Bool SAL_CALL
-        supportsService( const OUString& rServiceName )
+    virtual sal_Bool SAL_CALL 
+        supportsService( const OUString& rServiceName ) 
             throw(RuntimeException);
-    virtual Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
+    virtual Sequence< OUString > SAL_CALL 
+        getSupportedServiceNames() 
             throw(RuntimeException);
 
 
-    static inline OUString
+    static inline OUString	
         getImplementationName_Static() throw();
-        static Sequence< OUString >
+        static Sequence< OUString >	
         getSupportedServiceNames_Static() throw();
 
 private:
@@ -179,7 +179,7 @@ private:
         OUString SAL_CALL makeUpperCase(const OUString&, CharClass *);
         OUString SAL_CALL makeInitCap(const OUString&, CharClass *);
 
-/*  static ::com::sun::star::uno::Reference<
+/*	static ::com::sun::star::uno::Reference<
         ::com::sun::star::linguistic2::XLinguServiceManager > xLngSvcMgr;
     static ::com::sun::star::uno::Reference<
         ::com::sun::star::linguistic2::XSpellChecker1 > xSpell;
diff --git a/lingucomponent/source/thesaurus/libnth/ntreg.cxx b/lingucomponent/source/thesaurus/libnth/ntreg.cxx
index 2951652e4bab..27849021b47a 100644
--- a/lingucomponent/source/thesaurus/libnth/ntreg.cxx
+++ b/lingucomponent/source/thesaurus/libnth/ntreg.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 "precompiled_lingucomponent.hxx"
 
 
-#include <cppuhelper/factory.hxx>   // helper for factories
+#include <cppuhelper/factory.hxx>	// helper for factories
 #include <rtl/string.hxx>
 
 #include <com/sun/star/registry/XRegistryKey.hpp>
diff --git a/package/inc/ByteChucker.hxx b/package/inc/ByteChucker.hxx
index 733756e2dd65..ce187774cf25 100644
--- a/package/inc/ByteChucker.hxx
+++ b/package/inc/ByteChucker.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 namespace com { namespace sun { namespace star {
     namespace io { class XSeekable; class XOutputStream; }
 } } }
-class ByteChucker
+class ByteChucker 
 {
 protected:
     com::sun::star::uno::Reference < com::sun::star::io::XOutputStream > xStream;
@@ -54,7 +54,7 @@ public:
     void WriteBytes( const ::com::sun::star::uno::Sequence< sal_Int8 >& aData )
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
 
-    sal_Int64 GetPosition()
+    sal_Int64 GetPosition() 
         throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
 
     ByteChucker& operator << (sal_Int8 nInt8);
diff --git a/package/inc/ByteGrabber.hxx b/package/inc/ByteGrabber.hxx
index a9bdfb1e1928..fd65f3dcc6dd 100644
--- a/package/inc/ByteGrabber.hxx
+++ b/package/inc/ByteGrabber.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 com { namespace sun { namespace star {
     namespace io { class XSeekable; class XInputStream; }
 } } }
-class ByteGrabber
+class ByteGrabber 
 {
 protected:
     ::osl::Mutex m_aMutex;
@@ -54,15 +54,15 @@ protected:
 public:
     ByteGrabber (com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xIstream);
     ~ByteGrabber();
-
+    
     void setInputStream (com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xNewStream);
     // XInputStream
-    sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
+    sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
     // XSeekable
-    sal_Int64 SAL_CALL seek( sal_Int64 location )
+    sal_Int64 SAL_CALL seek( sal_Int64 location ) 
         throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    sal_Int64 SAL_CALL getPosition(  )
+    sal_Int64 SAL_CALL getPosition(  ) 
         throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
     sal_Int64 SAL_CALL getLength(  )
         throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
diff --git a/package/inc/CRC32.hxx b/package/inc/CRC32.hxx
index cb3c75e41685..a7983557a6fd 100644
--- a/package/inc/CRC32.hxx
+++ b/package/inc/CRC32.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/package/inc/Deflater.hxx b/package/inc/Deflater.hxx
index 6a45978de44b..3f2c1fcb426d 100644
--- a/package/inc/Deflater.hxx
+++ b/package/inc/Deflater.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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/Sequence.hxx>
 
-extern "C"
+extern "C" 
 {
     typedef struct z_stream_s z_stream;
 }
@@ -39,16 +39,16 @@ class Deflater
 {
 protected:
     com::sun::star::uno::Sequence< sal_Int8 > sInBuffer;
-    sal_Bool                bFinish;
-    sal_Bool                bFinished;
-    sal_Bool                bSetParams;
-    sal_Int32               nLevel, nStrategy;
-    sal_Int32               nOffset, nLength;
-    z_stream*               pStream;
+    sal_Bool				bFinish;
+    sal_Bool				bFinished;
+    sal_Bool				bSetParams;
+    sal_Int32				nLevel, nStrategy;
+    sal_Int32				nOffset, nLength;
+    z_stream*				pStream;
 
     void init (sal_Int32 nLevel, sal_Int32 nStrategy, sal_Bool bNowrap);
     sal_Int32 doDeflateBytes (com::sun::star::uno::Sequence < sal_Int8 > &rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength);
-
+        
 public:
     ~Deflater();
     Deflater(sal_Int32 nSetLevel, sal_Bool bNowrap);
diff --git a/package/inc/EncryptedDataHeader.hxx b/package/inc/EncryptedDataHeader.hxx
index ed0ffe6628e3..88cdaa57a02d 100644
--- a/package/inc/EncryptedDataHeader.hxx
+++ b/package/inc/EncryptedDataHeader.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,24 +31,24 @@
 #include <sal/types.h>
 
 /* The structure of this header is as follows:
-
+ 
    Header signature 4 bytes
    Version number   2 bytes
    Iteraction count 4 bytes
-   Size             4 bytes
-   Salt length      2 bytes
-   IV length        2 bytes
-   Digest length    2 bytes
+   Size				4 bytes
+   Salt length		2 bytes
+   IV length		2 bytes
+   Digest length	2 bytes
    MediaType length 2 bytes
    Salt content     X bytes
-   IV content       X bytes
+   IV content 	    X bytes
    digest content   X bytes
-   MediaType        X bytes
+   MediaType		X bytes
 
 */
 const sal_uInt32 n_ConstHeader = 0x0502474dL; // "MG\002\005"
 const sal_Int32 n_ConstHeaderSize = 22; // + salt length + iv length + digest length + mediatype length
-const sal_Int16 n_ConstCurrentVersion = 1;
+const sal_Int16 n_ConstCurrentVersion = 1; 
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/package/inc/EncryptionData.hxx b/package/inc/EncryptionData.hxx
index ab2a658208c9..4dba2e3f701b 100644
--- a/package/inc/EncryptionData.hxx
+++ b/package/inc/EncryptionData.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/package/inc/HashMaps.hxx b/package/inc/HashMaps.hxx
index bfd48ef000e1..637f56a1350c 100644
--- a/package/inc/HashMaps.hxx
+++ b/package/inc/HashMaps.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,19 +46,19 @@ namespace com { namespace sun { namespace star { namespace packages {
 class ContentInfo;
 } } } }
 
-typedef std::hash_map < rtl::OUString,
+typedef std::hash_map < rtl::OUString, 
                         ZipPackageFolder *,
-                        ::rtl::OUStringHash,
+                        ::rtl::OUStringHash, 
                         eqFunc > FolderHash;
 
-typedef std::hash_map < rtl::OUString,
+typedef std::hash_map < rtl::OUString, 
                         rtl::Reference < com::sun::star::packages::ContentInfo >,
-                        ::rtl::OUStringHash,
+                        ::rtl::OUStringHash, 
                         eqFunc > ContentHash;
 
-typedef std::hash_map < rtl::OUString,
-                        ZipEntry,
-                        rtl::OUStringHash,
+typedef std::hash_map < rtl::OUString, 
+                        ZipEntry, 
+                        rtl::OUStringHash, 
                         eqFunc > EntryHash;
 
 #endif
diff --git a/package/inc/Inflater.hxx b/package/inc/Inflater.hxx
index 47fe8d2b4b95..ee7efecbf0f9 100644
--- a/package/inc/Inflater.hxx
+++ b/package/inc/Inflater.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ extern "C"
 class Inflater
 {
 protected:
-    sal_Bool                bFinish, bFinished, bSetParams, bNeedDict;
-    sal_Int32               nOffset, nLength, nLastInflateError;
-    z_stream*               pStream;
-    com::sun::star::uno::Sequence < sal_Int8 >  sInBuffer;
-    sal_Int32   doInflateBytes (com::sun::star::uno::Sequence < sal_Int8 > &rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength);
+    sal_Bool				bFinish, bFinished, bSetParams, bNeedDict;
+    sal_Int32				nOffset, nLength, nLastInflateError;
+    z_stream*				pStream;
+    com::sun::star::uno::Sequence < sal_Int8 > 	sInBuffer;
+    sal_Int32	doInflateBytes (com::sun::star::uno::Sequence < sal_Int8 > &rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength);
 
 public:
     Inflater(sal_Bool bNoWrap = sal_False);
diff --git a/package/inc/PackageConstants.hxx b/package/inc/PackageConstants.hxx
index 7dd4d78a4e9b..229f739f5a94 100644
--- a/package/inc/PackageConstants.hxx
+++ b/package/inc/PackageConstants.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/package/inc/ZipEntry.hxx b/package/inc/ZipEntry.hxx
index 915d1ca7bb21..79df26166548 100644
--- a/package/inc/ZipEntry.hxx
+++ b/package/inc/ZipEntry.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ struct ZipEntry
     sal_Int16 nExtraLen;
     ::rtl::OUString sPath;
 };
-#endif
+#endif 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/package/inc/ZipEnumeration.hxx b/package/inc/ZipEnumeration.hxx
index bd64b31e9373..0cfaa2bceed6 100644
--- a/package/inc/ZipEnumeration.hxx
+++ b/package/inc/ZipEnumeration.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 class ZipEnumeration
 {
-protected:
-    EntryHash       &rEntryHash;
+protected: 
+    EntryHash 		&rEntryHash;
     EntryHash::const_iterator aIterator;
 public:
     sal_Bool SAL_CALL hasMoreElements();
diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx
index 0e182ae6900c..982ab18267c3 100644
--- a/package/inc/ZipFile.hxx
+++ b/package/inc/ZipFile.hxx
@@ -63,9 +63,9 @@ class ZipFile
 protected:
     ::osl::Mutex    m_aMutex;
 
-    ::rtl::OUString sComment;       /* zip file comment */
-    EntryHash       aEntries;
-    ByteGrabber     aGrabber;
+    ::rtl::OUString	sComment; 	  	/* zip file comment */
+    EntryHash		aEntries;
+    ByteGrabber 	aGrabber;
     Inflater        aInflater;
     com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xStream;
     com::sun::star::uno::Reference < com::sun::star::io::XSeekable > xSeek;
@@ -183,13 +183,13 @@ public:
 
     ZipEnumeration * SAL_CALL entries(  );
 protected:
-    sal_Bool        readLOC ( ZipEntry &rEntry)
+    sal_Bool		readLOC ( ZipEntry &rEntry)
         throw(::com::sun::star::io::IOException, com::sun::star::packages::zip::ZipException, com::sun::star::uno::RuntimeException);
-    sal_Int32       readCEN()
+    sal_Int32		readCEN()
         throw(::com::sun::star::io::IOException, com::sun::star::packages::zip::ZipException, com::sun::star::uno::RuntimeException);
-    sal_Int32       findEND()
+    sal_Int32		findEND()
         throw(::com::sun::star::io::IOException, com::sun::star::packages::zip::ZipException, com::sun::star::uno::RuntimeException);
-    sal_Int32       recover()
+    sal_Int32 		recover()
         throw(::com::sun::star::io::IOException, com::sun::star::packages::zip::ZipException, com::sun::star::uno::RuntimeException);
 
 };
diff --git a/package/inc/ZipOutputStream.hxx b/package/inc/ZipOutputStream.hxx
index 3ea34339428b..53a6bd91feef 100644
--- a/package/inc/ZipOutputStream.hxx
+++ b/package/inc/ZipOutputStream.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,23 +46,23 @@ class ZipOutputStream
 {
 protected:
     com::sun::star::uno::Reference < com::sun::star::io::XOutputStream > xStream;
-    ::std::vector < ZipEntry * >            aZipList;
+    ::std::vector < ZipEntry * >			aZipList;
     com::sun::star::uno::Sequence < sal_Int8 > aBuffer, aEncryptionBuffer;
-    ::rtl::OUString     sComment;
-    Deflater            aDeflater;
-    rtlCipher           aCipher;
-    rtlDigest           aDigest;
-    CRC32               aCRC;
-    ByteChucker         aChucker;
-    ZipEntry            *pCurrentEntry;
-    sal_Int16           nMethod, nLevel, mnDigested;
-    sal_Bool            bFinished, bEncryptCurrentEntry;
-    EncryptionData      *pCurrentEncryptData;
+    ::rtl::OUString		sComment;
+    Deflater			aDeflater;
+    rtlCipher 			aCipher;
+    rtlDigest 			aDigest;
+    CRC32				aCRC;
+    ByteChucker			aChucker;
+    ZipEntry 			*pCurrentEntry;
+    sal_Int16			nMethod, nLevel, mnDigested;
+    sal_Bool			bFinished, bEncryptCurrentEntry;
+    EncryptionData 		*pCurrentEncryptData;
 
 public:
     ZipOutputStream( com::sun::star::uno::Reference < com::sun::star::io::XOutputStream > &xOStream );
     ~ZipOutputStream();
-
+    
     // rawWrite to support a direct write to the output stream
     void SAL_CALL rawWrite( ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength )
         throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
@@ -74,7 +74,7 @@ public:
         throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL setLevel( sal_Int32 nNewLevel )
         throw(::com::sun::star::uno::RuntimeException);
-    void SAL_CALL putNextEntry( ZipEntry& rEntry,
+    void SAL_CALL putNextEntry( ZipEntry& rEntry, 
             rtl::Reference < EncryptionData > &rData,
             sal_Bool bEncrypt = sal_False )
         throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx
index 4de11cf22779..4430ba111a0a 100644
--- a/package/inc/ZipPackage.hxx
+++ b/package/inc/ZipPackage.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,18 +83,18 @@ protected:
     SotMutexHolderRef m_aMutexHolder;
 
     ::com::sun::star::uno::Sequence < sal_Int8 > m_aEncryptionKey;
-    FolderHash       m_aRecent;
-    ::rtl::OUString  m_aURL;
-    sal_Bool         m_bHasEncryptedEntries;
-    sal_Bool         m_bHasNonEncryptedEntries;
-    sal_Bool         m_bInconsistent;
-    sal_Bool         m_bUseManifest;
-    sal_Bool         m_bForceRecovery;
-
-    sal_Bool        m_bMediaTypeFallbackUsed;
-    sal_Int32       m_nFormat;
-    sal_Bool        m_bAllowRemoveOnInsert;
-
+    FolderHash 		 m_aRecent;
+    ::rtl::OUString	 m_aURL;
+    sal_Bool 		 m_bHasEncryptedEntries;
+    sal_Bool 		 m_bHasNonEncryptedEntries;
+    sal_Bool 		 m_bInconsistent;
+    sal_Bool 		 m_bUseManifest;
+    sal_Bool		 m_bForceRecovery;
+    
+    sal_Bool		m_bMediaTypeFallbackUsed;
+    sal_Int32		m_nFormat;
+    sal_Bool		m_bAllowRemoveOnInsert;
+    
     InitialisationMode m_eMode;
 
     ::com::sun::star::uno::Reference < com::sun::star::container::XNameContainer > m_xRootFolder;
@@ -104,7 +104,7 @@ protected:
     const ::com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > m_xFactory;
 
     ZipPackageFolder *m_pRootFolder;
-    ZipFile          *m_pZipFile;
+    ZipFile 		 *m_pZipFile;
 
     void parseManifest();
     void parseContentType();
@@ -131,57 +131,57 @@ public:
     void ConnectTo( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream );
 
     // XInitialization
-    virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
+    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);
     // XHierarchicalNameAccess
-    virtual ::com::sun::star::uno::Any SAL_CALL getByHierarchicalName( const ::rtl::OUString& aName )
+    virtual ::com::sun::star::uno::Any SAL_CALL getByHierarchicalName( const ::rtl::OUString& aName ) 
         throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL hasByHierarchicalName( const ::rtl::OUString& aName )
+    virtual sal_Bool SAL_CALL hasByHierarchicalName( const ::rtl::OUString& aName ) 
         throw(::com::sun::star::uno::RuntimeException);
     // XSingleServiceFactory
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance(  )
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance(  ) 
         throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) 
         throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
     // XChangesBatch
-    virtual void SAL_CALL commitChanges(  )
+    virtual void SAL_CALL commitChanges(  ) 
         throw(::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL hasPendingChanges(  )
+    virtual sal_Bool SAL_CALL hasPendingChanges(  ) 
         throw(::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::util::ElementChange > SAL_CALL getPendingChanges(  )
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::util::ElementChange > SAL_CALL getPendingChanges(  ) 
         throw(::com::sun::star::uno::RuntimeException);
     // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier )
+    virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) 
         throw(::com::sun::star::uno::RuntimeException);
-    com::sun::star::uno::Sequence < sal_Int8 > getUnoTunnelImplementationId( void )
+    com::sun::star::uno::Sequence < sal_Int8 > getUnoTunnelImplementationId( void ) 
         throw(::com::sun::star::uno::RuntimeException);
     // XPropertySet
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  )
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) 
         throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
+    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) 
         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);
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName )
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) 
         throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener )
+    virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) 
         throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener )
+    virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) 
         throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+    virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) 
         throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+    virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) 
         throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  )
+    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) 
         throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) 
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) 
         throw (::com::sun::star::uno::RuntimeException);
 
     // Uno componentiseralation
-    static ::rtl::OUString static_getImplementationName();
-    static ::com::sun::star::uno::Sequence < ::rtl::OUString > static_getSupportedServiceNames();
+    static ::rtl::OUString static_getImplementationName();	
+    static ::com::sun::star::uno::Sequence < ::rtl::OUString > static_getSupportedServiceNames();	
     static ::com::sun::star::uno::Reference < com::sun::star::lang::XSingleServiceFactory > createServiceFactory( com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > const & rServiceFactory );
     sal_Bool SAL_CALL static_supportsService(rtl::OUString const & rServiceName);
 };
diff --git a/package/inc/ZipPackageBuffer.hxx b/package/inc/ZipPackageBuffer.hxx
index e8cf9ff87e86..29ba4156e37d 100644
--- a/package/inc/ZipPackageBuffer.hxx
+++ b/package/inc/ZipPackageBuffer.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,29 +55,29 @@ public:
     inline const com::sun::star::uno::Sequence < sal_Int8> getSequence () const { return m_aBuffer; }
 
     // XInputStream
-    virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
+    virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
+    virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL available(  )
+    virtual sal_Int32 SAL_CALL available(  ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL closeInput(  )
+    virtual void SAL_CALL closeInput(  ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
     // XOutputStream
-    virtual void SAL_CALL writeBytes( const ::com::sun::star::uno::Sequence< sal_Int8 >& aData )
+    virtual void SAL_CALL writeBytes( const ::com::sun::star::uno::Sequence< sal_Int8 >& aData ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL flush(  )
+    virtual void SAL_CALL flush(  ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL closeOutput(  )
+    virtual void SAL_CALL closeOutput(  ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
     // XSeekable
-    virtual void SAL_CALL seek( sal_Int64 location )
+    virtual void SAL_CALL seek( sal_Int64 location ) 
         throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual sal_Int64 SAL_CALL getPosition(  )
+    virtual sal_Int64 SAL_CALL getPosition(  ) 
         throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual sal_Int64 SAL_CALL getLength(  )
+    virtual sal_Int64 SAL_CALL getLength(  ) 
         throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
 };
 #endif
diff --git a/package/inc/ZipPackageFolder.hxx b/package/inc/ZipPackageFolder.hxx
index e45cdc057ae8..29ff92430602 100644
--- a/package/inc/ZipPackageFolder.hxx
+++ b/package/inc/ZipPackageFolder.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <cppuhelper/implbase2.hxx>
 
 namespace com { namespace sun { namespace star {
-namespace beans
+namespace beans 
 {
     struct PropertyValue;
 }
@@ -61,7 +61,7 @@ protected:
     ::rtl::OUString m_sVersion;
 
 public:
-
+    
     ZipPackageFolder( const ::com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& xFactory,
                       sal_Int32 nFormat,
                       sal_Bool bAllowRemoveOnInsert );
@@ -92,49 +92,49 @@ public:
     void  releaseUpwardRef();
 
     // XNameContainer
-    virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement )
+    virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) 
         throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeByName( const ::rtl::OUString& Name )
+    virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) 
         throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     // XEnumerationAccess
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(  )
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(  ) 
         throw(::com::sun::star::uno::RuntimeException);
 
     // XElementAccess
-    virtual ::com::sun::star::uno::Type SAL_CALL getElementType(  )
+    virtual ::com::sun::star::uno::Type SAL_CALL getElementType(  ) 
         throw(::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL hasElements(  )
+    virtual sal_Bool SAL_CALL hasElements(  ) 
         throw(::com::sun::star::uno::RuntimeException);
 
     // XNameAccess
-    virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName )
+    virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) 
         throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  )
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) 
         throw(::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName )
+    virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) 
         throw(::com::sun::star::uno::RuntimeException);
 
     // XNameReplace
-    virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement )
+    virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) 
         throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     // XPropertySet
-    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
+    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) 
         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);
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName )
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) 
         throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier )
+    virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) 
         throw(::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  )
+    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) 
         throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) 
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) 
         throw (::com::sun::star::uno::RuntimeException);
 };
 #endif
diff --git a/package/inc/mutexholder.hxx b/package/inc/mutexholder.hxx
index 3fbbd4c5738a..8f56012e3bce 100644
--- a/package/inc/mutexholder.hxx
+++ b/package/inc/mutexholder.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 class SotMutexHolder
 {
     ::osl::Mutex m_aMutex;
-    sal_Int32    m_nRefCount;
+    sal_Int32	 m_nRefCount;
 
     public:
     SotMutexHolder() : m_nRefCount( 0 ) {}
@@ -59,7 +59,7 @@ class SotMutexHolderRef
 
 public:
     SotMutexHolderRef()
-    : m_pHolder( NULL )
+    : m_pHolder( NULL ) 
     {}
 
     SotMutexHolderRef( SotMutexHolder* pHolder )
@@ -116,7 +116,7 @@ public:
     {
         return *m_pHolder;
     }
-
+    
     operator SotMutexHolder*() const
     {
         return m_pHolder;
diff --git a/package/inc/pch/precompiled_package.cxx b/package/inc/pch/precompiled_package.cxx
index 49b45ad88d87..762f8ec652d1 100644
--- a/package/inc/pch/precompiled_package.cxx
+++ b/package/inc/pch/precompiled_package.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/package/inc/pch/precompiled_package.hxx b/package/inc/pch/precompiled_package.hxx
index dfadd0a869a6..ea9e713ff04b 100644
--- a/package/inc/pch/precompiled_package.hxx
+++ b/package/inc/pch/precompiled_package.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/package/inc/zipfileaccess.hxx b/package/inc/zipfileaccess.hxx
index 1516aa4d7fef..68f48268e080 100644
--- a/package/inc/zipfileaccess.hxx
+++ b/package/inc/zipfileaccess.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class OZipFileAccess : public ::cppu::WeakImplHelper5<
     ::cppu::OInterfaceContainerHelper* m_pListenersContainer;
 
     sal_Bool m_bDisposed;
-
+    
 public:
     OZipFileAccess( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory );
 
@@ -77,7 +77,7 @@ public:
 
     static ::rtl::OUString SAL_CALL impl_staticGetImplementationName();
 
-    static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance(
+    static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( 
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
 
 
diff --git a/package/qa/ofopxmlstorages/StorageUnitTest.java b/package/qa/ofopxmlstorages/StorageUnitTest.java
index 65294d46bbb9..228666c2f2e1 100644
--- a/package/qa/ofopxmlstorages/StorageUnitTest.java
+++ b/package/qa/ofopxmlstorages/StorageUnitTest.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/package/qa/ofopxmlstorages/Test01.java b/package/qa/ofopxmlstorages/Test01.java
index abb73c3fc48b..04510ea73e05 100644
--- a/package/qa/ofopxmlstorages/Test01.java
+++ b/package/qa/ofopxmlstorages/Test01.java
@@ -58,7 +58,7 @@ public class Test01 implements StorageTest {
                 m_aTestHelper.Error( "No valid temporary file was created!" );
                 return false;
             }
-
+        
             // create temporary storage based on arbitrary medium
             // after such a storage is closed it is lost
             XStorage xTempStorage = m_aTestHelper.createTempStorage( m_xMSF, m_xStorageFactory );
@@ -77,7 +77,7 @@ public class Test01 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+            
             byte pBytes1[] = { 1, 1, 1, 1, 1 };
 
             // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
@@ -99,7 +99,7 @@ public class Test01 implements StorageTest {
                                                         pBytes2,
                                                         aRelations2 ) )
                 return false;
-
+        
             // set Relations for storages and check that "IsRoot" and "OpenMode" properties are set correctly
             if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempStorage,
                                                             true,
@@ -113,7 +113,7 @@ public class Test01 implements StorageTest {
                                                             ElementModes.WRITE,
                                                             aRelations1 ) )
                 return false;
-
+    
             // create temporary storage based on a previously created temporary file
             XStorage xTempFileStorage = m_aTestHelper.createStorageFromURL( m_xStorageFactory,
                                                                             sTempFileURL,
@@ -162,7 +162,7 @@ public class Test01 implements StorageTest {
                 m_aTestHelper.Error( "Can't open existing substorage!" );
                 return false;
             }
-
+    
             if ( !m_aTestHelper.checkStorageProperties( xResultSubStorage,
                                                         false,
                                                         ElementModes.READ,
@@ -194,7 +194,7 @@ public class Test01 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 
 }
 
diff --git a/package/qa/ofopxmlstorages/Test02.java b/package/qa/ofopxmlstorages/Test02.java
index 4ba7892b8295..3b85a5b5c9c8 100644
--- a/package/qa/ofopxmlstorages/Test02.java
+++ b/package/qa/ofopxmlstorages/Test02.java
@@ -48,7 +48,7 @@ public class Test02 implements StorageTest {
             XStream xTempFileStream = m_aTestHelper.CreateTempFileStream( m_xMSF );
             if ( xTempFileStream == null )
                 return false;
-
+        
             // create storage based on the temporary stream
             XStorage xTempStorage = m_aTestHelper.createStorageFromStream( m_xStorageFactory,
                                                                             xTempFileStream,
@@ -68,7 +68,7 @@ public class Test02 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+            
             byte pBytes1[] = { 1, 1, 1, 1, 1 };
 
             // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
@@ -93,7 +93,7 @@ public class Test02 implements StorageTest {
                                                             ElementModes.WRITE,
                                                             aRelations ) )
                 return false;
-
+    
             // commit substorage first
             if ( !m_aTestHelper.commitStorage( xTempSubStorage ) )
                 return false;
@@ -120,7 +120,7 @@ public class Test02 implements StorageTest {
             if ( xTempInStream == null )
                 return false;
 
-
+        
             // open input stream
             XStorage xResultStorage = m_aTestHelper.createStorageFromInputStream( m_xStorageFactory, xTempInStream );
             if ( xResultStorage == null )
@@ -141,7 +141,7 @@ public class Test02 implements StorageTest {
                 m_aTestHelper.Error( "Can't open existing substorage!" );
                 return false;
             }
-
+    
             if ( !m_aTestHelper.checkStorageProperties( xResultSubStorage,
                                                         false,
                                                         ElementModes.READ,
@@ -158,7 +158,7 @@ public class Test02 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 
 }
 
diff --git a/package/qa/ofopxmlstorages/Test03.java b/package/qa/ofopxmlstorages/Test03.java
index e3424c9106f2..ee2a892d2080 100644
--- a/package/qa/ofopxmlstorages/Test03.java
+++ b/package/qa/ofopxmlstorages/Test03.java
@@ -61,7 +61,7 @@ public class Test03 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+            
             byte pBytes1[] = { 1, 1, 1, 1, 1 };
 
             // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
@@ -96,7 +96,7 @@ public class Test03 implements StorageTest {
 
             if ( !m_aTestHelper.disposeStorage( xTempSubStorage ) )
                 return false;
-
+                
             // ================================================
             // check storage hyerarchy tree
             // ================================================
@@ -166,14 +166,14 @@ public class Test03 implements StorageTest {
                 return false;
             }
 
-            if ( !( sRootCont[0].equals( "SubStorage1" ) && sRootCont[1].equals( "SubStream1" )
+            if ( !( sRootCont[0].equals( "SubStorage1" ) && sRootCont[1].equals( "SubStream1" ) 
                  || sRootCont[0].equals( "SubStream1" ) && sRootCont[1].equals( "SubStorage1" ) )
               || !( xRootNameAccess.hasByName( "SubStream1" ) && xRootNameAccess.hasByName( "SubStorage1" ) ) )
             {
                 m_aTestHelper.Error( "Root storage contains wrong list of children!" );
                 return false;
             }
-
+            
             // get storage through XNameAccess
             XStorage xResultSubStorage = getStorageFromNameAccess( xRootNameAccess, "SubStorage1" );
             if ( xResultSubStorage == null )
@@ -199,7 +199,7 @@ public class Test03 implements StorageTest {
                 m_aTestHelper.Error( "'SubStream2' can not be detected as child stream element of 'SubStorage1'!" );
                 return false;
             }
-
+            
             return true;
         }
         catch( Exception e )
@@ -207,7 +207,7 @@ public class Test03 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 
     public XStorage getStorageFromNameAccess( XNameAccess xAccess, String sName )
     {
diff --git a/package/qa/ofopxmlstorages/Test04.java b/package/qa/ofopxmlstorages/Test04.java
index 8b99c15bd77c..5188b32b040f 100644
--- a/package/qa/ofopxmlstorages/Test04.java
+++ b/package/qa/ofopxmlstorages/Test04.java
@@ -61,7 +61,7 @@ public class Test04 implements StorageTest {
                 m_aTestHelper.Error( "No valid temporary file was created!" );
                 return false;
             }
-
+        
             // create temporary storage based on arbitrary medium
             // after such a storage is closed it is lost
             XStorage xTempStorage = m_aTestHelper.createTempStorage( m_xMSF, m_xStorageFactory );
@@ -82,7 +82,7 @@ public class Test04 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+            
             byte pBytes1[] = { 1, 1, 1, 1, 1 };
 
             // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
@@ -114,7 +114,7 @@ public class Test04 implements StorageTest {
                                                         pBytes2,
                                                         aRelations2 ) )
                 return false;
-
+        
             // set Relations for storages and check that "IsRoot" and "OpenMode" properties are set correctly
             if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempStorage,
                                                             true,
@@ -128,14 +128,14 @@ public class Test04 implements StorageTest {
                                                             ElementModes.WRITE,
                                                             aRelations2 ) )
                 return false;
-
+    
             // set Relations for storages and check that "IsRoot" and "OpenMode" properties are set correctly
             if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempSubStorage2,
                                                             false,
                                                             ElementModes.WRITE,
                                                             aRelations2 ) )
                 return false;
-
+    
             // create temporary storage based on a previously created temporary file
             XStorage xTempFileStorage = m_aTestHelper.createStorageFromURL( m_xStorageFactory,
                                                                             sTempFileURL,
@@ -216,7 +216,7 @@ public class Test04 implements StorageTest {
                 m_aTestHelper.Error( "Can't open existing substorage!" );
                 return false;
             }
-
+    
             if ( !m_aTestHelper.checkStorageProperties( xResSubStorage1,
                                                         false,
                                                         ElementModes.READ,
@@ -262,7 +262,7 @@ public class Test04 implements StorageTest {
             // remove element and check that it was removed completelly
             if ( !m_aTestHelper.removeElement( xResStorage, "SubStorage2" ) )
                 return false;
-
+                
             try
             {
                 XNameAccess xResAccess = (XNameAccess) UnoRuntime.queryInterface( XNameAccess.class, xResStorage );
@@ -302,7 +302,7 @@ public class Test04 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 
 }
 
diff --git a/package/qa/ofopxmlstorages/Test05.java b/package/qa/ofopxmlstorages/Test05.java
index 36439ca6ebcd..971c0338b40b 100644
--- a/package/qa/ofopxmlstorages/Test05.java
+++ b/package/qa/ofopxmlstorages/Test05.java
@@ -89,7 +89,7 @@ public class Test05 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+    
 
             byte pBytes1[] = { 1, 1, 1, 1, 1 };
 
@@ -112,7 +112,7 @@ public class Test05 implements StorageTest {
                                                         pBytes2,
                                                         aRelations2 ) )
                 return false;
-
+    
             // set Relations for storages and check that "IsRoot" and "OpenMode" properties are set correctly
             if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempFileStorage,
                                                             true,
@@ -196,7 +196,7 @@ public class Test05 implements StorageTest {
                 m_aTestHelper.Error( "Wrong exception is thrown by disposed storage: " + e );
                 return false;
             }
-
+    
             try
             {
                 xSubStream1.getInputStream();
@@ -224,7 +224,7 @@ public class Test05 implements StorageTest {
                 m_aTestHelper.Error( "Wrong exception is thrown by disposed stream: " + e );
                 return false;
             }
-
+    
 
             // dispose root storage
             if ( !m_aTestHelper.disposeStorage( xTempFileStorage ) )
@@ -259,7 +259,7 @@ public class Test05 implements StorageTest {
                 m_aTestHelper.Error( "Can't open existing substorage 'SubSubStorage'!" );
                 return false;
             }
-
+    
             if ( !m_aTestHelper.checkStorageProperties( xResSubStorage,
                                                         false,
                                                         ElementModes.READ,
@@ -275,7 +275,7 @@ public class Test05 implements StorageTest {
                 m_aTestHelper.Error( "Can't open existing substorage 'SubSubStorage'!" );
                 return false;
             }
-
+    
             if ( !m_aTestHelper.checkStorageProperties( xResSubSubStorage,
                                                         false,
                                                         ElementModes.READ,
@@ -308,7 +308,7 @@ public class Test05 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 
 }
 
diff --git a/package/qa/ofopxmlstorages/Test06.java b/package/qa/ofopxmlstorages/Test06.java
index 61969db88e12..4db4a8989f5c 100644
--- a/package/qa/ofopxmlstorages/Test06.java
+++ b/package/qa/ofopxmlstorages/Test06.java
@@ -72,7 +72,7 @@ public class Test06 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+    
             // in case stream is open for reading it must exist
             try
             {
@@ -271,7 +271,7 @@ public class Test06 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 
 }
 
diff --git a/package/qa/ofopxmlstorages/Test07.java b/package/qa/ofopxmlstorages/Test07.java
index bcd85d5d01c0..5499281c57e5 100644
--- a/package/qa/ofopxmlstorages/Test07.java
+++ b/package/qa/ofopxmlstorages/Test07.java
@@ -84,7 +84,7 @@ public class Test07 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+            
             byte pBytes2[] = { 2, 2, 2, 2, 2 };
 
             // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
@@ -140,7 +140,7 @@ public class Test07 implements StorageTest {
                 m_aTestHelper.Error( "The new substorage still was not commited so it must be empty!" );
                 return false;
             }
-
+            
             if ( !m_aTestHelper.disposeStorage( xClonedSubStorage ) )
                 return false;
 
@@ -206,7 +206,7 @@ public class Test07 implements StorageTest {
                 m_aTestHelper.Error( "The root storage still was not commited so it's clone must be empty!" );
                 return false;
             }
-
+            
             if ( !m_aTestHelper.disposeStorage( xCloneOfRoot ) )
                 return false;
 
@@ -253,6 +253,6 @@ public class Test07 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 }
 
diff --git a/package/qa/ofopxmlstorages/Test08.java b/package/qa/ofopxmlstorages/Test08.java
index eaed60d4d8e3..ab7f9b14bf44 100644
--- a/package/qa/ofopxmlstorages/Test08.java
+++ b/package/qa/ofopxmlstorages/Test08.java
@@ -47,7 +47,7 @@ public class Test08 implements StorageTest {
             XStream xTempFileStream = m_aTestHelper.CreateTempFileStream( m_xMSF );
             if ( xTempFileStream == null )
                 return false;
-
+        
             // create storage based on the temporary stream
             XStorage xTempStorage = m_aTestHelper.createStorageFromStream( m_xStorageFactory,
                                                                             xTempFileStream,
@@ -67,7 +67,7 @@ public class Test08 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+            
             byte pBytes1[] = { 1, 1, 1, 1, 1 };
 
             // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
@@ -92,7 +92,7 @@ public class Test08 implements StorageTest {
                                                             ElementModes.WRITE,
                                                             aRelations1 ) )
                 return false;
-
+    
             // commit substorage first
             if ( !m_aTestHelper.commitStorage( xTempSubStorage ) )
                 return false;
@@ -205,7 +205,7 @@ public class Test08 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 
     private boolean checkSubStorages( XStorage xStorage, byte[] pBytes1, StringPair[][] aRelations )
     {
diff --git a/package/qa/ofopxmlstorages/TestHelper.java b/package/qa/ofopxmlstorages/TestHelper.java
index 6b153fd2b960..abad297dfc00 100644
--- a/package/qa/ofopxmlstorages/TestHelper.java
+++ b/package/qa/ofopxmlstorages/TestHelper.java
@@ -37,7 +37,7 @@ public class TestHelper  {
             Error( "Can't get XOutputStream implementation from substream '" + sStreamName + "'!" );
             return false;
         }
-
+    
         // get XTrucate implementation from output stream
         XTruncate xTruncate = (XTruncate) UnoRuntime.queryInterface( XTruncate.class, xOutput );
         if ( xTruncate == null )
@@ -45,7 +45,7 @@ public class TestHelper  {
             Error( "Can't get XTruncate implementation from substream '" + sStreamName + "'!" );
             return false;
         }
-
+        
         // write requested byte sequence
         try
         {
@@ -144,7 +144,7 @@ public class TestHelper  {
             Error( "Can't create substream '" + sStreamName + "', exception : " + e + "!" );
             return false;
         }
-
+        
         return WriteBytesToStream( xSubStream, sStreamName, sMediaType, bCompressed, pBytes, aRelations );
     }
 
@@ -171,7 +171,7 @@ public class TestHelper  {
                     Error( "'IsRoot' property contains wrong value!" );
                     bOk = false;
                 }
-
+                    
                 if ( ( bIsRoot
                   && ( nPropMode | ElementModes.READ ) != ( nMode | ElementModes.READ ) )
                   || ( !bIsRoot && ( nPropMode & nMode ) != nMode ) )
@@ -305,7 +305,7 @@ public class TestHelper  {
                             return false;
                         }
                     }
-
+                
                     break;
                 }
             }
@@ -313,7 +313,7 @@ public class TestHelper  {
 
         return true;
     }
-
+    
     public boolean checkStorageProperties( XStorage xStorage,
                                             boolean bIsRoot,
                                             int nMode,
@@ -337,7 +337,7 @@ public class TestHelper  {
                     Error( "'IsRoot' property contains wrong value!" );
                     bOk = false;
                 }
-
+                    
                 if ( ( bIsRoot
                   && ( nPropMode | ElementModes.READ ) != ( nMode | ElementModes.READ ) )
                   || ( !bIsRoot && ( nPropMode & nMode ) != nMode ) )
@@ -399,7 +399,7 @@ public class TestHelper  {
             Error( "Can't get XInputStream implementation from substream '" + sName + "'!" );
             return false;
         }
-
+    
         byte pContents[][] = new byte[1][]; // ???
 
         // read contents
@@ -453,11 +453,11 @@ public class TestHelper  {
                 bOk = true;
                 if ( !sPropMediaType.equals( sMediaType ) )
                 {
-                    Error( "'MediaType' property contains wrong value for stream '" + sName + "',\nexpected: '"
+                    Error( "'MediaType' property contains wrong value for stream '" + sName + "',\nexpected: '" 
                             + sMediaType + "', set: '" + sPropMediaType + "'!" );
                     bOk = false;
                 }
-
+    
                 if ( nPropSize != pBytes.length )
                 {
                     Error( "'Size' property contains wrong value for stream'" + sName + "'!" );
@@ -528,7 +528,7 @@ public class TestHelper  {
             Error( "Can't open substream '" + sName + "', exception : " + e + "!" );
             return false;
         }
-
+        
         boolean bResult = InternalCheckStream( xSubStream, sName, sMediaType, pBytes, aRelations );
 
         // free the stream resources, garbage collector may remove the object too late
@@ -576,7 +576,7 @@ public class TestHelper  {
 
         return true;
     }
-
+    
     public boolean disposeStream( XStream xStream, String sStreamName )
     {
         XComponent xComponent = (XComponent) UnoRuntime.queryInterface( XComponent.class, xStream );
@@ -585,7 +585,7 @@ public class TestHelper  {
             Error( "Can't get XComponent implementation from substream '" + sStreamName + "'!" );
             return false;
         }
-
+        
         try
         {
             xComponent.dispose();
@@ -666,7 +666,7 @@ public class TestHelper  {
             Error( "Can't close output part of a stream, exception :" + e );
             return false;
         }
-
+        
         return true;
     }
 
@@ -708,7 +708,7 @@ public class TestHelper  {
     public String CreateTempFile( XMultiServiceFactory xMSF )
     {
         String sResult = null;
-
+    
         // try to get temporary file representation
         XPropertySet xTempFileProps = null;
         try
@@ -900,7 +900,7 @@ public class TestHelper  {
                                 int nMode )
     {
         XStorage xResult = null;
-
+        
         try
         {
             PropertyValue[] aAddArgs = new PropertyValue[1];
@@ -924,7 +924,7 @@ public class TestHelper  {
 
         if ( xResult == null )
             Error( "Can't create storage from URL!" );
-
+            
         return xResult;
     }
 
@@ -934,7 +934,7 @@ public class TestHelper  {
                                 int nMode )
     {
         XStorage xResult = null;
-
+        
         try
         {
             PropertyValue[] aAddArgs = new PropertyValue[1];
@@ -958,7 +958,7 @@ public class TestHelper  {
 
         if ( xResult == null )
             Error( "Can't create storage from stream!" );
-
+            
         return xResult;
     }
 
@@ -967,7 +967,7 @@ public class TestHelper  {
                                 XInputStream xInStream )
     {
         XStorage xResult = null;
-
+        
         try
         {
             PropertyValue[] aAddArgs = new PropertyValue[1];
@@ -991,7 +991,7 @@ public class TestHelper  {
 
         if ( xResult == null )
             Error( "Can't create storage from input stream!" );
-
+            
         return xResult;
     }
 
@@ -1005,7 +1005,7 @@ public class TestHelper  {
             Error( "Can't create temp file stream!" );
             return null;
         }
-
+        
         try
         {
             xResult = createStorageFromStream( xFactory, xStream, ElementModes.WRITE );
diff --git a/package/qa/storages/BorderedStream.java b/package/qa/storages/BorderedStream.java
index 7972b7a3ef0a..41d5bd9de40f 100644
--- a/package/qa/storages/BorderedStream.java
+++ b/package/qa/storages/BorderedStream.java
@@ -41,7 +41,7 @@ public class BorderedStream
     {
         return (XInputStream)UnoRuntime.queryInterface( XInputStream.class, this );
     }
-
+    
     // ----------------------------------------------------------
     public synchronized XOutputStream getOutputStream()
         throws com.sun.star.uno.RuntimeException
@@ -75,7 +75,7 @@ public class BorderedStream
         {
             aData[0] = new byte[0];
         }
-
+        
         return nRead;
     }
 
diff --git a/package/qa/storages/RegressionTest_114358.java b/package/qa/storages/RegressionTest_114358.java
index 51d3ecb4a8b4..3062077ea762 100644
--- a/package/qa/storages/RegressionTest_114358.java
+++ b/package/qa/storages/RegressionTest_114358.java
@@ -36,7 +36,7 @@ public class RegressionTest_114358 implements StorageTest {
             XStream xTempFileStream = m_aTestHelper.CreateTempFileStream( m_xMSF );
             if ( xTempFileStream == null )
                 return false;
-
+        
             // create storage based on the temporary stream
             Object pArgs[] = new Object[2];
             pArgs[0] = (Object) xTempFileStream;
@@ -59,7 +59,7 @@ public class RegressionTest_114358 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+            
             byte pBytes1[] = { 1, 1, 1, 1, 1 };
 
             // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
@@ -79,7 +79,7 @@ public class RegressionTest_114358 implements StorageTest {
                                                             false,
                                                             ElementModes.WRITE ) )
                 return false;
-
+    
             // commit substorage first
             if ( !m_aTestHelper.commitStorage( xTempSubStorage ) )
                 return false;
@@ -120,7 +120,7 @@ public class RegressionTest_114358 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+            
             // open the substream, set new "MediaType" and "Compressed" properties to it, truncate and write new contents
             if ( !m_aTestHelper.WriteBytesToSubstream( xTempSubStorage, "SubStream1", "MediaType4", true, pBytes2 ) )
                 return false;
@@ -163,7 +163,7 @@ public class RegressionTest_114358 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+    
             if ( !m_aTestHelper.checkStorageProperties( xTempStorage, "MediaType2", true, ElementModes.READ ) )
                 return false;
 
@@ -185,6 +185,6 @@ public class RegressionTest_114358 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 }
 
diff --git a/package/qa/storages/RegressionTest_125919.java b/package/qa/storages/RegressionTest_125919.java
index 0a13fc63758c..9945faf379bf 100644
--- a/package/qa/storages/RegressionTest_125919.java
+++ b/package/qa/storages/RegressionTest_125919.java
@@ -49,7 +49,7 @@ public class RegressionTest_125919 implements StorageTest {
                 if ( nInitInd < 18000 )
                     pBytes18[nInitInd] = ( new Integer( 256  - pBytes36[nInitInd] ) ).byteValue();
             }
-
+            
             System.out.println( "This test can take up to some hours. The file size currently is about 50000." );
             System.out.println( "Progress: " );
             for ( int nAvailableBytes = nMinTestLen; nAvailableBytes < nMaxTestLen; nAvailableBytes++ )
@@ -129,6 +129,6 @@ public class RegressionTest_125919 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 }
 
diff --git a/package/qa/storages/RegressionTest_i26398.java b/package/qa/storages/RegressionTest_i26398.java
index 9116a7d9bafa..257bbcd152a9 100644
--- a/package/qa/storages/RegressionTest_i26398.java
+++ b/package/qa/storages/RegressionTest_i26398.java
@@ -36,7 +36,7 @@ public class RegressionTest_i26398 implements StorageTest {
             XStream xTempFileStream = m_aTestHelper.CreateTempFileStream( m_xMSF );
             if ( xTempFileStream == null )
                 return false;
-
+        
             // create storage based on the temporary stream
             Object pArgs[] = new Object[2];
             pArgs[0] = (Object) xTempFileStream;
@@ -59,7 +59,7 @@ public class RegressionTest_i26398 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+    
             byte pBytes1[] = { 1, 1, 1, 1, 1 };
 
             // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
@@ -103,11 +103,11 @@ public class RegressionTest_i26398 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+    
             // dispose substorage
             if ( !m_aTestHelper.disposeStorage( xTempSubStorage ) )
                 return false;
-
+        
             // ================================================
             // reopen the substorage in readwrite mode and check contents
             // ================================================
@@ -133,7 +133,7 @@ public class RegressionTest_i26398 implements StorageTest {
 
             // the root storage is based on the temporary stream so it can be left undisposed, since it does not lock
             // any resource, later the garbage collector will release the object and it must die by refcount
-
+    
             return true;
         }
         catch( Exception e )
@@ -141,6 +141,6 @@ public class RegressionTest_i26398 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 }
 
diff --git a/package/qa/storages/RegressionTest_i27773.java b/package/qa/storages/RegressionTest_i27773.java
index 4e627a816167..6753541508fd 100644
--- a/package/qa/storages/RegressionTest_i27773.java
+++ b/package/qa/storages/RegressionTest_i27773.java
@@ -286,7 +286,7 @@ public class RegressionTest_i27773 implements StorageTest {
 
             // the root storage is based on the temporary stream so it can be left undisposed, since it does not lock
             // any resource, later the garbage collector will release the object and it must die by refcount
-
+    
             return true;
         }
         catch( Exception e )
@@ -294,6 +294,6 @@ public class RegressionTest_i27773 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 }
 
diff --git a/package/qa/storages/RegressionTest_i29169.java b/package/qa/storages/RegressionTest_i29169.java
index 580ee510caf8..137d84fa21de 100644
--- a/package/qa/storages/RegressionTest_i29169.java
+++ b/package/qa/storages/RegressionTest_i29169.java
@@ -36,7 +36,7 @@ public class RegressionTest_i29169 implements StorageTest {
             XStream xTempFileStream = m_aTestHelper.CreateTempFileStream( m_xMSF );
             if ( xTempFileStream == null )
                 return false;
-
+        
             // create storage based on the temporary stream
             Object pArgs[] = new Object[2];
             pArgs[0] = (Object) xTempFileStream;
@@ -59,7 +59,7 @@ public class RegressionTest_i29169 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+            
             byte pBytes1[] = { 1, 1, 1, 1, 1 };
 
             // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
@@ -94,7 +94,7 @@ public class RegressionTest_i29169 implements StorageTest {
                                                             false,
                                                             ElementModes.WRITE ) )
                 return false;
-
+    
             // set "MediaType" property for storages and check that "IsRoot" and "OpenMode" properties are set correctly
             if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempStorage,
                                                             "MediaType5",
@@ -226,7 +226,7 @@ public class RegressionTest_i29169 implements StorageTest {
 
             if ( !m_aTestHelper.checkStream( xTempSubSubStorage, "SubSubStream1", "MediaType2", true, pBytes1 ) )
                 return false;
-
+    
             // ================================================
             // rename the reopened storages and streams
             // ================================================
@@ -353,10 +353,10 @@ public class RegressionTest_i29169 implements StorageTest {
 
             if ( !m_aTestHelper.checkStream( xTempSubSubStorage, "SubSubStream1", "MediaType2", true, pBytes1 ) )
                 return false;
-
+    
             // the storage is based on the temporary stream so it can be left undisposed, since it does not lock
             // any resource, later the garbage collector will release the object and it must die by refcount
-
+    
             return true;
         }
         catch( Exception e )
@@ -364,6 +364,6 @@ public class RegressionTest_i29169 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 }
 
diff --git a/package/qa/storages/RegressionTest_i29321.java b/package/qa/storages/RegressionTest_i29321.java
index 740f48ce59a3..a56e545bac18 100644
--- a/package/qa/storages/RegressionTest_i29321.java
+++ b/package/qa/storages/RegressionTest_i29321.java
@@ -36,7 +36,7 @@ public class RegressionTest_i29321 implements StorageTest {
             XStream xTempFileStream = m_aTestHelper.CreateTempFileStream( m_xMSF );
             if ( xTempFileStream == null )
                 return false;
-
+        
             // create storage based on the temporary stream
             Object pArgs[] = new Object[2];
             pArgs[0] = (Object) xTempFileStream;
@@ -59,7 +59,7 @@ public class RegressionTest_i29321 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+    
             // open a new substorage
             XStorage xTempSubSubStorage = m_aTestHelper.openSubStorage( xTempSubStorage,
                                                                         "SubSubStorage1",
@@ -157,7 +157,7 @@ public class RegressionTest_i29321 implements StorageTest {
 
             // the root storage is based on the temporary stream so it can be left undisposed, since it does not lock
             // any resource, later the garbage collector will release the object and it must die by refcount
-
+    
             return true;
         }
         catch( Exception e )
@@ -165,6 +165,6 @@ public class RegressionTest_i29321 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 }
 
diff --git a/package/qa/storages/RegressionTest_i30400.java b/package/qa/storages/RegressionTest_i30400.java
index 5f82a7beb39e..8294b6814b9d 100644
--- a/package/qa/storages/RegressionTest_i30400.java
+++ b/package/qa/storages/RegressionTest_i30400.java
@@ -41,7 +41,7 @@ public class RegressionTest_i30400 implements StorageTest {
             XStream xTempFileStream = m_aTestHelper.CreateTempFileStream( m_xMSF );
             if ( xTempFileStream == null )
                 return false;
-
+        
             // create storage based on the temporary stream
             Object pArgs[] = new Object[2];
             pArgs[0] = (Object) xTempFileStream;
@@ -75,7 +75,7 @@ public class RegressionTest_i30400 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+            
             // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
             if ( !m_aTestHelper.WriteBytesToSubstream( xTempSubStorage, "SubStream1", "MediaType3", true, pBytes1 ) )
                 return false;
@@ -112,7 +112,7 @@ public class RegressionTest_i30400 implements StorageTest {
                                                             false,
                                                             ElementModes.WRITE ) )
                 return false;
-
+    
             // set "MediaType" property for storages and check that "IsRoot" and "OpenMode" properties are set correctly
             if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempStorage,
                                                             "MediaType8",
@@ -131,11 +131,11 @@ public class RegressionTest_i30400 implements StorageTest {
             // commit the storages
             // ================================================
 
-            // commit lowlevel substorage
+            // commit lowlevel substorage 
             if ( !m_aTestHelper.commitStorage( xTempSubSubStorage ) )
                 return false;
 
-            // commit substorage
+            // commit substorage 
             if ( !m_aTestHelper.commitStorage( xTempSubStorage ) )
                 return false;
 
@@ -201,7 +201,7 @@ public class RegressionTest_i30400 implements StorageTest {
 
             // the storage is based on the temporary stream so it can be left undisposed, since it does not lock
             // any resource, later the garbage collector will release the object and it must die by refcount
-
+    
             return true;
         }
         catch( Exception e )
@@ -209,7 +209,7 @@ public class RegressionTest_i30400 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 
 
     public boolean TestCopyWithRenaming( XStorage xTempStorage, XStorage xTempSubStorage, XStorage xTempSubSubStorage )
diff --git a/package/qa/storages/RegressionTest_i30677.java b/package/qa/storages/RegressionTest_i30677.java
index 740c9e319313..87d28939f361 100644
--- a/package/qa/storages/RegressionTest_i30677.java
+++ b/package/qa/storages/RegressionTest_i30677.java
@@ -36,7 +36,7 @@ public class RegressionTest_i30677 implements StorageTest {
             XStream xTempFileStream = m_aTestHelper.CreateTempFileStream( m_xMSF );
             if ( xTempFileStream == null )
                 return false;
-
+        
             // create storage based on the temporary stream
             Object pArgs[] = new Object[2];
             pArgs[0] = (Object) xTempFileStream;
@@ -59,7 +59,7 @@ public class RegressionTest_i30677 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+    
             // open a new subsubstorage
             XStorage xTempSubSubStorage = m_aTestHelper.openSubStorage( xTempSubStorage,
                                                                         "SubSubStorage1",
@@ -250,7 +250,7 @@ public class RegressionTest_i30677 implements StorageTest {
 
             // the root storage is based on the temporary stream so it can be left undisposed, since it does not lock
             // any resource, later the garbage collector will release the object and it must die by refcount
-
+    
             return true;
         }
         catch( Exception e )
@@ -258,6 +258,6 @@ public class RegressionTest_i30677 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 }
 
diff --git a/package/qa/storages/RegressionTest_i35095.java b/package/qa/storages/RegressionTest_i35095.java
index d98ec800a5a6..dd5779a51752 100644
--- a/package/qa/storages/RegressionTest_i35095.java
+++ b/package/qa/storages/RegressionTest_i35095.java
@@ -36,7 +36,7 @@ public class RegressionTest_i35095 implements StorageTest {
             XStream xTempFileStream = m_aTestHelper.CreateTempFileStream( m_xMSF );
             if ( xTempFileStream == null )
                 return false;
-
+        
             // create storage based on the temporary stream
             Object pArgs[] = new Object[2];
             pArgs[0] = (Object) xTempFileStream;
@@ -69,7 +69,7 @@ public class RegressionTest_i35095 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+    
             // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
             if ( !m_aTestHelper.WriteBytesToEncrSubstream( xTempSubStorage, "SubStream2", "MediaType2", false, pBytes, sPass ) )
                 return false;
@@ -139,7 +139,7 @@ public class RegressionTest_i35095 implements StorageTest {
                 m_aTestHelper.Error( "Can't open existing substorage!" );
                 return false;
             }
-
+    
             if ( !m_aTestHelper.checkStorageProperties( xResultSubStorage, "MediaType4", false, ElementModes.READ ) )
                 return false;
 
@@ -160,7 +160,7 @@ public class RegressionTest_i35095 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 
 }
 
diff --git a/package/qa/storages/RegressionTest_i46848.java b/package/qa/storages/RegressionTest_i46848.java
index 438626e9a7ba..339b35f9ed83 100644
--- a/package/qa/storages/RegressionTest_i46848.java
+++ b/package/qa/storages/RegressionTest_i46848.java
@@ -36,7 +36,7 @@ public class RegressionTest_i46848 implements StorageTest {
             XStream xTempFileStream = m_aTestHelper.CreateTempFileStream( m_xMSF );
             if ( xTempFileStream == null )
                 return false;
-
+        
             // create storage based on the temporary stream
             Object pArgs[] = new Object[2];
             pArgs[0] = (Object) xTempFileStream;
@@ -59,7 +59,7 @@ public class RegressionTest_i46848 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+            
             byte pBytes1[] = { 1, 1, 1, 1, 1 };
 
             // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
@@ -79,7 +79,7 @@ public class RegressionTest_i46848 implements StorageTest {
                                                             false,
                                                             ElementModes.WRITE ) )
                 return false;
-
+    
             // commit substorage first
             if ( !m_aTestHelper.commitStorage( xTempSubStorage ) )
                 return false;
@@ -118,7 +118,7 @@ public class RegressionTest_i46848 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+    
             // set "MediaType" property for storages and check that "IsRoot" and "OpenMode" properties are set correctly
             if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempSubStorage,
                                                             "ChangedMediaType3",
@@ -164,7 +164,7 @@ public class RegressionTest_i46848 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+    
             if ( !m_aTestHelper.checkStorageProperties( xTempStorage, "MediaType2", true, ElementModes.READ ) )
                 return false;
 
@@ -186,6 +186,6 @@ public class RegressionTest_i46848 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 }
 
diff --git a/package/qa/storages/RegressionTest_i49755.java b/package/qa/storages/RegressionTest_i49755.java
index 7d3ee6c01cac..c1b597828d0d 100644
--- a/package/qa/storages/RegressionTest_i49755.java
+++ b/package/qa/storages/RegressionTest_i49755.java
@@ -36,7 +36,7 @@ public class RegressionTest_i49755 implements StorageTest {
             XStream xTempFileStream = m_aTestHelper.CreateTempFileStream( m_xMSF );
             if ( xTempFileStream == null )
                 return false;
-
+        
             // create storage based on the temporary stream
             Object pArgs[] = new Object[2];
             pArgs[0] = (Object) xTempFileStream;
@@ -71,7 +71,7 @@ public class RegressionTest_i49755 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+    
             // set "MediaType" property for storages and check that "IsRoot" and "OpenMode" properties are set correctly
             if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempSubStorage,
                                                             "MediaType2",
@@ -88,7 +88,7 @@ public class RegressionTest_i49755 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+    
             // set "MediaType" property for storages and check that "IsRoot" and "OpenMode" properties are set correctly
             if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempSubSubStorage,
                                                             "MediaType3",
@@ -109,7 +109,7 @@ public class RegressionTest_i49755 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+    
             // set "MediaType" property for storages and check that "IsRoot" and "OpenMode" properties are set correctly
             if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempSubStorage1,
                                                             "MediaType5",
@@ -161,7 +161,7 @@ public class RegressionTest_i49755 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+    
             // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
             if ( !m_aTestHelper.WriteBytesToSubstream( xStep2TempSubStorage1, "SubStream2", "MediaType4", false, pBytes ) )
                 return false;
@@ -217,7 +217,7 @@ public class RegressionTest_i49755 implements StorageTest {
                 m_aTestHelper.Error( "Can't open existing substorage!" );
                 return false;
             }
-
+    
             if ( !m_aTestHelper.checkStorageProperties( xResultSubStorage, "MediaType2", false, ElementModes.READ ) )
                 return false;
 
@@ -230,7 +230,7 @@ public class RegressionTest_i49755 implements StorageTest {
                 m_aTestHelper.Error( "Can't open existing substorage!" );
                 return false;
             }
-
+    
             if ( !m_aTestHelper.checkStorageProperties( xResultSubSubStorage, "MediaType3", false, ElementModes.READ ) )
                 return false;
 
@@ -247,7 +247,7 @@ public class RegressionTest_i49755 implements StorageTest {
                 m_aTestHelper.Error( "Can't open existing substorage!" );
                 return false;
             }
-
+    
             if ( !m_aTestHelper.checkStorageProperties( xResultSubStorage1, "MediaType5", false, ElementModes.READ ) )
                 return false;
 
@@ -266,7 +266,7 @@ public class RegressionTest_i49755 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 
 }
 
diff --git a/package/qa/storages/RegressionTest_i55821.java b/package/qa/storages/RegressionTest_i55821.java
index 0803816427d6..5c669423b696 100644
--- a/package/qa/storages/RegressionTest_i55821.java
+++ b/package/qa/storages/RegressionTest_i55821.java
@@ -40,7 +40,7 @@ public class RegressionTest_i55821 implements StorageTest {
             XStream xTempFileStream = m_aTestHelper.CreateTempFileStream( m_xMSF );
             if ( xTempFileStream == null )
                 return false;
-
+        
             // create storage based on the temporary stream
             Object pArgs[] = new Object[2];
             pArgs[0] = (Object) xTempFileStream;
@@ -61,7 +61,7 @@ public class RegressionTest_i55821 implements StorageTest {
             // the stream will not be encrypted
             if ( !m_aTestHelper.WriteBytesToEncrSubstream( xTempStorage, "SubStream1", "MediaType1", false, pBytes, sPass ) )
                 return false;
-
+    
             if ( !m_aTestHelper.commitStorage( xTempStorage ) )
                 return false;
 
@@ -106,6 +106,6 @@ public class RegressionTest_i55821 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 }
 
diff --git a/package/qa/storages/RegressionTest_i59886.java b/package/qa/storages/RegressionTest_i59886.java
index 471149823c33..ce39e39df109 100644
--- a/package/qa/storages/RegressionTest_i59886.java
+++ b/package/qa/storages/RegressionTest_i59886.java
@@ -36,7 +36,7 @@ public class RegressionTest_i59886 implements StorageTest {
             XStream xTempFileStream = m_aTestHelper.CreateTempFileStream( m_xMSF );
             if ( xTempFileStream == null )
                 return false;
-
+        
             // create storage based on the temporary stream
             Object pArgs[] = new Object[2];
             pArgs[0] = (Object) xTempFileStream;
@@ -69,7 +69,7 @@ public class RegressionTest_i59886 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+    
             // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
             if ( !m_aTestHelper.WriteBytesToEncrSubstream( xTempSubStorage, "SubStream2", "MediaType2", false, pBytes, sPass ) )
                 return false;
@@ -122,7 +122,7 @@ public class RegressionTest_i59886 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+    
             // set the common storage password
             XEncryptionProtectedSource xEncr = (XEncryptionProtectedSource) UnoRuntime.queryInterface( XEncryptionProtectedSource.class, xStep2TempStorage );
             if ( xEncr == null )
@@ -199,7 +199,7 @@ public class RegressionTest_i59886 implements StorageTest {
                 m_aTestHelper.Error( "Can't open existing substorage!" );
                 return false;
             }
-
+    
             if ( !m_aTestHelper.checkStorageProperties( xTargetSubStorage, "MediaType4", false, ElementModes.WRITE ) )
                 return false;
 
@@ -238,6 +238,6 @@ public class RegressionTest_i59886 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 }
 
diff --git a/package/qa/storages/RegressionTest_i61909.java b/package/qa/storages/RegressionTest_i61909.java
index 5f5c1572d79d..95590e319288 100644
--- a/package/qa/storages/RegressionTest_i61909.java
+++ b/package/qa/storages/RegressionTest_i61909.java
@@ -45,7 +45,7 @@ public class RegressionTest_i61909 implements StorageTest {
                 m_aTestHelper.Error( "No valid temporary file was created!" );
                 return false;
             }
-
+        
             // create storage based on the temporary stream
             Object pArgs[] = new Object[2];
             pArgs[0] = (Object) sTempFileURL;
@@ -76,7 +76,7 @@ public class RegressionTest_i61909 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+    
             // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
             if ( !m_aTestHelper.WriteBytesToSubstream( xTempSubStorage, "SubStream2", "MediaType2", true, pBytes ) )
                 return false;
@@ -162,6 +162,6 @@ public class RegressionTest_i61909 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 }
 
diff --git a/package/qa/storages/RegressionTest_i84234.java b/package/qa/storages/RegressionTest_i84234.java
index 16150690d882..be011000a750 100644
--- a/package/qa/storages/RegressionTest_i84234.java
+++ b/package/qa/storages/RegressionTest_i84234.java
@@ -36,7 +36,7 @@ public class RegressionTest_i84234 implements StorageTest {
             XStream xTempFileStream = m_aTestHelper.CreateTempFileStream( m_xMSF );
             if ( xTempFileStream == null )
                 return false;
-
+        
             // create storage based on the temporary stream
             Object pArgs[] = new Object[2];
             pArgs[0] = (Object) xTempFileStream;
@@ -59,7 +59,7 @@ public class RegressionTest_i84234 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+    
             byte pBytes1[] = { 1, 1, 1, 1, 1 };
 
             // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
@@ -90,7 +90,7 @@ public class RegressionTest_i84234 implements StorageTest {
             // dispose storage
             if ( !m_aTestHelper.disposeStorage( xTempStorage ) )
                 return false;
-
+    
             // ================================================
             // reopen the storages in readwrite mode and check Compressed flag
             // ================================================
@@ -121,7 +121,7 @@ public class RegressionTest_i84234 implements StorageTest {
 
             // the root storage is based on the temporary stream so it can be left undisposed, since it does not lock
             // any resource, later the garbage collector will release the object and it must die by refcount
-
+    
             return true;
         }
         catch( Exception e )
@@ -129,6 +129,6 @@ public class RegressionTest_i84234 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 }
 
diff --git a/package/qa/storages/StorageUnitTest.java b/package/qa/storages/StorageUnitTest.java
index e5010d86c735..a56beffd1305 100644
--- a/package/qa/storages/StorageUnitTest.java
+++ b/package/qa/storages/StorageUnitTest.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/package/qa/storages/Test01.java b/package/qa/storages/Test01.java
index a793a2fd5809..b722c3a4ec24 100644
--- a/package/qa/storages/Test01.java
+++ b/package/qa/storages/Test01.java
@@ -37,7 +37,7 @@ public class Test01 implements StorageTest {
                 m_aTestHelper.Error( "No valid temporary file was created!" );
                 return false;
             }
-
+        
             // create temporary storage based on arbitrary medium
             // after such a storage is closed it is lost
             Object oTempStorage = m_xStorageFactory.createInstance();
@@ -57,7 +57,7 @@ public class Test01 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+    
             byte pBigBytes[] = new byte[33000];
             for ( int nInd = 0; nInd < 33000; nInd++ )
                 pBigBytes[nInd] = (byte)( nInd % 128 );
@@ -81,7 +81,7 @@ public class Test01 implements StorageTest {
             // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
             if ( !m_aTestHelper.WriteBytesToSubstream( xTempSubStorage, "SubStream2", "MediaType2", false, pBytes2 ) )
                 return false;
-
+        
             // set "MediaType" property for storages and check that "IsRoot" and "OpenMode" properties are set correctly
             if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempStorage,
                                                             "MediaType3",
@@ -95,7 +95,7 @@ public class Test01 implements StorageTest {
                                                             false,
                                                             ElementModes.WRITE ) )
                 return false;
-
+    
             // create temporary storage based on a previously created temporary file
             Object pArgs[] = new Object[2];
             pArgs[0] = (Object) sTempFileURL;
@@ -144,7 +144,7 @@ public class Test01 implements StorageTest {
                 m_aTestHelper.Error( "Can't open existing substorage!" );
                 return false;
             }
-
+    
             if ( !m_aTestHelper.checkStorageProperties( xResultSubStorage, "MediaType4", false, ElementModes.READ ) )
                 return false;
 
@@ -171,7 +171,7 @@ public class Test01 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 
 }
 
diff --git a/package/qa/storages/Test02.java b/package/qa/storages/Test02.java
index 668efbe6a509..2da897a850f8 100644
--- a/package/qa/storages/Test02.java
+++ b/package/qa/storages/Test02.java
@@ -36,7 +36,7 @@ public class Test02 implements StorageTest {
             XStream xTempFileStream = m_aTestHelper.CreateTempFileStream( m_xMSF );
             if ( xTempFileStream == null )
                 return false;
-
+        
             // create storage based on the temporary stream
             Object pArgs[] = new Object[2];
             pArgs[0] = (Object) xTempFileStream;
@@ -59,7 +59,7 @@ public class Test02 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+            
             byte pBigBytes[] = new byte[33000];
             for ( int nInd = 0; nInd < 33000; nInd++ )
                 pBigBytes[nInd] = (byte)( nInd % 128 );
@@ -87,7 +87,7 @@ public class Test02 implements StorageTest {
                                                             false,
                                                             ElementModes.WRITE ) )
                 return false;
-
+    
             // commit substorage first
             if ( !m_aTestHelper.commitStorage( xTempSubStorage ) )
                 return false;
@@ -114,7 +114,7 @@ public class Test02 implements StorageTest {
             if ( xTempInStream == null )
                 return false;
 
-
+        
             // open input stream
             // since no mode is provided the result storage must be opened readonly
             Object pOneArg[] = new Object[1];
@@ -140,7 +140,7 @@ public class Test02 implements StorageTest {
                 m_aTestHelper.Error( "Can't open existing substorage!" );
                 return false;
             }
-
+    
             if ( !m_aTestHelper.checkStorageProperties( xResultSubStorage, "MediaType3", false, ElementModes.READ ) )
                 return false;
 
@@ -157,7 +157,7 @@ public class Test02 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 
 }
 
diff --git a/package/qa/storages/Test03.java b/package/qa/storages/Test03.java
index 353cd4df8d14..01b9039dd318 100644
--- a/package/qa/storages/Test03.java
+++ b/package/qa/storages/Test03.java
@@ -51,7 +51,7 @@ public class Test03 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+            
             byte pBigBytes[] = new byte[33000];
             for ( int nInd = 0; nInd < 33000; nInd++ )
                 pBigBytes[nInd] = (byte)( nInd % 128 );
@@ -88,7 +88,7 @@ public class Test03 implements StorageTest {
 
             if ( !m_aTestHelper.disposeStorage( xTempSubStorage ) )
                 return false;
-
+                
             // ================================================
             // check storage hyerarchy tree
             // ================================================
@@ -174,7 +174,7 @@ public class Test03 implements StorageTest {
                 m_aTestHelper.Error( "Root storage contains wrong list of children!" );
                 return false;
             }
-
+            
             // get storage through XNameAccess
             XStorage xResultSubStorage = getStorageFromNameAccess( xRootNameAccess, "SubStorage1" );
             if ( xResultSubStorage == null )
@@ -197,7 +197,7 @@ public class Test03 implements StorageTest {
                 m_aTestHelper.Error( "'SubStream2' can not be detected as child stream element of 'SubStorage1'!" );
                 return false;
             }
-
+            
             return true;
         }
         catch( Exception e )
@@ -205,7 +205,7 @@ public class Test03 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 
     public XStorage getStorageFromNameAccess( XNameAccess xAccess, String sName )
     {
diff --git a/package/qa/storages/Test04.java b/package/qa/storages/Test04.java
index 81f770f8ff9a..2f8ba736f1b3 100644
--- a/package/qa/storages/Test04.java
+++ b/package/qa/storages/Test04.java
@@ -40,7 +40,7 @@ public class Test04 implements StorageTest {
                 m_aTestHelper.Error( "No valid temporary file was created!" );
                 return false;
             }
-
+        
             // create temporary storage based on arbitrary medium
             // after such a storage is closed it is lost
             Object oTempStorage = m_xStorageFactory.createInstance();
@@ -62,7 +62,7 @@ public class Test04 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+            
             byte pBigBytes[] = new byte[33000];
             for ( int nInd = 0; nInd < 33000; nInd++ )
                 pBigBytes[nInd] = (byte)( nInd % 128 );
@@ -96,7 +96,7 @@ public class Test04 implements StorageTest {
             // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
             if ( !m_aTestHelper.WriteBytesToSubstream( xTempSubStorage2, "SubStream2", "MediaType2", false, pBytes2 ) )
                 return false;
-
+        
             // set "MediaType" property for storages and check that "IsRoot" and "OpenMode" properties are set correctly
             if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempStorage,
                                                             "MediaType3",
@@ -110,14 +110,14 @@ public class Test04 implements StorageTest {
                                                             false,
                                                             ElementModes.WRITE ) )
                 return false;
-
+    
             // set "MediaType" property for storages and check that "IsRoot" and "OpenMode" properties are set correctly
             if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempSubStorage2,
                                                             "MediaType5",
                                                             false,
                                                             ElementModes.WRITE ) )
                 return false;
-
+    
             // create temporary storage based on a previously created temporary file
             Object pArgs[] = new Object[2];
             pArgs[0] = (Object) sTempFileURL;
@@ -209,7 +209,7 @@ public class Test04 implements StorageTest {
                 m_aTestHelper.Error( "Can't open existing substorage!" );
                 return false;
             }
-
+    
             if ( !m_aTestHelper.checkStorageProperties( xResSubStorage1, "MediaType4", false, ElementModes.READ ) )
                 return false;
 
@@ -261,7 +261,7 @@ public class Test04 implements StorageTest {
             // remove element and check that it was removed completelly
             if ( !m_aTestHelper.removeElement( xResStorage, "SubStorage2" ) )
                 return false;
-
+                
             try
             {
                 XNameAccess xResAccess = (XNameAccess) UnoRuntime.queryInterface( XNameAccess.class, xResStorage );
@@ -301,7 +301,7 @@ public class Test04 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 
 }
 
diff --git a/package/qa/storages/Test05.java b/package/qa/storages/Test05.java
index adf943c6ef12..6d90cf9efaa7 100644
--- a/package/qa/storages/Test05.java
+++ b/package/qa/storages/Test05.java
@@ -71,7 +71,7 @@ public class Test05 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+    
             byte pBigBytes[] = new byte[33000];
             for ( int nInd = 0; nInd < 33000; nInd++ )
                 pBigBytes[nInd] = (byte)( nInd % 128 );
@@ -95,7 +95,7 @@ public class Test05 implements StorageTest {
             // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
             if ( !m_aTestHelper.WriteBytesToSubstream( xSubSubStorage, "SubStream2", "MediaType2", false, pBytes2 ) )
                 return false;
-
+    
             // set "MediaType" property for storages and check that "IsRoot" and "OpenMode" properties are set correctly
             if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempFileStorage,
                                                             "MediaType3",
@@ -192,7 +192,7 @@ public class Test05 implements StorageTest {
                 m_aTestHelper.Error( "Wrong exception is thrown by disposed storage: " + e );
                 return false;
             }
-
+    
             try
             {
                 xSubStream1.getInputStream();
@@ -220,7 +220,7 @@ public class Test05 implements StorageTest {
                 m_aTestHelper.Error( "Wrong exception is thrown by disposed stream: " + e );
                 return false;
             }
-
+    
 
             // dispose root storage
             if ( !m_aTestHelper.disposeStorage( xTempFileStorage ) )
@@ -252,7 +252,7 @@ public class Test05 implements StorageTest {
                 m_aTestHelper.Error( "Can't open existing substorage 'SubSubStorage'!" );
                 return false;
             }
-
+    
             if ( !m_aTestHelper.checkStorageProperties( xResSubStorage, "MediaType4", false, ElementModes.READ ) )
                 return false;
 
@@ -265,7 +265,7 @@ public class Test05 implements StorageTest {
                 m_aTestHelper.Error( "Can't open existing substorage 'SubSubStorage'!" );
                 return false;
             }
-
+    
             if ( !m_aTestHelper.checkStorageProperties( xResSubSubStorage, "MediaType5", false, ElementModes.READ ) )
                 return false;
 
@@ -293,7 +293,7 @@ public class Test05 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 
 }
 
diff --git a/package/qa/storages/Test06.java b/package/qa/storages/Test06.java
index ef42c66335a5..0803389a1edf 100644
--- a/package/qa/storages/Test06.java
+++ b/package/qa/storages/Test06.java
@@ -73,7 +73,7 @@ public class Test06 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+    
             // in case stream is open for reading it must exist
             try
             {
@@ -273,7 +273,7 @@ public class Test06 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 
 }
 
diff --git a/package/qa/storages/Test07.java b/package/qa/storages/Test07.java
index 970c6f13ec09..b0edaa5db998 100644
--- a/package/qa/storages/Test07.java
+++ b/package/qa/storages/Test07.java
@@ -37,7 +37,7 @@ public class Test07 implements StorageTest {
                 m_aTestHelper.Error( "No valid temporary file was created!" );
                 return false;
             }
-
+        
             // create temporary storage based on arbitrary medium
             // after such a storage is closed it is lost
             Object oTempStorage = m_xStorageFactory.createInstance();
@@ -73,7 +73,7 @@ public class Test07 implements StorageTest {
             // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
             if ( !m_aTestHelper.WriteBytesToEncrSubstream( xTempStorage, "SubStream2", "MediaType2", false, pBytes2, sPass2 ) )
                 return false;
-
+        
             // create temporary storage based on a previously created temporary file
             Object pArgs[] = new Object[2];
             pArgs[0] = (Object) sTempFileURL;
@@ -156,7 +156,7 @@ public class Test07 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 
 }
 
diff --git a/package/qa/storages/Test08.java b/package/qa/storages/Test08.java
index 5e024db588c8..ecf28c4a86b4 100644
--- a/package/qa/storages/Test08.java
+++ b/package/qa/storages/Test08.java
@@ -31,7 +31,7 @@ public class Test08 implements StorageTest {
     {
         try
         {
-
+    
             // create temporary storage based on arbitrary medium
             // after such a storage is closed it is lost
             Object oTempStorage = m_xStorageFactory.createInstance();
@@ -51,7 +51,7 @@ public class Test08 implements StorageTest {
                 m_aTestHelper.Message( "Optional interface XEncryptionProtectedSource is not implemented, feature can not be tested!" );
                 return true;
             }
-
+            
             String sPass1 = "123";
             String sPass2 = "321";
 
@@ -63,7 +63,7 @@ public class Test08 implements StorageTest {
                 m_aTestHelper.Error( "Can't set a common encryption key for the storage, exception:" + e );
                 return false;
             }
-
+            
             // open a new substorage
             XStorage xTempSubStorage = m_aTestHelper.openSubStorage( xTempStorage,
                                                                         "SubStorage1",
@@ -73,7 +73,7 @@ public class Test08 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+            
             byte pBigBytes[] = new byte[33000];
             for ( int nInd = 0; nInd < 33000; nInd++ )
                 pBigBytes[nInd] = (byte)( nInd % 128 );
@@ -126,7 +126,7 @@ public class Test08 implements StorageTest {
                 m_aTestHelper.Error( "No valid temporary file was created!" );
                 return false;
             }
-
+    
             // create temporary storage based on a previously created temporary file
             Object pArgs[] = new Object[2];
             pArgs[0] = (Object) sTempFileURL;
@@ -175,7 +175,7 @@ public class Test08 implements StorageTest {
                 m_aTestHelper.Error( "Can't open existing substorage!" );
                 return false;
             }
-
+    
             if ( !m_aTestHelper.checkStorageProperties( xResultSubStorage, "MediaType5", false, ElementModes.READ ) )
                 return false;
 
@@ -188,7 +188,7 @@ public class Test08 implements StorageTest {
                 m_aTestHelper.Error( "XEncryptionProtectedSource was successfully used already, so it must be supported!" );
                 return false;
             }
-
+    
             try {
                 xResultStorageEncryption.setEncryptionPassword( sPass2 );
             }
@@ -225,6 +225,6 @@ public class Test08 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 }
 
diff --git a/package/qa/storages/Test09.java b/package/qa/storages/Test09.java
index 2ce2dfb1e484..8d867a4fecaa 100644
--- a/package/qa/storages/Test09.java
+++ b/package/qa/storages/Test09.java
@@ -31,7 +31,7 @@ public class Test09 implements StorageTest {
     {
         try
         {
-
+    
             // create temporary storage based on arbitrary medium
             // after such a storage is closed it is lost
             Object oTempStorage = m_xStorageFactory.createInstance();
@@ -63,7 +63,7 @@ public class Test09 implements StorageTest {
                 m_aTestHelper.Error( "No valid temporary file was created!" );
                 return false;
             }
-
+    
             // create temporary storage based on a previously created temporary file
             Object pArgs[] = new Object[2];
             pArgs[0] = (Object) sTempFileURL;
@@ -133,6 +133,6 @@ public class Test09 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 }
 
diff --git a/package/qa/storages/Test10.java b/package/qa/storages/Test10.java
index 162daa5abe29..35c3e6ecbce6 100644
--- a/package/qa/storages/Test10.java
+++ b/package/qa/storages/Test10.java
@@ -67,7 +67,7 @@ public class Test10 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+            
             byte pBytes2[] = { 2, 2, 2, 2, 2 };
 
             // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
@@ -119,7 +119,7 @@ public class Test10 implements StorageTest {
                 m_aTestHelper.Error( "The new substorage still was not commited so it must be empty!" );
                 return false;
             }
-
+            
             if ( !m_aTestHelper.disposeStorage( xClonedSubStorage ) )
                 return false;
 
@@ -184,7 +184,7 @@ public class Test10 implements StorageTest {
                 m_aTestHelper.Error( "The root storage still was not commited so it's clone must be empty!" );
                 return false;
             }
-
+            
             if ( !m_aTestHelper.disposeStorage( xCloneOfRoot ) )
                 return false;
 
@@ -227,6 +227,6 @@ public class Test10 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 }
 
diff --git a/package/qa/storages/Test11.java b/package/qa/storages/Test11.java
index 198fa41fe588..5663c1e57746 100644
--- a/package/qa/storages/Test11.java
+++ b/package/qa/storages/Test11.java
@@ -68,7 +68,7 @@ public class Test11 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+            
             String sPass2 = "2222222222";
             byte pBytes2[] = { 2, 2, 2, 2, 2 };
 
@@ -121,7 +121,7 @@ public class Test11 implements StorageTest {
                 m_aTestHelper.Error( "The new substorage still was not commited so it must be empty!" );
                 return false;
             }
-
+            
             if ( !m_aTestHelper.disposeStorage( xClonedSubStorage ) )
                 return false;
 
@@ -170,7 +170,7 @@ public class Test11 implements StorageTest {
             // ==============================
             // commit the root storage and check cloning
             // ==============================
-
+    
             if ( !m_aTestHelper.commitStorage( xTempStorage ) )
                 return false;
 
@@ -213,6 +213,6 @@ public class Test11 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 }
 
diff --git a/package/qa/storages/Test12.java b/package/qa/storages/Test12.java
index 05928cf76b0d..6db2561bfade 100644
--- a/package/qa/storages/Test12.java
+++ b/package/qa/storages/Test12.java
@@ -36,7 +36,7 @@ public class Test12 implements StorageTest {
             XStream xTempFileStream = m_aTestHelper.CreateTempFileStream( m_xMSF );
             if ( xTempFileStream == null )
                 return false;
-
+        
             // create storage based on the temporary stream
             Object pArgs[] = new Object[2];
             pArgs[0] = (Object) xTempFileStream;
@@ -59,7 +59,7 @@ public class Test12 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+            
             byte pBigBytes[] = new byte[33000];
             for ( int nInd = 0; nInd < 33000; nInd++ )
                 pBigBytes[nInd] = (byte)( nInd % 128 );
@@ -87,7 +87,7 @@ public class Test12 implements StorageTest {
                                                             false,
                                                             ElementModes.WRITE ) )
                 return false;
-
+    
             // commit substorage first
             if ( !m_aTestHelper.commitStorage( xTempSubStorage ) )
                 return false;
@@ -192,7 +192,7 @@ public class Test12 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 
     private boolean checkSubStorages( XStorage xStorage, byte[] pBytes1, byte[] pBigBytes )
     {
diff --git a/package/qa/storages/Test13.java b/package/qa/storages/Test13.java
index e8b05264f44d..6e8c8a4e9037 100644
--- a/package/qa/storages/Test13.java
+++ b/package/qa/storages/Test13.java
@@ -33,7 +33,7 @@ public class Test13 implements StorageTest {
         for ( int nInd = 0; nInd < 4; ++nInd, aStreamPrefix += "SubStorage" + nInd )
             if ( !testForPath( aStreamPrefix ) )
                 return false;
-
+        
         return true;
     }
 
@@ -54,7 +54,7 @@ public class Test13 implements StorageTest {
                 m_aTestHelper.Error( "No valid temporary file was created!" );
                 return false;
             }
-
+    
             // create temporary storage based on a previously created temporary file
             Object pArgs[] = new Object[2];
             pArgs[0] = (Object) sTempFileURL;
@@ -209,7 +209,7 @@ public class Test13 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 
 }
 
diff --git a/package/qa/storages/Test14.java b/package/qa/storages/Test14.java
index 1f35758af05a..94e384c6b8f9 100644
--- a/package/qa/storages/Test14.java
+++ b/package/qa/storages/Test14.java
@@ -33,7 +33,7 @@ public class Test14 implements StorageTest {
         for ( int nInd = 0; nInd < 4; ++nInd, aStreamPrefix += "SubStorage" + nInd )
             if ( !testForPath( aStreamPrefix ) )
                 return false;
-
+        
         return true;
     }
 
@@ -51,7 +51,7 @@ public class Test14 implements StorageTest {
                 m_aTestHelper.Error( "No valid temporary file was created!" );
                 return false;
             }
-
+    
             // create temporary storage based on a previously created temporary file
             Object pArgs[] = new Object[2];
             pArgs[0] = (Object) sTempFileURL;
@@ -80,7 +80,7 @@ public class Test14 implements StorageTest {
             // and commit
             if ( !m_aTestHelper.WriteBytesToEncrStreamH( xTempFileStorage, aSubStream2Path, "MediaType2", false, pBytes2, sPass2, true ) )
                 return false;
-
+    
             // open a new substream hierarchically, set "MediaType" and "Compressed" properties to it, write some bytes
             // and don't commit
             if ( !m_aTestHelper.WriteBytesToEncrStreamH( xTempFileStorage, aSubStream3Path, "MediaType2", false, pBytes2, sPass2, false ) )
@@ -182,7 +182,7 @@ public class Test14 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 
 }
 
diff --git a/package/qa/storages/Test15.java b/package/qa/storages/Test15.java
index b58453f9a195..ca89cfa19e95 100644
--- a/package/qa/storages/Test15.java
+++ b/package/qa/storages/Test15.java
@@ -33,7 +33,7 @@ public class Test15 implements StorageTest {
         for ( int nInd = 0; nInd < 4; ++nInd, aStreamPrefix += "SubStorage" + nInd )
             if ( !testForPath( aStreamPrefix ) )
                 return false;
-
+        
         return true;
     }
 
@@ -52,7 +52,7 @@ public class Test15 implements StorageTest {
                 m_aTestHelper.Error( "No valid temporary file was created!" );
                 return false;
             }
-
+    
             // create temporary storage based on a previously created temporary file
             Object pArgs[] = new Object[2];
             pArgs[0] = (Object) sTempFileURL;
@@ -75,7 +75,7 @@ public class Test15 implements StorageTest {
                 m_aTestHelper.Message( "Optional interface XEncryptionProtectedSource is not implemented, feature can not be tested!" );
                 return true;
             }
-
+            
             String sPass1 = "12345";
             String sPass2 = "54321";
 
@@ -112,7 +112,7 @@ public class Test15 implements StorageTest {
             if ( !m_aTestHelper.WBToSubstrOfEncrH( xTempFileStorage, aSubStream4Path, "MediaType2", true, pBytes1, true, false ) )
                 return false;
 
-
+    
             // set "MediaType" property for storages and check that "IsRoot" and "OpenMode" properties are set correctly
             if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempFileStorage,
                                                             "MediaType3",
@@ -152,7 +152,7 @@ public class Test15 implements StorageTest {
                 m_aTestHelper.Error( "XEncryptionProtectedSource is supported, but can not be retrieved!" );
                 return false;
             }
-
+            
             try {
                 xTempStorageEncryption.setEncryptionPassword( sPass2 );
             }
@@ -229,7 +229,7 @@ public class Test15 implements StorageTest {
                 m_aTestHelper.Error( "XEncryptionProtectedSource is supported, but can not be retrieved!" );
                 return false;
             }
-
+            
             try {
                 xTempStorageEncryption.setEncryptionPassword( sPass1 );
             }
@@ -262,7 +262,7 @@ public class Test15 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 
 }
 
diff --git a/package/qa/storages/Test16.java b/package/qa/storages/Test16.java
index 6f432b0da730..1b573dc126a1 100644
--- a/package/qa/storages/Test16.java
+++ b/package/qa/storages/Test16.java
@@ -37,7 +37,7 @@ public class Test16 implements StorageTest {
                 m_aTestHelper.Error( "No valid temporary file was created!" );
                 return false;
             }
-
+        
             // create temporary storage based on arbitrary medium
             // after such a storage is closed it is lost
             Object oTempStorage = m_xStorageFactory.createInstance();
@@ -57,7 +57,7 @@ public class Test16 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+            
             byte pBytes1[] = { 1, 1, 1, 1, 1 };
 
             // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
@@ -69,7 +69,7 @@ public class Test16 implements StorageTest {
             // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
             if ( !m_aTestHelper.WriteBytesToSubstream( xTempSubStorage, "SubStream\u0442\u0435\u0441\u04422", "MediaType2", false, pBytes2 ) )
                 return false;
-
+        
             // set "MediaType" property for storages and check that "IsRoot" and "OpenMode" properties are set correctly
             if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempStorage,
                                                             "MediaType3",
@@ -83,7 +83,7 @@ public class Test16 implements StorageTest {
                                                             false,
                                                             ElementModes.WRITE ) )
                 return false;
-
+    
             // create temporary storage based on a previously created temporary file
             Object pArgs[] = new Object[2];
             pArgs[0] = (Object) sTempFileURL;
@@ -132,7 +132,7 @@ public class Test16 implements StorageTest {
                 m_aTestHelper.Error( "Can't open existing substorage!" );
                 return false;
             }
-
+    
             if ( !m_aTestHelper.checkStorageProperties( xResultSubStorage, "MediaType4", false, ElementModes.READ ) )
                 return false;
 
@@ -153,7 +153,7 @@ public class Test16 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 
 }
 
diff --git a/package/qa/storages/Test17.java b/package/qa/storages/Test17.java
index 009344cefbc4..9d25672ba78c 100644
--- a/package/qa/storages/Test17.java
+++ b/package/qa/storages/Test17.java
@@ -36,7 +36,7 @@ public class Test17 implements StorageTest {
             XStream xTempFileStream = m_aTestHelper.CreateTempFileStream( m_xMSF );
             if ( xTempFileStream == null )
                 return false;
-
+        
             // create storage based on the temporary stream
             Object pArgs[] = new Object[2];
             pArgs[0] = (Object) xTempFileStream;
@@ -50,7 +50,7 @@ public class Test17 implements StorageTest {
                 return false;
             }
 
-
+        
             byte pBytes1[] = { 1, 1, 1, 1, 1 };
             String pNames[] = { "SubStream1", "SubStream2", "SubStream3", "SubStream4", "SubStream5", "SubStream6", "SubStream7" };
 
@@ -65,7 +65,7 @@ public class Test17 implements StorageTest {
                     m_aTestHelper.Error( "Can't create substorage!" );
                     return false;
                 }
-
+    
                 // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
                 if ( !m_aTestHelper.WriteBytesToSubstream( xTempSubStorage, pNames[nInd], "MediaType1", true, pBytes1 ) )
                     return false;
@@ -101,7 +101,7 @@ public class Test17 implements StorageTest {
             if ( xTempInStream == null )
                 return false;
 
-
+        
             // open input stream
             // since no mode is provided the result storage must be opened readonly
             Object pOneArg[] = new Object[1];
@@ -124,7 +124,7 @@ public class Test17 implements StorageTest {
                 m_aTestHelper.Error( "Can't open existing substorage!" );
                 return false;
             }
-
+    
             for ( int nInd = 0; nInd < pNames.length; nInd++ )
                 if ( !m_aTestHelper.checkStream( xResultSubStorage, pNames[nInd], "MediaType1", true, pBytes1 ) )
                     return false;
@@ -136,7 +136,7 @@ public class Test17 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 
 }
 
diff --git a/package/qa/storages/Test18.java b/package/qa/storages/Test18.java
index 335a230027ce..a79e2d3c2b9c 100644
--- a/package/qa/storages/Test18.java
+++ b/package/qa/storages/Test18.java
@@ -38,7 +38,7 @@ public class Test18 implements StorageTest {
                 m_aTestHelper.Error( "No valid temporary file was created!" );
                 return false;
             }
-
+        
             // create temporary storage based on arbitrary medium
             // after such a storage is closed it is lost
             Object oTempStorage = m_xStorageFactory.createInstance();
@@ -58,7 +58,7 @@ public class Test18 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+            
             byte pBytes1[] = { 1, 1, 1, 1, 1 };
 
             // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
@@ -68,7 +68,7 @@ public class Test18 implements StorageTest {
             // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
             if ( !m_aTestHelper.WriteBytesToSubstreamDefaultCompressed( xTempSubStorage, "SubStream2", "image/png", pBytes1 ) )
                 return false;
-
+    
             // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
             if ( !m_aTestHelper.WriteBytesToSubstreamDefaultCompressed( xTempSubStorage, "SubStream3", "image/gif", pBytes1 ) )
                 return false;
@@ -90,7 +90,7 @@ public class Test18 implements StorageTest {
                                                             false,
                                                             ElementModes.WRITE ) )
                 return false;
-
+    
             // create temporary storage based on a previously created temporary file
             Object pArgs[] = new Object[2];
             pArgs[0] = (Object) sTempFileURL;
@@ -139,7 +139,7 @@ public class Test18 implements StorageTest {
                 m_aTestHelper.Error( "Can't open existing substorage!" );
                 return false;
             }
-
+    
             if ( !m_aTestHelper.checkStorageProperties( xResultSubStorage, "MediaType4", false, ElementModes.READ ) )
                 return false;
 
@@ -166,7 +166,7 @@ public class Test18 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 
 }
 
diff --git a/package/qa/storages/TestHelper.java b/package/qa/storages/TestHelper.java
index dc28786513b1..0c1580fc7014 100644
--- a/package/qa/storages/TestHelper.java
+++ b/package/qa/storages/TestHelper.java
@@ -36,7 +36,7 @@ public class TestHelper  {
             Error( "Can't get XOutputStream implementation from substream '" + sStreamName + "'!" );
             return false;
         }
-
+    
         // get XTrucate implementation from output stream
         XTruncate xTruncate = (XTruncate) UnoRuntime.queryInterface( XTruncate.class, xOutput );
         if ( xTruncate == null )
@@ -44,7 +44,7 @@ public class TestHelper  {
             Error( "Can't get XTruncate implementation from substream '" + sStreamName + "'!" );
             return false;
         }
-
+        
         // write requested byte sequence
         try
         {
@@ -118,7 +118,7 @@ public class TestHelper  {
             Error( "Can't create substream '" + sStreamName + "', exception : " + e + "!" );
             return false;
         }
-
+    
         // get output stream of substream
         XOutputStream xOutput = xSubStream.getOutputStream();
         if ( xOutput == null )
@@ -126,7 +126,7 @@ public class TestHelper  {
             Error( "Can't get XOutputStream implementation from substream '" + sStreamName + "'!" );
             return false;
         }
-
+    
         // get XTrucate implementation from output stream
         XTruncate xTruncate = (XTruncate) UnoRuntime.queryInterface( XTruncate.class, xOutput );
         if ( xTruncate == null )
@@ -134,7 +134,7 @@ public class TestHelper  {
             Error( "Can't get XTruncate implementation from substream '" + sStreamName + "'!" );
             return false;
         }
-
+        
         // write requested byte sequence
         try
         {
@@ -213,7 +213,7 @@ public class TestHelper  {
             Error( "Can't create substream '" + sStreamName + "', exception : " + e + "!" );
             return false;
         }
-
+        
         if ( !WriteBytesToStream( xSubStream, sStreamName, sMediaType, bCompressed, pBytes ) )
             return false;
 
@@ -345,7 +345,7 @@ public class TestHelper  {
             Error( "Can't create substream '" + sStreamPath + "', exception : " + e + "!" );
             return false;
         }
-
+        
         if ( !WriteBytesToStream( xSubStream, sStreamPath, sMediaType, bCompressed, pBytes ) )
             return false;
 
@@ -410,7 +410,7 @@ public class TestHelper  {
             Error( "Can't create substream '" + sStreamPath + "', exception : " + e + "!" );
             return false;
         }
-
+        
         if ( !WriteBytesToStream( xSubStream, sStreamPath, sMediaType, bCompressed, pBytes ) )
             return false;
 
@@ -555,7 +555,7 @@ public class TestHelper  {
             Message( "Optional interface XEncryptionProtectedSource is not implemented, feature can not be tested!" );
             return -1;
         }
-
+            
         try {
             xStreamEncryption.setEncryptionPassword( sNewPass );
         }
@@ -613,7 +613,7 @@ public class TestHelper  {
             Message( "Optional interface XEncryptionProtectedSource is not implemented, feature can not be tested!" );
             return -1;
         }
-
+            
         try {
             xStreamEncryption.setEncryptionPassword( sNewPass );
         }
@@ -672,7 +672,7 @@ public class TestHelper  {
                     Error( "'IsRoot' property contains wrong value!" );
                     bOk = false;
                 }
-
+                    
                 if ( ( bIsRoot
                   && ( nPropMode | ElementModes.READ ) != ( nMode | ElementModes.READ ) )
                   || ( !bIsRoot && ( nPropMode & nMode ) != nMode ) )
@@ -716,13 +716,13 @@ public class TestHelper  {
                             + sMediaType + "', set '" + sPropMediaType + "' !" );
                     bOk = false;
                 }
-
+    
                 if ( bPropIsRoot != bIsRoot )
                 {
                     Error( "'IsRoot' property contains wrong value!" );
                     bOk = false;
                 }
-
+                    
                 if ( ( bIsRoot
                   && ( nPropMode | ElementModes.READ ) != ( nMode | ElementModes.READ ) )
                   || ( !bIsRoot && ( nPropMode & nMode ) != nMode ) )
@@ -758,7 +758,7 @@ public class TestHelper  {
             Error( "Can't get XInputStream implementation from substream '" + sName + "'!" );
             return false;
         }
-
+    
         byte pContents[][] = new byte[1][]; // ???
 
         // read contents
@@ -813,11 +813,11 @@ public class TestHelper  {
                 bOk = true;
                 if ( !sPropMediaType.equals( sMediaType ) )
                 {
-                    Error( "'MediaType' property contains wrong value for stream '" + sName + "',\nexpected: '"
+                    Error( "'MediaType' property contains wrong value for stream '" + sName + "',\nexpected: '" 
                             + sMediaType + "', set: '" + sPropMediaType + "'!" );
                     bOk = false;
                 }
-
+    
                 if ( nPropSize != pBytes.length )
                 {
                     Error( "'Size' property contains wrong value for stream'" + sName + "'!" );
@@ -866,7 +866,7 @@ public class TestHelper  {
             Error( "Can't open substream '" + sName + "', exception : " + e + "!" );
             return false;
         }
-
+        
         boolean bResult = InternalCheckStream( xSubStream, sName, sMediaType, bCompressed, pBytes, true );
 
         // free the stream resources, garbage collector may remove the object too late
@@ -883,7 +883,7 @@ public class TestHelper  {
                                     String sPass )
     {
         // Important: a common password for any of parent storage should not be set or
-        //            should be different from sPass
+        // 			  should be different from sPass
 
         try
         {
@@ -898,7 +898,7 @@ public class TestHelper  {
             Error( "Unexpected exception in case of opening of encrypted stream '" + sName + "' without password: " + e + "!" );
             return false;
         }
-
+    
         String sWrongPass = "11";
         sWrongPass += sPass;
         try
@@ -914,7 +914,7 @@ public class TestHelper  {
             Error( "Unexpected exception in case of opening of encrypted stream '" + sName + "' with wrong password: " + e + "!" );
             return false;
         }
-
+    
         XStream xSubStream = null;
         try
         {
@@ -931,7 +931,7 @@ public class TestHelper  {
             Error( "Can't open encrypted substream '" + sName + "', exception : " + e + "!" );
             return false;
         }
-
+        
         // encrypted streams will be compressed always, so after the storing this property is always true,
         // although before the storing it can be set to false ( it is not always clear whether a stream is encrypted
         // before the storing )
@@ -975,7 +975,7 @@ public class TestHelper  {
             Error( "Can't open substream '" + sPath + "', exception : " + e + "!" );
             return false;
         }
-
+        
         boolean bResult = InternalCheckStream( xSubStream, sPath, sMediaType, bCompressed, pBytes, true );
 
         // free the stream resources, garbage collector may remove the object too late
@@ -992,7 +992,7 @@ public class TestHelper  {
                                     String sPass )
     {
         // Important: a common password for any of parent storage should not be set or
-        //            should be different from sPass
+        // 			  should be different from sPass
         XHierarchicalStorageAccess xHStorage =
             (XHierarchicalStorageAccess) UnoRuntime.queryInterface( XHierarchicalStorageAccess.class, xParentStorage );
         if ( xHStorage == null )
@@ -1015,7 +1015,7 @@ public class TestHelper  {
             Error( "Unexpected exception in case of opening of encrypted stream '" + sPath + "' without password: " + e + "!" );
             return false;
         }
-
+    
         String sWrongPass = "11";
         sWrongPass += sPass;
         try
@@ -1032,7 +1032,7 @@ public class TestHelper  {
             Error( "Unexpected exception in case of opening of encrypted stream '" + sPath + "' with wrong password: " + e + "!" );
             return false;
         }
-
+    
         XStream xSubStream = null;
         try
         {
@@ -1049,7 +1049,7 @@ public class TestHelper  {
             Error( "Can't open encrypted substream '" + sPath + "', exception : " + e + "!" );
             return false;
         }
-
+        
         // encrypted streams will be compressed always, so after the storing this property is always true,
         // although before the storing it can be set to false ( it is not always clear whether a stream is encrypted
         // before the storing )
@@ -1100,7 +1100,7 @@ public class TestHelper  {
 
         return true;
     }
-
+    
     public boolean disposeStream( XStream xStream, String sStreamName )
     {
         XComponent xComponent = (XComponent) UnoRuntime.queryInterface( XComponent.class, xStream );
@@ -1109,7 +1109,7 @@ public class TestHelper  {
             Error( "Can't get XComponent implementation from substream '" + sStreamName + "'!" );
             return false;
         }
-
+        
         try
         {
             xComponent.dispose();
@@ -1190,7 +1190,7 @@ public class TestHelper  {
             Error( "Can't close output part of a stream, exception :" + e );
             return false;
         }
-
+        
         return true;
     }
 
@@ -1232,7 +1232,7 @@ public class TestHelper  {
     public String CreateTempFile( XMultiServiceFactory xMSF )
     {
         String sResult = null;
-
+    
         // try to get temporary file representation
         XPropertySet xTempFileProps = null;
         try
diff --git a/package/source/manifest/Base64Codec.cxx b/package/source/manifest/Base64Codec.cxx
index f3c8152a3fad..9c2d4d34288a 100644
--- a/package/source/manifest/Base64Codec.cxx
+++ b/package/source/manifest/Base64Codec.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/package/source/manifest/Base64Codec.hxx b/package/source/manifest/Base64Codec.hxx
index 8cae2a7037fd..941c115a8437 100644
--- a/package/source/manifest/Base64Codec.hxx
+++ b/package/source/manifest/Base64Codec.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/package/source/manifest/ManifestDefines.hxx b/package/source/manifest/ManifestDefines.hxx
index 65b9c6181727..67159ee8edb5 100644
--- a/package/source/manifest/ManifestDefines.hxx
+++ b/package/source/manifest/ManifestDefines.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/package/source/manifest/ManifestExport.cxx b/package/source/manifest/ManifestExport.cxx
index 04316e784c77..6283e5ff84fc 100644
--- a/package/source/manifest/ManifestExport.cxx
+++ b/package/source/manifest/ManifestExport.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,44 +47,44 @@ using namespace com::sun::star::xml::sax;
 
 ManifestExport::ManifestExport(Reference < XDocumentHandler > xHandler,  const Sequence < Sequence < PropertyValue > > &rManList )
 {
-    const OUString sFileEntryElement    ( RTL_CONSTASCII_USTRINGPARAM ( ELEMENT_FILE_ENTRY ) );
-    const OUString sManifestElement     ( RTL_CONSTASCII_USTRINGPARAM ( ELEMENT_MANIFEST ) );
+    const OUString sFileEntryElement   	( RTL_CONSTASCII_USTRINGPARAM ( ELEMENT_FILE_ENTRY ) );
+    const OUString sManifestElement    	( RTL_CONSTASCII_USTRINGPARAM ( ELEMENT_MANIFEST ) );
     const OUString sEncryptionDataElement( RTL_CONSTASCII_USTRINGPARAM ( ELEMENT_ENCRYPTION_DATA ) );
-    const OUString sAlgorithmElement    ( RTL_CONSTASCII_USTRINGPARAM ( ELEMENT_ALGORITHM ) );
+    const OUString sAlgorithmElement	( RTL_CONSTASCII_USTRINGPARAM ( ELEMENT_ALGORITHM ) );
     const OUString sStartKeyGenerationElement ( RTL_CONSTASCII_USTRINGPARAM ( ELEMENT_START_KEY_GENERATION ) );
     const OUString sKeyDerivationElement( RTL_CONSTASCII_USTRINGPARAM ( ELEMENT_KEY_DERIVATION ) );
 
-    const OUString sCdataAttribute      ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_CDATA ) );
-    const OUString sMediaTypeAttribute  ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_MEDIA_TYPE ) );
-    const OUString sVersionAttribute    ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_VERSION ) );
-    const OUString sFullPathAttribute   ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_FULL_PATH ) );
-    const OUString sSizeAttribute       ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_SIZE ) );
-    const OUString sKeySizeAttribute    ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_KEY_SIZE ) );
-    const OUString sSaltAttribute       ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_SALT ) );
+    const OUString sCdataAttribute     	( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_CDATA ) );
+    const OUString sMediaTypeAttribute 	( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_MEDIA_TYPE ) );
+    const OUString sVersionAttribute 	( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_VERSION ) );
+    const OUString sFullPathAttribute  	( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_FULL_PATH ) );
+    const OUString sSizeAttribute 		( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_SIZE ) );
+    const OUString sKeySizeAttribute	( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_KEY_SIZE ) );
+    const OUString sSaltAttribute 		( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_SALT ) );
     const OUString sInitialisationVectorAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_INITIALISATION_VECTOR ) );
     const OUString sIterationCountAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_ITERATION_COUNT ) );
-    const OUString sAlgorithmNameAttribute  ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_ALGORITHM_NAME ) );
+    const OUString sAlgorithmNameAttribute 	( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_ALGORITHM_NAME ) );
     const OUString sStartKeyGenerationNameAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_START_KEY_GENERATION_NAME ) );
-    const OUString sKeyDerivationNameAttribute  ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_KEY_DERIVATION_NAME ) );
-    const OUString sChecksumTypeAttribute   ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_CHECKSUM_TYPE ) );
-    const OUString sChecksumAttribute   ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_CHECKSUM) );
-
-    const OUString sFullPathProperty    ( RTL_CONSTASCII_USTRINGPARAM ( "FullPath" ) );
-    const OUString sVersionProperty     ( RTL_CONSTASCII_USTRINGPARAM ( "Version" ) );
-    const OUString sMediaTypeProperty   ( RTL_CONSTASCII_USTRINGPARAM ( "MediaType" ) );
-    const OUString sIterationCountProperty  ( RTL_CONSTASCII_USTRINGPARAM ( "IterationCount" ) );
-    const OUString sSaltProperty        ( RTL_CONSTASCII_USTRINGPARAM ( "Salt" ) );
+    const OUString sKeyDerivationNameAttribute 	( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_KEY_DERIVATION_NAME ) );
+    const OUString sChecksumTypeAttribute 	( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_CHECKSUM_TYPE ) );
+    const OUString sChecksumAttribute 	( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_CHECKSUM) );
+
+    const OUString sFullPathProperty  	( RTL_CONSTASCII_USTRINGPARAM ( "FullPath" ) );
+    const OUString sVersionProperty 	( RTL_CONSTASCII_USTRINGPARAM ( "Version" ) );
+    const OUString sMediaTypeProperty 	( RTL_CONSTASCII_USTRINGPARAM ( "MediaType" ) );
+    const OUString sIterationCountProperty	( RTL_CONSTASCII_USTRINGPARAM ( "IterationCount" ) );
+    const OUString sSaltProperty 		( RTL_CONSTASCII_USTRINGPARAM ( "Salt" ) );
     const OUString sInitialisationVectorProperty( RTL_CONSTASCII_USTRINGPARAM ( "InitialisationVector" ) );
-    const OUString sSizeProperty        ( RTL_CONSTASCII_USTRINGPARAM ( "Size" ) );
-    const OUString sDigestProperty      ( RTL_CONSTASCII_USTRINGPARAM ( "Digest" ) );
+    const OUString sSizeProperty 		( RTL_CONSTASCII_USTRINGPARAM ( "Size" ) );
+    const OUString sDigestProperty 		( RTL_CONSTASCII_USTRINGPARAM ( "Digest" ) );
 
-    const OUString sWhiteSpace          ( RTL_CONSTASCII_USTRINGPARAM ( " " ) );
-    const OUString sBlowfish            ( RTL_CONSTASCII_USTRINGPARAM ( "Blowfish CFB" ) );
-    const OUString sPBKDF2              ( RTL_CONSTASCII_USTRINGPARAM ( "PBKDF2" ) );
-    const OUString sChecksumType        ( RTL_CONSTASCII_USTRINGPARAM ( CHECKSUM_TYPE ) );
-    const OUString sStartKeySize        ( RTL_CONSTASCII_USTRINGPARAM ( START_KEY_SIZE ) );
-    const OUString sDerivedKeySize      ( RTL_CONSTASCII_USTRINGPARAM ( DERIVED_KEY_SIZE ) );
-    const OUString sSHA1                ( RTL_CONSTASCII_USTRINGPARAM ( ALGORITHM_SHA1 ) );
+    const OUString sWhiteSpace 			( RTL_CONSTASCII_USTRINGPARAM ( " " ) );
+    const OUString sBlowfish 			( RTL_CONSTASCII_USTRINGPARAM ( "Blowfish CFB" ) );
+    const OUString sPBKDF2 				( RTL_CONSTASCII_USTRINGPARAM ( "PBKDF2" ) );
+    const OUString sChecksumType 		( RTL_CONSTASCII_USTRINGPARAM ( CHECKSUM_TYPE ) );
+    const OUString sStartKeySize 		( RTL_CONSTASCII_USTRINGPARAM ( START_KEY_SIZE ) );
+    const OUString sDerivedKeySize 		( RTL_CONSTASCII_USTRINGPARAM ( DERIVED_KEY_SIZE ) );
+    const OUString sSHA1 		        ( RTL_CONSTASCII_USTRINGPARAM ( ALGORITHM_SHA1 ) );
 
     ::comphelper::AttributeList * pRootAttrList = new ::comphelper::AttributeList;
     const Sequence < PropertyValue > *pSequence = rManList.getConstArray();
@@ -139,7 +139,7 @@ ManifestExport::ManifestExport(Reference < XDocumentHandler > xHandler,  const S
           || aDocMediaType.equals( OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII ) ) )
           || aDocMediaType.equals( OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_ASCII ) ) )
           || aDocMediaType.equals( OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII ) ) )
-          || aDocMediaType.equals( OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII ) ) )
+          || aDocMediaType.equals( OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII ) ) ) 
           || aDocMediaType.equals( OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII ) ) )
 
           || aDocMediaType.equals( OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII ) ) )
diff --git a/package/source/manifest/ManifestExport.hxx b/package/source/manifest/ManifestExport.hxx
index 73b8cce89725..860c8e60d44f 100644
--- a/package/source/manifest/ManifestExport.hxx
+++ b/package/source/manifest/ManifestExport.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx
index be0e540a11da..33b63877795f 100644
--- a/package/source/manifest/ManifestImport.cxx
+++ b/package/source/manifest/ManifestImport.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,41 +43,41 @@ using namespace std;
 // ---------------------------------------------------
 ManifestImport::ManifestImport( vector < Sequence < PropertyValue > > & rNewManVector )
 : nNumProperty ( 0 )
-, bIgnoreEncryptData    ( sal_False )
+, bIgnoreEncryptData 	( sal_False )
 , rManVector ( rNewManVector )
 
-, sFileEntryElement     ( RTL_CONSTASCII_USTRINGPARAM ( ELEMENT_FILE_ENTRY ) )
-, sManifestElement      ( RTL_CONSTASCII_USTRINGPARAM ( ELEMENT_MANIFEST ) )
+, sFileEntryElement   	( RTL_CONSTASCII_USTRINGPARAM ( ELEMENT_FILE_ENTRY ) )
+, sManifestElement    	( RTL_CONSTASCII_USTRINGPARAM ( ELEMENT_MANIFEST ) )
 , sEncryptionDataElement( RTL_CONSTASCII_USTRINGPARAM ( ELEMENT_ENCRYPTION_DATA ) )
-, sAlgorithmElement ( RTL_CONSTASCII_USTRINGPARAM ( ELEMENT_ALGORITHM ) )
+, sAlgorithmElement	( RTL_CONSTASCII_USTRINGPARAM ( ELEMENT_ALGORITHM ) )
 , sKeyDerivationElement( RTL_CONSTASCII_USTRINGPARAM ( ELEMENT_KEY_DERIVATION ) )
 
-, sCdataAttribute               ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_CDATA ) )
-, sMediaTypeAttribute           ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_MEDIA_TYPE ) )
-, sVersionAttribute             ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_VERSION ) )
-, sFullPathAttribute            ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_FULL_PATH ) )
-, sSizeAttribute                ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_SIZE ) )
-, sSaltAttribute                ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_SALT ) )
+, sCdataAttribute     			( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_CDATA ) )
+, sMediaTypeAttribute 			( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_MEDIA_TYPE ) )
+, sVersionAttribute 			( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_VERSION ) )
+, sFullPathAttribute  			( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_FULL_PATH ) )
+, sSizeAttribute 				( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_SIZE ) )
+, sSaltAttribute 				( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_SALT ) )
 , sInitialisationVectorAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_INITIALISATION_VECTOR ) )
-, sIterationCountAttribute      ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_ITERATION_COUNT ) )
-, sAlgorithmNameAttribute       ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_ALGORITHM_NAME ) )
-, sKeyDerivationNameAttribute   ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_KEY_DERIVATION_NAME ) )
-, sChecksumAttribute            ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_CHECKSUM ) )
-, sChecksumTypeAttribute        ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_CHECKSUM_TYPE ) )
-
-, sFullPathProperty             ( RTL_CONSTASCII_USTRINGPARAM ( "FullPath" ) )
-, sMediaTypeProperty            ( RTL_CONSTASCII_USTRINGPARAM ( "MediaType" ) )
-, sVersionProperty              ( RTL_CONSTASCII_USTRINGPARAM ( "Version" ) )
-, sIterationCountProperty       ( RTL_CONSTASCII_USTRINGPARAM ( "IterationCount" ) )
-, sSaltProperty                 ( RTL_CONSTASCII_USTRINGPARAM ( "Salt" ) )
-, sInitialisationVectorProperty ( RTL_CONSTASCII_USTRINGPARAM ( "InitialisationVector" ) )
-, sSizeProperty                 ( RTL_CONSTASCII_USTRINGPARAM ( "Size" ) )
-, sDigestProperty               ( RTL_CONSTASCII_USTRINGPARAM ( "Digest" ) )
-
-, sWhiteSpace                   ( RTL_CONSTASCII_USTRINGPARAM ( " " ) )
-, sBlowfish                     ( RTL_CONSTASCII_USTRINGPARAM ( "Blowfish CFB" ) )
-, sPBKDF2                       ( RTL_CONSTASCII_USTRINGPARAM ( "PBKDF2" ) )
-, sChecksumType                 ( RTL_CONSTASCII_USTRINGPARAM ( CHECKSUM_TYPE ) )
+, sIterationCountAttribute 		( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_ITERATION_COUNT ) )
+, sAlgorithmNameAttribute 		( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_ALGORITHM_NAME ) )
+, sKeyDerivationNameAttribute 	( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_KEY_DERIVATION_NAME ) )
+, sChecksumAttribute 			( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_CHECKSUM ) )
+, sChecksumTypeAttribute 		( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_CHECKSUM_TYPE ) )
+
+, sFullPathProperty  			( RTL_CONSTASCII_USTRINGPARAM ( "FullPath" ) )
+, sMediaTypeProperty 			( RTL_CONSTASCII_USTRINGPARAM ( "MediaType" ) )
+, sVersionProperty  			( RTL_CONSTASCII_USTRINGPARAM ( "Version" ) )
+, sIterationCountProperty 		( RTL_CONSTASCII_USTRINGPARAM ( "IterationCount" ) )
+, sSaltProperty 				( RTL_CONSTASCII_USTRINGPARAM ( "Salt" ) )
+, sInitialisationVectorProperty	( RTL_CONSTASCII_USTRINGPARAM ( "InitialisationVector" ) )
+, sSizeProperty 				( RTL_CONSTASCII_USTRINGPARAM ( "Size" ) )
+, sDigestProperty 				( RTL_CONSTASCII_USTRINGPARAM ( "Digest" ) )
+
+, sWhiteSpace 					( RTL_CONSTASCII_USTRINGPARAM ( " " ) )
+, sBlowfish						( RTL_CONSTASCII_USTRINGPARAM ( "Blowfish CFB" ) )
+, sPBKDF2 						( RTL_CONSTASCII_USTRINGPARAM ( "PBKDF2" ) )
+, sChecksumType					( RTL_CONSTASCII_USTRINGPARAM ( CHECKSUM_TYPE ) )
 {
     aStack.reserve( 10 );
 }
@@ -88,19 +88,19 @@ ManifestImport::~ManifestImport ( void )
 }
 
 // ---------------------------------------------------
-void SAL_CALL ManifestImport::startDocument(  )
+void SAL_CALL ManifestImport::startDocument(  ) 	
         throw( xml::sax::SAXException, uno::RuntimeException )
 {
 }
 
 // ---------------------------------------------------
-void SAL_CALL ManifestImport::endDocument(  )
+void SAL_CALL ManifestImport::endDocument(  ) 	
         throw( xml::sax::SAXException, uno::RuntimeException )
 {
 }
 
 // ---------------------------------------------------
-void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs )
+void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) 	
         throw( xml::sax::SAXException, uno::RuntimeException )
 {
     StringHashMap aConvertedAttribs;
@@ -197,12 +197,12 @@ void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Re
 }
 
 // ---------------------------------------------------
-void SAL_CALL ManifestImport::endElement( const OUString& aName )
+void SAL_CALL ManifestImport::endElement( const OUString& aName ) 	
     throw( xml::sax::SAXException, uno::RuntimeException )
 {
     ::rtl::OUString aConvertedName = ConvertName( aName );
     if ( !aStack.empty() && aStack.rbegin()->m_aConvertedName.equals( aConvertedName ) )
-    {
+    { 
         if ( aConvertedName.equals( sFileEntryElement ) )
         {
             aSequence.realloc ( nNumProperty );
@@ -216,31 +216,31 @@ void SAL_CALL ManifestImport::endElement( const OUString& aName )
 }
 
 // ---------------------------------------------------
-void SAL_CALL ManifestImport::characters( const OUString& /*aChars*/ )
+void SAL_CALL ManifestImport::characters( const OUString& /*aChars*/ ) 	
         throw( xml::sax::SAXException, uno::RuntimeException )
 {
 }
 
 // ---------------------------------------------------
-void SAL_CALL ManifestImport::ignorableWhitespace( const OUString& /*aWhitespaces*/ )
+void SAL_CALL ManifestImport::ignorableWhitespace( const OUString& /*aWhitespaces*/ ) 	
         throw( xml::sax::SAXException, uno::RuntimeException )
 {
 }
 
 // ---------------------------------------------------
-void SAL_CALL ManifestImport::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ )
+void SAL_CALL ManifestImport::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ ) 	
         throw( xml::sax::SAXException, uno::RuntimeException )
 {
 }
 
 // ---------------------------------------------------
-void SAL_CALL ManifestImport::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& /*xLocator*/ )
+void SAL_CALL ManifestImport::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& /*xLocator*/ ) 	
         throw( xml::sax::SAXException, uno::RuntimeException )
 {
 }
 
 // ---------------------------------------------------
-::rtl::OUString ManifestImport::PushNameAndNamespaces( const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs, StringHashMap& o_aConvertedAttribs )
+::rtl::OUString ManifestImport::PushNameAndNamespaces( const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs, StringHashMap& o_aConvertedAttribs ) 	
 {
     StringHashMap aNamespaces;
     ::std::vector< ::std::pair< ::rtl::OUString, ::rtl::OUString > > aAttribsStrs;
@@ -275,12 +275,12 @@ void SAL_CALL ManifestImport::setDocumentLocator( const uno::Reference< xml::sax
         aConvertedName = ConvertName( aName );
 
     aStack.push_back( ManifestScopeEntry( aConvertedName, aNamespaces ) );
-
+ 
     for ( sal_uInt16 nInd = 0; nInd < aAttribsStrs.size(); nInd++ )
     {
         // convert the attribute names on filling
         o_aConvertedAttribs[ConvertName( aAttribsStrs[nInd].first )] = aAttribsStrs[nInd].second;
-    }
+    }    
 
     return aConvertedName;
 }
@@ -307,7 +307,7 @@ void SAL_CALL ManifestImport::setDocumentLocator( const uno::Reference< xml::sax
     {
         // no check for manifest.xml consistency currently since the old versions have supported inconsistent documents as well
         aResult = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MANIFEST_NSPREFIX ) );
-        aResult += aPureName;
+        aResult += aPureName; 
     }
 
     return aResult;
diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx
index e875c46b8b9c..6a48672bc16f 100644
--- a/package/source/manifest/ManifestImport.hxx
+++ b/package/source/manifest/ManifestImport.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <HashMaps.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com { namespace sun { namespace star { 
     namespace xml { namespace sax { class XAttributeList; } }
     namespace beans { struct PropertyValue; }
 } } }
@@ -62,7 +62,7 @@ class ManifestImport : public cppu::WeakImplHelper1 < com::sun::star::xml::sax::
 {
 protected:
     com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aSequence;
-    sal_Int16       nNumProperty;
+    sal_Int16 		nNumProperty;
     ManifestStack aStack;
     sal_Bool bIgnoreEncryptData;
     ::std::vector < ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > > & rManVector;
@@ -110,21 +110,21 @@ protected:
 public:
     ManifestImport( std::vector < ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > > & rNewVector );
     ~ManifestImport( void );
-    virtual void SAL_CALL startDocument(  )
+    virtual void SAL_CALL startDocument(  ) 	
         throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL endDocument(  )
+    virtual void SAL_CALL endDocument(  ) 	
         throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL startElement( const ::rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs )
+    virtual void SAL_CALL startElement( const ::rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) 	
         throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL endElement( const ::rtl::OUString& aName )
+    virtual void SAL_CALL endElement( const ::rtl::OUString& aName ) 	
         throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL characters( const ::rtl::OUString& aChars )
+    virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) 	
         throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces )
+    virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) 	
         throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData )
+    virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) 	
         throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator )
+    virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) 	
         throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
 };
 #endif
diff --git a/package/source/manifest/ManifestReader.cxx b/package/source/manifest/ManifestReader.cxx
index 9e973a65d31e..34fe9e262d75 100644
--- a/package/source/manifest/ManifestReader.cxx
+++ b/package/source/manifest/ManifestReader.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ using namespace ::com::sun::star::packages::manifest;
 using ::rtl::OUString;
 
 ManifestReader::ManifestReader( const Reference < XMultiServiceFactory > & xNewFactory )
-: xFactory ( xNewFactory )
+: xFactory ( xNewFactory ) 
 {
 }
 ManifestReader::~ManifestReader()
 {
 }
-Sequence< Sequence< PropertyValue > > SAL_CALL ManifestReader::readManifestSequence( const Reference< XInputStream >& rStream )
+Sequence< Sequence< PropertyValue > > SAL_CALL ManifestReader::readManifestSequence( const Reference< XInputStream >& rStream ) 
     throw (::com::sun::star::uno::RuntimeException)
 {
     Sequence < Sequence < PropertyValue > > aManifestSequence;
@@ -74,8 +74,8 @@ Sequence< Sequence< PropertyValue > > SAL_CALL ManifestReader::readManifestSeque
             xParser->parseStream( aParserInput );
             aManifestSequence.realloc ( aManVector.size() );
             Sequence < PropertyValue > * pSequence = aManifestSequence.getArray();
-            ::std::vector < Sequence < PropertyValue > >::const_iterator aIter = aManVector.begin();
-            ::std::vector < Sequence < PropertyValue > >::const_iterator aEnd = aManVector.end();
+            ::std::vector < Sequence < PropertyValue > >::const_iterator aIter = aManVector.begin(); 
+            ::std::vector < Sequence < PropertyValue > >::const_iterator aEnd = aManVector.end(); 
             while( aIter != aEnd )
                 *pSequence++ = (*aIter++);
         }
@@ -124,7 +124,7 @@ OUString ManifestReader::getImplementationName()
 sal_Bool SAL_CALL ManifestReader::supportsService(OUString const & rServiceName)
     throw (RuntimeException)
 {
-    return static_supportsService ( rServiceName );
+    return static_supportsService ( rServiceName ); 
 }
 
 Sequence < OUString > ManifestReader::getSupportedServiceNames()
diff --git a/package/source/manifest/ManifestReader.hxx b/package/source/manifest/ManifestReader.hxx
index 7454e26b0e98..b200f6efbbf8 100644
--- a/package/source/manifest/ManifestReader.hxx
+++ b/package/source/manifest/ManifestReader.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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/packages/manifest/XManifestReader.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
-namespace com { namespace sun { namespace star {
+namespace com { namespace sun { namespace star { 
     namespace lang { class XMultiServiceFactory; class XSingleServiceFactory; }
 } } }
 
@@ -50,20 +50,20 @@ public:
     virtual ~ManifestReader();
 
     // XManifestReader
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > SAL_CALL readManifestSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rStream )
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > SAL_CALL readManifestSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rStream ) 
         throw (::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  )
+    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) 
         throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) 
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) 
         throw (::com::sun::star::uno::RuntimeException);
 
     // Component constructor
-    static ::rtl::OUString static_getImplementationName();
-    static ::com::sun::star::uno::Sequence < ::rtl::OUString > static_getSupportedServiceNames();
+    static ::rtl::OUString static_getImplementationName();	
+    static ::com::sun::star::uno::Sequence < ::rtl::OUString > static_getSupportedServiceNames();	
     sal_Bool SAL_CALL static_supportsService(rtl::OUString const & rServiceName);
     static ::com::sun::star::uno::Reference < com::sun::star::lang::XSingleServiceFactory > createServiceFactory( com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > const & rServiceFactory );
 };
diff --git a/package/source/manifest/ManifestWriter.cxx b/package/source/manifest/ManifestWriter.cxx
index ef829ff5ac03..6d7c848016b6 100644
--- a/package/source/manifest/ManifestWriter.cxx
+++ b/package/source/manifest/ManifestWriter.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ using namespace ::com::sun::star::xml::sax;
 using namespace ::com::sun::star::packages::manifest;
 
 ManifestWriter::ManifestWriter( const Reference < XMultiServiceFactory > & xNewFactory )
-: xFactory ( xNewFactory )
+: xFactory ( xNewFactory ) 
 {
 }
 ManifestWriter::~ManifestWriter()
@@ -59,7 +59,7 @@ ManifestWriter::~ManifestWriter()
 }
 
 // XManifestWriter methods
-void SAL_CALL ManifestWriter::writeManifestSequence( const Reference< XOutputStream >& rStream, const Sequence< Sequence< PropertyValue > >& rSequence )
+void SAL_CALL ManifestWriter::writeManifestSequence( const Reference< XOutputStream >& rStream, const Sequence< Sequence< PropertyValue > >& rSequence ) 
         throw (RuntimeException)
 {
     OUString sSaxWriter ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.xml.sax.Writer" ) );
diff --git a/package/source/manifest/ManifestWriter.hxx b/package/source/manifest/ManifestWriter.hxx
index eac775b08ad2..34c4e45d3be5 100644
--- a/package/source/manifest/ManifestWriter.hxx
+++ b/package/source/manifest/ManifestWriter.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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/packages/manifest/XManifestWriter.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
-namespace com { namespace sun { namespace star {
+namespace com { namespace sun { namespace star { 
     namespace lang { class XMultiServiceFactory; class XSingleServiceFactory; }
 } } }
 
@@ -50,20 +50,20 @@ public:
     virtual ~ManifestWriter();
 
     // XManifestWriter
-    virtual void SAL_CALL writeManifestSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rStream, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& rSequence )
+    virtual void SAL_CALL writeManifestSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rStream, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& rSequence ) 
         throw (::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  )
+    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) 
         throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) 
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) 
         throw (::com::sun::star::uno::RuntimeException);
 
     // Component constructor
-    static ::rtl::OUString static_getImplementationName();
-    static ::com::sun::star::uno::Sequence < ::rtl::OUString > static_getSupportedServiceNames();
+    static ::rtl::OUString static_getImplementationName();	
+    static ::com::sun::star::uno::Sequence < ::rtl::OUString > static_getSupportedServiceNames();	
     static ::com::sun::star::uno::Reference < com::sun::star::lang::XSingleServiceFactory > createServiceFactory( com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > const & rServiceFactory );
     sal_Bool SAL_CALL static_supportsService(rtl::OUString const & rServiceName);
 };
diff --git a/package/source/xstor/disposelistener.cxx b/package/source/xstor/disposelistener.cxx
index 97b06e790051..312c77d040f9 100644
--- a/package/source/xstor/disposelistener.cxx
+++ b/package/source/xstor/disposelistener.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/package/source/xstor/disposelistener.hxx b/package/source/xstor/disposelistener.hxx
index 8c8e02096027..54b336688ec1 100644
--- a/package/source/xstor/disposelistener.hxx
+++ b/package/source/xstor/disposelistener.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/package/source/xstor/ocompinstream.cxx b/package/source/xstor/ocompinstream.cxx
index 50333b0d4982..446e33996c53 100644
--- a/package/source/xstor/ocompinstream.cxx
+++ b/package/source/xstor/ocompinstream.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ OInputCompStream::OInputCompStream( OWriteStream_Impl& aImpl,
     OSL_ENSURE( m_pImpl->m_rMutexRef.Is(), "No mutex is provided!\n" );
     if ( !m_pImpl->m_rMutexRef.Is() )
         throw uno::RuntimeException(); // just a disaster
-
+    
     OSL_ENSURE( xStream.is(), "No stream is provided!\n" );
 }
 
@@ -99,12 +99,12 @@ uno::Any SAL_CALL OInputCompStream::queryInterface( const uno::Type& rType )
 
     // common interfaces
     aReturn <<= ::cppu::queryInterface
-                (   rType
-                    ,   static_cast<io::XInputStream*> ( this )
-                    ,   static_cast<io::XStream*> ( this )
-                    ,   static_cast<lang::XComponent*> ( this )
-                    ,   static_cast<beans::XPropertySet*> ( this )
-                    ,   static_cast<embed::XExtendedStorageStream*> ( this ) );
+                (	rType
+                    ,	static_cast<io::XInputStream*> ( this )
+                    ,	static_cast<io::XStream*> ( this )
+                    ,	static_cast<lang::XComponent*> ( this )
+                    ,	static_cast<beans::XPropertySet*> ( this )
+                    ,	static_cast<embed::XExtendedStorageStream*> ( this ) );
 
     if ( aReturn.hasValue() == sal_True )
         return aReturn ;
@@ -112,9 +112,9 @@ uno::Any SAL_CALL OInputCompStream::queryInterface( const uno::Type& rType )
     if ( m_nStorageType == embed::StorageFormats::OFOPXML )
     {
         aReturn <<= ::cppu::queryInterface
-                    (   rType
-                        ,   static_cast<embed::XRelationshipAccess*> ( this ) );
-
+                    (	rType
+                        ,	static_cast<embed::XRelationshipAccess*> ( this ) );
+    
         if ( aReturn.hasValue() == sal_True )
             return aReturn ;
     }
@@ -123,7 +123,7 @@ uno::Any SAL_CALL OInputCompStream::queryInterface( const uno::Type& rType )
 }
 
 //-----------------------------------------------
-sal_Int32 SAL_CALL OInputCompStream::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
+sal_Int32 SAL_CALL OInputCompStream::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) 
         throw ( io::NotConnectedException,
                 io::BufferSizeExceededException,
                 io::IOException,
@@ -146,7 +146,7 @@ sal_Int32 SAL_CALL OInputCompStream::readBytes( uno::Sequence< sal_Int8 >& aData
 }
 
 //-----------------------------------------------
-sal_Int32 SAL_CALL OInputCompStream::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
+sal_Int32 SAL_CALL OInputCompStream::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) 
         throw ( io::NotConnectedException,
                 io::BufferSizeExceededException,
                 io::IOException,
@@ -170,7 +170,7 @@ sal_Int32 SAL_CALL OInputCompStream::readSomeBytes( uno::Sequence< sal_Int8 >& a
 }
 
 //-----------------------------------------------
-void SAL_CALL OInputCompStream::skipBytes( sal_Int32 nBytesToSkip )
+void SAL_CALL OInputCompStream::skipBytes( sal_Int32 nBytesToSkip ) 
         throw ( io::NotConnectedException,
                 io::BufferSizeExceededException,
                 io::IOException,
@@ -194,7 +194,7 @@ void SAL_CALL OInputCompStream::skipBytes( sal_Int32 nBytesToSkip )
 }
 
 //-----------------------------------------------
-sal_Int32 SAL_CALL OInputCompStream::available(  )
+sal_Int32 SAL_CALL OInputCompStream::available(  ) 
         throw ( io::NotConnectedException,
                 io::IOException,
                 uno::RuntimeException )
@@ -217,7 +217,7 @@ sal_Int32 SAL_CALL OInputCompStream::available(  )
 }
 
 //-----------------------------------------------
-void SAL_CALL OInputCompStream::closeInput(  )
+void SAL_CALL OInputCompStream::closeInput(  ) 
         throw ( io::NotConnectedException,
                 io::IOException,
                 uno::RuntimeException )
@@ -449,7 +449,7 @@ uno::Sequence< beans::StringPair > SAL_CALL OInputCompStream::getRelationshipByI
                     return aSeq[nInd1];
                 break;
             }
-
+    
     throw container::NoSuchElementException();
 }
 
@@ -679,7 +679,7 @@ uno::Any SAL_CALL OInputCompStream::getPropertyValue( const ::rtl::OUString& aPr
 
 
 //-----------------------------------------------
-void SAL_CALL OInputCompStream::addPropertyChangeListener(
+void SAL_CALL OInputCompStream::addPropertyChangeListener( 
     const ::rtl::OUString& /*aPropertyName*/,
     const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
         throw ( beans::UnknownPropertyException,
diff --git a/package/source/xstor/ocompinstream.hxx b/package/source/xstor/ocompinstream.hxx
index 98bafe333efb..c585f18fc4bb 100644
--- a/package/source/xstor/ocompinstream.hxx
+++ b/package/source/xstor/ocompinstream.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,19 +78,19 @@ public:
     void InternalDispose();
 
     // XInterface
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType )
+    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) 
         throw( ::com::sun::star::uno::RuntimeException );
 
     // XInputStream
-    virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
+    virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
+    virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL available(  )
+    virtual sal_Int32 SAL_CALL available(  ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL closeInput(  )
+    virtual void SAL_CALL closeInput(  ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
 
     //XStream
diff --git a/package/source/xstor/ohierarchyholder.cxx b/package/source/xstor/ohierarchyholder.cxx
index d36fd2d23895..6f0b3c5ec883 100644
--- a/package/source/xstor/ohierarchyholder.cxx
+++ b/package/source/xstor/ohierarchyholder.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -276,7 +276,7 @@ void SAL_CALL OHierarchyElement_Impl::disposing( const lang::EventObject& Source
         throw ( uno::RuntimeException )
 {
     uno::Sequence< embed::XStorage > aStoragesToCommit;
-
+    
     try
     {
         ::osl::ClearableMutexGuard aGuard( m_aMutex );
diff --git a/package/source/xstor/ohierarchyholder.hxx b/package/source/xstor/ohierarchyholder.hxx
index cc6fb1e211d9..6fff34c17f75 100644
--- a/package/source/xstor/ohierarchyholder.hxx
+++ b/package/source/xstor/ohierarchyholder.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/package/source/xstor/oseekinstream.cxx b/package/source/xstor/oseekinstream.cxx
index 0c8ee1527b0d..229bba9ebb7f 100644
--- a/package/source/xstor/oseekinstream.cxx
+++ b/package/source/xstor/oseekinstream.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ uno::Any SAL_CALL OInputSeekStream::queryInterface( const uno::Type& rType )
         throw( uno::RuntimeException )
 {
     // Attention:
-    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+    //	Don't use mutex or guard in this method!!! Is a method of XInterface.
 
     uno::Any aReturn( ::cppu::queryInterface( rType,
                                            static_cast< io::XSeekable* >( this ) ) );
@@ -140,7 +140,7 @@ void SAL_CALL OInputSeekStream::seek( sal_Int64 location )
 }
 
 sal_Int64 SAL_CALL OInputSeekStream::getPosition()
-        throw ( io::IOException,
+        throw ( io::IOException, 
                 uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
diff --git a/package/source/xstor/oseekinstream.hxx b/package/source/xstor/oseekinstream.hxx
index 8203be6ec8b9..b605d25e8a8d 100644
--- a/package/source/xstor/oseekinstream.hxx
+++ b/package/source/xstor/oseekinstream.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx
index 7e45f6574355..b68162eeec73 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ sal_Bool KillFile( const ::rtl::OUString& aURL, const uno::Reference< lang::XMul
 
     try
     {
-        uno::Reference < ucb::XSimpleFileAccess > xAccess(
-                xFactory->createInstance (
+        uno::Reference < ucb::XSimpleFileAccess > xAccess( 
+                xFactory->createInstance ( 
                         ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ),
                 uno::UNO_QUERY );
 
@@ -205,7 +205,7 @@ const sal_Int32 n_ConstBufferSize = 32000;
 {
     ::rtl::OUString aTempURL;
 
-    uno::Reference < beans::XPropertySet > xTempFile(
+    uno::Reference < beans::XPropertySet > xTempFile( 
             xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ),
             uno::UNO_QUERY );
 
@@ -222,7 +222,7 @@ const sal_Int32 n_ConstBufferSize = 32000;
         ::package::StaticAddLog( aException.Message );
         ::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Quiet exception" ) ) );
     }
-
+    
     if ( !aTempURL.getLength() )
         throw uno::RuntimeException(); // TODO: can not create tempfile
 
@@ -352,9 +352,9 @@ void OWriteStream_Impl::InsertIntoPackageFolder( const ::rtl::OUString& aName,
         uno::Reference< lang::XUnoTunnel > xTunnel( m_xPackageStream, uno::UNO_QUERY );
         if ( !xTunnel.is() )
             throw uno::RuntimeException(); // TODO
-
+    
         xParentPackageFolder->insertByName( aName, uno::makeAny( xTunnel ) );
-
+    
         m_bFlushed = sal_False;
         m_bHasInsertedStreamOptimization = sal_False;
     }
@@ -478,17 +478,17 @@ void OWriteStream_Impl::DisposeWrappers()
     {
         try {
             m_pAntiImpl->dispose();
-        }
+        }	 
         catch ( uno::RuntimeException& aRuntimeException )
         {
             AddLog( aRuntimeException.Message );
             AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Quiet exception" ) ) );
         }
-
+        
         m_pAntiImpl = NULL;
     }
     m_pParent = NULL;
-
+    
     if ( !m_aInputStreamsList.empty() )
     {
         for ( InputStreamsList_Impl::iterator pStreamIter = m_aInputStreamsList.begin();
@@ -510,7 +510,7 @@ uno::Reference< lang::XMultiServiceFactory > OWriteStream_Impl::GetServiceFactor
 {
     if ( m_xFactory.is() )
         return m_xFactory;
-
+        
     return ::comphelper::getProcessServiceFactory();
 }
 
@@ -524,11 +524,11 @@ uno::Reference< lang::XMultiServiceFactory > OWriteStream_Impl::GetServiceFactor
         try {
             if ( aTempURL && xStream.is() )
             {
-                uno::Reference < ucb::XSimpleFileAccess > xTempAccess(
-                                GetServiceFactory()->createInstance (
+                uno::Reference < ucb::XSimpleFileAccess > xTempAccess( 
+                                GetServiceFactory()->createInstance ( 
                                         ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ),
                                 uno::UNO_QUERY );
-
+                
                 if ( !xTempAccess.is() )
                     throw uno::RuntimeException(); // TODO:
 
@@ -538,7 +538,7 @@ uno::Reference< lang::XMultiServiceFactory > OWriteStream_Impl::GetServiceFactor
                     // the current position of the original stream should be still OK, copy further
                     ::comphelper::OStorageHelper::CopyInputToOutput( xStream, xTempOutStream );
                     xTempOutStream->closeOutput();
-                    xTempOutStream = uno::Reference< io::XOutputStream >();
+                    xTempOutStream = uno::Reference< io::XOutputStream >();					
                 }
                 else
                     throw io::IOException(); // TODO:
@@ -577,7 +577,7 @@ uno::Reference< lang::XMultiServiceFactory > OWriteStream_Impl::GetServiceFactor
     if ( !m_xCacheStream.is() && !m_aTempURL.getLength() )
     {
         uno::Reference< io::XInputStream > xOrigStream = m_xPackageStream->getDataStream();
-        if ( !xOrigStream.is() )
+        if ( !xOrigStream.is() ) 
         {
             // in case of new inserted package stream it is possible that input stream still was not set
             uno::Reference< io::XStream > xCacheStream = CreateMemoryStream( GetServiceFactory() );
@@ -599,7 +599,7 @@ uno::Reference< lang::XMultiServiceFactory > OWriteStream_Impl::GetServiceFactor
                 OSL_ENSURE( xCacheStream.is(), "If the stream can not be created an exception must be thrown!\n" );
 
                 if ( nRead )
-                {
+                {                
                     uno::Reference< io::XOutputStream > xOutStream( xCacheStream->getOutputStream(), uno::UNO_SET_THROW );
                     xOutStream->writeBytes( aData );
                 }
@@ -614,11 +614,11 @@ uno::Reference< lang::XMultiServiceFactory > OWriteStream_Impl::GetServiceFactor
                 try {
                     if ( m_aTempURL.getLength() )
                     {
-                        uno::Reference < ucb::XSimpleFileAccess > xTempAccess(
-                                        GetServiceFactory()->createInstance (
+                        uno::Reference < ucb::XSimpleFileAccess > xTempAccess( 
+                                        GetServiceFactory()->createInstance ( 
                                                 ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ),
                                         uno::UNO_QUERY );
-
+                        
                         if ( !xTempAccess.is() )
                             throw uno::RuntimeException(); // TODO:
 
@@ -632,7 +632,7 @@ uno::Reference< lang::XMultiServiceFactory > OWriteStream_Impl::GetServiceFactor
                             // the current position of the original stream should be still OK, copy further
                             ::comphelper::OStorageHelper::CopyInputToOutput( xOrigStream, xTempOutStream );
                             xTempOutStream->closeOutput();
-                            xTempOutStream = uno::Reference< io::XOutputStream >();
+                            xTempOutStream = uno::Reference< io::XOutputStream >();					
                         }
                         else
                             throw io::IOException(); // TODO:
@@ -670,8 +670,8 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetTempFileAsStream()
         if ( m_aTempURL.getLength() )
         {
             // the temporary file is not used if the cache is used
-            uno::Reference < ucb::XSimpleFileAccess > xTempAccess(
-                            GetServiceFactory()->createInstance (
+            uno::Reference < ucb::XSimpleFileAccess > xTempAccess( 
+                            GetServiceFactory()->createInstance ( 
                                     ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ),
                             uno::UNO_QUERY );
 
@@ -715,8 +715,8 @@ uno::Reference< io::XInputStream > OWriteStream_Impl::GetTempFileAsInputStream()
         if ( m_aTempURL.getLength() )
         {
             // the temporary file is not used if the cache is used
-            uno::Reference < ucb::XSimpleFileAccess > xTempAccess(
-                            GetServiceFactory()->createInstance (
+            uno::Reference < ucb::XSimpleFileAccess > xTempAccess( 
+                            GetServiceFactory()->createInstance ( 
                                     ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ),
                             uno::UNO_QUERY );
 
@@ -755,7 +755,7 @@ void OWriteStream_Impl::InsertStreamDirectly( const uno::Reference< io::XInputSt
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ) ;
 
-    // this call can be made only during parent storage commit
+    // this call can be made only during parent storage commit 
     // the  parent storage is responsible for the correct handling
     // of deleted and renamed contents
 
@@ -847,7 +847,7 @@ void OWriteStream_Impl::Commit()
 
     uno::Reference< packages::XDataSinkEncrSupport > xNewPackageStream;
     uno::Sequence< uno::Any > aSeq( 1 );
-    aSeq[0] <<= sal_False;
+    aSeq[0] <<= sal_False; 
 
     if ( m_xCacheStream.is() )
     {
@@ -960,7 +960,7 @@ void OWriteStream_Impl::Revert()
         m_xCacheStream = uno::Reference< io::XStream >();
         m_xCacheSeek = uno::Reference< io::XSeekable >();
     }
-
+    
     if ( m_aTempURL.getLength() )
     {
         KillFile( m_aTempURL, GetServiceFactory() );
@@ -1054,10 +1054,10 @@ uno::Sequence< beans::PropertyValue > OWriteStream_Impl::InsertOwnProps(
 
     return aResult;
 }
-
+    
 //-----------------------------------------------
 sal_Bool OWriteStream_Impl::IsTransacted()
-{
+{ 
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ) ;
     return ( m_pAntiImpl && m_pAntiImpl->m_bTransacted );
 }
@@ -1077,7 +1077,7 @@ void OWriteStream_Impl::ReadRelInfoIfNecessary()
                                         m_xOrigRelInfoStream,
                                         ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_rels/*.rels" ) ),
                                         m_xFactory );
-
+            
             // in case of success the stream must be thrown away, that means that the OrigRelInfo is initialized
             // the reason for this is that the original stream might not be seekable ( at the same time the new
             // provided stream must be seekable ), so it must be read only once
@@ -1112,7 +1112,7 @@ void OWriteStream_Impl::ReadRelInfoIfNecessary()
         }
     }
 }
-
+    
 //-----------------------------------------------
 uno::Sequence< beans::PropertyValue > OWriteStream_Impl::ReadPackageStreamProperties()
 {
@@ -1135,7 +1135,7 @@ uno::Sequence< beans::PropertyValue > OWriteStream_Impl::ReadPackageStreamProper
         aResult[2].Name = ::rtl::OUString::createFromAscii("Size");
 
         if ( m_nStorageType == embed::StorageFormats::PACKAGE )
-            aResult[3].Name = ::rtl::OUString::createFromAscii("Encrypted");
+            aResult[3].Name = ::rtl::OUString::createFromAscii("Encrypted"); 
     }
     else
     {
@@ -1208,7 +1208,7 @@ uno::Sequence< uno::Sequence< beans::StringPair > > OWriteStream_Impl::GetAllRel
         return uno::Sequence< uno::Sequence< beans::StringPair > >();
 
     ReadRelInfoIfNecessary();
-
+    
     if ( m_nRelInfoStatus == RELINFO_READ )
         return m_aOrigRelInfo;
     else if ( m_nRelInfoStatus == RELINFO_CHANGED_STREAM_READ || m_nRelInfoStatus == RELINFO_CHANGED )
@@ -1391,7 +1391,7 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream_Impl( sal_Int32 nStre
         uno::Reference< io::XStream > xCompStream(
                         static_cast< ::cppu::OWeakObject* >( pStream ),
                         uno::UNO_QUERY );
-        OSL_ENSURE( xCompStream.is(),
+        OSL_ENSURE( xCompStream.is(), 
                     "OInputCompStream MUST provide XStream interfaces!\n" );
 
         m_aInputStreamsList.push_back( pStream );
@@ -1416,7 +1416,7 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream_Impl( sal_Int32 nStre
         uno::Reference< io::XStream > xSeekStream(
                         static_cast< ::cppu::OWeakObject* >( pStream ),
                         uno::UNO_QUERY );
-        OSL_ENSURE( xSeekStream.is(),
+        OSL_ENSURE( xSeekStream.is(), 
                     "OInputSeekStream MUST provide XStream interfaces!\n" );
 
         m_aInputStreamsList.push_back( pStream );
@@ -1491,7 +1491,7 @@ uno::Reference< io::XInputStream > OWriteStream_Impl::GetPlainRawInStream()
 
     // this method is used only internally, this stream object should not go outside of this implementation
     // if ( m_pAntiImpl )
-    //  throw io::IOException(); // TODO:
+    //	throw io::IOException(); // TODO:
 
     return m_xPackageStream->getPlainRawStream();
 }
@@ -1537,7 +1537,7 @@ void OWriteStream_Impl::CreateReadonlyCopyBasedOnData( const uno::Reference< io:
 {
     uno::Reference < io::XStream > xTempFile;
     if ( !xTargetStream.is() )
-        xTempFile = uno::Reference < io::XStream >(
+        xTempFile = uno::Reference < io::XStream >( 
             m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ),
             uno::UNO_QUERY );
     else
@@ -1546,7 +1546,7 @@ void OWriteStream_Impl::CreateReadonlyCopyBasedOnData( const uno::Reference< io:
     uno::Reference < io::XSeekable > xTempSeek( xTempFile, uno::UNO_QUERY );
     if ( !xTempSeek.is() )
         throw uno::RuntimeException(); // TODO
-
+        
     uno::Reference < io::XOutputStream > xTempOut = xTempFile->getOutputStream();
     if ( !xTempOut.is() )
         throw uno::RuntimeException();
@@ -1577,7 +1577,7 @@ void OWriteStream_Impl::GetCopyOfLastCommit( uno::Reference< io::XStream >& xTar
     OSL_ENSURE( m_xPackageStream.is(), "The source stream for copying is incomplete!\n" );
     if ( !m_xPackageStream.is() )
         throw uno::RuntimeException();
-
+    
     uno::Reference< io::XInputStream > xDataToCopy;
     if ( IsEncrypted() )
     {
@@ -1725,7 +1725,7 @@ void OWriteStream_Impl::CommitStreamRelInfo( const uno::Reference< embed::XStora
         aNewRelStreamName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".rels" ) );
 
         sal_Bool bRenamed = !aOrigRelStreamName.equals( aNewRelStreamName );
-        if ( m_nRelInfoStatus == RELINFO_CHANGED
+        if ( m_nRelInfoStatus == RELINFO_CHANGED 
           || m_nRelInfoStatus == RELINFO_CHANGED_STREAM_READ
           || m_nRelInfoStatus == RELINFO_CHANGED_STREAM )
         {
@@ -1771,7 +1771,7 @@ void OWriteStream_Impl::CommitStreamRelInfo( const uno::Reference< embed::XStora
                 xSeek->seek( 0 );
                 ::comphelper::OStorageHelper::CopyInputToOutput( m_xNewRelInfoStream, xOutputStream );
                 xSeek->seek( 0 );
-
+    
                 // set the mediatype
                 uno::Reference< beans::XPropertySet > xPropSet( xRelsStream, uno::UNO_QUERY_THROW );
                 xPropSet->setPropertyValue(
@@ -1822,7 +1822,7 @@ OWriteStream::OWriteStream( OWriteStream_Impl* pImpl, sal_Bool bTransacted )
 
     if ( !m_pImpl || !m_pImpl->m_rMutexRef.Is() )
         throw uno::RuntimeException(); // just a disaster
-
+    
     m_pData = new WSInternalData_Impl( pImpl->m_rMutexRef, m_pImpl->m_nStorageType );
 }
 
@@ -1839,7 +1839,7 @@ OWriteStream::OWriteStream( OWriteStream_Impl* pImpl, uno::Reference< io::XStrea
 
     if ( !m_pImpl || !m_pImpl->m_rMutexRef.Is() )
         throw uno::RuntimeException(); // just a disaster
-
+    
     m_pData = new WSInternalData_Impl( pImpl->m_rMutexRef, m_pImpl->m_nStorageType );
 
     if ( xStream.is() )
@@ -1957,7 +1957,7 @@ void OWriteStream::CopyToStreamInternally_Impl( const uno::Reference< io::XStrea
     // if it fails the stream will become invalid
     try {
         m_xSeekable->seek( nCurPos );
-    }
+    } 
     catch ( uno::Exception& aException )
     {
         m_pImpl->AddLog( aException.Message );
@@ -1967,7 +1967,7 @@ void OWriteStream::CopyToStreamInternally_Impl( const uno::Reference< io::XStrea
         OSL_ENSURE( sal_False, "The stream become invalid during copiing!\n" );
         throw uno::RuntimeException();
     }
-
+    
     if ( bThrown )
         throw eThrown;
 
@@ -2012,31 +2012,31 @@ uno::Any SAL_CALL OWriteStream::queryInterface( const uno::Type& rType )
 
     // common interfaces
     aReturn <<= ::cppu::queryInterface
-                (   rType
-                    ,   static_cast<lang::XTypeProvider*> ( this )
-                    ,   static_cast<io::XInputStream*> ( this )
-                    ,   static_cast<io::XOutputStream*> ( this )
-                    ,   static_cast<io::XStream*> ( this )
-                    ,   static_cast<embed::XExtendedStorageStream*> ( this )
-                    ,   static_cast<io::XSeekable*> ( this )
-                    ,   static_cast<io::XTruncate*> ( this )
-                    ,   static_cast<lang::XComponent*> ( this )
-                    ,   static_cast<beans::XPropertySet*> ( this ) );
-
+                (	rType
+                    ,	static_cast<lang::XTypeProvider*> ( this )
+                    ,	static_cast<io::XInputStream*> ( this )
+                    ,	static_cast<io::XOutputStream*> ( this )
+                    ,	static_cast<io::XStream*> ( this )
+                    ,	static_cast<embed::XExtendedStorageStream*> ( this )
+                    ,	static_cast<io::XSeekable*> ( this )
+                    ,	static_cast<io::XTruncate*> ( this )
+                    ,	static_cast<lang::XComponent*> ( this )
+                    ,	static_cast<beans::XPropertySet*> ( this ) );
+    
     if ( aReturn.hasValue() == sal_True )
         return aReturn ;
 
     if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE )
     {
         aReturn <<= ::cppu::queryInterface
-                    (   rType
-                        ,   static_cast<embed::XEncryptionProtectedSource*> ( this ) );
+                    (	rType
+                        ,	static_cast<embed::XEncryptionProtectedSource*> ( this ) );
     }
     else if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML )
     {
         aReturn <<= ::cppu::queryInterface
-                    (   rType
-                        ,   static_cast<embed::XRelationshipAccess*> ( this ) );
+                    (	rType
+                        ,	static_cast<embed::XRelationshipAccess*> ( this ) );
     }
 
     if ( aReturn.hasValue() == sal_True )
@@ -2045,9 +2045,9 @@ uno::Any SAL_CALL OWriteStream::queryInterface( const uno::Type& rType )
     if ( m_bTransacted )
     {
         aReturn <<= ::cppu::queryInterface
-                    (   rType
-                        ,   static_cast<embed::XTransactedObject*> ( this )
-                        ,   static_cast<embed::XTransactionBroadcaster*> ( this ) );
+                    (	rType
+                        ,	static_cast<embed::XTransactedObject*> ( this )
+                        ,	static_cast<embed::XTransactionBroadcaster*> ( this ) );
 
         if ( aReturn.hasValue() == sal_True )
             return aReturn ;
@@ -2083,49 +2083,49 @@ uno::Sequence< uno::Type > SAL_CALL OWriteStream::getTypes()
                 if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE )
                 {
                     m_pData->m_pTypeCollection = new ::cppu::OTypeCollection
-                                    (   ::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XInputStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XOutputStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XSeekable >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XTruncate >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< lang::XComponent >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XEncryptionProtectedSource >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XExtendedStorageStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XTransactedObject >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XTransactionBroadcaster >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
+                                    (	::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< io::XInputStream >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< io::XOutputStream >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< io::XStream >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< io::XSeekable >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< io::XTruncate >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< lang::XComponent >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< embed::XEncryptionProtectedSource >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< embed::XExtendedStorageStream >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< embed::XTransactedObject >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< embed::XTransactionBroadcaster >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
                 }
                 else if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML )
                 {
                     m_pData->m_pTypeCollection = new ::cppu::OTypeCollection
-                                    (   ::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XInputStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XOutputStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XSeekable >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XTruncate >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< lang::XComponent >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XRelationshipAccess >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XExtendedStorageStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XTransactedObject >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XTransactionBroadcaster >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
+                                    (	::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< io::XInputStream >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< io::XOutputStream >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< io::XStream >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< io::XSeekable >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< io::XTruncate >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< lang::XComponent >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< embed::XRelationshipAccess >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< embed::XExtendedStorageStream >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< embed::XTransactedObject >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< embed::XTransactionBroadcaster >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
                 }
                 else // if ( m_pData->m_nStorageType == embed::StorageFormats::ZIP )
                 {
                     m_pData->m_pTypeCollection = new ::cppu::OTypeCollection
-                                    (   ::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XInputStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XOutputStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XSeekable >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XTruncate >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< lang::XComponent >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XExtendedStorageStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XTransactedObject >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XTransactionBroadcaster >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
+                                    (	::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< io::XInputStream >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< io::XOutputStream >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< io::XStream >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< io::XSeekable >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< io::XTruncate >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< lang::XComponent >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< embed::XExtendedStorageStream >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< embed::XTransactedObject >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< embed::XTransactionBroadcaster >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
                 }
             }
             else
@@ -2133,40 +2133,40 @@ uno::Sequence< uno::Type > SAL_CALL OWriteStream::getTypes()
                 if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE )
                 {
                     m_pData->m_pTypeCollection = new ::cppu::OTypeCollection
-                                    (   ::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XInputStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XOutputStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XSeekable >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XTruncate >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< lang::XComponent >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XEncryptionProtectedSource >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
+                                    (	::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< io::XInputStream >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< io::XOutputStream >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< io::XStream >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< io::XSeekable >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< io::XTruncate >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< lang::XComponent >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< embed::XEncryptionProtectedSource >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
                 }
                 else if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML )
                 {
                     m_pData->m_pTypeCollection = new ::cppu::OTypeCollection
-                                    (   ::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XInputStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XOutputStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XSeekable >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XTruncate >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< lang::XComponent >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XRelationshipAccess >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
+                                    (	::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< io::XInputStream >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< io::XOutputStream >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< io::XStream >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< io::XSeekable >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< io::XTruncate >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< lang::XComponent >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< embed::XRelationshipAccess >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
                 }
                 else // if ( m_pData->m_nStorageType == embed::StorageFormats::ZIP )
                 {
                     m_pData->m_pTypeCollection = new ::cppu::OTypeCollection
-                                    (   ::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XInputStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XOutputStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XSeekable >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XTruncate >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< lang::XComponent >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
+                                    (	::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< io::XInputStream >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< io::XOutputStream >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< io::XStream >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< io::XSeekable >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< io::XTruncate >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< lang::XComponent >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
                 }
             }
         }
@@ -2186,7 +2186,7 @@ uno::Sequence< sal_Int8 > SAL_CALL OWriteStream::getImplementationId()
 }
 
 //-----------------------------------------------
-sal_Int32 SAL_CALL OWriteStream::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
+sal_Int32 SAL_CALL OWriteStream::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) 
         throw ( io::NotConnectedException,
                 io::BufferSizeExceededException,
                 io::IOException,
@@ -2209,7 +2209,7 @@ sal_Int32 SAL_CALL OWriteStream::readBytes( uno::Sequence< sal_Int8 >& aData, sa
 }
 
 //-----------------------------------------------
-sal_Int32 SAL_CALL OWriteStream::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
+sal_Int32 SAL_CALL OWriteStream::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) 
         throw ( io::NotConnectedException,
                 io::BufferSizeExceededException,
                 io::IOException,
@@ -2232,7 +2232,7 @@ sal_Int32 SAL_CALL OWriteStream::readSomeBytes( uno::Sequence< sal_Int8 >& aData
 }
 
 //-----------------------------------------------
-void SAL_CALL OWriteStream::skipBytes( sal_Int32 nBytesToSkip )
+void SAL_CALL OWriteStream::skipBytes( sal_Int32 nBytesToSkip ) 
         throw ( io::NotConnectedException,
                 io::BufferSizeExceededException,
                 io::IOException,
@@ -2255,7 +2255,7 @@ void SAL_CALL OWriteStream::skipBytes( sal_Int32 nBytesToSkip )
 }
 
 //-----------------------------------------------
-sal_Int32 SAL_CALL OWriteStream::available(  )
+sal_Int32 SAL_CALL OWriteStream::available(  ) 
         throw ( io::NotConnectedException,
                 io::IOException,
                 uno::RuntimeException )
@@ -2278,7 +2278,7 @@ sal_Int32 SAL_CALL OWriteStream::available(  )
 }
 
 //-----------------------------------------------
-void SAL_CALL OWriteStream::closeInput(  )
+void SAL_CALL OWriteStream::closeInput(  ) 
         throw ( io::NotConnectedException,
                 io::IOException,
                 uno::RuntimeException )
@@ -2412,7 +2412,7 @@ void SAL_CALL OWriteStream::writeBytes( const uno::Sequence< sal_Int8 >& aData )
 }
 
 //-----------------------------------------------
-void SAL_CALL OWriteStream::flush()
+void SAL_CALL OWriteStream::flush() 
         throw ( io::NotConnectedException,
                 io::BufferSizeExceededException,
                 io::IOException,
@@ -2445,7 +2445,7 @@ void SAL_CALL OWriteStream::flush()
 void OWriteStream::CloseOutput_Impl()
 {
     // all the checks must be done in calling method
-
+    
     m_xOutStream->closeOutput();
     m_xOutStream = uno::Reference< io::XOutputStream >();
 
@@ -2483,7 +2483,7 @@ void SAL_CALL OWriteStream::closeOutput()
 
     if ( !m_xOutStream.is() )
         throw io::NotConnectedException();
-
+    
     CloseOutput_Impl();
 
     if ( m_bInStreamDisconnected || !m_xInStream.is() )
@@ -2514,7 +2514,7 @@ void SAL_CALL OWriteStream::seek( sal_Int64 location )
 
 //-----------------------------------------------
 sal_Int64 SAL_CALL OWriteStream::getPosition()
-        throw ( io::IOException,
+        throw ( io::IOException, 
                 uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
@@ -2838,7 +2838,7 @@ uno::Sequence< beans::StringPair > SAL_CALL OWriteStream::getRelationshipByID(
                     return aSeq[nInd1];
                 break;
             }
-
+    
     throw container::NoSuchElementException();
 }
 
@@ -3043,7 +3043,7 @@ void SAL_CALL OWriteStream::insertRelationships(  const uno::Sequence< uno::Sequ
 
                                 nIndSourceSame = nIndSource1;
                             }
-
+                            
                             break;
                         }
                     }
@@ -3173,7 +3173,7 @@ void SAL_CALL OWriteStream::setPropertyValue( const ::rtl::OUString& aPropertyNa
             && aPropertyName.equalsAscii( "UseCommonStoragePasswordEncryption" ) )
     {
         sal_Bool bUseCommonPass = sal_False;
-        if ( aValue >>= bUseCommonPass )
+        if ( aValue >>= bUseCommonPass ) 
         {
             if ( m_bInitOnDemand && m_pImpl->m_bHasInsertedStreamOptimization )
             {
@@ -3300,7 +3300,7 @@ uno::Any SAL_CALL OWriteStream::getPropertyValue( const ::rtl::OUString& aProp )
 
 
 //-----------------------------------------------
-void SAL_CALL OWriteStream::addPropertyChangeListener(
+void SAL_CALL OWriteStream::addPropertyChangeListener( 
     const ::rtl::OUString& /*aPropertyName*/,
     const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
         throw ( beans::UnknownPropertyException,
@@ -3379,7 +3379,7 @@ void SAL_CALL OWriteStream::removeVetoableChangeListener(
 }
 
 //____________________________________________________________________________________________________
-//  XTransactedObject
+//	XTransactedObject
 //____________________________________________________________________________________________________
 
 //-----------------------------------------------
@@ -3456,7 +3456,7 @@ void SAL_CALL OWriteStream::commit()
             throw lang::DisposedException();
         }
 
-        m_pImpl->Commit();
+        m_pImpl->Commit(); 
 
         // when the storage is commited the parent is modified
         ModifyParentUnlockMutex_Impl( aGuard );
@@ -3560,7 +3560,7 @@ void SAL_CALL OWriteStream::revert()
 }
 
 //____________________________________________________________________________________________________
-//  XTransactionBroadcaster
+//	XTransactionBroadcaster
 //____________________________________________________________________________________________________
 
 //-----------------------------------------------
diff --git a/package/source/xstor/owriteablestream.hxx b/package/source/xstor/owriteablestream.hxx
index d3c15f00d44c..1247a92408b7 100644
--- a/package/source/xstor/owriteablestream.hxx
+++ b/package/source/xstor/owriteablestream.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ struct WSInternalData_Impl
     ::cppu::OTypeCollection* m_pTypeCollection;
     ::cppu::OMultiTypeInterfaceContainerHelper m_aListenersContainer; // list of listeners
     sal_Int32 m_nStorageType;
-
+    
     // the mutex reference MUST NOT be empty
     WSInternalData_Impl( const SotMutexHolderRef rMutexRef, sal_Int32 nStorageType )
     : m_rSharedMutexRef( rMutexRef )
@@ -106,12 +106,12 @@ struct OWriteStream_Impl : public PreCreationStruct
     friend class OWriteStream;
     friend class OInputCompStream;
 
-    OWriteStream*   m_pAntiImpl;
+    OWriteStream*	m_pAntiImpl;
     ::rtl::OUString m_aTempURL;
-
+    
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xCacheStream;
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable > m_xCacheSeek;
-
+    
     InputStreamsList_Impl m_aInputStreamsList;
 
     sal_Bool                        m_bHasDataToFlush;    // only modified elements will be sent to the original content
@@ -131,7 +131,7 @@ struct OWriteStream_Impl : public PreCreationStruct
     sal_Bool m_bUseCommonPass;
     sal_Bool m_bHasCachedPassword;
     ::rtl::OUString m_aPass;
-
+    
     sal_Bool m_bCompressedSetExplicit;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > m_xPackage;
@@ -144,7 +144,7 @@ struct OWriteStream_Impl : public PreCreationStruct
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xOrigRelInfoStream;
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > m_aOrigRelInfo;
     sal_Bool m_bOrigRelInfoBroken;
-
+    
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > m_aNewRelInfo;
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xNewRelInfoStream;
     sal_Int16 m_nRelInfoStatus;
@@ -156,8 +156,8 @@ private:
 
     ::rtl::OUString GetFilledTempFileIfNo( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xStream );
     ::rtl::OUString FillTempGetFileName();
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >       GetTempFileAsStream();
-    ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >  GetTempFileAsInputStream();
+    ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >		GetTempFileAsStream();
+    ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >	GetTempFileAsInputStream();
 
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > GetStream_Impl( sal_Int32 nStreamMode,
                                                                                         sal_Bool bHierarchyAccess );
@@ -182,7 +182,7 @@ public:
                     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >() );
 
     ~OWriteStream_Impl();
-
+    
     void CleanCacheStream();
 
     void AddLog( const ::rtl::OUString& aMessage );
@@ -217,7 +217,7 @@ public:
     void Revert();
 
     void Free( sal_Bool bMust ); // allows to try to disconnect from the temporary stream
-                                 // in case bMust is set to sal_True the method
+                                 // in case bMust is set to sal_True the method 
                                 // will throw exception in case the file is still busy
 
     void SetModified(); // can be done only by parent storage after renaming
@@ -315,26 +315,26 @@ public:
     void DeInit();
 
     // XInterface
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType )
+    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 release() throw();
 
-    //  XTypeProvider
+    //	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 );
 
     // XInputStream
-    virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
+    virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
     virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL available(  )
+    virtual sal_Int32 SAL_CALL available(  ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL closeInput(  )
+    virtual void SAL_CALL closeInput(  ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
 
     // XOutputStream
diff --git a/package/source/xstor/register.cxx b/package/source/xstor/register.cxx
index b398b61e7f5e..d81c5b4a80b8 100644
--- a/package/source/xstor/register.cxx
+++ b/package/source/xstor/register.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTyp
 void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     void * pRet = 0;
-
+    
     ::rtl::OUString aImplName( ::rtl::OUString::createFromAscii( pImplName ) );
     uno::Reference< lang::XSingleServiceFactory > xFactory;
 
@@ -60,13 +60,13 @@ void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServic
                                             OStorageFactory::impl_staticCreateSelfInstance,
                                             OStorageFactory::impl_staticGetSupportedServiceNames() );
     }
-
+        
     if ( xFactory.is() )
     {
         xFactory->acquire();
         pRet = xFactory.get();
     }
-
+    
     return pRet;
 }
 
@@ -80,7 +80,7 @@ sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegis
 
             uno::Reference< registry::XRegistryKey >  xNewKey;
 
-            xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
+            xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + 
                                         OStorageFactory::impl_staticGetImplementationName() +
                                         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") )  );
 
diff --git a/package/source/xstor/selfterminatefilestream.cxx b/package/source/xstor/selfterminatefilestream.cxx
index b69170a57791..2c6f177e6856 100644
--- a/package/source/xstor/selfterminatefilestream.cxx
+++ b/package/source/xstor/selfterminatefilestream.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ void OSelfTerminateFileStream::CloseStreamDeleteFile()
 }
 
 //-----------------------------------------------
-sal_Int32 SAL_CALL OSelfTerminateFileStream::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
+sal_Int32 SAL_CALL OSelfTerminateFileStream::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) 
         throw ( io::NotConnectedException,
                 io::BufferSizeExceededException,
                 io::IOException,
@@ -90,7 +90,7 @@ sal_Int32 SAL_CALL OSelfTerminateFileStream::readBytes( uno::Sequence< sal_Int8
 }
 
 //-----------------------------------------------
-sal_Int32 SAL_CALL OSelfTerminateFileStream::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
+sal_Int32 SAL_CALL OSelfTerminateFileStream::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) 
         throw ( io::NotConnectedException,
                 io::BufferSizeExceededException,
                 io::IOException,
@@ -100,7 +100,7 @@ sal_Int32 SAL_CALL OSelfTerminateFileStream::readSomeBytes( uno::Sequence< sal_I
 }
 
 //-----------------------------------------------
-void SAL_CALL OSelfTerminateFileStream::skipBytes( sal_Int32 nBytesToSkip )
+void SAL_CALL OSelfTerminateFileStream::skipBytes( sal_Int32 nBytesToSkip ) 
         throw ( io::NotConnectedException,
                 io::BufferSizeExceededException,
                 io::IOException,
@@ -110,7 +110,7 @@ void SAL_CALL OSelfTerminateFileStream::skipBytes( sal_Int32 nBytesToSkip )
 }
 
 //-----------------------------------------------
-sal_Int32 SAL_CALL OSelfTerminateFileStream::available(  )
+sal_Int32 SAL_CALL OSelfTerminateFileStream::available(  ) 
         throw ( io::NotConnectedException,
                 io::IOException,
                 uno::RuntimeException )
@@ -119,7 +119,7 @@ sal_Int32 SAL_CALL OSelfTerminateFileStream::available(  )
 }
 
 //-----------------------------------------------
-void SAL_CALL OSelfTerminateFileStream::closeInput(  )
+void SAL_CALL OSelfTerminateFileStream::closeInput(  ) 
         throw ( io::NotConnectedException,
                 io::IOException,
                 uno::RuntimeException )
@@ -138,7 +138,7 @@ void SAL_CALL OSelfTerminateFileStream::seek( sal_Int64 location )
 
 //-----------------------------------------------
 sal_Int64 SAL_CALL OSelfTerminateFileStream::getPosition()
-        throw ( io::IOException,
+        throw ( io::IOException, 
                 uno::RuntimeException)
 {
     return m_xSeekable->getPosition();
diff --git a/package/source/xstor/selfterminatefilestream.hxx b/package/source/xstor/selfterminatefilestream.hxx
index 16bc65c5d6cd..a9d28f0a6f85 100644
--- a/package/source/xstor/selfterminatefilestream.hxx
+++ b/package/source/xstor/selfterminatefilestream.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ public:
     void CloseStreamDeleteFile();
 
     // XInputStream
-    virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
+    virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
+    virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL available()
+    virtual sal_Int32 SAL_CALL available() 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL closeInput()
+    virtual void SAL_CALL closeInput() 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
 
     //XSeekable
diff --git a/package/source/xstor/switchpersistencestream.cxx b/package/source/xstor/switchpersistencestream.cxx
index 84dc04e0ed95..c3121a9cfa85 100644
--- a/package/source/xstor/switchpersistencestream.cxx
+++ b/package/source/xstor/switchpersistencestream.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ void SwitchablePersistenceStream::SwitchPersistenceTo( const uno::Reference< io:
     }
 
     xNewSeekable->seek( nPos );
-
+    
     CloseAll_Impl();
 
     m_pStreamData = new SPStreamData_Impl( m_xFactory, sal_False,
@@ -184,7 +184,7 @@ void SwitchablePersistenceStream::CopyAndSwitchPersistenceTo( const uno::Referen
 
     if ( !xTargetStream.is() )
     {
-        xTargetStream = uno::Reference < io::XStream >(
+        xTargetStream = uno::Reference < io::XStream >( 
             m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ),
             uno::UNO_QUERY_THROW );
 
diff --git a/package/source/xstor/switchpersistencestream.hxx b/package/source/xstor/switchpersistencestream.hxx
index a1f47b4063db..730aca1bff35 100644
--- a/package/source/xstor/switchpersistencestream.hxx
+++ b/package/source/xstor/switchpersistencestream.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class SwitchablePersistenceStream
                                         ::com::sun::star::io::XSeekable,
                                         ::com::sun::star::io::XAsyncOutputMonitor >
 {
-    ::osl::Mutex    m_aMutex;
+    ::osl::Mutex	m_aMutex;
 
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory;
 
diff --git a/package/source/xstor/xfactory.cxx b/package/source/xstor/xfactory.cxx
index 160162e47267..2e1656b437c8 100644
--- a/package/source/xstor/xfactory.cxx
+++ b/package/source/xstor/xfactory.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,15 +92,15 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstance()
             uno::RuntimeException )
 {
     // TODO: reimplement TempStream service to support XStream interface
-    uno::Reference < io::XStream > xTempStream(
+    uno::Reference < io::XStream > xTempStream( 
                         m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ),
                         uno::UNO_QUERY );
 
     if ( !xTempStream.is() )
         throw uno::RuntimeException(); // TODO:
 
-    return uno::Reference< uno::XInterface >(
-                static_cast< OWeakObject* >( new OStorage(  xTempStream,
+    return uno::Reference< uno::XInterface >( 
+                static_cast< OWeakObject* >( new OStorage(	xTempStream,
                                                             embed::ElementModes::READWRITE,
                                                             uno::Sequence< beans::PropertyValue >(),
                                                             m_xFactory,
@@ -164,8 +164,8 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr
             throw lang::IllegalArgumentException(); // TODO:
         }
 
-        uno::Reference < ::com::sun::star::ucb::XSimpleFileAccess > xTempAccess(
-                m_xFactory->createInstance (
+        uno::Reference < ::com::sun::star::ucb::XSimpleFileAccess > xTempAccess( 
+                m_xFactory->createInstance ( 
                         ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ),
                 uno::UNO_QUERY );
 
@@ -186,9 +186,9 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr
     // retrieve mediadescriptor and set storage properties
     uno::Sequence< beans::PropertyValue > aDescr;
     uno::Sequence< beans::PropertyValue > aPropsToSet;
-
+    
     sal_Int32 nStorageType = embed::StorageFormats::PACKAGE;
-
+    
     if ( nArgNum >= 3 )
     {
         if( aArguments[2] >>= aDescr )
@@ -268,7 +268,7 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr
         if ( !CheckPackageSignature_Impl( xInputStream, xSeekable ) )
             throw io::IOException(); // TODO: this is not a package file
 
-        return uno::Reference< uno::XInterface >(
+        return uno::Reference< uno::XInterface >( 
                     static_cast< OWeakObject* >( new OStorage( xInputStream, nStorageMode, aPropsToSet, m_xFactory, nStorageType ) ),
                     uno::UNO_QUERY );
     }
@@ -288,7 +288,7 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr
         if ( !CheckPackageSignature_Impl( xStream->getInputStream(), xSeekable ) )
             throw io::IOException(); // TODO: this is not a package file
 
-        return uno::Reference< uno::XInterface >(
+        return uno::Reference< uno::XInterface >( 
                     static_cast< OWeakObject* >( new OStorage( xStream, nStorageMode, aPropsToSet, m_xFactory, nStorageType ) ),
                     uno::UNO_QUERY );
     }
diff --git a/package/source/xstor/xfactory.hxx b/package/source/xstor/xfactory.hxx
index 86dca8dc264c..0a6a5fad7f39 100644
--- a/package/source/xstor/xfactory.hxx
+++ b/package/source/xstor/xfactory.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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:
     static ::rtl::OUString SAL_CALL impl_staticGetImplementationName();
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
-        impl_staticCreateSelfInstance(
+        impl_staticCreateSelfInstance( 
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
 
 
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index a99170749a0d..e45427e4858d 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,9 +81,9 @@ struct StorInternalData_Impl
     OChildDispListener_Impl* m_pSubElDispListener;
 
     WeakComponentList m_aOpenSubComponentsList;
-
+    
     ::rtl::Reference< OHierarchyHolder_Impl > m_rHierarchyHolder;
-
+    
     // the mutex reference MUST NOT be empty
     StorInternalData_Impl( const SotMutexHolderRef& rMutexRef, sal_Bool bRoot, sal_Int32 nStorageType, sal_Bool bReadOnlyWrap )
     : m_rSharedMutexRef( rMutexRef )
@@ -194,7 +194,7 @@ SotElement_Impl::~SotElement_Impl()
 
 //-----------------------------------------------
 // most of properties are holt by the storage but are not used
-OStorage_Impl::OStorage_Impl(   uno::Reference< io::XInputStream > xInputStream,
+OStorage_Impl::OStorage_Impl(	uno::Reference< io::XInputStream > xInputStream,
                                 sal_Int32 nMode,
                                 uno::Sequence< beans::PropertyValue > xProperties,
                                 uno::Reference< lang::XMultiServiceFactory > xFactory,
@@ -234,7 +234,7 @@ OStorage_Impl::OStorage_Impl(   uno::Reference< io::XInputStream > xInputStream,
 
 //-----------------------------------------------
 // most of properties are holt by the storage but are not used
-OStorage_Impl::OStorage_Impl(   uno::Reference< io::XStream > xStream,
+OStorage_Impl::OStorage_Impl(	uno::Reference< io::XStream > xStream,
                                 sal_Int32 nMode,
                                 uno::Sequence< beans::PropertyValue > xProperties,
                                 uno::Reference< lang::XMultiServiceFactory > xFactory,
@@ -276,7 +276,7 @@ OStorage_Impl::OStorage_Impl(   uno::Reference< io::XStream > xStream,
 }
 
 //-----------------------------------------------
-OStorage_Impl::OStorage_Impl(   OStorage_Impl* pParent,
+OStorage_Impl::OStorage_Impl(	OStorage_Impl* pParent,
                                 sal_Int32 nMode,
                                 uno::Reference< container::XNameContainer > xPackageFolder,
                                 uno::Reference< lang::XSingleServiceFactory > xPackage,
@@ -603,7 +603,7 @@ void OStorage_Impl::ReadRelInfoIfNecessary()
                                     xRelInfoStream,
                                     ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_rels/.rels" ) ),
                                     m_xFactory );
-
+        
         m_nRelInfoStatus = RELINFO_READ;
     }
     else if ( m_nRelInfoStatus == RELINFO_CHANGED_STREAM )
@@ -764,16 +764,16 @@ void OStorage_Impl::CopyToStorage( const uno::Reference< embed::XStorage >& xDes
     }
     else if ( m_nStorageType == embed::StorageFormats::OFOPXML )
     {
-
+        
         // TODO/LATER: currently the optimization is not active
         // uno::Reference< io::XInputStream > xRelInfoStream = GetRelInfoStreamForName( ::rtl::OUString() ); // own stream
         // if ( xRelInfoStream.is() )
         // {
-        //  // Relations info stream is a writeonly property, introduced only to optimyze copying
-        //  // Should be used carefuly since no check for stream consistency is done, and the stream must not stay locked
+        // 	// Relations info stream is a writeonly property, introduced only to optimyze copying
+        // 	// Should be used carefuly since no check for stream consistency is done, and the stream must not stay locked
         //
-        //  ::rtl::OUString aRelInfoString = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RelationsInfoStream" ) );
-        //  xPropSet->setPropertyValue( aRelInfoString, uno::makeAny( GetSeekableTempCopy( xRelInfoStream, m_xFactory ) ) );
+        // 	::rtl::OUString aRelInfoString = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RelationsInfoStream" ) );
+        // 	xPropSet->setPropertyValue( aRelInfoString, uno::makeAny( GetSeekableTempCopy( xRelInfoStream, m_xFactory ) ) );
         // }
 
         uno::Reference< embed::XRelationshipAccess > xRels( xDest, uno::UNO_QUERY );
@@ -865,9 +865,9 @@ void OStorage_Impl::CopyStorageElement( SotElement_Impl* pElement,
                     // uno::Reference< io::XInputStream > xInStream = GetRelInfoStreamForName( ::rtl::OUString() ); // own rels stream
                     // if ( xInStream.is() )
                     // {
-                    //  aStrProps.realloc( ++nNum );
-                    //  aStrProps[nNum-1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RelationsInfoStream" ) );
-                    //  aStrProps[nNum-1].Value <<= GetSeekableTempCopy( xInStream, m_xFactory );
+                    // 	aStrProps.realloc( ++nNum );
+                    // 	aStrProps[nNum-1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RelationsInfoStream" ) );
+                    // 	aStrProps[nNum-1].Value <<= GetSeekableTempCopy( xInStream, m_xFactory );
                     // }
 
                     uno::Reference< embed::XRelationshipAccess > xRels( xDest, uno::UNO_QUERY );
@@ -891,7 +891,7 @@ void OStorage_Impl::CopyStorageElement( SotElement_Impl* pElement,
                 {
                     // for now get just nonseekable access to the stream
                     // TODO/LATER: the raw stream can be used
-
+                    
                     xInputToInsert = pElement->m_pStream->m_xPackageStream->getDataStream();
                 }
 
@@ -1001,7 +1001,7 @@ uno::Sequence< uno::Sequence< beans::StringPair > > OStorage_Impl::GetAllRelatio
         return uno::Sequence< uno::Sequence< beans::StringPair > >();
 
     ReadRelInfoIfNecessary();
-
+        
     if ( m_nRelInfoStatus == RELINFO_READ
       || m_nRelInfoStatus == RELINFO_CHANGED_STREAM_READ || m_nRelInfoStatus == RELINFO_CHANGED )
         return m_aRelInfo;
@@ -1027,7 +1027,7 @@ void OStorage_Impl::CopyLastCommitTo( const uno::Reference< embed::XStorage >& x
                                 m_nStorageType);
 
     // TODO/LATER: could use direct copying
-    aTempRepresent.CopyToStorage( xNewStor, sal_False );
+    aTempRepresent.CopyToStorage( xNewStor, sal_False ); 
 }
 
 //-----------------------------------------------
@@ -1167,7 +1167,7 @@ void OStorage_Impl::Commit()
                 // the renamed elements are not in new temporary storage
                 if ( m_bCommited || m_bIsRoot )
                     xNewPackageFolder->removeByName( (*pElementIter)->m_aOriginalName );
-
+                
                 (*pElementIter)->m_pStream->InsertIntoPackageFolder( (*pElementIter)->m_aName, xNewPackageFolder );
             }
             else if ( !m_bCommited && !m_bIsRoot )
@@ -1733,7 +1733,7 @@ void OStorage_Impl::RemoveStreamRelInfo( const ::rtl::OUString& aOriginalName )
     {
         ::rtl::OUString aRelStreamName = aOriginalName;
         aRelStreamName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".rels" ) );
-
+        
         if ( m_xRelStorage->hasByName( aRelStreamName ) )
             m_xRelStorage->removeElement( aRelStreamName );
     }
@@ -1784,7 +1784,7 @@ void OStorage_Impl::CommitStreamRelInfo( SotElement_Impl* pStreamElement )
             // Create new rels storage, this is commit scenario so it must be possible
             CreateRelStorage();
         }
-
+    
         pStreamElement->m_pStream->CommitStreamRelInfo( m_xRelStorage, pStreamElement->m_aOriginalName, pStreamElement->m_aName );
     }
 }
@@ -1825,7 +1825,7 @@ void OStorage_Impl::CommitRelInfo( const uno::Reference< container::XNameContain
         if ( m_nRelInfoStatus == RELINFO_BROKEN || m_nRelInfoStatus == RELINFO_CHANGED_BROKEN )
             throw io::IOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
 
-        if ( m_nRelInfoStatus == RELINFO_CHANGED
+        if ( m_nRelInfoStatus == RELINFO_CHANGED 
           || m_nRelInfoStatus == RELINFO_CHANGED_STREAM_READ
           || m_nRelInfoStatus == RELINFO_CHANGED_STREAM )
         {
@@ -1873,7 +1873,7 @@ void OStorage_Impl::CommitRelInfo( const uno::Reference< container::XNameContain
                 uno::Reference< io::XSeekable > xSeek( m_xNewRelInfoStream, uno::UNO_QUERY_THROW );
                 xSeek->seek( 0 );
                 ::comphelper::OStorageHelper::CopyInputToOutput( m_xNewRelInfoStream, xOutputStream );
-
+    
                 // set the mediatype
                 uno::Reference< beans::XPropertySet > xPropSet( xRelsStream, uno::UNO_QUERY_THROW );
                 xPropSet->setPropertyValue(
@@ -1922,7 +1922,7 @@ void OStorage_Impl::CommitRelInfo( const uno::Reference< container::XNameContain
 //=====================================================
 
 //-----------------------------------------------
-OStorage::OStorage( uno::Reference< io::XInputStream > xInputStream,
+OStorage::OStorage(	uno::Reference< io::XInputStream > xInputStream,
                     sal_Int32 nMode,
                     uno::Sequence< beans::PropertyValue > xProperties,
                     uno::Reference< lang::XMultiServiceFactory > xFactory,
@@ -1934,7 +1934,7 @@ OStorage::OStorage( uno::Reference< io::XInputStream > xInputStream,
 }
 
 //-----------------------------------------------
-OStorage::OStorage( uno::Reference< io::XStream > xStream,
+OStorage::OStorage(	uno::Reference< io::XStream > xStream,
                     sal_Int32 nMode,
                     uno::Sequence< beans::PropertyValue > xProperties,
                     uno::Reference< lang::XMultiServiceFactory > xFactory,
@@ -1946,7 +1946,7 @@ OStorage::OStorage( uno::Reference< io::XStream > xStream,
 }
 
 //-----------------------------------------------
-OStorage::OStorage( OStorage_Impl* pImpl, sal_Bool bReadOnlyWrap )
+OStorage::OStorage(	OStorage_Impl* pImpl, sal_Bool bReadOnlyWrap )
 : m_pImpl( pImpl )
 {
     // this call can be done only from OStorage_Impl implementation to create child storage
@@ -2046,7 +2046,7 @@ void SAL_CALL OStorage::InternalDispose( sal_Bool bNotifyImpl )
                         }
                     }
                 }
-
+    
                 m_pData->m_aOpenSubComponentsList.clear();
             }
         }
@@ -2235,7 +2235,7 @@ void OStorage::MakeLinkToSubComponent_Impl( const uno::Reference< lang::XCompone
 }
 
 //____________________________________________________________________________________________________
-//  XInterface
+//	XInterface
 //____________________________________________________________________________________________________
 
 //-----------------------------------------------
@@ -2246,18 +2246,18 @@ uno::Any SAL_CALL OStorage::queryInterface( const uno::Type& rType )
 
     // common interfaces
     aReturn <<= ::cppu::queryInterface
-                (   rType
-                ,   static_cast<lang::XTypeProvider*> ( this )
-                ,   static_cast<embed::XStorage*> ( this )
-                ,   static_cast<embed::XTransactedObject*> ( this )
-                ,   static_cast<embed::XTransactionBroadcaster*> ( this )
-                ,   static_cast<util::XModifiable*> ( this )
-                ,   static_cast<container::XNameAccess*> ( this )
-                ,   static_cast<container::XElementAccess*> ( this )
-                ,   static_cast<lang::XComponent*> ( this )
-                ,   static_cast<beans::XPropertySet*> ( this )
-                ,   static_cast<embed::XOptimizedStorage*> ( this )
-                ,   static_cast<embed::XHierarchicalStorageAccess*> ( this ) );
+                (	rType
+                ,	static_cast<lang::XTypeProvider*> ( this )
+                ,	static_cast<embed::XStorage*> ( this )
+                ,	static_cast<embed::XTransactedObject*> ( this )
+                ,	static_cast<embed::XTransactionBroadcaster*> ( this )
+                ,	static_cast<util::XModifiable*> ( this )
+                ,	static_cast<container::XNameAccess*> ( this )
+                ,	static_cast<container::XElementAccess*> ( this )
+                ,	static_cast<lang::XComponent*> ( this )
+                ,	static_cast<beans::XPropertySet*> ( this )
+                ,	static_cast<embed::XOptimizedStorage*> ( this )
+                ,	static_cast<embed::XHierarchicalStorageAccess*> ( this ) );
 
     if ( aReturn.hasValue() == sal_True )
         return aReturn ;
@@ -2267,22 +2267,22 @@ uno::Any SAL_CALL OStorage::queryInterface( const uno::Type& rType )
         if ( m_pData->m_bIsRoot )
         {
             aReturn <<= ::cppu::queryInterface
-                        (   rType
-                        ,   static_cast<embed::XStorageRawAccess*> ( this )
-                        ,   static_cast<embed::XEncryptionProtectedSource*> ( this ) );
+                        (	rType
+                        ,	static_cast<embed::XStorageRawAccess*> ( this )
+                        ,	static_cast<embed::XEncryptionProtectedSource*> ( this ) );
         }
         else
         {
             aReturn <<= ::cppu::queryInterface
-                        (   rType
-                        ,   static_cast<embed::XStorageRawAccess*> ( this ) );
+                        (	rType
+                        ,	static_cast<embed::XStorageRawAccess*> ( this ) );
         }
     }
     else if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML )
     {
         aReturn <<= ::cppu::queryInterface
-                    (   rType
-                    ,   static_cast<embed::XRelationshipAccess*> ( this ) );
+                    (	rType
+                    ,	static_cast<embed::XRelationshipAccess*> ( this ) );
     }
 
     if ( aReturn.hasValue() == sal_True )
@@ -2304,7 +2304,7 @@ void SAL_CALL OStorage::release() throw()
 }
 
 //____________________________________________________________________________________________________
-//  XTypeProvider
+//	XTypeProvider
 //____________________________________________________________________________________________________
 
 //-----------------------------------------------
@@ -2322,47 +2322,47 @@ uno::Sequence< uno::Type > SAL_CALL OStorage::getTypes()
                 if ( m_pData->m_bIsRoot )
                 {
                     m_pData->m_pTypeCollection = new ::cppu::OTypeCollection
-                                    (   ::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XStorage >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XStorageRawAccess >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XTransactedObject >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XTransactionBroadcaster >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< util::XModifiable >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XEncryptionProtectedSource >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
+                                    (	::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< embed::XStorage >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< embed::XStorageRawAccess >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< embed::XTransactedObject >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< embed::XTransactionBroadcaster >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< util::XModifiable >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< embed::XEncryptionProtectedSource >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
                 }
                 else
                 {
                     m_pData->m_pTypeCollection = new ::cppu::OTypeCollection
-                                    (   ::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XStorage >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XStorageRawAccess >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XTransactedObject >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XTransactionBroadcaster >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< util::XModifiable >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
+                                    (	::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< embed::XStorage >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< embed::XStorageRawAccess >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< embed::XTransactedObject >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< embed::XTransactionBroadcaster >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< util::XModifiable >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
                 }
             }
             else if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML )
             {
                 m_pData->m_pTypeCollection = new ::cppu::OTypeCollection
-                                (   ::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
-                                ,   ::getCppuType( ( const uno::Reference< embed::XStorage >* )NULL )
-                                ,   ::getCppuType( ( const uno::Reference< embed::XTransactedObject >* )NULL )
-                                ,   ::getCppuType( ( const uno::Reference< embed::XTransactionBroadcaster >* )NULL )
-                                ,   ::getCppuType( ( const uno::Reference< util::XModifiable >* )NULL )
-                                ,   ::getCppuType( ( const uno::Reference< embed::XRelationshipAccess >* )NULL )
-                                ,   ::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
+                                (	::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
+                                ,	::getCppuType( ( const uno::Reference< embed::XStorage >* )NULL )
+                                ,	::getCppuType( ( const uno::Reference< embed::XTransactedObject >* )NULL )
+                                ,	::getCppuType( ( const uno::Reference< embed::XTransactionBroadcaster >* )NULL )
+                                ,	::getCppuType( ( const uno::Reference< util::XModifiable >* )NULL )
+                                ,	::getCppuType( ( const uno::Reference< embed::XRelationshipAccess >* )NULL )
+                                ,	::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
             }
             else
             {
                 m_pData->m_pTypeCollection = new ::cppu::OTypeCollection
-                                (   ::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
-                                ,   ::getCppuType( ( const uno::Reference< embed::XStorage >* )NULL )
-                                ,   ::getCppuType( ( const uno::Reference< embed::XTransactedObject >* )NULL )
-                                ,   ::getCppuType( ( const uno::Reference< embed::XTransactionBroadcaster >* )NULL )
-                                ,   ::getCppuType( ( const uno::Reference< util::XModifiable >* )NULL )
-                                ,   ::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
+                                (	::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
+                                ,	::getCppuType( ( const uno::Reference< embed::XStorage >* )NULL )
+                                ,	::getCppuType( ( const uno::Reference< embed::XTransactedObject >* )NULL )
+                                ,	::getCppuType( ( const uno::Reference< embed::XTransactionBroadcaster >* )NULL )
+                                ,	::getCppuType( ( const uno::Reference< util::XModifiable >* )NULL )
+                                ,	::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
             }
         }
     }
@@ -2381,7 +2381,7 @@ uno::Sequence< sal_Int8 > SAL_CALL OStorage::getImplementationId()
 }
 
 //____________________________________________________________________________________________________
-//  XStorage
+//	XStorage
 //____________________________________________________________________________________________________
 
 
@@ -2555,7 +2555,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::openStreamElement(
 }
 
 //-----------------------------------------------
-uno::Reference< io::XStream > SAL_CALL OStorage::openEncryptedStreamElement(
+uno::Reference< io::XStream > SAL_CALL OStorage::openEncryptedStreamElement( 
     const ::rtl::OUString& aStreamName, sal_Int32 nOpenMode, const ::rtl::OUString& aPass )
         throw ( embed::InvalidStorageException,
                 lang::IllegalArgumentException,
@@ -2736,7 +2736,7 @@ uno::Reference< embed::XStorage > SAL_CALL OStorage::openStorageElement(
                 // virtual, that means that it is just enough to change the flag to let it be writable
                 // and since there is no AntiImpl nobody should be notified about it
                 pElement->m_pStorage->m_nStorageMode = nStorageMode | embed::ElementModes::READ;
-
+    
                 if ( ( nStorageMode & embed::ElementModes::TRUNCATE ) )
                 {
                     for ( SotElementList_Impl::iterator pElementIter = pElement->m_pStorage->m_aChildrenList.begin();
@@ -2744,7 +2744,7 @@ uno::Reference< embed::XStorage > SAL_CALL OStorage::openStorageElement(
                        {
                         SotElement_Impl* pElementToDel = (*pElementIter);
                         pElementIter++;
-
+    
                         m_pImpl->RemoveElement( pElementToDel );
                        }
                 }
@@ -2765,12 +2765,12 @@ uno::Reference< embed::XStorage > SAL_CALL OStorage::openStorageElement(
         {
             // Before this call is done the object must be refcounted already
             pElement->m_pStorage->SetReadOnlyWrap( *pResultStorage );
-
+    
             // before the storage disposes the stream it must deregister itself as listener
             uno::Reference< lang::XComponent > xStorageComponent( xResult, uno::UNO_QUERY );
             if ( !xStorageComponent.is() )
                 throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
-
+    
             MakeLinkToSubComponent_Impl( xStorageComponent );
         }
     }
@@ -3107,7 +3107,7 @@ void SAL_CALL OStorage::copyStorageElementLastCommitTo(
         {
             // the existence of m_pAntiImpl of the child is not interesting,
             // the copy will be created internally
-
+    
             pElement->m_pStorage->CopyLastCommitTo( xTargetStorage );
         }
         else
@@ -3178,7 +3178,7 @@ sal_Bool SAL_CALL OStorage::isStreamElement( const ::rtl::OUString& aElementName
         throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 1 ); // unacceptable name
 
     SotElement_Impl* pElement = NULL;
-
+    
     try
     {
         pElement = m_pImpl->FindElement( aElementName );
@@ -3247,7 +3247,7 @@ sal_Bool SAL_CALL OStorage::isStorageElement( const ::rtl::OUString& aElementNam
         throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 1 );
 
     SotElement_Impl* pElement = NULL;
-
+    
     try
     {
         pElement = m_pImpl->FindElement( aElementName );
@@ -3492,7 +3492,7 @@ void SAL_CALL OStorage::renameElement( const ::rtl::OUString& aElementName, cons
 }
 
 //-----------------------------------------------
-void SAL_CALL OStorage::copyElementTo(  const ::rtl::OUString& aElementName,
+void SAL_CALL OStorage::copyElementTo(	const ::rtl::OUString& aElementName,
                                         const uno::Reference< embed::XStorage >& xDest,
                                         const ::rtl::OUString& aNewName )
         throw ( embed::InvalidStorageException,
@@ -3517,7 +3517,7 @@ void SAL_CALL OStorage::copyElementTo(  const ::rtl::OUString& aElementName,
       || !aNewName.getLength() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aNewName, sal_False ) )
         throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Unexpected entry name syntax." ) ), uno::Reference< uno::XInterface >(), 1 );
 
-    if ( !xDest.is() )
+    if ( !xDest.is() ) 
         // || xDest == uno::Reference< uno::XInterface >( static_cast< OWeakObject* >( this ), uno::UNO_QUERY ) )
         throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 2 );
 
@@ -3597,7 +3597,7 @@ void SAL_CALL OStorage::copyElementTo(  const ::rtl::OUString& aElementName,
 
 
 //-----------------------------------------------
-void SAL_CALL OStorage::moveElementTo(  const ::rtl::OUString& aElementName,
+void SAL_CALL OStorage::moveElementTo(	const ::rtl::OUString& aElementName,
                                         const uno::Reference< embed::XStorage >& xDest,
                                         const ::rtl::OUString& aNewName )
         throw ( embed::InvalidStorageException,
@@ -3647,7 +3647,7 @@ void SAL_CALL OStorage::moveElementTo(  const ::rtl::OUString& aElementName,
             throw container::ElementExistException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
 
         m_pImpl->CopyStorageElement( pElement, xDest, aNewName, sal_False );
-
+    
         m_pImpl->RemoveElement( pElement );
 
         m_pImpl->m_bIsModified = sal_True;
@@ -3712,7 +3712,7 @@ void SAL_CALL OStorage::moveElementTo(  const ::rtl::OUString& aElementName,
 }
 
 //____________________________________________________________________________________________________
-//  XStorageRawAccess
+//	XStorageRawAccess
 //____________________________________________________________________________________________________
 
 //-----------------------------------------------
@@ -3759,8 +3759,8 @@ uno::Reference< io::XInputStream > SAL_CALL OStorage::getPlainRawStreamElement(
         if ( !xRawInStream.is() )
             throw io::IOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
 
-        uno::Reference < io::XOutputStream > xTempOut(
-                            m_pImpl->GetServiceFactory()->createInstance (
+        uno::Reference < io::XOutputStream > xTempOut( 
+                            m_pImpl->GetServiceFactory()->createInstance ( 
                                     ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.io.TempFile" ) ) ),
                             uno::UNO_QUERY );
         xTempIn = uno::Reference < io::XInputStream >( xTempOut, uno::UNO_QUERY );
@@ -3857,7 +3857,7 @@ uno::Reference< io::XInputStream > SAL_CALL OStorage::getRawEncrStreamElement(
         SotElement_Impl* pElement = m_pImpl->FindElement( sStreamName );
         if ( !pElement )
             throw container::NoSuchElementException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
-
+    
         if ( !pElement->m_pStream )
         {
             m_pImpl->OpenSubStream( pElement );
@@ -3872,8 +3872,8 @@ uno::Reference< io::XInputStream > SAL_CALL OStorage::getRawEncrStreamElement(
         if ( !xRawInStream.is() )
             throw io::IOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
 
-        uno::Reference < io::XOutputStream > xTempOut(
-                            m_pImpl->GetServiceFactory()->createInstance (
+        uno::Reference < io::XOutputStream > xTempOut( 
+                            m_pImpl->GetServiceFactory()->createInstance ( 
                                     ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.io.TempFile" ) ) ),
                             uno::UNO_QUERY );
         xTempIn = uno::Reference < io::XInputStream >( xTempOut, uno::UNO_QUERY );
@@ -4040,7 +4040,7 @@ void SAL_CALL OStorage::insertRawEncrStreamElement( const ::rtl::OUString& aStre
 }
 
 //____________________________________________________________________________________________________
-//  XTransactedObject
+//	XTransactedObject
 //____________________________________________________________________________________________________
 
 //-----------------------------------------------
@@ -4183,7 +4183,7 @@ void SAL_CALL OStorage::revert()
 }
 
 //____________________________________________________________________________________________________
-//  XTransactionBroadcaster
+//	XTransactionBroadcaster
 //____________________________________________________________________________________________________
 
 //-----------------------------------------------
@@ -4219,10 +4219,10 @@ void SAL_CALL OStorage::removeTransactionListener( const uno::Reference< embed::
 }
 
 //____________________________________________________________________________________________________
-//  XModifiable
+//	XModifiable
 //  TODO: if there will be no demand on this interface it will be removed from implementation,
-//        I do not want to remove it now since it is still possible that it will be inserted
-//        to the service back.
+//		  I do not want to remove it now since it is still possible that it will be inserted
+//		  to the service back.
 //____________________________________________________________________________________________________
 
 //-----------------------------------------------
@@ -4304,7 +4304,7 @@ void SAL_CALL OStorage::removeModifyListener(
 }
 
 //____________________________________________________________________________________________________
-//  XNameAccess
+//	XNameAccess
 //____________________________________________________________________________________________________
 
 //-----------------------------------------------
@@ -4518,7 +4518,7 @@ sal_Bool SAL_CALL OStorage::hasElements()
 
 
 //____________________________________________________________________________________________________
-//  XComponent
+//	XComponent
 //____________________________________________________________________________________________________
 
 //-----------------------------------------------
@@ -4591,7 +4591,7 @@ void SAL_CALL OStorage::removeEventListener(
 }
 
 //____________________________________________________________________________________________________
-//  XEncryptionProtectedSource
+//	XEncryptionProtectedSource
 //____________________________________________________________________________________________________
 
 void SAL_CALL OStorage::setEncryptionPassword( const ::rtl::OUString& aPass )
@@ -4616,7 +4616,7 @@ void SAL_CALL OStorage::setEncryptionPassword( const ::rtl::OUString& aPass )
     if ( m_pData->m_bIsRoot )
     {
         try {
-            m_pImpl->ReadContents();
+            m_pImpl->ReadContents(); 
         }
         catch ( uno::RuntimeException& aRuntimeException )
         {
@@ -4635,7 +4635,7 @@ void SAL_CALL OStorage::setEncryptionPassword( const ::rtl::OUString& aPass )
                                                                                     uno::UNO_QUERY ),
                                                 aCaught );
         }
-
+        
         uno::Reference< beans::XPropertySet > xPackPropSet( m_pImpl->m_xPackage, uno::UNO_QUERY );
         if ( !xPackPropSet.is() )
             throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
@@ -4729,7 +4729,7 @@ void SAL_CALL OStorage::removeEncryption()
 }
 
 //____________________________________________________________________________________________________
-//  XPropertySet
+//	XPropertySet
 //____________________________________________________________________________________________________
 
 //-----------------------------------------------
@@ -4783,7 +4783,7 @@ void SAL_CALL OStorage::setPropertyValue( const ::rtl::OUString& aPropertyName,
         {
             aValue >>= m_pImpl->m_aMediaType;
             m_pImpl->m_bControlMediaType = sal_True;
-
+    
             m_pImpl->m_bBroadcastModified = sal_True;
             m_pImpl->m_bIsModified = sal_True;
         }
@@ -4791,7 +4791,7 @@ void SAL_CALL OStorage::setPropertyValue( const ::rtl::OUString& aPropertyName,
         {
             aValue >>= m_pImpl->m_aVersion;
             m_pImpl->m_bControlVersion = sal_True;
-
+    
             // this property can be set even for readonly storage
             if ( !m_pData->m_bReadOnlyWrap )
             {
@@ -4938,7 +4938,7 @@ uno::Any SAL_CALL OStorage::getPropertyValue( const ::rtl::OUString& aPropertyNa
         else if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE
           && ( aPropertyName.equalsAscii( "HasEncryptedEntries" )
             || aPropertyName.equalsAscii( "HasNonEncryptedEntries" )
-            || aPropertyName.equalsAscii( "IsInconsistent" ) ) )
+            || aPropertyName.equalsAscii( "IsInconsistent" ) ) ) 
         {
             try {
                 m_pImpl->ReadContents();
@@ -5052,7 +5052,7 @@ void SAL_CALL OStorage::removeVetoableChangeListener(
 }
 
 //____________________________________________________________________________________________________
-//  XRelationshipAccess
+//	XRelationshipAccess
 //____________________________________________________________________________________________________
 
 // TODO/LATER: the storage and stream implementations of this interface are very similar, they could use a helper class
@@ -5164,7 +5164,7 @@ uno::Sequence< beans::StringPair > SAL_CALL OStorage::getRelationshipByID(  cons
                     return aSeq[nInd1];
                 break;
             }
-
+    
     throw container::NoSuchElementException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
 }
 
@@ -5370,7 +5370,7 @@ void SAL_CALL OStorage::insertRelationships(  const uno::Sequence< uno::Sequence
 
                                 nIndSourceSame = nIndSource1;
                             }
-
+                            
                             break;
                         }
                     }
@@ -5435,7 +5435,7 @@ void SAL_CALL OStorage::clearRelationships()
 }
 
 //____________________________________________________________________________________________________
-//  XOptimizedStorage
+//	XOptimizedStorage
 //____________________________________________________________________________________________________
 //-----------------------------------------------
 void SAL_CALL OStorage::insertRawNonEncrStreamElementDirect(
@@ -5545,7 +5545,7 @@ void SAL_CALL OStorage::insertStreamElementDirect(
                                                  aCaught );
     }
 }
-
+                
 //-----------------------------------------------
 void SAL_CALL OStorage::copyElementDirectlyTo(
             const ::rtl::OUString& aElementName,
@@ -5675,7 +5675,7 @@ void SAL_CALL OStorage::writeAndAttachToStream( const uno::Reference< io::XStrea
 
     if ( !m_pImpl->m_pSwitchStream )
         throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
-
+    
     try
     {
         m_pImpl->m_pSwitchStream->CopyAndSwitchPersistenceTo( xStream );
@@ -5747,12 +5747,12 @@ void SAL_CALL OStorage::attachToURL( const ::rtl::OUString& sURL,
 
     if ( !m_pImpl->m_pSwitchStream )
         throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
-
-    uno::Reference < ucb::XSimpleFileAccess > xAccess(
-            m_pImpl->m_xFactory->createInstance (
+    
+    uno::Reference < ucb::XSimpleFileAccess > xAccess( 
+            m_pImpl->m_xFactory->createInstance ( 
                     ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" ) ) ),
             uno::UNO_QUERY_THROW );
-
+    
     try
     {
         if ( bReadOnly )
@@ -6006,7 +6006,7 @@ void SAL_CALL OStorage::copyStreamElementData( const ::rtl::OUString& aStreamNam
 //____________________________________________________________________________________________________
 
 //-----------------------------------------------
-uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openStreamElementByHierarchicalName( const ::rtl::OUString& aStreamPath, ::sal_Int32 nOpenMode )
+uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openStreamElementByHierarchicalName( const ::rtl::OUString& aStreamPath, ::sal_Int32 nOpenMode ) 
         throw ( embed::InvalidStorageException,
                 lang::IllegalArgumentException,
                 packages::WrongPasswordException,
@@ -6065,7 +6065,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openStreamEle
 }
 
 //-----------------------------------------------
-uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openEncryptedStreamElementByHierarchicalName( const ::rtl::OUString& aStreamPath, ::sal_Int32 nOpenMode, const ::rtl::OUString& sPassword )
+uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openEncryptedStreamElementByHierarchicalName( const ::rtl::OUString& aStreamPath, ::sal_Int32 nOpenMode, const ::rtl::OUString& sPassword ) 
         throw ( embed::InvalidStorageException,
                 lang::IllegalArgumentException,
                 packages::NoEncryptionException,
@@ -6132,7 +6132,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openEncrypted
 }
 
 //-----------------------------------------------
-void SAL_CALL OStorage::removeStreamElementByHierarchicalName( const ::rtl::OUString& aStreamPath )
+void SAL_CALL OStorage::removeStreamElementByHierarchicalName( const ::rtl::OUString& aStreamPath ) 
         throw ( embed::InvalidStorageException,
                 lang::IllegalArgumentException,
                 container::NoSuchElementException,
diff --git a/package/source/xstor/xstorage.hxx b/package/source/xstor/xstorage.hxx
index 330b4c800f28..39c61e25b241 100644
--- a/package/source/xstor/xstorage.hxx
+++ b/package/source/xstor/xstorage.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,13 +58,13 @@
 
 #include "mutexholder.hxx"
 
-#define RELINFO_NO_INIT             1
-#define RELINFO_READ                2
-#define RELINFO_CHANGED             3
-#define RELINFO_CHANGED_STREAM      4
-#define RELINFO_CHANGED_STREAM_READ 5
-#define RELINFO_BROKEN              6
-#define RELINFO_CHANGED_BROKEN      7
+#define RELINFO_NO_INIT				1
+#define RELINFO_READ				2
+#define RELINFO_CHANGED				3
+#define RELINFO_CHANGED_STREAM		4
+#define RELINFO_CHANGED_STREAM_READ	5
+#define RELINFO_BROKEN				6
+#define RELINFO_CHANGED_BROKEN		7
 
 #define STOR_MESS_PRECOMMIT 1
 #define STOR_MESS_COMMITED  2
@@ -85,14 +85,14 @@ struct OWriteStream_Impl;
 
 struct SotElement_Impl
 {
-    ::rtl::OUString             m_aName;
+    ::rtl::OUString             m_aName;        
     ::rtl::OUString             m_aOriginalName;
     sal_Bool                    m_bIsRemoved;
     sal_Bool                    m_bIsInserted;
-    sal_Bool                    m_bIsStorage;
-
-    OStorage_Impl*              m_pStorage;
-    OWriteStream_Impl*          m_pStream;
+    sal_Bool					m_bIsStorage;
+    
+    OStorage_Impl*				m_pStorage;
+    OWriteStream_Impl*			m_pStream;
 
 public:
                                 SotElement_Impl( const ::rtl::OUString& rName, sal_Bool bStor, sal_Bool bNew );
@@ -131,12 +131,12 @@ typedef ::std::list< StorageHolder_Impl > OStorageList_Impl;
 class SwitchablePersistenceStream;
 struct OStorage_Impl
 {
-    SotMutexHolderRef           m_rMutexRef;
+    SotMutexHolderRef			m_rMutexRef;
 
-    OStorage*                   m_pAntiImpl;         // only valid if external references exists
-    OStorageList_Impl           m_aReadOnlyWrapList; // only valid if readonly external reference exists
+    OStorage*					m_pAntiImpl;    	 // only valid if external references exists
+    OStorageList_Impl			m_aReadOnlyWrapList; // only valid if readonly external reference exists
 
-    sal_Int32                   m_nStorageMode; // open mode ( read/write/trunc/nocreate )
+    sal_Int32					m_nStorageMode; // open mode ( read/write/trunc/nocreate )
     sal_Bool                    m_bIsModified;  // only modified elements will be sent to the original content
     sal_Bool                    m_bBroadcastModified;  // will be set if notification is required
     sal_Bool                    m_bCommited;    // sending the streams is coordinated by the root storage of the package
@@ -145,8 +145,8 @@ struct OStorage_Impl
     sal_Bool                    m_bListCreated;
 
 
-    SotElementList_Impl                         m_aChildrenList;
-    SotElementList_Impl                         m_aDeletedList;
+    SotElementList_Impl							m_aChildrenList;
+    SotElementList_Impl							m_aDeletedList;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xPackageFolder;
     ::com::sun::star::uno::Reference< ::com::sun::star::logging::XSimpleLogRing >  m_xLogRing;
@@ -164,11 +164,11 @@ struct OStorage_Impl
     // must be empty in case of root storage
     OStorage_Impl* m_pParent;
 
-    sal_Bool        m_bControlMediaType;
+    sal_Bool		m_bControlMediaType;
     ::rtl::OUString m_aMediaType;
-    sal_Bool        m_bMTFallbackUsed;
+    sal_Bool		m_bMTFallbackUsed;
 
-    sal_Bool        m_bControlVersion;
+    sal_Bool		m_bControlVersion;
     ::rtl::OUString m_aVersion;
 
     SwitchablePersistenceStream* m_pSwitchStream;
@@ -176,7 +176,7 @@ struct OStorage_Impl
     sal_Int32 m_nStorageType; // the mode in wich the storage is used
 
     // the _rels substorage that is handled in a special way in embed::StorageFormats::OFOPXML
-    SotElement_Impl* m_pRelStorElement;
+    SotElement_Impl* m_pRelStorElement; 
     ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xRelStorage;
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > m_aRelInfo;
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xNewRelInfoStream;
@@ -185,20 +185,20 @@ struct OStorage_Impl
     //////////////////////////////////////////
     // Constructors
 
-    OStorage_Impl(  ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xInputStream,
+    OStorage_Impl(	::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xInputStream,
                     sal_Int32 nMode,
                     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > xProperties,
                     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory,
                     sal_Int32 nStorageType );
 
-    OStorage_Impl(  ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > xStream,
+    OStorage_Impl(	::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > xStream,
                     sal_Int32 nMode,
                     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > xProperties,
                     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory,
                     sal_Int32 nStorageType );
 
     // constructor for a substorage
-    OStorage_Impl(  OStorage_Impl* pParent,
+    OStorage_Impl(	OStorage_Impl* pParent,
                     sal_Int32 nMode,
                     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > xPackageFolder,
                     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > xPackage,
@@ -289,7 +289,7 @@ struct OStorage_Impl
 };
 
 
-class OStorage  : public ::com::sun::star::lang::XTypeProvider
+class OStorage	: public ::com::sun::star::lang::XTypeProvider
                 , public ::com::sun::star::embed::XStorage
                 , public ::com::sun::star::embed::XStorageRawAccess
                 , public ::com::sun::star::embed::XTransactedObject
@@ -304,7 +304,7 @@ class OStorage  : public ::com::sun::star::lang::XTypeProvider
                 , public ::com::sun::star::embed::XHierarchicalStorageAccess
                 , public ::cppu::OWeakObject
 {
-    OStorage_Impl*  m_pImpl;
+    OStorage_Impl*	m_pImpl;
     StorInternalData_Impl* m_pData;
 
 protected:
@@ -322,19 +322,19 @@ protected:
 
 public:
 
-    OStorage(   ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xInputStream,
+    OStorage(	::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xInputStream,
                 sal_Int32 nMode,
                 ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > xProperties,
                 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory,
                 sal_Int32 nStorageType );
 
-    OStorage(   ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > xStream,
+    OStorage(	::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > xStream,
                 sal_Int32 nMode,
                 ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > xProperties,
                 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory,
                 sal_Int32 nStorageType );
 
-    OStorage(   OStorage_Impl* pImpl, sal_Bool bReadOnlyWrap );
+    OStorage(	OStorage_Impl* pImpl, sal_Bool bReadOnlyWrap );
 
     virtual ~OStorage();
 
@@ -345,10 +345,10 @@ public:
     sal_Int32 GetRefCount_Impl() { return m_refCount; }
 
     //____________________________________________________________________________________________________
-    //  XInterface
+    //	XInterface
     //____________________________________________________________________________________________________
 
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType )
+    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();
@@ -356,7 +356,7 @@ public:
     virtual void SAL_CALL release() throw();
 
     //____________________________________________________________________________________________________
-    //  XTypeProvider
+    //	XTypeProvider
     //____________________________________________________________________________________________________
 
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes()
@@ -366,7 +366,7 @@ public:
         throw( ::com::sun::star::uno::RuntimeException );
 
     //____________________________________________________________________________________________________
-    //  XStorage
+    //	XStorage
     //____________________________________________________________________________________________________
 
     virtual void SAL_CALL copyToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest )
@@ -376,7 +376,7 @@ public:
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openStreamElement(
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openStreamElement( 
             const ::rtl::OUString& aStreamName, sal_Int32 nOpenMode )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
@@ -385,7 +385,7 @@ public:
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openEncryptedStreamElement(
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openEncryptedStreamElement( 
             const ::rtl::OUString& aStreamName, sal_Int32 nOpenMode, const ::rtl::OUString& aPass )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
@@ -395,7 +395,7 @@ public:
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL openStorageElement(
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL openStorageElement( 
             const ::rtl::OUString& aStorName, sal_Int32 nStorageMode )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
@@ -403,7 +403,7 @@ public:
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL cloneStreamElement(
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL cloneStreamElement( 
             const ::rtl::OUString& aStreamName )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
@@ -412,7 +412,7 @@ public:
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL cloneEncryptedStreamElement(
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL cloneEncryptedStreamElement( 
             const ::rtl::OUString& aStreamName, const ::rtl::OUString& aPass )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
@@ -468,7 +468,7 @@ public:
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual void SAL_CALL copyElementTo(    const ::rtl::OUString& aElementName,
+    virtual void SAL_CALL copyElementTo(	const ::rtl::OUString& aElementName, 
                                         const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest,
                                         const ::rtl::OUString& aNewName )
         throw ( ::com::sun::star::embed::InvalidStorageException,
@@ -479,7 +479,7 @@ public:
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual void SAL_CALL moveElementTo(    const ::rtl::OUString& aElementName,
+    virtual void SAL_CALL moveElementTo(	const ::rtl::OUString& aElementName,
                                         const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest,
                                         const ::rtl::OUString& rNewName )
         throw ( ::com::sun::star::embed::InvalidStorageException,
@@ -491,7 +491,7 @@ public:
                 ::com::sun::star::uno::RuntimeException );
 
     //____________________________________________________________________________________________________
-    //  XStorageRawAccess
+    //	XStorageRawAccess
     //____________________________________________________________________________________________________
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getPlainRawStreamElement(
@@ -550,7 +550,7 @@ public:
         throw ( ::com::sun::star::uno::RuntimeException );
 
     //____________________________________________________________________________________________________
-    //  XModifiable
+    //	XModifiable
     //____________________________________________________________________________________________________
 
     virtual sal_Bool SAL_CALL isModified()
@@ -569,7 +569,7 @@ public:
         throw ( ::com::sun::star::uno::RuntimeException );
 
     //____________________________________________________________________________________________________
-    //  XNameAccess
+    //	XNameAccess
     //____________________________________________________________________________________________________
 
     virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName )
@@ -590,7 +590,7 @@ public:
         throw ( ::com::sun::star::uno::RuntimeException );
 
     //____________________________________________________________________________________________________
-    //  XComponent
+    //	XComponent
     //____________________________________________________________________________________________________
 
     virtual void SAL_CALL dispose()
@@ -605,7 +605,7 @@ public:
         throw ( ::com::sun::star::uno::RuntimeException );
 
     //____________________________________________________________________________________________________
-    //  XEncryptionProtectedSource
+    //	XEncryptionProtectedSource
     //____________________________________________________________________________________________________
 
     virtual void SAL_CALL setEncryptionPassword( const ::rtl::OUString& aPass )
@@ -617,7 +617,7 @@ public:
                 ::com::sun::star::io::IOException );
 
     //____________________________________________________________________________________________________
-    //  XPropertySet
+    //	XPropertySet
     //____________________________________________________________________________________________________
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
@@ -635,7 +635,7 @@ public:
                 ::com::sun::star::lang::WrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual void SAL_CALL addPropertyChangeListener(
+    virtual void SAL_CALL addPropertyChangeListener( 
             const ::rtl::OUString& aPropertyName,
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener )
         throw ( ::com::sun::star::beans::UnknownPropertyException,
@@ -662,7 +662,7 @@ public:
                 ::com::sun::star::uno::RuntimeException );
 
     //____________________________________________________________________________________________________
-    //  XOptimizedStorage
+    //	XOptimizedStorage
     //____________________________________________________________________________________________________
     virtual void SAL_CALL insertRawNonEncrStreamElementDirect( const ::rtl::OUString& sStreamName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream )
         throw ( ::com::sun::star::embed::InvalidStorageException,
@@ -680,7 +680,7 @@ public:
                 ::com::sun::star::io::IOException,
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
-
+                
     virtual void SAL_CALL copyElementDirectlyTo( const ::rtl::OUString& sSourceName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XOptimizedStorage >& xTargetStorage, const ::rtl::OUString& sTargetName )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
@@ -776,7 +776,7 @@ public:
     // XHierarchicalStorageAccess
     //____________________________________________________________________________________________________
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openStreamElementByHierarchicalName( const ::rtl::OUString& sStreamPath, ::sal_Int32 nOpenMode )
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openStreamElementByHierarchicalName( const ::rtl::OUString& sStreamPath, ::sal_Int32 nOpenMode ) 
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::packages::WrongPasswordException,
@@ -784,7 +784,7 @@ public:
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException);
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamElementByHierarchicalName( const ::rtl::OUString& sStreamName, ::sal_Int32 nOpenMode, const ::rtl::OUString& sPassword )
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamElementByHierarchicalName( const ::rtl::OUString& sStreamName, ::sal_Int32 nOpenMode, const ::rtl::OUString& sPassword ) 
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::packages::NoEncryptionException,
@@ -793,7 +793,7 @@ public:
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL removeStreamElementByHierarchicalName( const ::rtl::OUString& sElementPath )
+    virtual void SAL_CALL removeStreamElementByHierarchicalName( const ::rtl::OUString& sElementPath ) 
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::container::NoSuchElementException,
diff --git a/package/source/zipapi/ByteChucker.cxx b/package/source/zipapi/ByteChucker.cxx
index 8ff31dc49926..73025fe12515 100644
--- a/package/source/zipapi/ByteChucker.cxx
+++ b/package/source/zipapi/ByteChucker.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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;
 using namespace ::com::sun::star::lang;
 
 ByteChucker::ByteChucker(Reference<XOutputStream> xOstream)
-: xStream(xOstream)
+: xStream(xOstream) 
 , xSeek (xOstream, UNO_QUERY )
 , a1Sequence ( 1 )
 , a2Sequence ( 2 )
@@ -59,7 +59,7 @@ void ByteChucker::WriteBytes( const Sequence< sal_Int8 >& aData )
     xStream->writeBytes(aData);
 }
 
-sal_Int64 ByteChucker::GetPosition(  )
+sal_Int64 ByteChucker::GetPosition(  ) 
         throw(IOException, RuntimeException)
 {
     return xSeek->getPosition();
diff --git a/package/source/zipapi/ByteGrabber.cxx b/package/source/zipapi/ByteGrabber.cxx
index 50546707d54e..34bd9a7ac827 100644
--- a/package/source/zipapi/ByteGrabber.cxx
+++ b/package/source/zipapi/ByteGrabber.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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;
  */
 
 ByteGrabber::ByteGrabber(uno::Reference  < io::XInputStream > xIstream)
-: xStream(xIstream)
+: xStream(xIstream) 
 , xSeek (xIstream, uno::UNO_QUERY )
 , aSequence ( 4 )
 {
@@ -58,8 +58,8 @@ void ByteGrabber::setInputStream (uno::Reference < io::XInputStream > xNewStream
 }
 
 // XInputStream chained
-sal_Int32 SAL_CALL ByteGrabber::readBytes( uno::Sequence< sal_Int8 >& aData,
-                                        sal_Int32 nBytesToRead )
+sal_Int32 SAL_CALL ByteGrabber::readBytes( uno::Sequence< sal_Int8 >& aData, 
+                                        sal_Int32 nBytesToRead ) 
     throw(io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -67,7 +67,7 @@ sal_Int32 SAL_CALL ByteGrabber::readBytes( uno::Sequence< sal_Int8 >& aData,
 }
 
 // XSeekable chained...
-sal_Int64 SAL_CALL ByteGrabber::seek( sal_Int64 location )
+sal_Int64 SAL_CALL ByteGrabber::seek( sal_Int64 location ) 
     throw(lang::IllegalArgumentException, io::IOException, uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -80,12 +80,12 @@ sal_Int64 SAL_CALL ByteGrabber::seek( sal_Int64 location )
             location = nLen;
         xSeek->seek( location );
         return location;
-    }
+    }		
     else
         throw io::IOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
 }
 
-sal_Int64 SAL_CALL ByteGrabber::getPosition(  )
+sal_Int64 SAL_CALL ByteGrabber::getPosition(  ) 
         throw(io::IOException, uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -123,8 +123,8 @@ ByteGrabber& ByteGrabber::operator >> (sal_Int16& rInt16)
     else
     {
         pSequence = aSequence.getConstArray();
-        rInt16 = static_cast <sal_Int16>
-               ( (pSequence[0] & 0xFF)
+        rInt16 = static_cast <sal_Int16> 
+               ( (pSequence[0] & 0xFF) 
               | (pSequence[1] & 0xFF) << 8);
     }
     return *this;
@@ -139,9 +139,9 @@ ByteGrabber& ByteGrabber::operator >> (sal_Int32& rInt32)
     else
     {
         pSequence = aSequence.getConstArray();
-        rInt32 = static_cast < sal_Int32 >
+        rInt32 = static_cast < sal_Int32 > 
                 ( (pSequence[0] & 0xFF)
-              | ( pSequence[1] & 0xFF ) << 8
+              | ( pSequence[1] & 0xFF ) << 8 
               | ( pSequence[2] & 0xFF ) << 16
               | ( pSequence[3] & 0xFF ) << 24 );
     }
@@ -167,8 +167,8 @@ ByteGrabber& ByteGrabber::operator >> (sal_uInt16& rInt16)
     else
     {
         pSequence = aSequence.getConstArray();
-        rInt16 = static_cast <sal_uInt16>
-               ( (pSequence[0] & 0xFF)
+        rInt16 = static_cast <sal_uInt16> 
+               ( (pSequence[0] & 0xFF) 
               | (pSequence[1] & 0xFF) << 8);
     }
     return *this;
@@ -182,9 +182,9 @@ ByteGrabber& ByteGrabber::operator >> (sal_uInt32& ruInt32)
     else
     {
         pSequence = aSequence.getConstArray();
-        ruInt32 = static_cast < sal_uInt32 >
+        ruInt32 = static_cast < sal_uInt32 > 
                 ( (pSequence[0] & 0xFF)
-              | ( pSequence[1] & 0xFF ) << 8
+              | ( pSequence[1] & 0xFF ) << 8 
               | ( pSequence[2] & 0xFF ) << 16
               | ( pSequence[3] & 0xFF ) << 24 );
     }
diff --git a/package/source/zipapi/CRC32.cxx b/package/source/zipapi/CRC32.cxx
index 9334831ea30c..6e15614bf67c 100644
--- a/package/source/zipapi/CRC32.cxx
+++ b/package/source/zipapi/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
@@ -48,10 +48,10 @@ using namespace com::sun::star::io;
 
 CRC32::CRC32()
 : nCRC(0)
-{
+{ 
 }
 CRC32::~CRC32()
-{
+{ 
 }
 void SAL_CALL CRC32::reset()
     throw(RuntimeException)
@@ -65,8 +65,8 @@ sal_Int32 SAL_CALL CRC32::getValue()
 }
 /** Update CRC32 with specified sequence of bytes
  */
-void SAL_CALL CRC32::updateSegment(const Sequence< sal_Int8 > &b,
-                                    sal_Int32 off,
+void SAL_CALL CRC32::updateSegment(const Sequence< sal_Int8 > &b, 
+                                    sal_Int32 off, 
                                     sal_Int32 len)
         throw(RuntimeException)
 {
diff --git a/package/source/zipapi/Deflater.cxx b/package/source/zipapi/Deflater.cxx
index b2c1edb07cbc..a0005f5fe973 100644
--- a/package/source/zipapi/Deflater.cxx
+++ b/package/source/zipapi/Deflater.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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;
 
 Deflater::~Deflater(void)
 {
-    end();
+    end();	
 }
 void Deflater::init (sal_Int32 nLevelArg, sal_Int32 nStrategyArg, sal_Bool bNowrap)
 {
@@ -142,15 +142,15 @@ sal_Int32 Deflater::doDeflateBytes (uno::Sequence < sal_Int8 > &rBuffer, sal_Int
     }
 }
 
-void SAL_CALL Deflater::setInputSegment( const uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength )
+void SAL_CALL Deflater::setInputSegment( const uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength ) 
 {
     OSL_ASSERT( !(nNewOffset < 0 || nNewLength < 0 || nNewOffset + nNewLength > rBuffer.getLength()));
-
+    
     sInBuffer = rBuffer;
     nOffset = nNewOffset;
     nLength = nNewLength;
 }
-void SAL_CALL Deflater::setLevel( sal_Int32 nNewLevel )
+void SAL_CALL Deflater::setLevel( sal_Int32 nNewLevel ) 
 {
     if ((nNewLevel < 0 || nNewLevel > 9) && nNewLevel != DEFAULT_COMPRESSION)
     {
@@ -162,32 +162,32 @@ void SAL_CALL Deflater::setLevel( sal_Int32 nNewLevel )
         bSetParams = sal_True;
     }
 }
-sal_Bool SAL_CALL Deflater::needsInput(  )
+sal_Bool SAL_CALL Deflater::needsInput(  ) 
 {
     return nLength <=0;
 }
-void SAL_CALL Deflater::finish(  )
+void SAL_CALL Deflater::finish(  ) 
 {
     bFinish = sal_True;
 }
-sal_Bool SAL_CALL Deflater::finished(  )
+sal_Bool SAL_CALL Deflater::finished(  ) 
 {
     return bFinished;
 }
-sal_Int32 SAL_CALL Deflater::doDeflateSegment( uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength )
+sal_Int32 SAL_CALL Deflater::doDeflateSegment( uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength ) 
 {
     OSL_ASSERT( !(nNewOffset < 0 || nNewLength < 0 || nNewOffset + nNewLength > rBuffer.getLength()));
     return doDeflateBytes(rBuffer, nNewOffset, nNewLength);
 }
-sal_Int32 SAL_CALL Deflater::getTotalIn(  )
+sal_Int32 SAL_CALL Deflater::getTotalIn(  ) 
 {
     return pStream->total_in;
 }
-sal_Int32 SAL_CALL Deflater::getTotalOut(  )
+sal_Int32 SAL_CALL Deflater::getTotalOut(  ) 
 {
     return pStream->total_out;
 }
-void SAL_CALL Deflater::reset(  )
+void SAL_CALL Deflater::reset(  ) 
 {
 #ifdef SYSTEM_ZLIB
     deflateReset(pStream);
@@ -198,7 +198,7 @@ void SAL_CALL Deflater::reset(  )
     bFinished = sal_False;
     nOffset = nLength = 0;
 }
-void SAL_CALL Deflater::end(  )
+void SAL_CALL Deflater::end(  ) 
 {
     if (pStream != NULL)
     {
diff --git a/package/source/zipapi/EntryInputStream.cxx b/package/source/zipapi/EntryInputStream.cxx
index cd43622ea8ac..eb89646916e4 100644
--- a/package/source/zipapi/EntryInputStream.cxx
+++ b/package/source/zipapi/EntryInputStream.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::packages::zip;
 using namespace com::sun::star::packages::zip::ZipConstants;
 
-/** Provides access to the compressed data in a zipfile.
+/** Provides access to the compressed data in a zipfile. 
  *
  * 04/12/00 - uncompresses the stream into memory and seeks on it 'in memory'
  * This and the ZipPackageBuffer used in the ZipOutputStream are memory hogs
@@ -51,7 +51,7 @@ using namespace com::sun::star::packages::zip::ZipConstants;
  * seek to it before performing any reads.
  */
 
-EntryInputStream::EntryInputStream( Reference < io::XInputStream > xNewInput,
+EntryInputStream::EntryInputStream( Reference < io::XInputStream > xNewInput, 
                                     const ZipEntry & rNewEntry,
                                     const rtl::Reference < EncryptionData > &xEncryptData,
                                     sal_Bool bGetRawStream)
@@ -99,22 +99,22 @@ void EntryInputStream::readIntoMemory()
 
             // Get the key
             rtl_digest_PBKDF2 ( aDerivedKey.getArray(), 16,
-                                reinterpret_cast < const sal_uInt8 * > (xEncryptionData->aKey.getConstArray()),
+                                reinterpret_cast < const sal_uInt8 * > (xEncryptionData->aKey.getConstArray()), 
                                 xEncryptionData->aKey.getLength(),
-                                xEncryptionData->aSalt.getConstArray(),
+                                xEncryptionData->aSalt.getConstArray(), 
                                 xEncryptionData->aSalt.getLength(),
                                 xEncryptionData->nIterationCount );
-
+            
             rtlCipher aCipher = rtl_cipher_create (rtl_Cipher_AlgorithmBF, rtl_Cipher_ModeStream);
-            aResult = rtl_cipher_init( aCipher, rtl_Cipher_DirectionDecode,
+            aResult = rtl_cipher_init( aCipher, rtl_Cipher_DirectionDecode, 
                                        aDerivedKey.getConstArray(),
                                        aDerivedKey.getLength(),
                                        xEncryptionData->aInitVector.getConstArray(),
                                        xEncryptionData->aInitVector.getLength());
             OSL_ASSERT (aResult == rtl_Cipher_E_None);
             aDecryptBuffer.realloc ( nSize );
-            aResult = rtl_cipher_decode ( aCipher,
-                                          aReadBuffer.getConstArray(),
+            aResult = rtl_cipher_decode ( aCipher, 
+                                          aReadBuffer.getConstArray(), 
                                           nSize,
                                           reinterpret_cast < sal_uInt8 * > (aDecryptBuffer.getArray()),
                                           nSize);
@@ -171,17 +171,17 @@ void SAL_CALL EntryInputStream::skipBytes( sal_Int32 nBytesToSkip )
 
     nCurrent+=nBytesToSkip;
 }
-sal_Int32 SAL_CALL EntryInputStream::available(  )
+sal_Int32 SAL_CALL EntryInputStream::available(  ) 
     throw(io::NotConnectedException, io::IOException, RuntimeException)
 {
     return static_cast < sal_Int32 > (nUncompressedSize - nCurrent);
 }
-void SAL_CALL EntryInputStream::closeInput(  )
+void SAL_CALL EntryInputStream::closeInput(  ) 
     throw(io::NotConnectedException, io::IOException, RuntimeException)
 {
 }
 
-void SAL_CALL EntryInputStream::seek( sal_Int64 location )
+void SAL_CALL EntryInputStream::seek( sal_Int64 location ) 
     throw(lang::IllegalArgumentException, io::IOException, RuntimeException)
 {
     if (location > nUncompressedSize)
@@ -190,7 +190,7 @@ void SAL_CALL EntryInputStream::seek( sal_Int64 location )
         location = 0;
     nCurrent = location;
 }
-sal_Int64 SAL_CALL EntryInputStream::getPosition(  )
+sal_Int64 SAL_CALL EntryInputStream::getPosition(  ) 
         throw(io::IOException, RuntimeException)
 {
     return nCurrent;
diff --git a/package/source/zipapi/EntryInputStream.hxx b/package/source/zipapi/EntryInputStream.hxx
index 8a5bf0dc835f..cf1bf5aeb58f 100644
--- a/package/source/zipapi/EntryInputStream.hxx
+++ b/package/source/zipapi/EntryInputStream.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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/packages/zip/ZipEntry.hpp>
 #include <rtl/ref.hxx>
 #include <EncryptionData.hxx>
-class EntryInputStream : public cppu::WeakImplHelper2< com::sun::star::io::XInputStream,
+class EntryInputStream : public cppu::WeakImplHelper2< com::sun::star::io::XInputStream, 
                                                        com::sun::star::io::XSeekable >
 {
 protected:
@@ -50,29 +50,29 @@ protected:
     void readIntoMemory()
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
 public:
-             EntryInputStream( com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xInput,
-                                const com::sun::star::packages::zip::ZipEntry &rNewEntry,
+             EntryInputStream( com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xInput, 
+                                const com::sun::star::packages::zip::ZipEntry &rNewEntry, 
                                const rtl::Reference < EncryptionData > &xEncryptData,
                                sal_Bool bGetRawStream = sal_False);
     virtual ~EntryInputStream();
 
     // XInputStream
-    virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
+    virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
+    virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL available(  )
+    virtual sal_Int32 SAL_CALL available(  ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL closeInput(  )
+    virtual void SAL_CALL closeInput(  ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
     // XSeekable
-    virtual void SAL_CALL seek( sal_Int64 location )
+    virtual void SAL_CALL seek( sal_Int64 location ) 
         throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual sal_Int64 SAL_CALL getPosition(  )
+    virtual sal_Int64 SAL_CALL getPosition(  ) 
         throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual sal_Int64 SAL_CALL getLength(  )
+    virtual sal_Int64 SAL_CALL getLength(  ) 
         throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
     /*
 private:
diff --git a/package/source/zipapi/Inflater.cxx b/package/source/zipapi/Inflater.cxx
index 26ba278cc9de..398742022138 100644
--- a/package/source/zipapi/Inflater.cxx
+++ b/package/source/zipapi/Inflater.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,24 +76,24 @@ Inflater::~Inflater()
     end();
 }
 
-void SAL_CALL Inflater::setInput( const Sequence< sal_Int8 >& rBuffer )
+void SAL_CALL Inflater::setInput( const Sequence< sal_Int8 >& rBuffer ) 
 {
     sInBuffer = rBuffer;
     nOffset = 0;
     nLength = rBuffer.getLength();
 }
 
-sal_Bool SAL_CALL Inflater::needsDictionary(  )
+sal_Bool SAL_CALL Inflater::needsDictionary(  ) 
 {
     return bNeedDict;
 }
 
-sal_Bool SAL_CALL Inflater::finished(  )
+sal_Bool SAL_CALL Inflater::finished(  ) 
 {
     return bFinished;
 }
 
-sal_Int32 SAL_CALL Inflater::doInflateSegment( Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength )
+sal_Int32 SAL_CALL Inflater::doInflateSegment( Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength ) 
 {
     if (nNewOffset < 0 || nNewLength < 0 || nNewOffset + nNewLength > rBuffer.getLength())
     {
@@ -102,7 +102,7 @@ sal_Int32 SAL_CALL Inflater::doInflateSegment( Sequence< sal_Int8 >& rBuffer, sa
     return doInflateBytes(rBuffer, nNewOffset, nNewLength);
 }
 
-void SAL_CALL Inflater::end(  )
+void SAL_CALL Inflater::end(  ) 
 {
     if (pStream != NULL)
     {
diff --git a/package/source/zipapi/MemoryByteGrabber.hxx b/package/source/zipapi/MemoryByteGrabber.hxx
index 5e167490d632..bc413490443f 100644
--- a/package/source/zipapi/MemoryByteGrabber.hxx
+++ b/package/source/zipapi/MemoryByteGrabber.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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/io/XSeekable.hpp>
 #include <string.h>
 
-class MemoryByteGrabber
+class MemoryByteGrabber 
 {
 protected:
     const com::sun::star::uno::Sequence < sal_Int8 > maBuffer;
@@ -42,8 +42,8 @@ public:
     MemoryByteGrabber ( const com::sun::star::uno::Sequence < sal_Int8 > & rBuffer )
     : maBuffer ( rBuffer )
     , mpBuffer ( rBuffer.getConstArray() )
-    , mnCurrent ( 0 )
-    , mnEnd ( rBuffer.getLength() )
+    , mnCurrent ( 0 ) 
+    , mnEnd ( rBuffer.getLength() ) 
     {
     }
     MemoryByteGrabber()
@@ -52,8 +52,8 @@ public:
     const sal_Int8 * getCurrentPos () { return mpBuffer + mnCurrent; }
 
     // XInputStream chained
-    sal_Int32 SAL_CALL readBytes( com::sun::star::uno::Sequence< sal_Int8 >& aData,
-                                            sal_Int32 nBytesToRead )
+    sal_Int32 SAL_CALL readBytes( com::sun::star::uno::Sequence< sal_Int8 >& aData, 
+                                            sal_Int32 nBytesToRead ) 
         throw(com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException)
     {
         if ( nBytesToRead < 0)
@@ -68,29 +68,29 @@ public:
         return nBytesToRead;
     }
 
-    sal_Int32 SAL_CALL readSomeBytes( com::sun::star::uno::Sequence< sal_Int8 >& aData,
-                                                    sal_Int32 nMaxBytesToRead )
+    sal_Int32 SAL_CALL readSomeBytes( com::sun::star::uno::Sequence< sal_Int8 >& aData, 
+                                                    sal_Int32 nMaxBytesToRead ) 
         throw(com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException)
     {
-        return readBytes( aData, nMaxBytesToRead );
+        return readBytes( aData, nMaxBytesToRead );	
     }
-    void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
+    void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) 
         throw(com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException)
     {
         mnCurrent += nBytesToSkip;
     }
-    sal_Int32 SAL_CALL available(  )
+    sal_Int32 SAL_CALL available(  ) 
         throw(com::sun::star::io::NotConnectedException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException)
     {
         return mnEnd - mnCurrent;
     }
-    void SAL_CALL closeInput(  )
+    void SAL_CALL closeInput(  ) 
         throw(com::sun::star::io::NotConnectedException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException)
     {
     }
 
     // XSeekable chained...
-    sal_Int64 SAL_CALL seek( sal_Int64 location )
+    sal_Int64 SAL_CALL seek( sal_Int64 location ) 
         throw(com::sun::star::lang::IllegalArgumentException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException)
     {
         if ( location < 0 || location > mnEnd )
@@ -98,7 +98,7 @@ public:
         mnCurrent = static_cast < sal_Int32 > ( location );
         return mnCurrent;
     }
-    sal_Int64 SAL_CALL getPosition(  )
+    sal_Int64 SAL_CALL getPosition(  ) 
             throw(com::sun::star::io::IOException, com::sun::star::uno::RuntimeException)
     {
         return mnCurrent;
diff --git a/package/source/zipapi/XMemoryStream.cxx b/package/source/zipapi/XMemoryStream.cxx
index 7003bf1b814b..8b737db6e2d2 100644
--- a/package/source/zipapi/XMemoryStream.cxx
+++ b/package/source/zipapi/XMemoryStream.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ XMemoryStream::XMemoryStream ( com::sun::star::uno::Sequence < sal_Int8 > & rNew
 XMemoryStream::~XMemoryStream(void)
 {
 }
-::com::sun::star::uno::Any SAL_CALL XMemoryStream::queryInterface( const com::sun::star::uno::Type& rType )
+::com::sun::star::uno::Any SAL_CALL XMemoryStream::queryInterface( const com::sun::star::uno::Type& rType ) 
         throw(com::sun::star::uno::RuntimeException)
 {
-    return ::cppu::queryInterface ( rType                                       ,
+    return ::cppu::queryInterface ( rType										,
                                     // OWeakObject interfaces
-                                    reinterpret_cast< XInterface*       > ( this )  ,
-                                    static_cast< XWeak*         > ( this )  ,
+                                    reinterpret_cast< XInterface*		> ( this )	,
+                                    static_cast< XWeak*			> ( this )	,
                                     // my interfaces
-                                    static_cast< XInputStream*      > ( this )  ,
-                                    static_cast< XSeekable*     > ( this ) );
+                                    static_cast< XInputStream*		> ( this )	,
+                                    static_cast< XSeekable*		> ( this ) );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/package/source/zipapi/XMemoryStream.hxx b/package/source/zipapi/XMemoryStream.hxx
index 935712abbe42..e6bc88e81797 100644
--- a/package/source/zipapi/XMemoryStream.hxx
+++ b/package/source/zipapi/XMemoryStream.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class XMemoryStream: public ZipPackageBuffer
 public:
     XMemoryStream ( com::sun::star::uno::Sequence < sal_Int8 > & rNewBuffer );
     virtual ~XMemoryStream(void);
-    virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& rType )
+    virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& rType ) 
         throw(com::sun::star::uno::RuntimeException);
 };
 #endif
diff --git a/package/source/zipapi/XUnbufferedStream.hxx b/package/source/zipapi/XUnbufferedStream.hxx
index 6da133e32ef4..6f9e0d572b3e 100644
--- a/package/source/zipapi/XUnbufferedStream.hxx
+++ b/package/source/zipapi/XUnbufferedStream.hxx
@@ -40,9 +40,9 @@
 #include <CRC32.hxx>
 #include <mutexholder.hxx>
 
-#define UNBUFF_STREAM_DATA          0
-#define UNBUFF_STREAM_RAW           1
-#define UNBUFF_STREAM_WRAPPEDRAW    2
+#define UNBUFF_STREAM_DATA			0
+#define UNBUFF_STREAM_RAW			1
+#define UNBUFF_STREAM_WRAPPEDRAW	2
 
 class EncryptionData;
 typedef void* rtlCipher;
diff --git a/package/source/zipapi/ZipEnumeration.cxx b/package/source/zipapi/ZipEnumeration.cxx
index 767aacc92a54..45ac260ea7e8 100644
--- a/package/source/zipapi/ZipEnumeration.cxx
+++ b/package/source/zipapi/ZipEnumeration.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index 005d29196fd6..7a1b5d964ba9 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -252,9 +252,9 @@ sal_Bool ZipFile::StaticFillData ( rtl::Reference < EncryptionData > & rData,
             sal_Int16 nSaltLength =   pBuffer[nPos++] & 0xFF;
             nSaltLength          |= ( pBuffer[nPos++] & 0xFF ) << 8;
             sal_Int16 nIVLength   = ( pBuffer[nPos++] & 0xFF );
-            nIVLength            |= ( pBuffer[nPos++] & 0xFF ) << 8;
+            nIVLength 			 |= ( pBuffer[nPos++] & 0xFF ) << 8;
             sal_Int16 nDigestLength = pBuffer[nPos++] & 0xFF;
-            nDigestLength        |= ( pBuffer[nPos++] & 0xFF ) << 8;
+            nDigestLength 	     |= ( pBuffer[nPos++] & 0xFF ) << 8;
 
             sal_Int16 nMediaTypeLength = pBuffer[nPos++] & 0xFF;
             nMediaTypeLength |= ( pBuffer[nPos++] & 0xFF ) << 8;
@@ -286,7 +286,7 @@ sal_Bool ZipFile::StaticFillData ( rtl::Reference < EncryptionData > & rData,
     return bOk;
 }
 
-Reference< XInputStream > ZipFile::StaticGetDataFromRawStream(  const Reference< XInputStream >& xStream,
+Reference< XInputStream > ZipFile::StaticGetDataFromRawStream(	const Reference< XInputStream >& xStream,
                                                                 const rtl::Reference < EncryptionData > &rData )
         throw ( packages::WrongPasswordException, ZipIOException, RuntimeException )
 {
diff --git a/package/source/zipapi/ZipOutputStream.cxx b/package/source/zipapi/ZipOutputStream.cxx
index 02b66bad182b..d4778a87b04b 100644
--- a/package/source/zipapi/ZipOutputStream.cxx
+++ b/package/source/zipapi/ZipOutputStream.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,18 +68,18 @@ ZipOutputStream::~ZipOutputStream( void )
         delete aZipList[i];
 }
 
-void SAL_CALL ZipOutputStream::setMethod( sal_Int32 nNewMethod )
+void SAL_CALL ZipOutputStream::setMethod( sal_Int32 nNewMethod ) 
     throw(RuntimeException)
 {
     nMethod = static_cast < sal_Int16 > (nNewMethod);
 }
-void SAL_CALL ZipOutputStream::setLevel( sal_Int32 nNewLevel )
+void SAL_CALL ZipOutputStream::setLevel( sal_Int32 nNewLevel ) 
     throw(RuntimeException)
 {
     aDeflater.setLevel( nNewLevel);
 }
 
-void SAL_CALL ZipOutputStream::putNextEntry( ZipEntry& rEntry,
+void SAL_CALL ZipOutputStream::putNextEntry( ZipEntry& rEntry, 
                         rtl::Reference < EncryptionData > &xEncryptData,
                         sal_Bool bEncrypt)
     throw(IOException, RuntimeException)
@@ -113,7 +113,7 @@ void SAL_CALL ZipOutputStream::putNextEntry( ZipEntry& rEntry,
     pCurrentEntry = &rEntry;
 }
 
-void SAL_CALL ZipOutputStream::closeEntry(  )
+void SAL_CALL ZipOutputStream::closeEntry(  ) 
     throw(IOException, RuntimeException)
 {
     ZipEntry *pEntry = pCurrentEntry;
@@ -170,7 +170,7 @@ void SAL_CALL ZipOutputStream::closeEntry(  )
             bEncryptCurrentEntry = sal_False;
             rtl_cipher_destroy ( aCipher );
             pCurrentEncryptData->aDigest.realloc ( RTL_DIGEST_LENGTH_SHA1 );
-            aDigestResult = rtl_digest_getSHA1 ( aDigest,
+            aDigestResult = rtl_digest_getSHA1 ( aDigest, 
                                                  reinterpret_cast < sal_uInt8 * > ( pCurrentEncryptData->aDigest.getArray() ),
                                                  RTL_DIGEST_LENGTH_SHA1 );
             OSL_ASSERT( aDigestResult == rtl_Digest_E_None );
@@ -180,7 +180,7 @@ void SAL_CALL ZipOutputStream::closeEntry(  )
     }
 }
 
-void SAL_CALL ZipOutputStream::write( const Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength )
+void SAL_CALL ZipOutputStream::write( const Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength ) 
     throw(IOException, RuntimeException)
 {
     switch (pCurrentEntry->nMethod)
@@ -204,14 +204,14 @@ void SAL_CALL ZipOutputStream::write( const Sequence< sal_Int8 >& rBuffer, sal_I
     }
 }
 
-void SAL_CALL ZipOutputStream::rawWrite( Sequence< sal_Int8 >& rBuffer, sal_Int32 /*nNewOffset*/, sal_Int32 nNewLength )
+void SAL_CALL ZipOutputStream::rawWrite( Sequence< sal_Int8 >& rBuffer, sal_Int32 /*nNewOffset*/, sal_Int32 nNewLength ) 
     throw(IOException, RuntimeException)
 {
     Sequence < sal_Int8 > aTmpBuffer ( rBuffer.getConstArray(), nNewLength );
     aChucker.WriteBytes( aTmpBuffer );
 }
 
-void SAL_CALL ZipOutputStream::rawCloseEntry(  )
+void SAL_CALL ZipOutputStream::rawCloseEntry(  ) 
     throw(IOException, RuntimeException)
 {
     if ( pCurrentEntry->nMethod == DEFLATED && ( pCurrentEntry->nFlag & 8 ) )
@@ -219,7 +219,7 @@ void SAL_CALL ZipOutputStream::rawCloseEntry(  )
     pCurrentEntry = NULL;
 }
 
-void SAL_CALL ZipOutputStream::finish(  )
+void SAL_CALL ZipOutputStream::finish(  ) 
     throw(IOException, RuntimeException)
 {
     if (bFinished)
@@ -295,7 +295,7 @@ void ZipOutputStream::writeCEN( const ZipEntry &rEntry )
         throw IOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unexpected character is used in file name." ) ), Reference< XInterface >() );
 
     ::rtl::OString sUTF8Name = ::rtl::OUStringToOString( rEntry.sPath, RTL_TEXTENCODING_UTF8 );
-    sal_Int16 nNameLength       = static_cast < sal_Int16 > ( sUTF8Name.getLength() );
+    sal_Int16 nNameLength 		= static_cast < sal_Int16 > ( sUTF8Name.getLength() );
 
     aChucker << CENSIG;
     aChucker << rEntry.nVersion;
@@ -344,7 +344,7 @@ sal_Int32 ZipOutputStream::writeLOC( const ZipEntry &rEntry )
         throw IOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unexpected character is used in file name." ) ), Reference< XInterface >() );
 
     ::rtl::OString sUTF8Name = ::rtl::OUStringToOString( rEntry.sPath, RTL_TEXTENCODING_UTF8 );
-    sal_Int16 nNameLength       = static_cast < sal_Int16 > ( sUTF8Name.getLength() );
+    sal_Int16 nNameLength 		= static_cast < sal_Int16 > ( sUTF8Name.getLength() );
 
     aChucker << LOCSIG;
     aChucker << rEntry.nVersion;
@@ -397,7 +397,7 @@ sal_uInt32 ZipOutputStream::getCurrentDosTime( )
         nYear-=1980;
     else if (nYear>80)
         nYear-=80;
-    sal_uInt32 nResult = static_cast < sal_uInt32>( ( ( ( aDateTime.Day) +
+    sal_uInt32 nResult = static_cast < sal_uInt32>( ( ( ( aDateTime.Day) + 
                                           ( 32 * (aDateTime.Month)) +
                                           ( 512 * nYear ) ) << 16) |
                                         ( ( aDateTime.Seconds/2) +
@@ -407,7 +407,7 @@ sal_uInt32 ZipOutputStream::getCurrentDosTime( )
 }
 /*
 
-   This is actually never used, so I removed it, but thought that the
+   This is actually never used, so I removed it, but thought that the 
    implementation details may be useful in the future...mtg 20010307
 
    I stopped using the time library and used the OSL version instead, but
diff --git a/package/source/zippackage/ContentInfo.hxx b/package/source/zippackage/ContentInfo.hxx
index baf5078147a2..65a8a0c7a240 100644
--- a/package/source/zippackage/ContentInfo.hxx
+++ b/package/source/zippackage/ContentInfo.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ public:
         ZipPackageFolder *pFolder;
         ZipPackageStream *pStream;
     };
-    ContentInfo ( ZipPackageStream * pNewStream )
+    ContentInfo ( ZipPackageStream * pNewStream ) 
     : xTunnel ( pNewStream )
     , bFolder ( false )
     , pStream ( pNewStream )
     {
     }
-    ContentInfo ( ZipPackageFolder * pNewFolder )
+    ContentInfo ( ZipPackageFolder * pNewFolder ) 
     : xTunnel ( pNewFolder )
     , bFolder ( true )
     , pFolder ( pNewFolder )
     {
     }
-    virtual ~ContentInfo ()
+    virtual ~ContentInfo () 
     {
         if ( bFolder )
             pFolder->releaseUpwardRef();
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index fbfb575d9dfb..89767c9acf5a 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -144,22 +144,22 @@ class ActiveDataStreamer : public ::cppu::WeakImplHelper1< XActiveDataStreamer >
     uno::Reference< XStream > mStream;
 public:
 
-    virtual uno::Reference< XStream > SAL_CALL getStream()
-            throw( RuntimeException )
+    virtual uno::Reference< XStream > SAL_CALL getStream() 
+            throw( RuntimeException ) 
             { return mStream; }
 
-    virtual void SAL_CALL setStream( const uno::Reference< XStream >& stream )
-            throw( RuntimeException )
+    virtual void SAL_CALL setStream( const uno::Reference< XStream >& stream ) 
+            throw( RuntimeException ) 
             { mStream = stream; }
 };
 
 class DummyInputStream : public ::cppu::WeakImplHelper1< XInputStream >
 {
-    virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >&, sal_Int32 )
+    virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >&, sal_Int32 ) 
             throw ( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
         { return 0; }
 
-    virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >&, sal_Int32 )
+    virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >&, sal_Int32 ) 
             throw ( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
         { return 0; }
 
@@ -227,7 +227,7 @@ void ZipPackage::parseManifest()
         if ( m_xRootFolder->hasByName( sMeta ) )
         {
             const OUString sManifest (RTL_CONSTASCII_USTRINGPARAM( "manifest.xml") );
-
+    
             try {
                 uno::Reference< XUnoTunnel > xTunnel;
                 Any aAny = m_xRootFolder->getByName( sMeta );
@@ -252,13 +252,13 @@ void ZipPackage::parseManifest()
                             const OUString sPropIterationCount ( RTL_CONSTASCII_USTRINGPARAM ( "IterationCount" ) );
                             const OUString sPropSize ( RTL_CONSTASCII_USTRINGPARAM ( "Size" ) );
                             const OUString sPropDigest ( RTL_CONSTASCII_USTRINGPARAM ( "Digest" ) );
-
+                            
                             Sequence < Sequence < PropertyValue > > aManifestSequence = xReader->readManifestSequence ( xSink->getInputStream() );
                             sal_Int32 nLength = aManifestSequence.getLength();
                             const Sequence < PropertyValue > *pSequence = aManifestSequence.getConstArray();
                             ZipPackageStream *pStream = NULL;
                             ZipPackageFolder *pFolder = NULL;
-
+            
                             for (sal_Int32 i = 0; i < nLength ; i++, pSequence++)
                             {
                                 OUString sPath, sMediaType, sVersion;
@@ -301,31 +301,31 @@ void ZipPackage::parseManifest()
                                         pStream = reinterpret_cast < ZipPackageStream* > ( xUnoTunnel->getSomething(ZipPackageStream::static_getImplementationId()));
                                         pStream->SetMediaType ( sMediaType );
                                         pStream->SetFromManifest( sal_True );
-
+            
                                         if (pSalt && pVector && pCount && pSize)
                                         {
                                             Sequence < sal_uInt8 > aSequence;
                                             sal_Int32 nCount = 0, nSize = 0;
                                                                            pStream->SetToBeEncrypted ( sal_True );
-
+            
                                             *pSalt >>= aSequence;
                                             pStream->setSalt ( aSequence );
-
+            
                                             *pVector >>= aSequence;
                                             pStream->setInitialisationVector ( aSequence );
-
+            
                                             *pCount >>= nCount;
                                             pStream->setIterationCount ( nCount );
-
+            
                                             *pSize >>= nSize;
                                             pStream->setSize ( nSize );
-
+            
                                             if ( pDigest )
                                             {
                                                 *pDigest >>= aSequence;
                                                 pStream->setDigest ( aSequence );
                                             }
-
+            
                                             pStream->SetToBeCompressed ( sal_True );
                                             pStream->SetToBeEncrypted ( sal_True );
                                             pStream->SetIsEncrypted ( sal_True );
@@ -344,7 +344,7 @@ void ZipPackage::parseManifest()
                         else
                             throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "No manifes parser!" ) ), uno::Reference< uno::XInterface >() );
                     }
-
+    
                     // now hide the manifest.xml file from user
                     xMetaInfFolder->removeByName( sManifest );
                 }
@@ -385,7 +385,7 @@ void ZipPackage::parseManifest()
                 }
             }
 
-
+                
             if ( !bManifestParsed )
             {
                 // the manifest.xml could not be successfuly parsed, this is an inconsistent package
@@ -468,7 +468,7 @@ void ZipPackage::parseContentType()
                             aPath = aContentTypeInfo[1][nInd].First.copy( 1 );
                         else
                             aPath = aContentTypeInfo[1][nInd].First;
-
+                            
                         if ( aPath.getLength() && hasByHierarchicalName( aPath ) )
                         {
                             uno::Any aIterAny = getByHierarchicalName( aPath );
@@ -533,7 +533,7 @@ void ZipPackage::getZipFileContents()
             while ( (nIndex = rName.indexOf('/', nOldIndex) ) != -1 )
             {
                 sTemp = rName.copy ( nOldIndex, nIndex - nOldIndex );
-                if (nIndex == nOldIndex)
+                if (nIndex == nOldIndex) 
                     break;
                 if ( !pCurrent->hasByName( sTemp ) )
                 {
@@ -544,7 +544,7 @@ void ZipPackage::getZipFileContents()
                 }
                 else
                     pCurrent = pCurrent->doGetByName(sTemp).pFolder;
-                nOldIndex = nIndex+1;
+                nOldIndex = nIndex+1; 
             }
             if ( nStreamIndex != -1 && sDirName.getLength() )
                 m_aRecent [ sDirName ] = pCurrent;
@@ -558,7 +558,7 @@ void ZipPackage::getZipFileContents()
             pPkgStream->setZipEntryOnLoading( rEntry );
             pPkgStream->setName( sTemp );
             pPkgStream->doSetParent( pCurrent, sal_True );
-        }
+        } 
     }
 
     if ( m_nFormat == embed::StorageFormats::PACKAGE )
@@ -568,10 +568,10 @@ void ZipPackage::getZipFileContents()
 }
 
 // XInitialization
-void SAL_CALL ZipPackage::initialize( const Sequence< Any >& aArguments )
+void SAL_CALL ZipPackage::initialize( const Sequence< Any >& aArguments ) 
         throw(Exception, RuntimeException)
 {
-    RTL_LOGFILE_TRACE_AUTHOR ( "package", LOGFILE_AUTHOR, "{ ZipPackage::initialize" );
+    RTL_LOGFILE_TRACE_AUTHOR ( "package", LOGFILE_AUTHOR, "{ ZipPackage::initialize" );	
     sal_Bool bBadZipFile = sal_False, bHaveZipFile = sal_True;
     uno::Reference< XProgressHandler > xProgressHandler;
     beans::NamedValue aNamedValue;
@@ -618,7 +618,7 @@ void SAL_CALL ZipPackage::initialize( const Sequence< Any >& aArguments )
                     }
                     else
                         m_aURL = aParamUrl;
-
+                        
                     Content aContent ( m_aURL, uno::Reference < XCommandEnvironment >() );
                     Any aAny = aContent.getPropertyValue( OUString::createFromAscii( "Size" ) );
                     sal_uInt64 aSize = 0;
@@ -637,7 +637,7 @@ void SAL_CALL ZipPackage::initialize( const Sequence< Any >& aArguments )
                 catch (com::sun::star::uno::Exception&)
                 {
                     // Exception derived from uno::Exception thrown. This probably
-                    // means the file doesn't exist...we'll create it at
+                    // means the file doesn't exist...we'll create it at 
                     // commitChanges time
                     bHaveZipFile = sal_False;
                 }
@@ -734,7 +734,7 @@ void SAL_CALL ZipPackage::initialize( const Sequence< Any >& aArguments )
         catch (com::sun::star::uno::Exception&)
         {
             // Exception derived from uno::Exception thrown. This probably
-            // means the file doesn't exist...we'll create it at
+            // means the file doesn't exist...we'll create it at 
             // commitChanges time
             bHaveZipFile = sal_False;
         }
@@ -742,7 +742,7 @@ void SAL_CALL ZipPackage::initialize( const Sequence< Any >& aArguments )
         {
             try
             {
-                m_pZipFile = new ZipFile ( m_xContentStream, m_xFactory, sal_True, m_bForceRecovery, xProgressHandler );
+                m_pZipFile = new ZipFile ( m_xContentStream, m_xFactory, sal_True, m_bForceRecovery, xProgressHandler );	
                 getZipFileContents();
             }
             catch ( IOException & )
@@ -758,7 +758,7 @@ void SAL_CALL ZipPackage::initialize( const Sequence< Any >& aArguments )
                 if( m_pZipFile ) { delete m_pZipFile; m_pZipFile = NULL; }
                 throw;
             }
-
+                
             if ( bBadZipFile )
             {
                 // clean up the memory, and tell the UCB about the error
@@ -771,19 +771,19 @@ void SAL_CALL ZipPackage::initialize( const Sequence< Any >& aArguments )
         }
     }
 
-    RTL_LOGFILE_TRACE_AUTHOR ( "package", LOGFILE_AUTHOR, "} ZipPackage::initialize" );
+    RTL_LOGFILE_TRACE_AUTHOR ( "package", LOGFILE_AUTHOR, "} ZipPackage::initialize" );	
 }
 
-Any SAL_CALL ZipPackage::getByHierarchicalName( const OUString& aName )
+Any SAL_CALL ZipPackage::getByHierarchicalName( const OUString& aName ) 
         throw(NoSuchElementException, RuntimeException)
 {
-    OUString sTemp, sDirName;
+    OUString sTemp, sDirName; 
     sal_Int32 nOldIndex, nIndex, nStreamIndex;
     FolderHash::iterator aIter;
 
     if ( (nIndex = aName.getLength() ) == 1 && *aName.getStr() == '/' )
         return makeAny ( uno::Reference < XUnoTunnel > (m_pRootFolder) );
-    else
+    else 
     {
         nStreamIndex = aName.lastIndexOf ( '/' );
         bool bFolder = nStreamIndex == nIndex-1;
@@ -832,7 +832,7 @@ Any SAL_CALL ZipPackage::getByHierarchicalName( const OUString& aName )
             }
             else
                 throw NoSuchElementException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
-            nOldIndex = nIndex+1;
+            nOldIndex = nIndex+1; 
         }
         if ( bFolder )
         {
@@ -855,16 +855,16 @@ Any SAL_CALL ZipPackage::getByHierarchicalName( const OUString& aName )
     }
 }
 
-sal_Bool SAL_CALL ZipPackage::hasByHierarchicalName( const OUString& aName )
+sal_Bool SAL_CALL ZipPackage::hasByHierarchicalName( const OUString& aName ) 
         throw(RuntimeException)
 {
-    OUString sTemp, sDirName;
+    OUString sTemp, sDirName; 
     sal_Int32 nOldIndex, nIndex, nStreamIndex;
     FolderHash::iterator aIter;
 
     if ( (nIndex = aName.getLength() ) == 1 && *aName.getStr() == '/' )
         return sal_True;
-    else
+    else 
     {
         nStreamIndex = aName.lastIndexOf ( '/' );
         bool bFolder = nStreamIndex == nIndex-1;
@@ -913,7 +913,7 @@ sal_Bool SAL_CALL ZipPackage::hasByHierarchicalName( const OUString& aName )
             }
             else
                 return sal_False;
-            nOldIndex = nIndex+1;
+            nOldIndex = nIndex+1; 
         }
         if ( bFolder )
         {
@@ -935,13 +935,13 @@ sal_Bool SAL_CALL ZipPackage::hasByHierarchicalName( const OUString& aName )
 }
 
 // XSingleServiceFactory
-uno::Reference< XInterface > SAL_CALL ZipPackage::createInstance(  )
+uno::Reference< XInterface > SAL_CALL ZipPackage::createInstance(  ) 
         throw(Exception, RuntimeException)
 {
     uno::Reference < XInterface > xRef = *(new ZipPackageStream ( *this, m_xFactory, m_bAllowRemoveOnInsert ));
     return xRef;
 }
-uno::Reference< XInterface > SAL_CALL ZipPackage::createInstanceWithArguments( const Sequence< Any >& aArguments )
+uno::Reference< XInterface > SAL_CALL ZipPackage::createInstanceWithArguments( const Sequence< Any >& aArguments ) 
         throw(Exception, RuntimeException)
 {
     sal_Bool bArg = sal_False;
@@ -968,7 +968,7 @@ void ZipPackage::WriteMimetypeMagicFile( ZipOutputStream& aZipOut )
     Sequence< sal_Int8 > aType( (sal_Int8*)sMediaType.getStr(),
                                 nBufferLength );
 
-
+    
     pEntry->sPath = sMime;
     pEntry->nMethod = STORED;
     pEntry->nSize = pEntry->nCompressedSize = nBufferLength;
@@ -988,9 +988,9 @@ void ZipPackage::WriteMimetypeMagicFile( ZipOutputStream& aZipOut )
     catch ( ::com::sun::star::io::IOException & r )
     {
         OSL_ENSURE( 0, "Error adding mimetype to the ZipOutputStream" );
-        throw WrappedTargetException(
+        throw WrappedTargetException( 
                 OUString( RTL_CONSTASCII_USTRINGPARAM ( OSL_LOG_PREFIX "Error adding mimetype to the ZipOutputStream!" ) ),
-                static_cast < OWeakObject * > ( this ),
+                static_cast < OWeakObject * > ( this ), 
                 makeAny( r ) );
     }
 }
@@ -1034,9 +1034,9 @@ void ZipPackage::WriteManifest( ZipOutputStream& aZipOut, const vector< Sequence
     {
                 OSL_ENSURE ( 0, "Couldn't get a ManifestWriter!" );
         IOException aException;
-        throw WrappedTargetException(
+        throw WrappedTargetException( 
                 OUString( RTL_CONSTASCII_USTRINGPARAM ( OSL_LOG_PREFIX "Couldn't get a ManifestWriter!" ) ),
-                static_cast < OWeakObject * > ( this ),
+                static_cast < OWeakObject * > ( this ), 
                 makeAny( aException ) );
     }
 }
@@ -1099,12 +1099,12 @@ void ZipPackage::ConnectTo( const uno::Reference< io::XInputStream >& xInStream
     m_xContentSeek.set( xInStream, uno::UNO_QUERY_THROW );
     m_xContentStream = xInStream;
 
-    // seek back to the beginning of the temp file so we can read segments from it
+    // seek back to the beginning of the temp file so we can read segments from it 
     m_xContentSeek->seek( 0 );
     if ( m_pZipFile )
         m_pZipFile->setInputStream( m_xContentStream );
     else
-        m_pZipFile = new ZipFile ( m_xContentStream, m_xFactory, sal_False );
+        m_pZipFile = new ZipFile ( m_xContentStream, m_xFactory, sal_False );    
 }
 
 uno::Reference< io::XInputStream > ZipPackage::writeTempFile()
@@ -1113,7 +1113,7 @@ uno::Reference< io::XInputStream > ZipPackage::writeTempFile()
     // write directly to it otherwize create a temporary file to write to.
     // If a temporary file is created it is returned back by the method.
     // If the data written directly, xComponentStream will be switched here
-
+    
     sal_Bool bUseTemp = sal_True;
     uno::Reference < io::XInputStream > xResult;
     uno::Reference < io::XInputStream > xTempIn;
@@ -1142,7 +1142,7 @@ uno::Reference< io::XInputStream > ZipPackage::writeTempFile()
         if( xTempOut.is() )
             bUseTemp = sal_False;
     }
-
+    
     if( bUseTemp )
     {
         // create temporary file
@@ -1151,7 +1151,7 @@ uno::Reference< io::XInputStream > ZipPackage::writeTempFile()
         xTempOut.set( xTempFile->getOutputStream(), UNO_SET_THROW );
         xTempIn.set( xTempFile->getInputStream(), UNO_SET_THROW );
     }
-
+    
     // Hand it to the ZipOutputStream:
     ZipOutputStream aZipOut ( xTempOut );
     aZipOut.setMethod(DEFLATED);
@@ -1162,14 +1162,14 @@ uno::Reference< io::XInputStream > ZipPackage::writeTempFile()
         if ( m_nFormat == embed::StorageFormats::PACKAGE )
         {
             // Remove the old manifest.xml file as the
-            // manifest will be re-generated and the
+            // manifest will be re-generated and the 
             // META-INF directory implicitly created if does not exist
             const OUString sMeta ( RTL_CONSTASCII_USTRINGPARAM ( "META-INF" ) );
 
             if ( m_xRootFolder->hasByName( sMeta ) )
             {
                 const OUString sManifest (RTL_CONSTASCII_USTRINGPARAM( "manifest.xml") );
-
+    
                 uno::Reference< XUnoTunnel > xTunnel;
                 Any aAny = m_xRootFolder->getByName( sMeta );
                 aAny >>= xTunnel;
@@ -1218,13 +1218,13 @@ uno::Reference< io::XInputStream > ZipPackage::writeTempFile()
         TimeValue aTime;
         osl_getSystemTime( &aTime );
         rtlRandomPool aRandomPool = rtl_random_createPool ();
-        rtl_random_addBytes ( aRandomPool, &aTime, 8 );
-
+        rtl_random_addBytes ( aRandomPool, &aTime, 8 ); 
 
+    
         // call saveContents (it will recursively save sub-directories
         OUString aEmptyString;
         m_pRootFolder->saveContents( aEmptyString, aManList, aZipOut, m_aEncryptionKey, aRandomPool );
-
+    
         // Clean up random pool memory
         rtl_random_destroyPool ( aRandomPool );
 
@@ -1238,7 +1238,7 @@ uno::Reference< io::XInputStream > ZipPackage::writeTempFile()
         }
 
         aZipOut.finish();
-
+    
         if( bUseTemp )
             xResult = xTempIn;
 
@@ -1303,7 +1303,7 @@ uno::Reference< XActiveDataStreamer > ZipPackage::openOriginalForOutput()
     Content aOriginalContent (m_aURL, uno::Reference < XCommandEnvironment >() );
     uno::Reference< XActiveDataStreamer > xSink = new ActiveDataStreamer;
 
-    if ( m_eMode == e_IMode_URL )
+    if ( m_eMode == e_IMode_URL ) 
     {
         try
         {
@@ -1331,11 +1331,11 @@ uno::Reference< XActiveDataStreamer > ZipPackage::openOriginalForOutput()
             }
 
             OpenCommandArgument2 aArg;
-               aArg.Mode        = OpenMode::DOCUMENT;
-               aArg.Priority    = 0; // unused
+               aArg.Mode		= OpenMode::DOCUMENT;
+               aArg.Priority	= 0; // unused
                aArg.Sink       = xSink;
                aArg.Properties = Sequence< Property >( 0 ); // unused
-
+    
             aOriginalContent.executeCommand( OUString::createFromAscii( "open" ), makeAny( aArg ) );
         }
         catch( Exception& )
@@ -1349,7 +1349,7 @@ uno::Reference< XActiveDataStreamer > ZipPackage::openOriginalForOutput()
 }
 
 // XChangesBatch
-void SAL_CALL ZipPackage::commitChanges()
+void SAL_CALL ZipPackage::commitChanges() 
         throw(WrappedTargetException, RuntimeException)
 {
     // lock the component for the time of commiting
@@ -1362,7 +1362,7 @@ void SAL_CALL ZipPackage::commitChanges()
                 static_cast < OWeakObject * > ( this ), makeAny ( aException ) );
     }
 
-    RTL_LOGFILE_TRACE_AUTHOR ( "package", LOGFILE_AUTHOR, "{ ZipPackage::commitChanges" );
+    RTL_LOGFILE_TRACE_AUTHOR ( "package", LOGFILE_AUTHOR, "{ ZipPackage::commitChanges" );    
 
     // first the writeTempFile is called, if it returns a stream the stream should be written to the target
     // if no stream was returned, the file was written directly, nothing should be done
@@ -1430,7 +1430,7 @@ void SAL_CALL ZipPackage::commitChanges()
         {
             uno::Reference< XOutputStream > aOrigFileStream;
             sal_Bool bCanBeCorrupted = sal_False;
-
+    
             if( isLocalFile_Impl( m_aURL ) )
             {
                 // write directly in case of local file
@@ -1471,7 +1471,7 @@ void SAL_CALL ZipPackage::commitChanges()
                     }
                 }
             }
-
+    
             if( !aOrigFileStream.is() )
             {
                 try
@@ -1483,11 +1483,11 @@ void SAL_CALL ZipPackage::commitChanges()
 
                     OUString sTargetFolder = m_aURL.copy ( 0, m_aURL.lastIndexOf ( static_cast < sal_Unicode > ( '/' ) ) );
                     Content aContent ( sTargetFolder, uno::Reference < XCommandEnvironment > () );
-
+    
                     OUString sTempURL;
                     Any aAny = xPropSet->getPropertyValue ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Uri" ) ) );
                     aAny >>= sTempURL;
-
+    
                     TransferInfo aInfo;
                     aInfo.NameClash = NameClash::OVERWRITE;
                     aInfo.MoveData = sal_False;
@@ -1517,7 +1517,7 @@ void SAL_CALL ZipPackage::commitChanges()
     // after successful storing it can be set to false
     m_bMediaTypeFallbackUsed = sal_False;
 
-    RTL_LOGFILE_TRACE_AUTHOR ( "package", LOGFILE_AUTHOR, "} ZipPackage::commitChanges" );
+    RTL_LOGFILE_TRACE_AUTHOR ( "package", LOGFILE_AUTHOR, "} ZipPackage::commitChanges" );    
 }
 
 void ZipPackage::DisconnectFromTargetAndThrowException_Impl( const uno::Reference< io::XInputStream >& xTempStream )
@@ -1548,12 +1548,12 @@ void ZipPackage::DisconnectFromTargetAndThrowException_Impl( const uno::Referenc
                                     makeAny ( aException ) );
 }
 
-sal_Bool SAL_CALL ZipPackage::hasPendingChanges(  )
+sal_Bool SAL_CALL ZipPackage::hasPendingChanges(  ) 
         throw(RuntimeException)
 {
     return sal_False;
 }
-Sequence< ElementChange > SAL_CALL ZipPackage::getPendingChanges(  )
+Sequence< ElementChange > SAL_CALL ZipPackage::getPendingChanges(  ) 
         throw(RuntimeException)
 {
     return Sequence < ElementChange > ();
@@ -1612,27 +1612,27 @@ uno::Reference < XSingleServiceFactory > ZipPackage::createServiceFactory( uno::
 namespace { struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {}; }
 
 // XUnoTunnel
-Sequence< sal_Int8 > ZipPackage::getUnoTunnelImplementationId( void )
+Sequence< sal_Int8 > ZipPackage::getUnoTunnelImplementationId( void ) 
     throw (RuntimeException)
 {
     ::cppu::OImplementationId &rId = lcl_ImplId::get();
     return rId.getImplementationId();
 }
 
-sal_Int64 SAL_CALL ZipPackage::getSomething( const Sequence< sal_Int8 >& aIdentifier )
+sal_Int64 SAL_CALL ZipPackage::getSomething( const Sequence< sal_Int8 >& aIdentifier ) 
     throw(RuntimeException)
-{
+{																
     if (aIdentifier.getLength() == 16 && 0 == rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(),  aIdentifier.getConstArray(), 16 ) )
         return reinterpret_cast < sal_Int64 > ( this );
     return 0;
 }
 
-uno::Reference< XPropertySetInfo > SAL_CALL ZipPackage::getPropertySetInfo(  )
+uno::Reference< XPropertySetInfo > SAL_CALL ZipPackage::getPropertySetInfo(  ) 
         throw(RuntimeException)
 {
     return uno::Reference < XPropertySetInfo > ();
 }
-void SAL_CALL ZipPackage::setPropertyValue( const OUString& aPropertyName, const Any& aValue )
+void SAL_CALL ZipPackage::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) 
         throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
     if ( m_nFormat != embed::StorageFormats::PACKAGE )
@@ -1656,12 +1656,12 @@ void SAL_CALL ZipPackage::setPropertyValue( const OUString& aPropertyName, const
     else
         throw UnknownPropertyException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
 }
-Any SAL_CALL ZipPackage::getPropertyValue( const OUString& PropertyName )
+Any SAL_CALL ZipPackage::getPropertyValue( const OUString& PropertyName ) 
         throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     // TODO/LATER: Activate the check when zip-ucp is ready
     // if ( m_nFormat != embed::StorageFormats::PACKAGE )
-    //  throw UnknownPropertyException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
+    //	throw UnknownPropertyException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
 
     Any aAny;
     if (PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "EncryptionKey" ) ) )
@@ -1696,19 +1696,19 @@ Any SAL_CALL ZipPackage::getPropertyValue( const OUString& PropertyName )
     }
     throw UnknownPropertyException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
 }
-void SAL_CALL ZipPackage::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*xListener*/ )
+void SAL_CALL ZipPackage::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*xListener*/ ) 
         throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
 }
-void SAL_CALL ZipPackage::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*aListener*/ )
+void SAL_CALL ZipPackage::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*aListener*/ ) 
         throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
 }
-void SAL_CALL ZipPackage::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< XVetoableChangeListener >& /*aListener*/ )
+void SAL_CALL ZipPackage::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< XVetoableChangeListener >& /*aListener*/ ) 
         throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
 }
-void SAL_CALL ZipPackage::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< XVetoableChangeListener >& /*aListener*/ )
+void SAL_CALL ZipPackage::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< XVetoableChangeListener >& /*aListener*/ ) 
         throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
 }
diff --git a/package/source/zippackage/ZipPackageBuffer.cxx b/package/source/zippackage/ZipPackageBuffer.cxx
index d6a20eb0b96c..2fbbd01e234c 100644
--- a/package/source/zippackage/ZipPackageBuffer.cxx
+++ b/package/source/zippackage/ZipPackageBuffer.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ ZipPackageBuffer::ZipPackageBuffer(sal_Int64 nNewBufferSize )
 , m_bMustInitBuffer ( sal_True )
 {
 }
-ZipPackageBuffer::~ZipPackageBuffer(void)
+ZipPackageBuffer::~ZipPackageBuffer(void) 
 {
 }
 
-sal_Int32 SAL_CALL ZipPackageBuffer::readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
+sal_Int32 SAL_CALL ZipPackageBuffer::readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) 
         throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
 {
     if (nBytesToRead < 0)
@@ -62,12 +62,12 @@ sal_Int32 SAL_CALL ZipPackageBuffer::readBytes( Sequence< sal_Int8 >& aData, sal
     return nBytesToRead;
 }
 
-sal_Int32 SAL_CALL ZipPackageBuffer::readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
+sal_Int32 SAL_CALL ZipPackageBuffer::readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) 
         throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
 {
     return readBytes(aData, nMaxBytesToRead);
 }
-void SAL_CALL ZipPackageBuffer::skipBytes( sal_Int32 nBytesToSkip )
+void SAL_CALL ZipPackageBuffer::skipBytes( sal_Int32 nBytesToSkip ) 
         throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
 {
     if (nBytesToSkip < 0)
@@ -78,16 +78,16 @@ void SAL_CALL ZipPackageBuffer::skipBytes( sal_Int32 nBytesToSkip )
 
     m_nCurrent+=nBytesToSkip;
 }
-sal_Int32 SAL_CALL ZipPackageBuffer::available(  )
+sal_Int32 SAL_CALL ZipPackageBuffer::available(  ) 
         throw(NotConnectedException, IOException, RuntimeException)
 {
     return static_cast < sal_Int32 > (m_nEnd - m_nCurrent);
 }
-void SAL_CALL ZipPackageBuffer::closeInput(  )
+void SAL_CALL ZipPackageBuffer::closeInput(  ) 
         throw(NotConnectedException, IOException, RuntimeException)
 {
 }
-void SAL_CALL ZipPackageBuffer::writeBytes( const Sequence< sal_Int8 >& aData )
+void SAL_CALL ZipPackageBuffer::writeBytes( const Sequence< sal_Int8 >& aData ) 
         throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
 {
     sal_Int64 nDataLen = aData.getLength(), nCombined = m_nEnd + nDataLen;
@@ -110,27 +110,27 @@ void SAL_CALL ZipPackageBuffer::writeBytes( const Sequence< sal_Int8 >& aData )
     if (m_nCurrent>m_nEnd)
         m_nEnd = m_nCurrent;
 }
-void SAL_CALL ZipPackageBuffer::flush(  )
+void SAL_CALL ZipPackageBuffer::flush(  ) 
         throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
 {
 }
-void SAL_CALL ZipPackageBuffer::closeOutput(  )
+void SAL_CALL ZipPackageBuffer::closeOutput(  ) 
         throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
 {
 }
-void SAL_CALL ZipPackageBuffer::seek( sal_Int64 location )
+void SAL_CALL ZipPackageBuffer::seek( sal_Int64 location ) 
         throw( IllegalArgumentException, IOException, RuntimeException)
 {
     if ( location > m_nEnd || location < 0 )
         throw IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 1 );
     m_nCurrent = location;
 }
-sal_Int64 SAL_CALL ZipPackageBuffer::getPosition(  )
+sal_Int64 SAL_CALL ZipPackageBuffer::getPosition(  ) 
         throw(IOException, RuntimeException)
 {
     return m_nCurrent;
 }
-sal_Int64 SAL_CALL ZipPackageBuffer::getLength(  )
+sal_Int64 SAL_CALL ZipPackageBuffer::getLength(  ) 
         throw(IOException, RuntimeException)
 {
     return m_nEnd;
diff --git a/package/source/zippackage/ZipPackageEntry.cxx b/package/source/zippackage/ZipPackageEntry.cxx
index df789850189f..6d764133e463 100644
--- a/package/source/zippackage/ZipPackageEntry.cxx
+++ b/package/source/zippackage/ZipPackageEntry.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,12 +61,12 @@ ZipPackageEntry::~ZipPackageEntry()
 }
 
 // XChild
-OUString SAL_CALL ZipPackageEntry::getName(  )
+OUString SAL_CALL ZipPackageEntry::getName(  ) 
     throw(RuntimeException)
 {
     return msName;
 }
-void SAL_CALL ZipPackageEntry::setName( const OUString& aName )
+void SAL_CALL ZipPackageEntry::setName( const OUString& aName ) 
     throw(RuntimeException)
 {
     if ( pParent && msName.getLength() && pParent->hasByName ( msName ) )
@@ -82,7 +82,7 @@ void SAL_CALL ZipPackageEntry::setName( const OUString& aName )
     if ( pParent )
         pParent->doInsertByName ( this, sal_False );
 }
-Reference< XInterface > SAL_CALL ZipPackageEntry::getParent(  )
+Reference< XInterface > SAL_CALL ZipPackageEntry::getParent(  ) 
         throw(RuntimeException)
 {
     // return Reference< XInterface >( xParent, UNO_QUERY );
@@ -97,7 +97,7 @@ void ZipPackageEntry::doSetParent ( ZipPackageFolder * pNewParent, sal_Bool bIns
         pNewParent->doInsertByName ( this, sal_False );
 }
 
-void SAL_CALL ZipPackageEntry::setParent( const Reference< XInterface >& xNewParent )
+void SAL_CALL ZipPackageEntry::setParent( const Reference< XInterface >& xNewParent ) 
         throw(NoSupportException, RuntimeException)
 {
     sal_Int64 nTest(0);
@@ -115,24 +115,24 @@ void SAL_CALL ZipPackageEntry::setParent( const Reference< XInterface >& xNewPar
     }
 }
     //XPropertySet
-Reference< beans::XPropertySetInfo > SAL_CALL ZipPackageEntry::getPropertySetInfo(  )
+Reference< beans::XPropertySetInfo > SAL_CALL ZipPackageEntry::getPropertySetInfo(  ) 
         throw(RuntimeException)
 {
     return Reference < beans::XPropertySetInfo > ();
 }
-void SAL_CALL ZipPackageEntry::addPropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< beans::XPropertyChangeListener >& /*xListener*/ )
+void SAL_CALL ZipPackageEntry::addPropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< beans::XPropertyChangeListener >& /*xListener*/ ) 
         throw(beans::UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
 }
-void SAL_CALL ZipPackageEntry::removePropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< beans::XPropertyChangeListener >& /*aListener*/ )
+void SAL_CALL ZipPackageEntry::removePropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< beans::XPropertyChangeListener >& /*aListener*/ ) 
         throw(beans::UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
 }
-void SAL_CALL ZipPackageEntry::addVetoableChangeListener( const OUString& /*PropertyName*/, const Reference< beans::XVetoableChangeListener >& /*aListener*/ )
+void SAL_CALL ZipPackageEntry::addVetoableChangeListener( const OUString& /*PropertyName*/, const Reference< beans::XVetoableChangeListener >& /*aListener*/ ) 
         throw(beans::UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
 }
-void SAL_CALL ZipPackageEntry::removeVetoableChangeListener( const OUString& /*PropertyName*/, const Reference< beans::XVetoableChangeListener >& /*aListener*/ )
+void SAL_CALL ZipPackageEntry::removeVetoableChangeListener( const OUString& /*PropertyName*/, const Reference< beans::XVetoableChangeListener >& /*aListener*/ ) 
         throw(beans::UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
 }
diff --git a/package/source/zippackage/ZipPackageEntry.hxx b/package/source/zippackage/ZipPackageEntry.hxx
index 6ae623a50664..eef9dd9ae461 100644
--- a/package/source/zippackage/ZipPackageEntry.hxx
+++ b/package/source/zippackage/ZipPackageEntry.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 class ZipPackageFolder;
 
-class ZipPackageEntry : public cppu::WeakImplHelper5
+class ZipPackageEntry : public cppu::WeakImplHelper5 
 <
     com::sun::star::container::XNamed,
     com::sun::star::container::XChild,
@@ -53,7 +53,7 @@ protected:
     bool mbIsFolder:1;
     bool mbAllowRemoveOnInsert:1;
     // com::sun::star::uno::Reference < com::sun::star::container::XNameContainer > xParent;
-    ::rtl::OUString     sMediaType;
+    ::rtl::OUString		sMediaType;
     ZipPackageFolder * pParent;
 public:
     ZipEntry aEntry;
@@ -73,32 +73,32 @@ public:
         pParent = NULL;
     }
     // XNamed
-    virtual ::rtl::OUString SAL_CALL getName(  )
+    virtual ::rtl::OUString SAL_CALL getName(  ) 
         throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setName( const ::rtl::OUString& aName )
+    virtual void SAL_CALL setName( const ::rtl::OUString& aName ) 
         throw(::com::sun::star::uno::RuntimeException);
     // XChild
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent(  )
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent(  ) 
         throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent )
+    virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) 
         throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException);
     // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier )
+    virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) 
         throw(::com::sun::star::uno::RuntimeException) = 0;
     // XPropertySet
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  )
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) 
         throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
+    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) 
         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) = 0;
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName )
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) 
         throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) = 0;
-    virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener )
+    virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) 
         throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener )
+    virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) 
         throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+    virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) 
         throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+    virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) 
         throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 };
 #endif
diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx
index 011bd65990d9..cdff1b23010e 100644
--- a/package/source/zippackage/ZipPackageFolder.cxx
+++ b/package/source/zippackage/ZipPackageFolder.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 { struct lcl_CachedImplId : public rtl::Static< Sequence < sal_Int8 >,
 
 ZipPackageFolder::ZipPackageFolder ( const Reference< XMultiServiceFactory >& xFactory,
                                      sal_Int32 nFormat,
-                                     sal_Bool bAllowRemoveOnInsert )
+                                     sal_Bool bAllowRemoveOnInsert ) 
 : m_xFactory( xFactory )
 , m_nFormat( nFormat )
 {
@@ -74,14 +74,14 @@ ZipPackageFolder::ZipPackageFolder ( const Reference< XMultiServiceFactory >& xF
     this->mbAllowRemoveOnInsert = bAllowRemoveOnInsert;
 
     SetFolder ( sal_True );
-    aEntry.nVersion     = -1;
-    aEntry.nFlag        = 0;
-    aEntry.nMethod      = STORED;
-    aEntry.nTime        = -1;
-    aEntry.nCrc         = 0;
-    aEntry.nCompressedSize  = 0;
-    aEntry.nSize        = 0;
-    aEntry.nOffset      = -1;
+    aEntry.nVersion		= -1;
+    aEntry.nFlag		= 0;
+    aEntry.nMethod		= STORED;
+    aEntry.nTime		= -1;
+    aEntry.nCrc			= 0;
+    aEntry.nCompressedSize	= 0;
+    aEntry.nSize		= 0;
+    aEntry.nOffset		= -1;
     Sequence < sal_Int8 > &rCachedImplId = lcl_CachedImplId::get();
     if ( !rCachedImplId.getLength() )
         rCachedImplId = getImplementationId();
@@ -97,9 +97,9 @@ sal_Bool ZipPackageFolder::LookForUnexpectedODF12Streams( const ::rtl::OUString&
     sal_Bool bHasUnexpected = sal_False;
 
     for ( ContentHash::const_iterator aCI = maContents.begin(), aEnd = maContents.end();
-          !bHasUnexpected && aCI != aEnd;
+          !bHasUnexpected && aCI != aEnd; 
           aCI++)
-    {
+    { 
         const OUString &rShortName = (*aCI).first;
         const ContentInfo &rInfo = *(*aCI).second;
 
@@ -120,7 +120,7 @@ sal_Bool ZipPackageFolder::LookForUnexpectedODF12Streams( const ::rtl::OUString&
         {
             if ( aPath.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "META-INF/" ) ) ) )
             {
-                if ( !rShortName.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "manifest.xml" ) ) )
+                if ( !rShortName.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "manifest.xml" ) ) ) 
                   && rShortName.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "signatures" ) ) ) == -1 )
                 {
                     // a stream from META-INF with unexpected name
@@ -136,7 +136,7 @@ sal_Bool ZipPackageFolder::LookForUnexpectedODF12Streams( const ::rtl::OUString&
                 if ( aPath.getLength()
                   || !rShortName.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "mimetype" ) ) ) )
                 {
-                    // if it is not "mimetype" from the root it is not a part of the package
+                    // if it is not "mimetype" from the root it is not a part of the package 
                     bHasUnexpected = sal_True;
                 }
             }
@@ -155,9 +155,9 @@ void ZipPackageFolder::setChildStreamsTypeByExtension( const beans::StringPair&
         aExt = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "." ) ) + aPair.First;
 
     for ( ContentHash::const_iterator aCI = maContents.begin(), aEnd = maContents.end();
-          aCI != aEnd;
+          aCI != aEnd; 
           aCI++)
-    {
+    { 
         const OUString &rShortName = (*aCI).first;
         const ContentInfo &rInfo = *(*aCI).second;
 
@@ -175,17 +175,17 @@ void ZipPackageFolder::setChildStreamsTypeByExtension( const beans::StringPair&
 
 void ZipPackageFolder::copyZipEntry( ZipEntry &rDest, const ZipEntry &rSource)
 {
-      rDest.nVersion            = rSource.nVersion;
-    rDest.nFlag             = rSource.nFlag;
-    rDest.nMethod           = rSource.nMethod;
-    rDest.nTime             = rSource.nTime;
-    rDest.nCrc              = rSource.nCrc;
-    rDest.nCompressedSize   = rSource.nCompressedSize;
-    rDest.nSize             = rSource.nSize;
-    rDest.nOffset           = rSource.nOffset;
-    rDest.sPath             = rSource.sPath;
-    rDest.nPathLen          = rSource.nPathLen;
-    rDest.nExtraLen         = rSource.nExtraLen;
+      rDest.nVersion			= rSource.nVersion;
+    rDest.nFlag				= rSource.nFlag;
+    rDest.nMethod			= rSource.nMethod;
+    rDest.nTime				= rSource.nTime;
+    rDest.nCrc				= rSource.nCrc;
+    rDest.nCompressedSize	= rSource.nCompressedSize;
+    rDest.nSize				= rSource.nSize;
+    rDest.nOffset			= rSource.nOffset;
+    rDest.sPath				= rSource.sPath;
+    rDest.nPathLen			= rSource.nPathLen;
+    rDest.nExtraLen			= rSource.nExtraLen;
 }
 
 const ::com::sun::star::uno::Sequence < sal_Int8 >& ZipPackageFolder::static_getImplementationId()
@@ -194,7 +194,7 @@ const ::com::sun::star::uno::Sequence < sal_Int8 >& ZipPackageFolder::static_get
 }
 
     // XNameContainer
-void SAL_CALL ZipPackageFolder::insertByName( const OUString& aName, const Any& aElement )
+void SAL_CALL ZipPackageFolder::insertByName( const OUString& aName, const Any& aElement ) 
         throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException)
 {
     if (hasByName(aName))
@@ -224,11 +224,11 @@ void SAL_CALL ZipPackageFolder::insertByName( const OUString& aName, const Any&
                 pEntry->setName (aName);
             doInsertByName ( pEntry, sal_True );
         }
-        else
+        else 
             throw IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 0 );
     }
 }
-void SAL_CALL ZipPackageFolder::removeByName( const OUString& Name )
+void SAL_CALL ZipPackageFolder::removeByName( const OUString& Name ) 
         throw(NoSuchElementException, WrappedTargetException, RuntimeException)
 {
     ContentHash::iterator aIter = maContents.find ( Name );
@@ -237,18 +237,18 @@ void SAL_CALL ZipPackageFolder::removeByName( const OUString& Name )
     maContents.erase( aIter );
 }
     // XEnumerationAccess
-Reference< XEnumeration > SAL_CALL ZipPackageFolder::createEnumeration(  )
+Reference< XEnumeration > SAL_CALL ZipPackageFolder::createEnumeration(  ) 
         throw(RuntimeException)
 {
     return Reference < XEnumeration> (new ZipPackageFolderEnumeration(maContents));
 }
     // XElementAccess
-Type SAL_CALL ZipPackageFolder::getElementType(  )
+Type SAL_CALL ZipPackageFolder::getElementType(  ) 
         throw(RuntimeException)
 {
     return ::getCppuType ((const Reference< XUnoTunnel > *) 0);
 }
-sal_Bool SAL_CALL ZipPackageFolder::hasElements(  )
+sal_Bool SAL_CALL ZipPackageFolder::hasElements(  ) 
         throw(RuntimeException)
 {
     return maContents.size() > 0;
@@ -262,30 +262,30 @@ ContentInfo& ZipPackageFolder::doGetByName( const OUString& aName )
         throw NoSuchElementException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
     return *(*aIter).second;
 }
-Any SAL_CALL ZipPackageFolder::getByName( const OUString& aName )
+Any SAL_CALL ZipPackageFolder::getByName( const OUString& aName ) 
     throw(NoSuchElementException, WrappedTargetException, RuntimeException)
 {
     return makeAny ( doGetByName ( aName ).xTunnel );
 }
-Sequence< OUString > SAL_CALL ZipPackageFolder::getElementNames(  )
+Sequence< OUString > SAL_CALL ZipPackageFolder::getElementNames(  ) 
         throw(RuntimeException)
 {
     sal_uInt32 i=0, nSize = maContents.size();
     Sequence < OUString > aSequence ( nSize );
     OUString *pNames = aSequence.getArray();
-    for ( ContentHash::const_iterator aIterator = maContents.begin(), aEnd = maContents.end();
-          aIterator != aEnd;
+    for ( ContentHash::const_iterator aIterator = maContents.begin(), aEnd = maContents.end(); 
+          aIterator != aEnd; 
           ++i, ++aIterator)
         pNames[i] = (*aIterator).first;
     return aSequence;
 }
-sal_Bool SAL_CALL ZipPackageFolder::hasByName( const OUString& aName )
+sal_Bool SAL_CALL ZipPackageFolder::hasByName( const OUString& aName ) 
     throw(RuntimeException)
 {
     return maContents.find ( aName ) != maContents.end ();
 }
     // XNameReplace
-void SAL_CALL ZipPackageFolder::replaceByName( const OUString& aName, const Any& aElement )
+void SAL_CALL ZipPackageFolder::replaceByName( const OUString& aName, const Any& aElement ) 
         throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException)
 {
     if ( hasByName( aName ) )
@@ -298,7 +298,7 @@ void SAL_CALL ZipPackageFolder::replaceByName( const OUString& aName, const Any&
 static void ImplSetStoredData( ZipEntry & rEntry, Reference < XInputStream> & rStream )
 {
     // It's very annoying that we have to do this, but lots of zip packages
-    // don't allow data descriptors for STORED streams, meaning we have to
+    // don't allow data descriptors for STORED streams, meaning we have to 
     // know the size and CRC32 of uncompressed streams before we actually
     // write them !
     CRC32 aCRC32;
@@ -352,9 +352,9 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
     }
 
     for ( ContentHash::const_iterator aCI = maContents.begin(), aEnd = maContents.end();
-          aCI != aEnd;
+          aCI != aEnd; 
           aCI++)
-    {
+    { 
         const OUString &rShortName = (*aCI).first;
         const ContentInfo &rInfo = *(*aCI).second;
 
@@ -365,7 +365,7 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
             pFolder = rInfo.pFolder;
         else
             pStream = rInfo.pStream;
-
+        
         if ( rInfo.bFolder )
         {
             OUString sTempName = rPath + rShortName + OUString( RTL_CONSTASCII_USTRINGPARAM ( "/" ) );
@@ -376,13 +376,13 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
             pValue[PKG_MNFST_VERSION].Value <<= pFolder->GetVersion();
             pValue[PKG_MNFST_FULLPATH].Name = sFullPathProperty;
             pValue[PKG_MNFST_FULLPATH].Value <<= sTempName;
-
+            
             pFolder->saveContents( sTempName, rManList, rZipOut, rEncryptionKey, rRandomPool);
         }
         else
         {
             // if pTempEntry is necessary, it will be released and passed to the ZipOutputStream
-            // and be deleted in the ZipOutputStream destructor
+            // and be deleted in the ZipOutputStream destructor 
             auto_ptr < ZipEntry > pAutoTempEntry ( new ZipEntry );
             ZipEntry* pTempEntry = pAutoTempEntry.get();
 
@@ -455,7 +455,7 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
                             OSL_ENSURE( !bRawStream || !bToBeCompressed && !bToBeEncrypted, "The stream is already encrypted!\n" );
                             xSeek->seek ( bRawStream ? pStream->GetMagicalHackPos() : 0 );
                             ImplSetStoredData ( *pTempEntry, xStream );
-
+    
                             // TODO/LATER: Get rid of hacks related to switching of Flag Method and Size properties!
                         }
                         else if ( bToBeEncrypted )
@@ -464,7 +464,7 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
                             pTempEntry->nSize = static_cast < sal_Int32 > ( xSeek->getLength() );
                             nOwnStreamOrigSize = pTempEntry->nSize;
                         }
-
+        
                         xSeek->seek ( 0 );
                     }
                     else
@@ -481,7 +481,7 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
                                 // Should be handled close to the raw stream handling
                                 bTransportOwnEncrStreamAsRaw = sal_True;
                                 pTempEntry->nMethod = STORED;
-
+    
                                 // TODO/LATER: get rid of this situation
                                 // this size should be different from the one that will be stored in manifest.xml
                                 // it is used in storing algorithms and after storing the correct size will be set
@@ -501,16 +501,16 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
                     bWritingFailed = sal_True;
                     continue;
                 }
-
+    
                 if ( bToBeEncrypted || bRawStream || bTransportOwnEncrStreamAsRaw )
                 {
                     if ( bToBeEncrypted && !bTransportOwnEncrStreamAsRaw )
                     {
-                        Sequence < sal_uInt8 > aSalt ( 16 ), aVector ( 8 );
+                        Sequence < sal_uInt8 > aSalt ( 16 ), aVector ( 8 ); 
                         rtl_random_getBytes ( rRandomPool, aSalt.getArray(), 16 );
                         rtl_random_getBytes ( rRandomPool, aVector.getArray(), 8 );
                         sal_Int32 nIterationCount = 1024;
-
+            
                         if ( !pStream->HasOwnKey() )
                             pStream->setKey ( rEncryptionKey );
 
@@ -518,7 +518,7 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
                         pStream->setSalt ( aSalt );
                         pStream->setIterationCount ( nIterationCount );
                     }
-
+    
                     // last property is digest, which is inserted later if we didn't have
                     // a magic header
                     aPropSet.realloc(PKG_SIZE_ENCR_MNFST);
@@ -530,12 +530,12 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
                     pValue[PKG_MNFST_SALT].Value <<= pStream->getSalt();
                     pValue[PKG_MNFST_ITERATION].Name = sIterationCountProperty;
                     pValue[PKG_MNFST_ITERATION].Value <<= pStream->getIterationCount ();
-
+                    
                     // Need to store the uncompressed size in the manifest
                     OSL_ENSURE( nOwnStreamOrigSize >= 0, "The stream size was not correctly initialized!\n" );
                     pValue[PKG_MNFST_UCOMPSIZE].Name = sSizeProperty;
                     pValue[PKG_MNFST_UCOMPSIZE].Value <<= nOwnStreamOrigSize;
-
+    
                     if ( bRawStream || bTransportOwnEncrStreamAsRaw )
                     {
                         pValue[PKG_MNFST_DIGEST].Name = sDigestProperty;
@@ -555,7 +555,7 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
                 // If it's a PackageMember, then it's an unbuffered stream and we need
                 // to get a new version of it as we can't seek backwards.
                 if ( pStream->IsPackageMember() )
-                {
+                {	
                     xStream = pStream->getRawData();
                     if ( !xStream.is() )
                     {
@@ -600,17 +600,17 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
             else
             {
                 // This stream is defenitly not a raw stream
-
+            
                 // If nonseekable access is used the stream should be at the beginning and
                 // is useless after the storing. Thus if the storing fails the package should
                 // be thrown away ( as actually it is done currently )!
                 // To allow to reuse the package after the error, the optimization must be removed!
-
+            
                 // If it's a PackageMember, then our previous reference held a 'raw' stream
                 // so we need to re-get it, unencrypted, uncompressed and positioned at the
                 // beginning of the stream
                 if ( pStream->IsPackageMember() )
-                {
+                {	
                     xStream = pStream->getInputStream();
                     if ( !xStream.is() )
                     {
@@ -676,7 +676,7 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
                     // as usual encrypted stream
                     pStream->SetToBeEncrypted( sal_True );
                 }
-
+    
                 // Remove hacky bit from entry flags
                 if ( pTempEntry->nFlag & ( 1 << 4 ) )
                 {
@@ -699,7 +699,7 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
         if ( m_nFormat == embed::StorageFormats::PACKAGE || ( m_nFormat == embed::StorageFormats::OFOPXML && !rInfo.bFolder ) )
             rManList.push_back( aPropSet );
     }
-
+    
     if( bWritingFailed )
         throw RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
 }
@@ -720,7 +720,7 @@ void ZipPackageFolder::releaseUpwardRef( void )
     for ( ContentHash::const_iterator aCI = maContents.begin();
           aCI!=maContents.end();
           aCI++)
-    {
+    { 
         ContentInfo &rInfo = * (*aCI).second;
         if ( rInfo.bFolder )// && ! rInfo.pFolder->HasReleased () )
             rInfo.pFolder->releaseUpwardRef();
@@ -733,24 +733,24 @@ void ZipPackageFolder::releaseUpwardRef( void )
 #endif
 }
 
-sal_Int64 SAL_CALL ZipPackageFolder::getSomething( const Sequence< sal_Int8 >& aIdentifier )
+sal_Int64 SAL_CALL ZipPackageFolder::getSomething( const Sequence< sal_Int8 >& aIdentifier ) 
     throw(RuntimeException)
-{
+{																
     sal_Int64 nMe = 0;
-    if ( aIdentifier.getLength() == 16 &&
+    if ( aIdentifier.getLength() == 16 && 
          0 == rtl_compareMemory(static_getImplementationId().getConstArray(),  aIdentifier.getConstArray(), 16 ) )
         nMe = reinterpret_cast < sal_Int64 > ( this );
     return nMe;
 }
-void SAL_CALL ZipPackageFolder::setPropertyValue( const OUString& aPropertyName, const Any& aValue )
+void SAL_CALL ZipPackageFolder::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) 
         throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
     if (aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MediaType")))
     {
         // TODO/LATER: activate when zip ucp is ready
         // if ( m_nFormat != embed::StorageFormats::PACKAGE )
-        //  throw UnknownPropertyException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
-
+        // 	throw UnknownPropertyException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
+            
         aValue >>= sMediaType;
     }
     else if (aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Version")))
@@ -760,14 +760,14 @@ void SAL_CALL ZipPackageFolder::setPropertyValue( const OUString& aPropertyName,
     else
         throw UnknownPropertyException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
 }
-Any SAL_CALL ZipPackageFolder::getPropertyValue( const OUString& PropertyName )
+Any SAL_CALL ZipPackageFolder::getPropertyValue( const OUString& PropertyName ) 
         throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     if (PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) )
     {
         // TODO/LATER: activate when zip ucp is ready
         // if ( m_nFormat != embed::StorageFormats::PACKAGE )
-        //  throw UnknownPropertyException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
+        //	throw UnknownPropertyException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
 
         return makeAny ( sMediaType );
     }
diff --git a/package/source/zippackage/ZipPackageFolderEnumeration.cxx b/package/source/zippackage/ZipPackageFolderEnumeration.cxx
index ed1bfbdf1d30..155b398c0037 100644
--- a/package/source/zippackage/ZipPackageFolderEnumeration.cxx
+++ b/package/source/zippackage/ZipPackageFolderEnumeration.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ ZipPackageFolderEnumeration::~ZipPackageFolderEnumeration( void )
 {
 }
 
-sal_Bool SAL_CALL ZipPackageFolderEnumeration::hasMoreElements(  )
+sal_Bool SAL_CALL ZipPackageFolderEnumeration::hasMoreElements(  ) 
         throw(uno::RuntimeException)
 {
     return (aIterator != rContents.end() );
 }
-uno::Any SAL_CALL ZipPackageFolderEnumeration::nextElement(  )
+uno::Any SAL_CALL ZipPackageFolderEnumeration::nextElement(  ) 
         throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
 {
     uno::Any aAny;
diff --git a/package/source/zippackage/ZipPackageFolderEnumeration.hxx b/package/source/zippackage/ZipPackageFolderEnumeration.hxx
index ee38ad734e84..751ffbfb417f 100644
--- a/package/source/zippackage/ZipPackageFolderEnumeration.hxx
+++ b/package/source/zippackage/ZipPackageFolderEnumeration.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <HashMaps.hxx>
 
 class ZipPackageFolderEnumeration : public cppu::WeakImplHelper2
-<
+< 
     com::sun::star::container::XEnumeration,
     com::sun::star::lang::XServiceInfo
 >
@@ -48,19 +48,19 @@ public:
     virtual ~ZipPackageFolderEnumeration( void );
 
     // XEnumeration
-    virtual sal_Bool SAL_CALL hasMoreElements(  )
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) 
         throw(::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL nextElement(  )
+    virtual ::com::sun::star::uno::Any SAL_CALL nextElement(  ) 
         throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  )
+    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) 
         throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) 
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) 
         throw (::com::sun::star::uno::RuntimeException);
-
+    
 };
 #endif
 
diff --git a/package/source/zippackage/ZipPackageSink.cxx b/package/source/zippackage/ZipPackageSink.cxx
index 2f9202398493..2270063797e5 100644
--- a/package/source/zippackage/ZipPackageSink.cxx
+++ b/package/source/zippackage/ZipPackageSink.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ ZipPackageSink::ZipPackageSink(void)
 : xStream ( com::sun::star::uno::Reference < com::sun::star::io::XInputStream > (NULL))
 {
 }
-ZipPackageSink::~ZipPackageSink(void)
+ZipPackageSink::~ZipPackageSink(void) 
 {
 }
-void SAL_CALL ZipPackageSink::setInputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& aStream )
+void SAL_CALL ZipPackageSink::setInputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& aStream ) 
     throw(::com::sun::star::uno::RuntimeException)
 {
     xStream = aStream;
 }
-::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL ZipPackageSink::getInputStream(  )
+::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL ZipPackageSink::getInputStream(  ) 
     throw(::com::sun::star::uno::RuntimeException)
 {
     return xStream;
diff --git a/package/source/zippackage/ZipPackageSink.hxx b/package/source/zippackage/ZipPackageSink.hxx
index a90d40131072..f8e0eb1684ed 100644
--- a/package/source/zippackage/ZipPackageSink.hxx
+++ b/package/source/zippackage/ZipPackageSink.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ protected:
 public:
     ZipPackageSink();
     virtual ~ZipPackageSink();
-    virtual void SAL_CALL setInputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& aStream )
+    virtual void SAL_CALL setInputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& aStream ) 
         throw(::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream(  )
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream(  ) 
         throw(::com::sun::star::uno::RuntimeException);
 };
 #endif
diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx
index 318a6a52b873..f3c6d713fbf3 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -89,16 +89,16 @@ ZipPackageStream::ZipPackageStream ( ZipPackage & rNewPackage,
     this->mbAllowRemoveOnInsert = bAllowRemoveOnInsert;
 
     SetFolder ( sal_False );
-    aEntry.nVersion     = -1;
-    aEntry.nFlag        = 0;
-    aEntry.nMethod      = -1;
-    aEntry.nTime        = -1;
-    aEntry.nCrc         = -1;
-    aEntry.nCompressedSize  = -1;
-    aEntry.nSize        = -1;
-    aEntry.nOffset      = -1;
-    aEntry.nPathLen     = -1;
-    aEntry.nExtraLen    = -1;
+    aEntry.nVersion		= -1;
+    aEntry.nFlag		= 0;
+    aEntry.nMethod		= -1;
+    aEntry.nTime		= -1;
+    aEntry.nCrc			= -1;
+    aEntry.nCompressedSize	= -1;
+    aEntry.nSize		= -1;
+    aEntry.nOffset		= -1;
+    aEntry.nPathLen		= -1;
+    aEntry.nExtraLen	= -1;
 
     Sequence < sal_Int8 > &rCachedImplId = lcl_CachedImplId::get();
     if ( !rCachedImplId.getLength() )
diff --git a/package/source/zippackage/ZipPackageStream.hxx b/package/source/zippackage/ZipPackageStream.hxx
index 9bdc09d04f92..321e385a519d 100644
--- a/package/source/zippackage/ZipPackageStream.hxx
+++ b/package/source/zippackage/ZipPackageStream.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <cppuhelper/implbase2.hxx>
 #include <mutexholder.hxx>
 
-#define PACKAGE_STREAM_NOTSET           0
-#define PACKAGE_STREAM_PACKAGEMEMBER    1
-#define PACKAGE_STREAM_DETECT           2
-#define PACKAGE_STREAM_DATA             3
-#define PACKAGE_STREAM_RAW              4
+#define PACKAGE_STREAM_NOTSET			0
+#define PACKAGE_STREAM_PACKAGEMEMBER	1
+#define PACKAGE_STREAM_DETECT			2
+#define PACKAGE_STREAM_DATA				3
+#define PACKAGE_STREAM_RAW				4
 
 class ZipPackage;
 struct ZipEntry;
@@ -55,13 +55,13 @@ class ZipPackageStream : public cppu::ImplInheritanceHelper2
 protected:
     com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xStream;
     const ::com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > m_xFactory;
-    ZipPackage          &rZipPackage;
-    sal_Bool            bToBeCompressed, bToBeEncrypted, bHaveOwnKey, bIsEncrypted;
+    ZipPackage 			&rZipPackage;
+    sal_Bool			bToBeCompressed, bToBeEncrypted, bHaveOwnKey, bIsEncrypted;
     rtl::Reference < EncryptionData > xEncryptionData;
 
-    sal_uInt8   m_nStreamMode;
-    sal_uInt32  m_nMagicalHackPos;
-    sal_uInt32  m_nMagicalHackSize;
+    sal_uInt8	m_nStreamMode;
+    sal_uInt32	m_nMagicalHackPos;
+    sal_uInt32	m_nMagicalHackSize;
 
     sal_Bool m_bHasSeekable;
 
@@ -72,10 +72,10 @@ protected:
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& GetOwnSeekStream();
 
 public:
-    sal_Bool HasOwnKey () const  { return bHaveOwnKey;}
+    sal_Bool HasOwnKey () const	 { return bHaveOwnKey;}
     sal_Bool IsToBeCompressed () const { return bToBeCompressed;}
     sal_Bool IsToBeEncrypted () const { return bToBeEncrypted;}
-    sal_Bool IsEncrypted () const    { return bIsEncrypted;}
+    sal_Bool IsEncrypted () const  	 { return bIsEncrypted;}
     sal_Bool IsPackageMember () const { return m_nStreamMode == PACKAGE_STREAM_PACKAGEMEMBER;}
 
     sal_Bool IsFromManifest() const { return m_bFromManifest; }
@@ -102,8 +102,8 @@ public:
 
     void SetToBeCompressed (sal_Bool bNewValue) { bToBeCompressed = bNewValue;}
     void SetIsEncrypted (sal_Bool bNewValue) { bIsEncrypted = bNewValue;}
-    void SetToBeEncrypted (sal_Bool bNewValue)
-    {
+    void SetToBeEncrypted (sal_Bool bNewValue)  
+    { 
         bToBeEncrypted  = bNewValue;
         if ( bToBeEncrypted && !xEncryptionData.is())
             xEncryptionData = new EncryptionData;
@@ -141,13 +141,13 @@ public:
     void setZipEntryOnLoading( const ZipEntry &rInEntry);
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getRawData()
         throw(::com::sun::star::uno::RuntimeException);
-
+    
     static const ::com::sun::star::uno::Sequence < sal_Int8 >& static_getImplementationId();
 
     // XActiveDataSink
-    virtual void SAL_CALL setInputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& aStream )
+    virtual void SAL_CALL setInputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& aStream ) 
         throw(::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream(  )
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream(  ) 
         throw(::com::sun::star::uno::RuntimeException);
 
     // XDataSinkEncrSupport
@@ -174,21 +174,21 @@ public:
                 ::com::sun::star::uno::RuntimeException );
 
     // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier )
+    virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) 
         throw(::com::sun::star::uno::RuntimeException);
 
     // XPropertySet
-    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
+    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) 
         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);
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName )
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) 
         throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  )
+    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) 
         throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) 
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) 
         throw (::com::sun::star::uno::RuntimeException);
 };
 #endif
diff --git a/package/source/zippackage/wrapstreamforshare.cxx b/package/source/zippackage/wrapstreamforshare.cxx
index 9afb2f8f9428..ff871d49a1a0 100644
--- a/package/source/zippackage/wrapstreamforshare.cxx
+++ b/package/source/zippackage/wrapstreamforshare.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ WrapStreamForShare::~WrapStreamForShare()
 }
 
 // XInputStream
-sal_Int32 SAL_CALL WrapStreamForShare::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
+sal_Int32 SAL_CALL WrapStreamForShare::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) 
         throw ( io::NotConnectedException,
                 io::BufferSizeExceededException,
                 io::IOException,
@@ -92,7 +92,7 @@ sal_Int32 SAL_CALL WrapStreamForShare::readSomeBytes( uno::Sequence< sal_Int8 >&
     return nRead;
 }
 
-void SAL_CALL WrapStreamForShare::skipBytes( sal_Int32 nBytesToSkip )
+void SAL_CALL WrapStreamForShare::skipBytes( sal_Int32 nBytesToSkip ) 
         throw ( io::NotConnectedException,
                 io::BufferSizeExceededException,
                 io::IOException,
@@ -122,7 +122,7 @@ sal_Int32 SAL_CALL WrapStreamForShare::available()
     return m_xInStream->available();
 }
 
-void SAL_CALL WrapStreamForShare::closeInput()
+void SAL_CALL WrapStreamForShare::closeInput() 
         throw ( io::NotConnectedException,
                 io::IOException,
                 uno::RuntimeException )
@@ -156,7 +156,7 @@ void SAL_CALL WrapStreamForShare::seek( sal_Int64 location )
 }
 
 sal_Int64 SAL_CALL WrapStreamForShare::getPosition()
-        throw ( io::IOException,
+        throw ( io::IOException, 
                 uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
diff --git a/package/source/zippackage/wrapstreamforshare.hxx b/package/source/zippackage/wrapstreamforshare.hxx
index 85b03c62943c..90b6ef496050 100644
--- a/package/source/zippackage/wrapstreamforshare.hxx
+++ b/package/source/zippackage/wrapstreamforshare.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,15 +51,15 @@ public:
     virtual ~WrapStreamForShare();
 
     // XInputStream
-    virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
+    virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
     virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL available(  )
+    virtual sal_Int32 SAL_CALL available(  ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL closeInput(  )
+    virtual void SAL_CALL closeInput(  ) 
         throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
 
 
diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx
index 3690b636df68..88b4530b5684 100644
--- a/package/source/zippackage/zipfileaccess.cxx
+++ b/package/source/zippackage/zipfileaccess.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ uno::Sequence< ::rtl::OUString > OZipFileAccess::GetPatternsFromString_Impl( con
     if ( !aString.getLength() )
         return uno::Sequence< ::rtl::OUString >();
 
-    uno::Sequence< ::rtl::OUString > aPattern( 1 );
+    uno::Sequence< ::rtl::OUString > aPattern( 1 );  
     sal_Int32 nInd = 0;
 
     const sal_Unicode* pString = aString.getStr();
@@ -118,18 +118,18 @@ uno::Sequence< ::rtl::OUString > OZipFileAccess::GetPatternsFromString_Impl( con
             pString++;
         }
     }
-
+    
     return aPattern;
 }
 
 // ----------------------------------------------------------------
 sal_Bool OZipFileAccess::StringGoodForPattern_Impl( const ::rtl::OUString& aString,
                                                     const uno::Sequence< ::rtl::OUString >& aPattern )
-{
+{ 
     sal_Int32 nInd = aPattern.getLength() - 1;
     if ( nInd < 0 )
         return sal_False;
-
+   
     if ( nInd == 0 )
     {
         if ( !aPattern[0].getLength() )
@@ -143,7 +143,7 @@ sal_Bool OZipFileAccess::StringGoodForPattern_Impl( const ::rtl::OUString& aStri
     if ( nEndInd >= nBeginInd
       && ( nEndInd == aString.getLength() || aString.copy( nEndInd ).equals( aPattern[nInd] ) )
       && ( nBeginInd == 0 || aString.copy( 0, nBeginInd ).equals( aPattern[0] ) ) )
-    {
+    { 
         for ( sal_Int32 nCurInd = aPattern.getLength() - 2; nCurInd > 0; nCurInd-- )
         {
             if ( !aPattern[nCurInd].getLength() )
@@ -218,7 +218,7 @@ void SAL_CALL OZipFileAccess::initialize( const uno::Sequence< uno::Any >& aArgu
 
     if ( !m_xContentStream.is() )
         throw io::IOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
-
+    
     if ( !xSeekable.is() )
     {
         // TODO: after fwkbugfix02 is integrated a helper class can be used to make the stream seekable
@@ -229,7 +229,7 @@ void SAL_CALL OZipFileAccess::initialize( const uno::Sequence< uno::Any >& aArgu
     m_pZipFile = new ZipFile(
                 m_xContentStream,
                 m_xFactory,
-                sal_True );
+                sal_True );	
 }
 
 // XNameAccess
@@ -366,8 +366,8 @@ uno::Reference< io::XInputStream > SAL_CALL OZipFileAccess::getStreamByPattern(
     {
         if ( StringGoodForPattern_Impl( (*aIter).second.sPath, aPattern ) )
         {
-            uno::Reference< io::XInputStream > xEntryStream( m_pZipFile->getDataStream( (*aIter).second,
-                                                                                        new EncryptionData(),
+            uno::Reference< io::XInputStream > xEntryStream( m_pZipFile->getDataStream( (*aIter).second, 
+                                                                                        new EncryptionData(), 
                                                                                         sal_False,
                                                                                         m_aMutexHolder ) );
 
diff --git a/setup_native/inc/setup_native/qswin32.h b/setup_native/inc/setup_native/qswin32.h
index 6953ded36afb..2ef69b21ea5d 100644
--- a/setup_native/inc/setup_native/qswin32.h
+++ b/setup_native/inc/setup_native/qswin32.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,22 +29,22 @@
 #ifndef _QSWIN32_H
 #define _QSWIN32_H
 
-#define QUICKSTART_CLASSNAMEA           "SO Listener Class"
-#define QUICKSTART_WINDOWNAMEA          "SO Listener Window"
-#define SHUTDOWN_QUICKSTART_MESSAGEA    "SO KillTray"
+#define QUICKSTART_CLASSNAMEA			"SO Listener Class"
+#define QUICKSTART_WINDOWNAMEA			"SO Listener Window"
+#define SHUTDOWN_QUICKSTART_MESSAGEA	"SO KillTray"
 
-#define QUICKSTART_CLASSNAMEW           L##QUICKSTART_CLASSNAMEA
-#define QUICKSTART_WINDOWNAMEW          L##QUICKSTART_WINDOWNAMEA
-#define SHUTDOWN_QUICKSTART_MESSAGEW    L##SHUTDOWN_QUICKSTART_MESSAGEA
+#define QUICKSTART_CLASSNAMEW			L##QUICKSTART_CLASSNAMEA
+#define QUICKSTART_WINDOWNAMEW			L##QUICKSTART_WINDOWNAMEA
+#define SHUTDOWN_QUICKSTART_MESSAGEW	L##SHUTDOWN_QUICKSTART_MESSAGEA
 
 #ifdef UNICODE
-#   define QUICKSTART_CLASSNAME             QUICKSTART_CLASSNAMEW
-#   define QUICKSTART_WINDOWNAME            QUICKSTART_WINDOWNAMEW
-#   define SHUTDOWN_QUICKSTART_MESSAGE      SHUTDOWN_QUICKSTART_MESSAGEW
+#	define QUICKSTART_CLASSNAME				QUICKSTART_CLASSNAMEW
+#	define QUICKSTART_WINDOWNAME			QUICKSTART_WINDOWNAMEW
+#	define SHUTDOWN_QUICKSTART_MESSAGE		SHUTDOWN_QUICKSTART_MESSAGEW
 #else
-#   define QUICKSTART_CLASSNAME             QUICKSTART_CLASSNAMEA
-#   define QUICKSTART_WINDOWNAME            QUICKSTART_WINDOWNAMEA
-#   define SHUTDOWN_QUICKSTART_MESSAGE      SHUTDOWN_QUICKSTART_MESSAGEA
+#	define QUICKSTART_CLASSNAME				QUICKSTART_CLASSNAMEA
+#	define QUICKSTART_WINDOWNAME			QUICKSTART_WINDOWNAMEA
+#	define SHUTDOWN_QUICKSTART_MESSAGE		SHUTDOWN_QUICKSTART_MESSAGEA
 #endif
 
 #endif /* _QSWIN32_H */
diff --git a/setup_native/scripts/admin.pl b/setup_native/scripts/admin.pl
index ea186f5a8ba4..d90c76650d38 100644
--- a/setup_native/scripts/admin.pl
+++ b/setup_native/scripts/admin.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
@@ -89,7 +89,7 @@ sub getparameter
     while ( $#ARGV >= 0 )
     {
         my $param = shift(@ARGV);
-
+        
         if ($param eq "-t") { $targetdir = shift(@ARGV); }
         elsif ($param eq "-d") { $databasepath = shift(@ARGV); }
         else
@@ -126,14 +126,14 @@ sub controlparameter
         usage();
         exit(-1);
     }
-
+    
     if ( -d $databasepath )
     {
         $databasepath =~ s/\\\s*$//;
         $databasepath =~ s/\/\s*$//;
-
+        
         my $msifiles = find_file_with_file_extension("msi", $databasepath);
-
+    
         if ( $#{$msifiles} < 0 ) { exit_program("ERROR: Did not find msi database in directory $installationdir"); }
         if ( $#{$msifiles} > 0 ) { exit_program("ERROR: Did find more than one msi database in directory $installationdir"); }
 
@@ -141,13 +141,13 @@ sub controlparameter
     }
 
     if ( ! -f $databasepath ) { exit_program("ERROR: Did not find msi database in directory $databasepath."); }
-
+    
     if ( ! -d $targetdir ) { create_directories($targetdir); }
 }
 
 #############################################################################
 # The program msidb.exe can be located next to the Perl program. Then it is
-# not neccessary to find it in the PATH variable.
+# not neccessary to find it in the PATH variable. 
 #############################################################################
 
 sub check_local_msidb
@@ -155,7 +155,7 @@ sub check_local_msidb
     my $msidbname = "msidb.exe";
     my $perlprogramm = $0;
     my $path = $perlprogramm;
-
+    
     get_path_from_fullqualifiedname(\$path);
 
     $path =~ s/\\\s*$//;
@@ -173,29 +173,29 @@ sub check_local_msidb
 }
 
 #############################################################################
-# Converting a string list with separator $listseparator
+# Converting a string list with separator $listseparator 
 # into an array
 #############################################################################
 
 sub convert_stringlist_into_array
 {
     my ( $includestringref, $listseparator ) = @_;
-
+    
     my @newarray = ();
     my $first;
     my $last = ${$includestringref};
 
-    while ( $last =~ /^\s*(.+?)\Q$listseparator\E(.+)\s*$/) # "$" for minimal matching
+    while ( $last =~ /^\s*(.+?)\Q$listseparator\E(.+)\s*$/)	# "$" for minimal matching
     {
         $first = $1;
-        $last = $2;
+        $last = $2;	
         # Problem with two directly following listseparators. For example a path with two ";;" directly behind each other
         $first =~ s/^$listseparator//;
         push(@newarray, "$first\n");
-    }
-
-    push(@newarray, "$last\n");
+    }	
 
+    push(@newarray, "$last\n");	
+    
     return \@newarray;
 }
 
@@ -206,19 +206,19 @@ sub convert_stringlist_into_array
 
 sub check_system_path
 {
-    my $onefile;
+    my $onefile;	
     my $error = 0;
     my $pathvariable = $ENV{'PATH'};
     my $local_pathseparator = $pathseparator;
-
+    
     if( $^O =~ /cygwin/i )
-    {   # When using cygwin's perl the PATH variable is POSIX style and ...
+    {	# When using cygwin's perl the PATH variable is POSIX style and ...
         $pathvariable = qx{cygpath -mp "$pathvariable"} ;
         # has to be converted to DOS style for further use.
         $local_pathseparator = ';';
     }
     my $patharrayref = convert_stringlist_into_array(\$pathvariable, $local_pathseparator);
-
+    
     my @needed_files_in_path = ("expand.exe");
     if ( $localmsidbpath eq "" ) { push(@needed_files_in_path, "msidb.exe"); } # not found locally -> search in path
     my @optional_files_in_path = ("msiinfo.exe");
@@ -239,7 +239,7 @@ sub check_system_path
         else
         {
             print( "\tFound: $$fileref\n" );
-        }
+        }		
     }
 
     if ( $error ) { exit_program("ERROR: Could not find all needed files in path (using setsolar should help)!"); }
@@ -261,7 +261,7 @@ sub check_system_path
         {
             print( "\tFound: $$fileref\n" );
             if ( $onefile eq "msiinfo.exe" ) { $msiinfo_available = 1; }
-        }
+        }		
     }
 
 }
@@ -276,7 +276,7 @@ sub get_sourcepath_from_filename_and_includepath
 
     my $onefile = "";
     my $foundsourcefile = 0;
-
+        
     for ( my $j = 0; $j <= $#{$includepatharrayref}; $j++ )
     {
         my $includepath = ${$includepatharrayref}[$j];
@@ -293,7 +293,7 @@ sub get_sourcepath_from_filename_and_includepath
     }
 
     if (!($foundsourcefile)) { $onefile = ""; }
-
+    
     return \$onefile;
 }
 
@@ -311,7 +311,7 @@ sub remove_empty_dirs_in_folder
     }
 
     my @content = ();
-
+    
     $dir =~ s/\Q$separator\E\s*$//;
 
     if ( -d $dir )
@@ -321,7 +321,7 @@ sub remove_empty_dirs_in_folder
         closedir(DIR);
 
         my $oneitem;
-
+    
         foreach $oneitem (@content)
         {
             if ((!($oneitem eq ".")) && (!($oneitem eq "..")))
@@ -334,11 +334,11 @@ sub remove_empty_dirs_in_folder
                 }
             }
         }
-
-        # try to remove empty directory
+        
+        # try to remove empty directory		
         my $returnvalue = rmdir $dir;
 
-        # if ( $returnvalue ) { print "Successfully removed empty dir $dir\n"; }
+        # if ( $returnvalue ) { print "Successfully removed empty dir $dir\n"; }	
     }
 }
 
@@ -349,15 +349,15 @@ sub remove_empty_dirs_in_folder
 sub get_extensions_dir
 {
     my ( $unopkgfile ) = @_;
-
+    
     my $localbranddir = $unopkgfile;
     get_path_from_fullqualifiedname(\$localbranddir); # "program" dir in brand layer
     get_path_from_fullqualifiedname(\$localbranddir); # root dir in brand layer
     $localbranddir =~ s/\Q$separator\E\s*$//;
     my $extensiondir = $localbranddir . $separator . "share" . $separator . "extensions";
     my $preregdir = $localbranddir . $separator . "share" . $separator . "prereg" . $separator . "bundled";
-
-    return ($extensiondir, $preregdir);
+    
+    return ($extensiondir, $preregdir);	
 }
 
 ########################################################
@@ -368,7 +368,7 @@ sub get_extensions_dir
 sub find_file_with_file_extension
 {
     my ($extension, $dir) = @_;
-
+    
     my @allfiles = ();
     my @sourcefiles = ();
 
@@ -379,7 +379,7 @@ sub find_file_with_file_extension
     closedir(DIR);
 
     my $onefile;
-
+    
     foreach $onefile (@sourcefiles)
     {
         if ((!($onefile eq ".")) && (!($onefile eq "..")))
@@ -390,7 +390,7 @@ sub find_file_with_file_extension
             }
         }
     }
-
+    
     return \@allfiles;
 }
 
@@ -408,8 +408,8 @@ sub create_directories
         get_path_from_fullqualifiedname(\$parentdir);
         create_directories($parentdir);   # recursive
     }
-
-    create_directory($directory);   # now it has to succeed
+    
+    create_directory($directory);	# now it has to succeed
 }
 
 ##############################################################
@@ -430,7 +430,7 @@ sub create_directory
 sub try_to_create_directory
 {
     my ($directory) = @_;
-
+    
     my $returnvalue = 1;
     my $created_directory = 0;
 
@@ -441,7 +441,7 @@ sub try_to_create_directory
         if ($returnvalue)
         {
             $created_directory = 1;
-
+    
             my $localcall = "chmod 775 $directory \>\/dev\/null 2\>\&1";
             system($localcall);
         }
@@ -466,8 +466,8 @@ sub get_path_from_fullqualifiedname
 {
     my ($longfilenameref) = @_;
 
-    if ( $$longfilenameref =~ /\Q$separator\E/ )    # Is there a separator in the path? Otherwise the path is empty.
-    {
+    if ( $$longfilenameref =~ /\Q$separator\E/ )	# Is there a separator in the path? Otherwise the path is empty.
+    {	
         if ( $$longfilenameref =~ /^\s*(\S.*\Q$separator\E)(\S.+\S?)/ )
         {
             $$longfilenameref = $1;
@@ -475,8 +475,8 @@ sub get_path_from_fullqualifiedname
     }
     else
     {
-        $$longfilenameref = ""; # there is no path
-    }
+        $$longfilenameref = "";	# there is no path
+    }	
 }
 
 ##############################################################
@@ -486,7 +486,7 @@ sub get_path_from_fullqualifiedname
 sub make_absolute_filename_to_relative_filename
 {
     my ($longfilenameref) = @_;
-
+    
     # Either '/' or '\'.
     if ( $$longfilenameref =~ /^.*[\/\\](\S.+\S?)/ )
     {
@@ -508,7 +508,7 @@ sub exit_program
     print "***************************************************************\n";
     remove_complete_directory($savetemppath, 1);
     print "\n" . get_time_string();
-    exit(-1);
+    exit(-1);	
 }
 
 #################################################################################
@@ -518,12 +518,12 @@ sub exit_program
 sub unpack_cabinet_file
 {
     my ($cabfilename, $unpackdir) = @_;
-
+    
     my $expandfile = "expand.exe"; # has to be in the PATH
-
+    
     # expand.exe has to be located in the system directory.
-    # Cygwin has another tool expand.exe, that converts tabs to spaces. This cannot be used of course.
-    # But this wrong expand.exe is typically in the PATH before this expand.exe, to unpack
+    # Cygwin has another tool expand.exe, that converts tabs to spaces. This cannot be used of course. 
+    # But this wrong expand.exe is typically in the PATH before this expand.exe, to unpack 
     # cabinet files.
 
     if ( $^O =~ /cygwin/i )
@@ -532,7 +532,7 @@ sub unpack_cabinet_file
         $expandfile =~ s/\\/\//;
         if ( ! -f $expandfile ) { exit_program("ERROR: Did not find file $expandfile in the Windows system folder!"); }
     }
-
+    
     my $expandlogfile = $unpackdir . $separator . "expand.log";
 
     # exclude cabinet file
@@ -567,14 +567,14 @@ sub extract_tables_from_database
 {
     my ($fullmsidatabasepath, $workdir, $tablelist) = @_;
 
-    my $msidb = "msidb.exe";    # Has to be in the path
+    my $msidb = "msidb.exe";	# Has to be in the path
     if ( $localmsidbpath ) { $msidb = $localmsidbpath; }
     my $infoline = "";
     my $systemcall = "";
     my $returnvalue = "";
 
     if ( $^O =~ /cygwin/i ) {
-        chomp( $fullmsidatabasepath = qx{cygpath -w "$fullmsidatabasepath"} );
+        chomp( $fullmsidatabasepath = qx{cygpath -w "$fullmsidatabasepath"} ); 
         # msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
         $fullmsidatabasepath =~ s/\\/\\\\/g;
         $workdir =~ s/\\/\\\\/g;
@@ -584,7 +584,7 @@ sub extract_tables_from_database
     }
 
     # Export of all tables by using "*"
-
+                            
     $systemcall = $msidb . " -d " . $fullmsidatabasepath . " -f " . $workdir . " -e $tablelist";
     print "\nAnalyzing msi database\n";
     $returnvalue = system($systemcall);
@@ -605,13 +605,13 @@ sub extract_tables_from_database
 sub check_for_internal_cabfiles
 {
     my ($cabfilehash) = @_;
-
+    
     my $contains_internal_cabfiles = 0;
     my %allcabfileshash = ();
-
+    
     foreach my $filename ( keys %{$cabfilehash} )
     {
-        if ( $filename =~ /^\s*\#/ )     # starting with a hash
+        if ( $filename =~ /^\s*\#/ )	 # starting with a hash
         {
             $contains_internal_cabfiles = 1;
             # setting real filename without hash as key and name with hash as value
@@ -620,7 +620,7 @@ sub check_for_internal_cabfiles
             $allcabfileshash{$realfilename} = $filename;
         }
     }
-
+    
     return ( $contains_internal_cabfiles, \%allcabfileshash );
 }
 
@@ -634,9 +634,9 @@ sub extract_cabs_from_database
 
     my $infoline = "";
     my $fullsuccess = 1;
-    my $msidb = "msidb.exe";    # Has to be in the path
+    my $msidb = "msidb.exe";	# Has to be in the path
     if ( $localmsidbpath ) { $msidb = $localmsidbpath; }
-
+    
     my @all_excluded_cabfiles = ();
 
     if( $^O =~ /cygwin/i )
@@ -654,10 +654,10 @@ sub extract_cabs_from_database
     foreach my $onefile ( keys %{$allcabfiles} )
     {
         my $systemcall = $msidb . " -d " . $msidatabase . " -x " . $onefile;
-         system($systemcall);
+         system($systemcall); 		
          push(@all_excluded_cabfiles, $onefile);
     }
-
+    
     \@all_excluded_cabfiles;
 }
 
@@ -668,7 +668,7 @@ sub extract_cabs_from_database
 sub analyze_media_file
 {
     my ($filecontent) = @_;
-
+    
     my %diskidhash = ();
 
     for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
@@ -692,13 +692,13 @@ sub analyze_customaction_file
     my ($filecontent) = @_;
 
     my $register_extensions_exists = 0;
-
+    
     my %table = ();
 
     for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
     {
         if ( ${$filecontent}[$i] =~ /^\s*RegisterExtensions\s+/ )
-        {
+        { 
             $register_extensions_exists = 1;
             last;
         }
@@ -714,7 +714,7 @@ sub analyze_customaction_file
 sub analyze_directory_file
 {
     my ($filecontent) = @_;
-
+    
     my %table = ();
 
     for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
@@ -726,18 +726,18 @@ sub analyze_directory_file
             my $dir = $1;
             my $parent = $2;
             my $name = $3;
-
+            
             if ( $name =~ /^\s*(.*?)\s*\:\s*(.*?)\s*$/ ) { $name = $2; }
             if ( $name =~ /^\s*(.*?)\s*\|\s*(.*?)\s*$/ ) { $name = $2; }
-
+            
             my %helphash = ();
             $helphash{'Directory_Parent'} = $parent;
             $helphash{'DefaultDir'} = $name;
             $table{$dir} = \%helphash;
         }
     }
-
-    return \%table;
+    
+    return \%table;	
 }
 
 #################################################################################
@@ -747,9 +747,9 @@ sub analyze_directory_file
 sub analyze_component_file
 {
     my ($filecontent) = @_;
-
+    
     my %table = ();
-
+    
     for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
     {
         if (( $i == 0 ) || ( $i == 1 ) || ( $i == 2 )) { next; }
@@ -758,12 +758,12 @@ sub analyze_component_file
         {
             my $component = $1;
             my $dir = $3;
-
+            
             $table{$component} = $dir;
         }
     }
 
-    return \%table;
+    return \%table;	
 }
 
 #################################################################################
@@ -773,11 +773,11 @@ sub analyze_component_file
 sub analyze_file_file
 {
     my ($filecontent) = @_;
-
+    
     my %table = ();
     my %fileorder = ();
     my $maxsequence = 0;
-
+    
     for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
     {
         if (( $i == 0 ) || ( $i == 1 ) || ( $i == 2 )) { next; }
@@ -790,16 +790,16 @@ sub analyze_file_file
             my $sequence = $8;
 
             if ( $filename =~ /^\s*(.*?)\s*\|\s*(.*?)\s*$/ ) { $filename = $2; }
-
+            
             my %helphash = ();
             $helphash{'Component'} = $comp;
             $helphash{'FileName'} = $filename;
             $helphash{'Sequence'} = $sequence;
 
             $table{$file} = \%helphash;
-
+            
             $fileorder{$sequence} = $file;
-
+            
             if ( $sequence > $maxsequence ) { $maxsequence = $sequence; }
         }
     }
@@ -813,7 +813,7 @@ sub analyze_file_file
 
 sub create_directory_tree
 {
-    my ($parent, $pathcollector, $fulldir, $dirhash) = @_;
+    my ($parent, $pathcollector, $fulldir, $dirhash) = @_;	
 
     foreach my $dir ( keys %{$dirhash} )
     {
@@ -840,11 +840,11 @@ sub create_directory_structure
     my ($dirhash, $targetdir) = @_;
 
     print "Creating directories\n";
-
+    
     my %fullpathhash = ();
-
+    
     my @startparents = ("TARGETDIR", "INSTALLLOCATION");
-
+    
     foreach $dir (@startparents) { create_directory_tree($dir, \%fullpathhash, $targetdir, $dirhash); }
 
     # Also adding the pathes of the startparents
@@ -852,7 +852,7 @@ sub create_directory_structure
     {
         if ( ! exists($fullpathhash{$dir}) ) { $fullpathhash{$dir} = $targetdir; }
     }
-
+    
     return \%fullpathhash;
 }
 
@@ -863,7 +863,7 @@ sub create_directory_structure
 sub change_privileges
 {
     my ($destfile, $privileges) = @_;
-
+    
     my $localcall = "chmod $privileges " . "\"" . $destfile . "\"";
     system($localcall);
 }
@@ -889,7 +889,7 @@ sub change_privileges_full
 sub create_directory_with_privileges
 {
     my ($directory, $privileges) = @_;
-
+        
     my $returnvalue = 1;
     my $infoline = "";
 
@@ -899,7 +899,7 @@ sub create_directory_with_privileges
         $returnvalue = mkdir($directory, $localprivileges);
 
         if ($returnvalue)
-        {
+        {	
             my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1";
             system($localcall);
         }
@@ -912,22 +912,22 @@ sub create_directory_with_privileges
 }
 
 ######################################################
-# Creating a unique directory with pid extension
+# Creating a unique directory with pid extension	
 ######################################################
 
 sub create_pid_directory
 {
     my ($directory) = @_;
-
+    
     $directory =~ s/\Q$separator\E\s*$//;
-    my $pid = $$;           # process id
-    my $time = time();      # time
-
+    my $pid = $$;			# process id
+    my $time = time();		# time
+    
     $directory = $directory . "_" . $pid . $time;
 
-    if ( ! -d $directory ) { create_directory($directory); }
+    if ( ! -d $directory ) { create_directory($directory); }		
     else { exit_program("ERROR: Directory $directory already exists!"); }
-
+    
     return $directory;
 }
 
@@ -942,7 +942,7 @@ sub copy_files_into_directory_structure
     print "Copying files\n";
 
     my $unopkgfile = "";
-
+    
     for ( my $i = 1; $i <= $maxsequence; $i++ )
     {
         if ( exists($fileorder->{$i}) )
@@ -959,24 +959,24 @@ sub copy_files_into_directory_structure
 
             $destfile = $destdir . $separator . $destfile;
             my $sourcefile = $unpackdir . $separator . $file;
-
+            
             if ( ! -f $sourcefile )
             {
                 # It is possible, that this was an unpacked file
                 # Looking in the dirhash, to find the subdirectory in the installation set (the id is $dirname)
                 # subdir is not recursively analyzed, only one directory.
-
-                my $oldsourcefile = $sourcefile;
+                
+                my $oldsourcefile = $sourcefile;			
                 my $subdir = "";
                 if ( exists($dirhash->{$dirname}->{'DefaultDir'}) ) { $subdir = $dirhash->{$dirname}->{'DefaultDir'} . $separator; }
                 my $realfilename = $filehash->{$file}->{'FileName'};
                 my $localinstalldir = $installdir;
-
+                
                 $localinstalldir =~ s/\\\s*$//;
                 $localinstalldir =~ s/\/\s*$//;
-
+                
                 $sourcefile = $localinstalldir . $separator . $subdir . $realfilename;
-
+                
                 if ( ! -f $sourcefile ) { exit_program("ERROR: File not found: \"$oldsourcefile\" (or \"$sourcefile\")."); }
             }
 
@@ -988,12 +988,12 @@ sub copy_files_into_directory_structure
             if ( $destfile =~ /unopkg\.exe\s*$/ ) { $unopkgfile = $destfile; }
             # if (( $^O =~ /cygwin/i ) && ( $destfile =~ /\.exe\s*$/ )) { change_privileges($destfile, "775"); }
         }
-        # else  # allowing missing sequence numbers ?
+        # else	# allowing missing sequence numbers ?
         # {
-        #   exit_program("ERROR: No file assigned to sequence $i");
+        # 	exit_program("ERROR: No file assigned to sequence $i");
         # }
     }
-
+    
     return ($unopkgfile);
 }
 
@@ -1007,41 +1007,41 @@ sub remove_complete_directory
 
     my @content = ();
     my $infoline = "";
-
+    
     $directory =~ s/\Q$separator\E\s*$//;
 
     if ( -d $directory )
     {
         if ( $start ) { print "Removing directory $directory\n"; }
-
+    
         opendir(DIR, $directory);
         @content = readdir(DIR);
         closedir(DIR);
 
         my $oneitem;
-
+    
         foreach $oneitem (@content)
         {
             if ((!($oneitem eq ".")) && (!($oneitem eq "..")))
             {
                 my $item = $directory . $separator . $oneitem;
 
-                if ( -f $item || -l $item )     # deleting files or links
+                if ( -f $item || -l $item ) 	# deleting files or links
                 {
                     unlink($item);
                 }
 
-                if ( -d $item )     # recursive
+                if ( -d $item ) 	# recursive
                 {
                     remove_complete_directory($item, 0);
                 }
             }
         }
-
+        
         # try to remove empty directory
         my $returnvalue = rmdir $directory;
         if ( ! $returnvalue ) { print "Warning: Problem with removing empty dir $directory\n"; }
-    }
+    }	
 }
 
 ####################################################################################
@@ -1051,13 +1051,13 @@ sub remove_complete_directory
 sub get_temppath
 {
     my $temppath = "";
-
+    
     if (( $ENV{'TMP'} ) || ( $ENV{'TEMP'} ))
     {
         if ( $ENV{'TMP'} ) { $temppath = $ENV{'TMP'}; }
         elsif ( $ENV{'TEMP'} )  { $temppath = $ENV{'TEMP'}; }
 
-        $temppath =~ s/\Q$separator\E\s*$//;    # removing ending slashes and backslashes
+        $temppath =~ s/\Q$separator\E\s*$//;	# removing ending slashes and backslashes
         $temppath = $temppath . $separator . $globaltempdirname;
         create_directory_with_privileges($temppath, "777");
 
@@ -1071,7 +1071,7 @@ sub get_temppath
         if ( $^O =~ /cygwin/i )
         {
             $temppath =~ s/\\/\\\\/g;
-            chomp( $temppath = qx{cygpath -w "$temppath"} );
+            chomp( $temppath = qx{cygpath -w "$temppath"} ); 
         }
 
         $savetemppath = $temppath;
@@ -1080,7 +1080,7 @@ sub get_temppath
     {
         exit_program("ERROR: Could not set temporary directory (TMP and TEMP not set!).");
     }
-
+    
     return $temppath;
 }
 
@@ -1096,11 +1096,11 @@ sub register_extensions_sync
     {
         my $logtext = "ERROR: Failed to determine \"prereg\" folder for extension registration! Please check your installation set.";
         print $logtext . "\n";
-        exit_program($logtext);
+        exit_program($logtext);		
     }
 
     my $from = cwd();
-
+    
     my $path = $unopkgfile;
     get_path_from_fullqualifiedname(\$path);
     $path =~ s/\\\s*$//;
@@ -1109,7 +1109,7 @@ sub register_extensions_sync
     my $executable = $unopkgfile;
     make_absolute_filename_to_relative_filename(\$executable);
 
-    chdir($path);
+    chdir($path);		
 
     if ( ! $path_displayed )
     {
@@ -1126,7 +1126,7 @@ sub register_extensions_sync
     }
 
     $preregdir =~ s/\/\s*$//g;
-
+    
     my $systemcall = $executable . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file:///" . $preregdir . "\"" . " -env:UserInstallation=file:///" . $localtemppath . " 2\>\&1 |";
 
     print "... $systemcall\n";
@@ -1137,7 +1137,7 @@ sub register_extensions_sync
     while (<UNOPKG>) {push(@unopkgoutput, $_); }
     close (UNOPKG);
 
-    my $returnvalue = $?;   # $? contains the return value of the systemcall
+    my $returnvalue = $?;	# $? contains the return value of the systemcall
 
     if ($returnvalue)
     {
@@ -1145,7 +1145,7 @@ sub register_extensions_sync
         for ( my $j = 0; $j <= $#unopkgoutput; $j++ ) { print "$unopkgoutput[$j]"; }
         exit_program("ERROR: $systemcall failed!");
     }
-
+    
     chdir($from);
 }
 
@@ -1156,8 +1156,8 @@ sub register_extensions_sync
 sub register_extensions
 {
     my ($unopkgfile, $temppath, $preregdir) = @_;
-
-    print "Registering extensions:\n";
+    
+    print "Registering extensions:\n"; 
 
     if (( ! -f $unopkgfile ) || ( $unopkgfile eq "" ))
     {
@@ -1183,9 +1183,9 @@ sub read_file
 
     open( IN, "<$localfile" ) || exit_program("ERROR: Cannot open file $localfile for reading");
 
-    #   Don't use "my @localfile = <IN>" here, because
-    #   perl has a problem with the internal "large_and_huge_malloc" function
-    #   when calling perl using MacOS 10.5 with a perl built with MacOS 10.4
+    #	Don't use "my @localfile = <IN>" here, because
+    #	perl has a problem with the internal "large_and_huge_malloc" function
+    #	when calling perl using MacOS 10.5 with a perl built with MacOS 10.4
     while ( $line = <IN> ) {
         push @localfile, $line;
     }
@@ -1196,13 +1196,13 @@ sub read_file
 }
 
 ###############################################################
-# Setting the time string for the
-# Summary Information stream in the
+# Setting the time string for the 
+# Summary Information stream in the 
 # msi database of the admin installations.
 ###############################################################
 
 sub get_sis_time_string
-{
+{	
     # Syntax: <yyyy/mm/dd hh:mm:ss>
     my $second = (localtime())[0];
     my $minute = (localtime())[1];
@@ -1211,21 +1211,21 @@ sub get_sis_time_string
     my $month = (localtime())[4];
     my $year = 1900 + (localtime())[5];
     $month++;
-
+    
     if ( $second < 10 ) { $second = "0" . $second; }
     if ( $minute < 10 ) { $minute = "0" . $minute; }
     if ( $hour < 10 ) { $hour = "0" . $hour; }
     if ( $day < 10 ) { $day = "0" . $day; }
     if ( $month < 10 ) { $month = "0" . $month; }
-
+    
     my $timestring = $year . "/" . $month . "/" . $day . " " . $hour . ":" . $minute . ":" . $second;
-
+        
     return $timestring;
 }
 
 ###############################################################
-# Writing content of administrative installations into
-# Summary Information Stream of msi database.
+# Writing content of administrative installations into 
+# Summary Information Stream of msi database. 
 # This is required for example for following
 # patch processes using Windows Installer service.
 ###############################################################
@@ -1235,10 +1235,10 @@ sub write_sis_info
     my ($msidatabase) = @_;
 
     print "Setting SIS in msi database\n";
-
+    
     if ( ! -f $msidatabase ) { exit_program("ERROR: Cannot find file $msidatabase"); }
 
-    my $msiinfo = "msiinfo.exe";    # Has to be in the path
+    my $msiinfo = "msiinfo.exe";	# Has to be in the path
     my $infoline = "";
     my $systemcall = "";
     my $returnvalue = "";
@@ -1247,20 +1247,20 @@ sub write_sis_info
     # -w 4   (source files are unpacked),  wordcount
     # -s <date of admin installation>, LastPrinted, Syntax: <yyyy/mm/dd hh:mm:ss>
     # -l <person_making_admin_installation>, LastSavedBy
-
+    
     my $wordcount = 4;  # Unpacked files
     my $lastprinted = get_sis_time_string();
     my $lastsavedby = "Installer";
-
+    
     my $localmsidatabase = $msidatabase;
-
+    
     if( $^O =~ /cygwin/i )
     {
         $localmsidatabase = qx{cygpath -w "$localmsidatabase"};
         $localmsidatabase =~ s/\\/\\\\/g;
         $localmsidatabase =~ s/\s*$//g;
     }
-
+                        
     $systemcall = $msiinfo . " " . "\"" . $localmsidatabase . "\"" . " -w " . $wordcount . " -s " . "\"" . $lastprinted . "\"" . " -l $lastsavedby";
 
     $returnvalue = system($systemcall);
@@ -1269,7 +1269,7 @@ sub write_sis_info
     {
         $infoline = "ERROR: Could not execute $systemcall !\n";
         exit_program($infoline);
-    }
+    }	
 }
 
 ###############################################################
@@ -1281,11 +1281,11 @@ sub convert_timestring
     my ($secondstring) = @_;
 
     my $timestring = "";
-
-    if ( $secondstring < 60 )    # less than a minute
+    
+    if ( $secondstring < 60 )	 # less than a minute
     {
         if ( $secondstring < 10 ) { $secondstring = "0" . $secondstring; }
-        $timestring = "00\:$secondstring min\.";
+        $timestring = "00\:$secondstring min\.";	
     }
     elsif ( $secondstring < 3600 )
     {
@@ -1296,7 +1296,7 @@ sub convert_timestring
         if ( $seconds < 10 ) { $seconds = "0" . $seconds; }
         $timestring = "$minutes\:$seconds min\.";
     }
-    else    # more than one hour
+    else	# more than one hour
     {
         my $hours = $secondstring / 3600;
         my $secondstring = $secondstring % 3600;
@@ -1307,9 +1307,9 @@ sub convert_timestring
         if ( $hours < 10 ) { $hours = "0" . $hours; }
         if ( $minutes < 10 ) { $minutes = "0" . $minutes; }
         if ( $seconds < 10 ) { $seconds = "0" . $seconds; }
-        $timestring = "$hours\:$minutes\:$seconds hours";
+        $timestring = "$hours\:$minutes\:$seconds hours";		
     }
-
+    
     return $timestring;
 }
 
@@ -1343,9 +1343,9 @@ print("Destination directory: $targetdir\n" );
 
 my $helperdir = $temppath . $separator . "installhelper";
 create_directory($helperdir);
-
+    
 # Get File.idt, Component.idt and Directory.idt from database
-
+    
 my $tablelist = "File Directory Component Media CustomAction";
 extract_tables_from_database($databasepath, $helperdir, $tablelist);
 
@@ -1359,7 +1359,7 @@ if ( ! -f $filename ) { exit_program("ERROR: Could not find required file: $file
 my $filecontent = read_file($filename);
 my $cabfilehash = analyze_media_file($filecontent);
 
-# Check, if there are internal cab files
+# Check, if there are internal cab files 
 my ( $contains_internal_cabfiles, $all_internal_cab_files) = check_for_internal_cabfiles($cabfilehash);
 
 if ( $contains_internal_cabfiles )
@@ -1375,7 +1375,7 @@ if ( $contains_internal_cabfiles )
     foreach my $cabfile ( @{$all_excluded_cabs} ) { unpack_cabinet_file($cabfile, $unpackdir); }
     chdir($from);
 }
-
+    
 # Unpack all cab files into $helperdir, cab files must be located next to msi database
 my $installdir = $databasepath;
 
@@ -1385,7 +1385,7 @@ my $databasefilename = $databasepath;
 make_absolute_filename_to_relative_filename(\$databasefilename);
 
 my $cabfiles = find_file_with_file_extension("cab", $installdir);
-
+    
 if (( $#{$cabfiles} < 0 ) && ( ! $contains_internal_cabfiles )) { exit_program("ERROR: Did not find any cab file in directory $installdir"); }
 
 print "Unpacking files from cabinet file(s)\n";
@@ -1394,16 +1394,16 @@ for ( my $i = 0; $i <= $#{$cabfiles}; $i++ )
     my $cabfile = $installdir . $separator . ${$cabfiles}[$i];
     unpack_cabinet_file($cabfile, $unpackdir);
 }
-
+    
 # Reading tables
 $filename = $helperdir . $separator . "Directory.idt";
 $filecontent = read_file($filename);
 my $dirhash = analyze_directory_file($filecontent);
-
+    
 $filename = $helperdir . $separator . "Component.idt";
 $filecontent = read_file($filename);
 my $componenthash = analyze_component_file($filecontent);
-
+    
 $filename = $helperdir . $separator . "File.idt";
 $filecontent = read_file($filename);
 my ( $filehash, $fileorder, $maxsequence ) = analyze_file_file($filecontent);
@@ -1414,7 +1414,7 @@ my $fullpathhash = create_directory_structure($dirhash, $targetdir);
 # Copying files
 my ($unopkgfile) = copy_files_into_directory_structure($fileorder, $filehash, $componenthash, $fullpathhash, $maxsequence, $unpackdir, $installdir, $dirhash);
 if ( $^O =~ /cygwin/i ) { change_privileges_full($targetdir); }
-
+    
 my $msidatabase = $targetdir . $separator . $databasefilename;
 my $copyreturn = copy($databasepath, $msidatabase);
 if ( ! $copyreturn) { exit_program("ERROR: Could not copy $source to $dest\n"); }
diff --git a/setup_native/scripts/downloadscript.sh b/setup_native/scripts/downloadscript.sh
index e138ae057dd0..e399b05944ee 100644
--- a/setup_native/scripts/downloadscript.sh
+++ b/setup_native/scripts/downloadscript.sh
@@ -62,7 +62,7 @@ if [ -x /usr/bin/sum ] ; then
 
     sum=`$tail_prog +$linenum $0 | /usr/bin/sum`
     sum=`echo $sum | awk '{ print $1 }'`
-
+    
     if [ $sum != $checksum ]; then
         echo "The download file appears to be corrupted. Please download PRODUCTNAMEPLACEHOLDER again."
         exit 1
diff --git a/setup_native/scripts/install_create.pl b/setup_native/scripts/install_create.pl
index c49f22ddbc70..0aa8989c67d2 100755
--- a/setup_native/scripts/install_create.pl
+++ b/setup_native/scripts/install_create.pl
@@ -15,9 +15,9 @@ ENDHELP
   exit;
   }
 
-$infile     = $ARGV[0];
-$library    = $ARGV[1];
-$outfile    = $ARGV[2];
+$infile		= $ARGV[0];
+$library	= $ARGV[1];
+$outfile	= $ARGV[2];
 $infile     =~ tr/[A-Z]/[a-z]/;
 
 # read script header
diff --git a/setup_native/scripts/install_linux.sh b/setup_native/scripts/install_linux.sh
index c33fe989554f..12801b62f4fe 100644
--- a/setup_native/scripts/install_linux.sh
+++ b/setup_native/scripts/install_linux.sh
@@ -10,10 +10,10 @@ help()
 {
   echo
   echo "User Mode Installation script for developer and knowledgeable early access tester"
-  echo
+  echo 
   echo "This installation method is not intended for use in a production environment!"
   echo "Using this script is unsupported and completely at your own risk"
-  echo
+  echo 
   echo "Usage:" $0 [-lU] "<rpm-source-dir> <office-installation-dir>"
   echo "    <rpm-source-dir>: directory *only* containing the Linux rpm packages to be installed"
   echo "                      or language pack shell script containing the rpm packages"
@@ -43,9 +43,9 @@ try_to_unpack_languagepack_file()
   else
     printf "\nERROR: First parameter $FILENAME is a file, but no language pack shell script.\n"
     echo $USAGE
-    exit 2
+    exit 2  
   fi
-
+  
   echo "Unpacking shell script $FILENAME"
   TAILLINE=`head --lines=20 $FILENAME | sed --quiet 's/linenum=//p'`
 
@@ -56,7 +56,7 @@ try_to_unpack_languagepack_file()
 
   # Setting the new package path, in which the packages exist
   PACKAGE_PATH=$UNPACKDIR
-
+  
   # Setting variable UPDATE, because an Office installation has to exist, if a language pack shall be installed
   UPDATE="yes"
 }
@@ -100,7 +100,7 @@ fi
 PACKAGE_PATH=$1
 
 #
-# If the first parameter is a shell script (download installation set), the packages have to
+# If the first parameter is a shell script (download installation set), the packages have to 
 # be unpacked into temp directory
 #
 
@@ -130,7 +130,7 @@ else
 fi
 
 #
-# Determine whether this should be an update or a fresh install
+# Determine whether this should be an update or a fresh install 
 #
 
 INSTALLDIR=$2
@@ -139,7 +139,7 @@ RPM_DB_PATH=${INSTALLDIR}/var/lib/rpm
 # Check for versionrc
 if [ -f ${INSTALLDIR}/program/versionrc ]; then VERSIONRC=versionrc; fi
 
-if [ "$UPDATE" = "ask" ]
+if [ "$UPDATE" = "ask" ] 
 then
   PRODUCT=`sed --silent -e "
 /^buildid=/ {
@@ -198,7 +198,7 @@ then
   if [ ! "${RPM_DB_PATH:0:1}" = "/" ]; then
     RPM_DB_PATH=`cd ${RPM_DB_PATH}; pwd`
   fi
-
+  
   # we should use --freshen for updates to not add languages with patches, but this will break
   # language packs, so leave it for now ..
 #  RPMCMD="--freshen"
@@ -225,7 +225,7 @@ else
   if [ "$ADD" = "no" ]; then
     rpm --initdb --dbpath $RPM_DB_PATH
   fi
-
+  
   # Default install command
   RPMCMD="--install"
 fi
@@ -245,7 +245,7 @@ for i in $RPMLIST ; do
 done
 
 #
-# Perform the installation
+# Perform the installation 
 #
 
 echo
diff --git a/setup_native/scripts/install_solaris.sh b/setup_native/scripts/install_solaris.sh
index 624999f44f37..7c4cc7540540 100644
--- a/setup_native/scripts/install_solaris.sh
+++ b/setup_native/scripts/install_solaris.sh
@@ -7,12 +7,12 @@ USAGE="Usage: $0 [-a] [-l] [-h] <pkg-source-dir> <office-installation-dir>"
 
 help()
 {
-  echo
+  echo 
   echo "User Mode Installation script for developer and knowledgeable early access tester"
-  echo
+  echo 
   echo "This installation method is not intended for use in a production environment!"
   echo "Using this script is unsupported and completely at your own risk"
-  echo
+  echo 
   echo "Usage:" $0 "<pkg-source-dir> <office-installation-dir> [-l]"
   echo "    <pkg-source-dir>:       directory *only* containing the Solaris pkg packages to be installed"
   echo "                            or language pack shell script containing the Solaris pkg packages"
@@ -40,13 +40,13 @@ try_to_unpack_languagepack_file()
   else
     printf "\nERROR: First parameter $FILENAME is a file, but no language pack shell script.\n"
     echo $USAGE
-    exit 2
+    exit 2  
   fi
-
+  
   echo "Unpacking shell script $FILENAME"
   # TAILLINE=`head -n 20 $FILENAME | sed --quiet 's/linenum=//p'`
   TAILLINE=`head -n 20 $FILENAME | sed -n 's/linenum=//p'`
-
+  
   if [ -x "/usr/bin/mktemp" ]  # available in Solaris 10
   then
     UNPACKDIR=`mktemp -d`
@@ -54,13 +54,13 @@ try_to_unpack_languagepack_file()
     UNPACKDIR=/var/tmp/install_$$
     mkdir $UNPACKDIR
   fi
-
+  
   echo $UNPACKDIR
   tail +$TAILLINE $FILENAME | gunzip | (cd $UNPACKDIR; tar xvf -)
 
   # Setting the new package path, in which the packages exist
   PACKAGE_PATH=$UNPACKDIR
-
+  
   # Setting variable UPDATE, because an Office installation has to exist, if a language pack shall be installed
   UPDATE="yes"
 }
@@ -115,7 +115,7 @@ then
 fi
 
 # Determine whether this is a patch or a regular install set ..
-/bin/bash -c "ls $1/*/patchinfo >/dev/null 2>&1"
+/bin/bash -c "ls $1/*/patchinfo >/dev/null 2>&1" 
 if [ "$?" = 0 ]
 then
   UPDATE="yes"
@@ -136,7 +136,7 @@ else
   fi
 
   #
-  # If the first parameter is a shell script (download installation set), the packages have to
+  # If the first parameter is a shell script (download installation set), the packages have to 
   # be unpacked into temp directory
   #
   if [ -f "$PACKAGE_PATH" ]
@@ -147,7 +147,7 @@ else
   #
   # Create sed filter script for unwanted packages
   #
-
+  
   cat > /tmp/userinstall_filer.$$ << EOF
 /SUNWadabas/d
 /^SUNWj[0-9]/d
@@ -155,12 +155,12 @@ else
 /-shared-mime-info/d
 /-cde/d
 EOF
-
+ 
   # Do not install gnome-integration package on systems without GNOME
   pkginfo -q SUNWgnome-vfs
   if [ $? -ne 0 ]
   then
-
+  
     echo '/-gnome/d' >> /tmp/userinstall_filer.$$
   fi
 
@@ -169,20 +169,20 @@ EOF
   if [ ! -x $PKGDEP ]; then
     PKGDEP="get_pkg_list"
   fi
-
+  
   #
   # Get the list of packages to install
   #
-
+  
   PKG_LIST=`$PKGDEP $PACKAGE_PATH | sed -f  /tmp/userinstall_filer.$$`
   rm -f /tmp/userinstall_filer.$$
-
+  
   if [ -z "$PKG_LIST" ]
   then
     printf "\n$0: No packages found in $PACKAGE_PATH\n"
     exit 2
   fi
-
+  
   echo "Packages found:"
   for i in $PKG_LIST ; do
     echo $i
@@ -269,7 +269,7 @@ linenum=???
 tail +$linenum $0 > $GETUID_SO
 
 #
-# Perform the installation
+# Perform the installation 
 #
 if [ "$UPDATE" = "yes" ]
 then
@@ -285,11 +285,11 @@ then
     mkdir -p ${INSTALL_ROOT}/var/sadm/system/admin 2>/dev/null
     cp -f /var/sadm/system/admin/INST_RELEASE ${INSTALL_ROOT}/var/sadm/system/admin/INST_RELEASE
   fi
-
+  
   # The case UPDATE="yes" is valid for patch installation and for language packs.
   # For patches the variable PKG_LIST is empty, for language packs it is not empty.
   # Patches have to be installed with patchadd, language packs with pkgadd
-
+  
   if [ -z "${PKG_LIST}" ]
   then
     LD_PRELOAD_32=$GETUID_SO /usr/sbin/patchadd -R ${INSTALL_ROOT} -M ${PATCH_PATH} ${PATCH_LIST} 2>&1 | grep -v '/var/sadm/patch' || pkg_error
@@ -303,11 +303,11 @@ else
   for i in ${PKG_LIST}; do
     mkdir -m 0755 -p ${INSTALL_ROOT}`pkgparam -d ${PACKAGE_PATH} $i BASEDIR` 2>/dev/null
   done
-
+  
   if [ ! "${INSTALL_ROOT:0:1}" = "/" ]; then
     INSTALL_ROOT=`cd ${INSTALL_ROOT}; pwd`
   fi
-
+  
   echo "####################################################################"
   echo "#     Installation of the found packages                           #"
   echo "####################################################################"
diff --git a/setup_native/scripts/javaloader.sh b/setup_native/scripts/javaloader.sh
index e23505f586b0..4e133a8959ff 100644
--- a/setup_native/scripts/javaloader.sh
+++ b/setup_native/scripts/javaloader.sh
@@ -41,7 +41,7 @@ start_java()
     if [ "x" != "x$jrefile" ]; then
         jrecopy=-DJRE_FILE=$jrefile
     fi
-
+    
     # run the installer class file
     echo $java_runtime $home $log_module_states $getuid_path $jrecopy -jar $jarfilename
     $java_runtime $home $log_module_states $getuid_path $jrecopy -jar $jarfilename
@@ -61,7 +61,7 @@ do_exit()
         exitstring="$exitstring (exit code $errorcode)"
     fi
 
-    # simply echo the exitstring or open a xterm
+    # simply echo the exitstring or open a xterm 
     # -> dependent from tty
 
     if tty ; then
@@ -82,27 +82,27 @@ EOF
 
         # searching for xterm in path
         xtermname="xterm"
-        xtermfound="no";
+        xtermfound="no"; 
         for i in `echo $PATH | sed -e 's/^:/.:/g' -e 's/:$/:./g' -e 's/::/:.:/g' -e 's/:/ /g'`; do
             if [ -x "$i/$xtermname" -a ! -d "$i/$xtermname" ]; then
                 xtermname="$i/$xtermname"
-                xtermfound="yes"
+                xtermfound="yes" 
                 break
             fi
-        done
-
+        done    
+    
         if [ $xtermfound = "no" -a "`uname -s`" = "SunOS" ]; then
             if [ -x /usr/openwin/bin/xterm ]; then
                 xtermname=/usr/openwin/bin/xterm
                 xtermfound="yes"
-            fi
+            fi   
         fi
-
+        
         if [ $xtermfound = "yes" ]; then
             $xtermname -e $errorfile
         fi
     fi
-
+    
     cleanup
 
     exit $errorcode
@@ -123,7 +123,7 @@ set_jre_for_uninstall()
         if [ ! -f $packagepath/$jrefile ]; then
             errortext="Error: Java Runtime Environment (JRE) not found in directory: $packagepath"
             errorcode="4"
-            do_exit
+            do_exit    
         fi
     fi
 }
@@ -131,10 +131,10 @@ set_jre_for_uninstall()
 install_linux_rpm()
 {
     # Linux requires usage of rpm2cpio to install JRE with user privileges
-    # 1. --relocate /usr/java=/var/tmp does not work, because not all files are
+    # 1. --relocate /usr/java=/var/tmp does not work, because not all files are 
     #    relocatable. Some are always installed into /etc
     # 2. --root only works with root privileges. With user privileges only the
-    #    database is shifted, but not the files.
+    #    database is shifted, but not the files.   
 
     # On Linux currently rpm2cpio is required (and rpm anyhow)
 
@@ -147,7 +147,7 @@ install_linux_rpm()
     fi
 
     find_rpm()
-
+    
     if [ ! "$rpm_found" = "yes" ]; then
         errortext="Error: Did not find rpm. rpm is currently required for installations on Linux."
         errorcode="12"
@@ -174,7 +174,7 @@ install_linux_rpm()
     if [ ! -f $packagepath/$jrefile ]; then
         errortext="Error: Java Runtime Environment (JRE) not found in directory: $packagepath"
         errorcode="4"
-        do_exit
+        do_exit    
     fi
 
     PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar  lib/ext/localedata.jar lib/plugin.jar lib/javaws.jar lib/deploy.jar"
@@ -185,7 +185,7 @@ install_linux_rpm()
 
     tempjrefile=$tempdir/$jrefile
     cp $packagepath/$jrefile $tempjrefile
-
+        
     if [ ! -f "$tempjrefile" ]; then
         errortext="Error: Failed to copy Java Runtime Environment (JRE) temporarily."
         errorcode="5"
@@ -226,7 +226,7 @@ install_linux_rpm()
                     ;;
             esac
         done
-
+    
         # echo "Checksum 1: A1: $sumA1 B1: $sumB1"
         # echo "Checksum 2: A2: $sumA2 B2: $sumB2"
 
@@ -238,7 +238,7 @@ install_linux_rpm()
     else
         echo "Can't find /usr/bin/sum to do checksum. Continuing anyway."
     fi
-
+        
     # start to install jre
     echo "Extracting ..."
     olddir=`pwd`
@@ -263,7 +263,7 @@ install_linux_rpm()
 
     UNPACK_EXE=$javahome/bin/unpack200
     if [ -f $UNPACK_EXE ]; then
-        chmod +x $UNPACK_EXE
+        chmod +x $UNPACK_EXE 
         packerror=""
         for i in $PACKED_JARS; do
             if [ -f $javahome/`dirname $i`/`basename $i .jar`.pack ]; then
@@ -281,7 +281,7 @@ install_linux_rpm()
                 rm -f $javahome/`dirname $i`/`basename $i .jar`.pack
             fi
         done
-        if [  "$packerror" = "1" ]; then
+        if [  "$packerror" = "1" ]; then 
             if [ -d $javahome ]; then
                 /bin/rm -rf $javahome
             fi
@@ -309,7 +309,7 @@ install_linux_rpm()
     if [ x$ARCH = "x32" ] && [ -f "$javahome/bin/java" ]; then
         "$javahome/bin/java" -client -Xshare:dump > /dev/null 2>&1
     fi
-
+        
     java_runtime=$tempdir/$javahome/bin/java
 
     # Make symbolic links to all TrueType font files installed in the system
@@ -341,7 +341,7 @@ find_rpm2cpio()
             rpm2cpio_found="yes"
             break
         fi
-    done
+    done    
 }
 
 find_rpm()
@@ -352,7 +352,7 @@ find_rpm()
             rpm_found="yes"
             break
         fi
-    done
+    done    
 }
 
 check_architecture()
@@ -360,22 +360,22 @@ check_architecture()
     # Check, if system and installation set fit together (x86 and sparc).
     # If not, throw a warning.
     # Architecture of the installation set is saved in file "installdata/xpd/setup.xpd"
-    # <architecture>sparc</architecture> or <architecture>i386</architecture>
+    # <architecture>sparc</architecture> or <architecture>i386</architecture> 
     # Architecture of system is determined with "uname -p"
-
+    
     setupxpdfile="installdata/xpd/setup.xpd"
 
     if [ -f $setupxpdfile ]; then
-        platform=`uname -p` # valid values are "sparc" or "i386"
+        platform=`uname -p`	# valid values are "sparc" or "i386"
         searchstring="<architecture>$platform</architecture>"
         match=`cat $setupxpdfile | grep $searchstring`
 
         if [ -z "$match" ]; then
             # architecture does not fit, warning required
             if [ "$platform" = "sparc" ]; then
-                echo "Warning: This is an attempt to install Solaris x86 packages on Solaris Sparc."
+                echo "Warning: This is an attempt to install Solaris x86 packages on Solaris Sparc."    
             else
-                echo "Warning: This is an attempt to install Solaris Sparc packages on Solaris x86."
+                echo "Warning: This is an attempt to install Solaris Sparc packages on Solaris x86."                
             fi
         fi
     fi
@@ -390,7 +390,7 @@ find_solaris_jre()
             java_runtime_found="yes"
             break
         fi
-    done
+    done    
 }
 
 check_jre_version()
@@ -430,15 +430,15 @@ while getopts hj: opt; do
             java_runtime="${OPTARG}"
             if [ ! -f "$java_runtime" ]; then
                 errortext="Error: Invalid java runtime $java_runtime, file does not exist."
-                errorcode="2"
+                errorcode="2" 
                 do_exit
-            fi
+            fi 
             if [ ! -x "$java_runtime" ]; then
                 errortext="Error: Invalid java runtime $java_runtime, not an executable file."
-                errorcode="3"
+                errorcode="3" 
                 do_exit
-            fi
-            java_runtime_found="yes";
+            fi 
+            java_runtime_found="yes"; 
             ;;
         h)  echo ${USAGE}
             errortext=""
diff --git a/setup_native/scripts/langpackscript.sh b/setup_native/scripts/langpackscript.sh
index bf221909ebf4..9ea5a9a70550 100644
--- a/setup_native/scripts/langpackscript.sh
+++ b/setup_native/scripts/langpackscript.sh
@@ -111,19 +111,19 @@ echo "Unpacking and installing..."
 #    index=1
 #    for s in $sum
 #    do
-#   case $index in
-#   1)  sum1=$s;
+#	case $index in
+#	1)  sum1=$s;
 #     index=2;
-#       ;;
-#   2)  sum2=$s;
-#       index=3;
-#       ;;
-#   esac
+#	    ;;
+#	2)  sum2=$s;
+#	    index=3;
+#	    ;;
+#	esac
 #    done
 #    if expr $sum1 != <sum1replace> || expr $sum2 != <sum2replace> ; then
-#   echo "The download file appears to be corrupted.  Please refer"
-#   echo "to the Troubleshooting section of the Installation"
-#   exit 1
+#	echo "The download file appears to be corrupted.  Please refer"
+#	echo "to the Troubleshooting section of the Installation"
+#	exit 1
 #   fi
 #else
 #    echo "Can't find /usr/bin/sum to do checksum.  Continuing anyway."
diff --git a/setup_native/scripts/linuxpatchscript.sh b/setup_native/scripts/linuxpatchscript.sh
index 97dc39310a89..5378d8d84e4d 100644
--- a/setup_native/scripts/linuxpatchscript.sh
+++ b/setup_native/scripts/linuxpatchscript.sh
@@ -4,7 +4,7 @@ MYUID=`id | sed "s/(.*//g" | sed "s/.*=//"`
 
 if [ $MYUID -ne 0 ]
 then
-    echo You need to have super-user permissions to run this patch script
+    echo You need to have super-user permissions to run this patch script 
     exit 1
 fi
 
@@ -57,7 +57,7 @@ if [ "x$KDERPM" != "x" ]; then
 fi
 
 echo
-rpm --upgrade -v --hash --prefix $PRODUCTINSTALLLOCATION --notriggers $RPMLIST
+rpm --upgrade -v --hash --prefix $PRODUCTINSTALLLOCATION --notriggers $RPMLIST 
 echo
 
 # Some RPM versions have problems with -U and --prefix
diff --git a/setup_native/scripts/source/getuid.c b/setup_native/scripts/source/getuid.c
index 1e7989ed1eb4..80c91f2ab3db 100644
--- a/setup_native/scripts/source/getuid.c
+++ b/setup_native/scripts/source/getuid.c
@@ -17,7 +17,7 @@ extern "C" {
 int   chown  (const char *path, uid_t owner, gid_t group) {return 0;}
 int   lchown (const char *path, uid_t owner, gid_t group) {return 0;}
 int   fchown (int fildes, uid_t owner, gid_t group)       {return 0;}
-
+ 
 uid_t getuid  (void) {return 0;}
 int stat(const char *path,  struct stat *buf);
 #ifdef __notdef__
@@ -123,7 +123,7 @@ int __lxstat64(int n, const char *path, struct stat64 *buf)
     if (buf != NULL)
     {
         buf->st_uid = 0;
-        buf->st_gid = 0;
+        buf->st_gid = 0; 
     }
     return ret;
 }
diff --git a/setup_native/scripts/stclient_wrapper.sh b/setup_native/scripts/stclient_wrapper.sh
index 52ff8abcb0ee..baacf14b794d 100644
--- a/setup_native/scripts/stclient_wrapper.sh
+++ b/setup_native/scripts/stclient_wrapper.sh
@@ -26,12 +26,12 @@ do
     -i)  INSTANCE_URN="$2"; shift;;
     -P)  PARENT_PRODUCT_NAME="$2"; shift;;
     -S)  PRODUCT_SOURCE="$2"; shift;;
-    --)  shift; break;;
+    --)	 shift; break;;
     -*)
         echo >&2 \
         "usage: $0 -p <product name> -e <product version> -t <urn> -S <source> -P <parent product name> [-i <instance urn>]"
         exit 1;;
-    *)  break;;
+    *)  break;;	
     esac
     shift
 done
@@ -46,7 +46,7 @@ if [ ! -n $INSTANCE_URN ]; then
   [ ${EXITCODE} -eq 0 -o  ${EXITCODE} -eq 225 ] || exit 1
 
   # early versions did not have a dedicated exitcode, so need to compare text output
-  [ ${EXITCODE} -eq 225 -o "${TEST}" = "No records found" ] || echo "${TEST}"; exit 0
+  [ ${EXITCODE} -eq 225 -o "${TEST}" = "No records found" ] || echo "${TEST}"; exit 0 
 fi
 
 uname=`uname -p`
diff --git a/setup_native/scripts/uninstall_linux.sh b/setup_native/scripts/uninstall_linux.sh
index 9ec68855c927..4bd4e1853083 100644
--- a/setup_native/scripts/uninstall_linux.sh
+++ b/setup_native/scripts/uninstall_linux.sh
@@ -6,7 +6,7 @@
 
 if [ $# -ne 1 ]
 then
-  echo
+  echo 
   echo "Usage:" $0 "<office-installation-dir>"
   echo "    <inst-destination-dir>: directory where the office to be removed is installed"
   echo
diff --git a/setup_native/scripts/update.sh b/setup_native/scripts/update.sh
index 2aa727944012..1b3785b3894c 100644
--- a/setup_native/scripts/update.sh
+++ b/setup_native/scripts/update.sh
@@ -30,17 +30,17 @@ make_tempfile() {
     touch $TMPCMD
     echo $TMPCMD
   fi
-
+  
 }
 
-#
+# 
 # make_command_file - generate a command file to pass to xterm & co
 #
 run_in_terminal () {
 
   TMPCMD=`make_tempfile 'OpenOffice.org-Online-Update'`
-
-  cat >> $TMPCMD
+  
+  cat >> $TMPCMD 
 
   cat >> $TMPCMD << \EOF
 if [ $? -eq 0 -a ! -z "$DISPLAY" ]; then
@@ -59,7 +59,7 @@ EOF
 }
 
 #
-# run the command line passed as positional parameters either via
+# run the command line passed as positional parameters either via 
 # gksu/kdesu or via su command in a terminal emulator.
 #
 elevate() {
@@ -100,7 +100,7 @@ elevate() {
 
 update_pkg() {
   ADMINFILE=`make_tempfile 'LibreOffice-Online-Update-admin'`
-
+  
 cat >> $ADMINFILE << EOF
 action=nocheck
 conflict=nocheck
@@ -109,15 +109,15 @@ idepend=nocheck
 rdepend=nocheck
 mail=
 EOF
-
+  
   PKGLIST=""
   for i in `cd $1; ls -d *`; do
     pkginfo -q $i && PKGLIST="$PKGLIST $i"
   done
-
+  
   pkgrm -n -a $ADMINFILE $PKGLIST
   pkgadd -n -a $ADMINFILE -d $1 $PKGLIST
-
+  
   rm -f $ADMINFILE
 }
 
@@ -192,4 +192,4 @@ if [ "$CMD" = "update" ]; then
   fi
 else
   Usage
-fi
+fi    
diff --git a/setup_native/source/opensolaris/bundledextensions/ooo_bundled_extensions.xml b/setup_native/source/opensolaris/bundledextensions/ooo_bundled_extensions.xml
index 66acd508c281..3dc4a1118ba5 100644
--- a/setup_native/source/opensolaris/bundledextensions/ooo_bundled_extensions.xml
+++ b/setup_native/source/opensolaris/bundledextensions/ooo_bundled_extensions.xml
@@ -27,8 +27,8 @@
       <method_credential user="root" group="root" />
     </method_context>
   </exec_method>
-
-
+  
+  
   <exec_method
      type="method" name="stop"
      exec="/lib/svc/method/svc-ooo_bundled_extensions stop"
@@ -37,17 +37,17 @@
       <method_credential user="root" group="root" />
     </method_context>
   </exec_method>
-
+  
   <property_group name="startd" type="framework">
     <propval name="duration" type="astring"
-         value="transient" />
+         value="transient" /> 
     <propval name="ignore_error"
          type="astring" value="core,signal" />
-
-  </property_group>
+    
+  </property_group>  
 
   <stability value="Unstable" />
-
+  
   <template>
     <common_name>
       <loctext xml:lang="C">
diff --git a/setup_native/source/ulfconv/ulfconv.cxx b/setup_native/source/ulfconv/ulfconv.cxx
index bdcc98595f5c..201685cd7f9e 100644
--- a/setup_native/source/ulfconv/ulfconv.cxx
+++ b/setup_native/source/ulfconv/ulfconv.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 _pair {
 static int _pair_compare (const char *key, const _pair *pair);
 static const _pair* _pair_search (const char *key, const _pair *base, unsigned int member );
 
-
+ 
 const _pair _ms_encoding_list[] = {
     { "0",       RTL_TEXTENCODING_UTF8        },
     { "1250",    RTL_TEXTENCODING_MS_1250     },
@@ -87,16 +87,16 @@ char * my_fgets(char *s, int n, FILE *fp)
 
         if( c == EOF )
             break;
-
+        
         s[i] = (char) c;
-
+        
         if( s[i] == '\n' )
         {
             i++;
             break;
         }
     }
-
+    
     if( i>0 )
     {
         s[i] = '\0';
@@ -109,7 +109,7 @@ char * my_fgets(char *s, int n, FILE *fp)
 }
 
 /*****************************************************************************
- * compare function for binary search
+ * compare function for binary search   
  *****************************************************************************/
 
 static int
@@ -157,7 +157,7 @@ _pair_search (const char *key, const _pair *base, unsigned int member )
  * read_encoding_table
  ************************************************************************/
 
-void read_encoding_table(char * file, EncodingMap& aEncodingMap)
+void read_encoding_table(char * file, EncodingMap& aEncodingMap) 
 {
     FILE * fp = fopen(file, "r");
     if ( ! fp  ) {
@@ -167,31 +167,31 @@ void read_encoding_table(char * file, EncodingMap& aEncodingMap)
 
     char buffer[512];
     while ( NULL != my_fgets(buffer, sizeof(buffer), fp) ) {
-
+            
         // strip comment lines
         if ( buffer[0] == '#' )
             continue;
-
+        
         // find end of language string
         char * cp;
         for ( cp = buffer; ! isspace(*cp); cp++ )
             ;
         *cp = '\0';
-
+            
         // find start of codepage string
         for ( ++cp; isspace(*cp); ++cp )
             ;
         char * codepage = cp;
-
+        
         // find end of codepage string
         for ( ++cp; ! isspace(*cp); ++cp )
             ;
         *cp = '\0';
-
+        
         // find the correct mapping for codepage
         const unsigned int members = sizeof( _ms_encoding_list ) / sizeof( _pair );
         const _pair *encoding = _pair_search( codepage, _ms_encoding_list, members );
-
+            
         if ( encoding != NULL ) {
             const std::string language(buffer);
             aEncodingMap.insert( EncodingMap::value_type(language, encoding->value) );
@@ -214,7 +214,7 @@ void print_legacy_mixed(
     EncodingMap::iterator iter = aEncodingMap.find(language);
 
     if ( iter != aEncodingMap.end() ) {
-        fputs(OUStringToOString(aString, iter->second).getStr(), ostream);
+        fputs(OUStringToOString(aString, iter->second).getStr(), ostream); 
     } else {
         fprintf(stderr, "ulfconv: WARNING: no legacy encoding found for %s\n", language.c_str());
     }
@@ -253,30 +253,30 @@ int main( int argc, char * const argv[] )
     int errflg = 0;
     int argi;
 
-    for( argi=1; argi < argc; argi++ )
+    for( argi=1; argi < argc; argi++ ) 
     {
         if( argv[argi][0] == '-' && argv[argi][2] == '\0' )
         {
             switch(argv[argi][1]) {
-            case 'o':
+            case 'o': 
                 if (argi+1 >= argc || argv[argi+1][0] == '-')
                 {
                     fprintf(stderr, "Option -%c requires an operand\n", argv[argi][1]);
                     errflg++;
                     break;
                 }
-
+                
                 ++argi;
                 outfile = argv[argi];
                 break;
-            case 't':
+            case 't': 
                 if (argi+1 >= argc || argv[argi+1][0] == '-')
                 {
                     fprintf(stderr, "Option -%c requires an operand\n", argv[argi][1]);
                     errflg++;
                     break;
                 }
-
+                
                 read_encoding_table(argv[++argi], aEncodingMap);
                 break;
             default:
@@ -289,15 +289,15 @@ int main( int argc, char * const argv[] )
             break;
         }
     }
-
+    
     if (errflg) {
       fprintf(stderr, "Usage: ulfconv [-o <output file>] [-t <encoding table>] [<ulf file>]\n");
       exit(2);
     }
 
     /* assign input file to stdin */
-    if ( argi < argc )
-    {
+    if ( argi < argc ) 
+    {    
         istream = fopen(argv[argi], "r");
         if ( istream  == NULL ) {
             fprintf(stderr, "ulfconv: %s : %s\n", argv[argi], strerror(errno));
@@ -319,35 +319,35 @@ int main( int argc, char * const argv[] )
     /* read line by line from stdin */
     char buffer[65536];
     while ( NULL != fgets(buffer, sizeof(buffer), istream) ) {
-
+    
         /* only handle lines containing " = " */
         char * cp = strstr(buffer, " = \"");
         if ( cp ) {
             rtl::OUString aString;
-
+            
             /* find end of lang string */
             int n;
             for ( n=0; ! isspace(buffer[n]); n++ )
                 ;
-
+            
             std::string line = buffer;
             std::string lang(line, 0, n);
 
             cp += 4;
-            rtl_string2UString( &aString.pData, cp, strrchr(cp, '\"') - cp,
+            rtl_string2UString( &aString.pData, cp, strrchr(cp, '\"') - cp, 
                 RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS );
-
+            
             fprintf(ostream, "%s = \"", lang.c_str());
-
+            
             if ( aEncodingMap.empty() ) {
                 print_java_style(ostream, aString);
             } else {
                 print_legacy_mixed(ostream, aString, lang, aEncodingMap);
             }
-
+                        
             fprintf(ostream, "\"\n");
 
-
+            
         } else {
             fputs(buffer, ostream);
         }
diff --git a/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx b/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
index 0b030b956570..d92c4a3ac056 100644
--- a/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
+++ b/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,15 +26,15 @@
  *
  ************************************************************************/
 
-/*
-    After installation of the OOo filter for the indexing service
-    it is necessary to restart the indexing service in order to
+/*  
+    After installation of the OOo filter for the indexing service 
+    it is necessary to restart the indexing service in order to 
     activate the filter. This is the most reliable way to get the
     indexing service working. We only restart the service if it is
     already running. If we have insufficient privileges to restart
-    the service we do nothing.
+    the service we do nothing.  
 */
-
+ 
 #ifdef _MSC_VER
 #pragma warning(push, 1) /* disable warnings within system headers */
 #endif
@@ -64,70 +64,70 @@ QueryServiceStatus_t QueryServiceStatus_ = NULL;
 StartService_t StartService_ = NULL;
 
 const LPTSTR INDEXING_SERVICE_NAME = TEXT("cisvc");
-
+ 
 bool StopIndexingService(SC_HANDLE hService)
 {
-    SERVICE_STATUS status;
-
+    SERVICE_STATUS status; 
+     
     if (ControlService_(hService, SERVICE_CONTROL_STOP, &status))
-    {
-        // Check the status until the service is no longer stop pending.
-        if (QueryServiceStatus_(hService, &status))
-        {
+    {                           
+        // Check the status until the service is no longer stop pending. 
+        if (QueryServiceStatus_(hService, &status))  
+        {                  
             DWORD startTime = GetTickCount();
             DWORD oldCheckPoint = status.dwCheckPoint;
 
-            while (status.dwCurrentState == SERVICE_STOP_PENDING)
-            {
-                // Do not wait longer than the wait hint. A good interval is
-                // one tenth the wait hint, but no less than 1 second and no
-                // more than 10 seconds.
+            while (status.dwCurrentState == SERVICE_STOP_PENDING) 
+            { 
+                // Do not wait longer than the wait hint. A good interval is 
+                // one tenth the wait hint, but no less than 1 second and no 
+                // more than 10 seconds.          
                 DWORD waitTime = status.dwWaitHint / 10;
-
+                                                
                 if (waitTime < 1000)
                     waitTime = 1000;
                 else if (waitTime > 10000)
                     waitTime = 10000;
-
+                
                 Sleep(waitTime);
 
-                // Check the status again.
+                // Check the status again.          
                 if (!QueryServiceStatus_(hService, &status) ||
-                    (status.dwCurrentState == SERVICE_STOPPED))
+                    (status.dwCurrentState == SERVICE_STOPPED))  
                     break;
-
+                                                 
                 if (status.dwCheckPoint > oldCheckPoint)
-                {
+                {                
                     startTime = GetTickCount();
                     oldCheckPoint = status.dwCheckPoint;
                 }
                 else if ((GetTickCount() - startTime) > status.dwWaitHint)
-                {
+                {                    
                     break; // service doesn't react anymore
-                }
+                }                                    
             }
         }
-    }
-    return (status.dwCurrentState == SERVICE_STOPPED);
+    }        
+    return (status.dwCurrentState == SERVICE_STOPPED);         
 }
 
 void StartIndexingService(SC_HANDLE hService)
-{
+{     
     if (StartService_(hService, 0, NULL))
-    {
-        SERVICE_STATUS status;
+    { 
+        SERVICE_STATUS status; 
 
-        // Check the status until the service is no longer stop pending.
-        if (QueryServiceStatus_(hService, &status))
-        {
+        // Check the status until the service is no longer stop pending. 
+        if (QueryServiceStatus_(hService, &status))  
+        {                  
             DWORD startTime = GetTickCount();
             DWORD oldCheckPoint = status.dwCheckPoint;
 
-            while (status.dwCurrentState == SERVICE_START_PENDING)
-            {
-                // Do not wait longer than the wait hint. A good interval is
-                // one tenth the wait hint, but no less than 1 second and no
-                // more than 10 seconds.
+            while (status.dwCurrentState == SERVICE_START_PENDING) 
+            { 
+                // Do not wait longer than the wait hint. A good interval is 
+                // one tenth the wait hint, but no less than 1 second and no 
+                // more than 10 seconds.          
                 DWORD waitTime = status.dwWaitHint / 10;
 
                 if (waitTime < 1000)
@@ -137,13 +137,13 @@ void StartIndexingService(SC_HANDLE hService)
 
                 Sleep(waitTime);
 
-                // Check the status again.
+                // Check the status again.          
                 if (!QueryServiceStatus_(hService, &status) ||
-                    (status.dwCurrentState == SERVICE_STOPPED))
+                    (status.dwCurrentState == SERVICE_STOPPED))  
                     break;
-
+                                                 
                 if (status.dwCheckPoint > oldCheckPoint)
-                {
+                {                
                     startTime = GetTickCount();
                     oldCheckPoint = status.dwCheckPoint;
                 }
@@ -151,60 +151,60 @@ void StartIndexingService(SC_HANDLE hService)
                 {
                     // service doesn't react anymore
                     break;
-                }
+                }                                    
             }
         }
-    }
+    }        
 }
 
 extern "C" UINT __stdcall RestartIndexingService(MSIHANDLE)
 {
     //MessageBox(NULL, TEXT("Restarting Indexing Service"), TEXT("Message"), MB_OK | MB_ICONINFORMATION);
-
+    
     HMODULE hAdvapi32 = LoadLibrary("advapi32.dll");
 
     if (hAdvapi32)
     {
         CloseServiceHandle_ = reinterpret_cast<CloseServiceHandle_t>(GetProcAddress(hAdvapi32, "CloseServiceHandle"));
-        ControlService_ = reinterpret_cast<ControlService_t>(GetProcAddress(hAdvapi32, "ControlService"));
+        ControlService_ = reinterpret_cast<ControlService_t>(GetProcAddress(hAdvapi32, "ControlService")); 
         OpenSCManager_ = reinterpret_cast<OpenSCManager_t>(GetProcAddress(hAdvapi32, "OpenSCManagerA"));
-        OpenService_ = reinterpret_cast<OpenService_t>(GetProcAddress(hAdvapi32, "OpenServiceA"));
+        OpenService_ = reinterpret_cast<OpenService_t>(GetProcAddress(hAdvapi32, "OpenServiceA"));  
         QueryServiceStatus_ = reinterpret_cast<QueryServiceStatus_t>(GetProcAddress(hAdvapi32, "QueryServiceStatus"));
-        StartService_ = reinterpret_cast<StartService_t>(GetProcAddress(hAdvapi32, "StartServiceA"));
+        StartService_ = reinterpret_cast<StartService_t>(GetProcAddress(hAdvapi32, "StartServiceA"));                  
     }
-
-    /* On systems other than Windows 2000/XP the service API
-       functions might not be available */
-    if (!hAdvapi32 ||
+    
+    /* On systems other than Windows 2000/XP the service API 
+       functions might not be available */ 
+    if (!hAdvapi32 || 
         !(CloseServiceHandle_ && ControlService_ && OpenSCManager_ && OpenService_ && QueryServiceStatus_ && StartService_))
         return ERROR_SUCCESS;
-
-    SC_HANDLE hSCManager = OpenSCManager_(
-        NULL, // local machine
-        NULL, // ServicesActive database
-        SC_MANAGER_ALL_ACCESS);
-
-    if (hSCManager != NULL)
-    {
-        SC_HANDLE hIndexingService = OpenService_(
-            hSCManager, INDEXING_SERVICE_NAME, SERVICE_QUERY_STATUS | SERVICE_START | SERVICE_STOP);
-
+                            
+    SC_HANDLE hSCManager = OpenSCManager_( 
+        NULL, // local machine 
+        NULL, // ServicesActive database 
+        SC_MANAGER_ALL_ACCESS); 
+         
+    if (hSCManager != NULL) 
+    {                    
+        SC_HANDLE hIndexingService = OpenService_( 
+            hSCManager, INDEXING_SERVICE_NAME, SERVICE_QUERY_STATUS | SERVICE_START | SERVICE_STOP); 
+        
         if (hIndexingService)
         {
-            SERVICE_STATUS status;
+            SERVICE_STATUS status; 
             ZeroMemory(&status, sizeof(status));
-
-            if (QueryServiceStatus_(hIndexingService, &status) &&
-                (status.dwCurrentState == SERVICE_RUNNING))
-            {
-                if (StopIndexingService(hIndexingService))
-                    StartIndexingService(hIndexingService);
-            }
-            CloseServiceHandle_(hIndexingService);
-        }
-        CloseServiceHandle_(hSCManager);
-    }
-    return ERROR_SUCCESS;
+            
+            if (QueryServiceStatus_(hIndexingService, &status) && 
+                (status.dwCurrentState == SERVICE_RUNNING))  					    
+            {		        
+                if (StopIndexingService(hIndexingService))			 			    			 
+                    StartIndexingService(hIndexingService);	    		                   
+            }            		    
+            CloseServiceHandle_(hIndexingService); 
+        }			
+        CloseServiceHandle_(hSCManager);    			
+    }											                                    
+    return ERROR_SUCCESS;    
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/setup_native/source/win32/customactions/javafilter/jfregca.cxx b/setup_native/source/win32/customactions/javafilter/jfregca.cxx
index 638ff1c9f8ae..0bfb73e01a33 100644
--- a/setup_native/source/win32/customactions/javafilter/jfregca.cxx
+++ b/setup_native/source/win32/customactions/javafilter/jfregca.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ bool isMulti(MSIHANDLE);
 TCHAR *pxlData[8]= {
     "{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}", //CLSID 1 - key name at InstalledFilters Key
     "{43887C67-4D5D-4127-BAAC-87A288494C7C}", //CLSID 2 - key value for Default Export
-    ".pxl",                                   //Registry key for device type - already there if ActiveSync installerd
-    ".sxc",                                   //New registry key for SO docs
-    "InstalledFilters",                       //Sub-key of device/so doc key
-    "DefaultImport",                          //Key name added at device/so level key
-    "DefaultExport",                          //Key name added at device/so level key
-    "Binary Copy",                            //Key value for DefaultImport
+    ".pxl",									  //Registry key for device type - already there if ActiveSync installerd
+    ".sxc",									  //New registry key for SO docs
+    "InstalledFilters",						  //Sub-key of device/so doc key
+    "DefaultImport",						  //Key name added at device/so level key
+    "DefaultExport",						  //Key name added at device/so level key
+    "Binary Copy",							  //Key value for DefaultImport
 };
 
 TCHAR *pswData[8] = {
     "{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}", //CLSID 1 - key name at InstalledFilters Key
     "{CB43F086-838D-4FA4-B5F6-3406B9A57439}", //CLSID 2 - key value for Default Export
-    ".psw",                                   //Registry key for device type - already there if ActiveSync installe
-    ".sxw",                                   //New registry key for SO docs
-    "InstalledFilters",                       //Sub-key of device/so doc key
-    "DefaultImport",                          //Key name added at device/so level key
-    "DefaultExport",                          //Key name added at device/so level key
-    "Binary Copy",                            //Key value for DefaultImport
+    ".psw",									  //Registry key for device type - already there if ActiveSync installe
+    ".sxw",									  //New registry key for SO docs
+    "InstalledFilters",						  //Sub-key of device/so doc key
+    "DefaultImport",						  //Key name added at device/so level key
+    "DefaultExport",						  //Key name added at device/so level key
+    "Binary Copy",							  //Key value for DefaultImport
 };
 
 
@@ -77,7 +77,7 @@ TCHAR *pswData[8] = {
 #define DEVICE_PATH 2
 #define SO_PATH 3
 #define IF_PATH 4
-#define DEFIMPORT_KEY 5
+#define DEFIMPORT_KEY 5 
 #define DEFEXPORT_KEY 6
 #define BC_VALUE 7
 
@@ -86,7 +86,7 @@ const int MAX_KEY_LENGTH=255;
 const int MAX_VALUE_NAME=16383;
 
 BOOL APIENTRY DllMain( HANDLE,
-                       DWORD  ul_reason,
+                       DWORD  ul_reason, 
                        LPVOID
                      )
 {
@@ -106,8 +106,8 @@ extern "C" UINT install_jf ( MSIHANDLE hModule ) {
 #ifdef _JRGREG_DEBUG
     MessageBox(NULL, bMulti ? "Multi" : "Single", "Install", MB_OK);
 #endif
-    update_activesync_regvalues(bMulti, true, pxlData);
-    update_activesync_regvalues(bMulti, true, pswData);
+    update_activesync_regvalues(bMulti, true, pxlData); 
+    update_activesync_regvalues(bMulti, true, pswData); 
 
     return ERROR_SUCCESS;
 }
@@ -117,8 +117,8 @@ extern "C" UINT uninstall_jf ( MSIHANDLE hModule ) {
 #ifdef _JRGREG_DEBUG
     MessageBox(NULL, bMulti ? "Multi" : "Single", "Uninstall", MB_OK);
 #endif
-    update_activesync_regvalues(false, bMulti, pxlData);
-    update_activesync_regvalues(false, bMulti, pswData);
+    update_activesync_regvalues(false, bMulti, pxlData); 
+    update_activesync_regvalues(false, bMulti, pswData); 
 
     return ERROR_SUCCESS;
 }
@@ -127,9 +127,9 @@ extern "C" UINT uninstall_jf ( MSIHANDLE hModule ) {
     Determines if this is being installed on a per user or a machine wide basis
     @param hModule
     [in] a valid msi handle.
-
-
-    @returns
+    
+            
+    @returns 
     <TRUE/>if this is a multi-user install.
 */
 bool isMulti( MSIHANDLE hModule ) {
@@ -166,9 +166,9 @@ bool isMulti( MSIHANDLE hModule ) {
 
     @param data
     [in] an array of string containing names of registry keys and values
-
-
-    @returns
+    
+            
+    @returns 
     <TRUE/>if this is a multi-user install.
 */
 
@@ -182,7 +182,7 @@ bool update_activesync_regvalues(bool bMultiUser, bool bInstall, char **data) {
         if (ERROR_SUCCESS != RegOpenKeyEx(HKEY_LOCAL_MACHINE, (LPCSTR)MUKey, 0, KEY_ALL_ACCESS, &hKey)) {
             return false;
         }
-        if (bInstall) {
+        if (bInstall) { 
             createKeys(hKey, data);
         } else {
             deleteKeys(hKey, data);
@@ -194,35 +194,35 @@ bool update_activesync_regvalues(bool bMultiUser, bool bInstall, char **data) {
         }
 
         CHAR     achKey[MAX_KEY_LENGTH];   // buffer for subkey name
-        DWORD    cbName;                   // size of name string
-        CHAR     achClass[MAX_PATH] = "";  // buffer for class name
-        DWORD    cchClassName = MAX_PATH;  // size of class string
-        DWORD    cSubKeys=0;               // number of subkeys
-        DWORD    cbMaxSubKey;              // longest subkey size
-        DWORD    cchMaxClass;              // longest class string
-        DWORD    cValues;              // number of values for key
-        DWORD    cchMaxValue;          // longest value name
-        DWORD    cbMaxValueData;       // longest value data
-        DWORD    cbSecurityDescriptor; // size of security descriptor
-        FILETIME ftLastWriteTime;      // last write time
-
-        // Get the class name and the value count.
+        DWORD    cbName;                   // size of name string 
+        CHAR     achClass[MAX_PATH] = "";  // buffer for class name 
+        DWORD    cchClassName = MAX_PATH;  // size of class string 
+        DWORD    cSubKeys=0;               // number of subkeys 
+        DWORD    cbMaxSubKey;              // longest subkey size 
+        DWORD    cchMaxClass;              // longest class string 
+        DWORD    cValues;              // number of values for key 
+        DWORD    cchMaxValue;          // longest value name 
+        DWORD    cbMaxValueData;       // longest value data 
+        DWORD    cbSecurityDescriptor; // size of security descriptor 
+        FILETIME ftLastWriteTime;      // last write time 
+        
+        // Get the class name and the value count. 
         if (ERROR_SUCCESS == RegQueryInfoKey(
-            hKey,                    // key handle
-            achClass,                // buffer for class name
-            &cchClassName,           // size of class string
-            NULL,                    // reserved
-            &cSubKeys,               // number of subkeys
-            &cbMaxSubKey,            // longest subkey size
-            &cchMaxClass,            // longest class string
-            &cValues,                // number of values for this key
-            &cchMaxValue,            // longest value name
-            &cbMaxValueData,         // longest value data
-            &cbSecurityDescriptor,   // security descriptor
-            &ftLastWriteTime)) {       // last write time
+            hKey,                    // key handle 
+            achClass,                // buffer for class name 
+            &cchClassName,           // size of class string 
+            NULL,                    // reserved 
+            &cSubKeys,               // number of subkeys 
+            &cbMaxSubKey,            // longest subkey size 
+            &cchMaxClass,            // longest class string 
+            &cValues,                // number of values for this key 
+            &cchMaxValue,            // longest value name 
+            &cbMaxValueData,         // longest value data 
+            &cbSecurityDescriptor,   // security descriptor 
+            &ftLastWriteTime)) {       // last write time 
 
             if (cSubKeys) {
-                for (DWORD i=0; i<cSubKeys; i++) {
+                for (DWORD i=0; i<cSubKeys; i++) { 
                     cbName = 1024;
                     if (ERROR_SUCCESS == RegEnumKeyEx(hKey,i,achKey,&cbName,NULL,NULL,NULL,&ftLastWriteTime)) {
                         HKEY subKey;
@@ -239,7 +239,7 @@ bool update_activesync_regvalues(bool bMultiUser, bool bInstall, char **data) {
                     }
                 }
             }
-
+            
             bReturn = true;
         }
     }
@@ -279,13 +279,13 @@ void createKeys(HKEY hKey, char **data) {
         }
     }
 
-    if (ERROR_SUCCESS == RegCreateKeyEx(hKey, soPath, 0, NULL,
+    if (ERROR_SUCCESS == RegCreateKeyEx(hKey, soPath, 0, NULL, 
                             REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &soKey, NULL)) {
         RegSetValueEx(soKey, defExport, 0, REG_SZ, (LPBYTE)binaryCopy, strlen(binaryCopy));
         RegSetValueEx(soKey, defImport, 0, REG_SZ, (LPBYTE)clsid2, strlen(clsid2));
 
-
-        if (ERROR_SUCCESS == RegCreateKeyEx(soKey, IFPath, 0, NULL,
+        
+        if (ERROR_SUCCESS == RegCreateKeyEx(soKey, IFPath, 0, NULL, 
                             REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &soIFKey, NULL)) {
             RegSetValueEx(soIFKey, clsid2, 0, REG_SZ, NULL, NULL);
         }
@@ -293,7 +293,7 @@ void createKeys(HKEY hKey, char **data) {
 }
 
 /**
-    Delete registry keys
+    Delete registry keys 
 
     @param hKey
     [in] Handle to the parent registry key
@@ -318,7 +318,7 @@ void deleteKeys(HKEY hKey, TCHAR **data) {
     if (ERROR_SUCCESS == RegOpenKeyEx(hKey, soPath, 0, KEY_ALL_ACCESS, &soKey)) {
         RegDeleteValue(soKey, defExport);
         RegDeleteValue(soKey, defImport);
-
+        
         if (ERROR_SUCCESS == RegOpenKeyEx(soKey, IFPath, 0, KEY_ALL_ACCESS, &soIFKey)) {
             RegDeleteValue(soIFKey, clsid2);
             RegCloseKey(soIFKey);
diff --git a/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx b/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx
index 1bebed752e18..21188ab49f94 100644
--- a/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx
+++ b/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 #ifdef UNICODE
 #define _UNICODE
-#define _tstring    wstring
+#define _tstring	wstring
 #else
-#define _tstring    string
+#define _tstring	string
 #endif
 #include <tchar.h>
 #include <string>
@@ -56,14 +56,14 @@
 #include <systools/win32/uwinapi.h>
 #include <../tools/seterror.hxx>
 
-#define WININIT_FILENAME    "wininit.ini"
-#define RENAME_SECTION      "rename"
+#define	WININIT_FILENAME	"wininit.ini"
+#define RENAME_SECTION		"rename"
 
 #ifdef DEBUG
 inline void OutputDebugStringFormat( LPCTSTR pFormat, ... )
 {
-    _TCHAR  buffer[1024];
-    va_list args;
+    _TCHAR	buffer[1024];
+    va_list	args;
 
     va_start( args, pFormat );
     _vsntprintf( buffer, SAL_N_ELEMENTS(buffer), pFormat, args );
@@ -77,9 +77,9 @@ static inline void OutputDebugStringFormat( LPCTSTR, ... )
 
 static std::_tstring GetMsiProperty( MSIHANDLE handle, const std::_tstring& sProperty )
 {
-    std::_tstring   result;
-    TCHAR   szDummy[1] = TEXT("");
-    DWORD   nChars = 0;
+    std::_tstring	result;
+    TCHAR	szDummy[1] = TEXT("");
+    DWORD	nChars = 0;
 
     if ( MsiGetProperty( handle, sProperty.c_str(), szDummy, &nChars ) == ERROR_MORE_DATA )
     {
@@ -87,14 +87,14 @@ static std::_tstring GetMsiProperty( MSIHANDLE handle, const std::_tstring& sPro
         LPTSTR buffer = reinterpret_cast<LPTSTR>(_alloca(nBytes));
         ZeroMemory( buffer, nBytes );
         MsiGetProperty(handle, sProperty.c_str(), buffer, &nChars);
-        result = buffer;
+        result = buffer;			
     }
 
-    return  result;
+    return	result;
 }
-
+    
 static inline bool IsSetMsiProperty(MSIHANDLE handle, const std::_tstring& sProperty)
-{
+{   
     std::_tstring value = GetMsiProperty(handle, sProperty);
     return (value.length() > 0);
 }
@@ -111,30 +111,30 @@ static inline void SetMsiProperty(MSIHANDLE handle, const std::_tstring& sProper
 
 static BOOL MoveFileEx9x( 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) )
             {
@@ -156,7 +156,7 @@ static BOOL MoveFileEx9x( LPCSTR lpExistingFileNameA, LPCSTR lpNewFileNameA, DWO
         if ( !fSuccess && GetLastError() != ERROR_ACCESS_DENIED &&
             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 );
 
@@ -179,22 +179,22 @@ static BOOL MoveFileExImpl( LPCSTR lpExistingFileNameA, LPCSTR lpNewFileNameA, D
 
 extern "C" UINT __stdcall IsOfficeRunning( MSIHANDLE handle )
 {
-    std::_tstring   sInstDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") );
-    std::_tstring   sResourceDir = sInstDir + TEXT("Basis\\program\\resource\\");
-    std::_tstring   sPattern = sResourceDir + TEXT("vcl*.res");
+    std::_tstring	sInstDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") );
+    std::_tstring	sResourceDir = sInstDir + TEXT("Basis\\program\\resource\\");
+    std::_tstring	sPattern = sResourceDir + TEXT("vcl*.res");
 
-    WIN32_FIND_DATA aFindFileData;
-    HANDLE  hFind = FindFirstFile( sPattern.c_str(), &aFindFileData );
+    WIN32_FIND_DATA	aFindFileData;
+    HANDLE	hFind = FindFirstFile( sPattern.c_str(), &aFindFileData );
 
     if ( IsValidHandle(hFind) )
     {
-        BOOL    fSuccess = false;
-        bool    fRenameSucceeded;
+        BOOL	fSuccess = false;
+        bool	fRenameSucceeded;
 
         do
         {
-            std::_tstring   sResourceFile = sResourceDir + aFindFileData.cFileName;
-            std::_tstring   sIntermediate = sResourceFile + TEXT(".tmp");
+            std::_tstring	sResourceFile = sResourceDir + aFindFileData.cFileName;
+            std::_tstring	sIntermediate = sResourceFile + TEXT(".tmp");
 
             fRenameSucceeded = MoveFileExImpl( sResourceFile.c_str(), sIntermediate.c_str(), MOVEFILE_REPLACE_EXISTING );
             if ( fRenameSucceeded )
diff --git a/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx b/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx
index f6f6a4c0c3b9..fa5c3893eb8c 100644
--- a/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx
+++ b/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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.
  *
  ************************************************************************/
-
+ 
 #ifdef _MSC_VER
 #pragma warning(push, 1) /* disable warnings within system headers */
 #endif
@@ -44,92 +44,92 @@
 
 class RegistryKeyGuard
 {
-public:
+public: 
     RegistryKeyGuard(HKEY hkey = 0) :
         hkey_(hkey)
     {
     }
-
+    
     ~RegistryKeyGuard()
     {
         if (hkey_)
             RegCloseKey(hkey_);
-    }
+    }            
 private:
     HKEY hkey_;
 
 private:
     RegistryKeyGuard(const RegistryKeyGuard&);
-    RegistryKeyGuard& operator=(const RegistryKeyGuard&);
+    RegistryKeyGuard& operator=(const RegistryKeyGuard&);            
 };
 
 typedef std::vector<TCHAR> CharacterBuffer_t;
 
 /* throws std::runtime_error when the value "Path" could
-   not be found or contains an empty string or is not of
-   type REG_SZ. All such conditions are invalid for a
+   not be found or contains an empty string or is not of 
+   type REG_SZ. All such conditions are invalid for a 
    properly installed product. */
-std::string FindProductInstallationPath(HKEY hkey)
-{
+std::string FindProductInstallationPath(HKEY hkey) 
+{   
     DWORD nSubKeys;
     DWORD lLongestSubKey;
-
-    if (RegQueryInfoKey(hkey, NULL, NULL, NULL, &nSubKeys, &lLongestSubKey, NULL, NULL, NULL, NULL, NULL, NULL) !=
+    
+    if (RegQueryInfoKey(hkey, NULL, NULL, NULL, &nSubKeys, &lLongestSubKey, NULL, NULL, NULL, NULL, NULL, NULL) != 
         ERROR_SUCCESS)
         throw std::runtime_error("Cannot query info for registery key");
-
+        
     CharacterBuffer_t buff(lLongestSubKey + 1);
-
+    
     for (DWORD i = 0; i < nSubKeys; i++)
     {
         buff[0] = 0;
         LONG ret = RegEnumKey(hkey, i, &buff[0], buff.size());
-
+        
         if ((ret != ERROR_SUCCESS) && (ret != ERROR_MORE_DATA))
             throw std::runtime_error("Error enumerating registry key");
-
+        
         HKEY hSubKey;
-        if (RegOpenKey(hkey, &buff[0], &hSubKey) != ERROR_SUCCESS)
-            continue;
-
+        if (RegOpenKey(hkey, &buff[0], &hSubKey) != ERROR_SUCCESS)                    
+            continue;       
+        
         RegistryKeyGuard guard(hSubKey);
-
+        
         DWORD type;
         TCHAR pbuff[MAX_PATH];
         DWORD size = sizeof(pbuff);
         if ((RegQueryValueEx(
                 hSubKey, TEXT("Path"), NULL, &type, reinterpret_cast<LPBYTE>(pbuff), &size) != ERROR_SUCCESS) ||
-                (type != REG_SZ))
+                (type != REG_SZ))    
             continue;
-
-        std::string path(pbuff);
+        
+        std::string path(pbuff);                        
         std::string::size_type idx = path.rfind("program\\soffice.exe");
-        if (idx != std::string::npos)
-            return path.substr(0, idx);
-    } // for
-
-    throw std::runtime_error("No valid product path found");
+        if (idx != std::string::npos)        
+            return path.substr(0, idx);                                                                    
+    } // for     
+       
+    throw std::runtime_error("No valid product path found");        
 }
 
 UINT GetInstallProperty(MSIHANDLE handle, LPCTSTR name, CharacterBuffer_t* buffer)
-{
+{    
     DWORD size = buffer->size();
     UINT ret = MsiGetProperty(handle, name, &(*buffer)[0], &size);
-
+    
     if (ret == ERROR_MORE_DATA)
     {
         buffer->resize(size + 1);
         size = buffer->size();
         ret = MsiGetProperty(handle, name, &(*buffer)[0], &size);
-    }
+    }   
     return ret;
 }
 
-/*
+/*    
     Try to find the installation path to an already installed product.
     The installation path will be written in the Windows registry
-    during the installation. There may exist different products in
-    parallel e.g. StarOffice, StarSuite, OpenOffice.org. It will be
+    during the installation. There may exist different products in 
+    parallel e.g. StarOffice, StarSuite, OpenOffice.org. It will be 
     searched in this order for an installed product. If a product
     will be found the path to the product will be set in the property
     "INSTALLLOCATION" else nothing will be done.
@@ -137,37 +137,37 @@ UINT GetInstallProperty(MSIHANDLE handle, LPCTSTR name, CharacterBuffer_t* buffe
 extern "C" UINT __stdcall SetProductInstallationPath(MSIHANDLE handle)
 {
     //MessageBox(NULL, TEXT("SetProductInstallationPath"), TEXT("Language Pack Installation Helper"), MB_OK | MB_ICONINFORMATION);
-
+    
     try
-    {
-        CharacterBuffer_t regKeyProdPath(MAX_PATH);
-
+    {   
+        CharacterBuffer_t regKeyProdPath(MAX_PATH);                
+        
         GetInstallProperty(handle, TEXT("REGKEYPRODPATH"), &regKeyProdPath);
-
+                                                    
         HKEY hKey;
         if ((RegOpenKey(HKEY_CURRENT_USER, &regKeyProdPath[0], &hKey) == ERROR_SUCCESS) ||
             (RegOpenKey(HKEY_LOCAL_MACHINE, &regKeyProdPath[0], &hKey) == ERROR_SUCCESS))
-        {
+        {   
             RegistryKeyGuard guard(hKey);
-            std::string path = FindProductInstallationPath(hKey);
-            MsiSetProperty(handle, TEXT("INSTALLLOCATION"), path.c_str());
-        }
+            std::string path = FindProductInstallationPath(hKey);                
+            MsiSetProperty(handle, TEXT("INSTALLLOCATION"), path.c_str());                        
+        }        
     }
     catch(std::runtime_error& ex)
     {
         ex = ex; // no warnings
-    }
-    return ERROR_SUCCESS;
+    }                                       
+    return ERROR_SUCCESS;    
 }
 
 void MakeCfgimportCommandLine(CharacterBuffer_t* productPath)
-{
+{                 
     char* p = &(*productPath)[0] + lstrlen(&(*productPath)[0]) - 1;
 
-    if (*p != '\\')
-        lstrcat(&(*productPath)[0], "\\program\\configimport.exe --spool");
+    if (*p != '\\')        
+        lstrcat(&(*productPath)[0], "\\program\\configimport.exe --spool");                
     else
-        lstrcat(&(*productPath)[0], "program\\configimport.exe --spool");
+        lstrcat(&(*productPath)[0], "program\\configimport.exe --spool");                            
 }
 
 /*
@@ -176,18 +176,18 @@ void MakeCfgimportCommandLine(CharacterBuffer_t* productPath)
 extern "C" UINT __stdcall RegisterLanguagePack(MSIHANDLE handle)
 {
     //MessageBox(NULL, TEXT("RegisterLanguagePack"), TEXT("Language Pack Installation Helper"), MB_OK | MB_ICONINFORMATION);
-
-    CharacterBuffer_t productPath(MAX_PATH);
-    GetInstallProperty(handle, TEXT("INSTALLLOCATION"), &productPath);
-    MakeCfgimportCommandLine(&productPath);
-
-    STARTUPINFO si;
+    
+    CharacterBuffer_t productPath(MAX_PATH);        
+    GetInstallProperty(handle, TEXT("INSTALLLOCATION"), &productPath);                                
+    MakeCfgimportCommandLine(&productPath);        
+    
+    STARTUPINFO si;                
     ZeroMemory(&si, sizeof(si));
     si.cb = sizeof(si);
-
+    
     PROCESS_INFORMATION pi;
     ZeroMemory(&pi, sizeof(pi));
-
+    
     if (CreateProcess(
             NULL, &productPath[0], NULL, NULL,
             FALSE, CREATE_NO_WINDOW | NORMAL_PRIORITY_CLASS, NULL,
@@ -196,11 +196,11 @@ extern "C" UINT __stdcall RegisterLanguagePack(MSIHANDLE handle)
         // Wait until child process exits.
         WaitForSingleObject(pi.hProcess, INFINITE);
 
-        // Close process and thread handles.
+        // Close process and thread handles. 
         CloseHandle(pi.hProcess);
-        CloseHandle(pi.hThread);
-    }
-    return ERROR_SUCCESS;
+        CloseHandle(pi.hThread);        
+    }              
+    return ERROR_SUCCESS;               
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/setup_native/source/win32/customactions/languagepacks/respintest.cxx b/setup_native/source/win32/customactions/languagepacks/respintest.cxx
index 5f979a81fa68..7c2c62ae1e20 100644
--- a/setup_native/source/win32/customactions/languagepacks/respintest.cxx
+++ b/setup_native/source/win32/customactions/languagepacks/respintest.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 std;
 
-namespace
+namespace 
 {
     string GetMsiProperty(MSIHANDLE handle, const string& sProperty)
     {
@@ -86,7 +86,7 @@ namespace
     {
         MsiSetProperty(handle, sProperty.c_str(), TEXT("1"));
     }
-} // namespace
+} // namespace 
 
 extern "C" UINT __stdcall GetUserInstallMode(MSIHANDLE handle)
 {
@@ -104,16 +104,16 @@ extern "C" UINT __stdcall GetUserInstallMode(MSIHANDLE handle)
     // 1. Searching for "ProductCode" in setup.ini
 
     string sSetupiniPath = sOfficeInstallPath + TEXT("program\\setup.ini");
-
+    
     TCHAR szValue[32767];
 
-    GetPrivateProfileString(
-        TEXT("Bootstrap"),
+    GetPrivateProfileString( 
+        TEXT("Bootstrap"), 
         TEXT("ProductCode"),
         TEXT("INVALIDDIRECTORY"),
         szValue,
         SAL_N_ELEMENTS(szValue),
-        sSetupiniPath.c_str()
+        sSetupiniPath.c_str() 
         );
 
     if ( !_tcsicmp( szValue, TEXT("INVALIDDIRECTORY") ) )
@@ -129,13 +129,13 @@ extern "C" UINT __stdcall GetUserInstallMode(MSIHANDLE handle)
 
     szValue[0] = '\0';
 
-    GetPrivateProfileString(
-        TEXT("Bootstrap"),
+    GetPrivateProfileString( 
+        TEXT("Bootstrap"), 
         TEXT("buildid"),
         TEXT("ISWRONGPRODUCT"),
         szValue,
         SAL_N_ELEMENTS(szValue),
-        sSetupiniPath.c_str()
+        sSetupiniPath.c_str() 
         );
 
     if ( !_tcsicmp( szValue, TEXT("ISWRONGPRODUCT") ) )
@@ -156,7 +156,7 @@ extern "C" UINT __stdcall GetUserInstallMode(MSIHANDLE handle)
         SetMsiProperty( handle, TEXT("ISWRONGPRODUCT"), TEXT("YES") );
         // MessageBox(NULL, "ISWRONGPRODUCT 2 set after searching PRODUCTMAJOR", "DEBUG", MB_OK);
         SetMsiErrorCode( MSI_ERROR_ISWRONGPRODUCT );
-        return ERROR_SUCCESS;
+        return ERROR_SUCCESS;		
     }
 
     // 3. Only for patch: Comparing "PRODUCTMINOR from property table and "ProductMinor" from InfoFile
@@ -170,15 +170,15 @@ extern "C" UINT __stdcall GetUserInstallMode(MSIHANDLE handle)
 
         szValue[0] = '\0';
 
-        GetPrivateProfileString(
-            TEXT("Bootstrap"),
+        GetPrivateProfileString( 
+            TEXT("Bootstrap"), 
             TEXT("ProductBuildid"),
             TEXT("8918"),
             szValue,
             SAL_N_ELEMENTS(szValue),
-            sSetupiniPath.c_str()
+            sSetupiniPath.c_str() 
             );
-
+            
         int InstalledProductMinor = atoi(szValue);
 
         if ( InstalledProductMinor >= PatchProductMinor )
@@ -186,7 +186,7 @@ extern "C" UINT __stdcall GetUserInstallMode(MSIHANDLE handle)
             SetMsiProperty( handle, TEXT("PATCHISOLDER"), TEXT("YES") );
             // MessageBox(NULL, "PATCHISOLDER set", "DEBUG", MB_OK);
             SetMsiErrorCode( MSI_ERROR_PATCHISOLDER );
-            return ERROR_SUCCESS;
+            return ERROR_SUCCESS;    
         }
     }
 
@@ -194,13 +194,13 @@ extern "C" UINT __stdcall GetUserInstallMode(MSIHANDLE handle)
 
     szValue[0] = '\0';
 
-    GetPrivateProfileString(
-        TEXT("Bootstrap"),
+    GetPrivateProfileString( 
+        TEXT("Bootstrap"), 
         TEXT("ALLUSERS"),
         TEXT(""),
         szValue,
         SAL_N_ELEMENTS(szValue),
-        sSetupiniPath.c_str()
+        sSetupiniPath.c_str() 
         );
 
     if ( szValue[0] )
@@ -208,7 +208,7 @@ extern "C" UINT __stdcall GetUserInstallMode(MSIHANDLE handle)
         SetMsiProperty( handle, TEXT("ALLUSERS"), szValue );
         // MessageBox(NULL, "ALLUSERS set", "DEBUG", MB_OK);
     }
-
+    
     return ERROR_SUCCESS;
 }
 
diff --git a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
index 2ef10553e239..d416f9dd0cfd 100644
--- a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
+++ b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 #ifdef UNICODE
 #define _UNICODE
-#define _tstring    wstring
+#define _tstring	wstring
 #else
-#define _tstring    string
+#define _tstring	string
 #endif
 #include <tchar.h>
 #include <string>
@@ -56,14 +56,14 @@
 #include <systools/win32/uwinapi.h>
 #include <../tools/seterror.hxx>
 
-#define WININIT_FILENAME    "wininit.ini"
-#define RENAME_SECTION      "rename"
+#define	WININIT_FILENAME	"wininit.ini"
+#define RENAME_SECTION		"rename"
 
 #ifdef DEBUG
 inline void OutputDebugStringFormat( LPCTSTR pFormat, ... )
 {
-    _TCHAR  buffer[1024];
-    va_list args;
+    _TCHAR	buffer[1024];
+    va_list	args;
 
     va_start( args, pFormat );
     _vsntprintf( buffer, SAL_N_ELEMENTS(buffer), pFormat, args );
@@ -77,9 +77,9 @@ static inline void OutputDebugStringFormat( LPCTSTR, ... )
 
 static std::_tstring GetMsiProperty( MSIHANDLE handle, const std::_tstring& sProperty )
 {
-    std::_tstring   result;
-    TCHAR   szDummy[1] = TEXT("");
-    DWORD   nChars = 0;
+    std::_tstring	result;
+    TCHAR	szDummy[1] = TEXT("");
+    DWORD	nChars = 0;
 
     if ( MsiGetProperty( handle, sProperty.c_str(), szDummy, &nChars ) == ERROR_MORE_DATA )
     {
@@ -87,27 +87,27 @@ static std::_tstring GetMsiProperty( MSIHANDLE handle, const std::_tstring& sPro
         LPTSTR buffer = reinterpret_cast<LPTSTR>(_alloca(nBytes));
         ZeroMemory( buffer, nBytes );
         MsiGetProperty(handle, sProperty.c_str(), buffer, &nChars);
-        result = buffer;
+        result = buffer;			
     }
 
-    return  result;
+    return	result;
 }
 
 // The provided GUID must be without surounding '{}'
 static std::_tstring GetGuidPart(const std::_tstring& guid, int index)
 {
-    assert((guid.length() == 36) && "No GUID or wrong format!");
+    assert((guid.length() == 36) && "No GUID or wrong format!"); 
     assert(((index > -1) && (index < 5)) && "Out of range!");
-
+    
     if (index == 0) return std::_tstring(guid.c_str(), 8);
     if (index == 1) return std::_tstring(guid.c_str() + 9, 4);
     if (index == 2) return std::_tstring(guid.c_str() + 14, 4);
     if (index == 3) return std::_tstring(guid.c_str() + 19, 4);
     if (index == 4) return std::_tstring(guid.c_str() + 24, 12);
-
+    
     return std::_tstring();
 }
-
+    
 static void Swap(char* p1, char* p2)
 {
     char tmp = *p1;
@@ -119,51 +119,51 @@ static std::_tstring Invert(const std::_tstring& str)
 {
     char* buff = reinterpret_cast<char*>(_alloca(str.length()));
     strncpy(buff, str.c_str(), str.length());
-
+    
     char* front = buff;
     char* back = buff + str.length() - 1;
-
+    
     while (front < back)
         Swap(front++, back--);
-
+    
     return std::_tstring(buff, str.length());
 }
 
 // Convert the upgrade code (which is a GUID) according
 // to the way the windows installer does when writing it
 // to the registry
-// The first 8 bytes will be inverted, from the the last
+// The first 8 bytes will be inverted, from the the last 
 // 8 bytes always the nibbles will be inverted for further
-// details look in the MSDN under compressed registry keys
+// details look in the MSDN under compressed registry keys 
 static std::_tstring ConvertGuid(const std::_tstring& guid)
 {
     std::_tstring convertedGuid;
-
+    
     std::_tstring part = GetGuidPart(guid, 0);
     convertedGuid = Invert(part);
-
+    
     part = GetGuidPart(guid, 1);
     convertedGuid += Invert(part);
-
+    
     part = GetGuidPart(guid, 2);
     convertedGuid += Invert(part);
-
+    
     part = GetGuidPart(guid, 3);
     convertedGuid += Invert(std::_tstring(part.c_str(), 2));
     convertedGuid += Invert(std::_tstring(part.c_str() + 2, 2));
-
+    
     part = GetGuidPart(guid, 4);
     int pos = 0;
     for (int i = 0; i < 6; i++)
     {
         convertedGuid += Invert(std::_tstring(part.c_str() + pos, 2));
-        pos += 2;
+        pos += 2;		
     }
     return convertedGuid;
 }
 
 static inline bool IsSetMsiProperty(MSIHANDLE handle, const std::_tstring& sProperty)
-{
+{   
     std::_tstring value = GetMsiProperty(handle, sProperty);
     return (value.length() > 0);
 }
@@ -180,30 +180,30 @@ static inline void SetMsiProperty(MSIHANDLE handle, const std::_tstring& sProper
 
 static BOOL MoveFileEx9x( 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) )
             {
@@ -225,7 +225,7 @@ static BOOL MoveFileEx9x( LPCSTR lpExistingFileNameA, LPCSTR lpNewFileNameA, DWO
         if ( !fSuccess && GetLastError() != ERROR_ACCESS_DENIED &&
             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 );
 
@@ -248,15 +248,15 @@ static BOOL MoveFileExImpl( LPCSTR lpExistingFileNameA, LPCSTR lpNewFileNameA, D
 
 static bool SwapFiles( const std::_tstring& sFileName1, const std::_tstring& sFileName2 )
 {
-    std::_tstring   sTempFileName = sFileName1 + TEXT(".tmp");
-
+    std::_tstring	sTempFileName = sFileName1 + TEXT(".tmp");
+    
     bool fSuccess = true;
 
     //Try to move the original file to a temp file
     fSuccess = MoveFileExImpl( sFileName1.c_str(), sTempFileName.c_str(), MOVEFILE_REPLACE_EXISTING);
 
-    std::_tstring   mystr;
-
+    std::_tstring	mystr;
+    
     if ( fSuccess )
     {
         fSuccess = MoveFileExImpl( sFileName2.c_str(), sFileName1.c_str(), MOVEFILE_REPLACE_EXISTING );
@@ -288,14 +288,14 @@ static bool SwapFiles( const std::_tstring& sFileName1, const std::_tstring& sFi
 
             // if ( fSuccess )
             // {
-            //  mystr = "Success";
-            //  MessageBox( NULL, mystr.c_str(), "Titel", MB_OK );
+            //	mystr = "Success";
+            //	MessageBox( NULL, mystr.c_str(), "Titel", MB_OK );
             // }
             // else
             // {
-            //  char buff[256];
-            //  wsprintf(buff, "Failure %d", GetLastError());
-            //  MessageBox( NULL, buff, "Titel", MB_OK );
+            //	char buff[256];
+            //	wsprintf(buff, "Failure %d", GetLastError());
+            //	MessageBox( NULL, buff, "Titel", MB_OK );
             // }
         }
         else
@@ -305,14 +305,14 @@ static bool SwapFiles( const std::_tstring& sFileName1, const std::_tstring& sFi
     }
 
     OutputDebugStringFormat( TEXT("%s <-> %s: %s"), sFileName1.c_str(), sFileName2.c_str(), fSuccess ? TEXT("OK") : TEXT("FAILED") );
-
+    
     if (!fSuccess )
     {
-        DWORD   dwError = GetLastError();
+        DWORD	dwError = GetLastError();
         LPVOID lpMsgBuf;
-        if ( FormatMessage(
-            FORMAT_MESSAGE_ALLOCATE_BUFFER |
-            FORMAT_MESSAGE_FROM_SYSTEM |
+        if ( FormatMessage( 
+            FORMAT_MESSAGE_ALLOCATE_BUFFER | 
+            FORMAT_MESSAGE_FROM_SYSTEM | 
             FORMAT_MESSAGE_IGNORE_INSERTS,
             NULL,
             GetLastError(),
@@ -334,10 +334,10 @@ static bool SwapFiles( const std::_tstring& sFileName1, const std::_tstring& sFi
 
 static std::_tstring strip( const std::_tstring& s, _TCHAR c )
 {
-    std::_tstring   result = s;
+    std::_tstring	result = s;
 
     std::_tstring::size_type f;
-
+    
     do
     {
         f = result.find( c );
@@ -351,89 +351,89 @@ static std::_tstring strip( const std::_tstring& s, _TCHAR c )
 static std::_tstring trim( const std::_tstring& rString )
 {
     std::_tstring temp = rString;
-
+    
     while ( temp.length() && temp[0] == ' ' || temp[0] == '\t' )
         temp.erase( 0, 1 );
-
-    std::_tstring::size_type    len = temp.length();
-
+        
+    std::_tstring::size_type	len = temp.length();
+    
     while ( len && temp[len-1] == ' ' || temp[len-1] == '\t' )
     {
         temp.erase( len - 1, 1 );
         len = temp.length();
     }
-
+    
     return temp;
 }
 
 static bool readLine( FILE *fp, std::_tstring& rLine )
 {
     _TCHAR szBuffer[1024];
-    bool    bSuccess = false;
-    bool    bEOL = false;
-    std::_tstring   line;
-
+    bool	bSuccess = false;
+    bool	bEOL = false;
+    std::_tstring	line;
 
+        
     while ( !bEOL && _fgetts( szBuffer, sizeof(szBuffer), fp ) )
     {
-        int len = _tcslen(szBuffer);
-
+        int	len = _tcslen(szBuffer);
+        
         bSuccess = true;
-
+        
         while ( len && szBuffer[len - 1] == '\n' )
         {
             szBuffer[--len] = 0;
             bEOL = true;
         }
-
+            
         line.append( szBuffer );
     }
-
+    
     rLine = line;
     return bSuccess;
 }
 
 
-static std::_tstring getProfileString(
-    const std::_tstring& aFileName,
-    const std::_tstring& aSectionName,
-    const std::_tstring& aKeyName,
+static std::_tstring getProfileString( 
+    const std::_tstring& aFileName, 
+    const std::_tstring& aSectionName, 
+    const std::_tstring& aKeyName, 
     const std::_tstring& aDefault = _T("") )
 {
-    FILE    *fp = _tfopen( aFileName.c_str(), _T("r") );
-    std::_tstring   retValue = aDefault.length() ? aDefault : _T("");
-
+    FILE	*fp = _tfopen( aFileName.c_str(), _T("r") );
+    std::_tstring	retValue = aDefault.length() ? aDefault : _T("");
+    
     if ( fp )
     {
         std::_tstring line;
         std::_tstring section;
-
+        
         while ( readLine( fp, line ) )
         {
             line = trim( line );
-
+            
             if ( line.length() && line[0] == '[' )
             {
                 line.erase( 0, 1 );
                 std::_tstring::size_type end = line.find( ']', 0 );
-
+                
                 if ( std::_tstring::npos != end )
                     section = trim( line.substr( 0, end ) );
             }
             else
             {
 
-                std::_tstring::size_type iEqualSign = line.find( '=', 0 );
+                std::_tstring::size_type iEqualSign = line.find( '=', 0 ); 
 
                 if ( iEqualSign != std::_tstring::npos )
                 {
-                    std::_tstring   keyname = line.substr( 0, iEqualSign );
+                    std::_tstring	keyname = line.substr( 0, iEqualSign );
                     keyname = trim( keyname );
-
-                    std::_tstring   value = line.substr( iEqualSign + 1 /*, std::_tstring::npos */ );
+                    
+                    std::_tstring	value = line.substr( iEqualSign + 1 /*, std::_tstring::npos */ );
                     value = trim( value );
-
-                    if (
+                    
+                    if ( 
                         0 == _tcsicmp( section.c_str(), aSectionName.c_str() ) &&
                         0 == _tcsicmp( keyname.c_str(), aKeyName.c_str() )
                          )
@@ -444,17 +444,17 @@ static std::_tstring getProfileString(
                 }
             }
         }
-
+        
         fclose( fp );
     }
-
+    
     return retValue;
 }
 
 static std::queue< std::_tstring > getProfileSections( const std::_tstring& aFileName )
 {
-    FILE    *fp = _tfopen( aFileName.c_str(), _T("r") );
-    std::queue< std::_tstring > aResult;
+    FILE	*fp = _tfopen( aFileName.c_str(), _T("r") );
+    std::queue< std::_tstring >	aResult;
 
     OutputDebugStringFormat( TEXT("*** Retrieving Section Names ****") );
 
@@ -462,16 +462,16 @@ static std::queue< std::_tstring > getProfileSections( const std::_tstring& aFil
     {
         std::_tstring line;
         std::_tstring section;
-
+        
         while ( readLine( fp, line ) )
         {
             line = trim( line );
-
+            
             if ( line.length() && line[0] == '[' )
             {
                 line.erase( 0, 1 );
                 std::_tstring::size_type end = line.find( ']', 0 );
-
+                
                 if ( std::_tstring::npos != end )
                     section = trim( line.substr( 0, end ) );
 
@@ -481,10 +481,10 @@ static std::queue< std::_tstring > getProfileSections( const std::_tstring& aFil
 
             }
         }
-
+        
         fclose( fp );
     }
-
+    
     OutputDebugStringFormat( TEXT("*** Done Section Names ***") );
 
     return aResult;
@@ -492,8 +492,8 @@ static std::queue< std::_tstring > getProfileSections( const std::_tstring& aFil
 
 static std::queue< std::_tstring > getProfileKeys( const std::_tstring& aFileName, const std::_tstring& aSectionName )
 {
-    FILE    *fp = _tfopen( aFileName.c_str(), _T("r") );
-    std::queue< std::_tstring > aResult;
+    FILE	*fp = _tfopen( aFileName.c_str(), _T("r") );
+    std::queue< std::_tstring >	aResult;
 
     OutputDebugStringFormat( TEXT("*** Retrieving Key Names for [%s] ***"), aSectionName.c_str() );
 
@@ -501,27 +501,27 @@ static std::queue< std::_tstring > getProfileKeys( const std::_tstring& aFileNam
     {
         std::_tstring line;
         std::_tstring section;
-
+        
         while ( readLine( fp, line ) )
         {
             line = trim( line );
-
+            
             if ( line.length() && line[0] == '[' )
             {
                 line.erase( 0, 1 );
                 std::_tstring::size_type end = line.find( ']', 0 );
-
+                
                 if ( std::_tstring::npos != end )
                     section = trim( line.substr( 0, end ) );
             }
             else
             {
 
-                std::_tstring::size_type iEqualSign = line.find( '=', 0 );
+                std::_tstring::size_type iEqualSign = line.find( '=', 0 ); 
 
                 if ( iEqualSign != std::_tstring::npos )
                 {
-                    std::_tstring   keyname = line.substr( 0, iEqualSign );
+                    std::_tstring	keyname = line.substr( 0, iEqualSign );
                     keyname = trim( keyname );
 
                     if ( 0 == _tcsicmp( section.c_str(), aSectionName.c_str() ) )
@@ -534,7 +534,7 @@ static std::queue< std::_tstring > getProfileKeys( const std::_tstring& aFileNam
                 }
             }
         }
-
+        
         fclose( fp );
     }
 
@@ -545,23 +545,23 @@ static std::queue< std::_tstring > getProfileKeys( const std::_tstring& aFileNam
 
 extern "C" UINT __stdcall InstallPatchedFiles( MSIHANDLE handle )
 {
-    std::_tstring   sInstDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") );
-    std::_tstring   sProgramDir = sInstDir + TEXT("Basis\\program\\");
-    std::_tstring   sPatchFile = sProgramDir + TEXT("patchlist.txt");
+    std::_tstring	sInstDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") );
+    std::_tstring	sProgramDir = sInstDir + TEXT("Basis\\program\\");
+    std::_tstring	sPatchFile = sProgramDir + TEXT("patchlist.txt");
 
     std::queue< std::_tstring > aSectionNames;
     std::queue< std::_tstring > aKeyNames;
 
     OutputDebugStringA( "Starting Custom Action" );
 
-    // std::_tstring    mystr;
+    // std::_tstring	mystr;
     // mystr = "Patchfile: " + sPatchFile;
     // MessageBox( NULL, mystr.c_str(), "Patchfile", MB_OK );
 
     aSectionNames = getProfileSections( sPatchFile );
     while ( !aSectionNames.empty() )
     {
-        std::_tstring   sSectionName = aSectionNames.front();
+        std::_tstring	sSectionName = aSectionNames.front();
         if ( std::_tstring(TEXT("_root")) == sSectionName ) { sSectionName = TEXT(""); }
         // mystr = "Section: " + sSectionName;
         // MessageBox( NULL, mystr.c_str(), "Titel", MB_OK );
@@ -569,14 +569,14 @@ extern "C" UINT __stdcall InstallPatchedFiles( MSIHANDLE handle )
         aKeyNames = getProfileKeys( sPatchFile, sSectionName );
         while ( !aKeyNames.empty() )
         {
-            std::_tstring   sKeyName = aKeyNames.front();
-            std::_tstring   sValue = getProfileString( sPatchFile, sSectionName, sKeyName );
+            std::_tstring	sKeyName = aKeyNames.front();
+            std::_tstring	sValue = getProfileString( sPatchFile, sSectionName, sKeyName );
 
             if ( sValue.length() )
             {
-                std::_tstring   sFileName1 = sKeyName;
-                std::_tstring   sExtension = sValue;
-                std::_tstring   sFileName2;
+                std::_tstring	sFileName1 = sKeyName;
+                std::_tstring	sExtension = sValue;
+                std::_tstring	sFileName2;
 
                 sFileName1 = strip( sFileName1, '\"' );
                 sExtension = strip( sExtension, '\"' );
@@ -592,7 +592,7 @@ extern "C" UINT __stdcall InstallPatchedFiles( MSIHANDLE handle )
 
             aKeyNames.pop();
         }
-
+            
         aSectionNames.pop();
     }
 
@@ -601,13 +601,13 @@ extern "C" UINT __stdcall InstallPatchedFiles( MSIHANDLE handle )
 
 extern "C" UINT __stdcall UninstallPatchedFiles( MSIHANDLE handle )
 {
-    TCHAR   szValue[8192];
-    DWORD   nValueSize = sizeof(szValue);
-    HKEY    hKey;
-
-    std::_tstring   sInstDir;
-
-    std::_tstring   sProductKey = GetMsiProperty( handle, TEXT("FINDPRODUCT") );
+    TCHAR	szValue[8192];
+    DWORD	nValueSize = sizeof(szValue);
+    HKEY	hKey;
+    
+    std::_tstring	sInstDir;
+    
+    std::_tstring	sProductKey = GetMsiProperty( handle, TEXT("FINDPRODUCT") );
 
     if ( ERROR_SUCCESS == RegOpenKey( HKEY_CURRENT_USER,  sProductKey.c_str(), &hKey ) )
     {
@@ -628,20 +628,20 @@ extern "C" UINT __stdcall UninstallPatchedFiles( MSIHANDLE handle )
     else
         return ERROR_SUCCESS;
 
-    std::_tstring   sProgramDir = sInstDir + TEXT("Basis\\program\\");
-    std::_tstring   sPatchFile = sProgramDir + TEXT("patchlist.txt");
+    std::_tstring	sProgramDir = sInstDir + TEXT("Basis\\program\\");
+    std::_tstring	sPatchFile = sProgramDir + TEXT("patchlist.txt");
 
-    std::queue< std::_tstring > aSectionNames;
-    std::queue< std::_tstring > aKeyNames;
+    std::queue< std::_tstring >	aSectionNames;
+    std::queue< std::_tstring >	aKeyNames;
 
-    // std::_tstring    mystr;
+    // std::_tstring	mystr;
     // mystr = "Patchfile: " + sPatchFile;
     // MessageBox( NULL, mystr.c_str(), "Titel", MB_OK );
 
     aSectionNames = getProfileSections( sPatchFile );
     while ( !aSectionNames.empty() )
-    {
-        std::_tstring   sSectionName = aSectionNames.front();
+    {	
+        std::_tstring	sSectionName = aSectionNames.front();
         if ( std::_tstring(TEXT("_root")) == sSectionName ) { sSectionName = TEXT(""); }
         // mystr = "Section: " + sSectionName;
         // MessageBox( NULL, mystr.c_str(), "Titel", MB_OK );
@@ -649,14 +649,14 @@ extern "C" UINT __stdcall UninstallPatchedFiles( MSIHANDLE handle )
         aKeyNames = getProfileKeys( sPatchFile, sSectionName );
         while( !aKeyNames.empty() )
         {
-            std::_tstring   sKeyName = aKeyNames.front();
-            std::_tstring   sValue = getProfileString( sPatchFile, sSectionName, sKeyName );
+            std::_tstring	sKeyName = aKeyNames.front();
+            std::_tstring	sValue = getProfileString( sPatchFile, sSectionName, sKeyName );
 
             if ( sValue.length() )
             {
-                std::_tstring   sFileName1 = sKeyName;
-                std::_tstring   sExtension = sValue;
-                std::_tstring   sFileName2;
+                std::_tstring	sFileName1 = sKeyName;
+                std::_tstring	sExtension = sValue;
+                std::_tstring	sFileName2;
 
                 sFileName1 = strip( sFileName1, '\"' );
                 sExtension = strip( sExtension, '\"' );
@@ -672,7 +672,7 @@ extern "C" UINT __stdcall UninstallPatchedFiles( MSIHANDLE handle )
 
             aKeyNames.pop();
         }
-
+        
         aSectionNames.pop();
     }
 
@@ -681,22 +681,22 @@ extern "C" UINT __stdcall UninstallPatchedFiles( MSIHANDLE handle )
 
 extern "C" UINT __stdcall IsOfficeRunning( MSIHANDLE handle )
 {
-    std::_tstring   sInstDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") );
-    std::_tstring   sResourceDir = sInstDir + TEXT("Basis\\program\\resource\\");
-    std::_tstring   sPattern = sResourceDir + TEXT("vcl*.res");
+    std::_tstring	sInstDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") );
+    std::_tstring	sResourceDir = sInstDir + TEXT("Basis\\program\\resource\\");
+    std::_tstring	sPattern = sResourceDir + TEXT("vcl*.res");
 
-    WIN32_FIND_DATA aFindFileData;
-    HANDLE  hFind = FindFirstFile( sPattern.c_str(), &aFindFileData );
+    WIN32_FIND_DATA	aFindFileData;
+    HANDLE	hFind = FindFirstFile( sPattern.c_str(), &aFindFileData );
 
     if ( IsValidHandle(hFind) )
     {
-        BOOL    fSuccess = false;
-        bool    fRenameSucceeded;
+        BOOL	fSuccess = false;
+        bool	fRenameSucceeded;
 
         do
         {
-            std::_tstring   sResourceFile = sResourceDir + aFindFileData.cFileName;
-            std::_tstring   sIntermediate = sResourceFile + TEXT(".tmp");
+            std::_tstring	sResourceFile = sResourceDir + aFindFileData.cFileName;
+            std::_tstring	sIntermediate = sResourceFile + TEXT(".tmp");
 
             fRenameSucceeded = MoveFileExImpl( sResourceFile.c_str(), sIntermediate.c_str(), MOVEFILE_REPLACE_EXISTING );
             if ( fRenameSucceeded )
@@ -721,7 +721,7 @@ extern "C" UINT __stdcall IsOfficeRunning( MSIHANDLE handle )
 
 extern "C" UINT __stdcall SetFeatureState( MSIHANDLE handle )
 {
-    std::_tstring   mystr;
+    std::_tstring	mystr;
 
     // 1. Reading Product Code from setup.ini of installed Office
 
@@ -731,13 +731,13 @@ extern "C" UINT __stdcall SetFeatureState( MSIHANDLE handle )
 
     TCHAR szProductCode[32767];
 
-    GetPrivateProfileString(
-        TEXT("Bootstrap"),
+    GetPrivateProfileString( 
+        TEXT("Bootstrap"), 
         TEXT("ProductCode"),
         TEXT("NOTFOUND"),
         szProductCode,
         SAL_N_ELEMENTS(szProductCode),
-        sSetupiniPath.c_str()
+        sSetupiniPath.c_str() 
         );
 
     if ( !_tcsicmp( szProductCode, TEXT("NOTFOUND") ) )
@@ -748,7 +748,7 @@ extern "C" UINT __stdcall SetFeatureState( MSIHANDLE handle )
     }
 
     // 2. Converting Product code
-
+    
     std::_tstring productCode = TEXT(szProductCode);
     productCode = ConvertGuid(std::_tstring(productCode.c_str() + 1, productCode.length() - 2));
     mystr = TEXT("Changed product code: ") + productCode;
@@ -782,7 +782,7 @@ extern "C" UINT __stdcall SetFeatureState( MSIHANDLE handle )
         int counter = 0;
         // DWORD counter = 0;
         LONG lEnumResult;
-
+        
         do
         {
             TCHAR szValueName[8192];
@@ -792,7 +792,7 @@ extern "C" UINT __stdcall SetFeatureState( MSIHANDLE handle )
             DWORD nValueDataSize = sizeof(szValueData);
 
             lEnumResult = RegEnumValue( hKey, counter, szValueName, pValueNameSize, NULL, NULL, (LPBYTE)szValueData, &nValueDataSize);
-
+            
             if ( ERROR_SUCCESS == lEnumResult )
             {
                 std::_tstring sValueName = szValueName;
@@ -811,21 +811,21 @@ extern "C" UINT __stdcall SetFeatureState( MSIHANDLE handle )
                     {
                         MsiSetFeatureState(handle,sValueName.c_str(),INSTALLSTATE_ABSENT); // do not install this feature
                         // mystr = TEXT("Do NOT install: ") + sValueName;
-                        // MessageBox( NULL, mystr.c_str(), "ValueName", MB_OK );
+                        // MessageBox( NULL, mystr.c_str(), "ValueName", MB_OK );				
                     }
                     else
                     {
                         MsiSetFeatureState(handle,sValueName.c_str(),INSTALLSTATE_LOCAL); // do install this feature
                         // mystr = TEXT("Do install: ") + sValueName;
-                        // MessageBox( NULL, mystr.c_str(), "ValueName", MB_OK );
-                    }
+                        // MessageBox( NULL, mystr.c_str(), "ValueName", MB_OK );					
+                    }	
                 }
             }
 
             counter = counter + 1;
-
+            
         } while ( ERROR_SUCCESS == lEnumResult );
-
+        
         RegCloseKey( hKey );
     }
 
@@ -851,7 +851,7 @@ extern "C" UINT __stdcall SetNewFeatureState( MSIHANDLE handle )
         // mystr = TEXT("OnlineUpdate wird NICHT installiert!");
         // MessageBox(NULL, mystr.c_str(), "INSTALLSTATE_ABSENT", MB_OK);
     }
-
+    
     return ERROR_SUCCESS;
 }
 
@@ -878,7 +878,7 @@ extern "C" UINT __stdcall ShowOnlineUpdateDialog( MSIHANDLE handle )
         UnsetMsiProperty(handle, TEXT("SHOW_ONLINEUPDATE_DIALOG"));
 
         // Setting SELECT_OU_FEATURE to 1, which is probably superfluous
-        // because this is already the default value. But only this
+        // because this is already the default value. But only this 
         // guarantees, that CustomAction SetNewFeatureState always sets
         // the correct FeatureState for "gm_o_Onlineupdate", if it is
         // already installed.
diff --git a/setup_native/source/win32/customactions/quickstarter/quickstarter.cxx b/setup_native/source/win32/customactions/quickstarter/quickstarter.cxx
index fbb4982a96f4..396b293d95f1 100644
--- a/setup_native/source/win32/customactions/quickstarter/quickstarter.cxx
+++ b/setup_native/source/win32/customactions/quickstarter/quickstarter.cxx
@@ -15,7 +15,7 @@ std::string GetOfficeInstallationPath(MSIHANDLE handle)
     std::string progpath;
     DWORD sz = 0;
     LPTSTR dummy = TEXT("");
-
+    
     if (MsiGetProperty(handle, TEXT("INSTALLLOCATION"), dummy, &sz) == ERROR_MORE_DATA)
     {
         sz++; // space for the final '\0'
@@ -23,7 +23,7 @@ std::string GetOfficeInstallationPath(MSIHANDLE handle)
         LPTSTR buff = reinterpret_cast<LPTSTR>(_alloca(nbytes));
         ZeroMemory(buff, nbytes);
         MsiGetProperty(handle, TEXT("INSTALLLOCATION"), buff, &sz);
-        progpath = buff;
+        progpath = buff;            
     }
     return progpath;
 }
@@ -33,7 +33,7 @@ std::string GetOfficeProductName(MSIHANDLE handle)
     std::string productname;
     DWORD sz = 0;
     LPTSTR dummy = TEXT("");
-
+    
     if (MsiGetProperty(handle, TEXT("ProductName"), dummy, &sz) == ERROR_MORE_DATA)
     {
         sz++; // space for the final '\0'
@@ -41,7 +41,7 @@ std::string GetOfficeProductName(MSIHANDLE handle)
         LPTSTR buff = reinterpret_cast<LPTSTR>(_alloca(nbytes));
         ZeroMemory(buff, nbytes);
         MsiGetProperty(handle, TEXT("ProductName"), buff, &sz);
-        productname = buff;
+        productname = buff;            
     }
     return productname;
 }
@@ -51,7 +51,7 @@ std::string GetQuickstarterLinkName(MSIHANDLE handle)
     std::string quickstarterlinkname;
     DWORD sz = 0;
     LPTSTR dummy = TEXT("");
-
+    
     if (MsiGetProperty(handle, TEXT("Quickstarterlinkname"), dummy, &sz) == ERROR_MORE_DATA)
     {
         sz++; // space for the final '\0'
@@ -59,7 +59,7 @@ std::string GetQuickstarterLinkName(MSIHANDLE handle)
         LPTSTR buff = reinterpret_cast<LPTSTR>(_alloca(nbytes));
         ZeroMemory(buff, nbytes);
         MsiGetProperty(handle, TEXT("Quickstarterlinkname"), buff, &sz);
-        quickstarterlinkname = buff;
+        quickstarterlinkname = buff;            
     }
     else if (MsiGetProperty(handle, TEXT("ProductName"), dummy, &sz) == ERROR_MORE_DATA)
     {
@@ -68,7 +68,7 @@ std::string GetQuickstarterLinkName(MSIHANDLE handle)
         LPTSTR buff = reinterpret_cast<LPTSTR>(_alloca(nbytes));
         ZeroMemory(buff, nbytes);
         MsiGetProperty(handle, TEXT("ProductName"), buff, &sz);
-        quickstarterlinkname = buff;
+        quickstarterlinkname = buff;            
     }
     return quickstarterlinkname;
 }
@@ -82,13 +82,13 @@ inline bool IsValidHandle( HANDLE handle )
 static HANDLE WINAPI _CreateToolhelp32Snapshot( DWORD dwFlags, DWORD th32ProcessID )
 {
     typedef HANDLE (WINAPI *FN_PROC)( DWORD dwFlags, DWORD th32ProcessID );
-    static FN_PROC  lpProc = NULL;
+    static FN_PROC	lpProc = NULL;
 
-    HANDLE  hSnapshot = NULL;
+    HANDLE	hSnapshot = NULL;
 
     if ( !lpProc )
     {
-        HMODULE hLibrary = GetModuleHandle("KERNEL32.DLL");
+        HMODULE	hLibrary = GetModuleHandle("KERNEL32.DLL");
 
         if ( hLibrary )
             lpProc = reinterpret_cast< FN_PROC >(GetProcAddress( hLibrary, "CreateToolhelp32Snapshot" ));
@@ -103,13 +103,13 @@ static HANDLE WINAPI _CreateToolhelp32Snapshot( DWORD dwFlags, DWORD th32Process
 static BOOL WINAPI _Process32First( HANDLE hSnapshot, PROCESSENTRY32 *lppe32 )
 {
     typedef BOOL (WINAPI *FN_PROC)( HANDLE hSnapshot, PROCESSENTRY32 *lppe32 );
-    static FN_PROC  lpProc = NULL;
+    static FN_PROC	lpProc = NULL;
 
-    BOOL    fSuccess = FALSE;
+    BOOL	fSuccess = FALSE;
 
     if ( !lpProc )
     {
-        HMODULE hLibrary = GetModuleHandle("KERNEL32.DLL");
+        HMODULE	hLibrary = GetModuleHandle("KERNEL32.DLL");
 
         if ( hLibrary )
             lpProc = reinterpret_cast< FN_PROC >(GetProcAddress( hLibrary, "Process32First" ));
@@ -124,13 +124,13 @@ static BOOL WINAPI _Process32First( HANDLE hSnapshot, PROCESSENTRY32 *lppe32 )
 static BOOL WINAPI _Process32Next( HANDLE hSnapshot, PROCESSENTRY32 *lppe32 )
 {
     typedef BOOL (WINAPI *FN_PROC)( HANDLE hSnapshot, PROCESSENTRY32 *lppe32 );
-    static FN_PROC  lpProc = NULL;
+    static FN_PROC	lpProc = NULL;
 
-    BOOL    fSuccess = FALSE;
+    BOOL	fSuccess = FALSE;
 
     if ( !lpProc )
     {
-        HMODULE hLibrary = GetModuleHandle("KERNEL32.DLL");
+        HMODULE	hLibrary = GetModuleHandle("KERNEL32.DLL");
 
         if ( hLibrary )
             lpProc = reinterpret_cast< FN_PROC >(GetProcAddress( hLibrary, "Process32Next" ));
@@ -144,18 +144,18 @@ static BOOL WINAPI _Process32Next( HANDLE hSnapshot, PROCESSENTRY32 *lppe32 )
 
 static std::string GetProcessImagePath_9x( DWORD dwProcessId )
 {
-    std::string sImagePath;
+    std::string	sImagePath;
 
-    HANDLE  hSnapshot = _CreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 );
+    HANDLE	hSnapshot = _CreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 );
 
     if ( IsValidHandle( hSnapshot ) )
     {
-        PROCESSENTRY32  pe32 = { 0 };
+        PROCESSENTRY32	pe32 = { 0 };
 
         pe32.dwSize = sizeof(PROCESSENTRY32);
 
-        BOOL    fSuccess = _Process32First( hSnapshot, &pe32 );
-        bool    found = false;
+        BOOL	fSuccess = _Process32First( hSnapshot, &pe32 );
+        bool	found = false;
 
         while ( !found && fSuccess )
         {
@@ -179,11 +179,11 @@ static DWORD WINAPI _GetModuleFileNameExA( HANDLE hProcess, HMODULE hModule, LPS
 {
     typedef DWORD (WINAPI *FN_PROC)( HANDLE hProcess, HMODULE hModule, LPSTR lpFileName, DWORD nSize );
 
-    static FN_PROC  lpProc = NULL;
+    static FN_PROC	lpProc = NULL;
 
     if ( !lpProc )
     {
-        HMODULE hLibrary = LoadLibrary("PSAPI.DLL");
+        HMODULE	hLibrary = LoadLibrary("PSAPI.DLL");
 
         if ( hLibrary )
             lpProc = reinterpret_cast< FN_PROC >(GetProcAddress( hLibrary, "GetModuleFileNameExA" ));
@@ -198,13 +198,13 @@ static DWORD WINAPI _GetModuleFileNameExA( HANDLE hProcess, HMODULE hModule, LPS
 
 static std::string GetProcessImagePath_NT( DWORD dwProcessId )
 {
-    std::string sImagePath;
+    std::string	sImagePath;
 
-    HANDLE  hProcess = OpenProcess( PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, dwProcessId );
+    HANDLE	hProcess = OpenProcess( PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, dwProcessId );
 
     if ( IsValidHandle( hProcess ) )
     {
-        CHAR    szPathBuffer[MAX_PATH] = "";
+        CHAR	szPathBuffer[MAX_PATH] = "";
 
         if ( _GetModuleFileNameExA( hProcess, NULL, szPathBuffer, sizeof(szPathBuffer) ) )
             sImagePath = szPathBuffer;
diff --git a/setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx b/setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx
index 1d1b3c61d67a..d61309c98762 100644
--- a/setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx
+++ b/setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 "C" UINT __stdcall RemoveQuickstarterLink( MSIHANDLE hMSI )
 {
-    CHAR    szStartupPath[MAX_PATH];
+    CHAR	szStartupPath[MAX_PATH];
 
     if ( SHGetSpecialFolderPathA( NULL, szStartupPath, CSIDL_STARTUP, FALSE ) )
     {
diff --git a/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx b/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx
index 86e9585044ae..d1d7794ad35f 100644
--- a/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx
+++ b/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,29 +31,29 @@
 
 static BOOL CALLBACK EnumWindowsProc( HWND hWnd, LPARAM lParam )
 {
-    MSIHANDLE   hMSI = static_cast< MSIHANDLE >( lParam );
-    CHAR    szClassName[sizeof(QUICKSTART_CLASSNAMEA) + 1];
+    MSIHANDLE	hMSI = static_cast< MSIHANDLE >( lParam );
+    CHAR	szClassName[sizeof(QUICKSTART_CLASSNAMEA) + 1];
 
-    int nCharsCopied = GetClassName( hWnd, szClassName, sizeof( szClassName ) );
+    int	nCharsCopied = GetClassName( hWnd, szClassName, sizeof( szClassName ) );
 
     if ( nCharsCopied && !stricmp( QUICKSTART_CLASSNAMEA, szClassName ) )
     {
-        DWORD   dwProcessId;
+        DWORD	dwProcessId;
 
         if ( GetWindowThreadProcessId( hWnd, &dwProcessId ) )
         {
-            std::string sImagePath = GetProcessImagePath( dwProcessId );
-            std::string sOfficeImageDir = GetOfficeInstallationPath( hMSI ) + "program\\";
+            std::string	sImagePath = GetProcessImagePath( dwProcessId );
+            std::string	sOfficeImageDir = GetOfficeInstallationPath( hMSI ) + "program\\";
 
             if ( !strnicmp( sImagePath.c_str(), sOfficeImageDir.c_str(), sOfficeImageDir.length() ) )
             {
-                UINT    uMsgShutdownQuickstart = RegisterWindowMessageA( SHUTDOWN_QUICKSTART_MESSAGEA );
+                UINT	uMsgShutdownQuickstart = RegisterWindowMessageA( SHUTDOWN_QUICKSTART_MESSAGEA );
 
                 if ( uMsgShutdownQuickstart )
                     SendMessageA( hWnd, uMsgShutdownQuickstart, 0, 0 );
+                
 
-
-                HANDLE  hProcess = OpenProcess( SYNCHRONIZE, FALSE, dwProcessId );
+                HANDLE	hProcess = OpenProcess( SYNCHRONIZE, FALSE, dwProcessId );
 
                 if ( hProcess )
                 {
@@ -66,7 +66,7 @@ static BOOL CALLBACK EnumWindowsProc( HWND hWnd, LPARAM lParam )
 
         }
     }
-
+    
     return TRUE;
 }
 
diff --git a/setup_native/source/win32/customactions/rebase/rebase.cxx b/setup_native/source/win32/customactions/rebase/rebase.cxx
index 1eb3fedbf2f0..deece215afa2 100644
--- a/setup_native/source/win32/customactions/rebase/rebase.cxx
+++ b/setup_native/source/win32/customactions/rebase/rebase.cxx
@@ -47,8 +47,8 @@ static bool IsValidHandle( HANDLE handle )
 static std::string GetMsiProperty(MSIHANDLE handle, const std::string& sProperty)
 {
     std::string result;
-    TCHAR       szDummy[1] = TEXT("");
-    DWORD       nChars = 0;
+    TCHAR		szDummy[1] = TEXT("");
+    DWORD		nChars = 0;
 
     if (MsiGetProperty(handle, sProperty.c_str(), szDummy, &nChars) == ERROR_MORE_DATA)
     {
@@ -67,7 +67,7 @@ static BOOL rebaseImage( const std::string& filePath, LPVOID address )
     ULONG_PTR lpOldImageBase;
     ULONG ulNewImageSize;
     ULONG_PTR lpNewImageBase = reinterpret_cast<ULONG_PTR>(address);
-
+    
     BOOL bResult = ReBaseImage(
         (PSTR)filePath.c_str(),
         (PSTR)"",
@@ -80,17 +80,17 @@ static BOOL rebaseImage( const std::string& filePath, LPVOID address )
         &ulNewImageSize,
         &lpNewImageBase,
         (ULONG)time(NULL) );
-
+    
     return bResult;
 }
 
 static BOOL rebaseImage( MSIHANDLE /*handle*/, const std::string& sFilePath, LPVOID address )
 {
-    std::string mystr;
+    std::string	mystr;
     mystr = "Full file: " + sFilePath;
 
     BOOL bResult = rebaseImage( sFilePath, address );
-
+    
     if ( !bResult )
     {
         OutputDebugStringFormat( "Rebasing library %s failed", mystr.c_str() );
@@ -102,10 +102,10 @@ static BOOL rebaseImage( MSIHANDLE /*handle*/, const std::string& sFilePath, LPV
 static BOOL rebaseImagesInFolder( MSIHANDLE handle, const std::string& sPath, LPVOID address )
 {
     std::string   sDir     = sPath;
-    std::string   sPattern = sPath + TEXT("*.dll");
+    std::string	  sPattern = sPath + TEXT("*.dll");
 
-    WIN32_FIND_DATA aFindFileData;
-    HANDLE  hFind = FindFirstFile( sPattern.c_str(), &aFindFileData );
+    WIN32_FIND_DATA	aFindFileData;
+    HANDLE	hFind = FindFirstFile( sPattern.c_str(), &aFindFileData );
 
     if ( IsValidHandle(hFind) )
     {
@@ -113,7 +113,7 @@ static BOOL rebaseImagesInFolder( MSIHANDLE handle, const std::string& sPath, LP
 
         do
         {
-            std::string sLibFile = sDir + aFindFileData.cFileName;
+            std::string	sLibFile = sDir + aFindFileData.cFileName;
             rebaseImage( handle, sLibFile, address );
             fSuccess = FindNextFile( hFind, &aFindFileData );
         }
@@ -128,15 +128,15 @@ static BOOL rebaseImagesInFolder( MSIHANDLE handle, const std::string& sPath, LP
 static BOOL rebaseImages( MSIHANDLE handle, LPVOID pAddress )
 {
     std::string sInstallPath = GetMsiProperty(handle, TEXT("INSTALLLOCATION"));
-
+ 
     std::string sBasisDir  = sInstallPath + TEXT("Basis\\program\\");
     std::string sOfficeDir = sInstallPath + TEXT("program\\");
     std::string sUreDir    = sInstallPath + TEXT("URE\\bin\\");
-
+    
     BOOL bResult = rebaseImagesInFolder( handle, sBasisDir, pAddress );
     bResult &= rebaseImagesInFolder( handle, sOfficeDir, pAddress );
     bResult &= rebaseImagesInFolder( handle, sUreDir, pAddress );
-
+    
     return bResult;
 }
 
@@ -155,11 +155,11 @@ static BOOL IsServerSystem( MSIHANDLE /*handle*/ )
 extern "C" BOOL __stdcall RebaseLibrariesOnProperties( MSIHANDLE handle )
 {
     static LPVOID pDefault = reinterpret_cast<LPVOID>(0x10000000);
-
+    
     std::string sDontOptimizeLibs = GetMsiProperty(handle, TEXT("DONTOPTIMIZELIBS"));
     if ( sDontOptimizeLibs.length() > 0 && sDontOptimizeLibs == "1" )
         return TRUE;
-
+    
     if ( !IsServerSystem( handle ))
         return rebaseImages( handle, pDefault );
 
diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
index 54a471acf095..4ce7faaec029 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #ifdef _MSC_VER
 #pragma warning(push, 1) /* disable warnings within system headers */
 #endif
-#define WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN		
 #include <windows.h>
 #include <msiquery.h>
 #ifdef _MSC_VER
@@ -144,7 +144,7 @@ static LONG DeleteSubKeyTree( HKEY RootKey, LPCSTR lpKey )
     LONG rc = RegOpenKeyExA( RootKey, lpKey, 0, KEY_READ | DELETE, &hKey );
 
     if (ERROR_SUCCESS == rc)
-    {
+    {	
         LPCSTR    lpSubKey;
         DWORD     nMaxSubKeyLen;
 
@@ -248,7 +248,7 @@ bool GetMsiProp( MSIHANDLE handle, LPCSTR name, /*out*/std::string& value )
         MsiGetPropertyA(handle, name, buff, &sz);
         value = buff;
         return true;
-    }
+    }            
     return false;
 }
 
@@ -458,7 +458,7 @@ extern "C" UINT __stdcall FindRegisteredExtensions( MSIHANDLE handle )
     }
 
     OutputDebugStringFormat( "FindRegisteredExtensions:" );
-
+    
     bool bRegisterAll = IsSetMsiProp( handle, "REGISTER_ALL_MSO_TYPES" );
 
     if ( IsSetMsiProp( handle, "REGISTER_NO_MSO_TYPES" ) )
@@ -471,7 +471,7 @@ extern "C" UINT __stdcall FindRegisteredExtensions( MSIHANDLE handle )
     else
         OutputDebugStringFormat( "FindRegisteredExtensions: " );
 
-    // setting the msi properties SELECT_* will force registering for all corresponding
+    // setting the msi properties SELECT_* will force registering for all corresponding 
     // file types
     if ( IsSetMsiProp( handle, "SELECT_WORD" ) )
         registerSomeExtensions( handle, WORD_START, EXCEL_START, true );
@@ -487,7 +487,7 @@ extern "C" UINT __stdcall FindRegisteredExtensions( MSIHANDLE handle )
 
 //----------------------------------------------------------
 extern "C" UINT __stdcall DeleteRegisteredExtensions( MSIHANDLE /*handle*/ )
-{
+{         
     OutputDebugStringFormat( "DeleteRegisteredExtensions\n" );
 
     // remove all file extensions
diff --git a/setup_native/source/win32/customactions/reg4msdoc/constants.hxx b/setup_native/source/win32/customactions/reg4msdoc/constants.hxx
index 21b576b97dda..4caab9211f78 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/constants.hxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/constants.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 _CONSTANTS_HXX_
  #define _CONSTANTS_HXX_
-
+ 
 extern const int MSWORD;
 extern const int MSEXCEL;
-extern const int MSPOWERPOINT;
-extern const int DEFAULT_HTML_EDITOR_FOR_IE;
-extern const int HTML_EDITOR;
+extern const int MSPOWERPOINT;	
+extern const int DEFAULT_HTML_EDITOR_FOR_IE;	
+extern const int HTML_EDITOR;	
 extern const int DEFAULT_SHELL_HTML_EDITOR;
 
  #endif
-
+ 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/setup_native/source/win32/customactions/reg4msdoc/msihelper.cxx b/setup_native/source/win32/customactions/reg4msdoc/msihelper.cxx
index 648d4f33fdd3..f1f2f59822df 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/msihelper.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/msihelper.cxx
@@ -17,7 +17,7 @@ bool GetMsiProp(MSIHANDLE handle, LPCTSTR name, /*out*/std::wstring& value)
         MsiGetProperty(handle, name, buff, &sz);
         value = buff;
         return true;
-    }
+    }            
     return false;
 }
 
@@ -47,7 +47,7 @@ bool IsMsiPropNotEmpty(MSIHANDLE handle, LPCTSTR name)
 
 bool IsAllUserInstallation(MSIHANDLE handle)
 {
-    return IsSetMsiProp(handle, TEXT("ALLUSERS"));
+    return IsSetMsiProp(handle, TEXT("ALLUSERS"));    
 }
 
 std::wstring GetOfficeInstallationPath(MSIHANDLE handle)
@@ -58,7 +58,7 @@ std::wstring GetOfficeInstallationPath(MSIHANDLE handle)
 }
 
 std::wstring GetOfficeExecutablePath(MSIHANDLE handle)
-{
+{    
     std::wstring exepath = GetOfficeInstallationPath(handle);
     exepath += TEXT("program\\soffice.exe");
     return exepath;
@@ -68,7 +68,7 @@ std::wstring GetProductName(MSIHANDLE handle)
 {
     std::wstring prodname;
     GetMsiProp(handle, TEXT("ProductName"), prodname);
-    return prodname;
+    return prodname; 
 }
 
 bool IsModuleInstalled(MSIHANDLE handle, LPCTSTR name)
@@ -92,7 +92,7 @@ bool IsModuleSelectedForDeinstallation(MSIHANDLE handle, LPCTSTR name)
     INSTALLSTATE current_state;
     INSTALLSTATE future_state;
     MsiGetFeatureState(handle, name, &current_state, &future_state);
-    return ((current_state == INSTALLSTATE_LOCAL) && (future_state == INSTALLSTATE_ABSENT));
+    return ((current_state == INSTALLSTATE_LOCAL) && (future_state == INSTALLSTATE_ABSENT));    
 }
 
 bool IsCompleteDeinstallation(MSIHANDLE handle)
diff --git a/setup_native/source/win32/customactions/reg4msdoc/msihelper.hxx b/setup_native/source/win32/customactions/reg4msdoc/msihelper.hxx
index 483a66986859..2ff1a880f12e 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/msihelper.hxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/msihelper.hxx
@@ -15,43 +15,43 @@
 #include <string>
 
 /**
-    Get the value of the named property
-
+    Get the value of the named property 
+    
     @param handle
     [in] a valid msi handle.
-
+    
     @param name
     [in] the name of the property.
-
+    
     @param value
     [out] receives thes value of the property.
-
-    @returns
+            
+    @returns 
     <TRUE/>if the property was found.
 */
 bool GetMsiProp(MSIHANDLE handle, LPCTSTR name, /*out*/std::wstring& value);
 
 /**
-    Set the value of a binary property which can only
+    Set the value of a binary property which can only 
     have the values "0" or "1" to "1".
-
+    
     @param handle
     [in] a valid msi handle.
-
+    
     @param name
-    [in] the name of the property.
+    [in] the name of the property.    
 */
 void SetMsiProp(MSIHANDLE handle, LPCTSTR name);
 
 /**
-    Set the value of a binary property which can only
+    Set the value of a binary property which can only 
     have the values "0" or "1" to "0".
-
+    
     @param handle
     [in] a valid msi handle.
-
+    
     @param name
-    [in] the name of the property.
+    [in] the name of the property.    
 */
 void UnsetMsiProp(MSIHANDLE handle, LPCTSTR name);
 
@@ -59,7 +59,7 @@ void UnsetMsiProp(MSIHANDLE handle, LPCTSTR name);
     Returns whether a certain property is set meaning
     its value is "1". This method should be used for
     binary properties whose value can be "0" or "1".
-
+    
     @returns
     <TRUE/>if the value of the specified property is
     "1" else if the property is not defined or its
@@ -71,7 +71,7 @@ bool IsSetMsiProp(MSIHANDLE handle, LPCTSTR name);
     Returns whether a certain property is set meaning
     its value is not empty. This method should be used for
     properties, that can have different values.
-
+    
     @returns
     <TRUE/>if the value of the specified property is
     not empty. If it is empty <FALSE/> will be returned.
@@ -80,10 +80,10 @@ bool IsMsiPropNotEmpty(MSIHANDLE handle, LPCTSTR name);
 
 /**
     Query if this is an installation for all user or not.
-
+    
     @param handle
     [in] a valid msi handle.
-
+    
     @returns
     <TRUE/>if this is an all user installation
 */
@@ -92,10 +92,10 @@ bool IsAllUserInstallation(MSIHANDLE handle);
 /**
     Returns the destination folder of the office installation
     as system path. The returned path contains a final '\'.
-
+    
     @param handle
     [in] a valid msi handle.
-
+    
     @returns
     the destination path of the office installation finalized
     with a '\'.
@@ -105,10 +105,10 @@ std::wstring GetOfficeInstallationPath(MSIHANDLE handle);
 /**
     Returns the absolute path of the office executable that
     will be installed as system path.
-
+    
     @param handle
     [in] a valid msi handle.
-
+    
     @returns
     the absolute system path of the office executable (e.g.
     (C:\Program Files\StarOffice 8\program\soffice.exe").
@@ -118,25 +118,25 @@ std::wstring GetOfficeExecutablePath(MSIHANDLE handle);
 /**
     Get the name of the office that will be installed
     (e.g. StarOffice 8, StarSuite 8, ...).
-
+    
     @param handle
     [in] a valid msi handle.
-
-    @returns
+    
+    @returns 
     the name of the office product that will be installed.
 */
 std::wstring GetProductName(MSIHANDLE handle);
 
 /**
     Determine if the specified module is installed locally.
-
+    
     @param handle
     [in] a valid msi handle.
-
+    
     @param name
     [in] the name of the module.
-
-    @returns
+    
+    @returns 
     <TRUE/>if the specified module is installed locally.
 */
 bool IsModuleInstalled(MSIHANDLE handle, LPCTSTR name);
@@ -144,39 +144,39 @@ bool IsModuleInstalled(MSIHANDLE handle, LPCTSTR name);
 /**
     Determine if the specified module is selected to be installed
     locally.
-
+    
     @param handle
     [in] a valid msi handle.
-
+    
     @param name
     [in] the name of the module.
-
+        
     @returns
-    <TRUE/>if the specified module is about to be installed locally.
+    <TRUE/>if the specified module is about to be installed locally.    
 */
 bool IsModuleSelectedForInstallation(MSIHANDLE handle, LPCTSTR name);
 
 /**
     Determine if the specified module which is locally installed is
     selected for deinstallation.
-
+    
     @param handle
     [in] a valid msi handle.
-
+    
     @param name
     [in] the name of the module.
-
-    @returns
+    
+    @returns 
     <TRUE/>if the specified module is about to be deinstalled.
 */
 bool IsModuleSelectedForDeinstallation(MSIHANDLE handle, LPCTSTR name);
 
 /**
     Determine whether this is a complete uninstallation or not.
-
+    
     @param handle
     [in] a valid msi handle.
-
+    
     @returns
     <TRUE/>if this is a complete deinstallation.
 */
diff --git a/setup_native/source/win32/customactions/reg4msdoc/reg4msdocmsi.cxx b/setup_native/source/win32/customactions/reg4msdoc/reg4msdocmsi.cxx
index e3f930ccfcbd..538f45339851 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/reg4msdocmsi.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/reg4msdocmsi.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #ifdef _MSC_VER
 #pragma warning(push, 1) /* disable warnings within system headers */
 #endif
-#define WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN		
 #include <windows.h>
 #include <msiquery.h>
 #ifdef _MSC_VER
@@ -62,29 +62,29 @@ void DeterminePowerPointPreselectionState(MSIHANDLE handle)
 }
 
 extern "C" UINT __stdcall InstallUiSequenceEntry(MSIHANDLE handle)
-{
+{        
     //MessageBox(NULL, TEXT("InstallUiSequenceEntry"), TEXT("Information"), MB_OK | MB_ICONINFORMATION);
-
+    
     if (IsModuleSelectedForInstallation(handle, TEXT("gm_p_Wrt_Bin")))
     {
         DetermineWordPreselectionState(handle);
     }
-    else if (IsModuleInstalled(handle, TEXT("gm_p_Wrt_Bin")) &&
-             !IsModuleSelectedForDeinstallation(handle, TEXT("gm_p_Wrt_Bin")) &&
+    else if (IsModuleInstalled(handle, TEXT("gm_p_Wrt_Bin")) && 
+             !IsModuleSelectedForDeinstallation(handle, TEXT("gm_p_Wrt_Bin")) && 
              IsRegisteredFor(handle, MSWORD))
-    {
+    {             
         SetMsiProp(handle, TEXT("SELECT_WORD"));
-    }
+    }        
     else
     {
         UnsetMsiProp(handle, TEXT("SELECT_WORD"));
     }
-
-    if (IsModuleSelectedForInstallation(handle, TEXT("gm_p_Calc_Bin")))
+        
+    if (IsModuleSelectedForInstallation(handle, TEXT("gm_p_Calc_Bin")))                    
     {
-        DetermineExcelPreselectionState(handle);
-    }
-    else if (IsModuleInstalled(handle, TEXT("gm_p_Calc_Bin")) &&
+        DetermineExcelPreselectionState(handle);    
+    }        
+    else if (IsModuleInstalled(handle, TEXT("gm_p_Calc_Bin")) && 
              !IsModuleSelectedForDeinstallation(handle, TEXT("gm_p_Calc_Bin")) &&
              IsRegisteredFor(handle, MSEXCEL))
     {
@@ -94,21 +94,21 @@ extern "C" UINT __stdcall InstallUiSequenceEntry(MSIHANDLE handle)
     {
         UnsetMsiProp(handle, TEXT("SELECT_EXCEL"));
     }
-
-    if (IsModuleSelectedForInstallation(handle, TEXT("gm_p_Impress_Bin")))
+        
+    if (IsModuleSelectedForInstallation(handle, TEXT("gm_p_Impress_Bin")))         
     {
         DeterminePowerPointPreselectionState(handle);
-    }
-    else if (IsModuleInstalled(handle, TEXT("gm_p_Impress_Bin")) &&
+    }       
+    else if (IsModuleInstalled(handle, TEXT("gm_p_Impress_Bin")) && 
             !IsModuleSelectedForDeinstallation(handle, TEXT("gm_p_Impress_Bin")) &&
             IsRegisteredFor(handle, MSPOWERPOINT))
     {
-        SetMsiProp(handle, TEXT("SELECT_POWERPOINT"));
-    }
+        SetMsiProp(handle, TEXT("SELECT_POWERPOINT"));        
+    }        
     else
     {
         UnsetMsiProp(handle, TEXT("SELECT_POWERPOINT"));
-    }
+    }    
 
     SetMsiProp(handle, TEXT("UI_SEQUENCE_EXECUTED"));
 
@@ -118,17 +118,17 @@ extern "C" UINT __stdcall InstallUiSequenceEntry(MSIHANDLE handle)
 extern "C" UINT __stdcall InstallExecSequenceEntry(MSIHANDLE handle)
 {
     //MessageBox(NULL, TEXT("InstallExecSequenceEntry"), TEXT("Information"), MB_OK | MB_ICONINFORMATION);
-
+     
     // Do nothing in repair mode.
     // Then UI_SEQUENCE_EXECUTED is not set and Installed is set!
     // In silent installation UI_SEQUENCE_EXECUTED is also not set, but Installed is not set.
     if ((!IsSetMsiProp(handle, TEXT("UI_SEQUENCE_EXECUTED"))) && (IsMsiPropNotEmpty(handle, TEXT("Installed")))) { return ERROR_SUCCESS; }
-
+    
     int reg4 = 0;
     int unreg4 = 0;
-
-    // we always register as html editor for Internet Explorer
-    // if writer is installed because there's no harm if we do so
+    
+    // we always register as html editor for Internet Explorer 
+    // if writer is installed because there's no harm if we do so 
     if (IsModuleSelectedForInstallation(handle, TEXT("gm_p_Wrt_Bin")))
         reg4 |= HTML_EDITOR;
 
@@ -136,54 +136,54 @@ extern "C" UINT __stdcall InstallExecSequenceEntry(MSIHANDLE handle)
         reg4 |= MSWORD;
     else if (!IsSetMsiProp(handle, TEXT("SELECT_WORD")) && IsRegisteredFor(handle, MSWORD))
         unreg4 |= MSWORD;
-
+        
     if (IsSetMsiProp(handle, TEXT("SELECT_EXCEL")) && !IsRegisteredFor(handle, MSEXCEL))
         reg4 |= MSEXCEL;
     else if (!IsSetMsiProp(handle, TEXT("SELECT_EXCEL")) && IsRegisteredFor(handle, MSEXCEL))
         unreg4 |= MSEXCEL;
-
+        
     if (IsSetMsiProp(handle, TEXT("SELECT_POWERPOINT")) && !IsRegisteredFor(handle, MSPOWERPOINT))
         reg4 |= MSPOWERPOINT;
     else if (!IsSetMsiProp(handle, TEXT("SELECT_POWERPOINT")) && IsRegisteredFor(handle, MSPOWERPOINT))
         unreg4 |= MSPOWERPOINT;
-
+                               
     if (reg4)
-    {
+    {                       	    
         Register4MsDoc(handle, reg4);
     }
-
+    
     if (unreg4)
-    {
+    {        
         Unregister4MsDoc(handle, unreg4);
-    }
+    }        
     return ERROR_SUCCESS;
 }
 
 extern "C" UINT __stdcall DeinstallExecSequenceEntry(MSIHANDLE handle)
-{
+{         
     //MessageBox(NULL, TEXT("DeinstallExecSequenceEntry"), TEXT("Information"), MB_OK | MB_ICONINFORMATION);
-
+                        
     if (IsCompleteDeinstallation(handle))
     {
-        Unregister4MsDocAll(handle);
+        Unregister4MsDocAll(handle);  
         return ERROR_SUCCESS;
     }
-
+    
     if (IsModuleSelectedForDeinstallation(handle, TEXT("gm_p_Wrt_Bin")))
     {
         Unregister4MsDoc(handle, MSWORD | HTML_EDITOR);
     }
-
+    
     if (IsModuleSelectedForDeinstallation(handle, TEXT("gm_p_Calc_Bin")))
     {
         Unregister4MsDoc(handle, MSEXCEL);
     }
-
+    
     if (IsModuleSelectedForDeinstallation(handle, TEXT("gm_p_Impress_Bin")))
     {
         Unregister4MsDoc(handle, MSPOWERPOINT);
     }
-
+                            
     return ERROR_SUCCESS;
 }
 
diff --git a/setup_native/source/win32/customactions/reg4msdoc/register.cxx b/setup_native/source/win32/customactions/reg4msdoc/register.cxx
index a23d0ea67934..21d6d7e8f822 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/register.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/register.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace /* private */
     RegistrarPtr CreateRegistrar(bool InstallForAllUser, const RegistrationContextInformation& RegCtx)
     {
         RegistrarPtr RegPtr;
-
+        
         if (InstallForAllUser)
             RegPtr = RegistrarPtr(new Registrar(RegCtx));
         else
             RegPtr = RegistrarPtr(new UserRegistrar(RegCtx));
-
+            
         return RegPtr;
     }
 } // namespace private
 
 bool query_preselect_registration_for_ms_application(MSIHANDLE handle, int Register)
-{
+{        
     bool preselect = false;
-
+    
     try
     {
         RegistrationContextInformation RegContext(handle, GetOfficeExecutablePath(handle));
         RegistrarPtr CurrentRegistrar = CreateRegistrar(IsAllUserInstallation(handle), RegContext);
-
+        
         if (Register & MSWORD)
             preselect = CurrentRegistrar->QueryPreselectMsWordRegistration();
         else if (Register & MSEXCEL)
@@ -85,9 +85,9 @@ bool query_preselect_registration_for_ms_application(MSIHANDLE handle, int Regis
     catch(RegistryException&)
     {
         assert(false);
-    }
+    }    
     return preselect;
-}
+}   
 
 //-----------------------------------------
 // registers StarOffice for MS document
@@ -96,24 +96,24 @@ bool query_preselect_registration_for_ms_application(MSIHANDLE handle, int Regis
 //-----------------------------------------
 
 void Register4MsDoc(MSIHANDLE handle, int Register)
-{
+{        
     try
-    {
+    {        
         RegistrationContextInformation RegContext(handle, GetOfficeExecutablePath(handle));
         RegistrarPtr CurrentRegistrar = CreateRegistrar(IsAllUserInstallation(handle), RegContext);
-
+        
         if ((Register & MSWORD))
-            CurrentRegistrar->RegisterForMsWord();
-
+            CurrentRegistrar->RegisterForMsWord();	
+    
         if ((Register & MSEXCEL))
             CurrentRegistrar->RegisterForMsExcel();
-
+    
         if ((Register & MSPOWERPOINT))
             CurrentRegistrar->RegisterForMsPowerPoint();
-
+        
         if ((Register & HTML_EDITOR))
             CurrentRegistrar->RegisterAsHtmlEditorForInternetExplorer();
-
+    
         if ((Register & DEFAULT_SHELL_HTML_EDITOR))
         {
             CurrentRegistrar->RegisterAsDefaultHtmlEditorForInternetExplorer();
@@ -124,33 +124,33 @@ void Register4MsDoc(MSIHANDLE handle, int Register)
     {
         assert(false);
     }
-
+    
     if (Register)
-        SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, 0, 0);
+        SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, 0, 0);    
 }
 
 void Unregister4MsDoc(MSIHANDLE handle, int Unregister)
-{
+{        
     try
     {
         RegistrationContextInformation RegContext(handle, GetOfficeExecutablePath(handle));
         RegistrarPtr CurrentRegistrar = CreateRegistrar(IsAllUserInstallation(handle), RegContext);
-
+        
         if ((Unregister & MSWORD) && CurrentRegistrar->IsRegisteredFor(MSWORD))
             CurrentRegistrar->UnregisterForMsWord();
-
+        
         if ((Unregister & HTML_EDITOR) && CurrentRegistrar->IsRegisteredFor(HTML_EDITOR))
             CurrentRegistrar->UnregisterAsHtmlEditorForInternetExplorer();
-
+            
         if ((Unregister & MSEXCEL) && CurrentRegistrar->IsRegisteredFor(MSEXCEL))
             CurrentRegistrar->UnregisterForMsExcel();
-
+            
         if ((Unregister & MSPOWERPOINT) && CurrentRegistrar->IsRegisteredFor(MSPOWERPOINT))
             CurrentRegistrar->UnregisterForMsPowerPoint();
-
+        
         if ((Unregister & DEFAULT_HTML_EDITOR_FOR_IE) && CurrentRegistrar->IsRegisteredFor(DEFAULT_HTML_EDITOR_FOR_IE))
             CurrentRegistrar->UnregisterAsDefaultHtmlEditorForInternetExplorer();
-
+            
         if ((Unregister & DEFAULT_SHELL_HTML_EDITOR) && CurrentRegistrar->IsRegisteredFor(DEFAULT_SHELL_HTML_EDITOR))
             CurrentRegistrar->UnregisterAsDefaultShellHtmlEditor();
     }
@@ -158,9 +158,9 @@ void Unregister4MsDoc(MSIHANDLE handle, int Unregister)
     {
         assert(false);
     }
-
+        
     if (Unregister)
-        SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, 0, 0);
+        SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, 0, 0);    
 }
 
 //-----------------------------------------
@@ -168,14 +168,14 @@ void Unregister4MsDoc(MSIHANDLE handle, int Unregister)
 // registry entries
 // Algorithm:
 //
-// 1.
+// 1. 
 // Target key exist (e.g. '.doc')
 // Default value == soffice.?
 // Backup key != empty
 // Action: Replace Default value with backup
 // key
 //
-// 2.
+// 2. 
 // Target key exist
 // Default value == soffice.?
 // Backup key == empty
@@ -188,16 +188,16 @@ void Unregister4MsDoc(MSIHANDLE handle, int Unregister)
 //
 // 4.
 // Target key does not exist
-// Action: nop
+// Action: nop 
 //-----------------------------------------
 
 void Unregister4MsDocAll(MSIHANDLE handle)
-{
+{            
     try
     {
         RegistrationContextInformation RegContext(handle, GetOfficeExecutablePath(handle));
         RegistrarPtr CurrentRegistrar = CreateRegistrar(IsAllUserInstallation(handle), RegContext);
-
+         
         CurrentRegistrar->UnregisterAllAndCleanUpRegistry();
     }
     catch(RegistryException&)
@@ -212,12 +212,12 @@ void Unregister4MsDocAll(MSIHANDLE handle)
 //-----------------------------------------
 
 void RepairRegister4MsDocSettings(MSIHANDLE handle)
-{
+{        
     try
     {
         RegistrationContextInformation RegContext(handle, GetOfficeExecutablePath(handle));
         RegistrarPtr CurrentRegistrar = CreateRegistrar(IsAllUserInstallation(handle), RegContext);
-
+            
         CurrentRegistrar->RepairRegistrationState();
     }
     catch(RegistryException&)
@@ -227,14 +227,14 @@ void RepairRegister4MsDocSettings(MSIHANDLE handle)
 }
 
 bool IsRegisteredFor(MSIHANDLE handle, int State)
-{
+{        
     bool Registered = false;
-
+    
     try
     {
         RegistrationContextInformation RegContext(handle, GetOfficeExecutablePath(handle));
         RegistrarPtr CurrentRegistrar = CreateRegistrar(IsAllUserInstallation(handle), RegContext);
-
+            
         Registered = CurrentRegistrar->IsRegisteredFor(State);
     }
     catch(RegistryException&)
@@ -255,24 +255,24 @@ int FixReturnRegistrationState(MSIHANDLE handle)
 
     try
     {
-        WindowsRegistry registry;
+        WindowsRegistry registry;				
 
         RegistryValue rv_regmsdocstate = RegistryValue(
             new RegistryValueImpl(REGMSDOCSTATE, 0));
-
+        
         RegistryKey so_bak_key;
 
         if (IsAllUserInstallation(handle))
         {
             RegistryKey hkcr_key = registry.GetClassesRootKey();
-
+            
             if (hkcr_key->HasSubKey(SO_BACKUP_KEY))
                 so_bak_key = hkcr_key->OpenSubKey(SO_BACKUP_KEY);
             else
-                so_bak_key = hkcr_key->CreateSubKey(SO_BACKUP_KEY);
+                so_bak_key = hkcr_key->CreateSubKey(SO_BACKUP_KEY);				
 
             if (!so_bak_key->HasValue(REGMSDOCSTATE))
-            {
+            {	
                 // set a defined value
                 so_bak_key->SetValue(rv_regmsdocstate);
 
@@ -280,37 +280,37 @@ int FixReturnRegistrationState(MSIHANDLE handle)
 
                 if (hklm_key->HasSubKey(SO60_UNINSTALL_KEY))
                 {
-                    RegistryKey so_uninst_key =
+                    RegistryKey so_uninst_key = 
                         hklm_key->OpenSubKey(SO60_UNINSTALL_KEY);
 
                     if (so_uninst_key->HasValue(REGMSDOCSTATE))
-                        so_bak_key->CopyValue(so_uninst_key, REGMSDOCSTATE);
-                }
-            }
+                        so_bak_key->CopyValue(so_uninst_key, REGMSDOCSTATE);						
+                }							
+            }			
         }
-        else
+        else 
         {
-            RegistryKey hkcu_classes_key =
+            RegistryKey hkcu_classes_key = 
                 registry.GetCurrentUserKey()->OpenSubKey(SOFTWARE_CLASSES);
-
+            
             so_bak_key = hkcu_classes_key->CreateSubKey(SO_BACKUP_KEY);
-
+            
             if (!so_bak_key->HasValue(REGMSDOCSTATE))
             {
                 // set a defined value
                 so_bak_key->SetValue(rv_regmsdocstate);
 
-                RegistryKey hklm_sftw_classes =
+                RegistryKey hklm_sftw_classes = 
                     registry.GetLocalMachineKey()->OpenSubKey(SOFTWARE_CLASSES, false);
-
+                
                 RegistryKey so_bak_key_old;
 
                 if (hklm_sftw_classes->HasSubKey(SO_BACKUP_KEY))
                 {
                     so_bak_key_old = hklm_sftw_classes->OpenSubKey(SO_BACKUP_KEY, false);
-
+                    
                     if (so_bak_key_old->HasValue(REGMSDOCSTATE))
-                        so_bak_key->CopyValue(so_bak_key_old, REGMSDOCSTATE);
+                        so_bak_key->CopyValue(so_bak_key_old, REGMSDOCSTATE);	
                 }
                 else // try the uninstall key
                 {
@@ -318,16 +318,16 @@ int FixReturnRegistrationState(MSIHANDLE handle)
 
                     if (hklm_key->HasSubKey(SO60_UNINSTALL_KEY))
                     {
-                        RegistryKey so_uninst_key =
+                        RegistryKey so_uninst_key = 
                             hklm_key->OpenSubKey(SO60_UNINSTALL_KEY);
 
                         if (so_uninst_key->HasValue(REGMSDOCSTATE))
-                            so_bak_key->CopyValue(so_uninst_key, REGMSDOCSTATE);
+                            so_bak_key->CopyValue(so_uninst_key, REGMSDOCSTATE);				
                     }
                 }
             }
-        }
-
+        }	
+        
         rv_regmsdocstate = so_bak_key->GetValue(REGMSDOCSTATE);
         registration_state = rv_regmsdocstate->GetDataAsInt();
     }
diff --git a/setup_native/source/win32/customactions/reg4msdoc/register.hxx b/setup_native/source/win32/customactions/reg4msdoc/register.hxx
index 964c4be894df..10d600776e97 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/register.hxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/register.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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.
  *
  ************************************************************************/
-
+ 
 #ifndef _REGISTER_HXX_
 #define _REGISTER_HXX_
 
@@ -71,7 +71,7 @@ bool IsRegisteredFor(MSIHANDLE handle, int State);
     application type or not */
 bool query_preselect_registration_for_ms_application(
     MSIHANDLE handle, int Register);
-
+    
 // StarOffice 6.0 saved the registration
 // state in HKEY_LOCAL_MACHINE\Software\
 // Microsoft\Windows\CurrentVersion\Uninstall\
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx b/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
index 45fbed4819d2..12316bc9adf6 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
@@ -35,9 +35,9 @@ static inline void OutputDebugStringFormat( LPCTSTR, ... )
 
 const int MSWORD                     = 0x1;
 const int MSEXCEL                    = 0x2;
-const int MSPOWERPOINT               = 0x4;
-const int DEFAULT_HTML_EDITOR_FOR_IE = 0x8;
-const int HTML_EDITOR                = 0x10;
+const int MSPOWERPOINT               = 0x4;	
+const int DEFAULT_HTML_EDITOR_FOR_IE = 0x8;	
+const int HTML_EDITOR				 = 0x10;	
 const int DEFAULT_SHELL_HTML_EDITOR  = 0x20;
 
 namespace /* private */
@@ -53,7 +53,7 @@ namespace /* private */
     const std::wstring MS_IE_DEF_HTML_EDITOR_SHL_EDIT_CMD = L"Software\\Microsoft\\Internet Explorer\\Default HTML Editor\\shell\\edit\\command";
 }
 
-Registrar::Registrar(const RegistrationContextInformation& RegContext) :
+Registrar::Registrar(const RegistrationContextInformation& RegContext) : 	
     m_ContextInformation(RegContext),
     FORWARD_KEY_PREFIX(L"OpenOffice.org"),//FORWARD_KEY_PREFIX(L"soffice6"),
     DEFAULT_VALUE_NAME(L""),
@@ -69,9 +69,9 @@ Registrar::~Registrar()
 }
 
 void Registrar::RegisterForMsWord() const
-{
+{    
     assert(m_RootKey.get());
-
+    
     RegisterForMsOfficeApplication(
         m_ContextInformation.GetWordDocumentFileExtension(),
         m_ContextInformation.GetWordDocumentDisplayName(),
@@ -79,15 +79,15 @@ void Registrar::RegisterForMsWord() const
         m_ContextInformation.GetWordDocumentDefaultShellCommand(),
         m_ContextInformation.ShellNewCommandDisplayName(),
         RegistrationContextInformation::Writer);
-
+    
     RegisterForMsOfficeApplication(
         m_ContextInformation.GetWordTemplateFileExtension(),
         m_ContextInformation.GetWordTemplateDisplayName(),
         m_ContextInformation.GetWordTemplateDefaultIconEntry(),
         m_ContextInformation.GetWordTemplateDefaultShellCommand(),
         m_ContextInformation.ShellNewCommandDisplayName(),
-        RegistrationContextInformation::Writer);
-
+        RegistrationContextInformation::Writer);	
+        
     RegisterForMsOfficeApplication(
         m_ContextInformation.GetRtfDocumentFileExtension(),
         m_ContextInformation.GetRtfDocumentDisplayName(),
@@ -95,7 +95,7 @@ void Registrar::RegisterForMsWord() const
         m_ContextInformation.GetRtfDocumentDefaultShellCommand(),
         m_ContextInformation.ShellNewCommandDisplayName(),
         RegistrationContextInformation::Writer);
-
+    
     SaveRegisteredFor(MSWORD);
 }
 
@@ -114,7 +114,7 @@ void Registrar::UnregisterForMsWord() const
     try
     {
         UnregisterForMsOfficeApplication(
-            m_ContextInformation.GetWordTemplateFileExtension());
+            m_ContextInformation.GetWordTemplateFileExtension());		
     }
     catch(RegistryKeyNotFoundException&)
     {}
@@ -138,7 +138,7 @@ bool Registrar::QueryPreselectForMsApplication(const std::wstring& file_extensio
     // MS Office applications already exist if we are about to
     // register in HKCU\Software\Classes
     RegistryKey root_key = WindowsRegistry().GetClassesRootKey();
-
+                
     if (!root_key->HasSubKey(file_extension))
     {
         preselect = true;
@@ -147,7 +147,7 @@ bool Registrar::QueryPreselectForMsApplication(const std::wstring& file_extensio
     else
     {
         RegistryKey RegKey = root_key->OpenSubKey(file_extension, false);
-
+        
         if (RegKey->HasValue(DEFAULT_VALUE_NAME))
         {
             RegistryValue RegVal = RegKey->GetValue(DEFAULT_VALUE_NAME);
@@ -169,12 +169,12 @@ bool Registrar::QueryPreselectForMsApplication(const std::wstring& file_extensio
             preselect = true;
             OutputDebugStringFormat( TEXT("QueryPreselect: No default found for SubKey (%s), preselected!\n"), file_extension.c_str() );
         }
-    }
+    }            	
     return preselect;
 }
 
 bool Registrar::QueryPreselectMsWordRegistration() const
-{
+{    
     return QueryPreselectForMsApplication(
         m_ContextInformation.GetWordDocumentFileExtension());
 }
@@ -182,7 +182,7 @@ bool Registrar::QueryPreselectMsWordRegistration() const
 void Registrar::RegisterForMsExcel() const
 {
     assert(m_RootKey.get());
-
+        
     RegisterForMsOfficeApplication(
         m_ContextInformation.GetExcelSheetFileExtension(),
         m_ContextInformation.GetExcelSheetDisplayName(),
@@ -198,14 +198,14 @@ void Registrar::RegisterForMsExcel() const
         m_ContextInformation.GetExcelTemplateDefaultShellCommand(),
         m_ContextInformation.ShellNewCommandDisplayName(),
         RegistrationContextInformation::Calc);
-
+    
     SaveRegisteredFor(MSEXCEL);
 }
 
 void Registrar::UnregisterForMsExcel() const
 {
     assert(m_RootKey.get());
-
+    
     try
     {
         UnregisterForMsOfficeApplication(
@@ -234,7 +234,7 @@ bool Registrar::QueryPreselectMsExcelRegistration() const
 void Registrar::RegisterForMsPowerPoint() const
 {
     assert(m_RootKey.get());
-
+    
     RegisterForMsOfficeApplication(
         m_ContextInformation.GetPowerPointDocumentFileExtension(),
         m_ContextInformation.GetPowerPointDocumentDisplayName(),
@@ -242,7 +242,7 @@ void Registrar::RegisterForMsPowerPoint() const
         m_ContextInformation.GetPowerPointDocumentDefaultShellCommand(),
         m_ContextInformation.ShellNewCommandDisplayName(),
         RegistrationContextInformation::Impress);
-
+            
     RegisterForMsOfficeApplication(
         m_ContextInformation.GetPowerPointShowFileExtension(),
         m_ContextInformation.GetPowerPointShowDisplayName(),
@@ -250,22 +250,22 @@ void Registrar::RegisterForMsPowerPoint() const
         m_ContextInformation.GetPowerPointShowDefaultShellCommand(),
         m_ContextInformation.ShellNewCommandDisplayName(),
         RegistrationContextInformation::Impress);
-
+            
     RegisterForMsOfficeApplication(
         m_ContextInformation.GetPowerPointTemplateFileExtension(),
         m_ContextInformation.GetPowerPointTemplateDisplayName(),
         m_ContextInformation.GetPowerPointTemplateDefaultIconEntry(),
         m_ContextInformation.GetPowerPointTemplateDefaultShellCommand(),
         m_ContextInformation.ShellNewCommandDisplayName(),
-        RegistrationContextInformation::Impress);
-
+        RegistrationContextInformation::Impress);	
+        
     SaveRegisteredFor(MSPOWERPOINT);
 }
 
 void Registrar::UnregisterForMsPowerPoint() const
 {
     assert(m_RootKey.get());
-
+    
     try
     {
         UnregisterForMsOfficeApplication(
@@ -307,46 +307,46 @@ bool Registrar::QueryPreselectMsPowerPointRegistration() const
       make the following entries to register
       a html editor for the Internet Explorer
       HKCR\.htm\OpenWithList\App Friendly Name\shell\edit\command
-      But the reality shows that this works only
-      with Internet Explorer 5.x
-      Internet Explorer 6.0 wants the follwoing
+      But the reality shows that this works only 
+      with Internet Explorer 5.x 
+      Internet Explorer 6.0 wants the follwoing 
       entries:
       HKCR\.htm\OpenWithList\App.exe
-      HKCR\Applications\App.ex\shell\edit\command
+      HKCR\Applications\App.ex\shell\edit\command      
 */
 void Registrar::RegisterAsHtmlEditorForInternetExplorer() const
 {
     assert(m_RootKey.get());
-
+    
     std::wstring OOFriendlyAppName = m_ContextInformation.GetOpenOfficeFriendlyAppName();
-
+    
     std::wstring RegKeyName = HTM_OPENWITHLIST + std::wstring(L"\\") + OOFriendlyAppName;
     RegistryKey RegKey = m_RootKey->CreateSubKey(RegKeyName);
-
+    
     RegKey = RegKey->CreateSubKey(SHELL_EDIT_COMMAND);
-
+    
     RegistryValue RegVal(
         new RegistryValueImpl(
-            DEFAULT_VALUE_NAME,
+            DEFAULT_VALUE_NAME, 
             m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::Open,
                                                           RegistrationContextInformation::Writer)));
-
+            
     RegKey->SetValue(RegVal);
-
+    
     RegKeyName = APPLICATIONS + std::wstring(L"\\") + OOFriendlyAppName;
     RegKey = m_RootKey->CreateSubKey(RegKeyName);
-
+    
     RegVal->SetName(L"FriendlyAppName");
     RegVal->SetValue(OOFriendlyAppName);
     RegKey->SetValue(RegVal);
-
+    
     RegKey = RegKey->CreateSubKey(SHELL_EDIT_COMMAND);
     RegVal->SetName(DEFAULT_VALUE_NAME);
     RegVal->SetValue(
         m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::Open,
-                                                      RegistrationContextInformation::Writer));
+                                                      RegistrationContextInformation::Writer));        
     RegKey->SetValue(RegVal);
-
+    
     SaveRegisteredFor(HTML_EDITOR);
 }
 
@@ -375,75 +375,75 @@ void Registrar::UnregisterAsHtmlEditorForInternetExplorer() const
 void Registrar::RegisterAsDefaultHtmlEditorForInternetExplorer() const
 {
     assert(m_RootKey.get());
-
+    
     RegistryKey RegistrationRootKey = GetRootKeyForDefHtmlEditorForIERegistration();
-
+    
     RegistryKey RegKey = RegistrationRootKey->CreateSubKey(MS_IE_DEF_HTML_EDITOR_SHL_EDIT_CMD);
-
+    
     RegistryValue RegVal = RegistryValue(new RegistryValueImpl(DEFAULT_VALUE_NAME, L""));
-
+    
     if (RegKey->HasValue(DEFAULT_VALUE_NAME))
     {
         RegVal = RegKey->GetValue(DEFAULT_VALUE_NAME);
-
+        
         std::wstring CmdLine = RegVal->GetDataAsUniString();
-
+        
         if (std::wstring::npos == CmdLine.find(m_ContextInformation.GetOpenOfficeExecutableName()))
-        {
+        {            
             RegistryKey BackupRegKey = m_RootKey->CreateSubKey(PRIVATE_BACKUP_KEY_NAME + L"\\" + DEFAULT_HTML_EDITOR);
-
+            
             if (RegKey->HasValue(DEFAULT_VALUE_NAME))
-                BackupRegKey->CopyValue(RegKey, DEFAULT_VALUE_NAME);
-
+                BackupRegKey->CopyValue(RegKey, DEFAULT_VALUE_NAME);            
+            
             RegKey = RegistrationRootKey->OpenSubKey(MS_IE_DEF_HTML_EDITOR);
             if (RegKey->HasValue(L"Description"))
                 BackupRegKey->CopyValue(RegKey, L"Description");
         }
     }
-
+        
     RegVal->SetValue(
         m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::Open,
                                                       RegistrationContextInformation::Writer));
     RegKey = RegistrationRootKey->OpenSubKey(MS_IE_DEF_HTML_EDITOR_SHL_EDIT_CMD);
     RegKey->SetValue(RegVal);
-
+    
     RegVal->SetName(L"Description");
     RegVal->SetValue(m_ContextInformation.GetOpenOfficeFriendlyAppName());
     RegKey = RegistrationRootKey->OpenSubKey(MS_IE_DEF_HTML_EDITOR);
     RegKey->SetValue(RegVal);
-
+    
     SaveRegisteredFor(DEFAULT_HTML_EDITOR_FOR_IE);
 }
 
 void Registrar::UnregisterAsDefaultHtmlEditorForInternetExplorer() const
 {
     assert(m_RootKey.get());
-
+    
     RegistryKey RegistrationRootKey = GetRootKeyForDefHtmlEditorForIERegistration();
-
+    
     RegistryKey RegKey = RegistrationRootKey->OpenSubKey(MS_IE_DEF_HTML_EDITOR_SHL_EDIT_CMD);
-
+        
     if (RegKey->HasValue(DEFAULT_VALUE_NAME))
     {
         RegistryValue RegVal = RegKey->GetValue(DEFAULT_VALUE_NAME);
-
+        
         std::wstring CmdLine = RegVal->GetDataAsUniString();
-
+            
         if (std::wstring::npos != CmdLine.find(m_ContextInformation.GetOpenOfficeExecutableName()))
-        {
+        {                
             RegistryKey BackupRegKey = m_RootKey->OpenSubKey(PRIVATE_BACKUP_KEY_NAME);
-
+                    
             if (BackupRegKey->HasSubKey(DEFAULT_HTML_EDITOR))
             {
                 BackupRegKey = BackupRegKey->OpenSubKey(DEFAULT_HTML_EDITOR);
-
+                
                 if (BackupRegKey->HasValue(DEFAULT_VALUE_NAME))
                     RegKey->CopyValue(BackupRegKey, DEFAULT_VALUE_NAME);
                 else
                     RegKey->DeleteValue(DEFAULT_VALUE_NAME);
 
-                RegKey = RegistrationRootKey->OpenSubKey(MS_IE_DEF_HTML_EDITOR);
-
+                RegKey = RegistrationRootKey->OpenSubKey(MS_IE_DEF_HTML_EDITOR);                        
+                    
                 if (BackupRegKey->HasValue(L"Description"))
                     RegKey->CopyValue(BackupRegKey, L"Description");
                 else
@@ -451,91 +451,91 @@ void Registrar::UnregisterAsDefaultHtmlEditorForInternetExplorer() const
             }
             else
             {
-                RegKey->DeleteValue(DEFAULT_VALUE_NAME);
+                RegKey->DeleteValue(DEFAULT_VALUE_NAME);                       
                 RegKey = RegistrationRootKey->OpenSubKey(MS_IE_DEF_HTML_EDITOR);
                 RegKey->DeleteValue(L"Description");
-            }
+            }        
         }
     }
-
+    
     SaveNotRegisteredFor(DEFAULT_HTML_EDITOR_FOR_IE);
 }
 
 void Registrar::RegisterAsDefaultShellHtmlEditor() const
 {
     assert(m_RootKey.get());
-
+    
     RegistryKey RegKey = m_RootKey->CreateSubKey(L".htm");
-
+    
     RegistryValue RegVal = RegistryValue(
         new RegistryValueImpl(DEFAULT_VALUE_NAME, L""));
-
+    
     if (RegKey->HasValue(DEFAULT_VALUE_NAME))
         RegVal = RegKey->GetValue(DEFAULT_VALUE_NAME);
-
-    std::wstring HtmFwdKey = RegVal->GetDataAsUniString();
+        
+    std::wstring HtmFwdKey = RegVal->GetDataAsUniString();        
     if (0 == HtmFwdKey.length() || !m_RootKey->HasSubKey(HtmFwdKey))
         HtmFwdKey = L".htm";
-
+    
     RegKey = m_RootKey->CreateSubKey(HtmFwdKey + L"\\" + SHELL_EDIT_COMMAND);
-
+    
     if (RegKey->HasValue(DEFAULT_VALUE_NAME))
     {
         RegVal = RegKey->GetValue(DEFAULT_VALUE_NAME);
-
+    
         std::wstring CmdLine = RegVal->GetDataAsUniString();
-
+        
         // backup old values if we are not in place
         if (std::wstring::npos == CmdLine.find(m_ContextInformation.GetOpenOfficeExecutableName()))
-        {
+        {            
             RegistryKey BackupRegKey = m_RootKey->CreateSubKey(PRIVATE_BACKUP_KEY_NAME + L"\\" + HTML_EDIT);
             BackupRegKey->CopyValue(RegKey, DEFAULT_VALUE_NAME, SHELL_EDIT_COMMAND_BACKUP);
-        }
+        }		
     }
-
+    
     RegVal->SetValue(
         m_ContextInformation.GetOpenOfficeCommandline(RegistrationContextInformation::Open,
                                                       RegistrationContextInformation::Writer));
-
+        
     RegKey->SetValue(RegVal);
-
+    
     SaveRegisteredFor(DEFAULT_SHELL_HTML_EDITOR);
 }
 
 void Registrar::UnregisterAsDefaultShellHtmlEditor() const
 {
     assert(m_RootKey.get());
-
+    
     try
     {
         RegistryKey RegKey = m_RootKey->OpenSubKey(L".htm");
-
+    
         RegistryValue RegVal = RegistryValue(
             new RegistryValueImpl(DEFAULT_VALUE_NAME, L""));
-
+    
         if (RegKey->HasValue(DEFAULT_VALUE_NAME))
             RegVal = RegKey->GetValue(DEFAULT_VALUE_NAME);
-
+        
         std::wstring HtmFwdKey = RegVal->GetDataAsUniString();
-
+        
         if (0 == HtmFwdKey.length() || !m_RootKey->HasSubKey(HtmFwdKey))
             HtmFwdKey = L".htm";
-
+    
         RegKey = m_RootKey->OpenSubKey(HtmFwdKey + L"\\" + SHELL_EDIT_COMMAND);
-
+    
         RegVal = RegKey->GetValue(DEFAULT_VALUE_NAME);
-
+        
         std::wstring CmdLine = RegVal->GetDataAsUniString();
-
+        
         if (std::wstring::npos != CmdLine.find(m_ContextInformation.GetOpenOfficeExecutableName()))
-        {
+        {        
             RegistryKey BackupRegKey = m_RootKey->CreateSubKey(PRIVATE_BACKUP_KEY_NAME + L"\\" + HTML_EDIT);
-
+            
             if (BackupRegKey->HasValue(SHELL_EDIT_COMMAND_BACKUP))
                 RegKey->CopyValue(BackupRegKey, SHELL_EDIT_COMMAND_BACKUP, DEFAULT_VALUE_NAME);
             else
                 RegKey->DeleteValue(DEFAULT_VALUE_NAME);
-        }
+        }    
     }
     catch(RegistryKeyNotFoundException&)
     {
@@ -547,7 +547,7 @@ void Registrar::UnregisterAsDefaultShellHtmlEditor() const
 void Registrar::SaveRegisteredFor(int State) const
 {
     assert(m_RootKey.get());
-
+    
     int NewState = GetRegisterState();
     NewState |= State;
     SetRegisterState(NewState);
@@ -556,7 +556,7 @@ void Registrar::SaveRegisteredFor(int State) const
 void Registrar::SaveNotRegisteredFor(int State) const
 {
     assert(m_RootKey.get());
-
+        
     int NewState = GetRegisterState();
     NewState &= ~State;
     SetRegisterState(NewState);
@@ -565,16 +565,16 @@ void Registrar::SaveNotRegisteredFor(int State) const
 int Registrar::GetRegisterState() const
 {
     int State = 0;
-
+    
     RegistryKey RegKey = m_RootKey->CreateSubKey(PRIVATE_BACKUP_KEY_NAME);
-
+    
     if (RegKey->HasValue(REGISTRATION_STATE))
     {
         RegistryValue RegVal = RegKey->GetValue(REGISTRATION_STATE);
         if (REG_DWORD == RegVal->GetType())
             State = RegVal->GetDataAsInt();
     }
-
+    
     return State;
 }
 
@@ -584,22 +584,22 @@ void Registrar::SetRegisterState(int NewState) const
     RegistryValue RegVal = RegistryValue(new RegistryValueImpl(REGISTRATION_STATE, NewState));
     RegKey->SetValue(RegVal);
 }
-
+    
 bool Registrar::IsRegisteredFor(int State) const
 {
     assert(m_RootKey.get());
-
+    
     RegistryKey RegKey = m_RootKey->CreateSubKey(PRIVATE_BACKUP_KEY_NAME);
-
+    
     int SavedState = 0;
-
+    
     if (RegKey->HasValue(REGISTRATION_STATE))
     {
         RegistryValue RegVal = RegKey->GetValue(REGISTRATION_STATE);
         if (REG_DWORD == RegVal->GetType())
-            SavedState = RegVal->GetDataAsInt();
+            SavedState = RegVal->GetDataAsInt();        
     }
-
+    
     return ((SavedState & State) == State);
 }
 
@@ -631,7 +631,7 @@ void Registrar::RepairRegistrationState() const
 
 /** Unregisters all and delete all Registry keys we have written */
 void Registrar::UnregisterAllAndCleanUpRegistry() const
-{
+{	
     assert(m_RootKey.get());
 
     if (IsRegisteredFor(MSWORD))
@@ -651,7 +651,7 @@ void Registrar::UnregisterAllAndCleanUpRegistry() const
 
     if (IsRegisteredFor(DEFAULT_SHELL_HTML_EDITOR))
         UnregisterAsDefaultShellHtmlEditor();
-
+    
     if (m_RootKey->HasSubKey(PRIVATE_BACKUP_KEY_NAME))
         m_RootKey->DeleteSubKeyTree(PRIVATE_BACKUP_KEY_NAME);
 }
@@ -665,7 +665,7 @@ void Registrar::RegisterForMsOfficeApplication(
     const RegistrationContextInformation::OFFICE_APPLICATION eOfficeApp) const
 {
     assert(m_RootKey.get());
-
+    
     std::wstring ForwardKeyName = FORWARD_KEY_PREFIX + FileExtension;
 
     RegistryKey ForwardKey = m_RootKey->CreateSubKey(ForwardKeyName);
@@ -702,39 +702,39 @@ void Registrar::RegisterForMsOfficeApplication(
 
     // set the new forward key under the appropriate extension
     RegKey = m_RootKey->CreateSubKey(FileExtension);
-
+    
     if (RegKey->HasValue(DEFAULT_VALUE_NAME))
     {
         RegVal = RegKey->GetValue(DEFAULT_VALUE_NAME);
-
+    
         if (REG_SZ == RegVal->GetType())
         {
             std::wstring str = RegVal->GetDataAsUniString();
-            if (!IsOpenOfficeRegisteredForMsApplication(str))
+            if (!IsOpenOfficeRegisteredForMsApplication(str)) 
                 ForwardKey->CopyValue(RegKey, DEFAULT_VALUE_NAME, BACKUP_VALUE_NAME);
         }
     }
-
+    
     RegVal->SetValue(ForwardKeyName);
-    RegKey->SetValue(RegVal);
+    RegKey->SetValue(RegVal);	
 }
 
 void Registrar::UnregisterForMsOfficeApplication(const std::wstring& FileExtension) const
 {
     std::wstring FwdRegKeyName = FORWARD_KEY_PREFIX + FileExtension;
-
+    
     if (m_RootKey->HasSubKey(FileExtension))
     {
         RegistryKey RegKey = m_RootKey->OpenSubKey(FileExtension);
-
+        
         if (RegKey->HasValue(DEFAULT_VALUE_NAME))
         {
             RegistryValue RegVal = RegKey->GetValue(DEFAULT_VALUE_NAME);
-            if (REG_SZ == RegVal->GetType() &&
+            if (REG_SZ == RegVal->GetType() && 
                 IsOpenOfficeRegisteredForMsApplication(RegVal->GetDataAsUniString()))
-            {
+            {                
                 RegistryKey FwdRegKey = m_RootKey->CreateSubKey(FwdRegKeyName);
-
+                    
                 if (FwdRegKey->HasValue(BACKUP_VALUE_NAME))
                     RegKey->CopyValue(FwdRegKey, BACKUP_VALUE_NAME, DEFAULT_VALUE_NAME);
                 else
@@ -742,11 +742,11 @@ void Registrar::UnregisterForMsOfficeApplication(const std::wstring& FileExtensi
             }
         }
     }
-
+    
     if (m_RootKey->HasSubKey(FwdRegKeyName))
         m_RootKey->DeleteSubKeyTree(FwdRegKeyName);
 }
-
+   
 RegistryKey Registrar::GetRootKeyForDefHtmlEditorForIERegistration() const
 {
     return WindowsRegistry().GetLocalMachineKey();
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrar.hxx b/setup_native/source/win32/customactions/reg4msdoc/registrar.hxx
index 851b12f8daf7..e0bf8f1ee799 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registrar.hxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registrar.hxx
@@ -11,28 +11,28 @@
 
 #include "constants.hxx"
 
-class Registrar
+class Registrar  
 {
 public:
-
+    
     Registrar(const RegistrationContextInformation& RegContext);
 
     virtual ~Registrar();
 
     bool IsRegisteredFor(int State) const;
-
+    
     virtual void RegisterForMsWord() const;
     virtual void UnregisterForMsWord() const;
     virtual bool QueryPreselectMsWordRegistration() const;
-
+    
     virtual void RegisterForMsExcel() const;
     virtual void UnregisterForMsExcel() const;
     virtual bool QueryPreselectMsExcelRegistration() const;
-
+    
     virtual void RegisterForMsPowerPoint() const;
     virtual void UnregisterForMsPowerPoint() const;
     virtual bool QueryPreselectMsPowerPointRegistration() const;
-
+    
     virtual void RegisterAsHtmlEditorForInternetExplorer() const;
     virtual void UnregisterAsHtmlEditorForInternetExplorer() const;
 
@@ -50,9 +50,9 @@ public:
     /** Unregisters all and delete all Registry keys we have written
     */
     virtual void UnregisterAllAndCleanUpRegistry() const;
-
+    
 protected:
-
+      
     virtual void RegisterForMsOfficeApplication(
         const std::wstring& FileExtension,
         const std::wstring& DocumentDisplayName,
@@ -60,45 +60,45 @@ protected:
         const std::wstring& DefaultShellCommand,
         const std::wstring& ShellNewCommandDisplayName,
         const RegistrationContextInformation::OFFICE_APPLICATION eOfficeApp) const;
-
+    
     virtual void UnregisterForMsOfficeApplication(
         const std::wstring& FileExtension) const;
-
+    
     virtual RegistryKey GetRootKeyForDefHtmlEditorForIERegistration() const;
-
+    
     void SaveRegisteredFor(int State) const;
     void SaveNotRegisteredFor(int State) const;
-
+    
     int GetRegisterState() const;
     void SetRegisterState(int NewState) const;
-
+    
     virtual bool QueryPreselectForMsApplication(const std::wstring& file_extension) const;
-
+        
     /** A helper function (for readability) returns true if OpenOffice is already
           registered for a MS application
-
+          
           @param DocumentExtensionDefValue
                       The default value of the appropriate document extension Registry key
     */
     bool IsOpenOfficeRegisteredForMsApplication(const std::wstring& DocumentExtensionDefValue) const;
-
-protected:
-    const RegistrationContextInformation&   m_ContextInformation;
+            
+protected:	
+    const RegistrationContextInformation&	m_ContextInformation;
 
     const std::wstring FORWARD_KEY_PREFIX;
     const std::wstring DEFAULT_VALUE_NAME;
     const std::wstring BACKUP_VALUE_NAME;
     const std::wstring PRIVATE_BACKUP_KEY_NAME;
     const std::wstring REGISTRATION_STATE;
-
-    RegistryKey  m_RootKey;
-
+    
+    RegistryKey	 m_RootKey;
+    
 // prevent copy/assignment
 private:
     Registrar(const Registrar&);
     Registrar& operator=(const Registrar&);
 };
 
-#endif
+#endif 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx b/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
index 189b7e3074ae..307e3ff469e9 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
@@ -31,7 +31,7 @@ RegistrationContextInformation::RegistrationContextInformation(MSIHANDLE hMsi, c
 }
 
 std::wstring RegistrationContextInformation::GetWordDocumentDisplayName() const
-{
+{	
     std::wstring str;
     GetMsiProp(msihandle_, TEXT("STR_MS_WORD_DOCUMENT"), str);
     if (m_IsWin9x && !IsConvertableToAnsi(str))
@@ -79,7 +79,7 @@ std::wstring RegistrationContextInformation::GetWordTemplateDefaultShellCommand(
 }
 
 std::wstring RegistrationContextInformation::GetRtfDocumentDisplayName() const
-{
+{	
     std::wstring str;
     GetMsiProp(msihandle_, TEXT("STR_RTF_DOCUMENT"), str);
     if (m_IsWin9x && !IsConvertableToAnsi(str))
@@ -221,7 +221,7 @@ std::wstring RegistrationContextInformation::GetPowerPointShowDefaultShellComman
 {
     return std::wstring(TEXT("open"));
 }
-
+    
 //----------------------------------------------
 /** The string for the "New" command that should appear
     in the Explorer context menu when someone right
@@ -232,13 +232,13 @@ std::wstring RegistrationContextInformation::ShellNewCommandDisplayName() const
     std::wstring str;
     GetMsiProp(msihandle_, TEXT("STR_NEW_DISPLAY_NAME"), str);
     std::wstring::size_type idx = str.find(TEXT("~"));
-
+    
     if(std::wstring::npos != idx)
         str.replace(idx, 1, TEXT("&"));
-
+        
     if (m_IsWin9x && !IsConvertableToAnsi(str))
         str = TEXT("&New");
-
+        
     return str;
 }
 
@@ -251,7 +251,7 @@ std::wstring RegistrationContextInformation::ShellEditCommandDisplayName() const
     std::wstring str;
     GetMsiProp(msihandle_, TEXT("STR_EDIT"), str);
     std::wstring::size_type idx = str.find(TEXT("~"));
-
+    
     if(std::wstring::npos != idx)
         str.replace(idx, 1, TEXT("&"));
 
@@ -264,7 +264,7 @@ std::wstring RegistrationContextInformation::ShellEditCommandDisplayName() const
 std::wstring RegistrationContextInformation::GetOpenOfficeFriendlyAppName() const
 {
     std::wstring str;
-    GetMsiProp(msihandle_, TEXT("ProductName"), str);
+    GetMsiProp(msihandle_, TEXT("ProductName"), str);	
     return str;
 }
 
@@ -302,7 +302,7 @@ std::wstring RegistrationContextInformation::GetOpenOfficeCommandline(SHELL_COMM
         break;
     case Office: // default to std command line
         break;
-    // default: no default to find new added enums at compile time
+    // default: no default to find new added enums at compile time 
     }
     switch(ShellCommand)
     {
@@ -318,7 +318,7 @@ std::wstring RegistrationContextInformation::GetOpenOfficeCommandline(SHELL_COMM
     case Printto:
         cmd_line += std::wstring(TEXT(" -pt \"%2\" \"%1\""));
         break;
-    // default: no default to find new added enums at compile time
+    // default: no default to find new added enums at compile time 
     }
     return cmd_line;
 }
@@ -338,7 +338,7 @@ bool RegistrationContextInformation::IsConvertableToAnsi(const std::wstring& Str
             buff,
             sizeof(buff),
             NULL,
-            &bUsedDefChar);
+            &bUsedDefChar);        
     }
     return !bUsedDefChar;
 }
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx b/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx
index 91a42e6b58d7..1e52a710e81d 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx
@@ -21,25 +21,25 @@
 /** A simple implementation class that returns the
     appropriate display names for the Microsoft
     Office document types.
-    Under Windows 9x this class checks if the
+    Under Windows 9x this class checks if the 
     document display name is convertable to an ANSI
     string and if not returns an english default.
     So we avoid garbage if soemone for instance
     installs an japanese StarOffice/OpenOffice
     under a German Windows 98 for instance.
 */
-class RegistrationContextInformation
+class RegistrationContextInformation  
 {
 public:
-
+    
     enum SHELL_COMMAND {New, Open, Print, Printto};
     enum OFFICE_APPLICATION {Office, Writer, Calc, Impress};
-
+    
     RegistrationContextInformation(MSIHANDLE hMsi, const std::wstring& OpenOfficeExecutablePath);
-
-    /** Word document information
-        The icon index is the index of the icon
-        in soffice.exe to be associated with
+            
+    /** Word document information		
+        The icon index is the index of the icon 
+        in soffice.exe to be associated with 
         word document files
     */
     std::wstring GetWordDocumentDisplayName() const;
@@ -48,8 +48,8 @@ public:
     std::wstring GetWordDocumentDefaultShellCommand() const;
 
     /** Word template information
-        The icon index is the index of the icon
-        in soffice.exe to be associated with
+        The icon index is the index of the icon 
+        in soffice.exe to be associated with 
         word template files
     */
     std::wstring GetWordTemplateDisplayName() const;
@@ -57,9 +57,9 @@ public:
     std::wstring GetWordTemplateDefaultIconEntry() const;
     std::wstring GetWordTemplateDefaultShellCommand() const;
 
-    /** Rtf document information
-        The icon index is the index of the icon
-        in soffice.exe to be associated with
+    /** Rtf document information		
+        The icon index is the index of the icon 
+        in soffice.exe to be associated with 
         rtf document files
     */
     std::wstring GetRtfDocumentDisplayName() const;
@@ -68,18 +68,18 @@ public:
     std::wstring GetRtfDocumentDefaultShellCommand() const;
 
     /** Excel sheet information
-        The icon index is the index of the icon
-        in soffice.exe to be associated with
+        The icon index is the index of the icon 
+        in soffice.exe to be associated with 
         Excel sheets
     */
-    std::wstring GetExcelSheetDisplayName() const;
+    std::wstring GetExcelSheetDisplayName() const; 
     std::wstring GetExcelSheetFileExtension() const;
     std::wstring GetExcelSheetDefaultIconEntry() const;
     std::wstring GetExcelSheetDefaultShellCommand() const;
 
     /** Excel template information
-        The icon index is the index of the icon
-        in soffice.exe to be associated with
+        The icon index is the index of the icon 
+        in soffice.exe to be associated with 
         Excel template files
     */
     std::wstring GetExcelTemplateDisplayName() const;
@@ -88,18 +88,18 @@ public:
     std::wstring GetExcelTemplateDefaultShellCommand() const;
 
     /** PowerPoint document information
-        The icon index is the index of the icon
-        in soffice.exe to be associated with
+        The icon index is the index of the icon 
+        in soffice.exe to be associated with 
         PowerPoint document files
     */
     std::wstring GetPowerPointDocumentDisplayName() const;
-    std::wstring GetPowerPointDocumentFileExtension() const;
+    std::wstring GetPowerPointDocumentFileExtension() const;	
     std::wstring GetPowerPointDocumentDefaultIconEntry() const;
     std::wstring GetPowerPointDocumentDefaultShellCommand() const;
 
     /** PowerPoint template information
-        The icon index is the index of the icon
-        in soffice.exe to be associated with
+        The icon index is the index of the icon 
+        in soffice.exe to be associated with 
         PowerPoint template files
     */
     std::wstring GetPowerPointTemplateDisplayName() const;
@@ -110,17 +110,17 @@ public:
     /** PowerPoint Show information
     */
     std::wstring GetPowerPointShowDisplayName() const;
-    std::wstring GetPowerPointShowFileExtension() const;
+    std::wstring GetPowerPointShowFileExtension() const;	
     std::wstring GetPowerPointShowDefaultIconEntry() const;
     std::wstring GetPowerPointShowDefaultShellCommand() const;
-
-    /** The string for the "New" command that should appear
-        in the Explorer context menu when someone right
-        clicks a Microsoft document
+    
+    /** The string for the "New" command that should appear 
+        in the Explorer context menu when someone right 
+        clicks a Microsoft document 
     */
     std::wstring ShellNewCommandDisplayName() const;
 
-    /** The string for the "Edit" command that should
+    /** The string for the "Edit" command that should 
         appear in the Explorer context menu when someone
         right clicks a document
     */
@@ -130,7 +130,7 @@ public:
     */
     std::wstring GetOpenOfficeFriendlyAppName() const;
 
-    /** The path to the StarOffice/OpenOffice executable
+    /** The path to the StarOffice/OpenOffice executable 
     */
     std::wstring GetOpenOfficeExecutablePath() const;
 
@@ -143,19 +143,19 @@ public:
     */
     std::wstring GetOpenOfficeCommandline(SHELL_COMMAND ShellCommand,
                                           OFFICE_APPLICATION OfficeApp) const;
-
+    
 private:
     bool IsConvertableToAnsi(const std::wstring& String)  const;
 
     void ExtractOpenOfficeExecNameFromPath();
 
 private:
-    MSIHANDLE    msihandle_;
-    bool         m_IsWin9x;
+    MSIHANDLE	 msihandle_;
+    bool		 m_IsWin9x;
     std::wstring m_OOExecPath;
     std::wstring m_OOExecName;
 };
 
-#endif
+#endif 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registry.cxx b/setup_native/source/win32/customactions/reg4msdoc/registry.cxx
index bc277997b92b..d2201e076943 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registry.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/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
@@ -102,7 +102,7 @@ std::wstring RegistryKeyImpl::GetName() const
 }
 
 //-----------------------------------------------------
-/**
+/** 
 */
 bool RegistryKeyImpl::IsOpen() const
 {
@@ -130,7 +130,7 @@ bool RegistryKeyImpl::IsWriteable() const
 
 //-----------------------------------------------------
 /** Convenience function to determine if the
-    Registry key at hand has the specified
+    Registry key at hand has the specified 
     value
 
     @precond IsOpen = true
@@ -152,18 +152,18 @@ struct CompareNamesCaseInsensitive
     CompareNamesCaseInsensitive(const std::wstring& Name) :
         name_(Name)
     {}
-
+    
     bool operator() (const std::wstring& value)
     {
         return (0 == StrCmpI(value.c_str(), name_.c_str()));
     }
-
+    
     std::wstring name_;
 };
 
 //-----------------------------------------------------
 /** Convenience function to determine if the
-    Registry key at hand has the specified
+    Registry key at hand has the specified 
     sub-key
 
     @precond IsOpen = true
@@ -188,14 +188,14 @@ void RegistryKeyImpl::Close()
     if (RegCloseKey(m_hSubKey) != ERROR_SUCCESS) {
         assert(false);
     }
-
+    
     m_hSubKey = 0;
     m_IsWriteable = false;
 }
 
 //-----------------------------------------------------
-/** Copies the specified value from RegistryKey to
-    the registry key at hand, if a value with this
+/** Copies the specified value from RegistryKey to 
+    the registry key at hand, if a value with this 
     name already exist under the registry key at hand
     it will be overwritten
 
@@ -208,18 +208,18 @@ void RegistryKeyImpl::Close()
             RegistryValueNotFoundException
 */
 void RegistryKeyImpl::CopyValue(const RegistryKey& RegistryKey, const std::wstring& Name)
-{
-    assert(RegistryKey->HasValue(Name));
+{	
+    assert(RegistryKey->HasValue(Name));  
 #ifdef __MINGW32__
-    SetValue((const RegistryValue&)(RegistryKey->GetValue(Name)));
+    SetValue((const RegistryValue&)(RegistryKey->GetValue(Name)));    
 #else
-    SetValue(RegistryKey->GetValue(Name));
+    SetValue(RegistryKey->GetValue(Name));    
 #endif
     assert(HasValue(Name));
 }
 
-/** Copies the specified value from RegistryKey to
-    the registry key at hand under a new name,
+/** Copies the specified value from RegistryKey to 
+    the registry key at hand under a new name, 
     if a value with this name already exist there
     it will be overwritten
 
@@ -234,11 +234,11 @@ void RegistryKeyImpl::CopyValue(const RegistryKey& RegistryKey, const std::wstri
 void RegistryKeyImpl::CopyValue(const RegistryKey& RegistryKey, const std::wstring& Name, const std::wstring& NewName)
 {
     assert(RegistryKey->HasValue(Name));
-
+    
     RegistryValue RegVal = RegistryKey->GetValue(Name);
     RegVal->SetName(NewName);
     SetValue(RegVal);
-
+    
     assert(HasValue(NewName));
 }
 
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registry.hxx b/setup_native/source/win32/customactions/reg4msdoc/registry.hxx
index fe0014b6a191..4d251b8eea5f 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registry.hxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/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
@@ -53,18 +53,18 @@ class RegistryKeyImpl;
 // typedefs
 //---------------------------------------
 
-typedef std::auto_ptr<RegistryKeyImpl>      RegistryKey;
-typedef std::vector<std::wstring>               StringList;
-typedef std::auto_ptr<StringList>               StringListPtr;
+typedef std::auto_ptr<RegistryKeyImpl>  	RegistryKey;
+typedef std::vector<std::wstring>				StringList;
+typedef std::auto_ptr<StringList>				StringListPtr;
 
 //---------------------------------------
-//
+// 
 //---------------------------------------
 
 class RegistryKeyImpl
 {
-public:
-
+public:   
+    
     //############################################
     // Destruction
     //############################################
@@ -83,10 +83,10 @@ public:
     std::wstring GetName() const;
 
     /** The number of sub values of the key at hand
-
+        
         @precond IsOpen = true
 
-        @throws
+        @throws 
     */
     virtual size_t GetSubValueCount() const = 0;
 
@@ -97,7 +97,7 @@ public:
         @throws
     */
     virtual size_t GetSubKeyCount() const = 0;
-
+    
     bool IsOpen() const;
 
     /** Do we have write access on the key at hand
@@ -136,9 +136,9 @@ public:
         @precond IsOpen = true
     */
     virtual RegistryValue GetValue(const std::wstring& Name, const RegistryValue& Default) const = 0;
-
+    
     /** Convenience function to determine if the
-        Registry key at hand has the specified
+        Registry key at hand has the specified 
         value
 
         @precond IsOpen = true
@@ -148,7 +148,7 @@ public:
     bool HasValue(const std::wstring& Name) const;
 
     /** Convenience function to determine if the
-        Registry key at hand has the specified
+        Registry key at hand has the specified 
         sub-key
 
         @precond IsOpen = true
@@ -163,9 +163,9 @@ public:
     //############################################
 
 
-    /** Open the registry key, has no effect if
+    /** Open the registry key, has no effect if 
         the key is already open
-
+        
         @precond IsOpen = false
 
         @throws RegistryWriteAccessDenyException
@@ -177,12 +177,12 @@ public:
         using it without re-opening may cause
         RegistryIOExceptions to be thrown
 
-        This is a template method that calls
-        ImplClose which has to be overwritten
+        This is a template method that calls 
+        ImplClose which has to be overwritten 
         by sub-classes
     */
     void Close();
-
+    
     /** Open the specified sub-key of the registry key
         at hand
 
@@ -233,7 +233,7 @@ public:
                  IsWriteable = true
                  HasValue(Name) = true
 
-        @throws RegistryIOException
+        @throws	RegistryIOException
                 RegistryWriteAccessDeniedException
                 RegistryValueNotFoundException
     */
@@ -250,8 +250,8 @@ public:
     virtual void SetValue(const RegistryValue& Value) = 0;
 
 
-    /** Copies the specified value from RegistryKey to
-        the registry key at hand, if a value with this
+    /** Copies the specified value from RegistryKey to 
+        the registry key at hand, if a value with this 
         name already exist under the registry key at hand
         it will be overwritten
 
@@ -265,8 +265,8 @@ public:
     */
     virtual void CopyValue(const RegistryKey& RegistryKey, const std::wstring& Name);
 
-    /** Copies the specified value from RegistryKey to
-        the registry key at hand under a new name,
+    /** Copies the specified value from RegistryKey to 
+        the registry key at hand under a new name, 
         if a value with this name already exist there
         it will be overwritten
 
@@ -281,8 +281,8 @@ public:
     virtual void CopyValue(const RegistryKey& RegistryKey, const std::wstring& Name, const std::wstring& NewName);
 
     //############################################
-    // Creation
-    // only possible through WindowsRegistry class
+    // Creation 
+    // only possible through WindowsRegistry class	
     //############################################
 
 
@@ -296,7 +296,7 @@ protected:
     RegistryKeyImpl(HKEY RootKey, const std::wstring& KeyName);
 
     /** Create instance of the specified Registry key.
-        RootKey should only one of the predefined
+        RootKey should only one of the predefined 
         keys HKEY_CLASSES_ROOT, HKEY_CURRENT_USER,
         HKEY_LOCAL_MACHINE, HKEY_USERS
 
@@ -305,7 +305,7 @@ protected:
                  RegistryKeyNotFoundException
     */
     RegistryKeyImpl(HKEY RootKey);
-
+    
     /** Create an instances of the specified Registry key,
         the key is assumed to be already opened.
     */
@@ -318,11 +318,11 @@ protected:
     */
     bool IsRootKey() const;
 
-protected:
-    HKEY            m_hRootKey;
-    HKEY            m_hSubKey;
-    std::wstring    m_KeyName;
-    bool                m_IsWriteable;
+protected: 
+    HKEY			m_hRootKey;
+    HKEY		    m_hSubKey;
+    std::wstring	m_KeyName;
+    bool				m_IsWriteable;
 
 // prevent copy and assignment
 private:
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registryexception.cxx b/setup_native/source/win32/customactions/reg4msdoc/registryexception.cxx
index cebbe67c6798..5de0c04e42a7 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registryexception.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registryexception.cxx
@@ -35,9 +35,9 @@ RegistryException::~RegistryException() throw()
 */
 const char* RegistryException::what() const throw()
 {
-    FormatMessage(
-        FORMAT_MESSAGE_ALLOCATE_BUFFER |
-        FORMAT_MESSAGE_FROM_SYSTEM |
+    FormatMessage( 
+        FORMAT_MESSAGE_ALLOCATE_BUFFER | 
+        FORMAT_MESSAGE_FROM_SYSTEM | 
         FORMAT_MESSAGE_IGNORE_INSERTS,
         NULL,
         m_ErrorCode,
@@ -45,7 +45,7 @@ const char* RegistryException::what() const throw()
         (LPTSTR) &m_ErrorMsg,
         0,
         NULL);
-
+        
     return reinterpret_cast<char*>(m_ErrorMsg);
 }
 
@@ -61,13 +61,13 @@ long RegistryException::GetErrorCode() const
 // that is closed
 //#######################################
 
-RegistryIOException::RegistryIOException(long ErrorCode) :
+RegistryIOException::RegistryIOException(long ErrorCode) : 
     RegistryException(ErrorCode)
 {
 };
 
 //#######################################
-//
+// 
 //#######################################
 
 RegistryNoWriteAccessException::RegistryNoWriteAccessException(long ErrorCode) :
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registryexception.hxx b/setup_native/source/win32/customactions/reg4msdoc/registryexception.hxx
index 4ea3a2098853..96ce6036746a 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registryexception.hxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registryexception.hxx
@@ -17,23 +17,23 @@ class RegistryException : public std::exception
 public:
 
     RegistryException(long ErrorCode);
-
+    
     virtual ~RegistryException() throw();
-
+        
     /**
-        @descr  Returns a string that describes the error if
+        @descr	Returns a string that describes the error if
                 available, else NULL will be returned. The
                 returned string is only temporary so the caller
                 has to copy it if he needs the string further.
     */
     virtual const char* what() const throw();
-
+    
     /**
-        @descr  Returns the error code.
+        @descr	Returns the error code.
     */
-
+    
     long GetErrorCode() const;
-
+    
 private:
     long    m_ErrorCode;
     void*  m_ErrorMsg;
@@ -51,7 +51,7 @@ public:
 };
 
 //#######################################
-// Thrown when trying to write to a readonly registry key
+// Thrown when trying to write to a readonly registry key 
 //#######################################
 
 class RegistryNoWriteAccessException : public RegistryException
@@ -61,7 +61,7 @@ public:
 };
 
 //#######################################
-// Thrown when trying to access an registry key, with improper
+// Thrown when trying to access an registry key, with improper 
 // access rights
 //#######################################
 
@@ -102,6 +102,6 @@ public:
     RegistryInvalidOperationException(long ErrorCode);
 };
 
-#endif
+#endif 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registryvalueimpl.cxx b/setup_native/source/win32/customactions/reg4msdoc/registryvalueimpl.cxx
index d9012fcd087d..71501a8a6ce9 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registryvalueimpl.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registryvalueimpl.cxx
@@ -48,7 +48,7 @@ RegistryValueImpl::RegistryValueImpl(const std::wstring& Name, const std::wstrin
 */
 RegistryValueImpl::RegistryValueImpl(const std::wstring& Name, const std::string& Value) :
     m_Name(Name),
-    m_Type(REG_SZ),
+    m_Type(REG_SZ),	
     m_IntData(0)
 {
     m_StringData = AnsiToUnicodeString(Value);
@@ -118,7 +118,7 @@ const void* RegistryValueImpl::GetDataBuffer() const
 */
 std::wstring RegistryValueImpl::GetDataAsUniString() const
 {
-    assert(REG_SZ == m_Type);
+    assert(REG_SZ == m_Type);    
     return m_StringData;
 }
 
@@ -130,13 +130,13 @@ std::string RegistryValueImpl::GetDataAsAnsiString() const
     assert(REG_SZ == m_Type);
     return UnicodeToAnsiString(m_StringData);
 }
-
+    
 //--------------------------------------------
-/** Returns the data as number
+/** Returns the data as number 		
 */
 int RegistryValueImpl::GetDataAsInt() const
 {
-    assert(REG_DWORD == m_Type);
+    assert(REG_DWORD == m_Type);    
     return m_IntData;
 }
 
@@ -155,7 +155,7 @@ int RegistryValueImpl::GetType() const
 
 
 //--------------------------------------------
-/** Set a new name
+/** Set a new name 
 */
 void RegistryValueImpl::SetName(const std::wstring& NewName)
 {
@@ -163,7 +163,7 @@ void RegistryValueImpl::SetName(const std::wstring& NewName)
 }
 
 //--------------------------------------------
-/**
+/** 
 */
 void RegistryValueImpl::SetValue(const std::wstring& NewValue)
 {
@@ -172,7 +172,7 @@ void RegistryValueImpl::SetValue(const std::wstring& NewValue)
 }
 
 //--------------------------------------------
-/**
+/** 
 */
 void RegistryValueImpl::SetValue(const std::string& NewValue)
 {
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registryvalueimpl.hxx b/setup_native/source/win32/customactions/reg4msdoc/registryvalueimpl.hxx
index 1f4df3353359..48bfcea9b605 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registryvalueimpl.hxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registryvalueimpl.hxx
@@ -9,7 +9,7 @@
 #include <memory>
 #include <string>
 
-class RegistryValueImpl
+class RegistryValueImpl  
 {
 public:
 
@@ -22,7 +22,7 @@ public:
     RegistryValueImpl(const std::wstring& Name, const std::wstring& Value);
 
     RegistryValueImpl(const std::wstring& Name, const std::string& Value);
-
+    
     #if (_MSC_VER >= 1300)
     RegistryValueImpl::RegistryValueImpl(const RegistryValueImpl& s);
     #endif
@@ -53,7 +53,7 @@ public:
         @precond GetType = STRING
     */
     std::wstring GetDataAsUniString() const;
-
+    
     /** Returns the data as ansi string
 
         @precond GetType = STRING
@@ -61,7 +61,7 @@ public:
     std::string GetDataAsAnsiString() const;
 
     /** Returns the data as number
-
+    
         @precond GetType = NUMBER
     */
     int GetDataAsInt() const;
@@ -73,13 +73,13 @@ public:
     //#################################
     // Command
     //#################################
+    
 
-
-    /** Set a new name
+    /** Set a new name 
     */
     void SetName(const std::wstring& NewName);
 
-    /**
+    /** 
     */
     void SetValue(const std::wstring& NewValue);
 
@@ -96,16 +96,16 @@ public:
     //#################################
 
 private:
-    std::wstring    m_Name;
-    int             m_Type;
-    std::wstring    m_StringData;
-    int             m_IntData;
+    std::wstring	m_Name;
+    int				m_Type;
+    std::wstring	m_StringData;
+    int				m_IntData;
 };
 
 
 typedef std::auto_ptr<RegistryValueImpl> RegistryValue;
 
 
-#endif
+#endif 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registryw9x.cxx b/setup_native/source/win32/customactions/reg4msdoc/registryw9x.cxx
index 47cc8ce70ec5..4b14c0d1d907 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registryw9x.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registryw9x.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -446,7 +446,7 @@ void RegistryKeyImplWin9x::DeleteSubKey(const std::wstring& Name)
     else if (ERROR_ACCESS_DENIED == rc)
         throw RegistryAccessDeniedException(rc);
     else if (ERROR_SUCCESS != rc)
-        throw RegistryException(rc);
+        throw RegistryException(rc);		
 }
 
 //-----------------------------------------------------
@@ -478,7 +478,7 @@ void RegistryKeyImplWin9x::DeleteSubKeyTree(const std::wstring& Name)
                  IsWriteable = true
                  HasValue(Name) = true
 
-        @throws RegistryIOException
+        @throws	RegistryIOException
                 RegistryWriteAccessDeniedException
                 RegistryValueNotFoundException
 */
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registryw9x.hxx b/setup_native/source/win32/customactions/reg4msdoc/registryw9x.hxx
index 46c25cb898cf..5f6ce614981d 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registryw9x.hxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registryw9x.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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.
  *
  ************************************************************************/
-
+ 
 #ifndef _REGISTRYW9X_HXX_
 #define _REGISTRYW9X_HXX_
 
@@ -38,17 +38,17 @@
 
 class RegistryKeyImplWin9x : public RegistryKeyImpl
 {
-public:
-
+public:   
+    
     //############################################
     // Queries
     //############################################
 
     /** The number of sub values of the key at hand
-
+        
         @precond IsOpen = true
 
-        @throws
+        @throws 
     */
     virtual size_t GetSubValueCount() const;
 
@@ -59,7 +59,7 @@ public:
         @throws
     */
     virtual size_t GetSubKeyCount() const;
-
+    
     virtual StringListPtr GetSubKeyNames() const;
 
     virtual StringListPtr GetSubValueNames() const;
@@ -76,14 +76,14 @@ public:
         @precond IsOpen = true
     */
     virtual RegistryValue GetValue(const std::wstring& Name, const RegistryValue& Default) const;
-
+    
     //############################################
     // Commands
     //############################################
 
-    /** Open the registry key, has no effect if
+    /** Open the registry key, has no effect if 
         the key is already open
-
+        
         @precond IsOpen = false
 
         @throws RegistryWriteAccessDenyException
@@ -141,7 +141,7 @@ public:
                  IsWriteable = true
                  HasValue(Name) = true
 
-        @throws RegistryIOException
+        @throws	RegistryIOException
                 RegistryWriteAccessDeniedException
                 RegistryValueNotFoundException
     */
@@ -158,9 +158,9 @@ public:
     virtual void SetValue(const RegistryValue& Value);
 
     //############################################
-    // Creation
+    // Creation 
     //
-    // only possible through WindowsRegistry class
+    // only possible through WindowsRegistry class	
     //############################################
 
 protected:
@@ -179,17 +179,17 @@ protected:
                  RegistryKeyNotFoundException
     */
     RegistryKeyImplWin9x(HKEY RootKey);
-
+    
     /** Create an instances of the specified Registry key,
     the key is assumed to be already opened.
     */
     RegistryKeyImplWin9x(HKEY RootKey, HKEY SubKey, const std::wstring& KeyName, bool Writeable = true);
-
+    
 // prevent copy/assignment
 private:
     RegistryKeyImplWin9x(const RegistryKeyImplWin9x&);
     RegistryKeyImplWin9x& operator=(const RegistryKeyImplWin9x&);
-
+    
 //######################################
 // Friend declarations
 //######################################
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrywnt.cxx b/setup_native/source/win32/customactions/reg4msdoc/registrywnt.cxx
index 4f60d0cae32a..cd3507b7d696 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registrywnt.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registrywnt.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
  ************************************************************************/
 
 //---------------------------------------
-//
+// 
 //---------------------------------------
 
 #ifdef _MSC_VER
@@ -50,22 +50,22 @@
 #endif
 
 //---------------------------------------
-//
+// 
 //---------------------------------------
 
 const size_t MAX_TMP_BUFF_SIZE = 1024 * sizeof(wchar_t);
 
 
 //############################################
-// Creation
-// only possible through WindowsRegistry class
+// Creation 
+// only possible through WindowsRegistry class	
 //############################################
 
 
 //-----------------------------------------------------
 /** Create instance and open the specified Registry key
 */
-RegistryKeyImplWinNT::RegistryKeyImplWinNT(HKEY RootKey, const std::wstring& KeyName) :
+RegistryKeyImplWinNT::RegistryKeyImplWinNT(HKEY RootKey, const std::wstring& KeyName) : 
     RegistryKeyImpl(RootKey, KeyName)
 {
 }
@@ -73,7 +73,7 @@ RegistryKeyImplWinNT::RegistryKeyImplWinNT(HKEY RootKey, const std::wstring& Key
 //-----------------------------------------------------
 /** Create instance and open the specified Registry key
 */
-RegistryKeyImplWinNT::RegistryKeyImplWinNT(HKEY RootKey) :
+RegistryKeyImplWinNT::RegistryKeyImplWinNT(HKEY RootKey) : 
     RegistryKeyImpl(RootKey)
 {
 }
@@ -95,10 +95,10 @@ RegistryKeyImplWinNT::RegistryKeyImplWinNT(HKEY RootKey, HKEY SubKey, const std:
 
 //-----------------------------------------------------
 /** The number of sub values of the key at hand
-
+        
     @precond IsOpen = true
 
-    @throws
+    @throws 
 */
 size_t RegistryKeyImplWinNT::GetSubValueCount() const
 {
@@ -147,37 +147,37 @@ size_t RegistryKeyImplWinNT::GetSubKeyCount() const
 /**
 */
 StringListPtr RegistryKeyImplWinNT::GetSubKeyNames() const
-{
+{	
     assert(IsOpen());
 
     wchar_t buff[1024];
-    DWORD  buff_size = sizeof(buff);
+    DWORD  buff_size = sizeof(buff);	
     FILETIME ftime;
-
+    
     StringList* key_names = new StringList();
-
+        
     LONG rc = ERROR_SUCCESS;
 
     for (DWORD i = 0; /* left empty */; i++)
-    {
+    {	
         rc = RegEnumKeyExW(
             m_hSubKey, i, buff, &buff_size,
             0, 0, 0, &ftime);
-
-        if (ERROR_SUCCESS != rc &&
+        
+        if (ERROR_SUCCESS != rc && 
             ERROR_MORE_DATA != rc)
             break;
-
+        
         buff_size = sizeof(buff);
 
-        key_names->push_back(buff);
+        key_names->push_back(buff);		
     }
-
+    
     if (ERROR_INVALID_HANDLE == rc)
         throw RegistryIOException(rc);
     else if (ERROR_NO_MORE_ITEMS != rc && ERROR_SUCCESS != rc)
         throw RegistryException(rc);
-
+        
 #if (_MSC_VER < 1300) && !defined(__MINGW32__)
     return key_names;
 #else
@@ -193,7 +193,7 @@ StringListPtr RegistryKeyImplWinNT::GetSubValueNames() const
     assert(IsOpen());
 
     wchar_t buff[1024];
-    DWORD  buff_size = sizeof(buff);
+    DWORD  buff_size = sizeof(buff);	
 
     StringList* value_names = new StringList();
 
@@ -204,16 +204,16 @@ StringListPtr RegistryKeyImplWinNT::GetSubValueNames() const
         rc = RegEnumValueW(
             m_hSubKey, i, buff, &buff_size,
             0, 0, 0, 0);
-
-        if (ERROR_SUCCESS != rc &&
+    
+        if (ERROR_SUCCESS != rc && 
             ERROR_MORE_DATA != rc)
             break;
 
         buff_size = sizeof(buff);
 
-        value_names->push_back(buff);
+        value_names->push_back(buff);		
     }
-
+    
     if (ERROR_INVALID_HANDLE == rc)
         throw RegistryIOException(rc);
     else if (ERROR_NO_MORE_ITEMS != rc && ERROR_SUCCESS != rc)
@@ -271,7 +271,7 @@ RegistryValue RegistryKeyImplWinNT::GetValue(const std::wstring& Name) const
     {
         assert(false);
     }
-
+    
     return regval;
 }
 
@@ -324,7 +324,7 @@ RegistryValue RegistryKeyImplWinNT::GetValue(const std::wstring& Name, const Reg
 
     return regval;
 }
-
+    
 
 //############################################
 // Commands
@@ -332,7 +332,7 @@ RegistryValue RegistryKeyImplWinNT::GetValue(const std::wstring& Name, const Reg
 
 
 //-----------------------------------------------------
-/** Open the registry key, has no effect if
+/** Open the registry key, has no effect if 
     the key is already open
 
     @precond IsOpen = false
@@ -365,7 +365,7 @@ void RegistryKeyImplWinNT::Open(bool Writeable)
         throw RegistryException(rc);
 
     m_IsWriteable = Writeable;
-
+    
     assert(IsOpen());
 }
 
@@ -405,7 +405,7 @@ RegistryKey RegistryKeyImplWinNT::CreateSubKey(const std::wstring& Name)
     HKEY hRoot = IsRootKey() ? m_hRootKey : m_hSubKey;
 
     HKEY hKey;
-
+    
     LONG rc = RegCreateKeyExW(
         hRoot,
         Name.c_str(),
@@ -442,16 +442,16 @@ void RegistryKeyImplWinNT::DeleteSubKey(const std::wstring& Name)
     assert(IsOpen());
     assert(IsWriteable());
     assert(HasSubKey(Name));
-
+    
     RegistryKey SubKey = OpenSubKey(Name);
 
     size_t nSubKeyCount = SubKey->GetSubKeyCount();
-
+    
     assert(0 == nSubKeyCount);
-
+    
     if (nSubKeyCount)
         throw RegistryInvalidOperationException(ERROR_NOT_SUPPORTED);
-
+    
     LONG rc = RegDeleteKeyW(m_hSubKey, Name.c_str());
 
     if (ERROR_INVALID_HANDLE == rc)
@@ -499,9 +499,9 @@ LONG RegistryKeyImplWinNT::ImplDeleteSubKeyTree(HKEY RootKey, const std::wstring
         0,
         KEY_READ | DELETE,
         &hKey);
-
+    
     if (ERROR_SUCCESS == rc)
-    {
+    {	
         wchar_t* lpSubKey;
         DWORD    nMaxSubKeyLen;
 
@@ -509,7 +509,7 @@ LONG RegistryKeyImplWinNT::ImplDeleteSubKeyTree(HKEY RootKey, const std::wstring
             hKey, 0, 0, 0, 0,
             &nMaxSubKeyLen,
             0, 0, 0, 0, 0, 0);
-
+    
         nMaxSubKeyLen++; // space for trailing '\0'
 
         lpSubKey = reinterpret_cast<wchar_t*>(
@@ -538,7 +538,7 @@ LONG RegistryKeyImplWinNT::ImplDeleteSubKeyTree(HKEY RootKey, const std::wstring
 
         } // while
 
-        RegCloseKey(hKey);
+        RegCloseKey(hKey);        
 
     } // if
 
@@ -561,7 +561,7 @@ LONG RegistryKeyImplWinNT::ImplDeleteSubKeyTree(HKEY RootKey, const std::wstring
                  IsWriteable = true
                  HasValue(Name) = true
 
-        @throws RegistryIOException
+        @throws	RegistryIOException
                 RegistryWriteAccessDeniedException
                 RegistryValueNotFoundException
 */
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrywnt.hxx b/setup_native/source/win32/customactions/reg4msdoc/registrywnt.hxx
index 517327f34582..ac93df4f02da 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registrywnt.hxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registrywnt.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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.
  *
  ************************************************************************/
-
+ 
 #ifndef _REGISTRYWNT_HXX_
 #define _REGISTRYWNT_HXX_
 
@@ -37,17 +37,17 @@
 
 class RegistryKeyImplWinNT : public RegistryKeyImpl
 {
-public:
-
+public:   
+    
     //############################################
     // Queries
     //############################################
 
     /** The number of sub values of the key at hand
-
+        
         @precond IsOpen = true
 
-        @throws
+        @throws 
     */
     virtual size_t GetSubValueCount() const;
 
@@ -58,7 +58,7 @@ public:
         @throws
     */
     virtual size_t GetSubKeyCount() const;
-
+    
     virtual StringListPtr GetSubKeyNames() const;
 
     virtual StringListPtr GetSubValueNames() const;
@@ -75,14 +75,14 @@ public:
         @precond IsOpen = true
     */
     virtual RegistryValue GetValue(const std::wstring& Name, const RegistryValue& Default) const;
-
+    
     //############################################
     // Commands
     //############################################
 
-    /** Open the registry key, has no effect if
+    /** Open the registry key, has no effect if 
         the key is already open
-
+        
         @precond IsOpen = false
 
         @throws RegistryWriteAccessDenyException
@@ -140,7 +140,7 @@ public:
                  IsWriteable = true
                  HasValue(Name) = true
 
-        @throws RegistryIOException
+        @throws	RegistryIOException
                 RegistryWriteAccessDeniedException
                 RegistryValueNotFoundException
     */
@@ -157,9 +157,9 @@ public:
     virtual void SetValue(const RegistryValue& Value);
 
     //############################################
-    // Creation
+    // Creation 
     //
-    // only possible through WindowsRegistry class
+    // only possible through WindowsRegistry class	
     //############################################
 
 protected:
@@ -178,21 +178,21 @@ protected:
                  RegistryKeyNotFoundException
     */
     RegistryKeyImplWinNT(HKEY RootKey);
-
+    
     /** Create an instances of the specified Registry key,
     the key is assumed to be already opened.
     */
     RegistryKeyImplWinNT(HKEY RootKey, HKEY SubKey, const std::wstring& KeyName, bool Writeable = true);
-
+    
 private:
-
+    
     LONG ImplDeleteSubKeyTree(HKEY RootKey, const std::wstring& Name);
-
+    
 //prevent copy and assignment
 private:
     RegistryKeyImplWinNT(const RegistryKeyImplWinNT&);
     RegistryKeyImplWinNT& operator=(const RegistryKeyImplWinNT&);
-
+    
 //######################################
 // Friend declarations
 //######################################
diff --git a/setup_native/source/win32/customactions/reg4msdoc/stringconverter.cxx b/setup_native/source/win32/customactions/reg4msdoc/stringconverter.cxx
index db38d568e877..84d45532d218 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/stringconverter.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/stringconverter.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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.
  *
  ************************************************************************/
-
+ 
 #include "stringconverter.hxx"
 
 #ifdef _MSC_VER
@@ -44,7 +44,7 @@ std::string UnicodeToAnsiString(const std::wstring& UniString)
 {
     int len = WideCharToMultiByte(
         CP_ACP, 0, UniString.c_str(), -1, 0, 0, 0, 0);
-
+            
     char* buff = reinterpret_cast<char*>(_alloca(len));
 
     WideCharToMultiByte(
@@ -59,7 +59,7 @@ std::wstring AnsiToUnicodeString(const std::string& AnsiString)
 {
     int len = MultiByteToWideChar(
         CP_ACP, 0, AnsiString.c_str(), -1, 0, 0);
-
+            
     wchar_t* buff = reinterpret_cast<wchar_t*>(_alloca(len * sizeof(wchar_t)));
 
     MultiByteToWideChar(
diff --git a/setup_native/source/win32/customactions/reg4msdoc/stringconverter.hxx b/setup_native/source/win32/customactions/reg4msdoc/stringconverter.hxx
index c8fcbd56f627..6a23c0e9b7cc 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/stringconverter.hxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/stringconverter.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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.
  *
  ************************************************************************/
-
+ 
 #ifndef _STRINGCONVERTER_HXX_
 #define _STRINGCONVERTER_HXX_
 
diff --git a/setup_native/source/win32/customactions/reg4msdoc/userregistrar.cxx b/setup_native/source/win32/customactions/reg4msdoc/userregistrar.cxx
index 986bf0d28cb6..03a19523d171 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/userregistrar.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/userregistrar.cxx
@@ -23,7 +23,7 @@ UserRegistrar::UserRegistrar(const RegistrationContextInformation& RegContext) :
 }
 
 //###################################
-// Command
+// Command 
 //###################################
 
 //--------------------------------------
@@ -32,9 +32,9 @@ UserRegistrar::UserRegistrar(const RegistrationContextInformation& RegContext) :
 void UserRegistrar::UnregisterAsHtmlEditorForInternetExplorer() const
 {
     Registrar::UnregisterAsHtmlEditorForInternetExplorer();
-
+    
     DeleteHtmFileAssociationKeys();
-
+    
     try
     {
         RegistryKey RegKey = m_RootKey->OpenSubKey(L"Applications");
@@ -55,30 +55,30 @@ void UserRegistrar::UnregisterAsHtmlEditorForInternetExplorer() const
 void UserRegistrar::RegisterAsDefaultShellHtmlEditor() const
 {
     RegistryKey LocalHtmKey = m_RootKey->CreateSubKey(L".htm");
-
+    
     if (!LocalHtmKey->HasValue(DEFAULT_VALUE_NAME))
     {
         RegistryKey HKCRKey = WindowsRegistry().GetClassesRootKey();
-
+        
         if (HKCRKey->HasSubKey(L".htm"))
         {
             RegistryKey RootHtmKey = HKCRKey->OpenSubKey(L".htm", false);
-
+            
             if (RootHtmKey->HasValue(DEFAULT_VALUE_NAME))
             {
                 RegistryValue RegVal = RootHtmKey->GetValue(DEFAULT_VALUE_NAME);
-
+            
                 std::wstring RootHtmFwdKey = RegVal->GetDataAsUniString();
-
+                
                 if (HKCRKey->HasSubKey(RootHtmFwdKey))
-                {
+                {            
                     m_RootKey->CreateSubKey(RootHtmFwdKey);
                     LocalHtmKey->CopyValue(RootHtmKey, DEFAULT_VALUE_NAME);
                 }
             }
         }
     }
-
+    
     // calling base class method
     Registrar::RegisterAsDefaultShellHtmlEditor();
 }
@@ -92,7 +92,7 @@ void UserRegistrar::UnregisterAsDefaultShellHtmlEditor() const
     Registrar::UnregisterAsDefaultShellHtmlEditor();
     DeleteHtmFileAssociationKeys();
 }
-
+    
 //--------------------------------------
 /**
 */
@@ -101,11 +101,11 @@ void UserRegistrar::UnregisterForMsOfficeApplication(
 {
     /// calling base class method
     Registrar::UnregisterForMsOfficeApplication(FileExtension);
-
+        
     if (m_RootKey->HasSubKey(FileExtension))
     {
         RegistryKey RegKey = m_RootKey->OpenSubKey(FileExtension);
-
+        
         if ((0 == RegKey->GetSubKeyCount()) && (0 == RegKey->GetSubValueCount()))
         {
             RegKey->Close();
@@ -123,14 +123,14 @@ RegistryKey UserRegistrar::GetRootKeyForDefHtmlEditorForIERegistration() const
 }
 
 //--------------------------------------
-/**
+/** 
 */
 void UserRegistrar::DeleteHtmFileAssociationKeys() const
 {
     // Later delete the created keys if they are empty and have not changed meanwhile.
     // Remeber: if we create a new registry key in the user part of the
     // registry, changes to that key via the merged key HKEY_CLASSES_ROOT
-    // go into the user branch HKEY_CURRENT_USER and are not visible for other users.
+    // go into the user branch HKEY_CURRENT_USER and are not visible for other users. 
     // so we must carefully detect if the keys have not changed in order to prevent accidentally
     // deleting a key and so destroying existing associations
     // See MSDN: "Merged View of HKEY_CLASSES_ROOT"
diff --git a/setup_native/source/win32/customactions/reg4msdoc/userregistrar.hxx b/setup_native/source/win32/customactions/reg4msdoc/userregistrar.hxx
index f4b674a717e7..653a4790edda 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/userregistrar.hxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/userregistrar.hxx
@@ -8,10 +8,10 @@
 
 #include "registrar.hxx"
 
-class UserRegistrar : public Registrar
+class UserRegistrar : public Registrar  
 {
 public:
-
+    
     //###################################
     // Creation
     //###################################
@@ -19,28 +19,28 @@ public:
     UserRegistrar(const RegistrationContextInformation& RegContext);
 
     //###################################
-    // Command
+    // Command 
     //###################################
-
+        
     virtual void UnregisterAsHtmlEditorForInternetExplorer() const;
-
+    
     virtual void RegisterAsDefaultShellHtmlEditor() const;
     virtual void UnregisterAsDefaultShellHtmlEditor() const;
-
+    
 protected:
     virtual void UnregisterForMsOfficeApplication(
         const std::wstring& FileExtension) const;
-
+        
     virtual RegistryKey GetRootKeyForDefHtmlEditorForIERegistration() const;
-
+    
 private:
-
-    /** Delete the privately created file associations
-          for htm files if the keys are empty
+    
+    /** Delete the privately created file associations 
+          for htm files if the keys are empty  
     */
     void DeleteHtmFileAssociationKeys() const;
 };
 
-#endif
+#endif 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/setup_native/source/win32/customactions/reg4msdoc/windowsregistry.cxx b/setup_native/source/win32/customactions/reg4msdoc/windowsregistry.cxx
index 1e97f779bc39..49a3fdd34892 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/windowsregistry.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/windowsregistry.cxx
@@ -15,7 +15,7 @@
 //
 //------------------------------
 
-WindowsRegistry::WindowsRegistry()
+WindowsRegistry::WindowsRegistry() 
 {
     OSVERSIONINFOA osverinfo;
     ZeroMemory(&osverinfo, sizeof(osverinfo));
@@ -37,7 +37,7 @@ RegistryKey WindowsRegistry::GetClassesRootKey(bool Writeable) const
 //------------------------------
 //
 //------------------------------
-
+    
 RegistryKey WindowsRegistry::GetCurrentUserKey(bool Writeable) const
 {
     return GetRegistryKey(HKEY_CURRENT_USER, Writeable);
@@ -68,14 +68,14 @@ RegistryKey WindowsRegistry::GetUserKey(bool Writeable) const
 RegistryKey WindowsRegistry::GetRegistryKey(HKEY RootKey, bool Writeable) const
 {
     RegistryKey regkey;
-
+    
     if (m_IsWinNT)
         regkey = RegistryKey(new RegistryKeyImplWinNT(RootKey));
     else
         regkey = RegistryKey(new RegistryKeyImplWin9x(RootKey));
 
     regkey->Open(Writeable);
-
+        
     return regkey;
 }
 
diff --git a/setup_native/source/win32/customactions/reg4msdoc/windowsregistry.hxx b/setup_native/source/win32/customactions/reg4msdoc/windowsregistry.hxx
index 1b1cb5e2829e..5b2f94047f5e 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/windowsregistry.hxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/windowsregistry.hxx
@@ -16,15 +16,15 @@
 
 #include "Registry.hxx"
 
-/** Basically a factory class
+/** Basically a factory class 
 */
-class WindowsRegistry
+class WindowsRegistry  
 {
 public:
     WindowsRegistry();
-
+    
     RegistryKey GetClassesRootKey(bool Writeable = true) const;
-
+    
     RegistryKey GetCurrentUserKey(bool Writeable = true) const;
 
     RegistryKey GetLocalMachineKey(bool Writeable = true) const;
@@ -38,6 +38,6 @@ private:
     bool m_IsWinNT;
 };
 
-#endif
+#endif 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/setup_native/source/win32/customactions/reg64/reg64.cxx b/setup_native/source/win32/customactions/reg64/reg64.cxx
index fe22ed86b829..2f4b676e7dfb 100644
--- a/setup_native/source/win32/customactions/reg64/reg64.cxx
+++ b/setup_native/source/win32/customactions/reg64/reg64.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
 *
  * DO NOT ALTER 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 @@
 
 // 10.11.2009 tkr: MinGW doesn't know anything about RegDeleteKeyExW if WINVER < 0x0502.
 extern "C" {
-WINADVAPI LONG WINAPI RegDeleteKeyExW(HKEY,LPCWSTR,REGSAM,DWORD);
+WINADVAPI LONG WINAPI RegDeleteKeyExW(HKEY,LPCWSTR,REGSAM,DWORD); 
 }
 
 // 06.11.2009 tkr: to provide windows xp as build systems for mingw we need to define KEY_WOW64_64KEY
-// in mingw 3.13 KEY_WOW64_64KEY isn't available < Win2003 systems.
+// in mingw 3.13 KEY_WOW64_64KEY isn't available < Win2003 systems. 
 // Also defined in setup_native\source\win32\customactions\reg64\reg64.cxx,source\win32\customactions\shellextensions\shellextensions.cxx and
 // extensions\source\activex\main\so_activex.cpp
 
 #ifndef KEY_WOW64_64KEY
-    #define KEY_WOW64_64KEY (0x0100)
+    #define KEY_WOW64_64KEY	(0x0100)
 #endif
 
 
@@ -87,7 +87,7 @@ static inline void OutputDebugStringFormat( const wchar_t*, ... )
 bool WriteRegistry( MSIHANDLE & hMSI, OPERATION op, const wchar_t* componentName)
 {
     INSTALLSTATE current_state;
-    INSTALLSTATE comp_state;
+    INSTALLSTATE comp_state; 
     UINT ret = MsiGetComponentState( hMSI, componentName, &current_state, &comp_state );
     if ( ERROR_SUCCESS == ret )
     {
@@ -153,7 +153,7 @@ BOOL UnicodeEquals( wchar_t* pStr1, wchar_t* pStr2 )
         pStr1++, pStr2++;
 
     return ( *pStr1 == 0 && *pStr2 == 0 );
-}
+} 
 
 BOOL GetMsiProp( MSIHANDLE hMSI, const wchar_t* pPropName, wchar_t** ppValue )
 {
@@ -174,11 +174,11 @@ BOOL GetMsiProp( MSIHANDLE hMSI, const wchar_t* pPropName, wchar_t** ppValue )
 
         return TRUE;
     } else if (ret  == ERROR_INVALID_HANDLE)
-    {
+    {	
         OutputDebugStringFormat(L"GetMsiProp - ERROR_INVALID_HANDLE" );
     } else if (ret == ERROR_INVALID_PARAMETER)
     {
-        OutputDebugStringFormat(L"GetMsiProp - ERROR_INVALID_PARAMETER" );
+        OutputDebugStringFormat(L"GetMsiProp - ERROR_INVALID_PARAMETER" );		
     } else if (ret == ERROR_SUCCESS)
     {
         OutputDebugStringFormat(L"GetMsiProp - ERROR_SUCCESS" );
@@ -187,7 +187,7 @@ BOOL GetMsiProp( MSIHANDLE hMSI, const wchar_t* pPropName, wchar_t** ppValue )
 
     OutputDebugStringFormat(L"GetMsiProp - ENDE\n" );
     return FALSE;
-}
+} 
 
 bool IsInstallForAllUsers( MSIHANDLE hMSI )
 {
@@ -215,9 +215,9 @@ wchar_t* GetBasisInstallLocation( MSIHANDLE hMSI )
 
     return pVal;
 }
+ 
 
-
-bool QueryReg64Table(MSIHANDLE& rhDatabase, MSIHANDLE& rhView)
+bool QueryReg64Table(MSIHANDLE& rhDatabase, MSIHANDLE& rhView) 
 {
     OutputDebugStringFormat(L"QueryReg64Table - START\n" );
     int const arraysize = 400;
@@ -287,9 +287,9 @@ bool SetRegistryKey(HKEY RootKey, const wchar_t* KeyName, const wchar_t* ValueNa
 bool DoRegEntries( MSIHANDLE& rhMSI, OPERATION op, MSIHANDLE& rhView)
 {
     OutputDebugStringFormat(L"DoRegEntries - START\n" );
-
+    
     MSIHANDLE hRecord;
-
+    
     long lRoot;
     wchar_t  szKey[255];
     wchar_t  szName[255];
@@ -299,28 +299,28 @@ bool DoRegEntries( MSIHANDLE& rhMSI, OPERATION op, MSIHANDLE& rhView)
     /// read records until there are no more records
     while (MsiViewFetch(rhView,&hRecord) == ERROR_SUCCESS)
     {
-        DWORD    dwKey = 255;
-        DWORD    dwName = 255;
-        DWORD    dwValue = 1024;
-        DWORD    dwComponent = 255;
-
+        DWORD	 dwKey = 255;
+        DWORD	 dwName = 255;
+        DWORD	 dwValue = 1024;
+        DWORD	 dwComponent = 255;
+        
         szKey[0] = '\0';
         szName[0] = '\0';
         szValue[0] = '\0';
         szComponent[0] = '\0';
-
+        
         lRoot = MsiRecordGetInteger(hRecord,2);
         MsiRecordGetString(hRecord,3,szKey,&dwKey);
-
-        if (!MsiRecordIsNull(hRecord, 4))
+        
+        if (!MsiRecordIsNull(hRecord, 4)) 
             MsiRecordGetString(hRecord,4,szName,&dwName);
-
+        
         if (!MsiRecordIsNull(hRecord, 5))
         {
-            MsiRecordGetString(hRecord,5,szValue,&dwValue);
-
-
-
+            MsiRecordGetString(hRecord,5,szValue,&dwValue);			
+                
+            
+    
             wchar_t* nPos = wcsstr(szValue , INSTALLLOCATION);
             if ( NULL != nPos)
             {
@@ -336,21 +336,21 @@ bool DoRegEntries( MSIHANDLE& rhMSI, OPERATION op, MSIHANDLE& rhView)
 
                 // prefix
                 wcsncpy(newValue, szValue, nPrefixSize);
-
+                
                 // basis location
                 wcsncat(newValue, sBasisInstallLocation, nPropSize * sizeof( wchar_t ));
 
                 // postfix
                 wcsncat(newValue, nPos + ( wcslen( INSTALLLOCATION ) ), nPropSize * sizeof( wchar_t ));
-
+                
                 wcsncpy(szValue, newValue, nNewValueBytes <=1024? nNewValueBytes: 1024);
 
                 free(newValue);
             }
-
+            
         }
-
-
+        
+    
         MsiRecordGetString(hRecord,6,szComponent,&dwComponent);
 
         OutputDebugStringFormat(L"****** DoRegEntries *******" );
@@ -390,7 +390,7 @@ bool DoRegEntries( MSIHANDLE& rhMSI, OPERATION op, MSIHANDLE& rhView)
                     OutputDebugStringFormat(L"Unknown Root!" );
                 break;
         }
-
+        
         OutputDebugStringFormat(L"Key:");
         OutputDebugStringFormat( szKey );
         OutputDebugStringFormat(L"Name:");
@@ -403,14 +403,14 @@ bool DoRegEntries( MSIHANDLE& rhMSI, OPERATION op, MSIHANDLE& rhView)
         switch (op)
         {
             case SET:
-
+                    
                     if (WriteRegistry(rhMSI, SET, szComponent))
                     {
                         OutputDebugStringFormat(L"DoRegEntries - Write\n" );
                         SetRegistryKey(key, szKey, szName, szValue);
                     }
                 break;
-            case REMOVE:
+            case REMOVE: 
                     OutputDebugStringFormat(L"DoRegEntries - PreRemove\n" );
                     if (WriteRegistry(rhMSI, REMOVE, szComponent))
                     {
@@ -422,10 +422,10 @@ bool DoRegEntries( MSIHANDLE& rhMSI, OPERATION op, MSIHANDLE& rhView)
     }
 
     MsiCloseHandle(rhView);
-
-
+    
+    
     OutputDebugStringFormat(L"DoRegEntries - ENDE\n" );
-
+    
     return true;
 }
 
@@ -440,7 +440,7 @@ bool Reg64(MSIHANDLE& rhMSI, OPERATION op)
         OutputDebugStringFormat(L"BASISINSTALLLOCATION is NULL\n" );
         return false;
     }
-
+    
     MSIHANDLE hView;
     MSIHANDLE hDatabase = MsiGetActiveDatabase(rhMSI);
 
@@ -460,7 +460,7 @@ extern "C" UINT __stdcall InstallReg64(MSIHANDLE hMSI)
 {
     OutputDebugStringFormat(L"InstallReg64\n" );
     Reg64(hMSI, SET);
-    return ERROR_SUCCESS;
+    return ERROR_SUCCESS;    
 }
 
 extern "C" UINT __stdcall DeinstallReg64(MSIHANDLE hMSI)
diff --git a/setup_native/source/win32/customactions/regactivex/regactivex.cxx b/setup_native/source/win32/customactions/regactivex/regactivex.cxx
index 0cf89eca1ebc..fa4188b88d61 100644
--- a/setup_native/source/win32/customactions/regactivex/regactivex.cxx
+++ b/setup_native/source/win32/customactions/regactivex/regactivex.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ void RegisterActiveXNative( const char* pActiveXPath, int nMode, BOOL InstallFor
 #endif
 
     // For Win98/WinME the values should be written to the local machine
-    OSVERSIONINFO       aVerInfo;
+    OSVERSIONINFO		aVerInfo;
     aVerInfo.dwOSVersionInfoSize = sizeof( aVerInfo );
     if ( GetVersionEx( &aVerInfo ) && aVerInfo.dwPlatformId != VER_PLATFORM_WIN32_NT )
         InstallForAllUser = TRUE;
@@ -132,7 +132,7 @@ void RegisterActiveXNative( const char* pActiveXPath, int nMode, BOOL InstallFor
 void UnregisterActiveXNative( const char* pActiveXPath, int nMode, BOOL InstallForAllUser, BOOL InstallFor64Bit )
 {
     // For Win98/WinME the values should be written to the local machine
-    OSVERSIONINFO       aVerInfo;
+    OSVERSIONINFO		aVerInfo;
     aVerInfo.dwOSVersionInfoSize = sizeof( aVerInfo );
     if ( GetVersionEx( &aVerInfo ) && aVerInfo.dwPlatformId != VER_PLATFORM_WIN32_NT )
         InstallForAllUser = TRUE;
diff --git a/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx b/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx
index 800fde54eab5..258e26b2b5f6 100644
--- a/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx
+++ b/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ BOOL UnicodeEquals( wchar_t* pStr1, wchar_t* pStr2 )
         pStr1++, pStr2++;
 
     return ( *pStr1 == 0 && *pStr2 == 0 );
-}
+}		
 
 //----------------------------------------------------------
 BOOL GetMsiProp( MSIHANDLE hMSI, const wchar_t* pPropName, wchar_t** ppValue )
diff --git a/setup_native/source/win32/customactions/relnotes/relnotes.cxx b/setup_native/source/win32/customactions/relnotes/relnotes.cxx
index 48aaf9b417bd..e814c1257053 100644
--- a/setup_native/source/win32/customactions/relnotes/relnotes.cxx
+++ b/setup_native/source/win32/customactions/relnotes/relnotes.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ static bool GetMsiProp(MSIHANDLE handle, LPCTSTR name, /*out*/std::wstring& valu
         MsiGetProperty(handle, name, buff, &sz);
         value = buff;
         return true;
-    }
+    }            
     return false;
 }
 
@@ -90,7 +90,7 @@ static bool GetMsiProp(MSIHANDLE handle, LPCTSTR name, /*out*/std::wstring& valu
 UINT ShowReleaseNotes( TCHAR* pFileName, TCHAR* pFilePath )
 {
     TCHAR sFullPath[ MAX_PATH ];
-
+    
     if ( FAILED( StringCchCopy( sFullPath, MAX_PATH, pFilePath ) ) )
     {
         OutputDebugStringFormat( TEXT("DEBUG: ShowReleaseNotes: Could not copy path [%s]"), pFilePath );
@@ -104,7 +104,7 @@ UINT ShowReleaseNotes( TCHAR* pFileName, TCHAR* pFilePath )
     }
 
     HANDLE hFile = CreateFile( sFullPath, 0, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-
+    
     if ( IsValidHandle(hFile) )
     {
         CloseHandle( hFile );
diff --git a/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx b/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx
index 58159cabd56f..8e4abcca52f1 100644
--- a/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 #ifdef UNICODE
 #define _UNICODE
-#define _tstring    wstring
+#define _tstring	wstring
 #else
-#define _tstring    string
+#define _tstring	string
 #endif
 #include <tchar.h>
 #include <string>
@@ -95,7 +95,7 @@ extern "C" UINT __stdcall CheckInstallDirectory(MSIHANDLE handle)
     UnsetMsiProperty( handle, TEXT("DIRECTORY_NOT_EMPTY") );
 
     // 1. Searching for file setup.ini
-
+    
     std::_tstring sSetupIniPath = sInstallPath + sOfficeHostnamePath + TEXT("\\program\\setup.ini");
 
     WIN32_FIND_DATA data;
@@ -113,7 +113,7 @@ extern "C" UINT __stdcall CheckInstallDirectory(MSIHANDLE handle)
         // std::_tstring notEmptyTitle = "Directory not empty";
         // MessageBox(NULL, notEmptyStr.c_str(), notEmptyTitle.c_str(), MB_OK);
     }
-
+    
     return ERROR_SUCCESS;
 }
 
diff --git a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
index 01ba1ab13b16..2cfdcfa54f1a 100644
--- a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 #ifdef UNICODE
 #define _UNICODE
-#define _tstring    wstring
+#define _tstring	wstring
 #else
-#define _tstring    string
+#define _tstring	string
 #endif
 #include <tchar.h>
 #include <string>
diff --git a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
index f50c795c5c8a..0cf8458221aa 100644
--- a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 #ifdef UNICODE
 #define _UNICODE
-#define _tstring    wstring
+#define _tstring	wstring
 #else
-#define _tstring    string
+#define _tstring	string
 #endif
 #include <tchar.h>
 #include <string>
@@ -56,14 +56,14 @@
 #include <systools/win32/uwinapi.h>
 #include <../tools/seterror.hxx>
 
-#define WININIT_FILENAME    "wininit.ini"
-#define RENAME_SECTION      "rename"
+#define	WININIT_FILENAME	"wininit.ini"
+#define RENAME_SECTION		"rename"
 
 #ifdef DEBUG
 inline void OutputDebugStringFormat( LPCTSTR pFormat, ... )
 {
-    _TCHAR  buffer[1024];
-    va_list args;
+    _TCHAR	buffer[1024];
+    va_list	args;
 
     va_start( args, pFormat );
     _vsntprintf( buffer, SAL_N_ELEMENTS(buffer), pFormat, args );
@@ -77,9 +77,9 @@ static inline void OutputDebugStringFormat( LPCTSTR, ... )
 
 static std::_tstring GetMsiProperty( MSIHANDLE handle, const std::_tstring& sProperty )
 {
-    std::_tstring   result;
-    TCHAR   szDummy[1] = TEXT("");
-    DWORD   nChars = 0;
+    std::_tstring	result;
+    TCHAR	szDummy[1] = TEXT("");
+    DWORD	nChars = 0;
 
     if ( MsiGetProperty( handle, sProperty.c_str(), szDummy, &nChars ) == ERROR_MORE_DATA )
     {
@@ -87,14 +87,14 @@ static std::_tstring GetMsiProperty( MSIHANDLE handle, const std::_tstring& sPro
         LPTSTR buffer = reinterpret_cast<LPTSTR>(_alloca(nBytes));
         ZeroMemory( buffer, nBytes );
         MsiGetProperty(handle, sProperty.c_str(), buffer, &nChars);
-        result = buffer;
+        result = buffer;			
     }
 
-    return  result;
+    return	result;
 }
-
+    
 static inline bool IsSetMsiProperty(MSIHANDLE handle, const std::_tstring& sProperty)
-{
+{   
     std::_tstring value = GetMsiProperty(handle, sProperty);
     return (value.length() > 0);
 }
@@ -111,30 +111,30 @@ static inline void SetMsiProperty(MSIHANDLE handle, const std::_tstring& sProper
 
 static BOOL MoveFileEx9x( 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) )
             {
@@ -156,7 +156,7 @@ static BOOL MoveFileEx9x( LPCSTR lpExistingFileNameA, LPCSTR lpNewFileNameA, DWO
         if ( !fSuccess && GetLastError() != ERROR_ACCESS_DENIED &&
             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 );
 
@@ -179,10 +179,10 @@ static BOOL MoveFileExImpl( LPCSTR lpExistingFileNameA, LPCSTR lpNewFileNameA, D
 
 extern "C" UINT __stdcall IsOfficeRunning( MSIHANDLE handle )
 {
-    OSVERSIONINFO   osverinfo;
+    OSVERSIONINFO	osverinfo;
     osverinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
     GetVersionEx( &osverinfo );
-
+    
     // renaming the vcl resource doesn't work reliable with OS >= Windows Vista
     if (osverinfo.dwMajorVersion < 6 )
     {
@@ -198,18 +198,18 @@ extern "C" UINT __stdcall IsOfficeRunning( MSIHANDLE handle )
 //        mystr = "IsOfficeRunning start. Checking file in dir: " + sResourceDir;
 //        MessageBox( NULL, mystr.c_str(), "IsOfficeRunning", MB_OK );
 
-        WIN32_FIND_DATA aFindFileData;
-        HANDLE  hFind = FindFirstFile( sPattern.c_str(), &aFindFileData );
+        WIN32_FIND_DATA	aFindFileData;
+        HANDLE	hFind = FindFirstFile( sPattern.c_str(), &aFindFileData );
 
         if ( IsValidHandle(hFind) )
         {
-            BOOL    fSuccess = false;
-            bool    fRenameSucceeded;
+            BOOL	fSuccess = false;
+            bool	fRenameSucceeded;
 
             do
             {
-                std::_tstring   sResourceFile = sResourceDir + aFindFileData.cFileName;
-                std::_tstring   sIntermediate = sResourceFile + TEXT(".tmp");
+                std::_tstring	sResourceFile = sResourceDir + aFindFileData.cFileName;
+                std::_tstring	sIntermediate = sResourceFile + TEXT(".tmp");
 
                 fRenameSucceeded = MoveFileExImpl( sResourceFile.c_str(), sIntermediate.c_str(), MOVEFILE_REPLACE_EXISTING );
                 if ( fRenameSucceeded )
@@ -239,12 +239,12 @@ extern "C" UINT __stdcall IsOfficeRunning( MSIHANDLE handle )
         // Property empty -> no office installed
         if ( sOfficeInstallPath.length() == 0 )
             return ERROR_SUCCESS;
-
+    
         std::_tstring sRenameSrc = sOfficeInstallPath + TEXT("program");
         std::_tstring sRenameDst = sOfficeInstallPath + TEXT("program_test");
-
+    
         bool bSuccess = MoveFile( sRenameSrc.c_str(), sRenameDst.c_str() );
-
+    
         if ( bSuccess )
         {
             MoveFile( sRenameDst.c_str(), sRenameSrc.c_str() );
@@ -258,14 +258,14 @@ extern "C" UINT __stdcall IsOfficeRunning( MSIHANDLE handle )
                 return ERROR_SUCCESS;
             if ( dwError == ERROR_PATH_NOT_FOUND )
                 return ERROR_SUCCESS;
-
+            
             // The destination folder should never exist, don't know what to do here
             if ( dwError == ERROR_ALREADY_EXISTS )
                 return ERROR_SUCCESS;
-
-            if ( FormatMessage(
-                FORMAT_MESSAGE_ALLOCATE_BUFFER |
-                FORMAT_MESSAGE_FROM_SYSTEM |
+            
+            if ( FormatMessage( 
+                FORMAT_MESSAGE_ALLOCATE_BUFFER | 
+                FORMAT_MESSAGE_FROM_SYSTEM | 
                 FORMAT_MESSAGE_IGNORE_INSERTS,
                 NULL,
                 GetLastError(),
@@ -279,7 +279,7 @@ extern "C" UINT __stdcall IsOfficeRunning( MSIHANDLE handle )
             }
             else
                 OutputDebugStringFormat( TEXT("Error Code %d: Unknown"), dwError );
-
+            
             MsiSetProperty( handle, TEXT("OFFICERUNS"), TEXT("1") );
             SetMsiErrorCode( MSI_ERROR_OFFICE_IS_RUNNING );
         }
diff --git a/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx b/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx
index 7b7453a1f70e..aca931c9c22f 100644
--- a/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,22 +41,22 @@
 
 #ifdef UNICODE
 #define _UNICODE
-#define _tstring    wstring
+#define _tstring	wstring
 #else
-#define _tstring    string
+#define _tstring	string
 #endif
 #include <tchar.h>
 #include <string>
 
 using namespace std;
 
-namespace
+namespace 
 {
     std::_tstring GetMsiProperty( MSIHANDLE handle, const std::_tstring& sProperty )
     {
-        std::_tstring   result;
-        TCHAR   szDummy[1] = TEXT("");
-        DWORD   nChars = 0;
+        std::_tstring	result;
+        TCHAR	szDummy[1] = TEXT("");
+        DWORD	nChars = 0;
 
         if ( MsiGetProperty( handle, sProperty.c_str(), szDummy, &nChars ) == ERROR_MORE_DATA )
         {
@@ -67,7 +67,7 @@ namespace
             result = buffer;
         }
 
-        return  result;
+        return	result;
     }
 } // namespace
 
@@ -79,49 +79,49 @@ extern "C" UINT __stdcall CompleteInstallPath( MSIHANDLE handle )
     // this causes in an update installation, that INSTALLLOCATION is set to "c:\program files",
     // so that in an OOo 3.3 or later, the directory "program" or "share" are directly created
     // below "c:\program files".
-
-    TCHAR   szValue[8192];
-    DWORD   nValueSize = sizeof(szValue);
-    HKEY    hKey;
-    std::_tstring   sInstDir;
-    std::_tstring   mystr;
-
-    // Reading property OFFICEDIRHOSTNAME_, that contains the part of the path behind
+    
+    TCHAR	szValue[8192];
+    DWORD	nValueSize = sizeof(szValue);
+    HKEY	hKey;
+    std::_tstring	sInstDir;
+    std::_tstring	mystr;
+
+    // Reading property OFFICEDIRHOSTNAME_, that contains the part of the path behind 
     // the program files folder.
-
-    std::_tstring   sInstallLocation = GetMsiProperty( handle, TEXT("INSTALLLOCATION") );
-    std::_tstring   sOfficeDirHostname = GetMsiProperty( handle, TEXT("OFFICEDIRHOSTNAME_") );
-
+    
+    std::_tstring	sInstallLocation = GetMsiProperty( handle, TEXT("INSTALLLOCATION") );
+    std::_tstring	sOfficeDirHostname = GetMsiProperty( handle, TEXT("OFFICEDIRHOSTNAME_") );
+    
     // If sInstallLocation ends with (contains) the string sOfficeDirHostname,
     // INSTALLLOCATION is good and nothing has to be done here.
-
+    
     bool pathCompletionRequired = true;
 
     if ( _tcsstr( sInstallLocation.c_str(), sOfficeDirHostname.c_str() ) )
     {
-        pathCompletionRequired = false;  // nothing to do
+        pathCompletionRequired = false;  // nothing to do 
         // mystr = "Nothing to do, officedir is included into installlocation";
         // MessageBox( NULL, mystr.c_str(), "It is part of installlocation", MB_OK );
     }
-
+    
     // If the path INSTALLLOCATION does not end with this string, INSTALLLOCATION is maybe
     // transfered from an OOo 3.0, OOo 3.1 and OOo 3.2 and need to be changed therefore.
 
     if ( pathCompletionRequired )
     {
-        std::_tstring   sManufacturer = GetMsiProperty( handle, TEXT("Manufacturer") );
-        std::_tstring   sDefinedName = GetMsiProperty( handle, TEXT("DEFINEDPRODUCT") );
-        std::_tstring   sUpgradeCode = GetMsiProperty( handle, TEXT("UpgradeCode") );
+        std::_tstring	sManufacturer = GetMsiProperty( handle, TEXT("Manufacturer") );
+        std::_tstring	sDefinedName = GetMsiProperty( handle, TEXT("DEFINEDPRODUCT") );
+        std::_tstring	sUpgradeCode = GetMsiProperty( handle, TEXT("UpgradeCode") );
 
         // sUpdateVersion can be "3.0", "3.1" or "3.2"
 
-        std::_tstring   sProductKey30 = "Software\\" + sManufacturer + "\\" + sDefinedName +
+        std::_tstring	sProductKey30 = "Software\\" + sManufacturer + "\\" + sDefinedName +
                                             "\\" + "3.0" + "\\" + sUpgradeCode;
 
-        std::_tstring   sProductKey31 = "Software\\" + sManufacturer + "\\" + sDefinedName +
+        std::_tstring	sProductKey31 = "Software\\" + sManufacturer + "\\" + sDefinedName +
                                             "\\" + "3.1" + "\\" + sUpgradeCode;
 
-        std::_tstring   sProductKey32 = "Software\\" + sManufacturer + "\\" + sDefinedName +
+        std::_tstring	sProductKey32 = "Software\\" + sManufacturer + "\\" + sDefinedName +
                                             "\\" + "3.2" + "\\" + sUpgradeCode;
 
         // mystr = "ProductKey: " + sProductKey;
@@ -129,7 +129,7 @@ extern "C" UINT __stdcall CompleteInstallPath( MSIHANDLE handle )
 
         // mystr = "Checking registry";
         // MessageBox( NULL, mystr.c_str(), "registry search", MB_OK );
-
+    
         bool oldVersionExists = false;
 
         if ( ERROR_SUCCESS == RegOpenKey( HKEY_CURRENT_USER,  sProductKey30.c_str(), &hKey ) )
@@ -140,29 +140,29 @@ extern "C" UINT __stdcall CompleteInstallPath( MSIHANDLE handle )
         else if ( ERROR_SUCCESS == RegOpenKey( HKEY_CURRENT_USER,  sProductKey31.c_str(), &hKey ) )
         {
             oldVersionExists = true;
-            RegCloseKey( hKey );
+            RegCloseKey( hKey );		
         }
         else if ( ERROR_SUCCESS == RegOpenKey( HKEY_CURRENT_USER,  sProductKey32.c_str(), &hKey ) )
         {
             oldVersionExists = true;
-            RegCloseKey( hKey );
+            RegCloseKey( hKey );		
         }
         else if ( ERROR_SUCCESS == RegOpenKey( HKEY_LOCAL_MACHINE,  sProductKey30.c_str(), &hKey ) )
         {
             oldVersionExists = true;
-            RegCloseKey( hKey );
+            RegCloseKey( hKey );		
         }
         else if ( ERROR_SUCCESS == RegOpenKey( HKEY_LOCAL_MACHINE,  sProductKey31.c_str(), &hKey ) )
         {
             oldVersionExists = true;
-            RegCloseKey( hKey );
+            RegCloseKey( hKey );		
         }
         else if ( ERROR_SUCCESS == RegOpenKey( HKEY_LOCAL_MACHINE,  sProductKey32.c_str(), &hKey ) )
         {
             oldVersionExists = true;
-            RegCloseKey( hKey );
+            RegCloseKey( hKey );		
         }
-
+    
         if ( oldVersionExists )
         {
             // Adding the new path content sOfficeDirHostname
diff --git a/setup_native/source/win32/customactions/shellextensions/copyeditiondata.cxx b/setup_native/source/win32/customactions/shellextensions/copyeditiondata.cxx
index c816a71a3de1..c78b2efffe06 100644
--- a/setup_native/source/win32/customactions/shellextensions/copyeditiondata.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/copyeditiondata.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/setup_native/source/win32/customactions/shellextensions/copyextensiondata.cxx b/setup_native/source/win32/customactions/shellextensions/copyextensiondata.cxx
index d94b65459d8a..253fa7a2c2ed 100644
--- a/setup_native/source/win32/customactions/shellextensions/copyextensiondata.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/copyextensiondata.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 #ifdef UNICODE
 #define _UNICODE
-#define _tstring    wstring
+#define _tstring	wstring
 #else
-#define _tstring    string
+#define _tstring	string
 #endif
 #include <tchar.h>
 #include <string>
diff --git a/setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx b/setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx
index ffd6ef1a87dd..2cea3de247ec 100644
--- a/setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 std;
 
-namespace
+namespace 
 {
     string GetMsiProperty(MSIHANDLE handle, const string& sProperty)
     {
@@ -121,7 +121,7 @@ Order compareVersions(string const & version1, string const & version2) {
 
         if (e1.size() < e2.size()) {
             return ORDER_LESS;
-        } else if (e1.size() > e2.size()) {
+        } else if (e1.size() > e2.size()) {            
             return ORDER_GREATER;
         } else if (e1 < e2) {
             return ORDER_LESS;
@@ -132,7 +132,7 @@ Order compareVersions(string const & version1, string const & version2) {
     return ORDER_EQUAL;
 }
 
-} // namespace
+} // namespace 
 
 extern "C" UINT __stdcall DotNetCheck(MSIHANDLE handle) {
     string present(GetMsiProperty(handle, TEXT("MsiNetAssemblySupport")));
@@ -151,34 +151,34 @@ extern "C" UINT __stdcall DotNetCheck(MSIHANDLE handle) {
     // string result(GetMsiProperty(handle, TEXT("DOTNET_SUFFICIENT")));
     // string myText3 = TEXT("DOTNET_SUFFICIENT: ") + result;
     // MessageBox(NULL, myText3.c_str(), "DEBUG", MB_OK);
+    
 
-
-    return ERROR_SUCCESS;
+    return ERROR_SUCCESS;    
 }
 
 extern "C" UINT __stdcall ShowProperties(MSIHANDLE handle)
 {
-    string property = GetMsiProperty(handle, TEXT("INSTALLLOCATION"));
+    string property = GetMsiProperty(handle, TEXT("INSTALLLOCATION"));                
     string myText = TEXT("INSTALLLOCATION: ") + property;
     MessageBox(NULL, myText.c_str(), "INSTALLLOCATION", MB_OK);
 
-    property = GetMsiProperty(handle, TEXT("Installed"));
+    property = GetMsiProperty(handle, TEXT("Installed"));                
     myText = TEXT("Installed: ") + property;
     MessageBox(NULL, myText.c_str(), "Installed", MB_OK);
 
-    property = GetMsiProperty(handle, TEXT("PATCH"));
+    property = GetMsiProperty(handle, TEXT("PATCH"));                
     myText = TEXT("PATCH: ") + property;
     MessageBox(NULL, myText.c_str(), "PATCH", MB_OK);
 
-    property = GetMsiProperty(handle, TEXT("REMOVE"));
+    property = GetMsiProperty(handle, TEXT("REMOVE"));                
     myText = TEXT("REMOVE: ") + property;
     MessageBox(NULL, myText.c_str(), "REMOVE", MB_OK);
 
-    property = GetMsiProperty(handle, TEXT("ALLUSERS"));
+    property = GetMsiProperty(handle, TEXT("ALLUSERS"));                
     myText = TEXT("ALLUSERS: ") + property;
     MessageBox(NULL, myText.c_str(), "ALLUSERS", MB_OK);
-
-    return ERROR_SUCCESS;
+    
+    return ERROR_SUCCESS;     
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/setup_native/source/win32/customactions/shellextensions/iconcache.cxx b/setup_native/source/win32/customactions/shellextensions/iconcache.cxx
index daba7fb8c7d7..9ed419b33374 100644
--- a/setup_native/source/win32/customactions/shellextensions/iconcache.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/iconcache.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,12 +42,12 @@ extern "C" UINT __stdcall RebuildShellIconCache(MSIHANDLE)
 {
     // Rebuild icon cache on windows OS prior XP
 
-    OSVERSIONINFO   osverinfo;
+    OSVERSIONINFO	osverinfo;
 
     osverinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
 
-    if (
-        GetVersionEx( &osverinfo ) &&
+    if ( 
+        GetVersionEx( &osverinfo ) && 
         VER_PLATFORM_WIN32_NT == osverinfo.dwPlatformId &&
         (
         5 < osverinfo.dwMajorVersion ||
@@ -58,17 +58,17 @@ extern "C" UINT __stdcall RebuildShellIconCache(MSIHANDLE)
         return ERROR_SUCCESS;
     }
 
-    HKEY    hKey;
-    DWORD   dwDispostion;
-    LONG    lError = RegCreateKeyEx( HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop\\WindowMetrics"), 0, NULL, REG_OPTION_VOLATILE, KEY_SET_VALUE | KEY_QUERY_VALUE, NULL, &hKey, &dwDispostion );
+    HKEY	hKey;
+    DWORD	dwDispostion;
+    LONG	lError = RegCreateKeyEx( HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop\\WindowMetrics"), 0, NULL, REG_OPTION_VOLATILE, KEY_SET_VALUE | KEY_QUERY_VALUE, NULL, &hKey, &dwDispostion );
 
     if ( ERROR_SUCCESS == lError )
     {
-        TCHAR   szValue[256];
-        TCHAR   szTempValue[256];
-        DWORD   cbValue = sizeof(szValue);
-        DWORD   dwType;
-        int     iSize = 0;
+        TCHAR	szValue[256];
+        TCHAR	szTempValue[256];
+        DWORD	cbValue = sizeof(szValue);
+        DWORD	dwType;
+        int		iSize = 0;
 
         lError = RegQueryValueEx( hKey, TEXT("Shell Icon Size"), 0, &dwType, (LPBYTE)szValue, &cbValue );
 
@@ -86,7 +86,7 @@ extern "C" UINT __stdcall RebuildShellIconCache(MSIHANDLE)
         itoa( iSize + 1, szTempValue, 10 );
         lError = RegSetValueEx( hKey, TEXT("Shell Icon Size"), 0, dwType, (LPBYTE)szTempValue, strlen( szTempValue ) + 1 );
 
-        LRESULT lResult = SendMessageTimeout(
+        LRESULT	lResult = SendMessageTimeout(
              HWND_BROADCAST,
              WM_SETTINGCHANGE,
              SPI_SETNONCLIENTMETRICS,
diff --git a/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx b/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx
index 11c9757ff921..cab23c6483e7 100644
--- a/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,19 +136,19 @@ extern "C" UINT __stdcall CreateLayerLinks(MSIHANDLE handle)
     if (IsValidHandle(h1file))
     {
         DWORD dummy;
-
+        
         // Converting string into UTF-8 encoding and writing into file "basis-link"
 
         int nCharsRequired = MultiByteToWideChar( CP_ACP, 0, sBasisInstallPath.c_str(), -1, NULL, 0 );
         if ( nCharsRequired )
         {
-            LPWSTR  lpPathW = new WCHAR[nCharsRequired];
+            LPWSTR	lpPathW = new WCHAR[nCharsRequired];
             if ( MultiByteToWideChar( CP_ACP, 0, sBasisInstallPath.c_str(), -1, lpPathW, nCharsRequired ) )
             {
                 nCharsRequired = WideCharToMultiByte( CP_UTF8, 0, lpPathW, -1, NULL, 0, NULL, NULL );
                 if ( nCharsRequired )
                 {
-                    LPSTR   lpPathUTF8 = new CHAR[nCharsRequired];
+                    LPSTR	lpPathUTF8 = new CHAR[nCharsRequired];
                     WideCharToMultiByte( CP_UTF8, 0, lpPathW, -1, lpPathUTF8, nCharsRequired, NULL, NULL );
 
                     // WriteFile( h1file, sBasisInstallPath.c_str(), sBasisInstallPath.size() ,&dummy, 0 );
@@ -157,7 +157,7 @@ extern "C" UINT __stdcall CreateLayerLinks(MSIHANDLE handle)
                     delete lpPathUTF8;
                 }
             }
-
+            
             delete lpPathW;
         }
 
@@ -184,13 +184,13 @@ extern "C" UINT __stdcall CreateLayerLinks(MSIHANDLE handle)
         int nCharsRequired = MultiByteToWideChar( CP_ACP, 0, sUreInstallPath.c_str(), -1, NULL, 0 );
         if ( nCharsRequired )
         {
-            LPWSTR  lpPathW = new WCHAR[nCharsRequired];
+            LPWSTR	lpPathW = new WCHAR[nCharsRequired];
             if ( MultiByteToWideChar( CP_ACP, 0, sUreInstallPath.c_str(), -1, lpPathW, nCharsRequired ) )
             {
                 nCharsRequired = WideCharToMultiByte( CP_UTF8, 0, lpPathW, -1, NULL, 0, NULL, NULL );
                 if ( nCharsRequired )
                 {
-                    LPSTR   lpPathUTF8 = new CHAR[nCharsRequired];
+                    LPSTR	lpPathUTF8 = new CHAR[nCharsRequired];
                     WideCharToMultiByte( CP_UTF8, 0, lpPathW, -1, lpPathUTF8, nCharsRequired, NULL, NULL );
 
                     // WriteFile( h2file, sUreInstallPath.c_str(), sUreInstallPath.size() ,&dummy, 0 );
@@ -199,7 +199,7 @@ extern "C" UINT __stdcall CreateLayerLinks(MSIHANDLE handle)
                     delete lpPathUTF8;
                 }
             }
-
+            
             delete lpPathW;
         }
 
@@ -216,7 +216,7 @@ extern "C" UINT __stdcall RemoveLayerLinks(MSIHANDLE handle)
     string sOfficeInstallPath = sInstallPath;
     string sBasisInstallPath = sInstallPath + TEXT("Basis\\");
     string sUreInstallPath = sInstallPath + TEXT("URE\\");
-
+    
     string sBasisLinkPath = sOfficeInstallPath + TEXT("basis-link");
     string sUreLinkPath = sBasisInstallPath + TEXT("ure-link");
     string sUreDirName = sUreInstallPath + TEXT("bin");
diff --git a/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx b/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx
index a487309c53f2..7ebad71d9abe 100644
--- a/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,22 +41,22 @@
 
 #ifdef UNICODE
 #define _UNICODE
-#define _tstring    wstring
+#define _tstring	wstring
 #else
-#define _tstring    string
+#define _tstring	string
 #endif
 #include <tchar.h>
 #include <string>
 
 using namespace std;
 
-namespace
+namespace 
 {
     std::_tstring GetMsiProperty( MSIHANDLE handle, const std::_tstring& sProperty )
     {
-        std::_tstring   result;
-        TCHAR   szDummy[1] = TEXT("");
-        DWORD   nChars = 0;
+        std::_tstring	result;
+        TCHAR	szDummy[1] = TEXT("");
+        DWORD	nChars = 0;
 
         if ( MsiGetProperty( handle, sProperty.c_str(), szDummy, &nChars ) == ERROR_MORE_DATA )
         {
@@ -67,26 +67,26 @@ namespace
             result = buffer;
         }
 
-        return  result;
+        return	result;
     }
 } // namespace
 
 extern "C" UINT __stdcall MigrateInstallPath( MSIHANDLE handle )
 {
-    TCHAR   szValue[8192];
-    DWORD   nValueSize = sizeof(szValue);
-    HKEY    hKey;
-    std::_tstring   sInstDir;
+    TCHAR	szValue[8192];
+    DWORD	nValueSize = sizeof(szValue);
+    HKEY	hKey;
+    std::_tstring	sInstDir;
 
-    std::_tstring   sManufacturer = GetMsiProperty( handle, TEXT("Manufacturer") );
-    std::_tstring   sDefinedName = GetMsiProperty( handle, TEXT("DEFINEDPRODUCT") );
-    std::_tstring   sUpdateVersion = GetMsiProperty( handle, TEXT("DEFINEDVERSION") );
-    std::_tstring   sUpgradeCode = GetMsiProperty( handle, TEXT("UpgradeCode") );
+    std::_tstring	sManufacturer = GetMsiProperty( handle, TEXT("Manufacturer") );
+    std::_tstring	sDefinedName = GetMsiProperty( handle, TEXT("DEFINEDPRODUCT") );
+    std::_tstring	sUpdateVersion = GetMsiProperty( handle, TEXT("DEFINEDVERSION") );
+    std::_tstring	sUpgradeCode = GetMsiProperty( handle, TEXT("UpgradeCode") );
 
-    std::_tstring   sProductKey = "Software\\" + sManufacturer + "\\" + sDefinedName +
+    std::_tstring	sProductKey = "Software\\" + sManufacturer + "\\" + sDefinedName +
                                         "\\" + sUpdateVersion + "\\" + sUpgradeCode;
 
-    std::_tstring   mystr;
+    std::_tstring	mystr;
     mystr = "ProductKey: " + sProductKey;
     // MessageBox( NULL, mystr.c_str(), "ProductKey", MB_OK );
 
@@ -95,10 +95,10 @@ extern "C" UINT __stdcall MigrateInstallPath( MSIHANDLE handle )
         if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("INSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
         {
             sInstDir = szValue;
-            MsiSetProperty(handle, TEXT("INSTALLLOCATION"), sInstDir.c_str());
+            MsiSetProperty(handle, TEXT("INSTALLLOCATION"), sInstDir.c_str());                        
             // MessageBox( NULL, sInstDir.c_str(), "Found in HKEY_CURRENT_USER", MB_OK );
         }
-
+        
         RegCloseKey( hKey );
     }
     else if ( ERROR_SUCCESS == RegOpenKey( HKEY_LOCAL_MACHINE,  sProductKey.c_str(), &hKey ) )
@@ -106,7 +106,7 @@ extern "C" UINT __stdcall MigrateInstallPath( MSIHANDLE handle )
         if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("INSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
         {
             sInstDir = szValue;
-            MsiSetProperty(handle, TEXT("INSTALLLOCATION"), sInstDir.c_str());
+            MsiSetProperty(handle, TEXT("INSTALLLOCATION"), sInstDir.c_str());                        
             // MessageBox( NULL, sInstDir.c_str(), "Found in HKEY_LOCAL_MACHINE", MB_OK );
         }
 
diff --git a/setup_native/source/win32/customactions/shellextensions/postuninstall.cxx b/setup_native/source/win32/customactions/shellextensions/postuninstall.cxx
index d4ac16aec8a3..4a272a564109 100644
--- a/setup_native/source/win32/customactions/shellextensions/postuninstall.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/postuninstall.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 #ifdef UNICODE
 #define _UNICODE
-#define _tstring    wstring
+#define _tstring	wstring
 #else
-#define _tstring    string
+#define _tstring	string
 #endif
 #include <tchar.h>
 #include <string>
@@ -52,9 +52,9 @@
 
 static std::_tstring GetMsiProperty( MSIHANDLE handle, const std::_tstring& sProperty )
 {
-    std::_tstring   result;
-    TCHAR   szDummy[1] = TEXT("");
-    DWORD   nChars = 0;
+    std::_tstring	result;
+    TCHAR	szDummy[1] = TEXT("");
+    DWORD	nChars = 0;
 
     if ( MsiGetProperty( handle, sProperty.c_str(), szDummy, &nChars ) == ERROR_MORE_DATA )
     {
@@ -62,18 +62,18 @@ static std::_tstring GetMsiProperty( MSIHANDLE handle, const std::_tstring& sPro
         LPTSTR buffer = reinterpret_cast<LPTSTR>(_alloca(nBytes));
         ZeroMemory( buffer, nBytes );
         MsiGetProperty(handle, sProperty.c_str(), buffer, &nChars);
-        result = buffer;
+        result = buffer;            
     }
 
-    return  result;
+    return	result;
 }
 
 
 static BOOL ExecuteCommand( LPCTSTR lpCommand, BOOL bSync )
 {
-    BOOL                fSuccess = FALSE;
-    STARTUPINFO         si;
-    PROCESS_INFORMATION pi;
+    BOOL				fSuccess = FALSE;
+    STARTUPINFO			si;
+    PROCESS_INFORMATION	pi;
 
     ZeroMemory( &si, sizeof(si) );
     si.cb = sizeof(si);
@@ -105,15 +105,15 @@ static BOOL ExecuteCommand( LPCTSTR lpCommand, BOOL bSync )
 
 extern "C" UINT __stdcall ExecutePostUninstallScript( MSIHANDLE handle )
 {
-    TCHAR   szValue[8192];
-    DWORD   nValueSize = sizeof(szValue);
-    HKEY    hKey;
-    std::_tstring   sInstDir;
-
-    std::_tstring   sProductKey = GetMsiProperty( handle, TEXT("FINDPRODUCT") );
+    TCHAR	szValue[8192];
+    DWORD	nValueSize = sizeof(szValue);
+    HKEY	hKey;
+    std::_tstring	sInstDir;
+    
+    std::_tstring	sProductKey = GetMsiProperty( handle, TEXT("FINDPRODUCT") );
 
     // MessageBox( NULL, sProductKey.c_str(), "Titel", MB_OK );
-
+    
     if ( ERROR_SUCCESS == RegOpenKey( HKEY_CURRENT_USER,  sProductKey.c_str(), &hKey ) )
     {
         if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("INSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
@@ -133,11 +133,11 @@ extern "C" UINT __stdcall ExecutePostUninstallScript( MSIHANDLE handle )
     else
         return ERROR_SUCCESS;
 
-    std::_tstring   sInfFile = sInstDir + TEXT("program\\postuninstall.inf");
-    std::_tstring   sCommand = _T("RUNDLL32.EXE ");
+    std::_tstring	sInfFile = sInstDir + TEXT("program\\postuninstall.inf");
+    std::_tstring	sCommand = _T("RUNDLL32.EXE ");
 
     // MessageBox( NULL, sInfFile.c_str(), "Titel", MB_OK );
-
+    
     if ( (LONG)GetVersion() < 0 )
         sCommand += _T("setupx.dll");
     else
diff --git a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
index 9075436e0412..ca43eea65566 100644
--- a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 #ifdef UNICODE
 #define _UNICODE
-#define _tstring    wstring
+#define _tstring	wstring
 #else
-#define _tstring    string
+#define _tstring	string
 #endif
 #include <tchar.h>
 #include <string>
@@ -62,7 +62,7 @@
 static std::_tstring createTempFolder()
 {
     BOOL bExist = FALSE;
-    TCHAR szTempName[MAX_PATH];
+    TCHAR szTempName[MAX_PATH]; 
     do
     {
         bExist = FALSE;
@@ -73,19 +73,19 @@ static std::_tstring createTempFolder()
         {
             //fprintf (stderr, "GetTempPath failed with error %d.\n", GetLastError());
             return TEXT("");
-        }
+        }          
         // Create a temporary file.
         UINT uRetVal = GetTempFileName(lpPathBuffer, // directory for tmp files
-                                       "upg",        // temp file name prefix
-                                       0,            // create unique name
-                                       szTempName);  // buffer for name
+                                       "upg",        // temp file name prefix 
+                                       0,            // create unique name 
+                                       szTempName);  // buffer for name 
         if (uRetVal == 0)
         {
             //fprintf (stderr, "GetTempFileName failed with error %d.\n", GetLastError());
             return TEXT("");
         }
         //Delete the file
-        BOOL bDel = DeleteFile(szTempName);
+        BOOL bDel = DeleteFile(szTempName);    
         if (FALSE == bDel)
         {
             //fprintf(stderr, "Could not delete temp file. Error %d.\n", GetLastError());
@@ -107,7 +107,7 @@ static std::_tstring createTempFolder()
             }
         }
     } while(bExist);
-
+    
     std::_tstring cur(szTempName);
     //make a file URL from the path
     std::_tstring ret(TEXT("file:///"));
@@ -132,7 +132,7 @@ static void deleteTempFolder(const std::_tstring& sTempFolder)
     //convert the file URL to a path
     const std::_tstring path(sTempFolder.substr(8));
     std::_tstring path2;
-//    MessageBox(NULL, path.c_str(), "del1", MB_OK);
+//    MessageBox(NULL, path.c_str(), "del1", MB_OK);        
     for (std::_tstring::const_iterator i = path.begin(); i != path.end(); i++)
     {
         if (*i == '/')
@@ -147,14 +147,14 @@ static void deleteTempFolder(const std::_tstring& sTempFolder)
     size_t size = path2.size();
     TCHAR * szTemp2 = new TCHAR[size + 2];
     ZeroMemory(szTemp2, (size + 2) * sizeof(TCHAR));
-    memcpy(szTemp2, szTemp, size * sizeof(TCHAR));
-
+    memcpy(szTemp2, szTemp, size * sizeof(TCHAR));   
+    
 //    MessageBox(NULL, szTemp2, "del3", MB_OK);
-    SHFILEOPSTRUCT operation =
+    SHFILEOPSTRUCT operation = 
         {
             NULL,
             FO_DELETE,
-            szTemp2,
+            szTemp2, 
             NULL,
             FOF_SILENT | FOF_NOCONFIRMATION | FOF_NOERRORUI | FOF_NOCONFIRMMKDIR,
             FALSE,
@@ -189,7 +189,7 @@ static std::_tstring GetMsiProperty( MSIHANDLE handle, const std::_tstring& sPro
 /* creates a child process which is specified in lpCommand.
 
   out_exitCode is the exit code of the child process
-
+  
 
 **/
 static BOOL ExecuteCommand( LPCTSTR lpCommand, DWORD * out_exitCode)
@@ -217,10 +217,10 @@ static BOOL ExecuteCommand( LPCTSTR lpCommand, DWORD * out_exitCode)
     if ( fSuccess )
     {
         WaitForSingleObject( pi.hProcess, INFINITE );
-
+        
         if (!GetExitCodeProcess( pi.hProcess, out_exitCode))
             fSuccess = FALSE;
-
+        
         CloseHandle( pi.hProcess );
         CloseHandle( pi.hThread );
     }
@@ -252,7 +252,7 @@ static BOOL RemoveCompleteDirectory( std::_tstring sPath )
 
             mystr = "Current short file: " + sFileName;
             // MessageBox(NULL, mystr.c_str(), "Current Content", MB_OK);
-
+        
             if (( strcmp(sFileName.c_str(),sCurrentDir.c_str()) != 0 ) &&
                 ( strcmp(sFileName.c_str(),sParentDir.c_str()) != 0 ))
             {
@@ -312,7 +312,7 @@ static BOOL RemoveCompleteDirectory( std::_tstring sPath )
             bDirectoryRemoved = false;
         }
     }
-
+    
     return bDirectoryRemoved;
 }
 
@@ -342,12 +342,12 @@ extern "C" UINT __stdcall RegisterExtensions(MSIHANDLE handle)
             + TEXT(" -env:UserInstallation=") + sTempFolder;
         mystr = "Command: " + sCommand;
         //MessageBox(NULL, mystr.c_str(), "Command", MB_OK);
-
+        
         DWORD exitCode = 0;
         bool fSuccess = ExecuteCommand( sCommand.c_str(), & exitCode);
 
         deleteTempFolder(sTempFolder);
-
+        
 //         if ( fSuccess )
 //         {
 //             mystr = "Executed successfully!";
@@ -358,7 +358,7 @@ extern "C" UINT __stdcall RegisterExtensions(MSIHANDLE handle)
 //             mystr = "An error occured during execution!";
 //             MessageBox(NULL, mystr.c_str(), "Command", MB_OK);
 //         }
-
+        
         FindClose( hFindUnopkg );
     }
 //     else
@@ -382,10 +382,10 @@ extern "C" UINT __stdcall RemoveExtensions(MSIHANDLE handle)
     DWORD nValueSize = sizeof(szValue);
     HKEY  hKey;
     std::_tstring sInstDir;
-
+    
     std::_tstring sProductKey = GetMsiProperty( handle, TEXT("FINDPRODUCT") );
     //MessageBox( NULL, sProductKey.c_str(), "Titel", MB_OK );
-
+    
     if ( ERROR_SUCCESS == RegOpenKey( HKEY_CURRENT_USER,  sProductKey.c_str(), &hKey ) )
     {
         if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("INSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
@@ -410,7 +410,7 @@ extern "C" UINT __stdcall RemoveExtensions(MSIHANDLE handle)
     // Removing complete directory "Basis\presets\bundled"
 
     std::_tstring sCacheDir = sInstDir + TEXT("share\\prereg\\bundled");
-
+    
     bool fSuccess = RemoveCompleteDirectory( sCacheDir );
 
 //     if ( fSuccess )
diff --git a/setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx b/setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx
index f9dfc5cb99bc..616eeff7b7dc 100644
--- a/setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 #ifdef UNICODE
 #define _UNICODE
-#define _tstring    wstring
+#define _tstring	wstring
 #else
-#define _tstring    string
+#define _tstring	string
 #endif
 #include <tchar.h>
 #include <string>
diff --git a/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx b/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
index c26b0ca0d0c2..502db5e97d49 100644
--- a/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
  ************************************************************************/
 
 /*
-    Windows shell extensions need to be approved in order to be used by the
+    Windows shell extensions need to be approved in order to be used by the 
     Windows shell for clarification read the following section from the
     Microsoft Developers Network Library (MSDN) see
     http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/platform/shell/programmersguide/shell_int/shell_int_extending/extensionhandlers/shell_ext.asp
-
-
+    
+    
     <MSDN>
-    Shell extension handlers run in the Shell process. Because it is a system process,
-    the administrator of a Windows NT system can limit Shell extension handlers to
-    those on an approved list by setting the EnforceShellExtensionSecurity value of the
-    HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Policies\Explorer key to 1
+    Shell extension handlers run in the Shell process. Because it is a system process, 
+    the administrator of a Windows NT system can limit Shell extension handlers to 
+    those on an approved list by setting the EnforceShellExtensionSecurity value of the 
+    HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Policies\Explorer key to 1 
     (one).
-    To place a Shell extension handler on the approved list, create a REG_SZ value whose
-    name is the string form of the handler's GUID under
-    HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved.
-
-    The Shell does not use the value that is assigned to the GUID, but it should be set to
+    To place a Shell extension handler on the approved list, create a REG_SZ value whose 
+    name is the string form of the handler's GUID under 
+    HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved. 
+    
+    The Shell does not use the value that is assigned to the GUID, but it should be set to 
     make inspecting the registry easier.
 
-    Your setup application can add values to the Approved key only if the person installing
-    the application has sufficient privileges. If the attempt to add an extension handler
-    fails, you should inform the user that administrative privileges are required to fully
-    install the application. If the handler is essential to the application, you should fail
-    the setup and notify the user to contact an administrator.
+    Your setup application can add values to the Approved key only if the person installing 
+    the application has sufficient privileges. If the attempt to add an extension handler 
+    fails, you should inform the user that administrative privileges are required to fully 
+    install the application. If the handler is essential to the application, you should fail 
+    the setup and notify the user to contact an administrator. 
 
-    While there is no need to add values to the Approved key on Windows 95 or Windows 98
-    systems, there is no harm in doing so. The system will simply ignore them. However, there
-    is no guarantee that the key will exist on these systems. Your setup program must be able
+    While there is no need to add values to the Approved key on Windows 95 or Windows 98 
+    systems, there is no harm in doing so. The system will simply ignore them. However, there 
+    is no guarantee that the key will exist on these systems. Your setup program must be able 
     to handle this case.
     </MSDN>
-
+    
     We add the following entries to the respective registry key
     "{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"="OpenOffice.org Column Handler"
     "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"="OpenOffice.org Infotip Handler"
     "{63542C48-9552-494A-84F7-73AA6A7C99C1}"="OpenOffice.org Property Sheet Handler"
     "{3B092F0C-7696-40E3-A80F-68D74DA84210}"="OpenOffice.org Thumbnail Viewer"
-
-    These shell extensions are implemented in the 'shell' project. We ignore registration
+    
+    These shell extensions are implemented in the 'shell' project. We ignore registration 
     failures because of insufficient privileges. The reason is: On systems which restrict the
     use of shell extensions by applying the aforementioned policy probably only people with
     sufficient privileges are allowed to install applications anyway. On systems where the
-    use of shell extensions is not restricted registration failures because of insufficient
-    prviliges have no negative effect because the shell extensions will work anyhow.
+    use of shell extensions is not restricted registration failures because of insufficient 
+    prviliges have no negative effect because the shell extensions will work anyhow. 
 */
-
+ 
 #ifdef _MSC_VER
 #pragma warning(push, 1) /* disable warnings within system headers */
 #endif
@@ -116,7 +116,7 @@ BOOL GetMsiProp( MSIHANDLE hMSI, const char* pPropName, char** ppValue )
     }
 
     return FALSE;
-}
+} 
 
 bool IsVersionNT64( MSIHANDLE hMSI )
 {
@@ -149,48 +149,48 @@ extern "C" UINT __stdcall InstallExecSequenceEntry(MSIHANDLE hMSI)
 // Also defined in setup_native\source\win32\customactions\reg64\reg64.cxx,source\win32\customactions\shellextensions\shellextensions.cxx and
 // extensions\source\activex\main\so_activex.cpp
 #ifndef KEY_WOW64_64KEY
-    #define KEY_WOW64_64KEY (0x0100)
+    #define KEY_WOW64_64KEY	(0x0100)
 #endif
 
     if (IsVersionNT64(hMSI))
     {
         // Open Windows 64 Bit Registry
         if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved"),0, KEY_WRITE | KEY_WOW64_64KEY, &hKey) == ERROR_SUCCESS)
-        {
-            RegSetValueEx(hKey, ColumnHandler.Key, 0, REG_SZ, reinterpret_cast<const BYTE*>(ColumnHandler.Value), _tcslen(ColumnHandler.Value) + 1);
-            RegSetValueEx(hKey, InfotipHandler.Key, 0, REG_SZ, reinterpret_cast<const BYTE*>(InfotipHandler.Value), _tcslen(InfotipHandler.Value) + 1);
-            RegSetValueEx(hKey, PropHandler.Key, 0, REG_SZ, reinterpret_cast<const BYTE*>(PropHandler.Value), _tcslen(PropHandler.Value) + 1);
-            RegSetValueEx(hKey, ThumbViewer.Key, 0, REG_SZ, reinterpret_cast<const BYTE*>(ThumbViewer.Value), _tcslen(ThumbViewer.Value) + 1);
-
+        {            
+            RegSetValueEx(hKey, ColumnHandler.Key, 0, REG_SZ, reinterpret_cast<const BYTE*>(ColumnHandler.Value), _tcslen(ColumnHandler.Value) + 1);        
+            RegSetValueEx(hKey, InfotipHandler.Key, 0, REG_SZ, reinterpret_cast<const BYTE*>(InfotipHandler.Value), _tcslen(InfotipHandler.Value) + 1);            
+            RegSetValueEx(hKey, PropHandler.Key, 0, REG_SZ, reinterpret_cast<const BYTE*>(PropHandler.Value), _tcslen(PropHandler.Value) + 1);    
+            RegSetValueEx(hKey, ThumbViewer.Key, 0, REG_SZ, reinterpret_cast<const BYTE*>(ThumbViewer.Value), _tcslen(ThumbViewer.Value) + 1);    
+        
             RegCloseKey(hKey);
-        }
+        }         
 
         // Open Windows 32 Bit Registry on Win64 maschine
 
         if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved"),0, KEY_WRITE, &hKey ) == ERROR_SUCCESS)
-        {
-            RegSetValueEx(hKey, ColumnHandler.Key, 0, REG_SZ, reinterpret_cast<const BYTE*>(ColumnHandler.Value), _tcslen(ColumnHandler.Value) + 1);
-            RegSetValueEx(hKey, InfotipHandler.Key, 0, REG_SZ, reinterpret_cast<const BYTE*>(InfotipHandler.Value), _tcslen(InfotipHandler.Value) + 1);
-            RegSetValueEx(hKey, PropHandler.Key, 0, REG_SZ, reinterpret_cast<const BYTE*>(PropHandler.Value), _tcslen(PropHandler.Value) + 1);
-            RegSetValueEx(hKey, ThumbViewer.Key, 0, REG_SZ, reinterpret_cast<const BYTE*>(ThumbViewer.Value), _tcslen(ThumbViewer.Value) + 1);
-
+        {            
+            RegSetValueEx(hKey, ColumnHandler.Key, 0, REG_SZ, reinterpret_cast<const BYTE*>(ColumnHandler.Value), _tcslen(ColumnHandler.Value) + 1);        
+            RegSetValueEx(hKey, InfotipHandler.Key, 0, REG_SZ, reinterpret_cast<const BYTE*>(InfotipHandler.Value), _tcslen(InfotipHandler.Value) + 1);            
+            RegSetValueEx(hKey, PropHandler.Key, 0, REG_SZ, reinterpret_cast<const BYTE*>(PropHandler.Value), _tcslen(PropHandler.Value) + 1);    
+            RegSetValueEx(hKey, ThumbViewer.Key, 0, REG_SZ, reinterpret_cast<const BYTE*>(ThumbViewer.Value), _tcslen(ThumbViewer.Value) + 1);    
+        
             RegCloseKey(hKey);
-        }
+        }         
 
 
     } else
     {
         if (RegOpenKey(HKEY_LOCAL_MACHINE, TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved"), &hKey) == ERROR_SUCCESS)
-        {
-            RegSetValueEx(hKey, ColumnHandler.Key, 0, REG_SZ, reinterpret_cast<const BYTE*>(ColumnHandler.Value), _tcslen(ColumnHandler.Value) + 1);
-            RegSetValueEx(hKey, InfotipHandler.Key, 0, REG_SZ, reinterpret_cast<const BYTE*>(InfotipHandler.Value), _tcslen(InfotipHandler.Value) + 1);
-            RegSetValueEx(hKey, PropHandler.Key, 0, REG_SZ, reinterpret_cast<const BYTE*>(PropHandler.Value), _tcslen(PropHandler.Value) + 1);
-            RegSetValueEx(hKey, ThumbViewer.Key, 0, REG_SZ, reinterpret_cast<const BYTE*>(ThumbViewer.Value), _tcslen(ThumbViewer.Value) + 1);
-
+        {            
+            RegSetValueEx(hKey, ColumnHandler.Key, 0, REG_SZ, reinterpret_cast<const BYTE*>(ColumnHandler.Value), _tcslen(ColumnHandler.Value) + 1);        
+            RegSetValueEx(hKey, InfotipHandler.Key, 0, REG_SZ, reinterpret_cast<const BYTE*>(InfotipHandler.Value), _tcslen(InfotipHandler.Value) + 1);            
+            RegSetValueEx(hKey, PropHandler.Key, 0, REG_SZ, reinterpret_cast<const BYTE*>(PropHandler.Value), _tcslen(PropHandler.Value) + 1);    
+            RegSetValueEx(hKey, ThumbViewer.Key, 0, REG_SZ, reinterpret_cast<const BYTE*>(ThumbViewer.Value), _tcslen(ThumbViewer.Value) + 1);    
+        
             RegCloseKey(hKey);
-        }
+        }         
     }
-    return ERROR_SUCCESS;
+    return ERROR_SUCCESS;    
 }
 
 /*
@@ -207,7 +207,7 @@ extern "C" UINT __stdcall DeinstallExecSequenceEntry(MSIHANDLE)
         RegDeleteValue(hKey, InfotipHandler.Key);
         RegDeleteValue(hKey, PropHandler.Key);
         RegDeleteValue(hKey, ThumbViewer.Key);
-
+        
         RegCloseKey(hKey);
     }
     return ERROR_SUCCESS;
diff --git a/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx b/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx
index 9c5e6d4eb416..c7bffcdbaf59 100644
--- a/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 #ifdef UNICODE
 #define _UNICODE
-#define _tstring    wstring
+#define _tstring	wstring
 #else
-#define _tstring    string
+#define _tstring	string
 #endif
 #include <tchar.h>
 #include <string>
@@ -52,9 +52,9 @@
 
 std::_tstring GetMsiProperty( MSIHANDLE handle, const std::_tstring& sProperty )
 {
-    std::_tstring   result;
-    TCHAR   szDummy[1] = TEXT("");
-    DWORD   nChars = 0;
+    std::_tstring	result;
+    TCHAR	szDummy[1] = TEXT("");
+    DWORD	nChars = 0;
 
     if ( MsiGetProperty( handle, sProperty.c_str(), szDummy, &nChars ) == ERROR_MORE_DATA )
     {
@@ -62,10 +62,10 @@ std::_tstring GetMsiProperty( MSIHANDLE handle, const std::_tstring& sProperty )
         LPTSTR buffer = reinterpret_cast<LPTSTR>(_alloca(nBytes));
         ZeroMemory( buffer, nBytes );
         MsiGetProperty(handle, sProperty.c_str(), buffer, &nChars);
-        result = buffer;
+        result = buffer;            
     }
 
-    return  result;
+    return	result;
 }
 
 /*
@@ -74,28 +74,28 @@ std::_tstring GetMsiProperty( MSIHANDLE handle, const std::_tstring& sProperty )
 */
 extern "C" UINT __stdcall InstallStartmenuFolderIcon( MSIHANDLE handle )
 {
-    std::_tstring   sOfficeMenuFolder = GetMsiProperty( handle, TEXT("OfficeMenuFolder") );
+    std::_tstring	sOfficeMenuFolder = GetMsiProperty( handle, TEXT("OfficeMenuFolder") );
     std::_tstring sDesktopFile = sOfficeMenuFolder + TEXT("Desktop.ini");
-
+    
     //    MessageBox(NULL, sDesktopFile.c_str(), TEXT("OfficeMenuFolder"), MB_OK | MB_ICONINFORMATION);
-
-    std::_tstring   sIconFile = GetMsiProperty( handle, TEXT("INSTALLLOCATION") ) + TEXT("program\\soffice.exe");
-
-    OSVERSIONINFO   osverinfo;
+    
+    std::_tstring	sIconFile = GetMsiProperty( handle, TEXT("INSTALLLOCATION") ) + TEXT("program\\soffice.exe");
+    
+    OSVERSIONINFO	osverinfo;
     osverinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
     GetVersionEx( &osverinfo );
-
+    
     if (osverinfo.dwMajorVersion < 6 /* && osverinfo.dwMinorVersion  */ )
     {
         // This icon (18) is a Windows folder until XP Version (number is 0 based)
-        WritePrivateProfileString(
+        WritePrivateProfileString( 
             TEXT(".ShellClassInfo"),
             TEXT("IconFile"),
             sIconFile.c_str(),
             sDesktopFile.c_str() );
-
+        
         // FYI: in tool 'ResHack' this icon can be found on position '19' (number is 1 based)
-        WritePrivateProfileString(
+        WritePrivateProfileString( 
             TEXT(".ShellClassInfo"),
             TEXT("IconIndex"),
             TEXT("18"),
@@ -106,32 +106,32 @@ extern "C" UINT __stdcall InstallStartmenuFolderIcon( MSIHANDLE handle )
     //     // at the moment there exists no Vista Icon, so we use the default folder icon.
     //     // add the icon into desktop/util/verinfo.rc
     // }
-
+    
     // The value '0' is to avoid a message like "You Are Deleting a System Folder" warning when deleting or moving the folder.
-    WritePrivateProfileString(
+    WritePrivateProfileString( 
         TEXT(".ShellClassInfo"),
         TEXT("ConfirmFileOp"),
         TEXT("0"),
         sDesktopFile.c_str() );
-
+    
     /*
-      WritePrivateProfileString(
+      WritePrivateProfileString( 
       TEXT(".ShellClassInfo"),
       TEXT("InfoTip"),
       TEXT("StarOffice Productivity Suite"),
       sDesktopFile.c_str() );
     */
-
+    
     SetFileAttributes( sDesktopFile.c_str(), FILE_ATTRIBUTE_HIDDEN );
     SetFileAttributes( sOfficeMenuFolder.c_str(), FILE_ATTRIBUTE_SYSTEM );
-
-
-    return ERROR_SUCCESS;
+    
+    
+    return ERROR_SUCCESS;    
 }
 
 extern "C" UINT __stdcall DeinstallStartmenuFolderIcon(MSIHANDLE handle)
 {
-    std::_tstring   sOfficeMenuFolder = GetMsiProperty( handle, TEXT("OfficeMenuFolder") );
+    std::_tstring	sOfficeMenuFolder = GetMsiProperty( handle, TEXT("OfficeMenuFolder") );
     std::_tstring sDesktopFile = sOfficeMenuFolder + TEXT("Desktop.ini");
 
     SetFileAttributes( sDesktopFile.c_str(), FILE_ATTRIBUTE_NORMAL );
diff --git a/setup_native/source/win32/customactions/shellextensions/upgrade.cxx b/setup_native/source/win32/customactions/shellextensions/upgrade.cxx
index 6280bfb5b2e5..2efd60ad868a 100644
--- a/setup_native/source/win32/customactions/shellextensions/upgrade.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/upgrade.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,82 +49,82 @@
 
 using namespace std;
 
-namespace
+namespace 
 {
     // The provided GUID must be without surounding '{}'
     string GetGuidPart(const string& guid, int index)
     {
-        assert((guid.length() == 36) && "No GUID or wrong format!");
+        assert((guid.length() == 36) && "No GUID or wrong format!"); 
         assert(((index > -1) && (index < 5)) && "Out of range!");
-
+        
         if (index == 0) return string(guid.c_str(), 8);
         if (index == 1) return string(guid.c_str() + 9, 4);
         if (index == 2) return string(guid.c_str() + 14, 4);
         if (index == 3) return string(guid.c_str() + 19, 4);
         if (index == 4) return string(guid.c_str() + 24, 12);
-
+        
         return string();
     }
-
+    
     void Swap(char* p1, char* p2)
     {
         char tmp = *p1;
         *p1 = *p2;
         *p2 = tmp;
     }
-
+    
     string Invert(const string& str)
     {
         char* buff = reinterpret_cast<char*>(_alloca(str.length()));
         strncpy(buff, str.c_str(), str.length());
-
+        
         char* front = buff;
         char* back = buff + str.length() - 1;
-
-        while (front < back)
-            Swap(front++, back--);
-
-        return string(buff, str.length());
+        
+        while (front < back)        
+            Swap(front++, back--);        
+        
+        return string(buff, str.length());            
     }
-
+    
     // Convert the upgrade code (which is a GUID) according
     // to the way the windows installer does when writing it
     // to the registry
-    // The first 8 bytes will be inverted, from the the last
+    // The first 8 bytes will be inverted, from the the last 
     // 8 bytes always the nibbles will be inverted for further
-    // details look in the MSDN under compressed registry keys
+    // details look in the MSDN under compressed registry keys 
     string ConvertGuid(const string& guid)
     {
         string convertedGuid;
-
+        
         string part = GetGuidPart(guid, 0);
         convertedGuid = Invert(part);
-
+        
         part = GetGuidPart(guid, 1);
         convertedGuid += Invert(part);
-
+        
         part = GetGuidPart(guid, 2);
         convertedGuid += Invert(part);
-
+        
         part = GetGuidPart(guid, 3);
         convertedGuid += Invert(string(part.c_str(), 2));
         convertedGuid += Invert(string(part.c_str() + 2, 2));
-
-        part = GetGuidPart(guid, 4);
+        
+        part = GetGuidPart(guid, 4);        
         int pos = 0;
         for (int i = 0; i < 6; i++)
         {
             convertedGuid += Invert(string(part.c_str() + pos, 2));
-            pos += 2;
+            pos += 2;        
         }
         return convertedGuid;
     }
-
+    
     string GetMsiProperty(MSIHANDLE handle, const string& sProperty)
     {
-        string  result;
-        TCHAR   szDummy[1] = TEXT("");
-        DWORD   nChars = 0;
+        string	result;
+        TCHAR	szDummy[1] = TEXT("");
+        DWORD	nChars = 0;
 
         if (MsiGetProperty(handle, sProperty.c_str(), szDummy, &nChars) == ERROR_MORE_DATA)
         {
@@ -132,13 +132,13 @@ namespace
             LPTSTR buffer = reinterpret_cast<LPTSTR>(_alloca(nBytes));
             ZeroMemory( buffer, nBytes );
             MsiGetProperty(handle, sProperty.c_str(), buffer, &nChars);
-            result = buffer;
+            result = buffer;            
         }
-        return  result;
+        return	result;
     }
 
     inline bool IsSetMsiProperty(MSIHANDLE handle, const string& sProperty)
-    {
+    {    
         return (GetMsiProperty(handle, sProperty).length() > 0);
     }
 
@@ -157,51 +157,51 @@ namespace
     {
         HKEY hKey;
         if (RegOpenKey(hRootKey, regKey.c_str(), &hKey) == ERROR_SUCCESS)
-        {
+        {   
             DWORD nSubKeys;
             DWORD lLongestSubKey;
-
+        
             if (RegQueryInfoKey(
                 hKey, NULL, NULL, NULL, &nSubKeys, &lLongestSubKey, NULL, NULL, NULL, NULL, NULL, NULL) == ERROR_SUCCESS)
             {
                 LPTSTR buffer = reinterpret_cast<LPTSTR>(_alloca(lLongestSubKey + 1));
-
+            
                 for (DWORD i = 0; i < nSubKeys; i++)
-                {
-                    LONG ret = RegEnumKey(hKey, i, buffer, lLongestSubKey + 1);
-                    if ((ret == ERROR_SUCCESS) && (buffer == upgradeKey))
+                {                        
+                    LONG ret = RegEnumKey(hKey, i, buffer, lLongestSubKey + 1);                    
+                    if ((ret == ERROR_SUCCESS) && (buffer == upgradeKey))     
                         return true;
                 }
             }
         }
         return false;
     }
-} // namespace
+} // namespace 
 
 extern "C" UINT __stdcall SetProductInstallMode(MSIHANDLE handle)
 {
-    string upgradeCode = GetMsiProperty(handle, TEXT("UpgradeCode"));
+    string upgradeCode = GetMsiProperty(handle, TEXT("UpgradeCode"));                
     upgradeCode = ConvertGuid(string(upgradeCode.c_str() + 1, upgradeCode.length() - 2));
-
-    //MessageBox(NULL, upgradeCode.c_str(), TEXT("Debug"), MB_OK);
-
+    
+    //MessageBox(NULL, upgradeCode.c_str(), TEXT("Debug"), MB_OK);            
+    
     if (RegistryKeyHasUpgradeSubKey(
-        HKEY_CURRENT_USER,
+        HKEY_CURRENT_USER, 
         TEXT("Software\\Microsoft\\Installer\\UpgradeCodes"),
         upgradeCode) && IsSetMsiProperty(handle, TEXT("ALLUSERS")))
-    {
+    {        
         UnsetMsiProperty(handle, TEXT("ALLUSERS"));
         //MessageBox(NULL, "ALLUSERS removed", "DEBUG", MB_OK);
     }
     else if (RegistryKeyHasUpgradeSubKey(
-             HKEY_LOCAL_MACHINE,
+             HKEY_LOCAL_MACHINE, 
              TEXT("Software\\Classes\\Installer\\UpgradeCodes"),
              upgradeCode) && !IsSetMsiProperty(handle, TEXT("ALLUSERS")))
     {
         SetMsiProperty(handle, TEXT("ALLUSERS"));
         //MessageBox(NULL, "ALLUSERS set", "DEBUG", MB_OK);
-    }
-    return ERROR_SUCCESS;
+    }   
+    return ERROR_SUCCESS;     
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
index badd20ae241e..3c8e3483ec30 100644
--- a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 #ifdef UNICODE
 #define _UNICODE
-#define _tstring    wstring
+#define _tstring	wstring
 #else
-#define _tstring    string
+#define _tstring	string
 #endif
 #include <tchar.h>
 #include <string>
@@ -116,7 +116,7 @@ static BOOL RemoveCompleteDirectory( std::_tstring sPath )
 
             mystr = "Current short file: " + sFileName;
             // MessageBox(NULL, mystr.c_str(), "Current Content", MB_OK);
-
+        
             if (( strcmp(sFileName.c_str(),sCurrentDir.c_str()) != 0 ) &&
                 ( strcmp(sFileName.c_str(),sParentDir.c_str()) != 0 ))
             {
@@ -176,7 +176,7 @@ static BOOL RemoveCompleteDirectory( std::_tstring sPath )
             bDirectoryRemoved = false;
         }
     }
-
+    
     return bDirectoryRemoved;
 }
 
@@ -221,7 +221,7 @@ extern "C" UINT __stdcall RemovePrgFolder( MSIHANDLE handle )
     std::_tstring sRemoveDir = sOfficeInstallPath + TEXT("program_old");
 
 //    MessageBox(NULL, sRemoveDir.c_str(), "REMOVING OLD DIR", MB_OK);
-
+    
     bool bSuccess = RemoveCompleteDirectory( sRemoveDir );
 
     TCHAR sAppend[2] = TEXT("0");
diff --git a/setup_native/source/win32/customactions/tools/checkversion.cxx b/setup_native/source/win32/customactions/tools/checkversion.cxx
index b978301fb57a..044a00533c87 100644
--- a/setup_native/source/win32/customactions/tools/checkversion.cxx
+++ b/setup_native/source/win32/customactions/tools/checkversion.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/setup_native/source/win32/customactions/tools/seterror.cxx b/setup_native/source/win32/customactions/tools/seterror.cxx
index c9c74ec43d18..0927283be28a 100644
--- a/setup_native/source/win32/customactions/tools/seterror.cxx
+++ b/setup_native/source/win32/customactions/tools/seterror.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/setup_native/source/win32/customactions/tools/seterror.hxx b/setup_native/source/win32/customactions/tools/seterror.hxx
index 3a2a1b047d9f..abc76cac8151 100644
--- a/setup_native/source/win32/customactions/tools/seterror.hxx
+++ b/setup_native/source/win32/customactions/tools/seterror.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/setup_native/source/win32/stwrapper/stwrapper.cxx b/setup_native/source/win32/stwrapper/stwrapper.cxx
index b4e22cf7afca..210b5fb82c4f 100644
--- a/setup_native/source/win32/stwrapper/stwrapper.cxx
+++ b/setup_native/source/win32/stwrapper/stwrapper.cxx
@@ -32,8 +32,8 @@ static const TCHAR g_szSTExecutable[256]            = TEXT("stclient.exe");
 
 LONG RegReadValue( HKEY hBaseKey, LPCTSTR lpSubKey, LPCTSTR lpValueName, LPVOID lpData, DWORD cbData )
 {
-    HKEY    hKey = NULL;
-    LONG    lResult( 0 );
+    HKEY	hKey = NULL;
+    LONG	lResult( 0 );
 
     lResult = RegOpenKeyEx( hBaseKey, lpSubKey, 0, KEY_QUERY_VALUE, &hKey );
 
@@ -74,7 +74,7 @@ static bool IsSupportedPlatform()
         {
             case VER_PLATFORM_WIN32_NT:     // Windows NT based
                 return true;
-
+        
             case VER_PLATFORM_WIN32_WINDOWS: // Windows Me/98/95.
             case VER_PLATFORM_WIN32s:        // Win32s
                 return false;
@@ -181,16 +181,16 @@ static bool GetProgramFilesFolder( LPTSTR strPath )
     if (( hLibrary = LoadLibrary( "shell32.dll" )) != NULL )
     {
         BOOL (WINAPI *pSHGetSpecialFolderPathA)( HWND, LPSTR, int, BOOL );
-
+        
         pSHGetSpecialFolderPathA = (BOOL (WINAPI *)(HWND, LPSTR, int, BOOL))GetProcAddress( hLibrary, "SHGetSpecialFolderPathA" );
-
+        
         if ( pSHGetSpecialFolderPathA )
         {
             if ( pSHGetSpecialFolderPathA( NULL, strPath, CSIDL_PROGRAM_FILES, TRUE ))
                 bRet = true;
         }
     }
-
+    
     FreeLibrary( hLibrary );
 
     return ( bRet );
@@ -202,7 +202,7 @@ static PathResult RetrieveExecutablePath( LPTSTR szExecutablePath )
 {
     PathResult eRet = PATHRESULT_API_NOT_SUPPORTED;
     TCHAR szProgramFilesFolder[MAX_PATH];
-
+    
     if ( GetProgramFilesFolder( szProgramFilesFolder ))
     {
         size_t nLen = _tcslen( szProgramFilesFolder );
@@ -236,19 +236,19 @@ int WINAPI _tWinMain( HINSTANCE /*hInstance*/, HINSTANCE, LPTSTR, int )
 {
     const DWORD ERR_NO_RECORDS_FOUND = 225;
     const DWORD ERR_DUP_RECORD       = 226;
-
+    
     DWORD dwExitCode = (DWORD)1;
 
     int     nArgs  = 0;
     LPTSTR* lpArgs = GetCommandArgs( &nArgs );
-
+    
     if ( !IsSupportedPlatform() )
     {
         // Return 0 for a successful run on not supported platforms
         // We don't want that the Office tries to start us forever.
-        return 0;
+        return 0; 
     }
-
+    
     if ( nArgs >= 11 )
     {
         TCHAR szTargetURN[1024]         = {0};
@@ -260,11 +260,11 @@ int WINAPI _tWinMain( HINSTANCE /*hInstance*/, HINSTANCE, LPTSTR, int )
 
 //      -i)  INSTANCE_URN="$2"; shift;;
 //      -t)  TARGET_URN="$2"; shift;;
-//      -p)  PRODUCT_NAME="$2"; shift;;
-//      -e)  PRODUCT_VERSION="$2"; shift;;
-//      -P)  PARENT_PRODUCT_NAME="$2"; shift;;
-//      -S)  PRODUCT_SOURCE="$2"; shift;;
-//      "usage: $0 [-i <instance urn>] -p <product name> -e <product version> -t <urn> -S <source> -P <parent product name>"
+//	    -p)  PRODUCT_NAME="$2"; shift;;
+//	    -e)  PRODUCT_VERSION="$2"; shift;;
+//	    -P)  PARENT_PRODUCT_NAME="$2"; shift;;
+//	    -S)  PRODUCT_SOURCE="$2"; shift;;
+//	    "usage: $0 [-i <instance urn>] -p <product name> -e <product version> -t <urn> -S <source> -P <parent product name>"
 
         int i = 1;
         while ( i < nArgs )
@@ -283,10 +283,10 @@ int WINAPI _tWinMain( HINSTANCE /*hInstance*/, HINSTANCE, LPTSTR, int )
                             SafeCopy( szInstanceURN, lpArgs[i], SAL_N_ELEMENTS( szInstanceURN ));
                             break;
                         }
-
+                    
                         case 't':
                         {
-                            if ( i < nArgs )
+                            if ( i < nArgs ) 
                                 ++i;
                             SafeCopy( szTargetURN, lpArgs[i], SAL_N_ELEMENTS( szTargetURN ));
                             break;
@@ -325,7 +325,7 @@ int WINAPI _tWinMain( HINSTANCE /*hInstance*/, HINSTANCE, LPTSTR, int )
                     } // switch
                 }
             }
-
+            
             ++i;
         }
 
@@ -333,15 +333,15 @@ int WINAPI _tWinMain( HINSTANCE /*hInstance*/, HINSTANCE, LPTSTR, int )
         {
             BOOL bSuccess = TRUE;
             BOOL bProcessStarted = FALSE;
-
+            
             STARTUPINFO         aStartupInfo;
-            PROCESS_INFORMATION aProcessInfo;
+            PROCESS_INFORMATION	aProcessInfo;
             LPTSTR              lpCommandLine = 0;
-
+            
             ZeroMemory( &aStartupInfo, sizeof( aStartupInfo ));
             aStartupInfo.cb = sizeof( aStartupInfo );
             ZeroMemory( &aProcessInfo, sizeof( aProcessInfo ));
-
+            
             if ( _tcslen( szInstanceURN ) == 0 )
             {
                 // TEST=`${STCLIENT} -f -t ${TARGET_URN}`
@@ -367,12 +367,12 @@ int WINAPI _tWinMain( HINSTANCE /*hInstance*/, HINSTANCE, LPTSTR, int )
                                    NULL,
                                    &aStartupInfo,
                                    &aProcessInfo );
-
+                
                 bProcessStarted = TRUE;
-
+                
                 // wait until process ends to receive exit code
                 WaitForSingleObject( aProcessInfo.hProcess, INFINITE );
-
+                
                 delete []lpCommandLine;
             }
 
@@ -430,11 +430,11 @@ int WINAPI _tWinMain( HINSTANCE /*hInstance*/, HINSTANCE, LPTSTR, int )
                     _tcscat( lpCommandLine, GetOperatingSystemString() );
                     _tcscat( lpCommandLine, TEXT( "\"" ));
                     _tcscat( lpCommandLine, TEXT( " -z global" ));
-
+                    
                     ZeroMemory( &aStartupInfo, sizeof( aStartupInfo ));
                     aStartupInfo.cb = sizeof(aStartupInfo);
                     ZeroMemory( &aProcessInfo, sizeof( aProcessInfo ));
-
+                    
                     bSuccess = CreateProcess(
                                        NULL,
                                        lpCommandLine,
@@ -446,19 +446,19 @@ int WINAPI _tWinMain( HINSTANCE /*hInstance*/, HINSTANCE, LPTSTR, int )
                                        NULL,
                                        &aStartupInfo,
                                        &aProcessInfo );
-
+                    
                     delete []lpCommandLine;
-
+                    
                     // wait until process ends to receive exit code
                     WaitForSingleObject( aProcessInfo.hProcess, INFINITE );
-
+                    
                     dwSTClientExitCode = 0;
                     GetExitCodeProcess( aProcessInfo.hProcess, &dwSTClientExitCode );
                     dwSTClientExitCode &= 0x000000ff;
 
                     CloseHandle( aProcessInfo.hProcess );
                     CloseHandle( aProcessInfo.hThread );
-
+                    
                     if ( !bSuccess )
                         dwExitCode = 1; // couldn't start stclient process
                     else
@@ -490,7 +490,7 @@ int WINAPI _tWinMain( HINSTANCE /*hInstance*/, HINSTANCE, LPTSTR, int )
     }
     else
         dwExitCode = 0; // wrong number of arguments
-
+    
     return dwExitCode;
 }
 
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java b/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java
index 422f4c8134f9..c754c200d88d 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java
+++ b/wizards/com/sun/star/wizards/agenda/AgendaTemplate.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
@@ -65,13 +65,13 @@ import com.sun.star.wizards.ui.UnoDialog2;
 import com.sun.star.wizards.ui.event.DataAware;
 
 /**
- *
- * The classes here implement the whole document-functionality of the agenda wizard:
+ * 
+ * The classes here implement the whole document-functionality of the agenda wizard: 
  * the live-preview and the final "creation" of the document, when the user clicks "finish". <br/>
  * <br/>
  * <h2>Some terminology:<h2/>
  * items are names or headings. we don't make any distinction.
- *
+ * 
  * <br/>
  * The Agenda Template is used as general "controller" of the whole document, whereas the
  * two child-classes ItemsTable and TopicsTable control the item tables (note plural!) and the
@@ -105,7 +105,7 @@ import com.sun.star.wizards.ui.event.DataAware;
  * Many methods here are synchronized, in order to avoid colission made by
  * events fired too often.
  * @author rpiterman
- *
+ *  
  */
 public class AgendaTemplate extends TextDocument implements TemplateConsts, DataAware.Listener
 {
@@ -132,10 +132,10 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data
      * The template-filename of the current template.
      * Since we often re-link section and the break the link,
      * inorder to restore them, we need a template to link to.
-     * This is practically an identicall copy of the current template.
+     * This is practically an identicall copy of the current template. 
      */
     String template;
-    /**
+    /** 
      * used for common operations on sections.
      */
     TextSectionHandler textSectionHandler;
@@ -144,8 +144,8 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data
      */
     XComponentLoader xComponentLoader;
     /**
-     * an array containing all ItemTable object (which control each an Items
-     * Table in the document.
+     * an array containing all ItemTable object (which control each an Items 
+     * Table in the document. 
      */
     ItemsTable[] itemsTables;
     /**
@@ -167,8 +167,8 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data
      * A temporary variable used to list all items and map them.
      */
     List _allItems = new Vector();
-    /**
-     * keep a reference on some static items in the document,
+    /** 
+     * keep a reference on some static items in the document, 
      * so when their content is changed (through the user), we
      * can just reference them and set their text.
      */
@@ -364,7 +364,7 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data
     }
 
     /**
-     * itemsCache is a Map containing all agenda item. These are object which
+     * itemsCache is a Map containing all agenda item. These are object which 
      * "write themselfs" to the table, given a table cursor.
      * A cache is used in order to reuse the objects, instead of recreate them.
      * This method fills the cache will all items objects (names and headings).
@@ -714,7 +714,7 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data
         textSectionHandler.removeAllTextSections();
     }
 
-    /**
+    /** 
      * hidden sections exist when an item's section is hidden because the
      * user specified not to display any items which it contains.
      * When finishing the wizard removes this sections entireley from the document.
@@ -744,9 +744,9 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data
 
     /**
      * create the minutes for the given topics or remove the minutes section from the document.
-     * If no topics are supplied, or the user
-     * specified not to create minuts, the minutes section will be removed,
-     * @param topicsData supplies PropertyValue arrays containing the values for the topics.
+     * If no topics are supplied, or the user 
+     * specified not to create minuts, the minutes section will be removed, 
+     * @param topicsData supplies PropertyValue arrays containing the values for the topics. 
      */
     public synchronized void createMinutes(List topicsData)
     {
@@ -815,7 +815,7 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data
                  * now add minutes for each topic.
                  * The template contains *one* minutes section, so
                  * we first use the one available, and then add a new one...
-                 *
+                 * 
                  * topics data has *always* an empty topic at the end...
                  */
                 for (int i = 0; i < topicsData.size() - 1; i++)
@@ -1028,9 +1028,9 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data
                 /* now go through all items that belong to this
                  * table. Check each one agains the model. If it should
                  * be display, call it's write method.
-                 * All items are of type AgendaItem which means they write
+                 * All items are of type AgendaItem which means they write 
                  * two cells to the table: a title (text) and a placeholder.
-                 * see AgendaItem class below.
+                 * see AgendaItem class below. 
                  */
                 for (int i = 0; i < items.size(); i++)
                 {
@@ -1086,7 +1086,7 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data
                 int rowIndex = getRowIndex(cursor);
                 int rowsCount = getRowCount((XTextTable) UnoRuntime.queryInterface(XTextTable.class, table));
 
-                /* now before deleteing i move the cursor up so it
+                /* now before deleteing i move the cursor up so it 
                  * does not disappear, because it will crash office.
                  */
                 cursor.gotoStart(false);
@@ -1109,7 +1109,7 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data
     /**
      * This class handles the preview of the topics table.
      * You can call it the controller of the topics table.
-     * It differs from ItemsTable in that it has no data model -
+     * It differs from ItemsTable in that it has no data model - 
      * the update is done programttically.<br/>
      * <br/>
      * The decision to make this class a class by its own
@@ -1117,7 +1117,7 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data
      * since there is anyway only one instance of this class at runtime
      * it could have also be implemented in the AgendaTemplate class
      * but for clarity and separation I decided to make a sub class for it.
-     *
+     * 
      * @author rp143992
      */
     public class Topics
@@ -1147,7 +1147,7 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data
         List topicCells = new Vector();
         int rowsPerTopic;
         /**
-         * fields which hold the number of the
+         * fields which hold the number of the 
          * fillins in the cells vectors.
          */
         int numCell = -1;
@@ -1167,7 +1167,7 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data
         /**
          * Analyze the structure of the Topics table.
          * The structure Must be as follows:<br>
-         * -One Header Row. <br>
+         * -One Header Row. <br> 
          * -arbitrary number of rows per topic <br>
          * -arbitrary content in the topics row <br>
          * -only soft formatting will be restored. <br>
@@ -1225,7 +1225,7 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data
             }
 
             /*
-             * in the topics table, there are always one
+             * in the topics table, there are always one 
              * title row and three topics defined.
              * So no mutter how many rows a topic takes - we
              * can restore its structure and format.
@@ -1276,7 +1276,7 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data
 
 
 
-            /* now that we know how the topics look like,
+            /* now that we know how the topics look like, 
              * we get the format of the first and last rows.
              */
 
@@ -1352,8 +1352,8 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data
         /**
          * check if the topic with the given index is written to the table.
          * @param topic the topic number (0 base)
-         * @return true if the topic is already written to the table. False if not.
-         * (false would mean new rows must be added to the table in order to
+         * @return true if the topic is already written to the table. False if not. 
+         * (false would mean new rows must be added to the table in order to 
          * be able to write this topic).
          */
         private boolean isWritten(int topic)
@@ -1363,11 +1363,11 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data
 
         /**
          * rewrites a single cell containing.
-         * This is used in order to refresh the topic/responsible/duration data in the
+         * This is used in order to refresh the topic/responsible/duration data in the 
          * preview document, in response to a change in the gui (by the user).
          * Since the structure of the topics table is flexible, we don't reference a cell
          * number. Rather, we use "what" argument to specify which cell should be redrawn.
-         * The Topics object, which analyzed the structure of the topics table appon
+         * The Topics object, which analyzed the structure of the topics table appon 
          * initialization, refreshes the approperiate cell.
          * @param topic index of the topic (0 based).
          * @param what 0 for num, 1 for topic, 2 for responsible, 3 for duration
@@ -1425,10 +1425,10 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data
          * writes the given topic.
          * if the first topic was involved, reformat the
          * first row.
-         * If any rows were added to the table, reformat
-         * the last row.
+         * If any rows were added to the table, reformat 
+         * the last row. 
          * @param topic the index of the topic to write.
-         * @param data the topic's data. (see TopicsControl
+         * @param data the topic's data. (see TopicsControl 
          * for explanation about the topics data model)
          * @throws Exception if something goes wrong (though nothing should).
          */
@@ -1480,10 +1480,10 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data
          * number of actuall topics it does *not* add
          * new rows !
          * Note also that the first topic will never be removed.
-         * If the table contains no topics, the whole section will
+         * If the table contains no topics, the whole section will 
          * be removed uppon finishing.
          * The reason for that is a "table-design" one: the first topic is
-         * maintained in order to be able to add rows with a design of this topic,
+         * maintained in order to be able to add rows with a design of this topic, 
          * and not of the header row.
          * @param topics the number of topics the table should contain.
          * @throws Exception
@@ -1530,7 +1530,7 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data
         /**
          * returns a text element for the given cell,
          * which will write the given text.
-         * @param cell the topics cell number.
+         * @param cell the topics cell number. 
          * @param value the value to write.
          * @return a TextElement object which will write the given value
          * to the given cell.
@@ -1553,7 +1553,7 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data
          * formats a series of cells from the given one,
          * using the given List of TableCellFormatter objects,
          * in the given order.
-         * This method is used to format the first (header) and the last
+         * This method is used to format the first (header) and the last 
          * rows of the table.
          * @param cursor a table cursor, pointing to the start cell to format
          * @param formats a List containing TableCellFormatter objects. Each will format one cell in the direction specified.
@@ -1653,7 +1653,7 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data
     }
 
     /**
-     * returns the rows count of this table, assuming
+     * returns the rows count of this table, assuming 
      * there is no vertical merged cells.
      * @param table
      * @return the rows count of the given table.
@@ -1667,11 +1667,11 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data
 
 /*
  * ===========================================================================================
- *
+ * 
  *                  End of AgendaTempalte class
- *
+ *  
  * ===========================================================================================
- *
+ * 
  */
 /*
  * =================================
@@ -1679,7 +1679,7 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data
  * =================================
  */
 /**
- * Interface that is used for writing content to a Uno Text / TextRange
+ * Interface that is used for writing content to a Uno Text / TextRange 
  * @author rp143992
  *
  */
@@ -1696,8 +1696,8 @@ interface AgendaElement
  * =================================
  */
 /**
- * Basic implementation of the AgendaElement interface -
- * writes nothing, but applies a ParaStyle to the given XText/XTextRange
+ * Basic implementation of the AgendaElement interface - 
+ * writes nothing, but applies a ParaStyle to the given XText/XTextRange 
  * @author rp143992
  *
  * TODO To change the template for this generated type comment go to
@@ -1825,7 +1825,7 @@ class PlaceholderTextElement extends TextElement
  *  The PlaceHolder class
  * =================================
  */
-/**
+/** 
  * An Agenda element which writes no text, but inserts a placeholder, and formats
  * it using a ParaStyleName.
  * @author rp143992
@@ -1869,7 +1869,7 @@ class PlaceholderElement extends ParaStyled
  * =================================
  */
 /**
- * An implementation of AgendaElement which
+ * An implementation of AgendaElement which 
  * gets as a parameter a table cursor, and writes
  * a text to the cell marked by this table cursor, and
  * a place holder to the next cell.
@@ -1956,6 +1956,6 @@ class TableCellFormatter
     }
 }
 
-
+    
 
 
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java
index 55119ea28325..9df6bbef9a74 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.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
@@ -24,8 +24,8 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-package com.sun.star.wizards.agenda;
-
+package com.sun.star.wizards.agenda; 
+    
 import com.sun.star.awt.FontDescriptor;
 import com.sun.star.awt.XButton;
 import com.sun.star.awt.XCheckBox;
@@ -40,18 +40,18 @@ import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.wizards.common.Helper;
 import com.sun.star.wizards.ui.UIConsts;
 import com.sun.star.wizards.ui.WizardDialog;
-
+    
 /**
  * This class is generated Automatically....
  * bla bla bla
- */
+ */      
 public abstract class AgendaWizardDialog  extends WizardDialog implements AgendaWizardDialogConst, UIConsts {
       //GUI Components as Class members.
   XFixedText lblTitle1;
   XCheckBox chkMinutes;
   XFixedText lblHelp1;
   XFixedText lblPageDesign;
-  XListBox listPageDesign;
+  XListBox listPageDesign; 
   //Image Control
   XControl imgHelp1;
   XControl imgHelp2;
@@ -89,8 +89,8 @@ public abstract class AgendaWizardDialog  extends WizardDialog implements Agenda
   XFixedText lblDuration;
   //XFixedText lblHelp5;
   XTextComponent txtTemplateName;
-  XRadioButton optCreateAgenda;
-  XRadioButton optMakeChanges;
+  XRadioButton optCreateAgenda; 
+  XRadioButton optMakeChanges; 
   XFixedText lblProceed;
   XFixedText lblTemplateName;
   XFixedText lblTemplatePath;
@@ -103,10 +103,10 @@ public abstract class AgendaWizardDialog  extends WizardDialog implements Agenda
   XButton btnRemove;
   XButton btnUp;
   XButton btnDown;
-
+  
   final private String IMGHELP1_HID = "";
-
-
+  
+  
   //Font Descriptors as Class members.
   FontDescriptor fontDescriptor1 = new FontDescriptor();
   FontDescriptor fontDescriptor2 = new FontDescriptor();
@@ -114,7 +114,7 @@ public abstract class AgendaWizardDialog  extends WizardDialog implements Agenda
 
   //Resources Object
   AgendaWizardDialogResources resources;
-
+  
   private String[] PROPS_LIST = new String[] {"Dropdown", "Height", "HelpURL", "PositionX", "PositionY", "Step", "TabIndex", "Width"};
   private String[] PROPS_LABEL_B = new String[] {"FontDescriptor", "Height", "Label", "MultiLine", "PositionX", "PositionY", "Step", "TabIndex", "Width"};
   private String[] PROPS_CHECK = new String[] {"Height", "HelpURL", "Label", "PositionX", "PositionY", "State", "Step", "TabIndex", "Width"};
@@ -123,34 +123,34 @@ public abstract class AgendaWizardDialog  extends WizardDialog implements Agenda
   private String[] PROPS_TEXTAREA = new String[] {"Height", "Label", "MultiLine", "PositionX", "PositionY", "Step", "TabIndex", "Width"};
   private String[] PROPS_TEXT = new String[] {"Height", "Label", "PositionX", "PositionY", "Step", "TabIndex", "Width"};
   private String[] PROPS_IMAGE = new String[] {"Border", "Height", "HelpURL", "ImageURL", "PositionX", "PositionY", "ScaleImage", "Step", "TabIndex", "Width"};
-
+  
   private static final Short NO_BORDER = new Short((short)0);
-
+  
   public AgendaWizardDialog(XMultiServiceFactory xmsf) {
     super(xmsf,HID);
     //Load Resources
     resources =  new AgendaWizardDialogResources(xmsf);
-
+   
     //set dialog properties...
-    Helper.setUnoPropertyValues(xDialogModel,
+    Helper.setUnoPropertyValues(xDialogModel, 
       new String[] { "Closeable","Height","Moveable","PositionX","PositionY","Step","TabIndex","Title","Width"},
       new Object[] { Boolean.TRUE,new Integer(210),Boolean.TRUE,new Integer(200),new Integer(52),INTEGERS[1],new Short((short)1),resources.resAgendaWizardDialog_title,new Integer(310)}
     );
-
+    
     //Set member- FontDescriptors...
     fontDescriptor1.Weight = 150;
     fontDescriptor1.Underline = com.sun.star.awt.FontUnderline.SINGLE;
     fontDescriptor2.Weight = 100;
     fontDescriptor4.Weight = 150;
   }
-
+  
   //build components
   public void buildStep1() {
-    lblTitle1 = insertLabel("lblTitle1",
+    lblTitle1 = insertLabel("lblTitle1", 
       PROPS_LABEL_B,
       new Object[] { fontDescriptor4,INTEGER_16,resources.reslblTitle1_value,Boolean.TRUE,new Integer(91),INTEGERS[8],INTEGERS[1],new Short((short)100),new Integer(212)}
     );
-    lblPageDesign = insertLabel("lblPageDesign",
+    lblPageDesign = insertLabel("lblPageDesign", 
       PROPS_TEXT,
       new Object[] { INTEGERS[8],resources.reslblPageDesign_value,new Integer(97),new Integer(32),INTEGERS[1],new Short((short)101),new Integer(66)}
     );
@@ -162,11 +162,11 @@ public abstract class AgendaWizardDialog  extends WizardDialog implements Agenda
       PROPS_CHECK,
       new Object[] { INTEGERS[9],CHKMINUTES_HID,resources.reschkMinutes_value,new Integer(97),new Integer(50),new Short((short)0),INTEGERS[1],new Short((short)103),new Integer(203)}
     );
-    imgHelp1 = insertImage("imgHelp1",
+    imgHelp1 = insertImage("imgHelp1", 
       PROPS_IMAGE,
       new Object[] { NO_BORDER, INTEGERS[10],IMGHELP1_HID, AgendaWizardDialogConst.INFO_IMAGE_URL, new Integer(92),new Integer(145), Boolean.FALSE, INTEGERS[1], new Short((short)104),INTEGERS[10]}
     );
-    lblHelp1 = insertLabel("lblHelp1",
+    lblHelp1 = insertLabel("lblHelp1", 
             PROPS_TEXTAREA,
             new Object[] { new Integer(39),resources.reslblHelp1_value,Boolean.TRUE,new Integer(104),new Integer(145),INTEGERS[1],new Short((short)105),new Integer(199)}
           );
@@ -174,11 +174,11 @@ public abstract class AgendaWizardDialog  extends WizardDialog implements Agenda
   }
 
   public void buildStep2() {
-    lblTitle2 = insertLabel("lblTitle2",
+    lblTitle2 = insertLabel("lblTitle2", 
       PROPS_LABEL_B,
       new Object[] { fontDescriptor4,INTEGER_16,resources.reslblTitle2_value,Boolean.TRUE,new Integer(91),INTEGERS[8],INTEGERS[2],new Short((short)200),new Integer(212)}
     );
-    lblDate = insertLabel("lblDate",
+    lblDate = insertLabel("lblDate", 
       PROPS_TEXT,
       new Object[] { INTEGERS[8],resources.reslblDate_value,new Integer(97),new Integer(32),INTEGERS[2],new Short((short)201),new Integer(66)}
     );
@@ -186,7 +186,7 @@ public abstract class AgendaWizardDialog  extends WizardDialog implements Agenda
       PROPS_LIST,
       new Object[] { Boolean.TRUE,INTEGER_12,TXTDATE_HID,new Integer(166),new Integer(30),INTEGERS[2],new Short((short)202),new Integer(70)}
     );
-    lblTime = insertLabel("lblTime",
+    lblTime = insertLabel("lblTime", 
       PROPS_TEXT,
       new Object[] { INTEGERS[8],resources.reslblTime_value,new Integer(97),new Integer(50),INTEGERS[2],new Short((short)203),new Integer(66)}
     );
@@ -194,8 +194,8 @@ public abstract class AgendaWizardDialog  extends WizardDialog implements Agenda
       new String[] {"Height", "HelpURL", "PositionX", "PositionY", "Step", "StrictFormat", "TabIndex", "Width"},
      new Object[] { INTEGER_12,TXTTIME_HID,new Integer(166),new Integer(48),INTEGERS[2],Boolean.TRUE,new Short((short)204),new Integer(70)}
     );
-
-    lblTitle = insertLabel("lblTitle",
+    
+    lblTitle = insertLabel("lblTitle", 
       PROPS_TEXT,
       new Object[] { INTEGERS[8],resources.reslblTitle_value,new Integer(97),new Integer(68),INTEGERS[2],new Short((short)205),new Integer(66)}
     );
@@ -203,7 +203,7 @@ public abstract class AgendaWizardDialog  extends WizardDialog implements Agenda
       new String[] {"Height", "HelpURL", "MultiLine", "PositionX", "PositionY", "Step", "TabIndex", "Width"},
       new Object[] { new Integer(26),TXTTITLE_HID,Boolean.TRUE,new Integer(166),new Integer(66),INTEGERS[2],new Short((short)206),new Integer(138)}
     );
-    lblLocation = insertLabel("lblLocation",
+    lblLocation = insertLabel("lblLocation", 
       PROPS_TEXT,
       new Object[] { INTEGERS[8],resources.reslblLocation_value,new Integer(97),new Integer(100),INTEGERS[2],new Short((short)207),new Integer(66)}
     );
@@ -211,20 +211,20 @@ public abstract class AgendaWizardDialog  extends WizardDialog implements Agenda
       new String[] { "Height", "HelpURL", "MultiLine", "PositionX", "PositionY", "Step", "TabIndex", "Width"},
       new Object[] { new Integer(34),CBLOCATION_HID,Boolean.TRUE,new Integer(166),new Integer(98),INTEGERS[2],new Short((short)208),new Integer(138)}
     );
-
-    imgHelp2 = insertImage("imgHelp2",
+    
+    imgHelp2 = insertImage("imgHelp2", 
       PROPS_IMAGE,
       new Object[] { NO_BORDER, INTEGERS[10],IMGHELP1_HID,AgendaWizardDialogConst.INFO_IMAGE_URL, new Integer(92),new Integer(145),Boolean.FALSE, INTEGERS[2],new Short((short)209),INTEGERS[10]}
     );
-    lblHelp2 = insertLabel("lblHelp2",
+    lblHelp2 = insertLabel("lblHelp2", 
       PROPS_TEXTAREA,
       new Object[] { new Integer(39),resources.reslblHelp2_value,Boolean.TRUE,new Integer(104),new Integer(145),INTEGERS[2],new Short((short)210),new Integer(199)}
     );
-
+    
   }
 
   public void buildStep3() {
-    lblTitle3 = insertLabel("lblTitle3",
+    lblTitle3 = insertLabel("lblTitle3", 
       PROPS_LABEL_B,
       new Object[] { fontDescriptor4,INTEGER_16,resources.reslblTitle3_value,Boolean.TRUE,new Integer(91),INTEGERS[8],INTEGERS[3],new Short((short)300),new Integer(212)}
     );
@@ -244,18 +244,18 @@ public abstract class AgendaWizardDialog  extends WizardDialog implements Agenda
       PROPS_CHECK,
       new Object[] { INTEGERS[8],CHKNOTES_HID,resources.reschkNotes_value,new Integer(97),new Integer(74),new Short((short)1),INTEGERS[3],new Short((short)304),new Integer(160)}
     );
-    imgHelp3 = insertImage("imgHelp3",
+    imgHelp3 = insertImage("imgHelp3", 
             PROPS_IMAGE,
             new Object[] { NO_BORDER, INTEGERS[10],IMGHELP1_HID,AgendaWizardDialogConst.INFO_IMAGE_URL, new Integer(92),new Integer(145),Boolean.FALSE, INTEGERS[3],new Short((short)305),INTEGERS[10]}
           );
-    lblHelp3 = insertLabel("lblHelp3",
+    lblHelp3 = insertLabel("lblHelp3", 
       PROPS_TEXTAREA,
       new Object[] { new Integer(39),resources.reslblHelp3_value,Boolean.TRUE,new Integer(104),new Integer(145),INTEGERS[3],new Short((short)306),new Integer(199)}
     );
   }
 
   public void buildStep4() {
-    lblTitle5 = insertLabel("lblTitle5",
+    lblTitle5 = insertLabel("lblTitle5", 
       PROPS_LABEL_B,
       new Object[] { fontDescriptor4,INTEGER_16,resources.reslblTitle5_value,Boolean.TRUE,new Integer(91),INTEGERS[8],INTEGERS[4],new Short((short)400),new Integer(212)}
     );
@@ -287,38 +287,38 @@ public abstract class AgendaWizardDialog  extends WizardDialog implements Agenda
       PROPS_CHECK,
       new Object[] { INTEGERS[8],CHKRESOURCEPERSONS_HID,resources.reschkResourcePersons_value,new Integer(97),new Integer(116),new Short((short)0),INTEGERS[4],new Short((short)407),new Integer(150)}
     );
-    imgHelp4 = insertImage("imgHelp4",
+    imgHelp4 = insertImage("imgHelp4", 
             PROPS_IMAGE,
             new Object[] { NO_BORDER, INTEGERS[10],IMGHELP1_HID,AgendaWizardDialogConst.INFO_IMAGE_URL, new Integer(92),new Integer(145),Boolean.FALSE, INTEGERS[4],new Short((short)408),INTEGERS[10]}
           );
-    lblHelp4 = insertLabel("lblHelp4",
+    lblHelp4 = insertLabel("lblHelp4", 
       PROPS_TEXTAREA,
       new Object[] { new Integer(39),resources.reslblHelp4_value,Boolean.TRUE,new Integer(104),new Integer(145),INTEGERS[4],new Short((short)409),new Integer(199)}
     );
   }
 
   public void buildStep5() {
-    lblTitle4 = insertLabel("lblTitle4",
+    lblTitle4 = insertLabel("lblTitle4", 
       PROPS_LABEL_B,
       new Object[] { fontDescriptor4,INTEGER_16,resources.reslblTitle4_value,Boolean.TRUE,new Integer(91),INTEGERS[8],INTEGERS[5],new Short((short)500),new Integer(212)}
     );
-    lblTopic = insertLabel("lblTopic",
+    lblTopic = insertLabel("lblTopic", 
       PROPS_TEXT,
       new Object[] { INTEGERS[8],resources.reslblTopic_value,new Integer(107),new Integer(28),INTEGERS[5],new Short((short)71),new Integer(501)}
     );
-    lblResponsible = insertLabel("lblResponsible",
+    lblResponsible = insertLabel("lblResponsible", 
       PROPS_TEXT,
       new Object[] { INTEGERS[8],resources.reslblResponsible_value,new Integer(195),new Integer(28),INTEGERS[5],new Short((short)72),new Integer(502)}
     );
-    lblDuration = insertLabel("lblDuration",
+    lblDuration = insertLabel("lblDuration", 
       PROPS_TEXT,
       new Object[] { INTEGERS[8],resources.reslblDuration_value,new Integer(267),new Integer(28),INTEGERS[5],new Short((short)73),new Integer(503)}
     );
-
-
-
-
-
+  
+    
+    
+    
+    
     btnInsert = insertButton("btnInsert", BTNINSERT_ACTION_PERFORMED,
             PROPS_BUTTON,
             new Object[] { INTEGER_14,BTNINSERT_HID,resources.resButtonInsert,new Integer(92),new Integer(136),INTEGERS[5],new Short((short)580),INTEGER_40}
@@ -335,22 +335,22 @@ public abstract class AgendaWizardDialog  extends WizardDialog implements Agenda
             PROPS_BUTTON,
             new Object[] { INTEGER_14,BTNDOWN_HID,resources.resButtonDown,new Integer(264),new Integer(136),INTEGERS[5],new Short((short)583),INTEGER_40}
           );
-
-
+          
+    
   }
 
   public void buildStep6() {
 
-    lblTitle6 = insertLabel("lblTitle6",
+    lblTitle6 = insertLabel("lblTitle6", 
       PROPS_LABEL_B,
       new Object[] { fontDescriptor4,INTEGER_16,resources.reslblTitle6_value,Boolean.TRUE,new Integer(91),INTEGERS[8],INTEGERS[6],new Short((short)600),new Integer(212)}
     );
-    lblHelpPg6 = insertLabel("lblHelpPg6",
+    lblHelpPg6 = insertLabel("lblHelpPg6", 
             PROPS_TEXTAREA,
             new Object[] { new Integer(24),resources.reslblHelpPg6_value,Boolean.TRUE,new Integer(97),new Integer(32),INTEGERS[6],new Short((short)601),new Integer(204)}
           );
-
-    lblTemplateName = insertLabel("lblTemplateName",
+    
+    lblTemplateName = insertLabel("lblTemplateName", 
       PROPS_TEXT,
       new Object[] { INTEGERS[8],resources.reslblTemplateName_value,new Integer(97),new Integer(62),INTEGERS[6],new Short((short)602),new Integer(101)}
     );
@@ -358,7 +358,7 @@ public abstract class AgendaWizardDialog  extends WizardDialog implements Agenda
       PROPS_X,
       new Object[] { INTEGER_12,TXTTEMPLATENAME_HID,new Integer(202),new Integer(60),INTEGERS[6],new Short((short)603),new Integer(100)}
     );
-    lblProceed = insertLabel("lblProceed",
+    lblProceed = insertLabel("lblProceed", 
       PROPS_TEXT,
       new Object[] { INTEGERS[8],resources.reslblProceed_value,new Integer(97),new Integer(101),INTEGERS[6],new Short((short)607),new Integer(204)}
     );
@@ -370,15 +370,15 @@ public abstract class AgendaWizardDialog  extends WizardDialog implements Agenda
       PROPS_BUTTON,
       new Object[] { INTEGERS[8],OPTMAKECHANGES_HID,resources.resoptMakeChanges_value,new Integer(103),new Integer(125),INTEGERS[6],new Short((short)609),new Integer(198)}
     );
-    imgHelp6 = insertImage("imgHelp6",
+    imgHelp6 = insertImage("imgHelp6", 
             PROPS_IMAGE,
             new Object[] { NO_BORDER, INTEGERS[10],IMGHELP1_HID,AgendaWizardDialogConst.INFO_IMAGE_URL, new Integer(92),new Integer(145),Boolean.FALSE, INTEGERS[6],new Short((short)610),INTEGERS[10]}
           );
-    lblHelp6 = insertLabel("lblHelp6",
+    lblHelp6 = insertLabel("lblHelp6", 
             PROPS_TEXTAREA,
             new Object[] { new Integer(39),resources.reslblHelp6_value,Boolean.TRUE,new Integer(104),new Integer(145),INTEGERS[6],new Short((short)611),new Integer(199)}
           );
-
+          
   }
 
 }
\ No newline at end of file
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.java b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.java
index 08f2fabfb8d9..109818f88149 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.java
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.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,28 +27,28 @@
 package com.sun.star.wizards.agenda;
 
 public interface AgendaWizardDialogConst {
-
+    
    /**
     * These are event method names, used with reflection
-    * to call the methods under these names uppon
+    * to call the methods under these names uppon 
     * events.
     */
-
-   final String LISTPAGEDESIGN_ACTION_PERFORMED =  "pageDesignChanged";
-   final String TXTTEMPLATENAME_TEXT_CHANGED =     "templateTitleChanged";
-   final String BTNTEMPLATEPATH_ACTION_PERFORMED = "saveAs";
-   final String BTNINSERT_ACTION_PERFORMED =       "insertRow";
-   final String BTNREMOVE_ACTION_PERFORMED =       "removeRow";
-   final String BTNUP_ACTION_PERFORMED =           "rowUp";
-   final String BTNDOWN_ACTION_PERFORMED =         "rowDown";
-
+      
+   final String LISTPAGEDESIGN_ACTION_PERFORMED =  "pageDesignChanged"; 
+   final String TXTTEMPLATENAME_TEXT_CHANGED =     "templateTitleChanged"; 
+   final String BTNTEMPLATEPATH_ACTION_PERFORMED = "saveAs"; 
+   final String BTNINSERT_ACTION_PERFORMED =       "insertRow"; 
+   final String BTNREMOVE_ACTION_PERFORMED =       "removeRow"; 
+   final String BTNUP_ACTION_PERFORMED =           "rowUp"; 
+   final String BTNDOWN_ACTION_PERFORMED =         "rowDown"; 
+  
    final String INFO_IMAGE_URL = "private:resource/dbu/image/19205";
   /* ====================================
    *                 Help IDs
    * ====================================
    */
-   final int HID = 41051;
-
+   final int HID = 41051; 
+   
    /*
    * "HID:(hid)"   - the dialog
    * "HID:(hid+1)  - the help button
@@ -57,19 +57,19 @@ public interface AgendaWizardDialogConst {
    * "HID:(hid+4)" - the create button
    * "HID:(hid+5)" - the cancel button
    */
-
+   
    final String LISTPAGEDESIGN_HID =          "HID:" + (HID + 6);
    final String CHKMINUTES_HID =              "HID:" + (HID + 7);
    final String TXTTIME_HID =                 "HID:" + (HID + 8);
    final String TXTDATE_HID =                 "HID:" + (HID + 9);
    final String TXTTITLE_HID =                "HID:" + (HID + 10);
    final String CBLOCATION_HID =              "HID:" + (HID + 11);
-
+   
    final String CHKMEETINGTITLE_HID =         "HID:" + (HID + 12);
    final String CHKREAD_HID =                 "HID:" + (HID + 13);
    final String CHKBRING_HID =                "HID:" + (HID + 14);
    final String CHKNOTES_HID =                "HID:" + (HID + 15);
-
+   
    final String CHKCONVENEDBY_HID =           "HID:" + (HID + 16);
    final String CHKPRESIDING_HID =            "HID:" + (HID + 17);
    final String CHKNOTETAKER_HID =            "HID:" + (HID + 18);
@@ -77,22 +77,22 @@ public interface AgendaWizardDialogConst {
    final String CHKATTENDEES_HID =            "HID:" + (HID + 20);
    final String CHKOBSERVERS_HID =            "HID:" + (HID + 21);
    final String CHKRESOURCEPERSONS_HID =      "HID:" + (HID + 22);
-
+   
    final String TXTTEMPLATENAME_HID =         "HID:" + (HID + 23);
    final String TXTTEMPLATEPATH_HID =         "HID:" + (HID + 24);
    final String BTNTEMPLATEPATH_HID =         "HID:" + (HID + 25);
-
+   
    final String OPTCREATEAGENDA_HID =         "HID:" + (HID + 26);
    final String OPTMAKECHANGES_HID =          "HID:" + (HID + 27);
-
+   
    final String BTNINSERT_HID =               "HID:" + (HID + 28);
    final String BTNREMOVE_HID =               "HID:" + (HID + 29);
    final String BTNUP_HID =                   "HID:" + (HID + 30);
    final String BTNDOWN_HID =                 "HID:" + (HID + 31);
-
+   
    final int LAST_HID = HID + 32;
-
-   /*
+   
+   /* 
     * 32 : scroll bar
     * 33 - 35 first topics row
     * 36 - 38 second
@@ -101,7 +101,7 @@ public interface AgendaWizardDialogConst {
     * 45 - 47
     * total 5 rows / 3 controls.
     */
-
-
+    
+   
 }
   
\ No newline at end of file
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java
index 64be1b074e04..7d68673f2a8e 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.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
@@ -24,8 +24,8 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-package com.sun.star.wizards.agenda;
+ 
+package com.sun.star.wizards.agenda; 
 
 import java.util.Vector;
 
@@ -54,12 +54,12 @@ import com.sun.star.wizards.document.OfficeDocument;
 import com.sun.star.wizards.text.ViewHandler;
 import com.sun.star.wizards.ui.PathSelection;
 import com.sun.star.wizards.ui.XPathSelectionListener;
-import com.sun.star.wizards.ui.event.DataAware;
+import com.sun.star.wizards.ui.event.DataAware; 
 import com.sun.star.wizards.ui.event.RadioDataAware;
 import com.sun.star.wizards.ui.event.UnoDataAware;
 
 /**
- * This class is the dialog implementation class -
+ * This class is the dialog implementation class - 
  * there is not much business logic here - but mostley
  * event methods.
  * Some event methods are also implemented in TopicsControl and TopicsControl.ControlRow.
@@ -71,7 +71,7 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog
      * used to prevent a double start of the wizard.
      */
     static boolean running;
-
+    
     /**
      * the preview document controller.
      */
@@ -82,14 +82,14 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog
      * the data model changes, except for topics).
      */
     private CGAgenda agenda;
-
+    
     /**
-     * the topics control, a gui element which
+     * the topics control, a gui element which 
      * manipulates the topics data according to the
-     * user's input.
+     * user's input. 
      */
     private TopicsControl topicsControl;
-
+    
     /**
      * an array with two array memebers:
      * agendaTemplates[0] contains an array with
@@ -98,31 +98,31 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog
      * corresponding URLs.
      */
     private String[][] agendaTemplates;
-
+    
     PathSelection myPathSelection;
-
+    
     String sTemplatePath;
     String sUserTemplatePath;
     String sBitmapPath;
-
+    
     String sPath;
 
     /** constructor */
-    public AgendaWizardDialogImpl(XMultiServiceFactory xmsf)
+    public AgendaWizardDialogImpl(XMultiServiceFactory xmsf) 
     {
         super(xmsf);
     }
-
+    
     protected void enterStep(int OldStep, int NewStep) {}
     protected void leaveStep(int OldStep, int NewStep) {}
-
+    
     /**
      * read the configuration data, open the specified template,
      * initialize the template controller (AgendaTemplate) and
-     * set the status of the displayed template to the one
+     * set the status of the displayed template to the one 
      * read from the configuration.
      * build the dialog.
-     * Synchronize the dialog to the same status (read from
+     * Synchronize the dialog to the same status (read from 
      * the configuration).
      * show the dialog.
      */
@@ -131,16 +131,16 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog
         try  {
             // read configuration data.
             agenda = new CGAgenda();
-
+        
             Object root = Configuration.getConfigurationRoot(xMSF, "/org.openoffice.Office.Writer/Wizards/Agenda", false);
             agenda.readConfiguration(root,"cp_");
-
+        
             // initialize the agenda template
             agendaTemplate = new AgendaTemplate(xMSF, agenda, resources, this);
             initializeTemplates();
-
+            
             agendaTemplate.load(agendaTemplates[1][agenda.cp_AgendaType] , new Vector());
-
+            
             // build the dialog.
             buildStep1();
             buildStep2();
@@ -150,17 +150,17 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog
             topicsControl = new TopicsControl(this,xMSF, agenda);
             buildStep6();
             drawNaviBar();
-
+            
             initializePaths();
-
+            
             //special Control for setting the save Path:
             insertPathSelectionControl();
-
+            
             // create the peer
             XWindow xw = agendaTemplate.xFrame.getContainerWindow();
             XWindowPeer xWindowPeer = (XWindowPeer) UnoRuntime.queryInterface(XWindowPeer.class, xw);
             this.createWindowPeer( xWindowPeer );
-
+            
             // initialize roadmap
             this.addRoadmap();
             this.insertRoadMapItems(
@@ -169,15 +169,15 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog
                     new boolean[] { true,true,true,true,true,true }
                     );
             this.setMaxStep(6);
-
+            
             // synchronize GUI and CGAgenda object.
             makeDA();
             if(myPathSelection.xSaveTextBox.getText().equalsIgnoreCase("")) {myPathSelection.initializePath();}
 
             executeDialog(agendaTemplate.xFrame);
-            removeTerminateListener();
+            removeTerminateListener(); 
             closeDocument();
-            running = false;
+            running = false;        
 
         }
         catch (Exception ex) {
@@ -186,21 +186,21 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog
             running=false;
             return;
         }
-
-
+        
+        
     }
-
+    
     private class myPathSelectionListener implements XPathSelectionListener {
         public void validatePath() {
             if (myPathSelection.usedPathPicker) {
-                filenameChanged = true;
+                filenameChanged = true;             
             }
             myPathSelection.usedPathPicker = false;
         }
     }
 
-
-    public void insertPathSelectionControl() {
+    
+    public void insertPathSelectionControl() {      
         myPathSelection = new PathSelection(xMSF, this, PathSelection.TransferMode.SAVE, PathSelection.DialogTypes.FILE);
         myPathSelection.insert(6, 97, 70, 205, (short) 45, resources.reslblTemplatePath_value, true, "HID:" + ( HID + 24 ), "HID:" + ( HID + 25 ));
         myPathSelection.sDefaultDirectory = sUserTemplatePath;
@@ -208,7 +208,7 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog
         myPathSelection.sDefaultFilter = "writer8_template";
         myPathSelection.addSelectionListener(new myPathSelectionListener());
     }
-
+    
     private void initializePaths() {
         try {
             sTemplatePath = FileAccess.getOfficePath(xMSF, "Template", "share", "/wizard");
@@ -218,18 +218,18 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog
             e.printStackTrace();
         }
     }
-
+    
     private void checkSavePath() {
-        if (agenda.cp_TemplatePath == null ||
-                agenda.cp_TemplatePath.equals("") ||
+        if (agenda.cp_TemplatePath == null || 
+                agenda.cp_TemplatePath.equals("") || 
                 !getFileAccess().exists(FileAccess.getParentDir(agenda.cp_TemplatePath),false) ||
                 !getFileAccess().isDirectory(FileAccess.getParentDir(agenda.cp_TemplatePath )))
             {
-                try  {
-                    agenda.cp_TemplatePath =
+                try  { 
+                    agenda.cp_TemplatePath = 
                         FileAccess.connectURLs(
-                            FileAccess.getOfficePath(xMSF, "Work", "", "") ,
-                            resources.resDefaultFilename
+                            FileAccess.getOfficePath(xMSF, "Work", "", "") , 
+                            resources.resDefaultFilename 
                         );
                 }
                 catch (Exception ex) {
@@ -237,30 +237,30 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog
                 }
             }
     }
-
+    
     /**
      * bind controls to the agenda member (DataAware model)
      */
     private void makeDA() {
-
+        
         setControlProperty("listPageDesign", "StringItemList", agendaTemplates[0]);
-
+        
         checkSavePath();
         //setFilename(agenda.cp_TemplatePath);
-
+        
         UnoDataAware.attachListBox( agenda, "cp_AgendaType", listPageDesign , null, true ).updateUI();
         UnoDataAware.attachCheckBox( agenda, "cp_IncludeMinutes", chkMinutes, null, true).updateUI();
-
+        
         UnoDataAware.attachEditControl(agenda, "cp_Title", txtTitle, agendaTemplate , true).updateUI();
         UnoDataAware.attachDateControl(agenda, "cp_Date", txtDate, agendaTemplate , true).updateUI();
         UnoDataAware.attachTimeControl(agenda, "cp_Time", txtTime, agendaTemplate , true).updateUI();
         UnoDataAware.attachEditControl(agenda, "cp_Location", cbLocation, agendaTemplate , true).updateUI();
-
+                
         UnoDataAware.attachCheckBox(agenda,"cp_ShowMeetingType", chkMeetingTitle , new RedrawListener( TemplateConsts.FILLIN_MEETING_TYPE ) , true);
         UnoDataAware.attachCheckBox(agenda,"cp_ShowRead", chkRead , new RedrawListener( TemplateConsts.FILLIN_READ ) , true).updateUI();
         UnoDataAware.attachCheckBox(agenda,"cp_ShowBring", chkBring , new RedrawListener( TemplateConsts.FILLIN_BRING ) , true).updateUI();
         UnoDataAware.attachCheckBox(agenda,"cp_ShowNotes", chkNotes , new RedrawListener( TemplateConsts.FILLIN_NOTES ) , true).updateUI();
-
+        
         UnoDataAware.attachCheckBox(agenda,"cp_ShowCalledBy", chkConvenedBy , new RedrawListener( TemplateConsts.FILLIN_CALLED_BY ) , true).updateUI();
         UnoDataAware.attachCheckBox(agenda,"cp_ShowFacilitator", chkPresiding , new RedrawListener( TemplateConsts.FILLIN_FACILITATOR ) , true).updateUI();
         UnoDataAware.attachCheckBox(agenda,"cp_ShowNotetaker", chkNoteTaker , new RedrawListener( TemplateConsts.FILLIN_NOTETAKER ) , true).updateUI();
@@ -268,11 +268,11 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog
         UnoDataAware.attachCheckBox(agenda,"cp_ShowAttendees", chkAttendees , new RedrawListener( TemplateConsts.FILLIN_PARTICIPANTS ) , true).updateUI();
         UnoDataAware.attachCheckBox(agenda,"cp_ShowObservers", chkObservers , new RedrawListener( TemplateConsts.FILLIN_OBSERVERS ) , true).updateUI();
         UnoDataAware.attachCheckBox(agenda,"cp_ShowResourcePersons", chkResourcePersons , new RedrawListener( TemplateConsts.FILLIN_RESOURCE_PERSONS ) , true).updateUI();
-
+        
         UnoDataAware.attachEditControl(agenda, "cp_TemplateName", txtTemplateName, null, true).updateUI();
-        RadioDataAware.attachRadioButtons( agenda, "cp_ProceedMethod",
+        RadioDataAware.attachRadioButtons( agenda, "cp_ProceedMethod", 
                 new Object[] {optCreateAgenda, optMakeChanges} ,null,true).updateUI();
-
+        
         listPageDesign.addItemListener(new XItemListener() {
             public void itemStateChanged(ItemEvent ie) {
                 pageDesignChanged(ie);
@@ -289,37 +289,37 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog
             XMultiServiceFactory xLocMSF = Desktop.connect(ConnectStr);
             AgendaWizardDialogImpl wizard = new AgendaWizardDialogImpl(xLocMSF);
             wizard.startWizard();
-
+            
         }
         catch (Exception exception) {
             exception.printStackTrace();
         }
     }
 
-
+    
     /*
     private void initializePaths() {
         try {
-
+            
             sUserTemplatePath = FileAccess.getOfficePath(xMSF, "Template", "user");
             sBitmapPath = FileAccess.combinePaths(xMSF, sTemplatePath, "/../wizard/bitmap");
         } catch (NoValidPathException e) {
             e.printStackTrace();
         }
     }*/
-
+    
     /**
      * read the available agenda wizard templates.
      */
     public boolean initializeTemplates() {
         try {
             String sTemplatePath = FileAccess.getOfficePath(xMSF, "Template", "share", "/wizard");
-
+            
             //sCurrentNorm = Norms[getCurrentLetter().cp_Norm];
             String sAgendaPath = FileAccess.combinePaths(xMSF, sTemplatePath, "/wizard/agenda" );
-
+    
             agendaTemplates = FileAccess.getFolderTitles(xMSF, "aw" , sAgendaPath);
-
+            
             return true;
         } catch (NoValidPathException nopathexception) {
             nopathexception.printStackTrace();
@@ -329,35 +329,35 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog
             return false;
         }
     }
-
+    
     /* ******************************
      * Event methods
      * ******************************
      */
-
+    
     /**
      * first page, page design listbox changed.
      */
     public void pageDesignChanged(ItemEvent ie) {
         int selected = ie.Selected;
-        try {
-            agendaTemplate.load( agendaTemplates[1][selected] , topicsControl.getTopicsData());
+        try { 
+            agendaTemplate.load( agendaTemplates[1][selected] , topicsControl.getTopicsData()); 
         }
         catch (Exception ex) {
             SystemDialog.showMessageBox(xMSF, "ErrBox", VclWindowPeerAttribute.OK, resources.resErrOpenTemplate);
             ex.printStackTrace();
         }
     }
-
+    
     /**
      * last page, template title changed...
      */
     public void templateTitleChanged() {
         String title = (String)Helper.getUnoPropertyValue( getModel(txtTemplateName), "Text" );
-        agendaTemplate.setTemplateTitle( title );
+        agendaTemplate.setTemplateTitle( title ); 
     }
-
-
+    
+    
     private FileAccess fileAccess1;
     /** convenience method.
      *  instead of creating a FileAccess object every time
@@ -374,31 +374,31 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog
                 e.printStackTrace();
             }
         return fileAccess1;
-
+    
     }
     /**
      * indicates if the filename was changed by the user through
      * the "save as" dialog.
      * If it is so, one needs not warn the user
-     * upon overwrite, since she was already warned.
+     * upon overwrite, since she was already warned. 
      */
     private boolean filenameChanged = false;
-
+    
     /**
      * last page, "browse" ("...") button was clicked...
      */
     public void saveAs() {
         try {
-
+            
             checkSavePath();
-
+            
             SystemDialog saveAs = SystemDialog.createStoreDialog(xMSF);
             saveAs.addFilterToDialog("ott","writer8_template",true);
             // call the saveAs dialog.
             String url = saveAs.callStoreDialog(
-                FileAccess.getParentDir(agenda.cp_TemplatePath),
+                FileAccess.getParentDir(agenda.cp_TemplatePath), 
                 FileAccess.getFilename(agenda.cp_TemplatePath));
-
+                
             if (url != null) {
                 agenda.cp_TemplatePath = url;
                 setFilename(url);
@@ -408,10 +408,10 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog
         catch (Exception ex) {
             ex.printStackTrace();
         }
-
-
+                            
+            
     }
-
+    
     /**
      * is called when the user
      * changes the path through the "save as" dialog.
@@ -426,36 +426,36 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog
         catch (Exception ex) {
             ex.printStackTrace();
         }
-
+            
     }
-
+    
     public void insertRow() {
         topicsControl.insertRow();
     }
-
+    
     public void removeRow() {
         topicsControl.removeRow();
     }
-
+    
     public void rowUp() {
         topicsControl.rowUp();
     }
-
+    
     public void rowDown() {
         topicsControl.rowDown();
     }
-
-
+    
+            
     /* ************************
      * Navigation bar methods
      * ************************
      */
-
+    
     public void cancelWizard() {
         xDialog.endExecute();
         running = false;
     }
-
+    
     public boolean finishWizard() {
         boolean bSaveSuccess = false; // pesimistic :(
         XTextDocument xTextDocument;
@@ -468,28 +468,28 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog
                 sPath = myPathSelection.getSelectedPath();
             }
             sPath = fileAccess.getURL(sPath);
-
+    
             //first, if the filename was not changed, thus
             //it is coming from a saved session, check if the
             // file exists and warn the user.
             if (!filenameChanged)
                 if (fileAccess.exists(sPath, true)) {
-
+    
                     int answer = SystemDialog.showMessageBox(xMSF, xControl.getPeer(), "MessBox", VclWindowPeerAttribute.YES_NO + VclWindowPeerAttribute.DEF_NO, resources.resFileExists);
                     if (answer == 3) // user said: no, do not overwrite....
                         return false;
                 }
 
             agendaTemplate.xTextDocument.lockControllers();
-
+            
             xTextDocument = (XTextDocument)UnoRuntime.queryInterface(XTextDocument.class,agendaTemplate.document);
-
+            
             bSaveSuccess = OfficeDocument.store(xMSF, xTextDocument, sPath , "writer8_template", false, resources.resErrSaveTemplate );
         } catch (Exception e) {
             SystemDialog.showMessageBox(xMSF, xControl.getPeer(), "ErrBox", VclWindowPeerAttribute.OK, resources.resErrSaveTemplate);
             //e.printStackTrace();
         }
-
+        
         if (bSaveSuccess) {
             try {
                 topicsControl.saveTopics(agenda);
@@ -500,9 +500,9 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog
             catch (Exception ex) {
                 ex.printStackTrace();
             }
-
+                
             agendaTemplate.finish( topicsControl.getTopicsData());
-            try {
+            try { 
                 XStorable xStoreable = (XStorable) UnoRuntime.queryInterface(XStorable.class, agendaTemplate.document);
                 xStoreable.store();
             }
@@ -510,13 +510,13 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog
                 SystemDialog.showMessageBox(xMSF, "ErrBox", VclWindowPeerAttribute.OK, resources.resErrSaveTemplate);
                 ex.printStackTrace();
             }
-
+            
             //xWindow.setVisible(false);
             //running = false;
             agendaTemplate.xTextDocument.unlockControllers();
             //closeDocument();
             //removeTerminateListener();
-
+            
             PropertyValue loadValues[] = new PropertyValue[2];
             loadValues[0] = new PropertyValue();
             loadValues[0].Name = "AsTemplate";
@@ -553,31 +553,31 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog
         running = false;
         return true;
     }
-
+    
     private void closeDocument() {
         try {
-            //xComponent.dispose();
+            //xComponent.dispose();                       
             XCloseable xCloseable = (XCloseable) UnoRuntime.queryInterface(XCloseable.class, agendaTemplate.xFrame);
             xCloseable.close(false);
         } catch (CloseVetoException e) {
             e.printStackTrace();
         }
     }
-
+    
     /* ********************
      * Sub Classes
-     * ********************
+     * ******************** 
      */
 
-
+    
     /**
      * this class is used to redraw an item's table when
      * the user clicks one of the checkboxes in step 3 or 4.
      */
     private class RedrawListener implements DataAware.Listener {
-
+        
         private String itemName;
-
+        
         public RedrawListener(String itemName_) {
             itemName = itemName_;
         }
@@ -591,7 +591,7 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog
             agendaTemplate.xTextDocument.unlockControllers();
         }
     }
-
-
+    
+            
 }
     
\ No newline at end of file
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.java b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.java
index 21730c9aa040..ff6b38b50ce8 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.java
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.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
@@ -25,19 +25,19 @@
  *
  ************************************************************************/
 
-package com.sun.star.wizards.agenda;
-
+package com.sun.star.wizards.agenda; 
+      
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.wizards.common.Resource;
 
 public class AgendaWizardDialogResources extends Resource  {
-
+      
   final static String UNIT_NAME = "dbwizres";
   final static String MODULE_NAME = "dbw";
   final static int RID_AGENDAWIZARDDIALOG_START = 5000;
   final static int RID_COMMON_START = 500;
-
-
+  
+      
   String resAgendaWizardDialog_title;
   String resoptMakeChanges_value;
   String reslblTemplateName_value;
@@ -74,31 +74,31 @@ public class AgendaWizardDialogResources extends Resource  {
   String reschkBring_value;
   String reschkNotes_value;
   String reslblHelp3_value;
-
+  
   String reslblDate_value;
   String reslblHelpPg6_value;
   String reslblPageDesign_value;
-
+  
   String resDefaultFilename;
   String resDefaultTitle;
-
+  
   String resErrSaveTemplate;
-
+  
   String resPlaceHolderTitle;
   String resPlaceHolderDate;
   String resPlaceHolderTime;
   String resPlaceHolderLocation;
   String resPlaceHolderHint;
-
+  
   String resStep1;
   String resStep2;
   String resStep3;
   String resStep4;
   String resStep5;
   String resStep6;
-
+  
   String resErrOpenTemplate;
-
+  
   String itemMeetingType;
   String itemRead;
   String itemBring;
@@ -110,25 +110,25 @@ public class AgendaWizardDialogResources extends Resource  {
   String itemAttendees;
   String itemObservers;
   String itemResource;
-
+  
   String resButtonInsert;
   String resButtonRemove;
   String resButtonUp;
   String resButtonDown;
-
-
-
-
-  // *** common resources ***
-
+  
+  
+  
+  
+  // *** common resources *** 
+  
   String resFileExists;
-
+  
 public AgendaWizardDialogResources(XMultiServiceFactory xmsf) {
   super(xmsf,UNIT_NAME,MODULE_NAME);
-
+  
   /**
-   * Delete the String, uncomment the getResText method
-   *
+   * Delete the String, uncomment the getResText method 
+   * 
    */
     resAgendaWizardDialog_title =           getResText(RID_AGENDAWIZARDDIALOG_START + 1);
     resoptMakeChanges_value =               getResText(RID_AGENDAWIZARDDIALOG_START + 2);
@@ -172,27 +172,27 @@ public AgendaWizardDialogResources(XMultiServiceFactory xmsf) {
 
     resDefaultFilename =                    getResText(RID_AGENDAWIZARDDIALOG_START + 41);
     resDefaultFilename = resDefaultFilename.substring(0,resDefaultFilename.length()-4) + ".ott";
-
+    
     resDefaultTitle =                       getResText(RID_AGENDAWIZARDDIALOG_START + 42);
-
+    
     resErrSaveTemplate =                    getResText(RID_AGENDAWIZARDDIALOG_START + 43);
-
+  
     resPlaceHolderTitle =                   getResText(RID_AGENDAWIZARDDIALOG_START + 44);
     resPlaceHolderDate =                    getResText(RID_AGENDAWIZARDDIALOG_START + 45);
     resPlaceHolderTime =                    getResText(RID_AGENDAWIZARDDIALOG_START + 46);
     resPlaceHolderLocation =                getResText(RID_AGENDAWIZARDDIALOG_START + 47);
     resPlaceHolderHint =                    getResText(RID_AGENDAWIZARDDIALOG_START + 48);
-
-
+    
+    
     resStep1 = getResText(RID_AGENDAWIZARDDIALOG_START + 50);
     resStep2 = getResText(RID_AGENDAWIZARDDIALOG_START + 51);
     resStep3 = getResText(RID_AGENDAWIZARDDIALOG_START + 52);
     resStep4 = getResText(RID_AGENDAWIZARDDIALOG_START + 53);
     resStep5 = getResText(RID_AGENDAWIZARDDIALOG_START + 54);
     resStep6 = getResText(RID_AGENDAWIZARDDIALOG_START + 55);
-
+    
     resErrOpenTemplate = getResText(RID_AGENDAWIZARDDIALOG_START + 56);
-
+    
      itemMeetingType = getResText(RID_AGENDAWIZARDDIALOG_START + 57);
      itemBring = getResText(RID_AGENDAWIZARDDIALOG_START + 58);
      itemRead = getResText(RID_AGENDAWIZARDDIALOG_START + 59);
@@ -205,17 +205,17 @@ public AgendaWizardDialogResources(XMultiServiceFactory xmsf) {
      itemTimekeeper = getResText(RID_AGENDAWIZARDDIALOG_START + 65);
      itemObservers = getResText(RID_AGENDAWIZARDDIALOG_START + 66);
      itemResource = getResText(RID_AGENDAWIZARDDIALOG_START + 67);
-
+    
      resButtonInsert = getResText(RID_AGENDAWIZARDDIALOG_START + 68);
      resButtonRemove  = getResText(RID_AGENDAWIZARDDIALOG_START + 69);
      resButtonUp  = getResText(RID_AGENDAWIZARDDIALOG_START + 70);
      resButtonDown  = getResText(RID_AGENDAWIZARDDIALOG_START + 71);
-
+       
     /*
      * Common resources
      */
-
+    
     resFileExists = getResText(RID_COMMON_START + 19);
-
+    
   }
 }
diff --git a/wizards/com/sun/star/wizards/agenda/CGAgenda.java b/wizards/com/sun/star/wizards/agenda/CGAgenda.java
index b7dc1cc37c00..e645ff6c6262 100644
--- a/wizards/com/sun/star/wizards/agenda/CGAgenda.java
+++ b/wizards/com/sun/star/wizards/agenda/CGAgenda.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/wizards/com/sun/star/wizards/agenda/CGTopic.java b/wizards/com/sun/star/wizards/agenda/CGTopic.java
index 74b818205b9f..68290e552a29 100644
--- a/wizards/com/sun/star/wizards/agenda/CGTopic.java
+++ b/wizards/com/sun/star/wizards/agenda/CGTopic.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,11 +35,11 @@ import com.sun.star.wizards.common.Indexable;
  * CGTopic means: Configuration Group Topic.
  * This object encapsulates a configuration group with topic information.
  * Since the topics gui conftrol uses its own data model, there is
- * also code here to convert from the data model to CGTopic object (the constructor)
+ * also code here to convert from the data model to CGTopic object (the constructor) 
  * and vice versa (setDataToRow method - used when loading the last session...)
  */
 public class CGTopic extends ConfigGroup implements Indexable {
-
+    
     /** sort order  */
     public int cp_Index;
     /** topic name  */
@@ -48,9 +48,9 @@ public class CGTopic extends ConfigGroup implements Indexable {
     public String cp_Responsible;
     /** time */
     public String cp_Time;
-
+    
     public CGTopic() {}
-
+    
     /**
      * create a new CGTopic object with data from the given row.
      * the row object is a PropertyValue array, as used
@@ -65,11 +65,11 @@ public class CGTopic extends ConfigGroup implements Indexable {
         cp_Responsible = (String)pv[2].Value;
         cp_Time = (String)pv[3].Value;
     }
-
+    
     /**
      * copies the data in this CGTopic object
      * to the given row.
-     * @param row the row object (PropertyValue array) to
+     * @param row the row object (PropertyValue array) to 
      * copy the data to.
      */
     public void setDataToRow(Object row) {
@@ -79,9 +79,9 @@ public class CGTopic extends ConfigGroup implements Indexable {
         pv[2].Value = cp_Responsible;
         pv[3].Value = cp_Time;
     }
-
+    
     public int getIndex() {
         return cp_Index;
     }
-
+    
 }
diff --git a/wizards/com/sun/star/wizards/agenda/CallWizard.java b/wizards/com/sun/star/wizards/agenda/CallWizard.java
index 69b62c56e4f7..de5a16106d8b 100644
--- a/wizards/com/sun/star/wizards/agenda/CallWizard.java
+++ b/wizards/com/sun/star/wizards/agenda/CallWizard.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,7 +51,7 @@ public class CallWizard {
     /**
      * Gives a factory for creating the service. This method is called by the
      * <code>JavaLoader</code>
-     *
+     * 
      * <p></p>
      *
      * @param stringImplementationName The implementation name of the component.
@@ -112,8 +112,8 @@ public class CallWizard {
          * Execute Wizard
          *
          * @param str only valid parameter is 'start' at the moment.
-         */
-
+         */     
+        
         public void trigger(String str) {
             try {
                 if (str.equalsIgnoreCase("start")) {
@@ -151,7 +151,7 @@ public class CallWizard {
          *         will be passed to the caller.
          */
         public void initialize(Object[] object) throws com.sun.star.uno.Exception {
-
+            
         }
 
         /**
diff --git a/wizards/com/sun/star/wizards/agenda/TemplateConsts.java b/wizards/com/sun/star/wizards/agenda/TemplateConsts.java
index 44ce6a1e0f0e..5a6f3b59f821 100644
--- a/wizards/com/sun/star/wizards/agenda/TemplateConsts.java
+++ b/wizards/com/sun/star/wizards/agenda/TemplateConsts.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
@@ -48,7 +48,7 @@ public interface TemplateConsts
      */
     public final static String SECTION_TOPICS = "AGENDA_TOPICS";
     /**
-     * the name of the parent minutes section.
+     * the name of the parent minutes section. 
      */
     public final static String SECTION_MINUTES_ALL = "MINUTES_ALL";
     /**
@@ -58,9 +58,9 @@ public interface TemplateConsts
     public final static String SECTION_MINUTES = "MINUTES";    //public final static String AGENDA_ITEM = "AGENDA_ITEM";
     /**
      * taged headings and names.
-     * These will be searched in item tables (in the template) and will be
+     * These will be searched in item tables (in the template) and will be 
      * replaced with resource strings.
-     *
+     * 
      * headings...
      */
     public final static String FILLIN_MEETING_TYPE = "<meeting-type>";
@@ -80,7 +80,7 @@ public interface TemplateConsts
     /**
      * Styles (paragraph styles) used for agenda items.
      * headings styles
-     *
+     * 
      */
     public final static String STYLE_MEETING_TYPE = "MeetingType";
     public final static String STYLE_BRING = "Bring";
@@ -97,9 +97,9 @@ public interface TemplateConsts
     public final static String STYLE_OBSERVERS = "Observers";
     public final static String STYLE_RESOURCE_PERSONS = "ResourcePersons";
     /**
-     * Styles (paragraph styles) used for the <b>text</b> of agenda items
+     * Styles (paragraph styles) used for the <b>text</b> of agenda items 
      * The agenda wizard creates fill-in fields with the given styles...)
-     *
+     * 
      * headings fields styles
      */
     public final static String STYLE_MEETING_TYPE_TEXT = "MeetingTypeText";
diff --git a/wizards/com/sun/star/wizards/agenda/TopicsControl.java b/wizards/com/sun/star/wizards/agenda/TopicsControl.java
index eb13e2f8b65c..db39ea99d2ac 100644
--- a/wizards/com/sun/star/wizards/agenda/TopicsControl.java
+++ b/wizards/com/sun/star/wizards/agenda/TopicsControl.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,13 +53,13 @@ import com.sun.star.wizards.ui.event.MethodInvocation;
  * @author rpiterman
  * This class implements the UI functionality of the topics scroller control.
  * <br/>
- * During developement, there has been a few changes which were not *fully* done -
+ * During developement, there has been a few changes which were not *fully* done - 
  * mainly in converting the topics and time boxes from combobox and time box to normal textboxes,
- * so in the code they might be referenced as combobox or timebox. This should be
+ * so in the code they might be referenced as combobox or timebox. This should be 
  * rather understood as topicstextbox and timetextbox.
  * <br/>
  * <br/>
- * Important behaiviour of this control is that there is always a
+ * Important behaiviour of this control is that there is always a 
  * blank row at the end, in which the user can enter data.<br/>
  * Once the row is not blank (thus, the user entered data...),
  * a new blank row is added.<br/>
@@ -69,7 +69,7 @@ import com.sun.star.wizards.ui.event.MethodInvocation;
  * The contorl shows 5 rows at a time.<br/>
  * If, for example, only 2 rows exist (from which the 2ed one is empty...)
  * then the other three rows, which do not exist in the data model, are disabled.
- * <br/>
+ * <br/> 
  * The following other functionality is implemented:
  * <br/>
  * 0. synchroniting data between controls, data model and live preview.
@@ -78,7 +78,7 @@ import com.sun.star.wizards.ui.event.MethodInvocation;
  * 3. Removing rows and adding new rows.<br/>
  * 4. Moving rows up and down. <br/>
  * <br/>
- * This control relays on the ControlScroller control which uses the following
+ * This control relays on the ControlScroller control which uses the following 
  * Data model:<br/>
  * 1. It uses a vector, whos members are arrays of PropertyValue.<br/>
  * 2. Each array represents a row.<br/>
@@ -86,10 +86,10 @@ import com.sun.star.wizards.ui.event.MethodInvocation;
  * 3. Each property Value represents a value for a single control with the following rules:<br/>
  * 3. a. the Value of the property is used for as value of the controls (usually text).<br/>
  * 3. b. the Name of the property is used to map values to UI controls in the following manner:<br/>
- * 3. b. 1. only the Name of the first X Rows is regarded, where X is the number of visible rows
+ * 3. b. 1. only the Name of the first X Rows is regarded, where X is the number of visible rows 
  * (in the agenda wizard this would be 5, since 5 topic rows are visible on the dialog).<br/>
- * 3. b. 2. The Names of the first X (or 5...) rows are the names of the UI Controls to
- * hold values. When the control scroller scrolls, it looks at the first 5 rows and uses
+ * 3. b. 2. The Names of the first X (or 5...) rows are the names of the UI Controls to 
+ * hold values. When the control scroller scrolls, it looks at the first 5 rows and uses 
  * the names specified there to map the current values to the specified controls.
  * <br/>
  * This data model makes the following limitations on the implementation:
@@ -101,26 +101,26 @@ import com.sun.star.wizards.ui.event.MethodInvocation;
  * <br/>
  * To save the topics in the registry a ConfigSet of objects of type CGTopic is
  * being used.
- * This one is not synchronized "live", since it is unnecessary... instead, it is
+ * This one is not synchronized "live", since it is unnecessary... instead, it is 
  * synchronized on call, before the settings should be saved.
  */
 public class TopicsControl extends ControlScroller implements XFocusListener
 {
 
     /**
-     * The name prefix of the number (label) controls
+     * The name prefix of the number (label) controls 
      */
     public static final String LABEL = "lblTopicCnt_";
     /**
-     * The name prefix of the topic (text) controls
+     * The name prefix of the topic (text) controls 
      */
     public static final String TOPIC = "txtTopicTopic_";
     /**
-     * The name prefix of the responsible (text) controls
+     * The name prefix of the responsible (text) controls 
      */
     public static final String RESP = "cbTopicResp_";
     /**
-     * The name prefix of the time (text) controls
+     * The name prefix of the time (text) controls 
      */
     public static final String TIME = "txtTopicTime_";
     Object lastFocusControl;
@@ -229,10 +229,10 @@ public class TopicsControl extends ControlScroller implements XFocusListener
         insertRowAtEnd();
     }
 
-    /**
-     * Insert a blank (empty) row
+    /** 
+     * Insert a blank (empty) row 
      * as last row of the control.
-     * The control has always a blank row at the
+     * The control has always a blank row at the 
      * end, which enables the user to enter data...
      */
     protected void insertRowAtEnd()
@@ -267,7 +267,7 @@ public class TopicsControl extends ControlScroller implements XFocusListener
     /**
      * overrides the parent class method to also enable the
      * row whenever data is written to it.
-     * @param guiRow
+     * @param guiRow 
      */
     protected void fillupControls(int guiRow)
     {
@@ -305,7 +305,7 @@ public class TopicsControl extends ControlScroller implements XFocusListener
      * in order to use the "move up", "down" "insert" and "remove" buttons,
      * we track the last control the gained focus, in order to know which
      * row should be handled.
-     * @param fe
+     * @param fe 
      */
     public void focusGained(FocusEvent fe)
     {
@@ -314,7 +314,7 @@ public class TopicsControl extends ControlScroller implements XFocusListener
     }
 
     /**
-     * Sometimes I set the focus programatically to a control
+     * Sometimes I set the focus programatically to a control 
      * (for example when moving a row up or down, the focus should move
      * with it).
      * In such cases, no VCL event is being triggered so it must
@@ -355,7 +355,7 @@ public class TopicsControl extends ControlScroller implements XFocusListener
 
     /**
      * compolsary implementation of FocusListener.
-     * @param fe
+     * @param fe 
      */
     public void focusLost(FocusEvent fe)
     {
@@ -363,7 +363,7 @@ public class TopicsControl extends ControlScroller implements XFocusListener
 
     /**
      * compolsary implementation of FocusListener.
-     * @param o
+     * @param o 
      */
     public void disposing(EventObject o)
     {
@@ -387,7 +387,7 @@ public class TopicsControl extends ControlScroller implements XFocusListener
         rowUp(lastFocusRow - nscrollvalue, lastFocusControl);
     }
 
-    /**
+    /** 
      * move the current row down.
      */
     public void rowDown()
@@ -479,7 +479,7 @@ public class TopicsControl extends ControlScroller implements XFocusListener
      * The index is important because it is used in the
      * Name member of the PropertyValue objects.
      * To know why see general class documentation above (data model explanation).
-     * @param i the index of the new row
+     * @param i the index of the new row 
      * @return
      */
     private PropertyValue[] newRow(int i)
@@ -496,8 +496,8 @@ public class TopicsControl extends ControlScroller implements XFocusListener
      * Implementation of ControlScroller
      * This is a UI method which inserts a new row to the control.
      * It uses the child-class ControlRow. (see below).
-     * @param _index
-     * @param npos
+     * @param _index 
+     * @param npos 
      * @see ControlRow
      */
     protected void insertControlGroup(int _index, int npos)
@@ -509,10 +509,10 @@ public class TopicsControl extends ControlScroller implements XFocusListener
 
     /**
      * Implementation of ControlScroller
-     * This is a UI method which makes a row visibele.
+     * This is a UI method which makes a row visibele. 
      * As far as I know it is never called.
-     * @param _index
-     * @param _bIsVisible
+     * @param _index 
+     * @param _bIsVisible 
      * @see ControlRow
      */
     protected void setControlGroupVisible(int _index, boolean _bIsVisible)
@@ -545,7 +545,7 @@ public class TopicsControl extends ControlScroller implements XFocusListener
     private Object[] oldData;
 
     /**
-     * update the preview document and
+     * update the preview document and 
      * remove/insert rows if needed.
      * @param guiRow
      * @param column
@@ -652,7 +652,7 @@ public class TopicsControl extends ControlScroller implements XFocusListener
     }
 
     /**
-     * If the user presses tab on the last control, and
+     * If the user presses tab on the last control, and 
      * there *are* more rows in the model, scroll down.
      * @param event
      */
@@ -673,7 +673,7 @@ public class TopicsControl extends ControlScroller implements XFocusListener
     }
 
     /**
-     * If the user presses shift-tab on the first control, and
+     * If the user presses shift-tab on the first control, and 
      * there *are* more rows in the model, scroll up.
      * @param event
      */
@@ -707,7 +707,7 @@ public class TopicsControl extends ControlScroller implements XFocusListener
     /**
      * moves the given row one row down.
      * @param guiRow the gui index of the row to move.
-     * @param control the control to gain focus after moving.
+     * @param control the control to gain focus after moving. 
      */
     synchronized void rowDown(int guiRow, Object control)
     {
@@ -851,9 +851,9 @@ public class TopicsControl extends ControlScroller implements XFocusListener
             insertRowAtEnd();
         /*
          * if we did not change the last row but
-         * we did change the one before - check if we
-         * have two empty rows at the end.
-         * If so, delete the last one...
+         * we did change the one before - check if we 
+         * have two empty rows at the end. 
+         * If so, delete the last one... 
          */
         }
         else if ((row1 + nscrollvalue) + (row2 + nscrollvalue) == (scrollfields.size() * 2 - 5))
@@ -1027,7 +1027,7 @@ public class TopicsControl extends ControlScroller implements XFocusListener
 
     /**
      * needed to make this data poblic.
-     * @return the List containing the topics data.
+     * @return the List containing the topics data. 
      */
     public List getTopicsData()
     {
@@ -1057,7 +1057,7 @@ public class TopicsControl extends ControlScroller implements XFocusListener
     };
 
     /**
-     *
+     * 
      * @author rp143992
      * A class represting a single GUI row.
      * Note that the instance methods of this class
@@ -1068,7 +1068,7 @@ public class TopicsControl extends ControlScroller implements XFocusListener
     {
 
         /**
-         * the number (label) control
+         * the number (label) control 
          */
         Object label;
         /**
@@ -1231,7 +1231,7 @@ public class TopicsControl extends ControlScroller implements XFocusListener
         /**
          * Impelementation of XKeyListener.
          * Optionally performs the one of the following:
-         * cursor up, or down, row up or down
+         * cursor up, or down, row up or down 
          */
         public void keyPressed(KeyEvent event)
         {
@@ -1257,7 +1257,7 @@ public class TopicsControl extends ControlScroller implements XFocusListener
         /**
          * returns the column number of the given control.
          * The given control must belong to this row or
-         * an IllegalArgumentException will accure.
+         * an IllegalArgumentException will accure. 
          * @param control
          * @return an int columnd number of the given control (0 to 3).
          */
diff --git a/wizards/com/sun/star/wizards/common/ConfigGroup.java b/wizards/com/sun/star/wizards/common/ConfigGroup.java
index 1b260132a5f4..56a4c0c632a2 100644
--- a/wizards/com/sun/star/wizards/common/ConfigGroup.java
+++ b/wizards/com/sun/star/wizards/common/ConfigGroup.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 @@ public class ConfigGroup implements ConfigNode
 
     /**
      * convert the primitive type value of the
-     * given Field object to the corresponding
-     * Java Object value.
+     * given Field object to the corresponding 
+     * Java Object value. 
      * @param field
      * @return the value of the field as a Object.
      * @throws IllegalAccessException
diff --git a/wizards/com/sun/star/wizards/common/ConfigNode.java b/wizards/com/sun/star/wizards/common/ConfigNode.java
index 23c0f9c5ba81..f6d9e2533c2b 100644
--- a/wizards/com/sun/star/wizards/common/ConfigNode.java
+++ b/wizards/com/sun/star/wizards/common/ConfigNode.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,8 +27,8 @@
 package com.sun.star.wizards.common;
 
 /**
- * This Interface specifies a method of an object which is
- * capable of reading adn writing its data out of the
+ * This Interface specifies a method of an object which is 
+ * capable of reading adn writing its data out of the 
  * OO Configuration. <br/>
  * There are 2 direct implementations: ConfigGroup and ConfigSet.
  * The root is the first Java Object in the configuration hirarchie.
@@ -39,7 +39,7 @@ public interface ConfigNode
 
     /**
      * reads the object data out of the configuration.
-     * @param  configurationView is a ::com::sun::star::configuration::HierarchyElement
+     * @param  configurationView is a ::com::sun::star::configuration::HierarchyElement 
      * which represents the node corresponding to the Object.
      * @param param a free parameter. Since the intension of this interface is
      * to be used in a tree like way, reading objects and subobjects and so on,
diff --git a/wizards/com/sun/star/wizards/common/ConfigSet.java b/wizards/com/sun/star/wizards/common/ConfigSet.java
index 216f91b5e430..72b4e2cbc2e1 100644
--- a/wizards/com/sun/star/wizards/common/ConfigSet.java
+++ b/wizards/com/sun/star/wizards/common/ConfigSet.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
@@ -399,7 +399,7 @@ public class ConfigSet implements ConfigNode, XMLProvider, ListModel
     /**
      * Set members might include a property
      * which orders them.
-     * This method reindexes the given member to be
+     * This method reindexes the given member to be 
      * the index number 0
      * Do not forget to call commit() after calling this method.
      * @param confView
diff --git a/wizards/com/sun/star/wizards/common/Configuration.java b/wizards/com/sun/star/wizards/common/Configuration.java
index 103fdc5848a2..2ee2fc51a696 100644
--- a/wizards/com/sun/star/wizards/common/Configuration.java
+++ b/wizards/com/sun/star/wizards/common/Configuration.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.util.XChangesBatch;
  * For the get methods, two parameters must be given: name and parent, where name is the
  * name of the property, parent is a HierarchyElement (::com::sun::star::configuration::HierarchyElement)<br/>
  * The get and set methods support hieryrchical property names like "options/gridX". <br/>
- * NOTE: not yet supported, but sometime later,
- * If you will ommit the "parent" parameter, then the "name" parameter must be in hierarchy form from
+ * NOTE: not yet supported, but sometime later, 
+ * If you will ommit the "parent" parameter, then the "name" parameter must be in hierarchy form from 
  * the root of the registry.
  * @author  rpiterman
  */
diff --git a/wizards/com/sun/star/wizards/common/DebugHelper.java b/wizards/com/sun/star/wizards/common/DebugHelper.java
index b560fb643a40..cb70ce050591 100644
--- a/wizards/com/sun/star/wizards/common/DebugHelper.java
+++ b/wizards/com/sun/star/wizards/common/DebugHelper.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/common/Desktop.java b/wizards/com/sun/star/wizards/common/Desktop.java
index 8902696c37b4..a9c04086ce08 100644
--- a/wizards/com/sun/star/wizards/common/Desktop.java
+++ b/wizards/com/sun/star/wizards/common/Desktop.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
@@ -266,7 +266,7 @@ public class Desktop
 
     /**
      * Checks if the passed Element Name already exists in the  ElementContainer. If yes it appends a
-     * suffix to make it unique
+     * suffix to make it unique 
      * @param xElementContainer
      * @param sElementName
      * @return a unique Name ready to be added to the container.
@@ -279,7 +279,7 @@ public class Desktop
 
     /**
      * Checks if the passed Element Name already exists in the  ElementContainer. If yes it appends a
-     * suffix to make it unique
+     * suffix to make it unique 
      * @param xElementContainer
      * @param sElementName
      * @return a unique Name ready to be added to the container.
@@ -295,7 +295,7 @@ public class Desktop
      * suffix to make it unique
      * @param _slist
      * @param _sElementName
-     * @param _sSuffixSeparator
+     * @param _sSuffixSeparator 
      * @return a unique Name not being in the passed list.
      */
     public static String getUniqueName(String[] _slist, String _sElementName, String _sSuffixSeparator)
@@ -362,7 +362,7 @@ public class Desktop
     /**
      * @deprecated used to retrieve the most common paths used in the office application
      * @author bc93774
-     *
+     * 
      */
     public class OfficePathRetriever
     {
@@ -467,10 +467,10 @@ public class Desktop
      * 1. Check if the given desktop argument has a componentWindow.
      * If it is null, the myFrame argument is taken.
      * 2. Go up the tree of frames and search a frame with a component window.
-     * 3. Get from the desktop all the components, and give the first one
+     * 3. Get from the desktop all the components, and give the first one 
      * which has a frame.
      * @param xMSF
-     * @param myFrame
+     * @param myFrame 
      * @param desktop
      * @return
      * @throws NoSuchElementException
diff --git a/wizards/com/sun/star/wizards/common/FileAccess.java b/wizards/com/sun/star/wizards/common/FileAccess.java
index 6278d7e71a97..8c87d094f82c 100644
--- a/wizards/com/sun/star/wizards/common/FileAccess.java
+++ b/wizards/com/sun/star/wizards/common/FileAccess.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,10 +51,10 @@ import com.sun.star.document.XDocumentProperties;
 /**
  * This class delivers static convenience methods
  * to use with ucb SimpleFileAccess service.
- * You can also instanciate the class, to encapsulate
+ * You can also instanciate the class, to encapsulate 
  * some functionality of SimpleFileAccess. The instance
  * keeps a reference to an XSimpleFileAccess and an
- * XFileIdentifierConverter, saves the permanent
+ * XFileIdentifierConverter, saves the permanent 
  * overhead of quering for those interfaces, and delivers
  * conveneince methods for using them.
  * These Convenince methods include mainly Exception-handling.
@@ -63,7 +63,7 @@ public class FileAccess
 {
 
     /**
-     *
+     * 
      * @param xMSF
      * @param sPath
      * @param sAddPath
@@ -598,7 +598,7 @@ public class FileAccess
      * @param xMSF
      * @param FilterName the prefix of the filename. a "-" is added to the prefix !
      * @param FolderName the folder (URL) to look for files...
-     * @return an array with two array members. The first one, with document titles,
+     * @return an array with two array members. The first one, with document titles, 
      * the second with the corresponding URLs.
      * @deprecated please use the getFolderTitles() with ArrayList
      */
@@ -699,7 +699,7 @@ public class FileAccess
     }
 
     /**
-     *
+     * 
      * @param xMSF
      * @param _sStartFilterName
      * @param FolderNames
@@ -1004,7 +1004,7 @@ public class FileAccess
 
     /**
      * @author rpiterman
-     * @param path
+     * @param path 
      * @param pathSeparator
      * @return
      */
@@ -1061,8 +1061,8 @@ public class FileAccess
     }
 
     /**
-     *
-     * @param url
+     * 
+     * @param url 
      * @return the parent dir of the given url.
      * if the path points to file, gives the directory in which the file is.
      */
@@ -1166,7 +1166,7 @@ public class FileAccess
     }
 
     /**
-     * shortens a filename to a user displayable representation.
+     * shortens a filename to a user displayable representation. 
      * @param path
      * @param maxLength
      * @return
diff --git a/wizards/com/sun/star/wizards/common/Helper.java b/wizards/com/sun/star/wizards/common/Helper.java
index 0df16b360de0..681f03b8ea35 100644
--- a/wizards/com/sun/star/wizards/common/Helper.java
+++ b/wizards/com/sun/star/wizards/common/Helper.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/wizards/com/sun/star/wizards/common/IRenderer.java b/wizards/com/sun/star/wizards/common/IRenderer.java
index 1aa73eaa599b..f781bc845b49 100644
--- a/wizards/com/sun/star/wizards/common/IRenderer.java
+++ b/wizards/com/sun/star/wizards/common/IRenderer.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER 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 @@ package com.sun.star.wizards.common;
  * A General interface which gives a string
  * that represents the rendered argument object.
  * Can be used to reference resources, internationalizartion
- * a.s.o
+ * a.s.o 
  */
 public interface IRenderer
 {
diff --git a/wizards/com/sun/star/wizards/common/Indexable.java b/wizards/com/sun/star/wizards/common/Indexable.java
index d95640f1ec70..b5a5d53cfe61 100644
--- a/wizards/com/sun/star/wizards/common/Indexable.java
+++ b/wizards/com/sun/star/wizards/common/Indexable.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/common/InvalidQueryException.java b/wizards/com/sun/star/wizards/common/InvalidQueryException.java
index 325f6fdc3760..f36aba00f8f2 100644
--- a/wizards/com/sun/star/wizards/common/InvalidQueryException.java
+++ b/wizards/com/sun/star/wizards/common/InvalidQueryException.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/common/JavaTools.java b/wizards/com/sun/star/wizards/common/JavaTools.java
index 836b2a7ea242..439033ee2863 100644
--- a/wizards/com/sun/star/wizards/common/JavaTools.java
+++ b/wizards/com/sun/star/wizards/common/JavaTools.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
@@ -135,7 +135,7 @@ public class JavaTools
 
     /**converts a list of Integer values included in an Integer vector to a list of int values
      *
-     *
+     * 
      * @param _aIntegerVector
      * @return
      */
@@ -160,8 +160,8 @@ public class JavaTools
     }
 
     /**converts a list of Boolean values included in a Boolean vector to a list of boolean values
-     *
-     *
+     * 
+     * 
      * @param _aBooleanVector
      * @return
      */
@@ -523,8 +523,8 @@ public class JavaTools
                 {
                     retvector.add(baselist[i]);
                 //          else
-                // here you could call the method of a defined interface to notify the calling method
-                //      }
+                // here you could call the method of a defined interface to notify the calling method                                           
+                //      }       
                 }
             }
             retarray = new String[retvector.size()];
@@ -548,7 +548,7 @@ public class JavaTools
                     {
                         retvector.add(baselist[i]);
                     //          else
-                    // here you could call the method of a defined interface to notify the calling method
+                    // here you could call the method of a defined interface to notify the calling method                                           
                     }
                 }
                 retarray = new String[retvector.size()][2];
@@ -602,7 +602,7 @@ public class JavaTools
     /**
      * searches a multidimensional array for duplicate fields. According to the following example
      * SlaveFieldName1 ;SlaveFieldName2; SlaveFieldName3
-     * MasterFieldName1;MasterFieldName2;MasterFieldName3
+     * MasterFieldName1;MasterFieldName2;MasterFieldName3 
      * The entries SlaveFieldNameX and MasterFieldNameX are grouped together and then the created groups are compared
      * If a group is duplicate the entry of the second group is returned.
      * @param _scomplist
diff --git a/wizards/com/sun/star/wizards/common/NoValidPathException.java b/wizards/com/sun/star/wizards/common/NoValidPathException.java
index f4975d2fff0c..cdbe0065bb7f 100644
--- a/wizards/com/sun/star/wizards/common/NoValidPathException.java
+++ b/wizards/com/sun/star/wizards/common/NoValidPathException.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/common/NumberFormatter.java b/wizards/com/sun/star/wizards/common/NumberFormatter.java
index cb183eb29c25..dc20c4619bf6 100644
--- a/wizards/com/sun/star/wizards/common/NumberFormatter.java
+++ b/wizards/com/sun/star/wizards/common/NumberFormatter.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,15 +51,15 @@ public class NumberFormatter
     public int iTextFormatKey = -1;
     public int iTimeFormatKey = -1;
     public int iLogicalFormatKey = -1;
-    public long lDateCorrection;
+    public long lDateCorrection;    
     public XNumberFormatter xNumberFormatter;
     public XNumberFormats xNumberFormats;
     public XNumberFormatTypes xNumberFormatTypes;
     public XPropertySet xNumberFormatSettings;
     private boolean bNullDateCorrectionIsDefined = false;
-    private Locale aLocale;
-
-
+    private Locale aLocale; 
+    
+    
     public NumberFormatter(XMultiServiceFactory _xMSF, XNumberFormatsSupplier _xNumberFormatsSupplier, Locale _aLocale) throws Exception
     {
         aLocale = _aLocale;
@@ -67,11 +67,11 @@ public class NumberFormatter
         xNumberFormats = _xNumberFormatsSupplier.getNumberFormats();
         xNumberFormatSettings = _xNumberFormatsSupplier.getNumberFormatSettings();
         xNumberFormatter = (XNumberFormatter) UnoRuntime.queryInterface(XNumberFormatter.class, oNumberFormatter);
-        xNumberFormatter.attachNumberFormatsSupplier(_xNumberFormatsSupplier);
+        xNumberFormatter.attachNumberFormatsSupplier(_xNumberFormatsSupplier);  
         xNumberFormatTypes = (XNumberFormatTypes) UnoRuntime.queryInterface(XNumberFormatTypes.class, xNumberFormats);
-
+        
     }
-
+    
     public NumberFormatter(XNumberFormatsSupplier _xNumberFormatsSupplier, Locale _aLocale) throws Exception
     {
         aLocale = _aLocale;
@@ -80,24 +80,24 @@ public class NumberFormatter
         xNumberFormatTypes = (XNumberFormatTypes) UnoRuntime.queryInterface(XNumberFormatTypes.class, xNumberFormats);
     }
 
-
+    
     /**
      * @param _xMSF
      * @param _xNumberFormatsSupplier
      * @return
      * @throws Exception
      * @deprecated
-     *
+     * 
      */
     public static XNumberFormatter createNumberFormatter(XMultiServiceFactory _xMSF, XNumberFormatsSupplier _xNumberFormatsSupplier) throws Exception
     {
         Object oNumberFormatter = _xMSF.createInstance("com.sun.star.util.NumberFormatter");
         XNumberFormatter xNumberFormatter = (XNumberFormatter) UnoRuntime.queryInterface(XNumberFormatter.class, oNumberFormatter);
-        xNumberFormatter.attachNumberFormatsSupplier(_xNumberFormatsSupplier);
+        xNumberFormatter.attachNumberFormatsSupplier(_xNumberFormatsSupplier);  
         return xNumberFormatter;
     }
-
-
+    
+    
     /**
      * gives a key to pass to a NumberFormat object. <br/>
      * example: <br/>
@@ -110,22 +110,22 @@ public class NumberFormatter
      * @param numberFormatsSupplier
      * @param type - a constant out of i18n.NumberFormatIndex enumeration.
      * @return a key to use with a util.NumberFormat instance.
-     *
+     * 
      */
-    public static int getNumberFormatterKey( Object numberFormatsSupplier, short type)
+    public static int getNumberFormatterKey( Object numberFormatsSupplier, short type) 
     {
         Object numberFormatTypes = ((XNumberFormatsSupplier)UnoRuntime.queryInterface(XNumberFormatsSupplier.class,numberFormatsSupplier)).getNumberFormats();
         Locale l = new Locale();
         return ((XNumberFormatTypes)UnoRuntime.queryInterface(XNumberFormatTypes.class,numberFormatTypes)).getFormatIndex(type, l);
     }
-
-
+    
+    
     public String convertNumberToString(int _nkey, double _dblValue)
     {
         return xNumberFormatter.convertNumberToString(_nkey, _dblValue);
     }
-
-
+    
+    
     public static String convertNumberToString(XNumberFormatter _xNumberFormatter, int _nkey, double _dblValue)
     {
         return _xNumberFormatter.convertNumberToString(_nkey, _dblValue);
@@ -137,19 +137,19 @@ public class NumberFormatter
         return convertStringToNumber(_nkey, _sString);
     }
 
-
+    
     /**
      * @param dateCorrection The lDateCorrection to set.
      */
-    public void setNullDateCorrection(long dateCorrection)
+    public void setNullDateCorrection(long dateCorrection) 
     {
         lDateCorrection = dateCorrection;
-    }
-
-
+    }   
+    
+    
     public int defineNumberFormat(String _FormatString)
     {
-        try
+        try 
         {
             int NewFormatKey = xNumberFormats.queryKey(_FormatString, aLocale, true);
             if (NewFormatKey == -1)
@@ -165,13 +165,13 @@ public class NumberFormatter
         }
     }
 
-
+    
     /**
-     * returns a numberformat for a FormatString.
+     * returns a numberformat for a FormatString. 
      * @param _FormatString
-     * @param _aLocale
+     * @param _aLocale 
      * @return
-     */
+     */ 
     public int defineNumberFormat(String _FormatString, Locale _aLocale)
     {
         try
@@ -189,8 +189,8 @@ public class NumberFormatter
             return -1;
         }
     }
-
-
+    
+    
 
     public void setNumberFormat(XInterface _xFormatObject, int _FormatKey, NumberFormatter _oNumberFormatter)
     {
@@ -243,7 +243,7 @@ public class NumberFormatter
         }
     }
 
-
+    
     public int setBooleanReportDisplayNumberFormat()
     {
         String FormatString = "[=1]" + '"' + (char)9745 + '"' + ";[=0]" + '"' + (char)58480 + '"' + ";0";
@@ -258,12 +258,12 @@ public class NumberFormatter
         catch (Exception e)
         {         //MalformedNumberFormat
             e.printStackTrace();
-            iLogicalFormatKey = xNumberFormatTypes.getStandardFormat(NumberFormat.LOGICAL, aLocale);
+            iLogicalFormatKey = xNumberFormatTypes.getStandardFormat(NumberFormat.LOGICAL, aLocale);                    
         }
         return iLogicalFormatKey;
-    }
-
-
+    }   
+    
+    
     /**
      * @return Returns the iDateFormatKey.
      */
@@ -271,7 +271,7 @@ public class NumberFormatter
     {
         if (iDateFormatKey == -1)
         {
-            iDateFormatKey = xNumberFormatTypes.getStandardFormat(NumberFormat.DATE, aLocale);
+            iDateFormatKey = xNumberFormatTypes.getStandardFormat(NumberFormat.DATE, aLocale);          
         }
         return iDateFormatKey;
     }
@@ -283,7 +283,7 @@ public class NumberFormatter
         if (iDateTimeFormatKey == -1)
         {
             iDateTimeFormatKey = xNumberFormatTypes.getStandardFormat(NumberFormat.DATETIME, aLocale);
-        }
+        }          
         return iDateTimeFormatKey;
     }
     /**
@@ -294,7 +294,7 @@ public class NumberFormatter
         if (iLogicalFormatKey == -1)
         {
             iLogicalFormatKey = xNumberFormatTypes.getStandardFormat(NumberFormat.LOGICAL, aLocale);
-        }
+        }            
         return iLogicalFormatKey;
     }
     /**
@@ -316,7 +316,7 @@ public class NumberFormatter
         if (iTextFormatKey == -1)
         {
             iTextFormatKey = xNumberFormatTypes.getStandardFormat(NumberFormat.TEXT, aLocale);
-        }
+        }          
         return iTextFormatKey;
     }
     /**
@@ -327,7 +327,7 @@ public class NumberFormatter
         if (iTimeFormatKey == -1)
         {
             iTimeFormatKey = xNumberFormatTypes.getStandardFormat(NumberFormat.TIME, aLocale);
-        }
+        }      
         return iTimeFormatKey;
-    }
+    }   
 }
diff --git a/wizards/com/sun/star/wizards/common/NumericalHelper.java b/wizards/com/sun/star/wizards/common/NumericalHelper.java
index 109affffd5ef..9a5229367aa0 100644
--- a/wizards/com/sun/star/wizards/common/NumericalHelper.java
+++ b/wizards/com/sun/star/wizards/common/NumericalHelper.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER 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 @@ import com.sun.star.uno.TypeClass;
  * Optional or named parameters in SO are of the Object type in Java.
  * These objects must be converted to the right simple value type.
  * Unfortunately, StarBasic does not know the original desired type,
- * and a value that should be a "Float" is delivered as "Byte". This class
+ * and a value that should be a "Float" is delivered as "Byte". This class 
  * handles the conversions of these types.<br>
- * This class does not log warnings (or throws Exceptions) when the precision
+ * This class does not log warnings (or throws Exceptions) when the precision 
  * of a value is lost.
  */
 public class NumericalHelper
@@ -93,7 +93,7 @@ public class NumericalHelper
 
     /**
      * get a byte value from the object
-     * @param aValue
+     * @param aValue 
      * @return a byte
      * @throws com.sun.star.lang.IllegalArgumentException if the object cannot be converted
      */
@@ -151,7 +151,7 @@ public class NumericalHelper
 
     /**
      * get a char value from the object
-     * @param aValue
+     * @param aValue 
      * @return a char
      * @throws com.sun.star.lang.IllegalArgumentException  if the object cannot be converted
      */
@@ -216,7 +216,7 @@ public class NumericalHelper
 
     /**
      * get a short value from the object
-     * @param aValue
+     * @param aValue 
      * @return a short
      * @throws com.sun.star.lang.IllegalArgumentException if the object cannot be converted
      */
@@ -340,7 +340,7 @@ public class NumericalHelper
     /**
     @param _aValue a object this can contain anything
     @return true, if the parameter aValue is type of real numbers
-
+    
     see also http://en.wikipedia.org/wiki/Mathematics
      */
     public static boolean isRealNumber(Object _aValue)
@@ -351,7 +351,7 @@ public class NumericalHelper
     /**
     @param aValue a object this can contain anything
      * @return true, if the value is type of any integer values. double / float are not(!) integer values
-     * @throws com.sun.star.lang.IllegalArgumentException
+     * @throws com.sun.star.lang.IllegalArgumentException 
      */
     public static boolean isInteger(Object aValue) throws com.sun.star.lang.IllegalArgumentException
     {
@@ -414,8 +414,8 @@ public class NumericalHelper
 //        DebugHelper.exception(BasicErrorCode.SbERR_CONVERSION, "");
 //        return 0;
 //    }}
-//
-//
+//    
+//    
 //    public static String toStringWithErrorMessage(Object _aValue) throws com.sun.star.script.BasicErrorException{
 //    try {
 //        return toString(_aValue);
@@ -425,7 +425,7 @@ public class NumericalHelper
 //        return "";
 //    }}
 //
-//
+//    
 //    public static int toIntWithErrorMessage(Object _aValue, int _ndefaultValue) throws com.sun.star.script.BasicErrorException{
 //    try {
 //        return toInt(_aValue, _ndefaultValue);
@@ -438,14 +438,14 @@ public class NumericalHelper
 //    public static boolean toBooleanWithErrorMessage(Object _oObject, int _nTrueField, int _nFalseField) throws com.sun.star.script.BasicErrorException{
 //        return toBooleanWithErrorMessage(_oObject, new int[]{_nTrueField}, new int[]{_nFalseField});
 //    }
-//
-//
+//    
+//    
 //    public static boolean toBooleanWithErrorMessage(Object _oObject) throws com.sun.star.script.BasicErrorException{
 //        try{
 //            return toBoolean(_oObject);
 //        }
 //        catch (java.lang.Exception e){
-//           DebugHelper.exception(BasicErrorCode.SbERR_BAD_ARGUMENT, "");
+//           DebugHelper.exception(BasicErrorCode.SbERR_BAD_ARGUMENT, ""); 
 //           return false;
 //        }
 //    }
@@ -465,16 +465,16 @@ public class NumericalHelper
 //            return false;
 //        }
 //    }catch (java.lang.Exception e){
-//       DebugHelper.exception(BasicErrorCode.SbERR_OUT_OF_RANGE, "");
+//       DebugHelper.exception(BasicErrorCode.SbERR_OUT_OF_RANGE, ""); 
 //        return false;
 //    }}
-//
-//
+//        
+//    
 //    public static boolean toBooleanWithErrorMessage(Object _oObject, int _nTrueField, int _nFalseField, boolean _bdefaultValue) throws com.sun.star.script.BasicErrorException{
 //        return toBooleanWithErrorMessage(_oObject, new int[]{_nTrueField}, new int[]{_nFalseField}, _bdefaultValue);
 //    }
-//
-//
+//    
+//    
 //    public static boolean toBooleanWithErrorMessage(Object _oObject, int[] _nTrueFields, int[] _nFalseFields, boolean _bdefaultValue) throws com.sun.star.script.BasicErrorException{
 //    try{
 //        if ((_oObject == null) || (AnyConverter.isVoid(_oObject))){
@@ -494,12 +494,12 @@ public class NumericalHelper
 //            }
 //        }
 //    }catch (java.lang.Exception e){
-//       DebugHelper.exception(BasicErrorCode.SbERR_OUT_OF_RANGE, "");
+//       DebugHelper.exception(BasicErrorCode.SbERR_OUT_OF_RANGE, ""); 
 //        return false;
 //    }}
     /**
      * get an int value from the object
-     * @param aValue
+     * @param aValue 
      * @return an int
      * @throws com.sun.star.lang.IllegalArgumentException if the object cannot be converted
      */
@@ -555,7 +555,7 @@ public class NumericalHelper
 
     /**
      * get a long value from the object
-     * @param aValue
+     * @param aValue 
      * @return a long
      * @throws com.sun.star.lang.IllegalArgumentException if the object cannot be converted
      */
@@ -611,7 +611,7 @@ public class NumericalHelper
 
     /**
      * get a float value from the object
-     * @param aValue
+     * @param aValue 
      * @return a float
      * @throws com.sun.star.lang.IllegalArgumentException if the object cannot be converted
      */
@@ -667,7 +667,7 @@ public class NumericalHelper
 
     /**
      * get a double value from the object
-     * @param aValue
+     * @param aValue 
      * @return a double
      * @throws com.sun.star.lang.IllegalArgumentException if the object cannot be converted
      */
@@ -723,7 +723,7 @@ public class NumericalHelper
 
     /**
      * get a String value from the object
-     * @param aValue
+     * @param aValue 
      * @return a String
      * @throws com.sun.star.lang.IllegalArgumentException if the object cannot be converted
      */
@@ -773,7 +773,7 @@ public class NumericalHelper
 
     /**
      * get a boolean value from the object
-     * @param aValue
+     * @param aValue 
      * @return a boolean
      * @throws com.sun.star.lang.IllegalArgumentException if the object cannot be converted
      */
@@ -831,7 +831,7 @@ public class NumericalHelper
      * get an int array from an object
      * @param anArrayValue a value that is constructed into an array
      * @return an integer array
-     * @throws com.sun.star.lang.IllegalArgumentException
+     * @throws com.sun.star.lang.IllegalArgumentException 
      */
     public static int[] toIntArray(Object anArrayValue)
             throws com.sun.star.lang.IllegalArgumentException
@@ -865,7 +865,7 @@ public class NumericalHelper
      * get an byte array from an object
      * @param anArrayValue a value that is constructed into an array
      * @return a byte array
-     * @throws com.sun.star.lang.IllegalArgumentException
+     * @throws com.sun.star.lang.IllegalArgumentException 
      */
     public static byte[] toByteArray(Object anArrayValue)
             throws com.sun.star.lang.IllegalArgumentException
@@ -899,7 +899,7 @@ public class NumericalHelper
      * get a short array from an object
      * @param anArrayValue a value that is constructed into an array
      * @return a short array
-     * @throws com.sun.star.lang.IllegalArgumentException
+     * @throws com.sun.star.lang.IllegalArgumentException 
      */
     public static short[] toShortArray(Object anArrayValue)
             throws com.sun.star.lang.IllegalArgumentException
@@ -933,7 +933,7 @@ public class NumericalHelper
      * get a string array from an object
      * @param anArrayValue a value that is constructed into an array
      * @return a short array
-     * @throws com.sun.star.lang.IllegalArgumentException
+     * @throws com.sun.star.lang.IllegalArgumentException 
      */
     public static String[] toStringArray(Object anArrayValue)
             throws com.sun.star.lang.IllegalArgumentException
@@ -968,7 +968,7 @@ public class NumericalHelper
      * @param _aValue a value that is constructed into an int
      * @param _ndefaultValue the value that is returned, if conversion fails, or if 'aValue' is null
      * @return an int value
-     * @throws java.lang.Exception
+     * @throws java.lang.Exception 
      */
     public static int toInt(Object _aValue, int _ndefaultValue) throws Exception
     {
@@ -1169,7 +1169,7 @@ public class NumericalHelper
 //            throws com.sun.star.script.BasicErrorException {
 //        return RomanNumbering.getRomanEquivalent(n);
 //    }
-    /**
+    /** 
      * get the type object from the given object
      * @param aValue an object representing a (numerical) value; can also be an 'any'
      * @return a type object: the object together with the its type information
@@ -1285,7 +1285,7 @@ public class NumericalHelper
     /**
      * get the simple int type
      * @param typeObject
-     * @return
+     * @return 
      * @throws com.sun.star.lang.IllegalArgumentException
      */
     static int getInt(TypeObject typeObject)
@@ -1301,7 +1301,7 @@ public class NumericalHelper
 
     /**
      * get the simple float type
-     * @throws com.sun.star.lang.IllegalArgumentException
+     * @throws com.sun.star.lang.IllegalArgumentException 
      */
     static float getFloat(TypeObject typeObject)
             throws com.sun.star.lang.IllegalArgumentException
@@ -1496,7 +1496,7 @@ public class NumericalHelper
 
 //    public static boolean isObjectNumericRepresentation(Object _oValue, NumberFormatter _oNumberFormatter, XPropertySet _xPropertySet) throws com.sun.star.script.BasicErrorException{
 //    try{
-//        int nNumberFormat = AnyConverter.toInt(_xPropertySet.getPropertyValue("NumberFormat"));
+//        int nNumberFormat = AnyConverter.toInt(_xPropertySet.getPropertyValue("NumberFormat"));        
 //        if (AnyConverter.isString(_oValue)){
 //            String sCellContent = AnyConverter.toString(_oValue);
 //            try{
@@ -1511,9 +1511,9 @@ public class NumericalHelper
 //        }
 //    }
 //    catch (com.sun.star.uno.Exception e){
-//        DebugHelper.exception(1 /*BasicErrorCode.SbERR_METHOD_FAILED*/, "");
+//        DebugHelper.exception(1 /*BasicErrorCode.SbERR_METHOD_FAILED*/, "");          
 //        return false;
-//    }}
+//    }} 
     /**
      * Helper class for roman numbering
      */
@@ -1558,7 +1558,7 @@ public class NumericalHelper
                 }
                 String number = NumericalHelper.toString(new Integer(n));
                 /* converison idea: every digit is written with a maximum of two
-                 * different roman symbols, using three in total, e.g. CC, CD,
+                 * different roman symbols, using three in total, e.g. CC, CD, 
                  * DCC, CM for the hundreds (meaning 200, 400, 700 and 900).
                  * So every digit is converted seperately with regard to the
                  * special cases 4 and 9.
diff --git a/wizards/com/sun/star/wizards/common/Properties.java b/wizards/com/sun/star/wizards/common/Properties.java
index 6b4155d15adf..6f0a963c21a2 100644
--- a/wizards/com/sun/star/wizards/common/Properties.java
+++ b/wizards/com/sun/star/wizards/common/Properties.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/common/PropertySetHelper.java b/wizards/com/sun/star/wizards/common/PropertySetHelper.java
index aec166a5c1c5..a652b168ceba 100644
--- a/wizards/com/sun/star/wizards/common/PropertySetHelper.java
+++ b/wizards/com/sun/star/wizards/common/PropertySetHelper.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER 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,10 +79,10 @@ public class PropertySetHelper
     }
 
     /**
-    set a property,
+    set a property, 
     @param _sName name of the property to set
     @param _aValue property value as object
-     * @throws java.lang.Exception
+     * @throws java.lang.Exception 
      */
     public void setPropertyValue(String _sName, Object _aValue) throws java.lang.Exception
     {
diff --git a/wizards/com/sun/star/wizards/common/Resource.java b/wizards/com/sun/star/wizards/common/Resource.java
index 8dc660b21d07..39607a2f8781 100644
--- a/wizards/com/sun/star/wizards/common/Resource.java
+++ b/wizards/com/sun/star/wizards/common/Resource.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/wizards/com/sun/star/wizards/common/SystemDialog.java b/wizards/com/sun/star/wizards/common/SystemDialog.java
index ac3a38c9cf7d..4f75435d7b8d 100644
--- a/wizards/com/sun/star/wizards/common/SystemDialog.java
+++ b/wizards/com/sun/star/wizards/common/SystemDialog.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
@@ -146,10 +146,10 @@ public class SystemDialog
     }
 
     /**
-     *
+     * 
      * @param displayDir
      * @param defaultName
-     * given url to a local path.
+     * given url to a local path. 
      * @return
      */
     public String callStoreDialog(String displayDir, String defaultName)
@@ -333,11 +333,11 @@ public class SystemDialog
      */
     /**
      * @param windowServiceName one of the following strings:
-     * "ErrorBox", "WarningBox", "MessBox", "InfoBox", "QueryBox".
-     * There are other values possible, look
-     * under src/toolkit/source/awt/vcltoolkit.cxx
+     * "ErrorBox", "WarningBox", "MessBox", "InfoBox", "QueryBox". 
+     * There are other values possible, look 
+     * under src/toolkit/source/awt/vcltoolkit.cxx 
      * @param windowAttribute see com.sun.star.awt.VclWindowPeerAttribute
-     * @return 0 = cancel, 1 = ok, 2 = yes,  3 = no(I'm not sure here)
+     * @return 0 = cancel, 1 = ok, 2 = yes,  3 = no(I'm not sure here) 
      * other values check for yourself ;-)
      */
     public static int showMessageBox(XMultiServiceFactory xMSF, String windowServiceName, int windowAttribute, String MessageText)
diff --git a/wizards/com/sun/star/wizards/common/TerminateWizardException.java b/wizards/com/sun/star/wizards/common/TerminateWizardException.java
index 124d98f9ff31..f71a47b27fda 100644
--- a/wizards/com/sun/star/wizards/common/TerminateWizardException.java
+++ b/wizards/com/sun/star/wizards/common/TerminateWizardException.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/common/UCB.java b/wizards/com/sun/star/wizards/common/UCB.java
index 5e3ad00698df..e068f01eb9d7 100644
--- a/wizards/com/sun/star/wizards/common/UCB.java
+++ b/wizards/com/sun/star/wizards/common/UCB.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER 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,18 +56,18 @@ public class UCB
 
     private Object ucb;
     private FileAccess fa;
-
+    
     public UCB(XMultiServiceFactory xmsf) throws Exception
     {
         String[] keys = new String[2];
         keys[ 0 ] = "Local";
         keys[ 1 ] = "Office";
-        ucb = xmsf.createInstanceWithArguments(
+        ucb = xmsf.createInstanceWithArguments(                
             "com.sun.star.ucb.UniversalContentBroker", keys );
         fa = new FileAccess(xmsf);
     }
-
-    public void deleteDirContent(String dir)
+    
+    public void deleteDirContent(String dir) 
         throws Exception
     {
         if (!fa.exists(dir,true))
@@ -80,18 +80,18 @@ public class UCB
             delete(FileAccess.connectURLs(dir ,(String)l.get(i)));
     }
     }
-
+    
     public void delete(String filename) throws Exception
     {
         //System.out.println("UCB.delete(" + filename);
         executeCommand( getContent(filename),"delete",Boolean.TRUE);
     }
-
+    
     public void copy(String sourceDir, String targetDir) throws Exception
     {
         copy(sourceDir,targetDir,(Verifier)null);
     }
-
+    
     public void copy(String sourceDir, String targetDir, Verifier verifier) throws Exception
     {
         List files = listFiles(sourceDir,verifier);
@@ -99,9 +99,9 @@ public class UCB
         {
           copy(sourceDir, (String)files.get(i), targetDir);
         }
-
+        
     }
-
+    
     public void copy(String sourceDir, String filename, String targetDir, String targetName) throws Exception
     {
         if (!fa.exists(targetDir,true))
@@ -111,7 +111,7 @@ public class UCB
         //System.out.println("UCB.copy(" + sourceDir + ", " + filename +  ", " + targetDir+ ", " + targetName);
         executeCommand(ucb, "globalTransfer", copyArg(sourceDir,filename, targetDir,targetName));
     }
-
+    
     /**
      * @deprecated
      * @param sourceDir
@@ -134,7 +134,7 @@ public class UCB
      */
     public GlobalTransferCommandArgument copyArg(String sourceDir, String sourceFilename, String targetDir, String targetFilename)
     {
-
+        
         GlobalTransferCommandArgument aArg = new GlobalTransferCommandArgument();
         aArg.Operation = TransferCommandOperation.COPY;
         aArg.SourceURL = fa.getURL(sourceDir,sourceFilename);
@@ -144,10 +144,10 @@ public class UCB
         aArg.NameClash = NameClash.OVERWRITE;
         return aArg;
     }
-
+    
     public Object executeCommand(Object xContent, String aCommandName, Object aArgument)
-        throws com.sun.star.ucb.CommandAbortedException,
-            com.sun.star.uno.Exception
+        throws com.sun.star.ucb.CommandAbortedException, 
+            com.sun.star.uno.Exception 
     {
         XCommandProcessor xCmdProcessor = (XCommandProcessor)UnoRuntime.queryInterface(
             XCommandProcessor.class, xContent);
@@ -163,22 +163,22 @@ public class UCB
         Object xContent = getContent(path);
 
         OpenCommandArgument2 aArg = new OpenCommandArgument2();
-        aArg.Mode = OpenMode.ALL;
-        aArg.Priority = 32768;
+        aArg.Mode = OpenMode.ALL;        
+        aArg.Priority = 32768;        
 
         // Fill info for the properties wanted.
         aArg.Properties = new Property[] {new Property()};
-
+        
         aArg.Properties[0].Name = "Title";
         aArg.Properties[0].Handle = -1;
-
+        
         XDynamicResultSet xSet;
 
         xSet = (XDynamicResultSet)UnoRuntime.queryInterface(
           XDynamicResultSet.class,executeCommand(xContent, "open", aArg));
 
         XResultSet xResultSet = xSet.getStaticResultSet();
-
+        
         List files = new Vector();
 
         if (xResultSet.first())
@@ -197,17 +197,17 @@ public class UCB
                 {
                     ; //ignore
                 }
-                else
+                else 
                 {
                     files.add(aTitle);
                 }
             }
             while (xResultSet.next()); // next child
         }
-
+        
         if (verifier != null)
         {
-            for (int i = 0; i<files.size(); i++)
+            for (int i = 0; i<files.size(); i++) 
             {
                 if (!verifier.verify(files.get(i)))
                 {
@@ -215,18 +215,18 @@ public class UCB
                 }
             }
         }
-
+        
         return files;
     }
-
-    public Object getContentProperty(Object content, String propName, Class type)
-        throws Exception
+    
+    public Object getContentProperty(Object content, String propName, Class type) 
+        throws Exception 
     {
         Property[] pv = new Property[1];
         pv[0] = new Property();
         pv[0].Name = propName;
         pv[0].Handle = -1;
-
+    
         Object row = executeCommand(content,"getPropertyValues",pv);
         XRow xrow = (XRow)UnoRuntime.queryInterface(XRow.class,row);
         if (type.equals(String.class))
@@ -249,21 +249,21 @@ public class UCB
         {
             return null;
         }
-
+        
     }
-
+    
     public Object getContent(String path) throws Exception
     {
         //System.out.println("Getting Content for : " + path);
         XContentIdentifier id = ((XContentIdentifierFactory) UnoRuntime.queryInterface(XContentIdentifierFactory.class, ucb)).createContentIdentifier(path);
-
+          
         return ((XContentProvider)UnoRuntime.queryInterface(
           XContentProvider.class,ucb)).queryContent(id);
     }
-
+    
     public static interface Verifier
     {
 
-        public boolean verify(Object object);
+        public boolean verify(Object object); 
     }
 }
diff --git a/wizards/com/sun/star/wizards/common/XMLHelper.java b/wizards/com/sun/star/wizards/common/XMLHelper.java
index 326ba03fbeea..d67b7f6d0d35 100644
--- a/wizards/com/sun/star/wizards/common/XMLHelper.java
+++ b/wizards/com/sun/star/wizards/common/XMLHelper.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/common/XMLProvider.java b/wizards/com/sun/star/wizards/common/XMLProvider.java
index f5c2fd662d31..bfe8efea31e8 100644
--- a/wizards/com/sun/star/wizards/common/XMLProvider.java
+++ b/wizards/com/sun/star/wizards/common/XMLProvider.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/db/BlindtextCreator.java b/wizards/com/sun/star/wizards/db/BlindtextCreator.java
index b52381def054..742a28be94db 100644
--- a/wizards/com/sun/star/wizards/db/BlindtextCreator.java
+++ b/wizards/com/sun/star/wizards/db/BlindtextCreator.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/wizards/com/sun/star/wizards/db/ColumnPropertySet.java b/wizards/com/sun/star/wizards/db/ColumnPropertySet.java
index 204ba2328321..fdd2fc98f7d2 100644
--- a/wizards/com/sun/star/wizards/db/ColumnPropertySet.java
+++ b/wizards/com/sun/star/wizards/db/ColumnPropertySet.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/wizards/com/sun/star/wizards/db/CommandMetaData.java b/wizards/com/sun/star/wizards/db/CommandMetaData.java
index ad54020e8645..4df1fc8378a8 100644
--- a/wizards/com/sun/star/wizards/db/CommandMetaData.java
+++ b/wizards/com/sun/star/wizards/db/CommandMetaData.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
@@ -69,22 +69,22 @@ public class CommandMetaData extends DBMetaData
 
     private XIndexAccess xIndexKeys;
 
-    public CommandMetaData(XMultiServiceFactory xMSF, Locale _aLocale, NumberFormatter oNumberFormatter)
+    public CommandMetaData(XMultiServiceFactory xMSF, Locale _aLocale, NumberFormatter oNumberFormatter) 
         {
             super(xMSF, _aLocale, oNumberFormatter);
         }
-
-    public CommandMetaData(XMultiServiceFactory xMSF)
+    
+    public CommandMetaData(XMultiServiceFactory xMSF) 
         {
             super(xMSF);
         }
 
 
-    public void initializeFieldColumns(boolean _bgetDefaultValue, String _CommandName, String[] _FieldNames)
+    public void initializeFieldColumns(boolean _bgetDefaultValue, String _CommandName, String[] _FieldNames) 
         {
             this.setCommandName(_CommandName);
             FieldColumns = new FieldColumn[_FieldNames.length];
-            for (int i = 0; i < _FieldNames.length; i++)
+            for (int i = 0; i < _FieldNames.length; i++) 
             {
                 FieldColumns[i] = new FieldColumn(this, _FieldNames[i], this.getCommandName(), false);
 //                if (_bgetDefaultValue)
@@ -94,22 +94,22 @@ public class CommandMetaData extends DBMetaData
             }
         }
 
-
+    
     public void initializeFieldColumns(String[] _FieldNames, XNameAccess _xColumns)
         {
             FieldColumns = new FieldColumn[_FieldNames.length];
-            for (int i = 0; i < _FieldNames.length; i++)
+            for (int i = 0; i < _FieldNames.length; i++) 
             {
                 FieldColumns[i] = new FieldColumn(this,_xColumns, _FieldNames[i] );
             }
         }
-
-
-    public void initializeFieldColumns(String[] _FieldNames, String _CommandName)
+    
+    
+    public void initializeFieldColumns(String[] _FieldNames, String _CommandName) 
         {
             this.setCommandName(_CommandName);
             FieldColumns = new FieldColumn[_FieldNames.length];
-            for (int i = 0; i < _FieldNames.length; i++)
+            for (int i = 0; i < _FieldNames.length; i++) 
             {
                 FieldColumns[i] = new FieldColumn(this, _FieldNames[i], _CommandName, false);
                 if (FieldTitleSet != null)
@@ -122,37 +122,37 @@ public class CommandMetaData extends DBMetaData
                             FieldColumns[i].setFieldTitle( _FieldNames[i] );
                             FieldTitleSet.put(_FieldNames[i], _FieldNames[i]);
                         }
-                    }
+                    }                   
                 }
             }
         }
-
+    
     public Map getFieldTitleSet()
         {
             return FieldTitleSet;
         }
-
-
-    public XPropertySet getColumnObjectByFieldName(String _FieldName, boolean _bgetByDisplayName)
+    
+    
+    public XPropertySet getColumnObjectByFieldName(String _FieldName, boolean _bgetByDisplayName) 
         {
-            try
+            try 
             {
                 FieldColumn CurFieldColumn = null;
                 if (_bgetByDisplayName)
                 {
-                    CurFieldColumn = this.getFieldColumnByDisplayName(_FieldName);
+                    CurFieldColumn = this.getFieldColumnByDisplayName(_FieldName);              
                 }
                 else
                 {
-                    CurFieldColumn = this.getFieldColumnByFieldName(_FieldName);
+                    CurFieldColumn = this.getFieldColumnByFieldName(_FieldName);                
                 }
                 String CurCommandName = CurFieldColumn.getCommandName();
                 CommandObject oCommand = getTableByName(CurCommandName);
                 Object oColumn = oCommand.getColumns().getByName(CurFieldColumn.getFieldName());
                 XPropertySet xColumn = UnoRuntime.queryInterface( XPropertySet.class, oColumn );
                 return xColumn;
-            }
-            catch (Exception exception)
+            } 
+            catch (Exception exception) 
             {
                 exception.printStackTrace(System.out);
                 return null;
@@ -170,12 +170,12 @@ public class CommandMetaData extends DBMetaData
                 sSortFieldName[0] = _fieldnames[i];
                 int index = JavaTools.FieldInTable(SortFieldNames, _fieldnames[i]);
                 if (index > -1)
-
+            
                 {
                     sSortFieldName[1] = SortFieldNames[index][1];
                 }
                 else
-
+            
                 {
                     sSortFieldName[1] = "ASC";
                 }
@@ -205,13 +205,13 @@ public class CommandMetaData extends DBMetaData
         {
             if (FieldColumns.length > 0)
             {
-                for (int i = 0; i < FieldColumns.length; i++)
+                for (int i = 0; i < FieldColumns.length; i++) 
                 {
                     if (FieldColumns[i].getFieldName().equals(_FieldName))
-
+                                
                     {
                         if (FieldColumns[i].getCommandName().equals(_CommandName))
-                        {
+                        {                        
                             return FieldColumns[i];
                         }
                     }
@@ -222,9 +222,9 @@ public class CommandMetaData extends DBMetaData
 
 
 
-    public FieldColumn getFieldColumnByFieldName(String _FieldName)
+    public FieldColumn getFieldColumnByFieldName(String _FieldName) 
         {
-            for (int i = 0; i < FieldColumns.length; i++)
+            for (int i = 0; i < FieldColumns.length; i++) 
             {
                 String sFieldName = FieldColumns[i].getFieldName();
                 if (sFieldName.equals(_FieldName))
@@ -243,10 +243,10 @@ public class CommandMetaData extends DBMetaData
             throw new com.sun.star.uno.RuntimeException();
         }
 
-
-    public FieldColumn getFieldColumnByDisplayName(String _DisplayName)
+    
+    public FieldColumn getFieldColumnByDisplayName(String _DisplayName) 
         {
-            for (int i = 0; i < FieldColumns.length; i++)
+            for (int i = 0; i < FieldColumns.length; i++) 
             {
                 String sDisplayName = FieldColumns[i].getDisplayFieldName();
                 if (sDisplayName.equals(_DisplayName))
@@ -265,10 +265,10 @@ public class CommandMetaData extends DBMetaData
             throw new com.sun.star.uno.RuntimeException();
         }
 
-
-    public FieldColumn getFieldColumnByTitle(String _FieldTitle)
+    
+    public FieldColumn getFieldColumnByTitle(String _FieldTitle) 
         {
-            for (int i = 0; i < FieldColumns.length; i++)
+            for (int i = 0; i < FieldColumns.length; i++) 
             {
                 if (FieldColumns[i].getFieldTitle().equals(_FieldTitle))
                 {
@@ -277,7 +277,7 @@ public class CommandMetaData extends DBMetaData
             }
             // throw new com.sun.star.uno.RuntimeException();
             // LLA: Group works with fields direct
-            for (int i = 0; i < FieldColumns.length; i++)
+            for (int i = 0; i < FieldColumns.length; i++) 
             {
                 if (FieldColumns[i].getFieldName().equals(_FieldTitle))
                 {
@@ -288,24 +288,24 @@ public class CommandMetaData extends DBMetaData
         }
 
 
-    public boolean getFieldNamesOfCommand(String _commandname, int _commandtype, boolean _bAppendMode)
+    public boolean getFieldNamesOfCommand(String _commandname, int _commandtype, boolean _bAppendMode) 
         {
-            try
+            try 
             {
                 // Object oField;
                 java.util.Vector<String> ResultFieldNames = new java.util.Vector<String>(10);
                 String[] FieldNames;
                 CommandObject oCommand = this.getCommandByName(_commandname, _commandtype);
                 FieldNames = oCommand.getColumns().getElementNames();
-                if (FieldNames.length > 0)
+                if (FieldNames.length > 0) 
                 {
-                    for (int n = 0; n < FieldNames.length; n++)
+                    for (int n = 0; n < FieldNames.length; n++) 
                     {
                         final String sFieldName = FieldNames[n];
                         Object oField = oCommand.getColumns().getByName(sFieldName);
                         int iType = AnyConverter.toInt(Helper.getUnoPropertyValue(oField, "Type"));
                         // BinaryFieldTypes are not included in the WidthList
-                        if (JavaTools.FieldInIntTable(WidthList, iType) >= 0)
+                        if (JavaTools.FieldInIntTable(WidthList, iType) >= 0) 
                         {
 //                        if (_bAppendMode)
 //                            ResultFieldNames.addElement(_commandname + "." + FieldNames[n]);
@@ -323,8 +323,8 @@ public class CommandMetaData extends DBMetaData
                     ResultFieldNames.copyInto(m_aAllFieldNames);
                     return true;
                 }
-            }
-            catch (Exception exception)
+            } 
+            catch (Exception exception) 
             {
                 exception.printStackTrace(System.out);
             }
@@ -334,11 +334,11 @@ public class CommandMetaData extends DBMetaData
             showMessageBox("ErrorBox", VclWindowPeerAttribute.OK, sMsgNoFieldsFromCommand);
             return false;
         }
-
-
-
-
-
+    
+    
+    
+    
+    
 
     public String[] getOrderableColumns(String[] _fieldnames)
         {
@@ -362,14 +362,14 @@ public class CommandMetaData extends DBMetaData
     /**
      * @return Returns the command.
      */
-    public String getCommandName()
+    public String getCommandName() 
         {
             return Command;
         }
     /**
      * @param _command The command to set.
      */
-    public void setCommandName(String _command)
+    public void setCommandName(String _command) 
         {
             Command = _command;
         }
@@ -377,7 +377,7 @@ public class CommandMetaData extends DBMetaData
     /**
      * @return Returns the commandType.
      */
-    public int getCommandType()
+    public int getCommandType() 
         {
             return CommandType;
         }
@@ -385,15 +385,15 @@ public class CommandMetaData extends DBMetaData
     /**
      * @param _commandType The commandType to set.
      */
-    public void setCommandType(int _commandType)
+    public void setCommandType(int _commandType) 
         {
             CommandType = _commandType;
         }
 
 
-    public boolean isnumeric(FieldColumn _oFieldColumn)
+    public boolean isnumeric(FieldColumn _oFieldColumn) 
         {
-            try
+            try 
             {
                 CommandObject oTable = super.getTableByName(_oFieldColumn.getCommandName());
                 Object oField = oTable.getColumns().getByName(_oFieldColumn.getFieldName());
@@ -408,19 +408,19 @@ public class CommandMetaData extends DBMetaData
                     return false;
                 }
             }
-            catch (Exception exception)
+            catch (Exception exception) 
             {
                 exception.printStackTrace(System.out);
                 return false;
             }
         }
 
-    public String[] setNumericFields()
+    public String[] setNumericFields() 
         {
-            try
+            try 
             {
                 Vector<String> numericfieldsvector = new java.util.Vector<String>();
-                for (int i = 0; i < FieldColumns.length; i++)
+                for (int i = 0; i < FieldColumns.length; i++) 
                 {
                     if (isnumeric(FieldColumns[i]))
                     {
@@ -431,7 +431,7 @@ public class CommandMetaData extends DBMetaData
                 numericfieldsvector.toArray(NumericFieldNames);
                 return NumericFieldNames;
             }
-            catch (Exception exception)
+            catch (Exception exception) 
             {
                 exception.printStackTrace(System.out);
                 return new String[]{};
@@ -441,39 +441,39 @@ public class CommandMetaData extends DBMetaData
     public String[] getFieldNames(String[] _sDisplayFieldNames, String _sCommandName)
         {
             Vector<String> sFieldNamesVector = new java.util.Vector<String>();
-            for (int i = 0; i < FieldColumns.length; i++)
+            for (int i = 0; i < FieldColumns.length; i++) 
             {
-                if (_sCommandName.equals(FieldColumns[i].getCommandName()))
+                if (_sCommandName.equals(FieldColumns[i].getCommandName())) 
                 {
-                    if (JavaTools.FieldInList(_sDisplayFieldNames, FieldColumns[i].getDisplayFieldName()) > -1)
+                    if (JavaTools.FieldInList(_sDisplayFieldNames, FieldColumns[i].getDisplayFieldName()) > -1) 
                     {
                         sFieldNamesVector.addElement(FieldColumns[i].getFieldName());
                     }
                 }
             }
             String[] sFieldNames = new String[sFieldNamesVector.size()];
-            sFieldNamesVector.toArray(sFieldNames);
+            sFieldNamesVector.toArray(sFieldNames);            
             return sFieldNames;
         }
-
+    
 
 
     public String[] getFieldNames()
         {
             String[] sFieldNames = new String[FieldColumns.length];
-            for (int i = 0; i < FieldColumns.length; i++)
+            for (int i = 0; i < FieldColumns.length; i++) 
             {
                 sFieldNames[i] = FieldColumns[i].getFieldName();
             }
             return sFieldNames;
         }
-
+    
     public String[] getDisplayFieldNames()
         {
             String[] sDisplayFieldNames = new String[FieldColumns.length];
-            for (int i = 0; i < FieldColumns.length; i++)
+            for (int i = 0; i < FieldColumns.length; i++) 
             {
-                sDisplayFieldNames[i] = FieldColumns[i].getDisplayFieldName();
+                sDisplayFieldNames[i] = FieldColumns[i].getDisplayFieldName(); 
             }
             return sDisplayFieldNames;
         }
@@ -481,10 +481,10 @@ public class CommandMetaData extends DBMetaData
 
     public String[] setNonAggregateFieldNames()
         {
-            try
+            try 
             {
                 Vector<String> nonaggregatefieldsvector = new java.util.Vector<String>();
-                for (int i = 0; i < FieldColumns.length; i++)
+                for (int i = 0; i < FieldColumns.length; i++) 
                 {
                     if (JavaTools.FieldInTable(AggregateFieldNames, FieldColumns[i].getDisplayFieldName()) == -1)
                     {
@@ -494,8 +494,8 @@ public class CommandMetaData extends DBMetaData
                 NonAggregateFieldNames = new String[nonaggregatefieldsvector.size()];
                 nonaggregatefieldsvector.toArray(NonAggregateFieldNames);
                 return NonAggregateFieldNames;
-            }
-            catch (Exception exception)
+            } 
+            catch (Exception exception) 
             {
                 exception.printStackTrace(System.out);
                 return new String[]{};
@@ -507,15 +507,15 @@ public class CommandMetaData extends DBMetaData
      * @param _DisplayFieldNames
      * @return
      */
-    public boolean hasNumericalFields(String[] _DisplayFieldNames)
+    public boolean hasNumericalFields(String[] _DisplayFieldNames) 
 
         {
-            if (_DisplayFieldNames != null)
+            if (_DisplayFieldNames != null) 
             {
-                if (_DisplayFieldNames.length > 0)
+                if (_DisplayFieldNames.length > 0) 
                 {
                     for (int i = 0; i < _DisplayFieldNames.length; i++)
-                    {
+                    {   
                         if (isnumeric(getFieldColumnByDisplayName(_DisplayFieldNames[i])))
                         {
                             return true;
@@ -526,7 +526,7 @@ public class CommandMetaData extends DBMetaData
             return false;
         }
 
-    public String getFieldTitle(String FieldName)
+    public String getFieldTitle(String FieldName) 
         {
             String FieldTitle = FieldName;
             if (this.FieldTitleSet != null)
@@ -540,7 +540,7 @@ public class CommandMetaData extends DBMetaData
             return FieldTitle;
         }
 
-
+    
     public void setFieldTitles(String[] sFieldTitles)
         {
             int nFieldColLength = FieldColumns.length;
@@ -550,11 +550,11 @@ public class CommandMetaData extends DBMetaData
                 {
                     FieldColumns[i].setFieldTitle(sFieldTitles[i]);
                 }
-
+                
             }
         }
-
-
+    
+    
     public String[] getFieldTitles()
         {
             String[] sFieldTitles = new String[FieldColumns.length];
@@ -564,20 +564,20 @@ public class CommandMetaData extends DBMetaData
             }
             return sFieldTitles;
         }
-
-
-    public void setGroupFieldNames(String[] GroupFieldNames)
+    
+    
+    public void setGroupFieldNames(String[] GroupFieldNames) 
         {
             this.GroupFieldNames = GroupFieldNames;
         }
 
-
-    public String[] getGroupFieldNames()
+    
+    public String[] getGroupFieldNames() 
         {
             return GroupFieldNames;
         }
 
-    public void createRecordFieldNames()
+    public void createRecordFieldNames() 
         {
             String CurFieldName;
             int GroupFieldCount;
@@ -587,10 +587,10 @@ public class CommandMetaData extends DBMetaData
             RecordFieldNames = new String[TotFieldCount - GroupFieldCount];
 
             int a = 0;
-            for (int i = 0; i < TotFieldCount; i++)
+            for (int i = 0; i < TotFieldCount; i++) 
             {
                 CurFieldName = FieldColumns[i].getFieldName();
-                if (JavaTools.FieldInList(GroupFieldNames, CurFieldName) < 0)
+                if (JavaTools.FieldInList(GroupFieldNames, CurFieldName) < 0) 
                 {
                     RecordFieldNames[a] = CurFieldName;
                     // a += 1;
@@ -612,7 +612,7 @@ public class CommandMetaData extends DBMetaData
         }
 
     /**@deprecated use 'RelationController' class instead
-     *
+     * 
      * @param _stablename
      * @param _ncommandtype
      * @return
@@ -620,7 +620,7 @@ public class CommandMetaData extends DBMetaData
     public String[] getReferencedTables(String _stablename, int _ncommandtype)
         {
             String[] sTotReferencedTables = new String[]{};
-            try
+            try 
             {
                 if (_ncommandtype == com.sun.star.sdb.CommandType.TABLE)
                 {
@@ -651,8 +651,8 @@ public class CommandMetaData extends DBMetaData
                         }
                     }
                 }
-            }
-            catch (Exception e)
+            } 
+            catch (Exception e) 
             {
                 e.printStackTrace(System.out);
             }
@@ -660,14 +660,14 @@ public class CommandMetaData extends DBMetaData
         }
 
     /**@deprecated use 'RelationController' class instead
-     *
+     * 
      * @param _sreferencedtablename
      * @return
      */
     public String[][] getKeyColumns(String _sreferencedtablename)
         {
             String[][] skeycolumnnames = null;
-            try
+            try 
             {
                 for (int i = 0; i < xIndexKeys.getCount(); i++)
                 {
@@ -695,8 +695,8 @@ public class CommandMetaData extends DBMetaData
                         }
                     }
                 }
-            }
-            catch (Exception e)
+            } 
+            catch (Exception e) 
             {
                 e.printStackTrace();
             }
@@ -706,12 +706,12 @@ public class CommandMetaData extends DBMetaData
 
     public void openFormDocument(boolean _bReadOnly)
         {
-            try
+            try 
             {
                 Object oEmbeddedFactory = super.xMSF.createInstance("com.sun.star.embed.OOoEmbeddedObjectFactory");
                 int iEntryInitMode = EntryInitModes.DEFAULT_INIT;       //TRUNCATE_INIT???
-            }
-            catch (Exception e)
+            } 
+            catch (Exception e) 
             {
                 e.printStackTrace(System.out);
             }
@@ -720,14 +720,14 @@ public class CommandMetaData extends DBMetaData
 
     public void setCommandComposingAttributes()
         {
-            try
+            try 
             {
                 boolean bCatalogAtStart2 = xDBMetaData.isCatalogAtStart();
                 sCatalogSep = xDBMetaData.getCatalogSeparator();
                 sIdentifierQuote = xDBMetaData.getIdentifierQuoteString();
                 bCommandComposerAttributesalreadyRetrieved = true;
-            }
-            catch (SQLException e)
+            } 
+            catch (SQLException e) 
             {
                 e.printStackTrace(System.out);
             }
@@ -737,7 +737,7 @@ public class CommandMetaData extends DBMetaData
     /**
      * @return Returns the bCatalogAtStart.
      */
-    public boolean isCatalogAtStart()
+    public boolean isCatalogAtStart() 
         {
             if (!bCommandComposerAttributesalreadyRetrieved)
             {
@@ -749,7 +749,7 @@ public class CommandMetaData extends DBMetaData
     /**
      * @return Returns the sCatalogSep.
      */
-    public String getCatalogSeparator()
+    public String getCatalogSeparator() 
         {
             if (!bCommandComposerAttributesalreadyRetrieved)
             {
@@ -761,7 +761,7 @@ public class CommandMetaData extends DBMetaData
     /**
      * @return Returns the sIdentifierQuote.
      */
-    public String getIdentifierQuote()
+    public String getIdentifierQuote() 
         {
             if (!bCommandComposerAttributesalreadyRetrieved)
             {
diff --git a/wizards/com/sun/star/wizards/db/CommandName.java b/wizards/com/sun/star/wizards/db/CommandName.java
index aa8a4f9c7ea9..4174545ff8f2 100644
--- a/wizards/com/sun/star/wizards/db/CommandName.java
+++ b/wizards/com/sun/star/wizards/db/CommandName.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/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java
index 323ded34385a..2fceae708564 100644
--- a/wizards/com/sun/star/wizards/db/DBMetaData.java
+++ b/wizards/com/sun/star/wizards/db/DBMetaData.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
@@ -424,7 +424,7 @@ public class DBMetaData
         // NumericTypes are all types where aggregate functions can be performed on.
         // Similarly to a major competitor date/time/timmestamp fields are not included
 
-
+        
     }
 
     public boolean isBinaryDataType(int _itype)
@@ -923,7 +923,7 @@ public class DBMetaData
      * adds the passed document as a report or a form to the database. Afterwards the document is deleted.
      * the document may not be open
      * @param _xComponent
-     * @param _xDocNameAccess
+     * @param _xDocNameAccess 
      * @param _bcreateTemplate  describes the type of the document: "form" or "report"
      */
     public void addDatabaseDocument(XComponent _xComponent, XHierarchicalNameAccess _xDocNameAccess, boolean i_createTemplate)
diff --git a/wizards/com/sun/star/wizards/db/FieldColumn.java b/wizards/com/sun/star/wizards/db/FieldColumn.java
index 041aab5f5300..406fb05e48d2 100644
--- a/wizards/com/sun/star/wizards/db/FieldColumn.java
+++ b/wizards/com/sun/star/wizards/db/FieldColumn.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/wizards/com/sun/star/wizards/db/QueryMetaData.java b/wizards/com/sun/star/wizards/db/QueryMetaData.java
index bad14c2faa20..a15fe42ae786 100644
--- a/wizards/com/sun/star/wizards/db/QueryMetaData.java
+++ b/wizards/com/sun/star/wizards/db/QueryMetaData.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
@@ -92,14 +92,14 @@ public class QueryMetaData extends CommandMetaData
     {
         return this.GroupByFilterConditions;
     }
-//  public void addFieldColumn(String _FieldName, String _sCommandName){
-//      FieldColumn oFieldColumn = getFieldColumn(_FieldName, _sCommandName);
-//      if (oFieldColumn == null){
-//          FieldColumn[] LocFieldColumns = new FieldColumn[FieldColumns.length + 1];
-//          System.arraycopy(FieldColumns, 0, LocFieldColumns, 0, FieldColumns.length);
-//          LocFieldColumns[FieldColumns.length] = new FieldColumn(this, _FieldName, _sCommandName);
-//          FieldColumns = LocFieldColumns;
-//      }
+//	public void addFieldColumn(String _FieldName, String _sCommandName){
+//		FieldColumn oFieldColumn = getFieldColumn(_FieldName, _sCommandName);
+//		if (oFieldColumn == null){
+//			FieldColumn[] LocFieldColumns = new FieldColumn[FieldColumns.length + 1];
+//			System.arraycopy(FieldColumns, 0, LocFieldColumns, 0, FieldColumns.length);
+//			LocFieldColumns[FieldColumns.length] = new FieldColumn(this, _FieldName, _sCommandName);
+//			FieldColumns = LocFieldColumns;
+//		}
 //    }
     public void addSeveralFieldColumns(String[] _FieldNames, String _sCommandName)
     {
diff --git a/wizards/com/sun/star/wizards/db/RecordParser.java b/wizards/com/sun/star/wizards/db/RecordParser.java
index 6c8ddb5b2c36..75d7c3365400 100644
--- a/wizards/com/sun/star/wizards/db/RecordParser.java
+++ b/wizards/com/sun/star/wizards/db/RecordParser.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/wizards/com/sun/star/wizards/db/RelationController.java b/wizards/com/sun/star/wizards/db/RelationController.java
index acf47581d3e2..cf7793b9c248 100644
--- a/wizards/com/sun/star/wizards/db/RelationController.java
+++ b/wizards/com/sun/star/wizards/db/RelationController.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
@@ -140,7 +140,7 @@ public class RelationController extends CommandName
                         {
                             aSlaveFieldNamesVector.add(sForeignColumnName);
                             aMasterFieldNamesVector.add(sPrimaryColumnName);
-                            bleaveLoop = true;                  //Only one relation may exist between two tables...
+                            bleaveLoop = true;                  //Only one relation may exist between two tables...                     
                         }
                     }
 
diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
index 235da2d7c04a..b474c6a5b5d2 100644
--- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
+++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.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/wizards/com/sun/star/wizards/db/TableDescriptor.java b/wizards/com/sun/star/wizards/db/TableDescriptor.java
index 8e3b740417c4..241de89f3934 100644
--- a/wizards/com/sun/star/wizards/db/TableDescriptor.java
+++ b/wizards/com/sun/star/wizards/db/TableDescriptor.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
@@ -256,7 +256,7 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen
                 XPropertySet xColPropertySet = getByIndex(i);
                 if (!isColunnNameDuplicate(xNameAccessColumns, xColPropertySet))
                 {
-                    xAppendColumns.appendByDescriptor(xColPropertySet); //xColPropertySet.setPropertyValue("Type", new Integer(32423))
+                    xAppendColumns.appendByDescriptor(xColPropertySet);	//xColPropertySet.setPropertyValue("Type", new Integer(32423))
                         }
                         else
                         {
@@ -857,5 +857,5 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen
         }
         return bhastoinsert;
     }
-}
-
+}   
+    
diff --git a/wizards/com/sun/star/wizards/db/TypeInspector.java b/wizards/com/sun/star/wizards/db/TypeInspector.java
index 1f22801fd8c5..ab677bfcb22d 100644
--- a/wizards/com/sun/star/wizards/db/TypeInspector.java
+++ b/wizards/com/sun/star/wizards/db/TypeInspector.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
@@ -419,21 +419,21 @@ public class TypeInspector
         return (getAutoIncrementIndex(_xColPropertySet) != INVALID);
     }
 
-    /** finds the first available DataType that can be used as a primary key in a table.
+    /** finds the first available DataType that can be used as a primary key in a table. 
      * @return The first datatype that also supports Autoincrmentation is taken according to the following list:
      *1) INTEGER
      *2) FLOAT
      *3) REAL
      *4) DOUBLE
      *5) NUMERIC
-     *6) DECIMAL         *
-     * If no appropriate datatype is found ther first available numeric type after DataType.INTEGER
+     *6) DECIMAL         * 
+     * If no appropriate datatype is found ther first available numeric type after DataType.INTEGER 
      * according to the 'convertDataType' method is returned
      */
-    /**TODO the fallback order is the same as implemented in the method 'convertDataType'.
+    /**TODO the fallback order is the same as implemented in the method 'convertDataType'. 
      * It's not very elegant to have the same intelligence
      * on several spots in the class!!
-     *
+     * 
      */
     public TypeInfo findAutomaticPrimaryKeyType()
     {
diff --git a/wizards/com/sun/star/wizards/document/Control.java b/wizards/com/sun/star/wizards/document/Control.java
index fb4191277b8c..ca5168d004ee 100644
--- a/wizards/com/sun/star/wizards/document/Control.java
+++ b/wizards/com/sun/star/wizards/document/Control.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
@@ -273,9 +273,9 @@ public class Control extends Shape
         }
     }
 
-    /** the peer should be retrieved every time before it is used because it
+    /** the peer should be retrieved every time before it is used because it 
      * might be disposed otherwise
-     *
+     * 
      * @return
      */
     public XLayoutConstrains getPeer()
diff --git a/wizards/com/sun/star/wizards/document/DatabaseControl.java b/wizards/com/sun/star/wizards/document/DatabaseControl.java
index b0b1523840a9..c0dff49dc813 100644
--- a/wizards/com/sun/star/wizards/document/DatabaseControl.java
+++ b/wizards/com/sun/star/wizards/document/DatabaseControl.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/wizards/com/sun/star/wizards/document/FormHandler.java b/wizards/com/sun/star/wizards/document/FormHandler.java
index 7b558d67cd9f..90f05bd203d8 100644
--- a/wizards/com/sun/star/wizards/document/FormHandler.java
+++ b/wizards/com/sun/star/wizards/document/FormHandler.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/wizards/com/sun/star/wizards/document/GridControl.java b/wizards/com/sun/star/wizards/document/GridControl.java
index 66bae37e1ed3..8243e6a929be 100644
--- a/wizards/com/sun/star/wizards/document/GridControl.java
+++ b/wizards/com/sun/star/wizards/document/GridControl.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/wizards/com/sun/star/wizards/document/OfficeDocument.java b/wizards/com/sun/star/wizards/document/OfficeDocument.java
index 4cb78cd967c3..b0a01beac42e 100644
--- a/wizards/com/sun/star/wizards/document/OfficeDocument.java
+++ b/wizards/com/sun/star/wizards/document/OfficeDocument.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
@@ -123,7 +123,7 @@ public class OfficeDocument
      * @param desktop
      * @param frame
      * @param sDocumentType e.g. swriter, scalc, ( simpress, scalc : not tested)
-     * @return the document Component (implements XComponent) object ( XTextDocument, or XSpreadsheedDocument )
+     * @return the document Component (implements XComponent) object ( XTextDocument, or XSpreadsheedDocument )  
      */
     public static Object createNewDocument(XFrame frame, String sDocumentType, boolean preview, boolean readonly)
     {
diff --git a/wizards/com/sun/star/wizards/document/Shape.java b/wizards/com/sun/star/wizards/document/Shape.java
index b2ef1a27e662..5252317b6f42 100644
--- a/wizards/com/sun/star/wizards/document/Shape.java
+++ b/wizards/com/sun/star/wizards/document/Shape.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/wizards/com/sun/star/wizards/document/TimeStampControl.java b/wizards/com/sun/star/wizards/document/TimeStampControl.java
index 88733ee883c1..8645f3125a67 100644
--- a/wizards/com/sun/star/wizards/document/TimeStampControl.java
+++ b/wizards/com/sun/star/wizards/document/TimeStampControl.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 class TimeStampControl extends DatabaseControl
 
     DatabaseControl oDateControl;
     DatabaseControl oTimeControl;
-//  XShape xGroupShape;
+//  XShape xGroupShape; 
     Resource oResource;
     private String sDateAppendix; // = GetResText(RID_FORM + 4)
     private String sTimeAppendix; // = GetResText(RID_FORM + 5)
diff --git a/wizards/com/sun/star/wizards/fax/CGFax.java b/wizards/com/sun/star/wizards/fax/CGFax.java
index 067c4dce09f1..301a792796df 100644
--- a/wizards/com/sun/star/wizards/fax/CGFax.java
+++ b/wizards/com/sun/star/wizards/fax/CGFax.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/fax/CGFaxWizard.java b/wizards/com/sun/star/wizards/fax/CGFaxWizard.java
index 232d4ee8c163..9daf3ded5a5c 100644
--- a/wizards/com/sun/star/wizards/fax/CGFaxWizard.java
+++ b/wizards/com/sun/star/wizards/fax/CGFaxWizard.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/fax/CallWizard.java b/wizards/com/sun/star/wizards/fax/CallWizard.java
index b20dc0890e56..0d04b0b94ca3 100644
--- a/wizards/com/sun/star/wizards/fax/CallWizard.java
+++ b/wizards/com/sun/star/wizards/fax/CallWizard.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER 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 CallWizard
     /**
      * Gives a factory for creating the service. This method is called by the
      * <code>JavaLoader</code>
-     *
+     * 
      * <p></p>
      *
      * @param stringImplementationName The implementation name of the component.
diff --git a/wizards/com/sun/star/wizards/fax/FaxDocument.java b/wizards/com/sun/star/wizards/fax/FaxDocument.java
index 8eafbed257d1..862f6b663099 100644
--- a/wizards/com/sun/star/wizards/fax/FaxDocument.java
+++ b/wizards/com/sun/star/wizards/fax/FaxDocument.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.java b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.java
index 8c81ba5e5fec..27cd3e244617 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.java
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER 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 @@ public abstract class FaxWizardDialog extends WizardDialog implements FaxWizardD
                     new Integer(39), resources.reslblIntroduction_value, Boolean.TRUE, new Integer(104), new Integer(145), INTEGERS[1], new Short((short) 55), new Integer(199)
                 });
         ImageControl3 = insertInfoImage(92, 145, 1);
-//  ImageControl3 = insertImage("ImageControl3",
+//  ImageControl3 = insertImage("ImageControl3", 
 //      new String[] {"Border", "Height", "ImageURL", "PositionX", "PositionY", "ScaleImage", "Step", "TabIndex", "Width"},
 //      new Object[] { new Short((short)0),INTEGERS[10],"private:resource/dbu/image/19205",new Integer(92),new Integer(145),Boolean.FALSE,INTEGERS[1],new Short((short)56),INTEGERS[10]}
 //    );
@@ -609,7 +609,7 @@ public abstract class FaxWizardDialog extends WizardDialog implements FaxWizardD
                     INTEGERS[8], resources.reslblTemplateName_value, new Integer(97), new Integer(58), INTEGERS[5], new Short((short) 57), new Integer(101)
                 });
         /*
-        lblTemplatePath = insertLabel("lblTemplatePath",
+        lblTemplatePath = insertLabel("lblTemplatePath", 
         new String[] {"Height", "Label", "PositionX", "PositionY", "Step", "TabIndex", "Width"},
         new Object[] { INTEGERS[8],resources.reslblTemplatePath_value,new Integer(97),new Integer(77),INTEGERS[5],new Short((short)58),new Integer(71)}
         );
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.java b/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.java
index 743173373b54..af3abb57fc5a 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.java
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER 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 interface FaxWizardDialogConst
      *                 Help IDs
      * ====================================
      */
-    public final static int HID = 41119; //TODO enter first hid here
+    public final static int HID = 41119; //TODO enter first hid here 
     public static final int HIDMAIN = 41180;
     public final String OPTBUSINESSFAX_HID = "HID:" + (HID + 1);
     public final String LSTBUSINESSSTYLE_HID = "HID:" + (HID + 2);
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java
index e9a39eb5d5ef..63c4b0c119ce 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -300,7 +300,7 @@ public class FaxWizardDialogImpl extends FaxWizardDialog
     {
         try
         {
-            //xComponent.dispose();
+            //xComponent.dispose();                       
             XCloseable xCloseable = (XCloseable) UnoRuntime.queryInterface(XCloseable.class, myFaxDoc.xFrame);
             xCloseable.close(false);
         }
@@ -686,7 +686,7 @@ public class FaxWizardDialogImpl extends FaxWizardDialog
         TextFieldHandler myFieldHandler = new TextFieldHandler(myFaxDoc.xMSF, xTextDocument);
         myFieldHandler.changeUserFieldContent("Fax", txtSenderFax.getText());
     }
-    //switch Elements on/off -------------------------------------------------------
+    //switch Elements on/off -------------------------------------------------------    
     public void setElements()
     {
         //UI relevant:
@@ -767,7 +767,7 @@ public class FaxWizardDialogImpl extends FaxWizardDialog
                 myFaxDoc.switchFooter("Standard", bFooterPossible, (chkFooterPageNumbers.getState() != 0), txtFooter.getText());
             }
 
-            //enable/disable roadmap item for footer page
+            //enable/disable roadmap item for footer page       
             XInterface BPaperItem = getRoadmapItemByID(RM_FOOTER);
             Helper.setUnoPropertyValue(BPaperItem, "Enabled", new Boolean(bFooterPossible));
 
@@ -870,4 +870,4 @@ public class FaxWizardDialogImpl extends FaxWizardDialog
 
 
 
-
+    
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.java b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.java
index 0043d25590d8..d25c3cddb97b 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.java
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER 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 @@ public class FaxWizardDialogResources extends Resource
         super(xmsf, UNIT_NAME, MODULE_NAME);
         /**
          * Delete the String, uncomment the getResText method
-         *
+         *  
          */
         resFaxWizardDialog_title = getResText(RID_FAXWIZARDDIALOG_START + 1);
         resLabel9_value = getResText(RID_FAXWIZARDDIALOG_START + 2);
diff --git a/wizards/com/sun/star/wizards/form/CallFormWizard.java b/wizards/com/sun/star/wizards/form/CallFormWizard.java
index 9a8e73951c69..4d730225dfc5 100644
--- a/wizards/com/sun/star/wizards/form/CallFormWizard.java
+++ b/wizards/com/sun/star/wizards/form/CallFormWizard.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/wizards/com/sun/star/wizards/form/DataEntrySetter.java b/wizards/com/sun/star/wizards/form/DataEntrySetter.java
index 2844e0b53104..07649cacc301 100644
--- a/wizards/com/sun/star/wizards/form/DataEntrySetter.java
+++ b/wizards/com/sun/star/wizards/form/DataEntrySetter.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,7 +51,7 @@ public class DataEntrySetter
         this.CurUnoDialog = _CurUnoDialog;
         curtabindex = (short) (FormWizard.SODATA_PAGE * 100);
         Integer IDataStep = new Integer(FormWizard.SODATA_PAGE);
-        String sNewDataOnly = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 44);    //
+        String sNewDataOnly = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 44);    // 
         String sDisplayAllData = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 46); //
         String sNoModification = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 47); // AllowUpdates
         String sNoDeletion = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 48);     // AllowDeletes
diff --git a/wizards/com/sun/star/wizards/form/FieldLinker.java b/wizards/com/sun/star/wizards/form/FieldLinker.java
index f5555421a4b3..3396f9433d6d 100644
--- a/wizards/com/sun/star/wizards/form/FieldLinker.java
+++ b/wizards/com/sun/star/wizards/form/FieldLinker.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
@@ -263,7 +263,7 @@ public class FieldLinker extends DBLimitedFieldSelection
     /**
      * @return the LinkFieldnames of the joins. When no LinkFieldNames were selected the returned Array is empty.
      * When Joins were assigned duplicate a null value is returned
-     *
+     * 
      */
     public String[][] getLinkFieldNames()
     {
@@ -288,7 +288,7 @@ public class FieldLinker extends DBLimitedFieldSelection
             return null;
         }
             return LinkFieldNames;
-
+        
     }
 
     public void enable(boolean _bdoenable)
diff --git a/wizards/com/sun/star/wizards/form/Finalizer.java b/wizards/com/sun/star/wizards/form/Finalizer.java
index fa1f9ce56074..f1d4ce9835aa 100644
--- a/wizards/com/sun/star/wizards/form/Finalizer.java
+++ b/wizards/com/sun/star/wizards/form/Finalizer.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/wizards/com/sun/star/wizards/form/FormConfiguration.java b/wizards/com/sun/star/wizards/form/FormConfiguration.java
index 8e2c36ae0966..0c293a850ed6 100644
--- a/wizards/com/sun/star/wizards/form/FormConfiguration.java
+++ b/wizards/com/sun/star/wizards/form/FormConfiguration.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/wizards/com/sun/star/wizards/form/FormControlArranger.java b/wizards/com/sun/star/wizards/form/FormControlArranger.java
index 9a0c58fd41b8..cc9449bfa717 100644
--- a/wizards/com/sun/star/wizards/form/FormControlArranger.java
+++ b/wizards/com/sun/star/wizards/form/FormControlArranger.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
@@ -100,7 +100,7 @@ public class FormControlArranger
         setFormSize(_FormSize);
     }
     // Note: on all Controls except for the checkbox the Label has to be set
-    // a bit under the DBControl because its Height is also smaller
+    // a bit under the DBControl because its Height is also smaller 
     private int getLabelDiffHeight(int _index)
     {
         if (curDBControl != null)
@@ -264,7 +264,7 @@ public class FormControlArranger
     }
 
     /**
-     *
+     * 
      * @param StartIndex
      * @param EndIndex
      * @param nDist
@@ -498,7 +498,7 @@ public class FormControlArranger
                 break;
         }
 //      if ((nYRefPos + nDBHeight) > nMaxDBYPos)
-//          nMaxDBYPos = nYRefPos + nDBHeight;
+//          nMaxDBYPos = nYRefPos + nDBHeight;      
     }
 
     private void repositionColumnarLeftControls(int LastIndex)
diff --git a/wizards/com/sun/star/wizards/form/FormDocument.java b/wizards/com/sun/star/wizards/form/FormDocument.java
index ae1a795368e4..cd82625e3de7 100644
--- a/wizards/com/sun/star/wizards/form/FormDocument.java
+++ b/wizards/com/sun/star/wizards/form/FormDocument.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/wizards/com/sun/star/wizards/form/FormWizard.java b/wizards/com/sun/star/wizards/form/FormWizard.java
index eb25fb65c78d..c3a58e0ab5e4 100644
--- a/wizards/com/sun/star/wizards/form/FormWizard.java
+++ b/wizards/com/sun/star/wizards/form/FormWizard.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
@@ -289,7 +289,7 @@ public class FormWizard extends DatabaseObjectWizard
                 FormName = curFinalizer.getName();
                 if (curFormDocument.finalizeForms(CurDataEntrySetter, curFieldLinker, curFormConfiguration))
                 {
-
+                   
                     if (curFinalizer.finish())
                     {
                         m_success = true;
diff --git a/wizards/com/sun/star/wizards/form/StyleApplier.java b/wizards/com/sun/star/wizards/form/StyleApplier.java
index 79e0321a3c0b..09a9f1aad0c7 100644
--- a/wizards/com/sun/star/wizards/form/StyleApplier.java
+++ b/wizards/com/sun/star/wizards/form/StyleApplier.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/wizards/com/sun/star/wizards/form/UIControlArranger.java b/wizards/com/sun/star/wizards/form/UIControlArranger.java
index b596efe143ea..61d634a113bf 100644
--- a/wizards/com/sun/star/wizards/form/UIControlArranger.java
+++ b/wizards/com/sun/star/wizards/form/UIControlArranger.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/wizards/com/sun/star/wizards/letter/CGLetter.java b/wizards/com/sun/star/wizards/letter/CGLetter.java
index 986d43bac5bb..28b72b38d7e8 100644
--- a/wizards/com/sun/star/wizards/letter/CGLetter.java
+++ b/wizards/com/sun/star/wizards/letter/CGLetter.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/letter/CGLetterWizard.java b/wizards/com/sun/star/wizards/letter/CGLetterWizard.java
index 0a6cfd90ab42..9cb9a25bdc0b 100644
--- a/wizards/com/sun/star/wizards/letter/CGLetterWizard.java
+++ b/wizards/com/sun/star/wizards/letter/CGLetterWizard.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/letter/CGPaperElementLocation.java b/wizards/com/sun/star/wizards/letter/CGPaperElementLocation.java
index 7c8b28bc93ed..be7ab49346bb 100644
--- a/wizards/com/sun/star/wizards/letter/CGPaperElementLocation.java
+++ b/wizards/com/sun/star/wizards/letter/CGPaperElementLocation.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/letter/CallWizard.java b/wizards/com/sun/star/wizards/letter/CallWizard.java
index f3508512807d..d203856d653a 100644
--- a/wizards/com/sun/star/wizards/letter/CallWizard.java
+++ b/wizards/com/sun/star/wizards/letter/CallWizard.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER 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 CallWizard
     /**
      * Gives a factory for creating the service. This method is called by the
      * <code>JavaLoader</code>
-     *
+     * 
      * <p></p>
      *
      * @param stringImplementationName The implementation name of the component.
diff --git a/wizards/com/sun/star/wizards/letter/LetterDocument.java b/wizards/com/sun/star/wizards/letter/LetterDocument.java
index 0c981c6e066e..6ed28c29ed9f 100644
--- a/wizards/com/sun/star/wizards/letter/LetterDocument.java
+++ b/wizards/com/sun/star/wizards/letter/LetterDocument.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.java b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.java
index e0b8a8c2579e..03638d368dea 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.java
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER 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 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW
                 });
         ImageControl3 = insertInfoImage(92, 145, 1);
 
-//    ImageControl3 = insertImage("ImageControl3",
+//    ImageControl3 = insertImage("ImageControl3", 
 //      new String[] {"Border", "Height", "ImageURL", "Name", "PositionX", "PositionY", "ScaleImage", "Step", "TabIndex", "Width"},
 //      new Object[] { new Short((short)0), INTEGERS[10],"private:resource/dbu/image/19205","ImageControl3",new Integer(92),new Integer(145),Boolean.FALSE,INTEGERS[1],new Short((short)81),INTEGERS[10]}
 //    );
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.java b/wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.java
index b94ac6f0c0ac..15ddf29c3f88 100755
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.java
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogEvents.java b/wizards/com/sun/star/wizards/letter/LetterWizardDialogEvents.java
index 0a6407dbde1d..02bebe1cfca3 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogEvents.java
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogEvents.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
index 2842cf63a19c..c0f56cd13b52 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -359,7 +359,7 @@ public class LetterWizardDialogImpl extends LetterWizardDialog
     {
         try
         {
-            //xComponent.dispose();
+            //xComponent.dispose();                       
             XCloseable xCloseable = (XCloseable) UnoRuntime.queryInterface(XCloseable.class, myLetterDoc.xFrame);
             xCloseable.close(false);
         }
@@ -750,7 +750,7 @@ public class LetterWizardDialogImpl extends LetterWizardDialog
         }
     }
 
-    //switch Elements on/off -------------------------------------------------------
+    //switch Elements on/off -------------------------------------------------------    
     public void chkUseLogoItemChanged()
     {
         try
@@ -824,7 +824,7 @@ public class LetterWizardDialogImpl extends LetterWizardDialog
                 myLetterDoc.switchFooter("Standard", bFooterPossible, (chkFooterPageNumbers.getState() != 0), txtFooter.getText());
             }
 
-            //enable/disable roadmap item for footer page
+            //enable/disable roadmap item for footer page       
             XInterface BPaperItem = getRoadmapItemByID(RM_FOOTER);
             Helper.setUnoPropertyValue(BPaperItem, "Enabled", new Boolean(bFooterPossible));
 
@@ -1079,7 +1079,7 @@ public class LetterWizardDialogImpl extends LetterWizardDialog
 
     public void lstLetterNormItemChanged()
     {
-        //when the norm changes, the correct template needs to be reloaded
+        //when the norm changes, the correct template needs to be reloaded      
         sCurrentNorm = Norms[getCurrentLetter().cp_Norm];
         initializeTemplates(xMSF);
         if (optBusinessLetter.getState())
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java b/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java
index 01731d989ebc..dc652bc02781 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/letter/LocaleCodes.java b/wizards/com/sun/star/wizards/letter/LocaleCodes.java
index 82994f40dc6b..b9dec8147358 100644
--- a/wizards/com/sun/star/wizards/letter/LocaleCodes.java
+++ b/wizards/com/sun/star/wizards/letter/LocaleCodes.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/query/CallQueryWizard.java b/wizards/com/sun/star/wizards/query/CallQueryWizard.java
index ec6ab3895fca..f108bc36519d 100644
--- a/wizards/com/sun/star/wizards/query/CallQueryWizard.java
+++ b/wizards/com/sun/star/wizards/query/CallQueryWizard.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/wizards/com/sun/star/wizards/query/Finalizer.java b/wizards/com/sun/star/wizards/query/Finalizer.java
index 35d1edf37bde..592c3e64a495 100644
--- a/wizards/com/sun/star/wizards/query/Finalizer.java
+++ b/wizards/com/sun/star/wizards/query/Finalizer.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/wizards/com/sun/star/wizards/query/QuerySummary.java b/wizards/com/sun/star/wizards/query/QuerySummary.java
index f570970e0fe8..47f5abf51140 100644
--- a/wizards/com/sun/star/wizards/query/QuerySummary.java
+++ b/wizards/com/sun/star/wizards/query/QuerySummary.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
@@ -83,13 +83,13 @@ public class QuerySummary extends QueryMetaData
                     }) + sReturnChar;
             sFilterFraction = combineFilterNameFraction(this.getFilterConditions(), RID_QUERY + 53, RID_QUERY + 54) + sReturnChar;
             //      if (xDBMetaData.getNumericFunctions().length() > 0)
-            //          sAggregateFraction = combinePartString(RID_QUERY + 55, AggregateFieldNames, RID_QUERY + 56, RID_QUERY + 95, new String[]{ "<CALCULATEDFUNCTION>", "<FIELDNAME>"}) + sReturnChar;
+            //          sAggregateFraction = combinePartString(RID_QUERY + 55, AggregateFieldNames, RID_QUERY + 56, RID_QUERY + 95, new String[]{ "<CALCULATEDFUNCTION>", "<FIELDNAME>"}) + sReturnChar;                
             if (xDBMetaData.supportsGroupBy())
             {
                 sGroupByFraction = combinePartString(RID_QUERY + 57, GroupFieldNames, RID_QUERY + 58) + sReturnChar;
                 sHavingFraction = combineFilterNameFraction(getGroupByFilterConditions(), RID_QUERY + 59, RID_QUERY + 60);
             }
-            // TODO: remove the last return from the string
+            // TODO: remove the last return from the string 
             sSummary = sFieldNamesFraction + sSortingFraction + sFilterFraction + sAggregateFraction + sGroupByFraction + sHavingFraction;
             sSummary = JavaTools.replaceSubString(sSummary, "", "~");
         }
@@ -171,7 +171,7 @@ public class QuerySummary extends QueryMetaData
         }
         return _basestring;
     }
-    // TODO: How can you merge the following two methods to a single one in a smarter way??
+    // TODO: How can you merge the following two methods to a single one in a smarter way?? 
     public String combinePartString(int _InitResID, String[] _FieldNames, int _AlternativeResID)
     {
         if (_FieldNames != null)
diff --git a/wizards/com/sun/star/wizards/query/QueryWizard.java b/wizards/com/sun/star/wizards/query/QueryWizard.java
index a0970534d657..8184c13c142c 100644
--- a/wizards/com/sun/star/wizards/query/QueryWizard.java
+++ b/wizards/com/sun/star/wizards/query/QueryWizard.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
@@ -153,7 +153,7 @@ public class QueryWizard extends DatabaseObjectWizard
                     curproperties[0] = Properties.createProperty( "DatabaseLocation", settings[ IDX_LOCATION ] );
                 else
                     curproperties[0] = Properties.createProperty( "DataSourceName", settings[ IDX_DSN ] );
-
+ 
                 QueryWizard CurQueryWizard = new QueryWizard( serviceFactory, curproperties );
                 CurQueryWizard.startQueryWizard();
             }
@@ -338,8 +338,8 @@ public class QueryWizard extends DatabaseObjectWizard
     public boolean finishWizard()
     {
         int ncurStep = getCurrentStep();
-        if  (   ( ncurStep == SOSUMMARY_PAGE )
-            ||  ( switchToStep( ncurStep, SOSUMMARY_PAGE ) )
+        if	(	( ncurStep == SOSUMMARY_PAGE )
+            ||	( switchToStep( ncurStep, SOSUMMARY_PAGE ) )
             )
         {
             m_createdQuery = m_finalizer.finish();
diff --git a/wizards/com/sun/star/wizards/report/CallReportWizard.java b/wizards/com/sun/star/wizards/report/CallReportWizard.java
index 89aa7f471705..78b67263ede1 100644
--- a/wizards/com/sun/star/wizards/report/CallReportWizard.java
+++ b/wizards/com/sun/star/wizards/report/CallReportWizard.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/wizards/com/sun/star/wizards/report/DBColumn.java b/wizards/com/sun/star/wizards/report/DBColumn.java
index eb6ce3229ac4..e9e4fcff69ce 100644
--- a/wizards/com/sun/star/wizards/report/DBColumn.java
+++ b/wizards/com/sun/star/wizards/report/DBColumn.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/wizards/com/sun/star/wizards/report/Dataimport.java b/wizards/com/sun/star/wizards/report/Dataimport.java
index 8547758a08e6..9b1d993c82bc 100644
--- a/wizards/com/sun/star/wizards/report/Dataimport.java
+++ b/wizards/com/sun/star/wizards/report/Dataimport.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,11 +80,11 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi
         CurReportDocument.StopProcess();
     }
 
-//    public static void main(String args[])
+//    public static void main(String args[]) 
 //        {
 //            String ConnectStr = "uno:socket,host=localhost,port=8100;urp,negotiate=0,forcesynchronous=1;StarOffice.NamingService";
 //            XMultiServiceFactory xMSF = null;
-//            try
+//            try 
 //            {
 //                xMSF = com.sun.star.wizards.common.Desktop.connect(ConnectStr);
 //                if (xMSF != null)
@@ -103,11 +103,11 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi
 //                CurDataimport.createReport(xMSF, oTextDocument.xTextDocument, curproperties);
 //
 //            }
-//            catch (Exception e)
+//            catch (Exception e) 
 //            {
 //                e.printStackTrace(System.out);
 //            }
-//            catch (java.lang.Exception javaexception)
+//            catch (java.lang.Exception javaexception) 
 //            {
 //                javaexception.printStackTrace(System.out);
 //            }
diff --git a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java
index 82e478bac781..fcfb08d7c999 100644
--- a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java
+++ b/wizards/com/sun/star/wizards/report/GroupFieldHandler.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/wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java b/wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java
index 6422befd65f0..b9e8794ed671 100755
--- a/wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java
+++ b/wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java
@@ -1,8 +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
@@ -96,7 +96,7 @@ public interface IReportBuilderLayouter
 
     /**
      * Insert the names of the groups, the group names are names out of the field names.
-     *
+     * 
      * If a group name is given here, it will not shown in the fields/titles, but must be in the field string list.
      * @param _aGroupFieldNames
      */
diff --git a/wizards/com/sun/star/wizards/report/IReportDefinitionReadAccess.java b/wizards/com/sun/star/wizards/report/IReportDefinitionReadAccess.java
index 59fd096fe363..1c71d5e34641 100755
--- a/wizards/com/sun/star/wizards/report/IReportDefinitionReadAccess.java
+++ b/wizards/com/sun/star/wizards/report/IReportDefinitionReadAccess.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/report/IReportDocument.java b/wizards/com/sun/star/wizards/report/IReportDocument.java
index 702a776f9c98..b15339573ece 100644
--- a/wizards/com/sun/star/wizards/report/IReportDocument.java
+++ b/wizards/com/sun/star/wizards/report/IReportDocument.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER 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 @@ import java.util.Vector;
 /**
  * New Interface which gives us the possibility to switch on the fly between the old
  * Wizard and the new Sun Report Builder Wizard, which use the same UI.
- *
+ * 
  * @author ll93751
  */
 public interface IReportDocument
@@ -53,7 +53,7 @@ public interface IReportDocument
 
     // -------------------------------------------------------------------------
     // Access Helper
-    // -------------------------------------------------------------------------
+    // -------------------------------------------------------------------------    
     /**
      * Gives access to the DB Values
      * @return
@@ -69,7 +69,7 @@ public interface IReportDocument
     public com.sun.star.awt.XWindowPeer getWizardParent();
 
     /**
-     *
+     * 
      * @return the Frame of the document Window or Report Builder Window
      */
     public com.sun.star.frame.XFrame getFrame();
@@ -78,10 +78,10 @@ public interface IReportDocument
 
     // -------------------------------------------------------------------------
     // First step: After entering the table name, select fields
-    // -------------------------------------------------------------------------
+    // -------------------------------------------------------------------------    
     /**
      * Is called after first step, set Tablename and the fields, which should occur in the Report.
-     * @param _aType
+     * @param _aType 
      * @param TableName
      * @param FieldNames
      */
@@ -99,7 +99,7 @@ public interface IReportDocument
 
     // -------------------------------------------------------------------------
     // Second step: Label field titles
-    // -------------------------------------------------------------------------
+    // -------------------------------------------------------------------------    
     /**
      * Set new names for the titles
      * @param sFieldTitles
@@ -117,7 +117,7 @@ public interface IReportDocument
     public void liveupdate_changeUserFieldContent(final String FieldName, final String TitleName);
     // -------------------------------------------------------------------------
     // Third step: Grouping
-    // -------------------------------------------------------------------------
+    // -------------------------------------------------------------------------    
     /* Grouping Page */
     // Document should not hold the grouping information!
     /**
@@ -148,7 +148,7 @@ public interface IReportDocument
     public void setGrouping(String[] aGroupList);
     // -------------------------------------------------------------------------
     // Fourth step: Sorting
-    // -------------------------------------------------------------------------
+    // -------------------------------------------------------------------------    
     /**
      * Set the list how to sort
      * @param aSort
@@ -156,7 +156,7 @@ public interface IReportDocument
     public void setSorting(String[][] aSort);
     // -------------------------------------------------------------------------
     // Fivth step: Templates / Layout
-    // -------------------------------------------------------------------------
+    // -------------------------------------------------------------------------    
     /* Template Page */
     public void setPageOrientation(int nOrientation) throws com.sun.star.lang.IllegalArgumentException;
 
@@ -187,7 +187,7 @@ public interface IReportDocument
     public void layout_setupRecordSection(String TemplateName);
     // -------------------------------------------------------------------------
     // finishing
-    // -------------------------------------------------------------------------
+    // -------------------------------------------------------------------------    
     // preview (update titlenames)
     // addTextListener
     /**
@@ -229,7 +229,7 @@ public interface IReportDocument
     public void dispose();
     // -------------------------------------------------------------------------
     // Garbage dump
-    // -------------------------------------------------------------------------
+    // -------------------------------------------------------------------------    
     /* DataImport */
     // ???
     // public void addTextSectionCopies();
@@ -262,7 +262,7 @@ public interface IReportDocument
 
     /**
      * check internal invariants
-     * @throws a
+     * @throws a 
      */
     public void checkInvariants() throws java.lang.Exception;
 }
diff --git a/wizards/com/sun/star/wizards/report/RecordTable.java b/wizards/com/sun/star/wizards/report/RecordTable.java
index b4af7f7fa94b..97570a481eeb 100644
--- a/wizards/com/sun/star/wizards/report/RecordTable.java
+++ b/wizards/com/sun/star/wizards/report/RecordTable.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/wizards/com/sun/star/wizards/report/ReportFinalizer.java b/wizards/com/sun/star/wizards/report/ReportFinalizer.java
index 1482e118e516..05253f45d0b5 100644
--- a/wizards/com/sun/star/wizards/report/ReportFinalizer.java
+++ b/wizards/com/sun/star/wizards/report/ReportFinalizer.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/wizards/com/sun/star/wizards/report/ReportImplementationHelper.java b/wizards/com/sun/star/wizards/report/ReportImplementationHelper.java
index a8d26d68cd41..a215bd98369d 100644
--- a/wizards/com/sun/star/wizards/report/ReportImplementationHelper.java
+++ b/wizards/com/sun/star/wizards/report/ReportImplementationHelper.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER 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 @@ public class ReportImplementationHelper
     protected int m_nDefaultPageOrientation;
 
     /**
-     *
+     * 
      * @param _aMSF
-     * @param _nOrientation
+     * @param _nOrientation 
      */
     public ReportImplementationHelper(XMultiServiceFactory _aMSF, int _nOrientation)
     {
diff --git a/wizards/com/sun/star/wizards/report/ReportLayouter.java b/wizards/com/sun/star/wizards/report/ReportLayouter.java
index d1532b47dc4a..d05bc2cf4845 100644
--- a/wizards/com/sun/star/wizards/report/ReportLayouter.java
+++ b/wizards/com/sun/star/wizards/report/ReportLayouter.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/wizards/com/sun/star/wizards/report/ReportTextDocument.java b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
index 3ab9e704b9b9..9ba3d039f6ea 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextDocument.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextDocument.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/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 05f7ad2a6a5b..3219ea8f9857 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -406,7 +406,7 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
         catch (Exception exception)
         {
         }
-//            catch (java.lang.Exception javaexception)
+//            catch (java.lang.Exception javaexception) 
 //            {
 //                javaexception.printStackTrace(System.out);
 //            }
@@ -434,18 +434,18 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
         }
         DataVector.removeAllElements();
     }
-//    public void updateProgressDisplay(int iCounter)
+//    public void updateProgressDisplay(int iCounter) 
 //        {
-//            try
+//            try 
 //            {
-//                if (iCounter % 10 == 0)
+//                if (iCounter % 10 == 0) 
 //                {
 //                    sProgressCurRecord = JavaTools.replaceSubString(sProgressBaseCurRecord, String.valueOf(iCounter), "<COUNT>");
 //                    setControlProperty("lblCurProgress", "Label", sProgressCurRecord);
 //                    super.xReschedule.reschedule();
 //                }
-//            }
-//            catch (java.lang.Exception jexception)
+//            } 
+//            catch (java.lang.Exception jexception) 
 //            {
 //                jexception.printStackTrace(System.out);
 //            }
diff --git a/wizards/com/sun/star/wizards/report/ReportWizard.java b/wizards/com/sun/star/wizards/report/ReportWizard.java
index 2bffd2b4bea3..dd545a14796b 100644
--- a/wizards/com/sun/star/wizards/report/ReportWizard.java
+++ b/wizards/com/sun/star/wizards/report/ReportWizard.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -428,7 +428,7 @@ private static void initializeLogger(XMultiServiceFactory _xMSF)
         System.out.println("Can't get singleton from logging");
     }
     final XLoggerPool xLoggerPool = UnoRuntime.queryInterface( XLoggerPool.class, aLoggerPool );
-    m_xLogger = xLoggerPool.getNamedLogger("com.sun.star.wizards.ReportBuilder");
+    m_xLogger = xLoggerPool.getNamedLogger("com.sun.star.wizards.ReportBuilder");    
 }
 
 public static XLogger getLogger()
@@ -466,7 +466,7 @@ public static XLogger getLogger()
                 }
             }
         }
-
+        
         try
         {
             if (m_reportDocument == null)
@@ -750,7 +750,7 @@ public static XLogger getLogger()
 //        long nTime = aDate.getTime();
 //        Long aLong = new Long(nTime);
 //        String aStr = aLong.toString();
-//
+//        
 //        Date aNewDate = new Date(1202382900000L);
 ////         aNewDate.
 //        String aDateStr = aNewDate.toString();
diff --git a/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java b/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java
index 6a90214696a5..aa3357ff4ceb 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER 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 @@ public class ReportBuilderImplementation extends ReportImplementationHelper
         catch (com.sun.star.uno.Exception e)
         {
             ReportWizard.getLogger().log(com.sun.star.logging.LogLevel.SEVERE, "Problems with initialize the ReportDefinition" + e.getMessage());
-
+            
         }
 
         switchOffPropertyBrowser();
@@ -328,7 +328,7 @@ public class ReportBuilderImplementation extends ReportImplementationHelper
 
     /**
      * Change the current Layouter by a new one with the given Name _sName.
-     * If there exist no other layouter with the given name, nothing happens, the layouter will not change to
+     * If there exist no other layouter with the given name, nothing happens, the layouter will not change to 
      * an illegal one.
      * @param _sName Name of the other layouter.
      */
@@ -642,7 +642,7 @@ public class ReportBuilderImplementation extends ReportImplementationHelper
         String[] a = new String[getLayoutMap().size()];
         String[] b = new String[getLayoutMap().size()];
 
-        // run through the whole layoutmap and
+        // run through the whole layoutmap and 
         final Set aKeys = getLayoutMap().keySet();
         final Iterator aKeyIterator = aKeys.iterator();
         int i = 0;
@@ -745,4 +745,4 @@ public class ReportBuilderImplementation extends ReportImplementationHelper
 
 }
 
-
+   
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java
index ccb74ebf6f07..c12e1db4e36c 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns.java
index 2dc468fb09e7..90bf347e2a03 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns.java
@@ -1,8 +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
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java
index d79713524021..4ef9ccdf98c5 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java b/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java
index 55fdafe6c79a..307bb61bf373 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java
@@ -1,8 +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
@@ -282,7 +282,7 @@ public class DesignTemplate
     /**
      * create a new DesignTemplate by try to load a otr file from the given path.
      * Internally we store the loaded ReportDefinition.
-     *
+     * 
      * @param _xMSF
      * @param _sPath
      * @return
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java
index 9fd891a446f2..a26278d581b7 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java
@@ -1,8 +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
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java
index c03cf7cec909..9dae19223bc7 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java
@@ -1,8 +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
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/LayoutConstants.java b/wizards/com/sun/star/wizards/reportbuilder/layout/LayoutConstants.java
index c31ce4b5f277..d5261c62dc33 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/LayoutConstants.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/LayoutConstants.java
@@ -2,7 +2,7 @@
  * ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java
index a10affa9ea2c..237802ab31cb 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER 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 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
     /**
      * The Constructor is protected, this is a abstract class, use Tabular or other to create an instance.
      * @param _xDefinitionAccess
-     * @param _aResource
+     * @param _aResource 
      */
     protected ReportBuilderLayouter(IReportDefinitionReadAccess _xDefinitionAccess, Resource _aResource)
     {
@@ -126,7 +126,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
 
     /**
      * Layout the complete report new, by all information we know until this time.
-     *
+     * 
      * If there are some information less, it is no problem for this function, they will be leaved out.
      * It is possible to call this function after every change, but be careful, could take a little bit longer.
      */
@@ -192,7 +192,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
     // -------------------------------------------------------------------------
     /**
      * Remove all fields
-     * @param _xSectionToClear
+     * @param _xSectionToClear 
      */
     private void emptySection(XSection _xSectionToClear)
     {
@@ -227,7 +227,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
 //    {
 //    }
     /**
-     *
+     * 
      * @param _nGroupCount
      * @return the left indent in 1/100mm
      */
@@ -707,14 +707,14 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
     // -------------------------------------------------------------------------
     /**
      * Insert a already formatted field name into a given section
-     *
+     * 
      * Use 'convertToFieldName(dbfield)' to convert a dbfield name in the right.
-     *
+     * 
      * @param _xSection        in which section the formatted field will store
      * @param _sFormattedfield as String a dbfield or an other function
      * @param _aRect           .X, .Y are the absolute position (1/100mm) where the formatted field will set
      * @param _nWidth          the width of the field in 1/100mm
-     * @param _aSO
+     * @param _aSO 
      * @return a new Rectangle with the new Rect.X position, Rect.Y will not change.
      */
     protected Rectangle insertFormattedField(XSection _xSection, String _sFormattedfield, Rectangle _aRect, int _nWidth, SectionObject _aSO)
@@ -749,7 +749,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
                     }
                 }
                 _aRect.Height = nHeight;
-
+                
                 final XReportControlModel xReportControlModel = (XReportControlModel) UnoRuntime.queryInterface(XReportControlModel.class, aField);
                 if (xReportControlModel != null)
                 {
@@ -781,7 +781,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
                         if (xImageControl != null)
                         {
                             // xImageControl.setScaleImage(true);
-
+                            
                             xImageControl.setScaleMode(com.sun.star.awt.ImageScaleMode.Isotropic);
                         }
                     }
@@ -1010,7 +1010,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
 //        {
 //            GregorianCalendar aCalendar = new GregorianCalendar();
 //            StringBuffer aBuf = new StringBuffer();
-//
+//            
 //            Locale aLocale = new Locale("en","US");
 //            SimpleDateFormat aFormat = new SimpleDateFormat(_sFormat, aLocale);
 //            aBuf = aFormat.format(aCalendar.getTime(), aBuf, new FieldPosition(0) );
@@ -1038,14 +1038,14 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
 ////        long nTime = aDate.getTime();
 ////        Long aLong = new Long(nTime);
 ////        String aStr = aLong.toString();
-////
+////        
 ////        Date aNewDate = new Date(1202382900000L);
 //////         aNewDate.
 ////        String aDateStr = aNewDate.toString();
 //////         Datetime aNewTime = new Time(1202382900);
 //////         String aTimeStr = aNewTime.toString();
 ////
-//
+//        
 //    }
     protected void clearPageFooter()
     {
@@ -1094,7 +1094,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
     /**
      * Returns the width and height of a given string (_sText) in 1/100mm drawn in the given font descriptor.
      * TODO: This function is a performance leak, we could store already calculated values in a map, to build a cache. Access should be much faster then.
-     *
+     * 
      * @param _sText
      * @param _aFont
      * @return width of given text in 1/100mm
@@ -1648,7 +1648,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
 //                {
 //                    ex.printStackTrace();
 //                }
-//
+//                
 //            }
 
         }
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionEmptyObject.java b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionEmptyObject.java
index 8df754795e63..f97f0744913b 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionEmptyObject.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionEmptyObject.java
@@ -1,8 +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
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel.java b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel.java
index ae3766fd3391..5a7ed7f83d0c 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel.java
@@ -1,8 +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
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionObject.java b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionObject.java
index fa33e85d39cb..f07254edc979 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionObject.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionObject.java
@@ -1,8 +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
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionTextField.java b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionTextField.java
index 2a11fcd56f04..11d3e676298f 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionTextField.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionTextField.java
@@ -1,8 +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
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java b/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java
index 0fe168b28263..d5018e4e09c9 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/table/CGCategory.java b/wizards/com/sun/star/wizards/table/CGCategory.java
index ea74b33f09ad..739645b4e29f 100644
--- a/wizards/com/sun/star/wizards/table/CGCategory.java
+++ b/wizards/com/sun/star/wizards/table/CGCategory.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
@@ -60,7 +60,7 @@ public class CGCategory
     {
         try
         {
-            oconfigView = Configuration.getConfigurationRoot(xMSF, CGROOTPATH, false);  //business/Tables
+            oconfigView = Configuration.getConfigurationRoot(xMSF, CGROOTPATH, false);  //business/Tables   
             xNameAccessCurBusinessNode = Configuration.getChildNodebyName(
                 UnoRuntime.queryInterface(XNameAccess.class, oconfigView),
                 category);
diff --git a/wizards/com/sun/star/wizards/table/CGTable.java b/wizards/com/sun/star/wizards/table/CGTable.java
index a1878bdeb02f..12198c9a96f2 100644
--- a/wizards/com/sun/star/wizards/table/CGTable.java
+++ b/wizards/com/sun/star/wizards/table/CGTable.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/wizards/com/sun/star/wizards/table/CallTableWizard.java b/wizards/com/sun/star/wizards/table/CallTableWizard.java
index 4aeb66cf66ca..4b992a5ea463 100644
--- a/wizards/com/sun/star/wizards/table/CallTableWizard.java
+++ b/wizards/com/sun/star/wizards/table/CallTableWizard.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/wizards/com/sun/star/wizards/table/FieldDescription.java b/wizards/com/sun/star/wizards/table/FieldDescription.java
index d26e58783aba..fbb2dbfd715f 100644
--- a/wizards/com/sun/star/wizards/table/FieldDescription.java
+++ b/wizards/com/sun/star/wizards/table/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
@@ -132,7 +132,7 @@ public class FieldDescription
         try
         {
             xPropertySet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, _xNameAccessFieldNode);
-//      Integer Index = (Integer) xPropertySet.getPropertyValue("Index");
+//      Integer Index = (Integer) xPropertySet.getPropertyValue("Index");       
             if (propertyexists("Name"))
             {
                 aPropertyValues.addElement(Properties.createProperty("Name", Name));
@@ -144,16 +144,16 @@ public class FieldDescription
             if (propertyexists("Scale"))
             {
                 aPropertyValues.addElement(Properties.createProperty("Scale", (Integer) xPropertySet.getPropertyValue("Scale")));
-//          Scale =
+//          Scale =         
             }
             if (propertyexists("Precision"))
             {
                 aPropertyValues.addElement(Properties.createProperty("Precision", (Integer) xPropertySet.getPropertyValue("Precision")));
-//          Precision = (Integer) xPropertySet.getPropertyValue("Precision");
+//          Precision = (Integer) xPropertySet.getPropertyValue("Precision");       
             }
             if (propertyexists("DefaultValue"))
             {
-                aPropertyValues.addElement(Properties.createProperty("DefaultValue", (Boolean) xPropertySet.getPropertyValue("DefaultValue")));//          DefaultValue = (Boolean) xPropertySet.getPropertyValue("DefaultValue");
+                aPropertyValues.addElement(Properties.createProperty("DefaultValue", (Boolean) xPropertySet.getPropertyValue("DefaultValue")));//          DefaultValue = (Boolean) xPropertySet.getPropertyValue("DefaultValue");     
             //Type =  new Integer(4); // TODO wo ist der Fehler?(Integer) xPropertySet.getPropertyValue("Type");
             }
         }
diff --git a/wizards/com/sun/star/wizards/table/FieldFormatter.java b/wizards/com/sun/star/wizards/table/FieldFormatter.java
index 205413bd50f3..3c9a8997e01f 100644
--- a/wizards/com/sun/star/wizards/table/FieldFormatter.java
+++ b/wizards/com/sun/star/wizards/table/FieldFormatter.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/wizards/com/sun/star/wizards/table/Finalizer.java b/wizards/com/sun/star/wizards/table/Finalizer.java
index 43c6787a294c..94636532ed07 100644
--- a/wizards/com/sun/star/wizards/table/Finalizer.java
+++ b/wizards/com/sun/star/wizards/table/Finalizer.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/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java
index d8ecf13a9ad9..6f7ecb289080 100644
--- a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java
+++ b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.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/wizards/com/sun/star/wizards/table/ScenarioSelector.java b/wizards/com/sun/star/wizards/table/ScenarioSelector.java
index 4f985c18e055..6f6ae92fce23 100644
--- a/wizards/com/sun/star/wizards/table/ScenarioSelector.java
+++ b/wizards/com/sun/star/wizards/table/ScenarioSelector.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,7 +58,7 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X
 {
     final static int PRIVATE = 0;
     final static int BUSINESS = 1;
-
+    
     private XFixedText lblExplanation;
     private XFixedText lblCategories;
     private XRadioButton optBusiness;
@@ -329,7 +329,7 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X
             {
                 int selindex = JavaTools.FieldInList(NewItems, SelItems[i]);
                 super.xSelectedFieldsListBox.removeItems((short) selindex, (short) 1);
-                /**TODO In this context the items should be better placed at their original position.
+                /**TODO In this context the items should be better placed at their original position. 
                  * but how is this position retrieved?
                  */
                 super.xFieldsListBox.addItem(SelItems[i], xFieldsListBox.getItemCount());
diff --git a/wizards/com/sun/star/wizards/table/TableWizard.java b/wizards/com/sun/star/wizards/table/TableWizard.java
index 1444cc946675..607f5b739667 100644
--- a/wizards/com/sun/star/wizards/table/TableWizard.java
+++ b/wizards/com/sun/star/wizards/table/TableWizard.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/wizards/com/sun/star/wizards/text/TextDocument.java b/wizards/com/sun/star/wizards/text/TextDocument.java
index 4fe2e9f0d710..0dd48f6608d8 100644
--- a/wizards/com/sun/star/wizards/text/TextDocument.java
+++ b/wizards/com/sun/star/wizards/text/TextDocument.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/wizards/com/sun/star/wizards/text/TextFieldHandler.java b/wizards/com/sun/star/wizards/text/TextFieldHandler.java
index 5d8c677c621e..8994bfd1860b 100644
--- a/wizards/com/sun/star/wizards/text/TextFieldHandler.java
+++ b/wizards/com/sun/star/wizards/text/TextFieldHandler.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
@@ -59,7 +59,7 @@ public class TextFieldHandler
     /**
      * Creates a new instance of TextFieldHandler
      * @param xMSF
-     * @param xTextDocument
+     * @param xTextDocument 
      */
     public TextFieldHandler(XMultiServiceFactory xMSF, XTextDocument xTextDocument)
     {
diff --git a/wizards/com/sun/star/wizards/text/TextFrameHandler.java b/wizards/com/sun/star/wizards/text/TextFrameHandler.java
index 562444a1ad84..93e48a247f52 100644
--- a/wizards/com/sun/star/wizards/text/TextFrameHandler.java
+++ b/wizards/com/sun/star/wizards/text/TextFrameHandler.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/text/TextSectionHandler.java b/wizards/com/sun/star/wizards/text/TextSectionHandler.java
index 42fd75879c3c..dadf928a504b 100644
--- a/wizards/com/sun/star/wizards/text/TextSectionHandler.java
+++ b/wizards/com/sun/star/wizards/text/TextSectionHandler.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
@@ -233,7 +233,7 @@ public class TextSectionHandler
             {
                 XTextCursor xTextCursor = xText.createTextCursor();
                 xText.insertControlCharacter(xTextCursor, ControlCharacter.PARAGRAPH_BREAK, false);
-                //      Helper.setUnoPropertyValue(xTextCursor, "PageDescName", "First Page");
+                //		Helper.setUnoPropertyValue(xTextCursor, "PageDescName", "First Page");
                 xTextCursor.collapseToEnd();
             }
             XTextCursor xSecondTextCursor = xText.createTextCursor();
diff --git a/wizards/com/sun/star/wizards/text/TextStyleHandler.java b/wizards/com/sun/star/wizards/text/TextStyleHandler.java
index e6c952e65785..e50a923ad719 100644
--- a/wizards/com/sun/star/wizards/text/TextStyleHandler.java
+++ b/wizards/com/sun/star/wizards/text/TextStyleHandler.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/wizards/com/sun/star/wizards/text/TextTableHandler.java b/wizards/com/sun/star/wizards/text/TextTableHandler.java
index d3646a7cfa37..7b70e2348b6d 100644
--- a/wizards/com/sun/star/wizards/text/TextTableHandler.java
+++ b/wizards/com/sun/star/wizards/text/TextTableHandler.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/wizards/com/sun/star/wizards/text/ViewHandler.java b/wizards/com/sun/star/wizards/text/ViewHandler.java
index e29ad10cfbb1..117fc159bbc4 100644
--- a/wizards/com/sun/star/wizards/text/ViewHandler.java
+++ b/wizards/com/sun/star/wizards/text/ViewHandler.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/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
index 55a6b35dc7e9..55ae228032a1 100644
--- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java
+++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.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
@@ -357,7 +357,7 @@ public class AggregateComponent extends ControlScroller
                 ControlRow oControlRow = (ControlRow) ControlRowVector.elementAt(i);
 //              if (i == _index)
 //                  oControlRow.settovoid();
-//              else
+//              else            
                 oControlRow.setVisible(false);
             }
         }
diff --git a/wizards/com/sun/star/wizards/ui/ButtonList.java b/wizards/com/sun/star/wizards/ui/ButtonList.java
index 634261145079..e14a06b4ee0a 100644
--- a/wizards/com/sun/star/wizards/ui/ButtonList.java
+++ b/wizards/com/sun/star/wizards/ui/ButtonList.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
@@ -93,7 +93,7 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener
     {
         m_aControlName = _sName;
     }
-
+    
     /** Setter for property m_aButtonSize.
      * @param imageSize  New value of property m_aButtonSize.
      */
@@ -354,7 +354,7 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener
     }
 
     /**
-     *
+     * 
      * @param i
      * @return the Object in the list model corresponding to the given image index.
      */
@@ -372,7 +372,7 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener
     }
 
     /**
-     *
+     * 
      * @param i
      * @return the index in the listModel for the given image index.
      */
@@ -451,7 +451,7 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener
      */
     private void fireItemSelected()
     {
-//      java.awt.event.ItemEvent event = new java.awt.event.ItemEvent(this, 0,
+//      java.awt.event.ItemEvent event = new java.awt.event.ItemEvent(this, 0, 
 //          getSelectedObject(), java.awt.event.ItemEvent.SELECTED);
         java.util.ArrayList list;
         synchronized(this)
@@ -755,9 +755,9 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener
     {
 
         /**
-         *
+         * 
          * @param listItem
-         * @return two resource ids for an image referenced in the imaglist resourcefile of the
+         * @return two resource ids for an image referenced in the imaglist resourcefile of the 
          * wizards project; The second one of them is designed to be used for High Contrast Mode.
          */
         public Object[] getImageUrls(Object listItem);
diff --git a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java
index ddca1039706a..5bb10f184d86 100644
--- a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.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
@@ -278,7 +278,7 @@ public class CommandFieldSelection extends FieldSelection implements Comparator
     }
 
     /** returns the selected entry index in the commandListbox
-     *
+     * 
      * @return
      * @throws com.sun.star.wizards.common.TerminateWizardException
      */
diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.java b/wizards/com/sun/star/wizards/ui/ControlScroller.java
index f42fe81134a9..037ad93fff1d 100644
--- a/wizards/com/sun/star/wizards/ui/ControlScroller.java
+++ b/wizards/com/sun/star/wizards/ui/ControlScroller.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
@@ -389,7 +389,7 @@ public abstract class ControlScroller
      * the control in guiRow and column
      * @param guiRow 0 based row index
      * @param column 0 based column index
-     * @return the propertyValue object corresponding to
+     * @return the propertyValue object corresponding to 
      * this control.
      */
     protected PropertyValue fieldInfo(int guiRow, int column)
@@ -496,7 +496,7 @@ public abstract class ControlScroller
 
     protected abstract void initializeScrollFields();
 
-    /** inserts a group of controls into the component. The group may either be a row or a column of controls
+    /** inserts a group of controls into the component. The group may either be a row or a column of controls 
      *  The controls should be put on Step 99 (means made invisible at first). All the controlrows that are needed are than
      *  made visible automatically when calling "initialize(_fieldcount)"
      * @author bc93774
diff --git a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java
index 341ab73828c5..0bd88031781d 100644
--- a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.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/wizards/com/sun/star/wizards/ui/DocumentPreview.java b/wizards/com/sun/star/wizards/ui/DocumentPreview.java
index 173fae87f01b..f077660d41ed 100644
--- a/wizards/com/sun/star/wizards/ui/DocumentPreview.java
+++ b/wizards/com/sun/star/wizards/ui/DocumentPreview.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
@@ -67,7 +67,7 @@ public class DocumentPreview
 
     /*********************************************************************
     main
-
+    
     - create new frame with window inside
     - load a component as preview into this frame
      */
@@ -138,7 +138,7 @@ public class DocumentPreview
     /*********************************************************************
     create a new frame with a new container window inside,
     which isnt part of the global frame tree.
-
+    
     Attention:
     a) This frame wont be destroyed by the office. It must be closed by you!
     Do so - please call XCloseable::close().
diff --git a/wizards/com/sun/star/wizards/ui/FieldSelection.java b/wizards/com/sun/star/wizards/ui/FieldSelection.java
index 803f85948721..021526622680 100644
--- a/wizards/com/sun/star/wizards/ui/FieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/FieldSelection.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/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java
index 50b855ab3693..8b75d0531e1c 100644
--- a/wizards/com/sun/star/wizards/ui/FilterComponent.java
+++ b/wizards/com/sun/star/wizards/ui/FilterComponent.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
@@ -242,7 +242,7 @@ public class FilterComponent
             {
                 final String serviceName = "com.sun.star.beans.PropertyBag";
                 final XPropertyContainer column = (XPropertyContainer) UnoRuntime.queryInterface(XPropertyContainer.class, oQueryMetaData.xMSF.createInstance(serviceName));
-
+                
                 column.addProperty("Type", PropertyAttribute.BOUND, DataType.VARCHAR);
                 column.addProperty("Name", PropertyAttribute.BOUND, "");
                 column.addProperty("Value", (short)( PropertyAttribute.MAYBEVOID | PropertyAttribute.REMOVABLE ), null );
@@ -388,7 +388,7 @@ public class FilterComponent
      * @param iWidth
      * @param FilterCount
      * @param _oQueryMetaData
-     * @param _firstHelpID
+     * @param _firstHelpID 
      */
     public FilterComponent(WizardDialog CurUnoDialog, XMultiServiceFactory _xMSF, int iStep, int iPosX, int iPosY, int iWidth, int FilterCount, QueryMetaData _oQueryMetaData, int _firstHelpID)
     {
@@ -525,8 +525,8 @@ public class FilterComponent
     }
 
     // -------------------------------------------------------------------------
-    //
-    //
+    // 
+    // 
     // -------------------------------------------------------------------------
     final class ControlRow
     {
@@ -719,7 +719,7 @@ public class FilterComponent
 
         /**
          * @returns true if the current condition is complete, all needed fields are filled with values.
-         * So we can enable the next.
+         * So we can enable the next. 
          */
         boolean isConditionComplete()
         {
diff --git a/wizards/com/sun/star/wizards/ui/ImageList.java b/wizards/com/sun/star/wizards/ui/ImageList.java
index dcd378369c5f..0fb4a4e93d4e 100644
--- a/wizards/com/sun/star/wizards/ui/ImageList.java
+++ b/wizards/com/sun/star/wizards/ui/ImageList.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
@@ -190,7 +190,7 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener
         //XWindow win = (XWindow)UnoRuntime.queryInterface(XWindow.class,lblContainer);
         /*dialog.xWindow.addWindowListener(uiEventListener);
         String dName = (String)Helper.getUnoPropertyValue(dialog.xDialogModel,"Name");
-
+        
         uiEventListener.add(dName,EventNames.EVENT_WINDOW_SHOWN,"disableContainerMouseEvents",this);
          */
         int selectionWidth = rowSelect ?
@@ -502,7 +502,7 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener
     }
 
     /**
-     *
+     * 
      * @param i
      * @return the Object in the list model corresponding to the given image index.
      */
@@ -520,7 +520,7 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener
     }
 
     /**
-     *
+     * 
      * @param i
      * @return the index in the listModel for the given image index.
      */
@@ -598,7 +598,7 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener
      */
     private void fireItemSelected()
     {
-//      java.awt.event.ItemEvent event = new java.awt.event.ItemEvent(this, 0,
+//      java.awt.event.ItemEvent event = new java.awt.event.ItemEvent(this, 0, 
 //          getSelectedObject(), java.awt.event.ItemEvent.SELECTED);
         java.util.ArrayList list;
         synchronized(this)
@@ -878,15 +878,15 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener
     System.out.println("mouse enter");
     int i = getImageFromEvent(event);
     //TODO what is when the image does not display an image?
-    if (getIndexFor(i) != selected)
+    if (getIndexFor(i) != selected) 
     setBorder(m_aImages[i],imageBorderMO);
     }
-
+    
     public void mouseExitImage(Object event) {
     //System.out.println("mouse exit");
     int i = getImageFromEvent(event);
     //TODO what is when the image does not display an image?
-    if (getIndexFor(i) != selected)
+    if (getIndexFor(i) != selected) 
     setBorder(m_aImages[i],imageBorder);
     }
      */
@@ -930,9 +930,9 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener
     {
 
         /**
-         *
+         * 
          * @param listItem
-         * @return two resource ids for an image referenced in the imaglist resourcefile of the
+         * @return two resource ids for an image referenced in the imaglist resourcefile of the 
          * wizards project; The second one of them is designed to be used for High Contrast Mode.
          */
         public Object[] getImageUrls(Object listItem);
diff --git a/wizards/com/sun/star/wizards/ui/PathSelection.java b/wizards/com/sun/star/wizards/ui/PathSelection.java
index 4cb101382c6d..501e99d67171 100755
--- a/wizards/com/sun/star/wizards/ui/PathSelection.java
+++ b/wizards/com/sun/star/wizards/ui/PathSelection.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/ui/PeerConfig.java b/wizards/com/sun/star/wizards/ui/PeerConfig.java
index d3871ee62a5b..3175d6475988 100644
--- a/wizards/com/sun/star/wizards/ui/PeerConfig.java
+++ b/wizards/com/sun/star/wizards/ui/PeerConfig.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
@@ -160,9 +160,9 @@ public class PeerConfig implements XWindowListener
     }
 
     /**
-     *
+     * 
      * @param oAPIControl an API control that the interface XControl can be derived from
-     * @param _saccessname
+     * @param _saccessname 
      */
     public void setAccessibleName(Object oAPIControl, String _saccessname)
     {
@@ -188,10 +188,10 @@ public class PeerConfig implements XWindowListener
     }
 
     /**
-     *
+     * 
      * @param oAPIControl an API control that the interface XControl can be derived from
-     * @param _propnames
-     * @param _propvalues
+     * @param _propnames 
+     * @param _propvalues 
      */
     public void setPeerProperties(Object oAPIControl, String[] _propnames, Object[] _propvalues)
     {
@@ -221,7 +221,7 @@ public class PeerConfig implements XWindowListener
     /**
      * Assigns an image to the property 'ImageUrl' of a dialog control. The image id must be assigned in a resource file
      * within the wizards project
-     * wizards project
+     * wizards project 
      * @param _ocontrolmodel
      * @param _nResId
      * @param _nhcResId
@@ -233,7 +233,7 @@ public class PeerConfig implements XWindowListener
     }
 
     /**
-     * Assigns an image to the property 'ImageUrl' of a dialog control. The image ids that the Resource urls point to
+     * Assigns an image to the property 'ImageUrl' of a dialog control. The image ids that the Resource urls point to 
      * may be assigned in a Resource file outside the wizards project
      * @param _ocontrolmodel
      * @param _sResourceUrl
@@ -248,10 +248,10 @@ public class PeerConfig implements XWindowListener
     /**
      * Assigns an image to the property 'ImageUrl' of a dialog control. The image id must be assigned in a resource file
      * within the wizards project
-     * wizards project
+     * wizards project 
      * @param _ocontrolmodel
      * @param _oResource
-     * @param _oHCResource
+     * @param _oHCResource 
      */
     public void setImageUrl(Object _ocontrolmodel, Object _oResource, Object _oHCResource)
     {
diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java b/wizards/com/sun/star/wizards/ui/SortingComponent.java
index 29b646d3e852..3e4b45c2c239 100644
--- a/wizards/com/sun/star/wizards/ui/SortingComponent.java
+++ b/wizards/com/sun/star/wizards/ui/SortingComponent.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
@@ -130,7 +130,7 @@ public class SortingComponent
                         }, new Object[]
                         {
                             new Boolean(bDoEnable), new Integer(10), HIDString, sSortDescend[i], IOptButtonPosX, new Integer(iCurPosY + 24), new Short((short) 0), IStep, new Short(curtabindex++), new String("DESC"), IOptButtonWidth
-                        }); //, new Short((short) (19+i*4))
+                        }); //, new Short((short) (19+i*4))  
                 iCurPosY = iCurPosY + 36;
                 FirstHelpIndex += 3;
             }
@@ -205,9 +205,9 @@ public class SortingComponent
     }
 
     /**
-     * sets the controls of a Sorting criterion to readonly or not.
+     * sets the controls of a Sorting criterion to readonly or not. 
      * @param _index index of the Sorting criterion
-     * @param _breadonly
+     * @param _breadonly 
      */
     public void setReadOnly(int _index, boolean _breadonly)
     {
@@ -215,7 +215,7 @@ public class SortingComponent
     }
 
     /**
-     *
+     * 
      * @param _index the first Sorting criterion in which 'ReadOnly is set to 'false'
      * @param _bcomplete
      */
diff --git a/wizards/com/sun/star/wizards/ui/TitlesComponent.java b/wizards/com/sun/star/wizards/ui/TitlesComponent.java
index d4091c964e14..f42dac35a046 100644
--- a/wizards/com/sun/star/wizards/ui/TitlesComponent.java
+++ b/wizards/com/sun/star/wizards/ui/TitlesComponent.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/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java
index 5a181b84c4b5..63b62bdb735d 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.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/wizards/com/sun/star/wizards/ui/UnoDialog2.java b/wizards/com/sun/star/wizards/ui/UnoDialog2.java
index 184a4a354b0c..61e63aee2450 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog2.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog2.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/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java
index f17c44b82aa5..5a8434148b89 100644
--- a/wizards/com/sun/star/wizards/ui/WizardDialog.java
+++ b/wizards/com/sun/star/wizards/ui/WizardDialog.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
@@ -435,7 +435,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL
      */
 
     /**
-     *
+     * 
      * @param _ndialogpage
      * @param ooldValue
      * @param onewValue
diff --git a/wizards/com/sun/star/wizards/ui/XCommandSelectionListener.java b/wizards/com/sun/star/wizards/ui/XCommandSelectionListener.java
index 24fbd10eb9dd..73a7c7a87048 100644
--- a/wizards/com/sun/star/wizards/ui/XCommandSelectionListener.java
+++ b/wizards/com/sun/star/wizards/ui/XCommandSelectionListener.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/ui/XCompletion.java b/wizards/com/sun/star/wizards/ui/XCompletion.java
index 545345731e39..a3f2416826c1 100644
--- a/wizards/com/sun/star/wizards/ui/XCompletion.java
+++ b/wizards/com/sun/star/wizards/ui/XCompletion.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/wizards/com/sun/star/wizards/ui/XFieldSelectionListener.java b/wizards/com/sun/star/wizards/ui/XFieldSelectionListener.java
index b47ad2363709..28916f1b89a8 100644
--- a/wizards/com/sun/star/wizards/ui/XFieldSelectionListener.java
+++ b/wizards/com/sun/star/wizards/ui/XFieldSelectionListener.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/ui/XPathSelectionListener.java b/wizards/com/sun/star/wizards/ui/XPathSelectionListener.java
index 5c76c092a46f..4b582127bb2f 100755
--- a/wizards/com/sun/star/wizards/ui/XPathSelectionListener.java
+++ b/wizards/com/sun/star/wizards/ui/XPathSelectionListener.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/ui/event/AbstractListener.java b/wizards/com/sun/star/wizards/ui/event/AbstractListener.java
index ebbcba96f58c..4265f39b50c2 100644
--- a/wizards/com/sun/star/wizards/ui/event/AbstractListener.java
+++ b/wizards/com/sun/star/wizards/ui/event/AbstractListener.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/wizards/com/sun/star/wizards/ui/event/CommonListener.java b/wizards/com/sun/star/wizards/ui/event/CommonListener.java
index 18f33af2cef8..0899d3117af6 100644
--- a/wizards/com/sun/star/wizards/ui/event/CommonListener.java
+++ b/wizards/com/sun/star/wizards/ui/event/CommonListener.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/wizards/com/sun/star/wizards/ui/event/DataAware.java b/wizards/com/sun/star/wizards/ui/event/DataAware.java
index b81b8e71bcdb..dc095206eafa 100644
--- a/wizards/com/sun/star/wizards/ui/event/DataAware.java
+++ b/wizards/com/sun/star/wizards/ui/event/DataAware.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,7 +44,7 @@ import java.util.Iterator;
  * in child classes, the updateData() will be binded to UI event calls.
  * <br><br>
  * This class holds references to a Data Object and a Value object.
- * The Value object "knows" how to get and set a value from the
+ * The Value object "knows" how to get and set a value from the 
  * Data Object.
  */
 public abstract class DataAware {
@@ -60,7 +60,7 @@ public abstract class DataAware {
      * from/to the data object.
      */
     protected Value value;
-
+    
     /**
      * creates a DataAware object for the given data object and Value object.
      * @param dataObject_
@@ -89,7 +89,7 @@ public abstract class DataAware {
      */
     public void setDataObject(Object obj, boolean updateUI) {
 
-        if (obj != null && !value.isAssignable(obj.getClass()))
+        if (obj != null && !value.isAssignable(obj.getClass())) 
             throw new ClassCastException("can not cast new DataObject to original Class");
 
         dataObject = obj;
@@ -112,14 +112,14 @@ public abstract class DataAware {
 
     /**
      * gets the current value from the data obejct.
-     * this method delegates the job to
+     * this method delegates the job to 
      * the value object.
      * @return the current value of the data object.
      */
     protected Object getFromData() {
         return value.get(getDataObject());
     }
-
+    
     /**
      * sets the given value to the UI control
      * @param newValue the value to set to the ui control.
@@ -221,10 +221,10 @@ public abstract class DataAware {
         for (Iterator i = dataAwares.iterator(); i.hasNext();)
              ((DataAware) i.next()).setDataObject(dataObject, updateUI);
     }
-
+    
     /**
      * Value objects read and write a value from and
-     * to an object. Typically using reflection and JavaBeans properties
+     * to an object. Typically using reflection and JavaBeans properties 
      * or directly using memeber reflection API.
      * DataAware delegates the handling of the DataObject
      * to a Value object.
@@ -254,7 +254,7 @@ public abstract class DataAware {
          */
         public boolean isAssignable(Class type);
     }
-
+    
     /**
      * implementation of Value, handling JavaBeans properties through
      * reflection.
@@ -282,7 +282,7 @@ public abstract class DataAware {
             getMethod = createGetMethod(propertyName, propertyOwner);
             setMethod = createSetMethod(propertyName, propertyOwner, getMethod.getReturnType());
         }
-
+        
         /**
          * called from the constructor, and creates a get method reflection object
          * for the given property and object.
@@ -306,7 +306,7 @@ public abstract class DataAware {
             }
             return m;
         }
-
+        
         /* (non-Javadoc)
          * @see com.sun.star.wizards.ui.event.DataAware.Value#get(java.lang.Object)
          */
@@ -328,7 +328,7 @@ public abstract class DataAware {
                     return new short[0];
             }
             return null;
-
+        
         }
 
         protected Method createSetMethod(String propName, Object obj, Class paramClass) {
diff --git a/wizards/com/sun/star/wizards/ui/event/DataAwareFields.java b/wizards/com/sun/star/wizards/ui/event/DataAwareFields.java
index 74881d7b1f23..1e058374d760 100644
--- a/wizards/com/sun/star/wizards/ui/event/DataAwareFields.java
+++ b/wizards/com/sun/star/wizards/ui/event/DataAwareFields.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,12 +31,12 @@ import java.lang.reflect.Field;
 import com.sun.star.uno.Any;
 
 /**
- * This class is a factory for Value objects for different types of
- * memebers.
- * Other than some Value implementations classes this class contains static
+ * This class is a factory for Value objects for different types of 
+ * memebers. 
+ * Other than some Value implementations classes this class contains static 
  * type conversion methods and factory methods.
- *
- * @see com.sun.star.wizards.ui.event.DataAware.Value
+ * 
+ * @see com.sun.star.wizards.ui.event.DataAware.Value 
  */
 public class DataAwareFields
 {
@@ -47,7 +47,7 @@ public class DataAwareFields
     /**
      * returns a Value Object which sets and gets values
      * and converting them to other types, according to the "value" argument.
-     *
+     * 
      * @param owner
      * @param fieldname
      * @param value
diff --git a/wizards/com/sun/star/wizards/ui/event/EventNames.java b/wizards/com/sun/star/wizards/ui/event/EventNames.java
index 50aa32dc57aa..ee1a0ace9cdd 100644
--- a/wizards/com/sun/star/wizards/ui/event/EventNames.java
+++ b/wizards/com/sun/star/wizards/ui/event/EventNames.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/wizards/com/sun/star/wizards/ui/event/ListModelBinder.java b/wizards/com/sun/star/wizards/ui/event/ListModelBinder.java
index b2dc75f22f48..db209161fffa 100644
--- a/wizards/com/sun/star/wizards/ui/event/ListModelBinder.java
+++ b/wizards/com/sun/star/wizards/ui/event/ListModelBinder.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
@@ -138,7 +138,7 @@ public class ListModelBinder implements ListDataListener
             insert(i);
 
         /*int insertedItems = lde.getIndex1() - lde.getIndex0() + 1;
-
+        
         for (int i = 0; i<selected.length; i++)
         if (selected[i].intValue() >= lde.getIndex0())
         selected[i] = new Short((short)(selected[i].shortValue() + insertedItems));
@@ -161,12 +161,12 @@ public class ListModelBinder implements ListDataListener
     if (s>=lde.getIndex0() && s<==lde.getIndex1()) {
     selected[i] = null;
     removed++;
+    }             
     }
-    }
-
+    
     Short[] newSelected = (removed > 0 ? new Short[selected.length - removed] : selected;
     if (removed>0)
-
+    
     if (selected[i].intValue() >= lde.getIndex0())
      */
     }
diff --git a/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java b/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java
index c45a496c7849..617c55882e3f 100644
--- a/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java
+++ b/wizards/com/sun/star/wizards/ui/event/MethodInvocation.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 @@ import java.lang.reflect.Method;
 
 /**
  * Encapsulate a Method invocation.
- * In the constructor one defines a method, a target object and an optional
+ * In the constructor one defines a method, a target object and an optional 
  * Parameter.
  * Then one calls "invoke", with or without a parameter. <br/>
  * Limitations: I do not check anything myself. If the param is not ok, from the
@@ -80,7 +80,7 @@ public class MethodInvocation
     }
 
     /**
-     * Returns the result of calling the method on the object, or null, if no result.
+     * Returns the result of calling the method on the object, or null, if no result. 
      */
     public Object invoke(Object param) throws IllegalAccessException, InvocationTargetException
     {
diff --git a/wizards/com/sun/star/wizards/ui/event/RadioDataAware.java b/wizards/com/sun/star/wizards/ui/event/RadioDataAware.java
index 7dddea572503..3954b2eea671 100644
--- a/wizards/com/sun/star/wizards/ui/event/RadioDataAware.java
+++ b/wizards/com/sun/star/wizards/ui/event/RadioDataAware.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/wizards/com/sun/star/wizards/ui/event/SimpleDataAware.java b/wizards/com/sun/star/wizards/ui/event/SimpleDataAware.java
index 8a9c2200d76d..5c102903272f 100644
--- a/wizards/com/sun/star/wizards/ui/event/SimpleDataAware.java
+++ b/wizards/com/sun/star/wizards/ui/event/SimpleDataAware.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
@@ -72,7 +72,7 @@ public class SimpleDataAware extends DataAware
     else if (value.equals("")) return Boolean.FALSE;
     else return Boolean.TRUE;
     }
-
+    
     public void disableControls(Object[] controls) {
     disableObjects = controls;
     }
diff --git a/wizards/com/sun/star/wizards/ui/event/Task.java b/wizards/com/sun/star/wizards/ui/event/Task.java
index 16feacd5e1fa..1d67ecb956c6 100644
--- a/wizards/com/sun/star/wizards/ui/event/Task.java
+++ b/wizards/com/sun/star/wizards/ui/event/Task.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/wizards/com/sun/star/wizards/ui/event/TaskEvent.java b/wizards/com/sun/star/wizards/ui/event/TaskEvent.java
index 1c54cfea2fa6..af840c3b4bb4 100644
--- a/wizards/com/sun/star/wizards/ui/event/TaskEvent.java
+++ b/wizards/com/sun/star/wizards/ui/event/TaskEvent.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/wizards/com/sun/star/wizards/ui/event/TaskListener.java b/wizards/com/sun/star/wizards/ui/event/TaskListener.java
index 114747c30776..cfbc16c9c845 100644
--- a/wizards/com/sun/star/wizards/ui/event/TaskListener.java
+++ b/wizards/com/sun/star/wizards/ui/event/TaskListener.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/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java
index 632609d85f05..010773216183 100644
--- a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java
+++ b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.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,10 +36,10 @@ import com.sun.star.wizards.common.Helper;
  *
  * This class suppoprts imple cases where a UI control can
  * be directly synchronized with a data property.
- * Such controls are: the different text controls
- * (synchronizing the "Text" , "Value", "Date", "Time" property),
+ * Such controls are: the different text controls 
+ * (synchronizing the "Text" , "Value", "Date", "Time" property), 
  * Checkbox controls, Dropdown listbox controls (synchronizing the
- * SelectedItems[] property.
+ * SelectedItems[] property. 
  * For those controls, static convenience methods are offered, to simplify use.
  */
 public class UnoDataAware extends DataAware
diff --git a/wizards/com/sun/star/wizards/web/AbstractErrorHandler.java b/wizards/com/sun/star/wizards/web/AbstractErrorHandler.java
index 6a6c5a0c220f..b6a4855673f6 100644
--- a/wizards/com/sun/star/wizards/web/AbstractErrorHandler.java
+++ b/wizards/com/sun/star/wizards/web/AbstractErrorHandler.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,8 +34,8 @@ import com.sun.star.wizards.common.SystemDialog;
 /**
  * An abstract implementation of ErrorHandler, which
  * uses a renderer method geMessageFor(Exception, Object, int, int)
- * (in this class still abstract...)
- * to render the errors, and displays
+ * (in this class still abstract...) 
+ * to render the errors, and displays 
  * error messeges.
  */
 public abstract class AbstractErrorHandler implements ErrorHandler
@@ -100,7 +100,7 @@ public abstract class AbstractErrorHandler implements ErrorHandler
     /**
      * display a message
      * @deprecated
-     * @param xmsf
+     * @param xmsf 
      * @param message the message to display
      * @param errorType an int constant from the ErrorHandler interface.
      * @return
@@ -159,7 +159,7 @@ public abstract class AbstractErrorHandler implements ErrorHandler
 
     /**
      * @param errorType
-     * @return the Uno attributes for each error type.
+     * @return the Uno attributes for each error type. 
      */
     private static int getAttributeFor(int errorType)
     {
@@ -227,7 +227,7 @@ public abstract class AbstractErrorHandler implements ErrorHandler
      * @param ex the exception
      * @param arg a free argument
      * @param ix a free argument
-     * @param type the error type (from the int constants
+     * @param type the error type (from the int constants 
      * in ErrorHandler interface)
      * @return a Strings which will be displayed in the message box,
      * and which describes the error, and the needed action from the user.
diff --git a/wizards/com/sun/star/wizards/web/BackgroundsDialog.java b/wizards/com/sun/star/wizards/web/BackgroundsDialog.java
index 70c40fbc6072..5663182af030 100644
--- a/wizards/com/sun/star/wizards/web/BackgroundsDialog.java
+++ b/wizards/com/sun/star/wizards/web/BackgroundsDialog.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
@@ -88,7 +88,7 @@ public class BackgroundsDialog extends ImageListDialog
 
     /**
      * trigered when the user clicks the "other" button.
-     * opens a "file open" dialog, adds the selected
+     * opens a "file open" dialog, adds the selected 
      * image to the list and to the web wizard configuration,
      * and then jumps to the new image, selecting it in the list.
      * @see add(String)
@@ -106,7 +106,7 @@ public class BackgroundsDialog extends ImageListDialog
     }
 
     /**
-     * adds the given image to the image list (to the model)
+     * adds the given image to the image list (to the model) 
      * and to the web wizard configuration.
      * @param s
      * @return
@@ -141,9 +141,9 @@ public class BackgroundsDialog extends ImageListDialog
     }
 
     /**
-     * an ImageList Imagerenderer implemtation.
+     * an ImageList Imagerenderer implemtation. 
      * The image URL is the object given from the list model.
-     * the image name, got from the "render" method is
+     * the image name, got from the "render" method is 
      * the filename portion of the url.
      * @author rpiterman
      *
@@ -177,13 +177,13 @@ public class BackgroundsDialog extends ImageListDialog
     }
 
     /**
-     * This is a list model for the image list of the
+     * This is a list model for the image list of the 
      * backgrounds dialog.
      * It takes the Backgrounds config set as an argument,
      * and "parses" it to a list of files:
      * It goes through each image in the set, and checks it:
      * if it is a directory it lists all image files in this directory.
-     * if it is a file, it adds the file to the list.
+     * if it is a file, it adds the file to the list. 
      * @author rpiterman
      */
     private class Model extends DefaultListModel
@@ -272,8 +272,8 @@ public class BackgroundsDialog extends ImageListDialog
 
         /**
          * adds the given image url to the list.
-         * if and only if it ends with jpg, jpeg or gif
-         * (case insensitive)
+         * if and only if it ends with jpg, jpeg or gif 
+         * (case insensitive) 
          * @param filename image url.
          */
         private void add(String filename)
diff --git a/wizards/com/sun/star/wizards/web/CallWizard.java b/wizards/com/sun/star/wizards/web/CallWizard.java
index f0318e5f2e18..4b9d7a3680e4 100644
--- a/wizards/com/sun/star/wizards/web/CallWizard.java
+++ b/wizards/com/sun/star/wizards/web/CallWizard.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 CallWizard
     /**
      * Gives a factory for creating the service. This method is called by the
      * <code>JavaLoader</code>
-     *
+     * 
      * <p></p>
      *
      * @param stringImplementationName The implementation name of the component.
diff --git a/wizards/com/sun/star/wizards/web/ErrorHandler.java b/wizards/com/sun/star/wizards/web/ErrorHandler.java
index f330532a3058..aa9495e5cde0 100644
--- a/wizards/com/sun/star/wizards/web/ErrorHandler.java
+++ b/wizards/com/sun/star/wizards/web/ErrorHandler.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 interface ErrorHandler
     public static int DEF_YES = VclWindowPeerAttribute.DEF_YES;
     public static int DEF_NO = VclWindowPeerAttribute.DEF_NO;
     /**
-     * Error type for fatal errors which should abort application
+     * Error type for fatal errors which should abort application 
      * execution. Should actually never be used :-)
      */
     public static final int ERROR_FATAL = 0;
@@ -101,7 +101,7 @@ public interface ErrorHandler
      */
     public static final int ERROR_WARNING = 8;
     /**
-     * An error type which just tells the user something
+     * An error type which just tells the user something 
      * ( like "you look tired! you should take a bath! and so on)
      */
     public static final int ERROR_MESSAGE = 9;
diff --git a/wizards/com/sun/star/wizards/web/ExtensionVerifier.java b/wizards/com/sun/star/wizards/web/ExtensionVerifier.java
index 8bc036131b70..2b7158b5ad31 100644
--- a/wizards/com/sun/star/wizards/web/ExtensionVerifier.java
+++ b/wizards/com/sun/star/wizards/web/ExtensionVerifier.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 ExtensionVerifier implements UCB.Verifier
     /**
      * @return true if the given object is
      * a String which does not end with the
-     * given extension.
+     * given extension. 
      */
     public boolean verify(Object object)
     {
diff --git a/wizards/com/sun/star/wizards/web/FTPDialog.java b/wizards/com/sun/star/wizards/web/FTPDialog.java
index 976e57790ab2..8f5303a4a4b5 100644
--- a/wizards/com/sun/star/wizards/web/FTPDialog.java
+++ b/wizards/com/sun/star/wizards/web/FTPDialog.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
@@ -56,7 +56,7 @@ import com.sun.star.wizards.web.data.CGSettings;
 
 /**
  * This is the FTP Dialog. <br/>
- * The Dialog enables the user:
+ * The Dialog enables the user: 
  * (*) entering FTP server and user information.
  * (*) testing the connection.
  * (*) choosing a directory on the server.
@@ -75,7 +75,7 @@ public class FTPDialog extends UnoDialog2 implements UIConsts, WWHID
 
     /**
      * A Constant used for the setLabel(int) method to change the
-     * status-display. "unknown" is the status when the user first
+     * status-display. "unknown" is the status when the user first 
      * opens the dialog, or changes the servername/username/password.
      */
     private final static int STATUS_UNKONWN = 0;
@@ -123,7 +123,7 @@ public class FTPDialog extends UnoDialog2 implements UIConsts, WWHID
      */
     private final static String ICON_UNKNOWN = "ftpunknown.gif";
     /**
-     * The icon url for an icon representing the "connecting" state.
+     * The icon url for an icon representing the "connecting" state. 
      */
     private final static String ICON_CONNECTING = "ftpconnecting.gif";    //GUI Components as Class members.
     //Fixed Line
@@ -178,7 +178,7 @@ public class FTPDialog extends UnoDialog2 implements UIConsts, WWHID
      * @param xmsf
      * @param p the publishert object that contains the data
      * for this dialog
-     * @throws Exception
+     * @throws Exception 
      */
     public FTPDialog(XMultiServiceFactory xmsf, CGPublish p) throws Exception
     {
@@ -408,8 +408,8 @@ public class FTPDialog extends UnoDialog2 implements UIConsts, WWHID
     }
 
     /**
-     * extract the hostname out of the url used by the
-     * publisher. This url does not include the username:password string.
+     * extract the hostname out of the url used by the 
+     * publisher. This url does not include the username:password string. 
      * @param ftpUrl
      * @return
      */
@@ -616,7 +616,7 @@ public class FTPDialog extends UnoDialog2 implements UIConsts, WWHID
     /**
      * changes the status label to disconnected status, and
      * disables the ok and choose-dir buttons.
-     * This method is called also when the hostname, username
+     * This method is called also when the hostname, username 
      * and passwordtext fields change.
      */
     public void disconnect()
@@ -693,7 +693,7 @@ public class FTPDialog extends UnoDialog2 implements UIConsts, WWHID
     }
 
     /**
-     * changes the text of the status label and
+     * changes the text of the status label and 
      * (TODO) the status image.
      * @param label
      * @param color
@@ -713,7 +713,7 @@ public class FTPDialog extends UnoDialog2 implements UIConsts, WWHID
     }
 
     /**
-     * called when the user clicks
+     * called when the user clicks 
      * the choose-dir button. ("...")
      * Opens the pickFolder dialog.
      * checks if the returned folder is an ftp folder.
diff --git a/wizards/com/sun/star/wizards/web/FTPDialogResources.java b/wizards/com/sun/star/wizards/web/FTPDialogResources.java
index b9a5fe7548d6..83b12084a6bf 100644
--- a/wizards/com/sun/star/wizards/web/FTPDialogResources.java
+++ b/wizards/com/sun/star/wizards/web/FTPDialogResources.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
@@ -65,8 +65,8 @@ public class FTPDialogResources extends Resource
         super(xmsf, UNIT_NAME, MODULE_NAME);
 
         /**
-         * Delete the String, uncomment the getResText method
-         *
+         * Delete the String, uncomment the getResText method 
+         * 
          */
         resFTPDialog_title = getResText(RID_FTPDIALOG_START + 0);
         reslblUsername_value = getResText(RID_FTPDIALOG_START + 1);
diff --git a/wizards/com/sun/star/wizards/web/IconsDialog.java b/wizards/com/sun/star/wizards/web/IconsDialog.java
index 6228180a75f4..59d205674737 100644
--- a/wizards/com/sun/star/wizards/web/IconsDialog.java
+++ b/wizards/com/sun/star/wizards/web/IconsDialog.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 @@ import com.sun.star.wizards.web.data.CGIconSet;
  * This class simulates a model, though it does not functions really as one,
  * since it does not cast events.
  * It also implements the ImageList.ImageRenderer interface, to handle
- * its own objects.
+ * its own objects. 
  */
 public class IconsDialog extends ImageListDialog implements ImageList.IImageRenderer, ListModel
 {
diff --git a/wizards/com/sun/star/wizards/web/ImageListDialog.java b/wizards/com/sun/star/wizards/web/ImageListDialog.java
index 976d61222e72..a31f8ed73368 100644
--- a/wizards/com/sun/star/wizards/web/ImageListDialog.java
+++ b/wizards/com/sun/star/wizards/web/ImageListDialog.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 com.sun.star.wizards.ui.ImageList.Counter;
  * The model and the renderer are
  * still abstract in this class.
  * To use the class one should extend it,
- * in the constructor then set the imageList
+ * in the constructor then set the imageList 
  * properties (member name il) like image size, grid size,
  * model renderer aso, and then call "build".
  * This class uses a counter renderer which
@@ -58,9 +58,9 @@ import com.sun.star.wizards.ui.ImageList.Counter;
  * so dialogs which do not need those, should set the corresponding
  * members showDeselectButton and/or showOtherButton to false.
  * <br/>
- * the consturctor should recieve, among others, an Array of String resources - see
+ * the consturctor should recieve, among others, an Array of String resources - see 
  * constructor documentation for details.
- *
+ * 
  * @author rpiterman
  */
 public abstract class ImageListDialog extends UnoDialog2 implements UIConsts
@@ -94,12 +94,12 @@ public abstract class ImageListDialog extends UnoDialog2 implements UIConsts
     private int hid;
 
     /**
-     *
+     * 
      * @param xmsf
      * @param resources_ a string array with the following strings :
      * dialog title, label text, ok, cancel, help, deselect, other.
-     * <br/> if "deselect" and "other" are not displayed,
-     * the array can also be shorter. but if "other" is displayed
+     * <br/> if "deselect" and "other" are not displayed, 
+     * the array can also be shorter. but if "other" is displayed 
      * and "deselect" not, both must be there :-(
      */
     public ImageListDialog(
@@ -116,7 +116,7 @@ public abstract class ImageListDialog extends UnoDialog2 implements UIConsts
      * adds the controls to the dialog, depending on
      * the size of the image list.
      * This method should be called by subclasses after setting
-     * the il ImageList member properties
+     * the il ImageList member properties 
      */
     protected void build()
     {
@@ -198,7 +198,7 @@ public abstract class ImageListDialog extends UnoDialog2 implements UIConsts
         il.tabIndex = 1;
         il.create(this);
 
-        /*lblContainer = insertLabel("lblContainer",
+        /*lblContainer = insertLabel("lblContainer", 
         new String[] {"Height", "Name", "PositionX", "PositionY", "TabIndex", "Width"},
         new Object[] { new Integer(176),"lblContainer",new Integer(6),new Integer(17),new Short((short)5),new Integer(214)}
         );*/
diff --git a/wizards/com/sun/star/wizards/web/LogTaskListener.java b/wizards/com/sun/star/wizards/web/LogTaskListener.java
index f1814f9e4cb6..bb97fdf83819 100644
--- a/wizards/com/sun/star/wizards/web/LogTaskListener.java
+++ b/wizards/com/sun/star/wizards/web/LogTaskListener.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/web/Process.java b/wizards/com/sun/star/wizards/web/Process.java
index d1ae8e23763e..0bcb3e245c20 100644
--- a/wizards/com/sun/star/wizards/web/Process.java
+++ b/wizards/com/sun/star/wizards/web/Process.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
@@ -76,7 +76,7 @@ import com.sun.star.wizards.web.export.Exporter;
  * all preparations are done in WWD_Events.finishWizard methods.
  * <br/>
  * <br/>
- *
+ * 
  * note on error handling: <br/>
  * on "catch" clauses I tries to decide whether the
  * exception is fatal or not. For fatal exception an error message
@@ -84,7 +84,7 @@ import com.sun.star.wizards.web.export.Exporter;
  * and a false is returned.
  * In less-fatal errors, the errorHandler "should decide" which means,
  * the user is given the option to "OK" or to "Cancel" and depending
- * on that interaction I cary on.
+ * on that interaction I cary on. 
  */
 public class Process implements WebWizardConst, ProcessErrors
 {
@@ -105,8 +105,8 @@ public class Process implements WebWizardConst, ProcessErrors
     private UCB ucb;
     public Task myTask;
     /**
-     * This is a cache for exporters, so I do not need to
-     * instanciate the same exporter more than once.
+     * This is a cache for exporters, so I do not need to 
+     * instanciate the same exporter more than once. 
      */
     private Map exporters = new Hashtable(3);
     private boolean result;
@@ -131,7 +131,7 @@ public class Process implements WebWizardConst, ProcessErrors
 
     /**
      * @return to how many destinations should the
-     * generated site be published.
+     * generated site be published. 
      */
     private int countPublish()
     {
@@ -203,7 +203,7 @@ public class Process implements WebWizardConst, ProcessErrors
 
         if (!result)
         {
-            myTask.fail();        //this is a bug protection.
+            myTask.fail();        //this is a bug protection. 
         }
         while (myTask.getStatus() < myTask.getMax())
         {
@@ -273,13 +273,13 @@ public class Process implements WebWizardConst, ProcessErrors
 //   * @return true if should continue
 //   */
 //  private boolean cleanup(String dir) {
-//
+//      
 //      boolean success = true;
 //
 //      if (dir != null && fileAccess.exists(dir,false)) {
 //
 //          String[] files = fileAccess.listFiles(dir,true);
-//
+//          
 //          for (int i = 0; i < files.length; i++) {
 //              if (fileAccess.isDirectory(files[i]))
 //                  success = success && cleanup(files[i]);
@@ -291,7 +291,7 @@ public class Process implements WebWizardConst, ProcessErrors
 //      return success && fileAccess.delete(dir);
 //  }
     /**
-     * This method is used to copy style files to a target
+     * This method is used to copy style files to a target 
      * Directory: css and background.
      * Note that this method is static since it is
      * also used when displaying a "preview"
@@ -319,7 +319,7 @@ public class Process implements WebWizardConst, ProcessErrors
     }
 
     /**
-     * Copy "static" files (which are always the same,
+     * Copy "static" files (which are always the same, 
      * thus not user-input-dependant) to a target directory.
      * Note that this method is static since it is
      * also used when displaying a "preview"
@@ -427,7 +427,7 @@ public class Process implements WebWizardConst, ProcessErrors
         try
         {
             /*
-             * here I create the DOM of the TOC to pass to the XSL
+             * here I create the DOM of the TOC to pass to the XSL 
              */
             Document doc = (Document) settings.cp_DefaultSession.createDOM();
             generate(xmsf, layout, doc, fileAccess, targetDir, task);
@@ -439,7 +439,7 @@ public class Process implements WebWizardConst, ProcessErrors
             return false;
         }
 
-        /* copy files which are not xsl from layout directory to
+        /* copy files which are not xsl from layout directory to 
          * website root.
          */
         try
@@ -507,7 +507,7 @@ public class Process implements WebWizardConst, ProcessErrors
             throws Exception
     {
         /*
-         * a map that contains xsl templates. the keys are the xsl file names.
+         * a map that contains xsl templates. the keys are the xsl file names. 
          */
         Map templates = layout.getTemplates(xmsf);
 
@@ -565,7 +565,7 @@ public class Process implements WebWizardConst, ProcessErrors
      * In the present situation, where we only use a "flat" list of
      * documents, instead of the original plan to use a tree,
      * the recursion is not implemented.
-     * @param content the content ( directory-like, contains documents)
+     * @param content the content ( directory-like, contains documents) 
      * @param dir (target directory for exporting this content.
      * @param task
      * @return true if should continue
@@ -626,7 +626,7 @@ public class Process implements WebWizardConst, ProcessErrors
                 }
                 catch (SecurityException sx)
                 {
-                    // nonfatal
+                    // nonfatal 
                     if (!error(sx, item, ERROR_EXPORT_SECURITY, ErrorHandler.ERROR_NORMAL_IGNORE))
                     {
                         return false;
@@ -674,7 +674,7 @@ public class Process implements WebWizardConst, ProcessErrors
                 error(ex, doc, ERROR_DOC_VALIDATE, ErrorHandler.ERROR_PROCESS_FATAL);
                 return false;
             }
-        //get the exporter specified for this document
+        //get the exporter specified for this document  
         }
         CGExporter exporter = (CGExporter) settings.cp_Exporters.getElement(doc.cp_Exporter);
 
@@ -683,15 +683,15 @@ public class Process implements WebWizardConst, ProcessErrors
         {
 
             /*
-             * here I calculate the destination filename.
-             * I take the original filename (docFilename), substract the extension, (docExt) -> (fn)
+             * here I calculate the destination filename. 
+             * I take the original filename (docFilename), substract the extension, (docExt) -> (fn) 
              * and find an available filename which starts with
              * this filename, but with the new extension. (destExt)
              */
             String docFilename = FileAccess.getFilename(doc.cp_URL);
 
             String docExt = FileAccess.getExtension(docFilename);
-            String fn = doc.localFilename.substring(0, doc.localFilename.length() - docExt.length() - 1); //filename without extension
+            String fn = doc.localFilename.substring(0, doc.localFilename.length() - docExt.length() - 1); //filename without extension 
 
             /*
              * the copyExporter does not change
@@ -711,7 +711,7 @@ public class Process implements WebWizardConst, ProcessErrors
             }
 
             /*
-             * if two files with the same name
+             * if two files with the same name 
              * need to be exported ? So here
              * i get a new filename, so I do not
              * overwrite files...
@@ -734,9 +734,9 @@ public class Process implements WebWizardConst, ProcessErrors
                 task.advance(true);
             }
             /*
-             * getExporter(..) throws
+             * getExporter(..) throws 
              * IllegalAccessException, InstantiationException, ClassNotFoundException
-             * export() throws Exception
+             * export() throws Exception 
              */
             catch (Exception ex)
             {
@@ -762,7 +762,7 @@ public class Process implements WebWizardConst, ProcessErrors
 
     /**
      * submit an error.
-     * @param ex the exception
+     * @param ex the exception 
      * @param arg1 error argument
      * @param arg2 error argument 2
      * @param errType error type
@@ -789,7 +789,7 @@ public class Process implements WebWizardConst, ProcessErrors
     }
 
     /**
-     * creates an instance of the exporter class
+     * creates an instance of the exporter class 
      * as specified by the
      * exporter object.
      * @param export specifies the exporter to be created
@@ -811,7 +811,7 @@ public class Process implements WebWizardConst, ProcessErrors
     /**
      * searches the an exporter for the given CGExporter object
      * in the cache.
-     * If its not there, creates it, stores it in the cache and
+     * If its not there, creates it, stores it in the cache and 
      * returns it.
      * @param export specifies the needed exporter.
      * @return an Exporter instance
diff --git a/wizards/com/sun/star/wizards/web/ProcessErrorHandler.java b/wizards/com/sun/star/wizards/web/ProcessErrorHandler.java
index 96106986515c..75f08ed9068c 100644
--- a/wizards/com/sun/star/wizards/web/ProcessErrorHandler.java
+++ b/wizards/com/sun/star/wizards/web/ProcessErrorHandler.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/wizards/com/sun/star/wizards/web/ProcessErrors.java b/wizards/com/sun/star/wizards/web/ProcessErrors.java
index ca6da968654f..e3fb9f627080 100644
--- a/wizards/com/sun/star/wizards/web/ProcessErrors.java
+++ b/wizards/com/sun/star/wizards/web/ProcessErrors.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/wizards/com/sun/star/wizards/web/ProcessStatusRenderer.java b/wizards/com/sun/star/wizards/web/ProcessStatusRenderer.java
index 3fa3726f2e8f..4cbfde68194c 100644
--- a/wizards/com/sun/star/wizards/web/ProcessStatusRenderer.java
+++ b/wizards/com/sun/star/wizards/web/ProcessStatusRenderer.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,7 +34,7 @@ import com.sun.star.wizards.common.IRenderer;
 /**
  * @author rpiterman
  * recieves status calls from the status dialog which
- * apears when the user clicks "create".
+ * apears when the user clicks "create". 
  * allocates strings from the resources to
  * display the current task status.
  * (renders the state to resource strings)
diff --git a/wizards/com/sun/star/wizards/web/StatusDialog.java b/wizards/com/sun/star/wizards/web/StatusDialog.java
index ab1e7a0b6bc7..279b10f6cc68 100644
--- a/wizards/com/sun/star/wizards/web/StatusDialog.java
+++ b/wizards/com/sun/star/wizards/web/StatusDialog.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
@@ -222,7 +222,7 @@ public class StatusDialog extends UnoDialog2 implements TaskListener
     }
 
     /**
-     * changes the displayed text.
+     * changes the displayed text. 
      * A renderer is used to render
      * the task's subtask name to a resource string.
      */
@@ -296,7 +296,7 @@ public class StatusDialog extends UnoDialog2 implements TaskListener
 
     /**
      * sets a method to be invoced when the
-     *
+     * 
      */
     public void setFinishedMethod(MethodInvocation mi)
     {
diff --git a/wizards/com/sun/star/wizards/web/StylePreview.java b/wizards/com/sun/star/wizards/web/StylePreview.java
index 93507929d84b..a59ffbdb5f01 100644
--- a/wizards/com/sun/star/wizards/web/StylePreview.java
+++ b/wizards/com/sun/star/wizards/web/StylePreview.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,10 +32,10 @@ import com.sun.star.wizards.web.data.CGStyle;
 
 /**
  * @author rpiterman
- * the style preview, which is a OOo Document Preview in
+ * the style preview, which is a OOo Document Preview in 
  * an Image Control.
  * This class copies the files needed for this
- * preview from the web wizard work directory
+ * preview from the web wizard work directory 
  * to a given temporary directory, and updates them
  * on request, according to the current style/background selection
  * of the user.
@@ -48,7 +48,7 @@ public class StylePreview
      * the destination html url.
      */
     public String htmlFilename;
-    /**
+    /** 
      * the destination css url
      */
     private String cssFilename;
@@ -67,7 +67,7 @@ public class StylePreview
 
     /**
      * copies the html file to the temp directory, and calculates the
-     * destination names of the background and css files.
+     * destination names of the background and css files. 
      * @param wwRoot is the root directory of the web wizard files (
      * usually [oo]/share/template/[lang]/wizard/web
      */
@@ -113,7 +113,7 @@ public class StylePreview
             //copy the background image to the temp directory.
             fileAccess.copy(background, backgroundFilename);
         }
-        //copy the actual css to the temp directory
+        //copy the actual css to the temp directory 
         fileAccess.copy(css, cssFilename);
     }
 
diff --git a/wizards/com/sun/star/wizards/web/TOCPreview.java b/wizards/com/sun/star/wizards/web/TOCPreview.java
index 1fb70a11d4b5..110a34e27fb6 100644
--- a/wizards/com/sun/star/wizards/web/TOCPreview.java
+++ b/wizards/com/sun/star/wizards/web/TOCPreview.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,12 +44,12 @@ import com.sun.star.wizards.web.data.CGSettings;
  * @author rpiterman
  * This class both copies necessary files to
  * a temporary directory, generates a temporary TOC page,
- * and opens the generated html document in a web browser,
+ * and opens the generated html document in a web browser, 
  * by default "index.html" (unchangeable).
  * <br/>
- * Since the files are both static and dynamic (some are always the same,
- * while other change according to user choices)
- * I divide this tasks to two: all necessary
+ * Since the files are both static and dynamic (some are always the same, 
+ * while other change according to user choices) 
+ * I divide this tasks to two: all necessary 
  * static files, which should not regularily update are copied upon
  * instanciation.
  * The TOC is generated in refresh(...);
@@ -69,9 +69,9 @@ public class TOCPreview
 
     /**
      * @param xmsf_
-     * @param settings web wizard settings
-     * @param res resources
-     * @param tempDir_ destination
+     * @param settings web wizard settings 
+     * @param res resources 
+     * @param tempDir_ destination 
      * @throws Exception
      */
     public TOCPreview(XMultiServiceFactory xmsf_, CGSettings settings, WebWizardDialogResources res, String tempDir_, XFrame _xFrame)
@@ -104,7 +104,7 @@ public class TOCPreview
         Task task = new Task("", "", 10000);
         Process.generate(xmsf, layout, doc, fileAccess, tempDir, task);
         Process.copyLayoutFiles(ucb, fileAccess, settings, layout, tempDir);
-        xDispatch.dispatch(openHyperlink, loadArgs); //Dispatch.dispatch(openHyperlink, loadArgs);
+        xDispatch.dispatch(openHyperlink, loadArgs); //Dispatch.dispatch(openHyperlink, loadArgs);      
     }
 
     private PropertyValue[] loadArgs(String url)
diff --git a/wizards/com/sun/star/wizards/web/WWD_Events.java b/wizards/com/sun/star/wizards/web/WWD_Events.java
index e3927f188460..34261361d0bc 100644
--- a/wizards/com/sun/star/wizards/web/WWD_Events.java
+++ b/wizards/com/sun/star/wizards/web/WWD_Events.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,7 +58,7 @@ import com.sun.star.wizards.web.data.CGSessionName;
  * not much application-logic here - just plain
  * methods which react to events.
  * The only exception are the finish methods with the save
- * session methods.
+ * session methods. 
  */
 public abstract class WWD_Events extends WWD_Startup
 {
@@ -125,7 +125,7 @@ public abstract class WWD_Events extends WWD_Startup
         }
     }
 
-    /* *********************************
+    /* ********************************* 
      *  STEP 1
      */
     /**
@@ -238,7 +238,7 @@ public abstract class WWD_Events extends WWD_Startup
                 {
                     (short) 0
                 };
-                // We try to select the same item index again, if possible
+                // We try to select the same item index again, if possible 
                 if (settings.cp_SavedSessions.getSize() > selected[0])
                 {
                     nextSelected[0] = selected[0];
@@ -291,7 +291,7 @@ public abstract class WWD_Events extends WWD_Startup
      * when the user clicks another document
      * in the listbox, this method is called,
      * and couses the display in
-     * the textboxes title,description, author and export format
+     * the textboxes title,description, author and export format 
      * to change
      */
     public void setSelectedDoc(short[] s)
@@ -302,7 +302,7 @@ public abstract class WWD_Events extends WWD_Startup
         if (doc == null)
         {
             fillExportList(EMPTY_STRING_ARRAY);
-        //I try to avoid refreshing the export list if
+        //I try to avoid refreshing the export list if 
         //the same type of document is chosen.
         }
         else if (oldDoc == null || (!oldDoc.appType.equals(doc.appType)))
@@ -348,8 +348,8 @@ public abstract class WWD_Events extends WWD_Startup
             task.removeTaskListener(sd);
         }
         /*
-         * When adding a single document, do not use a
-         * status dialog...
+         * When adding a single document, do not use a 
+         * status dialog... 
          */
         else
         {
@@ -525,7 +525,7 @@ public abstract class WWD_Events extends WWD_Startup
     }
 
     /**
-     * updates the ui of a certain publisher
+     * updates the ui of a certain publisher 
      * (the text box url)
      * @param number
      */
@@ -632,7 +632,7 @@ public abstract class WWD_Events extends WWD_Startup
         if (p.cp_Publish)
         {
             String path = getFileAccess().getPath(p.url, null);
-            // target exists?
+            // target exists? 
             if (getFileAccess().exists(p.url, false))
             {
                 //if its a directory
@@ -660,7 +660,7 @@ public abstract class WWD_Events extends WWD_Startup
                     }
                 }
                 else
-                {//not a directory, but still exists
+                {//not a directory, but still exists 
                     String message = JavaTools.replaceSubString(resources.resLocalTargetExistsAsfile,
                             path, "%FILENAME");
                     AbstractErrorHandler.showMessage(xMSF, xControl.getPeer(), message, ErrorHandler.ERROR_PROCESS_FATAL);
@@ -712,7 +712,7 @@ public abstract class WWD_Events extends WWD_Startup
         {
 
             String path = getFileAccess().getPath(p.cp_URL, null);
-            // target exists?
+            // target exists? 
             if (getFileAccess().exists(p.cp_URL, false))
             {
                 //if its a directory
@@ -725,7 +725,7 @@ public abstract class WWD_Events extends WWD_Startup
                     return false;
                 }
                 else
-                {//not a directory, but still exists ( a file...)
+                {//not a directory, but still exists ( a file...) 
                     if (!p.overwriteApproved)
                     {
                         String message = JavaTools.replaceSubString(resources.resZipTargetExists,
@@ -750,7 +750,7 @@ public abstract class WWD_Events extends WWD_Startup
 
             String path = getFileAccess().getPath(p.cp_URL, null);
 
-            // target exists?
+            // target exists? 
             if (getFileAccess().exists(p.url, false))
             {
                 //if its a directory
@@ -902,10 +902,10 @@ public abstract class WWD_Events extends WWD_Startup
     }
 
     /**
-     * this method will be called when the Status Dialog
-     * is hidden.
+     * this method will be called when the Status Dialog 
+     * is hidden. 
      * It checks if the "Process" was successfull, and if so,
-     * it closes the wizard dialog.
+     * it closes the wizard dialog. 
      */
     public void finishWizardFinished()
     {
@@ -950,7 +950,7 @@ public abstract class WWD_Events extends WWD_Startup
      * @param exitOnCreate_ should the wizard close after
      * a successfull create.
      * Default is true,
-     * I have a hidden feature which enables false here
+     * I have a hidden feature which enables false here 
      */
     public void finishWizard(boolean exitOnCreate_)
     {
@@ -983,7 +983,7 @@ public abstract class WWD_Events extends WWD_Startup
      * this method is only called
      * if ftp-password was eather set, or
      * the user entered one in the FTP Dialog which
-     * popped up when clicking "Create".
+     * popped up when clicking "Create". 
      *
      */
     private void finishWizard2()
@@ -1052,7 +1052,7 @@ public abstract class WWD_Events extends WWD_Startup
 
         /*
          * again, if proxies are on, I disable ftp before the creation process
-         * starts.
+         * starts. 
          */
         if (proxies)
         {
@@ -1134,7 +1134,7 @@ public abstract class WWD_Events extends WWD_Startup
     }
 
     /**
-     * is called on the WindowHidden event,
+     * is called on the WindowHidden event, 
      * deletes the temporary directory.
      */
     public void cleanup()
@@ -1240,13 +1240,13 @@ public abstract class WWD_Events extends WWD_Startup
             // where the documents are added to in the list (offset)
             int offset = (getSelectedDoc().length > 0 ? selectedDoc[0] + 1 : getDocsCount());
 
-            /* if the user chose one file, the list starts at 0,
+            /* if the user chose one file, the list starts at 0, 
              * if he chose more than one, the first entry is a directory name,
              * all the others are filenames.
              */
             int start = (files.length > 1 ? 1 : 0);
             /*
-             * Number of documents failed to validate.
+             * Number of documents failed to validate. 
              */
             int failed = 0;
 
diff --git a/wizards/com/sun/star/wizards/web/WWD_General.java b/wizards/com/sun/star/wizards/web/WWD_General.java
index d4e273f4889b..4617a10ba898 100644
--- a/wizards/com/sun/star/wizards/web/WWD_General.java
+++ b/wizards/com/sun/star/wizards/web/WWD_General.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
@@ -86,7 +86,7 @@ public abstract class WWD_General extends WebWizardDialog
     }
 
     /*
-     *  File Dialog methods
+     *  File Dialog methods 
      */
     protected SystemDialog getDocAddDialog()
     {
@@ -98,7 +98,7 @@ public abstract class WWD_General extends WebWizardDialog
             docAddDialog.addFilter(
                     JavaTools.replaceSubString(f.cp_Name, resources.prodName, "%PRODNAME"), f.cp_Filter, i == 0);
         }
-        //docAddDialog.addFilter(resources.resSODocs, "*.oxt;*.sxw;*.sxc;*.sxd;*.sxi;*.sdw;*.sdc;*.sdd;*.sdi;*.sda;*.sdp"  ,true);
+        //docAddDialog.addFilter(resources.resSODocs, "*.oxt;*.sxw;*.sxc;*.sxd;*.sxi;*.sdw;*.sdc;*.sdd;*.sdi;*.sda;*.sdp"  ,true); 
         //docAddDialog.addFilter(resources.resMSDocs, "*.doc;*.xls;*.ppt;*.pps",false);
         //docAddDialog.addFilter(resources.resImages, "*.jpg;*.gif;*.png;*.bmp;*.tiff;*.jpeg;*.jpe",false);
         //docAddDialog.addFilter(resources.resAllFiles,"*.*",false);
@@ -159,7 +159,7 @@ public abstract class WWD_General extends WebWizardDialog
     }
 
     /**
-     * returns the document specified
+     * returns the document specified 
      * by the given short array.
      * @param s
      * @return
@@ -199,8 +199,8 @@ public abstract class WWD_General extends WebWizardDialog
     }
 
     /**
-     * returns a publisher object for the given name
-     * @param name one of the WebWizardConst constants : FTP
+     * returns a publisher object for the given name 
+     * @param name one of the WebWizardConst constants : FTP 
      * @return
      */
     protected CGPublish getPublisher(String name)
@@ -253,7 +253,7 @@ public abstract class WWD_General extends WebWizardDialog
         {
             return;
         /*
-         * disbale steps 3-7
+         * disbale steps 3-7 
          */
         }
         for (int i = 3; i < 8; i++)
@@ -261,7 +261,7 @@ public abstract class WWD_General extends WebWizardDialog
             setStepEnabled(i, enabled, true);
         /* in this place i just disable the finish button.
          * later, in the checkPublish, which is only performed if
-         * this one is true, it will be enabled (if the check
+         * this one is true, it will be enabled (if the check 
          * is positive)
          */
         }
@@ -331,9 +331,9 @@ public abstract class WWD_General extends WebWizardDialog
     }
 
     /**
-     *
+     * 
      * @return false either if publishing input is wrong or there
-     * are no publishing targets chosen. returns true when at least
+     * are no publishing targets chosen. returns true when at least 
      * one target is chosen, *and* all
      * which are chosen are legal.
      * If proxies are on, ftp publisher is ignored.
@@ -352,7 +352,7 @@ public abstract class WWD_General extends WebWizardDialog
 
     /**
      * This method checks if the publishing
-     * input is ok, and enables and disables
+     * input is ok, and enables and disables 
      * the 'create' button.
      * public because it is called from
      * an event listener object.
@@ -374,8 +374,8 @@ public abstract class WWD_General extends WebWizardDialog
     }
 
     /**
-     * substitutes path variables with the corresponding values.
-     * @param path a path, which might contain OOo path variables.
+     * substitutes path variables with the corresponding values. 
+     * @param path a path, which might contain OOo path variables. 
      * @return the path, after substituing path variables.
      */
     protected String substitute(String path)
diff --git a/wizards/com/sun/star/wizards/web/WWD_Startup.java b/wizards/com/sun/star/wizards/web/WWD_Startup.java
index 200f70a32383..a3ca1db939e7 100644
--- a/wizards/com/sun/star/wizards/web/WWD_Startup.java
+++ b/wizards/com/sun/star/wizards/web/WWD_Startup.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/wizards/com/sun/star/wizards/web/WWHID.java b/wizards/com/sun/star/wizards/web/WWHID.java
index 6d9a4882fcb9..8baa37243078 100644
--- a/wizards/com/sun/star/wizards/web/WWHID.java
+++ b/wizards/com/sun/star/wizards/web/WWHID.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/web/WebWizard.java b/wizards/com/sun/star/wizards/web/WebWizard.java
index 87ea5217b11e..81d6db638013 100644
--- a/wizards/com/sun/star/wizards/web/WebWizard.java
+++ b/wizards/com/sun/star/wizards/web/WebWizard.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/web/WebWizardConst.java b/wizards/com/sun/star/wizards/web/WebWizardConst.java
index 7ef17f134458..4846eabcdee9 100644
--- a/wizards/com/sun/star/wizards/web/WebWizardConst.java
+++ b/wizards/com/sun/star/wizards/web/WebWizardConst.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/web/WebWizardDialog.java b/wizards/com/sun/star/wizards/web/WebWizardDialog.java
index 736639972c44..a65132714431 100644
--- a/wizards/com/sun/star/wizards/web/WebWizardDialog.java
+++ b/wizards/com/sun/star/wizards/web/WebWizardDialog.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
@@ -90,8 +90,8 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC
     //Image Control
     XControl ImageControl6;
     XFixedText Label3;
-    //titled box
-    XControl FrameControl1;
+    //titled box 
+    XControl FrameControl1;   
     //Image Control
     XControl ImageControl2;
     //Image Control
@@ -897,17 +897,17 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC
         ilLayouts.helpURL = HID3_IL_LAYOUTS_IMG1;
 
     /*for (int i = 0; i<8; i++)
-    imgIconsPrev[i] = insertImage("imgIconPrev" + i,
+    imgIconsPrev[i] = insertImage("imgIconPrev" + i, 
     new String[] { "BackgroundColor","Border","Height","ImageURL", "PositionX", "PositionY", "ScaleImage", "Step", "Tabstop", "Width"},
     new Object[] { new Integer(-1), new Short((short)0),new Integer(14),"file:///c:/bludisk.gif", new Integer(97 + i * 20 + 7 ),new Integer(147),Boolean.FALSE,INTEGERS[5],Boolean.FALSE,new Integer(14)});
      */
     }
 
     /**
-     * renders the images and titles of
+     * renders the images and titles of 
      * the layouts
      * @author rpiterman
-
+    
      */
     private class LayoutRenderer implements ImageList.IImageRenderer
     {
diff --git a/wizards/com/sun/star/wizards/web/WebWizardDialogResources.java b/wizards/com/sun/star/wizards/web/WebWizardDialogResources.java
index c4a4f0cf58cd..6019cbe71ac6 100644
--- a/wizards/com/sun/star/wizards/web/WebWizardDialogResources.java
+++ b/wizards/com/sun/star/wizards/web/WebWizardDialogResources.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -189,8 +189,8 @@ public class WebWizardDialogResources
     {
         oResource = _oResource;
         /**
-         * Delete the String, uncomment the getResText method
-         *
+         * Delete the String, uncomment the getResText method 
+         * 
          */
         resWebWizardDialog_title = oResource.getResText(RID_WEBWIZARDDIALOG_START + 1);
         reslblIntroduction_value = oResource.getResText(RID_WEBWIZARDDIALOG_START + 2);
diff --git a/wizards/com/sun/star/wizards/web/data/CGArgument.java b/wizards/com/sun/star/wizards/web/data/CGArgument.java
index 2ae2c70ce69c..dc21e21e0812 100644
--- a/wizards/com/sun/star/wizards/web/data/CGArgument.java
+++ b/wizards/com/sun/star/wizards/web/data/CGArgument.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/wizards/com/sun/star/wizards/web/data/CGContent.java b/wizards/com/sun/star/wizards/web/data/CGContent.java
index 9bf32f26ff48..4607e269b83f 100644
--- a/wizards/com/sun/star/wizards/web/data/CGContent.java
+++ b/wizards/com/sun/star/wizards/web/data/CGContent.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/wizards/com/sun/star/wizards/web/data/CGDesign.java b/wizards/com/sun/star/wizards/web/data/CGDesign.java
index 00c1ea10b949..96b102f078ac 100644
--- a/wizards/com/sun/star/wizards/web/data/CGDesign.java
+++ b/wizards/com/sun/star/wizards/web/data/CGDesign.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/wizards/com/sun/star/wizards/web/data/CGDocument.java b/wizards/com/sun/star/wizards/web/data/CGDocument.java
index 177355612675..b8c7ed50cd6b 100644
--- a/wizards/com/sun/star/wizards/web/data/CGDocument.java
+++ b/wizards/com/sun/star/wizards/web/data/CGDocument.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
@@ -92,7 +92,7 @@ public class CGDocument extends ConfigSetItem implements XMLProvider
     /**
      * The contents subdirectory name in which the document is in.
      * This subdirectory will be created in the content's "docs"
-     * subdirectory.
+     * subdirectory.  
      */
     public String dirName;
     /**
@@ -180,7 +180,7 @@ public class CGDocument extends ConfigSetItem implements XMLProvider
             xProps = ((XDocumentPropertiesSupplier) UnoRuntime.queryInterface(XDocumentPropertiesSupplier.class, component)).getDocumentProperties();
         }
 
-        task.advance(true); //4
+        task.advance(true); //4    
 
         //now use the object to read some document properties.
         if (xProps != null)
@@ -255,7 +255,7 @@ public class CGDocument extends ConfigSetItem implements XMLProvider
     /**
      * @param media is the media description string returned by an UNO TypeDetection object.
      * @return one of the constants in the interface TypeDetection.
-     *
+     * 
      */
     private String getDocType(String media)
     {
diff --git a/wizards/com/sun/star/wizards/web/data/CGExporter.java b/wizards/com/sun/star/wizards/web/data/CGExporter.java
index c23073fbed01..89ced4722531 100644
--- a/wizards/com/sun/star/wizards/web/data/CGExporter.java
+++ b/wizards/com/sun/star/wizards/web/data/CGExporter.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/wizards/com/sun/star/wizards/web/data/CGFilter.java b/wizards/com/sun/star/wizards/web/data/CGFilter.java
index dc4f41df746b..3c93437f0f25 100644
--- a/wizards/com/sun/star/wizards/web/data/CGFilter.java
+++ b/wizards/com/sun/star/wizards/web/data/CGFilter.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,6 +30,6 @@ public class CGFilter extends ConfigSetItem
 {
 
     public String cp_Name;
-    //public boolean         cp_Readonly;
+    //public boolean         cp_Readonly; 
     public String cp_Filter;
 }
diff --git a/wizards/com/sun/star/wizards/web/data/CGGeneralInfo.java b/wizards/com/sun/star/wizards/web/data/CGGeneralInfo.java
index c12d4c92f535..b3b80ea48c4d 100644
--- a/wizards/com/sun/star/wizards/web/data/CGGeneralInfo.java
+++ b/wizards/com/sun/star/wizards/web/data/CGGeneralInfo.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/wizards/com/sun/star/wizards/web/data/CGIconSet.java b/wizards/com/sun/star/wizards/web/data/CGIconSet.java
index 197c6c3e44b5..c09936e3ea48 100644
--- a/wizards/com/sun/star/wizards/web/data/CGIconSet.java
+++ b/wizards/com/sun/star/wizards/web/data/CGIconSet.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/wizards/com/sun/star/wizards/web/data/CGImage.java b/wizards/com/sun/star/wizards/web/data/CGImage.java
index e6d459bf48d5..d9e2e520b6ec 100644
--- a/wizards/com/sun/star/wizards/web/data/CGImage.java
+++ b/wizards/com/sun/star/wizards/web/data/CGImage.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/web/data/CGLayout.java b/wizards/com/sun/star/wizards/web/data/CGLayout.java
index 9d9557c1615a..18443014c902 100644
--- a/wizards/com/sun/star/wizards/web/data/CGLayout.java
+++ b/wizards/com/sun/star/wizards/web/data/CGLayout.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/wizards/com/sun/star/wizards/web/data/CGPublish.java b/wizards/com/sun/star/wizards/web/data/CGPublish.java
index 1a3746a3873d..97bfeedb6e4e 100644
--- a/wizards/com/sun/star/wizards/web/data/CGPublish.java
+++ b/wizards/com/sun/star/wizards/web/data/CGPublish.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/wizards/com/sun/star/wizards/web/data/CGSession.java b/wizards/com/sun/star/wizards/web/data/CGSession.java
index 3acd570b7878..98d362cc6a31 100644
--- a/wizards/com/sun/star/wizards/web/data/CGSession.java
+++ b/wizards/com/sun/star/wizards/web/data/CGSession.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/wizards/com/sun/star/wizards/web/data/CGSessionName.java b/wizards/com/sun/star/wizards/web/data/CGSessionName.java
index 77cde79a8ca2..d9957c93c0a4 100644
--- a/wizards/com/sun/star/wizards/web/data/CGSessionName.java
+++ b/wizards/com/sun/star/wizards/web/data/CGSessionName.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/wizards/com/sun/star/wizards/web/data/CGSettings.java b/wizards/com/sun/star/wizards/web/data/CGSettings.java
index ecc538b9fa83..e426ff030e87 100644
--- a/wizards/com/sun/star/wizards/web/data/CGSettings.java
+++ b/wizards/com/sun/star/wizards/web/data/CGSettings.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/web/data/CGStyle.java b/wizards/com/sun/star/wizards/web/data/CGStyle.java
index e6258d8c5fe1..a765e4dad752 100644
--- a/wizards/com/sun/star/wizards/web/data/CGStyle.java
+++ b/wizards/com/sun/star/wizards/web/data/CGStyle.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,7 +30,7 @@ public class CGStyle extends ConfigSetItem
 {
 
     public String cp_Name;
-    //public boolean         cp_Readonly;
+    //public boolean         cp_Readonly; 
     public String cp_CssHref;
     public String cp_BackgroundImage;
     public String cp_IconSet;
diff --git a/wizards/com/sun/star/wizards/web/data/ConfigSetItem.java b/wizards/com/sun/star/wizards/web/data/ConfigSetItem.java
index 06c11a06178e..d4c147dc86c1 100644
--- a/wizards/com/sun/star/wizards/web/data/ConfigSetItem.java
+++ b/wizards/com/sun/star/wizards/web/data/ConfigSetItem.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/web/data/TypeDetection.java b/wizards/com/sun/star/wizards/web/data/TypeDetection.java
index d6998ac74814..9f832361765f 100644
--- a/wizards/com/sun/star/wizards/web/data/TypeDetection.java
+++ b/wizards/com/sun/star/wizards/web/data/TypeDetection.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER 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,19 +41,19 @@ public class TypeDetection
 {
 
     /**
-     * a document which will open in writer.
+     * a document which will open in writer. 
      */
     public final static String WRITER_DOC = "writer";
     /**
-     * a document which will open in calc.
+     * a document which will open in calc. 
      */
     public final static String CALC_DOC = "calc";
     /**
-     * a document which will open in impress.
+     * a document which will open in impress. 
      */
     public final static String IMPRESS_DOC = "impress";
     /**
-     * a document which will open in draw.
+     * a document which will open in draw. 
      */
     public final static String DRAW_DOC = "draw";
     /**
diff --git a/wizards/com/sun/star/wizards/web/export/AbstractExporter.java b/wizards/com/sun/star/wizards/web/export/AbstractExporter.java
index 97b1109add01..fc69ccb6fe15 100644
--- a/wizards/com/sun/star/wizards/web/export/AbstractExporter.java
+++ b/wizards/com/sun/star/wizards/web/export/AbstractExporter.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/web/export/ConfiguredExporter.java b/wizards/com/sun/star/wizards/web/export/ConfiguredExporter.java
index de13a8c31bbe..d9f9af0428fe 100644
--- a/wizards/com/sun/star/wizards/web/export/ConfiguredExporter.java
+++ b/wizards/com/sun/star/wizards/web/export/ConfiguredExporter.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/web/export/CopyExporter.java b/wizards/com/sun/star/wizards/web/export/CopyExporter.java
index f620e3b106d3..b3571523d00e 100644
--- a/wizards/com/sun/star/wizards/web/export/CopyExporter.java
+++ b/wizards/com/sun/star/wizards/web/export/CopyExporter.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/web/export/Exporter.java b/wizards/com/sun/star/wizards/web/export/Exporter.java
index 90f145cf1241..43ef9275db4b 100644
--- a/wizards/com/sun/star/wizards/web/export/Exporter.java
+++ b/wizards/com/sun/star/wizards/web/export/Exporter.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,12 +47,12 @@ public interface Exporter
      * of a binary format.
      * always use source.urlFilename as destination filename.
      * @param source is a CGDocument object.
-     * @param target contains the URL of a directory to which the
+     * @param target contains the URL of a directory to which the 
      * file should be exported to.
      * @param xmsf this is a basic multiServiceFactory.
-     * @param task - a task monitoring object. This should advance
+     * @param task - a task monitoring object. This should advance 
      * (call task.advacne(true) ) 3 times, while exporting.
-     *
+     * 
      */
     public boolean export(CGDocument source, String targetDirectory, XMultiServiceFactory xmsf, Task task) throws IOException;
 
diff --git a/wizards/com/sun/star/wizards/web/export/FilterExporter.java b/wizards/com/sun/star/wizards/web/export/FilterExporter.java
index 8ff666d5ec87..58516d59e588 100644
--- a/wizards/com/sun/star/wizards/web/export/FilterExporter.java
+++ b/wizards/com/sun/star/wizards/web/export/FilterExporter.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/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.java b/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.java
index 07a79e15040e..d43a0f4b5a5e 100644
--- a/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.java
+++ b/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.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/wizards/com/sun/star/wizards/web/status/ErrorLog.java b/wizards/com/sun/star/wizards/web/status/ErrorLog.java
index d039fa5c64a3..258d96fa5bf8 100644
--- a/wizards/com/sun/star/wizards/web/status/ErrorLog.java
+++ b/wizards/com/sun/star/wizards/web/status/ErrorLog.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/web/status/ErrorReporter.java b/wizards/com/sun/star/wizards/web/status/ErrorReporter.java
index 4d967e24f3df..22a8e758372c 100644
--- a/wizards/com/sun/star/wizards/web/status/ErrorReporter.java
+++ b/wizards/com/sun/star/wizards/web/status/ErrorReporter.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/web/status/LogTaskListener.java b/wizards/com/sun/star/wizards/web/status/LogTaskListener.java
index d4109da3406f..6fa9c9b493cc 100644
--- a/wizards/com/sun/star/wizards/web/status/LogTaskListener.java
+++ b/wizards/com/sun/star/wizards/web/status/LogTaskListener.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/web/status/Task.java b/wizards/com/sun/star/wizards/web/status/Task.java
index 0fb0bf494286..c3a44c06e85f 100644
--- a/wizards/com/sun/star/wizards/web/status/Task.java
+++ b/wizards/com/sun/star/wizards/web/status/Task.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/web/status/TaskEvent.java b/wizards/com/sun/star/wizards/web/status/TaskEvent.java
index dd1d06c1938a..38e3d8f4d126 100644
--- a/wizards/com/sun/star/wizards/web/status/TaskEvent.java
+++ b/wizards/com/sun/star/wizards/web/status/TaskEvent.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/com/sun/star/wizards/web/status/TaskListener.java b/wizards/com/sun/star/wizards/web/status/TaskListener.java
index 63745bf83a62..bf0f3c388f8a 100644
--- a/wizards/com/sun/star/wizards/web/status/TaskListener.java
+++ b/wizards/com/sun/star/wizards/web/status/TaskListener.java
@@ -2,7 +2,7 @@
  ************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/source/euro/euro.src b/wizards/source/euro/euro.src
index 257632f8bbb4..86fd356ed175 100644
--- a/wizards/source/euro/euro.src
+++ b/wizards/source/euro/euro.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/source/formwizard/dbwizres.src b/wizards/source/formwizard/dbwizres.src
index c04d77b9fcdd..160bb08d90db 100644
--- a/wizards/source/formwizard/dbwizres.src
+++ b/wizards/source/formwizard/dbwizres.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
  *
  ************************************************************************/// common
 
-#define RID_COMMON_START                    500
-#define RID_DB_COMMON_START             1000
+#define RID_COMMON_START					500
+#define RID_DB_COMMON_START				1000
 
 // db wizards
 
-#define RID_DB_FORM_WIZARD_START            2200
-#define RID_DB_QUERY_WIZARD_START           2300
-#define RID_DB_REPORT_WIZARD_START      2400
-#define RID_DB_TABLE_WIZARD_START       2500
+#define RID_DB_FORM_WIZARD_START			2200
+#define RID_DB_QUERY_WIZARD_START			2300
+#define RID_DB_REPORT_WIZARD_START		2400
+#define RID_DB_TABLE_WIZARD_START		2500
 
 
-#define RID_LETTERWIZARDDIALOG_START        3000
-#define RID_LETTERWIZARDGREETING_START  3080
-#define RID_LETTERWIZARDSALUTATION_START    3090
-#define RID_LETTERWIZARDROADMAP_START   3100
-#define RID_LETTERWIZARDLANGUAGE_START  3110
+#define RID_LETTERWIZARDDIALOG_START		3000
+#define RID_LETTERWIZARDGREETING_START	3080
+#define RID_LETTERWIZARDSALUTATION_START	3090
+#define RID_LETTERWIZARDROADMAP_START	3100
+#define RID_LETTERWIZARDLANGUAGE_START	3110
 
 
-#define RID_FAXWIZARDDIALOG_START           3200
-#define RID_FAXWIZARDCOMMUNICATION_START    3270
-#define RID_FAXWIZARDGREETING_START     3280
-#define RID_FAXWIZARDSALUTATION_START       3290
-#define RID_FAXWIZARDROADMAP_START      3300
+#define RID_FAXWIZARDDIALOG_START			3200
+#define RID_FAXWIZARDCOMMUNICATION_START	3270
+#define RID_FAXWIZARDGREETING_START		3280
+#define RID_FAXWIZARDSALUTATION_START		3290
+#define RID_FAXWIZARDROADMAP_START		3300
 
 // web wizard
 
-#define RID_WEBWIZARDDIALOG_START           4000
-#define RID_WEBWIZARDDIALOG_FTP         4200
+#define RID_WEBWIZARDDIALOG_START			4000
+#define RID_WEBWIZARDDIALOG_FTP			4200
 
 // agenda wizard
 
@@ -1748,9 +1748,9 @@ String RID_DB_TABLE_WIZARD_START + 51
 
 
 // ============================================================================
-// ============================                       ======================
-// ======================        LETTER WIZARD RESOURCES         ================
-// ============================                       ======================
+// ============================						  ======================
+// ======================		 LETTER WIZARD RESOURCES		 ================
+// ============================						  ======================
 // ============================================================================
 
 
@@ -2110,9 +2110,9 @@ String RID_LETTERWIZARDROADMAP_START + 6
 
 
 // ============================================================================
-// ============================                       ======================
-// ======================        FAX WIZARD RESOURCES        ================
-// ============================                       ======================
+// ============================						  ======================
+// ======================		 FAX WIZARD RESOURCES		 ================
+// ============================						  ======================
 // ============================================================================
 
 
@@ -2406,9 +2406,9 @@ String RID_FAXWIZARDROADMAP_START + 5
 
 
 // ============================================================================
-// ============================                       ======================
-// ======================        WEB WIZARD RESOURCES        ================
-// ============================                       ======================
+// ============================						  ======================
+// ======================		 WEB WIZARD RESOURCES		 ================
+// ============================						  ======================
 // ============================================================================
 
 
@@ -3063,7 +3063,7 @@ String RID_WEBWIZARDDIALOG_START +152
 
 
 // ============================================================================
-// =================         WEB WIZARD FTP DIALOG RESOURCES      =============
+// =================		 WEB WIZARD FTP DIALOG RESOURCES	  =============
 // ============================================================================
 
 
@@ -3166,9 +3166,9 @@ String RID_WEBWIZARDDIALOG_FTP +18
 
 
 // ============================================================================
-// ============================                       ======================
-// ======================        AGENDA WIZARD RESOURCES         ================
-// ============================                       ======================
+// ============================						  ======================
+// ======================		 AGENDA WIZARD RESOURCES		 ================
+// ============================						  ======================
 // ============================================================================
 
 String RID_AGENDAWIZARDDIALOG_START +1
diff --git a/wizards/source/imagelists/imagelists.src b/wizards/source/imagelists/imagelists.src
index 830c365ca4e4..c50e642a65f3 100644
--- a/wizards/source/imagelists/imagelists.src
+++ b/wizards/source/imagelists/imagelists.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,190 +24,190 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#define REPORTWIZARD_BASE   1000
-#define FORMWIZARD_BASE     1100
-#define WEBWIZARD_BASE      1200
+#define REPORTWIZARD_BASE 	1000
+#define FORMWIZARD_BASE 	1100
+#define WEBWIZARD_BASE	    1200
 
-#define IMG_REPORT_ORIENTATION_PORTRAIT         REPORTWIZARD_BASE + 0
+#define	IMG_REPORT_ORIENTATION_PORTRAIT	   		REPORTWIZARD_BASE + 0
 Image IMG_REPORT_ORIENTATION_PORTRAIT
 {
     ImageBitmap = Bitmap { File = "portrait_32.png"; };
 };
 
-#define IMG_REPORT_ORIENTATION_PORTRAIT_HC      REPORTWIZARD_BASE + 1
+#define	IMG_REPORT_ORIENTATION_PORTRAIT_HC		REPORTWIZARD_BASE + 1
 Image IMG_REPORT_ORIENTATION_PORTRAIT_HC
 {
     ImageBitmap = Bitmap { File = "portrait_32_h.png"; };
 };
 
-#define IMG_REPORT_ORIENTATION_LANDSCAPE        REPORTWIZARD_BASE + 2
+#define	IMG_REPORT_ORIENTATION_LANDSCAPE		REPORTWIZARD_BASE + 2
 Image IMG_REPORT_ORIENTATION_LANDSCAPE
 {
     ImageBitmap = Bitmap { File = "landscape_32.png"; };
 };
 
-#define IMG_REPORT_ORIENTATION_LANDSCAPE_HC     REPORTWIZARD_BASE + 3
+#define	IMG_REPORT_ORIENTATION_LANDSCAPE_HC		REPORTWIZARD_BASE + 3
 Image IMG_REPORT_ORIENTATION_LANDSCAPE_HC
 {
     ImageBitmap = Bitmap { File = "landscape_32_h.png"; };
 };
 
-#define IMG_FORM_ARRANGELISTSIDE                FORMWIZARD_BASE + 0
+#define	IMG_FORM_ARRANGELISTSIDE				FORMWIZARD_BASE + 0
 Image IMG_FORM_ARRANGELISTSIDE
 {
     ImageBitmap = Bitmap { File = "formarrangelistside_42.png"; };
 };
 
-#define IMG_FORM_ARRANGELISTSIDE_HC             FORMWIZARD_BASE + 1
+#define	IMG_FORM_ARRANGELISTSIDE_HC				FORMWIZARD_BASE + 1
 Image IMG_FORM_ARRANGELISTSIDE_HC
 {
     ImageBitmap = Bitmap { File = "formarrangelistside_42_h.png"; };
 };
 
-#define IMG_FORM_ARRANGELISTTOP                 FORMWIZARD_BASE + 2
+#define	IMG_FORM_ARRANGELISTTOP					FORMWIZARD_BASE + 2
 Image IMG_FORM_ARRANGELISTTOP
 {
     ImageBitmap = Bitmap { File = "formarrangelisttop_42.png"; };
 };
 
-#define IMG_FORM_ARRANGELISTTOP_HC              FORMWIZARD_BASE + 3
+#define	IMG_FORM_ARRANGELISTTOP_HC				FORMWIZARD_BASE + 3
 Image IMG_FORM_ARRANGELISTTOP_HC
 {
     ImageBitmap = Bitmap { File = "formarrangelisttop_42_h.png"; };
 };
 
-#define IMG_FORM_ARRANGETABLE                   FORMWIZARD_BASE + 4
+#define	IMG_FORM_ARRANGETABLE					FORMWIZARD_BASE + 4
 Image IMG_FORM_ARRANGETABLE
 {
     ImageBitmap = Bitmap { File = "formarrangetable_42.png"; };
 };
 
-#define IMG_FORM_ARRANGETABLE_HC                    FORMWIZARD_BASE + 5
+#define	IMG_FORM_ARRANGETABLE_HC					FORMWIZARD_BASE + 5
 Image IMG_FORM_ARRANGETABLE_HC
 {
     ImageBitmap = Bitmap { File = "formarrangetable_42_h.png"; };
 };
 
 
-#define IMG_FORM_ARRANGEFREE                    FORMWIZARD_BASE + 6
+#define	IMG_FORM_ARRANGEFREE					FORMWIZARD_BASE + 6
 Image IMG_FORM_ARRANGEFREE
 {
     ImageBitmap = Bitmap { File = "formarrangefree_42.png"; };
 };
 
-#define IMG_FORM_ARRANGEFREE_HC                 FORMWIZARD_BASE + 7
+#define	IMG_FORM_ARRANGEFREE_HC					FORMWIZARD_BASE + 7
 Image IMG_FORM_ARRANGEFREE_HC
 {
     ImageBitmap = Bitmap { File = "formarrangefree_42_h.png"; };
 };
 
 
-#define IMG_WEB_LAYOUT_TABLE3                       WEBWIZARD_BASE + 0
+#define	IMG_WEB_LAYOUT_TABLE3						WEBWIZARD_BASE + 0
 Image IMG_WEB_LAYOUT_TABLE3
 {
     ImageBitmap = Bitmap { File = "table_3.png"; };
 };
 
-#define IMG_WEB_LAYOUT_TABLE3_HC                        WEBWIZARD_BASE + 1
+#define	IMG_WEB_LAYOUT_TABLE3_HC						WEBWIZARD_BASE + 1
 Image IMG_WEB_LAYOUT_TABLE3_HC
 {
     ImageBitmap = Bitmap { File = "table_3_h.png"; };
 };
 
 
-#define IMG_WEB_LAYOUT_TABLE2                       WEBWIZARD_BASE + 2
+#define	IMG_WEB_LAYOUT_TABLE2						WEBWIZARD_BASE + 2
 Image IMG_WEB_LAYOUT_TABLE2
 {
     ImageBitmap = Bitmap { File = "table_2.png"; };
 };
 
 
-#define IMG_WEB_LAYOUT_TABLE2_HC                    WEBWIZARD_BASE + 3
+#define	IMG_WEB_LAYOUT_TABLE2_HC					WEBWIZARD_BASE + 3
 Image IMG_WEB_LAYOUT_TABLE2_HC
 {
     ImageBitmap = Bitmap { File = "table_2_h.png"; };
 };
 
 
-#define IMG_WEB_LAYOUT_SIMPLE                       WEBWIZARD_BASE + 4
+#define	IMG_WEB_LAYOUT_SIMPLE						WEBWIZARD_BASE + 4
 Image IMG_WEB_LAYOUT_SIMPLE
 {
     ImageBitmap = Bitmap { File = "simple.png"; };
 };
 
-#define IMG_WEB_LAYOUT_SIMPLE_HC                    WEBWIZARD_BASE + 5
+#define	IMG_WEB_LAYOUT_SIMPLE_HC					WEBWIZARD_BASE + 5
 Image IMG_WEB_LAYOUT_SIMPLE_HC
 {
     ImageBitmap = Bitmap { File = "simple_h.png"; };
 };
 
-#define IMG_WEB_LAYOUT_DIAGONAL                     WEBWIZARD_BASE + 6
+#define	IMG_WEB_LAYOUT_DIAGONAL						WEBWIZARD_BASE + 6
 Image IMG_WEB_LAYOUT_DIAGONAL
 {
     ImageBitmap = Bitmap { File = "diagonal.png"; };
 };
 
-#define IMG_WEB_LAYOUT_DIAGONAL_HC                  WEBWIZARD_BASE + 7
+#define	IMG_WEB_LAYOUT_DIAGONAL_HC					WEBWIZARD_BASE + 7
 Image IMG_WEB_LAYOUT_DIAGONAL_HC
 {
     ImageBitmap = Bitmap { File = "diagonal_h.png"; };
 };
 
-#define IMG_WEB_LAYOUT_ZIGZAG                       WEBWIZARD_BASE + 8
+#define	IMG_WEB_LAYOUT_ZIGZAG						WEBWIZARD_BASE + 8
 Image IMG_WEB_LAYOUT_ZIGZAG
 {
     ImageBitmap = Bitmap { File = "zigzag.png"; };
 };
 
-#define IMG_WEB_LAYOUT_ZIGZAG_HC                        WEBWIZARD_BASE + 9
+#define	IMG_WEB_LAYOUT_ZIGZAG_HC						WEBWIZARD_BASE + 9
 Image IMG_WEB_LAYOUT_ZIGZAG_HC
 {
     ImageBitmap = Bitmap { File = "zigzag_h.png"; };
 };
 
-#define IMG_WEB_LAYOUT_FRAMELEFT                        WEBWIZARD_BASE + 10
+#define	IMG_WEB_LAYOUT_FRAMELEFT						WEBWIZARD_BASE + 10
 Image IMG_WEB_LAYOUT_FRAMELEFT
 {
     ImageBitmap = Bitmap { File = "frame_left.png"; };
 };
 
-#define IMG_WEB_LAYOUT_FRAMELEFT_HC                     WEBWIZARD_BASE + 11
+#define	IMG_WEB_LAYOUT_FRAMELEFT_HC						WEBWIZARD_BASE + 11
 Image IMG_WEB_LAYOUT_FRAMELEFT_HC
 {
     ImageBitmap = Bitmap { File = "frame_left_h.png"; };
 };
 
-#define IMG_WEB_LAYOUT_FRAMERIGHT                       WEBWIZARD_BASE + 12
+#define	IMG_WEB_LAYOUT_FRAMERIGHT						WEBWIZARD_BASE + 12
 Image IMG_WEB_LAYOUT_FRAMERIGHT
 {
     ImageBitmap = Bitmap { File = "frame_right.png"; };
 };
 
-#define IMG_WEB_LAYOUT_FRAMERIGHT_HC                        WEBWIZARD_BASE + 13
+#define	IMG_WEB_LAYOUT_FRAMERIGHT_HC						WEBWIZARD_BASE + 13
 Image IMG_WEB_LAYOUT_FRAMERIGHT_HC
 {
     ImageBitmap = Bitmap { File = "frame_right_h.png"; };
 };
 
-#define IMG_WEB_LAYOUT_FRAMETOP                         WEBWIZARD_BASE + 14
+#define	IMG_WEB_LAYOUT_FRAMETOP							WEBWIZARD_BASE + 14
 Image IMG_WEB_LAYOUT_FRAMETOP
 {
     ImageBitmap = Bitmap { File = "frame_top.png"; };
 };
 
-#define IMG_WEB_LAYOUT_FRAMETOP_HC                      WEBWIZARD_BASE + 15
+#define	IMG_WEB_LAYOUT_FRAMETOP_HC						WEBWIZARD_BASE + 15
 Image IMG_WEB_LAYOUT_FRAMETOP_HC
 {
     ImageBitmap = Bitmap { File = "frame_top_h.png"; };
 };
 
-#define IMG_WEB_LAYOUT_FRAMEBOTTOM                          WEBWIZARD_BASE + 16
+#define	IMG_WEB_LAYOUT_FRAMEBOTTOM							WEBWIZARD_BASE + 16
 Image IMG_WEB_LAYOUT_FRAMEBOTTOM
 {
     ImageBitmap = Bitmap { File = "frame_bottom.png"; };
 };
 
-#define IMG_WEB_LAYOUT_FRAMEBOTTOM_HC                           WEBWIZARD_BASE + 17
+#define	IMG_WEB_LAYOUT_FRAMEBOTTOM_HC							WEBWIZARD_BASE + 17
 Image IMG_WEB_LAYOUT_FRAMEBOTTOM_HC
 {
     ImageBitmap = Bitmap { File = "frame_bottom_h.png"; };
diff --git a/wizards/source/importwizard/importwi.src b/wizards/source/importwizard/importwi.src
index daddcc284642..d8cc204889a2 100644
--- a/wizards/source/importwizard/importwi.src
+++ b/wizards/source/importwizard/importwi.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -23,11 +23,11 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************/#define sHelpButton   1000
-#define sCancelButton   1001
-#define sBackButton 1002
-#define sNextButton 1003
-#define sBeginButton    1004
+ ************************************************************************/#define sHelpButton	1000
+#define sCancelButton	1001
+#define sBackButton	1002
+#define sNextButton	1003
+#define sBeginButton	1004
 #define sCloseButton    1005
 #define sWelcometextLabel1  1006
 #define sWelcometextLabel2  1007
@@ -45,9 +45,9 @@
 #define sTextImportLabel 1033
 #define sTextExportLabel 1034
 #define sGroupnameDefault   1036
-#define sProgressDesc1  1039
-#define sProgressOneDoc 1040
-#define sProgressMoreDocs   1041
+#define sProgressDesc1	1039
+#define sProgressOneDoc	1040
+#define sProgressMoreDocs	1041
 #define sProgressMoreTemplates 1042
 #define sNoDirCreation  1050
 #define sMsgDirNotThere    1051
@@ -67,8 +67,8 @@
 #define sPathErrorStarDoc_1_    1065
 #define sPathErrorStarDoc_2_    1066
 #define sPathErrorStarDoc_3_    1067
-#define sOverwriteallFiles  1070
-#define sreeditMacro    1071
+#define sOverwriteallFiles 	1070
+#define sreeditMacro 	1071
 #define scouldNotsaveDocument 1072
 #define scouldNotopenDocument 1073
 #define sPathDialogMessage  1080
@@ -95,7 +95,7 @@
 #define sCreateLogfile          2032
 #define sLogfileHelpText        2033
 #define sLogfileSummary         2034
-#define sshowLogfile            2035
+#define sshowLogfile			2035
 
 #define sSumInclusiveSubDir     3000
 #define sSumSaveDokumente       3001
diff --git a/wizards/source/schedule/schedule.src b/wizards/source/schedule/schedule.src
index beabe83cf2a4..3116f0f41131 100644
--- a/wizards/source/schedule/schedule.src
+++ b/wizards/source/schedule/schedule.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR 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.
  *
  ************************************************************************/// Dialog labels start at 1000
-#define dlgCalTitle 1000
-#define dlgCalTitleBack 1001
-#define dlgCalTitleOwnData  1002
-#define dlgSchdlTitle   1003
-#define dlgOK   1004
-#define dlgCancel   1005
-#define dlgCalFrameOption   1006
-#define dlgCalOptionYear    1007
-#define dlgCalOptionMonth   1008
-#define dlgSchdlDescription 1009
-#define dlgSchdlCountry 1010
-#define dlgTime 1011
-#define dlgYear 1012
-#define dlgCalMonth 1013
-#define dlgSpecificBankholidays 1014
-#define dlgCalOwnData   1015
-#define dlgCalInsert    1016
-#define dlgCalDelete    1017
-#define dlgCalNewEvent  1018
-#define dlgCalEvent 1019
-#define dlgCalEventOnce 1020
-#define dlgCalEventDay  1021
-#define dlgCalEventMonth    1022
-#define dlgCalEventYear 1023
+#define dlgCalTitle	1000
+#define dlgCalTitleBack	1001
+#define dlgCalTitleOwnData	1002
+#define dlgSchdlTitle	1003
+#define dlgOK	1004
+#define dlgCancel	1005
+#define dlgCalFrameOption	1006
+#define dlgCalOptionYear	1007
+#define dlgCalOptionMonth	1008
+#define dlgSchdlDescription	1009
+#define dlgSchdlCountry	1010
+#define dlgTime	1011
+#define dlgYear	1012
+#define dlgCalMonth	1013
+#define dlgSpecificBankholidays	1014
+#define dlgCalOwnData	1015
+#define dlgCalInsert	1016
+#define dlgCalDelete	1017
+#define dlgCalNewEvent	1018
+#define dlgCalEvent	1019
+#define dlgCalEventOnce	1020
+#define dlgCalEventDay	1021
+#define dlgCalEventMonth	1022
+#define dlgCalEventYear	1023
 
 // Bitmap file is 1099
-#define dlgBitmapFile   1099
+#define dlgBitmapFile	1099
 
 // Names of states start at 1100
-#define dlgState    1100
+#define dlgState	1100
 
 // Months start at 1200
-#define dlgMonth    1200
+#define dlgMonth	1200
 
 // Messages start at 1300
-#define msgCalErrorTitle    1300
-#define msgCalError 1301
-#define msgCalRemoveTitle   1302
-#define msgCalRemove    1303
+#define msgCalErrorTitle	1300
+#define msgCalError	1301
+#define msgCalRemoveTitle	1302
+#define msgCalRemove	1303
 
 // Styles start at 1400
-#define stlWorkday  1400
-#define stlWeekend  1401
+#define stlWorkday	1400
+#define stlWeekend	1401
 
 // Sheet names start at 1410
-#define nameCalYear 1410
-#define nameCalMonth    1411
+#define nameCalYear	1410
+#define nameCalMonth	1411
 
 #define sProgress   1500
 
diff --git a/wizards/source/template/template.src b/wizards/source/template/template.src
index 61e57f5cc053..a063a3c30f9a 100644
--- a/wizards/source/template/template.src
+++ b/wizards/source/template/template.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -23,16 +23,16 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************/#define SAMPLES       1000
-#define STYLES      1100
-#define AgendaDlgName       1200
-#define AgendaDlgNoCancel   1201
-#define AgendaDlgFrame      1202
-#define AgendaDlgButton1    1203
-#define AgendaDlgButton2    1204
-#define CorrespondenceNoTextmark    1300
-#define CorrespondenceMsgError  1302
-#define CorrespondenceDialog    1303
+ ************************************************************************/#define SAMPLES		1000
+#define STYLES		1100
+#define AgendaDlgName		1200
+#define AgendaDlgNoCancel	1201
+#define AgendaDlgFrame		1202
+#define AgendaDlgButton1	1203
+#define AgendaDlgButton2	1204
+#define CorrespondenceNoTextmark	1300
+#define CorrespondenceMsgError	1302
+#define CorrespondenceDialog	1303
 #define CorrespondenceFields    1350
 #define TextField    1400
 #define Newsletter    1450
diff --git a/wizards/source/webwizard/webwizar.src b/wizards/source/webwizard/webwizar.src
index 19d77d89f4a9..b7bb7dd3b1d2 100644
--- a/wizards/source/webwizard/webwizar.src
+++ b/wizards/source/webwizard/webwizar.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/util/hidother.src b/wizards/util/hidother.src
index 7f706a69b657..912d9d49d6a8 100644
--- a/wizards/util/hidother.src
+++ b/wizards/util/hidother.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 //40768 - 42767
 
 /*
- * web wizard :         34200 - 34319
- * report wizard :      34320 - 34399
+ * web wizard : 		34200 - 34319
+ * report wizard : 		34320 - 34399
  * others to be listed...
  *
- * web wizard (cont.) :     41000 - 41050
+ * web wizard (cont.) :		41000 - 41050
  * agenda wizard :              41051 - 41099
  */
 
@@ -45,205 +45,205 @@
 // ***************
 //webwizardgeneralcontrols
 
-#define HID0_WEBWIZARD  34200
+#define	HID0_WEBWIZARD	34200
 hidspecial HID { HelpID = HID0_WEBWIZARD; } ;
-#define HID0_HELP   34201
+#define	HID0_HELP	34201
 hidspecial HID { HelpID = HID0_HELP; } ;
-#define HID0_NEXT   34202
+#define	HID0_NEXT	34202
 hidspecial HID { HelpID = HID0_NEXT; } ;
-#define HID0_PREV   34203
+#define	HID0_PREV	34203
 hidspecial HID { HelpID = HID0_PREV; } ;
-#define HID0_CREATE 34204
+#define	HID0_CREATE	34204
 hidspecial HID { HelpID = HID0_CREATE; } ;
-#define HID0_CANCEL 34205
+#define	HID0_CANCEL	34205
 hidspecial HID { HelpID = HID0_CANCEL; } ;
-#define HID0_STATUS_DIALOG  34206
+#define	HID0_STATUS_DIALOG	34206
 hidspecial HID { HelpID = HID0_STATUS_DIALOG; } ;
 
 
 //step1
-#define HID1_LST_SESSIONS   34207
+#define	HID1_LST_SESSIONS	34207
 hidspecial HID { HelpID = HID1_LST_SESSIONS; } ;
-#define HID1_BTN_DEL_SES    34209
+#define	HID1_BTN_DEL_SES	34209
 hidspecial HID { HelpID = HID1_BTN_DEL_SES; } ;
 
 //step2
-#define HID2_LST_DOCS   34210
+#define	HID2_LST_DOCS	34210
 hidspecial HID { HelpID = HID2_LST_DOCS; } ;
-#define HID2_BTN_ADD_DOC    34211
+#define	HID2_BTN_ADD_DOC	34211
 hidspecial HID { HelpID = HID2_BTN_ADD_DOC; } ;
-#define HID2_BTN_REM_DOC    34212
+#define	HID2_BTN_REM_DOC	34212
 hidspecial HID { HelpID = HID2_BTN_REM_DOC; } ;
-#define HID2_BTN_DOC_UP 34213
+#define	HID2_BTN_DOC_UP	34213
 hidspecial HID { HelpID = HID2_BTN_DOC_UP; } ;
-#define HID2_BTN_DOC_DOWN   34214
+#define	HID2_BTN_DOC_DOWN	34214
 hidspecial HID { HelpID = HID2_BTN_DOC_DOWN; } ;
-#define HID2_TXT_DOC_TITLE  34215
+#define	HID2_TXT_DOC_TITLE	34215
 hidspecial HID { HelpID = HID2_TXT_DOC_TITLE; } ;
-#define HID2_TXT_DOC_DESC   34216
+#define	HID2_TXT_DOC_DESC	34216
 hidspecial HID { HelpID = HID2_TXT_DOC_DESC; } ;
-#define HID2_TXT_DOC_AUTHOR 34217
+#define	HID2_TXT_DOC_AUTHOR	34217
 hidspecial HID { HelpID = HID2_TXT_DOC_AUTHOR; } ;
-#define HID2_LST_DOC_EXPORT 34218
+#define	HID2_LST_DOC_EXPORT	34218
 hidspecial HID { HelpID = HID2_LST_DOC_EXPORT; } ;
-#define HID2_STATUS_ADD_DOCS    34219
+#define	HID2_STATUS_ADD_DOCS	34219
 hidspecial HID { HelpID = HID2_STATUS_ADD_DOCS; } ;
 
 //step3
-#define HID3_IL_LAYOUTS_IMG1    34220
+#define	HID3_IL_LAYOUTS_IMG1	34220
 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG1; } ;
-#define HID3_IL_LAYOUTS_IMG2    34221
+#define	HID3_IL_LAYOUTS_IMG2	34221
 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG2; } ;
-#define HID3_IL_LAYOUTS_IMG3    34222
+#define	HID3_IL_LAYOUTS_IMG3	34222
 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG3; } ;
-#define HID3_IL_LAYOUTS_IMG4    34223
+#define	HID3_IL_LAYOUTS_IMG4	34223
 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG4; } ;
-#define HID3_IL_LAYOUTS_IMG5    34224
+#define	HID3_IL_LAYOUTS_IMG5	34224
 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG5; } ;
-#define HID3_IL_LAYOUTS_IMG6    34225
+#define	HID3_IL_LAYOUTS_IMG6	34225
 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG6; } ;
-#define HID3_IL_LAYOUTS_IMG7    34226
+#define	HID3_IL_LAYOUTS_IMG7	34226
 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG7; } ;
-#define HID3_IL_LAYOUTS_IMG8    34227
+#define	HID3_IL_LAYOUTS_IMG8	34227
 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG8; } ;
-#define HID3_IL_LAYOUTS_IMG9    34228
+#define	HID3_IL_LAYOUTS_IMG9	34228
 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG9; } ;
-#define HID3_IL_LAYOUTS_IMG10   34229
+#define	HID3_IL_LAYOUTS_IMG10	34229
 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG10; } ;
-#define HID3_IL_LAYOUTS_IMG11   34230
+#define	HID3_IL_LAYOUTS_IMG11	34230
 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG11; } ;
-#define HID3_IL_LAYOUTS_IMG12   34231
+#define	HID3_IL_LAYOUTS_IMG12	34231
 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG12; } ;
-#define HID3_IL_LAYOUTS_IMG13   34232
+#define	HID3_IL_LAYOUTS_IMG13	34232
 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG13; } ;
-#define HID3_IL_LAYOUTS_IMG14   34233
+#define	HID3_IL_LAYOUTS_IMG14	34233
 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG14; } ;
-#define HID3_IL_LAYOUTS_IMG15   34234
+#define	HID3_IL_LAYOUTS_IMG15	34234
 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG15; } ;
 
 //step4
-#define HID4_CHK_DISPLAY_FILENAME   34235
+#define	HID4_CHK_DISPLAY_FILENAME	34235
 hidspecial HID { HelpID = HID4_CHK_DISPLAY_FILENAME; } ;
-#define HID4_CHK_DISPLAY_DESCRIPTION    34236
+#define	HID4_CHK_DISPLAY_DESCRIPTION	34236
 hidspecial HID { HelpID = HID4_CHK_DISPLAY_DESCRIPTION; } ;
-#define HID4_CHK_DISPLAY_AUTHOR 34237
+#define	HID4_CHK_DISPLAY_AUTHOR	34237
 hidspecial HID { HelpID = HID4_CHK_DISPLAY_AUTHOR; } ;
-#define HID4_CHK_DISPLAY_CR_DATE    34238
+#define	HID4_CHK_DISPLAY_CR_DATE	34238
 hidspecial HID { HelpID = HID4_CHK_DISPLAY_CR_DATE; } ;
-#define HID4_CHK_DISPLAY_UP_DATE    34239
+#define	HID4_CHK_DISPLAY_UP_DATE	34239
 hidspecial HID { HelpID = HID4_CHK_DISPLAY_UP_DATE; } ;
-#define HID4_CHK_DISPLAY_FORMAT 34240
+#define	HID4_CHK_DISPLAY_FORMAT	34240
 hidspecial HID { HelpID = HID4_CHK_DISPLAY_FORMAT; } ;
-#define HID4_CHK_DISPLAY_F_ICON 34241
+#define	HID4_CHK_DISPLAY_F_ICON	34241
 hidspecial HID { HelpID = HID4_CHK_DISPLAY_F_ICON; } ;
-#define HID4_CHK_DISPLAY_PAGES  34242
+#define	HID4_CHK_DISPLAY_PAGES	34242
 hidspecial HID { HelpID = HID4_CHK_DISPLAY_PAGES; } ;
-#define HID4_CHK_DISPLAY_SIZE   34243
+#define	HID4_CHK_DISPLAY_SIZE	34243
 hidspecial HID { HelpID = HID4_CHK_DISPLAY_SIZE; } ;
 
-#define HID4_GRP_OPTIMAIZE_640  34244
+#define	HID4_GRP_OPTIMAIZE_640	34244
 hidspecial HID { HelpID = HID4_GRP_OPTIMAIZE_640; } ;
-#define HID4_GRP_OPTIMAIZE_800  34245
+#define	HID4_GRP_OPTIMAIZE_800	34245
 hidspecial HID { HelpID = HID4_GRP_OPTIMAIZE_800; } ;
-#define HID4_GRP_OPTIMAIZE_1024 34246
+#define	HID4_GRP_OPTIMAIZE_1024	34246
 hidspecial HID { HelpID = HID4_GRP_OPTIMAIZE_1024; } ;
 
 
 //step5
-#define HID5_LST_STYLES 34247
+#define	HID5_LST_STYLES	34247
 hidspecial HID { HelpID = HID5_LST_STYLES; } ;
-#define HID5_BTN_BACKGND    34248
+#define	HID5_BTN_BACKGND	34248
 hidspecial HID { HelpID = HID5_BTN_BACKGND; } ;
-#define HID5_BTN_ICONS  34249
+#define	HID5_BTN_ICONS	34249
 hidspecial HID { HelpID = HID5_BTN_ICONS; } ;
 
 //step6
-#define HID6_TXT_SITE_TITLE 34250
+#define	HID6_TXT_SITE_TITLE	34250
 hidspecial HID { HelpID = HID6_TXT_SITE_TITLE; } ;
-#define HID6_TXT_SITE_DESC  34253
+#define	HID6_TXT_SITE_DESC	34253
 hidspecial HID { HelpID = HID6_TXT_SITE_DESC; } ;
-#define HID6_DATE_SITE_CREATED  34255
+#define	HID6_DATE_SITE_CREATED	34255
 hidspecial HID { HelpID = HID6_DATE_SITE_CREATED; } ;
-#define HID6_DATE_SITE_UPDATED  34256
+#define	HID6_DATE_SITE_UPDATED	34256
 hidspecial HID { HelpID = HID6_DATE_SITE_UPDATED; } ;
-#define HID6_TXT_SITE_EMAIL 34258
+#define	HID6_TXT_SITE_EMAIL	34258
 hidspecial HID { HelpID = HID6_TXT_SITE_EMAIL; } ;
-#define HID6_TXT_SITE_COPYRIGHT 34259
+#define	HID6_TXT_SITE_COPYRIGHT	34259
 hidspecial HID { HelpID = HID6_TXT_SITE_COPYRIGHT; } ;
 
 //step7
-#define HID7_BTN_PREVIEW    34260
+#define	HID7_BTN_PREVIEW	34260
 hidspecial HID { HelpID = HID7_BTN_PREVIEW; } ;
-#define HID7_CHK_PUBLISH_LOCAL  34261
+#define	HID7_CHK_PUBLISH_LOCAL	34261
 hidspecial HID { HelpID = HID7_CHK_PUBLISH_LOCAL; } ;
-#define HID7_TXT_LOCAL  34262
+#define	HID7_TXT_LOCAL	34262
 hidspecial HID { HelpID = HID7_TXT_LOCAL; } ;
-#define HID7_BTN_LOCAL  34263
+#define	HID7_BTN_LOCAL	34263
 hidspecial HID { HelpID = HID7_BTN_LOCAL; } ;
-#define HID7_CHK_PUBLISH_ZIP    34264
+#define	HID7_CHK_PUBLISH_ZIP	34264
 hidspecial HID { HelpID = HID7_CHK_PUBLISH_ZIP; } ;
-#define HID7_TXT_ZIP    34265
+#define	HID7_TXT_ZIP	34265
 hidspecial HID { HelpID = HID7_TXT_ZIP; } ;
-#define HID7_BTN_ZIP    34266
+#define	HID7_BTN_ZIP	34266
 hidspecial HID { HelpID = HID7_BTN_ZIP; } ;
-#define HID7_CHK_PUBLISH_FTP    34267
+#define	HID7_CHK_PUBLISH_FTP	34267
 hidspecial HID { HelpID = HID7_CHK_PUBLISH_FTP; } ;
-#define HID7_TXT_FTP    34268
+#define	HID7_TXT_FTP	34268
 hidspecial HID { HelpID = HID7_TXT_FTP; } ;
-#define HID7_BTN_FTP    34269
+#define	HID7_BTN_FTP	34269
 hidspecial HID { HelpID = HID7_BTN_FTP; } ;
-#define HID7_CHK_SAVE   34270
+#define	HID7_CHK_SAVE	34270
 hidspecial HID { HelpID = HID7_CHK_SAVE; } ;
-#define HID7_TXT_SAVE   34271
+#define	HID7_TXT_SAVE	34271
 hidspecial HID { HelpID = HID7_TXT_SAVE; } ;
 
 //web wizard backgrounds dialog
-#define HID_BG  34290
+#define	HID_BG	34290
 hidspecial HID { HelpID = HID_BG; } ;
-#define HID_BG_BTN_OTHER    34291
+#define	HID_BG_BTN_OTHER	34291
 hidspecial HID { HelpID = HID_BG_BTN_OTHER; } ;
-#define HID_BG_BTN_NONE 34292
+#define	HID_BG_BTN_NONE	34292
 hidspecial HID { HelpID = HID_BG_BTN_NONE; } ;
-#define HID_BG_BTN_OK   34293
+#define	HID_BG_BTN_OK	34293
 hidspecial HID { HelpID = HID_BG_BTN_OK; } ;
-#define HID_BG_BTN_CANCEL   34294
+#define	HID_BG_BTN_CANCEL	34294
 hidspecial HID { HelpID = HID_BG_BTN_CANCEL; } ;
 
-#define HID_BG_BTN_BACK 34295
+#define	HID_BG_BTN_BACK	34295
 hidspecial HID { HelpID = HID_BG_BTN_BACK; } ;
-#define HID_BG_BTN_FW   34296
+#define	HID_BG_BTN_FW	34296
 hidspecial HID { HelpID = HID_BG_BTN_FW; } ;
-#define HID_BG_BTN_IMG1 34297
+#define	HID_BG_BTN_IMG1	34297
 hidspecial HID { HelpID = HID_BG_BTN_IMG1; } ;
-#define HID_BG_BTN_IMG2 34298
+#define	HID_BG_BTN_IMG2	34298
 hidspecial HID { HelpID = HID_BG_BTN_IMG2; } ;
-#define HID_BG_BTN_IMG3 34299
+#define	HID_BG_BTN_IMG3	34299
 hidspecial HID { HelpID = HID_BG_BTN_IMG3; } ;
-#define HID_BG_BTN_IMG4 34300
+#define	HID_BG_BTN_IMG4	34300
 hidspecial HID { HelpID = HID_BG_BTN_IMG4; } ;
-#define HID_BG_BTN_IMG5 34301
+#define	HID_BG_BTN_IMG5	34301
 hidspecial HID { HelpID = HID_BG_BTN_IMG5; } ;
-#define HID_BG_BTN_IMG6 34302
+#define	HID_BG_BTN_IMG6	34302
 hidspecial HID { HelpID = HID_BG_BTN_IMG6; } ;
-#define HID_BG_BTN_IMG7 34303
+#define	HID_BG_BTN_IMG7	34303
 hidspecial HID { HelpID = HID_BG_BTN_IMG7; } ;
-#define HID_BG_BTN_IMG8 34304
+#define	HID_BG_BTN_IMG8	34304
 hidspecial HID { HelpID = HID_BG_BTN_IMG8; } ;
-#define HID_BG_BTN_IMG9 34305
+#define	HID_BG_BTN_IMG9	34305
 hidspecial HID { HelpID = HID_BG_BTN_IMG9; } ;
-#define HID_BG_BTN_IMG10    34306
+#define	HID_BG_BTN_IMG10	34306
 hidspecial HID { HelpID = HID_BG_BTN_IMG10; } ;
-#define HID_BG_BTN_IMG11    34307
+#define	HID_BG_BTN_IMG11	34307
 hidspecial HID { HelpID = HID_BG_BTN_IMG11; } ;
-#define HID_BG_BTN_IMG12    34308
+#define	HID_BG_BTN_IMG12	34308
 hidspecial HID { HelpID = HID_BG_BTN_IMG12; } ;
-#define HID_BG_BTN_IMG13    34309
+#define	HID_BG_BTN_IMG13	34309
 hidspecial HID { HelpID = HID_BG_BTN_IMG13; } ;
-#define HID_BG_BTN_IMG14    34300
+#define	HID_BG_BTN_IMG14	34300
 hidspecial HID { HelpID = HID_BG_BTN_IMG14; } ;
-#define HID_BG_BTN_IMG15    34311
+#define	HID_BG_BTN_IMG15	34311
 hidspecial HID { HelpID = HID_BG_BTN_IMG15; } ;
-#define HID_BG_BTN_IMG16    34312
+#define	HID_BG_BTN_IMG16	34312
 hidspecial HID { HelpID = HID_BG_BTN_IMG16; } ;
 
 // ++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -255,42 +255,42 @@ hidspecial HID { HelpID = HID_BG_BTN_IMG16; } ;
 // REPORT WIZARD
 // *************
 
-#define HID_DLGREPORT_DIALOG                34320
+#define HID_DLGREPORT_DIALOG        		34320
 hidspecial HID { HelpID = HID_DLGREPORT_DIALOG; };
-#define HID_DLGREPORT_0_CMDPREV             34322
+#define HID_DLGREPORT_0_CMDPREV     		34322
 hidspecial HID { HelpID = HID_DLGREPORT_0_CMDPREV; };
-#define HID_DLGREPORT_0_CMDNEXT             34323
+#define HID_DLGREPORT_0_CMDNEXT      		34323
 hidspecial HID { HelpID = HID_DLGREPORT_0_CMDNEXT; };
-#define HID_DLGREPORT_0_CMDFINISH           34324
+#define HID_DLGREPORT_0_CMDFINISH   		34324
 hidspecial HID { HelpID = HID_DLGREPORT_0_CMDFINISH; };
-#define HID_DLGREPORT_0_CMDCANCEL           34325
+#define HID_DLGREPORT_0_CMDCANCEL   		34325
 hidspecial HID { HelpID = HID_DLGREPORT_0_CMDCANCEL; };
 
-#define HID_DLGREPORT_1_LBTABLES            34330
+#define HID_DLGREPORT_1_LBTABLES    		34330
 hidspecial HID { HelpID = HID_DLGREPORT_1_LBTABLES; };
-#define HID_DLGREPORT_1_FIELDSAVAILABLE     34331
+#define HID_DLGREPORT_1_FIELDSAVAILABLE   	34331
 hidspecial HID { HelpID = HID_DLGREPORT_1_FIELDSAVAILABLE; };
 #define HID_DLGREPORT_1_CMDMOVESELECTED     34332
 hidspecial HID { HelpID = HID_DLGREPORT_1_CMDMOVESELECTED; };
-#define HID_DLGREPORT_1_CMDMOVEALL          34333
+#define HID_DLGREPORT_1_CMDMOVEALL  		34333
 hidspecial HID { HelpID = HID_DLGREPORT_1_CMDMOVEALL; };
 #define HID_DLGREPORT_1_CMDREMOVESELECTED   34334
 hidspecial HID { HelpID = HID_DLGREPORT_1_CMDREMOVESELECTED; };
 #define HID_DLGREPORT_1_CMDREMOVEALL        34335
 hidspecial HID { HelpID = HID_DLGREPORT_1_CMDREMOVEALL; };
-#define HID_DLGREPORT_1_FIELDSSELECTED      34336
+#define HID_DLGREPORT_1_FIELDSSELECTED    	34336
 hidspecial HID { HelpID = HID_DLGREPORT_1_FIELDSSELECTED; };
-#define HID_DLGREPORT_1_CMDMOVEUP           34337
+#define HID_DLGREPORT_1_CMDMOVEUP        	34337
 hidspecial HID { HelpID = HID_DLGREPORT_1_CMDMOVEUP; };
 #define HID_DLGREPORT_1_CMDMOVEDOWN        34338
 hidspecial HID { HelpID = HID_DLGREPORT_1_CMDMOVEDOWN; };
 
 
-#define HID_DLGREPORT_2_GROUPING            34340
+#define HID_DLGREPORT_2_GROUPING    		34340
 hidspecial HID { HelpID = HID_DLGREPORT_2_GROUPING; };
-#define HID_DLGREPORT_2_CMDGROUP            34341
+#define HID_DLGREPORT_2_CMDGROUP    		34341
 hidspecial HID { HelpID = HID_DLGREPORT_2_CMDGROUP; };
-#define HID_DLGREPORT_2_CMDUNGROUP          34342
+#define HID_DLGREPORT_2_CMDUNGROUP  		34342
 hidspecial HID { HelpID = HID_DLGREPORT_2_CMDUNGROUP; };
 #define HID_DLGREPORT_2_PREGROUPINGDEST     34343
 hidspecial HID { HelpID = HID_DLGREPORT_2_PREGROUPINGDEST; };
@@ -300,40 +300,40 @@ hidspecial HID { HelpID = HID_DLGREPORT_2_CMDMOVEUPGROUP; };
 hidspecial HID { HelpID = HID_DLGREPORT_2_CMDMOVEDOWNGROUP; };
 
 
-#define HID_DLGREPORT_3_SORT1               34346
+#define HID_DLGREPORT_3_SORT1       		34346
 hidspecial HID { HelpID = HID_DLGREPORT_3_SORT1; };
-#define HID_DLGREPORT_3_OPTASCEND1          34347
+#define HID_DLGREPORT_3_OPTASCEND1    		34347
 hidspecial HID { HelpID = HID_DLGREPORT_3_OPTASCEND1; };
-#define HID_DLGREPORT_3_OPTDESCEND1         34348
+#define HID_DLGREPORT_3_OPTDESCEND1    		34348
 hidspecial HID { HelpID = HID_DLGREPORT_3_OPTDESCEND1; };
-#define HID_DLGREPORT_3_SORT2               34349
+#define HID_DLGREPORT_3_SORT2       		34349
 hidspecial HID { HelpID = HID_DLGREPORT_3_SORT2; };
-#define HID_DLGREPORT_3_OPTASCEND2          34350
+#define HID_DLGREPORT_3_OPTASCEND2    		34350
 hidspecial HID { HelpID = HID_DLGREPORT_3_OPTASCEND2; };
-#define HID_DLGREPORT_3_OPTDESCEND2         34351
+#define HID_DLGREPORT_3_OPTDESCEND2    		34351
 hidspecial HID { HelpID = HID_DLGREPORT_3_OPTDESCEND2; };
-#define HID_DLGREPORT_3_SORT3               34352
+#define HID_DLGREPORT_3_SORT3       		34352
 hidspecial HID { HelpID = HID_DLGREPORT_3_SORT3; };
-#define HID_DLGREPORT_3_OPTASCEND3          34353
+#define HID_DLGREPORT_3_OPTASCEND3    		34353
 hidspecial HID { HelpID = HID_DLGREPORT_3_OPTASCEND3; };
-#define HID_DLGREPORT_3_OPTDESCEND3         34354
+#define HID_DLGREPORT_3_OPTDESCEND3    		34354
 hidspecial HID { HelpID = HID_DLGREPORT_3_OPTDESCEND3; };
-#define HID_DLGREPORT_3_SORT4               34355
+#define HID_DLGREPORT_3_SORT4       		34355
 hidspecial HID { HelpID = HID_DLGREPORT_3_SORT4; };
-#define HID_DLGREPORT_3_OPTASCEND4          34356
+#define HID_DLGREPORT_3_OPTASCEND4    		34356
 hidspecial HID { HelpID = HID_DLGREPORT_3_OPTASCEND4; };
-#define HID_DLGREPORT_3_OPTDESCEND4         34357
+#define HID_DLGREPORT_3_OPTDESCEND4    		34357
 hidspecial HID { HelpID = HID_DLGREPORT_3_OPTDESCEND4; };
 
-#define HID_DLGREPORT_4_TITLE               34362
+#define HID_DLGREPORT_4_TITLE    			34362
 hidspecial HID { HelpID = HID_DLGREPORT_4_TITLE; };
-#define HID_DLGREPORT_4_DATALAYOUT          34363
+#define HID_DLGREPORT_4_DATALAYOUT  		34363
 hidspecial HID { HelpID = HID_DLGREPORT_4_DATALAYOUT; };
-#define HID_DLGREPORT_4_PAGELAYOUT          34364
+#define HID_DLGREPORT_4_PAGELAYOUT  		34364
 hidspecial HID { HelpID = HID_DLGREPORT_4_PAGELAYOUT; };
-#define HID_DLGREPORT_4_LANDSCAPE           34365
+#define HID_DLGREPORT_4_LANDSCAPE   		34365
 hidspecial HID { HelpID = HID_DLGREPORT_4_LANDSCAPE; };
-#define HID_DLGREPORT_4_PORTRAIT            34366
+#define HID_DLGREPORT_4_PORTRAIT    		34366
 hidspecial HID { HelpID = HID_DLGREPORT_4_PORTRAIT; };
 
 #define HID_DLGREPORT_5_OPTDYNTEMPLATE      34370
@@ -401,19 +401,19 @@ hidspecial HID { HelpID = HID_DLGFORM_MASTER_CMDREMOVESELECTED; };
 hidspecial HID { HelpID = HID_DLGFORM_MASTER_CMDREMOVEALL; };
 #define HID_DLGFORM_MASTER_FIELDSSELECTED          34417
 hidspecial HID { HelpID = HID_DLGFORM_MASTER_FIELDSSELECTED; };
-#define HID_DLGFORM_MASTER_CMDMOVEUP            34418
+#define HID_DLGFORM_MASTER_CMDMOVEUP       	    34418
 hidspecial HID { HelpID = HID_DLGFORM_MASTER_CMDMOVEUP; };
 #define HID_DLGFORM_MASTER_CMDMOVEDOWN             34419
 hidspecial HID { HelpID = HID_DLGFORM_MASTER_CMDMOVEDOWN; };
 
 
-#define HID_DLGFORM_CHKCREATESUBFORM            34421
+#define HID_DLGFORM_CHKCREATESUBFORM      		34421
 hidspecial HID { HelpID = HID_DLGFORM_CHKCREATESUBFORM; };
-#define HID_DLGFORM_OPTONEXISTINGRELATION           34422
+#define HID_DLGFORM_OPTONEXISTINGRELATION       	34422
 hidspecial HID { HelpID = HID_DLGFORM_OPTONEXISTINGRELATION; };
-#define HID_DLGFORM_OPTSELECTMANUALLY               34423
+#define HID_DLGFORM_OPTSELECTMANUALLY       		34423
 hidspecial HID { HelpID = HID_DLGFORM_OPTSELECTMANUALLY; };
-#define HID_DLGFORM_lstRELATIONS            34424
+#define HID_DLGFORM_lstRELATIONS			34424
 hidspecial HID { HelpID = HID_DLGFORM_lstRELATIONS; };
 
 
@@ -431,27 +431,27 @@ hidspecial HID { HelpID = HID_DLGFORM_SUB_CMDREMOVESELECTED; };
 hidspecial HID { HelpID = HID_DLGFORM_SUB_CMDREMOVEALL; };
 #define HID_DLGFORM_SUB_FIELDSSELECTED          34437
 hidspecial HID { HelpID = HID_DLGFORM_SUB_FIELDSSELECTED; };
-#define HID_DLGFORM_SUB_CMDMOVEUP           34438
+#define HID_DLGFORM_SUB_CMDMOVEUP       	34438
 hidspecial HID { HelpID = HID_DLGFORM_SUB_CMDMOVEUP; };
 #define HID_DLGFORM_SUB_CMDMOVEDOWN             34439
 hidspecial HID { HelpID = HID_DLGFORM_SUB_CMDMOVEDOWN; };
 
 
-#define HID_DLGFORM_LINKER_LSTSLAVELINK1            34441
+#define HID_DLGFORM_LINKER_LSTSLAVELINK1    		34441
 hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTSLAVELINK1; };
-#define HID_DLGFORM_LINKER_LSTMASTERLINK1               34442
+#define HID_DLGFORM_LINKER_LSTMASTERLINK1       		34442
 hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTMASTERLINK1; };
-#define HID_DLGFORM_LINKER_LSTSLAVELINK2            34443
+#define HID_DLGFORM_LINKER_LSTSLAVELINK2    		34443
 hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTSLAVELINK2; };
-#define HID_DLGFORM_LINKER_LSTMASTERLINK2               34444
+#define HID_DLGFORM_LINKER_LSTMASTERLINK2       		34444
 hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTMASTERLINK2; };
-#define HID_DLGFORM_LINKER_LSTSLAVELINK3            34445
+#define HID_DLGFORM_LINKER_LSTSLAVELINK3    		34445
 hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTSLAVELINK3; };
-#define HID_DLGFORM_LINKER_LSTMASTERLINK3               34446
+#define HID_DLGFORM_LINKER_LSTMASTERLINK3       		34446
 hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTMASTERLINK3; };
-#define HID_DLGFORM_LINKER_LSTSLAVELINK4            34447
+#define HID_DLGFORM_LINKER_LSTSLAVELINK4    		34447
 hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTSLAVELINK4; };
-#define HID_DLGFORM_LINKER_LSTMASTERLINK4               34448
+#define HID_DLGFORM_LINKER_LSTMASTERLINK4       		34448
 hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTMASTERLINK4; };
 
 #define HID_DLGFORM_CMDALIGNLEFT        34451
@@ -490,20 +490,20 @@ hidspecial HID { HelpID = HID_DLGFORM_CHKNODELETION; };
 hidspecial HID { HelpID = HID_DLGFORM_CHKNOADDITION; };
 
 
-#define HID_DLGFORM_LSTSTYLES           34471
+#define HID_DLGFORM_LSTSTYLES       	34471
 hidspecial HID { HelpID = HID_DLGFORM_LSTSTYLES; };
-#define HID_DLGFORM_CMDNOBORDER         34472
+#define HID_DLGFORM_CMDNOBORDER     	34472
 hidspecial HID { HelpID = HID_DLGFORM_CMDNOBORDER; };
-#define HID_DLGFORM_CMD3DBORDER         34473
+#define HID_DLGFORM_CMD3DBORDER     	34473
 hidspecial HID { HelpID = HID_DLGFORM_CMD3DBORDER; };
 #define HID_DLGFORM_CMDSIMPLEBORDER     34474
 hidspecial HID { HelpID = HID_DLGFORM_CMDSIMPLEBORDER; };
 
-#define HID_DLGFORM_TXTPATH         34481
+#define HID_DLGFORM_TXTPATH       	34481
 hidspecial HID { HelpID = HID_DLGFORM_TXTPATH; };
 #define HID_DLGFORM_OPTWORKWITHFORM     34482
 hidspecial HID { HelpID = HID_DLGFORM_OPTWORKWITHFORM; };
-#define HID_DLGFORM_OPTMODIFYFORM       34483
+#define HID_DLGFORM_OPTMODIFYFORM     	34483
 hidspecial HID { HelpID = HID_DLGFORM_OPTMODIFYFORM; };
 
 
@@ -895,138 +895,138 @@ hidspecial HID { HelpID = HID_LTRWIZARD_CREATE; };
 #define HID_LTRWIZARD_CANCEL   40825
 hidspecial HID { HelpID = HID_LTRWIZARD_CANCEL; };
 
-#define HID_QUERYWIZARD_LSTTABLES           40850
+#define HID_QUERYWIZARD_LSTTABLES   		40850
 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTTABLES; };
-#define HID_QUERYWIZARD_LSTFIELDS           40851
+#define HID_QUERYWIZARD_LSTFIELDS   		40851
 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFIELDS; };
-#define HID_QUERYWIZARD_CMDMOVESELECTED     40852
+#define HID_QUERYWIZARD_CMDMOVESELECTED   	40852
 hidspecial HID { HelpID = HID_QUERYWIZARD_CMDMOVESELECTED; };
-#define HID_QUERYWIZARD_CMDMOVEALL          40853
+#define HID_QUERYWIZARD_CMDMOVEALL   		40853
 hidspecial HID { HelpID = HID_QUERYWIZARD_CMDMOVEALL; };
 #define HID_QUERYWIZARD_CMDREMOVESELECTED   40854
 hidspecial HID { HelpID = HID_QUERYWIZARD_CMDREMOVESELECTED; };
-#define HID_QUERYWIZARD_CMDREMOVEALL        40855
+#define HID_QUERYWIZARD_CMDREMOVEALL   		40855
 hidspecial HID { HelpID = HID_QUERYWIZARD_CMDREMOVEALL; };
-#define HID_QUERYWIZARD_LSTSELFIELDS        40856
+#define HID_QUERYWIZARD_LSTSELFIELDS   		40856
 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTSELFIELDS; };
-#define HID_QUERYWIZARD_CMDMOVEUP           40857
+#define HID_QUERYWIZARD_CMDMOVEUP   		40857
 hidspecial HID { HelpID = HID_QUERYWIZARD_CMDMOVEUP; };
-#define HID_QUERYWIZARD_CMDMOVEDOWN         40858
+#define HID_QUERYWIZARD_CMDMOVEDOWN   		40858
 hidspecial HID { HelpID = HID_QUERYWIZARD_CMDMOVEDOWN; };
 
-#define HID_QUERYWIZARD_SORT1               40865
+#define HID_QUERYWIZARD_SORT1       		40865
 hidspecial HID { HelpID = HID_QUERYWIZARD_SORT1; };
-#define HID_QUERYWIZARD_OPTASCEND1          40866
+#define HID_QUERYWIZARD_OPTASCEND1    		40866
 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTASCEND1; };
-#define HID_QUERYWIZARD_OPTDESCEND1         40867
+#define HID_QUERYWIZARD_OPTDESCEND1    		40867
 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTDESCEND1; };
-#define HID_QUERYWIZARD_SORT2               40868
+#define HID_QUERYWIZARD_SORT2       		40868
 hidspecial HID { HelpID = HID_QUERYWIZARD_SORT2; };
-#define HID_QUERYWIZARD_OPTASCEND2          40869
+#define HID_QUERYWIZARD_OPTASCEND2    		40869
 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTASCEND2; };
-#define HID_QUERYWIZARD_OPTDESCEND2         40870
+#define HID_QUERYWIZARD_OPTDESCEND2    		40870
 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTDESCEND2; };
-#define HID_QUERYWIZARD_SORT3               40871
+#define HID_QUERYWIZARD_SORT3       		40871
 hidspecial HID { HelpID = HID_QUERYWIZARD_SORT3; };
-#define HID_QUERYWIZARD_OPTASCEND3          40872
+#define HID_QUERYWIZARD_OPTASCEND3    		40872
 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTASCEND3; };
-#define HID_QUERYWIZARD_OPTDESCEND3         40873
+#define HID_QUERYWIZARD_OPTDESCEND3    		40873
 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTDESCEND3; };
-#define HID_QUERYWIZARD_SORT4               40874
+#define HID_QUERYWIZARD_SORT4       		40874
 hidspecial HID { HelpID = HID_QUERYWIZARD_SORT4; };
-#define HID_QUERYWIZARD_OPTASCEND4          40875
+#define HID_QUERYWIZARD_OPTASCEND4    		40875
 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTASCEND4; };
-#define HID_QUERYWIZARD_OPTDESCEND4         40876
+#define HID_QUERYWIZARD_OPTDESCEND4    		40876
 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTDESCEND4; };
 
-#define HID_QUERYWIZARD_OPTMATCHALL         40878
+#define HID_QUERYWIZARD_OPTMATCHALL	   		40878
 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTMATCHALL; };
-#define HID_QUERYWIZARD_OPTMATCHANY         40879
+#define HID_QUERYWIZARD_OPTMATCHANY 		40879
 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTMATCHANY; };
 
-#define HID_QUERYWIZARD_LSTFIELDNAME_1      40880
+#define HID_QUERYWIZARD_LSTFIELDNAME_1	   	40880
 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFIELDNAME_1; };
-#define HID_QUERYWIZARD_LSTOPERATOR_1       40881
+#define HID_QUERYWIZARD_LSTOPERATOR_1 		40881
 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTOPERATOR_1; };
-#define HID_QUERYWIZARD_TXTVALUE_1          40882
+#define HID_QUERYWIZARD_TXTVALUE_1    		40882
 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTVALUE_1; };
-#define HID_QUERYWIZARD_LSTFIELDNAME_2      40883
+#define HID_QUERYWIZARD_LSTFIELDNAME_2  	40883
 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFIELDNAME_2; };
-#define HID_QUERYWIZARD_LSTOPERATOR_2       40884
+#define HID_QUERYWIZARD_LSTOPERATOR_2    	40884
 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTOPERATOR_2; };
-#define HID_QUERYWIZARD_TXTVALUE_2          40885
+#define HID_QUERYWIZARD_TXTVALUE_2    		40885
 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTVALUE_2; };
-#define HID_QUERYWIZARD_LSTFIELDNAME_3      40886
+#define HID_QUERYWIZARD_LSTFIELDNAME_3 		40886
 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFIELDNAME_3; };
-#define HID_QUERYWIZARD_LSTOPERATOR_3       40887
+#define HID_QUERYWIZARD_LSTOPERATOR_3    	40887
 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTOPERATOR_3; };
-#define HID_QUERYWIZARD_TXTVALUE_3          40888
+#define HID_QUERYWIZARD_TXTVALUE_3    		40888
 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTVALUE_3; };
 
-#define HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY         40895
+#define HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY	   		40895
 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY; };
-#define HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY        40896
+#define HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY 		40896
 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY; };
-#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1          40897
+#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1    		40897
 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1; };
-#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1            40898
+#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1  			40898
 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1; };
-#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_2          40899
+#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_2    		40899
 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_2; };
-#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_2            40900
+#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_2  			40900
 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFIELDS_2; };
-#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_3          40901
+#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_3    		40901
 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_3; };
-#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_3            40902
+#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_3  			40902
 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFIELDS_3; };
-#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_4          40903
+#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_4    		40903
 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_4; };
-#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_4            40904
+#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_4  			40904
 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFIELDS_4; };
-#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_5          40905
+#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_5    		40905
 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_5; };
-#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_5            40906
+#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_5  			40906
 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFIELDS_5; };
-#define HID_QUERYWIZARD_BTNAGGREGATEPLUS                40907
+#define HID_QUERYWIZARD_BTNAGGREGATEPLUS  				40907
 hidspecial HID { HelpID = HID_QUERYWIZARD_BTNAGGREGATEPLUS; };
-#define HID_QUERYWIZARD_BTNAGGREGATEMINUS               40908
+#define HID_QUERYWIZARD_BTNAGGREGATEMINUS  				40908
 hidspecial HID { HelpID = HID_QUERYWIZARD_BTNAGGREGATEMINUS; };
 
-#define HID_QUERYWIZARD_LSTFILTERFIELDS             40915
+#define HID_QUERYWIZARD_LSTFILTERFIELDS   			40915
 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTERFIELDS; };
-#define HID_QUERYWIZARD_CMDFILTERMOVESELECTED       40916
+#define HID_QUERYWIZARD_CMDFILTERMOVESELECTED   	40916
 hidspecial HID { HelpID = HID_QUERYWIZARD_CMDFILTERMOVESELECTED; };
-#define HID_QUERYWIZARD_CMDFILTERREMOVESELECTED     40917
+#define HID_QUERYWIZARD_CMDFILTERREMOVESELECTED   	40917
 hidspecial HID { HelpID = HID_QUERYWIZARD_CMDFILTERREMOVESELECTED; };
-#define HID_QUERYWIZARD_LSTFILTERSELFIELDS          40918
+#define HID_QUERYWIZARD_LSTFILTERSELFIELDS   		40918
 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTERSELFIELDS; };
-#define HID_QUERYWIZARD_CMDFILTERMOVEUP             40919
+#define HID_QUERYWIZARD_CMDFILTERMOVEUP   			40919
 hidspecial HID { HelpID = HID_QUERYWIZARD_CMDFILTERMOVEUP; };
-#define HID_QUERYWIZARD_CMDFILTERMOVEDOWN           40920
+#define HID_QUERYWIZARD_CMDFILTERMOVEDOWN   		40920
 hidspecial HID { HelpID = HID_QUERYWIZARD_CMDFILTERMOVEDOWN; };
 
-#define HID_QUERYWIZARD_OPTGROUPMATCHALL            40923
+#define HID_QUERYWIZARD_OPTGROUPMATCHALL	   		40923
 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTGROUPMATCHALL; };
-#define HID_QUERYWIZARD_OPTGROUPMATCHANY        40924
+#define HID_QUERYWIZARD_OPTGROUPMATCHANY 		40924
 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTGROUPMATCHANY; };
 
-#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_1        40925
+#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_1	   	40925
 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTERFIELDNAME_1; };
-#define HID_QUERYWIZARD_LSTFILTEROPERATOR_1         40926
+#define HID_QUERYWIZARD_LSTFILTEROPERATOR_1 		40926
 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTEROPERATOR_1; };
-#define HID_QUERYWIZARD_TXTFILTERVALUE_1            40927
+#define HID_QUERYWIZARD_TXTFILTERVALUE_1    		40927
 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTFILTERVALUE_1; };
-#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_2        40928
+#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_2  		40928
 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTERFIELDNAME_2; };
-#define HID_QUERYWIZARD_LSTFILTEROPERATOR_2         40929
+#define HID_QUERYWIZARD_LSTFILTEROPERATOR_2    		40929
 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTEROPERATOR_2; };
-#define HID_QUERYWIZARD_TXTFILTERVALUE_2            40930
+#define HID_QUERYWIZARD_TXTFILTERVALUE_2    		40930
 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTFILTERVALUE_2; };
-#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_3        40931
+#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_3 		40931
 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTERFIELDNAME_3; };
-#define HID_QUERYWIZARD_LSTFILTEROPERATOR_3         40932
+#define HID_QUERYWIZARD_LSTFILTEROPERATOR_3    		40932
 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTEROPERATOR_3; };
-#define HID_QUERYWIZARD_TXTFILTERVALUE_3            40933
+#define HID_QUERYWIZARD_TXTFILTERVALUE_3    		40933
 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTFILTERVALUE_3; };
 
 #define HID_QUERYWIZARD_TXTTITLE_1         40940
@@ -1044,122 +1044,122 @@ hidspecial HID { HelpID = HID_QUERYWIZARD_TXTTITLE_6; };
 #define HID_QUERYWIZARD_TXTTITLE_7         40946
 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTTITLE_7; };
 
-#define HID_QUERYWIZARD_TXTQUERYTITLE       40955
+#define HID_QUERYWIZARD_TXTQUERYTITLE    	40955
 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTQUERYTITLE; };
-#define HID_QUERYWIZARD_OPTDISPLAYQUERY     40956
+#define HID_QUERYWIZARD_OPTDISPLAYQUERY    	40956
 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTDISPLAYQUERY; };
-#define HID_QUERYWIZARD_OPTMODIFYQUERY      40957
+#define HID_QUERYWIZARD_OPTMODIFYQUERY    	40957
 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTMODIFYQUERY; };
-#define HID_QUERYWIZARD_TXTSUMMARY          40958
+#define HID_QUERYWIZARD_TXTSUMMARY    		40958
 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTSUMMARY; };
 
-#define HID_QUERYWIZARD             40970
+#define HID_QUERYWIZARD   			40970
 hidspecial HID { HelpID = HID_QUERYWIZARD; };
-#define HID_QUERYWIZARD_BACK        40972
+#define HID_QUERYWIZARD_BACK   		40972
 hidspecial HID { HelpID = HID_QUERYWIZARD_BACK; };
-#define HID_QUERYWIZARD_NEXT        40973
+#define HID_QUERYWIZARD_NEXT   		40973
 hidspecial HID { HelpID = HID_QUERYWIZARD_NEXT; };
-#define HID_QUERYWIZARD_CREATE      40974
+#define HID_QUERYWIZARD_CREATE   	40974
 hidspecial HID { HelpID = HID_QUERYWIZARD_CREATE; };
-#define HID_QUERYWIZARD_CANCEL      40975
+#define HID_QUERYWIZARD_CANCEL  	40975
 hidspecial HID { HelpID = HID_QUERYWIZARD_CANCEL; };
 
 // ++++++++++++++++++++++++++++++++++++++
 // +++ Web Wizard : Continued from 34312
 // ++++++++++++++++++++++++++++++++++++++
 // web wizard iconssets dialog
-#define HID_IS  41000
+#define	HID_IS	41000
 hidspecial HID { HelpID = HID_IS; } ;
-#define HID_IS_BTN_NONE 41002
+#define	HID_IS_BTN_NONE	41002
 hidspecial HID { HelpID = HID_IS_BTN_NONE; } ;
-#define HID_IS_BTN_OK   41003
+#define	HID_IS_BTN_OK	41003
 hidspecial HID { HelpID = HID_IS_BTN_OK; } ;
 #define HID_IS_BTN_CANCEL 41004
 hidspecial HID { HelpID = HID_IS_BTN_CANCEL; } ;
 
-#define HID_IS_BTN_IMG1 41005
+#define	HID_IS_BTN_IMG1	41005
 hidspecial HID { HelpID = HID_IS_BTN_IMG1; } ;
-#define HID_IS_BTN_IMG2 41006
+#define	HID_IS_BTN_IMG2	41006
 hidspecial HID { HelpID = HID_IS_BTN_IMG2; } ;
-#define HID_IS_BTN_IMG3 41007
+#define	HID_IS_BTN_IMG3	41007
 hidspecial HID { HelpID = HID_IS_BTN_IMG3; } ;
-#define HID_IS_BTN_IMG4 41008
+#define	HID_IS_BTN_IMG4	41008
 hidspecial HID { HelpID = HID_IS_BTN_IMG4; } ;
-#define HID_IS_BTN_IMG5 41009
+#define	HID_IS_BTN_IMG5	41009
 hidspecial HID { HelpID = HID_IS_BTN_IMG5; } ;
-#define HID_IS_BTN_IMG6 41010
+#define	HID_IS_BTN_IMG6	41010
 hidspecial HID { HelpID = HID_IS_BTN_IMG6; } ;
-#define HID_IS_BTN_IMG7 41011
+#define	HID_IS_BTN_IMG7	41011
 hidspecial HID { HelpID = HID_IS_BTN_IMG7; } ;
-#define HID_IS_BTN_IMG8 41012
+#define	HID_IS_BTN_IMG8	41012
 hidspecial HID { HelpID = HID_IS_BTN_IMG8; } ;
-#define HID_IS_BTN_IMG9 41013
+#define	HID_IS_BTN_IMG9	41013
 hidspecial HID { HelpID = HID_IS_BTN_IMG9; } ;
-#define HID_IS_BTN_IMG10    41014
+#define	HID_IS_BTN_IMG10	41014
 hidspecial HID { HelpID = HID_IS_BTN_IMG10; } ;
-#define HID_IS_BTN_IMG11    41015
+#define	HID_IS_BTN_IMG11	41015
 hidspecial HID { HelpID = HID_IS_BTN_IMG11; } ;
-#define HID_IS_BTN_IMG12    41016
+#define	HID_IS_BTN_IMG12	41016
 hidspecial HID { HelpID = HID_IS_BTN_IMG12; } ;
-#define HID_IS_BTN_IMG13    41017
+#define	HID_IS_BTN_IMG13	41017
 hidspecial HID { HelpID = HID_IS_BTN_IMG13; } ;
-#define HID_IS_BTN_IMG14    41018
+#define	HID_IS_BTN_IMG14	41018
 hidspecial HID { HelpID = HID_IS_BTN_IMG14; } ;
-#define HID_IS_BTN_IMG15    41019
+#define	HID_IS_BTN_IMG15	41019
 hidspecial HID { HelpID = HID_IS_BTN_IMG15; } ;
-#define HID_IS_BTN_IMG16    41020
+#define	HID_IS_BTN_IMG16	41020
 hidspecial HID { HelpID = HID_IS_BTN_IMG16; } ;
-#define HID_IS_BTN_IMG17    41021
+#define	HID_IS_BTN_IMG17	41021
 hidspecial HID { HelpID = HID_IS_BTN_IMG17; } ;
-#define HID_IS_BTN_IMG18    41022
+#define	HID_IS_BTN_IMG18	41022
 hidspecial HID { HelpID = HID_IS_BTN_IMG18; } ;
-#define HID_IS_BTN_IMG19    41023
+#define	HID_IS_BTN_IMG19	41023
 hidspecial HID { HelpID = HID_IS_BTN_IMG19; } ;
-#define HID_IS_BTN_IMG20    41024
+#define	HID_IS_BTN_IMG20	41024
 hidspecial HID { HelpID = HID_IS_BTN_IMG20; } ;
-#define HID_IS_BTN_IMG21    41025
+#define	HID_IS_BTN_IMG21	41025
 hidspecial HID { HelpID = HID_IS_BTN_IMG21; } ;
-#define HID_IS_BTN_IMG22    41026
+#define	HID_IS_BTN_IMG22	41026
 hidspecial HID { HelpID = HID_IS_BTN_IMG22; } ;
-#define HID_IS_BTN_IMG23    41027
+#define	HID_IS_BTN_IMG23	41027
 hidspecial HID { HelpID = HID_IS_BTN_IMG23; } ;
-#define HID_IS_BTN_IMG24    41028
+#define	HID_IS_BTN_IMG24	41028
 hidspecial HID { HelpID = HID_IS_BTN_IMG24; } ;
-#define HID_IS_BTN_IMG25    41029
+#define	HID_IS_BTN_IMG25	41029
 hidspecial HID { HelpID = HID_IS_BTN_IMG25; } ;
-#define HID_IS_BTN_IMG26    41030
+#define	HID_IS_BTN_IMG26	41030
 hidspecial HID { HelpID = HID_IS_BTN_IMG26; } ;
-#define HID_IS_BTN_IMG27    41031
+#define	HID_IS_BTN_IMG27	41031
 hidspecial HID { HelpID = HID_IS_BTN_IMG27; } ;
-#define HID_IS_BTN_IMG28    41032
+#define	HID_IS_BTN_IMG28	41032
 hidspecial HID { HelpID = HID_IS_BTN_IMG28; } ;
-#define HID_IS_BTN_IMG29    41033
+#define	HID_IS_BTN_IMG29	41033
 hidspecial HID { HelpID = HID_IS_BTN_IMG29; } ;
-#define HID_IS_BTN_IMG30    41034
+#define	HID_IS_BTN_IMG30	41034
 hidspecial HID { HelpID = HID_IS_BTN_IMG30; } ;
-#define HID_IS_BTN_IMG31    41035
+#define	HID_IS_BTN_IMG31	41035
 hidspecial HID { HelpID = HID_IS_BTN_IMG31; } ;
-#define HID_IS_BTN_IMG32    41036
+#define	HID_IS_BTN_IMG32	41036
 hidspecial HID { HelpID = HID_IS_BTN_IMG32; } ;
 
 // web wizard ftp dialog
-#define HID_FTP 41040
+#define	HID_FTP	41040
 hidspecial HID { HelpID = HID_FTP; } ;
-#define HID_FTP_SERVER  41041
+#define	HID_FTP_SERVER	41041
 hidspecial HID { HelpID = HID_FTP_SERVER; } ;
-#define HID_FTP_USERNAME    41042
+#define	HID_FTP_USERNAME	41042
 hidspecial HID { HelpID = HID_FTP_USERNAME; } ;
-#define HID_FTP_PASS    41043
+#define	HID_FTP_PASS	41043
 hidspecial HID { HelpID = HID_FTP_PASS; } ;
-#define HID_FTP_TEST    41044
+#define	HID_FTP_TEST	41044
 hidspecial HID { HelpID = HID_FTP_TEST; } ;
-#define HID_FTP_TXT_PATH    41045
+#define	HID_FTP_TXT_PATH	41045
 hidspecial HID { HelpID = HID_FTP_TXT_PATH; } ;
-#define HID_FTP_BTN_PATH    41046
+#define	HID_FTP_BTN_PATH	41046
 hidspecial HID { HelpID = HID_FTP_BTN_PATH; } ;
-#define HID_FTP_OK  41047
+#define	HID_FTP_OK	41047
 hidspecial HID { HelpID = HID_FTP_OK; } ;
-#define HID_FTP_CANCEL  41048
+#define	HID_FTP_CANCEL	41048
 hidspecial HID { HelpID = HID_FTP_CANCEL; } ;
 
 
@@ -1171,217 +1171,217 @@ hidspecial HID { HelpID = HID_FTP_CANCEL; } ;
 
 // step 0 - navibar
 
-#define HID_AGWIZ                       41051
+#define	HID_AGWIZ						41051
 hidspecial HID { HelpID = HID_AGWIZ; } ;
-#define HID_AGWIZ_HELP                      41052
+#define	HID_AGWIZ_HELP						41052
 hidspecial HID { HelpID = HID_AGWIZ_HELP; } ;
-#define HID_AGWIZ_NEXT                      41053
+#define	HID_AGWIZ_NEXT						41053
 hidspecial HID { HelpID = HID_AGWIZ_NEXT; } ;
-#define HID_AGWIZ_PREV                      41054
+#define	HID_AGWIZ_PREV						41054
 hidspecial HID { HelpID = HID_AGWIZ_PREV; } ;
-#define HID_AGWIZ_CREATE                    41055
+#define	HID_AGWIZ_CREATE					41055
 hidspecial HID { HelpID = HID_AGWIZ_CREATE; } ;
-#define HID_AGWIZ_CANCEL                    41056
+#define	HID_AGWIZ_CANCEL					41056
 hidspecial HID { HelpID = HID_AGWIZ_CANCEL; } ;
 
 //step 1 - design
 
-#define HID_AGWIZ_1_LIST_PAGEDESIGN             41057
+#define HID_AGWIZ_1_LIST_PAGEDESIGN				41057
 hidspecial HID { HelpID = HID_AGWIZ_1_LIST_PAGEDESIGN; } ;
-#define HID_AGWIZ_1_CHK_MINUTES                 41058
+#define HID_AGWIZ_1_CHK_MINUTES 				41058
 hidspecial HID { HelpID = HID_AGWIZ_1_CHK_MINUTES; } ;
 
 // step 2 - general attributes
 
-#define HID_AGWIZ_2_TXT_TIME                    41059
+#define HID_AGWIZ_2_TXT_TIME					41059
 hidspecial HID { HelpID = HID_AGWIZ_2_TXT_TIME; } ;
-#define HID_AGWIZ_2_TXT_DATE                    41060
+#define HID_AGWIZ_2_TXT_DATE					41060
 hidspecial HID { HelpID = HID_AGWIZ_2_TXT_DATE; } ;
-#define HID_AGWIZ_2_TXT_TITLE                   41061
+#define HID_AGWIZ_2_TXT_TITLE					41061
 hidspecial HID { HelpID = HID_AGWIZ_2_TXT_TITLE; } ;
-#define HID_AGWIZ_2_TXT_LOCATION                41062
+#define HID_AGWIZ_2_TXT_LOCATION 				41062
 hidspecial HID { HelpID = HID_AGWIZ_2_TXT_LOCATION; } ;
 
 // step 3 - headings
 
-#define HID_AGWIZ_3_CHK_MEETING_TYPE                41063
+#define HID_AGWIZ_3_CHK_MEETING_TYPE 				41063
 hidspecial HID { HelpID = HID_AGWIZ_3_CHK_MEETING_TYPE; } ;
-#define HID_AGWIZ_3_CHK_READ                    41064
+#define HID_AGWIZ_3_CHK_READ 					41064
 hidspecial HID { HelpID = HID_AGWIZ_3_CHK_READ; } ;
-#define HID_AGWIZ_3_CHK_BRING                   41065
+#define HID_AGWIZ_3_CHK_BRING 					41065
 hidspecial HID { HelpID = HID_AGWIZ_3_CHK_BRING; } ;
-#define HID_AGWIZ_3_CHK_NOTES                   41066
+#define HID_AGWIZ_3_CHK_NOTES 					41066
 hidspecial HID { HelpID = HID_AGWIZ_3_CHK_NOTES; } ;
 
 // step 4 - names
 
-#define HID_AGWIZ_4_CHK_CALLED_BY               41067
+#define HID_AGWIZ_4_CHK_CALLED_BY 				41067
 hidspecial HID { HelpID = HID_AGWIZ_4_CHK_CALLED_BY; } ;
-#define HID_AGWIZ_4_CHK_FACILITATOR                 41068
+#define HID_AGWIZ_4_CHK_FACILITATOR 				41068
 hidspecial HID { HelpID = HID_AGWIZ_4_CHK_FACILITATOR; } ;
-#define HID_AGWIZ_4_CHK_NOTETAKER               41069
+#define HID_AGWIZ_4_CHK_NOTETAKER 				41069
 hidspecial HID { HelpID = HID_AGWIZ_4_CHK_NOTETAKER; } ;
-#define HID_AGWIZ_4_CHK_TIMEKEEPER              41070
+#define HID_AGWIZ_4_CHK_TIMEKEEPER 				41070
 hidspecial HID { HelpID = HID_AGWIZ_4_CHK_TIMEKEEPER; } ;
-#define HID_AGWIZ_4_CHK_ATTENDEES               41071
+#define HID_AGWIZ_4_CHK_ATTENDEES 				41071
 hidspecial HID { HelpID = HID_AGWIZ_4_CHK_ATTENDEES; } ;
-#define HID_AGWIZ_4_CHK_OBSERVERS               41072
+#define HID_AGWIZ_4_CHK_OBSERVERS 				41072
 hidspecial HID { HelpID = HID_AGWIZ_4_CHK_OBSERVERS; } ;
-#define HID_AGWIZ_4_CHK_RESOURCEPERSONS             41073
+#define HID_AGWIZ_4_CHK_RESOURCEPERSONS 			41073
 hidspecial HID { HelpID = HID_AGWIZ_4_CHK_RESOURCEPERSONS; } ;
 
 // step 5 - topics
 
-#define HID_AGWIZ_6_TXT_TEMPLATENAME                41074
+#define HID_AGWIZ_6_TXT_TEMPLATENAME 				41074
 hidspecial HID { HelpID = HID_AGWIZ_6_TXT_TEMPLATENAME; } ;
-#define HID_AGWIZ_6_TXT_TEMPLATEPATH                41075
+#define HID_AGWIZ_6_TXT_TEMPLATEPATH 				41075
 hidspecial HID { HelpID = HID_AGWIZ_6_TXT_TEMPLATEPATH; } ;
-#define HID_AGWIZ_6_BTN_TEMPLATEPATH                41076
+#define HID_AGWIZ_6_BTN_TEMPLATEPATH 				41076
 hidspecial HID { HelpID = HID_AGWIZ_6_BTN_TEMPLATEPATH; } ;
 
 // step 6 - file info
 
-#define HID_AGWIZ_6_OPT_CREATEAGENDA                41077
+#define HID_AGWIZ_6_OPT_CREATEAGENDA 				41077
 hidspecial HID { HelpID = HID_AGWIZ_6_OPT_CREATEAGENDA; } ;
-#define HID_AGWIZ_6_OPT_MAKECHANGES                 41078
+#define HID_AGWIZ_6_OPT_MAKECHANGES 				41078
 hidspecial HID { HelpID = HID_AGWIZ_6_OPT_MAKECHANGES; } ;
 
 // - again step 5 - buttons
 
-#define HID_AGWIZ_5_BTN_INSERT                  41079
+#define HID_AGWIZ_5_BTN_INSERT 					41079
 hidspecial HID { HelpID = HID_AGWIZ_5_BTN_INSERT; } ;
-#define HID_AGWIZ_5_BTN_REMOVE                  41080
+#define HID_AGWIZ_5_BTN_REMOVE 					41080
 hidspecial HID { HelpID = HID_AGWIZ_5_BTN_REMOVE; } ;
-#define HID_AGWIZ_5_BTN_UP                  41081
+#define HID_AGWIZ_5_BTN_UP 					41081
 hidspecial HID { HelpID = HID_AGWIZ_5_BTN_UP; } ;
-#define HID_AGWIZ_5_BTN_DOWN                    41082
+#define HID_AGWIZ_5_BTN_DOWN 					41082
 hidspecial HID { HelpID = HID_AGWIZ_5_BTN_DOWN; } ;
 
 // again step 5 - scroll control
 
-#define HID_AGWIZ_5_SCROLL_BAR                  41083
+#define HID_AGWIZ_5_SCROLL_BAR 					41083
 hidspecial HID { HelpID = HID_AGWIZ_5_SCROLL_BAR; } ;
 
-#define HID_AGWIZ_5_TXT_TOPIC_1                 41084
+#define HID_AGWIZ_5_TXT_TOPIC_1 				41084
 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_TOPIC_1; } ;
-#define HID_AGWIZ_5_TXT_RESPONSIBLE_1               41085
+#define HID_AGWIZ_5_TXT_RESPONSIBLE_1 				41085
 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_RESPONSIBLE_1; } ;
-#define HID_AGWIZ_5_TXT_MINUTES_1               41086
+#define HID_AGWIZ_5_TXT_MINUTES_1 				41086
 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_MINUTES_1; } ;
 
-#define HID_AGWIZ_5_TXT_TOPIC_2                 41087
+#define HID_AGWIZ_5_TXT_TOPIC_2					41087
 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_TOPIC_2; } ;
-#define HID_AGWIZ_5_TXT_RESPONSIBLE_2               41088
+#define HID_AGWIZ_5_TXT_RESPONSIBLE_2 				41088
 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_RESPONSIBLE_2; } ;
-#define HID_AGWIZ_5_TXT_MINUTES_2               41089
+#define HID_AGWIZ_5_TXT_MINUTES_2				41089
 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_MINUTES_2; } ;
 
-#define HID_AGWIZ_5_TXT_TOPIC_3                 41090
+#define HID_AGWIZ_5_TXT_TOPIC_3					41090
 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_TOPIC_3; } ;
-#define HID_AGWIZ_5_TXT_RESPONSIBLE_3               41091
+#define HID_AGWIZ_5_TXT_RESPONSIBLE_3 				41091
 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_RESPONSIBLE_3; } ;
-#define HID_AGWIZ_5_TXT_MINUTES_3               41092
+#define HID_AGWIZ_5_TXT_MINUTES_3				41092
 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_MINUTES_3; } ;
 
-#define HID_AGWIZ_5_TXT_TOPIC_4                 41093
+#define HID_AGWIZ_5_TXT_TOPIC_4					41093
 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_TOPIC_4; } ;
-#define HID_AGWIZ_5_TXT_RESPONSIBLE_4               41094
+#define HID_AGWIZ_5_TXT_RESPONSIBLE_4 				41094
 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_RESPONSIBLE_4; } ;
-#define HID_AGWIZ_5_TXT_MINUTES_4               41095
+#define HID_AGWIZ_5_TXT_MINUTES_4				41095
 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_MINUTES_4; } ;
 
-#define HID_AGWIZ_5_TXT_TOPIC_5                 41096
+#define HID_AGWIZ_5_TXT_TOPIC_5					41096
 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_TOPIC_5; } ;
-#define HID_AGWIZ_5_TXT_RESPONSIBLE_5               41097
+#define HID_AGWIZ_5_TXT_RESPONSIBLE_5				41097
 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_RESPONSIBLE_5; } ;
-#define HID_AGWIZ_5_TXT_MINUTES_5               41098
+#define HID_AGWIZ_5_TXT_MINUTES_5				41098
 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_MINUTES_5; } ;
 
 
 //FaxWizard---------------------------
 
-#define HID_FAXWIZ_OPTBUSINESSFAX               41120
+#define HID_FAXWIZ_OPTBUSINESSFAX				41120
 hidspecial HID { HelpID = HID_FAXWIZ_OPTBUSINESSFAX; };
-#define HID_FAXWIZ_LSTBUSINESSSTYLE             41121
+#define HID_FAXWIZ_LSTBUSINESSSTYLE				41121
 hidspecial HID { HelpID = HID_FAXWIZ_LSTBUSINESSSTYLE; };
-#define HID_FAXWIZ_OPTPRIVATEFAX                41122
+#define HID_FAXWIZ_OPTPRIVATEFAX				41122
 hidspecial HID { HelpID = HID_FAXWIZ_OPTPRIVATEFAX; };
-#define HID_LSTPRIVATESTYLE                 41123
+#define HID_LSTPRIVATESTYLE					41123
 hidspecial HID { HelpID = HID_LSTPRIVATESTYLE; };
-#define HID_IMAGECONTROL3                   41124
+#define HID_IMAGECONTROL3					41124
 hidspecial HID { HelpID = HID_IMAGECONTROL3; };
-#define HID_CHKUSELOGO                      41125
+#define HID_CHKUSELOGO						41125
 hidspecial HID { HelpID = HID_CHKUSELOGO; };
-#define HID_CHKUSEDATE                      41126
+#define HID_CHKUSEDATE						41126
 hidspecial HID { HelpID = HID_CHKUSEDATE; };
-#define HID_CHKUSECOMMUNICATIONTYPE             41127
+#define HID_CHKUSECOMMUNICATIONTYPE				41127
 hidspecial HID { HelpID = HID_CHKUSECOMMUNICATIONTYPE; };
-#define HID_LSTCOMMUNICATIONTYPE                41128
+#define HID_LSTCOMMUNICATIONTYPE				41128
 hidspecial HID { HelpID = HID_LSTCOMMUNICATIONTYPE; };
-#define HID_CHKUSESUBJECT                   41129
+#define HID_CHKUSESUBJECT					41129
 hidspecial HID { HelpID = HID_CHKUSESUBJECT; };
-#define HID_CHKUSESALUTATION                    41130
+#define HID_CHKUSESALUTATION					41130
 hidspecial HID { HelpID = HID_CHKUSESALUTATION; };
-#define HID_LSTSALUTATION                   41131
+#define HID_LSTSALUTATION					41131
 hidspecial HID { HelpID = HID_LSTSALUTATION; };
-#define HID_CHKUSEGREETING                  41132
+#define HID_CHKUSEGREETING					41132
 hidspecial HID { HelpID = HID_CHKUSEGREETING; };
-#define HID_LSTGREETING                     41133
+#define HID_LSTGREETING						41133
 hidspecial HID { HelpID = HID_LSTGREETING; };
-#define HID_CHKUSEFOOTER                    41134
+#define HID_CHKUSEFOOTER					41134
 hidspecial HID { HelpID = HID_CHKUSEFOOTER; };
-#define HID_OPTSENDERPLACEHOLDER                41135
+#define HID_OPTSENDERPLACEHOLDER				41135
 hidspecial HID { HelpID = HID_OPTSENDERPLACEHOLDER; };
-#define HID_OPTSENDERDEFINE                 41136
+#define HID_OPTSENDERDEFINE					41136
 hidspecial HID { HelpID = HID_OPTSENDERDEFINE; };
-#define HID_TXTSENDERNAME                   41137
+#define HID_TXTSENDERNAME					41137
 hidspecial HID { HelpID = HID_TXTSENDERNAME; };
-#define HID_TXTSENDERSTREET                 41138
+#define HID_TXTSENDERSTREET					41138
 hidspecial HID { HelpID = HID_TXTSENDERSTREET; };
-#define HID_TXTSENDERPOSTCODE                   41139
+#define HID_TXTSENDERPOSTCODE					41139
 hidspecial HID { HelpID = HID_TXTSENDERPOSTCODE; };
-#define HID_TXTSENDERSTATE                  41140
+#define HID_TXTSENDERSTATE					41140
 hidspecial HID { HelpID = HID_TXTSENDERSTATE; };
-#define HID_TXTSENDERCITY                   41141
+#define HID_TXTSENDERCITY					41141
 hidspecial HID { HelpID = HID_TXTSENDERCITY; };
-#define HID_TXTSENDERFAX                    41142
+#define HID_TXTSENDERFAX					41142
 hidspecial HID { HelpID = HID_TXTSENDERFAX; };
-#define HID_OPTRECEIVERPLACEHOLDER              41143
+#define HID_OPTRECEIVERPLACEHOLDER				41143
 hidspecial HID { HelpID = HID_OPTRECEIVERPLACEHOLDER; };
-#define HID_OPTRECEIVERDATABASE                 41144
+#define HID_OPTRECEIVERDATABASE					41144
 hidspecial HID { HelpID = HID_OPTRECEIVERDATABASE; };
-#define HID_TXTFOOTER                       41145
+#define HID_TXTFOOTER						41145
 hidspecial HID { HelpID = HID_TXTFOOTER; };
-#define HID_CHKFOOTERNEXTPAGES                  41146
+#define HID_CHKFOOTERNEXTPAGES					41146
 hidspecial HID { HelpID = HID_CHKFOOTERNEXTPAGES; };
-#define HID_CHKFOOTERPAGENUMBERS                41147
+#define HID_CHKFOOTERPAGENUMBERS				41147
 hidspecial HID { HelpID = HID_CHKFOOTERPAGENUMBERS; };
-#define HID_TXTTEMPLATENAME                 41148
+#define HID_TXTTEMPLATENAME					41148
 hidspecial HID { HelpID = HID_TXTTEMPLATENAME; };
-#define HID_FILETEMPLATEPATH                    41149
+#define HID_FILETEMPLATEPATH					41149
 hidspecial HID { HelpID = HID_FILETEMPLATEPATH; };
-#define HID_OPTCREATEFAX                    41150
+#define HID_OPTCREATEFAX					41150
 hidspecial HID { HelpID = HID_OPTCREATEFAX; };
-#define HID_OPTMAKECHANGES                  41151
+#define HID_OPTMAKECHANGES					41151
 hidspecial HID { HelpID = HID_OPTMAKECHANGES; };
-#define HID_IMAGECONTROL2                   41152
+#define HID_IMAGECONTROL2					41152
 hidspecial HID { HelpID = HID_IMAGECONTROL2; };
-#define HID_FAXWIZ_TXTPATH                  41153
+#define HID_FAXWIZ_TXTPATH					41153
 hidspecial HID { HelpID = HID_FAXWIZ_TXTPATH; };
-#define HID_FAXWIZ_CMDPATH                  41154
+#define HID_FAXWIZ_CMDPATH					41154
 hidspecial HID { HelpID = HID_FAXWIZ_CMDPATH; };
 
-#define HID_FAXWIZARD                       41180
+#define HID_FAXWIZARD						41180
 hidspecial HID { HelpID = HID_FAXWIZARD; };
-#define HID_FAXWIZARD_HELP                  41181
+#define HID_FAXWIZARD_HELP					41181
 hidspecial HID { HelpID = HID_FAXWIZARD_HELP; };
-#define HID_FAXWIZARD_BACK                  41182
+#define HID_FAXWIZARD_BACK					41182
 hidspecial HID { HelpID = HID_FAXWIZARD_BACK; };
-#define HID_FAXWIZARD_NEXT                  41183
+#define HID_FAXWIZARD_NEXT					41183
 hidspecial HID { HelpID = HID_FAXWIZARD_NEXT; };
-#define HID_FAXWIZARD_CREATE                    41184
+#define HID_FAXWIZARD_CREATE					41184
 hidspecial HID { HelpID = HID_FAXWIZARD_CREATE; };
-#define HID_FAXWIZARD_CANCEL                    41185
+#define HID_FAXWIZARD_CANCEL					41185
 hidspecial HID { HelpID = HID_FAXWIZARD_CANCEL; };
 
 
@@ -1397,15 +1397,15 @@ hidspecial HID { HelpID = HID_DLGTABLE_DIALOG; };
 hidspecial HID { HelpID = HID_DLGTABLE_CMDPREV; };
 #define HID_DLGTABLE_CMDNEXT                 41203
 hidspecial HID { HelpID = HID_DLGTABLE_CMDNEXT; };
-#define HID_DLGTABLE_CMDFINISH              41204
+#define HID_DLGTABLE_CMDFINISH   			41204
 hidspecial HID { HelpID = HID_DLGTABLE_CMDFINISH; };
 #define HID_DLGTABLE_CMDCANCEL               41205
 hidspecial HID { HelpID = HID_DLGTABLE_CMDCANCEL; };
 
 
-#define HID_DLGTABLE_OPTBUSINESS            41206
+#define HID_DLGTABLE_OPTBUSINESS       		41206
 hidspecial HID { HelpID = HID_DLGTABLE_OPTBUSINESS; };
-#define HID_DLGTABLE_OPTPRIVATE             41207
+#define HID_DLGTABLE_OPTPRIVATE       		41207
 hidspecial HID { HelpID = HID_DLGTABLE_OPTPRIVATE; };
 
 
@@ -1436,31 +1436,31 @@ hidspecial HID { HelpID = HID_DLGTABLE_LB_SELFIELDNAMES; };
 hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVEFIELDUP; };
 #define HID_DLGTABLE_CMDMOVEFIELDDOWN        41222
 hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVEFIELDDOWN; };
-#define HID_DLGTABLE_CMDMINUS               41223
+#define HID_DLGTABLE_CMDMINUS        		41223
 hidspecial HID { HelpID = HID_DLGTABLE_CMDMINUS; };
-#define HID_DLGTABLE_CMDPLUS                41224
+#define HID_DLGTABLE_CMDPLUS        		41224
 hidspecial HID { HelpID = HID_DLGTABLE_CMDPLUS; };
-#define HID_DLGTABLE_COLNAME                41225
+#define HID_DLGTABLE_COLNAME        		41225
 hidspecial HID { HelpID = HID_DLGTABLE_COLNAME; };
-#define HID_DLGTABLE_COLMODIFIER                41226
+#define HID_DLGTABLE_COLMODIFIER        		41226
 hidspecial HID { HelpID = HID_DLGTABLE_COLMODIFIER; };
 
 
-#define HID_DLGTABLE_CHK_USEPRIMEKEY        41227
+#define HID_DLGTABLE_CHK_USEPRIMEKEY       	41227
 hidspecial HID { HelpID = HID_DLGTABLE_CHK_USEPRIMEKEY; };
-#define HID_DLGTABLE_OPT_PK_AUTOMATIC           41228
+#define HID_DLGTABLE_OPT_PK_AUTOMATIC       	41228
 hidspecial HID { HelpID = HID_DLGTABLE_OPT_PK_AUTOMATIC; };
 
 #define HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC     41229
 hidspecial HID { HelpID = HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC; };
 
-#define HID_DLGTABLE_OPT_PK_SINGLE              41230
+#define HID_DLGTABLE_OPT_PK_SINGLE       		41230
 hidspecial HID { HelpID = HID_DLGTABLE_OPT_PK_SINGLE; };
 #define HID_DLGTABLE_LB_PK_FIELDNAME            41231
 hidspecial HID { HelpID = HID_DLGTABLE_LB_PK_FIELDNAME; };
 #define HID_DLGTABLE_CK_PK_AUTOVALUE             41232
 hidspecial HID { HelpID = HID_DLGTABLE_CK_PK_AUTOVALUE; };
-#define HID_DLGTABLE_OPT_PK_SEVERAL         41233
+#define HID_DLGTABLE_OPT_PK_SEVERAL       	41233
 hidspecial HID { HelpID = HID_DLGTABLE_OPT_PK_SEVERAL; };
 #define HID_DLGTABLE_FIELDS_PK_AVAILABLE         41234
 hidspecial HID { HelpID = HID_DLGTABLE_FIELDS_PK_AVAILABLE; };
@@ -1479,17 +1479,17 @@ hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED; };
 
 
 
-#define HID_DLGTABLE_TXT_NAME               41240
+#define HID_DLGTABLE_TXT_NAME       		41240
 hidspecial HID { HelpID = HID_DLGTABLE_TXT_NAME; };
-#define HID_DLGTABLE_OPT_MODIFYTABLE            41241
+#define HID_DLGTABLE_OPT_MODIFYTABLE     		41241
 hidspecial HID { HelpID = HID_DLGTABLE_OPT_MODIFYTABLE; };
-#define HID_DLGTABLE_OPT_WORKWITHTABLE      41242
+#define HID_DLGTABLE_OPT_WORKWITHTABLE     	41242
 hidspecial HID { HelpID = HID_DLGTABLE_OPT_WORKWITHTABLE; };
-#define HID_DLGTABLE_OPT_STARTFORMWIZARD        41243
+#define HID_DLGTABLE_OPT_STARTFORMWIZARD     	41243
 hidspecial HID { HelpID = HID_DLGTABLE_OPT_STARTFORMWIZARD; };
-#define HID_DLGTABLE_LST_CATALOG        41244
+#define HID_DLGTABLE_LST_CATALOG     	41244
 hidspecial HID { HelpID = HID_DLGTABLE_LST_CATALOG; };
-#define HID_DLGTABLE_LST_SCHEMA         41245
+#define HID_DLGTABLE_LST_SCHEMA     	41245
 hidspecial HID { HelpID = HID_DLGTABLE_LST_SCHEMA; };
 
 
diff --git a/xmlsecurity/inc/pch/precompiled_xmlsecurity.cxx b/xmlsecurity/inc/pch/precompiled_xmlsecurity.cxx
index 7aa8a6192009..92fe51505bbf 100644
--- a/xmlsecurity/inc/pch/precompiled_xmlsecurity.cxx
+++ b/xmlsecurity/inc/pch/precompiled_xmlsecurity.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx
index ade8fb78ecc0..3d8c8630b78f 100644
--- a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx
+++ b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/xmlsecurity/inc/xmlsecurity/biginteger.hxx b/xmlsecurity/inc/xmlsecurity/biginteger.hxx
index 74d25bef987d..1103857c7ff3 100644
--- a/xmlsecurity/inc/xmlsecurity/biginteger.hxx
+++ b/xmlsecurity/inc/xmlsecurity/biginteger.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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/uno/Sequence.h"
 
 rtl::OUString bigIntegerToNumericString( ::com::sun::star::uno::Sequence< sal_Int8 > serial );
-::com::sun::star::uno::Sequence< sal_Int8 > numericStringToBigInteger ( rtl::OUString serialNumber );
+::com::sun::star::uno::Sequence< sal_Int8 > numericStringToBigInteger (	rtl::OUString serialNumber );
 
 #endif
 
diff --git a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
index e74aa1f5cece..b70745032b95 100644
--- a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
+++ b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,23 +60,23 @@ private:
     cssu::Sequence< cssu::Reference< dcss::security::XCertificate > > maCerts;
     SignatureInformations maCertsToIgnore;
 
-    FixedText           maHintFT;
+    FixedText			maHintFT;
     SvxSimpleTable      maCertLB;   // PB 2006/02/02 #i48648 now SvHeaderTabListBox
 
-    PushButton          maViewBtn;
+    PushButton			maViewBtn;
 
-    FixedLine           maBottomSepFL;
-    OKButton            maOKBtn;
+    FixedLine			maBottomSepFL;
+    OKButton			maOKBtn;
     CancelButton        maCancelBtn;
-    HelpButton          maHelpBtn;
+    HelpButton			maHelpBtn;
 
-    BOOL                mbInitialized;
+    BOOL				mbInitialized;
 
-    USHORT              GetSelectedEntryPos( void ) const;
-//  DECL_LINK(          Initialize, void* );
-    DECL_LINK(          ViewButtonHdl, Button* );
-    DECL_LINK(          CertificateHighlightHdl, void* );
-    DECL_LINK(          CertificateSelectHdl, void* );
+    USHORT				GetSelectedEntryPos( void ) const;
+//	DECL_LINK(			Initialize, void* );
+    DECL_LINK(			ViewButtonHdl, Button* );
+    DECL_LINK(			CertificateHighlightHdl, void* );
+    DECL_LINK(			CertificateSelectHdl, void* );
 
     void ImplShowCertificateDetails();
     void ImplInitialize();
diff --git a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
index f9031a9514ed..c35360931d57 100644
--- a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
+++ b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,27 +59,27 @@ private:
     friend class CertificateViewerDetailsTP;
     friend class CertificateViewerCertPathTP;
 
-    TabControl          maTabCtrl;
-    OKButton            maOkBtn;
-    HelpButton          maHelpBtn;
+    TabControl			maTabCtrl;
+    OKButton			maOkBtn;
+    HelpButton			maHelpBtn;
 
-    BOOL                mbCheckForPrivateKey;
+    BOOL				mbCheckForPrivateKey;
 
     cssu::Reference< dcss::xml::crypto::XSecurityEnvironment > mxSecurityEnvironment;
     cssu::Reference< dcss::security::XCertificate > mxCert;
 public:
         CertificateViewer( Window* pParent, const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment, const cssu::Reference< dcss::security::XCertificate >& rXCert, BOOL bCheckForPrivateKey );
-    virtual             ~CertificateViewer();
+    virtual				~CertificateViewer();
 };
 
 
 class CertificateViewerTP : public TabPage
 {
 protected:
-    CertificateViewer*  mpDlg;
+    CertificateViewer*	mpDlg;
 public:
     CertificateViewerTP( Window* _pParent, const ResId& _rResId, CertificateViewer* _pDlg );
-    inline void         SetTabDlg( CertificateViewer* pTabDlg );
+    inline void			SetTabDlg( CertificateViewer* pTabDlg );
 };
 
 inline void CertificateViewerTP::SetTabDlg( CertificateViewer* _pTabDlg )
@@ -91,23 +91,23 @@ inline void CertificateViewerTP::SetTabDlg( CertificateViewer* _pTabDlg )
 class CertificateViewerGeneralTP : public CertificateViewerTP
 {
 private:
-    Window              maFrameWin;
-    FixedImage          maCertImg;
-    FixedInfo           maCertInfoFI;
-    FixedLine           maSep1FL;
-    FixedInfo           maHintNotTrustedFI;
-    FixedLine           maSep2FL;
-    FixedInfo           maIssuedToLabelFI;
-    FixedInfo           maIssuedToFI;
-    FixedInfo           maIssuedByLabelFI;
-    FixedInfo           maIssuedByFI;
+    Window				maFrameWin;
+    FixedImage			maCertImg;
+    FixedInfo			maCertInfoFI;
+    FixedLine			maSep1FL;
+    FixedInfo			maHintNotTrustedFI;
+    FixedLine			maSep2FL;
+    FixedInfo			maIssuedToLabelFI;
+    FixedInfo			maIssuedToFI;
+    FixedInfo			maIssuedByLabelFI;
+    FixedInfo			maIssuedByFI;
     FixedInfo           maValidDateFI;
-    FixedImage          maKeyImg;
-    FixedInfo           maHintCorrespPrivKeyFI;
+    FixedImage			maKeyImg;
+    FixedInfo			maHintCorrespPrivKeyFI;
 public:
                         CertificateViewerGeneralTP( Window* pParent, CertificateViewer* _pDlg );
 
-    virtual void        ActivatePage();
+    virtual void		ActivatePage();
 };
 
 
@@ -115,30 +115,30 @@ class CertificateViewerDetailsTP : public CertificateViewerTP
 {
 private:
     SvxSimpleTable      maElementsLB;   // PB 2006/02/02 #i48648 now SvHeaderTabListBox
-    MultiLineEdit       maElementML;
-    Font                maStdFont;
-    Font                maFixedWidthFont;
+    MultiLineEdit		maElementML;
+    Font				maStdFont;
+    Font				maFixedWidthFont;
 
-    DECL_LINK(          ElementSelectHdl, void* );
-    void                Clear( void );
-    void                InsertElement( const String& _rField, const String& _rValue,
+    DECL_LINK(			ElementSelectHdl, void* );
+    void				Clear( void );
+    void				InsertElement( const String& _rField, const String& _rValue,
                                         const String& _rDetails, bool _bFixedWidthFont = false );
 public:
                         CertificateViewerDetailsTP( Window* pParent, CertificateViewer* _pDlg );
-    virtual             ~CertificateViewerDetailsTP();
+    virtual				~CertificateViewerDetailsTP();
 
-    virtual void        ActivatePage();
+    virtual void		ActivatePage();
 };
 
 
 class CertificateViewerCertPathTP : public CertificateViewerTP
 {
 private:
-    FixedText           maCertPathFT;
-    SvTreeListBox       maCertPathLB;
+    FixedText			maCertPathFT;
+    SvTreeListBox		maCertPathLB;
     PushButton          maViewCertPB;
-    FixedText           maCertStatusFT;
-    MultiLineEdit       maCertStatusML;
+    FixedText			maCertStatusFT;
+    MultiLineEdit		maCertStatusML;
 
     CertificateViewer*  mpParent;
     bool                mbFirstActivateDone;
@@ -147,18 +147,18 @@ private:
     String              msCertOK;
     String              msCertNotValidated;
 
-    DECL_LINK(          ViewCertHdl, void* );
-    DECL_LINK(          CertSelectHdl, void* );
-    void                Clear( void );
-    SvLBoxEntry*        InsertCert( SvLBoxEntry* _pParent, const String& _rName,
+    DECL_LINK(			ViewCertHdl, void* );
+    DECL_LINK(			CertSelectHdl, void* );
+    void				Clear( void );
+    SvLBoxEntry*		InsertCert( SvLBoxEntry* _pParent, const String& _rName,
                                     cssu::Reference< dcss::security::XCertificate > rxCert,
                                     bool bValid);
 
 public:
                         CertificateViewerCertPathTP( Window* pParent, CertificateViewer* _pDlg );
-    virtual             ~CertificateViewerCertPathTP();
+    virtual				~CertificateViewerCertPathTP();
 
-    virtual void        ActivatePage();
+    virtual void		ActivatePage();
 };
 
 
diff --git a/xmlsecurity/inc/xmlsecurity/certvalidity.hxx b/xmlsecurity/inc/xmlsecurity/certvalidity.hxx
index 837d5c29786d..f77d27f6981d 100644
--- a/xmlsecurity/inc/xmlsecurity/certvalidity.hxx
+++ b/xmlsecurity/inc/xmlsecurity/certvalidity.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
index 292653745f80..9084e8296ce8 100644
--- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
+++ b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class DigitalSignaturesDialog : public ModalDialog
 {
 private:
     cssu::Reference< cssu::XComponentContext >& mxCtx;
-    XMLSignatureHelper      maSignatureHelper;
+    XMLSignatureHelper	    maSignatureHelper;
 
     css::uno::Reference < css::embed::XStorage > mxStore;
     css::uno::Reference < css::io::XStream > mxSignatureStream;
@@ -74,49 +74,49 @@ private:
     SignatureInformations   maCurrentSignatureInformations;
     bool                    mbVerifySignatures;
     bool                    mbSignaturesChanged;
-    DocumentSignatureMode   meSignatureMode;
+    DocumentSignatureMode	meSignatureMode;
     css::uno::Sequence < css::uno::Sequence < css::beans::PropertyValue > > m_manifest;
 
-    FixedText           maHintDocFT;
-    FixedText           maHintBasicFT;
-    FixedText           maHintPackageFT;
+    FixedText			maHintDocFT;
+    FixedText			maHintBasicFT;
+    FixedText			maHintPackageFT;
     SvxSimpleTable      maSignaturesLB; // PB 2006/02/02 #i48648 now SvHeaderTabListBox
-    FixedImage          maSigsValidImg;
-    FixedInfo           maSigsValidFI;
+    FixedImage			maSigsValidImg;
+    FixedInfo			maSigsValidFI;
     FixedImage          maSigsInvalidImg;
     FixedInfo           maSigsInvalidFI;
     FixedImage          maSigsNotvalidatedImg;
     FixedInfo           maSigsNotvalidatedFI;
     FixedInfo           maSigsOldSignatureFI;
 
-    PushButton          maViewBtn;
-    PushButton          maAddBtn;
-    PushButton          maRemoveBtn;
+    PushButton			maViewBtn;
+    PushButton			maAddBtn;
+    PushButton			maRemoveBtn;
 
-    FixedLine           maBottomSepFL;
-    OKButton            maOKBtn;
-    HelpButton          maHelpBtn;
+    FixedLine			maBottomSepFL;
+    OKButton			maOKBtn;
+    HelpButton			maHelpBtn;
 
     ::rtl::OUString m_sODFVersion;
-    //Signals if the document contains already a document signature. This is only
+    //Signals if the document contains already a document signature. This is only 
     //importent when we are signing macros and if the value is true.
     bool m_bHasDocumentSignature;
     bool m_bWarningShowSignMacro;
 
-    DECL_LINK(          ViewButtonHdl, Button* );
-    DECL_LINK(          AddButtonHdl, Button* );
-    DECL_LINK(          RemoveButtonHdl, Button* );
-    DECL_LINK(          SignatureHighlightHdl, void* );
-    DECL_LINK(          SignatureSelectHdl, void* );
-    DECL_LINK(          StartVerifySignatureHdl, void* );
-    DECL_LINK(          OKButtonHdl, void* );
+    DECL_LINK(			ViewButtonHdl, Button* );
+    DECL_LINK(			AddButtonHdl, Button* );
+    DECL_LINK(			RemoveButtonHdl, Button* );
+    DECL_LINK(			SignatureHighlightHdl, void* );
+    DECL_LINK(			SignatureSelectHdl, void* );
+    DECL_LINK(			StartVerifySignatureHdl, void* );
+    DECL_LINK(			OKButtonHdl, void* );
 
     void                ImplGetSignatureInformations(bool bUseTempStream);
     void                ImplFillSignaturesBox();
     void                ImplShowSignaturesDetails();
     SignatureStreamHelper ImplOpenSignatureStream( sal_Int32 eStreamMode, bool bTempStream );
 
-    //Checks if adding is allowed.
+    //Checks if adding is allowed. 
     //See the spec at specs/www/appwide/security/Electronic_Signatures_and_Security.sxw
     //(6.6.2)Behaviour with regard to ODF 1.2
     bool canAdd();
@@ -128,8 +128,8 @@ private:
     bool canAddRemove();
 
 public:
-    DigitalSignaturesDialog( Window* pParent, cssu::Reference<
-        cssu::XComponentContext >& rxCtx, DocumentSignatureMode eMode,
+    DigitalSignaturesDialog( Window* pParent, cssu::Reference< 
+        cssu::XComponentContext >& rxCtx, DocumentSignatureMode eMode, 
         sal_Bool bReadOnly, const ::rtl::OUString& sODFVersion, bool bHasDocumentSignature);
     ~DigitalSignaturesDialog();
 
@@ -141,7 +141,7 @@ public:
     void    SetSignatureStream( const cssu::Reference < css::io::XStream >& rxStream );
 
                 // Execute the dialog...
-    short       Execute();
+    short	    Execute();
 
                 // Did signatures change?
     sal_Bool    SignaturesChanged() const { return mbSignaturesChanged; }
diff --git a/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx b/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx
index beb089060039..2f1f018297d8 100644
--- a/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 css = com::sun::star;
 
  Functions:
  1. help to create a list of content to be signed/verified
-
+ 
  **********************************************************/
 
 enum DocumentSignatureMode { SignatureModeDocumentContent, SignatureModeMacros, SignatureModePackage };
@@ -80,24 +80,24 @@ class DocumentSignatureHelper
 {
 public:
 
-    static SignatureStreamHelper OpenSignatureStream(
-        const css::uno::Reference < css::embed::XStorage >& rxStore, sal_Int32 nOpenMode,
+    static SignatureStreamHelper OpenSignatureStream( 
+        const css::uno::Reference < css::embed::XStorage >& rxStore, sal_Int32 nOpenMode, 
         DocumentSignatureMode eDocSigMode );
-    static std::vector< rtl::OUString > CreateElementList(
-        const css::uno::Reference < css::embed::XStorage >& rxStore,
-        const ::rtl::OUString rRootStorageName, DocumentSignatureMode eMode,
+    static std::vector< rtl::OUString > CreateElementList( 
+        const css::uno::Reference < css::embed::XStorage >& rxStore, 
+        const ::rtl::OUString rRootStorageName, DocumentSignatureMode eMode, 
         const DocumentSignatureAlgorithm mode);
     static bool isODFPre_1_2(const ::rtl::OUString & sODFVersion);
     static bool isOOo3_2_Signature(const SignatureInformation & sigInfo);
     static DocumentSignatureAlgorithm getDocumentAlgorithm(
         const ::rtl::OUString & sODFVersion, const SignatureInformation & sigInfo);
-    static bool checkIfAllFilesAreSigned( const ::std::vector< ::rtl::OUString > & sElementList,
+    static bool checkIfAllFilesAreSigned( const ::std::vector< ::rtl::OUString > & sElementList, 
         const SignatureInformation & sigInfo, const DocumentSignatureAlgorithm alg);
     static bool equalsReferenceUriManifestPath(
         const ::rtl::OUString & rUri, const ::rtl::OUString & rPath);
     static ::rtl::OUString GetDocumentContentSignatureDefaultStreamName();
     static ::rtl::OUString GetScriptingContentSignatureDefaultStreamName();
-    static ::rtl::OUString GetPackageSignatureDefaultStreamName();
+    static ::rtl::OUString GetPackageSignatureDefaultStreamName(); 
 
 };
 
diff --git a/xmlsecurity/inc/xmlsecurity/global.hrc b/xmlsecurity/inc/xmlsecurity/global.hrc
index 57a9a95e88b3..8761f7170573 100644
--- a/xmlsecurity/inc/xmlsecurity/global.hrc
+++ b/xmlsecurity/inc/xmlsecurity/global.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
index 46854d04d604..7ed8b292919b 100644
--- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
+++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,25 +68,25 @@ private:
     friend class MacroSecurityLevelTP;
     friend class MacroSecurityTrustedSourcesTP;
 
-    TabControl          maTabCtrl;
-    OKButton            maOkBtn;
-    CancelButton        maCancelBtn;
-    HelpButton          maHelpBtn;
-    PushButton          maResetBtn;
+    TabControl			maTabCtrl;
+    OKButton			maOkBtn;
+    CancelButton		maCancelBtn;
+    HelpButton			maHelpBtn;
+    PushButton			maResetBtn;
 
-    cssu::Reference< cssu::XComponentContext >  mxCtx;
-    cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >  mxSecurityEnvironment;
-    SvtSecurityOptions                                          maSecOptions;
+    cssu::Reference< cssu::XComponentContext >	mxCtx;
+    cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >	mxSecurityEnvironment;
+    SvtSecurityOptions											maSecOptions;
 
-    MacroSecurityTP*    mpLevelTP;
-    MacroSecurityTP*    mpTrustSrcTP;
+    MacroSecurityTP*	mpLevelTP;
+    MacroSecurityTP*	mpTrustSrcTP;
 
-    DECL_LINK(          OkBtnHdl, void* );
+    DECL_LINK(			OkBtnHdl, void* );
 public:
     MacroSecurity( Window* pParent, const cssu::Reference< cssu::XComponentContext>& rxCtx, const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment );
-    virtual             ~MacroSecurity();
+    virtual				~MacroSecurity();
 
-    inline void     EnableReset( bool _bEnable = true );
+    inline void		EnableReset( bool _bEnable = true );
 };
 
 inline void MacroSecurity::EnableReset( bool _bEnable )
@@ -97,12 +97,12 @@ inline void MacroSecurity::EnableReset( bool _bEnable )
 class MacroSecurityTP : public TabPage
 {
 protected:
-    MacroSecurity*      mpDlg;
+    MacroSecurity*		mpDlg;
 public:
                         MacroSecurityTP( Window* _pParent, const ResId& _rResId, MacroSecurity* _pDlg );
-    inline void         SetTabDlg( MacroSecurity* pTabDlg );
+    inline void			SetTabDlg( MacroSecurity* pTabDlg );
 
-    virtual void        ClosePage( void ) = 0;
+    virtual void		ClosePage( void ) = 0;
 };
 
 inline void MacroSecurityTP::SetTabDlg( MacroSecurity* _pTabDlg )
@@ -114,61 +114,61 @@ inline void MacroSecurityTP::SetTabDlg( MacroSecurity* _pTabDlg )
 class MacroSecurityLevelTP : public MacroSecurityTP
 {
 private:
-    FixedLine           maSecLevelFL;
+    FixedLine			maSecLevelFL;
     ReadOnlyImage       maSecReadonlyFI;
     RadioButton         maVeryHighRB;
-    RadioButton         maHighRB;
-    RadioButton         maMediumRB;
-    RadioButton         maLowRB;
+    RadioButton			maHighRB;
+    RadioButton			maMediumRB;
+    RadioButton			maLowRB;
 
     USHORT              mnCurLevel;
 
 protected:
-    DECL_LINK(          RadioButtonHdl, RadioButton* );
+    DECL_LINK(			RadioButtonHdl, RadioButton* );
 
 public:
                         MacroSecurityLevelTP( Window* pParent, MacroSecurity* _pDlg );
 
-    virtual void        ClosePage( void );
+    virtual void		ClosePage( void );
 };
 
 
 class MacroSecurityTrustedSourcesTP : public MacroSecurityTP
 {
 private:
-    FixedLine           maTrustCertFL;
+    FixedLine			maTrustCertFL;
     ReadOnlyImage       maTrustCertROFI;
     SvxSimpleTable      maTrustCertLB;  // PB 2006/02/02 #i48648 now SvHeaderTabListBox
-    PushButton          maAddCertPB;
-    PushButton          maViewCertPB;
-    PushButton          maRemoveCertPB;
-    FixedLine           maTrustFileLocFL;
+    PushButton			maAddCertPB;
+    PushButton			maViewCertPB;
+    PushButton			maRemoveCertPB;
+    FixedLine			maTrustFileLocFL;
     ReadOnlyImage       maTrustFileROFI;
     FixedInfo           maTrustFileLocFI;
-    ListBox             maTrustFileLocLB;
-    PushButton          maAddLocPB;
-    PushButton          maRemoveLocPB;
+    ListBox				maTrustFileLocLB;
+    PushButton			maAddLocPB;
+    PushButton			maRemoveLocPB;
 
     cssu::Sequence< SvtSecurityOptions::Certificate > maTrustedAuthors;
 
     sal_Bool            mbAuthorsReadonly;
     sal_Bool            mbURLsReadonly;
 
-    DECL_LINK(          ViewCertPBHdl, void* );
-    DECL_LINK(          RemoveCertPBHdl, void* );
-    DECL_LINK(          AddLocPBHdl, void* );
-    DECL_LINK(          RemoveLocPBHdl, void* );
-    DECL_LINK(          TrustCertLBSelectHdl, void* );
-    DECL_LINK(          TrustFileLocLBSelectHdl, void* );
+    DECL_LINK(			ViewCertPBHdl, void* );
+    DECL_LINK(			RemoveCertPBHdl, void* );
+    DECL_LINK(			AddLocPBHdl, void* );
+    DECL_LINK(			RemoveLocPBHdl, void* );
+    DECL_LINK(			TrustCertLBSelectHdl, void* );
+    DECL_LINK(			TrustFileLocLBSelectHdl, void* );
 
-    void                FillCertLB( void );
+    void				FillCertLB( void );
     void                ImplCheckButtons();
 
 public:
                         MacroSecurityTrustedSourcesTP( Window* pParent, MacroSecurity* _pDlg );
 
-    virtual void        ActivatePage();
-    virtual void        ClosePage( void );
+    virtual void		ActivatePage();
+    virtual void		ClosePage( void );
 };
 
 
diff --git a/xmlsecurity/inc/xmlsecurity/sigstruct.hxx b/xmlsecurity/inc/xmlsecurity/sigstruct.hxx
index fb1be3f86137..f3a8f293fab7 100644
--- a/xmlsecurity/inc/xmlsecurity/sigstruct.hxx
+++ b/xmlsecurity/inc/xmlsecurity/sigstruct.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 /*
  * signature status
  */
-/*
-#define STATUS_INIT         0
-#define STATUS_CREATION_SUCCEED     1
-#define STATUS_CREATION_FAIL        2
-#define STATUS_VERIFY_SUCCEED       3
-#define STATUS_VERIFY_FAIL      4
+/* 
+#define STATUS_INIT			0
+#define STATUS_CREATION_SUCCEED		1
+#define STATUS_CREATION_FAIL		2
+#define STATUS_VERIFY_SUCCEED		3
+#define STATUS_VERIFY_FAIL		4
 */
 
 /*
  * type of reference
  */
-#define TYPE_SAMEDOCUMENT_REFERENCE 1
-#define TYPE_BINARYSTREAM_REFERENCE 2
-#define TYPE_XMLSTREAM_REFERENCE    3
+#define TYPE_SAMEDOCUMENT_REFERENCE	1
+#define TYPE_BINARYSTREAM_REFERENCE	2
+#define TYPE_XMLSTREAM_REFERENCE	3
 
 struct SignatureReferenceInformation
 {
     sal_Int32       nType;
     rtl::OUString   ouURI;
     rtl::OUString   ouDigestValue;
-
+    
     SignatureReferenceInformation( sal_Int32 type, rtl::OUString uri )
     {
         nType = type;
@@ -90,11 +90,11 @@ struct SignatureInformation
     //XML signatures are written again (unless they have been removed).
     //If the date time string is converted into the DateTime structure
     //then information can be lost because it only holds a fractional
-    //of a second with a accuracy of one hundredth of second.
+    //of a second with a accuracy of one hundredth of second. 
     //If the string contains
     //milli seconds (because the document was created by an application other than OOo)
     //and the converted time is written back, then the string looks different
-    //and the signature is broken.
+    //and the signature is broken.	
     rtl::OUString ouDateTime;
     rtl::OUString ouSignatureId;
     rtl::OUString ouPropertyId;
@@ -105,7 +105,7 @@ struct SignatureInformation
         nStatus = ::com::sun::star::xml::crypto::SecurityOperationStatus_UNKNOWN;
         nSecurityEnvironmentIndex = -1;
     }
-};
+};		
 
 typedef ::std::vector< SignatureInformation > SignatureInformations;
 
diff --git a/xmlsecurity/inc/xmlsecurity/stbcontrl.hxx b/xmlsecurity/inc/xmlsecurity/stbcontrl.hxx
index 1afc073eac9f..8a3be384e394 100644
--- a/xmlsecurity/inc/xmlsecurity/stbcontrl.hxx
+++ b/xmlsecurity/inc/xmlsecurity/stbcontrl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 XmlSecStatusBarControl : public SfxStatusBarControl
 private:
     struct XmlSecStatusBarControl_Impl;
 
-    XmlSecStatusBarControl_Impl*        mpImpl;
+    XmlSecStatusBarControl_Impl*		mpImpl;
 
 public:
     SFX_DECL_STATUSBAR_CONTROL();
@@ -49,9 +49,9 @@ public:
     XmlSecStatusBarControl( USHORT _nId, StatusBar& _rStb, SfxBindings& _rBind );
     ~XmlSecStatusBarControl();
 
-    virtual void    StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
-    virtual void    Paint( const UserDrawEvent& rEvt );
-    virtual void    Command( const CommandEvent& rCEvt );
+    virtual void	StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void	Paint( const UserDrawEvent& rEvt );
+    virtual void	Command( const CommandEvent& rCEvt );
 };
 
 #endif
diff --git a/xmlsecurity/inc/xmlsecurity/warnings.hxx b/xmlsecurity/inc/xmlsecurity/warnings.hxx
index 8ac38118f4c0..b9bf69dd1746 100644
--- a/xmlsecurity/inc/xmlsecurity/warnings.hxx
+++ b/xmlsecurity/inc/xmlsecurity/warnings.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,27 +58,27 @@ private:
     // XSecurityEnvironment is needed for building the certification path
     cssu::Reference< dcss::xml::crypto::XSecurityEnvironment > mxSecurityEnvironment;
 
-//  cssu::Sequence< cssu::Reference< dcss::security::XCertificate > > maCerts;
+//	cssu::Sequence< cssu::Reference< dcss::security::XCertificate > > maCerts;
     cssu::Reference< dcss::security::XCertificate > mxCert;
 
-//  FixedImage          maQuestionMarkFI;
-    FixedInfo           maDocNameFI;
-    FixedInfo           maDescr1aFI;
-    FixedInfo           maDescr1bFI;
-    FixedInfo           maSignsFI;
-    PushButton          maViewSignsBtn;
-    FixedInfo           maDescr2FI;
-    CheckBox            maAlwaysTrustCB;
-    FixedLine           maBottomSepFL;
-    PushButton          maEnableBtn;
-    CancelButton        maDisableBtn;
-    HelpButton          maHelpBtn;
+//	FixedImage			maQuestionMarkFI;
+    FixedInfo			maDocNameFI;
+    FixedInfo			maDescr1aFI;
+    FixedInfo			maDescr1bFI;
+    FixedInfo			maSignsFI;
+    PushButton			maViewSignsBtn;
+    FixedInfo			maDescr2FI;
+    CheckBox			maAlwaysTrustCB;
+    FixedLine			maBottomSepFL;
+    PushButton			maEnableBtn;
+    CancelButton		maDisableBtn;
+    HelpButton			maHelpBtn;
 
-    const bool          mbSignedMode;           // modus of dialog (signed / unsigned macros)
+    const bool			mbSignedMode;			// modus of dialog (signed / unsigned macros)
 
-    DECL_LINK(          ViewSignsBtnHdl, void* );
-    DECL_LINK(          EnableBtnHdl, void* );
-//  DECL_LINK(          DisableBtnHdl, void* );
+    DECL_LINK(			ViewSignsBtnHdl, void* );
+    DECL_LINK(			EnableBtnHdl, void* );
+//	DECL_LINK(			DisableBtnHdl, void* );
 
 public:
     MacroWarning( Window* pParent, cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment, cssu::Reference< dcss::security::XCertificate >& _rxCert );
diff --git a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
index 9e416fe37d0f..7401f23a73ac 100644
--- a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace embed {
 
 struct XMLSignatureCreationResult
 {
-    sal_Int32 nSecurityId;
+    sal_Int32 nSecurityId; 
     com::sun::star::xml::crypto::SecurityOperationStatus nSignatureCreationResult;
 
     XMLSignatureCreationResult( sal_Int32 nId, com::sun::star::xml::crypto::SecurityOperationStatus nResult )
@@ -75,7 +75,7 @@ struct XMLSignatureCreationResult
 
 struct XMLSignatureVerifyResult
 {
-    sal_Int32 nSecurityId;
+    sal_Int32 nSecurityId; 
     com::sun::star::xml::crypto::SecurityOperationStatus nSignatureVerifyResult;
 
     XMLSignatureVerifyResult( sal_Int32 nId, com::sun::star::xml::crypto::SecurityOperationStatus nResult )
@@ -100,7 +100,7 @@ typedef ::std::vector<XMLSignatureVerifyResult> XMLSignatureVerifyResults;
  2. help to listen signature creation result;
  3. help to listen signature verify result;
  4. help to indicate which signature to verify.
-
+ 
  **********************************************************/
 
 class XMLSignatureHelper
@@ -184,19 +184,19 @@ public:
         for finding the certificate apparently use memcmp - hence they fail to find the
         certificate.
      */
-    void SetX509Certificate(sal_Int32 nSecurityId, const rtl::OUString& ouX509IssuerName,
+    void SetX509Certificate(sal_Int32 nSecurityId, const rtl::OUString& ouX509IssuerName, 
         const rtl::OUString& ouX509SerialNumber, const rtl::OUString& ouX509Cert);
-
-    void SetX509Certificate(sal_Int32 nSecurityId, sal_Int32 nSecurityEnvironmentIndex,
-        const rtl::OUString& ouX509IssuerName,  const rtl::OUString& ouX509SerialNumber,
+     
+    void SetX509Certificate(sal_Int32 nSecurityId, sal_Int32 nSecurityEnvironmentIndex,	
+        const rtl::OUString& ouX509IssuerName,	const rtl::OUString& ouX509SerialNumber,
         const rtl::OUString& ouX509Cert);
-    void        SetDateTime( sal_Int32 nSecurityId, const Date& rDate, const Time& rTime );
+    void	    SetDateTime( sal_Int32 nSecurityId, const Date& rDate, const Time& rTime );
 
     void        AddForSigning( sal_Int32 securityId, const rtl::OUString& uri, const rtl::OUString& objectURL, sal_Bool bBinary );
     bool        CreateAndWriteSignature( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xDocumentHandler );
     bool        CreateAndWriteSignature( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xOutputStream );
     bool        ReadAndVerifySignature( const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& xInputStream );
-
+    
     // MT: ??? I think only for adding/removing, not for new signatures...
     // MM: Yes, but if you want to insert a new signature into an existing signature file, those function
     //     will be very usefull, see Mission 3 in the new "multisigdemo" program   :-)
diff --git a/xmlsecurity/source/component/certificatecontainer.cxx b/xmlsecurity/source/component/certificatecontainer.cxx
index 7759ad731686..a7a41601b66b 100644
--- a/xmlsecurity/source/component/certificatecontainer.cxx
+++ b/xmlsecurity/source/component/certificatecontainer.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 #include "precompiled_xmlsecurity.hxx"
 #include <certificatecontainer.hxx>
-
+ 
 #include <sal/config.h>
 
 using namespace ::com::sun::star::uno;
 
 
-sal_Bool
+sal_Bool 
 CertificateContainer::searchMap( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name, Map &_certMap )
 {
     Map::iterator p = _certMap.find(url);
@@ -44,7 +44,7 @@ CertificateContainer::searchMap( const ::rtl::OUString & url, const ::rtl::OUStr
     while( p != _certMap.end() )
     {
         ret = (sal_Bool) (*p).second.equals(certificate_name);
-        if( ret )
+        if( ret ) 
                     break;
         p++;
     }
@@ -53,7 +53,7 @@ CertificateContainer::searchMap( const ::rtl::OUString & url, const ::rtl::OUStr
 }
 // -------------------------------------------------------------------
 
-sal_Bool
+sal_Bool 
 CertificateContainer::isTemporaryCertificate ( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name )
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -62,7 +62,7 @@ CertificateContainer::isTemporaryCertificate ( const ::rtl::OUString & url, cons
 
 // -------------------------------------------------------------------
 
-sal_Bool
+sal_Bool 
 CertificateContainer::isCertificateTrust ( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name )
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -70,21 +70,21 @@ CertificateContainer::isCertificateTrust ( const ::rtl::OUString & url, const ::
 }
 
 // -------------------------------------------------------------------
-sal_Bool
+sal_Bool 
 CertificateContainer::addCertificate( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name, ::sal_Bool trust )
     throw(::com::sun::star::uno::RuntimeException)
 {
     certMap.insert( Map::value_type( url, certificate_name ) );
-
+        
         //remember that the cert is trusted
         if (trust)
             certTrustMap.insert( Map::value_type( url, certificate_name ) );
-
+        
         return true;
 }
 
 //-------------------------------------------------------------------------
-::security::CertificateContainerStatus
+::security::CertificateContainerStatus 
 CertificateContainer::hasCertificate( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException)
 {
     if ( isTemporaryCertificate( url, certificate_name ) )
@@ -100,8 +100,8 @@ CertificateContainer::hasCertificate( const ::rtl::OUString & url, const ::rtl::
 }
 //-------------------------------------------------------------------------
 
-::rtl::OUString SAL_CALL
-CertificateContainer::getImplementationName( )
+::rtl::OUString SAL_CALL 
+CertificateContainer::getImplementationName( ) 
     throw(::com::sun::star::uno::RuntimeException)
 {
     return impl_getStaticImplementationName();
@@ -109,8 +109,8 @@ CertificateContainer::getImplementationName( )
 
 //-------------------------------------------------------------------------
 
-sal_Bool SAL_CALL
-CertificateContainer::supportsService( const ::rtl::OUString& ServiceName )
+sal_Bool SAL_CALL 
+CertificateContainer::supportsService( const ::rtl::OUString& ServiceName ) 
     throw(::com::sun::star::uno::RuntimeException)
 {
     if ( ServiceName.compareToAscii("com.sun.star.security.CertificateContainer") == 0 )
@@ -121,8 +121,8 @@ CertificateContainer::supportsService( const ::rtl::OUString& ServiceName )
 
 //-------------------------------------------------------------------------
 
-Sequence< ::rtl::OUString > SAL_CALL
-CertificateContainer::getSupportedServiceNames(  )
+Sequence< ::rtl::OUString > SAL_CALL 
+CertificateContainer::getSupportedServiceNames(  ) 
     throw(::com::sun::star::uno::RuntimeException)
 {
     return impl_getStaticSupportedServiceNames();
@@ -130,8 +130,8 @@ CertificateContainer::getSupportedServiceNames(  )
 
 //-------------------------------------------------------------------------
 
-Sequence< ::rtl::OUString > SAL_CALL
-CertificateContainer::impl_getStaticSupportedServiceNames(  )
+Sequence< ::rtl::OUString > SAL_CALL 
+CertificateContainer::impl_getStaticSupportedServiceNames(  ) 
     throw(::com::sun::star::uno::RuntimeException)
 {
     Sequence< ::rtl::OUString > aRet(1);
@@ -141,8 +141,8 @@ CertificateContainer::impl_getStaticSupportedServiceNames(  )
 
 //-------------------------------------------------------------------------
 
-::rtl::OUString SAL_CALL
-CertificateContainer::impl_getStaticImplementationName()
+::rtl::OUString SAL_CALL 
+CertificateContainer::impl_getStaticImplementationName() 
     throw(::com::sun::star::uno::RuntimeException)
 {
     return ::rtl::OUString::createFromAscii("com.sun.star.security.CertificateContainer");
@@ -150,7 +150,7 @@ CertificateContainer::impl_getStaticImplementationName()
 
 //-------------------------------------------------------------------------
 
-Reference< XInterface > SAL_CALL CertificateContainer::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager )
+Reference< XInterface > SAL_CALL CertificateContainer::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager ) 
     throw( RuntimeException )
 {
     return Reference< XInterface >( *new CertificateContainer( xServiceManager ) );
@@ -158,16 +158,16 @@ Reference< XInterface > SAL_CALL CertificateContainer::impl_createInstance( cons
 
 //-------------------------------------------------------------------------
 
-Reference< XSingleServiceFactory > SAL_CALL
-CertificateContainer::impl_createFactory( const Reference< XMultiServiceFactory >& ServiceManager )
+Reference< XSingleServiceFactory > SAL_CALL 
+CertificateContainer::impl_createFactory( const Reference< XMultiServiceFactory >& ServiceManager ) 
     throw(RuntimeException)
 {
-    Reference< XSingleServiceFactory > xReturn( ::cppu::createOneInstanceFactory( ServiceManager,
+    Reference< XSingleServiceFactory > xReturn( ::cppu::createOneInstanceFactory( ServiceManager, 
         CertificateContainer::impl_getStaticImplementationName(),
         CertificateContainer::impl_createInstance,
         CertificateContainer::impl_getStaticSupportedServiceNames()));
 
-    return xReturn;
+    return xReturn;		
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/component/certificatecontainer.hxx b/xmlsecurity/source/component/certificatecontainer.hxx
index abea11bf61f0..0a0c88c6285d 100644
--- a/xmlsecurity/source/component/certificatecontainer.hxx
+++ b/xmlsecurity/source/component/certificatecontainer.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,43 +51,43 @@ using namespace ::com::sun::star::lang;
 class CertificateContainer : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::security::XCertificateContainer >
 {
     private:
-        typedef std::map< ::rtl::OUString, ::rtl::OUString > Map;
+        typedef std::map< ::rtl::OUString, ::rtl::OUString > Map;		
         Map certMap;
         Map certTrustMap;
-
+        
         ::sal_Bool SAL_CALL searchMap( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name, Map &_certMap  );
         virtual ::sal_Bool SAL_CALL isTemporaryCertificate( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException);
         virtual ::sal_Bool SAL_CALL isCertificateTrust( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException);
-
+        
     public:
-
+    
         CertificateContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ) {};
         virtual ~CertificateContainer(){};
-
+        
         virtual ::sal_Bool SAL_CALL addCertificate( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name, ::sal_Bool trust ) throw(::com::sun::star::uno::RuntimeException);
-        virtual ::security::CertificateContainerStatus SAL_CALL hasCertificate( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException);
+        virtual ::security::CertificateContainerStatus SAL_CALL hasCertificate( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException);        
         // provide factory
-    static ::rtl::OUString SAL_CALL
+    static ::rtl::OUString SAL_CALL 
                                         impl_getStaticImplementationName( ) throw(::com::sun::star::uno::RuntimeException);
-
+        
     static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
                     impl_getStaticSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException);
-
+        
     static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL
                     impl_createFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ServiceManager ) throw(::com::sun::star::uno::RuntimeException);
-
+        
     static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
                     impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) throw( ::com::sun::star::uno::RuntimeException );
-
+    
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL
+    virtual ::rtl::OUString	SAL_CALL	
                                         getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException);
-        virtual ::sal_Bool SAL_CALL
+        virtual ::sal_Bool SAL_CALL 
                                         supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
 
     virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
                                         getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException);
-
+ 
 };
 
 
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index f5930feb7308..ba0d11d00ced 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -441,7 +441,7 @@ void DocumentDigitalSignatures::showCertificate(
 
     //warning free code
     //if ( aLocObj.GetProtocol() == INET_PROT_FILE && ( pBroker = ::ucbhelper::ContentBroker::get() ) )
-    //  xContentProvider = pBroker->getContentProviderInterface();
+    //	xContentProvider = pBroker->getContentProviderInterface();
     if ( aLocObj.GetProtocol() == INET_PROT_FILE)
     {
         pBroker = ::ucbhelper::ContentBroker::get();
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.hxx b/xmlsecurity/source/component/documentdigitalsignatures.hxx
index 3525370d10b5..204f53cf7f67 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.hxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <xmlsecurity/documentsignaturehelper.hxx>
 
-namespace com { namespace  sun { namespace star {
-
+namespace com { namespace  sun { namespace star { 
+    
     namespace uno {
         class XComponentContext;
     }
 }}}
 
-class DocumentDigitalSignatures : public cppu::WeakImplHelper2
-<
+class DocumentDigitalSignatures : public cppu::WeakImplHelper2 
+< 
     com::sun::star::security::XDocumentDigitalSignatures,
     com::sun::star::lang::XInitialization
 >
@@ -57,8 +57,8 @@ private:
     //The number of arguments which were passed in XInitialization::initialize
     int m_nArgumentsCount;
     //Indicates if the document already contains a document signature
-    bool m_bHasDocumentSignature;
-
+    bool m_bHasDocumentSignature; 
+    
     sal_Bool ImplViewSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rxStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xSignStream, DocumentSignatureMode eMode, bool bReadOnly ) throw (::com::sun::star::uno::RuntimeException);
     sal_Bool ImplViewSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rxStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignStream, DocumentSignatureMode eMode, bool bReadOnly ) throw (::com::sun::star::uno::RuntimeException);
     com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > ImplVerifySignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rxStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignStream, DocumentSignatureMode eMode ) throw (::com::sun::star::uno::RuntimeException);
@@ -67,11 +67,11 @@ public:
     DocumentDigitalSignatures( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext>& rxCtx );
 
     // for service registration...
-    static ::rtl::OUString GetImplementationName() throw (com::sun::star::uno::RuntimeException);
-    static ::com::sun::star::uno::Sequence < ::rtl::OUString > GetSupportedServiceNames() throw (com::sun::star::uno::RuntimeException);
-
+    static ::rtl::OUString GetImplementationName() throw (com::sun::star::uno::RuntimeException); 
+    static ::com::sun::star::uno::Sequence < ::rtl::OUString > GetSupportedServiceNames() throw (com::sun::star::uno::RuntimeException);	
+    
     //XInitialization
-    void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
+    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);
 
     // XDocumentDigitalSignatures
@@ -96,7 +96,7 @@ public:
 
 };
 
-com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL DocumentDigitalSignatures_CreateInstance(
+com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL DocumentDigitalSignatures_CreateInstance( 
     const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rCtx) throw ( com::sun::star::uno::Exception );
 
 #endif // _XMLSECURITY_DOCUMENTDIGITALSIGNATURES_HXX
diff --git a/xmlsecurity/source/component/registerservices.cxx b/xmlsecurity/source/component/registerservices.cxx
index c9f7475abb83..36bddc967aa3 100644
--- a/xmlsecurity/source/component/registerservices.cxx
+++ b/xmlsecurity/source/component/registerservices.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistr
                     // SERVICE DocumentDigitalSignatures
                     nPos = 0;
                     uno::Reference< registry::XRegistryKey > xNewKey(
-                    reinterpret_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( DocumentDigitalSignatures::GetImplementationName() ) );
-
+                    reinterpret_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( DocumentDigitalSignatures::GetImplementationName() ) ); 
+                    
                     xNewKey = xNewKey->createKey( rtl::OUString::createFromAscii( "/UNO/SERVICES" ) );
-
+            
                     const uno::Sequence< rtl::OUString >& rSNL = DocumentDigitalSignatures::GetSupportedServiceNames();
                     const rtl::OUString* pArray = rSNL.getConstArray();
                     for ( nPos = rSNL.getLength(); nPos--; )
@@ -69,16 +69,16 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistr
                     // SERVICE CertificateContainer
                     nPos = 0;
                     uno::Reference< registry::XRegistryKey > xNewKeyCertificateContainer(
-                    reinterpret_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( CertificateContainer::impl_getStaticImplementationName() ) );
+                    reinterpret_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( CertificateContainer::impl_getStaticImplementationName() ) ); 
                     xNewKeyCertificateContainer = xNewKeyCertificateContainer->createKey( rtl::OUString::createFromAscii( "/UNO/SERVICES" ) );
-
+            
                     const uno::Sequence< rtl::OUString >& rSNLCertificateContainer = CertificateContainer::impl_getStaticSupportedServiceNames();
                     const rtl::OUString* pArrayCertificateContainer = rSNLCertificateContainer.getConstArray();
                     for ( nPos = rSNLCertificateContainer.getLength(); nPos--; )
-                        xNewKeyCertificateContainer->createKey( pArrayCertificateContainer[nPos] );
-
+                        xNewKeyCertificateContainer->createKey( pArrayCertificateContainer[nPos] );    
+            
                     //-----------------------------
-
+                    
                     return sal_True;
         }
         catch (registry::InvalidRegistryException &)
@@ -93,10 +93,10 @@ void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pService
 {
     void* pRet = 0;
     uno::Reference< XInterface > xFactory;
-
+    
     //Decryptor
     rtl::OUString implName = rtl::OUString::createFromAscii( pImplName );
-
+        
     if ( pServiceManager && implName.equals( DocumentDigitalSignatures::GetImplementationName() ) )
     {
         // DocumentDigitalSignatures
@@ -110,11 +110,11 @@ void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pService
         // CertificateContainer
         xFactory = cppu::createOneInstanceFactory(
             reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ),
-            rtl::OUString::createFromAscii( pImplName ),
-            CertificateContainer::impl_createInstance,
+            rtl::OUString::createFromAscii( pImplName ), 
+            CertificateContainer::impl_createInstance, 
             CertificateContainer::impl_getStaticSupportedServiceNames() );
     }
-
+   
      if (xFactory.is())
     {
         xFactory->acquire();
diff --git a/xmlsecurity/source/component/warnbox.src b/xmlsecurity/source/component/warnbox.src
index dd55cad7558b..814952d82010 100644
--- a/xmlsecurity/source/component/warnbox.src
+++ b/xmlsecurity/source/component/warnbox.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx
index d07f5071e618..fa82427d2fe1 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 /* HACK: disable some warnings for MS-C */
 #ifdef _MSC_VER
-#pragma warning (disable : 4355)    // 4355: this used in initializer-list
+#pragma warning (disable : 4355)	// 4355: this used in initializer-list
 #endif
 
 using namespace ::com::sun::star;
 
-#define INVAL_SEL       0xFFFF
+#define INVAL_SEL		0xFFFF
 
 USHORT CertificateChooser::GetSelectedEntryPos( void ) const
 {
-    USHORT  nSel = INVAL_SEL;
+    USHORT	nSel = INVAL_SEL;
 
     SvLBoxEntry* pSel = maCertLB.FirstSelected();
     if( pSel )
@@ -65,15 +65,15 @@ USHORT CertificateChooser::GetSelectedEntryPos( void ) const
 }
 
 CertificateChooser::CertificateChooser( Window* _pParent, uno::Reference< uno::XComponentContext>& _rxCtx, uno::Reference< dcss::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment, const SignatureInformations& _rCertsToIgnore )
-    :ModalDialog    ( _pParent, XMLSEC_RES( RID_XMLSECDLG_CERTCHOOSER ) )
+    :ModalDialog	( _pParent, XMLSEC_RES( RID_XMLSECDLG_CERTCHOOSER ) )
     ,maCertsToIgnore( _rCertsToIgnore )
-    ,maHintFT       ( this, XMLSEC_RES( FT_HINT_SELECT ) )
-    ,maCertLB       ( this, XMLSEC_RES( LB_SIGNATURES ) )
-    ,maViewBtn      ( this, XMLSEC_RES( BTN_VIEWCERT ) )
-    ,maBottomSepFL  ( this, XMLSEC_RES( FL_BOTTOM_SEP ) )
-    ,maOKBtn        ( this, XMLSEC_RES( BTN_OK ) )
-    ,maCancelBtn    ( this, XMLSEC_RES( BTN_CANCEL ) )
-    ,maHelpBtn      ( this, XMLSEC_RES( BTN_HELP ) )
+    ,maHintFT		( this, XMLSEC_RES( FT_HINT_SELECT ) )
+    ,maCertLB		( this, XMLSEC_RES( LB_SIGNATURES ) )
+    ,maViewBtn		( this, XMLSEC_RES( BTN_VIEWCERT ) )
+    ,maBottomSepFL	( this, XMLSEC_RES( FL_BOTTOM_SEP ) )
+    ,maOKBtn		( this, XMLSEC_RES( BTN_OK ) )
+    ,maCancelBtn	( this, XMLSEC_RES( BTN_CANCEL ) )
+    ,maHelpBtn		( this, XMLSEC_RES( BTN_HELP ) )
 {
     static long nTabs[] = { 3, 0, 30*CS_LB_WIDTH/100, 60*CS_LB_WIDTH/100 };
     maCertLB.SetTabs( &nTabs[0] );
@@ -100,7 +100,7 @@ short CertificateChooser::Execute()
 {
     // #i48432#
     // We can't check for personal certificates before raising this dialog,
-    // because the mozilla implementation throws a NoPassword exception,
+    // because the mozilla implementation throws a NoPassword exception, 
     // if the user pressed cancel, and also if the database does not exist!
     // But in the later case, the is no password query, and the user is confused
     // that nothing happens when pressing "Add..." in the SignatureDialog.
@@ -201,7 +201,7 @@ void CertificateChooser::ImplInitialize()
 uno::Reference< dcss::security::XCertificate > CertificateChooser::GetSelectedCertificate()
 {
     uno::Reference< dcss::security::XCertificate > xCert;
-    USHORT  nSelected = GetSelectedEntryPos();
+    USHORT	nSelected = GetSelectedEntryPos();
     if ( nSelected < maCerts.getLength() )
         xCert = maCerts[ nSelected ];
     return xCert;
diff --git a/xmlsecurity/source/dialogs/certificatechooser.src b/xmlsecurity/source/dialogs/certificatechooser.src
index 13ce734e46df..9fa8e5ec78b6 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.src
+++ b/xmlsecurity/source/dialogs/certificatechooser.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index 7980b8046cbf..10e1487b9978 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 /* HACK: disable some warnings for MS-C */
 #ifdef _MSC_VER
-#pragma warning (disable : 4355)    // 4355: this used in initializer-list
+#pragma warning (disable : 4355)	// 4355: this used in initializer-list
 #endif
 
 using namespace ::com::sun::star;
@@ -72,10 +72,10 @@ CertificateViewer::CertificateViewer(
         Window* _pParent,
         const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment,
         const cssu::Reference< dcss::security::XCertificate >& _rXCert, BOOL bCheckForPrivateKey )
-    :TabDialog      ( _pParent, XMLSEC_RES( RID_XMLSECDLG_CERTVIEWER ) )
-    ,maTabCtrl      ( this, XMLSEC_RES( 1 ) )
-    ,maOkBtn        ( this, XMLSEC_RES( BTN_OK ) )
-    ,maHelpBtn      ( this, XMLSEC_RES( BTN_HELP ) )
+    :TabDialog		( _pParent, XMLSEC_RES( RID_XMLSECDLG_CERTVIEWER ) )
+    ,maTabCtrl		( this, XMLSEC_RES( 1 ) )
+    ,maOkBtn		( this, XMLSEC_RES( BTN_OK ) )
+    ,maHelpBtn		( this, XMLSEC_RES( BTN_HELP ) )
 {
     FreeResource();
 
@@ -98,27 +98,27 @@ CertificateViewer::~CertificateViewer()
 }
 
 CertificateViewerTP::CertificateViewerTP( Window* _pParent, const ResId& _rResId, CertificateViewer* _pDlg )
-    :TabPage        ( _pParent, _rResId )
-    ,mpDlg          ( _pDlg )
+    :TabPage		( _pParent, _rResId )
+    ,mpDlg			( _pDlg )
 {
 }
 
 
 CertificateViewerGeneralTP::CertificateViewerGeneralTP( Window* _pParent, CertificateViewer* _pDlg )
-    :CertificateViewerTP    ( _pParent, XMLSEC_RES( RID_XMLSECTP_GENERAL ), _pDlg )
-    ,maFrameWin             ( this, XMLSEC_RES( WIN_FRAME ) )
-    ,maCertImg              ( this, XMLSEC_RES( IMG_CERT ) )
-    ,maCertInfoFI           ( this, XMLSEC_RES( FI_CERTINFO ) )
-    ,maSep1FL               ( this, XMLSEC_RES( FL_SEP1 ) )
-    ,maHintNotTrustedFI     ( this, XMLSEC_RES( FI_HINTNOTTRUST ) )
-    ,maSep2FL               ( this, XMLSEC_RES( FL_SEP2 ) )
-    ,maIssuedToLabelFI      ( this, XMLSEC_RES( FI_ISSTOLABEL ) )
-    ,maIssuedToFI           ( this, XMLSEC_RES( FI_ISSTO ) )
-    ,maIssuedByLabelFI      ( this, XMLSEC_RES( FI_ISSBYLABEL ) )
-    ,maIssuedByFI           ( this, XMLSEC_RES( FI_ISSBY ) )
+    :CertificateViewerTP	( _pParent, XMLSEC_RES( RID_XMLSECTP_GENERAL ), _pDlg )
+    ,maFrameWin				( this, XMLSEC_RES( WIN_FRAME ) )
+    ,maCertImg				( this, XMLSEC_RES( IMG_CERT ) )
+    ,maCertInfoFI			( this, XMLSEC_RES( FI_CERTINFO ) )
+    ,maSep1FL				( this, XMLSEC_RES( FL_SEP1 ) )
+    ,maHintNotTrustedFI		( this, XMLSEC_RES( FI_HINTNOTTRUST ) )
+    ,maSep2FL				( this, XMLSEC_RES( FL_SEP2 ) )
+    ,maIssuedToLabelFI		( this, XMLSEC_RES( FI_ISSTOLABEL ) )
+    ,maIssuedToFI			( this, XMLSEC_RES( FI_ISSTO ) )
+    ,maIssuedByLabelFI		( this, XMLSEC_RES( FI_ISSBYLABEL ) )
+    ,maIssuedByFI			( this, XMLSEC_RES( FI_ISSBY ) )
     ,maValidDateFI          ( this, XMLSEC_RES( FI_VALIDDATE ) )
-    ,maKeyImg               ( this, XMLSEC_RES( IMG_KEY ) )
-    ,maHintCorrespPrivKeyFI ( this, XMLSEC_RES( FI_CORRPRIVKEY ) )
+    ,maKeyImg				( this, XMLSEC_RES( IMG_KEY ) )
+    ,maHintCorrespPrivKeyFI	( this, XMLSEC_RES( FI_CORRPRIVKEY ) )
 {
     if ( GetSettings().GetStyleSettings().GetHighContrastMode() )
         maKeyImg.SetImage( Image( XMLSEC_RES( IMG_KEY_HC ) ) );
@@ -157,7 +157,7 @@ CertificateViewerGeneralTP::CertificateViewerGeneralTP( Window* _pParent, Certif
     maHintCorrespPrivKeyFI.SetBackground( aBack );
 
     // make some bold
-    Font    aFnt( maCertInfoFI.GetFont() );
+    Font	aFnt( maCertInfoFI.GetFont() );
     aFnt.SetWeight( WEIGHT_BOLD );
     maCertInfoFI.SetFont( aFnt );
     maHintNotTrustedFI.SetFont( aFnt );
@@ -166,7 +166,7 @@ CertificateViewerGeneralTP::CertificateViewerGeneralTP( Window* _pParent, Certif
     maValidDateFI.SetFont( aFnt );
 
     // insert data
-    cssu::Reference< dcss::security::XCertificate > xCert = mpDlg->mxCert;
+    cssu::Reference< dcss::security::XCertificate >	xCert = mpDlg->mxCert;
 
     maIssuedToFI.SetText( XmlSec::GetContentPart( xCert->getSubjectName() ) );
     maIssuedByFI.SetText( XmlSec::GetContentPart( xCert->getIssuerName() ) );
@@ -232,15 +232,15 @@ void CertificateViewerGeneralTP::ActivatePage()
 
 struct Details_UserDatat
 {
-    String          maTxt;
-    bool            mbFixedWidthFont;
+    String			maTxt;
+    bool			mbFixedWidthFont;
 
-    inline          Details_UserDatat( const String& _rTxt, bool _bFixedWidthFont );
+    inline			Details_UserDatat( const String& _rTxt, bool _bFixedWidthFont );
 };
 
 inline Details_UserDatat::Details_UserDatat( const String& _rTxt, bool _bFixedWidthFont )
-    :maTxt              ( _rTxt )
-    ,mbFixedWidthFont   ( _bFixedWidthFont )
+    :maTxt				( _rTxt )
+    ,mbFixedWidthFont	( _bFixedWidthFont )
 {
 }
 
@@ -248,8 +248,8 @@ inline Details_UserDatat::Details_UserDatat( const String& _rTxt, bool _bFixedWi
 void CertificateViewerDetailsTP::Clear( void )
 {
     maElementML.SetText( String() );
-    ULONG           i = 0;
-    SvLBoxEntry*    pEntry = maElementsLB.GetEntry( i );
+    ULONG			i = 0;
+    SvLBoxEntry*	pEntry = maElementsLB.GetEntry( i );
     while( pEntry )
     {
         delete ( Details_UserDatat* ) pEntry->GetUserData();
@@ -263,17 +263,17 @@ void CertificateViewerDetailsTP::Clear( void )
 void CertificateViewerDetailsTP::InsertElement( const String& _rField, const String& _rValue,
                                                 const String& _rDetails, bool _bFixedWidthFont )
 {
-    SvLBoxEntry*    pEntry = maElementsLB.InsertEntry( _rField );
+    SvLBoxEntry*	pEntry = maElementsLB.InsertEntry( _rField );
     maElementsLB.SetEntryText( _rValue, pEntry, 1 );
     pEntry->SetUserData( ( void* ) new Details_UserDatat( _rDetails, _bFixedWidthFont ) );
 }
 
 CertificateViewerDetailsTP::CertificateViewerDetailsTP( Window* _pParent, CertificateViewer* _pDlg )
-    :CertificateViewerTP    ( _pParent, XMLSEC_RES( RID_XMLSECTP_DETAILS ), _pDlg  )
-    ,maElementsLB           ( this, XMLSEC_RES( LB_ELEMENTS ) )
-    ,maElementML            ( this, XMLSEC_RES( ML_ELEMENT ) )
-    ,maStdFont              ( maElementML.GetControlFont() )
-    ,maFixedWidthFont       ( OutputDevice::GetDefaultFont( DEFAULTFONT_UI_FIXED, LANGUAGE_DONTKNOW, DEFAULTFONT_FLAGS_ONLYONE, this ) )
+    :CertificateViewerTP	( _pParent, XMLSEC_RES( RID_XMLSECTP_DETAILS ), _pDlg  )
+    ,maElementsLB			( this, XMLSEC_RES( LB_ELEMENTS ) )
+    ,maElementML			( this, XMLSEC_RES( ML_ELEMENT ) )
+    ,maStdFont				( maElementML.GetControlFont() )
+    ,maFixedWidthFont		( OutputDevice::GetDefaultFont( DEFAULTFONT_UI_FIXED, LANGUAGE_DONTKNOW, DEFAULTFONT_FLAGS_ONLYONE, this ) )
 {
     WinBits nStyle = maElementsLB.GetStyle();
     nStyle &= ~WB_HSCROLL;
@@ -281,30 +281,30 @@ CertificateViewerDetailsTP::CertificateViewerDetailsTP( Window* _pParent, Certif
 
     maFixedWidthFont.SetHeight( maStdFont.GetHeight() );
 
-    static long nTabs[] = { 2, 0, 30*CS_LB_WIDTH/100 };
+    static long	nTabs[] = { 2, 0, 30*CS_LB_WIDTH/100 };
     maElementsLB.SetTabs( &nTabs[ 0 ] );
     maElementsLB.InsertHeaderEntry( String( XMLSEC_RES( STR_HEADERBAR ) ) );
 
     // fill list box
     Reference< security::XCertificate > xCert = mpDlg->mxCert;
-    UINT16                  nLineBreak = 16;
-    const char*             pHexSep = " ";
-    String                  aLBEntry;
-    String                  aDetails;
+    UINT16					nLineBreak = 16;
+    const char*				pHexSep = " ";
+    String					aLBEntry;
+    String					aDetails;
     // --> PB 2004-10-11 #i35107# - 0 == "V1", 1 == "V2", ..., n = "V(n+1)"
     aLBEntry = String::CreateFromAscii( "V" );
     aLBEntry += String::CreateFromInt32( xCert->getVersion() + 1 );
     // <--
     InsertElement( String( XMLSEC_RES( STR_VERSION ) ), aLBEntry, aLBEntry );
-    Sequence< sal_Int8 >    aSeq = xCert->getSerialNumber();
+    Sequence< sal_Int8 >	aSeq = xCert->getSerialNumber();
     aLBEntry = XmlSec::GetHexString( aSeq, pHexSep );
     aDetails = XmlSec::GetHexString( aSeq, pHexSep, nLineBreak );
     InsertElement( String( XMLSEC_RES( STR_SERIALNUM ) ), aLBEntry, aDetails, true );
 
-    std::pair< ::rtl::OUString, ::rtl::OUString> pairIssuer =
+    std::pair< ::rtl::OUString, ::rtl::OUString> pairIssuer = 
         XmlSec::GetDNForCertDetailsView(xCert->getIssuerName());
     aLBEntry = pairIssuer.first;
-    aDetails = pairIssuer.second;
+    aDetails = pairIssuer.second; 
     InsertElement( String( XMLSEC_RES( STR_ISSUER ) ), aLBEntry, aDetails );
     /*
     aSeq = xCert->getIssuerUniqueID();
@@ -325,7 +325,7 @@ CertificateViewerDetailsTP::CertificateViewerDetailsTP( Window* _pParent, Certif
     aLBEntry += GetSettings().GetUILocaleDataWrapper().getTime( aDateTime.GetTime() );
     InsertElement( String( XMLSEC_RES( STR_VALIDTO ) ), aLBEntry, aLBEntry );
 
-    std::pair< ::rtl::OUString, ::rtl::OUString > pairSubject =
+    std::pair< ::rtl::OUString, ::rtl::OUString > pairSubject = 
         XmlSec::GetDNForCertDetailsView(xCert->getSubjectName());
     aLBEntry = pairSubject.first;
     aDetails = pairSubject.second;
@@ -372,12 +372,12 @@ void CertificateViewerDetailsTP::ActivatePage()
 
 IMPL_LINK( CertificateViewerDetailsTP, ElementSelectHdl, void*, EMPTYARG )
 {
-    SvLBoxEntry*    pEntry = maElementsLB.FirstSelected();
-    String          aElementText;
-    bool            bFixedWidthFont;
+    SvLBoxEntry*	pEntry = maElementsLB.FirstSelected();
+    String			aElementText;
+    bool			bFixedWidthFont;
     if( pEntry )
     {
-        const Details_UserDatat*    p = ( Details_UserDatat* ) pEntry->GetUserData();
+        const Details_UserDatat*	p = ( Details_UserDatat* ) pEntry->GetUserData();
         aElementText = p->maTxt;
         bFixedWidthFont = p->mbFixedWidthFont;
     }
@@ -394,7 +394,7 @@ IMPL_LINK( CertificateViewerDetailsTP, ElementSelectHdl, void*, EMPTYARG )
 struct CertPath_UserData
 {
     cssu::Reference< dcss::security::XCertificate > mxCert;
-    String                                          maStatus;
+    String			                                maStatus;
     bool mbValid;
 
     CertPath_UserData( cssu::Reference< dcss::security::XCertificate > xCert, bool bValid):
@@ -406,12 +406,12 @@ struct CertPath_UserData
 
 
 CertificateViewerCertPathTP::CertificateViewerCertPathTP( Window* _pParent, CertificateViewer* _pDlg )
-    :CertificateViewerTP    ( _pParent, XMLSEC_RES( RID_XMLSECTP_CERTPATH ), _pDlg  )
-    ,maCertPathFT           ( this, XMLSEC_RES( FT_CERTPATH ) )
-    ,maCertPathLB           ( this, XMLSEC_RES( LB_SIGNATURES ) )
+    :CertificateViewerTP	( _pParent, XMLSEC_RES( RID_XMLSECTP_CERTPATH ), _pDlg  )
+    ,maCertPathFT			( this, XMLSEC_RES( FT_CERTPATH ) )
+    ,maCertPathLB			( this, XMLSEC_RES( LB_SIGNATURES ) )
     ,maViewCertPB           ( this, XMLSEC_RES( BTN_VIEWCERT ) )
-    ,maCertStatusFT         ( this, XMLSEC_RES( FT_CERTSTATUS ) )
-    ,maCertStatusML         ( this, XMLSEC_RES( ML_CERTSTATUS ) )
+    ,maCertStatusFT			( this, XMLSEC_RES( FT_CERTSTATUS ) )
+    ,maCertStatusML			( this, XMLSEC_RES( ML_CERTSTATUS ) )
     ,mpParent               ( _pDlg )
     ,mbFirstActivateDone    ( false )
     ,maCertImage            ( XMLSEC_RES( IMG_CERT_SMALL ) )
@@ -526,8 +526,8 @@ IMPL_LINK( CertificateViewerCertPathTP, CertSelectHdl, void*, EMPTYARG )
 void CertificateViewerCertPathTP::Clear( void )
 {
     maCertStatusML.SetText( String() );
-    ULONG           i = 0;
-    SvLBoxEntry*    pEntry = maCertPathLB.GetEntry( i );
+    ULONG			i = 0;
+    SvLBoxEntry*	pEntry = maCertPathLB.GetEntry( i );
     while( pEntry )
     {
         delete ( CertPath_UserData* ) pEntry->GetUserData();
diff --git a/xmlsecurity/source/dialogs/certificateviewer.src b/xmlsecurity/source/dialogs/certificateviewer.src
index 3a9466aeb9a8..19f90de45099 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.src
+++ b/xmlsecurity/source/dialogs/certificateviewer.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/xmlsecurity/source/dialogs/dialogs.hrc b/xmlsecurity/source/dialogs/dialogs.hrc
index b30eb9198e32..eb6fd0347e2a 100644
--- a/xmlsecurity/source/dialogs/dialogs.hrc
+++ b/xmlsecurity/source/dialogs/dialogs.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,53 +31,53 @@
 #include <svtools/controldims.hrc>
 #include <xmlsecurity/global.hrc>
 
-#define STD_MASKCOLOR                   Color{Red=0xffff;Green=0x0000;Blue=0xffff;}
+#define STD_MASKCOLOR					Color{Red=0xffff;Green=0x0000;Blue=0xffff;}
 
-#define FL_BOTTOM_SEP                   50
-#define BTN_OK                          51
-#define BTN_CANCEL                      52
-#define BTN_HELP                        53
-#define LB_SIGNATURES                   54
-#define BTN_VIEWCERT                    55
-#define STR_HEADERBAR                   56
-#define BTN_RESET                       57
+#define FL_BOTTOM_SEP					50
+#define BTN_OK							51
+#define BTN_CANCEL						52
+#define BTN_HELP						53
+#define LB_SIGNATURES					54
+#define BTN_VIEWCERT					55
+#define STR_HEADERBAR					56
+#define BTN_RESET						57
 #define STR_VALID_SIGNATURE             58
 #define STR_NO_INFO_TO_VERIFY           59
 #define STR_INVALID_SIGNATURE           60
 
 // --------- general metrics ---------
-#define DLGS_WIDTH                      287
-#define DLGS_HEIGHT                     195
+#define DLGS_WIDTH						287
+#define DLGS_HEIGHT						195
 // --------- ... for tab dialogs -----
-#define TP_WIDTH                        260
-#define TP_HEIGHT                       185
-#define RIDDER_HEIGHT                   (RSC_CD_PUSHBUTTON_HEIGHT)
-#define TD_SP_INNERBORDER_LEFT          3
-#define TD_SP_INNERBORDER_RIGHT         3
-#define TD_SP_INNERBORDER_TOP           3
-#define TD_SP_INNERBORDER_BOTTOM        3
+#define TP_WIDTH						260
+#define TP_HEIGHT						185
+#define RIDDER_HEIGHT					(RSC_CD_PUSHBUTTON_HEIGHT)
+#define TD_SP_INNERBORDER_LEFT			3
+#define TD_SP_INNERBORDER_RIGHT			3
+#define TD_SP_INNERBORDER_TOP			3
+#define TD_SP_INNERBORDER_BOTTOM		3
 #define TD_WIDTH                        (TP_WIDTH+RSC_SP_DLG_INNERBORDER_LEFT+RSC_SP_DLG_INNERBORDER_RIGHT)
-#define TD_HEIGHT                       (TP_HEIGHT+TD_SP_INNERBORDER_TOP+2*TD_SP_INNERBORDER_BOTTOM+RSC_CD_PUSHBUTTON_HEIGHT+RIDDER_HEIGHT)
-
-#define SEP_FL_SPACE_Y                  6
-#define SEP_FL_ADJ_Y(val)               (val-3)
-#define DLGS_BOTTOM_BTN_L(dlgh)         (dlgh-RSC_SP_DLG_INNERBORDER_BOTTOM)
-#define DLGS_BOTTOM_BTN_Y(dlgh)         (DLGS_BOTTOM_BTN_L(dlgh)-RSC_CD_PUSHBUTTON_HEIGHT)
-#define DLGS_BOTTOM_FL_Y(dlgh)          (DLGS_BOTTOM_BTN_Y(dlgh)-SEP_FL_SPACE_Y-5)
-#define DLGS_BOTTOM_LAST_CTRL_L(dlgh)   (DLGS_BOTTOM_BTN_Y(dlgh)-2*SEP_FL_SPACE_Y-3)
-#define DLGS_BOTTOM_HELP_X(dlgw)        (dlgw-RSC_SP_DLG_INNERBORDER_RIGHT-RSC_CD_PUSHBUTTON_WIDTH)
-#define DLGS_BOTTOM_CANCEL_X(dlgw)      (DLGS_BOTTOM_HELP_X(dlgw)-RSC_SP_CTRL_X-RSC_CD_PUSHBUTTON_WIDTH)
+#define TD_HEIGHT						(TP_HEIGHT+TD_SP_INNERBORDER_TOP+2*TD_SP_INNERBORDER_BOTTOM+RSC_CD_PUSHBUTTON_HEIGHT+RIDDER_HEIGHT)
+
+#define SEP_FL_SPACE_Y					6
+#define SEP_FL_ADJ_Y(val)				(val-3)
+#define DLGS_BOTTOM_BTN_L(dlgh)			(dlgh-RSC_SP_DLG_INNERBORDER_BOTTOM)
+#define DLGS_BOTTOM_BTN_Y(dlgh)			(DLGS_BOTTOM_BTN_L(dlgh)-RSC_CD_PUSHBUTTON_HEIGHT)
+#define DLGS_BOTTOM_FL_Y(dlgh)			(DLGS_BOTTOM_BTN_Y(dlgh)-SEP_FL_SPACE_Y-5)
+#define DLGS_BOTTOM_LAST_CTRL_L(dlgh)	(DLGS_BOTTOM_BTN_Y(dlgh)-2*SEP_FL_SPACE_Y-3)
+#define DLGS_BOTTOM_HELP_X(dlgw)		(dlgw-RSC_SP_DLG_INNERBORDER_RIGHT-RSC_CD_PUSHBUTTON_WIDTH)
+#define DLGS_BOTTOM_CANCEL_X(dlgw)		(DLGS_BOTTOM_HELP_X(dlgw)-RSC_SP_CTRL_X-RSC_CD_PUSHBUTTON_WIDTH)
 #define DLGS_BOTTOM_OK_X(dlgw)          (DLGS_BOTTOM_CANCEL_X(dlgw)-RSC_SP_CTRL_DESC_X-RSC_CD_PUSHBUTTON_WIDTH)
 
 
 // --------- dialog Digital Signatures ---------
-#define BTN_ADDCERT                     2
-#define BTN_REMOVECERT                  3
-#define FT_HINT_DOC                     4
-#define FT_HINT_BASIC                   5
-#define FT_HINT_PACK                    6
-#define IMG_STATE_VALID                 7
-#define FI_STATE_VALID                  8
+#define BTN_ADDCERT						2
+#define BTN_REMOVECERT					3
+#define FT_HINT_DOC						4
+#define FT_HINT_BASIC					5
+#define FT_HINT_PACK					6
+#define IMG_STATE_VALID					7
+#define FI_STATE_VALID					8
 #define IMG_STATE_BROKEN                9
 #define FI_STATE_BROKEN                 10
 #define IMG_STATE_NOTVALIDATED          11
@@ -87,89 +87,89 @@
 #define IMG_STATE_NOTVALIDATED_HC       15
 #define FI_STATE_OLDSIGNATURE           16
 
-//#define DS_WIDTH                      DLGS_WIDTH
-//#define DS_HEIGHT                     DLGS_HEIGHT
-#define DS_BTNWIDTH_1                   70
-#define DS_BTNSPACE_X                   RSC_SP_CTRL_X
-#define DS_WIDTH                        (RSC_SP_DLG_INNERBORDER_LEFT+RSC_SP_DLG_INNERBORDER_RIGHT+2*DS_BTNSPACE_X+3*DS_BTNWIDTH_1)
-#define DS_HEIGHT                       (DLGS_WIDTH*2/3)
-
-#define DS_COL_0                        RSC_SP_DLG_INNERBORDER_LEFT
-//#define DS_COL_MID                        (DS_WIDTH/2)
-//#define DS_COL_3                      (DS_COL_MID-(DS_BTNWIDTH_1/2))
-//#define DS_COL_4                      (DS_COL_2+DS_BTNWIDTH_1)
-//#define DS_COL_2                      (DS_COL_3-DS_BTNSPACE_X)
-//#define DS_COL_1                      (DS_COL_2-DS_BTNWIDTH_1)
-#define DS_COL_1                        DS_COL_0
-#define DS_COL_2                        (DS_COL_1+DS_BTNWIDTH_1)
-#define DS_COL_3                        (DS_COL_2+DS_BTNSPACE_X)
-#define DS_COL_4                        (DS_COL_3+DS_BTNWIDTH_1)
-#define DS_COL_5                        (DS_COL_4+DS_BTNSPACE_X)
-//#define   DS_COL_6                        (DS_COL_5+DS_BTNWIDTH_1)
-#define DS_COL_7                        (DS_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT)
-#define DS_COL_6                        DS_COL_7
-
-#define DS_ROW_0                        RSC_SP_DLG_INNERBORDER_TOP
-#define DS_ROW_1                        (DS_ROW_0+RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_X)
-#define DS_ROW_7                        DLGS_BOTTOM_BTN_L(DS_HEIGHT)
-#define DS_ROW_6                        DLGS_BOTTOM_BTN_Y(DS_HEIGHT)
-#define DS_ROW_5                        DLGS_BOTTOM_FL_Y(DS_HEIGHT)
-#define DS_ROW_4                        DLGS_BOTTOM_LAST_CTRL_L(DS_HEIGHT)
-#define DS_ROW_3                        (DS_ROW_4-RSC_CD_PUSHBUTTON_HEIGHT)
-#define DS_ROW_2A                       (DS_ROW_3-RSC_CD_FIXEDTEXT_HEIGHT-RSC_SP_CTRL_Y)
-#define DS_ROW_2                        (DS_ROW_2A-RSC_SP_CTRL_GROUP_Y)
-
-#define DS_LB_WIDTH                     (DS_COL_7-DS_COL_0)
+//#define DS_WIDTH						DLGS_WIDTH
+//#define DS_HEIGHT						DLGS_HEIGHT
+#define DS_BTNWIDTH_1					70
+#define DS_BTNSPACE_X					RSC_SP_CTRL_X
+#define DS_WIDTH						(RSC_SP_DLG_INNERBORDER_LEFT+RSC_SP_DLG_INNERBORDER_RIGHT+2*DS_BTNSPACE_X+3*DS_BTNWIDTH_1)
+#define DS_HEIGHT						(DLGS_WIDTH*2/3)
+
+#define DS_COL_0						RSC_SP_DLG_INNERBORDER_LEFT
+//#define DS_COL_MID						(DS_WIDTH/2)
+//#define DS_COL_3						(DS_COL_MID-(DS_BTNWIDTH_1/2))
+//#define DS_COL_4						(DS_COL_2+DS_BTNWIDTH_1)
+//#define DS_COL_2						(DS_COL_3-DS_BTNSPACE_X)
+//#define DS_COL_1						(DS_COL_2-DS_BTNWIDTH_1)
+#define DS_COL_1						DS_COL_0
+#define DS_COL_2						(DS_COL_1+DS_BTNWIDTH_1)
+#define DS_COL_3						(DS_COL_2+DS_BTNSPACE_X)
+#define DS_COL_4						(DS_COL_3+DS_BTNWIDTH_1)
+#define DS_COL_5						(DS_COL_4+DS_BTNSPACE_X)
+//#define	DS_COL_6						(DS_COL_5+DS_BTNWIDTH_1)
+#define DS_COL_7						(DS_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT)
+#define	DS_COL_6						DS_COL_7
+
+#define DS_ROW_0						RSC_SP_DLG_INNERBORDER_TOP
+#define DS_ROW_1						(DS_ROW_0+RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_X)
+#define DS_ROW_7						DLGS_BOTTOM_BTN_L(DS_HEIGHT)
+#define DS_ROW_6						DLGS_BOTTOM_BTN_Y(DS_HEIGHT)
+#define DS_ROW_5						DLGS_BOTTOM_FL_Y(DS_HEIGHT)
+#define DS_ROW_4						DLGS_BOTTOM_LAST_CTRL_L(DS_HEIGHT)
+#define	DS_ROW_3						(DS_ROW_4-RSC_CD_PUSHBUTTON_HEIGHT)
+#define DS_ROW_2A						(DS_ROW_3-RSC_CD_FIXEDTEXT_HEIGHT-RSC_SP_CTRL_Y)
+#define DS_ROW_2						(DS_ROW_2A-RSC_SP_CTRL_GROUP_Y)
+
+#define DS_LB_WIDTH						(DS_COL_7-DS_COL_0)
 
 // --------- dialog Ceritficate chooser ---------
-#define FT_HINT_SELECT                  1
+#define FT_HINT_SELECT					1
 
-#define CS_WIDTH                        DLGS_WIDTH
-#define CS_HEIGHT                       DLGS_HEIGHT
-#define CS_BTNWIDTH_1                   DS_BTNWIDTH_1
+#define CS_WIDTH						DLGS_WIDTH
+#define CS_HEIGHT						DLGS_HEIGHT
+#define CS_BTNWIDTH_1					DS_BTNWIDTH_1
 
-#define CS_COL_0                        RSC_SP_DLG_INNERBORDER_LEFT
-#define CS_COL_2                        (CS_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT)
-#define CS_COL_1                        (CS_COL_2-CS_BTNWIDTH_1)
+#define CS_COL_0						RSC_SP_DLG_INNERBORDER_LEFT
+#define CS_COL_2						(CS_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT)
+#define	CS_COL_1						(CS_COL_2-CS_BTNWIDTH_1)
 
-#define CS_ROW_0                        RSC_SP_DLG_INNERBORDER_TOP
-#define CS_ROW_1                        (CS_ROW_0+RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_X)
-#define CS_ROW_4                        DLGS_BOTTOM_LAST_CTRL_L(CS_HEIGHT)
-#define CS_ROW_3                        (CS_ROW_4-RSC_CD_PUSHBUTTON_HEIGHT)
-#define CS_ROW_2                        (CS_ROW_3-RSC_SP_CTRL_Y)
+#define CS_ROW_0						RSC_SP_DLG_INNERBORDER_TOP
+#define CS_ROW_1						(CS_ROW_0+RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_X)
+#define CS_ROW_4						DLGS_BOTTOM_LAST_CTRL_L(CS_HEIGHT)
+#define	CS_ROW_3						(CS_ROW_4-RSC_CD_PUSHBUTTON_HEIGHT)
+#define CS_ROW_2						(CS_ROW_3-RSC_SP_CTRL_Y)
 
-#define CS_LB_WIDTH                     (CS_COL_2-CS_COL_0)
+#define CS_LB_WIDTH						(CS_COL_2-CS_COL_0)
 
 // --------- tab dialog Certificate viewer ---------
 
-#define CV_COL_0                        TD_SP_INNERBORDER_LEFT
-#define CV_COL_1                        (TP_WIDTH-RSC_SP_TBPG_INNERBORDER_RIGHT)
-#define CV_ROW_0                        RSC_SP_TBPG_INNERBORDER_TOP
-#define CV_ROW_3                        (TP_HEIGHT-RSC_SP_TBPG_INNERBORDER_BOTTOM)
-#define CV_CONT_WIDTH                   (CV_COL_1-CV_COL_0)
-#define CV_CONT_HEIGHT                  (CV_ROW_3-CV_ROW_0)
-#define CV_ROW_1                        (CV_ROW_0+2*CV_CONT_HEIGHT/3)
-#define CV_ROW_2                        (CV_ROW_1+RSC_SP_CTRL_GROUP_Y)
+#define CV_COL_0						TD_SP_INNERBORDER_LEFT
+#define CV_COL_1						(TP_WIDTH-RSC_SP_TBPG_INNERBORDER_RIGHT)
+#define CV_ROW_0						RSC_SP_TBPG_INNERBORDER_TOP
+#define CV_ROW_3						(TP_HEIGHT-RSC_SP_TBPG_INNERBORDER_BOTTOM)
+#define CV_CONT_WIDTH					(CV_COL_1-CV_COL_0)
+#define CV_CONT_HEIGHT					(CV_ROW_3-CV_ROW_0)
+#define CV_ROW_1						(CV_ROW_0+2*CV_CONT_HEIGHT/3)
+#define CV_ROW_2						(CV_ROW_1+RSC_SP_CTRL_GROUP_Y)
 
-#define CV_COL_D                        (TD_WIDTH-TD_SP_INNERBORDER_RIGHT)
-#define CV_COL_C                        (CV_COL_D-RSC_CD_PUSHBUTTON_WIDTH)
-#define CV_COL_B                        (CV_COL_C-RSC_SP_CTRL_X)
-#define CV_COL_A                        (CV_COL_B-RSC_CD_PUSHBUTTON_WIDTH)
+#define CV_COL_D						(TD_WIDTH-TD_SP_INNERBORDER_RIGHT)
+#define CV_COL_C						(CV_COL_D-RSC_CD_PUSHBUTTON_WIDTH)
+#define CV_COL_B						(CV_COL_C-RSC_SP_CTRL_X)
+#define CV_COL_A						(CV_COL_B-RSC_CD_PUSHBUTTON_WIDTH)
 
-#define CV_ROW_B                        (TD_HEIGHT-TD_SP_INNERBORDER_BOTTOM)
-#define CV_ROW_A                        (CV_ROW_B-RSC_CD_PUSHBUTTON_HEIGHT)
+#define CV_ROW_B						(TD_HEIGHT-TD_SP_INNERBORDER_BOTTOM)
+#define CV_ROW_A						(CV_ROW_B-RSC_CD_PUSHBUTTON_HEIGHT)
 
 // --------- tab page Certificate viewer - General ---------
-#define WIN_FRAME                       2
-#define IMG_CERT                        3
-#define FI_CERTINFO                     4
-#define FL_SEP1                         5
-#define FI_HINTNOTTRUST                 6
-#define FL_SEP2                         7
-#define FI_ISSTOLABEL                   8
-#define FI_ISSTO                        9
-#define FI_ISSBYLABEL                   10
-#define FI_ISSBY                        11
+#define WIN_FRAME						2
+#define IMG_CERT						3
+#define FI_CERTINFO						4
+#define FL_SEP1							5
+#define FI_HINTNOTTRUST					6
+#define FL_SEP2							7
+#define FI_ISSTOLABEL					8
+#define FI_ISSTO						9
+#define FI_ISSBYLABEL					10
+#define FI_ISSBY						11
 #define FI_VALIDDATE                    12
 #define IMG_KEY                         13
 #define FI_CORRPRIVKEY                  14
@@ -179,63 +179,63 @@
 #define IMG_STATE_NOT_VALIDATED_HC      18
 #define IMG_KEY_HC                      19
 
-#define IMG1_WIDTH                      33
-#define IMG1_HEIGHT                     22
-#define IMG2_WIDTH                      20
-#define IMG2_HEIGHT                     20
-#define DATE_WIDTH                      30
-#define CW_COL_0                        (CV_COL_0+RSC_SP_GRP_INNERBORDER_LEFT)
-#define CW_COL_1                        (CW_COL_0+RSC_SP_FLGR_SPACE_X)
-#define CW_COL_1a                       (CW_COL_0+IMG2_WIDTH+1)
-#define CW_COL_2                        (CW_COL_0+IMG1_WIDTH)
-#define CW_COL_3                        (CW_COL_2+RSC_SP_CTRL_GROUP_X)
-#define CW_COL_4                        (CW_COL_1+40)
-#define CW_COL_5                        (CV_CONT_WIDTH-RSC_SP_GRP_INNERBORDER_RIGHT)
-#define CW_COL_5a                       (CW_COL_5-RSC_SP_GRP_INNERBORDER_RIGHT)
-#define CW_COL_4a                       (CW_COL_1+38)
-#define CW_COL_4b                       (CW_COL_4a+DATE_WIDTH)
-#define CW_COL_4c                       (CW_COL_4b+3)
-#define CW_COL_4d                       (CW_COL_4c+8)
-#define CW_COL_4e                       (CW_COL_4d+3)
-#define CW_ROW_0                        (CV_ROW_0+RSC_SP_GRP_INNERBORDER_TOP)
-#define CW_ROW_1                        (CW_ROW_0+RSC_SP_GRP_INNERBORDER_TOP)
-#define CW_ROW_2                        (CW_ROW_0+IMG1_HEIGHT)
-#define CW_ROW_3                        (CW_ROW_2+3)
-#define CW_ROW_4                        (CW_ROW_3+RSC_SP_CTRL_Y+RSC_CD_FIXEDLINE_HEIGHT)
-#define CW_ROW_4a                       (CW_ROW_4+35)
-#define CW_ROW_5                        (CW_ROW_4a+3)
-#define CW_ROW_6                        (CW_ROW_5+RSC_SP_CTRL_Y+RSC_CD_FIXEDLINE_HEIGHT)
-#define CW_ROW_7                        (CW_ROW_6+RSC_SP_CTRL_Y+RSC_CD_FIXEDTEXT_HEIGHT)
-#define CW_ROW_8                        (CW_ROW_7+RSC_SP_CTRL_Y+RSC_CD_FIXEDTEXT_HEIGHT)
-#define CW_ROW_9                        (CW_ROW_8+RSC_SP_CTRL_Y+RSC_CD_FIXEDTEXT_HEIGHT)
-#define CW_ROW_10                       (CW_ROW_9+2)
-#define CW_ROW_11                       (CW_ROW_9+IMG2_HEIGHT)
+#define IMG1_WIDTH						33
+#define IMG1_HEIGHT						22
+#define IMG2_WIDTH						20
+#define IMG2_HEIGHT						20
+#define DATE_WIDTH						30
+#define CW_COL_0						(CV_COL_0+RSC_SP_GRP_INNERBORDER_LEFT)
+#define CW_COL_1						(CW_COL_0+RSC_SP_FLGR_SPACE_X)
+#define CW_COL_1a						(CW_COL_0+IMG2_WIDTH+1)
+#define CW_COL_2						(CW_COL_0+IMG1_WIDTH)
+#define CW_COL_3						(CW_COL_2+RSC_SP_CTRL_GROUP_X)
+#define CW_COL_4						(CW_COL_1+40)
+#define CW_COL_5						(CV_CONT_WIDTH-RSC_SP_GRP_INNERBORDER_RIGHT)
+#define CW_COL_5a						(CW_COL_5-RSC_SP_GRP_INNERBORDER_RIGHT)
+#define CW_COL_4a						(CW_COL_1+38)
+#define CW_COL_4b						(CW_COL_4a+DATE_WIDTH)
+#define CW_COL_4c						(CW_COL_4b+3)
+#define CW_COL_4d						(CW_COL_4c+8)
+#define CW_COL_4e						(CW_COL_4d+3)
+#define CW_ROW_0						(CV_ROW_0+RSC_SP_GRP_INNERBORDER_TOP)
+#define CW_ROW_1						(CW_ROW_0+RSC_SP_GRP_INNERBORDER_TOP)
+#define CW_ROW_2						(CW_ROW_0+IMG1_HEIGHT)
+#define CW_ROW_3						(CW_ROW_2+3)
+#define CW_ROW_4						(CW_ROW_3+RSC_SP_CTRL_Y+RSC_CD_FIXEDLINE_HEIGHT)
+#define CW_ROW_4a						(CW_ROW_4+35)
+#define CW_ROW_5						(CW_ROW_4a+3)
+#define CW_ROW_6						(CW_ROW_5+RSC_SP_CTRL_Y+RSC_CD_FIXEDLINE_HEIGHT)
+#define CW_ROW_7						(CW_ROW_6+RSC_SP_CTRL_Y+RSC_CD_FIXEDTEXT_HEIGHT)
+#define CW_ROW_8						(CW_ROW_7+RSC_SP_CTRL_Y+RSC_CD_FIXEDTEXT_HEIGHT)
+#define CW_ROW_9						(CW_ROW_8+RSC_SP_CTRL_Y+RSC_CD_FIXEDTEXT_HEIGHT)
+#define CW_ROW_10						(CW_ROW_9+2)
+#define CW_ROW_11						(CW_ROW_9+IMG2_HEIGHT)
 
 // --------- tab page Certificate viewer - Details ---------
 
-#define LB_ELEMENTS                     1
-#define ML_ELEMENT                      2
-
-#define STR_VERSION                     1
-#define STR_SERIALNUM                   2
-#define STR_SIGALGORITHM                3
-#define STR_ISSUER                      4
-#define STR_ISSUER_ID                   5
-#define STR_VALIDFROM                   6
-#define STR_VALIDTO                     7
-#define STR_SUBJECT                     8
-#define STR_SUBJECT_ID                  9
-#define STR_SUBJECT_PUBKEY_ALGO         10
-#define STR_SUBJECT_PUBKEY_VAL          11
-#define STR_SIGNATURE_ALGO              12
-#define STR_THUMBPRINT_SHA1             13
-#define STR_THUMBPRINT_MD5              14
+#define LB_ELEMENTS						1
+#define ML_ELEMENT						2
+
+#define STR_VERSION						1
+#define STR_SERIALNUM					2
+#define STR_SIGALGORITHM				3
+#define STR_ISSUER						4
+#define STR_ISSUER_ID					5
+#define STR_VALIDFROM					6
+#define STR_VALIDTO						7
+#define STR_SUBJECT						8
+#define STR_SUBJECT_ID					9
+#define STR_SUBJECT_PUBKEY_ALGO			10
+#define STR_SUBJECT_PUBKEY_VAL			11
+#define STR_SIGNATURE_ALGO				12
+#define STR_THUMBPRINT_SHA1				13
+#define STR_THUMBPRINT_MD5				14
 
 // --------- tab page Certificate viewer - Certification Path ---------
 
-#define FT_CERTPATH                     1
-#define FT_CERTSTATUS                   2
-#define ML_CERTSTATUS                   3
+#define FT_CERTPATH						1
+#define FT_CERTSTATUS					2
+#define ML_CERTSTATUS					3
 #define IMG_CERT_SMALL                  4
 #define IMG_CERT_SMALL_HC               5
 #define IMG_CERT_NOTVALIDATED_SMALL     6
@@ -256,30 +256,30 @@
 // --------- tab dialog macro security ---------
 
 #define MS_COL_A                        (TD_WIDTH-RSC_SP_DLG_INNERBORDER_LEFT)
-#define MS_COL_B                        (MS_COL_A-RSC_CD_PUSHBUTTON_WIDTH)
-#define MS_COL_C                        (MS_COL_B-RSC_SP_CTRL_X)
-#define MS_COL_D                        (MS_COL_C-RSC_CD_PUSHBUTTON_WIDTH)
-#define MS_COL_E                        (MS_COL_D-RSC_SP_CTRL_X)
-#define MS_COL_F                        (MS_COL_E-RSC_CD_PUSHBUTTON_WIDTH)
-#define MS_COL_G                        (MS_COL_F-RSC_SP_CTRL_X)
-#define MS_COL_H                        (MS_COL_G-RSC_CD_PUSHBUTTON_WIDTH)
+#define MS_COL_B						(MS_COL_A-RSC_CD_PUSHBUTTON_WIDTH)
+#define MS_COL_C						(MS_COL_B-RSC_SP_CTRL_X)
+#define MS_COL_D						(MS_COL_C-RSC_CD_PUSHBUTTON_WIDTH)
+#define MS_COL_E						(MS_COL_D-RSC_SP_CTRL_X)
+#define MS_COL_F						(MS_COL_E-RSC_CD_PUSHBUTTON_WIDTH)
+#define MS_COL_G						(MS_COL_F-RSC_SP_CTRL_X)
+#define MS_COL_H						(MS_COL_G-RSC_CD_PUSHBUTTON_WIDTH)
 
 // --------- tab page security level ---------
 
-#define FL_SECLEVEL                     1
-#define RB_VERYHIGH                     2
-#define RB_HIGH                         3
-#define RB_MEDIUM                       4
-#define RB_LOW                          5
+#define FL_SECLEVEL						1
+#define RB_VERYHIGH						2
+#define RB_HIGH							3
+#define RB_MEDIUM						4
+#define RB_LOW							5
 #define FI_SEC_READONLY                 6
 
 #define RSC_BIG_RADIOBUTTON             40
 #define SL_RB_DIST_Y                    (RSC_SP_FLGR_SPACE_Y+RSC_BIG_RADIOBUTTON)
 #define SL_COL_0                        RSC_SP_TBPG_INNERBORDER_LEFT
-#define SL_COL_1                        (SL_COL_0+RSC_SP_FLGR_SPACE_X)
-#define SL_COL_3                        (TP_WIDTH-RSC_SP_TBPG_INNERBORDER_RIGHT)
+#define SL_COL_1						(SL_COL_0+RSC_SP_FLGR_SPACE_X)
+#define SL_COL_3						(TP_WIDTH-RSC_SP_TBPG_INNERBORDER_RIGHT)
 #define SL_COL_2                        ((SL_COL_3-SL_COL_1)*100/105)
-#define SL_ROW_0                        RSC_SP_TBPG_INNERBORDER_TOP
+#define SL_ROW_0						RSC_SP_TBPG_INNERBORDER_TOP
 #define SL_ROW_1                        (SL_ROW_0+SL_RB_DIST_Y)
 #define SL_ROW_2                        (SL_ROW_1+SL_RB_DIST_Y)
 #define SL_ROW_3                        (SL_ROW_2+SL_RB_DIST_Y)
@@ -287,28 +287,28 @@
 
 // --------- tab page trusted sources ---------
 
-#define FL_TRUSTCERT                    1
-#define LB_TRUSTCERT                    2
-#define PB_ADD_TRUSTCERT                3
-#define PB_VIEW_TRUSTCERT               4
-#define PB_REMOVE_TRUSTCERT             5
-#define FL_TRUSTFILELOC                 6
-#define FI_TRUSTFILELOC                 7
-#define LB_TRUSTFILELOC                 8
-#define FL_ADD_TRUSTFILELOC             9
-#define FL_REMOVE_TRUSTFILELOC          10
+#define FL_TRUSTCERT					1
+#define LB_TRUSTCERT					2
+#define PB_ADD_TRUSTCERT				3
+#define PB_VIEW_TRUSTCERT				4
+#define PB_REMOVE_TRUSTCERT				5
+#define FL_TRUSTFILELOC					6
+#define FI_TRUSTFILELOC					7
+#define LB_TRUSTFILELOC					8
+#define FL_ADD_TRUSTFILELOC				9
+#define FL_REMOVE_TRUSTFILELOC			10
 #define FI_TRUSTCERT_RO                 11
 #define FI_TRUSTFILE_RO                 12
 
 #define TS_COL_0                        RSC_SP_TBPG_INNERBORDER_LEFT
-#define TS_COL_1                        (TS_COL_0+RSC_SP_FLGR_SPACE_X)
+#define TS_COL_1						(TS_COL_0+RSC_SP_FLGR_SPACE_X)
 #define TS_COL_8                        (TP_WIDTH-RSC_SP_TBPG_INNERBORDER_RIGHT)
 #define TS_COL_7                        (TS_COL_8-RSC_SP_FLGR_SPACE_X)
 #define TS_COL_6                        (TS_COL_7-RSC_CD_PUSHBUTTON_WIDTH)
-#define TS_COL_5                        (TS_COL_6-RSC_SP_CTRL_GROUP_X)
-#define TS_COL_4                        (TS_COL_5-RSC_CD_PUSHBUTTON_WIDTH)
-#define TS_COL_3                        (TS_COL_4-RSC_SP_CTRL_GROUP_X)
-#define TS_COL_2                        (TS_COL_3-RSC_CD_PUSHBUTTON_WIDTH)
+#define TS_COL_5						(TS_COL_6-RSC_SP_CTRL_GROUP_X)
+#define TS_COL_4						(TS_COL_5-RSC_CD_PUSHBUTTON_WIDTH)
+#define TS_COL_3						(TS_COL_4-RSC_SP_CTRL_GROUP_X)
+#define TS_COL_2						(TS_COL_3-RSC_CD_PUSHBUTTON_WIDTH)
 
 #define RSC_CD_TABLISTBOX_HEIGHT        6*RSC_BS_CHARHEIGHT
 #define TS_ROW_0                        RSC_SP_TBPG_INNERBORDER_TOP
@@ -324,37 +324,37 @@
 
 // --------- signed macro warning ---------
 
-#define FI_DOCNAME                      1
-#define FI_DESCR1A                      2
-#define FI_SIGNS                        3
-#define PB_VIEWSIGNS                    4
-#define FI_DESCR2                       5
-#define CB_ALWAYSTRUST                  6
-#define PB_ENABLE                       7
-#define PB_DISABLE                      8
-#define FI_DESCR1B                      9
-
-#define MW_WIDTH                        DLGS_WIDTH
-#define MW_HEIGHT                       DLGS_HEIGHT
-
-#define MW_SYMBOL_WIDTH                 (20)
-
-#define MW_COL_0                        (RSC_SP_DLG_INNERBORDER_LEFT)
-#define MW_COL_1                        (MW_COL_0+MW_SYMBOL_WIDTH)
-#define MW_COL_4                        (MW_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT)
-#define MW_COL_3                        (MW_COL_4-RSC_CD_PUSHBUTTON_WIDTH)
-#define MW_COL_2                        (MW_COL_3-RSC_SP_CTRL_DESC_X)
-#define MW_COL_A                        (DLGS_BOTTOM_OK_X(MW_WIDTH))
-#define MW_COL_C                        (DLGS_BOTTOM_CANCEL_X(MW_WIDTH))
-#define MW_COL_E                        (DLGS_BOTTOM_HELP_X(MW_WIDTH))
-#define MW_ROW_0                        (RSC_SP_DLG_INNERBORDER_TOP)
-#define MW_ROW_1                        (MW_ROW_0+3*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_Y)
-#define MW_ROW_2                        (MW_ROW_1+RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_Y)
-#define MW_ROW_7                        (MW_HEIGHT-RSC_SP_DLG_INNERBORDER_BOTTOM)
-#define MW_ROW_6                        (DLGS_BOTTOM_BTN_Y(MW_HEIGHT))
-#define MW_ROW_5                        (DLGS_BOTTOM_FL_Y(MW_HEIGHT))
-#define MW_ROW_4                        (MW_ROW_5-RSC_CD_CHECKBOX_HEIGHT-RSC_SP_CTRL_Y)
-#define MW_ROW_3                        (MW_ROW_4-4*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_Y)
+#define FI_DOCNAME						1
+#define FI_DESCR1A						2
+#define FI_SIGNS						3
+#define PB_VIEWSIGNS					4
+#define FI_DESCR2						5
+#define CB_ALWAYSTRUST					6
+#define PB_ENABLE						7
+#define PB_DISABLE						8
+#define FI_DESCR1B						9
+
+#define MW_WIDTH						DLGS_WIDTH
+#define MW_HEIGHT						DLGS_HEIGHT
+
+#define MW_SYMBOL_WIDTH					(20)
+
+#define MW_COL_0						(RSC_SP_DLG_INNERBORDER_LEFT)
+#define MW_COL_1						(MW_COL_0+MW_SYMBOL_WIDTH)
+#define MW_COL_4						(MW_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT)
+#define MW_COL_3						(MW_COL_4-RSC_CD_PUSHBUTTON_WIDTH)
+#define MW_COL_2						(MW_COL_3-RSC_SP_CTRL_DESC_X)
+#define MW_COL_A						(DLGS_BOTTOM_OK_X(MW_WIDTH))
+#define MW_COL_C						(DLGS_BOTTOM_CANCEL_X(MW_WIDTH))
+#define MW_COL_E						(DLGS_BOTTOM_HELP_X(MW_WIDTH))
+#define MW_ROW_0						(RSC_SP_DLG_INNERBORDER_TOP)
+#define MW_ROW_1						(MW_ROW_0+3*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_Y)
+#define MW_ROW_2						(MW_ROW_1+RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_Y)
+#define MW_ROW_7						(MW_HEIGHT-RSC_SP_DLG_INNERBORDER_BOTTOM)
+#define MW_ROW_6						(DLGS_BOTTOM_BTN_Y(MW_HEIGHT))
+#define MW_ROW_5						(DLGS_BOTTOM_FL_Y(MW_HEIGHT))
+#define MW_ROW_4						(MW_ROW_5-RSC_CD_CHECKBOX_HEIGHT-RSC_SP_CTRL_Y)
+#define MW_ROW_3						(MW_ROW_4-4*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_Y)
 
 #endif
 
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 03abc233ab3b..301952ed9077 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 /* HACK: disable some warnings for MS-C */
 #ifdef _MSC_VER
-#pragma warning (disable : 4355)    // 4355: this used in initializer-list
+#pragma warning (disable : 4355)	// 4355: this used in initializer-list
 #endif
 
 using namespace ::com::sun::star::security;
@@ -80,12 +80,12 @@ using namespace ::com::sun::star;
 namespace css = ::com::sun::star;
 using ::rtl::OUString;
 
-namespace
+namespace 
 {
     class SaveODFItem: public utl::ConfigItem
     {
         sal_Int16 m_nODF;
-    public:
+    public: 
     virtual void Commit();
     virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
         SaveODFItem();
@@ -180,31 +180,31 @@ bool DigitalSignaturesDialog::isXML(const rtl::OUString& rURI )
     return bIsXML;
 }
 
-DigitalSignaturesDialog::DigitalSignaturesDialog(
-    Window* pParent,
-    uno::Reference< uno::XComponentContext >& rxCtx, DocumentSignatureMode eMode,
+DigitalSignaturesDialog::DigitalSignaturesDialog( 
+    Window* pParent, 
+    uno::Reference< uno::XComponentContext >& rxCtx, DocumentSignatureMode eMode, 
     sal_Bool bReadOnly, const ::rtl::OUString& sODFVersion, bool bHasDocumentSignature)
-    :ModalDialog        ( pParent, XMLSEC_RES( RID_XMLSECDLG_DIGSIG ) )
-    ,mxCtx              ( rxCtx )
-    ,maSignatureHelper  ( rxCtx )
-    ,meSignatureMode    ( eMode )
-    ,maHintDocFT        ( this, XMLSEC_RES( FT_HINT_DOC ) )
-    ,maHintBasicFT      ( this, XMLSEC_RES( FT_HINT_BASIC ) )
-    ,maHintPackageFT    ( this, XMLSEC_RES( FT_HINT_PACK ) )
-    ,maSignaturesLB     ( this, XMLSEC_RES( LB_SIGNATURES ) )
-    ,maSigsValidImg     ( this, XMLSEC_RES( IMG_STATE_VALID ) )
-    ,maSigsValidFI      ( this, XMLSEC_RES( FI_STATE_VALID ) )
-    ,maSigsInvalidImg   ( this, XMLSEC_RES( IMG_STATE_BROKEN ) )
+    :ModalDialog		( pParent, XMLSEC_RES( RID_XMLSECDLG_DIGSIG ) )
+    ,mxCtx 				( rxCtx )
+    ,maSignatureHelper	( rxCtx )
+    ,meSignatureMode	( eMode )
+    ,maHintDocFT		( this, XMLSEC_RES( FT_HINT_DOC ) )
+    ,maHintBasicFT		( this, XMLSEC_RES( FT_HINT_BASIC ) )
+    ,maHintPackageFT	( this, XMLSEC_RES( FT_HINT_PACK ) )
+    ,maSignaturesLB		( this, XMLSEC_RES( LB_SIGNATURES ) )
+    ,maSigsValidImg		( this, XMLSEC_RES( IMG_STATE_VALID ) )
+    ,maSigsValidFI		( this, XMLSEC_RES( FI_STATE_VALID ) )
+    ,maSigsInvalidImg	( this, XMLSEC_RES( IMG_STATE_BROKEN ) )
     ,maSigsInvalidFI    ( this, XMLSEC_RES( FI_STATE_BROKEN ) )
     ,maSigsNotvalidatedImg( this, XMLSEC_RES( IMG_STATE_NOTVALIDATED ) )
     ,maSigsNotvalidatedFI ( this, XMLSEC_RES( FI_STATE_NOTVALIDATED ) )
     ,maSigsOldSignatureFI ( this, XMLSEC_RES( FI_STATE_OLDSIGNATURE) )
     ,maViewBtn          ( this, XMLSEC_RES( BTN_VIEWCERT ) )
-    ,maAddBtn           ( this, XMLSEC_RES( BTN_ADDCERT ) )
-    ,maRemoveBtn        ( this, XMLSEC_RES( BTN_REMOVECERT ) )
-    ,maBottomSepFL      ( this, XMLSEC_RES( FL_BOTTOM_SEP ) )
-    ,maOKBtn            ( this, XMLSEC_RES( BTN_OK ) )
-    ,maHelpBtn          ( this, XMLSEC_RES( BTN_HELP ) )
+    ,maAddBtn			( this, XMLSEC_RES( BTN_ADDCERT ) )
+    ,maRemoveBtn		( this, XMLSEC_RES( BTN_REMOVECERT ) )
+    ,maBottomSepFL		( this, XMLSEC_RES( FL_BOTTOM_SEP ) )
+    ,maOKBtn			( this, XMLSEC_RES( BTN_OK ) )
+    ,maHelpBtn			( this, XMLSEC_RES( BTN_HELP ) )
     ,m_sODFVersion (sODFVersion)
     ,m_bHasDocumentSignature(bHasDocumentSignature)
     ,m_bWarningShowSignMacro(false)
@@ -251,9 +251,9 @@ DigitalSignaturesDialog::DigitalSignaturesDialog(
 
     switch( meSignatureMode )
     {
-        case SignatureModeDocumentContent:  maHintDocFT.Show();     break;
-        case SignatureModeMacros:           maHintBasicFT.Show();   break;
-        case SignatureModePackage:          maHintPackageFT.Show(); break;
+        case SignatureModeDocumentContent:	maHintDocFT.Show();		break;
+        case SignatureModeMacros:		    maHintBasicFT.Show();	break;
+        case SignatureModePackage:	        maHintPackageFT.Show();	break;
     }
 
     // adjust fixed text to images
@@ -285,17 +285,17 @@ void DigitalSignaturesDialog::SetStorage( const com::sun::star::uno::Reference <
 {
     mxStore = rxStore;
     maSignatureHelper.SetStorage( mxStore, m_sODFVersion);
-
+    
     Reference < css::packages::manifest::XManifestReader > xReader(
         mxCtx->getServiceManager()->createInstanceWithContext(
         OUSTR("com.sun.star.packages.manifest.ManifestReader"), mxCtx), UNO_QUERY_THROW);
 
     //Get the manifest.xml
-    Reference < css::embed::XStorage > xSubStore(rxStore->openStorageElement(
+    Reference < css::embed::XStorage > xSubStore(rxStore->openStorageElement( 
                 OUSTR("META-INF"), css::embed::ElementModes::READ), UNO_QUERY_THROW);
 
     Reference< css::io::XInputStream > xStream(
-        xSubStore->openStreamElement(OUSTR("manifest.xml"), css::embed::ElementModes::READ),
+        xSubStore->openStreamElement(OUSTR("manifest.xml"), css::embed::ElementModes::READ), 
         UNO_QUERY_THROW);
 
     m_manifest = xReader->readManifestSequence(xStream);
@@ -314,7 +314,7 @@ bool DigitalSignaturesDialog::canAddRemove()
     bool bDoc1_1 = DocumentSignatureHelper::isODFPre_1_2(m_sODFVersion);
     SaveODFItem item;
     bool bSave1_1 = item.isLessODF1_2();
-
+    
     // see specification
     //cvs: specs/www/appwide/security/Electronic_Signatures_and_Security.sxw
     //Paragraph 'Behavior with regard to ODF 1.2'
@@ -325,9 +325,9 @@ bool DigitalSignaturesDialog::canAddRemove()
         ErrorBox err(NULL, XMLSEC_RES(RID_XMLSECDLG_OLD_ODF_FORMAT));
         err.Execute();
         ret = false;
-    }
+    } 
 
-    //As of OOo 3.2 the document signature includes in macrosignatures.xml. That is
+    //As of OOo 3.2 the document signature includes in macrosignatures.xml. That is 
     //adding a macro signature will break an existing document signature.
     //The sfx2 will remove the documentsignature when the user adds a macro signature
     if (meSignatureMode == SignatureModeMacros
@@ -336,7 +336,7 @@ bool DigitalSignaturesDialog::canAddRemove()
         if (m_bHasDocumentSignature && !m_bWarningShowSignMacro)
         {
             //The warning says that the document signatures will be removed if the user
-            //continues. He can then either press 'OK' or 'NO'
+            //continues. He can then either press 'OK' or 'NO' 
             //It the user presses 'Add' or 'Remove' several times then, then the warning
             //is shown every time until the user presses 'OK'. From then on, the warning
             //is not displayed anymore as long as the signatures dialog is alive.
@@ -349,7 +349,7 @@ bool DigitalSignaturesDialog::canAddRemove()
         }
     }
     return ret;
-}
+} 
 
 bool DigitalSignaturesDialog::canAdd()
 {
@@ -392,16 +392,16 @@ IMPL_LINK( DigitalSignaturesDialog, SignatureHighlightHdl, void*, EMPTYARG )
 IMPL_LINK( DigitalSignaturesDialog, OKButtonHdl, void*, EMPTYARG )
 {
     // Export all other signatures...
-    SignatureStreamHelper aStreamHelper = ImplOpenSignatureStream(
+    SignatureStreamHelper aStreamHelper = ImplOpenSignatureStream( 
         embed::ElementModes::WRITE|embed::ElementModes::TRUNCATE, false );
-    uno::Reference< io::XOutputStream > xOutputStream(
+    uno::Reference< io::XOutputStream > xOutputStream( 
         aStreamHelper.xSignatureStream, uno::UNO_QUERY );
-    uno::Reference< com::sun::star::xml::sax::XDocumentHandler> xDocumentHandler =
+    uno::Reference< com::sun::star::xml::sax::XDocumentHandler> xDocumentHandler = 
         maSignatureHelper.CreateDocumentHandlerWithHeader( xOutputStream );
 
     int nInfos = maCurrentSignatureInformations.size();
     for( int n = 0 ; n < nInfos ; ++n )
-        maSignatureHelper.ExportSignature(
+        maSignatureHelper.ExportSignature( 
         xDocumentHandler, maCurrentSignatureInformations[ n ] );
 
     maSignatureHelper.CloseDocumentHandler( xDocumentHandler);
@@ -409,10 +409,10 @@ IMPL_LINK( DigitalSignaturesDialog, OKButtonHdl, void*, EMPTYARG )
     // If stream was not provided, we are responsible for committing it....
     if ( !mxSignatureStream.is() )
     {
-        uno::Reference< embed::XTransactedObject > xTrans(
+        uno::Reference< embed::XTransactedObject > xTrans( 
             aStreamHelper.xSignatureStorage, uno::UNO_QUERY );
         xTrans->commit();
-    }
+    }  
 
     EndDialog(RET_OK);
     return 0;
@@ -438,7 +438,7 @@ IMPL_LINK( DigitalSignaturesDialog, AddButtonHdl, Button*, EMPTYARG )
     {
         uno::Reference<com::sun::star::xml::crypto::XSecurityEnvironment> xSecEnv = maSignatureHelper.GetSecurityEnvironment();
 
-        uno::Reference<com::sun::star::security::XSerialNumberAdapter> xSerialNumberAdapter =
+        uno::Reference<com::sun::star::security::XSerialNumberAdapter> xSerialNumberAdapter = 
             ::com::sun::star::security::SerialNumberAdapter::create(mxCtx);
         CertificateChooser aChooser( this, mxCtx, xSecEnv, maCurrentSignatureInformations );
         if ( aChooser.Execute() == RET_OK )
@@ -462,13 +462,13 @@ IMPL_LINK( DigitalSignaturesDialog, AddButtonHdl, Button*, EMPTYARG )
 
             rtl::OUStringBuffer aStrBuffer;
             SvXMLUnitConverter::encodeBase64(aStrBuffer, xCert->getEncoded());
-
+   
             maSignatureHelper.SetX509Certificate( nSecurityId,
-                xCert->getIssuerName(), aCertSerial,
+                xCert->getIssuerName(), aCertSerial, 
                 aStrBuffer.makeStringAndClear());
 
-            std::vector< rtl::OUString > aElements =
-                DocumentSignatureHelper::CreateElementList(
+            std::vector< rtl::OUString > aElements = 
+                DocumentSignatureHelper::CreateElementList( 
                     mxStore, rtl::OUString(), meSignatureMode, OOo3_2Document);
 
             sal_Int32 nElements = aElements.size();
@@ -480,16 +480,16 @@ IMPL_LINK( DigitalSignaturesDialog, AddButtonHdl, Button*, EMPTYARG )
 
             maSignatureHelper.SetDateTime( nSecurityId, Date(), Time() );
 
-            // We open a signature stream in which the existing and the new
+            // We open a signature stream in which the existing and the new 
             //signature is written. ImplGetSignatureInformation (later in this function) will
             //then read the stream an will fill  maCurrentSignatureInformations. The final signature
-            //is written when the user presses OK. Then only maCurrentSignatureInformation and
+            //is written when the user presses OK. Then only maCurrentSignatureInformation and 
             //a sax writer are used to write the information.
             SignatureStreamHelper aStreamHelper = ImplOpenSignatureStream(
                 css::embed::ElementModes::WRITE|css::embed::ElementModes::TRUNCATE, true);
-            Reference< css::io::XOutputStream > xOutputStream(
+            Reference< css::io::XOutputStream > xOutputStream( 
                 aStreamHelper.xSignatureStream, UNO_QUERY_THROW);
-            Reference< css::xml::sax::XDocumentHandler> xDocumentHandler =
+            Reference< css::xml::sax::XDocumentHandler> xDocumentHandler = 
                 maSignatureHelper.CreateDocumentHandlerWithHeader( xOutputStream );
 
             // Export old signatures...
@@ -505,8 +505,8 @@ IMPL_LINK( DigitalSignaturesDialog, AddButtonHdl, Button*, EMPTYARG )
 
             maSignatureHelper.EndMission();
 
-            aStreamHelper = SignatureStreamHelper();    // release objects...
-
+            aStreamHelper = SignatureStreamHelper();	// release objects...
+           
             mbSignaturesChanged = true;
 
             sal_Int32 nStatus = maSignatureHelper.GetSignatureInformation( nSecurityId ).nStatus;
@@ -550,9 +550,9 @@ IMPL_LINK( DigitalSignaturesDialog, RemoveButtonHdl, Button*, EMPTYARG )
             // Export all other signatures...
             SignatureStreamHelper aStreamHelper = ImplOpenSignatureStream(
                 css::embed::ElementModes::WRITE | css::embed::ElementModes::TRUNCATE, true);
-            Reference< css::io::XOutputStream > xOutputStream(
+            Reference< css::io::XOutputStream > xOutputStream( 
                 aStreamHelper.xSignatureStream, UNO_QUERY_THROW);
-            Reference< css::xml::sax::XDocumentHandler> xDocumentHandler =
+            Reference< css::xml::sax::XDocumentHandler> xDocumentHandler = 
                 maSignatureHelper.CreateDocumentHandlerWithHeader( xOutputStream );
 
             int nInfos = maCurrentSignatureInformations.size();
@@ -563,7 +563,7 @@ IMPL_LINK( DigitalSignaturesDialog, RemoveButtonHdl, Button*, EMPTYARG )
 
             mbSignaturesChanged = true;
 
-            aStreamHelper = SignatureStreamHelper();    // release objects...
+            aStreamHelper = SignatureStreamHelper();	// release objects...
 
             ImplFillSignaturesBox();
         }
@@ -589,7 +589,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
     maSignaturesLB.Clear();
 
     uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > xSecEnv = maSignatureHelper.GetSecurityEnvironment();
-    uno::Reference<com::sun::star::security::XSerialNumberAdapter> xSerialNumberAdapter =
+    uno::Reference<com::sun::star::security::XSerialNumberAdapter> xSerialNumberAdapter = 
         ::com::sun::star::security::SerialNumberAdapter::create(mxCtx);
 
     uno::Reference< ::com::sun::star::security::XCertificate > xCert;
@@ -605,8 +605,8 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
         {
             DocumentSignatureAlgorithm mode = DocumentSignatureHelper::getDocumentAlgorithm(
                 m_sODFVersion, maCurrentSignatureInformations[n]);
-            std::vector< rtl::OUString > aElementsToBeVerified =
-                DocumentSignatureHelper::CreateElementList(
+            std::vector< rtl::OUString > aElementsToBeVerified = 
+                DocumentSignatureHelper::CreateElementList( 
                 mxStore, ::rtl::OUString(), meSignatureMode, mode);
 
             const SignatureInformation& rInfo = maCurrentSignatureInformations[n];
@@ -622,7 +622,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
                 //to find out if the X509IssuerName was modified does not work. See #i62684
                 DBG_ASSERT(sal_False, "Could not find embedded certificate!");
             }
-
+            
             //In case there is no embedded certificate we try to get it from a local store
             //Todo: This probably could be removed, see above.
             if (!xCert.is())
@@ -630,9 +630,9 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
 
             DBG_ASSERT( xCert.is(), "Certificate not found and can't be created!" );
 
-            String  aSubject;
-            String  aIssuer;
-            String  aDateTimeStr;
+            String	aSubject;
+            String	aIssuer;
+            String	aDateTimeStr;
 
             bool bSigValid = false;
             bool bCertValid = false;
@@ -642,7 +642,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
                 try {
                     sal_Int32 certResult = xSecEnv->verifyCertificate(xCert,
                         Sequence<css::uno::Reference<css::security::XCertificate> >());
-
+                    
                     bCertValid = certResult == css::security::CertificateValidity::VALID ? true : false;
                     if ( bCertValid )
                         nValidCerts++;
@@ -667,7 +667,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
                 if( bSigValid )
                     nValidSigs++;
             }
-
+            
             Image aImage;
             if (!bSigValid)
             {
@@ -679,7 +679,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
             }
             //Check if the signature is a "old" document signature, that is, which was created
             //by an version of OOo previous to 3.2
-            else if (meSignatureMode == SignatureModeDocumentContent
+            else if (meSignatureMode == SignatureModeDocumentContent 
                 && bSigValid && bCertValid && !DocumentSignatureHelper::isOOo3_2_Signature(
                 maCurrentSignatureInformations[n]))
             {
@@ -697,19 +697,19 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
             {
                 aImage = aImage = maSigsValidImg.GetImage();
             }
-
+            
             SvLBoxEntry* pEntry = maSignaturesLB.InsertEntry( aNullStr, aImage, aImage );
             maSignaturesLB.SetEntryText( aSubject, pEntry, 1 );
             maSignaturesLB.SetEntryText( aIssuer, pEntry, 2 );
             maSignaturesLB.SetEntryText( aDateTimeStr, pEntry, 3 );
-            pEntry->SetUserData( ( void* ) n );     // missuse user data as index
+            pEntry->SetUserData( ( void* ) n );		// missuse user data as index
         }
     }
 
     bool bAllSigsValid = (nValidSigs == nInfos);
     bool bAllCertsValid = (nValidCerts == nInfos);
     bool bShowValidState = nInfos && (bAllSigsValid && bAllCertsValid && bAllNewSignatures);
-
+    
     bool bShowNotValidatedState = nInfos && (bAllSigsValid && (!bAllCertsValid || !bAllNewSignatures));
     bool bShowInvalidState = nInfos && !bAllSigsValid;
 
@@ -754,10 +754,10 @@ void DigitalSignaturesDialog::ImplShowSignaturesDetails()
     if( maSignaturesLB.FirstSelected() )
     {
         USHORT nSelected = (USHORT) (sal_uIntPtr) maSignaturesLB.FirstSelected()->GetUserData();
-        const SignatureInformation& rInfo = maCurrentSignatureInformations[ nSelected ];
+        const SignatureInformation&	rInfo = maCurrentSignatureInformations[ nSelected ];
         css::uno::Reference<css::xml::crypto::XSecurityEnvironment > xSecEnv =
             maSignatureHelper.GetSecurityEnvironment();
-        css::uno::Reference<com::sun::star::security::XSerialNumberAdapter> xSerialNumberAdapter =
+        css::uno::Reference<com::sun::star::security::XSerialNumberAdapter> xSerialNumberAdapter = 
             ::com::sun::star::security::SerialNumberAdapter::create(mxCtx);
         // Use Certificate from doc, not from key store
         uno::Reference< dcss::security::XCertificate > xCert;
@@ -780,7 +780,7 @@ void DigitalSignaturesDialog::ImplShowSignaturesDetails()
 //signature stream is used.
 //Everytime the user presses Add a new temporary stream is created.
 //We keep the temporary stream as member because ImplGetSignatureInformations
-//will later access the stream to create DocumentSignatureInformation objects
+//will later access the stream to create DocumentSignatureInformation objects 
 //which are stored in maCurrentSignatureInformations.
 SignatureStreamHelper DigitalSignaturesDialog::ImplOpenSignatureStream(
     sal_Int32 nStreamOpenMode, bool bTempStream)
@@ -791,7 +791,7 @@ SignatureStreamHelper DigitalSignaturesDialog::ImplOpenSignatureStream(
         if (nStreamOpenMode & css::embed::ElementModes::TRUNCATE)
         {
             //We write always into a new temporary stream.
-            mxTempSignatureStream = Reference < css::io::XStream >(
+            mxTempSignatureStream = Reference < css::io::XStream >( 
                 mxCtx->getServiceManager()->createInstanceWithContext(
                 OUSTR( "com.sun.star.io.TempFile" ), mxCtx) ,
                 UNO_QUERY_THROW);
@@ -799,7 +799,7 @@ SignatureStreamHelper DigitalSignaturesDialog::ImplOpenSignatureStream(
         }
         else
         {
-            //When we read from the temp stream, then we must have previously
+            //When we read from the temp stream, then we must have previously 
             //created one.
             OSL_ASSERT(mxTempSignatureStream.is());
         }
@@ -813,7 +813,7 @@ SignatureStreamHelper DigitalSignaturesDialog::ImplOpenSignatureStream(
             //We may not have a dedicated stream for writing the signature
             //So we take one directly from the storage
             //Or DocumentDigitalSignatures::showDocumentContentSignatures was called,
-            //in which case Add/Remove is not allowed. This is done, for example, if the
+            //in which case Add/Remove is not allowed. This is done, for example, if the 
             //document is readonly
             aHelper = DocumentSignatureHelper::OpenSignatureStream(
                 mxStore, nStreamOpenMode, meSignatureMode );
@@ -826,7 +826,7 @@ SignatureStreamHelper DigitalSignaturesDialog::ImplOpenSignatureStream(
 
     if (nStreamOpenMode & css::embed::ElementModes::TRUNCATE)
     {
-        css::uno::Reference < css::io::XTruncate > xTruncate(
+        css::uno::Reference < css::io::XTruncate > xTruncate( 
             aHelper.xSignatureStream, UNO_QUERY_THROW);
         DBG_ASSERT( xTruncate.is(), "ImplOpenSignatureStream - Stream does not support xTruncate!" );
         xTruncate->truncate();
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc b/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc
index d63b44834f2c..98cb51782d97 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
index 87d2de520103..fcdc60bee5f4 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ ModalDialog RID_XMLSECDLG_DIGSIG
     {
         Text [ en-US ] = "The signatures in this document are invalid";
     };
-
+    
     FixedImage IMG_STATE_VALID
     {
         Pos = MAP_APPFONT( 6, 127 );
@@ -200,7 +200,7 @@ ErrorBox RID_XMLSECDLG_OLD_ODF_FORMAT
 {
     Buttons = WB_OK ;
     DefButton = WB_DEF_OK ;
-    Message [ en-US ] =
+    Message [ en-US ] = 
         "This document contains signatures in ODF 1.1 (OpenOffice.org 2.x) format. "
         "Signing documents in %PRODUCTNAME %PRODUCTVERSION requires ODF 1.2 format version. "
         "Thus no signatures can be added or removed to this document.\n\n"
diff --git a/xmlsecurity/source/dialogs/helpids.hrc b/xmlsecurity/source/dialogs/helpids.hrc
index 6456dddb47b9..4b0329de3eb3 100644
--- a/xmlsecurity/source/dialogs/helpids.hrc
+++ b/xmlsecurity/source/dialogs/helpids.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index e9474b4b957b..3bacce05c045 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 /* HACK: disable some warnings for MS-C */
 #ifdef _MSC_VER
-#pragma warning (disable : 4355)    // 4355: this used in initializer-list
+#pragma warning (disable : 4355)	// 4355: this used in initializer-list
 #endif
 
 using namespace ::com::sun::star;
@@ -74,12 +74,12 @@ IMPL_LINK( MacroSecurity, OkBtnHdl, void*, EMPTYARG )
 }
 
 MacroSecurity::MacroSecurity( Window* _pParent, const cssu::Reference< cssu::XComponentContext> &_rxCtx, const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment )
-    :TabDialog          ( _pParent, XMLSEC_RES( RID_XMLSECTP_MACROSEC ) )
-    ,maTabCtrl          ( this, XMLSEC_RES( 1 ) )
-    ,maOkBtn            ( this, XMLSEC_RES( BTN_OK ) )
-    ,maCancelBtn        ( this, XMLSEC_RES( BTN_CANCEL ) )
-    ,maHelpBtn          ( this, XMLSEC_RES( BTN_HELP ) )
-    ,maResetBtn         ( this, XMLSEC_RES( BTN_RESET ) )
+    :TabDialog			( _pParent, XMLSEC_RES( RID_XMLSECTP_MACROSEC ) )
+    ,maTabCtrl			( this, XMLSEC_RES( 1 ) )
+    ,maOkBtn			( this, XMLSEC_RES( BTN_OK ) )
+    ,maCancelBtn		( this, XMLSEC_RES( BTN_CANCEL ) )
+    ,maHelpBtn			( this, XMLSEC_RES( BTN_HELP ) )
+    ,maResetBtn			( this, XMLSEC_RES( BTN_RESET ) )
 {
     FreeResource();
 
@@ -104,19 +104,19 @@ MacroSecurity::~MacroSecurity()
 
 
 MacroSecurityTP::MacroSecurityTP( Window* _pParent, const ResId& _rResId, MacroSecurity* _pDlg )
-    :TabPage        ( _pParent, _rResId )
-    ,mpDlg          ( _pDlg )
+    :TabPage		( _pParent, _rResId )
+    ,mpDlg			( _pDlg )
 {
 }
 
 MacroSecurityLevelTP::MacroSecurityLevelTP( Window* _pParent, MacroSecurity* _pDlg )
-    :MacroSecurityTP    ( _pParent, XMLSEC_RES( RID_XMLSECTP_SECLEVEL ), _pDlg )
-    ,maSecLevelFL       ( this, XMLSEC_RES( FL_SECLEVEL ) )
+    :MacroSecurityTP	( _pParent, XMLSEC_RES( RID_XMLSECTP_SECLEVEL ), _pDlg )
+    ,maSecLevelFL		( this, XMLSEC_RES( FL_SECLEVEL ) )
     ,maSecReadonlyFI    ( this, XMLSEC_RES( FI_SEC_READONLY ))
     ,maVeryHighRB       ( this, XMLSEC_RES( RB_VERYHIGH ) )
-    ,maHighRB           ( this, XMLSEC_RES( RB_HIGH ) )
-    ,maMediumRB         ( this, XMLSEC_RES( RB_MEDIUM ) )
-    ,maLowRB            ( this, XMLSEC_RES( RB_LOW ) )
+    ,maHighRB			( this, XMLSEC_RES( RB_HIGH ) )
+    ,maMediumRB			( this, XMLSEC_RES( RB_MEDIUM ) )
+    ,maLowRB			( this, XMLSEC_RES( RB_LOW ) )
 {
     FreeResource();
 
@@ -141,18 +141,18 @@ MacroSecurityLevelTP::MacroSecurityLevelTP( Window* _pParent, MacroSecurity* _pD
     else
     {
         DBG_ERROR("illegal macro security level");
-    }
+    }            
     maSecReadonlyFI.Show(bReadonly);
     if(bReadonly)
     {
         //move to the selected button
         if( pCheck && pCheck != &maVeryHighRB)
-        {
+        {        
             long nDiff = pCheck->GetPosPixel().Y() - maVeryHighRB.GetPosPixel().Y();
             Point aPos(maSecReadonlyFI.GetPosPixel());
             aPos.Y() += nDiff;
             maSecReadonlyFI.SetPosPixel(aPos);
-        }
+        }            
         maVeryHighRB.Enable(sal_False);
         maHighRB.Enable(sal_False);
         maMediumRB.Enable(sal_False);
@@ -279,7 +279,7 @@ IMPL_LINK( MacroSecurityTrustedSourcesTP, AddLocPBHdl, void*, EMPTYARG )
 
 IMPL_LINK( MacroSecurityTrustedSourcesTP, RemoveLocPBHdl, void*, EMPTYARG )
 {
-    USHORT  nSel = maTrustFileLocLB.GetSelectEntryPos();
+    USHORT	nSel = maTrustFileLocLB.GetSelectEntryPos();
     if( nSel != LISTBOX_ENTRY_NOTFOUND )
     {
         maTrustFileLocLB.RemoveEntry( nSel );
@@ -321,8 +321,8 @@ void MacroSecurityTrustedSourcesTP::FillCertLB( void )
     {
         for( sal_uInt32 nEntry = 0 ; nEntry < nEntries ; ++nEntry )
         {
-            cssu::Sequence< ::rtl::OUString >&              rEntry = maTrustedAuthors[ nEntry ];
-            uno::Reference< css::security::XCertificate >   xCert;
+            cssu::Sequence< ::rtl::OUString >&				rEntry = maTrustedAuthors[ nEntry ];
+            uno::Reference< css::security::XCertificate >	xCert;
 
             // create from RawData
             xCert = mpDlg->mxSecurityEnvironment->createCertificateFromAscii( rEntry[ 2 ] );
@@ -330,34 +330,34 @@ void MacroSecurityTrustedSourcesTP::FillCertLB( void )
             SvLBoxEntry*    pLBEntry = maTrustCertLB.InsertEntry( XmlSec::GetContentPart( xCert->getSubjectName() ) );
             maTrustCertLB.SetEntryText( XmlSec::GetContentPart( xCert->getIssuerName() ), pLBEntry, 1 );
             maTrustCertLB.SetEntryText( XmlSec::GetDateTimeString( xCert->getNotValidAfter() ), pLBEntry, 2 );
-            pLBEntry->SetUserData( ( void* ) sal_Int32( nEntry ) );     // missuse user data as index
+            pLBEntry->SetUserData( ( void* ) sal_Int32( nEntry ) );		// missuse user data as index
         }
     }
 }
 
 MacroSecurityTrustedSourcesTP::MacroSecurityTrustedSourcesTP( Window* _pParent, MacroSecurity* _pDlg )
-    :MacroSecurityTP    ( _pParent, XMLSEC_RES( RID_XMLSECTP_TRUSTSOURCES ), _pDlg )
-    ,maTrustCertFL      ( this, XMLSEC_RES( FL_TRUSTCERT ) )
+    :MacroSecurityTP	( _pParent, XMLSEC_RES( RID_XMLSECTP_TRUSTSOURCES ), _pDlg )
+    ,maTrustCertFL		( this, XMLSEC_RES( FL_TRUSTCERT ) )
     ,maTrustCertROFI    ( this, XMLSEC_RES( FI_TRUSTCERT_RO ) )
     ,maTrustCertLB      ( this, XMLSEC_RES( LB_TRUSTCERT ) )
-    ,maAddCertPB        ( this, XMLSEC_RES( PB_ADD_TRUSTCERT ) )
-    ,maViewCertPB       ( this, XMLSEC_RES( PB_VIEW_TRUSTCERT ) )
-    ,maRemoveCertPB     ( this, XMLSEC_RES( PB_REMOVE_TRUSTCERT ) )
-    ,maTrustFileLocFL   ( this, XMLSEC_RES( FL_TRUSTFILELOC ) )
+    ,maAddCertPB		( this, XMLSEC_RES( PB_ADD_TRUSTCERT ) )
+    ,maViewCertPB		( this, XMLSEC_RES( PB_VIEW_TRUSTCERT ) )
+    ,maRemoveCertPB		( this, XMLSEC_RES( PB_REMOVE_TRUSTCERT ) )
+    ,maTrustFileLocFL	( this, XMLSEC_RES( FL_TRUSTFILELOC ) )
     ,maTrustFileROFI    ( this, XMLSEC_RES( FI_TRUSTFILE_RO ) )
     ,maTrustFileLocFI   ( this, XMLSEC_RES( FI_TRUSTFILELOC ) )
-    ,maTrustFileLocLB   ( this, XMLSEC_RES( LB_TRUSTFILELOC ) )
-    ,maAddLocPB         ( this, XMLSEC_RES( FL_ADD_TRUSTFILELOC ) )
-    ,maRemoveLocPB      ( this, XMLSEC_RES( FL_REMOVE_TRUSTFILELOC ) )
+    ,maTrustFileLocLB	( this, XMLSEC_RES( LB_TRUSTFILELOC ) )
+    ,maAddLocPB			( this, XMLSEC_RES( FL_ADD_TRUSTFILELOC ) )
+    ,maRemoveLocPB		( this, XMLSEC_RES( FL_REMOVE_TRUSTFILELOC ) )
 {
-    static long nTabs[] = { 3, 0, 35*CS_LB_WIDTH/100, 70*CS_LB_WIDTH/100 };
+    static long	nTabs[] = { 3, 0, 35*CS_LB_WIDTH/100, 70*CS_LB_WIDTH/100 };
     maTrustCertLB.SetTabs( &nTabs[ 0 ] );
     maTrustCertLB.InsertHeaderEntry( String( XMLSEC_RES( STR_HEADERBAR ) ) );
 
     FreeResource();
 
     maTrustCertLB.SetSelectHdl( LINK( this, MacroSecurityTrustedSourcesTP, TrustCertLBSelectHdl ) );
-    maAddCertPB.Hide();     // not used in the moment...
+    maAddCertPB.Hide();		// not used in the moment...
     maViewCertPB.SetClickHdl( LINK( this, MacroSecurityTrustedSourcesTP, ViewCertPBHdl ) );
     maViewCertPB.Disable();
     maRemoveCertPB.SetClickHdl( LINK( this, MacroSecurityTrustedSourcesTP, RemoveCertPBHdl ) );
@@ -372,12 +372,12 @@ MacroSecurityTrustedSourcesTP::MacroSecurityTrustedSourcesTP( Window* _pParent,
     mbAuthorsReadonly = mpDlg->maSecOptions.IsReadOnly( SvtSecurityOptions::E_MACRO_TRUSTEDAUTHORS );
     maTrustCertROFI.Show( mbAuthorsReadonly );
     mbAuthorsReadonly ? maTrustCertLB.DisableTable() : maTrustCertLB.EnableTable();
-//  unused button
+//  unused button 
 //    maAddCertPB.Enable( !mbAuthorsReadonly );
 
     FillCertLB();
 
-    cssu::Sequence< rtl::OUString > aSecureURLs = mpDlg->maSecOptions.GetSecureURLs();
+    cssu::Sequence< rtl::OUString >	aSecureURLs = mpDlg->maSecOptions.GetSecureURLs();
     mbURLsReadonly = mpDlg->maSecOptions.IsReadOnly( SvtSecurityOptions::E_SECUREURLS );
     maTrustFileROFI.Show( mbURLsReadonly );
     maTrustFileLocLB.Enable( !mbURLsReadonly );
@@ -400,10 +400,10 @@ void MacroSecurityTrustedSourcesTP::ActivatePage()
 
 void MacroSecurityTrustedSourcesTP::ClosePage( void )
 {
-    USHORT  nEntryCnt = maTrustFileLocLB.GetEntryCount();
+    USHORT	nEntryCnt = maTrustFileLocLB.GetEntryCount();
     if( nEntryCnt )
     {
-        cssu::Sequence< rtl::OUString > aSecureURLs( nEntryCnt );
+        cssu::Sequence< rtl::OUString >	aSecureURLs( nEntryCnt );
         for( USHORT i = 0 ; i < nEntryCnt ; ++i )
         {
             ::rtl::OUString aURL( maTrustFileLocLB.GetEntry( i ) );
@@ -450,7 +450,7 @@ void ReadOnlyImage::RequestHelp( const HelpEvent& rHEvt )
 
         String aStr(ReadOnlyImage::GetHelpTip());
         if ( Help::IsBalloonHelpEnabled() )
-            Help::ShowBalloon( this, rHEvt.GetMousePosPixel(), aScreenRect,
+            Help::ShowBalloon( this, rHEvt.GetMousePosPixel(), aScreenRect, 
             aStr );
         else if ( Help::IsQuickHelpEnabled() )
             Help::ShowQuickHelp( this, aScreenRect, aStr );
diff --git a/xmlsecurity/source/dialogs/macrosecurity.src b/xmlsecurity/source/dialogs/macrosecurity.src
index 0683606f500c..9e7411ef92c2 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.src
+++ b/xmlsecurity/source/dialogs/macrosecurity.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx
index 2bb2bd1fa262..4022f497e98e 100644
--- a/xmlsecurity/source/dialogs/resourcemanager.cxx
+++ b/xmlsecurity/source/dialogs/resourcemanager.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,17 +45,17 @@ using namespace std;
 
 namespace XmlSec
 {
-    static ResMgr*          pResMgr = 0;
+    static ResMgr*			pResMgr = 0;
     static SvtSysLocale*    pSysLocale = 0;
 
     ResMgr* GetResMgr( void )
     {
         if( !pResMgr )
         {
-            ByteString  aName( "xmlsec" );
-//          pResMgr = ResMgr::CreateResMgr( aName.GetBuffer(), Application::GetSettings().GetUILanguage() );
-//          LanguageType    aLang( LANGUAGE_ENGLISH_US );
-//          pResMgr = ResMgr::CreateResMgr( aName.GetBuffer(), aLang );
+            ByteString	aName( "xmlsec" );
+//    		pResMgr = ResMgr::CreateResMgr( aName.GetBuffer(), Application::GetSettings().GetUILanguage() );
+//			LanguageType	aLang( LANGUAGE_ENGLISH_US );
+//			pResMgr = ResMgr::CreateResMgr( aName.GetBuffer(), aLang );
 // MT: Change to Locale
             pResMgr = ResMgr::CreateResMgr( aName.GetBuffer() );
         }
@@ -114,11 +114,11 @@ namespace XmlSec
     }
 
     /*
-        Creates two strings based on the distinguished name which are displayed in the
+        Creates two strings based on the distinguished name which are displayed in the 
         certificate details view. The first string contains only the values of the attribute
         and valudes pairs, which are separated by commas. All escape characters ('"') are
         removed.
-        The second string is for the details view at the bottom. It shows the attribute/value
+        The second string is for the details view at the bottom. It shows the attribute/value 
         pairs on different lines. All escape characters ('"') are removed.
     */
     pair< OUString, OUString> GetDNForCertDetailsView( const OUString & rRawString)
@@ -141,11 +141,11 @@ namespace XmlSec
         }
         return make_pair(s1.makeStringAndClear(), s2.makeStringAndClear());
     }
-
+ 
 /*
     Whenever the attribute value contains special characters, such as '"' or ',' (without '')
     then the value will be enclosed in double quotes by the respective Windows or NSS function
-    which we use to retrieve, for example, the subject name. If double quotes appear in the value then
+    which we use to retrieve, for example, the subject name. If double quotes appear in the value then 
     they are escaped with a double quote. This function removes the escape characters.
 */
 #ifdef WNT
@@ -163,7 +163,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
         for (sal_Int32 i = 0; i < length; i++)
         {
             sal_Unicode c = rRawString[i];
-
+        
             if (c == '=')
             {
                 if (! bInValue)
@@ -181,9 +181,9 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
             {
                 if (!bInEscape)
                 {
-                    //If this is the quote is the first of the couple which enclose the
+                    //If this is the quote is the first of the couple which enclose the 
                     //whole value, because the value contains special characters
-                    //then we just drop it. That is, this character must be followed by
+                    //then we just drop it. That is, this character must be followed by 
                     //a character which is not '"'.
                     if ( i + 1 < length && rRawString[i+1] == '"')
                         bInEscape = true;
@@ -192,7 +192,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
                 }
                 else
                 {
-                    //This quote is escaped by a preceding quote and therefore is
+                    //This quote is escaped by a preceding quote and therefore is 
                     //part of the value
                     sbufValue.append(c);
                     bInEscape = false;
@@ -200,8 +200,8 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
             }
             else if (c == ',' || c == '+')
             {
-                //The comma separate the attribute value pairs.
-                //If the comma is not part of a value (the value would then be enclosed in '"'),
+                //The comma separate the attribute value pairs. 
+                //If the comma is not part of a value (the value would then be enclosed in '"'), 
                 //then we have reached the end of the value
                 if (!bInValue)
                 {
@@ -215,7 +215,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
                 else
                 {
                     //The whole string is enclosed because it contains special characters.
-                    //The enclosing '"' are not part of certificate but will be added by
+                    //The enclosing '"' are not part of certificate but will be added by 
                     //the function (Windows or NSS) which retrieves DN
                     sbufValue.append(c);
                 }
@@ -249,7 +249,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
         for (sal_Int32 i = 0; i < length; i++)
         {
             sal_Unicode c = rRawString[i];
-
+        
             if (c == '=')
             {
                 if (! bInValue)
@@ -273,7 +273,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
                 { // bInEscape is true
                     sbufValue.append(c);
                     bInEscape = false;
-                }
+                }      
             }
             else if (c == '"')
             {
@@ -287,7 +287,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
                 }
                 else
                 {
-                    //This quote is escaped by a preceding quote and therefore is
+                    //This quote is escaped by a preceding quote and therefore is 
                     //part of the value
                     sbufValue.append(c);
                     bInEscape = false;
@@ -295,8 +295,8 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
             }
             else if (c == ',' || c == '+')
             {
-                //The comma separate the attribute value pairs.
-                //If the comma is not part of a value (the value would then be enclosed in '"'),
+                //The comma separate the attribute value pairs. 
+                //If the comma is not part of a value (the value would then be enclosed in '"'), 
                 //then we have reached the end of the value
                 if (!bInValue)
                 {
@@ -310,7 +310,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
                 else
                 {
                     //The whole string is enclosed because it contains special characters.
-                    //The enclosing '"' are not part of certificate but will be added by
+                    //The enclosing '"' are not part of certificate but will be added by 
                     //the function (Windows or NSS) which retrieves DN
                     sbufValue.append(c);
                 }
@@ -360,14 +360,14 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
 
     String GetHexString( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rSeq, const char* _pSep, UINT16 _nLineBreak )
     {
-        const sal_Int8*         pSerNumSeq = _rSeq.getConstArray();
-        int                     nCnt = _rSeq.getLength();
-        String                  aStr;
-        const char              pHexDigs[ 17 ] = "0123456789ABCDEF";
-        char                    pBuffer[ 3 ] = "  ";
-        UINT8                   nNum;
-        UINT16                  nBreakStart = _nLineBreak? _nLineBreak : 1;
-        UINT16                  nBreak = nBreakStart;
+        const sal_Int8*			pSerNumSeq = _rSeq.getConstArray();
+        int						nCnt = _rSeq.getLength();
+        String					aStr;
+        const char				pHexDigs[ 17 ] = "0123456789ABCDEF";
+        char					pBuffer[ 3 ] = "  ";
+        UINT8					nNum;
+        UINT16					nBreakStart = _nLineBreak? _nLineBreak : 1;
+        UINT16					nBreak = nBreakStart;
         for( int i = 0 ; i < nCnt ; ++i )
         {
             nNum = UINT8( pSerNumSeq[ i ] );
@@ -393,8 +393,8 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
 
     long ShrinkToFitWidth( Control& _rCtrl, long _nOffs )
     {
-        long    nWidth = _rCtrl.GetTextWidth( _rCtrl.GetText() );
-        Size    aSize( _rCtrl.GetSizePixel() );
+        long	nWidth = _rCtrl.GetTextWidth( _rCtrl.GetText() );
+        Size	aSize( _rCtrl.GetSizePixel() );
         nWidth += _nOffs;
         aSize.Width() = nWidth;
         _rCtrl.SetSizePixel( aSize );
@@ -403,15 +403,15 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
 
     void AlignAfterImage( const FixedImage& _rImage, Control& _rCtrl, long _nXOffset )
     {
-        Point   aPos( _rImage.GetPosPixel() );
-        Size    aSize( _rImage.GetSizePixel() );
-        long    n = aPos.X();
+        Point	aPos( _rImage.GetPosPixel() );
+        Size	aSize( _rImage.GetSizePixel() );
+        long	n = aPos.X();
         n += aSize.Width();
         n += _nXOffset;
         aPos.X() = n;
         n = aPos.Y();
-        n += aSize.Height() / 2;                    // y-position is in the middle of the image
-        n -= _rCtrl.GetSizePixel().Height() / 2;    // center Control
+        n += aSize.Height() / 2;					// y-position is in the middle of the image
+        n -= _rCtrl.GetSizePixel().Height() / 2;	// center Control
         aPos.Y() = n;
         _rCtrl.SetPosPixel( aPos );
     }
diff --git a/xmlsecurity/source/dialogs/resourcemanager.hxx b/xmlsecurity/source/dialogs/resourcemanager.hxx
index ffea19c9a0a8..3f3e552eb8b4 100644
--- a/xmlsecurity/source/dialogs/resourcemanager.hxx
+++ b/xmlsecurity/source/dialogs/resourcemanager.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,29 +43,29 @@ class LocaleDataWrapper;
 
 namespace XmlSec
 {
-    ResMgr*         GetResMgr( void );
+    ResMgr*			GetResMgr( void );
 
     const LocaleDataWrapper&    GetLocaleData( void );
-    DateTime        GetDateTime( const ::com::sun::star::util::DateTime& _rDT );
-    String          GetDateTimeString( const ::com::sun::star::util::DateTime& _rDT );
-    String          GetDateTimeString( const rtl::OUString& _rDate, const rtl::OUString& _rTime );
-    String          GetDateString( const ::com::sun::star::util::DateTime& _rDT );
+    DateTime		GetDateTime( const ::com::sun::star::util::DateTime& _rDT );
+    String			GetDateTimeString( const ::com::sun::star::util::DateTime& _rDT );
+    String			GetDateTimeString( const rtl::OUString& _rDate, const rtl::OUString& _rTime );
+    String			GetDateString( const ::com::sun::star::util::DateTime& _rDT );
 
-    std::vector< std::pair< ::rtl::OUString, ::rtl::OUString> >
+    std::vector< std::pair< ::rtl::OUString, ::rtl::OUString> > 
         parseDN(const ::rtl::OUString& rRawString);
-    std::pair< ::rtl::OUString, ::rtl::OUString> GetDNForCertDetailsView(
+    std::pair< ::rtl::OUString, ::rtl::OUString> GetDNForCertDetailsView( 
         const ::rtl::OUString & rRawString);
     String          GetContentPart( const String& _rRawString );
 
-    String          GetHexString( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rSeq, const char* _pSep = ":", UINT16 _nLineBreak = 0xFFFF );
+    String			GetHexString( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rSeq, const char* _pSep = ":", UINT16 _nLineBreak = 0xFFFF );
 
-    long            ShrinkToFitWidth( Control& _rCtrl, long _nOffs = 0 );       // return = new width
-    void            AlignAfterImage( const FixedImage& _rImage, Control& _rCtrl, long _nXOffset = 0 );
-    void            AlignAfterImage( const FixedImage& _rImage, FixedInfo& _rFI, long _nXOffset = 0 );
-    void            AlignAndFitImageAndControl( FixedImage& _rImage, FixedInfo& _rFI, long _nXOffset = 0 );
+    long			ShrinkToFitWidth( Control& _rCtrl, long _nOffs = 0 );		// return = new width
+    void			AlignAfterImage( const FixedImage& _rImage, Control& _rCtrl, long _nXOffset = 0 );
+    void			AlignAfterImage( const FixedImage& _rImage, FixedInfo& _rFI, long _nXOffset = 0 );
+    void			AlignAndFitImageAndControl( FixedImage& _rImage, FixedInfo& _rFI, long _nXOffset = 0 );
 }
 
-#define XMLSEC_RES(id)      ResId(id,*XmlSec::GetResMgr())
+#define XMLSEC_RES(id)		ResId(id,*XmlSec::GetResMgr())
 
 #endif
 
diff --git a/xmlsecurity/source/dialogs/stbcontrl.cxx b/xmlsecurity/source/dialogs/stbcontrl.cxx
index 19a8cc675622..ee726d8a9524 100644
--- a/xmlsecurity/source/dialogs/stbcontrl.cxx
+++ b/xmlsecurity/source/dialogs/stbcontrl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <xmlsecurity/stbcontrl.hxx>
 
-#define PAINT_OFFSET    5
+#define PAINT_OFFSET	5
 
 SFX_IMPL_STATUSBAR_CONTROL( XmlSecStatusBarControl, SfxBoolItem );
 
@@ -53,10 +53,10 @@ class FunctionPopup_Impl : public PopupMenu
 public:
     FunctionPopup_Impl( USHORT nCheck );
 
-    USHORT          GetSelected() const { return nSelected; }
+    USHORT			GetSelected() const { return nSelected; }
 
 private:
-    USHORT          nSelected;
+    USHORT			nSelected;
 
     virtual void    Select();
 };
@@ -83,10 +83,10 @@ void FunctionPopup_Impl::Select()
 
 struct XmlSecStatusBarControl::XmlSecStatusBarControl_Impl
 {
-    Point       maPos;
-    Size        maSize;
-    bool        mbSigned;
-    Image       maImage;
+    Point		maPos;
+    Size		maSize;
+    bool		mbSigned;
+    Image		maImage;
 };
 
 
@@ -96,7 +96,7 @@ XmlSecStatusBarControl::XmlSecStatusBarControl( USHORT _nId, StatusBar& _rStb, S
     ,mpImpl( new XmlSecStatusBarControl_Impl )
 {
     mpImpl->mbSigned = false;
-//  pImp->maImage = Image( ResId( RID_SVXBMP_POSITION, DIALOG_MGR() ) );
+//	pImp->maImage = Image( ResId( RID_SVXBMP_POSITION, DIALOG_MGR() ) );
 }
 
 XmlSecStatusBarControl::~XmlSecStatusBarControl()
@@ -106,8 +106,8 @@ XmlSecStatusBarControl::~XmlSecStatusBarControl()
 
 void XmlSecStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
 {
-    GetStatusBar().SetHelpText( GetId(), String() );    // necessary ?
-    GetStatusBar().SetHelpId( GetId(), nSID );          // necessary ?
+    GetStatusBar().SetHelpText( GetId(), String() );	// necessary ?
+    GetStatusBar().SetHelpId( GetId(), nSID );			// necessary ?
 
     if( SFX_ITEM_AVAILABLE != eState )
     {
@@ -123,19 +123,19 @@ void XmlSecStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, con
         mpImpl->mbSigned = false;
     }
 
-    if( GetStatusBar().AreItemsVisible() )              // necessary ?
+    if( GetStatusBar().AreItemsVisible() )				// necessary ?
         GetStatusBar().SetItemData( GetId(), 0 );
 
-    GetStatusBar().SetItemText( GetId(), String() );    // necessary ?
+    GetStatusBar().SetItemText( GetId(), String() );	// necessary ?
 }
 
 void XmlSecStatusBarControl::Command( const CommandEvent& rCEvt )
 {
     // can / has to be done when integrated in Office!
-//  if( rCEvt.GetCommand() == .... )
+//	if( rCEvt.GetCommand() == .... )
     if( false )
     {
-//      GetBindings().GetDispatcher()->Execute( SID_PSZ_FUNCTION, SFX_CALLMODE_RECORD, &aItem, 0L );
+//		GetBindings().GetDispatcher()->Execute( SID_PSZ_FUNCTION, SFX_CALLMODE_RECORD, &aItem, 0L );
     }
     else
         SfxStatusBarControl::Command( rCEvt );
@@ -143,19 +143,19 @@ void XmlSecStatusBarControl::Command( const CommandEvent& rCEvt )
 
 void XmlSecStatusBarControl::Paint( const UserDrawEvent& rUsrEvt )
 {
-    OutputDevice*       pDev = rUsrEvt.GetDevice();
+    OutputDevice*		pDev = rUsrEvt.GetDevice();
     DBG_ASSERT( pDev, "-XmlSecStatusBarControl::Paint(): no Output Device... this will lead to nirvana..." );
-    const Rectangle&    rRect = rUsrEvt.GetRect();
-    StatusBar&          rBar = GetStatusBar();
-    Point               aItemPos = rBar.GetItemTextPos( GetId() );
-    Color               aOldLineColor = pDev->GetLineColor();
-    Color               aOldFillColor = pDev->GetFillColor();
+    const Rectangle&	rRect = rUsrEvt.GetRect();
+    StatusBar&			rBar = GetStatusBar();
+    Point				aItemPos = rBar.GetItemTextPos( GetId() );
+    Color				aOldLineColor = pDev->GetLineColor();
+    Color				aOldFillColor = pDev->GetFillColor();
 
     // just 4 testing until we've got a bitmap
     pDev->SetLineColor();
     pDev->SetFillColor( pDev->GetBackground().GetColor() );
 
-    String              s( String::CreateFromAscii( mpImpl->mbSigned? "X" : "-" ) );
+    String				s( String::CreateFromAscii( mpImpl->mbSigned? "X" : "-" ) );
     pDev->DrawRect( rRect );
     pDev->DrawText( Point( rRect.Left() + rRect.GetWidth() / 2 - pDev->GetTextWidth( s ) / 2, aItemPos.Y() ), s );
 
diff --git a/xmlsecurity/source/dialogs/warnings.cxx b/xmlsecurity/source/dialogs/warnings.cxx
index a5dd33ca9cca..be836a92de26 100644
--- a/xmlsecurity/source/dialogs/warnings.cxx
+++ b/xmlsecurity/source/dialogs/warnings.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ using namespace ::com::sun::star::security;
 
 /* HACK: disable some warnings for MS-C */
 #ifdef _MSC_VER
-#pragma warning (disable : 4355)    // 4355: this used in initializer-list
+#pragma warning (disable : 4355)	// 4355: this used in initializer-list
 #endif
 
 using namespace ::com::sun::star;
@@ -53,19 +53,19 @@ using namespace ::com::sun::star;
 
 
 MacroWarning::MacroWarning( Window* _pParent, uno::Reference< dcss::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment, cssu::Reference< dcss::security::XCertificate >& _rxCert )
-    :ModalDialog        ( _pParent, XMLSEC_RES( RID_XMLSECTP_MACROWARN ) )
-    ,maDocNameFI        ( this, ResId( FI_DOCNAME ) )
-    ,maDescr1aFI        ( this, ResId( FI_DESCR1A ) )
-    ,maDescr1bFI        ( this, ResId( FI_DESCR1B ) )
-    ,maSignsFI          ( this, ResId( FI_SIGNS ) )
-    ,maViewSignsBtn     ( this, ResId( PB_VIEWSIGNS ) )
-    ,maDescr2FI         ( this, ResId( FI_DESCR2 ) )
-    ,maAlwaysTrustCB    ( this, ResId( CB_ALWAYSTRUST ) )
-    ,maBottomSepFL      ( this, ResId( FL_BOTTOM_SEP ) )
-    ,maEnableBtn        ( this, ResId( PB_DISABLE ) )
-    ,maDisableBtn       ( this, ResId( PB_DISABLE ) )
-    ,maHelpBtn          ( this, ResId( BTN_HELP ) )
-    ,mbSignedMode       ( true )
+    :ModalDialog		( _pParent, XMLSEC_RES( RID_XMLSECTP_MACROWARN ) )
+    ,maDocNameFI		( this, ResId( FI_DOCNAME ) )
+    ,maDescr1aFI		( this, ResId( FI_DESCR1A ) )
+    ,maDescr1bFI		( this, ResId( FI_DESCR1B ) )
+    ,maSignsFI			( this, ResId( FI_SIGNS ) )
+    ,maViewSignsBtn		( this, ResId( PB_VIEWSIGNS ) )
+    ,maDescr2FI			( this, ResId( FI_DESCR2 ) )
+    ,maAlwaysTrustCB	( this, ResId( CB_ALWAYSTRUST ) )
+    ,maBottomSepFL		( this, ResId( FL_BOTTOM_SEP ) )
+    ,maEnableBtn		( this, ResId( PB_DISABLE ) )
+    ,maDisableBtn		( this, ResId( PB_DISABLE ) )
+    ,maHelpBtn			( this, ResId( BTN_HELP ) )
+    ,mbSignedMode		( true )
 {
     FreeResource();
 
@@ -77,7 +77,7 @@ MacroWarning::MacroWarning( Window* _pParent, uno::Reference< dcss::xml::crypto:
 
     maViewSignsBtn.SetClickHdl( LINK( this, MacroWarning, ViewSignsBtnHdl ) );
     maEnableBtn.SetClickHdl( LINK( this, MacroWarning, EnableBtnHdl ) );
-//  maDisableBtn.SetClickHdl( LINK( this, MacroWarning, DisableBtnHdl ) );
+//	maDisableBtn.SetClickHdl( LINK( this, MacroWarning, DisableBtnHdl ) );
 
     if( mxCert.is() )
         maSignsFI.SetText( XmlSec::GetContentPart( mxCert->getSubjectName() ) );
@@ -87,19 +87,19 @@ MacroWarning::MacroWarning( Window* _pParent, uno::Reference< dcss::xml::crypto:
 }
 
 MacroWarning::MacroWarning( Window* _pParent )
-    :ModalDialog        ( _pParent, XMLSEC_RES( RID_XMLSECTP_MACROWARN ) )
-    ,maDocNameFI        ( this, ResId( FI_DOCNAME ) )
-    ,maDescr1aFI        ( this, ResId( FI_DESCR1A ) )
-    ,maDescr1bFI        ( this, ResId( FI_DESCR1B ) )
-    ,maSignsFI          ( this, ResId( FI_SIGNS ) )
-    ,maViewSignsBtn     ( this, ResId( PB_VIEWSIGNS ) )
-    ,maDescr2FI         ( this, ResId( FI_DESCR2 ) )
-    ,maAlwaysTrustCB    ( this, ResId( CB_ALWAYSTRUST ) )
-    ,maBottomSepFL      ( this, ResId( FL_BOTTOM_SEP ) )
-    ,maEnableBtn        ( this, ResId( PB_DISABLE ) )
-    ,maDisableBtn       ( this, ResId( PB_DISABLE ) )
-    ,maHelpBtn          ( this, ResId( BTN_HELP ) )
-    ,mbSignedMode       ( false )
+    :ModalDialog		( _pParent, XMLSEC_RES( RID_XMLSECTP_MACROWARN ) )
+    ,maDocNameFI		( this, ResId( FI_DOCNAME ) )
+    ,maDescr1aFI		( this, ResId( FI_DESCR1A ) )
+    ,maDescr1bFI		( this, ResId( FI_DESCR1B ) )
+    ,maSignsFI			( this, ResId( FI_SIGNS ) )
+    ,maViewSignsBtn		( this, ResId( PB_VIEWSIGNS ) )
+    ,maDescr2FI			( this, ResId( FI_DESCR2 ) )
+    ,maAlwaysTrustCB	( this, ResId( CB_ALWAYSTRUST ) )
+    ,maBottomSepFL		( this, ResId( FL_BOTTOM_SEP ) )
+    ,maEnableBtn		( this, ResId( PB_DISABLE ) )
+    ,maDisableBtn		( this, ResId( PB_DISABLE ) )
+    ,maHelpBtn			( this, ResId( BTN_HELP ) )
+    ,mbSignedMode		( false )
 {
     FreeResource();
 
@@ -122,7 +122,7 @@ IMPL_LINK( MacroWarning, ViewSignsBtnHdl, void*, EMPTYARG )
 {
     DBG_ASSERT( mxCert.is(), "*MacroWarning::ViewSignsBtnHdl(): no certificate set!" );
 
-    CertificateViewer   aViewer( this, mxSecurityEnvironment, mxCert );
+    CertificateViewer	aViewer( this, mxSecurityEnvironment, mxCert );
     aViewer.Execute();
 
     return 0;
@@ -131,7 +131,7 @@ IMPL_LINK( MacroWarning, ViewSignsBtnHdl, void*, EMPTYARG )
 IMPL_LINK( MacroWarning, EnableBtnHdl, void*, EMPTYARG )
 {
     if( mbSignedMode && maAlwaysTrustCB.IsChecked() )
-    {   // insert path into trusted path list
+    {	// insert path into trusted path list
 
     }
 
diff --git a/xmlsecurity/source/dialogs/warnings.src b/xmlsecurity/source/dialogs/warnings.src
index 2e0e697dae1f..913717d3beb0 100644
--- a/xmlsecurity/source/dialogs/warnings.src
+++ b/xmlsecurity/source/dialogs/warnings.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/xmlsecurity/source/framework/buffernode.cxx b/xmlsecurity/source/framework/buffernode.cxx
index 2cf283cf5bc4..1ce46eb188a3 100644
--- a/xmlsecurity/source/framework/buffernode.cxx
+++ b/xmlsecurity/source/framework/buffernode.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,42 +50,42 @@ bool BufferNode::isECOfBeforeModifyIncluded(sal_Int32 nIgnoredSecurityId) const
 /****** BufferNode/isECOfBeforeModifyIncluded ********************************
  *
  *   NAME
- *  isECOfBeforeModifyIncluded -- checks whether there is some
- *  ElementCollector on this BufferNode, that has BEFORE-MODIFY priority.
+ *	isECOfBeforeModifyIncluded -- checks whether there is some 
+ *	ElementCollector on this BufferNode, that has BEFORE-MODIFY priority.
  *
  *   SYNOPSIS
- *  bExist = isECOfBeforeModifyIncluded(nIgnoredSecurityId);
+ *	bExist = isECOfBeforeModifyIncluded(nIgnoredSecurityId);
  *
  *   FUNCTION
- *  checks each ElementCollector on this BufferNode, if all following
- *  conditions are satisfied, then returns true:
- *  1. the ElementCollector's priority is BEFOREMODIFY;
- *  2. the ElementCollector's securityId can't be ignored.
- *  otherwise, returns false.
+ *	checks each ElementCollector on this BufferNode, if all following
+ *	conditions are satisfied, then returns true:
+ *	1. the ElementCollector's priority is BEFOREMODIFY;
+ *	2. the ElementCollector's securityId can't be ignored.
+ *	otherwise, returns false.
  *
  *   INPUTS
- *  nIgnoredSecurityId -    the security Id to be ignored. If it equals
- *                          to UNDEFINEDSECURITYID, then no security Id
- *                          will be ignored.
+ *	nIgnoredSecurityId -	the security Id to be ignored. If it equals
+ *	                        to UNDEFINEDSECURITYID, then no security Id
+ *	                    	will be ignored.
  *
  *   RESULT
- *  bExist - true if a match found, false otherwise
+ *	bExist - true if a match found, false otherwise
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     bool rc = false;
     std::vector< const ElementCollector* >::const_iterator ii = m_vElementCollectors.begin();
 
-    for( ; ii != m_vElementCollectors.end() ; ++ii )
+    for( ; ii != m_vElementCollectors.end() ; ++ii ) 
     {
         ElementCollector* pElementCollector = (ElementCollector*)*ii;
-
+        
         if ((nIgnoredSecurityId == cssxc::sax::ConstOfSecurityId::UNDEFINEDSECURITYID ||
              pElementCollector->getSecurityId() != nIgnoredSecurityId) &&
             (pElementCollector->getPriority() == cssxc::sax::ElementMarkPriority_BEFOREMODIFY))
@@ -94,7 +94,7 @@ bool BufferNode::isECOfBeforeModifyIncluded(sal_Int32 nIgnoredSecurityId) const
             break;
         }
     }
-
+    
     return rc;
 }
 
@@ -102,28 +102,28 @@ void BufferNode::setReceivedAll()
 /****** BufferNode/setReceiveAll *********************************************
  *
  *   NAME
- *  setReceivedAll -- indicates that the element in this BufferNode has
- *  been compeletely bufferred.
+ *	setReceivedAll -- indicates that the element in this BufferNode has
+ *	been compeletely bufferred.
  *
  *   SYNOPSIS
- *  setReceivedAll();
+ *	setReceivedAll();
  *
  *   FUNCTION
- *  sets the all-received flag and launches ElementCollector's notify
- *  process.
+ *	sets the all-received flag and launches ElementCollector's notify
+ *	process.
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     m_bAllReceived = true;
@@ -139,26 +139,26 @@ void BufferNode::addElementCollector(const ElementCollector* pElementCollector)
 /****** BufferNode/addElementCollector ***************************************
  *
  *   NAME
- *  addElementCollector -- adds a new ElementCollector to this BufferNode.
+ *	addElementCollector -- adds a new ElementCollector to this BufferNode.
  *
  *   SYNOPSIS
- *  addElementCollector(pElementCollector);
+ *	addElementCollector(pElementCollector);
  *
  *   FUNCTION
- *  see NAME
+ *	see NAME
  *
  *   INPUTS
- *  pElementCollector - the ElementCollector to be added
+ *	pElementCollector - the ElementCollector to be added
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     m_vElementCollectors.push_back( pElementCollector );
@@ -169,34 +169,34 @@ void BufferNode::removeElementCollector(const ElementCollector* pElementCollecto
 /****** BufferNode/removeElementCollector ************************************
  *
  *   NAME
- *  removeElementCollector -- removes an ElementCollector from this
- *  BufferNode.
+ *	removeElementCollector -- removes an ElementCollector from this
+ *	BufferNode.
  *
  *   SYNOPSIS
- *  removeElementCollector(pElementCollector);
+ *	removeElementCollector(pElementCollector);
  *
  *   FUNCTION
- *  see NAME
+ *	see NAME
  *
  *   INPUTS
- *  pElementCollector - the ElementCollector to be removed
+ *	pElementCollector - the ElementCollector to be removed
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     std::vector< const ElementCollector* >::iterator ii = m_vElementCollectors.begin();
 
-    for( ; ii != m_vElementCollectors.end() ; ++ii )
+    for( ; ii != m_vElementCollectors.end() ; ++ii ) 
     {
-        if( *ii == pElementCollector )
+        if( *ii == pElementCollector ) 
         {
             m_vElementCollectors.erase( ii );
             ((ElementCollector*)pElementCollector)->setBufferNode(NULL);
@@ -214,34 +214,34 @@ void BufferNode::setBlocker(const ElementMark* pBlocker)
 /****** BufferNode/setBlocker ************************************************
  *
  *   NAME
- *  setBlocker -- adds a blocker to this BufferNode.
+ *	setBlocker -- adds a blocker to this BufferNode.
  *
  *   SYNOPSIS
- *  setBlocker(pBlocker);
+ *	setBlocker(pBlocker);
  *
  *   FUNCTION
- *  see NAME
+ *	see NAME
  *
  *   INPUTS
- *  pBlocker - the new blocker to be attached
+ *	pBlocker - the new blocker to be attached
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   NOTES
- *  Because there is only one blocker permited for a BufferNode, so the
- *  old blocker on this BufferNode, if there is one, will be overcasted.
+ *	Because there is only one blocker permited for a BufferNode, so the
+ *	old blocker on this BufferNode, if there is one, will be overcasted.
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     OSL_ASSERT(!(m_pBlocker != NULL && pBlocker != NULL));
-
+    
     m_pBlocker = (ElementMark*)pBlocker;
     if (m_pBlocker != NULL)
     {
@@ -253,32 +253,32 @@ rtl::OUString BufferNode::printChildren() const
 /****** BufferNode/printChildren *********************************************
  *
  *   NAME
- *  printChildren -- prints children information into a string.
+ *	printChildren -- prints children information into a string.
  *
  *   SYNOPSIS
- *  result = printChildren();
+ *	result = printChildren();
  *
  *   FUNCTION
- *  see NAME
+ *	see NAME
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  result - the information string
+ *	result - the information string
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
-{
+{ 
     rtl::OUString rc;
     std::vector< const ElementCollector* >::const_iterator ii = m_vElementCollectors.begin();
-
-    for( ; ii != m_vElementCollectors.end() ; ++ii )
+            
+    for( ; ii != m_vElementCollectors.end() ; ++ii ) 
     {
         rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BufID=" ));
         rc += rtl::OUString::valueOf((*ii)->getBufferId());
@@ -287,9 +287,9 @@ rtl::OUString BufferNode::printChildren() const
         {
             rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "[M]" ));
         }
-
+        
         rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ",Pri=" ));
-
+        
         switch (((ElementCollector*)(*ii))->getPriority())
         {
             case cssxc::sax::ElementMarkPriority_BEFOREMODIFY:
@@ -302,7 +302,7 @@ rtl::OUString BufferNode::printChildren() const
                 rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UNKNOWN" ));
                 break;
         }
-
+        
         rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "(" ));
         /*
         if (((ElementCollector*)(*ii))->isInternalNotificationSuppressed())
@@ -315,7 +315,7 @@ rtl::OUString BufferNode::printChildren() const
         rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ")" ));
         rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " " ));
     }
-
+    
     return rc;
 }
 
@@ -323,27 +323,27 @@ bool BufferNode::hasAnything() const
 /****** BufferNode/hasAnything ***********************************************
  *
  *   NAME
- *  hasAnything -- checks whether there is any ElementCollector or blocker
- *  on this BufferNode.
+ *	hasAnything -- checks whether there is any ElementCollector or blocker
+ *	on this BufferNode.
  *
  *   SYNOPSIS
- *  bExist = hasAnything();
+ *	bExist = hasAnything();
  *
  *   FUNCTION
- *  see NAME
+ *	see NAME
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  bExist - true if there is, false otherwise.
+ *	bExist - true if there is, false otherwise.
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     return (m_pBlocker != NULL || m_vElementCollectors.size() > 0);
@@ -353,27 +353,27 @@ bool BufferNode::hasChildren() const
 /****** BufferNode/hasChildren ***********************************************
  *
  *   NAME
- *  hasChildren -- checks whether this BufferNode has any child
- *  BufferNode.
+ *	hasChildren -- checks whether this BufferNode has any child
+ *	BufferNode.
  *
  *   SYNOPSIS
- *  bExist = hasChildren();
+ *	bExist = hasChildren();
  *
  *   FUNCTION
- *  see NAME
+ *	see NAME
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  bExist - true if there is, false otherwise.
+ *	bExist - true if there is, false otherwise.
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     return (m_vChildren.size() > 0);
@@ -388,36 +388,36 @@ const BufferNode* BufferNode::getFirstChild() const
 /****** BufferNode/getFirstChild *********************************************
  *
  *   NAME
- *  getFirstChild -- retrieves the first child BufferNode.
+ *	getFirstChild -- retrieves the first child BufferNode.
  *
  *   SYNOPSIS
- *  child = getFirstChild();
+ *	child = getFirstChild();
  *
  *   FUNCTION
- *  see NAME
+ *	see NAME
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  child - the first child BufferNode, or NULL if there is no child
- *          BufferNode.
+ *	child -	the first child BufferNode, or NULL if there is no child
+ *	       	BufferNode.
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     BufferNode* rc = NULL;
-
+    
     if (m_vChildren.size() > 0)
     {
         rc = (BufferNode*)m_vChildren.front();
     }
-
+    
     return (const BufferNode*)rc;
 }
 
@@ -425,31 +425,31 @@ void BufferNode::addChild(const BufferNode* pChild, sal_Int32 nPosition)
 /****** BufferNode/addChild(pChild,nPosition) ********************************
  *
  *   NAME
- *  addChild -- inserts a child BufferNode at specific position.
+ *	addChild -- inserts a child BufferNode at specific position.
  *
  *   SYNOPSIS
- *  addChild(pChild, nPosition);
+ *	addChild(pChild, nPosition);
  *
  *   FUNCTION
- *  see NAME
+ *	see NAME
  *
  *   INPUTS
- *  pChild -    the child BufferNode to be added.
- *  nPosition - the position where the new child locates.
+ *	pChild - 	the child BufferNode to be added.
+ *	nPosition -	the position where the new child locates.
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   NOTES
- *  If the nPosition is -1, then the new child BufferNode is appended
- *  at the end.
+ *	If the nPosition is -1, then the new child BufferNode is appended
+ *	at the end.
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     if (nPosition == -1)
@@ -468,29 +468,29 @@ void BufferNode::addChild(const BufferNode* pChild)
 /****** BufferNode/addChild() ************************************************
  *
  *   NAME
- *  addChild -- add a new child BufferNode.
+ *	addChild -- add a new child BufferNode.
  *
  *   SYNOPSIS
- *  addChild(pChild);
+ *	addChild(pChild);
  *
  *   FUNCTION
- *  see NAME
+ *	see NAME
  *
  *   INPUTS
- *  pChild -    the child BufferNode to be added.
+ *	pChild - 	the child BufferNode to be added.
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   NOTES
- *  The new child BufferNode is appended at the end.
+ *	The new child BufferNode is appended at the end.
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     addChild(pChild, -1);
@@ -500,33 +500,33 @@ void BufferNode::removeChild(const BufferNode* pChild)
 /****** BufferNode/removeChild ***********************************************
  *
  *   NAME
- *  removeChild -- removes a child BufferNode from the children list.
+ *	removeChild -- removes a child BufferNode from the children list.
  *
  *   SYNOPSIS
- *  removeChild(pChild);
+ *	removeChild(pChild);
  *
  *   FUNCTION
- *  see NAME
+ *	see NAME
  *
  *   INPUTS
- *  pChild - the child BufferNode to be removed
+ *	pChild - the child BufferNode to be removed
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     std::vector< const BufferNode* >::iterator ii = m_vChildren.begin();
 
-    for( ; ii != m_vChildren.end() ; ++ii )
+    for( ; ii != m_vChildren.end() ; ++ii ) 
     {
-        if( *ii == pChild )
+        if( *ii == pChild ) 
         {
             m_vChildren.erase( ii );
             break;
@@ -538,49 +538,49 @@ sal_Int32 BufferNode::indexOfChild(const BufferNode* pChild) const
 /****** BufferNode/indexOfChild **********************************************
  *
  *   NAME
- *  indexOfChild -- gets the index of a child BufferNode.
+ *	indexOfChild -- gets the index of a child BufferNode.
  *
  *   SYNOPSIS
- *  index = indexOfChild(pChild);
+ *	index = indexOfChild(pChild);
  *
  *   FUNCTION
- *  see NAME
+ *	see NAME
  *
  *   INPUTS
- *  pChild - the child BufferNode whose index to be gotten
+ *	pChild - the child BufferNode whose index to be gotten
  *
  *   RESULT
- *  index - the index of that child BufferNode. If that child BufferNode
- *          is not found, -1 is returned.
+ *	index -	the index of that child BufferNode. If that child BufferNode
+ *	       	is not found, -1 is returned.
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     sal_Int32 nIndex = 0;
     bool bFound = false;
-
+    
     std::vector< const BufferNode * >::const_iterator ii = m_vChildren.begin();
 
-    for( ; ii != m_vChildren.end() ; ++ii )
+    for( ; ii != m_vChildren.end() ; ++ii ) 
     {
-        if( *ii == pChild )
+        if( *ii == pChild ) 
         {
             bFound = true;
             break;
         }
         nIndex++;
     }
-
+    
     if (!bFound )
     {
         nIndex = -1;
     }
-
+    
     return nIndex;
 }
 
@@ -588,36 +588,36 @@ const BufferNode* BufferNode::childAt(sal_Int32 nIndex) const
 /****** BufferNode/childAt ***************************************************
  *
  *   NAME
- *  childAt -- retrieves the child BufferNode at specific possition.
+ *	childAt -- retrieves the child BufferNode at specific possition.
  *
  *   SYNOPSIS
- *  child = childAt(nIndex);
+ *	child = childAt(nIndex);
  *
  *   FUNCTION
- *  see NAME
+ *	see NAME
  *
  *   INPUTS
- *  nIndex - the index of the child BufferNode to be retrieved
+ *	nIndex - the index of the child BufferNode to be retrieved
  *
  *   RESULT
- *  child - the child BufferNode at index position, or NULL if the index
- *          is out of the range of children.
+ *	child -	the child BufferNode at index position, or NULL if the index
+ *	       	is out of the range of children.
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     BufferNode* rc = NULL;
-
+    
     if (nIndex < ((sal_Int32)m_vChildren.size()) && nIndex >= 0)
     {
         rc = (BufferNode*)m_vChildren[nIndex];
     }
-
+    
     return (const BufferNode*)rc;
 }
 
@@ -635,35 +635,35 @@ const BufferNode* BufferNode::getNextSibling() const
 /****** BufferNode/getNextSibling ********************************************
  *
  *   NAME
- *  getNextSibling -- retrieves the next sibling BufferNode.
+ *	getNextSibling -- retrieves the next sibling BufferNode.
  *
  *   SYNOPSIS
- *  sibling = getNextSibling();
+ *	sibling = getNextSibling();
  *
  *   FUNCTION
- *  see NAME
+ *	see NAME
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  sibling - the next sibling BufferNode, or NULL if there is none.
+ *	sibling - the next sibling BufferNode, or NULL if there is none.
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     BufferNode* rc = NULL;
-
+    
     if (m_pParent != NULL)
     {
         rc = (BufferNode*)m_pParent->getNextChild(this);
     }
-
+    
     return (const BufferNode*)rc;
 }
 
@@ -671,46 +671,46 @@ const BufferNode* BufferNode::isAncestor(const BufferNode* pDescendant) const
 /****** BufferNode/isAncestor ************************************************
  *
  *   NAME
- *  isAncestor -- checks whether this BufferNode is an ancestor of another
- *  BufferNode.
+ *	isAncestor -- checks whether this BufferNode is an ancestor of another
+ *	BufferNode.
  *
  *   SYNOPSIS
- *  bIs = isAncestor(pDescendant);
+ *	bIs = isAncestor(pDescendant);
  *
  *   FUNCTION
- *  see NAME
+ *	see NAME
  *
  *   INPUTS
- *  pDescendant -   the BufferNode to be checked as a descendant
+ *	pDescendant -	the BufferNode to be checked as a descendant
  *
  *   RESULT
- *  bIs -   true if this BufferNode is an ancestor of the pDescendant,
- *          false otherwise.
+ *	bIs -	true if this BufferNode is an ancestor of the pDescendant, 
+ *	     	false otherwise.
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     BufferNode* rc = NULL;
-
+    
     if (pDescendant != NULL)
     {
         std::vector< const BufferNode* >::const_iterator ii = m_vChildren.begin();
-
-        for( ; ii != m_vChildren.end() ; ++ii )
+    
+        for( ; ii != m_vChildren.end() ; ++ii ) 
         {
             BufferNode* pChild = (BufferNode*)*ii;
-
+            
             if (pChild == pDescendant)
             {
                 rc = pChild;
                 break;
             }
-
+            
             if (pChild->isAncestor(pDescendant) != NULL)
             {
                 rc = pChild;
@@ -720,38 +720,38 @@ const BufferNode* BufferNode::isAncestor(const BufferNode* pDescendant) const
     }
 
     return (const BufferNode*)rc;
-}
+}	
 
 bool BufferNode::isPrevious(const BufferNode* pFollowing) const
 /****** BufferNode/isPrevious ************************************************
  *
  *   NAME
- *  isPrevious -- checks whether this BufferNode is ahead of another
- *  BufferNode in the tree order.
+ *	isPrevious -- checks whether this BufferNode is ahead of another
+ *	BufferNode in the tree order.
  *
  *   SYNOPSIS
- *  bIs = isPrevious(pFollowing);
+ *	bIs = isPrevious(pFollowing);
  *
  *   FUNCTION
- *  see NAME
+ *	see NAME
  *
  *   INPUTS
- *  pFollowing -    the BufferNode to be checked as a following
+ *	pFollowing -	the BufferNode to be checked as a following
  *
  *   RESULT
- *  bIs -   true if this BufferNode is ahead in the tree order, false
- *          otherwise.
+ *	bIs -	true if this BufferNode is ahead in the tree order, false
+ *	     	otherwise.
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     bool rc = false;
-
+    
     BufferNode* pNextBufferNode = (BufferNode*)getNextNodeByTreeOrder();
     while (pNextBufferNode != NULL)
     {
@@ -760,47 +760,47 @@ bool BufferNode::isPrevious(const BufferNode* pFollowing) const
             rc = true;
             break;
         }
-
+        
         pNextBufferNode = (BufferNode*)(pNextBufferNode->getNextNodeByTreeOrder());
     }
-
+    
     return rc;
-}
+}	
 
 const BufferNode* BufferNode::getNextNodeByTreeOrder() const
 /****** BufferNode/getNextNodeByTreeOrder ************************************
  *
  *   NAME
- *  getNextNodeByTreeOrder -- retrieves the next BufferNode in the tree
- *  order.
+ *	getNextNodeByTreeOrder -- retrieves the next BufferNode in the tree
+ *	order.
  *
  *   SYNOPSIS
- *  next = getNextNodeByTreeOrder();
+ *	next = getNextNodeByTreeOrder();
  *
  *   FUNCTION
- *  see NAME
+ *	see NAME
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  next -  the BufferNode following this BufferNode in the tree order,
- *          or NULL if there is none.
+ *	next -	the BufferNode following this BufferNode in the tree order, 
+ *	      	or NULL if there is none.
  *
  *   NOTES
- *  The "next" node in tree order is defined as:
- *  1. If a node has children, then the first child is;
- *  2. otherwise, if it has a following sibling, then this sibling node is;
- *  3. otherwise, if it has a parent node, the the parent's next sibling
- *     node is;
- *  4. otherwise, no "next" node exists.
+ *	The "next" node in tree order is defined as:
+ *	1. If a node has children, then the first child is;
+ *	2. otherwise, if it has a following sibling, then this sibling node is;
+ *	3. otherwise, if it has a parent node, the the parent's next sibling
+ *	   node is;
+ *	4. otherwise, no "next" node exists.
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
         /*
@@ -813,7 +813,7 @@ const BufferNode* BufferNode::getNextNodeByTreeOrder() const
     }
 
         /*
-         * Otherwise, it this buffer node has a following sibling,
+         * Otherwise, it this buffer node has a following sibling, 
          * then return that sibling.
          */
     BufferNode* pNextSibling = (BufferNode*)getNextSibling();
@@ -821,7 +821,7 @@ const BufferNode* BufferNode::getNextNodeByTreeOrder() const
     {
         return pNextSibling;
     }
-
+    
         /*
          * Otherwise, it this buffer node has parent, then return
          * its parent's following sibling.
@@ -829,23 +829,23 @@ const BufferNode* BufferNode::getNextNodeByTreeOrder() const
         BufferNode* pNode = (BufferNode*)this;
     BufferNode* pParent;
     BufferNode* pNextSiblingParent = NULL;
-
+    
     do
     {
         if (pNode == NULL)
         {
             break;
         }
-
+        
         pParent = (BufferNode*)pNode->getParent();
         if (pParent != NULL)
         {
             pNextSiblingParent = (BufferNode*)pParent->getNextSibling();
         }
         pNode = pParent;
-
+        
     }while (pNextSiblingParent == NULL);
-
+    
     return pNextSiblingParent;
 }
 
@@ -857,38 +857,38 @@ cssu::Reference< cssxw::XXMLElementWrapper > BufferNode::getXMLElement() const
 void BufferNode::setXMLElement( const cssu::Reference< cssxw::XXMLElementWrapper >& xXMLElement )
 {
     m_xXMLElement = xXMLElement;
-}
+}	
 
 void BufferNode::notifyBranch()
 /****** BufferNode/notifyBranch **********************************************
  *
  *   NAME
- *  notifyBranch -- notifies each BufferNode in the branch of this
- *  BufferNode in the tree order.
+ *	notifyBranch -- notifies each BufferNode in the branch of this
+ *	BufferNode in the tree order.
  *
  *   SYNOPSIS
- *  notifyBranch();
+ *	notifyBranch();
  *
  *   FUNCTION
- *  see NAME
+ *	see NAME
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     std::vector< const BufferNode* >::const_iterator ii = m_vChildren.begin();
 
-    for( ; ii != m_vChildren.end() ; ++ii )
+    for( ; ii != m_vChildren.end() ; ++ii ) 
     {
         BufferNode* pBufferNode = (BufferNode*)*ii;
         pBufferNode->elementCollectorNotify();
@@ -900,27 +900,27 @@ void BufferNode::notifyAncestor()
 /****** BufferNode/notifyAncestor ********************************************
  *
  *   NAME
- *  notifyAncestor -- notifies each ancestor BufferNode through the parent
- *  link.
+ *	notifyAncestor -- notifies each ancestor BufferNode through the parent
+ *	link.
  *
  *   SYNOPSIS
- *  notifyAncestor();
+ *	notifyAncestor();
  *
  *   FUNCTION
- *  see NAME
+ *	see NAME
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     BufferNode* pParent = m_pParent;
@@ -935,39 +935,39 @@ void BufferNode::elementCollectorNotify()
 /****** BufferNode/elementCollectorNotify ************************************
  *
  *   NAME
- *  elementCollectorNotify -- notifies this BufferNode.
+ *	elementCollectorNotify -- notifies this BufferNode.
  *
  *   SYNOPSIS
- *  elementCollectorNotify();
+ *	elementCollectorNotify();
  *
  *   FUNCTION
- *  Notifies this BufferNode if the notification is not suppressed.
+ *	Notifies this BufferNode if the notification is not suppressed.
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  child - the first child BufferNode, or NULL if there is no child
- *          BufferNode.
+ *	child -	the first child BufferNode, or NULL if there is no child
+ *	       	BufferNode.
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     if (m_vElementCollectors.size()>0)
     {
         cssxc::sax::ElementMarkPriority nMaxPriority = cssxc::sax::ElementMarkPriority_MINIMUM;
         cssxc::sax::ElementMarkPriority nPriority;
-
+        
         /*
          * get the max priority among ElementCollectors on this BufferNode
          */
         std::vector< const ElementCollector* >::const_iterator ii = m_vElementCollectors.begin();
-        for( ; ii != m_vElementCollectors.end() ; ++ii )
+        for( ; ii != m_vElementCollectors.end() ; ++ii ) 
         {
             ElementCollector* pElementCollector = (ElementCollector*)*ii;
             nPriority = pElementCollector->getPriority();
@@ -976,16 +976,16 @@ void BufferNode::elementCollectorNotify()
                 nMaxPriority = nPriority;
             }
         }
-
+        
         std::vector< const ElementCollector* > vElementCollectors( m_vElementCollectors );
         ii = vElementCollectors.begin();
-
-        for( ; ii != vElementCollectors.end() ; ++ii )
+        
+        for( ; ii != vElementCollectors.end() ; ++ii ) 
         {
             ElementCollector* pElementCollector = (ElementCollector*)*ii;
             nPriority = pElementCollector->getPriority();
             bool bToModify = pElementCollector->getModify();
-
+            
             /*
              * Only ElementCollector with the max priority can
              * perform notify operation.
@@ -1007,7 +1007,7 @@ void BufferNode::elementCollectorNotify()
                  * will destroy the bufferred element, in turn, ElementCollectors
                  * mentioned above can't perform their mission.
                  */
-                //if (!(nMaxPriority == cssxc::sax::ElementMarkPriority_PRI_MODIFY &&
+                //if (!(nMaxPriority == cssxc::sax::ElementMarkPriority_PRI_MODIFY && 
                 if (!(bToModify &&
                      (isECInSubTreeIncluded(pElementCollector->getSecurityId()) ||
                       isECOfBeforeModifyInAncestorIncluded(pElementCollector->getSecurityId()))
@@ -1024,38 +1024,38 @@ bool BufferNode::isECInSubTreeIncluded(sal_Int32 nIgnoredSecurityId) const
 /****** BufferNode/isECInSubTreeIncluded *************************************
  *
  *   NAME
- *  isECInSubTreeIncluded -- checks whether there is any ElementCollector
- *  in the branch of this BufferNode.
+ *	isECInSubTreeIncluded -- checks whether there is any ElementCollector
+ *	in the branch of this BufferNode.
  *
  *   SYNOPSIS
- *  bExist = isECInSubTreeIncluded(nIgnoredSecurityId);
+ *	bExist = isECInSubTreeIncluded(nIgnoredSecurityId);
  *
  *   FUNCTION
- *  checks each BufferNode in the branch of this BufferNode, if there is
- *  an ElementCollector whose signatureId is not ignored, then return
- *  true, otherwise, false returned.
+ *	checks each BufferNode in the branch of this BufferNode, if there is
+ *	an ElementCollector whose signatureId is not ignored, then return
+ *	true, otherwise, false returned.
  *
  *   INPUTS
- *  nIgnoredSecurityId -    the security Id to be ignored. If it equals
- *                          to UNDEFINEDSECURITYID, then no security Id
- *                          will be ignored.
+ *	nIgnoredSecurityId -	the security Id to be ignored. If it equals
+ *	                        to UNDEFINEDSECURITYID, then no security Id
+ *	                    	will be ignored.
  *
  *   RESULT
- *  bExist - true if a match found, false otherwise.
+ *	bExist - true if a match found, false otherwise.
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     bool rc = false;
-
+    
     std::vector< const ElementCollector* >::const_iterator jj = m_vElementCollectors.begin();
-
-    for( ; jj != m_vElementCollectors.end() ; ++jj )
+    
+    for( ; jj != m_vElementCollectors.end() ; ++jj ) 
     {
         ElementCollector* pElementCollector = (ElementCollector*)*jj;
         if (nIgnoredSecurityId == cssxc::sax::ConstOfSecurityId::UNDEFINEDSECURITYID ||
@@ -1065,15 +1065,15 @@ bool BufferNode::isECInSubTreeIncluded(sal_Int32 nIgnoredSecurityId) const
             break;
         }
     }
-
+    
     if ( !rc )
     {
         std::vector< const BufferNode* >::const_iterator ii = m_vChildren.begin();
-
-        for( ; ii != m_vChildren.end() ; ++ii )
+    
+        for( ; ii != m_vChildren.end() ; ++ii ) 
         {
             BufferNode* pBufferNode = (BufferNode*)*ii;
-
+            
             if ( pBufferNode->isECInSubTreeIncluded(nIgnoredSecurityId))
             {
                 rc = true;
@@ -1081,7 +1081,7 @@ bool BufferNode::isECInSubTreeIncluded(sal_Int32 nIgnoredSecurityId) const
             }
         }
     }
-
+    
     return rc;
 }
 
@@ -1089,37 +1089,37 @@ bool BufferNode::isECOfBeforeModifyInAncestorIncluded(sal_Int32 nIgnoredSecurity
 /****** BufferNode/isECOfBeforeModifyInAncestorIncluded **********************
  *
  *   NAME
- *  isECOfBeforeModifyInAncestorIncluded -- checks whether there is some
- *  ancestor BufferNode which has ElementCollector with PRI_BEFPREMODIFY
- *  priority.
+ *	isECOfBeforeModifyInAncestorIncluded -- checks whether there is some
+ *	ancestor BufferNode which has ElementCollector with PRI_BEFPREMODIFY
+ *	priority.
  *
  *   SYNOPSIS
- *  bExist = isECOfBeforeModifyInAncestorIncluded(nIgnoredSecurityId);
+ *	bExist = isECOfBeforeModifyInAncestorIncluded(nIgnoredSecurityId);
  *
  *   FUNCTION
- *  checks each ancestor BufferNode through the parent link, if there is
- *  an ElementCollector with PRI_BEFPREMODIFY priority and its
- *  signatureId is not ignored, then return true, otherwise, false
- *  returned.
+ *	checks each ancestor BufferNode through the parent link, if there is
+ *	an ElementCollector with PRI_BEFPREMODIFY priority and its 
+ *	signatureId is not ignored, then return true, otherwise, false
+ *	returned.
  *
  *   INPUTS
- *  nIgnoredSecurityId -    the security Id to be ignored. If it equals
- *                          to UNDEFINEDSECURITYID, then no security Id
- *                          will be ignored.
+ *	nIgnoredSecurityId -	the security Id to be ignored. If it equals
+ *	                        to UNDEFINEDSECURITYID, then no security Id
+ *	                    	will be ignored.
  *
  *   RESULT
- *  bExist - true if a match found, false otherwise.
+ *	bExist - true if a match found, false otherwise.
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     bool rc = false;
-
+    
     BufferNode* pParentNode = m_pParent;
     while (pParentNode != NULL)
     {
@@ -1128,10 +1128,10 @@ bool BufferNode::isECOfBeforeModifyInAncestorIncluded(sal_Int32 nIgnoredSecurity
             rc = true;
             break;
         }
-
+        
         pParentNode = (BufferNode*)pParentNode->getParent();
     }
-
+    
     return rc;
 }
 
@@ -1139,57 +1139,57 @@ bool BufferNode::isBlockerInSubTreeIncluded(sal_Int32 nIgnoredSecurityId) const
 /****** BufferNode/isBlockerInSubTreeIncluded ********************************
  *
  *   NAME
- *  isBlockerInSubTreeIncluded -- checks whether there is some BufferNode
- *  which has blocker on it
+ *	isBlockerInSubTreeIncluded -- checks whether there is some BufferNode
+ *	which has blocker on it
  *
  *   SYNOPSIS
- *  bExist = isBlockerInSubTreeIncluded(nIgnoredSecurityId);
+ *	bExist = isBlockerInSubTreeIncluded(nIgnoredSecurityId);
  *
  *   FUNCTION
- *  checks each BufferNode in the branch of this BufferNode, if one has
- *  a blocker on it, and the blocker's securityId is not ignored, then
- *  returns true; otherwise, false returns.
+ *	checks each BufferNode in the branch of this BufferNode, if one has
+ *	a blocker on it, and the blocker's securityId is not ignored, then
+ *	returns true; otherwise, false returns.
  *
  *   INPUTS
- *  nIgnoredSecurityId -    the security Id to be ignored. If it equals
- *                          to UNDEFINEDSECURITYID, then no security Id
- *                          will be ignored.
+ *	nIgnoredSecurityId -	the security Id to be ignored. If it equals
+ *	                        to UNDEFINEDSECURITYID, then no security Id
+ *	                    	will be ignored.
  *
  *   RESULT
- *  bExist - true if a match found, false otherwise.
+ *	bExist - true if a match found, false otherwise.
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     bool rc = false;
-
+    
     std::vector< const BufferNode* >::const_iterator ii = m_vChildren.begin();
 
-    for( ; ii != m_vChildren.end() ; ++ii )
+    for( ; ii != m_vChildren.end() ; ++ii ) 
     {
         BufferNode* pBufferNode = (BufferNode*)*ii;
         ElementMark* pBlocker = pBufferNode->getBlocker();
-
+        
         if (pBlocker != NULL &&
             (nIgnoredSecurityId == cssxc::sax::ConstOfSecurityId::UNDEFINEDSECURITYID ||
-            pBlocker->getSecurityId() != nIgnoredSecurityId ))
+            pBlocker->getSecurityId() != nIgnoredSecurityId )) 
         {
             rc = true;
             break;
         }
-
+        
         if (rc || pBufferNode->isBlockerInSubTreeIncluded(nIgnoredSecurityId))
         {
             rc = true;
             break;
         }
     }
-
+    
     return rc;
 }
 
@@ -1197,47 +1197,47 @@ const BufferNode* BufferNode::getNextChild(const BufferNode* pChild) const
 /****** BufferNode/getNextChild **********************************************
  *
  *   NAME
- *  getNextChild -- get the next child BufferNode.
+ *	getNextChild -- get the next child BufferNode.
  *
  *   SYNOPSIS
- *  nextChild = getNextChild();
+ *	nextChild = getNextChild();
  *
  *   FUNCTION
- *  see NAME
+ *	see NAME
  *
  *   INPUTS
- *  pChild - the child BufferNode whose next node is retrieved.
+ *	pChild - the child BufferNode whose next node is retrieved.
  *
  *   RESULT
- *  nextChild - the next child BufferNode after the pChild, or NULL if
- *  there is none.
+ *	nextChild -	the next child BufferNode after the pChild, or NULL if 
+ *	there is none.
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     BufferNode* rc = NULL;
     bool bChildFound = false;
-
+    
     std::vector< const BufferNode* >::const_iterator ii = m_vChildren.begin();
-    for( ; ii != m_vChildren.end() ; ++ii )
+    for( ; ii != m_vChildren.end() ; ++ii ) 
     {
         if (bChildFound)
         {
             rc = (BufferNode*)*ii;
             break;
         }
-
-        if( *ii == pChild )
+            
+        if( *ii == pChild ) 
         {
             bChildFound = true;
         }
     }
-
+    
     return (const BufferNode*)rc;
 }
 
@@ -1246,36 +1246,36 @@ void BufferNode::freeAllChildren()
 /****** BufferNode/freeAllChildren *******************************************
  *
  *   NAME
- *  freeAllChildren -- free all his child BufferNode.
+ *	freeAllChildren -- free all his child BufferNode.
  *
  *   SYNOPSIS
- *  freeAllChildren();
+ *	freeAllChildren();
  *
  *   FUNCTION
- *  see NAME
+ *	see NAME
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  30.03.2004 -    the correct the memory leak bug
+ *	30.03.2004 -	the correct the memory leak bug
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     std::vector< const BufferNode* >::const_iterator ii = m_vChildren.begin();
-    for( ; ii != m_vChildren.end() ; ++ii )
+    for( ; ii != m_vChildren.end() ; ++ii ) 
     {
         BufferNode *pChild = (BufferNode *)(*ii);
         pChild->freeAllChildren();
         delete pChild;
     }
-
+    
     m_vChildren.clear();
 }
 
diff --git a/xmlsecurity/source/framework/buffernode.hxx b/xmlsecurity/source/framework/buffernode.hxx
index cb6d596edecc..3cb103524a51 100644
--- a/xmlsecurity/source/framework/buffernode.hxx
+++ b/xmlsecurity/source/framework/buffernode.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,63 +44,63 @@ class BufferNode
 /****** buffernode.hxx/CLASS BufferNode ***************************************
  *
  *   NAME
- *  BufferNode -- Class to maintain the tree of bufferred elements
+ *	BufferNode -- Class to maintain the tree of bufferred elements
  *
  *   FUNCTION
- *  One BufferNode object represents a bufferred element in the document
- *  wrapper component.
- *  All BufferNode objects construct a tree which has the same structure
- *  of all bufferred elements. That is to say, if one bufferred element is
- *  an ancestor of another bufferred element, then the corresponding
- *  BufferNode objects are also in ancestor/descendant relationship.
- *  This class is used to manipulate the tree of bufferred elements.
+ *	One BufferNode object represents a bufferred element in the document
+ *	wrapper component.
+ *	All BufferNode objects construct a tree which has the same structure
+ *	of all bufferred elements. That is to say, if one bufferred element is
+ *	an ancestor of another bufferred element, then the corresponding
+ *	BufferNode objects are also in ancestor/descendant relationship.
+ *	This class is used to manipulate the tree of bufferred elements.
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
 private:
     /* the parent BufferNode */
     BufferNode* m_pParent;
-
+    
     /* all child BufferNodes */
-    std::vector< const BufferNode* > m_vChildren;
-
+    std::vector< const BufferNode* > m_vChildren; 
+    
     /* all ElementCollector holding this BufferNode */
     std::vector< const ElementCollector* > m_vElementCollectors;
-
+    
     /*
      * the blocker holding this BufferNode, one BufferNode can have one
      * blocker at most
      */
     ElementMark* m_pBlocker;
-
+    
     /*
      * whether the element has completely bufferred by the document wrapper
      * component
      */
     bool m_bAllReceived;
-
+    
     /* the XMLElementWrapper of the bufferred element */
     com::sun::star::uno::Reference<
         com::sun::star::xml::wrapper::XXMLElementWrapper > m_xXMLElement;
 
-private:
+private:	
     bool isECInSubTreeIncluded(sal_Int32 nIgnoredSecurityId) const;
     bool isECOfBeforeModifyInAncestorIncluded(sal_Int32 nIgnoredSecurityId) const;
     bool isBlockerInSubTreeIncluded(sal_Int32 nIgnoredSecurityId) const;
     const BufferNode* getNextChild(const BufferNode* pChild) const;
-
+        
 public:
     explicit BufferNode(
         const com::sun::star::uno::Reference<
             com::sun::star::xml::wrapper::XXMLElementWrapper >& xXMLElement);
     virtual ~BufferNode() {};
-
+    
     bool isECOfBeforeModifyIncluded(sal_Int32 nIgnoredSecurityId) const;
         void setReceivedAll();
         bool isAllReceived() const;
diff --git a/xmlsecurity/source/framework/decryptorimpl.cxx b/xmlsecurity/source/framework/decryptorimpl.cxx
index a2636f61cdf1..6201920d04c5 100644
--- a/xmlsecurity/source/framework/decryptorimpl.cxx
+++ b/xmlsecurity/source/framework/decryptorimpl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 cssxw = com::sun::star::xml::wrapper;
 #define SERVICE_NAME "com.sun.star.xml.crypto.sax.Decryptor"
 #define IMPLEMENTATION_NAME "com.sun.star.xml.security.framework.DecryptorImpl"
 
-#define DECLARE_ASCII( SASCIIVALUE )                                                                            \
+#define	DECLARE_ASCII( SASCIIVALUE )																			\
     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SASCIIVALUE ) )
 
 DecryptorImpl::DecryptorImpl( const cssu::Reference< cssl::XMultiServiceFactory >& rxMSF)
@@ -58,28 +58,28 @@ bool DecryptorImpl::checkReady() const
 /****** DecryptorImpl/checkReady *********************************************
  *
  *   NAME
- *  checkReady -- checks the conditions for the decryption.
+ *	checkReady -- checks the conditions for the decryption.
  *
  *   SYNOPSIS
- *  bReady = checkReady( );
+ *	bReady = checkReady( );
  *
  *   FUNCTION
- *  checks whether all following conditions are satisfied:
- *  1. the result listener is ready;
- *  2. the EncryptionEngine is ready.
+ *	checks whether all following conditions are satisfied:
+ *	1. the result listener is ready;
+ *	2. the EncryptionEngine is ready.
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  bReady - true if all conditions are satisfied, false otherwise
+ *	bReady - true if all conditions are satisfied, false otherwise
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     return (m_xResultListener.is() && EncryptionEngine::checkReady());
@@ -90,64 +90,64 @@ void DecryptorImpl::notifyResultListener() const
 /****** DecryptorImpl/notifyResultListener ***********************************
  *
  *   NAME
- *  notifyResultListener -- notifies the listener about the decryption
- *  result.
+ *	notifyResultListener -- notifies the listener about the decryption
+ *	result.
  *
  *   SYNOPSIS
- *  notifyResultListener( );
+ *	notifyResultListener( );
  *
  *   FUNCTION
- *  see NAME.
+ *	see NAME.
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     cssu::Reference< cssxc::sax::XDecryptionResultListener >
         xDecryptionResultListener ( m_xResultListener , cssu::UNO_QUERY ) ;
-
+        
     xDecryptionResultListener->decrypted(m_nSecurityId,m_nStatus);
 }
 
-void DecryptorImpl::startEngine( const cssu::Reference<
+void DecryptorImpl::startEngine( const cssu::Reference< 
     cssxc::XXMLEncryptionTemplate >&
     xEncryptionTemplate)
     throw (cssu::Exception, cssu::RuntimeException)
 /****** DecryptorImpl/startEngine ********************************************
  *
  *   NAME
- *  startEngine -- decrypts the encryption.
+ *	startEngine -- decrypts the encryption.
  *
  *   SYNOPSIS
- *  startEngine( xEncryptionTemplate );
+ *	startEngine( xEncryptionTemplate );
  *
  *   FUNCTION
- *  decrypts the encryption element, then if succeeds, updates the link
- *  of old template element to the new encryption element in
- *  SAXEventKeeper.
+ *	decrypts the encryption element, then if succeeds, updates the link
+ *	of old template element to the new encryption element in 
+ *	SAXEventKeeper.
  *
  *   INPUTS
- *  xEncryptionTemplate - the encryption template to be decrypted.
+ *	xEncryptionTemplate - the encryption template to be decrypted.
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     cssu::Reference< cssxc::XXMLEncryptionTemplate > xResultTemplate;
@@ -160,7 +160,7 @@ void DecryptorImpl::startEngine( const cssu::Reference<
     {
         m_nStatus = cssxc::SecurityOperationStatus_RUNTIMEERROR_FAILED;
     }
-
+    
     if (m_nStatus == cssxc::SecurityOperationStatus_OPERATION_SUCCEEDED)
     {
         cssu::Reference< cssxw::XXMLElementWrapper > xDecryptedElement
@@ -168,7 +168,7 @@ void DecryptorImpl::startEngine( const cssu::Reference<
         m_xSAXEventKeeper->setElement(m_nIdOfTemplateEC, xDecryptedElement);
     }
 }
-
+    
 /* XDecryptionResultBroadcaster */
 void SAL_CALL DecryptorImpl::addDecryptionResultListener( const cssu::Reference< cssxc::sax::XDecryptionResultListener >& listener )
         throw (cssu::Exception, cssu::RuntimeException)
@@ -183,13 +183,13 @@ void SAL_CALL DecryptorImpl::removeDecryptionResultListener( const cssu::Referen
 }
 
 /* XInitialization */
-void SAL_CALL DecryptorImpl::initialize( const cssu::Sequence< cssu::Any >& aArguments )
+void SAL_CALL DecryptorImpl::initialize( const cssu::Sequence< cssu::Any >& aArguments ) 
     throw (cssu::Exception, cssu::RuntimeException)
 {
     OSL_ASSERT(aArguments.getLength() == 5);
-
+    
     rtl::OUString ouTempString;
-
+    
     aArguments[0] >>= ouTempString;
     m_nSecurityId = ouTempString.toInt32();
     aArguments[1] >>= m_xSAXEventKeeper;
@@ -205,13 +205,13 @@ rtl::OUString DecryptorImpl_getImplementationName ()
     return rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
 }
 
-sal_Bool SAL_CALL DecryptorImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL DecryptorImpl_supportsService( const rtl::OUString& ServiceName ) 
     throw (cssu::RuntimeException)
 {
     return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME ));
 }
 
-cssu::Sequence< rtl::OUString > SAL_CALL DecryptorImpl_getSupportedServiceNames(  )
+cssu::Sequence< rtl::OUString > SAL_CALL DecryptorImpl_getSupportedServiceNames(  ) 
     throw (cssu::RuntimeException)
 {
     cssu::Sequence < rtl::OUString > aRet(1);
@@ -228,17 +228,17 @@ cssu::Reference< cssu::XInterface > SAL_CALL DecryptorImpl_createInstance( const
 }
 
 /* XServiceInfo */
-rtl::OUString SAL_CALL DecryptorImpl::getImplementationName(  )
+rtl::OUString SAL_CALL DecryptorImpl::getImplementationName(  ) 
     throw (cssu::RuntimeException)
 {
     return DecryptorImpl_getImplementationName();
 }
-sal_Bool SAL_CALL DecryptorImpl::supportsService( const rtl::OUString& rServiceName )
+sal_Bool SAL_CALL DecryptorImpl::supportsService( const rtl::OUString& rServiceName ) 
     throw (cssu::RuntimeException)
 {
     return DecryptorImpl_supportsService( rServiceName );
 }
-cssu::Sequence< rtl::OUString > SAL_CALL DecryptorImpl::getSupportedServiceNames(  )
+cssu::Sequence< rtl::OUString > SAL_CALL DecryptorImpl::getSupportedServiceNames(  ) 
     throw (cssu::RuntimeException)
 {
     return DecryptorImpl_getSupportedServiceNames();
diff --git a/xmlsecurity/source/framework/decryptorimpl.hxx b/xmlsecurity/source/framework/decryptorimpl.hxx
index fa558e97ec9b..cc13ec1b9930 100644
--- a/xmlsecurity/source/framework/decryptorimpl.hxx
+++ b/xmlsecurity/source/framework/decryptorimpl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 "encryptionengine.hxx"
 
 class DecryptorImpl : public cppu::ImplInheritanceHelper3
-<
+< 
     EncryptionEngine,
     com::sun::star::xml::crypto::sax::XDecryptionResultBroadcaster,
     com::sun::star::lang::XInitialization,
@@ -48,19 +48,19 @@ class DecryptorImpl : public cppu::ImplInheritanceHelper3
 /****** DecryptorImpl.hxx/CLASS DecryptorImpl *********************************
  *
  *   NAME
- *  DecryptorImpl -- decrypts an encryption
+ *	DecryptorImpl -- decrypts an encryption
  *
  *   FUNCTION
- *  Collects all resources for decrypting an encryption, then decrypts the
- *  encryption by invoking a xmlsec-based encryption bridge component.
+ *	Collects all resources for decrypting an encryption, then decrypts the
+ *	encryption by invoking a xmlsec-based encryption bridge component.
  *
  *   HISTORY
- *  05.01.2004 -    Interface supported: XDecryptionResultBroadcaster,
- *                  XInitialization, XServiceInfo
+ *	05.01.2004 -	Interface supported: XDecryptionResultBroadcaster,
+ *	            	XInitialization, XServiceInfo
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
 private:
@@ -68,7 +68,7 @@ private:
      * the Id of the encryption, which is used for the result listener to
      * identify the encryption.
      */
-    sal_Int32 m_nEncryptionId;
+    sal_Int32 m_nEncryptionId;  
 
     /*
      * the decryption result,
@@ -76,59 +76,59 @@ private:
      */
     bool      m_bDecryptionSucceed;
 
-    com::sun::star::uno::Reference<
+    com::sun::star::uno::Reference< 
         com::sun::star::xml::crypto::XXMLSecurityContext > m_xXMLSecurityContext;
-
+    
     virtual void notifyResultListener() const
         throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException);
     virtual bool checkReady() const;
-    virtual void startEngine( const com::sun::star::uno::Reference<
+    virtual void startEngine( const com::sun::star::uno::Reference< 
         com::sun::star::xml::crypto::XXMLEncryptionTemplate >&
         xEncryptionTemplate)
         throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException);
-
+    
 public:
-    explicit DecryptorImpl( const com::sun::star::uno::Reference<
+    explicit DecryptorImpl( const com::sun::star::uno::Reference< 
         com::sun::star::lang::XMultiServiceFactory >& rxMSF);
     virtual ~DecryptorImpl();
 
     /* XDecryptionResultBroadcaster */
     virtual void SAL_CALL addDecryptionResultListener(
-        const com::sun::star::uno::Reference<
+        const com::sun::star::uno::Reference< 
             com::sun::star::xml::crypto::sax::XDecryptionResultListener >&
             listener )
             throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL removeDecryptionResultListener(
-            const com::sun::star::uno::Reference<
-                com::sun::star::xml::crypto::sax::XDecryptionResultListener >&
+        virtual void SAL_CALL removeDecryptionResultListener( 
+            const com::sun::star::uno::Reference< 
+                com::sun::star::xml::crypto::sax::XDecryptionResultListener >& 
                 listener )
             throw (com::sun::star::uno::RuntimeException);
-
+    
     /* XInitialization */
-    virtual void SAL_CALL initialize(
-        const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments )
+    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);
 
     /* XServiceInfo */
-    virtual rtl::OUString SAL_CALL getImplementationName(  )
+    virtual rtl::OUString SAL_CALL getImplementationName(  ) 
         throw (com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName )
+    virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) 
         throw (com::sun::star::uno::RuntimeException);
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(  ) 
         throw (com::sun::star::uno::RuntimeException);
 };
 
 rtl::OUString DecryptorImpl_getImplementationName()
     throw ( com::sun::star::uno::RuntimeException );
 
-sal_Bool SAL_CALL DecryptorImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL DecryptorImpl_supportsService( const rtl::OUString& ServiceName ) 
     throw ( com::sun::star::uno::RuntimeException );
 
-com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL DecryptorImpl_getSupportedServiceNames(  )
+com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL DecryptorImpl_getSupportedServiceNames(  ) 
     throw ( com::sun::star::uno::RuntimeException );
 
 com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
-SAL_CALL DecryptorImpl_createInstance(
+SAL_CALL DecryptorImpl_createInstance( 
     const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&
         rSMgr)
     throw ( com::sun::star::uno::Exception );
diff --git a/xmlsecurity/source/framework/elementcollector.cxx b/xmlsecurity/source/framework/elementcollector.cxx
index bb001e699aad..a9411d7e5f88 100644
--- a/xmlsecurity/source/framework/elementcollector.cxx
+++ b/xmlsecurity/source/framework/elementcollector.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,41 +54,41 @@ ElementCollector::ElementCollector(
 /****** ElementCollector/ElementCollector *************************************
  *
  *   NAME
- *  ElementCollector -- constructor method
+ *	ElementCollector -- constructor method
  *
  *   SYNOPSIS
- *  ElementCollector(nSecurityId, nBufferId, nPriority, bToModify
- *                   xReferenceResolvedListener);
+ *	ElementCollector(nSecurityId, nBufferId, nPriority, bToModify 
+ *	                 xReferenceResolvedListener);
  *
  *   FUNCTION
- *  construct an ElementCollector object.
+ *	construct an ElementCollector object.
  *
  *   INPUTS
- *  nSecurityId -   represents which security entity the buffer node is
- *          related with. Either a signature or an encryption is
- *          a security entity.
- *  nBufferId - the id of the element bufferred in the document
- *          wrapper component. The document wrapper component
- *          uses this id to search the particular bufferred
- *          element.
- *  nPriority - the priority value. ElementCollector with lower
- *          priority value can't notify until all ElementCollectors
- *          with higher priority value have notified.
- *  bToModify - A flag representing whether this ElementCollector
- *          notification will cause the modification of its working
- *                  element.
- *  xReferenceResolvedListener
- *            - the listener that this ElementCollector notifies to.
+ *	nSecurityId - 	represents which security entity the buffer node is
+ *			related with. Either a signature or an encryption is
+ *			a security entity.
+ *	nBufferId -	the id of the element bufferred in the document
+ *			wrapper component. The document wrapper component 
+ *			uses this id to search the particular bufferred
+ *			element.
+ *	nPriority -	the priority value. ElementCollector with lower
+ *			priority value can't notify until all ElementCollectors
+ *			with higher priority value have notified.
+ *	bToModify -	A flag representing whether this ElementCollector
+ *			notification will cause the modification of its working
+ *	                element.
+ *	xReferenceResolvedListener
+ *	          -	the listener that this ElementCollector notifies to.
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     m_type = cssxc::sax::ElementMarkType_ELEMENTCOLLECTOR;
@@ -115,26 +115,26 @@ void ElementCollector::notifyListener()
 /****** ElementCollector/notifyListener ***************************************
  *
  *   NAME
- *  notifyListener -- enable the ability to notify the listener
+ *	notifyListener -- enable the ability to notify the listener
  *
  *   SYNOPSIS
- *  notifyListener();
+ *	notifyListener();
  *
  *   FUNCTION
- *  enable the ability to notify the listener and try to notify then.
+ *	enable the ability to notify the listener and try to notify then.
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     m_bAbleToNotify = true;
@@ -151,27 +151,27 @@ void ElementCollector::setReferenceResolvedListener(
 /****** ElementCollector/setReferenceResolvedListener *************************
  *
  *   NAME
- *  setReferenceResolvedListener -- configures a listener for the buffer
- *  node in this object
+ *	setReferenceResolvedListener -- configures a listener for the buffer
+ *	node in this object
  *
  *   SYNOPSIS
- *  setReferenceResolvedListener(xReferenceResolvedListener);
+ *	setReferenceResolvedListener(xReferenceResolvedListener);
  *
  *   FUNCTION
- *  configures a new listener and try to notify then.
+ *	configures a new listener and try to notify then.
  *
  *   INPUTS
- *  xReferenceResolvedListener - the new listener
+ *	xReferenceResolvedListener - the new listener
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     m_xReferenceResolvedListener = xReferenceResolvedListener;
@@ -182,26 +182,26 @@ void ElementCollector::setSecurityId(sal_Int32 nSecurityId)
 /****** ElementCollector/setSecurityId ****************************************
  *
  *   NAME
- *  setSecurityId -- configures the security Id of the buffer node
+ *	setSecurityId -- configures the security Id of the buffer node
  *
  *   SYNOPSIS
- *  setSecurityId(nSecurityId);
+ *	setSecurityId(nSecurityId);
  *
  *   FUNCTION
- *  configures the security Id and try to notify then
+ *	configures the security Id and try to notify then
  *
  *   INPUTS
- *  nSecurityId - the security Id
+ *	nSecurityId - the security Id
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     m_nSecurityId = nSecurityId;
@@ -212,30 +212,30 @@ void ElementCollector::doNotify()
 /****** ElementCollector/doNotify *********************************************
  *
  *   NAME
- *  doNotify -- tries to notify the listener
+ *	doNotify -- tries to notify the listener
  *
  *   SYNOPSIS
- *  doNotify();
+ *	doNotify();
  *
  *   FUNCTION
- *  notifies the listener when all below conditions are satisfied:
- *  the listener has not been notified;
- *  the notify right is granted;
- *  the listener has already been configured;
- *  the security id has already been configure
+ *	notifies the listener when all below conditions are satisfied:
+ *	the listener has not been notified;
+ *	the notify right is granted;
+ *	the listener has already been configured;
+ *	the security id has already been configure
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     if (!m_bNotified &&
@@ -254,44 +254,44 @@ ElementCollector* ElementCollector::clone(
 /****** ElementCollector/clone ************************************************
  *
  *   NAME
- *  clone -- duplicates this ElementCollector object
+ *	clone -- duplicates this ElementCollector object
  *
  *   SYNOPSIS
- *  cloned = clone(nBufferId, nPriority);
+ *	cloned = clone(nBufferId, nPriority);
  *
  *   FUNCTION
- *  duplicates this ElementCollector object with new buffer Id, priority.
+ *	duplicates this ElementCollector object with new buffer Id, priority.
  *
  *   INPUTS
- *  nBufferId - the buffer node's Id
- *  nPriority - the priority
+ *	nBufferId -	the buffer node's Id
+ *	nPriority -	the priority
  *
  *   RESULT
- *  clone -     a new ElementCollector
+ *	clone - 	a new ElementCollector
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
-    ElementCollector* pClonedOne
-        = new ElementCollector(m_nSecurityId,
+    ElementCollector* pClonedOne 
+        = new ElementCollector(m_nSecurityId, 
                        nBufferId, nPriority, m_bToModify,
                        m_xReferenceResolvedListener);
-
+    
     if (m_bAbleToNotify)
     {
         pClonedOne->notifyListener();
     }
-
+    
     if (m_pBufferNode != NULL)
     {
         m_pBufferNode->addElementCollector(pClonedOne);
     }
-
+    
     return pClonedOne;
 }
 
diff --git a/xmlsecurity/source/framework/elementcollector.hxx b/xmlsecurity/source/framework/elementcollector.hxx
index 12343bac2675..25e8bcce0c76 100644
--- a/xmlsecurity/source/framework/elementcollector.hxx
+++ b/xmlsecurity/source/framework/elementcollector.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,19 +37,19 @@ class ElementCollector : public ElementMark
 /****** elementcollector.hxx/CLASS ElementCollector ***************************
  *
  *   NAME
- *  ElementCollector -- Class to manipulate an element collector
+ *	ElementCollector -- Class to manipulate an element collector
  *
  *   FUNCTION
- *  This class is derived from the ElementMark class. Beyond the function
- *  of the ElementMark class, this class also maintains the priority, and
- *  manages the notify process
+ *	This class is derived from the ElementMark class. Beyond the function
+ *	of the ElementMark class, this class also maintains the priority, and
+ *	manages the notify process
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
 private:
@@ -61,23 +61,23 @@ private:
      *                    internal modification happens.
      */
     com::sun::star::xml::crypto::sax::ElementMarkPriority m_nPriority;
-
+    
     /*
      * the modify flag, representing whether which elementcollector will
      * modify its data.
      */
     bool m_bToModify;
-
+    
     /* the notify enable flag, see notifyListener method */
     bool m_bAbleToNotify;
-
+    
     /* whether the listener has been notified */
     bool m_bNotified;
-
+    
     /* the listener to be notified */
     com::sun::star::uno::Reference<
         com::sun::star::xml::crypto::sax::XReferenceResolvedListener > m_xReferenceResolvedListener;
-
+    
 public:
     ElementCollector(
         sal_Int32 nSecurityId,
@@ -88,7 +88,7 @@ public:
             com::sun::star::xml::crypto::sax::XReferenceResolvedListener >&
             xReferenceResolvedListener);
     virtual ~ElementCollector() {};
-
+    
     //bool isInternalNotificationSuppressed() const;
     com::sun::star::xml::crypto::sax::ElementMarkPriority getPriority() const;
     bool getModify() const;
diff --git a/xmlsecurity/source/framework/elementmark.cxx b/xmlsecurity/source/framework/elementmark.cxx
index 8393af447d83..44ee850307d0 100644
--- a/xmlsecurity/source/framework/elementmark.cxx
+++ b/xmlsecurity/source/framework/elementmark.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,32 +42,32 @@ ElementMark::ElementMark(sal_Int32 nSecurityId, sal_Int32 nBufferId)
 /****** ElementMark/ElementMark ***********************************************
  *
  *   NAME
- *  ElementMark -- constructor method
+ *	ElementMark -- constructor method
  *
  *   SYNOPSIS
- *  ElementMark(nSecurityId, nBufferId);
+ *	ElementMark(nSecurityId, nBufferId);
  *
  *   FUNCTION
- *  construct an ElementMark object.
+ *	construct an ElementMark object.
  *
  *   INPUTS
- *  nSecurityId -   represents which security entity the buffer node is
- *          related with. Either a signature or an encryption is
- *          a security entity.
- *  nBufferId - the id of the element bufferred in the document
- *          wrapper component. The document wrapper component
- *          uses this id to search the particular bufferred
- *          element.
+ *	nSecurityId - 	represents which security entity the buffer node is
+ *			related with. Either a signature or an encryption is
+ *			a security entity.
+ *	nBufferId -	the id of the element bufferred in the document
+ *			wrapper component. The document wrapper component 
+ *			uses this id to search the particular bufferred
+ *			element.
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
 }
diff --git a/xmlsecurity/source/framework/elementmark.hxx b/xmlsecurity/source/framework/elementmark.hxx
index bc844cf66541..7cb0378448e6 100644
--- a/xmlsecurity/source/framework/elementmark.hxx
+++ b/xmlsecurity/source/framework/elementmark.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,38 +38,38 @@ class ElementMark
 /****** elementmark.hxx/CLASS ElementMark *************************************
  *
  *   NAME
- *  ElementMark -- Class to manipulate an element mark
+ *	ElementMark -- Class to manipulate an element mark
  *
  *   FUNCTION
- *  This class maintains the security id, buffer id and its type for a
- *  buffer node.
+ *	This class maintains the security id, buffer id and its type for a
+ *	buffer node.
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
 protected:
     /* the BufferNode maintained by this object */
     BufferNode* m_pBufferNode;
-
+    
     /* the security Id */
     sal_Int32 m_nSecurityId;
-
+    
     /* the buffer Id */
     sal_Int32 m_nBufferId;
-
+    
     /*
      * the type value, is one of following values:
-     * TYPEOFELEMENTMARK - the default value, represents an blocker if
+     * TYPEOFELEMENTMARK - the default value, represents an blocker if 
      *                     not changed
      * TYPEOFELEMENTCOLLECTOR - represents an ElementCollector
      */
     com::sun::star::xml::crypto::sax::ElementMarkType m_type;
-
+    
 public:
     ElementMark(sal_Int32 nSecurityId, sal_Int32 nBufferId);
     virtual ~ElementMark() {};
diff --git a/xmlsecurity/source/framework/encryptionengine.cxx b/xmlsecurity/source/framework/encryptionengine.cxx
index 43df7f677b48..d05600dabd38 100644
--- a/xmlsecurity/source/framework/encryptionengine.cxx
+++ b/xmlsecurity/source/framework/encryptionengine.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 cssxw = com::sun::star::xml::wrapper;
 
 #define ENCRYPTION_TEMPLATE "com.sun.star.xml.crypto.XMLEncryptionTemplate"
 
-#define DECLARE_ASCII( SASCIIVALUE )                                                                            \
+#define	DECLARE_ASCII( SASCIIVALUE )																			\
     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SASCIIVALUE ) )
 
 EncryptionEngine::EncryptionEngine( )
@@ -53,31 +53,31 @@ bool EncryptionEngine::checkReady() const
 /****** EncryptionEngine/checkReady ******************************************
  *
  *   NAME
- *  checkReady -- checks the conditions for the main operation.
+ *	checkReady -- checks the conditions for the main operation.
  *
  *   SYNOPSIS
- *  bReady = checkReady( );
+ *	bReady = checkReady( );
  *
  *   FUNCTION
- *  checks whether all following conditions are satisfied:
- *  1. the main operation has't begun yet;
- *  2. the key material is known;
- *  3. the id of the template blocker is known;
- *  4. both the key element and the encryption template
- *     are bufferred.
+ *	checks whether all following conditions are satisfied:
+ *	1. the main operation has't begun yet;
+ *	2. the key material is known;
+ *	3. the id of the template blocker is known;
+ *	4. both the key element and the encryption template
+ *	   are bufferred.
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  bReady - true if all conditions are satisfied, false otherwise
+ *	bReady - true if all conditions are satisfied, false otherwise
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     bool rc = true;
@@ -95,65 +95,65 @@ bool EncryptionEngine::checkReady() const
     {
         rc = false;
     }
-
+    
     return rc;
 }
 
-void EncryptionEngine::tryToPerform( )
+void EncryptionEngine::tryToPerform( ) 
         throw (cssu::Exception, cssu::RuntimeException)
 /****** EncryptionEngine/tryToPerform ****************************************
  *
  *   NAME
- *  tryToPerform -- tries to perform the encryption/decryption operation.
+ *	tryToPerform -- tries to perform the encryption/decryption operation.
  *
  *   SYNOPSIS
- *  tryToPerform( );
+ *	tryToPerform( );
  *
  *   FUNCTION
- *  if the situation is ready, perform following operations.
- *  1. prepares a encryption template;
- *  2. calls the encryption bridge component;
- *  3. clears up all used resources;
- *  4. notifies the result listener;
- *  5. sets the "accomplishment" flag.
+ *	if the situation is ready, perform following operations.
+ *	1. prepares a encryption template;
+ *	2. calls the encryption bridge component;
+ *	3. clears up all used resources;
+ *	4. notifies the result listener;
+ *	5. sets the "accomplishment" flag.
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     if (checkReady())
     {
-        const rtl::OUString sEncryptionTemplate (
-            RTL_CONSTASCII_USTRINGPARAM( ENCRYPTION_TEMPLATE ) );
+        const rtl::OUString sEncryptionTemplate ( 
+            RTL_CONSTASCII_USTRINGPARAM( ENCRYPTION_TEMPLATE ) );	
         cssu::Reference < cssxc::XXMLEncryptionTemplate > xEncryptionTemplate(
             mxMSF->createInstance( sEncryptionTemplate ), cssu::UNO_QUERY );
-
+        
         OSL_ASSERT( xEncryptionTemplate.is() );
-
-        cssu::Reference< cssxw::XXMLElementWrapper > xXMLElement
+    
+        cssu::Reference< cssxw::XXMLElementWrapper > xXMLElement 
             = m_xSAXEventKeeper->getElement( m_nIdOfTemplateEC );
-
+        
         xEncryptionTemplate->setTemplate(xXMLElement);
-
+        
         startEngine( xEncryptionTemplate );
-
+    
         /*
          * done
          */
         clearUp( );
-
+        
         notifyResultListener();
-
+                
         m_bMissionDone = true;
     }
 }
@@ -162,45 +162,45 @@ void EncryptionEngine::clearUp( ) const
 /****** EncryptionEngine/clearup *********************************************
  *
  *   NAME
- *  clearUp -- clear up all resources used by this operation.
+ *	clearUp -- clear up all resources used by this operation.
  *
  *   SYNOPSIS
- *  clearUp( );
+ *	clearUp( );
  *
  *   FUNCTION
- *  cleaning resources up includes:
- *  1. releases the ElementCollector for the encryption template element;
- *  2. releases the Blocker for the encryption template element;
- *  3. releases the ElementCollector for the key element, if there is one.
+ *	cleaning resources up includes:
+ *	1. releases the ElementCollector for the encryption template element;
+ *	2. releases the Blocker for the encryption template element;
+ *	3. releases the ElementCollector for the key element, if there is one.
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
-    cssu::Reference < cssxc::sax::XReferenceResolvedBroadcaster >
+    cssu::Reference < cssxc::sax::XReferenceResolvedBroadcaster > 
         xReferenceResolvedBroadcaster( m_xSAXEventKeeper, cssu::UNO_QUERY );
-
+        
     xReferenceResolvedBroadcaster->removeReferenceResolvedListener(
-        m_nIdOfTemplateEC,
+        m_nIdOfTemplateEC, 
         (const cssu::Reference < cssxc::sax::XReferenceResolvedListener >)((SecurityEngine *)this));
-
+    
     m_xSAXEventKeeper->removeElementCollector(m_nIdOfTemplateEC);
-
+        
     if (m_nIdOfBlocker != -1)
     {
         m_xSAXEventKeeper->removeBlocker(m_nIdOfBlocker);
     }
-
+        
     if (m_nIdOfKeyEC != 0 && m_nIdOfKeyEC != -1)
     {
         m_xSAXEventKeeper->removeElementCollector(m_nIdOfKeyEC);
diff --git a/xmlsecurity/source/framework/encryptionengine.hxx b/xmlsecurity/source/framework/encryptionengine.hxx
index ef6f2dc09fb2..094a039e86b2 100644
--- a/xmlsecurity/source/framework/encryptionengine.hxx
+++ b/xmlsecurity/source/framework/encryptionengine.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,24 +42,24 @@
 #include "securityengine.hxx"
 
 class EncryptionEngine : public cppu::ImplInheritanceHelper1
-<
-    SecurityEngine,
+< 
+    SecurityEngine, 
     com::sun::star::xml::crypto::sax::XBlockerMonitor
 >
 /****** encryptionEngine.hxx/CLASS encryptionEngine ***************************
  *
  *   NAME
- *  EncryptionEngine -- Base class of Encryptor and Decryptor
+ *	EncryptionEngine -- Base class of Encryptor and Decryptor
  *
  *   FUNCTION
- *  Maintains common members and methods related with encryption.
+ *	Maintains common members and methods related with encryption.
  *
  *   HISTORY
- *  05.01.2004 -    Interface supported: XBlockerMonitor
+ *	05.01.2004 -	Interface supported: XBlockerMonitor
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
 protected:
@@ -67,29 +67,29 @@ protected:
      * the Encryption bridge component, which performs encrypt and decrypt
      * operation based on xmlsec library.
      */
-    com::sun::star::uno::Reference<
+    com::sun::star::uno::Reference< 
         com::sun::star::xml::crypto::XXMLEncryption > m_xXMLEncryption;
 
     /*
      * the Id of template blocker.
      */
     sal_Int32 m_nIdOfBlocker;
-
+    
 protected:
     EncryptionEngine( );
     virtual ~EncryptionEngine(){};
-
-    virtual void tryToPerform( )
+    
+    virtual void tryToPerform( ) 
         throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException);
-    virtual void clearUp( ) const;
+    virtual void clearUp( ) const;	
     virtual bool checkReady() const;
-
+    
     /*
      * starts the main function. This method will be implemented by any sub-class.
      * For a Encryptor, it performs encryption operation;
      * for a Decryptor, decryption operation is performed.
      */
-    virtual void startEngine( const com::sun::star::uno::Reference<
+    virtual void startEngine( const com::sun::star::uno::Reference< 
         com::sun::star::xml::crypto::XXMLEncryptionTemplate >&)
         throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException)
         {};
diff --git a/xmlsecurity/source/framework/encryptorimpl.cxx b/xmlsecurity/source/framework/encryptorimpl.cxx
index b6d86ee8b1f1..2c2328eb5299 100644
--- a/xmlsecurity/source/framework/encryptorimpl.cxx
+++ b/xmlsecurity/source/framework/encryptorimpl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 cssxw = com::sun::star::xml::wrapper;
 #define SERVICE_NAME "com.sun.star.xml.crypto.sax.Encryptor"
 #define IMPLEMENTATION_NAME "com.sun.star.xml.security.framework.EncryptorImpl"
 
-#define DECLARE_ASCII( SASCIIVALUE )                                                                            \
+#define	DECLARE_ASCII( SASCIIVALUE )																			\
     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SASCIIVALUE ) )
 
 EncryptorImpl::EncryptorImpl( const cssu::Reference< cssl::XMultiServiceFactory >& rxMSF)
@@ -59,28 +59,28 @@ bool EncryptorImpl::checkReady() const
 /****** EncryptorImpl/checkReady *********************************************
  *
  *   NAME
- *  checkReady -- checks the conditions for the encryption.
+ *	checkReady -- checks the conditions for the encryption.
  *
  *   SYNOPSIS
- *  bReady = checkReady( );
+ *	bReady = checkReady( );
  *
  *   FUNCTION
- *  checks whether all following conditions are satisfied:
- *  1. the result listener is ready;
- *  2. the EncryptionEngine is ready.
+ *	checks whether all following conditions are satisfied:
+ *	1. the result listener is ready;
+ *	2. the EncryptionEngine is ready.
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  bReady - true if all conditions are satisfied, false otherwise
+ *	bReady - true if all conditions are satisfied, false otherwise
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     sal_Int32 nKeyInc = 0;
@@ -88,9 +88,9 @@ bool EncryptorImpl::checkReady() const
     {
         nKeyInc = 1;
     }
-
+    
     return (m_xResultListener.is() &&
-        (m_nReferenceId != -1) &&
+        (m_nReferenceId != -1) && 
         (2+nKeyInc == m_nNumOfResolvedReferences) &&
         EncryptionEngine::checkReady());
 }
@@ -100,73 +100,73 @@ void EncryptorImpl::notifyResultListener() const
 /****** DecryptorImpl/notifyResultListener ***********************************
  *
  *   NAME
- *  notifyResultListener -- notifies the listener about the encryption
- *  result.
+ *	notifyResultListener -- notifies the listener about the encryption
+ *	result.
  *
  *   SYNOPSIS
- *  notifyResultListener( );
+ *	notifyResultListener( );
  *
  *   FUNCTION
- *  see NAME.
+ *	see NAME.
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     cssu::Reference< cssxc::sax::XEncryptionResultListener >
         xEncryptionResultListener ( m_xResultListener , cssu::UNO_QUERY ) ;
-
+        
     xEncryptionResultListener->encrypted( m_nSecurityId, m_nStatus );
 }
 
-void EncryptorImpl::startEngine( const cssu::Reference<
+void EncryptorImpl::startEngine( const cssu::Reference< 
     cssxc::XXMLEncryptionTemplate >&
     xEncryptionTemplate)
         throw (cssu::Exception, cssu::RuntimeException)
 /****** EncryptorImpl/startEngine ********************************************
  *
  *   NAME
- *  startEngine -- generates the encryption.
+ *	startEngine -- generates the encryption.
  *
  *   SYNOPSIS
- *  startEngine( xEncryptionTemplate );
+ *	startEngine( xEncryptionTemplate );
  *
  *   FUNCTION
- *  generates the encryption element, then if succeeds, updates the link
- *  of old template element to the new encryption element in
- *  SAXEventKeeper.
+ *	generates the encryption element, then if succeeds, updates the link
+ *	of old template element to the new encryption element in 
+ *	SAXEventKeeper.
  *
  *   INPUTS
- *  xEncryptionTemplate - the encryption template to be encrypted.
+ *	xEncryptionTemplate - the encryption template to be encrypted.
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     cssu::Reference < cssxc::XXMLEncryptionTemplate > xResultTemplate;
-
+    
     cssu::Reference< cssxw::XXMLElementWrapper >
         xXMLElement = m_xSAXEventKeeper->getElement( m_nReferenceId );
     xEncryptionTemplate->setTarget(xXMLElement);
-
-    try
+    
+    try 
     {
         xResultTemplate = m_xXMLEncryption->encrypt(
             xEncryptionTemplate, m_xSecurityEnvironment);
@@ -176,10 +176,10 @@ void EncryptorImpl::startEngine( const cssu::Reference<
     {
         m_nStatus = cssxc::SecurityOperationStatus_RUNTIMEERROR_FAILED;
     }
-
+    
     if (m_nStatus == cssxc::SecurityOperationStatus_OPERATION_SUCCEEDED)
     {
-        cssu::Reference < cssxw::XXMLElementWrapper > xResultEncryption
+        cssu::Reference < cssxw::XXMLElementWrapper > xResultEncryption 
             = xResultTemplate->getTemplate();
         m_xSAXEventKeeper->setElement(m_nIdOfTemplateEC, xResultEncryption);
         m_xSAXEventKeeper->setElement(m_nReferenceId, NULL);
@@ -196,7 +196,7 @@ void SAL_CALL EncryptorImpl::setReferenceCount(sal_Int32)
      * so the referenceNumber is always 1
      */
 }
-
+    
 void SAL_CALL EncryptorImpl::setReferenceId( sal_Int32 id )
     throw (cssu::Exception, cssu::RuntimeException)
 {
@@ -215,15 +215,15 @@ void SAL_CALL EncryptorImpl::removeEncryptionResultListener( const cssu::Referen
         throw (cssu::RuntimeException)
 {
 }
-
+    
 /* XInitialization */
-void SAL_CALL EncryptorImpl::initialize( const cssu::Sequence< cssu::Any >& aArguments )
+void SAL_CALL EncryptorImpl::initialize( const cssu::Sequence< cssu::Any >& aArguments ) 
     throw (cssu::Exception, cssu::RuntimeException)
 {
     OSL_ASSERT(aArguments.getLength() == 5);
 
     rtl::OUString ouTempString;
-
+    
     aArguments[0] >>= ouTempString;
     m_nSecurityId = ouTempString.toInt32();
     aArguments[1] >>= m_xSAXEventKeeper;
@@ -232,7 +232,7 @@ void SAL_CALL EncryptorImpl::initialize( const cssu::Sequence< cssu::Any >& aArg
     aArguments[3] >>= m_xSecurityEnvironment;
     aArguments[4] >>= m_xXMLEncryption;
 }
-
+    
 
 rtl::OUString EncryptorImpl_getImplementationName ()
     throw (cssu::RuntimeException)
@@ -240,13 +240,13 @@ rtl::OUString EncryptorImpl_getImplementationName ()
     return rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
 }
 
-sal_Bool SAL_CALL EncryptorImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL EncryptorImpl_supportsService( const rtl::OUString& ServiceName ) 
     throw (cssu::RuntimeException)
 {
     return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME ));
 }
 
-cssu::Sequence< rtl::OUString > SAL_CALL EncryptorImpl_getSupportedServiceNames(  )
+cssu::Sequence< rtl::OUString > SAL_CALL EncryptorImpl_getSupportedServiceNames(  ) 
     throw (cssu::RuntimeException)
 {
     cssu::Sequence < rtl::OUString > aRet(1);
@@ -256,7 +256,7 @@ cssu::Sequence< rtl::OUString > SAL_CALL EncryptorImpl_getSupportedServiceNames(
 }
 #undef SERVICE_NAME
 
-cssu::Reference< cssu::XInterface > SAL_CALL EncryptorImpl_createInstance(
+cssu::Reference< cssu::XInterface > SAL_CALL EncryptorImpl_createInstance( 
     const cssu::Reference< cssl::XMultiServiceFactory >& rSMgr)
     throw( cssu::Exception )
 {
@@ -264,17 +264,17 @@ cssu::Reference< cssu::XInterface > SAL_CALL EncryptorImpl_createInstance(
 }
 
 /* XServiceInfo */
-rtl::OUString SAL_CALL EncryptorImpl::getImplementationName(  )
+rtl::OUString SAL_CALL EncryptorImpl::getImplementationName(  ) 
     throw (cssu::RuntimeException)
 {
     return EncryptorImpl_getImplementationName();
 }
-sal_Bool SAL_CALL EncryptorImpl::supportsService( const rtl::OUString& rServiceName )
+sal_Bool SAL_CALL EncryptorImpl::supportsService( const rtl::OUString& rServiceName ) 
     throw (cssu::RuntimeException)
 {
     return EncryptorImpl_supportsService( rServiceName );
 }
-cssu::Sequence< rtl::OUString > SAL_CALL EncryptorImpl::getSupportedServiceNames(  )
+cssu::Sequence< rtl::OUString > SAL_CALL EncryptorImpl::getSupportedServiceNames(  ) 
     throw (cssu::RuntimeException)
 {
     return EncryptorImpl_getSupportedServiceNames();
diff --git a/xmlsecurity/source/framework/encryptorimpl.hxx b/xmlsecurity/source/framework/encryptorimpl.hxx
index 2d5e2e8aa444..51b579dad51c 100644
--- a/xmlsecurity/source/framework/encryptorimpl.hxx
+++ b/xmlsecurity/source/framework/encryptorimpl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,18 +50,18 @@ class EncryptorImpl : public cppu::ImplInheritanceHelper4
 /****** EncryptorImpl.hxx/CLASS EncryptorImpl *********************************
  *
  *   NAME
- *  EncryptorImpl -- generates an encryption
+ *	EncryptorImpl -- generates an encryption
  *
  *   FUNCTION
- *  Collects all resources for an encryption generation, then generates the
- *  encryption by invoking a xmlsec-based encryption bridge component.
+ *	Collects all resources for an encryption generation, then generates the
+ *	encryption by invoking a xmlsec-based encryption bridge component.
  *
  *   HISTORY
- *  05.01.2004 -    Interface supported: XInitialization, XServiceInfo
+ *	05.01.2004 -	Interface supported: XInitialization, XServiceInfo
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
 private:
@@ -69,79 +69,79 @@ private:
      * the Id of the encryption, which is used for the result listener to
      * identify the encryption.
      */
-    sal_Int32 m_nEncryptionId;
-
+    sal_Int32 m_nEncryptionId;  
+        
     /*
      * the Id of the element to be encrypted.
      */
     sal_Int32 m_nReferenceId;
-
+        
     /*
      * the decryption result,
      * remembers whether the encryption succeeds.
      */
     bool      m_bEncryptionSucceed;
-
-    com::sun::star::uno::Reference<
+    
+    com::sun::star::uno::Reference< 
         com::sun::star::xml::crypto::XSecurityEnvironment > m_xSecurityEnvironment;
-
+    
     virtual void notifyResultListener() const
         throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException);
     virtual bool checkReady() const;
-    virtual void startEngine( const com::sun::star::uno::Reference<
+    virtual void startEngine( const com::sun::star::uno::Reference< 
         com::sun::star::xml::crypto::XXMLEncryptionTemplate >&
         xEncryptionTemplate)
         throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException);
-
+    
 public:
-    explicit EncryptorImpl( const com::sun::star::uno::Reference<
+    explicit EncryptorImpl( const com::sun::star::uno::Reference< 
         com::sun::star::lang::XMultiServiceFactory >& rxMSF);
     virtual ~EncryptorImpl();
 
     /* XEncryptionResultBroadcaster */
     virtual void SAL_CALL addEncryptionResultListener(
-        const com::sun::star::uno::Reference<
+        const com::sun::star::uno::Reference< 
             com::sun::star::xml::crypto::sax::XEncryptionResultListener >&
             listener )
             throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL removeEncryptionResultListener(
-            const com::sun::star::uno::Reference<
-                com::sun::star::xml::crypto::sax::XEncryptionResultListener >&
+        virtual void SAL_CALL removeEncryptionResultListener( 
+            const com::sun::star::uno::Reference< 
+                com::sun::star::xml::crypto::sax::XEncryptionResultListener >& 
                 listener )
             throw (com::sun::star::uno::RuntimeException);
 
     /* XReferenceCollector */
     virtual void SAL_CALL setReferenceCount( sal_Int32 count )
         throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException);
-
+            
     virtual void SAL_CALL setReferenceId( sal_Int32 id )
         throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException);
 
     /* XInitialization */
-    virtual void SAL_CALL initialize(
-        const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments )
+    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);
 
     /* XServiceInfo */
-    virtual rtl::OUString SAL_CALL getImplementationName(  )
+    virtual rtl::OUString SAL_CALL getImplementationName(  ) 
         throw (com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName )
+    virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) 
         throw (com::sun::star::uno::RuntimeException);
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(  ) 
         throw (com::sun::star::uno::RuntimeException);
 };
 
 rtl::OUString EncryptorImpl_getImplementationName()
     throw ( com::sun::star::uno::RuntimeException );
 
-sal_Bool SAL_CALL EncryptorImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL EncryptorImpl_supportsService( const rtl::OUString& ServiceName ) 
     throw ( com::sun::star::uno::RuntimeException );
 
-com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL EncryptorImpl_getSupportedServiceNames(  )
+com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL EncryptorImpl_getSupportedServiceNames(  ) 
     throw ( com::sun::star::uno::RuntimeException );
 
 com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
-SAL_CALL EncryptorImpl_createInstance(
+SAL_CALL EncryptorImpl_createInstance( 
     const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rSMgr)
     throw ( com::sun::star::uno::Exception );
 
diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
index 5f19a305a748..f3519f46206b 100644
--- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
+++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,17 +70,17 @@ SAXEventKeeperImpl::~SAXEventKeeperImpl()
         m_pRootBufferNode->freeAllChildren();
         delete m_pRootBufferNode;
     }
-
+    
     m_pRootBufferNode = m_pCurrentBufferNode = m_pCurrentBlockingBufferNode = NULL;
-
+    
     /*
      * delete all unfreed ElementMarks
      */
     m_vNewElementCollectors.clear();
     m_pNewBlocker = NULL;
-
+    
     std::vector< const ElementMark* >::const_iterator ii = m_vElementMarkBuffers.begin();
-    for( ; ii != m_vElementMarkBuffers.end(); ++ii )
+    for( ; ii != m_vElementMarkBuffers.end(); ++ii ) 
     {
         delete (*ii);
     }
@@ -91,32 +91,32 @@ void SAXEventKeeperImpl::setCurrentBufferNode(BufferNode* pBufferNode)
 /****** SAXEventKeeperImpl/setCurrentBufferNode ******************************
  *
  *   NAME
- *  setCurrentBufferNode -- set a new active BufferNode.
+ *	setCurrentBufferNode -- set a new active BufferNode.
  *
  *   SYNOPSIS
- *  setCurrentBufferNode( pBufferNode );
+ *	setCurrentBufferNode( pBufferNode );
  *
  *   FUNCTION
- *  connects this BufferNode into the BufferNode tree as a child of the
- *  current active BufferNode. Then makes this BufferNode as the current
- *  active BufferNode.
- *  If the previous active BufferNode points to the root
- *  BufferNode, which means that no buffering operation was proceeding,
- *  then notifies the status change listener that buffering  operation
- *  will begin at once.
+ *	connects this BufferNode into the BufferNode tree as a child of the
+ *	current active BufferNode. Then makes this BufferNode as the current
+ *	active BufferNode.
+ *	If the previous active BufferNode points to the root
+ *	BufferNode, which means that no buffering operation was proceeding,
+ *	then notifies the status change listener that buffering  operation 
+ *	will begin at once.
  *
  *   INPUTS
- *  pBufferNode - a BufferNode which will be the new active BufferNode
+ *	pBufferNode - a BufferNode which will be the new active BufferNode
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     if (pBufferNode != m_pCurrentBufferNode)
@@ -126,13 +126,13 @@ void SAXEventKeeperImpl::setCurrentBufferNode(BufferNode* pBufferNode)
         {
             m_xSAXEventKeeperStatusChangeListener->collectionStatusChanged(sal_True);
         }
-
+            
         if (pBufferNode->getParent() == NULL)
         {
             m_pCurrentBufferNode->addChild(pBufferNode);
             pBufferNode->setParent(m_pCurrentBufferNode);
         }
-
+        
         m_pCurrentBufferNode = pBufferNode;
     }
 }
@@ -141,30 +141,30 @@ BufferNode* SAXEventKeeperImpl::addNewElementMarkBuffers()
 /****** SAXEventKeeperImpl/addNewElementMarkBuffers **************************
  *
  *   NAME
- *  addNewElementMarkBuffers -- add new ElementCollectors and new Blocker.
+ *	addNewElementMarkBuffers -- add new ElementCollectors and new Blocker.
  *
  *   SYNOPSIS
- *  pBufferNode = addNewElementMarkBuffers( );
+ *	pBufferNode = addNewElementMarkBuffers( );
  *
  *   FUNCTION
- *  if there are new ElementCollector or new Blocker to be added, then
- *  connect all of them with the current BufferNode. In case of the
- *  current BufferNode doesn't exist, creates one.
- *  Clears up the new ElementCollector list and the new Blocker pointer.
+ *	if there are new ElementCollector or new Blocker to be added, then
+ *	connect all of them with the current BufferNode. In case of the
+ *	current BufferNode doesn't exist, creates one.
+ *	Clears up the new ElementCollector list and the new Blocker pointer.
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  pBufferNode - the BufferNode that has been connected with both new
- *                ElementCollectors and new Blocker.
+ *	pBufferNode - the BufferNode that has been connected with both new
+ *	              ElementCollectors and new Blocker.
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     BufferNode* pBufferNode = NULL;
@@ -178,7 +178,7 @@ BufferNode* SAXEventKeeperImpl::addNewElementMarkBuffers()
          * no new BufferNode is needed to create.
          * This situation can only happen in the "Forwarding" mode.
          */
-        if ( (m_pCurrentBufferNode != NULL) &&
+        if ( (m_pCurrentBufferNode != NULL) && 
              (m_xXMLDocument->isCurrent(m_pCurrentBufferNode->getXMLElement())))
         {
             pBufferNode = m_pCurrentBufferNode;
@@ -187,11 +187,11 @@ BufferNode* SAXEventKeeperImpl::addNewElementMarkBuffers()
         {
             pBufferNode = new BufferNode(m_xXMLDocument->getCurrentElement());
         }
-
+            
         if (m_pNewBlocker != NULL)
         {
             pBufferNode->setBlocker(m_pNewBlocker);
-
+            
             /*
              * If no blocking before, then notify the status change listener that
              * the SAXEventKeeper has entered "blocking" status, during which, no
@@ -200,29 +200,29 @@ BufferNode* SAXEventKeeperImpl::addNewElementMarkBuffers()
             if (m_pCurrentBlockingBufferNode == NULL)
             {
                 m_pCurrentBlockingBufferNode = pBufferNode;
-
+                
                 if (m_xSAXEventKeeperStatusChangeListener.is())
                 {
                     m_xSAXEventKeeperStatusChangeListener->blockingStatusChanged(sal_True);
                 }
             }
-
+            
             m_pNewBlocker = NULL;
         }
-
+        
         if (m_vNewElementCollectors.size()>0)
         {
             std::vector< const ElementCollector* >::const_iterator ii = m_vNewElementCollectors.begin();
-
-            for( ; ii != m_vNewElementCollectors.end(); ++ii )
+            
+            for( ; ii != m_vNewElementCollectors.end(); ++ii ) 
             {
                 pBufferNode->addElementCollector(*ii);
             }
-
+        
             m_vNewElementCollectors.clear();
         }
     }
-
+    
     return pBufferNode;
 }
 
@@ -230,35 +230,35 @@ ElementMark* SAXEventKeeperImpl::findElementMarkBuffer(sal_Int32 nId) const
 /****** SAXEventKeeperImpl/findElementMarkBuffer *****************************
  *
  *   NAME
- *  findElementMarkBuffer -- finds an ElementMark.
+ *	findElementMarkBuffer -- finds an ElementMark.
  *
  *   SYNOPSIS
- *  pElementMark = findElementMarkBuffer( nId );
+ *	pElementMark = findElementMarkBuffer( nId );
  *
  *   FUNCTION
- *  searches an ElementMark with the particular Id in the ElementMark
- *  list.
+ *	searches an ElementMark with the particular Id in the ElementMark
+ *	list.
  *
  *   INPUTS
- *  nId - the Id of the ElementMark to be searched.
+ *	nId - the Id of the ElementMark to be searched.
  *
  *   RESULT
- *  pElementMark - the ElementMark with the particular Id, or NULL when
- *                 no such Id exists.
+ *	pElementMark - the ElementMark with the particular Id, or NULL when 
+ *	               no such Id exists.
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     ElementMark* pElementMark = NULL;
-
+    
     std::vector< const ElementMark* >::const_iterator ii = m_vElementMarkBuffers.begin();
-
-    for( ; ii != m_vElementMarkBuffers.end(); ++ii )
+            
+    for( ; ii != m_vElementMarkBuffers.end(); ++ii ) 
     {
         if ( nId == (*ii)->getBufferId())
         {
@@ -266,7 +266,7 @@ ElementMark* SAXEventKeeperImpl::findElementMarkBuffer(sal_Int32 nId) const
             break;
         }
     }
-
+    
     return pElementMark;
 }
 
@@ -274,31 +274,31 @@ void SAXEventKeeperImpl::removeElementMarkBuffer(sal_Int32 nId)
 /****** SAXEventKeeperImpl/removeElementMarkBuffer ***************************
  *
  *   NAME
- *  removeElementMarkBuffer -- removes an ElementMark
+ *	removeElementMarkBuffer -- removes an ElementMark
  *
  *   SYNOPSIS
- *  removeElementMarkBuffer( nId );
+ *	removeElementMarkBuffer( nId );
  *
  *   FUNCTION
- *  removes an ElementMark with the particular Id in the ElementMark list.
+ *	removes an ElementMark with the particular Id in the ElementMark list.
  *
  *   INPUTS
- *  nId - the Id of the ElementMark to be removed.
+ *	nId - the Id of the ElementMark to be removed.
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     std::vector< const ElementMark* >::iterator ii = m_vElementMarkBuffers.begin();
-
-    for( ; ii != m_vElementMarkBuffers.end(); ++ii )
+            
+    for( ; ii != m_vElementMarkBuffers.end(); ++ii ) 
     {
         if ( nId == (*ii)->getBufferId())
         {
@@ -306,7 +306,7 @@ void SAXEventKeeperImpl::removeElementMarkBuffer(sal_Int32 nId)
              * checks whether this ElementMark still in the new ElementCollect array
              */
             std::vector< const ElementCollector* >::iterator jj = m_vNewElementCollectors.begin();
-            for( ; jj != m_vNewElementCollectors.end(); ++jj )
+            for( ; jj != m_vNewElementCollectors.end(); ++jj ) 
             {
                 if ((*ii) == (*jj))
                 {
@@ -314,7 +314,7 @@ void SAXEventKeeperImpl::removeElementMarkBuffer(sal_Int32 nId)
                     break;
                 }
             }
-
+            
             /*
              * checks whether this ElementMark is the new Blocker
              */
@@ -322,12 +322,12 @@ void SAXEventKeeperImpl::removeElementMarkBuffer(sal_Int32 nId)
             {
                 m_pNewBlocker = NULL;
             }
-
+            
             /*
              * destory the ElementMark
              */
             delete (*ii);
-
+            
             m_vElementMarkBuffers.erase( ii );
             break;
         }
@@ -339,36 +339,36 @@ rtl::OUString SAXEventKeeperImpl::printBufferNode(
 /****** SAXEventKeeperImpl/printBufferNode ***********************************
  *
  *   NAME
- *  printBufferNode -- retrieves the information of a BufferNode and its
- *  branch.
+ *	printBufferNode -- retrieves the information of a BufferNode and its
+ *	branch.
  *
  *   SYNOPSIS
- *  info = printBufferNode( pBufferNode, nIndent );
+ *	info = printBufferNode( pBufferNode, nIndent );
  *
  *   FUNCTION
- *  all retrieved information includes:
- *  1. whether it is the current BufferNode;
- *  2. whether it is the current blocking BufferNode;
- *  3. the name of the parent element;
- *  4. the name of this element;
- *  5. all ElementCollectors working on this BufferNode;
- *  6. the Blocker working on this BufferNode;
- *  7. all child BufferNodes' information.
+ *	all retrieved information includes:
+ *	1. whether it is the current BufferNode;
+ *	2. whether it is the current blocking BufferNode;
+ *	3. the name of the parent element;
+ *	4. the name of this element;
+ *	5. all ElementCollectors working on this BufferNode;
+ *	6. the Blocker working on this BufferNode;
+ *	7. all child BufferNodes' information.
  *
  *   INPUTS
- *  pBufferNode -   the BufferNode from where information will be retrieved.
- *  nIndent -   how many space characters prefixed before the output
- *              message.
+ *	pBufferNode - 	the BufferNode from where information will be retrieved.
+ *	nIndent - 	how many space characters prefixed before the output
+ *	          	message.
  *
  *   RESULT
- *  info - the information string
+ *	info - the information string
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     rtl::OUString rc;
@@ -382,7 +382,7 @@ rtl::OUString SAXEventKeeperImpl::printBufferNode(
     {
         rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "[%]" ));
     }
-
+        
     if (pBufferNode == m_pCurrentBlockingBufferNode)
     {
         rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "[B]" ));
@@ -390,7 +390,7 @@ rtl::OUString SAXEventKeeperImpl::printBufferNode(
 
     rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " " ));
     rc += m_xXMLDocument->getNodeName(pBufferNode->getXMLElement());
-
+    
     BufferNode* pParent = (BufferNode*)pBufferNode->getParent();
     if (pParent != NULL)
     {
@@ -398,11 +398,11 @@ rtl::OUString SAXEventKeeperImpl::printBufferNode(
         rc += m_xXMLDocument->getNodeName(pParent->getXMLElement());
         rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "]" ));
     }
-
+    
     rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ":EC=" ));
     rc += pBufferNode->printChildren();
     rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " BR=" ));
-
+        
     ElementMark * pBlocker = pBufferNode->getBlocker();
     if (pBlocker != NULL)
     {
@@ -413,63 +413,63 @@ rtl::OUString SAXEventKeeperImpl::printBufferNode(
         rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " " ));
     }
     rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "\n" ));
-
+        
     std::vector< const BufferNode* >* vChildren = pBufferNode->getChildren();
     std::vector< const BufferNode* >::const_iterator jj = vChildren->begin();
-    for( ; jj != vChildren->end(); ++jj )
+    for( ; jj != vChildren->end(); ++jj ) 
     {
         rc += printBufferNode((BufferNode *)*jj, nIndent+4);
     }
-
+    
     delete vChildren;
-
+    
     return rc;
 }
 
-cssu::Sequence< cssu::Reference< cssxw::XXMLElementWrapper > >
+cssu::Sequence< cssu::Reference< cssxw::XXMLElementWrapper > > 
     SAXEventKeeperImpl::collectChildWorkingElement(BufferNode* pBufferNode) const
 /****** SAXEventKeeperImpl/collectChildWorkingElement ************************
  *
  *   NAME
- *  collectChildWorkingElement -- collects a BufferNode's all child
- *  Elements.
+ *	collectChildWorkingElement -- collects a BufferNode's all child
+ *	Elements.
  *
  *   SYNOPSIS
- *  list = collectChildWorkingElement( pBufferNode );
+ *	list = collectChildWorkingElement( pBufferNode );
  *
  *   FUNCTION
- *  see NAME.
+ *	see NAME.
  *
  *   INPUTS
- *  pBufferNode - the BufferNode whose child Elements will be collected.
+ *	pBufferNode - the BufferNode whose child Elements will be collected.
  *
  *   RESULT
- *  list - the child Elements list.
+ *	list - the child Elements list.
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     std::vector< const BufferNode* >* vChildren = pBufferNode->getChildren();
-
-    cssu::Sequence < cssu::Reference<
+    
+    cssu::Sequence < cssu::Reference< 
         cssxw::XXMLElementWrapper > > aChildrenCollection ( vChildren->size());
-
+    
     std::vector< const BufferNode* >::const_iterator ii = vChildren->begin();
-
+    
     sal_Int32 nIndex = 0;
-    for( ; ii != vChildren->end(); ++ii )
+    for( ; ii != vChildren->end(); ++ii ) 
     {
         aChildrenCollection[nIndex] = (*ii)->getXMLElement();
         nIndex++;
     }
-
+    
     delete vChildren;
-
+    
     return aChildrenCollection;
 }
 
@@ -478,47 +478,47 @@ void SAXEventKeeperImpl::smashBufferNode(
 /****** SAXEventKeeperImpl/smashBufferNode ***********************************
  *
  *   NAME
- *  smashBufferNode -- removes a BufferNode along with its working
- *  element.
+ *	smashBufferNode -- removes a BufferNode along with its working
+ *	element.
  *
  *   SYNOPSIS
- *  smashBufferNode( pBufferNode, bClearRoot );
+ *	smashBufferNode( pBufferNode, bClearRoot );
  *
  *   FUNCTION
- *  removes the BufferNode's working element from the DOM document, while
- *  reserves all ancestor paths for its child BufferNodes.
- *  when any of the BufferNode's ancestor element is useless, removes it
- *  too.
- *  removes the BufferNode from the BufferNode tree.
+ *	removes the BufferNode's working element from the DOM document, while
+ *	reserves all ancestor paths for its child BufferNodes.
+ *	when any of the BufferNode's ancestor element is useless, removes it
+ *	too.
+ *	removes the BufferNode from the BufferNode tree.
  *
  *   INPUTS
- *  pBufferNode -   the BufferNode to be removed
- *  bClearRoot -    whether the root element also needs to be cleared up.
+ *	pBufferNode - 	the BufferNode to be removed
+ *	bClearRoot - 	whether the root element also needs to be cleared up.
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   NOTES
- *  when removeing a Blocker's BufferNode, the bClearRoot flag should be
- *  true. Because a Blocker can buffer many SAX events which are not used
- *  by any other ElementCollector or Blocker.
- *  When the bClearRoot is set to true, the root BufferNode will be first
- *  cleared, with a stop flag seting at the next Blocking BufferNode. This
- *  operation can delete all useless bufferred SAX events which are only
- *  needed by the Blocker to be deleted.
+ *	when removeing a Blocker's BufferNode, the bClearRoot flag should be
+ *	true. Because a Blocker can buffer many SAX events which are not used
+ *	by any other ElementCollector or Blocker.
+ *	When the bClearRoot is set to true, the root BufferNode will be first
+ *	cleared, with a stop flag seting at the next Blocking BufferNode. This
+ *	operation can delete all useless bufferred SAX events which are only
+ *	needed by the Blocker to be deleted.
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     if (!pBufferNode->hasAnything())
     {
         BufferNode* pParent = (BufferNode*)pBufferNode->getParent();
-
+        
             /*
              * delete the XML data
              */
@@ -527,7 +527,7 @@ void SAXEventKeeperImpl::smashBufferNode(
             bool bIsNotBlocking = (m_pCurrentBlockingBufferNode == NULL);
             bool bIsBlockInside = false;
             bool bIsBlockingAfterward = false;
-
+            
                 /*
                  * If this is a blocker, then remove any out-element data
                  * which caused by blocking. The removal process will stop
@@ -535,18 +535,18 @@ void SAXEventKeeperImpl::smashBufferNode(
                  */
             if (bClearRoot)
             {
-                cssu::Sequence< cssu::Reference< cssxw::XXMLElementWrapper > >
+                cssu::Sequence< cssu::Reference< cssxw::XXMLElementWrapper > > 
                     aChildElements = collectChildWorkingElement(m_pRootBufferNode);
-
+                
                     /*
-                     * the clearUselessData only clearup the content in the
+                     * the clearUselessData only clearup the content in the 
                      * node, not the node itself.
                      */
                 m_xXMLDocument->clearUselessData(m_pRootBufferNode->getXMLElement(),
                     aChildElements,
                     bIsNotBlocking?(NULL):
                                    (m_pCurrentBlockingBufferNode->getXMLElement()));
-
+                    
                     /*
                      * remove the node if it is empty, then if its parent is also
                      * empty, remove it, then if the next parent is also empty,
@@ -554,9 +554,9 @@ void SAXEventKeeperImpl::smashBufferNode(
                      */
                 m_xXMLDocument->collapse( m_pRootBufferNode->getXMLElement() );
             }
-
+            
             /*
-             * if blocking, check the relationship between this BufferNode and
+             * if blocking, check the relationship between this BufferNode and 
              * the current blocking BufferNode.
              */
             if ( !bIsNotBlocking )
@@ -565,18 +565,18 @@ void SAXEventKeeperImpl::smashBufferNode(
                  * the current blocking BufferNode is a descendant of this BufferNode.
                  */
                 bIsBlockInside = (NULL != pBufferNode->isAncestor(m_pCurrentBlockingBufferNode));
-
+                
                 /*
                  * the current blocking BufferNode locates behind this BufferNode in tree
                  * order.
                  */
                 bIsBlockingAfterward = pBufferNode->isPrevious(m_pCurrentBlockingBufferNode);
             }
-
+            
             /*
              * this BufferNode's working element needs to be deleted only when
              * 1. there is no blocking, or
-             * 2. the current blocking BufferNode is a descendant of this BufferNode,
+             * 2. the current blocking BufferNode is a descendant of this BufferNode, 
              *    (then in the BufferNode's working element, the useless data before the blocking
              *     element should be deleted.) or
              * 3. the current blocking BufferNode is locates behind this BufferNode in tree,
@@ -586,18 +586,18 @@ void SAXEventKeeperImpl::smashBufferNode(
              */
             if ( bIsNotBlocking || bIsBlockInside || bIsBlockingAfterward )
             {
-                cssu::Sequence< cssu::Reference< cssxw::XXMLElementWrapper > >
+                cssu::Sequence< cssu::Reference< cssxw::XXMLElementWrapper > > 
                     aChildElements = collectChildWorkingElement(pBufferNode);
-
+                
                     /*
-                     * the clearUselessData only clearup the content in the
+                     * the clearUselessData only clearup the content in the 
                      * node, not the node itself.
                      */
                 m_xXMLDocument->clearUselessData(pBufferNode->getXMLElement(),
                     aChildElements,
                     bIsBlockInside?(m_pCurrentBlockingBufferNode->getXMLElement()):
                                (NULL));
-
+                    
                     /*
                      * remove the node if it is empty, then if its parent is also
                      * empty, remove it, then if the next parent is also empty,
@@ -612,17 +612,17 @@ void SAXEventKeeperImpl::smashBufferNode(
         std::vector< const BufferNode* >* vChildren = pBufferNode->getChildren();
         pParent->removeChild(pBufferNode);
         pBufferNode->setParent(NULL);
-
+        
         std::vector< const BufferNode * >::const_iterator ii = vChildren->begin();
-        for( ; ii != vChildren->end(); ++ii )
+        for( ; ii != vChildren->end(); ++ii ) 
         {
             ((BufferNode *)(*ii))->setParent(pParent);
             pParent->addChild(*ii, nIndex);
             nIndex++;
         }
-
+        
         delete vChildren;
-
+        
         /*
          * delete the BufferNode
          */
@@ -635,37 +635,37 @@ BufferNode* SAXEventKeeperImpl::findNextBlockingBufferNode(
 /****** SAXEventKeeperImpl/findNextBlockingBufferNode ************************
  *
  *   NAME
- *  findNextBlockingBufferNode -- finds the next blocking BufferNode
- *  behind the particular BufferNode.
+ *	findNextBlockingBufferNode -- finds the next blocking BufferNode
+ *	behind the particular BufferNode.
  *
  *   SYNOPSIS
- *  pBufferNode = findNextBlockingBufferNode( pStartBufferNode );
+ *	pBufferNode = findNextBlockingBufferNode( pStartBufferNode );
  *
  *   FUNCTION
- *  see NAME.
+ *	see NAME.
  *
  *   INPUTS
- *  pStartBufferNode - the BufferNode from where to search the next
- *                     blocking BufferNode.
+ *	pStartBufferNode - the BufferNode from where to search the next 
+ *	                   blocking BufferNode.
  *
  *   RESULT
- *  pBufferNode - the next blocking BufferNode, or NULL if no such
- *                BufferNode exists.
+ *	pBufferNode - the next blocking BufferNode, or NULL if no such 
+ *	              BufferNode exists.
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     BufferNode* pNext = NULL;
-
+    
     if (pStartBufferNode != NULL)
     {
         pNext = pStartBufferNode;
-
+        
         while (NULL != (pNext = (BufferNode*)pNext->getNextNodeByTreeOrder()))
         {
             if (pNext->getBlocker() != NULL)
@@ -674,7 +674,7 @@ BufferNode* SAXEventKeeperImpl::findNextBlockingBufferNode(
             }
         }
     }
-
+        
     return pNext;
 }
 
@@ -682,33 +682,33 @@ void SAXEventKeeperImpl::diffuse(BufferNode* pBufferNode) const
 /****** SAXEventKeeperImpl/diffuse *******************************************
  *
  *   NAME
- *  diffuse -- diffuse the notification.
+ *	diffuse -- diffuse the notification.
  *
  *   SYNOPSIS
- *  diffuse( pBufferNode );
+ *	diffuse( pBufferNode );
  *
  *   FUNCTION
- *  diffuse the collecting completion notification from the specific
- *  BufferNode along its parent link, until an ancestor which is not
- *  completely received is met.
+ *	diffuse the collecting completion notification from the specific
+ *	BufferNode along its parent link, until an ancestor which is not
+ *	completely received is met.
  *
  *   INPUTS
- *  pBufferNode - the BufferNode from which the notification will be
- *                diffused.
+ *	pBufferNode - the BufferNode from which the notification will be 
+ *	              diffused.
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     BufferNode* pParent = pBufferNode;
-
+    
     while(pParent->isAllReceived())
     {
         pParent->elementCollectorNotify();
@@ -720,28 +720,28 @@ void SAXEventKeeperImpl::releaseElementMarkBuffer()
 /****** SAXEventKeeperImpl/releaseElementMarkBuffer **************************
  *
  *   NAME
- *  releaseElementMarkBuffer -- releases useless ElementMarks
+ *	releaseElementMarkBuffer -- releases useless ElementMarks 
  *
  *   SYNOPSIS
- *  releaseElementMarkBuffer( );
+ *	releaseElementMarkBuffer( );
  *
  *   FUNCTION
- *  releases each ElementMark in the releasing list
- *  m_vReleasedElementMarkBuffers.
- *  The operation differs between an ElementCollector and a Blocker.
+ *	releases each ElementMark in the releasing list
+ *	m_vReleasedElementMarkBuffers.
+ *	The operation differs between an ElementCollector and a Blocker.
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     m_bIsReleasing = true;
@@ -750,22 +750,22 @@ void SAXEventKeeperImpl::releaseElementMarkBuffer()
         std::vector< sal_Int32 >::iterator pId = m_vReleasedElementMarkBuffers.begin();
         sal_Int32 nId = *pId;
         m_vReleasedElementMarkBuffers.erase( pId );
-
+        
         ElementMark* pElementMark = findElementMarkBuffer(nId);
 
         if (pElementMark != NULL)
         {
-            if (cssxc::sax::ElementMarkType_ELEMENTCOLLECTOR
-                == pElementMark->getType())
+            if (cssxc::sax::ElementMarkType_ELEMENTCOLLECTOR 
+                == pElementMark->getType()) 
             /*
              * it is a EC
              */
             {
                 ElementCollector* pElementCollector = (ElementCollector*)pElementMark;
-
+                    
                 cssxc::sax::ElementMarkPriority nPriority = pElementCollector->getPriority();
                 bool bToModify = pElementCollector->getModify();
-
+                
                 /*
                      * Delete the EC from the buffer node.
                      */
@@ -776,26 +776,26 @@ void SAXEventKeeperImpl::releaseElementMarkBuffer()
                 {
                     pBufferNode->notifyBranch();
                 }
-
+                        
                 if (bToModify)
                 {
                     pBufferNode->notifyAncestor();
                 }
-
+                
                 /*
                  * delete the ElementMark
-                 */
+                 */		 
                 pElementCollector = NULL;
                 pElementMark = NULL;
-                removeElementMarkBuffer(nId);
-
+                removeElementMarkBuffer(nId);			
+                
                 /*
                  * delete the BufferNode
                  */
                 diffuse(pBufferNode);
                 smashBufferNode(pBufferNode, false);
             }
-            else
+            else 
             /*
              * it is a Blocker
              */
@@ -805,7 +805,7 @@ void SAXEventKeeperImpl::releaseElementMarkBuffer()
                      */
                 BufferNode *pBufferNode = pElementMark->getBufferNode();
                 pBufferNode->setBlocker(NULL);
-
+                
                     /*
                      * If there is a following handler and no blocking now, then
                      * forward this event
@@ -813,11 +813,11 @@ void SAXEventKeeperImpl::releaseElementMarkBuffer()
                 if (m_pCurrentBlockingBufferNode == pBufferNode)
                 {
                         /*
-                         * Before forwarding, the next blocking point needs to be
+                         * Before forwarding, the next blocking point needs to be 
                          * found.
                          */
                     m_pCurrentBlockingBufferNode = findNextBlockingBufferNode(pBufferNode);
-
+                            
                         /*
                          * Forward the blocked events between these two STHs.
                          */
@@ -825,10 +825,10 @@ void SAXEventKeeperImpl::releaseElementMarkBuffer()
                            {
                                BufferNode* pTempCurrentBufferNode = m_pCurrentBufferNode;
                                BufferNode* pTempCurrentBlockingBufferNode = m_pCurrentBlockingBufferNode;
-
+                                           
                                m_pCurrentBufferNode = pBufferNode;
                                m_pCurrentBlockingBufferNode = NULL;
-
+                                           
                         m_bIsForwarding = true;
 
                         m_xXMLDocument->generateSAXEvents(
@@ -838,15 +838,15 @@ void SAXEventKeeperImpl::releaseElementMarkBuffer()
                             (pTempCurrentBlockingBufferNode == NULL)?NULL:(pTempCurrentBlockingBufferNode->getXMLElement()));
 
                         m_bIsForwarding = false;
-
+                                
                         m_pCurrentBufferNode = pTempCurrentBufferNode;
                         if (m_pCurrentBlockingBufferNode == NULL)
                         {
                             m_pCurrentBlockingBufferNode = pTempCurrentBlockingBufferNode;
                         }
                     }
-
-                    if (m_pCurrentBlockingBufferNode == NULL &&
+                            
+                    if (m_pCurrentBlockingBufferNode == NULL && 
                         m_xSAXEventKeeperStatusChangeListener.is())
                     {
                         m_xSAXEventKeeperStatusChangeListener->blockingStatusChanged(sal_False);
@@ -855,10 +855,10 @@ void SAXEventKeeperImpl::releaseElementMarkBuffer()
 
                 /*
                  * delete the ElementMark
-                 */
+                 */		 
                 pElementMark = NULL;
                 removeElementMarkBuffer(nId);
-
+                        
                 /*
                  * delete the BufferNode
                  */
@@ -867,11 +867,11 @@ void SAXEventKeeperImpl::releaseElementMarkBuffer()
             }
         }
     }
-
+        
     m_bIsReleasing = false;
-
-    if (!m_pRootBufferNode->hasAnything() &&
-        !m_pRootBufferNode->hasChildren() &&
+        
+    if (!m_pRootBufferNode->hasAnything() && 
+        !m_pRootBufferNode->hasChildren() && 
         m_xSAXEventKeeperStatusChangeListener.is())
     {
         m_xSAXEventKeeperStatusChangeListener->bufferStatusChanged(sal_True);
@@ -882,28 +882,28 @@ void SAXEventKeeperImpl::markElementMarkBuffer(sal_Int32 nId)
 /****** SAXEventKeeperImpl/markElementMarkBuffer *****************************
  *
  *   NAME
- *  markElementMarkBuffer -- marks an ElementMark to be released
+ *	markElementMarkBuffer -- marks an ElementMark to be released
  *
  *   SYNOPSIS
- *  markElementMarkBuffer( nId );
+ *	markElementMarkBuffer( nId );
  *
  *   FUNCTION
- *  puts the ElementMark with the particular Id into the releasing list,
- *  checks whether the releasing process is runing, if not then launch
- *  this process.
+ *	puts the ElementMark with the particular Id into the releasing list,
+ *	checks whether the releasing process is runing, if not then launch 
+ *	this process.
  *
  *   INPUTS
- *  nId - the Id of the ElementMark which will be released
+ *	nId - the Id of the ElementMark which will be released
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     m_vReleasedElementMarkBuffers.push_back( nId );
@@ -921,82 +921,82 @@ sal_Int32 SAXEventKeeperImpl::createElementCollector(
 /****** SAXEventKeeperImpl/createElementCollector ****************************
  *
  *   NAME
- *  createElementCollector -- creates a new ElementCollector on the
- *  incoming element.
+ *	createElementCollector -- creates a new ElementCollector on the
+ *	incoming element.
  *
  *   SYNOPSIS
- *  nId = createElementCollector( nSecurityId, nPriority,
- *                               bModifyElement,
- *                               xReferenceResolvedListener );
+ *	nId = createElementCollector( nSecurityId, nPriority,
+ *	                             bModifyElement,
+ *	                             xReferenceResolvedListener );
  *
  *   FUNCTION
- *  allocs a new Id, then create an ElementCollector with this Id value.
- *  Add the new created ElementCollector to the new ElementCollecotor list.
+ *	allocs a new Id, then create an ElementCollector with this Id value.
+ *	Add the new created ElementCollector to the new ElementCollecotor list.
  *
  *   INPUTS
- *  nSecurityId -   the security Id of the new ElementCollector
- *  nPriority -     the prirority of the new ElementCollector
- *  bModifyElement -whether this BufferNode will modify the content of
- *                  the corresponding element it works on
- *  xReferenceResolvedListener - the listener for the new ElementCollector.
+ *	nSecurityId - 	the security Id of the new ElementCollector
+ *	nPriority - 	the prirority of the new ElementCollector
+ *	bModifyElement -whether this BufferNode will modify the content of
+ *	                the corresponding element it works on
+ *	xReferenceResolvedListener - the listener for the new ElementCollector.
  *
  *   RESULT
- *  nId - the Id of the new ElementCollector
+ *	nId - the Id of the new ElementCollector
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     sal_Int32 nId = m_nNextElementMarkId;
     m_nNextElementMarkId ++;
-
-    ElementCollector* pElementCollector
+    
+    ElementCollector* pElementCollector 
         = new ElementCollector(
             nSecurityId,
             nId,
             nPriority,
             bModifyElement,
             xReferenceResolvedListener);
-
+                
     m_vElementMarkBuffers.push_back( pElementCollector );
-
+        
         /*
          * All the new EC to initial EC array.
          */
     m_vNewElementCollectors.push_back( pElementCollector );
-
+        
     return nId;
 }
 
-
+    
 sal_Int32 SAXEventKeeperImpl::createBlocker(sal_Int32 nSecurityId)
 /****** SAXEventKeeperImpl/createBlocker *************************************
  *
  *   NAME
- *  createBlocker -- creates a new Blocker on the incoming element.
+ *	createBlocker -- creates a new Blocker on the incoming element.
  *
  *   SYNOPSIS
- *  nId = createBlocker( nSecurityId );
+ *	nId = createBlocker( nSecurityId );
  *
  *   FUNCTION
- *  see NAME.
+ *	see NAME.
  *
  *   INPUTS
- *  nSecurityId -   the security Id of the new Blocker
+ *	nSecurityId - 	the security Id of the new Blocker
  *
  *   RESULT
- *  nId - the Id of the new Blocker
+ *	nId - the Id of the new Blocker
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     sal_Int32 nId = m_nNextElementMarkId;
@@ -1006,7 +1006,7 @@ sal_Int32 SAXEventKeeperImpl::createBlocker(sal_Int32 nSecurityId)
 
     m_pNewBlocker = new ElementMark(nSecurityId, nId);
     m_vElementMarkBuffers.push_back( m_pNewBlocker );
-
+        
     return nId;
 }
 
@@ -1026,51 +1026,51 @@ void SAL_CALL SAXEventKeeperImpl::removeElementCollector( sal_Int32 id )
 {
     markElementMarkBuffer(id);
 }
-
+    
 sal_Int32 SAL_CALL SAXEventKeeperImpl::addBlocker(  )
     throw (cssu::RuntimeException)
 {
     return createBlocker(cssxc::sax::ConstOfSecurityId::UNDEFINEDSECURITYID);
 }
-
+    
 void SAL_CALL SAXEventKeeperImpl::removeBlocker( sal_Int32 id )
     throw (cssu::RuntimeException)
 {
     markElementMarkBuffer(id);
 }
-
+    
 sal_Bool SAL_CALL SAXEventKeeperImpl::isBlocking(  )
     throw (cssu::RuntimeException)
 {
     return (m_pCurrentBlockingBufferNode != NULL);
 }
-
-cssu::Reference< cssxw::XXMLElementWrapper > SAL_CALL
+    
+cssu::Reference< cssxw::XXMLElementWrapper > SAL_CALL 
     SAXEventKeeperImpl::getElement( sal_Int32 id )
     throw (cssu::RuntimeException)
 {
     cssu::Reference< cssxw::XXMLElementWrapper > rc;
-
+    
     ElementMark* pElementMark = findElementMarkBuffer(id);
     if (pElementMark != NULL)
     {
         rc = pElementMark->getBufferNode()->getXMLElement();
     }
-
+    
     return rc;
 }
 
-void SAL_CALL SAXEventKeeperImpl::setElement(
-    sal_Int32 id,
+void SAL_CALL SAXEventKeeperImpl::setElement( 
+    sal_Int32 id, 
     const cssu::Reference< cssxw::XXMLElementWrapper >& aElement )
     throw (cssu::RuntimeException)
 {
     if (aElement.is())
     {
         m_xXMLDocument->rebuildIDLink(aElement);
-
+        
         ElementMark* pElementMark = findElementMarkBuffer(id);
-
+    
         if (pElementMark != NULL)
         {
             BufferNode* pBufferNode = pElementMark->getBufferNode();
@@ -1078,7 +1078,7 @@ void SAL_CALL SAXEventKeeperImpl::setElement(
             {
                     bool bIsCurrent = m_xXMLDocument->isCurrent(pBufferNode->getXMLElement());
                 pBufferNode->setXMLElement(aElement);
-
+                
                 if (bIsCurrent)
                 {
                     m_xXMLDocument->setCurrentElement(aElement);
@@ -1091,47 +1091,47 @@ void SAL_CALL SAXEventKeeperImpl::setElement(
         removeElementCollector( id );
     }
 }
-
+    
 cssu::Reference< cssxs::XDocumentHandler > SAL_CALL SAXEventKeeperImpl::setNextHandler(
     const cssu::Reference< cssxs::XDocumentHandler >& xNewHandler )
     throw (cssu::RuntimeException)
 {
     cssu::Reference< cssxs::XDocumentHandler > xOldHandler = m_xNextHandler;
-
+    
     m_xNextHandler = xNewHandler;
     return xOldHandler;
 }
-
+    
 rtl::OUString SAL_CALL SAXEventKeeperImpl::printBufferNodeTree()
     throw (cssu::RuntimeException)
 {
     rtl::OUString rc;
-
+    
     rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ElementMarkBuffers: size = " ));
     rc += rtl::OUString::valueOf((sal_Int32)m_vElementMarkBuffers.size());
     rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "\nCurrentBufferNode: " ));
     rc += m_xXMLDocument->getNodeName(m_pCurrentBufferNode->getXMLElement());
     rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "\n" ));
     rc += printBufferNode(m_pRootBufferNode, 0);
-
+    
     return rc;
 }
-
+    
 cssu::Reference< cssxw::XXMLElementWrapper > SAL_CALL SAXEventKeeperImpl::getCurrentBlockingNode()
     throw (cssu::RuntimeException)
 {
     cssu::Reference< cssxw::XXMLElementWrapper > rc;
-
+    
     if (m_pCurrentBlockingBufferNode != NULL)
     {
         rc = m_pCurrentBlockingBufferNode->getXMLElement();
     }
-
+    
     return rc;
 }
 
 /* XSecuritySAXEventKeeper */
-sal_Int32 SAL_CALL SAXEventKeeperImpl::addSecurityElementCollector(
+sal_Int32 SAL_CALL SAXEventKeeperImpl::addSecurityElementCollector( 
     cssxc::sax::ElementMarkPriority priority,
     sal_Bool modifyElement )
     throw (cssu::RuntimeException)
@@ -1142,23 +1142,23 @@ sal_Int32 SAL_CALL SAXEventKeeperImpl::addSecurityElementCollector(
         modifyElement,
         NULL);
 }
-
+    
 sal_Int32 SAL_CALL SAXEventKeeperImpl::cloneElementCollector(
     sal_Int32 referenceId,
     cssxc::sax::ElementMarkPriority priority )
     throw (cssu::RuntimeException)
 {
     sal_Int32 nId = -1;
-
+    
     ElementCollector* pElementCollector = (ElementCollector*)findElementMarkBuffer(referenceId);
     if (pElementCollector != NULL)
     {
         nId = m_nNextElementMarkId;
         m_nNextElementMarkId ++;
-
-        ElementCollector* pClonedOne
+            
+        ElementCollector* pClonedOne 
             = pElementCollector->clone(nId, priority);
-
+            
             /*
              * add this EC into the security data buffer array.
              */
@@ -1173,10 +1173,10 @@ sal_Int32 SAL_CALL SAXEventKeeperImpl::cloneElementCollector(
             m_vNewElementCollectors.push_back(pClonedOne);
         }
     }
-
+    
     return nId;
 }
-
+    
 void SAL_CALL SAXEventKeeperImpl::setSecurityId( sal_Int32 id, sal_Int32 securityId )
     throw (cssu::RuntimeException)
 {
@@ -1187,7 +1187,7 @@ void SAL_CALL SAXEventKeeperImpl::setSecurityId( sal_Int32 id, sal_Int32 securit
     }
 }
 
-
+    
 /* XReferenceResolvedBroadcaster */
 void SAL_CALL SAXEventKeeperImpl::addReferenceResolvedListener(
     sal_Int32 referenceId,
@@ -1200,14 +1200,14 @@ void SAL_CALL SAXEventKeeperImpl::addReferenceResolvedListener(
         pElementCollector->setReferenceResolvedListener(listener);
     }
 }
-
-void SAL_CALL SAXEventKeeperImpl::removeReferenceResolvedListener(
-    sal_Int32 /*referenceId*/,
+    
+void SAL_CALL SAXEventKeeperImpl::removeReferenceResolvedListener( 
+    sal_Int32 /*referenceId*/, 
     const cssu::Reference< cssxc::sax::XReferenceResolvedListener >&)
     throw (cssu::RuntimeException)
 {
 }
-
+    
 /* XSAXEventKeeperStatusChangeBroadcaster */
 void SAL_CALL SAXEventKeeperImpl::addSAXEventKeeperStatusChangeListener(
     const cssu::Reference< cssxc::sax::XSAXEventKeeperStatusChangeListener >& listener )
@@ -1215,13 +1215,13 @@ void SAL_CALL SAXEventKeeperImpl::addSAXEventKeeperStatusChangeListener(
 {
     m_xSAXEventKeeperStatusChangeListener = listener;
 }
-
+    
 void SAL_CALL SAXEventKeeperImpl::removeSAXEventKeeperStatusChangeListener(
     const cssu::Reference< cssxc::sax::XSAXEventKeeperStatusChangeListener >&)
     throw (cssu::RuntimeException)
 {
 }
-
+    
 /* XDocumentHandler */
 void SAL_CALL SAXEventKeeperImpl::startDocument(  )
     throw (cssxs::SAXException, cssu::RuntimeException)
@@ -1231,7 +1231,7 @@ void SAL_CALL SAXEventKeeperImpl::startDocument(  )
         m_xNextHandler->startDocument();
     }
 }
-
+    
 void SAL_CALL SAXEventKeeperImpl::endDocument(  )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
@@ -1240,7 +1240,7 @@ void SAL_CALL SAXEventKeeperImpl::endDocument(  )
         m_xNextHandler->endDocument();
     }
 }
-
+    
 void SAL_CALL SAXEventKeeperImpl::startElement(
     const rtl::OUString& aName,
     const cssu::Reference< cssxs::XAttributeList >& xAttribs )
@@ -1251,8 +1251,8 @@ void SAL_CALL SAXEventKeeperImpl::startElement(
          * forward this event
          */
     if ((m_pCurrentBlockingBufferNode == NULL) &&
-        (m_xNextHandler.is()) &&
-        (!m_bIsForwarding) &&
+        (m_xNextHandler.is()) && 
+        (!m_bIsForwarding) && 
         (m_pNewBlocker == NULL))
     {
         m_xNextHandler->startElement(aName, xAttribs);
@@ -1268,43 +1268,43 @@ void SAL_CALL SAXEventKeeperImpl::startElement(
     #else
         sal_Int32 nLength = xAttribs->getLength();
         cssu::Sequence< cssxcsax::XMLAttribute > aAttributes (nLength);
-
-        for ( int i = 0; i<nLength; ++i )
+        
+        for ( int i = 0; i<nLength; ++i ) 
         {
             aAttributes[i].sName = xAttribs->getNameByIndex((short)i);
             aAttributes[i].sValue =xAttribs->getValueByIndex((short)i);
         }
-
+        
         m_xCompressedDocumentHandler->_startElement(aName, aAttributes);
-    #endif
-
+    #endif	       		
+               
     }
-
+        
     BufferNode* pBufferNode = addNewElementMarkBuffers();
         if (pBufferNode != NULL)
         {
         setCurrentBufferNode(pBufferNode);
     }
 }
-
-void SAL_CALL SAXEventKeeperImpl::endElement( const rtl::OUString& aName )
+    
+void SAL_CALL SAXEventKeeperImpl::endElement( const rtl::OUString& aName ) 
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
         sal_Bool bIsCurrent = m_xXMLDocument->isCurrent(m_pCurrentBufferNode->getXMLElement());
-
+            
         /*
          * If there is a following handler and no blocking now, then
          * forward this event
          */
-    if ((m_pCurrentBlockingBufferNode == NULL) &&
-        (m_xNextHandler.is()) &&
+    if ((m_pCurrentBlockingBufferNode == NULL) && 
+        (m_xNextHandler.is()) && 
         (!m_bIsForwarding))
     {
         m_xNextHandler->endElement(aName);
     }
-
-    if ((m_pCurrentBlockingBufferNode != NULL) ||
-        (m_pCurrentBufferNode != m_pRootBufferNode) ||
+        
+    if ((m_pCurrentBlockingBufferNode != NULL) || 
+        (m_pCurrentBufferNode != m_pRootBufferNode) || 
         (!m_xXMLDocument->isCurrentElementEmpty()))
     {
             if (!m_bIsForwarding)
@@ -1313,11 +1313,11 @@ void SAL_CALL SAXEventKeeperImpl::endElement( const rtl::OUString& aName )
             m_xDocumentHandler->endElement(aName);
         #else
             m_xCompressedDocumentHandler->_endElement(aName);
-        #endif
+        #endif	       		
         }
-
+                
         /*
-        * If the current buffer node has not notified yet, and
+        * If the current buffer node has not notified yet, and 
         * the current buffer node is waiting for the current element,
         * then let it notify.
         */
@@ -1325,10 +1325,10 @@ void SAL_CALL SAXEventKeeperImpl::endElement( const rtl::OUString& aName )
         {
             BufferNode* pOldCurrentBufferNode = m_pCurrentBufferNode;
             m_pCurrentBufferNode = (BufferNode*)m_pCurrentBufferNode->getParent();
-
+            
             pOldCurrentBufferNode->setReceivedAll();
-
-            if ((m_pCurrentBufferNode == m_pRootBufferNode) &&
+                
+            if ((m_pCurrentBufferNode == m_pRootBufferNode) && 
                 m_xSAXEventKeeperStatusChangeListener.is())
             {
                 m_xSAXEventKeeperStatusChangeListener->collectionStatusChanged(sal_False);
@@ -1343,7 +1343,7 @@ void SAL_CALL SAXEventKeeperImpl::endElement( const rtl::OUString& aName )
         }
     }
 }
-
+    
 void SAL_CALL SAXEventKeeperImpl::characters( const rtl::OUString& aChars )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
@@ -1353,26 +1353,26 @@ void SAL_CALL SAXEventKeeperImpl::characters( const rtl::OUString& aChars )
         {
             m_xNextHandler->characters(aChars);
         }
-
-        if ((m_pCurrentBlockingBufferNode != NULL) ||
+        
+        if ((m_pCurrentBlockingBufferNode != NULL) || 
             (m_pCurrentBufferNode != m_pRootBufferNode))
         {
         #ifndef _USECOMPRESSEDDOCUMENTHANDLER
                 m_xDocumentHandler->characters(aChars);
         #else
             m_xCompressedDocumentHandler->_characters(aChars);
-        #endif
+        #endif	       		
             }
         }
 }
-
+    
 void SAL_CALL SAXEventKeeperImpl::ignorableWhitespace( const rtl::OUString& aWhitespaces )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
     characters( aWhitespaces );
 }
-
-void SAL_CALL SAXEventKeeperImpl::processingInstruction(
+    
+void SAL_CALL SAXEventKeeperImpl::processingInstruction( 
     const rtl::OUString& aTarget, const rtl::OUString& aData )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
@@ -1382,53 +1382,53 @@ void SAL_CALL SAXEventKeeperImpl::processingInstruction(
         {
             m_xNextHandler->processingInstruction(aTarget, aData);
         }
-
-        if ((m_pCurrentBlockingBufferNode != NULL) ||
+        
+        if ((m_pCurrentBlockingBufferNode != NULL) || 
             (m_pCurrentBufferNode != m_pRootBufferNode))
         {
         #ifndef _USECOMPRESSEDDOCUMENTHANDLER
             m_xDocumentHandler->processingInstruction(aTarget, aData);
         #else
             m_xCompressedDocumentHandler->_processingInstruction(aTarget, aData);
-        #endif
+        #endif	       		
             }
         }
 }
-
+    
 void SAL_CALL SAXEventKeeperImpl::setDocumentLocator( const cssu::Reference< cssxs::XLocator >&)
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
 }
-
+    
 /* XInitialization */
-void SAL_CALL SAXEventKeeperImpl::initialize( const cssu::Sequence< cssu::Any >& aArguments )
+void SAL_CALL SAXEventKeeperImpl::initialize( const cssu::Sequence< cssu::Any >& aArguments ) 
     throw (cssu::Exception, cssu::RuntimeException)
 {
     OSL_ASSERT(aArguments.getLength() == 1);
-
+    
     aArguments[0] >>= m_xXMLDocument;
-    m_xDocumentHandler = cssu::Reference< cssxs::XDocumentHandler >(
+    m_xDocumentHandler = cssu::Reference< cssxs::XDocumentHandler >( 
         m_xXMLDocument, cssu::UNO_QUERY );
-    m_xCompressedDocumentHandler = cssu::Reference< cssxcsax::XCompressedDocumentHandler >(
+    m_xCompressedDocumentHandler = cssu::Reference< cssxcsax::XCompressedDocumentHandler >( 
         m_xXMLDocument, cssu::UNO_QUERY );
-
+    
     m_pRootBufferNode = new BufferNode(m_xXMLDocument->getCurrentElement());
     m_pCurrentBufferNode = m_pRootBufferNode;
 }
-
+    
 rtl::OUString SAXEventKeeperImpl_getImplementationName ()
     throw (cssu::RuntimeException)
 {
     return rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
 }
 
-sal_Bool SAL_CALL SAXEventKeeperImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL SAXEventKeeperImpl_supportsService( const rtl::OUString& ServiceName ) 
     throw (cssu::RuntimeException)
 {
     return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME ));
 }
 
-cssu::Sequence< rtl::OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames(  )
+cssu::Sequence< rtl::OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames(  ) 
     throw (cssu::RuntimeException)
 {
     cssu::Sequence < rtl::OUString > aRet(1);
@@ -1438,7 +1438,7 @@ cssu::Sequence< rtl::OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceN
 }
 #undef SERVICE_NAME
 
-cssu::Reference< cssu::XInterface > SAL_CALL SAXEventKeeperImpl_createInstance(
+cssu::Reference< cssu::XInterface > SAL_CALL SAXEventKeeperImpl_createInstance( 
     const cssu::Reference< cssl::XMultiServiceFactory > &)
     throw( cssu::Exception )
 {
@@ -1446,17 +1446,17 @@ cssu::Reference< cssu::XInterface > SAL_CALL SAXEventKeeperImpl_createInstance(
 }
 
 /* XServiceInfo */
-rtl::OUString SAL_CALL SAXEventKeeperImpl::getImplementationName(  )
+rtl::OUString SAL_CALL SAXEventKeeperImpl::getImplementationName(  ) 
     throw (cssu::RuntimeException)
 {
     return SAXEventKeeperImpl_getImplementationName();
 }
-sal_Bool SAL_CALL SAXEventKeeperImpl::supportsService( const rtl::OUString& rServiceName )
+sal_Bool SAL_CALL SAXEventKeeperImpl::supportsService( const rtl::OUString& rServiceName ) 
     throw (cssu::RuntimeException)
 {
     return SAXEventKeeperImpl_supportsService( rServiceName );
 }
-cssu::Sequence< rtl::OUString > SAL_CALL SAXEventKeeperImpl::getSupportedServiceNames(  )
+cssu::Sequence< rtl::OUString > SAL_CALL SAXEventKeeperImpl::getSupportedServiceNames(  ) 
     throw (cssu::RuntimeException)
 {
     return SAXEventKeeperImpl_getSupportedServiceNames();
diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.hxx b/xmlsecurity/source/framework/saxeventkeeperimpl.hxx
index c78d58808586..175a3ae247be 100644
--- a/xmlsecurity/source/framework/saxeventkeeperimpl.hxx
+++ b/xmlsecurity/source/framework/saxeventkeeperimpl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #define INCLUDED_VECTOR
 #endif
 
-class SAXEventKeeperImpl : public cppu::WeakImplHelper6
-<
+class SAXEventKeeperImpl : public cppu::WeakImplHelper6 
+< 
     com::sun::star::xml::crypto::sax::XSecuritySAXEventKeeper,
     com::sun::star::xml::crypto::sax::XReferenceResolvedBroadcaster,
     com::sun::star::xml::crypto::sax::XSAXEventKeeperStatusChangeBroadcaster,
@@ -61,21 +61,21 @@ class SAXEventKeeperImpl : public cppu::WeakImplHelper6
 /****** SAXEventKeeperImpl.hxx/CLASS SAXEventKeeperImpl ***********************
  *
  *   NAME
- *  SAXEventKeeperImpl -- SAX events buffer controller
+ *	SAXEventKeeperImpl -- SAX events buffer controller
  *
  *   FUNCTION
- *  Controls SAX events to be bufferred, and controls bufferred SAX events
- *  to be released.
+ *	Controls SAX events to be bufferred, and controls bufferred SAX events
+ *	to be released.
  *
  *   HISTORY
- *  05.01.2004 -    Interface supported: XSecuritySAXEventKeeper,
- *                  XReferenceResolvedBroadcaster,
- *                  XSAXEventKeeperStatusChangeBroadcaster,
- *                  XDocumentHandler, XInitialization, XServiceInfo
+ *	05.01.2004 -	Interface supported: XSecuritySAXEventKeeper,
+ *	            	XReferenceResolvedBroadcaster, 
+ *	            	XSAXEventKeeperStatusChangeBroadcaster,
+ *	            	XDocumentHandler, XInitialization, XServiceInfo
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
 private:
@@ -83,63 +83,63 @@ private:
      * the XMLDocumentWrapper component which maintains all bufferred SAX
      * in DOM format.
      */
-    com::sun::star::uno::Reference<
-        com::sun::star::xml::wrapper::XXMLDocumentWrapper >
+    com::sun::star::uno::Reference< 
+        com::sun::star::xml::wrapper::XXMLDocumentWrapper > 
         m_xXMLDocument;
-
+    
     /*
      * the document handler provided by the XMLDocumentWrapper component.
      */
-    com::sun::star::uno::Reference<
+    com::sun::star::uno::Reference< 
         com::sun::star::xml::sax::XDocumentHandler > m_xDocumentHandler;
-
+        
     /*
      * the compressed document handler provided by the XMLDocumentWrapper
-     * component, the handler has more effient method definition that the
+     * component, the handler has more effient method definition that the 
      * normal document handler.
      */
-    com::sun::star::uno::Reference<
-        com::sun::star::xml::csax::XCompressedDocumentHandler >
+    com::sun::star::uno::Reference< 
+        com::sun::star::xml::csax::XCompressedDocumentHandler > 
         m_xCompressedDocumentHandler;
-
+    
     /*
      * a listener which receives this SAXEventKeeper's status change
      * notification.
-     * Based on the status changes, the listener can decide whether the
+     * Based on the status changes, the listener can decide whether the 
      * SAXEventKeeper should chain on/chain off the SAX chain, or whether
      * the SAXEventKeeper is useless any long.
      */
-    com::sun::star::uno::Reference<
-        com::sun::star::xml::crypto::sax::XSAXEventKeeperStatusChangeListener >
+    com::sun::star::uno::Reference< 
+        com::sun::star::xml::crypto::sax::XSAXEventKeeperStatusChangeListener > 
         m_xSAXEventKeeperStatusChangeListener;
-
+    
     /*
      * the root node of the BufferNode tree.
      * the BufferNode tree is used to keep track of all bufferred elements,
-     * it has the same structure with the document which maintains those
+     * it has the same structure with the document which maintains those 
      * elements physically.
      */
     BufferNode*  m_pRootBufferNode;
-
+    
     /*
      * the current active BufferNode.
      * this is used to keep track the current location in the BufferNode tree,
      * the next generated BufferNode will become a child BufferNode of it.
      */
     BufferNode*  m_pCurrentBufferNode;
-
+    
     /*
      * the next Id for a coming ElementMark.
      * the variable is increased by 1 when an new ElementMark is generated,
      * in this way, we can promise the Id of any ElementMark is unique.
      */
     sal_Int32    m_nNextElementMarkId;
-
+    
     /*
      * maintains a collection of all ElementMarks.
      */
     std::vector< const ElementMark* > m_vElementMarkBuffers;
-
+    
     /*
      * maintains a list of new ElementCollectors that will be created
      * on the element represented by the next incoming startElement SAX
@@ -151,27 +151,27 @@ private:
      * SAX event comes.
      */
     std::vector< const ElementCollector* > m_vNewElementCollectors;
-
+    
     /*
      * maintains the new Blocker that will be created
      * on the element represented by the next incoming startElement SAX
      * event.
      */
     ElementMark* m_pNewBlocker;
-
+    
     /*
      * the document handler to which all received SAX events will be
      * forwarded.
      */
-    com::sun::star::uno::Reference<
+    com::sun::star::uno::Reference< 
         com::sun::star::xml::sax::XDocumentHandler > m_xNextHandler;
-
+    
     /*
      * the current BufferNode which prevents the SAX events to be
      * forwarded to the m_xNextHandler.
      */
     BufferNode*  m_pCurrentBlockingBufferNode;
-
+    
     /*
      * maintains a list of ElementMark that has been asked to release.
      * Because during processing a request of releasing an ElementMark,
@@ -181,7 +181,7 @@ private:
      * order.
      */
     std::vector< sal_Int32 > m_vReleasedElementMarkBuffers;
-
+    
     /*
      * a flag to indicate whether the ElementMark releasing process is runing.
      * When a releasing request comes, the assigned ElementMark is added to
@@ -190,59 +190,59 @@ private:
      * method.
      */
     bool     m_bIsReleasing;
-
+    
     /*
      * a flag to indicate whether it is the "Forwarding" mode now.
      * A "Forwarding" mode means that all received SAX events are from the
-     * XMLDocumentWrapper component, instead of up-stream component in the
+     * XMLDocumentWrapper component, instead of up-stream component in the 
      * SAX chain.
      * The difference between "Forwarding" mode and normal mode is that:
      * no SAX events need to be transferred to the XMLDocumentWrapper component
      * again even if a buffer request happens.
      */
     bool     m_bIsForwarding;
-
+    
     void setCurrentBufferNode(BufferNode* pBufferNode);
-
+    
     BufferNode* addNewElementMarkBuffers();
-
+    
     ElementMark* findElementMarkBuffer(sal_Int32 nId) const;
-
+    
     void removeElementMarkBuffer(sal_Int32 nId);
-
+    
     rtl::OUString printBufferNode(
         BufferNode* pBufferNode, sal_Int32 nIndent) const;
-
-    com::sun::star::uno::Sequence< com::sun::star::uno::Reference<
-        com::sun::star::xml::wrapper::XXMLElementWrapper > >
+    
+    com::sun::star::uno::Sequence< com::sun::star::uno::Reference< 
+        com::sun::star::xml::wrapper::XXMLElementWrapper > > 
         collectChildWorkingElement(BufferNode* pBufferNode) const;
-
+            
     void smashBufferNode(
         BufferNode* pBufferNode, bool bClearRoot) const;
-
+    
     BufferNode* findNextBlockingBufferNode(
         BufferNode* pStartBufferNode) const;
-
+    
     void diffuse(BufferNode* pBufferNode) const;
-
+    
     void releaseElementMarkBuffer();
-
+    
     void markElementMarkBuffer(sal_Int32 nId);
-
+    
     sal_Int32 createElementCollector(
         sal_Int32 nSecurityId,
         com::sun::star::xml::crypto::sax::ElementMarkPriority nPriority,
         bool bModifyElement,
-        const com::sun::star::uno::Reference<
+        const com::sun::star::uno::Reference< 
             com::sun::star::xml::crypto::sax::XReferenceResolvedListener>&
             xReferenceResolvedListener);
-
+            
     sal_Int32 createBlocker(sal_Int32 nSecurityId);
-
+    
 public:
     SAXEventKeeperImpl();
     virtual ~SAXEventKeeperImpl();
-
+    
     /* XSAXEventKeeper */
     virtual sal_Int32 SAL_CALL addElementCollector(  )
         throw (com::sun::star::uno::RuntimeException);
@@ -254,110 +254,110 @@ public:
         throw (com::sun::star::uno::RuntimeException);
     virtual sal_Bool SAL_CALL isBlocking(  )
         throw (com::sun::star::uno::RuntimeException);
-    virtual com::sun::star::uno::Reference<
-        com::sun::star::xml::wrapper::XXMLElementWrapper > SAL_CALL
+    virtual com::sun::star::uno::Reference< 
+        com::sun::star::xml::wrapper::XXMLElementWrapper > SAL_CALL 
         getElement( sal_Int32 id )
         throw (com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setElement(
-        sal_Int32 id,
-        const com::sun::star::uno::Reference<
-            com::sun::star::xml::wrapper::XXMLElementWrapper >&
+    virtual void SAL_CALL setElement( 
+        sal_Int32 id, 
+        const com::sun::star::uno::Reference< 
+            com::sun::star::xml::wrapper::XXMLElementWrapper >& 
             aElement )
         throw (com::sun::star::uno::RuntimeException);
-    virtual com::sun::star::uno::Reference<
-        com::sun::star::xml::sax::XDocumentHandler > SAL_CALL
-        setNextHandler( const com::sun::star::uno::Reference<
+    virtual com::sun::star::uno::Reference< 
+        com::sun::star::xml::sax::XDocumentHandler > SAL_CALL 
+        setNextHandler( const com::sun::star::uno::Reference< 
             com::sun::star::xml::sax::XDocumentHandler >& xNewHandler )
         throw (com::sun::star::uno::RuntimeException);
     virtual rtl::OUString SAL_CALL printBufferNodeTree()
         throw (com::sun::star::uno::RuntimeException);
-    virtual com::sun::star::uno::Reference<
-        com::sun::star::xml::wrapper::XXMLElementWrapper > SAL_CALL
+    virtual com::sun::star::uno::Reference< 
+        com::sun::star::xml::wrapper::XXMLElementWrapper > SAL_CALL 
         getCurrentBlockingNode()
         throw (com::sun::star::uno::RuntimeException);
 
     /* XSecuritySAXEventKeeper */
-    virtual sal_Int32 SAL_CALL addSecurityElementCollector(
-        com::sun::star::xml::crypto::sax::ElementMarkPriority priority,
+    virtual sal_Int32 SAL_CALL addSecurityElementCollector( 
+        com::sun::star::xml::crypto::sax::ElementMarkPriority priority, 
         sal_Bool modifyElement )
         throw (com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL cloneElementCollector(
-        sal_Int32 referenceId,
+    virtual sal_Int32 SAL_CALL cloneElementCollector( 
+        sal_Int32 referenceId, 
         com::sun::star::xml::crypto::sax::ElementMarkPriority priority )
         throw (com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setSecurityId( sal_Int32 id, sal_Int32 securityId )
         throw (com::sun::star::uno::RuntimeException);
-
+    
     /* XReferenceResolvedBroadcaster */
-    virtual void SAL_CALL addReferenceResolvedListener(
-        sal_Int32 referenceId,
-        const com::sun::star::uno::Reference<
-            com::sun::star::xml::crypto::sax::XReferenceResolvedListener >&
+    virtual void SAL_CALL addReferenceResolvedListener( 
+        sal_Int32 referenceId, 
+        const com::sun::star::uno::Reference< 
+            com::sun::star::xml::crypto::sax::XReferenceResolvedListener >& 
             listener )
         throw (com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeReferenceResolvedListener(
-        sal_Int32 referenceId,
-        const com::sun::star::uno::Reference<
-            com::sun::star::xml::crypto::sax::XReferenceResolvedListener >&
+    virtual void SAL_CALL removeReferenceResolvedListener( 
+        sal_Int32 referenceId, 
+        const com::sun::star::uno::Reference< 
+            com::sun::star::xml::crypto::sax::XReferenceResolvedListener >& 
             listener )
         throw (com::sun::star::uno::RuntimeException);
 
     /* XSAXEventKeeperStatusChangeBroadcaster */
-    virtual void SAL_CALL addSAXEventKeeperStatusChangeListener(
-        const com::sun::star::uno::Reference<
-            com::sun::star::xml::crypto::sax::XSAXEventKeeperStatusChangeListener >&
+    virtual void SAL_CALL addSAXEventKeeperStatusChangeListener( 
+        const com::sun::star::uno::Reference< 
+            com::sun::star::xml::crypto::sax::XSAXEventKeeperStatusChangeListener >& 
             listener )
         throw (com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeSAXEventKeeperStatusChangeListener(
-        const com::sun::star::uno::Reference<
-            com::sun::star::xml::crypto::sax::XSAXEventKeeperStatusChangeListener >&
+    virtual void SAL_CALL removeSAXEventKeeperStatusChangeListener( 
+        const com::sun::star::uno::Reference< 
+            com::sun::star::xml::crypto::sax::XSAXEventKeeperStatusChangeListener >& 
             listener )
         throw (com::sun::star::uno::RuntimeException);
-
+    
     /* XDocumentHandler */
     virtual void SAL_CALL startDocument(  )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL endDocument(  )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL startElement(
-        const rtl::OUString& aName,
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >&
+    virtual void SAL_CALL startElement( 
+        const rtl::OUString& aName, 
+        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& 
         xAttribs )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL endElement( const rtl::OUString& aName )
+    virtual void SAL_CALL endElement( const rtl::OUString& aName ) 
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL characters( const rtl::OUString& aChars )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL ignorableWhitespace( const rtl::OUString& aWhitespaces )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL processingInstruction(
+    virtual void SAL_CALL processingInstruction( 
         const rtl::OUString& aTarget, const rtl::OUString& aData )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setDocumentLocator(
+    virtual void SAL_CALL setDocumentLocator( 
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XLocator >& xLocator )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
 
     /* XInitialization */
-    virtual void SAL_CALL initialize(
-        const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments )
+    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);
-
+    
     /* XServiceInfo */
-    virtual rtl::OUString SAL_CALL getImplementationName(  )
+    virtual rtl::OUString SAL_CALL getImplementationName(  ) 
         throw (com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName )
+    virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) 
         throw (com::sun::star::uno::RuntimeException);
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(  ) 
         throw (com::sun::star::uno::RuntimeException);
 };
 
 rtl::OUString SAXEventKeeperImpl_getImplementationName()
     throw ( com::sun::star::uno::RuntimeException );
 
-sal_Bool SAL_CALL SAXEventKeeperImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL SAXEventKeeperImpl_supportsService( const rtl::OUString& ServiceName ) 
     throw ( com::sun::star::uno::RuntimeException );
 
-com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames(  )
+com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames(  ) 
     throw ( com::sun::star::uno::RuntimeException );
 
 com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
diff --git a/xmlsecurity/source/framework/securityengine.cxx b/xmlsecurity/source/framework/securityengine.cxx
index b6554e343354..a7cf002c0d7d 100644
--- a/xmlsecurity/source/framework/securityengine.cxx
+++ b/xmlsecurity/source/framework/securityengine.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 cssl = com::sun::star::lang;
 namespace cssxc = com::sun::star::xml::crypto;
 namespace cssxw = com::sun::star::xml::wrapper;
 
-#define DECLARE_ASCII( SASCIIVALUE )                                                                            \
+#define	DECLARE_ASCII( SASCIIVALUE )																			\
     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SASCIIVALUE ) )
 
 SecurityEngine::SecurityEngine( const cssu::Reference< cssl::XMultiServiceFactory >& rxMSF )
@@ -72,18 +72,18 @@ sal_Bool SAL_CALL SecurityEngine::endMission(  )
     throw (com::sun::star::uno::RuntimeException)
 {
     sal_Bool rc = m_bMissionDone;
-
+    
     if (!rc)
     {
         clearUp( );
-
+        
         notifyResultListener();
         m_bMissionDone = true;
     }
-
+    
     m_xResultListener = NULL;
     m_xSAXEventKeeper = NULL;
-
+    
     return rc;
 }
 
diff --git a/xmlsecurity/source/framework/securityengine.hxx b/xmlsecurity/source/framework/securityengine.hxx
index 925b45b2a26e..75594f7dbeb8 100644
--- a/xmlsecurity/source/framework/securityengine.hxx
+++ b/xmlsecurity/source/framework/securityengine.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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/xml/crypto/sax/XMissionTaker.hpp>
 #include <com/sun/star/xml/crypto/sax/XSAXEventKeeper.hpp>
 #include <com/sun/star/xml/crypto/XXMLSignature.hpp>
-
+                                       
 #include <cppuhelper/implbase3.hxx>
 
 class SecurityEngine : public cppu::WeakImplHelper3
-<
+< 
     com::sun::star::xml::crypto::sax::XReferenceResolvedListener,
     com::sun::star::xml::crypto::sax::XKeyCollector,
     com::sun::star::xml::crypto::sax::XMissionTaker
@@ -47,54 +47,54 @@ class SecurityEngine : public cppu::WeakImplHelper3
 /****** securityengine.hxx/CLASS SecurityEngine *******************************
  *
  *   NAME
- *  SecurityEngine -- Base class of SignatureEngine and EncryptionEngine
+ *	SecurityEngine -- Base class of SignatureEngine and EncryptionEngine
  *
  *   FUNCTION
- *  Maintains common members and methods related with security engine
- *  operation.
+ *	Maintains common members and methods related with security engine
+ *	operation.
  *
  *   HISTORY
- *  05.01.2004 -    Interface supported: XReferenceResolvedListener,
- *          XKeyCollector, and XMissionTaker
+ *	05.01.2004 -	Interface supported: XReferenceResolvedListener,
+ * 			XKeyCollector, and XMissionTaker
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
 protected:
-    com::sun::star::uno::Reference<
+    com::sun::star::uno::Reference< 
         com::sun::star::lang::XMultiServiceFactory > mxMSF;
 
     /*
      * A SAXEventKeeper internally maintians all resources that a security
-     * operation needs. The m_xSAXEventKeeper member is used to release
+     * operation needs. The m_xSAXEventKeeper member is used to release 
      * those resources when the security operation finishes.
      */
-    com::sun::star::uno::Reference<
+    com::sun::star::uno::Reference< 
         com::sun::star::xml::crypto::sax::XSAXEventKeeper > m_xSAXEventKeeper;
-
+    
     /*
      * the id of ElementCollector of the template element.
      * For a signature, the template element is the Signature element,
      * for a encryption, the EncryptedData/EncryptedKey element is.
-     */
+     */	
     sal_Int32 m_nIdOfTemplateEC;
-
+    
     /*
      * remembers how many referenced elements have been bufferred completely,
      * including the key element, template element, and referenced element of
      * signature.
      */
     sal_Int32 m_nNumOfResolvedReferences;
-
+    
     /*
      * the id of ElementCollector of the key element.
      * If a Signature element or EncryptedData/EncryptedKey element has
      * an internal key sub-element, then this member should be -1
      */
     sal_Int32 m_nIdOfKeyEC;
-
+    
     /*
      * remembers whether the current opertion has finished.
      */
@@ -105,13 +105,13 @@ protected:
      * the result listener to identify the entity.
      */
     sal_Int32 m_nSecurityId;
-
+    
     /*
      * the status of the operation
      */
     //bool      m_bOperationSucceed;
     com::sun::star::xml::crypto::SecurityOperationStatus m_nStatus;
-
+    
     /*
      * the result listener, which will receives the security operation result.
      */
@@ -120,25 +120,25 @@ protected:
         m_xResultListener;
 
 protected:
-    explicit SecurityEngine( const com::sun::star::uno::Reference<
+    explicit SecurityEngine( const com::sun::star::uno::Reference< 
         com::sun::star::lang::XMultiServiceFactory >& rxMSF = NULL );
     virtual ~SecurityEngine() {};
-
-    /*
+    
+    /* 
      * perform the security operation.
      * Any derived class will implement this method respectively.
      */
     virtual void tryToPerform( )
         throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException){};
-
+        
     /*
      * clear up all resources used by this operation.
      * This method is called after the operation finishes, or a End-Your-Mission
      * message is received.
      * Any derived class will implement this method respectively.
      */
-    virtual void clearUp( ) const {};
-
+    virtual void clearUp( ) const {};	
+        
         /*
          * notifies any possible result listener.
          * When verify a signature or conduct a decryption, the operation result will
@@ -154,7 +154,7 @@ protected:
      * Any derived class will implement this method respectively.
      */
     virtual bool checkReady() const { return true; };
-
+    
 public:
     /* XReferenceResolvedListener */
     virtual void SAL_CALL referenceResolved( sal_Int32 referenceId )
@@ -163,7 +163,7 @@ public:
     /* XKeyCollector */
     virtual void SAL_CALL setKeyId( sal_Int32 id )
             throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException);
-
+        
         /* XMissionTaker */
         virtual sal_Bool SAL_CALL endMission(  )
             throw (com::sun::star::uno::RuntimeException);
diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.cxx b/xmlsecurity/source/framework/signaturecreatorimpl.cxx
index a0d0199957c7..3129af3f82a8 100644
--- a/xmlsecurity/source/framework/signaturecreatorimpl.cxx
+++ b/xmlsecurity/source/framework/signaturecreatorimpl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 cssxw = com::sun::star::xml::wrapper;
 #define SERVICE_NAME "com.sun.star.xml.crypto.sax.SignatureCreator"
 #define IMPLEMENTATION_NAME "com.sun.star.xml.security.framework.SignatureCreatorImpl"
 
-#define DECLARE_ASCII( SASCIIVALUE )                                                                            \
+#define	DECLARE_ASCII( SASCIIVALUE )																			\
     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SASCIIVALUE ) )
 
 SignatureCreatorImpl::SignatureCreatorImpl( const cssu::Reference< cssl::XMultiServiceFactory >& rxMSF )
@@ -59,33 +59,33 @@ bool SignatureCreatorImpl::checkReady() const
 /****** SignatureCreatorImpl/checkReady **************************************
  *
  *   NAME
- *  checkReady -- checks the conditions for the signature generation.
+ *	checkReady -- checks the conditions for the signature generation.
  *
  *   SYNOPSIS
- *  bReady = checkReady( );
+ *	bReady = checkReady( );
  *
  *   FUNCTION
- *  checks whether all following conditions are satisfied:
- *  1. the result listener is ready;
- *  2. the id of the template blocker is known;
- *  3. the SignatureEngine is ready.
+ *	checks whether all following conditions are satisfied:
+ *	1. the result listener is ready;
+ *	2. the id of the template blocker is known;
+ *	3. the SignatureEngine is ready.
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  bReady - true if all conditions are satisfied, false otherwise
+ *	bReady - true if all conditions are satisfied, false otherwise
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     return (m_xResultListener.is() &&
-            (m_nIdOfBlocker != -1) &&
+            (m_nIdOfBlocker != -1) && 
             SignatureEngine::checkReady());
 }
 
@@ -94,69 +94,69 @@ void SignatureCreatorImpl::notifyResultListener() const
 /****** SignatureCreatorImpl/notifyResultListener *****************************
  *
  *   NAME
- *  notifyResultListener -- notifies the listener about the signature
- *  creation result.
+ *	notifyResultListener -- notifies the listener about the signature
+ *	creation result.
  *
  *   SYNOPSIS
- *  notifyResultListener( );
+ *	notifyResultListener( );
  *
  *   FUNCTION
- *  see NAME.
+ *	see NAME.
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     cssu::Reference< cssxc::sax::XSignatureCreationResultListener >
         xSignatureCreationResultListener ( m_xResultListener , cssu::UNO_QUERY ) ;
-
+     
     xSignatureCreationResultListener->signatureCreated( m_nSecurityId, m_nStatus );
 }
 
-void SignatureCreatorImpl::startEngine( const cssu::Reference<
+void SignatureCreatorImpl::startEngine(	const cssu::Reference< 
     cssxc::XXMLSignatureTemplate >&
     xSignatureTemplate)
         throw (cssu::Exception, cssu::RuntimeException)
 /****** SignatureCreatorImpl/startEngine *************************************
  *
  *   NAME
- *  startEngine -- generates the signature.
+ *	startEngine -- generates the signature.
  *
  *   SYNOPSIS
- *  startEngine( xSignatureTemplate );
+ *	startEngine( xSignatureTemplate );
  *
  *   FUNCTION
- *  generates the signature element, then if succeeds, updates the link
- *  of old template element to the new signature element in
- *  SAXEventKeeper.
+ *	generates the signature element, then if succeeds, updates the link
+ *	of old template element to the new signature element in 
+ *	SAXEventKeeper.
  *
  *   INPUTS
- *  xSignatureTemplate - the signature template (along with all referenced
- *  elements) to be signed.
+ *	xSignatureTemplate - the signature template (along with all referenced
+ *	elements) to be signed.
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     cssu::Reference< cssxc::XXMLSignatureTemplate > xResultTemplate;
-    try
+    try 
     {
         xResultTemplate = m_xXMLSignature->generate(xSignatureTemplate, m_xSecurityEnvironment);
         m_nStatus = xResultTemplate->getStatus();
@@ -165,11 +165,11 @@ void SignatureCreatorImpl::startEngine( const cssu::Reference<
     {
         m_nStatus = cssxc::SecurityOperationStatus_RUNTIMEERROR_FAILED;
     }
-
+    
     if (m_nStatus == cssxc::SecurityOperationStatus_OPERATION_SUCCEEDED)
     {
         cssu::Reference < cssxw::XXMLElementWrapper > xResultSignature = xResultTemplate->getTemplate();
-        m_xSAXEventKeeper->setElement(m_nIdOfTemplateEC, xResultSignature);
+        m_xSAXEventKeeper->setElement(m_nIdOfTemplateEC, xResultSignature); 
     }
 }
 
@@ -177,32 +177,32 @@ void SignatureCreatorImpl::clearUp() const
 /****** SignatureCreatorImpl/clearUp *****************************************
  *
  *   NAME
- *  clearUp -- clear up all resources used by the signature generation.
+ *	clearUp -- clear up all resources used by the signature generation.
  *
  *   SYNOPSIS
- *  clearUp( );
+ *	clearUp( );
  *
  *   FUNCTION
- *  cleaning resources up includes:
- *  1. SignatureEngine's clearing up;
- *  2. releases the Blocker for the signature template element.
+ *	cleaning resources up includes:
+ *	1. SignatureEngine's clearing up;
+ *	2. releases the Blocker for the signature template element.
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     SignatureEngine::clearUp();
-
+    
     if (m_nIdOfBlocker != -1)
     {
         m_xSAXEventKeeper->removeBlocker(m_nIdOfBlocker);
@@ -218,7 +218,7 @@ void SAL_CALL SignatureCreatorImpl::setBlockerId( sal_Int32 id )
 }
 
 /* XSignatureCreationResultBroadcaster */
-void SAL_CALL SignatureCreatorImpl::addSignatureCreationResultListener(
+void SAL_CALL SignatureCreatorImpl::addSignatureCreationResultListener( 
     const cssu::Reference< cssxc::sax::XSignatureCreationResultListener >& listener )
     throw (cssu::Exception, cssu::RuntimeException)
 {
@@ -226,20 +226,20 @@ void SAL_CALL SignatureCreatorImpl::addSignatureCreationResultListener(
     tryToPerform();
 }
 
-void SAL_CALL SignatureCreatorImpl::removeSignatureCreationResultListener(
+void SAL_CALL SignatureCreatorImpl::removeSignatureCreationResultListener( 
     const cssu::Reference< cssxc::sax::XSignatureCreationResultListener >&)
     throw (cssu::RuntimeException)
 {
 }
 
 /* XInitialization */
-void SAL_CALL SignatureCreatorImpl::initialize( const cssu::Sequence< cssu::Any >& aArguments )
+void SAL_CALL SignatureCreatorImpl::initialize( const cssu::Sequence< cssu::Any >& aArguments ) 
     throw (cssu::Exception, cssu::RuntimeException)
 {
     OSL_ASSERT(aArguments.getLength() == 5);
-
+    
     rtl::OUString ouTempString;
-
+    
     aArguments[0] >>= ouTempString;
     m_nSecurityId = ouTempString.toInt32();
     aArguments[1] >>= m_xSAXEventKeeper;
@@ -248,7 +248,7 @@ void SAL_CALL SignatureCreatorImpl::initialize( const cssu::Sequence< cssu::Any
     aArguments[3] >>= m_xSecurityEnvironment;
     aArguments[4] >>= m_xXMLSignature;
 }
-
+    
 
 rtl::OUString SignatureCreatorImpl_getImplementationName ()
     throw (cssu::RuntimeException)
@@ -256,13 +256,13 @@ rtl::OUString SignatureCreatorImpl_getImplementationName ()
     return rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
 }
 
-sal_Bool SAL_CALL SignatureCreatorImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL SignatureCreatorImpl_supportsService( const rtl::OUString& ServiceName ) 
     throw (cssu::RuntimeException)
 {
     return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME ));
 }
 
-cssu::Sequence< rtl::OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceNames(  )
+cssu::Sequence< rtl::OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceNames(  ) 
     throw (cssu::RuntimeException)
 {
     cssu::Sequence < rtl::OUString > aRet(1);
@@ -272,7 +272,7 @@ cssu::Sequence< rtl::OUString > SAL_CALL SignatureCreatorImpl_getSupportedServic
 }
 #undef SERVICE_NAME
 
-cssu::Reference< cssu::XInterface > SAL_CALL SignatureCreatorImpl_createInstance(
+cssu::Reference< cssu::XInterface > SAL_CALL SignatureCreatorImpl_createInstance( 
     const cssu::Reference< cssl::XMultiServiceFactory >& rSMgr)
     throw( cssu::Exception )
 {
@@ -280,17 +280,17 @@ cssu::Reference< cssu::XInterface > SAL_CALL SignatureCreatorImpl_createInstance
 }
 
 /* XServiceInfo */
-rtl::OUString SAL_CALL SignatureCreatorImpl::getImplementationName(  )
+rtl::OUString SAL_CALL SignatureCreatorImpl::getImplementationName(  ) 
     throw (cssu::RuntimeException)
 {
     return SignatureCreatorImpl_getImplementationName();
 }
-sal_Bool SAL_CALL SignatureCreatorImpl::supportsService( const rtl::OUString& rServiceName )
+sal_Bool SAL_CALL SignatureCreatorImpl::supportsService( const rtl::OUString& rServiceName ) 
     throw (cssu::RuntimeException)
 {
     return SignatureCreatorImpl_supportsService( rServiceName );
 }
-cssu::Sequence< rtl::OUString > SAL_CALL SignatureCreatorImpl::getSupportedServiceNames(  )
+cssu::Sequence< rtl::OUString > SAL_CALL SignatureCreatorImpl::getSupportedServiceNames(  ) 
     throw (cssu::RuntimeException)
 {
     return SignatureCreatorImpl_getSupportedServiceNames();
diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.hxx b/xmlsecurity/source/framework/signaturecreatorimpl.hxx
index 52d04352a2d9..10641fdce96f 100644
--- a/xmlsecurity/source/framework/signaturecreatorimpl.hxx
+++ b/xmlsecurity/source/framework/signaturecreatorimpl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 SignatureCreatorImpl : public cppu::ImplInheritanceHelper4
 <
-    SignatureEngine,
+    SignatureEngine, 
     com::sun::star::xml::crypto::sax::XBlockerMonitor,
     com::sun::star::xml::crypto::sax::XSignatureCreationResultBroadcaster,
     com::sun::star::lang::XInitialization,
@@ -50,19 +50,19 @@ class SignatureCreatorImpl : public cppu::ImplInheritanceHelper4
 /****** SignatureCreatorImpl.hxx/CLASS SignatureCreatorImpl *******************
  *
  *   NAME
- *  SignatureCreatorImpl -- generates a signature
+ *	SignatureCreatorImpl -- generates a signature
  *
  *   FUNCTION
- *  Collects all resources for a signature generation, then generates the
- *  signature by invoking a xmlsec-based signature bridge component.
+ *	Collects all resources for a signature generation, then generates the
+ *	signature by invoking a xmlsec-based signature bridge component.
  *
  *   HISTORY
- *  05.01.2004 -    Interface supported: XBlockerMonitor,
- *          XInitialization, XServiceInfo
+ *	05.01.2004 -	Interface supported: XBlockerMonitor,
+ * 			XInitialization, XServiceInfo
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
 private:
@@ -71,7 +71,7 @@ private:
      * identify the signature.
      */
     sal_Int32 m_nSignatureId;
-
+    
     /*
      * the Id of template blocker.
      */
@@ -81,64 +81,64 @@ private:
      * the signature creation result
      */
     bool      m_bCreationSucceed;
-
-    com::sun::star::uno::Reference<
+    
+    com::sun::star::uno::Reference< 
         com::sun::star::xml::crypto::XSecurityEnvironment > m_xSecurityEnvironment;
-
+    
     virtual void notifyResultListener() const
         throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException);
-    virtual void clearUp( ) const;
+    virtual void clearUp( ) const;	
     virtual bool checkReady() const;
-    virtual void startEngine( const com::sun::star::uno::Reference<
+    virtual void startEngine( const com::sun::star::uno::Reference< 
         com::sun::star::xml::crypto::XXMLSignatureTemplate >&
         xSignatureTemplate)
         throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException);
-
+    
 public:
-    explicit SignatureCreatorImpl( const com::sun::star::uno::Reference<
+    explicit SignatureCreatorImpl( const com::sun::star::uno::Reference< 
         com::sun::star::lang::XMultiServiceFactory >& rxMSF);
     virtual ~SignatureCreatorImpl();
 
     /* XBlockerMonitor */
     virtual void SAL_CALL setBlockerId( sal_Int32 id )
             throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException);
-
+    
     /* XSignatureCreationResultBroadcaster */
-    void SAL_CALL addSignatureCreationResultListener(
-        const com::sun::star::uno::Reference<
+    void SAL_CALL addSignatureCreationResultListener( 
+        const com::sun::star::uno::Reference< 
             com::sun::star::xml::crypto::sax::XSignatureCreationResultListener >& listener )
         throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException);
-
-    void SAL_CALL removeSignatureCreationResultListener(
-        const com::sun::star::uno::Reference<
+    
+    void SAL_CALL removeSignatureCreationResultListener( 
+        const com::sun::star::uno::Reference< 
             com::sun::star::xml::crypto::sax::XSignatureCreationResultListener >& listener )
         throw (com::sun::star::uno::RuntimeException);
 
     /* XInitialization */
-    virtual void SAL_CALL initialize(
-        const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments )
+    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);
 
     /* XServiceInfo */
-    virtual rtl::OUString SAL_CALL getImplementationName(  )
+    virtual rtl::OUString SAL_CALL getImplementationName(  ) 
         throw (com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName )
+    virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) 
         throw (com::sun::star::uno::RuntimeException);
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(  ) 
         throw (com::sun::star::uno::RuntimeException);
 };
 
 rtl::OUString SignatureCreatorImpl_getImplementationName()
     throw ( com::sun::star::uno::RuntimeException );
 
-sal_Bool SAL_CALL SignatureCreatorImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL SignatureCreatorImpl_supportsService( const rtl::OUString& ServiceName ) 
     throw ( com::sun::star::uno::RuntimeException );
 
-com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceNames(  )
+com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceNames(  ) 
     throw ( com::sun::star::uno::RuntimeException );
 
 com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
-SAL_CALL SignatureCreatorImpl_createInstance(
+SAL_CALL SignatureCreatorImpl_createInstance( 
     const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > & rSMgr)
     throw ( com::sun::star::uno::Exception );
 
diff --git a/xmlsecurity/source/framework/signatureengine.cxx b/xmlsecurity/source/framework/signatureengine.cxx
index 3eea00e41434..bd5a52075099 100644
--- a/xmlsecurity/source/framework/signatureengine.cxx
+++ b/xmlsecurity/source/framework/signatureengine.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 cssxw = com::sun::star::xml::wrapper;
 
 #define SIGNATURE_TEMPLATE "com.sun.star.xml.crypto.XMLSignatureTemplate"
 
-#define DECLARE_ASCII( SASCIIVALUE )                                                                            \
+#define	DECLARE_ASCII( SASCIIVALUE )																			\
     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SASCIIVALUE ) )
 
 SignatureEngine::SignatureEngine( )
@@ -53,33 +53,33 @@ bool SignatureEngine::checkReady() const
 /****** SignatureEngine/checkReady *******************************************
  *
  *   NAME
- *  checkReady -- checks the conditions for the main operation.
+ *	checkReady -- checks the conditions for the main operation.
  *
  *   SYNOPSIS
- *  bReady = checkReady( );
+ *	bReady = checkReady( );
  *
  *   FUNCTION
- *  checks whether all following conditions are satisfied:
- *  1. the main operation has't begun yet;
- *  2. the key material is known;
- *  3. the amount of reference is known;
- *  4. all of referenced elements, the key element and the signature
- *     template are bufferred.
+ *	checks whether all following conditions are satisfied:
+ *	1. the main operation has't begun yet;
+ *	2. the key material is known;
+ *	3. the amount of reference is known;
+ *	4. all of referenced elements, the key element and the signature 
+ *	   template are bufferred.
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  bReady - true if all conditions are satisfied, false otherwise
+ *	bReady - true if all conditions are satisfied, false otherwise
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
-{
+{                     
     bool rc = true;
 
     sal_Int32 nKeyInc = 0;
@@ -87,7 +87,7 @@ bool SignatureEngine::checkReady() const
     {
         nKeyInc = 1;
     }
-
+    
     if (m_bMissionDone ||
         m_nIdOfKeyEC == -1 ||
         m_nTotalReferenceNumber == -1 ||
@@ -95,78 +95,78 @@ bool SignatureEngine::checkReady() const
     {
         rc = false;
     }
-
+            
     return rc;
 }
 
-void SignatureEngine::tryToPerform( )
+void SignatureEngine::tryToPerform( ) 
         throw (cssu::Exception, cssu::RuntimeException)
 /****** SignatureEngine/tryToPerform *****************************************
  *
  *   NAME
- *  tryToPerform -- tries to perform the signature operation.
+ *	tryToPerform -- tries to perform the signature operation.
  *
  *   SYNOPSIS
- *  tryToPerform( );
+ *	tryToPerform( );
  *
  *   FUNCTION
- *  if the situation is ready, perform following operations.
- *  1. prepares a signature template;
- *  2. calls the signature bridge component;
- *  3. clears up all used resources;
- *  4. notifies the result listener;
- *  5. sets the "accomplishment" flag.
+ *	if the situation is ready, perform following operations.
+ *	1. prepares a signature template;
+ *	2. calls the signature bridge component;
+ *	3. clears up all used resources;
+ *	4. notifies the result listener;
+ *	5. sets the "accomplishment" flag.
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     if (checkReady())
     {
         const rtl::OUString ouSignatureTemplate (
-            RTL_CONSTASCII_USTRINGPARAM( SIGNATURE_TEMPLATE ) );
+            RTL_CONSTASCII_USTRINGPARAM( SIGNATURE_TEMPLATE ) );	
         cssu::Reference < cssxc::XXMLSignatureTemplate >
             xSignatureTemplate( mxMSF->createInstance( ouSignatureTemplate ), cssu::UNO_QUERY );
-
+        
         OSL_ASSERT( xSignatureTemplate.is() );
-
+        
         cssu::Reference< cssxw::XXMLElementWrapper >
             xXMLElement = m_xSAXEventKeeper->getElement( m_nIdOfTemplateEC );
-
+        
         xSignatureTemplate->setTemplate(xXMLElement);
-
+        
         std::vector< sal_Int32 >::const_iterator ii = m_vReferenceIds.begin();
-
-        for( ; ii != m_vReferenceIds.end() ; ++ii )
+        
+        for( ; ii != m_vReferenceIds.end() ; ++ii ) 
         {
             xXMLElement = m_xSAXEventKeeper->getElement( *ii );
             xSignatureTemplate->setTarget(xXMLElement);
         }
-
+        
         /*
          * set the Uri binding
          */
         xSignatureTemplate->setBinding( this );
-
+        
         startEngine( xSignatureTemplate );
-
+        
         /*
          * done
          */
         clearUp( );
-
+        
         notifyResultListener();
-
+                
         m_bMissionDone = true;
     }
 }
@@ -175,49 +175,49 @@ void SignatureEngine::clearUp( ) const
 /****** SignatureEngine/clearUp **********************************************
  *
  *   NAME
- *  clearUp -- clear up all resources used by this operation.
+ *	clearUp -- clear up all resources used by this operation.
  *
  *   SYNOPSIS
- *  clearUp( );
+ *	clearUp( );
  *
  *   FUNCTION
- *  cleaning resources up includes:
- *  1. releases the ElementCollector for the signature template element;
- *  2. releases ElementCollectors for referenced elements;
- *  3. releases the ElementCollector for the key element, if there is one.
+ *	cleaning resources up includes:
+ *	1. releases the ElementCollector for the signature template element;
+ *	2. releases ElementCollectors for referenced elements;
+ *	3. releases the ElementCollector for the key element, if there is one.
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     cssu::Reference < cssxc::sax::XReferenceResolvedBroadcaster >
         xReferenceResolvedBroadcaster( m_xSAXEventKeeper, cssu::UNO_QUERY );
     xReferenceResolvedBroadcaster->removeReferenceResolvedListener(
-        m_nIdOfTemplateEC,
+        m_nIdOfTemplateEC, 
         (const cssu::Reference < cssxc::sax::XReferenceResolvedListener >)((SecurityEngine *)this));
-
+    
     m_xSAXEventKeeper->removeElementCollector(m_nIdOfTemplateEC);
-
+    
     std::vector< sal_Int32 >::const_iterator ii = m_vReferenceIds.begin();
-
-    for( ; ii != m_vReferenceIds.end() ; ++ii )
+    
+    for( ; ii != m_vReferenceIds.end() ; ++ii ) 
     {
         xReferenceResolvedBroadcaster->removeReferenceResolvedListener(
-            *ii,
+            *ii, 
             (const cssu::Reference < cssxc::sax::XReferenceResolvedListener >)((SecurityEngine *)this));
         m_xSAXEventKeeper->removeElementCollector(*ii);
     }
-
+    
     if (m_nIdOfKeyEC != 0 && m_nIdOfKeyEC != -1)
     {
         m_xSAXEventKeeper->removeElementCollector(m_nIdOfKeyEC);
@@ -231,7 +231,7 @@ void SAL_CALL SignatureEngine::setReferenceCount( sal_Int32 count )
     m_nTotalReferenceNumber = count;
     tryToPerform();
 }
-
+    
 void SAL_CALL SignatureEngine::setReferenceId( sal_Int32 id )
     throw (cssu::Exception, cssu::RuntimeException)
 {
@@ -247,14 +247,14 @@ void SAL_CALL SignatureEngine::setUriBinding(
     m_vUris.push_back(uri);
     m_vXInputStreams.push_back(aInputStream);
 }
-
+    
 cssu::Reference< com::sun::star::io::XInputStream > SAL_CALL SignatureEngine::getUriBinding( const rtl::OUString& uri )
     throw (cssu::Exception, cssu::RuntimeException)
 {
     cssu::Reference< com::sun::star::io::XInputStream > xInputStream;
-
+    
     int size = m_vUris.size();
-
+    
     for( int i=0; i<size; ++i)
     {
         if (m_vUris[i] == uri)
@@ -263,9 +263,9 @@ cssu::Reference< com::sun::star::io::XInputStream > SAL_CALL SignatureEngine::ge
             break;
         }
     }
-
+    
     return xInputStream;
 }
-
+    
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/framework/signatureengine.hxx b/xmlsecurity/source/framework/signatureengine.hxx
index 138ee6f883f5..7733785321e7 100644
--- a/xmlsecurity/source/framework/signatureengine.hxx
+++ b/xmlsecurity/source/framework/signatureengine.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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/xml/crypto/XXMLSignature.hpp>
 #include <com/sun/star/xml/crypto/XUriBinding.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
-
+                                       
 #include <cppuhelper/implbase2.hxx>
 
 #include "securityengine.hxx"
@@ -51,35 +51,35 @@
 
 class SignatureEngine : public cppu::ImplInheritanceHelper2
 <
-    SecurityEngine,
+    SecurityEngine, 
     com::sun::star::xml::crypto::sax::XReferenceCollector,
     com::sun::star::xml::crypto::XUriBinding
 >
 /****** signatureengine.hxx/CLASS SignatureEngine *****************************
  *
  *   NAME
- *  SignatureEngine -- Base class of SignatureCreator and SignatureVerifier
+ *	SignatureEngine -- Base class of SignatureCreator and SignatureVerifier
  *
  *   FUNCTION
- *  Maintains common members and methods related with signature operation.
+ *	Maintains common members and methods related with signature operation.
  *
  *   HISTORY
- *  05.01.2004 -    Interface supported: XReferenceCollector
+ *	05.01.2004 -	Interface supported: XReferenceCollector
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
 protected:
-
+    
     /*
      * the Signature bridge component, which performs signature generation
      * and verification based on xmlsec library.
      */
-    com::sun::star::uno::Reference<
+    com::sun::star::uno::Reference< 
         com::sun::star::xml::crypto::XXMLSignature > m_xXMLSignature;
-
+        
     /*
      * a collection of ElementCollector's ids. Each ElementCollector
      * represents one element signed by this signature.
@@ -104,27 +104,27 @@ protected:
 protected:
     SignatureEngine( );
     virtual ~SignatureEngine() {};
-
-    virtual void tryToPerform( )
+    
+    virtual void tryToPerform( ) 
         throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException);
-    virtual void clearUp( ) const;
+    virtual void clearUp( ) const;	
     virtual bool checkReady() const;
-
+    
     /*
      * starts the main function. This method will be implemented by any sub-class.
      * For a SignatureCreator, it performs signing operation;
      * for a SignatureVerifier, verification operation is performed.
      */
-    virtual void startEngine( const com::sun::star::uno::Reference<
+    virtual void startEngine( const com::sun::star::uno::Reference< 
                               com::sun::star::xml::crypto::XXMLSignatureTemplate >&)
         throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException)
         {};
-
+    
 public:
     /* XReferenceCollector */
     virtual void SAL_CALL setReferenceCount( sal_Int32 count )
         throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException);
-
+            
     virtual void SAL_CALL setReferenceId( sal_Int32 id )
         throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException);
 
diff --git a/xmlsecurity/source/framework/signatureverifierimpl.cxx b/xmlsecurity/source/framework/signatureverifierimpl.cxx
index d516e8761f6c..408e8f7b91a3 100644
--- a/xmlsecurity/source/framework/signatureverifierimpl.cxx
+++ b/xmlsecurity/source/framework/signatureverifierimpl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 cssxw = com::sun::star::xml::wrapper;
 #define SERVICE_NAME "com.sun.star.xml.crypto.sax.SignatureVerifier"
 #define IMPLEMENTATION_NAME "com.sun.star.xml.security.framework.SignatureVerifierImpl"
 
-#define DECLARE_ASCII( SASCIIVALUE )                                                                            \
+#define	DECLARE_ASCII( SASCIIVALUE )																			\
     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SASCIIVALUE ) )
 
 SignatureVerifierImpl::SignatureVerifierImpl( const cssu::Reference< cssl::XMultiServiceFactory >& rxMSF)
@@ -58,28 +58,28 @@ bool SignatureVerifierImpl::checkReady() const
 /****** SignatureVerifierImpl/checkReady *************************************
  *
  *   NAME
- *  checkReady -- checks the conditions for the signature verification.
+ *	checkReady -- checks the conditions for the signature verification.
  *
  *   SYNOPSIS
- *  bReady = checkReady( );
+ *	bReady = checkReady( );
  *
  *   FUNCTION
- *  checks whether all following conditions are satisfied:
- *  1. the result listener is ready;
- *  2. the SignatureEngine is ready.
+ *	checks whether all following conditions are satisfied:
+ *	1. the result listener is ready;
+ *	2. the SignatureEngine is ready.
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  bReady - true if all conditions are satisfied, false otherwise
+ *	bReady - true if all conditions are satisfied, false otherwise
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     return (m_xResultListener.is() && SignatureEngine::checkReady());
@@ -90,66 +90,66 @@ void SignatureVerifierImpl::notifyResultListener() const
 /****** SignatureVerifierImpl/notifyResultListener ***************************
  *
  *   NAME
- *  notifyResultListener -- notifies the listener about the verify result.
+ *	notifyResultListener -- notifies the listener about the verify result.
  *
  *   SYNOPSIS
- *  notifyResultListener( );
+ *	notifyResultListener( );
  *
  *   FUNCTION
- *  see NAME.
+ *	see NAME.
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     cssu::Reference< cssxc::sax::XSignatureVerifyResultListener >
         xSignatureVerifyResultListener ( m_xResultListener , cssu::UNO_QUERY ) ;
-
+        
     xSignatureVerifyResultListener->signatureVerified( m_nSecurityId, m_nStatus );
 }
 
-void SignatureVerifierImpl::startEngine( const cssu::Reference<
+void SignatureVerifierImpl::startEngine( const cssu::Reference< 
     cssxc::XXMLSignatureTemplate >&
     xSignatureTemplate)
     throw (cssu::Exception, cssu::RuntimeException)
 /****** SignatureVerifierImpl/startEngine ************************************
  *
  *   NAME
- *  startEngine -- verifies the signature.
+ *	startEngine -- verifies the signature.
  *
  *   SYNOPSIS
- *  startEngine( xSignatureTemplate );
+ *	startEngine( xSignatureTemplate );
  *
  *   FUNCTION
- *  see NAME.
+ *	see NAME.
  *
  *   INPUTS
- *  xSignatureTemplate - the signature template (along with all referenced
- *  elements) to be verified.
+ *	xSignatureTemplate - the signature template (along with all referenced
+ *	elements) to be verified.
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     cssu::Reference< cssxc::XXMLSignatureTemplate > xResultTemplate;
-    try
+    try 
     {
         xResultTemplate = m_xXMLSignature->validate(xSignatureTemplate, m_xXMLSecurityContext);
         m_nStatus = xResultTemplate->getStatus();
@@ -161,7 +161,7 @@ void SignatureVerifierImpl::startEngine( const cssu::Reference<
 }
 
 /* XSignatureVerifyResultBroadcaster */
-void SAL_CALL SignatureVerifierImpl::addSignatureVerifyResultListener(
+void SAL_CALL SignatureVerifierImpl::addSignatureVerifyResultListener( 
     const cssu::Reference< cssxc::sax::XSignatureVerifyResultListener >& listener )
     throw (cssu::Exception, cssu::RuntimeException)
 {
@@ -169,21 +169,21 @@ void SAL_CALL SignatureVerifierImpl::addSignatureVerifyResultListener(
     tryToPerform();
 }
 
-void SAL_CALL SignatureVerifierImpl::removeSignatureVerifyResultListener(
+void SAL_CALL SignatureVerifierImpl::removeSignatureVerifyResultListener( 
     const cssu::Reference< cssxc::sax::XSignatureVerifyResultListener >&)
     throw (cssu::RuntimeException)
 {
 }
 
 /* XInitialization */
-void SAL_CALL SignatureVerifierImpl::initialize(
-    const cssu::Sequence< cssu::Any >& aArguments )
+void SAL_CALL SignatureVerifierImpl::initialize( 
+    const cssu::Sequence< cssu::Any >& aArguments ) 
     throw (cssu::Exception, cssu::RuntimeException)
 {
     OSL_ASSERT(aArguments.getLength() == 5);
-
+    
     rtl::OUString ouTempString;
-
+    
     aArguments[0] >>= ouTempString;
     m_nSecurityId = ouTempString.toInt32();
     aArguments[1] >>= m_xSAXEventKeeper;
@@ -192,22 +192,22 @@ void SAL_CALL SignatureVerifierImpl::initialize(
     aArguments[3] >>= m_xXMLSecurityContext;
     aArguments[4] >>= m_xXMLSignature;
 }
-
+    
 
 rtl::OUString SignatureVerifierImpl_getImplementationName ()
     throw (cssu::RuntimeException)
 {
-    return rtl::OUString(
+    return rtl::OUString( 
         RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
 }
 
-sal_Bool SAL_CALL SignatureVerifierImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL SignatureVerifierImpl_supportsService( const rtl::OUString& ServiceName ) 
     throw (cssu::RuntimeException)
 {
     return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME ));
 }
 
-cssu::Sequence< rtl::OUString > SAL_CALL SignatureVerifierImpl_getSupportedServiceNames(  )
+cssu::Sequence< rtl::OUString > SAL_CALL SignatureVerifierImpl_getSupportedServiceNames(  ) 
     throw (cssu::RuntimeException)
 {
     cssu::Sequence < rtl::OUString > aRet(1);
@@ -217,7 +217,7 @@ cssu::Sequence< rtl::OUString > SAL_CALL SignatureVerifierImpl_getSupportedServi
 }
 #undef SERVICE_NAME
 
-cssu::Reference< cssu::XInterface > SAL_CALL SignatureVerifierImpl_createInstance(
+cssu::Reference< cssu::XInterface > SAL_CALL SignatureVerifierImpl_createInstance( 
     const cssu::Reference< cssl::XMultiServiceFactory >& rSMgr)
     throw( cssu::Exception )
 {
@@ -225,17 +225,17 @@ cssu::Reference< cssu::XInterface > SAL_CALL SignatureVerifierImpl_createInstanc
 }
 
 /* XServiceInfo */
-rtl::OUString SAL_CALL SignatureVerifierImpl::getImplementationName(  )
+rtl::OUString SAL_CALL SignatureVerifierImpl::getImplementationName(  ) 
     throw (cssu::RuntimeException)
 {
     return SignatureVerifierImpl_getImplementationName();
 }
-sal_Bool SAL_CALL SignatureVerifierImpl::supportsService( const rtl::OUString& rServiceName )
+sal_Bool SAL_CALL SignatureVerifierImpl::supportsService( const rtl::OUString& rServiceName ) 
     throw (cssu::RuntimeException)
 {
     return SignatureVerifierImpl_supportsService( rServiceName );
 }
-cssu::Sequence< rtl::OUString > SAL_CALL SignatureVerifierImpl::getSupportedServiceNames(  )
+cssu::Sequence< rtl::OUString > SAL_CALL SignatureVerifierImpl::getSupportedServiceNames(  ) 
     throw (cssu::RuntimeException)
 {
     return SignatureVerifierImpl_getSupportedServiceNames();
diff --git a/xmlsecurity/source/framework/signatureverifierimpl.hxx b/xmlsecurity/source/framework/signatureverifierimpl.hxx
index 77dede5b9272..f4db3fc0a5d5 100644
--- a/xmlsecurity/source/framework/signatureverifierimpl.hxx
+++ b/xmlsecurity/source/framework/signatureverifierimpl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 "signatureengine.hxx"
 
 class SignatureVerifierImpl : public cppu::ImplInheritanceHelper3
-<
-    SignatureEngine,
+< 
+    SignatureEngine, 
     com::sun::star::xml::crypto::sax::XSignatureVerifyResultBroadcaster,
     com::sun::star::lang::XInitialization,
     com::sun::star::lang::XServiceInfo
@@ -48,19 +48,19 @@ class SignatureVerifierImpl : public cppu::ImplInheritanceHelper3
 /****** SignatureVerifier.hxx/CLASS SignatureVerifierImpl *********************
  *
  *   NAME
- *  SignatureVerifierImpl -- verifies a signature
+ *	SignatureVerifierImpl -- verifies a signature
  *
  *   FUNCTION
- *  Collects all resources for a signature verification, then verifies the
- *  signature by invoking a xmlsec-based signature bridge component.
+ *	Collects all resources for a signature verification, then verifies the
+ *	signature by invoking a xmlsec-based signature bridge component.
  *
  *   HISTORY
- *  05.01.2004 -    Interface supported: XSignatureVerifyResultBroadcaster,
- *          XInitialization, XServiceInfo
+ *	05.01.2004 -	Interface supported: XSignatureVerifyResultBroadcaster,
+ * 			XInitialization, XServiceInfo
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
 private:
@@ -69,65 +69,65 @@ private:
      * identify the signature.
      */
     sal_Int32 m_nSignatureId;
-
+    
     /*
      * the verify result
      */
     bool      m_bVerifySucceed;
-
-    com::sun::star::uno::Reference<
+    
+    com::sun::star::uno::Reference< 
         com::sun::star::xml::crypto::XXMLSecurityContext > m_xXMLSecurityContext;
-
+    
     virtual void notifyResultListener() const
         throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException);
     virtual bool checkReady() const;
-    virtual void startEngine( const com::sun::star::uno::Reference<
+    virtual void startEngine( const com::sun::star::uno::Reference< 
         com::sun::star::xml::crypto::XXMLSignatureTemplate >&
         xSignatureTemplate)
         throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException);
 
 public:
-    explicit SignatureVerifierImpl( const com::sun::star::uno::Reference<
+    explicit SignatureVerifierImpl( const com::sun::star::uno::Reference< 
         com::sun::star::lang::XMultiServiceFactory >& rxMSF);
     virtual ~SignatureVerifierImpl();
 
     /* XSignatureVerifyResultBroadcaster */
-    virtual void SAL_CALL addSignatureVerifyResultListener(
-        const com::sun::star::uno::Reference<
+    virtual void SAL_CALL addSignatureVerifyResultListener( 
+        const com::sun::star::uno::Reference< 
             com::sun::star::xml::crypto::sax::XSignatureVerifyResultListener >&
             listener )
         throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeSignatureVerifyResultListener(
-        const com::sun::star::uno::Reference<
-            com::sun::star::xml::crypto::sax::XSignatureVerifyResultListener >&
+    virtual void SAL_CALL removeSignatureVerifyResultListener( 
+        const com::sun::star::uno::Reference< 
+            com::sun::star::xml::crypto::sax::XSignatureVerifyResultListener >& 
             listener )
         throw (com::sun::star::uno::RuntimeException);
 
     /* XInitialization */
-    virtual void SAL_CALL initialize(
-        const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments )
+    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);
 
     /* XServiceInfo */
-    virtual rtl::OUString SAL_CALL getImplementationName(  )
+    virtual rtl::OUString SAL_CALL getImplementationName(  ) 
         throw (com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName )
+    virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) 
         throw (com::sun::star::uno::RuntimeException);
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(  ) 
         throw (com::sun::star::uno::RuntimeException);
 };
 
 rtl::OUString SignatureVerifierImpl_getImplementationName()
     throw ( com::sun::star::uno::RuntimeException );
 
-sal_Bool SAL_CALL SignatureVerifierImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL SignatureVerifierImpl_supportsService( const rtl::OUString& ServiceName ) 
     throw ( com::sun::star::uno::RuntimeException );
 
-com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL SignatureVerifierImpl_getSupportedServiceNames(  )
+com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL SignatureVerifierImpl_getSupportedServiceNames(  ) 
     throw ( com::sun::star::uno::RuntimeException );
 
 com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
-SAL_CALL SignatureVerifierImpl_createInstance(
+SAL_CALL SignatureVerifierImpl_createInstance( 
     const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > & rSMgr)
     throw ( com::sun::star::uno::Exception );
 
diff --git a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx
index 86e19756b9d6..e2c213e5565a 100644
--- a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx
+++ b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ using ::rtl::OUString ;
 using ::com::sun::star::xml::wrapper::XXMLElementWrapper ;
 using ::com::sun::star::xml::crypto::XXMLEncryptionTemplate ;
 
-XMLEncryptionTemplateImpl :: XMLEncryptionTemplateImpl( const Reference< XMultiServiceFactory >& aFactory )
+XMLEncryptionTemplateImpl :: XMLEncryptionTemplateImpl( const Reference< XMultiServiceFactory >& aFactory ) 
     : m_xTemplate( NULL ),
       m_xTarget( NULL ),
       m_xServiceManager( aFactory ),
@@ -51,27 +51,27 @@ XMLEncryptionTemplateImpl :: ~XMLEncryptionTemplateImpl() {
 }
 
 /* XXMLEncryptionTemplate */
-void SAL_CALL XMLEncryptionTemplateImpl :: setTemplate( const Reference< XXMLElementWrapper >& aTemplate )
+void SAL_CALL XMLEncryptionTemplateImpl :: setTemplate( const Reference< XXMLElementWrapper >& aTemplate ) 
     throw (com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException)
 {
     m_xTemplate = aTemplate ;
 }
 
 /* XXMLEncryptionTemplate */
-Reference< XXMLElementWrapper > SAL_CALL XMLEncryptionTemplateImpl :: getTemplate()
+Reference< XXMLElementWrapper > SAL_CALL XMLEncryptionTemplateImpl :: getTemplate() 
 throw (com::sun::star::uno::RuntimeException)
 {
     return m_xTemplate ;
 }
 
 /* XXMLEncryptionTemplate */
-void SAL_CALL XMLEncryptionTemplateImpl :: setTarget( const Reference< XXMLElementWrapper >& aTarget )
+void SAL_CALL XMLEncryptionTemplateImpl :: setTarget( const Reference< XXMLElementWrapper >& aTarget ) 
     throw( com::sun::star::lang::IllegalArgumentException ) {
     m_xTarget = aTarget ;
 }
 
 /* XXMLEncryptionTemplate */
-Reference< XXMLElementWrapper > SAL_CALL XMLEncryptionTemplateImpl :: getTarget()
+Reference< XXMLElementWrapper > SAL_CALL XMLEncryptionTemplateImpl :: getTarget() 
 throw (com::sun::star::uno::RuntimeException)
 {
     return m_xTarget ;
diff --git a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx
index 87aad120ff53..10b33c8a5154 100644
--- a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx
+++ b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 XMLEncryptionTemplateImpl : public ::cppu::WeakImplHelper3<
         //Methods from XXMLEncryptionTemplate
         virtual void SAL_CALL setTemplate(
             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper >& aXmlElement
-            )
+            ) 
             throw (com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException);
 
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper > SAL_CALL getTemplate(
@@ -74,7 +74,7 @@ class XMLEncryptionTemplateImpl : public ::cppu::WeakImplHelper3<
 
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper > SAL_CALL getTarget(
         ) throw (com::sun::star::uno::RuntimeException) ;
-
+        
         virtual void SAL_CALL setStatus(
             ::com::sun::star::xml::crypto::SecurityOperationStatus status )
             throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
@@ -107,6 +107,6 @@ class XMLEncryptionTemplateImpl : public ::cppu::WeakImplHelper3<
         static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > impl_createFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) ;
 } ;
 
-#endif  // _XMLENCRYPTIONTEMPLATE_XMLSECIMPL_HXX_
+#endif	// _XMLENCRYPTIONTEMPLATE_XMLSECIMPL_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
index c03ef50243e0..9dc76e96c542 100644
--- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
+++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ using ::rtl::OUString ;
 using ::com::sun::star::xml::wrapper::XXMLElementWrapper ;
 using ::com::sun::star::xml::crypto::XXMLSignatureTemplate ;
 
-XMLSignatureTemplateImpl :: XMLSignatureTemplateImpl( const Reference< XMultiServiceFactory >& aFactory )
+XMLSignatureTemplateImpl :: XMLSignatureTemplateImpl( const Reference< XMultiServiceFactory >& aFactory ) 
     :m_xTemplate( NULL ),
      m_xServiceManager( aFactory ),
      m_nStatus ( ::com::sun::star::xml::crypto::SecurityOperationStatus_UNKNOWN )
@@ -52,40 +52,40 @@ XMLSignatureTemplateImpl :: ~XMLSignatureTemplateImpl() {
 }
 
 /* XXMLSignatureTemplate */
-void SAL_CALL XMLSignatureTemplateImpl :: setTemplate( const Reference< XXMLElementWrapper >& aTemplate )
+void SAL_CALL XMLSignatureTemplateImpl :: setTemplate( const Reference< XXMLElementWrapper >& aTemplate ) 
     throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException)
 {
     m_xTemplate = aTemplate ;
 }
 
 /* XXMLSignatureTemplate */
-Reference< XXMLElementWrapper > SAL_CALL XMLSignatureTemplateImpl :: getTemplate()
+Reference< XXMLElementWrapper > SAL_CALL XMLSignatureTemplateImpl :: getTemplate() 
     throw (com::sun::star::uno::RuntimeException)
 {
     return m_xTemplate ;
 }
 
-void SAL_CALL XMLSignatureTemplateImpl :: setTarget( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper >& aXmlElement )
+void SAL_CALL XMLSignatureTemplateImpl :: setTarget( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper >& aXmlElement ) 
     throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException)
 {
     targets.push_back( aXmlElement );
 }
 
-::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper > > SAL_CALL XMLSignatureTemplateImpl :: getTargets()
+::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper > > SAL_CALL XMLSignatureTemplateImpl :: getTargets() 
     throw (com::sun::star::uno::RuntimeException)
 {
     sal_Int32 length = targets.size();
     ::com::sun::star::uno::Sequence<
         ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper >
         > aTargets (length);
-
+        
     sal_Int32 i;
-
+    
     for (i=0; i<length; i++)
     {
         aTargets[i] = targets[i];
     }
-
+    
     return aTargets;
 }
 
diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx
index a38c73b44821..b8cc82480122 100644
--- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx
+++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ class XMLSignatureTemplateImpl : public ::cppu::WeakImplHelper3<
 
         virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper > > SAL_CALL getTargets(
         ) throw (com::sun::star::uno::RuntimeException);
-
+        
         virtual void SAL_CALL setBinding(
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::xml::crypto::XUriBinding >& aUriBinding )
@@ -86,7 +86,7 @@ class XMLSignatureTemplateImpl : public ::cppu::WeakImplHelper3<
             ::com::sun::star::xml::crypto::XUriBinding >
             SAL_CALL getBinding(  )
             throw (::com::sun::star::uno::RuntimeException);
-
+            
         virtual void SAL_CALL setStatus(
             ::com::sun::star::xml::crypto::SecurityOperationStatus status )
             throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
@@ -119,6 +119,6 @@ class XMLSignatureTemplateImpl : public ::cppu::WeakImplHelper3<
         static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > impl_createFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) ;
 } ;
 
-#endif  // _XMLSIGNATURETEMPLATE_XMLSECIMPL_HXX_
+#endif	// _XMLSIGNATURETEMPLATE_XMLSECIMPL_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/framework/xsec_framework.cxx b/xmlsecurity/source/framework/xsec_framework.cxx
index 3a03e3738d53..1597e32422ea 100644
--- a/xmlsecurity/source/framework/xsec_framework.cxx
+++ b/xmlsecurity/source/framework/xsec_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
@@ -70,16 +70,16 @@ sal_Bool SAL_CALL component_writeInfo(
             //Decryptor
             sal_Int32 nPos = 0;
             Reference< XRegistryKey > xNewKey(
-                reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( DecryptorImpl_getImplementationName() ) );
+                reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( DecryptorImpl_getImplementationName() ) ); 
             xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
-
+            
             const Sequence< OUString > & rSNL = DecryptorImpl_getSupportedServiceNames();
             const OUString * pArray = rSNL.getConstArray();
             for ( nPos = rSNL.getLength(); nPos--; )
                 xNewKey->createKey( pArray[nPos] );
-
+                
             //Encryptor
-            xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( EncryptorImpl_getImplementationName() );
+            xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( EncryptorImpl_getImplementationName() ); 
             xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
             const Sequence< OUString > & rSNL2 = EncryptorImpl_getSupportedServiceNames();
             pArray = rSNL2.getConstArray();
@@ -87,7 +87,7 @@ sal_Bool SAL_CALL component_writeInfo(
                 xNewKey->createKey( pArray[nPos] );
 
             //SignatureCreator
-            xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( SignatureCreatorImpl_getImplementationName() );
+            xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( SignatureCreatorImpl_getImplementationName() ); 
             xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
             const Sequence< OUString > & rSNL3 = SignatureCreatorImpl_getSupportedServiceNames();
             pArray = rSNL3.getConstArray();
@@ -95,7 +95,7 @@ sal_Bool SAL_CALL component_writeInfo(
                 xNewKey->createKey( pArray[nPos] );
 
             //SignatureVerifier
-            xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( SignatureVerifierImpl_getImplementationName() );
+            xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( SignatureVerifierImpl_getImplementationName() ); 
             xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
             const Sequence< OUString > & rSNL4 = SignatureVerifierImpl_getSupportedServiceNames();
             pArray = rSNL4.getConstArray();
@@ -103,7 +103,7 @@ sal_Bool SAL_CALL component_writeInfo(
                 xNewKey->createKey( pArray[nPos] );
 
             //SAXEventKeeper
-            xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( SAXEventKeeperImpl_getImplementationName() );
+            xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( SAXEventKeeperImpl_getImplementationName() ); 
             xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
             const Sequence< OUString > & rSNL5 = SAXEventKeeperImpl_getSupportedServiceNames();
             pArray = rSNL5.getConstArray();
@@ -111,7 +111,7 @@ sal_Bool SAL_CALL component_writeInfo(
                 xNewKey->createKey( pArray[nPos] );
 
             //XMLSignatureTemplateImpl
-            xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( XMLSignatureTemplateImpl::impl_getImplementationName() );
+            xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( XMLSignatureTemplateImpl::impl_getImplementationName() ); 
             xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
             const Sequence< OUString > & rSNL6 = XMLSignatureTemplateImpl::impl_getSupportedServiceNames();
             pArray = rSNL6.getConstArray();
@@ -119,13 +119,13 @@ sal_Bool SAL_CALL component_writeInfo(
                 xNewKey->createKey( pArray[nPos] );
 
             // XMLEncryptionTemplateImpl
-            xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( XMLEncryptionTemplateImpl::impl_getImplementationName() );
+            xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( XMLEncryptionTemplateImpl::impl_getImplementationName() ); 
             xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
             const Sequence< OUString > & rSNL7 = XMLEncryptionTemplateImpl::impl_getSupportedServiceNames();
             pArray = rSNL7.getConstArray();
             for ( nPos = rSNL7.getLength(); nPos--; )
                 xNewKey->createKey( pArray[nPos] );
-
+                
             return sal_True;
         }
         catch (InvalidRegistryException &)
@@ -141,7 +141,7 @@ void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     void * pRet = 0;
-
+    
     //Decryptor
     OUString implName = OUString::createFromAscii( pImplName );
     if ( pServiceManager && implName.equals(DecryptorImpl_getImplementationName()) )
@@ -150,7 +150,7 @@ void * SAL_CALL component_getFactory(
             reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
             OUString::createFromAscii( pImplName ),
             DecryptorImpl_createInstance, DecryptorImpl_getSupportedServiceNames() ) );
-
+        
         if (xFactory.is())
         {
             xFactory->acquire();
@@ -165,7 +165,7 @@ void * SAL_CALL component_getFactory(
             reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
             OUString::createFromAscii( pImplName ),
             EncryptorImpl_createInstance, EncryptorImpl_getSupportedServiceNames() ) );
-
+        
         if (xFactory.is())
         {
             xFactory->acquire();
@@ -180,14 +180,14 @@ void * SAL_CALL component_getFactory(
             reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
             OUString::createFromAscii( pImplName ),
             SignatureCreatorImpl_createInstance, SignatureCreatorImpl_getSupportedServiceNames() ) );
-
+        
         if (xFactory.is())
         {
             xFactory->acquire();
             pRet = xFactory.get();
         }
     }
-
+    
     //SignatureVerifier
     if ( pServiceManager && implName.equals(SignatureVerifierImpl_getImplementationName()) )
     {
@@ -195,7 +195,7 @@ void * SAL_CALL component_getFactory(
             reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
             OUString::createFromAscii( pImplName ),
             SignatureVerifierImpl_createInstance, SignatureVerifierImpl_getSupportedServiceNames() ) );
-
+        
         if (xFactory.is())
         {
             xFactory->acquire();
@@ -210,7 +210,7 @@ void * SAL_CALL component_getFactory(
             reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
             OUString::createFromAscii( pImplName ),
             SAXEventKeeperImpl_createInstance, SAXEventKeeperImpl_getSupportedServiceNames() ) );
-
+        
         if (xFactory.is())
         {
             xFactory->acquire();
@@ -243,7 +243,7 @@ void * SAL_CALL component_getFactory(
             pRet = xFactory.get();
         }
     }
-
+    
     return pRet;
 }
 }
diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx
index 9b5fd047eac6..d5058788b447 100644
--- a/xmlsecurity/source/helper/documentsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 css = ::com::sun::star;
 using rtl::OUString;
 
 
-namespace
+namespace 
 {
 ::rtl::OUString getElement(::rtl::OUString const & version, ::sal_Int32 * index)
 {
@@ -70,7 +70,7 @@ int compareVersions(
         ::rtl::OUString e2(getElement(version2, &i2));
         if (e1.getLength() < e2.getLength()) {
             return -1;
-        } else if (e1.getLength() > e2.getLength()) {
+        } else if (e1.getLength() > e2.getLength()) {            
             return 1;
         } else if (e1 < e2) {
             return -1;
@@ -84,14 +84,14 @@ int compareVersions(
 //If the OOo 3.0 mode is used then we exclude
 //'mimetype' and all content of 'META-INF'.
 //If the argument 'bSigning' is true then the element list is created for a signing
-//operation in which case we use the latest signing algorithm. That is all elements
+//operation in which case we use the latest signing algorithm. That is all elements 
 //we find in the zip storage are added to the list. We do not support the old signatures
 //which did not contain all files.
 //If 'bSigning' is false, then we validate. If the user enabled validating according to OOo 3.0
 //then mimetype and all content of META-INF must be excluded.
-void ImplFillElementList(
-    std::vector< rtl::OUString >& rList, const Reference < css::embed::XStorage >& rxStore,
-    const ::rtl::OUString rRootStorageName, const bool bRecursive,
+void ImplFillElementList( 
+    std::vector< rtl::OUString >& rList, const Reference < css::embed::XStorage >& rxStore, 
+    const ::rtl::OUString rRootStorageName, const bool bRecursive, 
     const DocumentSignatureAlgorithm mode)
 {
     ::rtl::OUString aMetaInfName( RTL_CONSTASCII_USTRINGPARAM( "META-INF" ) );
@@ -105,7 +105,7 @@ void ImplFillElementList(
 
     for ( sal_Int32 n = 0; n < nElements; n++ )
     {
-        if (mode != OOo3_2Document
+        if (mode != OOo3_2Document 
             && (pNames[n] == aMetaInfName
             || pNames[n] == sMimeTypeName))
         {
@@ -155,7 +155,7 @@ bool DocumentSignatureHelper::isOOo3_2_Signature(const SignatureInformation & si
     ::rtl::OUString sManifestURI(RTL_CONSTASCII_USTRINGPARAM("META-INF/manifest.xml"));
     bool bOOo3_2 = false;
     typedef ::std::vector< SignatureReferenceInformation >::const_iterator CIT;
-    for (CIT i = sigInfo.vSignatureReferenceInfors.begin();
+    for (CIT i = sigInfo.vSignatureReferenceInfors.begin(); 
         i < sigInfo.vSignatureReferenceInfors.end(); i++)
     {
         if (i->ouURI.equals(sManifestURI))
@@ -167,7 +167,7 @@ bool DocumentSignatureHelper::isOOo3_2_Signature(const SignatureInformation & si
     return  bOOo3_2;
 }
 
-DocumentSignatureAlgorithm
+DocumentSignatureAlgorithm 
 DocumentSignatureHelper::getDocumentAlgorithm(
     const ::rtl::OUString & sODFVersion, const SignatureInformation & sigInfo)
 {
@@ -184,24 +184,24 @@ DocumentSignatureHelper::getDocumentAlgorithm(
 }
 
 //The function creates a list of files which are to be signed or for which
-//the signature is to be validated. The strings are UTF8 encoded URIs which
+//the signature is to be validated. The strings are UTF8 encoded URIs which 
 //contain '/' as path separators.
 //
-//The algorithm how document signatures are created and validated has
+//The algorithm how document signatures are created and validated has 
 //changed over time. The change affects only which files within the document
 //are changed. Document signatures created by OOo 2.x only used particular files. Since
-//OOo 3.0 everything except "mimetype" and "META-INF" are signed. As of OOo 3.2 everything
+//OOo 3.0 everything except "mimetype" and "META-INF" are signed. As of OOo 3.2 everything 
 //except META-INF/documentsignatures.xml is signed.
 //Signatures are validated according to the algorithm which was then used for validation.
-//That is, when validating a signature which was created by OOo 3.0, then mimetype and
+//That is, when validating a signature which was created by OOo 3.0, then mimetype and 
 //META-INF are not used.
 //
 //When a signature is created then we always use the latest algorithm. That is, we use
 //that of OOo 3.2
-std::vector< rtl::OUString >
-DocumentSignatureHelper::CreateElementList(
-    const Reference < css::embed::XStorage >& rxStore,
-    const ::rtl::OUString /*rRootStorageName*/, DocumentSignatureMode eMode,
+std::vector< rtl::OUString > 
+DocumentSignatureHelper::CreateElementList( 
+    const Reference < css::embed::XStorage >& rxStore, 
+    const ::rtl::OUString /*rRootStorageName*/, DocumentSignatureMode eMode, 
     const DocumentSignatureAlgorithm mode)
 {
     std::vector< rtl::OUString > aElements;
@@ -311,7 +311,7 @@ DocumentSignatureHelper::CreateElementList(
     return aElements;
 }
 
-SignatureStreamHelper DocumentSignatureHelper::OpenSignatureStream(
+SignatureStreamHelper DocumentSignatureHelper::OpenSignatureStream( 
     const Reference < css::embed::XStorage >& rxStore, sal_Int32 nOpenMode, DocumentSignatureMode eDocSigMode )
 {
     sal_Int32 nSubStorageOpenMode = css::embed::ElementModes::READ;
@@ -320,7 +320,7 @@ SignatureStreamHelper DocumentSignatureHelper::OpenSignatureStream(
 
     SignatureStreamHelper aHelper;
 
-    try
+    try 
     {
         ::rtl::OUString aSIGStoreName( RTL_CONSTASCII_USTRINGPARAM( "META-INF" ) );
         aHelper.xSignatureStorage = rxStore->openStorageElement( aSIGStoreName, nSubStorageOpenMode );
@@ -348,11 +348,11 @@ SignatureStreamHelper DocumentSignatureHelper::OpenSignatureStream(
 
 //sElementList contains all files which are expected to be signed. Only those files must me signed,
 //no more, no less.
-//The DocumentSignatureAlgorithm indicates if the document was created with OOo 2.x. Then
+//The DocumentSignatureAlgorithm indicates if the document was created with OOo 2.x. Then 
 //the uri s in the Reference elements in the signature, were not properly encoded.
 // For example: <Reference URI="ObjectReplacements/Object 1">
-bool DocumentSignatureHelper::checkIfAllFilesAreSigned(
-    const ::std::vector< ::rtl::OUString > & sElementList,
+bool DocumentSignatureHelper::checkIfAllFilesAreSigned( 
+    const ::std::vector< ::rtl::OUString > & sElementList, 
     const SignatureInformation & sigInfo,
     const DocumentSignatureAlgorithm alg)
 {
@@ -382,7 +382,7 @@ bool DocumentSignatureHelper::checkIfAllFilesAreSigned(
                 ::rtl::OUString sElementListURI = *aIter;
                 if (alg == OOo2Document)
                 {
-                    sElementListURI =
+                    sElementListURI = 
                         ::rtl::Uri::encode(
                         sElementListURI, rtl_UriCharClassPchar,
                         rtl_UriEncodeCheckEscapes, RTL_TEXTENCODING_UTF8);
@@ -430,7 +430,7 @@ bool DocumentSignatureHelper::equalsReferenceUriManifestPath(
     {
         retVal = true;
         typedef std::vector<OUString>::const_iterator CIT;
-        for (CIT i = vUriSegments.begin(), j = vPathSegments.begin();
+        for (CIT i = vUriSegments.begin(), j = vPathSegments.begin(); 
             i != vUriSegments.end(); i++, j++)
         {
             //Decode the uri segment, so that %20 becomes ' ', etc.
@@ -443,10 +443,10 @@ bool DocumentSignatureHelper::equalsReferenceUriManifestPath(
             }
         }
     }
-
+    
     return retVal;
 }
-
+    
 ::rtl::OUString DocumentSignatureHelper::GetDocumentContentSignatureDefaultStreamName()
 {
     return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "documentsignatures.xml" ) );
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
index 18fb74c6c399..b46d8ba194cb 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 /* SEInitializer component */
 #define SEINITIALIZER_COMPONENT "com.sun.star.xml.crypto.SEInitializer"
 
-#define TAG_DOCUMENTSIGNATURES  "document-signatures"
-#define NS_DOCUMENTSIGNATURES   "http://openoffice.org/2004/documentsignatures"
+#define TAG_DOCUMENTSIGNATURES	"document-signatures"
+#define NS_DOCUMENTSIGNATURES	"http://openoffice.org/2004/documentsignatures"
 #define NS_DOCUMENTSIGNATURES_ODF_1_2 "urn:oasis:names:tc:opendocument:xmlns:digitalsignature:1.0"
 
 using namespace ::com::sun::star;
@@ -80,7 +80,7 @@ bool XMLSignatureHelper::Init( const rtl::OUString& rTokenPath )
     DBG_ASSERT( !mxSecurityContext.is(), "XMLSignatureHelper::Init - mxSecurityContext already set!" );
 
     ImplCreateSEInitializer();
-
+    
     if ( mxSEInitializer.is() )
         mxSecurityContext = mxSEInitializer->createSecurityContext( rTokenPath );
 
@@ -88,7 +88,7 @@ bool XMLSignatureHelper::Init( const rtl::OUString& rTokenPath )
 }
 
 void XMLSignatureHelper::ImplCreateSEInitializer()
-{
+{ 
     rtl::OUString sSEInitializer(rtl::OUString::createFromAscii( SEINITIALIZER_COMPONENT ));
     uno::Reference< lang::XMultiComponentFactory > xMCF( mxCtx->getServiceManager() );
     mxSEInitializer = uno::Reference< com::sun::star::xml::crypto::XSEInitializer > (
@@ -105,7 +105,7 @@ com::sun::star::uno::Reference< com::sun::star::xml::crypto::XUriBinding > XMLSi
     return mxUriBinding;
 }
 
-void XMLSignatureHelper::SetStorage(
+void XMLSignatureHelper::SetStorage( 
     const Reference < css::embed::XStorage >& rxStorage,
     ::rtl::OUString sODFVersion)
 {
@@ -140,7 +140,7 @@ sal_Int32 XMLSignatureHelper::GetNewSecurityId()
     return mpXSecController->getNewSecurityId();
 }
 
-void XMLSignatureHelper::SetX509Certificate(
+void XMLSignatureHelper::SetX509Certificate( 
         sal_Int32 nSecurityId,
         const rtl::OUString& ouX509IssuerName,
         const rtl::OUString& ouX509SerialNumber,
@@ -153,7 +153,7 @@ void XMLSignatureHelper::SetX509Certificate(
         ouX509Cert);
 }
 
-void XMLSignatureHelper::SetX509Certificate(
+void XMLSignatureHelper::SetX509Certificate( 
         sal_Int32 nSecurityId,
         sal_Int32 nSecurityEnvironmentIndex,
         const rtl::OUString& ouX509IssuerName,
@@ -196,31 +196,31 @@ uno::Reference<xml::sax::XDocumentHandler> XMLSignatureHelper::CreateDocumentHan
     const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xOutputStream )
 {
     /*
-     * get SAX writer component
+     * get SAX writer component 
      */
     uno::Reference< lang::XMultiComponentFactory > xMCF( mxCtx->getServiceManager() );
     uno::Reference< io::XActiveDataSource > xSaxWriter(
-        xMCF->createInstanceWithContext(rtl::OUString::createFromAscii(
+        xMCF->createInstanceWithContext(rtl::OUString::createFromAscii( 
             "com.sun.star.xml.sax.Writer"), mxCtx ), uno::UNO_QUERY );
-
+        
     DBG_ASSERT( xSaxWriter.is(), "can't instantiate XML writer" );
-
+    
     /*
-     * connect XML writer to output stream
+     * connect XML writer to output stream 
      */
     xSaxWriter->setOutputStream( xOutputStream );
 
     /*
      * prepare document handler
      */
-    uno::Reference<xml::sax::XDocumentHandler>
+    uno::Reference<xml::sax::XDocumentHandler> 
         xDocHandler( xSaxWriter,uno::UNO_QUERY);
-
+        
     /*
      * write the xml context for signatures
      */
     rtl::OUString tag_AllSignatures(RTL_CONSTASCII_USTRINGPARAM(TAG_DOCUMENTSIGNATURES));
-
+    
     SvXMLAttributeList *pAttributeList = new SvXMLAttributeList();
     rtl::OUString sNamespace;
     if (mbODFPre1_2)
@@ -231,12 +231,12 @@ uno::Reference<xml::sax::XDocumentHandler> XMLSignatureHelper::CreateDocumentHan
     pAttributeList->AddAttribute(
         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ATTR_XMLNS)),
         sNamespace);
-
+        
     xDocHandler->startDocument();
-    xDocHandler->startElement(
+    xDocHandler->startElement( 
         tag_AllSignatures,
         uno::Reference< com::sun::star::xml::sax::XAttributeList > (pAttributeList));
-
+        
     return xDocHandler;
 }
 
@@ -247,7 +247,7 @@ void XMLSignatureHelper::CloseDocumentHandler( const uno::Reference<xml::sax::XD
     xDocumentHandler->endDocument();
 }
 
-void XMLSignatureHelper::ExportSignature(
+void XMLSignatureHelper::ExportSignature( 
     const uno::Reference< xml::sax::XDocumentHandler >& xDocumentHandler,
     const SignatureInformation& signatureInfo )
 {
@@ -262,7 +262,7 @@ bool XMLSignatureHelper::CreateAndWriteSignature( const uno::Reference< xml::sax
      * create a signature listener
      */
 /*
-    ImplXMLSignatureListener* pSignatureListener = new ImplXMLSignatureListener(
+    ImplXMLSignatureListener* pSignatureListener = new ImplXMLSignatureListener( 
                                                     LINK( this, XMLSignatureHelper, SignatureCreationResultListener ),
                                                     LINK( this, XMLSignatureHelper, SignatureVerifyResultListener ),
                                                     LINK( this, XMLSignatureHelper, StartVerifySignatureElement ) );
@@ -284,30 +284,30 @@ bool XMLSignatureHelper::CreateAndWriteSignature( const uno::Reference< xml::sax
      * clear up the signature creation listener
      */
     //mpXSecController->setSignatureCreationResultListener( NULL );
-
+    
     return !mbError;
 }
 
 bool XMLSignatureHelper::CreateAndWriteSignature( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xOutputStream )
 {
-    uno::Reference<xml::sax::XDocumentHandler> xDocHandler
+    uno::Reference<xml::sax::XDocumentHandler> xDocHandler 
         = CreateDocumentHandlerWithHeader(xOutputStream);
-
+        
     bool rc = CreateAndWriteSignature( xDocHandler );
-
+    
     CloseDocumentHandler(xDocHandler);
-
+    
     return rc;
 }
 
 bool XMLSignatureHelper::ReadAndVerifySignature( const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& xInputStream )
 {
     mbError = false;
-
+    
     DBG_ASSERT(xInputStream.is(), "input stream missing");
-
+    
     /*
-     * prepare ParserInputSrouce
+     * prepare ParserInputSrouce 
      */
     xml::sax::InputSource aParserInput;
     // aParserInput.sSystemId = ouName;
@@ -327,31 +327,31 @@ bool XMLSignatureHelper::ReadAndVerifySignature( const com::sun::star::uno::Refe
     /*
      * create a signature reader
      */
-    uno::Reference< xml::sax::XDocumentHandler > xHandler
+    uno::Reference< xml::sax::XDocumentHandler > xHandler 
         = mpXSecController->createSignatureReader( );
-
+        
     /*
      * create a signature listener
      */
-    ImplXMLSignatureListener* pSignatureListener = new ImplXMLSignatureListener(
+    ImplXMLSignatureListener* pSignatureListener = new ImplXMLSignatureListener( 
                                                     LINK( this, XMLSignatureHelper, SignatureCreationResultListener ),
                                                     LINK( this, XMLSignatureHelper, SignatureVerifyResultListener ),
                                                     LINK( this, XMLSignatureHelper, StartVerifySignatureElement ) );
-
+    
     /*
      * configure the signature verify listener
      */
     //mpXSecController->setSignatureVerifyResultListener( pSignatureListener );
-
+    
     /*
      * setup the connection:
      * Parser -> SignatureListener -> SignatureReader
      */
-    pSignatureListener->setNextHandler(xHandler);
+    pSignatureListener->setNextHandler(xHandler);	
     xParser->setDocumentHandler( pSignatureListener );
-
+    
     /*
-     * parser the stream
+     * parser the stream 
      */
     try
     {
@@ -373,11 +373,11 @@ bool XMLSignatureHelper::ReadAndVerifySignature( const com::sun::star::uno::Refe
     {
         mbError = true;
     }
-
+    
     /*
      * clear up the connection
      */
-    pSignatureListener->setNextHandler( NULL );
+    pSignatureListener->setNextHandler( NULL );	
 
     /*
      * clear up the signature verify listener
@@ -388,7 +388,7 @@ bool XMLSignatureHelper::ReadAndVerifySignature( const com::sun::star::uno::Refe
      * release the signature reader
      */
     mpXSecController->releaseSignatureReader( );
-
+    
     return !mbError;
 }
 
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
index 0e75c51cf6c7..3ed893e6d2d5 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 ImplXMLSignatureListener::signatureVerified( sal_Int32 securityId,
 }
 
 // ---------------------------------------------------------------------------------
-// XDocumentHandler
+// XDocumentHandler 
 // ---------------------------------------------------------------------------------
 void SAL_CALL ImplXMLSignatureListener::startDocument(  )
     throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException)
@@ -84,7 +84,7 @@ void SAL_CALL ImplXMLSignatureListener::startDocument(  )
         m_xNextHandler->startDocument();
     }
 }
-
+    
 void SAL_CALL ImplXMLSignatureListener::endDocument(  )
     throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException)
 {
@@ -107,8 +107,8 @@ void SAL_CALL ImplXMLSignatureListener::startElement( const rtl::OUString& aName
         m_xNextHandler->startElement( aName, xAttribs );
     }
 }
-
-void SAL_CALL ImplXMLSignatureListener::endElement( const rtl::OUString& aName )
+    
+void SAL_CALL ImplXMLSignatureListener::endElement( const rtl::OUString& aName ) 
     throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException)
 {
     if (m_xNextHandler.is())
@@ -116,7 +116,7 @@ void SAL_CALL ImplXMLSignatureListener::endElement( const rtl::OUString& aName )
         m_xNextHandler->endElement( aName );
     }
 }
-
+    
 void SAL_CALL ImplXMLSignatureListener::characters( const rtl::OUString& aChars )
     throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException)
 {
@@ -125,7 +125,7 @@ void SAL_CALL ImplXMLSignatureListener::characters( const rtl::OUString& aChars
         m_xNextHandler->characters( aChars );
     }
 }
-
+    
 void SAL_CALL ImplXMLSignatureListener::ignorableWhitespace( const rtl::OUString& aWhitespaces )
     throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException)
 {
@@ -134,7 +134,7 @@ void SAL_CALL ImplXMLSignatureListener::ignorableWhitespace( const rtl::OUString
         m_xNextHandler->ignorableWhitespace( aWhitespaces );
     }
 }
-
+    
 void SAL_CALL ImplXMLSignatureListener::processingInstruction( const rtl::OUString& aTarget, const rtl::OUString& aData )
     throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException)
 {
@@ -143,7 +143,7 @@ void SAL_CALL ImplXMLSignatureListener::processingInstruction( const rtl::OUStri
         m_xNextHandler->processingInstruction( aTarget, aData );
     }
 }
-
+    
 void SAL_CALL ImplXMLSignatureListener::setDocumentLocator( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XLocator >& xLocator )
     throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException)
 {
@@ -154,7 +154,7 @@ void SAL_CALL ImplXMLSignatureListener::setDocumentLocator( const com::sun::star
 }
 
 // ---------------------------------------------------------------------------------
-// XUriBinding
+// XUriBinding 
 // ---------------------------------------------------------------------------------
 
 UriBindingHelper::UriBindingHelper()
@@ -167,11 +167,11 @@ UriBindingHelper::UriBindingHelper( const com::sun::star::uno::Reference < com::
 }
 
 
-void SAL_CALL UriBindingHelper::setUriBinding( const rtl::OUString& /*uri*/, const uno::Reference< io::XInputStream >&)
+void SAL_CALL UriBindingHelper::setUriBinding( const rtl::OUString& /*uri*/, const uno::Reference< io::XInputStream >&) 
     throw (uno::Exception, uno::RuntimeException)
 {
 }
-
+    
 uno::Reference< io::XInputStream > SAL_CALL UriBindingHelper::getUriBinding( const rtl::OUString& uri )
     throw (uno::Exception, uno::RuntimeException)
 {
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx b/xmlsecurity/source/helper/xmlsignaturehelper2.hxx
index e5dd47978b94..db9319753daa 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper2.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 #include <tools/link.hxx>
 #include <rtl/ustring.hxx>
 
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase1.hxx> 
+#include <cppuhelper/implbase3.hxx> 
 
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <com/sun/star/xml/crypto/sax/XSignatureCreationResultListener.hpp>
@@ -51,7 +51,7 @@ namespace embed {
 // MT: Not needed any more, remove later...
 
 class ImplXMLSignatureListener : public cppu::WeakImplHelper3
-<
+< 
     com::sun::star::xml::crypto::sax::XSignatureCreationResultListener,
     com::sun::star::xml::crypto::sax::XSignatureVerifyResultListener,
     com::sun::star::xml::sax::XDocumentHandler
@@ -62,56 +62,56 @@ private:
     Link        maVerifyResultListenerListener;
     Link        maStartVerifySignatureElementListener;
 
-    com::sun::star::uno::Reference<
+    com::sun::star::uno::Reference< 
         com::sun::star::xml::sax::XDocumentHandler > m_xNextHandler;
 
 public:
     ImplXMLSignatureListener( const Link& rCreationResultListenerListener, const Link rVerifyResultListenerListener, const Link rStartVerifySignatureElement );
     ~ImplXMLSignatureListener();
-
-    void setNextHandler(com::sun::star::uno::Reference<
+    
+    void setNextHandler(com::sun::star::uno::Reference< 
         com::sun::star::xml::sax::XDocumentHandler > xNextHandler);
 
     // com::sun::star::xml::crypto::sax::XSignatureCreationResultListener
     virtual void SAL_CALL signatureCreated( sal_Int32 securityId, com::sun::star::xml::crypto::SecurityOperationStatus creationResult )
         throw (com::sun::star::uno::RuntimeException);
-
+            
     // com::sun::star::xml::crypto::sax::XSignatureVerifyResultListener
     virtual void SAL_CALL signatureVerified( sal_Int32 securityId, com::sun::star::xml::crypto::SecurityOperationStatus verifyResult )
         throw (com::sun::star::uno::RuntimeException);
-
+        
     // com::sun::star::xml::sax::XDocumentHandler
     virtual void SAL_CALL startElement( const rtl::OUString& aName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL startDocument(  )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL endDocument(  )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
-    virtual void SAL_CALL endElement( const rtl::OUString& aName )
+        
+    virtual void SAL_CALL endElement( const rtl::OUString& aName ) 
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL characters( const rtl::OUString& aChars )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL ignorableWhitespace( const rtl::OUString& aWhitespaces )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL processingInstruction( const rtl::OUString& aTarget, const rtl::OUString& aData )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL setDocumentLocator( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XLocator >& xLocator )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
 };
 
 
 // ---------------------------------------------------------------------------------
-// XUriBinding
+// XUriBinding 
 // ---------------------------------------------------------------------------------
 
-class UriBindingHelper : public cppu::WeakImplHelper1
+class UriBindingHelper : public cppu::WeakImplHelper1 
 <
     com::sun::star::xml::crypto::XUriBinding
 >
@@ -120,7 +120,7 @@ private:
     com::sun::star::uno::Reference < com::sun::star::embed::XStorage > mxStorage;
 
 
-public:
+public: 
     UriBindingHelper();
     UriBindingHelper( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rxStorage );
 
diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx
index d2af8a56c760..864d6de8df14 100644
--- a/xmlsecurity/source/helper/xsecctl.cxx
+++ b/xmlsecurity/source/helper/xsecctl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -179,7 +179,7 @@ sal_Bool XSecController::convertDateTime( com::sun::star::util::DateTime& rDateT
             aTimeStr = rString.copy( nPos + 1, nPos2 - nPos - 1 );
 
             //Get the fraction of a second with the accuracy of one hundreds second.
-            //The fraction part of the date could have different accuracies. To calculate
+            //The fraction part of the date could have different accuracies. To calculate 
             //the count of a hundredth units one could form a fractional number by appending
             //the value of the time string to 0. Then multiply it by 100 and use only the whole number.
             //For example: 5:27:46,1 -> 0,1 * 100 = 10
@@ -276,38 +276,38 @@ sal_Bool XSecController::convertDateTime( com::sun::star::util::DateTime& rDateT
     }
     return bSuccess;
 }
-
+ 
 int XSecController::findSignatureInfor( sal_Int32 nSecurityId) const
 /****** XSecController/findSignatureInfor *************************************
  *
  *   NAME
- *  findSignatureInfor -- find SignatureInformation struct for a particular
- *                        signature
+ *	findSignatureInfor -- find SignatureInformation struct for a particular
+ *	                      signature
  *
  *   SYNOPSIS
- *  index = findSignatureInfor( nSecurityId );
+ *	index = findSignatureInfor( nSecurityId );
  *
  *   FUNCTION
- *  see NAME.
+ *	see NAME.
  *
  *   INPUTS
- *  nSecurityId - the signature's id
+ *	nSecurityId - the signature's id
  *
  *   RESULT
- *  index - the index of the signature, or -1 when no such signature
- *          existing
+ *	index - the index of the signature, or -1 when no such signature
+ *	        existing
  *
  *   HISTORY
- *  08.05.2004 -    implemented
+ *	08.05.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     int i;
     int size = m_vInternalSignatureInformations.size();
-
+    
     for (i=0; i<size; ++i)
     {
         if (m_vInternalSignatureInformations[i].signatureInfor.nSecurityId == nSecurityId)
@@ -315,7 +315,7 @@ int XSecController::findSignatureInfor( sal_Int32 nSecurityId) const
             return i;
         }
     }
-
+    
     return -1;
 }
 
@@ -323,35 +323,35 @@ void XSecController::createXSecComponent( )
 /****** XSecController/createXSecComponent ************************************
  *
  *   NAME
- *  bResult = createXSecComponent -- creates xml security components
+ *	bResult = createXSecComponent -- creates xml security components
  *
  *   SYNOPSIS
- *  createXSecComponent( );
+ *	createXSecComponent( );
  *
  *   FUNCTION
- *  Creates xml security components, including:
- *  1. an xml signature bridge component ( Java based or C based)
- *  2. an XMLDocumentWrapper component ( Java based or C based)
- *  3. a SAXEventKeeper component
+ *	Creates xml security components, including:
+ *	1. an xml signature bridge component ( Java based or C based)
+ *	2. an XMLDocumentWrapper component ( Java based or C based)
+ *	3. a SAXEventKeeper component
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     rtl::OUString sSAXEventKeeper(rtl::OUString::createFromAscii( SAXEVENTKEEPER_COMPONENT ));
     rtl::OUString sXMLSignature(rtl::OUString::createFromAscii( XMLSIGNATURE_COMPONENT ));
     rtl::OUString sXMLDocument(rtl::OUString::createFromAscii( XMLDOCUMENTWRAPPER_COMPONENT ));
-
+    
     /*
      * marks all security components are not available.
      */
@@ -361,11 +361,11 @@ void XSecController::createXSecComponent( )
     m_xSAXEventKeeper = NULL;
 
     cssu::Reference< cssl::XMultiComponentFactory > xMCF( mxCtx->getServiceManager() );
-
+    
     m_xXMLSignature = cssu::Reference< cssxc::XXMLSignature >(
         xMCF->createInstanceWithContext( sXMLSignature, mxCtx ),
         cssu::UNO_QUERY );
-
+        
     bool bSuccess = (0!=m_xXMLSignature.is());
     if ( bSuccess )
     /*
@@ -376,7 +376,7 @@ void XSecController::createXSecComponent( )
             xMCF->createInstanceWithContext( sXMLDocument, mxCtx ),
             cssu::UNO_QUERY );
     }
-
+    
     bSuccess &= (0!=m_xXMLDocumentWrapper.is());
     if ( bSuccess )
     /*
@@ -389,26 +389,26 @@ void XSecController::createXSecComponent( )
     }
 
     bSuccess &= (0!=m_xSAXEventKeeper.is());
-
+    
     if (bSuccess)
     /*
      * SAXEventKeeper created successfully.
      */
     {
         cssu::Reference< cssl::XInitialization > xInitialization(m_xSAXEventKeeper,  cssu::UNO_QUERY);
-
+    
         cssu::Sequence <cssu::Any> arg(1);
         arg[0] = cssu::makeAny(m_xXMLDocumentWrapper);
         xInitialization->initialize(arg);
-
-        cssu::Reference<cssxc::sax::XSAXEventKeeperStatusChangeBroadcaster>
-            xSAXEventKeeperStatusChangeBroadcaster(m_xSAXEventKeeper, cssu::UNO_QUERY);
+        
+        cssu::Reference<cssxc::sax::XSAXEventKeeperStatusChangeBroadcaster> 
+            xSAXEventKeeperStatusChangeBroadcaster(m_xSAXEventKeeper, cssu::UNO_QUERY); 
         cssu::Reference< cssxc::sax::XSAXEventKeeperStatusChangeListener >
             xStatusChangeListener = this;
-
+            
         xSAXEventKeeperStatusChangeBroadcaster
             ->addSAXEventKeeperStatusChangeListener( xStatusChangeListener );
-
+        
         m_nStatusOfSecurityComponents = INITIALIZED;
     }
 }
@@ -417,55 +417,55 @@ bool XSecController::chainOn( bool bRetrievingLastEvent )
 /****** XSecController/chainOn ************************************************
  *
  *   NAME
- *  chainOn -- tyies to connect the SAXEventKeeper with the SAX chain.
+ *	chainOn -- tyies to connect the SAXEventKeeper with the SAX chain.
  *
  *   SYNOPSIS
- *  bJustChainingOn = chainOn( bRetrievingLastEvent );
+ *	bJustChainingOn = chainOn( bRetrievingLastEvent );
  *
  *   FUNCTION
- *  First, checks whether the SAXEventKeeper is on the SAX chain. If not,
- *  creates xml security components, and chains the SAXEventKeeper into
- *  the SAX chain.
- *  Before being chained in, the SAXEventKeeper needs to receive all
- *  missed key SAX events, which can promise the DOM tree bufferred by the
- *  SAXEventKeeper has the same structure with the original document.
+ *	First, checks whether the SAXEventKeeper is on the SAX chain. If not,
+ *	creates xml security components, and chains the SAXEventKeeper into
+ *	the SAX chain.
+ *	Before being chained in, the SAXEventKeeper needs to receive all
+ *	missed key SAX events, which can promise the DOM tree bufferred by the
+ *	SAXEventKeeper has the same structure with the original document.
  *
  *   INPUTS
- *  bRetrievingLastEvent - whether to retrieve the last key SAX event from
- *                         the ElementStackKeeper.
- *
+ *	bRetrievingLastEvent - whether to retrieve the last key SAX event from
+ *	                       the ElementStackKeeper.
+ *	                       
  *   RESULT
- *  bJustChainingOn - whether the SAXEventKeeper is just chained into the
- *                    SAX chain.
+ *	bJustChainingOn - whether the SAXEventKeeper is just chained into the
+ *	                  SAX chain.
  *
  *   NOTES
- *  Sometimes, the last key SAX event can't be transferred to the
- *  SAXEventKeeper together.
- *  For instance, at the time an referenced element is detected, the
- *  startElement event has already been reserved by the ElementStackKeeper.
- *  Meanwhile, an ElementCollector needs to be created before the
- *  SAXEventKeeper receives that startElement event.
- *  So for the SAXEventKeeper, it needs to receive all missed key SAX
- *  events except that startElement event, then adds a new
- *  ElementCollector, then receives that startElement event.
+ *	Sometimes, the last key SAX event can't be transferred to the 
+ *	SAXEventKeeper together. 
+ *	For instance, at the time an referenced element is detected, the
+ *	startElement event has already been reserved by the ElementStackKeeper.
+ *	Meanwhile, an ElementCollector needs to be created before the
+ *	SAXEventKeeper receives that startElement event.
+ *	So for the SAXEventKeeper, it needs to receive all missed key SAX
+ *	events except that startElement event, then adds a new 
+ *	ElementCollector, then receives that startElement event.
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     bool rc = false;
-
+    
     if (!m_bIsSAXEventKeeperSticky && !m_bIsSAXEventKeeperConnected)
     {
         if ( m_nStatusOfSecurityComponents == UNINITIALIZED )
         {
             createXSecComponent();
         }
-
+        
         if ( m_nStatusOfSecurityComponents == INITIALIZED )
         /*
          * if all security components are ready, chains on the SAXEventKeeper
@@ -477,9 +477,9 @@ bool XSecController::chainOn( bool bRetrievingLastEvent )
              * phase.
              */
             m_xSAXEventKeeper->setNextHandler( NULL );
-
+            
             cssu::Reference< cssxs::XDocumentHandler > xSEKHandler(m_xSAXEventKeeper, cssu::UNO_QUERY);
-
+    
             /*
              * connects the previous document handler on the SAX chain
              */
@@ -489,7 +489,7 @@ bool XSecController::chainOn( bool bRetrievingLastEvent )
                 {
                     cssu::Reference< cssl::XInitialization > xInitialization
                         (m_xPreviousNodeOnSAXChain, cssu::UNO_QUERY);
-
+                        
                     cssu::Sequence<cssu::Any> aArgs( 1 );
                     aArgs[0] <<= xSEKHandler;
                     xInitialization->initialize(aArgs);
@@ -501,33 +501,33 @@ bool XSecController::chainOn( bool bRetrievingLastEvent )
                     xParser->setDocumentHandler( xSEKHandler );
                 }
             }
-
+            
             /*
              * get missed key SAX events
              */
             if (m_xElementStackKeeper.is())
             {
                 m_xElementStackKeeper->retrieve(xSEKHandler, bRetrievingLastEvent);
-
+                
                 /*
-                 * now the ElementStackKeeper can stop its work, because the
+                 * now the ElementStackKeeper can stop its work, because the 
                  * SAXEventKeeper is on the SAX chain, no SAX events will be
                  * missed.
                  */
                 m_xElementStackKeeper->stop();
             }
-
+            
             /*
              * connects the next document handler on the SAX chain
              */
             m_xSAXEventKeeper->setNextHandler( m_xNextNodeOnSAXChain );
-
+    
             m_bIsSAXEventKeeperConnected = true;
-
+            
             rc = true;
         }
     }
-
+    
     return rc;
 }
 
@@ -535,26 +535,26 @@ void XSecController::chainOff()
 /****** XSecController/chainOff ***********************************************
  *
  *   NAME
- *  chainOff -- disconnects the SAXEventKeeper from the SAX chain.
+ *	chainOff -- disconnects the SAXEventKeeper from the SAX chain.
  *
  *   SYNOPSIS
- *  chainOff( );
+ *	chainOff( );
  *
  *   FUNCTION
- *  See NAME.
+ *	See NAME.
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     if (!m_bIsSAXEventKeeperSticky )
@@ -562,14 +562,14 @@ void XSecController::chainOff()
         if (m_bIsSAXEventKeeperConnected)
         {
             m_xSAXEventKeeper->setNextHandler( NULL );
-
+            
             if ( m_xPreviousNodeOnSAXChain.is() )
             {
                 if ( m_bIsPreviousNodeInitializable )
                 {
                     cssu::Reference< cssl::XInitialization > xInitialization
                         (m_xPreviousNodeOnSAXChain, cssu::UNO_QUERY);
-
+                        
                     cssu::Sequence<cssu::Any> aArgs( 1 );
                     aArgs[0] <<= m_xNextNodeOnSAXChain;
                     xInitialization->initialize(aArgs);
@@ -580,7 +580,7 @@ void XSecController::chainOff()
                     xParser->setDocumentHandler( m_xNextNodeOnSAXChain );
                 }
             }
-
+            
             if (m_xElementStackKeeper.is())
             {
                 /*
@@ -589,7 +589,7 @@ void XSecController::chainOff()
                  */
                 m_xElementStackKeeper->start();
             }
-
+            
             m_bIsSAXEventKeeperConnected = false;
         }
     }
@@ -599,30 +599,30 @@ void XSecController::checkChainingStatus()
 /****** XSecController/checkChainingStatus ************************************
  *
  *   NAME
- *  checkChainingStatus -- connects or disconnects the SAXEventKeeper
- *  according to the current situation.
+ *	checkChainingStatus -- connects or disconnects the SAXEventKeeper
+ *	according to the current situation.
  *
  *   SYNOPSIS
- *  checkChainingStatus( );
+ *	checkChainingStatus( );
  *
  *   FUNCTION
- *  The SAXEventKeeper is chained into the SAX chain, when:
- *  1. some element is being collected, or
- *  2. the SAX event stream is blocking.
- *  Otherwise, chain off the SAXEventKeeper.
+ *	The SAXEventKeeper is chained into the SAX chain, when:
+ *	1. some element is being collected, or
+ *	2. the SAX event stream is blocking.
+ *	Otherwise, chain off the SAXEventKeeper.
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     if ( m_bIsCollectingElement || m_bIsBlocking )
@@ -639,35 +639,35 @@ void XSecController::initializeSAXChain()
 /****** XSecController/initializeSAXChain *************************************
  *
  *   NAME
- *  initializeSAXChain -- initializes the SAX chain according to the
- *  current setting.
+ *	initializeSAXChain -- initializes the SAX chain according to the
+ *	current setting.
  *
  *   SYNOPSIS
- *  initializeSAXChain( );
+ *	initializeSAXChain( );
  *
  *   FUNCTION
- *  Initializes the SAX chain, if the SAXEventKeeper is asked to be always
- *  on the SAX chain, chains it on. Otherwise, starts the
- *  ElementStackKeeper to reserve key SAX events.
+ *	Initializes the SAX chain, if the SAXEventKeeper is asked to be always
+ *	on the SAX chain, chains it on. Otherwise, starts the 
+ *	ElementStackKeeper to reserve key SAX events.
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     m_bIsSAXEventKeeperConnected = false;
     m_bIsCollectingElement = false;
     m_bIsBlocking = false;
-
+    
     if (m_xElementStackKeeper.is())
     {
         /*
@@ -675,80 +675,80 @@ void XSecController::initializeSAXChain()
          */
         m_xElementStackKeeper->start();
     }
-
+    
     chainOff();
 }
 
-cssu::Reference< com::sun::star::io::XInputStream >
+cssu::Reference< com::sun::star::io::XInputStream > 
     XSecController::getObjectInputStream( const rtl::OUString& objectURL )
 /****** XSecController/getObjectInputStream ************************************
  *
  *   NAME
- *  getObjectInputStream -- get a XInputStream interface from a SvStorage
+ *	getObjectInputStream -- get a XInputStream interface from a SvStorage
  *
  *   SYNOPSIS
- *  xInputStream = getObjectInputStream( objectURL );
+ *	xInputStream = getObjectInputStream( objectURL );
  *
  *   FUNCTION
- *  See NAME.
+ *	See NAME.
  *
  *   INPUTS
- *  objectURL - the object uri
+ *	objectURL - the object uri
  *
  *   RESULT
- *  xInputStream - the XInputStream interface
+ *	xInputStream - the XInputStream interface
  *
  *   HISTORY
- *  15.04.2004 -    implemented
+ *	15.04.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
         cssu::Reference< com::sun::star::io::XInputStream > xObjectInputStream;
 
     DBG_ASSERT( m_xUriBinding.is(), "Need XUriBinding!" );
-
+    
     xObjectInputStream = m_xUriBinding->getUriBinding(objectURL);
-
+    
     return xObjectInputStream;
-}
+}	
 
 #if 0
 sal_Int32 XSecController::getFastPropertyIndex(sal_Int32 nHandle) const
 /****** XSecController/getFastPropertyIndex ***********************************
  *
  *   NAME
- *  getFastPropertyIndex -- gets the index of a particular fast property
+ *	getFastPropertyIndex -- gets the index of a particular fast property
  *
  *   SYNOPSIS
- *  nIndex = getFastPropertyIndex( nHandle );
+ *	nIndex = getFastPropertyIndex( nHandle );
  *
  *   FUNCTION
- *  See NAME.
+ *	See NAME.
  *
  *   INPUTS
- *  nHandle - the key for the fast property
+ *	nHandle - the key for the fast property
  *
  *   RESULT
- *  nIndex - the index of the fast property, or -1
- *           if the key is not found.
+ *	nIndex - the index of the fast property, or -1
+ *	         if the key is not found.
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     std::vector< sal_Int32 >::const_iterator ii = m_vFastPropertyIndexs.begin();
     sal_Int32 nIndex = 0;
-
+    
     bool bFound = false;
-
-    for( ; ii != m_vFastPropertyIndexs.end(); ++ii,++nIndex )
+            
+    for( ; ii != m_vFastPropertyIndexs.end(); ++ii,++nIndex ) 
     {
         if ( nHandle == (*ii))
         {
@@ -756,18 +756,18 @@ sal_Int32 XSecController::getFastPropertyIndex(sal_Int32 nHandle) const
             break;
         }
     }
-
+    
     if (!bFound)
     {
         nIndex = -1;
     }
-
+    
     return nIndex;
 }
 #endif
 
 /*
- * public methods
+ * public methods 
  */
 
 sal_Int32 XSecController::getNewSecurityId(  )
@@ -783,39 +783,39 @@ void XSecController::startMission(
 /****** XSecController/startMission *******************************************
  *
  *   NAME
- *  startMission -- starts a new security mission.
+ *	startMission -- starts a new security mission.
  *
  *   SYNOPSIS
- *  startMission( xUriBinding, xSecurityContect );
+ *	startMission( xUriBinding, xSecurityContect );
  *
  *   FUNCTION
- *  get ready for a new mission.
+ *	get ready for a new mission.
  *
  *   INPUTS
- *  xUriBinding       - the Uri binding that provide maps between uris and
+ *	xUriBinding       - the Uri binding that provide maps between uris and
  *                          XInputStreams
- *  xSecurityContext  - the security context component which can provide
- *                      cryptoken
+ *	xSecurityContext  - the security context component which can provide
+ *	                    cryptoken
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     m_xUriBinding = xUriBinding;
-
+    
     m_nStatusOfSecurityComponents = UNINITIALIZED;
     m_xSecurityContext = xSecurityContext;
     m_pErrorMessage = NULL;
 
     m_vInternalSignatureInformations.clear();
-
+    
     m_bVerifyCurrentSignature = false;
 }
 
@@ -826,32 +826,32 @@ void XSecController::setSAXChainConnector(
 /****** XSecController/setSAXChainConnector ***********************************
  *
  *   NAME
- *  setSAXChainConnector -- configures the components which will
- *  collaborate with the SAXEventKeeper on the SAX chain.
+ *	setSAXChainConnector -- configures the components which will
+ *	collaborate with the SAXEventKeeper on the SAX chain.
  *
  *   SYNOPSIS
- *  setSAXChainConnector( xInitialization,
- *                        xDocumentHandler,
- *                        xElementStackKeeper );
+ *	setSAXChainConnector( xInitialization, 
+ *	                      xDocumentHandler,
+ *	                      xElementStackKeeper );
  *
  *   FUNCTION
- *  See NAME.
+ *	See NAME.
  *
  *   INPUTS
- *  xInitialization     - the previous node on the SAX chain
- *  xDocumentHandler    - the next node on the SAX chain
- *  xElementStackKeeper - the ElementStackKeeper component which reserves
- *                        missed key SAX events for the SAXEventKeeper
+ *	xInitialization     - the previous node on the SAX chain
+ *	xDocumentHandler    - the next node on the SAX chain
+ *	xElementStackKeeper - the ElementStackKeeper component which reserves
+ *	                      missed key SAX events for the SAXEventKeeper
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     m_bIsPreviousNodeInitializable = true;
@@ -869,37 +869,37 @@ void XSecController::setSAXChainConnector(
 /****** XSecController/setSAXChainConnector ***********************************
  *
  *   NAME
- *  setSAXChainConnector -- configures the components which will
- *  collaborate with the SAXEventKeeper on the SAX chain.
+ *	setSAXChainConnector -- configures the components which will
+ *	collaborate with the SAXEventKeeper on the SAX chain.
  *
  *   SYNOPSIS
- *  setSAXChainConnector( xParser, xDocumentHandler, xElementStackKeeper );
+ *	setSAXChainConnector( xParser, xDocumentHandler, xElementStackKeeper );
  *
  *   FUNCTION
- *  See NAME.
+ *	See NAME.
  *
  *   INPUTS
- *  xParser             - the previous node on the SAX chain
- *  xDocumentHandler    - the next node on the SAX chain
- *  xElementStackKeeper -the ElementStackKeeper component which reserves
- *                        missed key SAX events for the SAXEventKeeper
+ *	xParser             - the previous node on the SAX chain
+ *	xDocumentHandler    - the next node on the SAX chain
+ *	xElementStackKeeper -the ElementStackKeeper component which reserves
+ *	                      missed key SAX events for the SAXEventKeeper
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     m_bIsPreviousNodeInitializable = false;
     m_xPreviousNodeOnSAXChain = xParser;
     m_xNextNodeOnSAXChain = xDocumentHandler;
     m_xElementStackKeeper = xElementStackKeeper;
-
+    
     initializeSAXChain( );
 }
 
@@ -907,26 +907,26 @@ void XSecController::clearSAXChainConnector()
 /****** XSecController/clearSAXChainConnector *********************************
  *
  *   NAME
- *  clearSAXChainConnector -- resets the collaborating components.
+ *	clearSAXChainConnector -- resets the collaborating components.
  *
  *   SYNOPSIS
- *  clearSAXChainConnector( );
+ *	clearSAXChainConnector( );
  *
  *   FUNCTION
- *  See NAME.
+ *	See NAME.
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     /*
@@ -940,7 +940,7 @@ void XSecController::clearSAXChainConnector()
         cssu::Reference< cssxs::XDocumentHandler > xSEKHandler(m_xSAXEventKeeper, cssu::UNO_QUERY);
         m_xElementStackKeeper->retrieve(xSEKHandler, sal_True);
     }
-
+    
     chainOff();
 
     m_xPreviousNodeOnSAXChain = NULL;
@@ -952,30 +952,30 @@ void XSecController::endMission()
 /****** XSecController/endMission *********************************************
  *
  *   NAME
- *  endMission -- forces to end all missions
+ *	endMission -- forces to end all missions
  *
  *   SYNOPSIS
- *  endMission( );
+ *	endMission( );
  *
  *   FUNCTION
- *  Deletes all signature information and forces all missions to an end.
+ *	Deletes all signature information and forces all missions to an end.
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     sal_Int32 size = m_vInternalSignatureInformations.size();
-
+    
     for (int i=0; i<size; ++i)
     {
         if ( m_nStatusOfSecurityComponents == INITIALIZED )
@@ -985,25 +985,25 @@ void XSecController::endMission()
         {
             cssu::Reference< cssxc::sax::XMissionTaker > xMissionTaker
                 ( m_vInternalSignatureInformations[i].xReferenceResolvedListener, cssu::UNO_QUERY );
-
+            
             /*
              * askes the SignatureCreator/SignatureVerifier to release
              * all resouces it uses.
-             */
+             */	
             xMissionTaker->endMission();
         }
     }
-
+    
     m_xUriBinding = NULL;
     m_xSecurityContext = NULL;
-
+    
     /*
      * free the status change listener reference to this object
      */
     if (m_xSAXEventKeeper.is())
     {
-        cssu::Reference<cssxc::sax::XSAXEventKeeperStatusChangeBroadcaster>
-            xSAXEventKeeperStatusChangeBroadcaster(m_xSAXEventKeeper, cssu::UNO_QUERY);
+        cssu::Reference<cssxc::sax::XSAXEventKeeperStatusChangeBroadcaster> 
+            xSAXEventKeeperStatusChangeBroadcaster(m_xSAXEventKeeper, cssu::UNO_QUERY); 
         xSAXEventKeeperStatusChangeBroadcaster
             ->addSAXEventKeeperStatusChangeListener( NULL );
     }
@@ -1013,26 +1013,26 @@ const char* XSecController::getErrorMessage()
 /****** XSecController/getErrorMessage ****************************************
  *
  *   NAME
- *  getErrorMessage -- get the last error message
+ *	getErrorMessage -- get the last error message
  *
  *   SYNOPSIS
- *  pErrorMessage = getErrorMessage( );
+ *	pErrorMessage = getErrorMessage( );
  *
  *   FUNCTION
- *  see NAME.
+ *	see NAME.
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  22.04.2004 -    implemented
+ *	22.04.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     return m_pErrorMessage;
@@ -1044,27 +1044,27 @@ void XSecController::exportSignature(
 /****** XSecController/exportSignature ****************************************
  *
  *   NAME
- *  exportSignature -- export a signature structure to an XDocumentHandler
+ *	exportSignature -- export a signature structure to an XDocumentHandler
  *
  *   SYNOPSIS
- *  exportSignature( xDocumentHandler, signatureInfo);
+ *	exportSignature( xDocumentHandler, signatureInfo);
  *
  *   FUNCTION
- *  see NAME.
+ *	see NAME.
  *
  *   INPUTS
- *  xDocumentHandler    - the document handler to receive the signature
- *  signatureInfo       - signature to be exported
+ *	xDocumentHandler    - the document handler to receive the signature
+ *	signatureInfo       - signature to be exported
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  26.05.2004 -    implemented
+ *	26.05.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     /*
@@ -1091,34 +1091,34 @@ void XSecController::exportSignature(
             rtl::OUString tag_SignatureProperties(RTL_CONSTASCII_USTRINGPARAM(TAG_SIGNATUREPROPERTIES));
                 rtl::OUString tag_SignatureProperty(RTL_CONSTASCII_USTRINGPARAM(TAG_SIGNATUREPROPERTY));
                     rtl::OUString tag_Date(RTL_CONSTASCII_USTRINGPARAM(TAG_DATE));
-#if 0
+#if 0				
                     rtl::OUString tag_Timestamp(RTL_CONSTASCII_USTRINGPARAM(TAG_TIMESTAMP));
                         rtl::OUString tag_Date(RTL_CONSTASCII_USTRINGPARAM(TAG_DATE));
                         rtl::OUString tag_Time(RTL_CONSTASCII_USTRINGPARAM(TAG_TIME));
 #endif
-
+    
     const SignatureReferenceInformations& vReferenceInfors = signatureInfo.vSignatureReferenceInfors;
     SvXMLAttributeList *pAttributeList;
 
     /*
-     * Write Signature element
+     * Write Signature element 
      */
     pAttributeList = new SvXMLAttributeList();
     pAttributeList->AddAttribute(
         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ATTR_XMLNS)),
         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(NS_XMLDSIG)));
-
+        
     if (signatureInfo.ouSignatureId.getLength()>0)
     {
         pAttributeList->AddAttribute(
             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ATTR_ID)),
             rtl::OUString(signatureInfo.ouSignatureId));
     }
-
+        
     xDocumentHandler->startElement( tag_Signature, cssu::Reference< cssxs::XAttributeList > (pAttributeList));
     {
         /* Write SignedInfo element */
-        xDocumentHandler->startElement(
+        xDocumentHandler->startElement( 
             tag_SignedInfo,
             cssu::Reference< cssxs::XAttributeList > (new SvXMLAttributeList()));
         {
@@ -1129,7 +1129,7 @@ void XSecController::exportSignature(
                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ALGO_C14N)));
             xDocumentHandler->startElement( tag_CanonicalizationMethod, cssu::Reference< cssxs::XAttributeList > (pAttributeList) );
             xDocumentHandler->endElement( tag_CanonicalizationMethod );
-
+            
             /* Write SignatureMethod element */
             pAttributeList = new SvXMLAttributeList();
             pAttributeList->AddAttribute(
@@ -1141,7 +1141,7 @@ void XSecController::exportSignature(
             /* Write Reference element */
             int j;
             int refNum = vReferenceInfors.size();
-
+            
             for(j=0; j<refNum; ++j)
             {
                 const SignatureReferenceInformation& refInfor = vReferenceInfors[j];
@@ -1165,7 +1165,7 @@ void XSecController::exportSignature(
                         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ATTR_URI)),
                         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CHAR_FRAGMENT))+refInfor.ouURI);
                 }
-
+                
                 xDocumentHandler->startElement( tag_Reference, cssu::Reference< cssxs::XAttributeList > (pAttributeList) );
                 {
                     /* Write Transforms element */
@@ -1182,24 +1182,24 @@ void XSecController::exportSignature(
                             pAttributeList->AddAttribute(
                                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ATTR_ALGORITHM)),
                                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ALGO_C14N)));
-                            xDocumentHandler->startElement(
+                            xDocumentHandler->startElement( 
                                 tag_Transform,
                                 cssu::Reference< cssxs::XAttributeList > (pAttributeList) );
                             xDocumentHandler->endElement( tag_Transform );
                         }
                         xDocumentHandler->endElement( tag_Transforms );
                     }
-
+                    
                     /* Write DigestMethod element */
                     pAttributeList = new SvXMLAttributeList();
                     pAttributeList->AddAttribute(
                         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ATTR_ALGORITHM)),
                         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ALGO_XMLDSIGSHA1)));
-                    xDocumentHandler->startElement(
+                    xDocumentHandler->startElement( 
                         tag_DigestMethod,
                         cssu::Reference< cssxs::XAttributeList > (pAttributeList) );
                     xDocumentHandler->endElement( tag_DigestMethod );
-
+                    
                     /* Write DigestValue element */
                     xDocumentHandler->startElement(
                         tag_DigestValue,
@@ -1211,49 +1211,49 @@ void XSecController::exportSignature(
             }
         }
         xDocumentHandler->endElement( tag_SignedInfo );
-
+        
         /* Write SignatureValue element */
-        xDocumentHandler->startElement(
+        xDocumentHandler->startElement( 
             tag_SignatureValue,
             cssu::Reference< cssxs::XAttributeList > (new SvXMLAttributeList()));
         xDocumentHandler->characters( signatureInfo.ouSignatureValue );
         xDocumentHandler->endElement( tag_SignatureValue );
-
+        
         /* Write KeyInfo element */
-        xDocumentHandler->startElement(
+        xDocumentHandler->startElement( 
             tag_KeyInfo,
             cssu::Reference< cssxs::XAttributeList > (new SvXMLAttributeList()));
         {
             /* Write X509Data element */
-            xDocumentHandler->startElement(
+            xDocumentHandler->startElement( 
                 tag_X509Data,
                 cssu::Reference< cssxs::XAttributeList > (new SvXMLAttributeList()));
             {
                 /* Write X509IssuerSerial element */
-                xDocumentHandler->startElement(
+                xDocumentHandler->startElement( 
                     tag_X509IssuerSerial,
                     cssu::Reference< cssxs::XAttributeList > (new SvXMLAttributeList()));
                 {
                     /* Write X509IssuerName element */
-                    xDocumentHandler->startElement(
+                    xDocumentHandler->startElement( 
                         tag_X509IssuerName,
                         cssu::Reference< cssxs::XAttributeList > (new SvXMLAttributeList()));
                     xDocumentHandler->characters( signatureInfo.ouX509IssuerName );
                     xDocumentHandler->endElement( tag_X509IssuerName );
-
+                    
                     /* Write X509SerialNumber element */
-                    xDocumentHandler->startElement(
+                    xDocumentHandler->startElement( 
                         tag_X509SerialNumber,
                         cssu::Reference< cssxs::XAttributeList > (new SvXMLAttributeList()));
                     xDocumentHandler->characters( signatureInfo.ouX509SerialNumber );
                     xDocumentHandler->endElement( tag_X509SerialNumber );
                 }
                 xDocumentHandler->endElement( tag_X509IssuerSerial );
-
+                
                 /* Write X509Certificate element */
                 if (signatureInfo.ouX509Certificate.getLength()>0)
                 {
-                    xDocumentHandler->startElement(
+                    xDocumentHandler->startElement( 
                         tag_X509Certificate,
                         cssu::Reference< cssxs::XAttributeList > (new SvXMLAttributeList()));
                     xDocumentHandler->characters( signatureInfo.ouX509Certificate );
@@ -1263,14 +1263,14 @@ void XSecController::exportSignature(
             xDocumentHandler->endElement( tag_X509Data );
         }
         xDocumentHandler->endElement( tag_KeyInfo );
-
+        
         /* Write Object element */
-        xDocumentHandler->startElement(
+        xDocumentHandler->startElement( 
             tag_Object,
             cssu::Reference< cssxs::XAttributeList > (new SvXMLAttributeList()));
         {
             /* Write SignatureProperties element */
-            xDocumentHandler->startElement(
+            xDocumentHandler->startElement( 
                 tag_SignatureProperties,
                 cssu::Reference< cssxs::XAttributeList > (new SvXMLAttributeList()));
             {
@@ -1282,12 +1282,12 @@ void XSecController::exportSignature(
                 pAttributeList->AddAttribute(
                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ATTR_TARGET)),
                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CHAR_FRAGMENT))+signatureInfo.ouSignatureId);
-                xDocumentHandler->startElement(
+                xDocumentHandler->startElement( 
                     tag_SignatureProperty,
                     cssu::Reference< cssxs::XAttributeList > (pAttributeList));
                 {
                     /* Write timestamp element */
-
+                    
                     pAttributeList = new SvXMLAttributeList();
                     pAttributeList->AddAttribute(
                         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ATTR_XMLNS))
@@ -1295,16 +1295,16 @@ void XSecController::exportSignature(
                             +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(NSTAG_DC)),
                         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(NS_DC)));
 
-                    xDocumentHandler->startElement(
+                    xDocumentHandler->startElement( 
                         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(NSTAG_DC))
                             +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":"))
                             +tag_Date,
                         cssu::Reference< cssxs::XAttributeList > (pAttributeList));
-
+                        
                     ::rtl::OUStringBuffer buffer;
-                    //If the xml signature was already contained in the document,
-                    //then we use the original date and time string, rather then the
-                    //converted one. When the original string is converted to the DateTime
+                    //If the xml signature was already contained in the document, 
+                    //then we use the original date and time string, rather then the 
+                    //converted one. When the original string is converted to the DateTime 
                     //structure then information may be lost because it only holds a fractional
                     //of a second with a accuracy of one hundredth of second. If the string contains
                     //milli seconds (document was signed by an application other than OOo)
@@ -1316,7 +1316,7 @@ void XSecController::exportSignature(
                         convertDateTime( buffer, signatureInfo.stDateTime );
                     xDocumentHandler->characters( buffer.makeStringAndClear() );
 
-                    xDocumentHandler->endElement(
+                    xDocumentHandler->endElement( 
                         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(NSTAG_DC))
                             +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":"))
                             +tag_Date);
@@ -1326,7 +1326,7 @@ void XSecController::exportSignature(
             xDocumentHandler->endElement( tag_SignatureProperties );
         }
         xDocumentHandler->endElement( tag_Object );
-    }
+    }		
     xDocumentHandler->endElement( tag_Signature );
 }
 
@@ -1346,13 +1346,13 @@ SignatureInformations XSecController::getSignatureInformations() const
 {
     SignatureInformations vInfors;
     int sigNum = m_vInternalSignatureInformations.size();
-
+        
     for (int i=0; i<sigNum; ++i)
     {
         SignatureInformation si = m_vInternalSignatureInformations[i].signatureInfor;
         vInfors.push_back(si);
     }
-
+    
     return vInfors;
 }
 
@@ -1363,13 +1363,13 @@ SignatureInformations XSecController::getSignatureInformations() const
  */
 
 /*
- * XFastPropertySet
+ * XFastPropertySet 
  */
 /*
 void SAL_CALL XSecController::setFastPropertyValue(
     sal_Int32 nHandle,
     const cssu::Any& aValue )
-    throw ( cssb::UnknownPropertyException,
+    throw (	cssb::UnknownPropertyException,
         cssb::PropertyVetoException,
         cssl::IllegalArgumentException,
         cssl::WrappedTargetException,
@@ -1386,7 +1386,7 @@ void SAL_CALL XSecController::setFastPropertyValue(
         m_vFastPropertyValues[nIndex] = aValue;
     }
 }
-
+    
 cssu::Any SAL_CALL XSecController::getFastPropertyValue(
     sal_Int32 nHandle )
     throw (
@@ -1401,7 +1401,7 @@ cssu::Any SAL_CALL XSecController::getFastPropertyValue(
     {
         aValue = m_vFastPropertyValues[nIndex];
     }
-
+    
     return aValue;
 }
 */
@@ -1409,7 +1409,7 @@ cssu::Any SAL_CALL XSecController::getFastPropertyValue(
 /*
  * XSAXEventKeeperStatusChangeListener
  */
-
+ 
 void SAL_CALL XSecController::blockingStatusChanged( sal_Bool isBlocking )
     throw (cssu::RuntimeException)
 {
@@ -1423,18 +1423,18 @@ void SAL_CALL XSecController::blockingStatusChanged( sal_Bool isBlocking )
     this->m_bIsBlocking = isBlocking;
     checkChainingStatus();
 }
-
-void SAL_CALL XSecController::collectionStatusChanged(
+    
+void SAL_CALL XSecController::collectionStatusChanged( 
     sal_Bool isInsideCollectedElement )
     throw (cssu::RuntimeException)
 {
     /*
-    showMessageBox( rtl::OUString::createFromAscii((isInsideCollectedElement?
+    showMessageBox(	rtl::OUString::createFromAscii((isInsideCollectedElement?
                         "Collection Status => TRUE":
                         "Collection Status => FALSE")),
             rtl::OUString::createFromAscii("SAXEventKeeper Status"));
     */
-
+        
     this->m_bIsCollectingElement = isInsideCollectedElement;
     checkChainingStatus();
 }
@@ -1443,7 +1443,7 @@ void SAL_CALL XSecController::bufferStatusChanged( sal_Bool /*isBufferEmpty*/)
     throw (cssu::RuntimeException)
 {
     /*
-    showMessageBox( rtl::OUString::createFromAscii((isBufferEmpty?
+    showMessageBox(	rtl::OUString::createFromAscii((isBufferEmpty?
                         "Buffer Empty => TRUE":
                         "Buffer Empty => FALSE")),
             rtl::OUString::createFromAscii("SAXEventKeeper Status"));
@@ -1460,7 +1460,7 @@ void SAL_CALL XSecController::signatureCreated( sal_Int32 securityId, com::sun::
     DBG_ASSERT( index != -1, "Signature Not Found!" );
 
     SignatureInformation& signatureInfor = m_vInternalSignatureInformations[index].signatureInfor;
-
+    
     /*
     if (nResult == cssxc::sax::SignatureCreationResult_CREATIONSUCCEED)
     {
@@ -1469,7 +1469,7 @@ void SAL_CALL XSecController::signatureCreated( sal_Int32 securityId, com::sun::
     else
     {
         signatureInfor.nStatus = STATUS_CREATION_FAIL;
-    }
+    } 
     */
     signatureInfor.nStatus = nResult;
 }
@@ -1484,7 +1484,7 @@ void SAL_CALL XSecController::signatureVerified( sal_Int32 securityId, com::sun:
     DBG_ASSERT( index != -1, "Signature Not Found!" );
 
     SignatureInformation& signatureInfor = m_vInternalSignatureInformations[index].signatureInfor;
-
+    
     /*
     if (nResult == cssxc::sax::SignatureVerifyResult_VERIFYSUCCEED)
     {
diff --git a/xmlsecurity/source/helper/xsecctl.hxx b/xmlsecurity/source/helper/xsecctl.hxx
index 5fafb4c51fa9..73d6e0d198a0 100644
--- a/xmlsecurity/source/helper/xsecctl.hxx
+++ b/xmlsecurity/source/helper/xsecctl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,49 +70,49 @@
 /*
  * all stringS in signature element
  */
-#define TAG_SIGNATURE           "Signature"
-#define TAG_SIGNEDINFO          "SignedInfo"
-#define TAG_CANONICALIZATIONMETHOD  "CanonicalizationMethod"
-#define TAG_SIGNATUREMETHOD     "SignatureMethod"
-#define TAG_REFERENCE           "Reference"
-#define TAG_TRANSFORMS          "Transforms"
-#define TAG_TRANSFORM           "Transform"
-#define TAG_DIGESTMETHOD        "DigestMethod"
-#define TAG_DIGESTVALUE         "DigestValue"
-#define TAG_SIGNATUREVALUE      "SignatureValue"
-#define TAG_KEYINFO         "KeyInfo"
-#define TAG_X509DATA            "X509Data"
-#define TAG_X509ISSUERSERIAL        "X509IssuerSerial"
-#define TAG_X509ISSUERNAME      "X509IssuerName"
-#define TAG_X509SERIALNUMBER        "X509SerialNumber"
-#define TAG_X509CERTIFICATE     "X509Certificate"
-#define TAG_OBJECT          "Object"
-#define TAG_SIGNATUREPROPERTIES     "SignatureProperties"
-#define TAG_SIGNATUREPROPERTY       "SignatureProperty"
-#define TAG_TIMESTAMP           "timestamp"
-#define TAG_DATE            "date"
-//#define TAG_TIME          "time"
-
-#define ATTR_XMLNS          "xmlns"
-#define ATTR_ALGORITHM          "Algorithm"
-#define ATTR_URI            "URI"
-#define ATTR_ID             "Id"
-#define ATTR_TARGET         "Target"
-
-#define NSTAG_DC            "dc"
-
-#define NS_XMLDSIG          "http://www.w3.org/2000/09/xmldsig#"
-//#define NS_DATETIME           "http://www.ietf.org/rfcXXXX.txt"
-#define NS_DC               "http://purl.org/dc/elements/1.1/"
-
-#define ALGO_C14N           "http://www.w3.org/TR/2001/REC-xml-c14n-20010315"
-#define ALGO_RSASHA1            "http://www.w3.org/2000/09/xmldsig#rsa-sha1"
-#define ALGO_XMLDSIGSHA1        "http://www.w3.org/2000/09/xmldsig#sha1"
-
-#define CHAR_FRAGMENT           "#"
-#define CHAR_BLANK          " "
-
-
+#define TAG_SIGNATURE			"Signature"
+#define TAG_SIGNEDINFO			"SignedInfo"
+#define TAG_CANONICALIZATIONMETHOD	"CanonicalizationMethod"
+#define TAG_SIGNATUREMETHOD		"SignatureMethod"
+#define TAG_REFERENCE			"Reference"
+#define TAG_TRANSFORMS			"Transforms"
+#define TAG_TRANSFORM			"Transform"
+#define TAG_DIGESTMETHOD		"DigestMethod"
+#define TAG_DIGESTVALUE			"DigestValue"
+#define TAG_SIGNATUREVALUE		"SignatureValue"
+#define TAG_KEYINFO			"KeyInfo"
+#define TAG_X509DATA			"X509Data"
+#define TAG_X509ISSUERSERIAL		"X509IssuerSerial"
+#define TAG_X509ISSUERNAME		"X509IssuerName"
+#define TAG_X509SERIALNUMBER		"X509SerialNumber"
+#define TAG_X509CERTIFICATE		"X509Certificate"
+#define TAG_OBJECT			"Object"
+#define TAG_SIGNATUREPROPERTIES		"SignatureProperties"
+#define TAG_SIGNATUREPROPERTY		"SignatureProperty"
+#define TAG_TIMESTAMP			"timestamp"
+#define TAG_DATE			"date"
+//#define TAG_TIME			"time"
+
+#define ATTR_XMLNS			"xmlns"
+#define ATTR_ALGORITHM			"Algorithm"
+#define ATTR_URI			"URI"
+#define ATTR_ID				"Id"
+#define ATTR_TARGET			"Target"
+
+#define NSTAG_DC			"dc"
+
+#define NS_XMLDSIG			"http://www.w3.org/2000/09/xmldsig#"
+//#define NS_DATETIME			"http://www.ietf.org/rfcXXXX.txt"
+#define NS_DC				"http://purl.org/dc/elements/1.1/"
+
+#define ALGO_C14N			"http://www.w3.org/TR/2001/REC-xml-c14n-20010315"
+#define ALGO_RSASHA1			"http://www.w3.org/2000/09/xmldsig#rsa-sha1"
+#define ALGO_XMLDSIGSHA1		"http://www.w3.org/2000/09/xmldsig#sha1"
+
+#define CHAR_FRAGMENT			"#"
+#define CHAR_BLANK			" "
+
+ 
 /*
  * status of security related components
  */
@@ -129,22 +129,22 @@ class InternalSignatureInformation
 {
 public:
     SignatureInformation signatureInfor;
-
+    
     com::sun::star::uno::Reference<
-        com::sun::star::xml::crypto::sax::XReferenceResolvedListener >
+        com::sun::star::xml::crypto::sax::XReferenceResolvedListener > 
         xReferenceResolvedListener;
-
+        
     ::std::vector< sal_Int32 > vKeeperIds;
-
+    
     InternalSignatureInformation(
-        sal_Int32 nId,
+        sal_Int32 nId, 
         com::sun::star::uno::Reference< com::sun::star::xml::crypto::sax::XReferenceResolvedListener >
             xListener)
         :signatureInfor(nId)
     {
         xReferenceResolvedListener = xListener;
     }
-
+    
     void addReference( sal_Int32 type, rtl::OUString uri, sal_Int32 keeperId )
     {
         signatureInfor.vSignatureReferenceInfors.push_back(
@@ -155,62 +155,62 @@ public:
 
 typedef ::std::vector< InternalSignatureInformation > InternalSignatureInformations;
 
-class XSecController : public cppu::WeakImplHelper4
-<
+class XSecController : public cppu::WeakImplHelper4 
+< 
     com::sun::star::xml::crypto::sax::XSecurityController,
     //com::sun::star::beans::XFastPropertySet,
     com::sun::star::xml::crypto::sax::XSAXEventKeeperStatusChangeListener,
     com::sun::star::xml::crypto::sax::XSignatureCreationResultListener,
-    com::sun::star::xml::crypto::sax::XSignatureVerifyResultListener
+    com::sun::star::xml::crypto::sax::XSignatureVerifyResultListener	
 >
 /****** XSecController.hxx/CLASS XSecController *******************************
  *
  *   NAME
- *  XSecController -- the xml security framework controller
+ *	XSecController -- the xml security framework controller
  *
  *   FUNCTION
- *  Controlls the whole xml security framework to create signatures or to
- *  verify signatures.
+ *	Controlls the whole xml security framework to create signatures or to
+ *	verify signatures.
  *
  *   HISTORY
- *  05.01.2004 -    Interface supported: XSecurityController,
- *          XFastPropertySet, XSAXEventKeeperStatusChangeListener,
- *                  XSignatureCreationResultListener,
- *                  XSignatureVerifyResultListener
+ *	05.01.2004 -	Interface supported: XSecurityController,
+ * 			XFastPropertySet, XSAXEventKeeperStatusChangeListener,
+ *	            	XSignatureCreationResultListener,
+ *	            	XSignatureVerifyResultListener
  *
  *   NOTES
- *  The XFastPropertySet interface is used to transfer common values to
- *  classes in other module, for instance, the signature id for all
- *  sessions is transferred to xmloff module through this interface.
+ *	The XFastPropertySet interface is used to transfer common values to 
+ *	classes in other module, for instance, the signature id for all
+ *	sessions is transferred to xmloff module through this interface.
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     friend class XSecParser;
 
 private:
     com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext> mxCtx;
-
+    
     /*
      * used to buffer SAX events
      */
-    com::sun::star::uno::Reference<
+    com::sun::star::uno::Reference< 
         com::sun::star::xml::wrapper::XXMLDocumentWrapper > m_xXMLDocumentWrapper;
-
+    
     /*
      * the SAX events keeper
      */
-    com::sun::star::uno::Reference<
+    com::sun::star::uno::Reference< 
         com::sun::star::xml::crypto::sax::XSecuritySAXEventKeeper > m_xSAXEventKeeper;
-
+        
     /*
      * the bridge component which creates/verifies signature
      */
-    com::sun::star::uno::Reference<
+    com::sun::star::uno::Reference< 
         com::sun::star::xml::crypto::XXMLSignature > m_xXMLSignature;
-
+    
     /*
      * the Security Context
      */
@@ -228,8 +228,8 @@ private:
      */
     com::sun::star::uno::Reference<
         com::sun::star::xml::crypto::sax::XSignatureVerifyResultListener > m_xSignatureVerifyResultListener;
-#endif
-
+#endif		
+    
     /*
      * the security id incrementer, in order to make any security id unique
      * to the SAXEventKeeper.
@@ -242,7 +242,7 @@ private:
      * Signature information
      */
     InternalSignatureInformations m_vInternalSignatureInformations;
-
+    
     /*
      * the previous node on the SAX chain.
      * The reason that use a Reference<XInterface> type variable
@@ -250,22 +250,22 @@ private:
      * and importing, and there is no other common interface they
      * can provided.
      */
-    com::sun::star::uno::Reference<
+    com::sun::star::uno::Reference< 
         com::sun::star::uno::XInterface > m_xPreviousNodeOnSAXChain;
     /*
-     * whether the preivous node can provide an XInitiazlize interface,
-     * use this variable in order to typecast the XInterface to the
+     * whether the preivous node can provide an XInitiazlize interface, 
+     * use this variable in order to typecast the XInterface to the 
      * correct interface type.
      */
     bool m_bIsPreviousNodeInitializable;
-
+        
     /*
      * the next node on the SAX chain.
      * it can always provide an XDocumentHandler interface.
      */
-    com::sun::star::uno::Reference<
+    com::sun::star::uno::Reference< 
         com::sun::star::xml::sax::XDocumentHandler > m_xNextNodeOnSAXChain;
-
+        
     /*
      * the ElementStackKeeper is used to reserve the key SAX events.
      * when the SAXEventKeeper is chained on the SAX chain, it need
@@ -282,7 +282,7 @@ private:
      *     <A>
      *      <B/>
      *      <C>
-     *       <D>
+     *       <D> 
      *        <E/>
      *       </D>
      *      </C>
@@ -290,7 +290,7 @@ private:
      *
      * If we consider the SAX event section from startElement(<A>) to
      * startElement(<D>), then the key SAX events are:
-     *
+     * 
      *    startElement(<A>), startElement(<C>), startElement(<D>)
      *
      * The startElement(<B>) and endElement(<B>) is ignored, because
@@ -299,38 +299,38 @@ private:
      * If we consider the SAX event section from startElement(<D>) to
      * endElement(<A>), the key SAX events are:
      *
-     *    startElement(<D>), endElement(<D>), endElement(<C>),
+     *    startElement(<D>), endElement(<D>), endElement(<C>), 
      *    endElement(<A>).
-     */
-    com::sun::star::uno::Reference<
+     */ 
+    com::sun::star::uno::Reference< 
         com::sun::star::xml::crypto::sax::XElementStackKeeper > m_xElementStackKeeper;
-
+    
     /*
      * a flag representing whether the SAXEventKeeper is now on the
      * SAX chain.
      */
     bool m_bIsSAXEventKeeperConnected;
-
+    
     /*
-     * a flag representing whether it is collecting some element,
+     * a flag representing whether it is collecting some element, 
      * which means that the SAXEventKeeper can't be chained off the
      * SAX chain.
      */
     bool m_bIsCollectingElement;
-
+    
     /*
      * a flag representing whether the SAX event stream is blocking,
      * which also means that the SAXEventKeeper can't be chained off
      * the SAX chain.
      */
     bool m_bIsBlocking;
-
+    
     /*
      * a flag representing the current status of security related
      * components.
      */
     sal_Int32 m_nStatusOfSecurityComponents;
-
+    
     /*
      * a flag representing whether the SAXEventKeeper need to be
      * on the SAX chain all the time.
@@ -348,12 +348,12 @@ private:
       * error message pointer
       */
     const char *m_pErrorMessage;
-
+    
     /*
      * the XSecParser which is used to parse the signature stream
      */
     XSecParser *m_pXSecParser;
-
+    
     /*
      * the caller assigned signature id for the next signature in the
      * signature stream
@@ -364,7 +364,7 @@ private:
      * representing whether to verify the current signature
      */
     bool m_bVerifyCurrentSignature;
-public:
+public: 
     /*
      * An xUriBinding is provided to map Uris to XInputStream interfaces.
      */
@@ -379,7 +379,7 @@ private:
     sal_Bool convertNumber( sal_Int32& rValue, const rtl::OUString& rString, sal_Int32 nMin, sal_Int32 nMax );
     void convertDateTime( ::rtl::OUStringBuffer& rBuffer, const com::sun::star::util::DateTime& rDateTime );
     sal_Bool convertDateTime( com::sun::star::util::DateTime& rDateTime, const ::rtl::OUString& rString );
-
+     
     void createXSecComponent( );
     int findSignatureInfor( sal_Int32 nSecurityId ) const;
     bool chainOn( bool bRetrievingLastEvent );
@@ -389,7 +389,7 @@ private:
 
     com::sun::star::uno::Reference<
         com::sun::star::io::XInputStream > getObjectInputStream( const rtl::OUString& objectURL );
-
+        
         //sal_Int32 getFastPropertyIndex(sal_Int32 nHandle) const;
 
     /*
@@ -399,7 +399,7 @@ private:
     com::sun::star::uno::Reference<
         com::sun::star::xml::crypto::sax::XReferenceResolvedListener > prepareSignatureToWrite(
         InternalSignatureInformation& signatureInfo );
-
+        
     /*
      * For signature verification
      */
@@ -409,47 +409,47 @@ private:
         const rtl::OUString& ouUri,
         bool isBinary );
     void setReferenceCount() const;
-
+    
     void setX509IssuerName( rtl::OUString& ouX509IssuerName );
     void setX509SerialNumber( rtl::OUString& ouX509SerialNumber );
     void setX509Certificate( rtl::OUString& ouX509Certificate );
     void setSignatureValue( rtl::OUString& ouSignatureValue );
     void setDigestValue( rtl::OUString& ouDigestValue );
-
+    
     void setDate( rtl::OUString& ouDate );
 
     void setId( rtl::OUString& ouId );
     void setPropertyId( rtl::OUString& ouPropertyId );
-
-    com::sun::star::uno::Reference<
+    
+    com::sun::star::uno::Reference< 
         com::sun::star::xml::crypto::sax::XReferenceResolvedListener > prepareSignatureToRead(
         sal_Int32 nSecurityId );
-
+        
 public:
     XSecController(const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& rxCtx);
     ~XSecController();
-
+    
     sal_Int32 getNewSecurityId(  );
 
-    void startMission( const com::sun::star::uno::Reference<
+    void startMission( const com::sun::star::uno::Reference< 
         com::sun::star::xml::crypto::XUriBinding >& xUriBinding,
         const com::sun::star::uno::Reference<
             com::sun::star::xml::crypto::XXMLSecurityContext >& xSecurityContext );
-
+        
     void setSAXChainConnector(
-        const com::sun::star::uno::Reference<
+        const com::sun::star::uno::Reference< 
             com::sun::star::lang::XInitialization >& xInitialization,
-        const com::sun::star::uno::Reference<
+        const com::sun::star::uno::Reference< 
             com::sun::star::xml::sax::XDocumentHandler >& xDocumentHandler,
-        const com::sun::star::uno::Reference<
+        const com::sun::star::uno::Reference< 
             com::sun::star::xml::crypto::sax::XElementStackKeeper >& xElementStackKeeper);
 
     void setSAXChainConnector(
-        const com::sun::star::uno::Reference<
+        const com::sun::star::uno::Reference< 
             com::sun::star::xml::sax::XParser >& xParser,
-        const com::sun::star::uno::Reference<
+        const com::sun::star::uno::Reference< 
             com::sun::star::xml::sax::XDocumentHandler >& xDocumentHandler,
-        const com::sun::star::uno::Reference<
+        const com::sun::star::uno::Reference< 
             com::sun::star::xml::crypto::sax::XElementStackKeeper >& xElementStackKeeper);
 
     void clearSAXChainConnector();
@@ -458,13 +458,13 @@ public:
 
     SignatureInformation    getSignatureInformation( sal_Int32 nSecurityId ) const;
     SignatureInformations   getSignatureInformations() const;
-
+    
     void exportSignature(
-        const com::sun::star::uno::Reference<
+        const com::sun::star::uno::Reference< 
             com::sun::star::xml::sax::XDocumentHandler >& xDocumentHandler,
         const SignatureInformation& signatureInfo );
 
-
+    
     /*
      * For signature generation
      */
@@ -495,10 +495,10 @@ public:
         const rtl::OUString& ouX509IssuerName,
         const rtl::OUString& ouX509SerialNumber,
         const rtl::OUString& ouX509Cert);
-    // see the other setX509Certifcate function
+    // see the other setX509Certifcate function    
     void setX509Certificate(
         sal_Int32 nSecurityId,
-        const sal_Int32 nSecurityEnvironmentIndex,
+        const sal_Int32	nSecurityEnvironmentIndex,
         const rtl::OUString& ouX509IssuerName,
         const rtl::OUString& ouX509SerialNumber,
         const rtl::OUString& ouX509Cert);
@@ -506,12 +506,12 @@ public:
     void setDate(
         sal_Int32 nSecurityId,
         const ::com::sun::star::util::DateTime& rDateTime );
-
-
+        
+        
     bool WriteSignature(
-        const com::sun::star::uno::Reference<
+        const com::sun::star::uno::Reference< 
             com::sun::star::xml::sax::XDocumentHandler >& xDocumentHandler );
-
+        
     /*
      * For signature verification
      */
@@ -555,7 +555,7 @@ public:
      */
     virtual void SAL_CALL blockingStatusChanged( sal_Bool isBlocking )
         throw (com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL collectionStatusChanged(
+    virtual void SAL_CALL collectionStatusChanged( 
         sal_Bool isInsideCollectedElement )
         throw (com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL bufferStatusChanged( sal_Bool isBufferEmpty )
@@ -574,7 +574,7 @@ public:
         throw (com::sun::star::uno::RuntimeException);
 };
 
-#endif
-
+#endif	
+    
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/helper/xsecparser.cxx b/xmlsecurity/source/helper/xsecparser.cxx
index 8d9b84132712..57b559e691db 100644
--- a/xmlsecurity/source/helper/xsecparser.cxx
+++ b/xmlsecurity/source/helper/xsecparser.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ rtl::OUString XSecParser::getIdAttr(const cssu::Reference< cssxs::XAttributeList
 {
     rtl::OUString ouIdAttr = xAttribs->getValueByName(
         rtl::OUString(RTL_ASCII_USTRINGPARAM("id")));
-
-    if (ouIdAttr == NULL)
+        
+    if (ouIdAttr == NULL) 
     {
         ouIdAttr = xAttribs->getValueByName(
             rtl::OUString(RTL_ASCII_USTRINGPARAM("Id")));
     }
-
+    
     return ouIdAttr;
 }
 
 /*
- * XDocumentHandler
+ * XDocumentHandler 
  */
 void SAL_CALL XSecParser::startDocument(  )
     throw (cssxs::SAXException, cssu::RuntimeException)
@@ -76,13 +76,13 @@ void SAL_CALL XSecParser::startDocument(  )
     m_bInDigestValue = false;
     m_bInDate = false;
     //m_bInTime = false;
-
+    
     if (m_xNextHandler.is())
     {
         m_xNextHandler->startDocument();
     }
 }
-
+    
 void SAL_CALL XSecParser::endDocument(  )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
@@ -104,7 +104,7 @@ void SAL_CALL XSecParser::startElement(
         {
             m_pXSecController->collectToVerify( ouIdAttr );
         }
-
+        
         if ( aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_SIGNATURE)) )
         {
             m_pXSecController->addSignature();
@@ -117,7 +117,7 @@ void SAL_CALL XSecParser::startElement(
         {
             rtl::OUString ouUri = xAttribs->getValueByName(rtl::OUString(RTL_ASCII_USTRINGPARAM(ATTR_URI)));
             DBG_ASSERT( ouUri != NULL, "URI == NULL" );
-
+            
             if (0 == ouUri.compareTo(rtl::OUString(RTL_ASCII_USTRINGPARAM(CHAR_FRAGMENT)),1))
             {
                 /*
@@ -139,7 +139,7 @@ void SAL_CALL XSecParser::startElement(
             if ( m_bReferenceUnresolved )
             {
                 rtl::OUString ouAlgorithm = xAttribs->getValueByName(rtl::OUString(RTL_ASCII_USTRINGPARAM(ATTR_ALGORITHM)));
-
+                
                 if (ouAlgorithm != NULL && ouAlgorithm == rtl::OUString(RTL_ASCII_USTRINGPARAM(ALGO_C14N)))
                 /*
                 * a xml stream
@@ -196,7 +196,7 @@ void SAL_CALL XSecParser::startElement(
                 m_bInTime = true;
             }
             */
-
+            
         if (m_xNextHandler.is())
         {
             m_xNextHandler->startElement(aName, xAttribs);
@@ -217,11 +217,11 @@ void SAL_CALL XSecParser::startElement(
             cssu::Any());
     }
 }
-
-void SAL_CALL XSecParser::endElement( const rtl::OUString& aName )
+    
+void SAL_CALL XSecParser::endElement( const rtl::OUString& aName ) 
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
-    try
+    try 
     {
         if (aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_DIGESTVALUE)))
             {
@@ -237,7 +237,7 @@ void SAL_CALL XSecParser::endElement( const rtl::OUString& aName )
                 m_pXSecController->addStreamReference( m_currentReferenceURI, sal_True);
                 m_bReferenceUnresolved = false;
             }
-
+            
             m_pXSecController->setDigestValue( m_ouDigestValue );
         }
         else if ( aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_SIGNEDINFO)) )
@@ -299,7 +299,7 @@ void SAL_CALL XSecParser::endElement( const rtl::OUString& aName )
             cssu::Any());
     }
 }
-
+    
 void SAL_CALL XSecParser::characters( const rtl::OUString& aChars )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
@@ -331,15 +331,15 @@ void SAL_CALL XSecParser::characters( const rtl::OUString& aChars )
     else if (m_bInTime)
     {
         m_ouTime += aChars;
-    }
+    } 
     */
-
+    
     if (m_xNextHandler.is())
     {
         m_xNextHandler->characters(aChars);
         }
 }
-
+    
 void SAL_CALL XSecParser::ignorableWhitespace( const rtl::OUString& aWhitespaces )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
@@ -348,7 +348,7 @@ void SAL_CALL XSecParser::ignorableWhitespace( const rtl::OUString& aWhitespaces
         m_xNextHandler->ignorableWhitespace( aWhitespaces );
         }
 }
-
+    
 void SAL_CALL XSecParser::processingInstruction( const rtl::OUString& aTarget, const rtl::OUString& aData )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
@@ -357,7 +357,7 @@ void SAL_CALL XSecParser::processingInstruction( const rtl::OUString& aTarget, c
         m_xNextHandler->processingInstruction(aTarget, aData);
         }
 }
-
+    
 void SAL_CALL XSecParser::setDocumentLocator( const cssu::Reference< cssxs::XLocator >& xLocator )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
diff --git a/xmlsecurity/source/helper/xsecparser.hxx b/xmlsecurity/source/helper/xsecparser.hxx
index 3cfb033be534..931f098ae5b9 100644
--- a/xmlsecurity/source/helper/xsecparser.hxx
+++ b/xmlsecurity/source/helper/xsecparser.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,30 +38,30 @@
 
 #include <cppuhelper/implbase2.hxx>
 
-class XSecParser: public cppu::WeakImplHelper2
-<
+class XSecParser: public cppu::WeakImplHelper2 
+< 
     com::sun::star::xml::sax::XDocumentHandler,
     com::sun::star::lang::XInitialization
 >
 /****** XSecController.hxx/CLASS XSecParser ***********************************
  *
  *   NAME
- *  XSecParser -- a SAX parser that can detect security elements
+ *	XSecParser -- a SAX parser that can detect security elements
  *
  *   FUNCTION
- *  The XSecParser object is connected on the SAX chain and detects
- *  security elements in the SAX event stream, then notifies
- *  the XSecController.
+ *	The XSecParser object is connected on the SAX chain and detects 
+ *	security elements in the SAX event stream, then notifies
+ *	the XSecController.
  *
  *   HISTORY
- *  05.01.2004 -    Interface supported: XDocumentHandler, XInitialization
+ *	05.01.2004 -	Interface supported: XDocumentHandler, XInitialization
  *
  *   NOTES
- *  This class is used when importing a document.
+ *	This class is used when importing a document.
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     friend class XSecController;
@@ -88,16 +88,16 @@ private:
     bool m_bInSignatureValue;
     bool m_bInDate;
     //bool m_bInTime;
-
+    
     /*
      * the XSecController collaborating with XSecParser
      */
     XSecController* m_pXSecController;
-
+    
     /*
      * the next XDocumentHandler on the SAX chain
      */
-    com::sun::star::uno::Reference<
+    com::sun::star::uno::Reference< 
         com::sun::star::xml::sax::XDocumentHandler > m_xNextHandler;
 
     /*
@@ -108,61 +108,61 @@ private:
      * URI when the startElement event is met.
      */
     rtl::OUString m_currentReferenceURI;
-    bool m_bReferenceUnresolved;
+    bool m_bReferenceUnresolved; 
 
 private:
     rtl::OUString getIdAttr(const com::sun::star::uno::Reference<
             com::sun::star::xml::sax::XAttributeList >& xAttribs );
-
+    
 public:
-    XSecParser( XSecController* pXSecController,
+    XSecParser( XSecController* pXSecController, 
         const com::sun::star::uno::Reference<
             com::sun::star::xml::sax::XDocumentHandler >& xNextHandler );
     ~XSecParser(){};
-
+    
     /*
-     * XDocumentHandler
+     * XDocumentHandler 
      */
     virtual void SAL_CALL startDocument(  )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL endDocument(  )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL startElement(
-        const rtl::OUString& aName,
+        const rtl::OUString& aName, 
         const com::sun::star::uno::Reference<
             com::sun::star::xml::sax::XAttributeList >& xAttribs )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
-    virtual void SAL_CALL endElement( const rtl::OUString& aName )
+        
+    virtual void SAL_CALL endElement( const rtl::OUString& aName ) 
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL characters( const rtl::OUString& aChars )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL ignorableWhitespace( const rtl::OUString& aWhitespaces )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL processingInstruction(
         const rtl::OUString& aTarget,
         const rtl::OUString& aData )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL setDocumentLocator(
         const com::sun::star::uno::Reference<
             com::sun::star::xml::sax::XLocator >& xLocator )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
+        
     /*
-     * XInitialization
+     * 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);
 };
-
-#endif
-
+    
+#endif	
+    
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/helper/xsecsign.cxx b/xmlsecurity/source/helper/xsecsign.cxx
index c40492c41991..33ed8c2fa0e2 100644
--- a/xmlsecurity/source/helper/xsecsign.cxx
+++ b/xmlsecurity/source/helper/xsecsign.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ rtl::OUString XSecController::createId()
 {
     cssu::Sequence< sal_Int8 > aSeq( 16 );
     rtl_createUuid ((sal_uInt8 *)aSeq.getArray(), 0, sal_True);
-
+    
     char str[68]="ID_";
     int length = 3;
     for (int i=0; i<16; ++i)
     {
         length += sprintf(str+length, "%04x", (unsigned char)aSeq[i]);
     }
-
+    
     return rtl::OUString::createFromAscii(str);
 }
 
@@ -72,11 +72,11 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
 {
     sal_Int32 nSecurityId = internalSignatureInfor.signatureInfor.nSecurityId;
     SignatureReferenceInformations& vReferenceInfors = internalSignatureInfor.signatureInfor.vSignatureReferenceInfors;
-
+    
     sal_Int32 nIdOfSignatureElementCollector;
     cssu::Reference< cssxc::sax::XReferenceResolvedListener > xReferenceResolvedListener;
 
-    nIdOfSignatureElementCollector =
+    nIdOfSignatureElementCollector = 
         m_xSAXEventKeeper->addSecurityElementCollector( cssxc::sax::ElementMarkPriority_AFTERMODIFY, sal_True );
 
     m_xSAXEventKeeper->setSecurityId(nIdOfSignatureElementCollector, nSecurityId);
@@ -89,14 +89,14 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
         xMCF->createInstanceWithContext(
             rtl::OUString::createFromAscii(SIGNATURECREATOR_COMPONENT), mxCtx),
         cssu::UNO_QUERY);
-
+    
     cssu::Reference<cssl::XInitialization> xInitialization(xReferenceResolvedListener, cssu::UNO_QUERY);
 
     cssu::Sequence<cssu::Any> args(5);
     args[0] = cssu::makeAny(rtl::OUString::valueOf(nSecurityId));
     args[1] = cssu::makeAny(m_xSAXEventKeeper);
     args[2] = cssu::makeAny(rtl::OUString::valueOf(nIdOfSignatureElementCollector));
-
+    
     //i39448 : for nss, the internal module is used for signing, which needs to be improved later
     sal_Int32 nEnvIndex = internalSignatureInfor.signatureInfor.nSecurityEnvironmentIndex;
     if( nEnvIndex < 0 || nEnvIndex >= m_xSecurityContext->getSecurityEnvironmentNumber())
@@ -107,41 +107,41 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
     {
         args[3] = cssu::makeAny(m_xSecurityContext->getSecurityEnvironmentByIndex(nEnvIndex));
     }
-
+    
     args[4] = cssu::makeAny(m_xXMLSignature);
     xInitialization->initialize(args);
-
+            
     sal_Int32 nBlockerId = m_xSAXEventKeeper->addBlocker();
     m_xSAXEventKeeper->setSecurityId(nBlockerId, nSecurityId);
-
+        
     cssu::Reference<cssxc::sax::XBlockerMonitor> xBlockerMonitor(xReferenceResolvedListener, cssu::UNO_QUERY);
     xBlockerMonitor->setBlockerId(nBlockerId);
 
     cssu::Reference< cssxc::sax::XSignatureCreationResultBroadcaster >
         xSignatureCreationResultBroadcaster(xReferenceResolvedListener, cssu::UNO_QUERY);
-
+    
     xSignatureCreationResultBroadcaster->addSignatureCreationResultListener( this );
-
-    cssu::Reference<cssxc::sax::XReferenceResolvedBroadcaster>
-        xReferenceResolvedBroadcaster
+    
+    cssu::Reference<cssxc::sax::XReferenceResolvedBroadcaster> 
+        xReferenceResolvedBroadcaster  
         (m_xSAXEventKeeper,
         cssu::UNO_QUERY);
-
+        
     xReferenceResolvedBroadcaster->addReferenceResolvedListener(
         nIdOfSignatureElementCollector,
         xReferenceResolvedListener);
-
+        
     cssu::Reference<cssxc::sax::XReferenceCollector> xReferenceCollector
         (xReferenceResolvedListener, cssu::UNO_QUERY);
-
+    
     int i;
     int size = vReferenceInfors.size();
     sal_Int32 nReferenceCount = 0;
-
+    
     for(i=0; i<size; ++i)
     {
         sal_Int32 keeperId = internalSignatureInfor.vKeeperIds[i];
-
+        
         if ( keeperId != -1)
         {
             m_xSAXEventKeeper->setSecurityId(keeperId, nSecurityId);
@@ -150,19 +150,19 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
             nReferenceCount++;
         }
     }
-
+    
     xReferenceCollector->setReferenceCount( nReferenceCount );
-
+    
     /*
      * adds all URI binding
      */
     cssu::Reference<cssxc::XUriBinding> xUriBinding
         (xReferenceResolvedListener, cssu::UNO_QUERY);
-
+        
     for(i=0; i<size; ++i)
     {
         const SignatureReferenceInformation& refInfor = vReferenceInfors[i];
-
+        
         cssu::Reference< com::sun::star::io::XInputStream > xInputStream
             = getObjectInputStream( refInfor.ouURI );
 
@@ -171,15 +171,15 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
             xUriBinding->setUriBinding(refInfor.ouURI,xInputStream);
         }
     }
-
+    
     cssu::Reference<cssxc::sax::XKeyCollector> keyCollector (xReferenceResolvedListener, cssu::UNO_QUERY);
     keyCollector->setKeyId(0);
-
+    
     internalSignatureInfor.signatureInfor.ouSignatureId = createId();
     internalSignatureInfor.signatureInfor.ouPropertyId = createId();
     internalSignatureInfor.addReference(TYPE_SAMEDOCUMENT_REFERENCE, internalSignatureInfor.signatureInfor.ouPropertyId, -1 );
     size++;
-
+    
     /*
      * replace both digestValues and signatueValue to " "
      */
@@ -190,7 +190,7 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
     }
 
     internalSignatureInfor.signatureInfor.ouSignatureValue = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CHAR_BLANK));
-
+    
     return xReferenceResolvedListener;
 }
 
@@ -198,9 +198,9 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
 void XSecController::collectToSign( sal_Int32 securityId, const rtl::OUString& referenceId )
 {
     /* DBG_ASSERT( m_xSAXEventKeeper.is(), "the SAXEventKeeper is NULL" ); */
-
+    
     chainOn(true);
-
+    
     if ( m_nStatusOfSecurityComponents == INITIALIZED )
     /*
      * if all security components are ready, add a signature.
@@ -208,9 +208,9 @@ void XSecController::collectToSign( sal_Int32 securityId, const rtl::OUString& r
     {
         sal_Int32 nKeeperId = m_xSAXEventKeeper->addSecurityElementCollector(
             cssxc::sax::ElementMarkPriority_AFTERMODIFY, sal_False);
-
+            
         int index = findSignatureInfor( securityId );
-
+        
         if ( index == -1 )
         {
             InternalSignatureInformation isi(securityId, NULL);
@@ -227,9 +227,9 @@ void XSecController::collectToSign( sal_Int32 securityId, const rtl::OUString& r
 void XSecController::signAStream( sal_Int32 securityId, const rtl::OUString& uri, const rtl::OUString& /*objectURL*/, sal_Bool isBinary)
 {
         sal_Int32 type = ((isBinary==sal_True)?TYPE_BINARYSTREAM_REFERENCE:TYPE_XMLSTREAM_REFERENCE);
-
+        
     int index = findSignatureInfor( securityId );
-
+        
     if (index == -1)
     {
         InternalSignatureInformation isi(securityId, NULL);
@@ -253,7 +253,7 @@ void XSecController::setX509Certificate(
 
 void XSecController::setX509Certificate(
     sal_Int32 nSecurityId,
-    const sal_Int32 nSecurityEnvironmentIndex,
+    const sal_Int32	nSecurityEnvironmentIndex,
     const rtl::OUString& ouX509IssuerName,
     const rtl::OUString& ouX509SerialNumber,
     const rtl::OUString& ouX509Cert)
@@ -304,14 +304,14 @@ bool XSecController::WriteSignature(
     const cssu::Reference<cssxs::XDocumentHandler>& xDocumentHandler )
 {
     bool rc = false;
-
+    
     DBG_ASSERT( xDocumentHandler.is(), "I really need a document handler!" );
-
+    
     /*
-     * chain the SAXEventKeeper to the SAX chain
+     * chain the SAXEventKeeper to the SAX chain 
      */
     chainOn(true);
-
+    
     if ( m_nStatusOfSecurityComponents == INITIALIZED )
     /*
      * if all security components are ready, add the signature
@@ -320,33 +320,33 @@ bool XSecController::WriteSignature(
     {
         m_bIsSAXEventKeeperSticky = true;
         m_xSAXEventKeeper->setNextHandler(xDocumentHandler);
-
+        
         try
         {
             /*
-             * export the signature template
+             * export the signature template 
              */
             cssu::Reference<cssxs::XDocumentHandler> xSEKHandler( m_xSAXEventKeeper,cssu::UNO_QUERY);
-
+        
             int i;
             int sigNum = m_vInternalSignatureInformations.size();
-
+            
             for (i=0; i<sigNum; ++i)
             {
                 InternalSignatureInformation &isi = m_vInternalSignatureInformations[i];
-
+                
                 /*
                  * prepare the signature creator
                  */
-                isi.xReferenceResolvedListener
+                isi.xReferenceResolvedListener 
                     = prepareSignatureToWrite( isi );
-
+                        
                 exportSignature( xSEKHandler, isi.signatureInfor );
             }
-
+        
             m_bIsSAXEventKeeperSticky = false;
             chainOff();
-
+            
             rc = true;
         }
         catch( cssxs::SAXException& )
@@ -361,7 +361,7 @@ bool XSecController::WriteSignature(
         {
             m_pErrorMessage = ERROR_EXCEPTIONDURINGCREATION;
         }
-
+    
         m_xSAXEventKeeper->setNextHandler( NULL );
         m_bIsSAXEventKeeperSticky = false;
     }
@@ -369,7 +369,7 @@ bool XSecController::WriteSignature(
     {
         m_pErrorMessage = ERROR_CANNOTCREATEXMLSECURITYCOMPONENT;
     }
-
+    
     return rc;
 }
 
diff --git a/xmlsecurity/source/helper/xsecverify.cxx b/xmlsecurity/source/helper/xsecverify.cxx
index 8f903dd2053d..000f0d40f523 100644
--- a/xmlsecurity/source/helper/xsecverify.cxx
+++ b/xmlsecurity/source/helper/xsecverify.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
     sal_Int32 nIdOfSignatureElementCollector;
     cssu::Reference< cssxc::sax::XReferenceResolvedListener > xReferenceResolvedListener;
 
-    nIdOfSignatureElementCollector =
+    nIdOfSignatureElementCollector = 
         m_xSAXEventKeeper->addSecurityElementCollector( cssxc::sax::ElementMarkPriority_BEFOREMODIFY, sal_False);
 
     m_xSAXEventKeeper->setSecurityId(nIdOfSignatureElementCollector, nSecurityId);
-
+        
         /*
          * create a SignatureVerifier
          */
@@ -73,9 +73,9 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
         xMCF->createInstanceWithContext(
             rtl::OUString::createFromAscii( SIGNATUREVERIFIER_COMPONENT ), mxCtx),
         cssu::UNO_QUERY);
-
+    
     cssu::Reference<cssl::XInitialization> xInitialization(xReferenceResolvedListener, cssu::UNO_QUERY);
-
+    
     cssu::Sequence<cssu::Any> args(5);
     args[0] = cssu::makeAny(rtl::OUString::valueOf(nSecurityId));
     args[1] = cssu::makeAny(m_xSAXEventKeeper);
@@ -83,23 +83,23 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
     args[3] = cssu::makeAny(m_xSecurityContext);
     args[4] = cssu::makeAny(m_xXMLSignature);
     xInitialization->initialize(args);
-
+    
     cssu::Reference< cssxc::sax::XSignatureVerifyResultBroadcaster >
         signatureVerifyResultBroadcaster(xReferenceResolvedListener, cssu::UNO_QUERY);
-
+        
     signatureVerifyResultBroadcaster->addSignatureVerifyResultListener( this );
 
-    cssu::Reference<cssxc::sax::XReferenceResolvedBroadcaster> xReferenceResolvedBroadcaster
+    cssu::Reference<cssxc::sax::XReferenceResolvedBroadcaster> xReferenceResolvedBroadcaster  
         (m_xSAXEventKeeper,
         cssu::UNO_QUERY);
-
+        
     xReferenceResolvedBroadcaster->addReferenceResolvedListener(
         nIdOfSignatureElementCollector,
         xReferenceResolvedListener);
-
+        
     cssu::Reference<cssxc::sax::XKeyCollector> keyCollector (xReferenceResolvedListener, cssu::UNO_QUERY);
     keyCollector->setKeyId(0);
-
+    
     return xReferenceResolvedListener;
 }
 
@@ -107,8 +107,8 @@ void XSecController::addSignature()
 {
     cssu::Reference< cssxc::sax::XReferenceResolvedListener > xReferenceResolvedListener = NULL;
     sal_Int32 nSignatureId = 0;
-
-
+    
+    
     if (m_bVerifyCurrentSignature)
     {
         chainOn(true);
@@ -116,7 +116,7 @@ void XSecController::addSignature()
         m_bVerifyCurrentSignature = false;
         nSignatureId = m_nReservedSignatureId;
     }
-
+    
     InternalSignatureInformation isi( nSignatureId, xReferenceResolvedListener );
     m_vInternalSignatureInformations.push_back( isi );
 }
@@ -127,7 +127,7 @@ void XSecController::addReference( const rtl::OUString& ouUri)
     isi.addReference(TYPE_SAMEDOCUMENT_REFERENCE,ouUri, -1 );
 }
 
-void XSecController::addStreamReference(
+void XSecController::addStreamReference( 
     const rtl::OUString& ouUri,
     bool isBinary )
 {
@@ -142,7 +142,7 @@ void XSecController::addStreamReference(
              */
             cssu::Reference< com::sun::star::io::XInputStream > xObjectInputStream
                 = getObjectInputStream( ouUri );
-
+        
         if ( xObjectInputStream.is() )
         {
             cssu::Reference<cssxc::XUriBinding> xUriBinding
@@ -150,21 +150,21 @@ void XSecController::addStreamReference(
             xUriBinding->setUriBinding(ouUri, xObjectInputStream);
         }
     }
-
+    
     isi.addReference(type, ouUri, -1);
 }
 
 void XSecController::setReferenceCount() const
 {
     const InternalSignatureInformation &isi = m_vInternalSignatureInformations[m_vInternalSignatureInformations.size()-1];
-
+    
     if ( isi.xReferenceResolvedListener.is() )
     {
         const SignatureReferenceInformations &refInfors = isi.signatureInfor.vSignatureReferenceInfors;
-
+        
         int refNum = refInfors.size();
         sal_Int32 referenceCount = 0;
-
+            
         for(int i=0 ; i<refNum; ++i)
         {
             if (refInfors[i].nType == TYPE_SAMEDOCUMENT_REFERENCE )
@@ -175,7 +175,7 @@ void XSecController::setReferenceCount() const
                 referenceCount++;
             }
         }
-
+        
         cssu::Reference<cssxc::sax::XReferenceCollector> xReferenceCollector
             (isi.xReferenceResolvedListener, cssu::UNO_QUERY);
         xReferenceCollector->setReferenceCount( referenceCount );
@@ -244,7 +244,7 @@ void XSecController::setPropertyId( rtl::OUString& ouPropertyId )
 void XSecController::collectToVerify( const rtl::OUString& referenceId )
 {
     /* DBG_ASSERT( m_xSAXEventKeeper.is(), "the SAXEventKeeper is NULL" ); */
-
+    
     if ( m_nStatusOfSecurityComponents == INITIALIZED )
     /*
      * if all security components are ready, verify the signature.
@@ -252,20 +252,20 @@ void XSecController::collectToVerify( const rtl::OUString& referenceId )
     {
         bool bJustChainingOn = false;
         cssu::Reference< cssxs::XDocumentHandler > xHandler = NULL;
-
+        
         int i,j;
         int sigNum = m_vInternalSignatureInformations.size();
-
+        
         for (i=0; i<sigNum; ++i)
         {
             InternalSignatureInformation& isi = m_vInternalSignatureInformations[i];
             SignatureReferenceInformations& vReferenceInfors = isi.signatureInfor.vSignatureReferenceInfors;
             int refNum = vReferenceInfors.size();
-
+            
             for (j=0; j<refNum; ++j)
             {
                 SignatureReferenceInformation &refInfor = vReferenceInfors[j];
-
+                
                 if (refInfor.ouURI == referenceId)
                 {
                     if (chainOn(false))
@@ -273,27 +273,27 @@ void XSecController::collectToVerify( const rtl::OUString& referenceId )
                         bJustChainingOn = true;
                         xHandler = m_xSAXEventKeeper->setNextHandler(NULL);
                     }
-
+                    
                     sal_Int32 nKeeperId = m_xSAXEventKeeper->addSecurityElementCollector(
                         cssxc::sax::ElementMarkPriority_BEFOREMODIFY, sal_False );
-
-                    cssu::Reference<cssxc::sax::XReferenceResolvedBroadcaster> xReferenceResolvedBroadcaster
+    
+                    cssu::Reference<cssxc::sax::XReferenceResolvedBroadcaster> xReferenceResolvedBroadcaster  
                         (m_xSAXEventKeeper,
                         cssu::UNO_QUERY );
-
+                        
                     cssu::Reference<cssxc::sax::XReferenceCollector> xReferenceCollector
                         ( isi.xReferenceResolvedListener, cssu::UNO_QUERY );
-
+                    
                     m_xSAXEventKeeper->setSecurityId(nKeeperId, isi.signatureInfor.nSecurityId);
                     xReferenceResolvedBroadcaster->addReferenceResolvedListener( nKeeperId, isi.xReferenceResolvedListener);
                     xReferenceCollector->setReferenceId( nKeeperId );
-
+                    
                     isi.vKeeperIds[j] = nKeeperId;
                     break;
                 }
             }
         }
-
+    
         if ( bJustChainingOn )
         {
             cssu::Reference< cssxs::XDocumentHandler > xSEKHandler(m_xSAXEventKeeper, cssu::UNO_QUERY);
@@ -309,7 +309,7 @@ void XSecController::collectToVerify( const rtl::OUString& referenceId )
 void XSecController::addSignature( sal_Int32 nSignatureId )
 {
     DBG_ASSERT( m_pXSecParser != NULL, "No XSecParser initialized" );
-
+    
     m_nReservedSignatureId = nSignatureId;
     m_bVerifyCurrentSignature = true;
 }
@@ -318,12 +318,12 @@ cssu::Reference< cssxs::XDocumentHandler > XSecController::createSignatureReader
 {
     m_pXSecParser = new XSecParser( this, NULL );
     cssu::Reference< cssl::XInitialization > xInitialization = m_pXSecParser;
-
+    
     setSAXChainConnector(xInitialization, NULL, NULL);
-
+    
     return m_pXSecParser;
 }
-
+    
 void XSecController::releaseSignatureReader()
 {
     clearSAXChainConnector( );
diff --git a/xmlsecurity/source/xmlsec/biginteger.cxx b/xmlsecurity/source/xmlsec/biginteger.cxx
index 100708938cdb..c79e9af5ca3c 100644
--- a/xmlsecurity/source/xmlsec/biginteger.cxx
+++ b/xmlsecurity/source/xmlsec/biginteger.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 ;
 using ::rtl::OUString ;
 
-Sequence< sal_Int8 > numericStringToBigInteger ( OUString numeral )
+Sequence< sal_Int8 > numericStringToBigInteger ( OUString numeral ) 
 {
-    if( numeral.getStr() != NULL )
+    if( numeral.getStr() != NULL ) 
     {
         xmlChar* chNumeral ;
         const xmlSecByte* bnInteger ;
@@ -94,7 +94,7 @@ Sequence< sal_Int8 > numericStringToBigInteger ( OUString numeral )
     return Sequence< sal_Int8 >();
 }
 
-OUString bigIntegerToNumericString ( Sequence< sal_Int8 > integer )
+OUString bigIntegerToNumericString ( Sequence< sal_Int8 > integer ) 
 {
     OUString aRet ;
 
diff --git a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx
index c7e3c0fa61be..efc10fa01e07 100644
--- a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx
index bbfecbbcd760..13524621fe65 100644
--- a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx
+++ b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,6 +62,6 @@ class CertificateExtension_XmlSecImpl : public ::cppu::WeakImplHelper1<
         void setCertExtn( unsigned char* value, unsigned int vlen, unsigned char* id, unsigned int idlen, sal_Bool critical ) ;
 } ;
 
-#endif  // _CERTIFICATEEXTENSION_XMLSECIMPL_HXX_
+#endif	// _CERTIFICATEEXTENSION_XMLSECIMPL_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/xmlsec/certvalidity.cxx b/xmlsecurity/source/xmlsec/certvalidity.cxx
index b487c7e67a69..2ce5c14e21ed 100644
--- a/xmlsecurity/source/xmlsec/certvalidity.cxx
+++ b/xmlsecurity/source/xmlsec/certvalidity.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ rtl::OUString certificateValidityToOUString( ::sal_Int32 certValidity ) {
     } else if( ( certValidity & CertificateValidity::TIME_INVALID ) == CertificateValidity::TIME_INVALID ) {
          aValidity = OUString::createFromAscii( ( const char* )TIME_INVALID_STR ) ;
     } else if( ( certValidity & CertificateValidity::NOT_TIME_NESTED ) == CertificateValidity::NOT_TIME_NESTED ) {
-         aValidity = OUString::createFromAscii( ( const char* )NOT_NESTED_TIME_STR ) ;
+         aValidity = OUString::createFromAscii( ( const char* )NOT_NESTED_TIME_STR ) ;         
     } else if( ( certValidity & CertificateValidity::REVOKED ) == CertificateValidity::REVOKED ) {
          aValidity = OUString::createFromAscii( ( const char* )REVOKED_STR ) ;
     } else if( ( certValidity &  CertificateValidity::UNKNOWN_REVOKATION ) == CertificateValidity::UNKNOWN_REVOKATION ) {
diff --git a/xmlsecurity/source/xmlsec/diagnose.cxx b/xmlsecurity/source/xmlsec/diagnose.cxx
index 683884eeb32e..19763bb6064b 100644
--- a/xmlsecurity/source/xmlsec/diagnose.cxx
+++ b/xmlsecurity/source/xmlsec/diagnose.cxx
@@ -2,7 +2,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
@@ -56,7 +56,7 @@ struct UseDiagnose : public rtl::StaticWithInit<
 void xmlsec_trace(const char* pszFormat, ...)
 {
     bool bDebug = false;
-
+     
 #if OSL_DEBUG_LEVEL > 1
     bDebug = true;
 #endif
@@ -67,7 +67,7 @@ void xmlsec_trace(const char* pszFormat, ...)
         va_start(args, pszFormat);
         vfprintf(stderr, pszFormat, args);
         va_end(args);
-
+        
         fprintf(stderr,"\n");
         fflush(stderr);
     }
diff --git a/xmlsecurity/source/xmlsec/diagnose.hxx b/xmlsecurity/source/xmlsec/diagnose.hxx
index e59e24d42068..9c18b19b26b2 100644
--- a/xmlsecurity/source/xmlsec/diagnose.hxx
+++ b/xmlsecurity/source/xmlsec/diagnose.hxx
@@ -2,7 +2,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/xmlsecurity/source/xmlsec/errorcallback.cxx b/xmlsecurity/source/xmlsec/errorcallback.cxx
index a533c1291c12..9ec99686dc12 100644
--- a/xmlsecurity/source/xmlsec/errorcallback.cxx
+++ b/xmlsecurity/source/xmlsec/errorcallback.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,105 +49,105 @@ using namespace ::com::sun::star::xml::crypto;
 
 // SecurityOperationStatus getOperationStatus(int reason)
 // {
-//  switch (reason)
-//  {
-//  case XMLSEC_ERRORS_R_XMLSEC_FAILED:
-//      return SecurityOperationStatus_ENGINE_FAILED;
-//  case XMLSEC_ERRORS_R_MALLOC_FAILED:
-//      return SecurityOperationStatus_MALLOC_FAILED;
-//  case XMLSEC_ERRORS_R_STRDUP_FAILED:
-//      return SecurityOperationStatus_STRDUP_FAILED;
-//  case XMLSEC_ERRORS_R_CRYPTO_FAILED:
-//      return SecurityOperationStatus_CRYPTO_FAILED;
-//  case XMLSEC_ERRORS_R_XML_FAILED:
-//      return SecurityOperationStatus_XML_FAILED;
-//  case XMLSEC_ERRORS_R_XSLT_FAILED:
-//      return SecurityOperationStatus_XSLT_FAILED;
-//  case XMLSEC_ERRORS_R_IO_FAILED:
-//      return SecurityOperationStatus_IO_FAILED;
-//  case XMLSEC_ERRORS_R_DISABLED:
-//      return SecurityOperationStatus_DISABLED;
-//  case XMLSEC_ERRORS_R_NOT_IMPLEMENTED:
-//      return SecurityOperationStatus_NOT_IMPLEMENTED;
-//  case XMLSEC_ERRORS_R_INVALID_SIZE:
-//      return SecurityOperationStatus_INVALID_SIZE;
-//  case XMLSEC_ERRORS_R_INVALID_DATA:
-//      return SecurityOperationStatus_INVALID_DATA;
-//  case XMLSEC_ERRORS_R_INVALID_RESULT:
-//      return SecurityOperationStatus_INVALID_RESULT;
-//  case XMLSEC_ERRORS_R_INVALID_TYPE:
-//      return SecurityOperationStatus_INVALID_TYPE;
-//  case XMLSEC_ERRORS_R_INVALID_OPERATION:
-//      return SecurityOperationStatus_INVALID_OPERATION;
-//  case XMLSEC_ERRORS_R_INVALID_STATUS:
-//      return SecurityOperationStatus_INVALID_STATUS;
-//  case XMLSEC_ERRORS_R_INVALID_FORMAT:
-//      return SecurityOperationStatus_INVALID_FORMAT;
-//  case XMLSEC_ERRORS_R_DATA_NOT_MATCH:
-//      return SecurityOperationStatus_DATA_NOT_MATCH;
-//  case XMLSEC_ERRORS_R_INVALID_NODE:
-//      return SecurityOperationStatus_INVALID_NODE;
-//  case XMLSEC_ERRORS_R_INVALID_NODE_CONTENT:
-//      return SecurityOperationStatus_INVALID_NODE_CONTENT;
-//  case XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE:
-//      return SecurityOperationStatus_INVALID_NODE_ATTRIBUTE;
-//  case XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE:
-//      return SecurityOperationStatus_MISSING_NODE_ATTRIBUTE;
-//  case XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT:
-//      return SecurityOperationStatus_NODE_ALREADY_PRESENT;
-//  case XMLSEC_ERRORS_R_UNEXPECTED_NODE:
-//      return SecurityOperationStatus_UNEXPECTED_NODE;
-//  case XMLSEC_ERRORS_R_NODE_NOT_FOUND:
-//      return SecurityOperationStatus_NODE_NOT_FOUND;
-//  case XMLSEC_ERRORS_R_INVALID_TRANSFORM:
-//      return SecurityOperationStatus_INVALID_TRANSFORM;
-//  case XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY:
-//      return SecurityOperationStatus_INVALID_TRANSFORM_KEY;
-//  case XMLSEC_ERRORS_R_INVALID_URI_TYPE:
-//      return SecurityOperationStatus_INVALID_URI_TYPE;
-//  case XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED:
-//      return SecurityOperationStatus_TRANSFORM_SAME_DOCUMENT_REQUIRED;
-//  case XMLSEC_ERRORS_R_TRANSFORM_DISABLED:
-//      return SecurityOperationStatus_TRANSFORM_DISABLED;
-//  case XMLSEC_ERRORS_R_INVALID_KEY_DATA:
-//      return SecurityOperationStatus_INVALID_KEY_DATA;
-//  case XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND:
-//      return SecurityOperationStatus_KEY_DATA_NOT_FOUND;
-//  case XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST:
-//      return SecurityOperationStatus_KEY_DATA_ALREADY_EXIST;
-//  case XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE:
-//      return SecurityOperationStatus_INVALID_KEY_DATA_SIZE;
-//  case XMLSEC_ERRORS_R_KEY_NOT_FOUND:
-//      return SecurityOperationStatus_KEY_NOT_FOUND;
-//  case XMLSEC_ERRORS_R_KEYDATA_DISABLED:
-//      return SecurityOperationStatus_KEYDATA_DISABLED;
-//  case XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL:
-//      return SecurityOperationStatus_MAX_RETRIEVALS_LEVEL;
-//  case XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH:
-//      return SecurityOperationStatus_MAX_RETRIEVAL_TYPE_MISMATCH;
-//  case XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL:
-//      return SecurityOperationStatus_MAX_ENCKEY_LEVEL;
-//  case XMLSEC_ERRORS_R_CERT_VERIFY_FAILED:
-//      return SecurityOperationStatus_CERT_VERIFY_FAILED;
-//  case XMLSEC_ERRORS_R_CERT_NOT_FOUND:
-//      return SecurityOperationStatus_CERT_NOT_FOUND;
-//  case XMLSEC_ERRORS_R_CERT_REVOKED:
-//      return SecurityOperationStatus_CERT_REVOKED;
-//  case XMLSEC_ERRORS_R_CERT_ISSUER_FAILED:
-//      return SecurityOperationStatus_CERT_ISSUER_FAILED;
-//  case XMLSEC_ERRORS_R_CERT_NOT_YET_VALID:
-//      return SecurityOperationStatus_CERT_NOT_YET_VALID;
-//  case XMLSEC_ERRORS_R_CERT_HAS_EXPIRED:
-//      return SecurityOperationStatus_CERT_HAS_EXPIRED;
-//  case XMLSEC_ERRORS_R_DSIG_NO_REFERENCES:
-//      return SecurityOperationStatus_DSIG_NO_REFERENCES;
-//  case XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE:
-//      return SecurityOperationStatus_DSIG_INVALID_REFERENCE;
-//  case XMLSEC_ERRORS_R_ASSERTION:
-//      return SecurityOperationStatus_ASSERTION;
-//  default:
-//      return SecurityOperationStatus_RUNTIMEERROR_FAILED;
-//  }
+// 	switch (reason)
+// 	{
+// 	case XMLSEC_ERRORS_R_XMLSEC_FAILED:
+// 		return SecurityOperationStatus_ENGINE_FAILED;
+// 	case XMLSEC_ERRORS_R_MALLOC_FAILED:
+// 		return SecurityOperationStatus_MALLOC_FAILED;
+// 	case XMLSEC_ERRORS_R_STRDUP_FAILED:
+// 		return SecurityOperationStatus_STRDUP_FAILED;
+// 	case XMLSEC_ERRORS_R_CRYPTO_FAILED:
+// 		return SecurityOperationStatus_CRYPTO_FAILED;
+// 	case XMLSEC_ERRORS_R_XML_FAILED:
+// 		return SecurityOperationStatus_XML_FAILED;
+// 	case XMLSEC_ERRORS_R_XSLT_FAILED:
+// 		return SecurityOperationStatus_XSLT_FAILED;
+// 	case XMLSEC_ERRORS_R_IO_FAILED:
+// 		return SecurityOperationStatus_IO_FAILED;
+// 	case XMLSEC_ERRORS_R_DISABLED:
+// 		return SecurityOperationStatus_DISABLED;
+// 	case XMLSEC_ERRORS_R_NOT_IMPLEMENTED:
+// 		return SecurityOperationStatus_NOT_IMPLEMENTED;
+// 	case XMLSEC_ERRORS_R_INVALID_SIZE:
+// 		return SecurityOperationStatus_INVALID_SIZE;
+// 	case XMLSEC_ERRORS_R_INVALID_DATA:
+// 		return SecurityOperationStatus_INVALID_DATA;
+// 	case XMLSEC_ERRORS_R_INVALID_RESULT:
+// 		return SecurityOperationStatus_INVALID_RESULT;
+// 	case XMLSEC_ERRORS_R_INVALID_TYPE:
+// 		return SecurityOperationStatus_INVALID_TYPE;
+// 	case XMLSEC_ERRORS_R_INVALID_OPERATION:
+// 		return SecurityOperationStatus_INVALID_OPERATION;
+// 	case XMLSEC_ERRORS_R_INVALID_STATUS:
+// 		return SecurityOperationStatus_INVALID_STATUS;
+// 	case XMLSEC_ERRORS_R_INVALID_FORMAT:
+// 		return SecurityOperationStatus_INVALID_FORMAT;
+// 	case XMLSEC_ERRORS_R_DATA_NOT_MATCH:
+// 		return SecurityOperationStatus_DATA_NOT_MATCH;
+// 	case XMLSEC_ERRORS_R_INVALID_NODE:
+// 		return SecurityOperationStatus_INVALID_NODE;
+// 	case XMLSEC_ERRORS_R_INVALID_NODE_CONTENT:
+// 		return SecurityOperationStatus_INVALID_NODE_CONTENT;
+// 	case XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE:
+// 		return SecurityOperationStatus_INVALID_NODE_ATTRIBUTE;
+// 	case XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE:
+// 		return SecurityOperationStatus_MISSING_NODE_ATTRIBUTE;
+// 	case XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT:
+// 		return SecurityOperationStatus_NODE_ALREADY_PRESENT;
+// 	case XMLSEC_ERRORS_R_UNEXPECTED_NODE:
+// 		return SecurityOperationStatus_UNEXPECTED_NODE;
+// 	case XMLSEC_ERRORS_R_NODE_NOT_FOUND:
+// 		return SecurityOperationStatus_NODE_NOT_FOUND;
+// 	case XMLSEC_ERRORS_R_INVALID_TRANSFORM:
+// 		return SecurityOperationStatus_INVALID_TRANSFORM;
+// 	case XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY:
+// 		return SecurityOperationStatus_INVALID_TRANSFORM_KEY;
+// 	case XMLSEC_ERRORS_R_INVALID_URI_TYPE:
+// 		return SecurityOperationStatus_INVALID_URI_TYPE;
+// 	case XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED:
+// 		return SecurityOperationStatus_TRANSFORM_SAME_DOCUMENT_REQUIRED;
+// 	case XMLSEC_ERRORS_R_TRANSFORM_DISABLED:
+// 		return SecurityOperationStatus_TRANSFORM_DISABLED;
+// 	case XMLSEC_ERRORS_R_INVALID_KEY_DATA:
+// 		return SecurityOperationStatus_INVALID_KEY_DATA;
+// 	case XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND:
+// 		return SecurityOperationStatus_KEY_DATA_NOT_FOUND;
+// 	case XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST:
+// 		return SecurityOperationStatus_KEY_DATA_ALREADY_EXIST;
+// 	case XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE:
+// 		return SecurityOperationStatus_INVALID_KEY_DATA_SIZE;
+// 	case XMLSEC_ERRORS_R_KEY_NOT_FOUND:
+// 		return SecurityOperationStatus_KEY_NOT_FOUND;
+// 	case XMLSEC_ERRORS_R_KEYDATA_DISABLED:
+// 		return SecurityOperationStatus_KEYDATA_DISABLED;
+// 	case XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL:
+// 		return SecurityOperationStatus_MAX_RETRIEVALS_LEVEL;
+// 	case XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH:
+// 		return SecurityOperationStatus_MAX_RETRIEVAL_TYPE_MISMATCH;
+// 	case XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL:
+// 		return SecurityOperationStatus_MAX_ENCKEY_LEVEL;
+// 	case XMLSEC_ERRORS_R_CERT_VERIFY_FAILED:
+// 		return SecurityOperationStatus_CERT_VERIFY_FAILED;
+// 	case XMLSEC_ERRORS_R_CERT_NOT_FOUND:
+// 		return SecurityOperationStatus_CERT_NOT_FOUND;
+// 	case XMLSEC_ERRORS_R_CERT_REVOKED:
+// 		return SecurityOperationStatus_CERT_REVOKED;
+// 	case XMLSEC_ERRORS_R_CERT_ISSUER_FAILED:
+// 		return SecurityOperationStatus_CERT_ISSUER_FAILED;
+// 	case XMLSEC_ERRORS_R_CERT_NOT_YET_VALID:
+// 		return SecurityOperationStatus_CERT_NOT_YET_VALID;
+// 	case XMLSEC_ERRORS_R_CERT_HAS_EXPIRED:
+// 		return SecurityOperationStatus_CERT_HAS_EXPIRED;
+// 	case XMLSEC_ERRORS_R_DSIG_NO_REFERENCES:
+// 		return SecurityOperationStatus_DSIG_NO_REFERENCES;
+// 	case XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE:
+// 		return SecurityOperationStatus_DSIG_INVALID_REFERENCE;
+// 	case XMLSEC_ERRORS_R_ASSERTION:
+// 		return SecurityOperationStatus_ASSERTION;
+// 	default:
+// 		return SecurityOperationStatus_RUNTIMEERROR_FAILED;
+// 	}
 // }
 
 
@@ -165,49 +165,49 @@ void errorCallback(const char * /*file*/,
 //     const char * errObj = errorObject ? errorObject : "";
 //     const char * errSub = errorSubject ? errorSubject : "";
 //     const char * amsg = msg ? msg : "";
-//  fprintf(stdout, "xmlsec error: %s, %s,  %s, %i %s  \n", afunc, errObj, errSub, reason, amsg);
+// 	fprintf(stdout, "xmlsec error: %s, %s,  %s, %i %s  \n", afunc, errObj, errSub, reason, amsg);
 #endif
     //ToDo write log message
-//  if (g_xErrorRecorder.is() && !g_bErrorRecorded)
-//  {
-//      g_xErrorRecorder->setStatus(getOperationStatus(reason));
+// 	if (g_xErrorRecorder.is() && !g_bErrorRecorded)
+// 	{
+// 		g_xErrorRecorder->setStatus(getOperationStatus(reason));
 
-//      if ( reason != XMLSEC_ERRORS_R_ASSERTION && reason!=XMLSEC_ERRORS_R_XMLSEC_FAILED)
-//      {
+// 		if ( reason != XMLSEC_ERRORS_R_ASSERTION && reason!=XMLSEC_ERRORS_R_XMLSEC_FAILED)
+// 		{
 //             g_bErrorRecorded = true;
-//      }
-//  }
+// 		}
+// 	}
 }
 
 // void setErrorRecorder(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSecurityTemplate >& xTemplate)
 // {
-//  g_xErrorRecorder = xTemplate;
-//  g_xErrorRecorder->setStatus(SecurityOperationStatus_OPERATION_SUCCEEDED);
-//  g_bErrorRecorded = false;
-//  xmlSecErrorsSetCallback(errorCallback);
+// 	g_xErrorRecorder = xTemplate;
+// 	g_xErrorRecorder->setStatus(SecurityOperationStatus_OPERATION_SUCCEEDED);
+// 	g_bErrorRecorded = false;
+// 	xmlSecErrorsSetCallback(errorCallback);
 // }
 
 //void setErrorRecorder(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSignatureTemplate >& xTemplate)
 
-void setErrorRecorder()
+void setErrorRecorder()    
 {
-//  ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSecurityTemplate >
-//      xSecurityTemplate(xTemplate, ::com::sun::star::uno::UNO_QUERY);
-//  setErrorRecorder( xSecurityTemplate );
+// 	::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSecurityTemplate > 
+// 		xSecurityTemplate(xTemplate, ::com::sun::star::uno::UNO_QUERY);
+// 	setErrorRecorder( xSecurityTemplate );
     xmlSecErrorsSetCallback(errorCallback);
 }
 
 // void setErrorRecorder(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLEncryptionTemplate >& xTemplate)
 // {
-//  ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSecurityTemplate >
-//      xSecurityTemplate(xTemplate, ::com::sun::star::uno::UNO_QUERY);
-//  setErrorRecorder( xSecurityTemplate );
+// 	::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSecurityTemplate > 
+// 		xSecurityTemplate(xTemplate, ::com::sun::star::uno::UNO_QUERY);
+// 	setErrorRecorder( xSecurityTemplate );
 // }
 
 void clearErrorRecorder()
 {
     xmlSecErrorsSetCallback(NULL);
-//  g_xErrorRecorder = NULL;
+//	g_xErrorRecorder = NULL;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/xmlsec/errorcallback.hxx b/xmlsecurity/source/xmlsec/errorcallback.hxx
index c861263a0f22..c7f361e00a21 100644
--- a/xmlsecurity/source/xmlsec/errorcallback.hxx
+++ b/xmlsecurity/source/xmlsec/errorcallback.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/xmlsecurity/source/xmlsec/mscrypt/oid.hxx b/xmlsecurity/source/xmlsec/mscrypt/oid.hxx
index c46456d4dc87..1e69414e3169 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/oid.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/oid.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,121 +37,121 @@ struct OIDItemStr {
 };
 
 OIDItem OIDs[] = {
-    {"1.2.840.113549",  "RSA Data Security Inc."},
-    {"1.2.840.113549.1",    "PKCS"},
-    {"1.2.840.113549.2",    "RSA digest algorithm"},
-    {"1.2.840.113549.3",    "RSA cipher algorithm"},
-    {"1.2.840.113549.1.1",  "PKCS #1"},
-    {"1.2.840.113549.1.2",  "Unknown"},
-    {"1.2.840.113549.1.3",  "Unknown"},
-    {"1.2.840.113549.1.4",  "Unknown"},
-    {"1.2.840.113549.1.5",  "PKCS #5"},
-    {"1.2.840.113549.1.6",  "Unknown"},
-    {"1.2.840.113549.1.7",  "PKCS #7"},
-    {"1.2.840.113549.1.8",  "Unknown"},
-    {"1.2.840.113549.1.9",  "PKCS #9"},
-    {"1.2.840.113549.1.10", "Unknown"},
-    {"1.2.840.113549.1.12", "PKCS #12"},
-    {"1.2.840.113549.1.1.2",    "PKCS #1 MD2 With RSA Encryption"},
-    {"1.2.840.113549.1.1.3",    "PKCS #1 MD4 With RSA Encryption"},
-    {"1.2.840.113549.1.1.4",    "PKCS #1 MD5 With RSA Encryption"},
-    {"1.2.840.113549.1.1.1",    "PKCS #1 RSA Encryption"},
-    {"1.2.840.113549.1.1.2",    "PKCS #1 MD2 With RSA Encryption"},
-    {"1.2.840.113549.1.1.3",    "PKCS #1 MD4 With RSA Encryption"},
-    {"1.2.840.113549.1.1.4",    "PKCS #1 MD5 With RSA Encryption"},
-    {"1.2.840.113549.1.1.5",    "PKCS #1 SHA-1 With RSA Encryption"},
-    {"1.2.840.113549.1.1.5",    "PKCS #1 SHA-1 With RSA Encryption"},
-    {"1.2.840.113549.1.3.1",    "Unknown"},
-    {"1.2.840.113549.1.7.1",    "PKCS #7 Data"},
-    {"1.2.840.113549.1.7.2",    "PKCS #7 Signed Data"},
-    {"1.2.840.113549.1.7.3",    "PKCS #7 Enveloped Data"},
-    {"1.2.840.113549.1.7.4",    "PKCS #7 Signed and Enveloped Data"},
-    {"1.2.840.113549.1.7.5",    "PKCS #7 Digested Data"},
-    {"1.2.840.113549.1.7.5",    "PKCS #7 Digested Data"},
-    {"1.2.840.113549.1.7.6",    "PKCS #7 Encrypted Data"},
-    {"1.2.840.113549.1.9.1",    "PKCS #9 Email Address"},
-    {"1.2.840.113549.1.9.2",    "PKCS #9 Unstructured Name"},
-    {"1.2.840.113549.1.9.3",    "PKCS #9 Content Type"},
-    {"1.2.840.113549.1.9.4",    "PKCS #9 Message Digest"},
-    {"1.2.840.113549.1.9.5",    "PKCS #9 Signing Time"},
-    {"1.2.840.113549.1.9.6",    "PKCS #9 Counter Signature"},
-    {"1.2.840.113549.1.9.7",    "PKCS #9 Challenge Password"},
-    {"1.2.840.113549.1.9.8",    "PKCS #9 Unstructured Address"},
-    {"1.2.840.113549.1.9.9",    "PKCS #9 Extended Certificate Attributes"},
-    {"1.2.840.113549.1.9.15",   "PKCS #9 S/MIME Capabilities"},
-    {"1.2.840.113549.1.9.15.1", "Unknown"},
-    {"1.2.840.113549.3.2",  "RC2-CBC"},
-    {"1.2.840.113549.3.4",  "RC4"},
-    {"1.2.840.113549.3.7",  "DES-EDE3-CBC"},
-    {"1.2.840.113549.3.9",  "RC5-CBCPad"},
-    {"1.2.840.10046",   "ANSI X9.42"},
-    {"1.2.840.10046.2.1",   "Diffie-Hellman Public Key Algorithm"},
-    {"1.2.840.10040",   "ANSI X9.57"},
-    {"1.2.840.10040.4.1",   "ANSI X9.57 DSA Signature"},
-    {"1.2.840.10040.4.3",   "ANSI X9.57 Algorithm DSA Signature with SHA-1 Digest"},
-    {"2.5", "Directory"},
-    {"2.5.8",   "X.500-defined algorithms"},
-    {"2.5.8.1", "X.500-defined encryption algorithms"},
-    {"2.5.8.2", "Unknown"},
-    {"2.5.8.3", "Unknown"},
-    {"2.5.8.1.1",   "RSA Encryption Algorithm"},
-    {"1.3.14",  "Open Systems Implementors Workshop"},
-    {"1.3.14.3.2",  "OIW SECSIG Algorithm"},
-    {"1.3.14.3.2.2",    "Unknown"},
-    {"1.3.14.3.2.3",    "Unknown"},
-    {"1.3.14.3.2.4",    "Unknown"},
-    {"1.3.14.3.2.6",    "DES-ECB"},
-    {"1.3.14.3.2.7",    "DES-CBC"},
-    {"1.3.14.3.2.8",    "DES-OFB"},
-    {"1.3.14.3.2.9",    "DES-CFB"},
-    {"1.3.14.3.2.10",   "DES-MAC"},
-    {"1.3.14.3.2.11",   "Unknown"},
-    {"1.3.14.3.2.12",   "Unknown"},
-    {"1.3.14.3.2.13",   "Unknown"},
-    {"1.3.14.3.2.14",   "Unknown"},
-    {"1.3.14.3.2.15",   "ISO SHA with RSA Signature"},
-    {"1.3.14.3.2.16",   "Unknown"},
-    {"1.3.14.3.2.17",   "DES-EDE"},
-    {"1.3.14.3.2.18",   "Unknown"},
-    {"1.3.14.3.2.19",   "Unknown"},
-    {"1.3.14.3.2.20",   "Unknown"},
-    {"1.3.14.3.2.21",   "Unknown"},
-    {"1.3.14.3.2.22",   "Unknown"},
-    {"1.3.14.3.2.23",   "Unknown"},
-    {"1.3.14.3.2.24",   "Unknown"},
-    {"1.3.14.3.2.25",   "Unknown"},
-    {"1.3.14.3.2.26",   "SHA-1"},
-    {"1.3.14.3.2.27",   "Forgezza DSA Signature with SHA-1 Digest"},
-    {"1.3.14.3.2.28",   "Unknown"},
-    {"1.3.14.3.2.29",   "Unknown"},
-    {"1.3.14.7.2",  "Unknown"},
-    {"1.3.14.7.2.1",    "Unknown"},
-    {"1.3.14.7.2.2",    "Unknown"},
-    {"1.3.14.7.2.3",    "Unknown"},
-    {"1.3.14.7.2.2.1",  "Unknown"},
-    {"1.3.14.7.2.3.1",  "Unknown"},
-    {"2.16.840.1.101.2.1",  "US DOD Infosec"},
-    {"2.16.840.1.101.2.1.1.1",  "Unknown"},
-    {"2.16.840.1.101.2.1.1.2",  "MISSI DSS Algorithm (Old)"},
-    {"2.16.840.1.101.2.1.1.3",  "Unknown"},
-    {"2.16.840.1.101.2.1.1.4",  "Skipjack CBC64"},
-    {"2.16.840.1.101.2.1.1.5",  "Unknown"},
-    {"2.16.840.1.101.2.1.1.6",  "Unknown"},
-    {"2.16.840.1.101.2.1.1.7",  "Unknown"},
-    {"2.16.840.1.101.2.1.1.8",  "Unknown"},
-    {"2.16.840.1.101.2.1.1.9",  "Unknown"},
-    {"2.16.840.1.101.2.1.1.10", "MISSI KEA Algorithm"},
-    {"2.16.840.1.101.2.1.1.11", "Unknown"},
-    {"2.16.840.1.101.2.1.1.12", "MISSI KEA and DSS Algorithm (Old)"},
-    {"2.16.840.1.101.2.1.1.13", "Unknown"},
-    {"2.16.840.1.101.2.1.1.14", "Unknown"},
-    {"2.16.840.1.101.2.1.1.15", "Unknown"},
-    {"2.16.840.1.101.2.1.1.16", "Unknown"},
-    {"2.16.840.1.101.2.1.1.17", "Unknown"},
-    {"2.16.840.1.101.2.1.1.18", "Unknown"},
-    {"2.16.840.1.101.2.1.1.19", "MISSI DSS Algorithm"},
-    {"2.16.840.1.101.2.1.1.20", "MISSI KEA and DSS Algorithm"},
-    {"2.16.840.1.101.2.1.1.21", "Unknown"}
+    {"1.2.840.113549",	"RSA Data Security Inc."},
+    {"1.2.840.113549.1",	"PKCS"},
+    {"1.2.840.113549.2",	"RSA digest algorithm"},
+    {"1.2.840.113549.3",	"RSA cipher algorithm"},
+    {"1.2.840.113549.1.1",	"PKCS #1"},
+    {"1.2.840.113549.1.2",	"Unknown"},
+    {"1.2.840.113549.1.3",	"Unknown"},
+    {"1.2.840.113549.1.4",	"Unknown"},
+    {"1.2.840.113549.1.5",	"PKCS #5"},
+    {"1.2.840.113549.1.6",	"Unknown"},
+    {"1.2.840.113549.1.7",	"PKCS #7"},
+    {"1.2.840.113549.1.8",	"Unknown"},
+    {"1.2.840.113549.1.9",	"PKCS #9"},
+    {"1.2.840.113549.1.10",	"Unknown"},
+    {"1.2.840.113549.1.12",	"PKCS #12"},
+    {"1.2.840.113549.1.1.2",	"PKCS #1 MD2 With RSA Encryption"},
+    {"1.2.840.113549.1.1.3",	"PKCS #1 MD4 With RSA Encryption"},
+    {"1.2.840.113549.1.1.4",	"PKCS #1 MD5 With RSA Encryption"},
+    {"1.2.840.113549.1.1.1",	"PKCS #1 RSA Encryption"},
+    {"1.2.840.113549.1.1.2",	"PKCS #1 MD2 With RSA Encryption"},
+    {"1.2.840.113549.1.1.3",	"PKCS #1 MD4 With RSA Encryption"},
+    {"1.2.840.113549.1.1.4",	"PKCS #1 MD5 With RSA Encryption"},
+    {"1.2.840.113549.1.1.5",	"PKCS #1 SHA-1 With RSA Encryption"},
+    {"1.2.840.113549.1.1.5",	"PKCS #1 SHA-1 With RSA Encryption"},
+    {"1.2.840.113549.1.3.1",	"Unknown"},
+    {"1.2.840.113549.1.7.1",	"PKCS #7 Data"},
+    {"1.2.840.113549.1.7.2",	"PKCS #7 Signed Data"},
+    {"1.2.840.113549.1.7.3",	"PKCS #7 Enveloped Data"},
+    {"1.2.840.113549.1.7.4",	"PKCS #7 Signed and Enveloped Data"},
+    {"1.2.840.113549.1.7.5",	"PKCS #7 Digested Data"},
+    {"1.2.840.113549.1.7.5",	"PKCS #7 Digested Data"},
+    {"1.2.840.113549.1.7.6",	"PKCS #7 Encrypted Data"},
+    {"1.2.840.113549.1.9.1",	"PKCS #9 Email Address"},
+    {"1.2.840.113549.1.9.2",	"PKCS #9 Unstructured Name"},
+    {"1.2.840.113549.1.9.3",	"PKCS #9 Content Type"},
+    {"1.2.840.113549.1.9.4",	"PKCS #9 Message Digest"},
+    {"1.2.840.113549.1.9.5",	"PKCS #9 Signing Time"},
+    {"1.2.840.113549.1.9.6",	"PKCS #9 Counter Signature"},
+    {"1.2.840.113549.1.9.7",	"PKCS #9 Challenge Password"},
+    {"1.2.840.113549.1.9.8",	"PKCS #9 Unstructured Address"},
+    {"1.2.840.113549.1.9.9",	"PKCS #9 Extended Certificate Attributes"},
+    {"1.2.840.113549.1.9.15",	"PKCS #9 S/MIME Capabilities"},
+    {"1.2.840.113549.1.9.15.1",	"Unknown"},
+    {"1.2.840.113549.3.2",	"RC2-CBC"},
+    {"1.2.840.113549.3.4",	"RC4"},
+    {"1.2.840.113549.3.7",	"DES-EDE3-CBC"},
+    {"1.2.840.113549.3.9",	"RC5-CBCPad"},
+    {"1.2.840.10046",	"ANSI X9.42"},
+    {"1.2.840.10046.2.1",	"Diffie-Hellman Public Key Algorithm"},
+    {"1.2.840.10040",	"ANSI X9.57"},
+    {"1.2.840.10040.4.1",	"ANSI X9.57 DSA Signature"},
+    {"1.2.840.10040.4.3",	"ANSI X9.57 Algorithm DSA Signature with SHA-1 Digest"},
+    {"2.5",	"Directory"},
+    {"2.5.8",	"X.500-defined algorithms"},
+    {"2.5.8.1",	"X.500-defined encryption algorithms"},
+    {"2.5.8.2",	"Unknown"},
+    {"2.5.8.3",	"Unknown"},
+    {"2.5.8.1.1",	"RSA Encryption Algorithm"},
+    {"1.3.14",	"Open Systems Implementors Workshop"},
+    {"1.3.14.3.2",	"OIW SECSIG Algorithm"},
+    {"1.3.14.3.2.2",	"Unknown"},
+    {"1.3.14.3.2.3",	"Unknown"},
+    {"1.3.14.3.2.4",	"Unknown"},
+    {"1.3.14.3.2.6",	"DES-ECB"},
+    {"1.3.14.3.2.7",	"DES-CBC"},
+    {"1.3.14.3.2.8",	"DES-OFB"},
+    {"1.3.14.3.2.9",	"DES-CFB"},
+    {"1.3.14.3.2.10",	"DES-MAC"},
+    {"1.3.14.3.2.11",	"Unknown"},
+    {"1.3.14.3.2.12",	"Unknown"},
+    {"1.3.14.3.2.13",	"Unknown"},
+    {"1.3.14.3.2.14",	"Unknown"},
+    {"1.3.14.3.2.15",	"ISO SHA with RSA Signature"},
+    {"1.3.14.3.2.16",	"Unknown"},
+    {"1.3.14.3.2.17",	"DES-EDE"},
+    {"1.3.14.3.2.18",	"Unknown"},
+    {"1.3.14.3.2.19",	"Unknown"},
+    {"1.3.14.3.2.20",	"Unknown"},
+    {"1.3.14.3.2.21",	"Unknown"},
+    {"1.3.14.3.2.22",	"Unknown"},
+    {"1.3.14.3.2.23",	"Unknown"},
+    {"1.3.14.3.2.24",	"Unknown"},
+    {"1.3.14.3.2.25",	"Unknown"},
+    {"1.3.14.3.2.26",	"SHA-1"},
+    {"1.3.14.3.2.27",	"Forgezza DSA Signature with SHA-1 Digest"},
+    {"1.3.14.3.2.28",	"Unknown"},
+    {"1.3.14.3.2.29",	"Unknown"},
+    {"1.3.14.7.2",	"Unknown"},
+    {"1.3.14.7.2.1",	"Unknown"},
+    {"1.3.14.7.2.2",	"Unknown"},
+    {"1.3.14.7.2.3",	"Unknown"},
+    {"1.3.14.7.2.2.1",	"Unknown"},
+    {"1.3.14.7.2.3.1",	"Unknown"},
+    {"2.16.840.1.101.2.1",	"US DOD Infosec"},
+    {"2.16.840.1.101.2.1.1.1",	"Unknown"},
+    {"2.16.840.1.101.2.1.1.2",	"MISSI DSS Algorithm (Old)"},
+    {"2.16.840.1.101.2.1.1.3",	"Unknown"},
+    {"2.16.840.1.101.2.1.1.4",	"Skipjack CBC64"},
+    {"2.16.840.1.101.2.1.1.5",	"Unknown"},
+    {"2.16.840.1.101.2.1.1.6",	"Unknown"},
+    {"2.16.840.1.101.2.1.1.7",	"Unknown"},
+    {"2.16.840.1.101.2.1.1.8",	"Unknown"},
+    {"2.16.840.1.101.2.1.1.9",	"Unknown"},
+    {"2.16.840.1.101.2.1.1.10",	"MISSI KEA Algorithm"},
+    {"2.16.840.1.101.2.1.1.11",	"Unknown"},
+    {"2.16.840.1.101.2.1.1.12",	"MISSI KEA and DSS Algorithm (Old)"},
+    {"2.16.840.1.101.2.1.1.13",	"Unknown"},
+    {"2.16.840.1.101.2.1.1.14",	"Unknown"},
+    {"2.16.840.1.101.2.1.1.15",	"Unknown"},
+    {"2.16.840.1.101.2.1.1.16",	"Unknown"},
+    {"2.16.840.1.101.2.1.1.17",	"Unknown"},
+    {"2.16.840.1.101.2.1.1.18",	"Unknown"},
+    {"2.16.840.1.101.2.1.1.19",	"MISSI DSS Algorithm"},
+    {"2.16.840.1.101.2.1.1.20",	"MISSI KEA and DSS Algorithm"},
+    {"2.16.840.1.101.2.1.1.21",	"Unknown"}
 };
 
 int nOID = 115;
diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
index 5e466ab471a5..049b52185aaa 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 //CP : added by CP
 #include <rtl/locale.h>
-#include <osl/nlsupport.h>
+#include <osl/nlsupport.h> 
 #include <osl/process.h>
 
 //CP : end
@@ -171,7 +171,7 @@ SecurityEnvironment_MSCryptImpl :: ~SecurityEnvironment_MSCryptImpl() {
         for( priKeyIt = m_tPriKeyList.begin() ; priKeyIt != m_tPriKeyList.end() ; priKeyIt ++ )
             CryptDestroyKey( *priKeyIt ) ;
     }
-
+    
 }
 
 /* XInitialization */
@@ -222,10 +222,10 @@ Reference< XSingleServiceFactory > SecurityEnvironment_MSCryptImpl :: impl_creat
 }
 
 /* XUnoTunnel */
-sal_Int64 SAL_CALL SecurityEnvironment_MSCryptImpl :: getSomething( const Sequence< sal_Int8 >& aIdentifier )
+sal_Int64 SAL_CALL SecurityEnvironment_MSCryptImpl :: getSomething( const Sequence< sal_Int8 >& aIdentifier ) 
     throw( RuntimeException )
 {
-    if( aIdentifier.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) {
+    if( aIdentifier.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) { 
         return ( sal_Int64 )this ;
     }
     return 0 ;
@@ -317,7 +317,7 @@ void SecurityEnvironment_MSCryptImpl :: setCertDb( HCERTSTORE aCertDb ) throw( E
 }
 
 void SecurityEnvironment_MSCryptImpl :: adoptSymKey( HCRYPTKEY aSymKey ) throw( Exception , RuntimeException ) {
-    HCRYPTKEY   symkey ;
+    HCRYPTKEY	symkey ;
     std::list< HCRYPTKEY >::iterator keyIt ;
 
     if( aSymKey != NULL ) {
@@ -373,7 +373,7 @@ HCRYPTKEY SecurityEnvironment_MSCryptImpl :: getSymKey( unsigned int position )
 }
 
 void SecurityEnvironment_MSCryptImpl :: adoptPubKey( HCRYPTKEY aPubKey ) throw( Exception , RuntimeException ) {
-    HCRYPTKEY   pubkey ;
+    HCRYPTKEY	pubkey ;
     std::list< HCRYPTKEY >::iterator keyIt ;
 
     if( aPubKey != NULL ) {
@@ -429,7 +429,7 @@ HCRYPTKEY SecurityEnvironment_MSCryptImpl :: getPubKey( unsigned int position )
 }
 
 void SecurityEnvironment_MSCryptImpl :: adoptPriKey( HCRYPTKEY aPriKey ) throw( Exception , RuntimeException ) {
-    HCRYPTKEY   prikey ;
+    HCRYPTKEY	prikey ;
     std::list< HCRYPTKEY >::iterator keyIt ;
 
     if( aPriKey != NULL ) {
@@ -455,7 +455,7 @@ void SecurityEnvironment_MSCryptImpl :: adoptPriKey( HCRYPTKEY aPriKey ) throw(
 }
 
 void SecurityEnvironment_MSCryptImpl :: rejectPriKey( HCRYPTKEY aPriKey ) throw( Exception , RuntimeException ) {
-    HCRYPTKEY   prikey ;
+    HCRYPTKEY	prikey ;
     std::list< HCRYPTKEY >::iterator keyIt ;
 
     if( aPriKey != NULL ) {
@@ -485,7 +485,7 @@ HCRYPTKEY SecurityEnvironment_MSCryptImpl :: getPriKey( unsigned int position )
 }
 
 //Methods from XSecurityEnvironment
-Sequence< Reference < XCertificate > > SecurityEnvironment_MSCryptImpl :: getPersonalCertificates() throw( SecurityException , RuntimeException )
+Sequence< Reference < XCertificate > > SecurityEnvironment_MSCryptImpl :: getPersonalCertificates() throw( SecurityException , RuntimeException ) 
 {
     sal_Int32 length ;
     X509Certificate_MSCryptImpl* xcert ;
@@ -573,8 +573,8 @@ Sequence< Reference < XCertificate > > SecurityEnvironment_MSCryptImpl :: getPer
 
 Reference< XCertificate > SecurityEnvironment_MSCryptImpl :: getCertificate( const OUString& issuerName, const Sequence< sal_Int8 >& serialNumber ) throw( SecurityException , RuntimeException ) {
     unsigned int i ;
-//  sal_Int8 found = 0 ;
-    LPSTR   pszName ;
+//	sal_Int8 found = 0 ;
+    LPSTR	pszName ;
     X509Certificate_MSCryptImpl *xcert = NULL ;
     PCCERT_CONTEXT pCertContext = NULL ;
     HCERTSTORE hCertStore = NULL ;
@@ -621,8 +621,8 @@ Reference< XCertificate > SecurityEnvironment_MSCryptImpl :: getCertificate( con
 
     //Get the SerialNumber
     cryptSerialNumber.cbData = serialNumber.getLength() ;
-    cryptSerialNumber.pbData = ( BYTE* )malloc( cryptSerialNumber.cbData);
-    if (!cryptSerialNumber.pbData)
+    cryptSerialNumber.pbData = ( BYTE* )malloc( cryptSerialNumber.cbData); 
+    if (!cryptSerialNumber.pbData) 
     {
         free( certInfo.Issuer.pbData ) ;
         throw RuntimeException() ;
@@ -632,7 +632,7 @@ Reference< XCertificate > SecurityEnvironment_MSCryptImpl :: getCertificate( con
 
     certInfo.SerialNumber.cbData = cryptSerialNumber.cbData ;
     certInfo.SerialNumber.pbData = cryptSerialNumber.pbData ;
-
+        
     // Get the Cert from all store.
     for( i = 0 ; i < 6 ; i ++ )
     {
@@ -667,11 +667,11 @@ Reference< XCertificate > SecurityEnvironment_MSCryptImpl :: getCertificate( con
             continue;
         }
 
-/*******************************************************************************
- * This code reserved for remind us there are another way to find one cert by
- * IssuerName&serialnumber. You can use the code to replaced the function
+/******************************************************************************* 
+ * This code reserved for remind us there are another way to find one cert by 
+ * IssuerName&serialnumber. You can use the code to replaced the function 
  * CertFindCertificateInStore IF and ONLY IF you must find one special cert in
- * certStore but can not be found by CertFindCertificateInStore , then , you
+ * certStore but can not be found by CertFindCertificateInStore , then , you 
  * should also change the same part in libxmlsec/.../src/mscrypto/x509vfy.c#875.
  * By Chandler Peng(chandler.peng@sun.com)
  *****/
@@ -679,7 +679,7 @@ Reference< XCertificate > SecurityEnvironment_MSCryptImpl :: getCertificate( con
         pCertContext = NULL ;
         found = 0;
         do{
-            //  1. enum the certs has same string in the issuer string.
+            //	1. enum the certs has same string in the issuer string.
             pCertContext = CertEnumCertificatesInStore( hCertStore , pCertContext ) ;
             if( pCertContext != NULL )
             {
@@ -693,7 +693,7 @@ Reference< XCertificate > SecurityEnvironment_MSCryptImpl :: getCertificate( con
                     CERT_X500_NAME_STR | CERT_NAME_STR_REVERSE_FLAG ,
                     NULL, 0
                 ) ;
-
+                
                 if( cbIssuer == 0 ) continue ; // discard this cert;
 
                 issuer = (char *)malloc( cbIssuer ) ;
@@ -719,7 +719,7 @@ Reference< XCertificate > SecurityEnvironment_MSCryptImpl :: getCertificate( con
                     continue ;// discard this cert;
                 }
 
-                if(strncmp(pszName , issuer , cbIssuer) != 0)
+                if(strncmp(pszName , issuer , cbIssuer) != 0) 
                 {
                     free( issuer ) ;
                     continue ;// discard this cert;
@@ -738,7 +738,7 @@ Reference< XCertificate > SecurityEnvironment_MSCryptImpl :: getCertificate( con
             }
 
         }while(pCertContext);
-
+        
         if(i != 0 && i != 1) CertCloseStore( hCertStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
         if( found != 0 ) break; // Found the certificate.
 ********************************************************************************/
@@ -751,7 +751,7 @@ Reference< XCertificate > SecurityEnvironment_MSCryptImpl :: getCertificate( con
             &certInfo,
             NULL
         ) ;
-
+    
         if(i != 0 && i != 1) CertCloseStore( hCertStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
         if( pCertContext != NULL ) break ; // Found the certificate.
 
@@ -780,9 +780,9 @@ Sequence< Reference < XCertificate > > SecurityEnvironment_MSCryptImpl :: buildC
     PCCERT_CONTEXT pCertContext ;
     const X509Certificate_MSCryptImpl* xcert ;
 
-    CERT_ENHKEY_USAGE   enhKeyUsage ;
-    CERT_USAGE_MATCH    certUsage ;
-    CERT_CHAIN_PARA     chainPara ;
+    CERT_ENHKEY_USAGE	enhKeyUsage ;
+    CERT_USAGE_MATCH	certUsage ;
+    CERT_CHAIN_PARA		chainPara ;
 
     enhKeyUsage.cUsageIdentifier = 0 ;
     enhKeyUsage.rgpszUsageIdentifier = NULL ;
@@ -857,7 +857,7 @@ Sequence< Reference < XCertificate > > SecurityEnvironment_MSCryptImpl :: buildC
             &pChainContext);
         if (!bChain)
             pChainContext = NULL;
-
+        
         //Close the additional store
        CertCloseStore(hCollectionStore, CERT_CLOSE_STORE_CHECK_FLAG);
     }
@@ -964,16 +964,16 @@ HCERTSTORE getCertStoreForIntermediatCerts(
 //explicitly that all validation steps are carried out even if one or several
 //errors occur. See also
 //http://wiki.services.openoffice.org/wiki/Certificate_Path_Validation#Validation_status
-sal_Int32 SecurityEnvironment_MSCryptImpl :: verifyCertificate(
+sal_Int32 SecurityEnvironment_MSCryptImpl :: verifyCertificate( 
     const Reference< ::com::sun::star::security::XCertificate >& aCert,
-    const Sequence< Reference< ::com::sun::star::security::XCertificate > >& seqCerts)
-    throw( ::com::sun::star::uno::SecurityException, ::com::sun::star::uno::RuntimeException )
+    const Sequence< Reference< ::com::sun::star::security::XCertificate > >& seqCerts) 
+    throw( ::com::sun::star::uno::SecurityException, ::com::sun::star::uno::RuntimeException ) 
 {
     sal_Int32 validity = 0;
     PCCERT_CHAIN_CONTEXT pChainContext = NULL;
     PCCERT_CONTEXT pCertContext = NULL;
     const X509Certificate_MSCryptImpl* xcert = NULL;
-
+    
     Reference< XUnoTunnel > xCertTunnel( aCert, UNO_QUERY ) ;
     if( !xCertTunnel.is() ) {
         throw RuntimeException() ;
@@ -987,14 +987,14 @@ sal_Int32 SecurityEnvironment_MSCryptImpl :: verifyCertificate(
     if( xcert == NULL ) {
         throw RuntimeException() ;
     }
-
+    
     pCertContext = xcert->getMswcryCert() ;
 
-    CERT_ENHKEY_USAGE   enhKeyUsage ;
-    CERT_USAGE_MATCH    certUsage ;
-    CERT_CHAIN_PARA     chainPara ;
+    CERT_ENHKEY_USAGE	enhKeyUsage ;
+    CERT_USAGE_MATCH	certUsage ;
+    CERT_CHAIN_PARA		chainPara ;
     rtl_zeroMemory(&chainPara, sizeof(CERT_CHAIN_PARA));
-
+    
     //Prepare parameter for CertGetCertificateChain
     enhKeyUsage.cUsageIdentifier = 0 ;
     enhKeyUsage.rgpszUsageIdentifier = NULL ;
@@ -1012,7 +1012,7 @@ sal_Int32 SecurityEnvironment_MSCryptImpl :: verifyCertificate(
         hIntermediateCertsStore =
             getCertStoreForIntermediatCerts(seqCerts);
 
-        //Merge m_hCertStore and m_hKeyStore and the store of the intermediate
+        //Merge m_hCertStore and m_hKeyStore and the store of the intermediate 
         //certificates into one store.
         hCollectionStore = CertOpenStore(
             CERT_STORE_PROV_COLLECTION ,
@@ -1038,9 +1038,9 @@ sal_Int32 SecurityEnvironment_MSCryptImpl :: verifyCertificate(
                 hIntermediateCertsStore,
                 CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG,
                 0);
-
+                
         }
-
+        
         //CertGetCertificateChain searches by default in MY, CA, ROOT and TRUST
         //We do not check revocation of the root. In most cases there are none.
         //Then we would get CERT_TRUST_REVOCATION_STATUS_UNKNOWN
@@ -1051,7 +1051,7 @@ sal_Int32 SecurityEnvironment_MSCryptImpl :: verifyCertificate(
             NULL , //use current system time
             hCollectionStore,
             &chainPara ,
-            CERT_CHAIN_REVOCATION_CHECK_CHAIN | CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT,
+            CERT_CHAIN_REVOCATION_CHECK_CHAIN | CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT, 
             NULL ,
             &pChainContext);
 
@@ -1166,9 +1166,9 @@ sal_Int32 SecurityEnvironment_MSCryptImpl :: getCertificateCharacters( const ::c
 
     //Secondly, make sentence whether or not the cert has a private key.
     {
-        BOOL    fCallerFreeProv ;
-        DWORD   dwKeySpec ;
-        HCRYPTPROV  hProv ;
+        BOOL	fCallerFreeProv ;
+        DWORD	dwKeySpec ;
+        HCRYPTPROV	hProv ;
         if( CryptAcquireCertificatePrivateKey( pCertContext ,
                    0 ,
                    NULL ,
diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
index 6da54acc7cd4..187a302d038e 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,22 +65,22 @@ class SecurityEnvironment_MSCryptImpl : public ::cppu::WeakImplHelper4<
 {
     private :
         //cyrpto provider and key container
-        HCRYPTPROV                          m_hProv ;
-        LPCTSTR                             m_pszContainer ;
+        HCRYPTPROV							m_hProv ;
+        LPCTSTR								m_pszContainer ;
 
         //Key store
-        HCERTSTORE                          m_hKeyStore ;
+        HCERTSTORE							m_hKeyStore ;
 
         //Certiticate store
-        HCERTSTORE                          m_hCertStore ;
+        HCERTSTORE							m_hCertStore ;
 
         //Enable default system cryptography setting
-        sal_Bool                            m_bEnableDefault ;
+        sal_Bool							m_bEnableDefault ;
 
         //External keys
-        std::list< HCRYPTKEY >              m_tSymKeyList ;
-        std::list< HCRYPTKEY >              m_tPubKeyList ;
-        std::list< HCRYPTKEY >              m_tPriKeyList ;
+        std::list< HCRYPTKEY >				m_tSymKeyList ;
+        std::list< HCRYPTKEY >				m_tPubKeyList ;
+        std::list< HCRYPTKEY >				m_tPriKeyList ;
 
         //Service manager
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager ;
@@ -102,15 +102,15 @@ class SecurityEnvironment_MSCryptImpl : public ::cppu::WeakImplHelper4<
 
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL createCertificateFromAscii( const ::rtl::OUString& asciiCertificate ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ;
 
-        virtual ::sal_Int32 SAL_CALL verifyCertificate(
+        virtual ::sal_Int32 SAL_CALL verifyCertificate( 
             const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& xCert,
-            const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference<
-            ::com::sun::star::security::XCertificate > >& intermediateCertificates)
+            const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< 
+            ::com::sun::star::security::XCertificate > >& intermediateCertificates) 
             throw (::com::sun::star::uno::SecurityException, ::com::sun::star::uno::RuntimeException) ;
     virtual ::sal_Int32 SAL_CALL getCertificateCharacters( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& xCert ) throw (::com::sun::star::uno::SecurityException, ::com::sun::star::uno::RuntimeException) ;
-
+    
         virtual ::rtl::OUString SAL_CALL getSecurityEnvironmentInformation(  ) throw (::com::sun::star::uno::RuntimeException);
-
+    
 
         //Methods from XInitialization
         virtual void SAL_CALL initialize(
@@ -137,7 +137,7 @@ class SecurityEnvironment_MSCryptImpl : public ::cppu::WeakImplHelper4<
         static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > impl_createFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) ;
 
         //Methods from XUnoTunnel
-        virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier )
+        virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) 
             throw (::com::sun::star::uno::RuntimeException);
 
         static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId() ;
@@ -188,6 +188,6 @@ class SecurityEnvironment_MSCryptImpl : public ::cppu::WeakImplHelper4<
         virtual void destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
 } ;
 
-#endif  // _XSECURITYENVIRONMENT_MSCRYPTIMPL_HXX_
+#endif	// _XSECURITYENVIRONMENT_MSCRYPTIMPL_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
index 72063a140240..5f728c6b23ce 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,26 +51,26 @@ SEInitializer_MSCryptImpl::SEInitializer_MSCryptImpl(
 {
 }
 
-SEInitializer_MSCryptImpl::~SEInitializer_MSCryptImpl()
+SEInitializer_MSCryptImpl::~SEInitializer_MSCryptImpl() 
 {
 }
 
 /* XSEInitializer */
-cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL
+cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL 
     SEInitializer_MSCryptImpl::createSecurityContext(
     const rtl::OUString& sCertDB )
     throw (cssu::RuntimeException)
 {
     const char* n_pCertStore ;
     HCERTSTORE  n_hStoreHandle ;
-
+    
     //Initialize the crypto engine
-    if( sCertDB.getLength() > 0 )
+    if( sCertDB.getLength() > 0 ) 
     {
         rtl::OString sCertDir(sCertDB, sCertDB.getLength(), RTL_TEXTENCODING_ASCII_US);
         n_pCertStore = sCertDir.getStr();
         n_hStoreHandle = CertOpenSystemStore( NULL, n_pCertStore ) ;
-        if( n_hStoreHandle == NULL )
+        if( n_hStoreHandle == NULL ) 
         {
             return NULL;
         }
@@ -80,50 +80,50 @@ cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL
         n_pCertStore = NULL ;
         n_hStoreHandle = NULL ;
     }
-
+    
     xmlSecMSCryptoAppInit( n_pCertStore ) ;
 
     try {
         /* Build Security Environment */
-        const rtl::OUString sSecyrutyEnvironment ( RTL_CONSTASCII_USTRINGPARAM( SECURITY_ENVIRONMENT ) );
+        const rtl::OUString sSecyrutyEnvironment ( RTL_CONSTASCII_USTRINGPARAM( SECURITY_ENVIRONMENT ) );	
         cssu::Reference< cssxc::XSecurityEnvironment > xSecEnv( mxMSF->createInstance ( sSecyrutyEnvironment ), cssu::UNO_QUERY );
-        if( !xSecEnv.is() )
+        if( !xSecEnv.is() ) 
         {
             if( n_hStoreHandle != NULL )
             {
                 CertCloseStore( n_hStoreHandle, CERT_CLOSE_STORE_FORCE_FLAG ) ;
             }
-
+        
             xmlSecMSCryptoAppShutdown() ;
             return NULL;
         }
-
+        
         /* Setup key slot and certDb */
         cssu::Reference< cssl::XUnoTunnel > xEnvTunnel( xSecEnv , cssu::UNO_QUERY ) ;
-        if( !xEnvTunnel.is() )
+        if( !xEnvTunnel.is() ) 
         {
             if( n_hStoreHandle != NULL )
             {
                 CertCloseStore( n_hStoreHandle, CERT_CLOSE_STORE_FORCE_FLAG ) ;
             }
-
+        
             xmlSecMSCryptoAppShutdown() ;
             return NULL;
         }
 
         SecurityEnvironment_MSCryptImpl* pSecEnv = ( SecurityEnvironment_MSCryptImpl* )xEnvTunnel->getSomething( SecurityEnvironment_MSCryptImpl::getUnoTunnelId() ) ;
-        if( pSecEnv == NULL )
+        if( pSecEnv == NULL ) 
         {
             if( n_hStoreHandle != NULL )
             {
                 CertCloseStore( n_hStoreHandle, CERT_CLOSE_STORE_FORCE_FLAG ) ;
             }
-
+        
             xmlSecMSCryptoAppShutdown() ;
             return NULL;
         }
 
-        if( n_hStoreHandle != NULL )
+        if( n_hStoreHandle != NULL ) 
         {
             pSecEnv->setCryptoSlot( n_hStoreHandle ) ;
             pSecEnv->setCertDb( n_hStoreHandle ) ;
@@ -134,19 +134,19 @@ cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL
         }
 
         /* Build XML Security Context */
-        const rtl::OUString sSecyrutyContext ( RTL_CONSTASCII_USTRINGPARAM( SECURITY_CONTEXT ) );
+        const rtl::OUString sSecyrutyContext ( RTL_CONSTASCII_USTRINGPARAM( SECURITY_CONTEXT ) );	
         cssu::Reference< cssxc::XXMLSecurityContext > xSecCtx( mxMSF->createInstance ( sSecyrutyContext ), cssu::UNO_QUERY );
-        if( !xSecCtx.is() )
+        if( !xSecCtx.is() ) 
         {
             if( n_hStoreHandle != NULL )
             {
                 CertCloseStore( n_hStoreHandle, CERT_CLOSE_STORE_FORCE_FLAG ) ;
             }
-
+        
             xmlSecMSCryptoAppShutdown() ;
             return NULL;
         }
-
+        
         xSecCtx->setDefaultSecurityEnvironmentIndex(xSecCtx->addSecurityEnvironment( xSecEnv )) ;
         return xSecCtx;
     }
@@ -156,7 +156,7 @@ cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL
         {
             CertCloseStore( n_hStoreHandle, CERT_CLOSE_STORE_FORCE_FLAG ) ;
         }
-
+    
         xmlSecMSCryptoAppShutdown() ;
         return NULL;
     }
@@ -168,27 +168,27 @@ void SAL_CALL SEInitializer_MSCryptImpl::freeSecurityContext( const cssu::Refere
     /*
     cssu::Reference< cssxc::XSecurityEnvironment > xSecEnv
         = securityContext->getSecurityEnvironment();
-
-    if( xSecEnv.is() )
+        
+    if( xSecEnv.is() ) 
     {
         cssu::Reference< cssl::XUnoTunnel > xEnvTunnel( xSecEnv , cssu::UNO_QUERY ) ;
-        if( xEnvTunnel.is() )
+        if( xEnvTunnel.is() ) 
         {
             SecurityEnvironment_MSCryptImpl* pSecEnv = ( SecurityEnvironment_MSCryptImpl* )xEnvTunnel->getSomething( SecurityEnvironment_MSCryptImpl::getUnoTunnelId() ) ;
             HCERTSTORE n_hStoreHandle = pSecEnv->getCryptoSlot();
-
+            
             if( n_hStoreHandle != NULL )
             {
                 CertCloseStore( n_hStoreHandle, CERT_CLOSE_STORE_FORCE_FLAG ) ;
                 pSecEnv->setCryptoSlot( NULL ) ;
                 pSecEnv->setCertDb( NULL ) ;
             }
-
+        
             xmlSecMSCryptoAppShutdown() ;
         }
-    }
+    } 
     */
-
+    
     xmlSecMSCryptoAppShutdown() ;
 }
 
@@ -198,13 +198,13 @@ rtl::OUString SEInitializer_MSCryptImpl_getImplementationName ()
     return rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
 }
 
-sal_Bool SAL_CALL SEInitializer_MSCryptImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL SEInitializer_MSCryptImpl_supportsService( const rtl::OUString& ServiceName ) 
     throw (cssu::RuntimeException)
 {
     return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME ));
 }
 
-cssu::Sequence< rtl::OUString > SAL_CALL SEInitializer_MSCryptImpl_getSupportedServiceNames(  )
+cssu::Sequence< rtl::OUString > SAL_CALL SEInitializer_MSCryptImpl_getSupportedServiceNames(  ) 
     throw (cssu::RuntimeException)
 {
     cssu::Sequence < rtl::OUString > aRet(1);
@@ -221,17 +221,17 @@ cssu::Reference< cssu::XInterface > SAL_CALL SEInitializer_MSCryptImpl_createIns
 }
 
 /* XServiceInfo */
-rtl::OUString SAL_CALL SEInitializer_MSCryptImpl::getImplementationName(  )
+rtl::OUString SAL_CALL SEInitializer_MSCryptImpl::getImplementationName(  ) 
     throw (cssu::RuntimeException)
 {
     return SEInitializer_MSCryptImpl_getImplementationName();
 }
-sal_Bool SAL_CALL SEInitializer_MSCryptImpl::supportsService( const rtl::OUString& rServiceName )
+sal_Bool SAL_CALL SEInitializer_MSCryptImpl::supportsService( const rtl::OUString& rServiceName ) 
     throw (cssu::RuntimeException)
 {
     return SEInitializer_MSCryptImpl_supportsService( rServiceName );
 }
-cssu::Sequence< rtl::OUString > SAL_CALL SEInitializer_MSCryptImpl::getSupportedServiceNames(  )
+cssu::Sequence< rtl::OUString > SAL_CALL SEInitializer_MSCryptImpl::getSupportedServiceNames(  ) 
     throw (cssu::RuntimeException)
 {
     return SEInitializer_MSCryptImpl_getSupportedServiceNames();
diff --git a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx
index b4ee827b74f0..97c8510089b9 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,65 +38,65 @@
 
 #include <libxml/tree.h>
 
-class SEInitializer_MSCryptImpl : public cppu::WeakImplHelper2
-<
+class SEInitializer_MSCryptImpl : public cppu::WeakImplHelper2 
+< 
     com::sun::star::xml::crypto::XSEInitializer,
     com::sun::star::lang::XServiceInfo
 >
 /****** SEInitializer_MSCryptImpl.hxx/CLASS SEInitializer_MSCryptImpl ***********
  *
  *   NAME
- *  SEInitializer_MSCryptImpl -- Class to initialize a Security Context
- *  instance
+ *	SEInitializer_MSCryptImpl -- Class to initialize a Security Context
+ *	instance
  *
  *   FUNCTION
- *  Use this class to initialize a XmlSec based Security Context
- *  instance. After this instance is used up, use this class to free this
- *  instance.
+ *	Use this class to initialize a XmlSec based Security Context
+ *	instance. After this instance is used up, use this class to free this
+ *	instance.
  *
  *   HISTORY
- *  05.01.2004 -    Interface supported: XSEInitializer, XSEInitializer
+ *	05.01.2004 -	Interface supported: XSEInitializer, XSEInitializer
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
 private:
     com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > mxMSF;
-
+    
 public:
     SEInitializer_MSCryptImpl(const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > &rxMSF);
     virtual ~SEInitializer_MSCryptImpl();
 
     /* XSEInitializer */
-    virtual com::sun::star::uno::Reference<
+    virtual com::sun::star::uno::Reference< 
         com::sun::star::xml::crypto::XXMLSecurityContext >
         SAL_CALL createSecurityContext( const rtl::OUString& certDB )
         throw (com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL freeSecurityContext( const com::sun::star::uno::Reference<
         com::sun::star::xml::crypto::XXMLSecurityContext >& securityContext )
         throw (com::sun::star::uno::RuntimeException);
-
+    
     /* XServiceInfo */
-    virtual rtl::OUString SAL_CALL getImplementationName(  )
+    virtual rtl::OUString SAL_CALL getImplementationName(  ) 
         throw (com::sun::star::uno::RuntimeException);
-
-    virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName )
+        
+    virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) 
         throw (com::sun::star::uno::RuntimeException);
-
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+        
+    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(  ) 
         throw (com::sun::star::uno::RuntimeException);
 };
 
 rtl::OUString SEInitializer_MSCryptImpl_getImplementationName()
     throw ( com::sun::star::uno::RuntimeException );
 
-sal_Bool SAL_CALL SEInitializer_MSCryptImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL SEInitializer_MSCryptImpl_supportsService( const rtl::OUString& ServiceName ) 
     throw ( com::sun::star::uno::RuntimeException );
 
-com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL SEInitializer_MSCryptImpl_getSupportedServiceNames(  )
+com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL SEInitializer_MSCryptImpl_getSupportedServiceNames(  ) 
     throw ( com::sun::star::uno::RuntimeException );
 
 com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
index 2b5c6e5ed5dd..3ee12fab0e73 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 //CP : added by CP
 #include <rtl/locale.h>
-#include <osl/nlsupport.h>
+#include <osl/nlsupport.h> 
 #include <osl/process.h>
 #include <utility>
 
@@ -57,11 +57,11 @@ using ::com::sun::star::util::DateTime ;
 /*Resturns the index withing rRawString where sTypeName starts and where it ends.
     The starting index is pair.first. The ending index in pair.second points
     one char after the last character of the type.
-    sTypeName can be
+    sTypeName can be 
     "S" or "CN" (without ""). Do not use spaces at the beginning of the type name.
     If the type name is not found then pair.first and pair.second are -1.
 */
-std::pair< sal_Int32, sal_Int32 >
+std::pair< sal_Int32, sal_Int32 > 
 findTypeInDN(const OUString& rRawString, const OUString& sTypeName)
 {
     std::pair< sal_Int32, sal_Int32 > retVal;
@@ -92,9 +92,9 @@ findTypeInDN(const OUString& rRawString, const OUString& sTypeName)
         {
             if (!bInEscape)
             {
-                //If this is the quote is the first of the couple which enclose the
+                //If this is the quote is the first of the couple which enclose the 
                 //whole value, because the value contains special characters
-                //then we just drop it. That is, this character must be followed by
+                //then we just drop it. That is, this character must be followed by 
                 //a character which is not '"'.
                 if ( i + 1 < length && rRawString[i+1] == '"')
                     bInEscape = true;
@@ -103,15 +103,15 @@ findTypeInDN(const OUString& rRawString, const OUString& sTypeName)
             }
             else
             {
-                //This quote is escaped by a preceding quote and therefore is
+                //This quote is escaped by a preceding quote and therefore is 
                 //part of the value
                 bInEscape = false;
             }
         }
         else if (c == ',' || c == '+')
         {
-            //The comma separate the attribute value pairs.
-            //If the comma is not part of a value (the value would then be enclosed in '"'),
+            //The comma separate the attribute value pairs. 
+            //If the comma is not part of a value (the value would then be enclosed in '"'), 
             //then we have reached the end of the value
             if (!bInValue)
             {
@@ -154,16 +154,16 @@ findTypeInDN(const OUString& rRawString, const OUString& sTypeName)
 
 
 /*
-  MS Crypto uses the 'S' tag (equal to the 'ST' tag in NSS), but the NSS can't recognise
+  MS Crypto uses the 'S' tag (equal to the 'ST' tag in NSS), but the NSS can't recognise 
   it, so the 'S' tag should be changed to 'ST' tag. However I am not sure if this is necessary
-  anymore, because we provide always the signers certificate when signing. So libmlsec can find
+  anymore, because we provide always the signers certificate when signing. So libmlsec can find 
   the private key based on the provided certificate (X509Certificate element) and does not need
   the issuer name (X509IssuerName element). The issuer name in the xml signature has also no
   effect for the signature nor the certificate validation.
   In many RFCs, for example 4519, on speaks of 'ST'. However, the certificate does not contain
   strings for type names. Instead it uses OIDs.
  */
-
+ 
 OUString replaceTagSWithTagST(OUString oldDN)
 {
     std::pair<sal_Int32, sal_Int32 > pairIndex = findTypeInDN(oldDN, OUSTR("S"));
@@ -174,7 +174,7 @@ OUString replaceTagSWithTagST(OUString oldDN)
         newDN += OUSTR("ST");
         newDN += oldDN.copy(pairIndex.second);
         return newDN;
-    }
+    }	
     return oldDN;
 }
 /* end */
@@ -204,7 +204,7 @@ sal_Int16 SAL_CALL X509Certificate_MSCryptImpl :: getVersion() throw ( ::com::su
         Sequence< sal_Int8 > serial( m_pCertContext->pCertInfo->SerialNumber.cbData ) ;
         for( unsigned int i = 0 ; i < m_pCertContext->pCertInfo->SerialNumber.cbData ; i ++ )
             serial[i] = *( m_pCertContext->pCertInfo->SerialNumber.pbData + m_pCertContext->pCertInfo->SerialNumber.cbData - i - 1 ) ;
-
+ 
         return serial ;
     } else {
         return NULL ;
@@ -261,9 +261,9 @@ sal_Int16 SAL_CALL X509Certificate_MSCryptImpl :: getVersion() throw ( ::com::su
     }
 }
 
-::rtl::OUString SAL_CALL X509Certificate_MSCryptImpl :: getSubjectName() throw ( ::com::sun::star::uno::RuntimeException)
+::rtl::OUString SAL_CALL X509Certificate_MSCryptImpl :: getSubjectName() throw ( ::com::sun::star::uno::RuntimeException) 
 {
-    if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL )
+    if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL ) 
     {
         wchar_t* subject ;
         DWORD cbSubject ;
@@ -275,7 +275,7 @@ sal_Int16 SAL_CALL X509Certificate_MSCryptImpl :: getVersion() throw ( ::com::su
             NULL, 0
         ) ;
 
-        if( cbSubject != 0 )
+        if( cbSubject != 0 ) 
         {
             subject = new wchar_t[ cbSubject ] ;
             if( subject == NULL )
@@ -296,13 +296,13 @@ sal_Int16 SAL_CALL X509Certificate_MSCryptImpl :: getVersion() throw ( ::com::su
             OUString xSubject(reinterpret_cast<const sal_Unicode*>(subject));
             delete [] subject ;
 
-            return replaceTagSWithTagST(xSubject);
-        } else
+            return replaceTagSWithTagST(xSubject); 
+        } else 
         {
             return OUString() ;
         }
-    }
-    else
+    } 
+    else 
     {
         return OUString() ;
     }
@@ -481,7 +481,7 @@ void X509Certificate_MSCryptImpl :: setRawCert( Sequence< sal_Int8 > rawCert ) t
 
 /* XUnoTunnel */
 sal_Int64 SAL_CALL X509Certificate_MSCryptImpl :: getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw( RuntimeException ) {
-    if( aIdentifier.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) {
+    if( aIdentifier.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) { 
         return ( sal_Int64 )this ;
     }
     return 0 ;
@@ -522,7 +522,7 @@ X509Certificate_MSCryptImpl* X509Certificate_MSCryptImpl :: getImplementation( c
             return OUString::createFromAscii( OIDs[i].desc );
         }
     }
-
+    
     return OUString() ;
 }
 
@@ -539,7 +539,7 @@ X509Certificate_MSCryptImpl* X509Certificate_MSCryptImpl :: getImplementation( c
             {
                 thumbprint[i] = fingerprint[i];
             }
-
+            
             return thumbprint;
         }
         else
@@ -548,7 +548,7 @@ X509Certificate_MSCryptImpl* X509Certificate_MSCryptImpl :: getImplementation( c
             cbData = e;
         }
     }
-
+    
     return NULL;
 }
 
@@ -572,7 +572,7 @@ X509Certificate_MSCryptImpl* X509Certificate_MSCryptImpl :: getImplementation( c
     if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL )
     {
         CRYPT_BIT_BLOB publicKey = m_pCertContext->pCertInfo->SubjectPublicKeyInfo.PublicKey;
-
+        
         Sequence< sal_Int8 > key( publicKey.cbData ) ;
         for( unsigned int i = 0 ; i < publicKey.cbData ; i++ )
         {
@@ -586,7 +586,7 @@ X509Certificate_MSCryptImpl* X509Certificate_MSCryptImpl :: getImplementation( c
         return NULL ;
     }
 }
-
+    
 ::rtl::OUString SAL_CALL X509Certificate_MSCryptImpl::getSignatureAlgorithm()
     throw ( ::com::sun::star::uno::RuntimeException)
 {
@@ -600,13 +600,13 @@ X509Certificate_MSCryptImpl* X509Certificate_MSCryptImpl :: getImplementation( c
         return OUString() ;
     }
 }
-
+    
 ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getSHA1Thumbprint()
     throw ( ::com::sun::star::uno::RuntimeException)
 {
     return getThumbprint(m_pCertContext, CERT_SHA1_HASH_PROP_ID);
 }
-
+    
 ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getMD5Thumbprint()
     throw ( ::com::sun::star::uno::RuntimeException)
 {
@@ -616,7 +616,7 @@ X509Certificate_MSCryptImpl* X509Certificate_MSCryptImpl :: getImplementation( c
 sal_Int32 SAL_CALL X509Certificate_MSCryptImpl::getCertificateUsage(  )
     throw ( ::com::sun::star::uno::RuntimeException)
 {
-    sal_Int32 usage =
+    sal_Int32 usage = 
         CERT_DATA_ENCIPHERMENT_KEY_USAGE |
         CERT_DIGITAL_SIGNATURE_KEY_USAGE |
         CERT_KEY_AGREEMENT_KEY_USAGE |
@@ -625,18 +625,18 @@ sal_Int32 SAL_CALL X509Certificate_MSCryptImpl::getCertificateUsage(  )
         CERT_NON_REPUDIATION_KEY_USAGE |
         CERT_OFFLINE_CRL_SIGN_KEY_USAGE;
 
-    if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL && m_pCertContext->pCertInfo->cExtension != 0 )
+    if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL && m_pCertContext->pCertInfo->cExtension != 0 ) 
     {
         CERT_EXTENSION* pExtn = CertFindExtension(
             szOID_KEY_USAGE,
             m_pCertContext->pCertInfo->cExtension,
             m_pCertContext->pCertInfo->rgExtension);
-
+            
         if (pExtn != NULL)
         {
             CERT_KEY_USAGE_RESTRICTION_INFO keyUsage;
             DWORD length = sizeof(CERT_KEY_USAGE_RESTRICTION_INFO);
-
+            
             bool rc = CryptDecodeObject(
                 X509_ASN_ENCODING,
                 X509_KEY_USAGE,
@@ -644,15 +644,15 @@ sal_Int32 SAL_CALL X509Certificate_MSCryptImpl::getCertificateUsage(  )
                 pExtn->Value.cbData,
                 CRYPT_DECODE_NOCOPY_FLAG,
                 (void *)&keyUsage,
-                &length);
-
+                &length);             
+                
             if (rc && keyUsage.RestrictedKeyUsage.cbData!=0)
             {
                 usage = (sal_Int32)keyUsage.RestrictedKeyUsage.pbData;
-            }
+            } 
         }
     }
-
+    
     return usage;
 }
 
diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
index f9eba3248c94..62bfb8a4b074 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,16 +86,16 @@ class X509Certificate_MSCryptImpl : public ::cppu::WeakImplHelper2<
 
         virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSubjectPublicKeyValue()
             throw ( ::com::sun::star::uno::RuntimeException) ;
-
+            
         virtual ::rtl::OUString SAL_CALL getSignatureAlgorithm()
             throw ( ::com::sun::star::uno::RuntimeException) ;
-
+            
         virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSHA1Thumbprint()
             throw ( ::com::sun::star::uno::RuntimeException) ;
 
         virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getMD5Thumbprint()
             throw ( ::com::sun::star::uno::RuntimeException) ;
-
+            
         virtual sal_Int32 SAL_CALL getCertificateUsage( ) throw ( ::com::sun::star::uno::RuntimeException) ;
         // MM : end
 
@@ -111,6 +111,6 @@ class X509Certificate_MSCryptImpl : public ::cppu::WeakImplHelper2<
         void setRawCert( ::com::sun::star::uno::Sequence< sal_Int8 > rawCert ) throw ( ::com::sun::star::uno::RuntimeException) ;
 } ;
 
-#endif  // _X509CERTIFICATE_MSCRYPTIMPL_HXX_
+#endif	// _X509CERTIFICATE_MSCRYPTIMPL_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
index ab800b40b376..80d97b0b2ca9 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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_xmlsecurity.hxx"
-
+ 
 #include <sal/config.h>
 #include <rtl/uuid.h>
 #include "xmlencryption_mscryptimpl.hxx"
@@ -74,7 +74,7 @@ Reference< XXMLEncryptionTemplate >
 SAL_CALL XMLEncryption_MSCryptImpl :: encrypt(
     const Reference< XXMLEncryptionTemplate >& aTemplate ,
     const Reference< XSecurityEnvironment >& aEnvironment
-) throw( com::sun::star::xml::crypto::XMLEncryptionException,
+) throw( com::sun::star::xml::crypto::XMLEncryptionException, 
          com::sun::star::uno::SecurityException )
 {
     xmlSecKeysMngrPtr pMngr = NULL ;
@@ -116,7 +116,7 @@ SAL_CALL XMLEncryption_MSCryptImpl :: encrypt(
 
     pEncryptedData = pTemplate->getNativeElement() ;
 
-    //Find the element to be encrypted.
+    //Find the element to be encrypted. 
     //This element is wrapped in the CipherValue sub-element.
     xmlNodePtr pCipherData = pEncryptedData->children;
     while (pCipherData != NULL && stricmp((const char *)(pCipherData->name), "CipherData"))
@@ -143,7 +143,7 @@ SAL_CALL XMLEncryption_MSCryptImpl :: encrypt(
     if( pContent == NULL ) {
         throw XMLEncryptionException() ;
     }
-
+    
     xmlUnlinkNode(pContent);
     xmlAddNextSibling(pEncryptedData, pContent);
 
@@ -187,7 +187,7 @@ SAL_CALL XMLEncryption_MSCryptImpl :: encrypt(
         clearErrorRecorder();
         return aTemplate;
     }
-    aTemplate->setStatus(::com::sun::star::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED);
+    aTemplate->setStatus(::com::sun::star::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED);    
     xmlSecEncCtxDestroy( pEncCtx ) ;
     pSecEnv->destroyKeysManager( pMngr ) ; //i39448
 
@@ -210,7 +210,7 @@ Reference< XXMLEncryptionTemplate > SAL_CALL
 XMLEncryption_MSCryptImpl :: decrypt(
     const Reference< XXMLEncryptionTemplate >& aTemplate ,
     const Reference< XXMLSecurityContext >& aSecurityCtx
-) throw( com::sun::star::xml::crypto::XMLEncryptionException ,
+) throw( com::sun::star::xml::crypto::XMLEncryptionException , 
          com::sun::star::uno::SecurityException) {
     xmlSecKeysMngrPtr pMngr = NULL ;
     xmlSecEncCtxPtr pEncCtx = NULL ;
@@ -223,7 +223,7 @@ XMLEncryption_MSCryptImpl :: decrypt(
         throw RuntimeException() ;
 
     //Get Keys Manager
-    Reference< XSecurityEnvironment > xSecEnv
+    Reference< XSecurityEnvironment > xSecEnv 
         = aSecurityCtx->getSecurityEnvironmentByIndex(
             aSecurityCtx->getDefaultSecurityEnvironmentIndex());
     Reference< XUnoTunnel > xSecTunnel( xSecEnv , UNO_QUERY ) ;
@@ -290,7 +290,7 @@ XMLEncryption_MSCryptImpl :: decrypt(
         aTemplate->setStatus(::com::sun::star::xml::crypto::SecurityOperationStatus_UNKNOWN);
         xmlSecEncCtxDestroy( pEncCtx ) ;
         pSecEnv->destroyKeysManager( pMngr ) ; //i39448
-
+        
         //throw XMLEncryptionException() ;
         clearErrorRecorder();
         return aTemplate;
@@ -299,7 +299,7 @@ XMLEncryption_MSCryptImpl :: decrypt(
     /*----------------------------------------
     if( pEncCtx->resultReplaced != 0 ) {
         pContent = pEncryptedData ;
-
+    
         Reference< XUnoTunnel > xTunnel( ret , UNO_QUERY ) ;
         if( !xTunnel.is() ) {
             xmlSecEncCtxDestroy( pEncCtx ) ;
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx
index 539c9afff55f..47b621ea1fc1 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -95,6 +95,6 @@ class XMLEncryption_MSCryptImpl : public ::cppu::WeakImplHelper3<
         static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > impl_createFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) ;
 } ;
 
-#endif  // _XMLENCRYPTION_MSCRYPTIMPL_HXX_
+#endif	// _XMLENCRYPTION_MSCRYPTIMPL_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
index 52f3cc3b983d..3204ba85bfba 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ using ::rtl::OUString ;
 using ::com::sun::star::xml::crypto::XSecurityEnvironment ;
 using ::com::sun::star::xml::crypto::XXMLSecurityContext ;
 
-XMLSecurityContext_MSCryptImpl :: XMLSecurityContext_MSCryptImpl( const Reference< XMultiServiceFactory >& aFactory )
+XMLSecurityContext_MSCryptImpl :: XMLSecurityContext_MSCryptImpl( const Reference< XMultiServiceFactory >& aFactory ) 
     ://m_pKeysMngr( NULL ) ,
      m_xServiceManager( aFactory ),
-     m_xSecurityEnvironment( NULL )
+     m_xSecurityEnvironment( NULL ) 
 {
     //Init xmlsec library
     if( xmlSecInit() < 0 ) {
@@ -88,7 +88,7 @@ sal_Int32 SAL_CALL XMLSecurityContext_MSCryptImpl::addSecurityEnvironment(
     {
         throw RuntimeException() ;
     }
-
+    
     m_xSecurityEnvironment = aSecurityEnvironment;
 
     return 0;
@@ -100,7 +100,7 @@ sal_Int32 SAL_CALL XMLSecurityContext_MSCryptImpl::getSecurityEnvironmentNumber(
 {
     return 1;
 }
-
+    
 ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > SAL_CALL
     XMLSecurityContext_MSCryptImpl::getSecurityEnvironmentByIndex( sal_Int32 index )
     throw (::com::sun::star::uno::RuntimeException)
@@ -112,9 +112,9 @@ sal_Int32 SAL_CALL XMLSecurityContext_MSCryptImpl::getSecurityEnvironmentNumber(
     else
         throw RuntimeException() ;
 }
-
-::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > SAL_CALL
-    XMLSecurityContext_MSCryptImpl::getSecurityEnvironment(  )
+    
+::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > SAL_CALL 
+    XMLSecurityContext_MSCryptImpl::getSecurityEnvironment(  ) 
     throw (::com::sun::star::uno::RuntimeException)
 {
     return m_xSecurityEnvironment;
@@ -245,10 +245,10 @@ void SAL_CALL XMLSecurityContext_MSCryptImpl :: setSecurityEnvironment( const Re
 }
 
 /* XXMLSecurityContext */
-Reference< XSecurityEnvironment > SAL_CALL XMLSecurityContext_MSCryptImpl :: getSecurityEnvironment()
+Reference< XSecurityEnvironment > SAL_CALL XMLSecurityContext_MSCryptImpl :: getSecurityEnvironment() 
     throw (RuntimeException)
 {
-    return  m_xSecurityEnvironment ;
+    return	m_xSecurityEnvironment ;
 }
 #endif
 
@@ -304,10 +304,10 @@ Reference< XSingleServiceFactory > XMLSecurityContext_MSCryptImpl :: impl_create
 
 #if 0
 /* XUnoTunnel */
-sal_Int64 SAL_CALL XMLSecurityContext_MSCryptImpl :: getSomething( const Sequence< sal_Int8 >& aIdentifier )
+sal_Int64 SAL_CALL XMLSecurityContext_MSCryptImpl :: getSomething( const Sequence< sal_Int8 >& aIdentifier ) 
 throw (RuntimeException)
 {
-    if( aIdentifier.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) {
+    if( aIdentifier.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) { 
         return ( sal_Int64 )this ;
     }
     return 0 ;
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx
index dfc8217aa957..29ad6bc712e0 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,27 +63,27 @@ class XMLSecurityContext_MSCryptImpl : public ::cppu::WeakImplHelper3<
         virtual sal_Int32 SAL_CALL addSecurityEnvironment(
             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment >& aSecurityEnvironment
             ) throw (::com::sun::star::security::SecurityInfrastructureException, ::com::sun::star::uno::RuntimeException);
-
+        
         virtual ::sal_Int32 SAL_CALL getSecurityEnvironmentNumber(  )
             throw (::com::sun::star::uno::RuntimeException);
-
+            
         virtual ::com::sun::star::uno::Reference<
             ::com::sun::star::xml::crypto::XSecurityEnvironment > SAL_CALL
             getSecurityEnvironmentByIndex( ::sal_Int32 index )
             throw (::com::sun::star::uno::RuntimeException);
-
+             
         virtual ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::crypto::XSecurityEnvironment > SAL_CALL
-            getSecurityEnvironment(  )
+            ::com::sun::star::xml::crypto::XSecurityEnvironment > SAL_CALL 
+            getSecurityEnvironment(  ) 
             throw (::com::sun::star::uno::RuntimeException);
-
+        
         virtual ::sal_Int32 SAL_CALL getDefaultSecurityEnvironmentIndex(  )
             throw (::com::sun::star::uno::RuntimeException);
 
         virtual void SAL_CALL setDefaultSecurityEnvironmentIndex( sal_Int32 nDefaultEnvIndex )
             throw (::com::sun::star::uno::RuntimeException);
 
-#if 0
+#if 0		
         virtual void SAL_CALL setSecurityEnvironment(
             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment >& aSecurityEnvironment
         ) throw( com::sun::star::security::SecurityInfrastructureException) ;
@@ -118,7 +118,7 @@ class XMLSecurityContext_MSCryptImpl : public ::cppu::WeakImplHelper3<
 
 #if 0
         //Methods from XUnoTunnel
-        virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier )
+        virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) 
         throw (com::sun::star::uno::RuntimeException);
 
         static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId() ;
@@ -129,6 +129,6 @@ class XMLSecurityContext_MSCryptImpl : public ::cppu::WeakImplHelper3<
         //virtual xmlSecKeysMngrPtr keysManager() throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
 } ;
 
-#endif  // _XMLSIGNATURECONTEXT_MSCRYPTIMPL_HXX_
+#endif	// _XMLSIGNATURECONTEXT_MSCRYPTIMPL_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
index e7fa7f96aa68..25c7825e702c 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ Reference< XXMLSignatureTemplate >
 SAL_CALL XMLSignature_MSCryptImpl :: generate(
     const Reference< XXMLSignatureTemplate >& aTemplate ,
     const Reference< XSecurityEnvironment >& aEnvironment
-) throw( com::sun::star::xml::crypto::XMLSignatureException,
+) throw( com::sun::star::xml::crypto::XMLSignatureException, 
          com::sun::star::uno::SecurityException )
 {
     xmlSecKeysMngrPtr pMngr = NULL ;
@@ -140,7 +140,7 @@ SAL_CALL XMLSignature_MSCryptImpl :: generate(
     }
 
     //Sign the template
-    if( xmlSecDSigCtxSign( pDsigCtx , pNode ) == 0 )
+    if( xmlSecDSigCtxSign( pDsigCtx , pNode ) == 0 ) 
     {
         if (pDsigCtx->status == xmlSecDSigStatusSucceeded)
             aTemplate->setStatus(com::sun::star::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED);
@@ -169,8 +169,8 @@ Reference< XXMLSignatureTemplate >
 SAL_CALL XMLSignature_MSCryptImpl :: validate(
     const Reference< XXMLSignatureTemplate >& aTemplate ,
     const Reference< XXMLSecurityContext >& aSecurityCtx
-) throw( com::sun::star::uno::RuntimeException,
-         com::sun::star::uno::SecurityException,
+) throw( com::sun::star::uno::RuntimeException, 
+         com::sun::star::uno::SecurityException, 
          com::sun::star::xml::crypto::XMLSignatureException ) {
     xmlSecKeysMngrPtr pMngr = NULL ;
     xmlSecDSigCtxPtr pDsigCtx = NULL ;
@@ -184,7 +184,7 @@ SAL_CALL XMLSignature_MSCryptImpl :: validate(
         throw RuntimeException() ;
 
     //Get Keys Manager
-    Reference< XSecurityEnvironment > xSecEnv
+    Reference< XSecurityEnvironment > xSecEnv 
         = aSecurityCtx->getSecurityEnvironmentByIndex(
             aSecurityCtx->getDefaultSecurityEnvironmentIndex());
     Reference< XUnoTunnel > xSecTunnel( xSecEnv , UNO_QUERY ) ;
@@ -267,12 +267,12 @@ SAL_CALL XMLSignature_MSCryptImpl :: validate(
 
     xmlSecDSigCtxDestroy( pDsigCtx ) ;
     pSecEnv->destroyKeysManager( pMngr ) ; //i39448
-
+    
     //Unregistered the stream/URI binding
     if( xUriBinding.is() )
         xmlUnregisterStreamInputCallbacks() ;
-
-
+    
+    
     clearErrorRecorder();
     return aTemplate;
 }
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx
index d31050484548..bc5af5ecf14b 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 XMLSignature_MSCryptImpl : public ::cppu::WeakImplHelper3<
             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSignatureTemplate >& aTemplate ,
             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSecurityContext >& aContext
         ) throw( com::sun::star::uno::RuntimeException,
-                 com::sun::star::uno::SecurityException,
+                 com::sun::star::uno::SecurityException, 
                  com::sun::star::xml::crypto::XMLSignatureException);
 
         //Methods from XInitialization
@@ -95,6 +95,6 @@ class XMLSignature_MSCryptImpl : public ::cppu::WeakImplHelper3<
         static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > impl_createFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) ;
 } ;
 
-#endif  // _XMLSIGNATURE_MSCRYPTIMPL_HXX_
+#endif	// _XMLSIGNATURE_MSCRYPTIMPL_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx b/xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx
index c9ba623d2140..918d076567de 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ sal_Bool SAL_CALL mscrypt_component_writeInfo( void* /*pServiceManager*/ , void*
     Reference< XRegistryKey > xKey( reinterpret_cast< XRegistryKey* >( pRegistryKey ) ) ;
 
     if( xKey.is() ) {
-        //  try {
+        //	try {
         // XMLSignature_MSCryptImpl
         sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ;
         sKeyName += XMLSignature_MSCryptImpl::impl_getImplementationName() ;
@@ -122,11 +122,11 @@ sal_Bool SAL_CALL mscrypt_component_writeInfo( void* /*pServiceManager*/ , void*
             for( i = seqServices.getLength() ; i -- ;  )
                 xNewKey->createKey( seqServices.getConstArray()[i] ) ;
         }
-
+        
         return sal_True;
         //} catch( InvalidRegistryException & ) {
-        //  //we should not ignore exceptions
-        //  return sal_False ;
+        //	//we should not ignore exceptions
+        //	return sal_False ;
         //}
     }
     return result;
diff --git a/xmlsecurity/source/xmlsec/nss/certerrors.h b/xmlsecurity/source/xmlsec/nss/certerrors.h
index a587792b448d..c2b96c2944ee 100644
--- a/xmlsecurity/source/xmlsec/nss/certerrors.h
+++ b/xmlsecurity/source/xmlsec/nss/certerrors.h
@@ -102,8 +102,8 @@
 {SEC_ERROR_EXTENSION_NOT_FOUND, "Certificate extension not found."},
 
 {SEC_ERROR_CA_CERT_INVALID, "Issuer certificate is invalid."},
-
-{SEC_ERROR_PATH_LEN_CONSTRAINT_INVALID, "Certificate path length constraint is invalid."},
+   
+{SEC_ERROR_PATH_LEN_CONSTRAINT_INVALID,	"Certificate path length constraint is invalid."},
 
 {SEC_ERROR_CERT_USAGES_INVALID, "Certificate usages field is invalid."},
 
@@ -138,7 +138,7 @@ Please remove it and return it to your issuer."},
 
 {XP_SEC_FORTEZZA_NO_CARD, "No Fortezza cards Found"},
 
-{XP_SEC_FORTEZZA_NONE_SELECTED, "No Fortezza card selected"},
+{XP_SEC_FORTEZZA_NONE_SELECTED,	"No Fortezza card selected"},
 
 {XP_SEC_FORTEZZA_MORE_INFO, "Please select a personality to get more info on"},
 
@@ -221,13 +221,13 @@ Please remove it and return it to your issuer."},
 
 {SEC_ERROR_CERT_ADDR_MISMATCH, "Address in signing certificate does not match address in message headers."},
 
-{SEC_ERROR_PKCS12_UNABLE_TO_IMPORT_KEY, "Unable to import.  Error attempting to import private key."},
+{SEC_ERROR_PKCS12_UNABLE_TO_IMPORT_KEY,	"Unable to import.  Error attempting to import private key."},
 
-{SEC_ERROR_PKCS12_IMPORTING_CERT_CHAIN, "Unable to import.  Error attempting to import certificate chain."},
+{SEC_ERROR_PKCS12_IMPORTING_CERT_CHAIN,	"Unable to import.  Error attempting to import certificate chain."},
 
 {SEC_ERROR_PKCS12_UNABLE_TO_LOCATE_OBJECT_BY_NAME, "Unable to export.  Unable to locate certificate or key by nickname."},
 
-{SEC_ERROR_PKCS12_UNABLE_TO_EXPORT_KEY, "Unable to export.  Private Key could not be located and exported."},
+{SEC_ERROR_PKCS12_UNABLE_TO_EXPORT_KEY,	"Unable to export.  Private Key could not be located and exported."},
 
 {SEC_ERROR_PKCS12_UNABLE_TO_WRITE, "Unable to export.  Unable to write the export file."},
 
@@ -256,7 +256,7 @@ Please remove it and return it to your issuer."},
 {SEC_ERROR_JS_DEL_MOD_FAILURE, "Unable to delete module"},
 
 {SEC_ERROR_OLD_KRL, "New KRL is not later than the current one."},
-
+ 
 {SEC_ERROR_CKL_CONFLICT, "New CKL has different issuer than current CKL.  Delete current CKL."},
 
 {SEC_ERROR_CERT_NOT_IN_NAME_SPACE, "The Certifying Authority for this certificate is not permitted to issue a \
@@ -338,9 +338,9 @@ an existing cert, but that is not the same cert."},
 
 {SEC_ERROR_CRL_UNKNOWN_CRITICAL_EXTENSION, "Issuer's V2 Certificate Revocation List has an unknown critical extension."},
 
-{SEC_ERROR_UNKNOWN_OBJECT_TYPE, "Unknown object type specified."},
+{SEC_ERROR_UNKNOWN_OBJECT_TYPE,	"Unknown object type specified."},
 
-{SEC_ERROR_INCOMPATIBLE_PKCS11, "PKCS #11 driver violates the spec in an incompatible way."},
+{SEC_ERROR_INCOMPATIBLE_PKCS11,	"PKCS #11 driver violates the spec in an incompatible way."},
 
 {SEC_ERROR_NO_EVENT, "No new slot event is available at this time."},
 
diff --git a/xmlsecurity/source/xmlsec/nss/nssrenam.h b/xmlsecurity/source/xmlsec/nss/nssrenam.h
index bc3249e1bfc4..903aded42d1e 100644
--- a/xmlsecurity/source/xmlsec/nss/nssrenam.h
+++ b/xmlsecurity/source/xmlsec/nss/nssrenam.h
@@ -4,25 +4,25 @@
  * License Version 1.1 (the "License"); you may not use this file
  * except in compliance with the License. You may obtain a copy of
  * the License at http://www.mozilla.org/MPL/
- *
+ * 
  * Software distributed under the License is distributed on an "AS
  * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
  * implied. See the License for the specific language governing
  * rights and limitations under the License.
- *
+ * 
  * The Original Code is the Netscape security libraries.
- *
+ * 
  * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
+ * Communications Corporation.  Portions created by Netscape are 
  * Copyright (C) 2001 Netscape Communications Corporation.  All
  * Rights Reserved.
- *
+ * 
  * Contributor(s):
- *
+ * 
  * Alternatively, the contents of this file may be used under the
  * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable
- * instead of those above.  If you wish to allow use of your
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
  * version of this file only under the terms of the GPL and not to
  * allow others to use your version of this file under the MPL,
  * indicate your decision by deleting the provisions above and
diff --git a/xmlsecurity/source/xmlsec/nss/secerror.cxx b/xmlsecurity/source/xmlsec/nss/secerror.cxx
index cc7fdd27e0f5..8c44540fce6e 100644
--- a/xmlsecurity/source/xmlsec/nss/secerror.cxx
+++ b/xmlsecurity/source/xmlsec/nss/secerror.cxx
@@ -40,7 +40,7 @@
 using namespace xmlsecurity;
 
 struct ErrDesc {
-    PRErrorCode  errNum;
+    PRErrorCode	 errNum;
     const char * errString;
 };
 
@@ -50,7 +50,7 @@ const ErrDesc allDesc[] = {
 
 #include "certerrors.h"
 
-};
+};  
 
 
 
@@ -79,7 +79,7 @@ printChainFailure(CERTVerifyLog *log)
     const char * specificError = NULL;
     const char * issuer = NULL;
     CERTVerifyLogNode *node   = NULL;
-
+    
     if (log->count > 0)
     {
         xmlsec_trace("Bad certifcation path:");
@@ -89,7 +89,7 @@ printChainFailure(CERTVerifyLog *log)
             {
                 depth = node->depth;
                 xmlsec_trace("Certificate:  %d. %s %s:", depth,
-                        node->cert->subjectName,
+                        node->cert->subjectName, 
                         depth ? "[Certificate Authority]": "");
             }
             xmlsec_trace("  ERROR %ld: %s", node->error,
@@ -161,7 +161,7 @@ printChainFailure(CERTVerifyLog *log)
                 xmlsec_trace("%s", specificError);
             if (issuer)
                 xmlsec_trace("%s", issuer);
-        }
+        }    
     }
 }
 
diff --git a/xmlsecurity/source/xmlsec/nss/secerror.hxx b/xmlsecurity/source/xmlsec/nss/secerror.hxx
index 34f81cb4023d..4f7468eb914e 100644
--- a/xmlsecurity/source/xmlsec/nss/secerror.hxx
+++ b/xmlsecurity/source/xmlsec/nss/secerror.hxx
@@ -2,7 +2,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
@@ -37,6 +37,6 @@ getCertError(PRErrorCode errNum);
 
 void
 printChainFailure(CERTVerifyLog *log);
-#endif  // _XSECERROR_HXX_
+#endif	// _XSECERROR_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index 87b02e948d34..3643491cc311 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ struct UsageDescription
     SECCertificateUsage usage;
     char const * const description;
 };
+        
 
 
-
-char* GetPasswordFunction( PK11SlotInfo* pSlot, PRBool bRetry, void* /*arg*/ )
+char* GetPasswordFunction( PK11SlotInfo* pSlot,	PRBool bRetry, void* /*arg*/ )
 {
     uno::Reference< lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory() );
     if ( xMSF.is() )
@@ -212,10 +212,10 @@ Reference< XSingleServiceFactory > SecurityEnvironment_NssImpl :: impl_createFac
 }
 
 /* XUnoTunnel */
-sal_Int64 SAL_CALL SecurityEnvironment_NssImpl :: getSomething( const Sequence< sal_Int8 >& aIdentifier )
+sal_Int64 SAL_CALL SecurityEnvironment_NssImpl :: getSomething( const Sequence< sal_Int8 >& aIdentifier ) 
     throw( RuntimeException )
 {
-    if( aIdentifier.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) {
+    if( aIdentifier.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) { 
         return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_uIntPtr>(this));
     }
     return 0 ;
@@ -258,7 +258,7 @@ SecurityEnvironment_NssImpl* SecurityEnvironment_NssImpl :: getImplementation( c
     return buff.makeStringAndClear();
 }
 
-void SecurityEnvironment_NssImpl::addCryptoSlot( PK11SlotInfo* aSlot) throw( Exception , RuntimeException )
+void SecurityEnvironment_NssImpl::addCryptoSlot( PK11SlotInfo* aSlot) throw( Exception , RuntimeException ) 
 {
     PK11_ReferenceSlot(aSlot);
     m_Slots.push_back(aSlot);
@@ -274,7 +274,7 @@ void SecurityEnvironment_NssImpl :: setCertDb( CERTCertDBHandle* aCertDb ) throw
 }
 
 void SecurityEnvironment_NssImpl :: adoptSymKey( PK11SymKey* aSymKey ) throw( Exception , RuntimeException ) {
-    PK11SymKey* symkey ;
+    PK11SymKey*	symkey ;
     std::list< PK11SymKey* >::iterator keyIt ;
 
     if( aSymKey != NULL ) {
@@ -298,7 +298,7 @@ void SecurityEnvironment_NssImpl :: adoptSymKey( PK11SymKey* aSymKey ) throw( Ex
 }
 
 void SecurityEnvironment_NssImpl :: rejectSymKey( PK11SymKey* aSymKey ) throw( Exception , RuntimeException ) {
-    PK11SymKey* symkey ;
+    PK11SymKey*	symkey ;
     std::list< PK11SymKey* >::iterator keyIt ;
 
     if( aSymKey != NULL ) {
@@ -328,7 +328,7 @@ PK11SymKey* SecurityEnvironment_NssImpl :: getSymKey( unsigned int position ) th
 }
 
 void SecurityEnvironment_NssImpl :: adoptPubKey( SECKEYPublicKey* aPubKey ) throw( Exception , RuntimeException ) {
-    SECKEYPublicKey*    pubkey ;
+    SECKEYPublicKey*	pubkey ;
     std::list< SECKEYPublicKey* >::iterator keyIt ;
 
     if( aPubKey != NULL ) {
@@ -352,7 +352,7 @@ void SecurityEnvironment_NssImpl :: adoptPubKey( SECKEYPublicKey* aPubKey ) thro
 }
 
 void SecurityEnvironment_NssImpl :: rejectPubKey( SECKEYPublicKey* aPubKey ) throw( Exception , RuntimeException ) {
-    SECKEYPublicKey*    pubkey ;
+    SECKEYPublicKey*	pubkey ;
     std::list< SECKEYPublicKey* >::iterator keyIt ;
 
     if( aPubKey != NULL ) {
@@ -382,7 +382,7 @@ SECKEYPublicKey* SecurityEnvironment_NssImpl :: getPubKey( unsigned int position
 }
 
 void SecurityEnvironment_NssImpl :: adoptPriKey( SECKEYPrivateKey* aPriKey ) throw( Exception , RuntimeException ) {
-    SECKEYPrivateKey*   prikey ;
+    SECKEYPrivateKey*	prikey ;
     std::list< SECKEYPrivateKey* >::iterator keyIt ;
 
     if( aPriKey != NULL ) {
@@ -406,7 +406,7 @@ void SecurityEnvironment_NssImpl :: adoptPriKey( SECKEYPrivateKey* aPriKey ) thr
 }
 
 void SecurityEnvironment_NssImpl :: rejectPriKey( SECKEYPrivateKey* aPriKey ) throw( Exception , RuntimeException ) {
-    SECKEYPrivateKey*   prikey ;
+    SECKEYPrivateKey*	prikey ;
     std::list< SECKEYPrivateKey* >::iterator keyIt ;
 
     if( aPriKey != NULL ) {
@@ -444,38 +444,38 @@ void SecurityEnvironment_NssImpl::updateSlots()
        PK11SymKey * pSymKey = NULL;
 
     osl::MutexGuard guard(m_mutex);
-
+    
     m_Slots.clear();
     m_tSymKeyList.clear();
 
     soltList = PK11_GetAllTokens( CKM_INVALID_MECHANISM, PR_FALSE, PR_FALSE, NULL ) ;
-    if( soltList != NULL )
+    if( soltList != NULL ) 
     {
-        for( soltEle = soltList->head ; soltEle != NULL; soltEle = soltEle->next )
+        for( soltEle = soltList->head ; soltEle != NULL; soltEle = soltEle->next ) 
         {
             pSlot = soltEle->slot ;
-
+            
             if(pSlot != NULL)
             {
                 RTL_LOGFILE_TRACE2( "XMLSEC: Found a slot: SlotName=%s, TokenName=%s", PK11_GetSlotName(pSlot), PK11_GetTokenName(pSlot) );
 
 //The following code which is commented out checks if a slot, that is a smart card for example, is
-//              able to generate a symmetric key of type CKM_DES3_CBC. If this fails then this token
-//              will not be used. This key is possibly used for the encryption service. However, all
-//              interfaces and services used for public key signature and encryption are not published
-//              and the encryption is not used in OOo. Therefore it does not do any harm to remove
-//              this code, hence allowing smart cards which cannot generate this type of key.
+//				able to generate a symmetric key of type CKM_DES3_CBC. If this fails then this token
+//				will not be used. This key is possibly used for the encryption service. However, all
+//				interfaces and services used for public key signature and encryption are not published
+//				and the encryption is not used in OOo. Therefore it does not do any harm to remove
+//				this code, hence allowing smart cards which cannot generate this type of key.
 //
 //              By doing this, the encryption may fail if a smart card is being used which does not
 //              support this key generation.
-//
+//				
                 pSymKey = PK11_KeyGen( pSlot , CKM_DES3_CBC, NULL, 128, NULL ) ;
-//              if( pSymKey == NULL )
-//              {
-//                  PK11_FreeSlot( pSlot ) ;
-//                  RTL_LOGFILE_TRACE( "XMLSEC: Error - pSymKey is NULL" );
-//                  continue;
-//              }
+// 				if( pSymKey == NULL ) 
+// 				{
+// 					PK11_FreeSlot( pSlot ) ;
+// 					RTL_LOGFILE_TRACE( "XMLSEC: Error - pSymKey is NULL" );
+// 					continue;
+// 				}
                 addCryptoSlot(pSlot);
                 PK11_FreeSlot( pSlot ) ;
                 pSlot = NULL;
@@ -489,18 +489,18 @@ void SecurityEnvironment_NssImpl::updateSlots()
 
             }// end of if(pSlot != NULL)
         }// end of for
-    }// end of if( soltList != NULL )
+    }// end of if( soltList != NULL ) 
 
 }
 
 
-Sequence< Reference < XCertificate > >
-SecurityEnvironment_NssImpl::getPersonalCertificates() throw( SecurityException , RuntimeException )
+Sequence< Reference < XCertificate > > 
+SecurityEnvironment_NssImpl::getPersonalCertificates() throw( SecurityException , RuntimeException ) 
 {
     sal_Int32 length ;
     X509Certificate_NssImpl* xcert ;
     std::list< X509Certificate_NssImpl* > certsList ;
-
+    
     updateSlots();
     //firstly, we try to find private keys in slot
     for (CIT_SLOTS is = m_Slots.begin(); is != m_Slots.end(); is++)
@@ -513,16 +513,16 @@ SecurityEnvironment_NssImpl::getPersonalCertificates() throw( SecurityException
             SECStatus nRet = PK11_Authenticate(slot, PR_TRUE, NULL);
             //PK11_Authenticate may fail in case the a slot has not been initialized.
             //this is the case if the user has a new profile, so that they have never
-            //added a personal certificate.
+            //added a personal certificate. 
             if( nRet != SECSuccess && PORT_GetError() != SEC_ERROR_IO) {
                 throw NoPasswordException();
             }
-        }
-
+        } 
+        
         priKeyList = PK11_ListPrivateKeysInSlot(slot) ;
         if( priKeyList != NULL ) {
-            for( curPri = PRIVKEY_LIST_HEAD( priKeyList );
-                !PRIVKEY_LIST_END( curPri, priKeyList ) && curPri != NULL ;
+            for( curPri = PRIVKEY_LIST_HEAD( priKeyList ); 
+                !PRIVKEY_LIST_END( curPri, priKeyList ) && curPri != NULL ; 
                 curPri = PRIVKEY_LIST_NEXT( curPri ) ) {
                 xcert = NssPrivKeyToXCert( curPri->key ) ;
                 if( xcert != NULL )
@@ -560,7 +560,7 @@ SecurityEnvironment_NssImpl::getPersonalCertificates() throw( SecurityException
     return Sequence< Reference < XCertificate > > ();
 }
 
-Reference< XCertificate > SecurityEnvironment_NssImpl :: getCertificate( const OUString& issuerName, const Sequence< sal_Int8 >& serialNumber ) throw( SecurityException , RuntimeException )
+Reference< XCertificate > SecurityEnvironment_NssImpl :: getCertificate( const OUString& issuerName, const Sequence< sal_Int8 >& serialNumber ) throw( SecurityException , RuntimeException ) 
 {
     X509Certificate_NssImpl* xcert = NULL;
 
@@ -577,13 +577,13 @@ Reference< XCertificate > SecurityEnvironment_NssImpl :: getCertificate( const O
             throw RuntimeException() ;
 
                 /*
-                 * mmi : because MS Crypto use the 'S' tag (equal to the 'ST' tag in NSS), but the NSS can't recognise
+                 * mmi : because MS Crypto use the 'S' tag (equal to the 'ST' tag in NSS), but the NSS can't recognise 
                  *      it, so the 'S' tag should be changed to 'ST' tag
                  *
                  * PS  : it can work, but inside libxmlsec, the 'S' tag is till used to find cert in NSS engine, so it
                  *       is not useful at all. (comment out now)
                  */
-
+                 
                 /*
                 sal_Int32 nIndex = 0;
                 OUString newIssuerName;
@@ -599,16 +599,16 @@ Reference< XCertificate > SecurityEnvironment_NssImpl :: getCertificate( const O
                     {
                         newIssuerName+=aToken;
                     }
-
+                    
                     if (nIndex >= 0)
                     {
                         newIssuerName+=OUString::createFromAscii(",");
                     }
                 } while ( nIndex >= 0 );
                 */
-
+                
                 /* end */
-
+                
         //Create cert info from issue and serial
         rtl::OString ostr = rtl::OUStringToOString( issuerName , RTL_TEXTENCODING_UTF8 ) ;
         chIssuer = PL_strndup( ( char* )ostr.getStr(), ( int )ostr.getLength() ) ;
@@ -616,7 +616,7 @@ Reference< XCertificate > SecurityEnvironment_NssImpl :: getCertificate( const O
         if( nmIssuer == NULL ) {
             PL_strfree( chIssuer ) ;
             PORT_FreeArena( arena, PR_FALSE ) ;
-
+            
             /*
              * i40394
              *
@@ -775,7 +775,7 @@ verifyCertificate( const Reference< csss::XCertificate >& aCert,
     xmlsec_trace("Start verification of certificate: \n %s \n",
               OUStringToOString(
                   aCert->getSubjectName(), osl_getThreadTextEncoding()).getStr());
-
+    
     xcert = reinterpret_cast<X509Certificate_NssImpl*>(
        sal::static_int_cast<sal_uIntPtr>(xCertTunnel->getSomething( X509Certificate_NssImpl::getUnoTunnelId() ))) ;
     if( xcert == NULL ) {
@@ -788,7 +788,7 @@ verifyCertificate( const Reference< csss::XCertificate >& aCert,
     OSL_ASSERT(m_pHandler == CERT_GetDefaultCertDB());
     CERTCertDBHandle * certDb = m_pHandler != NULL ? m_pHandler : CERT_GetDefaultCertDB();
     cert = xcert->getNssCert() ;
-    if( cert != NULL )
+    if( cert != NULL ) 
     {
 
         //prepare the intermediate certificates
@@ -799,10 +799,10 @@ verifyCertificate( const Reference< csss::XCertificate >& aCert,
             item.type = siBuffer;
             item.data = (unsigned char*)der.getArray();
             item.len = der.getLength();
-
-            CERTCertificate* certTmp = CERT_NewTempCertificate(certDb, &item,
-                                           NULL     /* nickname */,
-                                           PR_FALSE /* isPerm */,
+ 
+            CERTCertificate* certTmp = CERT_NewTempCertificate(certDb, &item, 
+                                           NULL     /* nickname */, 
+                                           PR_FALSE /* isPerm */, 
                                            PR_TRUE  /* copyDER */);
              if (!certTmp)
              {
@@ -818,7 +818,7 @@ verifyCertificate( const Reference< csss::XCertificate >& aCert,
                  vecTmpNSSCertificates.push_back(certTmp);
              }
         }
-
+ 
 
         SECStatus status ;
 
@@ -826,7 +826,7 @@ verifyCertificate( const Reference< csss::XCertificate >& aCert,
         log.arena = PORT_NewArena(512);
         log.head = log.tail = NULL;
         log.count = 0;
-
+        
         CERT_EnableOCSPChecking(certDb);
         CERT_DisableOCSPDefaultResponder(certDb);
         CERTValOutParam cvout[5];
@@ -866,10 +866,10 @@ verifyCertificate( const Reference< csss::XCertificate >& aCert,
             | CERT_REV_M_IGNORE_IMPLICIT_DEFAULT_SOURCE;
         rev.leafTests.number_of_preferred_methods = 0;
         rev.leafTests.preferred_methods = NULL;
-        rev.leafTests.cert_rev_method_independent_flags =
+        rev.leafTests.cert_rev_method_independent_flags = 
             CERT_REV_MI_TEST_ALL_LOCAL_INFORMATION_FIRST;
 //            | CERT_REV_MI_REQUIRE_SOME_FRESH_INFO_AVAILABLE;
-
+            
         rev.chainTests.number_of_defined_methods = 2;
         rev.chainTests.cert_rev_flags_per_method = revFlagsChain;
         rev.chainTests.cert_rev_flags_per_method[cert_revocation_method_crl] =
@@ -880,11 +880,11 @@ verifyCertificate( const Reference< csss::XCertificate >& aCert,
             | CERT_REV_M_IGNORE_IMPLICIT_DEFAULT_SOURCE;
         rev.chainTests.number_of_preferred_methods = 0;
         rev.chainTests.preferred_methods = NULL;
-        rev.chainTests.cert_rev_method_independent_flags =
+        rev.chainTests.cert_rev_method_independent_flags = 
             CERT_REV_MI_TEST_ALL_LOCAL_INFORMATION_FIRST;
 //            | CERT_REV_MI_REQUIRE_SOME_FRESH_INFO_AVAILABLE;
 
-
+        
         cvin[ncvinCount].type = cert_pi_revocationFlags;
         cvin[ncvinCount].value.pointer.revocation = &rev;
         ncvinCount++;
@@ -899,7 +899,7 @@ verifyCertificate( const Reference< csss::XCertificate >& aCert,
         cvout[1].type = cert_po_errorLog;
         cvout[1].value.pointer.log = &log;
         cvout[2].type = cert_po_end;
-
+        
         // We check SSL server certificates, CA certificates and signing sertificates.
         //
         // ToDo check keyusage, looking at CERT_KeyUsageAndTypeForCertUsage (
@@ -912,8 +912,8 @@ verifyCertificate( const Reference< csss::XCertificate >& aCert,
         // certificateUsageUserCertImport
         // certificateUsageVerifyCA
         // certificateUsageAnyCA
-        // certificateUsageProtectedObjectSigner
-
+        // certificateUsageProtectedObjectSigner                            
+   
         UsageDescription arUsages[] =
         {
            {certificateUsageSSLClient, "certificateUsageSSLClient" },
@@ -928,10 +928,10 @@ verifyCertificate( const Reference< csss::XCertificate >& aCert,
         {
             xmlsec_trace("Testing usage %d of %d: %s (0x%x)", i + 1,
                       numUsages, arUsages[i].description, (int) arUsages[i].usage);
-
+            
             status = CERT_PKIXVerifyCert(const_cast<CERTCertificate *>(cert), arUsages[i].usage,
                                          cvin, cvout, NULL);
-            if( status == SECSuccess )
+            if( status == SECSuccess ) 
             {
                 xmlsec_trace("CERT_PKIXVerifyCert returned SECSuccess.");
                 //When an intermediate or root certificate is checked then we expect the usage
@@ -975,10 +975,10 @@ verifyCertificate( const Reference< csss::XCertificate >& aCert,
                 xmlsec_trace("Certificate is invalid.\n");
             }
         }
-
+        
     }
-    else
-    {
+    else 
+    { 
         validity = ::com::sun::star::security::CertificateValidity::INVALID ;
     }
 
@@ -992,7 +992,7 @@ verifyCertificate( const Reference< csss::XCertificate >& aCert,
     return validity ;
 }
 
-sal_Int32 SecurityEnvironment_NssImpl::getCertificateCharacters(
+sal_Int32 SecurityEnvironment_NssImpl::getCertificateCharacters( 
     const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& aCert ) throw( ::com::sun::star::uno::SecurityException, ::com::sun::star::uno::RuntimeException ) {
     sal_Int32 characters ;
     const X509Certificate_NssImpl* xcert ;
@@ -1021,7 +1021,7 @@ sal_Int32 SecurityEnvironment_NssImpl::getCertificateCharacters(
     }
 
     //Secondly, find out whether or not the cert has a private key.
-
+    
     /*
      * i40394
      *
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
index 64996a3cee8c..5bd22137dd23 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,16 +67,16 @@ class SecurityEnvironment_NssImpl : public ::cppu::WeakImplHelper4<
     ::com::sun::star::lang::XUnoTunnel >
 {
 private :
-
+        
     std::list< PK11SlotInfo* > m_Slots;
     typedef std::list< PK11SlotInfo* >::const_iterator CIT_SLOTS;
 
     osl::Mutex m_mutex;
-
-        CERTCertDBHandle*                   m_pHandler ;
-        std::list< PK11SymKey* >            m_tSymKeyList ;
-        std::list< SECKEYPublicKey* >       m_tPubKeyList ;
-        std::list< SECKEYPrivateKey* >      m_tPriKeyList ;
+    
+        CERTCertDBHandle*					m_pHandler ;
+        std::list< PK11SymKey* >			m_tSymKeyList ;
+        std::list< SECKEYPublicKey* >		m_tPubKeyList ;
+        std::list< SECKEYPrivateKey* >		m_tPriKeyList ;
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager ;
 
     public :
@@ -122,7 +122,7 @@ private :
         virtual ::rtl::OUString SAL_CALL getSecurityEnvironmentInformation(  ) throw (::com::sun::star::uno::RuntimeException);
 
         //Methods from XUnoTunnel
-        virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier )
+        virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) 
             throw (::com::sun::star::uno::RuntimeException);
 
         static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId() ;
@@ -176,6 +176,6 @@ private:
 
 } ;
 
-#endif  // _XSECURITYENVIRONMENT_NSSIMPL_HXX_
+#endif	// _XSECURITYENVIRONMENT_NSSIMPL_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
index f12632d3da67..71a62eb1b307 100644
--- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ struct InitNSSInitialize
             if (bNSSInit)
                 atexit(nsscrypto_finalize );
              return & bInitialized;
-
+            
         }
 };
 
@@ -130,11 +130,11 @@ void deleteRootsModule()
     SECMODModuleList *list = SECMOD_GetDefaultModuleList();
     SECMODListLock *lock = SECMOD_GetDefaultModuleListLock();
     SECMOD_GetReadLock(lock);
-
+    
     while (!RootsModule && list)
     {
         SECMODModule *module = list->module;
-
+ 
         for (int i=0; i < module->slotCount; i++)
         {
             PK11SlotInfo *slot = module->slots[i];
@@ -154,7 +154,7 @@ void deleteRootsModule()
         list = list->next;
     }
     SECMOD_ReleaseReadLock(lock);
-
+ 
     if (RootsModule)
     {
         PRInt32 modType;
@@ -208,7 +208,7 @@ bool nsscrypto_initialize( const char* token, bool & out_nss_init )
         {
             xmlsec_trace("Initializing NSS with profile failed.");
             char * error = NULL;
-
+            
             PR_GetErrorText(error);
             if (error)
                 xmlsec_trace("%s",error);
@@ -229,20 +229,20 @@ bool nsscrypto_initialize( const char* token, bool & out_nss_init )
         }
     }
     out_nss_init = true;
-
+    
 #if defined SYSTEM_MOZILLA
     if (!SECMOD_HasRootCerts())
     {
 #endif
         deleteRootsModule();
-
+        
 #if defined SYSTEM_MOZILLA
         OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("libnssckbi"SAL_DLLEXTENSION));
 #else
         OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("${OOO_BASE_DIR}/program/libnssckbi"SAL_DLLEXTENSION));
 #endif
         ::rtl::Bootstrap::expandMacros(rootModule);
-
+        
         OUString rootModulePath;
         if (::osl::File::E_None == ::osl::File::getSystemPathFromFileURL(rootModule, rootModulePath))
         {
@@ -253,18 +253,18 @@ bool nsscrypto_initialize( const char* token, bool & out_nss_init )
             pkcs11moduleSpec.append("\" library=\"");
             pkcs11moduleSpec.append(ospath.getStr());
             pkcs11moduleSpec.append("\"");
-
+ 
             SECMODModule * RootsModule =
                 SECMOD_LoadUserModule(
-                    const_cast<char*>(pkcs11moduleSpec.makeStringAndClear().getStr()),
-                    0, // no parent
+                    const_cast<char*>(pkcs11moduleSpec.makeStringAndClear().getStr()), 
+                    0, // no parent 
                     PR_FALSE); // do not recurse
-
+                
             if (RootsModule)
             {
-
+                
                 bool found = RootsModule->loaded;
-
+                    
                 SECMOD_DestroyModule(RootsModule);
                 RootsModule = 0;
                 if (found)
@@ -305,7 +305,7 @@ extern "C" void nsscrypto_finalize()
 
     if (RootsModule)
     {
-
+        
         if (SECSuccess == SECMOD_UnloadUserModule(RootsModule))
         {
             xmlsec_trace("Unloaded module \""ROOT_CERTS"\".");
@@ -332,7 +332,7 @@ bool getMozillaCurrentProfile(
 {
     /*
      * first, try to get the profile from "MOZILLA_CERTIFICATE_FOLDER"
-     */
+     */ 
     char * env = getenv("MOZILLA_CERTIFICATE_FOLDER");
     if (env)
     {
@@ -348,21 +348,21 @@ bool getMozillaCurrentProfile(
             mozilla::MozillaProductType_Firefox,
             mozilla::MozillaProductType_Default };
         int nProduct = 4;
-
+        
         uno::Reference<uno::XInterface> xInstance = rxMSF->createInstance(
             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap")) );
         OSL_ENSURE( xInstance.is(), "failed to create instance" );
-
-        uno::Reference<mozilla::XMozillaBootstrap> xMozillaBootstrap
+        
+        uno::Reference<mozilla::XMozillaBootstrap> xMozillaBootstrap 
             =  uno::Reference<mozilla::XMozillaBootstrap>(xInstance,uno::UNO_QUERY);
         OSL_ENSURE( xMozillaBootstrap.is(), "failed to create instance" );
-
+        
         if (xMozillaBootstrap.is())
         {
             for (int i=0; i<nProduct; i++)
             {
                 ::rtl::OUString profile = xMozillaBootstrap->getDefaultProfile(productTypes[i]);
-
+                
                 if (profile != NULL && profile.getLength()>0)
                 {
                     profilePath = xMozillaBootstrap->getProfilePath(productTypes[i],profile);
@@ -371,7 +371,7 @@ bool getMozillaCurrentProfile(
                 }
             }
         }
-
+        
         RTL_LOGFILE_PRODUCT_TRACE( "XMLSEC: No Mozilla Profile found!" );
         return false;
     }
@@ -385,12 +385,12 @@ SEInitializer_NssImpl::SEInitializer_NssImpl(
 {
 }
 
-SEInitializer_NssImpl::~SEInitializer_NssImpl()
+SEInitializer_NssImpl::~SEInitializer_NssImpl() 
 {
 }
 
 /* XSEInitializer */
-cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL
+cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL 
     SEInitializer_NssImpl::createSecurityContext(
     const rtl::OUString& sCertDB )
     throw (cssu::RuntimeException)
@@ -398,7 +398,7 @@ cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL
     CERTCertDBHandle    *pCertHandle = NULL ;
 
     rtl::OString sCertDir;
-    if( sCertDB.getLength() )
+    if( sCertDB.getLength() ) 
     {
         sCertDir = rtl::OString(sCertDB, sCertDB.getLength(), RTL_TEXTENCODING_ASCII_US);
     }
@@ -407,7 +407,7 @@ cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL
         static rtl::OString* pDefaultCertDir = NULL;
         if ( !pDefaultCertDir )
         {
-            pDefaultCertDir = new rtl::OString;
+            pDefaultCertDir = new rtl::OString; 
             rtl::OUString ouCertDir;
 
 
@@ -416,7 +416,7 @@ cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL
                 *pDefaultCertDir = rtl::OString(ouCertDir, ouCertDir.getLength(), RTL_TEXTENCODING_ASCII_US);
         }
         sCertDir = *pDefaultCertDir;
-
+        
     }
 
     if( ! *initNSS( sCertDir.getStr() ) )
@@ -426,24 +426,24 @@ cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL
 
     pCertHandle = CERT_GetDefaultCertDB() ;
 
-    try
+    try 
     {
         /* Build XML Security Context */
-        const rtl::OUString sSecyrutyContext ( RTL_CONSTASCII_USTRINGPARAM( SECURITY_CONTEXT ) );
+        const rtl::OUString sSecyrutyContext ( RTL_CONSTASCII_USTRINGPARAM( SECURITY_CONTEXT ) );   
         cssu::Reference< cssxc::XXMLSecurityContext > xSecCtx( mxMSF->createInstance ( sSecyrutyContext ), cssu::UNO_QUERY );
-        if( !xSecCtx.is() )
+        if( !xSecCtx.is() ) 
             return NULL;
 
-        const rtl::OUString sSecyrutyEnvironment ( RTL_CONSTASCII_USTRINGPARAM( SECURITY_ENVIRONMENT ) );
+        const rtl::OUString sSecyrutyEnvironment ( RTL_CONSTASCII_USTRINGPARAM( SECURITY_ENVIRONMENT ) );   
         cssu::Reference< cssxc::XSecurityEnvironment > xSecEnv( mxMSF->createInstance ( sSecyrutyEnvironment ), cssu::UNO_QUERY );
         cssu::Reference< cssl::XUnoTunnel > xEnvTunnel( xSecEnv , cssu::UNO_QUERY ) ;
-        if( !xEnvTunnel.is() )
+        if( !xEnvTunnel.is() ) 
             return NULL;
         SecurityEnvironment_NssImpl* pSecEnv = reinterpret_cast<SecurityEnvironment_NssImpl*>(
             sal::static_int_cast<sal_uIntPtr>(
                 xEnvTunnel->getSomething(SecurityEnvironment_NssImpl::getUnoTunnelId() ))) ;
         pSecEnv->setCertDb(pCertHandle);
-
+    
         sal_Int32 n = xSecCtx->addSecurityEnvironment(xSecEnv);
         //originally the SecurityEnvironment with the internal slot was set as default
         xSecCtx->setDefaultSecurityEnvironmentIndex( n );
@@ -476,13 +476,13 @@ rtl::OUString SEInitializer_NssImpl_getImplementationName ()
     return rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
 }
 
-sal_Bool SAL_CALL SEInitializer_NssImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL SEInitializer_NssImpl_supportsService( const rtl::OUString& ServiceName ) 
     throw (cssu::RuntimeException)
 {
     return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME ));
 }
 
-cssu::Sequence< rtl::OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceNames(  )
+cssu::Sequence< rtl::OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceNames(  ) 
     throw (cssu::RuntimeException)
 {
     cssu::Sequence < rtl::OUString > aRet(1);
@@ -499,17 +499,17 @@ cssu::Reference< cssu::XInterface > SAL_CALL SEInitializer_NssImpl_createInstanc
 }
 
 /* XServiceInfo */
-rtl::OUString SAL_CALL SEInitializer_NssImpl::getImplementationName(  )
+rtl::OUString SAL_CALL SEInitializer_NssImpl::getImplementationName(  ) 
     throw (cssu::RuntimeException)
 {
     return SEInitializer_NssImpl_getImplementationName();
 }
-sal_Bool SAL_CALL SEInitializer_NssImpl::supportsService( const rtl::OUString& rServiceName )
+sal_Bool SAL_CALL SEInitializer_NssImpl::supportsService( const rtl::OUString& rServiceName ) 
     throw (cssu::RuntimeException)
 {
     return SEInitializer_NssImpl_supportsService( rServiceName );
 }
-cssu::Sequence< rtl::OUString > SAL_CALL SEInitializer_NssImpl::getSupportedServiceNames(  )
+cssu::Sequence< rtl::OUString > SAL_CALL SEInitializer_NssImpl::getSupportedServiceNames(  ) 
     throw (cssu::RuntimeException)
 {
     return SEInitializer_NssImpl_getSupportedServiceNames();
diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
index da1f98b68188..d0b8a201687a 100644
--- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,65 +38,65 @@
 
 #include <libxml/tree.h>
 
-class SEInitializer_NssImpl : public cppu::WeakImplHelper2
-<
+class SEInitializer_NssImpl : public cppu::WeakImplHelper2 
+< 
     com::sun::star::xml::crypto::XSEInitializer,
     com::sun::star::lang::XServiceInfo
 >
 /****** SEInitializer_NssImpl.hxx/CLASS SEInitializer_NssImpl ***********
  *
  *   NAME
- *  SEInitializer_NssImpl -- Class to initialize a Security Context
- *  instance
+ *	SEInitializer_NssImpl -- Class to initialize a Security Context
+ *	instance
  *
  *   FUNCTION
- *  Use this class to initialize a XmlSec based Security Context
- *  instance. After this instance is used up, use this class to free this
- *  instance.
+ *	Use this class to initialize a XmlSec based Security Context
+ *	instance. After this instance is used up, use this class to free this
+ *	instance.
  *
  *   HISTORY
- *  05.01.2004 -    Interface supported: XSEInitializer, XSEInitializer
+ *	05.01.2004 -	Interface supported: XSEInitializer, XSEInitializer
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
 private:
     com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > mxMSF;
-
+    
 public:
     SEInitializer_NssImpl(const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > &rxMSF);
     virtual ~SEInitializer_NssImpl();
 
     /* XSEInitializer */
-    virtual com::sun::star::uno::Reference<
+    virtual com::sun::star::uno::Reference< 
         com::sun::star::xml::crypto::XXMLSecurityContext >
         SAL_CALL createSecurityContext( const rtl::OUString& certDB )
         throw (com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL freeSecurityContext( const com::sun::star::uno::Reference<
         com::sun::star::xml::crypto::XXMLSecurityContext >& securityContext )
         throw (com::sun::star::uno::RuntimeException);
-
+    
     /* XServiceInfo */
-    virtual rtl::OUString SAL_CALL getImplementationName(  )
+    virtual rtl::OUString SAL_CALL getImplementationName(  ) 
         throw (com::sun::star::uno::RuntimeException);
-
-    virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName )
+        
+    virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) 
         throw (com::sun::star::uno::RuntimeException);
-
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+        
+    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(  ) 
         throw (com::sun::star::uno::RuntimeException);
 };
 
 rtl::OUString SEInitializer_NssImpl_getImplementationName()
     throw ( com::sun::star::uno::RuntimeException );
 
-sal_Bool SAL_CALL SEInitializer_NssImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL SEInitializer_NssImpl_supportsService( const rtl::OUString& ServiceName ) 
     throw ( com::sun::star::uno::RuntimeException );
 
-com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceNames(  )
+com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceNames(  ) 
     throw ( com::sun::star::uno::RuntimeException );
 
 com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
index 6fad149b1c47..9de48239f642 100644
--- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ sal_Int16 SAL_CALL X509Certificate_NssImpl :: getVersion() throw ( ::com::sun::s
     if( m_pCert != NULL ) {
         if( m_pCert->version.len > 0 ) {
             return ( char )*( m_pCert->version.data ) ;
-        } else
+        } else 
             return 0 ;
     } else {
         return -1 ;
@@ -301,7 +301,7 @@ void X509Certificate_NssImpl :: setRawCert( Sequence< sal_Int8 > rawCert ) throw
 
 /* XUnoTunnel */
 sal_Int64 SAL_CALL X509Certificate_NssImpl :: getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw( RuntimeException ) {
-    if( aIdentifier.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) {
+    if( aIdentifier.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) { 
         return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_uIntPtr>(this));
     }
     return 0 ;
@@ -350,19 +350,19 @@ X509Certificate_NssImpl* X509Certificate_NssImpl :: getImplementation( const Ref
         //char *fpStr = NULL;
         SECItem fpItem;
         int length = ((id == SEC_OID_MD5)?MD5_LENGTH:SHA1_LENGTH);
-
+        
         memset(fingerprint, 0, sizeof fingerprint);
         PK11_HashBuf(id, fingerprint, pCert->derCert.data, pCert->derCert.len);
         fpItem.data = fingerprint;
         fpItem.len = length;
         //fpStr = CERT_Hexify(&fpItem, 1);
-
+    
         Sequence< sal_Int8 > thumbprint( length ) ;
         for( int i = 0 ; i < length ; i ++ )
         {
             thumbprint[i] = fingerprint[i];
         }
-
+        
         //PORT_Free(fpStr);
         return thumbprint;
     }
@@ -388,11 +388,11 @@ X509Certificate_NssImpl* X509Certificate_NssImpl :: getImplementation( const Ref
 ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getSubjectPublicKeyValue()
     throw ( ::com::sun::star::uno::RuntimeException)
 {
-    if( m_pCert != NULL )
+    if( m_pCert != NULL ) 
     {
         SECItem spk = m_pCert->subjectPublicKeyInfo.subjectPublicKey;
         DER_ConvertBitString(&spk);
-
+    
         if ( spk.len>0)
         {
             Sequence< sal_Int8 > key( spk.len ) ;
@@ -400,14 +400,14 @@ X509Certificate_NssImpl* X509Certificate_NssImpl :: getImplementation( const Ref
             {
                 key[i] = *( spk.data + i ) ;
             }
-
+    
             return key ;
         }
     }
-
+    
     return ::com::sun::star::uno::Sequence< sal_Int8 >();
 }
-
+    
 ::rtl::OUString SAL_CALL X509Certificate_NssImpl::getSignatureAlgorithm()
     throw ( ::com::sun::star::uno::RuntimeException)
 {
@@ -420,7 +420,7 @@ X509Certificate_NssImpl* X509Certificate_NssImpl :: getImplementation( const Ref
         return OUString() ;
     }
 }
-
+    
 ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getSHA1Thumbprint()
     throw ( ::com::sun::star::uno::RuntimeException)
 {
@@ -439,9 +439,9 @@ sal_Int32 SAL_CALL X509Certificate_NssImpl::getCertificateUsage(  )
     SECStatus rv;
     SECItem tmpitem;
     sal_Int32 usage;
-
+    
     rv = CERT_FindKeyUsageExtension(m_pCert, &tmpitem);
-    if ( rv == SECSuccess )
+    if ( rv == SECSuccess ) 
     {
         usage = tmpitem.data[0];
         PORT_Free(tmpitem.data);
@@ -451,18 +451,18 @@ sal_Int32 SAL_CALL X509Certificate_NssImpl::getCertificateUsage(  )
     {
         usage = KU_ALL;
     }
-
+    
     /*
      * to make the nss implementation compatible with MSCrypto,
      * the following usage is ignored
      *
      *
-    if ( CERT_GovtApprovedBitSet(m_pCert) )
+    if ( CERT_GovtApprovedBitSet(m_pCert) ) 
     {
         usage |= KU_NS_GOVT_APPROVED;
     }
     */
-
+    
     return usage;
 }
 
diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx
index e3297552481a..bedb25651818 100644
--- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,16 +80,16 @@ class X509Certificate_NssImpl : public ::cppu::WeakImplHelper2<
 
         virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSubjectPublicKeyValue()
             throw ( ::com::sun::star::uno::RuntimeException) ;
-
+            
         virtual ::rtl::OUString SAL_CALL getSignatureAlgorithm()
             throw ( ::com::sun::star::uno::RuntimeException) ;
-
+            
         virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSHA1Thumbprint()
             throw ( ::com::sun::star::uno::RuntimeException) ;
 
         virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getMD5Thumbprint()
             throw ( ::com::sun::star::uno::RuntimeException) ;
-
+            
         virtual sal_Int32 SAL_CALL getCertificateUsage( ) throw ( ::com::sun::star::uno::RuntimeException) ;
         // MM : end
 
@@ -105,6 +105,6 @@ class X509Certificate_NssImpl : public ::cppu::WeakImplHelper2<
         void setRawCert( ::com::sun::star::uno::Sequence< sal_Int8 > rawCert ) throw ( ::com::sun::star::uno::RuntimeException) ;
 } ;
 
-#endif  // _X509CERTIFICATE_NSSIMPL_HXX_
+#endif	// _X509CERTIFICATE_NSSIMPL_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
index e2e0c943d8e2..8a5cb3c0ebfc 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ Reference< XXMLEncryptionTemplate >
 SAL_CALL XMLEncryption_NssImpl :: encrypt(
     const Reference< XXMLEncryptionTemplate >& aTemplate ,
     const Reference< XSecurityEnvironment >& aEnvironment
-) throw( com::sun::star::xml::crypto::XMLEncryptionException,
+) throw( com::sun::star::xml::crypto::XMLEncryptionException, 
          com::sun::star::uno::SecurityException )
 {
     xmlSecKeysMngrPtr pMngr = NULL ;
@@ -110,7 +110,7 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt(
             sal::static_int_cast<sal_uIntPtr>(xSecTunnel->getSomething( SecurityEnvironment_NssImpl::getUnoTunnelId() ))) ;
     if( pSecEnv == NULL )
         throw RuntimeException() ;
-
+        
     //Get the encryption template
     Reference< XXMLElementWrapper > xTemplate = aTemplate->getTemplate() ;
     if( !xTemplate.is() ) {
@@ -155,7 +155,7 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt(
     if( pContent == NULL ) {
         throw XMLEncryptionException() ;
     }
-
+    
     /* MM : remove the following 2 lines
     xmlUnlinkNode(pContent);
     xmlAddNextSibling(pEncryptedData, pContent);
@@ -195,7 +195,7 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt(
 
     pEncryptedData = pTemplate->getNativeElement() ;
 
-    //Find the element to be encrypted.
+    //Find the element to be encrypted. 
     /* MM : remove the old method to get the target element
     //This element is wrapped in the CipherValue sub-element.
     xmlNodePtr pCipherData = pEncryptedData->children;
@@ -224,11 +224,11 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt(
     */
 
     //Encrypt the template
-    if( xmlSecEncCtxXmlEncrypt( pEncCtx , pEncryptedData , pContent ) < 0 )
+    if( xmlSecEncCtxXmlEncrypt( pEncCtx , pEncryptedData , pContent ) < 0 ) 
     {
         xmlSecEncCtxDestroy( pEncCtx ) ;
         pSecEnv->destroyKeysManager( pMngr ) ; //i39448
-
+        
         //throw XMLEncryptionException() ;
         clearErrorRecorder();
         return aTemplate;
@@ -255,7 +255,7 @@ Reference< XXMLEncryptionTemplate >
 SAL_CALL XMLEncryption_NssImpl :: decrypt(
     const Reference< XXMLEncryptionTemplate >& aTemplate ,
     const Reference< XXMLSecurityContext >& aSecurityCtx
-) throw( com::sun::star::xml::crypto::XMLEncryptionException ,
+) throw( com::sun::star::xml::crypto::XMLEncryptionException , 
          com::sun::star::uno::SecurityException) {
     xmlSecKeysMngrPtr pMngr = NULL ;
     xmlSecEncCtxPtr pEncCtx = NULL ;
@@ -304,32 +304,32 @@ SAL_CALL XMLEncryption_NssImpl :: decrypt(
     }
 
      setErrorRecorder( );
-
+        
     sal_Int32 nSecurityEnvironment = aSecurityCtx->getSecurityEnvironmentNumber();
     sal_Int32 i;
-
+    
     for (i=0; i<nSecurityEnvironment; ++i)
     {
         Reference< XSecurityEnvironment > aEnvironment = aSecurityCtx->getSecurityEnvironmentByIndex(i);
-
+        
         //Get Keys Manager
         Reference< XUnoTunnel > xSecTunnel( aEnvironment , UNO_QUERY ) ;
         if( !aEnvironment.is() ) {
              throw RuntimeException() ;
         }
-
+    
         SecurityEnvironment_NssImpl* pSecEnv =
             reinterpret_cast<SecurityEnvironment_NssImpl*>(
                 sal::static_int_cast<sal_uIntPtr>(
                     xSecTunnel->getSomething( SecurityEnvironment_NssImpl::getUnoTunnelId() )));
         if( pSecEnv == NULL )
             throw RuntimeException() ;
-
+            
         pMngr = pSecEnv->createKeysManager() ; //i39448
         if( !pMngr ) {
             throw RuntimeException() ;
         }
-
+            
         //Create Encryption context
         pEncCtx = xmlSecEncCtxCreate( pMngr ) ;
         if( pEncCtx == NULL )
@@ -348,11 +348,11 @@ SAL_CALL XMLEncryption_NssImpl :: decrypt(
             //Destroy the encryption context
             xmlSecEncCtxDestroy( pEncCtx ) ;
             pSecEnv->destroyKeysManager( pMngr ) ; //i39448
-
+        
             //get the decrypted element
             XMLElementWrapper_XmlSecImpl * ret = new XMLElementWrapper_XmlSecImpl(isParentRef?
                 (referenceNode->children):(referenceNode->next));
-
+        
             //return ret;
             aTemplate->setTemplate(ret);
             break;
diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx
index 1b859734db39..009abec62437 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -95,6 +95,6 @@ class XMLEncryption_NssImpl : public ::cppu::WeakImplHelper3<
         static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > impl_createFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) ;
 } ;
 
-#endif  // _XMLENCRYPTION_NSSIMPL_HXX_
+#endif	// _XMLENCRYPTION_NSSIMPL_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
index db8500fea13d..9b6ed2de1145 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ using ::rtl::OUString ;
 using ::com::sun::star::xml::crypto::XSecurityEnvironment ;
 using ::com::sun::star::xml::crypto::XXMLSecurityContext ;
 
-XMLSecurityContext_NssImpl :: XMLSecurityContext_NssImpl( const Reference< XMultiServiceFactory >& aFactory )
+XMLSecurityContext_NssImpl :: XMLSecurityContext_NssImpl( const Reference< XMultiServiceFactory >& aFactory ) 
     ://i39448 : m_pKeysMngr( NULL ) ,
     m_xServiceManager( aFactory ) ,
     m_nDefaultEnvIndex(-1)
-    //m_xSecurityEnvironment( NULL )
+    //m_xSecurityEnvironment( NULL ) 
 {
     //Init xmlsec library
     if( xmlSecInit() < 0 ) {
@@ -111,25 +111,25 @@ sal_Int32 SAL_CALL XMLSecurityContext_NssImpl::getSecurityEnvironmentNumber(  )
 {
     return m_vSecurityEnvironments.size();
 }
-
+    
 ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > SAL_CALL
     XMLSecurityContext_NssImpl::getSecurityEnvironmentByIndex( sal_Int32 index )
     throw (::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > xSecurityEnvironment;
-
+    
     if (index >= 0 && index < ( sal_Int32 )m_vSecurityEnvironments.size())
     {
         xSecurityEnvironment = m_vSecurityEnvironments[index];
     }
     else
         throw RuntimeException() ;
-
+        
     return xSecurityEnvironment;
 }
-
-::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > SAL_CALL
-    XMLSecurityContext_NssImpl::getSecurityEnvironment(  )
+    
+::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > SAL_CALL 
+    XMLSecurityContext_NssImpl::getSecurityEnvironment(  ) 
     throw (::com::sun::star::uno::RuntimeException)
 {
     if (m_nDefaultEnvIndex >= 0 && m_nDefaultEnvIndex < ( sal_Int32 )m_vSecurityEnvironments.size())
@@ -184,7 +184,7 @@ void SAL_CALL XMLSecurityContext_NssImpl :: setSecurityEnvironment( const Refere
         throw RuntimeException() ;
 
     //todo
-//  slot = pSecEnv->getCryptoSlot() ;
+//	slot = pSecEnv->getCryptoSlot() ;
     handler = pSecEnv->getCertDb() ;
 
     /*-
@@ -224,10 +224,10 @@ void SAL_CALL XMLSecurityContext_NssImpl :: setSecurityEnvironment( const Refere
 }
 
 /* XXMLSecurityContext */
-Reference< XSecurityEnvironment > SAL_CALL XMLSecurityContext_NssImpl :: getSecurityEnvironment()
+Reference< XSecurityEnvironment > SAL_CALL XMLSecurityContext_NssImpl :: getSecurityEnvironment() 
     throw (RuntimeException)
 {
-    return  m_xSecurityEnvironment ;
+    return	m_xSecurityEnvironment ;
 }
 #endif
 
@@ -284,10 +284,10 @@ Reference< XSingleServiceFactory > XMLSecurityContext_NssImpl :: impl_createFact
 
 #if 0 //not useful any longer
 /* XUnoTunnel */
-sal_Int64 SAL_CALL XMLSecurityContext_NssImpl :: getSomething( const Sequence< sal_Int8 >& aIdentifier )
+sal_Int64 SAL_CALL XMLSecurityContext_NssImpl :: getSomething( const Sequence< sal_Int8 >& aIdentifier ) 
 throw (RuntimeException)
 {
-    if( aIdentifier.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) {
+    if( aIdentifier.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) { 
         return ( sal_Int64 )this ;
     }
     return 0 ;
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx
index 685f83ec304d..ca69b84dd898 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,20 +71,20 @@ class XMLSecurityContext_NssImpl : public ::cppu::WeakImplHelper3<
         virtual sal_Int32 SAL_CALL addSecurityEnvironment(
             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment >& aSecurityEnvironment
             ) throw (::com::sun::star::security::SecurityInfrastructureException, ::com::sun::star::uno::RuntimeException);
-
+        
         virtual ::sal_Int32 SAL_CALL getSecurityEnvironmentNumber(  )
             throw (::com::sun::star::uno::RuntimeException);
-
+            
         virtual ::com::sun::star::uno::Reference<
             ::com::sun::star::xml::crypto::XSecurityEnvironment > SAL_CALL
             getSecurityEnvironmentByIndex( ::sal_Int32 index )
             throw (::com::sun::star::uno::RuntimeException);
-
+             
         virtual ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::crypto::XSecurityEnvironment > SAL_CALL
-            getSecurityEnvironment(  )
+            ::com::sun::star::xml::crypto::XSecurityEnvironment > SAL_CALL 
+            getSecurityEnvironment(  ) 
             throw (::com::sun::star::uno::RuntimeException);
-
+        
         virtual ::sal_Int32 SAL_CALL getDefaultSecurityEnvironmentIndex(  )
             throw (::com::sun::star::uno::RuntimeException);
 
@@ -114,13 +114,13 @@ class XMLSecurityContext_NssImpl : public ::cppu::WeakImplHelper3<
         static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) throw( ::com::sun::star::uno::RuntimeException ) ;
 
         static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > impl_createFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) ;
-
+                                         
         /*
          * Because of the issue of multi-securityenvironment, so the keyManager method is not useful any longer.
          *
-
+                                            
         //Methods from XUnoTunnel
-        virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier )
+        virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) 
         throw (com::sun::star::uno::RuntimeException);
 
         static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId() ;
@@ -128,10 +128,10 @@ class XMLSecurityContext_NssImpl : public ::cppu::WeakImplHelper3<
 
         //Native mehtods
         virtual xmlSecKeysMngrPtr keysManager() throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
-
+        
         */
 } ;
 
-#endif  // _XMLSIGNATURECONTEXT_NSSIMPL_HXX_
+#endif	// _XMLSIGNATURECONTEXT_NSSIMPL_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
index 9c08a4d01fce..090dee7e2f8a 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ Reference< XXMLSignatureTemplate >
 SAL_CALL XMLSignature_NssImpl :: generate(
     const Reference< XXMLSignatureTemplate >& aTemplate ,
     const Reference< XSecurityEnvironment >& aEnvironment
-) throw( com::sun::star::xml::crypto::XMLSignatureException,
+) throw( com::sun::star::xml::crypto::XMLSignatureException, 
          com::sun::star::uno::SecurityException )
 {
     xmlSecKeysMngrPtr pMngr = NULL ;
@@ -157,7 +157,7 @@ SAL_CALL XMLSignature_NssImpl :: generate(
     }
 
     //Sign the template
-    if( xmlSecDSigCtxSign( pDsigCtx , pNode ) == 0 )
+    if( xmlSecDSigCtxSign( pDsigCtx , pNode ) == 0 ) 
     {
         if (pDsigCtx->status == xmlSecDSigStatusSucceeded)
             aTemplate->setStatus(com::sun::star::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED);
@@ -186,8 +186,8 @@ Reference< XXMLSignatureTemplate >
 SAL_CALL XMLSignature_NssImpl :: validate(
     const Reference< XXMLSignatureTemplate >& aTemplate ,
     const Reference< XXMLSecurityContext >& aSecurityCtx
-) throw( com::sun::star::uno::RuntimeException,
-         com::sun::star::uno::SecurityException,
+) throw( com::sun::star::uno::RuntimeException, 
+         com::sun::star::uno::SecurityException, 
          com::sun::star::xml::crypto::XMLSignatureException ) {
     xmlSecKeysMngrPtr pMngr = NULL ;
     xmlSecDSigCtxPtr pDsigCtx = NULL ;
@@ -228,32 +228,32 @@ SAL_CALL XMLSignature_NssImpl :: validate(
     }
 
      setErrorRecorder();
-
+    
     sal_Int32 nSecurityEnvironment = aSecurityCtx->getSecurityEnvironmentNumber();
     sal_Int32 i;
-
+    
     for (i=0; i<nSecurityEnvironment; ++i)
     {
         Reference< XSecurityEnvironment > aEnvironment = aSecurityCtx->getSecurityEnvironmentByIndex(i);
-
+        
         //Get Keys Manager
         Reference< XUnoTunnel > xSecTunnel( aEnvironment , UNO_QUERY ) ;
         if( !xSecTunnel.is() ) {
              throw RuntimeException() ;
         }
-
+    
         SecurityEnvironment_NssImpl* pSecEnv =
             reinterpret_cast<SecurityEnvironment_NssImpl*>(
                 sal::static_int_cast<sal_uIntPtr>(
                     xSecTunnel->getSomething( SecurityEnvironment_NssImpl::getUnoTunnelId() )));
         if( pSecEnv == NULL )
             throw RuntimeException() ;
-
+            
         pMngr = pSecEnv->createKeysManager() ; //i39448
         if( !pMngr ) {
             throw RuntimeException() ;
         }
-
+            
         //Create Signature context
         pDsigCtx = xmlSecDSigCtxCreate( pMngr ) ;
         if( pDsigCtx == NULL )
@@ -266,9 +266,9 @@ SAL_CALL XMLSignature_NssImpl :: validate(
 
         //Verify signature
         int rs = xmlSecDSigCtxVerify( pDsigCtx , pNode );
-
-
-        if (rs == 0 &&
+        
+    
+        if (rs == 0 && 
             pDsigCtx->status == xmlSecDSigStatusSucceeded)
         {
             aTemplate->setStatus(com::sun::star::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED);
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx
index 3a8cfecd4eb0..4c6017a69381 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 XMLSignature_NssImpl : public ::cppu::WeakImplHelper3<
             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSignatureTemplate >& aTemplate ,
             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSecurityContext >& aContext
         ) throw( com::sun::star::uno::RuntimeException,
-                 com::sun::star::uno::SecurityException,
+                 com::sun::star::uno::SecurityException, 
                  com::sun::star::xml::crypto::XMLSignatureException);
 
         //Methods from XInitialization
@@ -95,6 +95,6 @@ class XMLSignature_NssImpl : public ::cppu::WeakImplHelper3<
         static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > impl_createFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) ;
 } ;
 
-#endif  // _XMLSIGNATURE_NSSIMPL_HXX_
+#endif	// _XMLSIGNATURE_NSSIMPL_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx b/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx
index bce50a11e5d5..c6155607330f 100644
--- a/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ sal_Bool SAL_CALL nss_component_writeInfo( void* /*pServiceManager*/ , void* pRe
     Reference< XRegistryKey > xKey( reinterpret_cast< XRegistryKey* >( pRegistryKey ) ) ;
 
     if( xKey.is() ) {
-        //  try {
+        //	try {
         // XMLSignature_NssImpl
         sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ;
         sKeyName += XMLSignature_NssImpl::impl_getImplementationName() ;
@@ -122,11 +122,11 @@ sal_Bool SAL_CALL nss_component_writeInfo( void* /*pServiceManager*/ , void* pRe
             for( i = seqServices.getLength() ; i -- ;  )
                 xNewKey->createKey( seqServices.getConstArray()[i] ) ;
         }
-
+        
         return sal_True;
         //} catch( InvalidRegistryException & ) {
-        //  //we should not ignore exceptions
-        //  return sal_False ;
+        //	//we should not ignore exceptions
+        //	return sal_False ;
         //}
     }
     return result;
diff --git a/xmlsecurity/source/xmlsec/saxhelper.cxx b/xmlsecurity/source/xmlsec/saxhelper.cxx
index 7384c6f310a7..6e40119cdbcd 100644
--- a/xmlsecurity/source/xmlsec/saxhelper.cxx
+++ b/xmlsecurity/source/xmlsec/saxhelper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ namespace cssxcsax = com::sun::star::xml::csax;
  * The return value is NULL terminated. The application has the responsibilty to
  * deallocte the return value.
  */
-xmlChar* ous_to_xmlstr( const rtl::OUString& oustr )
+xmlChar* ous_to_xmlstr( const rtl::OUString& oustr ) 
 {
     rtl::OString ostr = rtl::OUStringToOString( oustr , RTL_TEXTENCODING_UTF8 ) ;
     return xmlStrndup( ( xmlChar* )ostr.getStr(), ( int )ostr.getLength() ) ;
@@ -56,7 +56,7 @@ xmlChar* ous_to_xmlstr( const rtl::OUString& oustr )
  * The return value is NULL terminated. The application has the responsibilty to
  * deallocte the return value.
  */
-xmlChar* ous_to_nxmlstr( const rtl::OUString& oustr, int& length )
+xmlChar* ous_to_nxmlstr( const rtl::OUString& oustr, int& length ) 
 {
     rtl::OString ostr = rtl::OUStringToOString( oustr , RTL_TEXTENCODING_UTF8 ) ;
     length = ostr.getLength();
@@ -67,7 +67,7 @@ xmlChar* ous_to_nxmlstr( const rtl::OUString& oustr, int& length )
 /**
  * The input parameter isn't necessaryly NULL terminated.
  */
-rtl::OUString xmlchar_to_ous( const xmlChar* pChar, int length )
+rtl::OUString xmlchar_to_ous( const xmlChar* pChar, int length ) 
 {
     if( pChar != NULL )
     {
@@ -82,9 +82,9 @@ rtl::OUString xmlchar_to_ous( const xmlChar* pChar, int length )
 /**
  * The input parameter is NULL terminated
  */
-rtl::OUString xmlstr_to_ous( const xmlChar* pStr )
+rtl::OUString xmlstr_to_ous( const xmlChar* pStr ) 
 {
-    if( pStr != NULL )
+    if( pStr != NULL ) 
     {
         return xmlchar_to_ous( pStr , xmlStrlen( pStr ) ) ;
     }
@@ -98,16 +98,16 @@ rtl::OUString xmlstr_to_ous( const xmlChar* pStr )
  * The return value and the referenced value must be NULL terminated.
  * The application has the responsibilty to deallocte the return value.
  */
-const xmlChar** attrlist_to_nxmlstr( const cssu::Sequence< cssxcsax::XMLAttribute >& aAttributes )
+const xmlChar** attrlist_to_nxmlstr( const cssu::Sequence< cssxcsax::XMLAttribute >& aAttributes ) 
 {
     xmlChar* attname = NULL ;
     xmlChar* attvalue = NULL ;
     const xmlChar** attrs = NULL ;
     rtl::OUString oustr ;
-
+    
     sal_Int32 nLength = aAttributes.getLength();;
 
-    if( nLength != 0 )
+    if( nLength != 0 ) 
     {
         attrs = ( const xmlChar** )xmlMalloc( ( nLength * 2 + 2 ) * sizeof( xmlChar* ) ) ;
     }
@@ -116,12 +116,12 @@ const xmlChar** attrlist_to_nxmlstr( const cssu::Sequence< cssxcsax::XMLAttribut
         return NULL ;
     }
 
-    for( int i = 0 , j = 0 ; j < nLength ; ++j )
+    for( int i = 0 , j = 0 ; j < nLength ; ++j ) 
     {
         attname = ous_to_xmlstr( aAttributes[j].sName ) ;
         attvalue = ous_to_xmlstr( aAttributes[j].sValue ) ;
 
-        if( attname != NULL && attvalue != NULL )
+        if( attname != NULL && attvalue != NULL ) 
         {
             attrs[i++] = attname ;
             attrs[i++] = attvalue ;
@@ -152,7 +152,7 @@ SAXHelper::SAXHelper( )
 {
     xmlInitParser() ;
     LIBXML_TEST_VERSION ;
-
+    
     /*
      * compile error:
      * xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS ;
@@ -170,27 +170,27 @@ SAXHelper::SAXHelper( )
      *
      * mmi : re-initialize the SAX handler to version 1
      */
-
+    
     xmlSAXVersion(m_pParserCtxt->sax, 1);
 
     /* end */
 
-    if( m_pParserCtxt->inputTab[0] != NULL )
+    if( m_pParserCtxt->inputTab[0] != NULL ) 
     {
         m_pParserCtxt->inputTab[0] = NULL ;
     }
-
-    if( m_pParserCtxt == NULL )
+    
+    if( m_pParserCtxt == NULL ) 
     {
 #ifndef XMLSEC_NO_XSLT
-        xsltCleanupGlobals() ;
+        xsltCleanupGlobals() ;            
 #endif
 //      see issue i74334, we cannot call xmlCleanupParser when libxml is still used
-//      in other parts of the office.
-//      xmlCleanupParser() ;
+//		in other parts of the office.
+//		xmlCleanupParser() ;
         throw cssu::RuntimeException() ;
     }
-    else if( m_pParserCtxt->sax == NULL )
+    else if( m_pParserCtxt->sax == NULL ) 
     {
         xmlFreeParserCtxt( m_pParserCtxt ) ;
 
@@ -198,8 +198,8 @@ SAXHelper::SAXHelper( )
         xsltCleanupGlobals() ;
 #endif
 //      see issue i74334, we cannot call xmlCleanupParser when libxml is still used
-//      in other parts of the office.
-//      xmlCleanupParser() ;
+//		in other parts of the office.
+//		xmlCleanupParser() ;
         m_pParserCtxt = NULL ;
         throw cssu::RuntimeException() ;
     }
@@ -221,7 +221,7 @@ SAXHelper::SAXHelper( )
  * destruct the xml tree.
  */
 SAXHelper::~SAXHelper() {
-    if( m_pParserCtxt != NULL )
+    if( m_pParserCtxt != NULL ) 
     {
         /*
          * In the situation that no object refer the Document, this destructor
@@ -236,14 +236,14 @@ SAXHelper::~SAXHelper() {
         m_pParserCtxt = NULL ;
     }
 
-    if( m_pSaxHandler != NULL )
+    if( m_pSaxHandler != NULL ) 
     {
         xmlFree( m_pSaxHandler ) ;
         m_pSaxHandler = NULL ;
     }
 //      see issue i74334, we cannot call xmlCleanupParser when libxml is still used
-//      in other parts of the office.
-//  xmlCleanupParser() ;
+//		in other parts of the office.
+//	xmlCleanupParser() ;
 }
 
 xmlNodePtr SAXHelper::getCurrentNode()
@@ -260,7 +260,7 @@ void SAXHelper::setCurrentNode(const xmlNodePtr pNode)
      * node, in order to make compatibility.
      */
     m_pParserCtxt->nodeTab[m_pParserCtxt->nodeNr - 1]
-        = m_pParserCtxt->node
+        = m_pParserCtxt->node 
             = pNode;
 }
 
@@ -273,14 +273,14 @@ xmlDocPtr SAXHelper::getDocument()
  * XDocumentHandler -- start an xml document
  */
 void SAXHelper::startDocument( void )
-    throw( cssxs::SAXException , cssu::RuntimeException )
+    throw( cssxs::SAXException , cssu::RuntimeException ) 
 {
     /*
      * Adjust inputTab
      */
     xmlParserInputPtr pInput = xmlNewInputStream( m_pParserCtxt ) ;
 
-    if( m_pParserCtxt->inputTab != NULL && m_pParserCtxt->inputMax != 0 )
+    if( m_pParserCtxt->inputTab != NULL && m_pParserCtxt->inputMax != 0 ) 
     {
         m_pParserCtxt->inputTab[0] = pInput ;
         m_pParserCtxt->input = pInput ;
@@ -288,7 +288,7 @@ void SAXHelper::startDocument( void )
 
     m_pSaxHandler->startDocument( m_pParserCtxt ) ;
 
-    if( m_pParserCtxt == NULL || m_pParserCtxt->myDoc == NULL )
+    if( m_pParserCtxt == NULL || m_pParserCtxt->myDoc == NULL ) 
     {
         throw cssu::RuntimeException() ;
     }
@@ -297,8 +297,8 @@ void SAXHelper::startDocument( void )
 /**
  * XDocumentHandler -- end an xml document
  */
-void SAXHelper::endDocument( void )
-    throw( cssxs::SAXException , cssu::RuntimeException )
+void SAXHelper::endDocument( void ) 
+    throw( cssxs::SAXException , cssu::RuntimeException ) 
 {
     m_pSaxHandler->endDocument( m_pParserCtxt ) ;
 }
@@ -309,33 +309,33 @@ void SAXHelper::endDocument( void )
 void SAXHelper::startElement(
     const rtl::OUString& aName,
     const cssu::Sequence< cssxcsax::XMLAttribute >& aAttributes )
-    throw( cssxs::SAXException , cssu::RuntimeException )
+    throw( cssxs::SAXException , cssu::RuntimeException ) 
 {
     const xmlChar* fullName = NULL ;
     const xmlChar** attrs = NULL ;
 
     fullName = ous_to_xmlstr( aName ) ;
     attrs = attrlist_to_nxmlstr( aAttributes ) ;
-
+    
     if( fullName != NULL || attrs != NULL )
     {
         m_pSaxHandler->startElement( m_pParserCtxt , fullName , attrs ) ;
     }
 
-    if( fullName != NULL )
+    if( fullName != NULL ) 
     {
         xmlFree( ( xmlChar* )fullName ) ;
         fullName = NULL ;
     }
-
-    if( attrs != NULL )
+    
+    if( attrs != NULL ) 
     {
-        for( int i = 0 ; attrs[i] != NULL ; ++i )
+        for( int i = 0 ; attrs[i] != NULL ; ++i ) 
         {
             xmlFree( ( xmlChar* )attrs[i] ) ;
             attrs[i] = NULL ;
         }
-
+        
         xmlFree( ( void* ) attrs ) ;
         attrs = NULL ;
     }
@@ -345,14 +345,14 @@ void SAXHelper::startElement(
  * XDocumentHandler -- end an xml element
  */
 void SAXHelper::endElement( const rtl::OUString& aName )
-    throw( cssxs::SAXException , cssu::RuntimeException )
+    throw( cssxs::SAXException , cssu::RuntimeException ) 
 {
     xmlChar* fullname = NULL ;
 
     fullname = ous_to_xmlstr( aName ) ;
     m_pSaxHandler->endElement( m_pParserCtxt , fullname ) ;
 
-    if( fullname != NULL )
+    if( fullname != NULL ) 
     {
         xmlFree( ( xmlChar* )fullname ) ;
         fullname = NULL ;
@@ -363,7 +363,7 @@ void SAXHelper::endElement( const rtl::OUString& aName )
  * XDocumentHandler -- an xml element or cdata characters
  */
 void SAXHelper::characters( const rtl::OUString& aChars )
-    throw( cssxs::SAXException , cssu::RuntimeException )
+    throw( cssxs::SAXException , cssu::RuntimeException ) 
 {
     const xmlChar* chars = NULL ;
     int length = 0 ;
@@ -371,7 +371,7 @@ void SAXHelper::characters( const rtl::OUString& aChars )
     chars = ous_to_nxmlstr( aChars, length ) ;
     m_pSaxHandler->characters( m_pParserCtxt , chars , length ) ;
 
-    if( chars != NULL )
+    if( chars != NULL ) 
     {
         xmlFree( ( xmlChar* )chars ) ;
     }
@@ -380,8 +380,8 @@ void SAXHelper::characters( const rtl::OUString& aChars )
 /**
  * XDocumentHandler -- ignorable xml white space
  */
-void SAXHelper::ignorableWhitespace( const rtl::OUString& aWhitespaces )
-    throw( cssxs::SAXException , cssu::RuntimeException )
+void SAXHelper::ignorableWhitespace( const rtl::OUString& aWhitespaces ) 
+    throw( cssxs::SAXException , cssu::RuntimeException ) 
 {
     const xmlChar* chars = NULL ;
     int length = 0 ;
@@ -389,7 +389,7 @@ void SAXHelper::ignorableWhitespace( const rtl::OUString& aWhitespaces )
     chars = ous_to_nxmlstr( aWhitespaces, length ) ;
     m_pSaxHandler->ignorableWhitespace( m_pParserCtxt , chars , length ) ;
 
-    if( chars != NULL )
+    if( chars != NULL ) 
     {
         xmlFree( ( xmlChar* )chars ) ;
     }
@@ -401,7 +401,7 @@ void SAXHelper::ignorableWhitespace( const rtl::OUString& aWhitespaces )
 void SAXHelper::processingInstruction(
     const rtl::OUString& aTarget,
     const rtl::OUString& aData )
-    throw( cssxs::SAXException , cssu::RuntimeException )
+    throw( cssxs::SAXException , cssu::RuntimeException ) 
 {
     xmlChar* target = NULL ;
     xmlChar* data = NULL ;
@@ -411,13 +411,13 @@ void SAXHelper::processingInstruction(
 
     m_pSaxHandler->processingInstruction( m_pParserCtxt , target , data ) ;
 
-    if( target != NULL )
+    if( target != NULL ) 
     {
         xmlFree( ( xmlChar* )target ) ;
         target = NULL ;
     }
-
-    if( data != NULL )
+    
+    if( data != NULL ) 
     {
         xmlFree( ( xmlChar* )data ) ;
         data = NULL ;
@@ -430,17 +430,17 @@ void SAXHelper::processingInstruction(
  */
 void SAXHelper::setDocumentLocator(
     const cssu::Reference< cssxs::XLocator > &)
-    throw( cssxs::SAXException , cssu::RuntimeException )
+    throw( cssxs::SAXException , cssu::RuntimeException ) 
 {
     //--Pseudo code if necessary
     //--m_pSaxLocator is a member defined as xmlSAXHabdlerPtr
     //--m_pSaxLocatorHdl is a member defined as Sax_Locator
 
     //if( m_pSaxLocator != NULL ) {
-    //  //Deallocate the memory
+    //	//Deallocate the memory
     //}
     //if( m_pSaxLocatorHdl != NULL ) {
-    //  //Deallocate the memory
+    //	//Deallocate the memory
     //}
 
     //m_pSaxLocatorHdl = new Sax_Locator( xLocator ) ;
diff --git a/xmlsecurity/source/xmlsec/saxhelper.hxx b/xmlsecurity/source/xmlsec/saxhelper.hxx
index a18943d5043e..562b6e773eb5 100644
--- a/xmlsecurity/source/xmlsec/saxhelper.hxx
+++ b/xmlsecurity/source/xmlsec/saxhelper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
index 15bcd066477d..0426784db6c3 100644
--- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 cssxw = com::sun::star::xml::wrapper;
 
 #define SERVICE_NAME "com.sun.star.xml.wrapper.XMLDocumentWrapper"
 #define IMPLEMENTATION_NAME "com.sun.star.xml.security.bridge.xmlsec.XMLDocumentWrapper_XmlSecImpl"
-
+    
 #define STRXMLNS "xmlns"
 
 #define RTL_ASCII_USTRINGPARAM( asciiStr ) asciiStr, strlen( asciiStr ), RTL_TEXTENCODING_ASCII_US
@@ -75,12 +75,12 @@ XMLDocumentWrapper_XmlSecImpl::XMLDocumentWrapper_XmlSecImpl( )
 {
     saxHelper.startDocument();
     m_pDocument = saxHelper.getDocument();
-
+    
     /*
      * creates the virtual root element
      */
     saxHelper.startElement(rtl::OUString(RTL_UTF8_USTRINGPARAM( "root" )), cssu::Sequence<cssxcsax::XMLAttribute>());
-
+    
     m_pRootElement = saxHelper.getCurrentNode();
     m_pCurrentElement = m_pRootElement;
 }
@@ -95,44 +95,44 @@ void XMLDocumentWrapper_XmlSecImpl::getNextSAXEvent()
 /****** XMLDocumentWrapper_XmlSecImpl/getNextSAXEvent *************************
  *
  *   NAME
- *  getNextSAXEvent -- Prepares the next SAX event to be manipulate
+ *	getNextSAXEvent -- Prepares the next SAX event to be manipulate
  *
  *   SYNOPSIS
- *  getNextSAXEvent();
+ *	getNextSAXEvent();
  *
  *   FUNCTION
- *  When converting the document into SAX events, this method is used to
- *  decide the next SAX event to be generated.
- *  Two member variables are checked to make the decision, the
- *  m_pCurrentElement and the m_nCurrentPosition.
- *  The m_pCurrentElement represents the node which have been covered, and
- *  the m_nCurrentPosition represents the event which have been sent.
- *  For example, suppose that the m_pCurrentElement
- *  points to element A, and the m_nCurrentPosition equals to
- *  NODEPOSITION_STARTELEMENT, then the next SAX event should be the
- *  endElement for element A if A has no child, or startElement for the
- *  first child element of element A otherwise.
- *  The m_nCurrentPosition can be one of following values:
- *  NODEPOSITION_STARTELEMENT for startElement;
- *  NODEPOSITION_ENDELEMENT for endElement;
- *  NODEPOSITION_NORMAL for other SAX events;
+ *	When converting the document into SAX events, this method is used to
+ *	decide the next SAX event to be generated.
+ *	Two member variables are checked to make the decision, the
+ *	m_pCurrentElement and the m_nCurrentPosition.
+ *	The m_pCurrentElement represents the node which have been covered, and
+ *	the m_nCurrentPosition represents the event which have been sent.
+ *	For example, suppose that the m_pCurrentElement
+ *	points to element A, and the m_nCurrentPosition equals to 
+ *	NODEPOSITION_STARTELEMENT, then the next SAX event should be the
+ *	endElement for element A if A has no child, or startElement for the
+ *	first child element of element A otherwise.
+ *	The m_nCurrentPosition can be one of following values:
+ *	NODEPOSITION_STARTELEMENT for startElement;
+ *	NODEPOSITION_ENDELEMENT for endElement;
+ *	NODEPOSITION_NORMAL for other SAX events;
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     OSL_ASSERT( m_pCurrentElement != NULL );
-
+    
         /*
          * Get the next event through tree order.
          *
@@ -146,13 +146,13 @@ void XMLDocumentWrapper_XmlSecImpl::getNextSAXEvent()
              * If the current node has children, then its first child
              * should be next current node, and the next event will be
              * startElement or charaters(PI) based on that child's node
-             * type. Otherwise, the endElement of current node is the
+             * type. Otherwise, the endElement of current node is the 
              * next event.
              */
         if (m_pCurrentElement->children != NULL)
         {
             m_pCurrentElement = m_pCurrentElement->children;
-            m_nCurrentPosition
+            m_nCurrentPosition 
                 = (m_pCurrentElement->type == XML_ELEMENT_NODE)?
                     NODEPOSITION_STARTELEMENT:NODEPOSITION_NORMAL;
         }
@@ -169,7 +169,7 @@ void XMLDocumentWrapper_XmlSecImpl::getNextSAXEvent()
     else if (m_nCurrentPosition == NODEPOSITION_ENDELEMENT || m_nCurrentPosition == NODEPOSITION_NORMAL)
     {
         xmlNodePtr pNextSibling = m_pCurrentElement->next;
-
+        
             /*
              * If the current node has following sibling, that sibling
              * should be next current node, and the next event will be
@@ -180,7 +180,7 @@ void XMLDocumentWrapper_XmlSecImpl::getNextSAXEvent()
         if (pNextSibling != NULL)
         {
             m_pCurrentElement = pNextSibling;
-            m_nCurrentPosition
+            m_nCurrentPosition 
                 = (m_pCurrentElement->type == XML_ELEMENT_NODE)?
                     NODEPOSITION_STARTELEMENT:NODEPOSITION_NORMAL;
         }
@@ -193,40 +193,40 @@ void XMLDocumentWrapper_XmlSecImpl::getNextSAXEvent()
 }
 
 void XMLDocumentWrapper_XmlSecImpl::sendStartElement(
-    const cssu::Reference< cssxs::XDocumentHandler >& xHandler,
-    const cssu::Reference< cssxs::XDocumentHandler >& xHandler2,
+    const cssu::Reference< cssxs::XDocumentHandler >& xHandler, 
+    const cssu::Reference< cssxs::XDocumentHandler >& xHandler2, 
     const xmlNodePtr pNode) const
     throw (cssxs::SAXException)
 /****** XMLDocumentWrapper_XmlSecImpl/sendStartElement ************************
  *
  *   NAME
- *  sendStartElement -- Constructs a startElement SAX event
+ *	sendStartElement -- Constructs a startElement SAX event
  *
  *   SYNOPSIS
- *  sendStartElement(xHandler, xHandler2, pNode);
+ *	sendStartElement(xHandler, xHandler2, pNode);
  *
  *   FUNCTION
- *  Used when converting the document into SAX event stream.
- *  This method constructs a startElement SAX event for a particular
- *  element, then calls the startElement methods of the XDocumentHandlers.
+ *	Used when converting the document into SAX event stream.
+ *	This method constructs a startElement SAX event for a particular
+ *	element, then calls the startElement methods of the XDocumentHandlers.
  *
  *   INPUTS
- *  xHandler -  the first XDocumentHandler interface to receive the
- *          startElement SAX event. It can be NULL.
- *  xHandler2 - the second XDocumentHandler interface to receive the
- *          startElement SAX event. It can't be NULL.
- *  pNode -     the node on which the startElement should be generated.
- *          This node must be a element type.
+ *	xHandler -	the first XDocumentHandler interface to receive the
+ *			startElement SAX event. It can be NULL.
+ *	xHandler2 -	the second XDocumentHandler interface to receive the
+ *			startElement SAX event. It can't be NULL.
+ *	pNode -		the node on which the startElement should be generated.
+ *			This node must be a element type.
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     SvXMLAttributeList* pAttributeList = new SvXMLAttributeList();
@@ -258,12 +258,12 @@ void XMLDocumentWrapper_XmlSecImpl::sendStartElement(
     }
 
     xmlAttrPtr pAttr = pNode->properties;
-
+    
     while (pAttr != NULL)
     {
         const xmlChar* pAttrName = pAttr->name;
         xmlNsPtr pAttrNs = pAttr->ns;
-
+        
         rtl::OUString ouAttrName;
         if (pAttrNs == NULL)
         {
@@ -281,118 +281,118 @@ void XMLDocumentWrapper_XmlSecImpl::sendStartElement(
             rtl::OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)(pAttr->children->content))));
         pAttr = pAttr->next;
     }
-
+    
     rtl::OString sNodeName = getNodeQName(pNode);
-
+    
     if (xHandler.is())
     {
         xHandler->startElement(
             rtl::OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(sNodeName.getStr())) )),
             xAttrList);
     }
-
+    
     xHandler2->startElement(
         rtl::OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(sNodeName.getStr())) )),
         xAttrList);
 }
-
+    
 void XMLDocumentWrapper_XmlSecImpl::sendEndElement(
-    const cssu::Reference< cssxs::XDocumentHandler >& xHandler,
-    const cssu::Reference< cssxs::XDocumentHandler >& xHandler2,
+    const cssu::Reference< cssxs::XDocumentHandler >& xHandler, 
+    const cssu::Reference< cssxs::XDocumentHandler >& xHandler2, 
     const xmlNodePtr pNode) const
     throw (cssxs::SAXException)
 /****** XMLDocumentWrapper_XmlSecImpl/sendEndElement **************************
  *
  *   NAME
- *  sendEndElement -- Constructs a endElement SAX event
+ *	sendEndElement -- Constructs a endElement SAX event
  *
  *   SYNOPSIS
- *  sendEndElement(xHandler, xHandler2, pNode);
+ *	sendEndElement(xHandler, xHandler2, pNode);
  *
  *   FUNCTION
- *  Used when converting the document into SAX event stream.
- *  This method constructs a endElement SAX event for a particular
- *  element, then calls the endElement methods of the XDocumentHandlers.
+ *	Used when converting the document into SAX event stream.
+ *	This method constructs a endElement SAX event for a particular
+ *	element, then calls the endElement methods of the XDocumentHandlers.
  *
  *   INPUTS
- *  xHandler -  the first XDocumentHandler interface to receive the
- *          endElement SAX event. It can be NULL.
- *  xHandler2 - the second XDocumentHandler interface to receive the
- *          endElement SAX event. It can't be NULL.
- *  pNode -     the node on which the endElement should be generated.
- *          This node must be a element type.
+ *	xHandler -	the first XDocumentHandler interface to receive the
+ *			endElement SAX event. It can be NULL.
+ *	xHandler2 -	the second XDocumentHandler interface to receive the
+ *			endElement SAX event. It can't be NULL.
+ *	pNode -		the node on which the endElement should be generated.
+ *			This node must be a element type.
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     rtl::OString sNodeName = getNodeQName(pNode);
-
+    
     if (xHandler.is())
     {
         xHandler->endElement(rtl::OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(sNodeName.getStr())) )));
     }
-
+    
     xHandler2->endElement(rtl::OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(sNodeName.getStr())) )));
 }
-
+    
 void XMLDocumentWrapper_XmlSecImpl::sendNode(
-    const cssu::Reference< cssxs::XDocumentHandler >& xHandler,
-    const cssu::Reference< cssxs::XDocumentHandler >& xHandler2,
+    const cssu::Reference< cssxs::XDocumentHandler >& xHandler, 
+    const cssu::Reference< cssxs::XDocumentHandler >& xHandler2, 
     const xmlNodePtr pNode) const
     throw (cssxs::SAXException)
 /****** XMLDocumentWrapper_XmlSecImpl/sendNode ********************************
  *
  *   NAME
- *  sendNode -- Constructs a characters SAX event or a
- *  processingInstruction SAX event
+ *	sendNode -- Constructs a characters SAX event or a
+ *	processingInstruction SAX event
  *
  *   SYNOPSIS
- *  sendNode(xHandler, xHandler2, pNode);
+ *	sendNode(xHandler, xHandler2, pNode);
  *
  *   FUNCTION
- *  Used when converting the document into SAX event stream.
- *  This method constructs a characters SAX event or a
- *  processingInstructionfor SAX event based on the type of a particular
- *  element, then calls the corresponding methods of the XDocumentHandlers.
+ *	Used when converting the document into SAX event stream.
+ *	This method constructs a characters SAX event or a
+ *	processingInstructionfor SAX event based on the type of a particular
+ *	element, then calls the corresponding methods of the XDocumentHandlers.
  *
  *   INPUTS
- *  xHandler -  the first XDocumentHandler interface to receive the
- *          SAX event. It can be NULL.
- *  xHandler2 - the second XDocumentHandler interface to receive the
- *          SAX event. It can't be NULL.
- *  pNode -     the node on which the endElement should be generated.
- *          If it is a text node, then a characters SAX event is
- *          generated; if it is a PI node, then a
- *          processingInstructionfor SAX event is generated.
+ *	xHandler -	the first XDocumentHandler interface to receive the
+ *			SAX event. It can be NULL.
+ *	xHandler2 -	the second XDocumentHandler interface to receive the
+ *			SAX event. It can't be NULL.
+ *	pNode -		the node on which the endElement should be generated.
+ *			If it is a text node, then a characters SAX event is
+ *			generated; if it is a PI node, then a
+ *			processingInstructionfor SAX event is generated.
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     xmlElementType type = pNode->type;
-
+        
     if (type == XML_TEXT_NODE)
     {
         if (xHandler.is())
         {
             xHandler->characters(rtl::OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(pNode->content)) )));
         }
-
+        
         xHandler2->characters(rtl::OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(pNode->content)) )));
     }
     else if (type == XML_PI_NODE)
@@ -403,7 +403,7 @@ void XMLDocumentWrapper_XmlSecImpl::sendNode(
                 rtl::OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(pNode->name)) )),
                 rtl::OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(pNode->content)) )));
         }
-
+        
         xHandler2->processingInstruction(
             rtl::OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(pNode->name)) )),
             rtl::OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(pNode->content)) )));
@@ -414,26 +414,26 @@ rtl::OString XMLDocumentWrapper_XmlSecImpl::getNodeQName(const xmlNodePtr pNode)
 /****** XMLDocumentWrapper_XmlSecImpl/getNodeQName ****************************
  *
  *   NAME
- *  getNodeQName -- Retrives the qualified name of a node
+ *	getNodeQName -- Retrives the qualified name of a node
  *
  *   SYNOPSIS
- *  name = getNodeQName(pNode);
+ *	name = getNodeQName(pNode);
  *
  *   FUNCTION
- *  see NAME
+ *	see NAME
  *
  *   INPUTS
- *  pNode - the node whose name will be retrived
+ *	pNode -	the node whose name will be retrived
  *
  *   RESULT
- *  name - the node's qualified name
+ *	name - the node's qualified name
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     rtl::OString sNodeName((const sal_Char*)pNode->name);
@@ -447,7 +447,7 @@ rtl::OString XMLDocumentWrapper_XmlSecImpl::getNodeQName(const xmlNodePtr pNode)
             sNodeName = sPrefix+rtl::OString(":")+sNodeName;
         }
     }
-
+    
     return sNodeName;
 }
 
@@ -455,52 +455,52 @@ xmlNodePtr XMLDocumentWrapper_XmlSecImpl::checkElement( const cssu::Reference< c
 /****** XMLDocumentWrapper_XmlSecImpl/checkElement ****************************
  *
  *   NAME
- *  checkElement -- Retrives the node wrapped by an XXMLElementWrapper
- *  interface
+ *	checkElement -- Retrives the node wrapped by an XXMLElementWrapper
+ *	interface
  *
  *   SYNOPSIS
- *  node = checkElement(xXMLElement);
+ *	node = checkElement(xXMLElement);
  *
  *   FUNCTION
- *  see NAME
+ *	see NAME
  *
  *   INPUTS
- *  xXMLElement -   the XXMLElementWrapper interface wraping a node
+ *	xXMLElement -	the XXMLElementWrapper interface wraping a node
  *
  *   RESULT
- *  node - the node wrapped in the XXMLElementWrapper interface
+ *	node - the node wrapped in the XXMLElementWrapper interface
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     xmlNodePtr rc = NULL;
-
+    
     if (xXMLElement.is())
     {
         cssu::Reference< cssl::XUnoTunnel > xNodTunnel( xXMLElement, cssu::UNO_QUERY ) ;
-        if( !xNodTunnel.is() )
+        if( !xNodTunnel.is() ) 
         {
             throw cssu::RuntimeException() ;
         }
-
-        XMLElementWrapper_XmlSecImpl* pElement
+    
+        XMLElementWrapper_XmlSecImpl* pElement 
             = reinterpret_cast<XMLElementWrapper_XmlSecImpl*>(
                 sal::static_int_cast<sal_uIntPtr>(
                     xNodTunnel->getSomething(
                         XMLElementWrapper_XmlSecImpl::getUnoTunnelImplementationId() ))) ;
-
+            
         if( pElement == NULL ) {
             throw cssu::RuntimeException() ;
         }
-
+        
         rc = pElement->getNativeElement();
     }
-
+    
     return rc;
 }
 
@@ -509,64 +509,64 @@ sal_Int32 XMLDocumentWrapper_XmlSecImpl::recursiveDelete(
 /****** XMLDocumentWrapper_XmlSecImpl/recursiveDelete *************************
  *
  *   NAME
- *  recursiveDelete -- Deletes a paticular node with its branch.
+ *	recursiveDelete -- Deletes a paticular node with its branch.
  *
  *   SYNOPSIS
- *  result = recursiveDelete(pNode);
+ *	result = recursiveDelete(pNode);
  *
  *   FUNCTION
- *  Deletes a paticular node with its branch, while reserving the nodes
- *  (and their brance) listed in the m_aReservedNodes.
- *  The deletion process is preformed in the tree order, that is, a node
- *  is deleted after its previous sibling node is deleted, a parent node
- *  is deleted after its branch is deleted.
- *  During the deletion process when the m_pStopAtNode is reached, the
- *  progress is interrupted at once.
+ *	Deletes a paticular node with its branch, while reserving the nodes
+ *	(and their brance) listed in the m_aReservedNodes.
+ *	The deletion process is preformed in the tree order, that is, a node
+ *	is deleted after its previous sibling node is deleted, a parent node
+ *	is deleted after its branch is deleted.
+ *	During the deletion process when the m_pStopAtNode is reached, the
+ *	progress is interrupted at once.
  *
  *   INPUTS
- *  pNode - the node to be deleted
+ *	pNode -	the node to be deleted
  *
  *   RESULT
- *  result -    the result of the deletion process, can be one of following
- *          values:
- *          NODE_STOPED - the process is interrupted by meeting the
- *              m_pStopAtNode
- *          NODE_NOTREMOVED - the pNode is not completely removed
- *              because there is its descendant in the
- *              m_aReservedNodes list
- *          NODE_REMOVED - the pNode and its branch are completely
- *              removed
+ *	result -	the result of the deletion process, can be one of following 
+ *			values:
+ *			NODE_STOPED - the process is interrupted by meeting the
+ *				m_pStopAtNode
+ *			NODE_NOTREMOVED - the pNode is not completely removed
+ *				because there is its descendant in the 
+ *				m_aReservedNodes list
+ *			NODE_REMOVED - the pNode and its branch are completely
+ *				removed
  *
  *   NOTES
- *  The node in the m_aReservedNodes list must be in the tree order, otherwise
- *  the result is unpredictable.
+ *	The node in the m_aReservedNodes list must be in the tree order, otherwise
+ *	the result is unpredictable.
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     if (pNode == m_pStopAtNode)
     {
         return NODE_STOPED;
     }
-
+    
     if (pNode != m_pCurrentReservedNode)
     {
         xmlNodePtr pChild = pNode->children;
-
+        
         xmlNodePtr pNextSibling;
         bool bIsRemoved = true;
         sal_Int32 nResult;
-
+        
         while( pChild != NULL )
         {
             pNextSibling = pChild->next;
             nResult = recursiveDelete(pChild);
-
+            
             switch (nResult)
             {
             case NODE_STOPED:
@@ -580,15 +580,15 @@ sal_Int32 XMLDocumentWrapper_XmlSecImpl::recursiveDelete(
             default:
                 throw cssu::RuntimeException();
             }
-
+            
             pChild = pNextSibling;
         }
-
+        
         if (pNode == m_pCurrentElement)
         {
             bIsRemoved = false;
         }
-
+        
         return bIsRemoved?NODE_REMOVED:NODE_NOTREMOVED;
     }
     else
@@ -602,31 +602,31 @@ void XMLDocumentWrapper_XmlSecImpl::getNextReservedNode()
 /****** XMLDocumentWrapper_XmlSecImpl/getNextReservedNode *********************
  *
  *   NAME
- *  getNextReservedNode -- Highlights the next reserved node in the
- *  reserved node list
+ *	getNextReservedNode -- Highlights the next reserved node in the
+ *	reserved node list
  *
  *   SYNOPSIS
- *  getNextReservedNode();
+ *	getNextReservedNode();
  *
  *   FUNCTION
- *  The m_aReservedNodes array holds a node list, while the
- *  m_pCurrentReservedNode points to the one currently highlighted.
- *  This method is used to highlight the next node in the node list.
- *  This method is called at the time when the current highlighted node
- *  has been already processed, and the next node should be ready.
+ *	The m_aReservedNodes array holds a node list, while the 
+ *	m_pCurrentReservedNode points to the one currently highlighted.
+ *	This method is used to highlight the next node in the node list.
+ *	This method is called at the time when the current highlighted node
+ *	has been already processed, and the next node should be ready.
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     if (m_nReservedNodeIndex < m_aReservedNodes.getLength())
@@ -644,71 +644,71 @@ void XMLDocumentWrapper_XmlSecImpl::removeNode(const xmlNodePtr pNode) const
 /****** XMLDocumentWrapper_XmlSecImpl/removeNode ******************************
  *
  *   NAME
- *  removeNode -- Deletes a node with its branch unconditionaly
+ *	removeNode -- Deletes a node with its branch unconditionaly
  *
  *   SYNOPSIS
- *  removeNode( pNode );
+ *	removeNode( pNode );
  *
  *   FUNCTION
- *  Delete the node along with its branch from the document.
+ *	Delete the node along with its branch from the document.
  *
  *   INPUTS
- *  pNode - the node to be deleted
+ *	pNode -	the node to be deleted
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     /* you can't remove the current node */
     OSL_ASSERT( m_pCurrentElement != pNode );
 
     xmlAttrPtr pAttr = pNode->properties;
-
+    
     while (pAttr != NULL)
     {
-        if (!stricmp((sal_Char*)pAttr->name,"id"))
+        if (!stricmp((sal_Char*)pAttr->name,"id")) 
         {
             xmlRemoveID(m_pDocument, pAttr);
         }
-
+                        
         pAttr = pAttr->next;
     }
-
+    
     xmlUnlinkNode(pNode);
     xmlFreeNode(pNode);
-}
+}	
 
 void XMLDocumentWrapper_XmlSecImpl::buildIDAttr(xmlNodePtr pNode) const
 /****** XMLDocumentWrapper_XmlSecImpl/buildIDAttr *****************************
  *
  *   NAME
- *  buildIDAttr -- build the ID attribute of a node
+ *	buildIDAttr -- build the ID attribute of a node
  *
  *   SYNOPSIS
- *  buildIDAttr( pNode );
+ *	buildIDAttr( pNode );
  *
  *   FUNCTION
- *  see NAME
+ *	see NAME
  *
  *   INPUTS
- *  pNode - the node whose id attribute will be built
+ *	pNode -	the node whose id attribute will be built
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  14.06.2004 -    implemented
+ *	14.06.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     xmlAttrPtr idAttr = xmlHasProp( pNode, (const unsigned char *)"id" );
@@ -716,7 +716,7 @@ void XMLDocumentWrapper_XmlSecImpl::buildIDAttr(xmlNodePtr pNode) const
     {
         idAttr = xmlHasProp( pNode, (const unsigned char *)"Id" );
     }
-
+    
     if (idAttr != NULL)
     {
         xmlChar* idValue = xmlNodeListGetString( m_pDocument, idAttr->children, 1 ) ;
@@ -728,32 +728,32 @@ void XMLDocumentWrapper_XmlSecImpl::rebuildIDLink(xmlNodePtr pNode) const
 /****** XMLDocumentWrapper_XmlSecImpl/rebuildIDLink ***************************
  *
  *   NAME
- *  rebuildIDLink -- rebuild the ID link for the branch
+ *	rebuildIDLink -- rebuild the ID link for the branch
  *
  *   SYNOPSIS
- *  rebuildIDLink( pNode );
+ *	rebuildIDLink( pNode );
  *
  *   FUNCTION
- *  see NAME
+ *	see NAME
  *
  *   INPUTS
- *  pNode - the node, from which the branch will be rebuilt
+ *	pNode -	the node, from which the branch will be rebuilt
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  14.06.2004 -    implemented
+ *	14.06.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     if (pNode != NULL && pNode->type == XML_ELEMENT_NODE)
     {
         buildIDAttr( pNode );
-
+        
         xmlNodePtr child = pNode->children;
         while (child != NULL)
         {
@@ -782,9 +782,9 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::removeCurrentElement(  )
     throw (cssu::RuntimeException)
 {
     OSL_ASSERT( m_pCurrentElement != NULL );
-
+    
     xmlNodePtr pOldCurrentElement = m_pCurrentElement;
-
+    
     /*
      * pop the top node in the parser context's
      * nodeTab stack, then the parent of that node will
@@ -797,13 +797,13 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::removeCurrentElement(  )
                 (sal_Char*)(pOldCurrentElement->name)
             )));
     m_pCurrentElement = saxHelper.getCurrentNode();
-
+    
     /*
      * remove the node
      */
     removeNode(pOldCurrentElement);
-}
-
+}		
+    
 sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl::isCurrent( const cssu::Reference< cssxw::XXMLElementWrapper >& node )
     throw (cssu::RuntimeException)
 {
@@ -815,12 +815,12 @@ sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl::isCurrentElementEmpty(  )
     throw (cssu::RuntimeException)
 {
     sal_Bool rc = sal_False;
-
+    
     if (m_pCurrentElement->children == NULL)
     {
         rc = sal_True;
     }
-
+    
     return rc;
 }
 
@@ -831,20 +831,20 @@ rtl::OUString SAL_CALL XMLDocumentWrapper_XmlSecImpl::getNodeName( const cssu::R
     return rtl::OUString(RTL_UTF8_USTRINGPARAM ( (sal_Char*)pNode->name ));
 }
 
-void SAL_CALL XMLDocumentWrapper_XmlSecImpl::clearUselessData(
-    const cssu::Reference< cssxw::XXMLElementWrapper >& node,
-    const cssu::Sequence< cssu::Reference< cssxw::XXMLElementWrapper > >& reservedDescendants,
+void SAL_CALL XMLDocumentWrapper_XmlSecImpl::clearUselessData( 
+    const cssu::Reference< cssxw::XXMLElementWrapper >& node, 
+    const cssu::Sequence< cssu::Reference< cssxw::XXMLElementWrapper > >& reservedDescendants, 
     const cssu::Reference< cssxw::XXMLElementWrapper >& stopAtNode )
     throw (cssu::RuntimeException)
 {
     xmlNodePtr pTargetNode = checkElement(node);
-
+    
     m_pStopAtNode = checkElement(stopAtNode);
     m_aReservedNodes = reservedDescendants;
     m_nReservedNodeIndex = 0;
-
+    
     getNextReservedNode();
-
+    
     recursiveDelete(pTargetNode);
 }
 
@@ -853,14 +853,14 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::collapse( const cssu::Reference< cs
 {
     xmlNodePtr pTargetNode = checkElement(node);
     xmlNodePtr pParent;
-
+    
     while (pTargetNode != NULL)
     {
         if (pTargetNode->children != NULL || pTargetNode == m_pCurrentElement)
         {
             break;
         }
-
+        
         pParent = pTargetNode->parent;
         removeNode(pTargetNode);
         pTargetNode = pParent;
@@ -874,12 +874,12 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::getTree( const cssu::Reference< css
     {
         xmlNodePtr pTempCurrentElement = m_pCurrentElement;
         sal_Int32 nTempCurrentPosition = m_nCurrentPosition;
-
+        
         m_pCurrentElement = m_pRootElement;
-
+        
         m_nCurrentPosition = NODEPOSITION_STARTELEMENT;
         cssu::Reference< cssxs::XDocumentHandler > xHandler = handler;
-
+        
         while(true)
         {
             switch (m_nCurrentPosition)
@@ -894,24 +894,24 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::getTree( const cssu::Reference< css
                 sendNode(NULL, xHandler, m_pCurrentElement);
                 break;
             }
-
+            
             if ( (m_pCurrentElement == m_pRootElement) && (m_nCurrentPosition == NODEPOSITION_ENDELEMENT ))
             {
                 break;
             }
-
+    
             getNextSAXEvent();
         }
-
+        
         m_pCurrentElement = pTempCurrentElement;
         m_nCurrentPosition = nTempCurrentPosition;
     }
 }
-
+    
 void SAL_CALL XMLDocumentWrapper_XmlSecImpl::generateSAXEvents(
     const cssu::Reference< cssxs::XDocumentHandler >& handler,
     const cssu::Reference< cssxs::XDocumentHandler >& xEventKeeperHandler,
-    const cssu::Reference< cssxw::XXMLElementWrapper >& startNode,
+    const cssu::Reference< cssxw::XXMLElementWrapper >& startNode, 
     const cssu::Reference< cssxw::XXMLElementWrapper >& endNode )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
@@ -920,11 +920,11 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::generateSAXEvents(
          * element.
          */
     bool bHasCurrentElementChild = (m_pCurrentElement->children != NULL);
-
+    
     xmlNodePtr pTempCurrentElement = m_pCurrentElement;
-
+    
     m_pCurrentElement = checkElement(startNode);
-
+    
     if (m_pCurrentElement->type == XML_ELEMENT_NODE)
     {
         m_nCurrentPosition = NODEPOSITION_STARTELEMENT;
@@ -933,13 +933,13 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::generateSAXEvents(
     {
         m_nCurrentPosition = NODEPOSITION_NORMAL;
     }
-
+    
     xmlNodePtr pEndNode = checkElement(endNode);
-
+    
     cssu::Reference < cssxc::sax::XSAXEventKeeper > xSAXEventKeeper( xEventKeeperHandler, cssu::UNO_QUERY );
-
+    
     cssu::Reference< cssxs::XDocumentHandler > xHandler = handler;
-
+    
     while(true)
     {
         switch (m_nCurrentPosition)
@@ -956,13 +956,13 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::generateSAXEvents(
         default:
             throw cssu::RuntimeException();
         }
-
+        
         if (xSAXEventKeeper->isBlocking())
         {
             xHandler = NULL;
         }
-
-        if (pEndNode == NULL &&
+        
+        if (pEndNode == NULL && 
             ((bHasCurrentElementChild && m_pCurrentElement == xmlGetLastChild(pTempCurrentElement) && m_nCurrentPosition != NODEPOSITION_STARTELEMENT) ||
              (!bHasCurrentElementChild && m_pCurrentElement == pTempCurrentElement && m_nCurrentPosition == NODEPOSITION_STARTELEMENT)))
         {
@@ -970,7 +970,7 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::generateSAXEvents(
         }
 
         getNextSAXEvent();
-
+        
             /*
              * If there is an end point specified, then check whether
              * the current node equals to the end point. If so, stop
@@ -981,7 +981,7 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::generateSAXEvents(
             break;
         }
     }
-
+    
     m_pCurrentElement = pTempCurrentElement;
 }
 
@@ -992,14 +992,14 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::rebuildIDLink(
     xmlNodePtr pNode = checkElement( node );
     rebuildIDLink(pNode);
 }
-
+    
 
 /* cssxs::XDocumentHandler */
 void SAL_CALL XMLDocumentWrapper_XmlSecImpl::startDocument(  )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
 }
-
+    
 void SAL_CALL XMLDocumentWrapper_XmlSecImpl::endDocument(  )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
@@ -1010,41 +1010,41 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::startElement( const rtl::OUString&
 {
     sal_Int32 nLength = xAttribs->getLength();
     cssu::Sequence< cssxcsax::XMLAttribute > aAttributes (nLength);
-
-    for (int i = 0; i < nLength; ++i)
+    
+    for (int i = 0; i < nLength; ++i) 
     {
         aAttributes[i].sName = xAttribs->getNameByIndex((short)i);
         aAttributes[i].sValue =xAttribs->getValueByIndex((short)i);
     }
-
+    
     _startElement(aName, aAttributes);
 }
 
-void SAL_CALL XMLDocumentWrapper_XmlSecImpl::endElement( const rtl::OUString& aName )
+void SAL_CALL XMLDocumentWrapper_XmlSecImpl::endElement( const rtl::OUString& aName ) 
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
     saxHelper.endElement(aName);
     m_pCurrentElement = saxHelper.getCurrentNode();
 }
-
+    
 void SAL_CALL XMLDocumentWrapper_XmlSecImpl::characters( const rtl::OUString& aChars )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
     saxHelper.characters(aChars);
 }
-
+    
 void SAL_CALL XMLDocumentWrapper_XmlSecImpl::ignorableWhitespace( const rtl::OUString& aWhitespaces )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
     saxHelper.ignorableWhitespace(aWhitespaces);
 }
-
+    
 void SAL_CALL XMLDocumentWrapper_XmlSecImpl::processingInstruction( const rtl::OUString& aTarget, const rtl::OUString& aData )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
     saxHelper.processingInstruction(aTarget, aData);
 }
-
+    
 void SAL_CALL XMLDocumentWrapper_XmlSecImpl::setDocumentLocator( const cssu::Reference< cssxs::XLocator >& xLocator )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
@@ -1067,7 +1067,7 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_startElement( const rtl::OUString&
 {
     saxHelper.startElement(aName, aAttributes);
     m_pCurrentElement = saxHelper.getCurrentNode();
-
+    
     buildIDAttr( m_pCurrentElement );
 }
 
@@ -1106,13 +1106,13 @@ rtl::OUString XMLDocumentWrapper_XmlSecImpl_getImplementationName ()
     return rtl::OUString ( RTL_ASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
 }
 
-sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl_supportsService( const rtl::OUString& ServiceName ) 
     throw (cssu::RuntimeException)
 {
     return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME ));
 }
 
-cssu::Sequence< rtl::OUString > SAL_CALL XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames(  )
+cssu::Sequence< rtl::OUString > SAL_CALL XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames(  ) 
     throw (cssu::RuntimeException)
 {
     cssu::Sequence < rtl::OUString > aRet(1);
@@ -1130,17 +1130,17 @@ cssu::Reference< cssu::XInterface > SAL_CALL XMLDocumentWrapper_XmlSecImpl_creat
 }
 
 /* XServiceInfo */
-rtl::OUString SAL_CALL XMLDocumentWrapper_XmlSecImpl::getImplementationName(  )
+rtl::OUString SAL_CALL XMLDocumentWrapper_XmlSecImpl::getImplementationName(  ) 
     throw (cssu::RuntimeException)
 {
     return XMLDocumentWrapper_XmlSecImpl_getImplementationName();
 }
-sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl::supportsService( const rtl::OUString& rServiceName )
+sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl::supportsService( const rtl::OUString& rServiceName ) 
     throw (cssu::RuntimeException)
 {
     return XMLDocumentWrapper_XmlSecImpl_supportsService( rServiceName );
 }
-cssu::Sequence< rtl::OUString > SAL_CALL XMLDocumentWrapper_XmlSecImpl::getSupportedServiceNames(  )
+cssu::Sequence< rtl::OUString > SAL_CALL XMLDocumentWrapper_XmlSecImpl::getSupportedServiceNames(  ) 
     throw (cssu::RuntimeException)
 {
     return XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames();
diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
index 3ec30d51a3e8..5fcf9be6fd18 100644
--- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
+++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 
 #include <libxml/tree.h>
 
-class XMLDocumentWrapper_XmlSecImpl : public cppu::WeakImplHelper4
-<
+class XMLDocumentWrapper_XmlSecImpl : public cppu::WeakImplHelper4 
+< 
     com::sun::star::xml::wrapper::XXMLDocumentWrapper,
     com::sun::star::xml::sax::XDocumentHandler,
     com::sun::star::xml::csax::XCompressedDocumentHandler,
@@ -53,21 +53,21 @@ class XMLDocumentWrapper_XmlSecImpl : public cppu::WeakImplHelper4
 /****** XMLDocumentWrapper_XmlSecImpl.hxx/CLASS XMLDocumentWrapper_XmlSecImpl *
  *
  *   NAME
- *  XMLDocumentWrapper_XmlSecImpl -- Class to manipulate a libxml2
- *  document
+ *	XMLDocumentWrapper_XmlSecImpl -- Class to manipulate a libxml2
+ *	document
  *
  *   FUNCTION
- *  Converts SAX events into a libxml2 document, converts the document back
- *  into SAX event stream, and manipulate nodes in the document.
+ *	Converts SAX events into a libxml2 document, converts the document back
+ *	into SAX event stream, and manipulate nodes in the document.
  *
  *   HISTORY
- *  05.01.2004 -    Interface supported: XXMLDocumentWrapper,
- *          XDocumentHandler, XCompressedDocumentHandler,
- *          XServiceInfo
+ *	05.01.2004 -	Interface supported: XXMLDocumentWrapper,
+ * 			XDocumentHandler, XCompressedDocumentHandler,
+ *			XServiceInfo
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
 private:
@@ -76,22 +76,22 @@ private:
 
     /* the document used to convert SAX events to */
     xmlDocPtr m_pDocument;
-
+    
     /* the root element */
     xmlNodePtr m_pRootElement;
-
+    
     /*
      * the current active element. The next incoming SAX event will be
      * appended to this element
      */
     xmlNodePtr m_pCurrentElement;
-
-    /*
+    
+    /* 
      * This variable is used when converting the document or part of it into
      * SAX events. See getNextSAXEvent method.
-     */
+     */ 
     sal_Int32 m_nCurrentPosition;
-
+    
     /*
      * used for recursive deletion. See recursiveDelete method
      */
@@ -100,182 +100,182 @@ private:
     com::sun::star::uno::Sequence< com::sun::star::uno::Reference<
         com::sun::star::xml::wrapper::XXMLElementWrapper > > m_aReservedNodes;
     sal_Int32 m_nReservedNodeIndex;
-
+    
 private:
     void getNextSAXEvent();
-
+    
     void sendStartElement(
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xHandler,
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xHandler2,
+        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xHandler, 
+        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xHandler2, 
         const xmlNodePtr pNode) const
         throw (com::sun::star::xml::sax::SAXException);
-
+        
     void sendEndElement(
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xHandler,
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xHandler2,
+        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xHandler, 
+        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xHandler2, 
         const xmlNodePtr pNode) const
         throw (com::sun::star::xml::sax::SAXException);
-
+        
     void sendNode(
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xHandler,
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xHandler2,
+        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xHandler, 
+        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xHandler2, 
         const xmlNodePtr pNode) const
         throw (com::sun::star::xml::sax::SAXException);
-
+        
     rtl::OString getNodeQName(const xmlNodePtr pNode) const;
-
+    
     sal_Int32 recursiveDelete( const xmlNodePtr pNode);
-
+    
     void getNextReservedNode();
-
+    
     void removeNode( const xmlNodePtr pNode) const;
-
+    
     xmlNodePtr checkElement(
-        const com::sun::star::uno::Reference<
+        const com::sun::star::uno::Reference< 
             com::sun::star::xml::wrapper::XXMLElementWrapper >& xXMLElement) const;
-
+            
     void buildIDAttr( xmlNodePtr pNode ) const;
     void rebuildIDLink( xmlNodePtr pNode ) const;
-
+    
 public:
     XMLDocumentWrapper_XmlSecImpl();
     virtual ~XMLDocumentWrapper_XmlSecImpl();
-
+    
     /* com::sun::star::xml::wrapper::XXMLDocumentWrapper */
     virtual com::sun::star::uno::Reference<
         com::sun::star::xml::wrapper::XXMLElementWrapper > SAL_CALL getCurrentElement(  )
         throw (com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL setCurrentElement( const com::sun::star::uno::Reference<
         com::sun::star::xml::wrapper::XXMLElementWrapper >& element )
         throw (com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL removeCurrentElement(  )
         throw (com::sun::star::uno::RuntimeException);
-
+        
     virtual sal_Bool SAL_CALL isCurrent( const com::sun::star::uno::Reference<
         com::sun::star::xml::wrapper::XXMLElementWrapper >& node )
         throw (com::sun::star::uno::RuntimeException);
-
+        
     virtual sal_Bool SAL_CALL isCurrentElementEmpty(  )
         throw (com::sun::star::uno::RuntimeException);
-
+        
     virtual rtl::OUString SAL_CALL getNodeName( const com::sun::star::uno::Reference<
         com::sun::star::xml::wrapper::XXMLElementWrapper >& node )
         throw (com::sun::star::uno::RuntimeException);
-
-    virtual void SAL_CALL clearUselessData(
+        
+    virtual void SAL_CALL clearUselessData( 
         const com::sun::star::uno::Reference<
-            com::sun::star::xml::wrapper::XXMLElementWrapper >& node,
+            com::sun::star::xml::wrapper::XXMLElementWrapper >& node, 
         const com::sun::star::uno::Sequence< com::sun::star::uno::Reference<
-            com::sun::star::xml::wrapper::XXMLElementWrapper > >& reservedDescendants,
+            com::sun::star::xml::wrapper::XXMLElementWrapper > >& reservedDescendants, 
         const com::sun::star::uno::Reference<
             com::sun::star::xml::wrapper::XXMLElementWrapper >& stopAtNode )
         throw (com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL collapse( const com::sun::star::uno::Reference<
         com::sun::star::xml::wrapper::XXMLElementWrapper >& node )
         throw (com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL generateSAXEvents(
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& handler,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xEventKeeperHandler,
         const com::sun::star::uno::Reference<
-            com::sun::star::xml::wrapper::XXMLElementWrapper >& startNode,
+            com::sun::star::xml::wrapper::XXMLElementWrapper >& startNode, 
         const com::sun::star::uno::Reference<
             com::sun::star::xml::wrapper::XXMLElementWrapper >& endNode )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL getTree(
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& handler )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL rebuildIDLink(
         const com::sun::star::uno::Reference< com::sun::star::xml::wrapper::XXMLElementWrapper >& node )
         throw (com::sun::star::uno::RuntimeException);
 
-    /* com::sun::star::xml::sax::XDocumentHandler */
+    /* com::sun::star::xml::sax::XDocumentHandler */ 
     virtual void SAL_CALL startDocument(  )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL endDocument(  )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL startElement(
         const rtl::OUString& aName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
-    virtual void SAL_CALL endElement( const rtl::OUString& aName )
+        
+    virtual void SAL_CALL endElement( const rtl::OUString& aName ) 
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL characters( const rtl::OUString& aChars )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL ignorableWhitespace( const rtl::OUString& aWhitespaces )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL processingInstruction( const rtl::OUString& aTarget, const rtl::OUString& aData )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL setDocumentLocator( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XLocator >& xLocator )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
+        
     /* com::sun::star::xml::csax::XCompressedDocumentHandler */
     virtual void SAL_CALL _startDocument(  )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL _endDocument(  )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL _startElement(
         const rtl::OUString& aName,
-        const com::sun::star::uno::Sequence<
+        const com::sun::star::uno::Sequence< 
             com::sun::star::xml::csax::XMLAttribute >& aAttributes )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL _endElement( const rtl::OUString& aName )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL _characters( const rtl::OUString& aChars )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL _ignorableWhitespace( const rtl::OUString& aWhitespaces )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL _processingInstruction( const rtl::OUString& aTarget, const rtl::OUString& aData )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
-    virtual void SAL_CALL _setDocumentLocator(
+        
+    virtual void SAL_CALL _setDocumentLocator( 
         sal_Int32 columnNumber,
         sal_Int32 lineNumber,
         const rtl::OUString& publicId,
         const rtl::OUString& systemId )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-
+    
     /* com::sun::star::lang::XServiceInfo */
-    virtual rtl::OUString SAL_CALL getImplementationName(  )
+    virtual rtl::OUString SAL_CALL getImplementationName(  ) 
         throw (com::sun::star::uno::RuntimeException);
-
-    virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName )
+        
+    virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) 
         throw (com::sun::star::uno::RuntimeException);
-
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+        
+    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(  ) 
         throw (com::sun::star::uno::RuntimeException);
 };
 
 rtl::OUString XMLDocumentWrapper_XmlSecImpl_getImplementationName()
     throw ( com::sun::star::uno::RuntimeException );
 
-sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl_supportsService( const rtl::OUString& ServiceName ) 
     throw ( com::sun::star::uno::RuntimeException );
 
-com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
-    XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames(  )
+com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL 
+    XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames(  ) 
     throw ( com::sun::star::uno::RuntimeException );
 
 com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
-SAL_CALL XMLDocumentWrapper_XmlSecImpl_createInstance(
+SAL_CALL XMLDocumentWrapper_XmlSecImpl_createInstance( 
     const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > & rSMgr)
     throw ( com::sun::star::uno::Exception );
 
diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx
index 72c498e939fd..c51993226ed8 100644
--- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ XMLElementWrapper_XmlSecImpl::XMLElementWrapper_XmlSecImpl(const xmlNodePtr pNod
 
 
 /* XUnoTunnel */
-cssu::Sequence< sal_Int8 > XMLElementWrapper_XmlSecImpl::getUnoTunnelImplementationId( void )
+cssu::Sequence< sal_Int8 > XMLElementWrapper_XmlSecImpl::getUnoTunnelImplementationId( void ) 
     throw (cssu::RuntimeException)
 {
     static ::cppu::OImplementationId* pId = 0;
@@ -87,13 +87,13 @@ rtl::OUString XMLElementWrapper_XmlSecImpl_getImplementationName ()
     return rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
 }
 
-sal_Bool SAL_CALL XMLElementWrapper_XmlSecImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL XMLElementWrapper_XmlSecImpl_supportsService( const rtl::OUString& ServiceName ) 
     throw (cssu::RuntimeException)
 {
     return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME ));
 }
 
-cssu::Sequence< rtl::OUString > SAL_CALL XMLElementWrapper_XmlSecImpl_getSupportedServiceNames(  )
+cssu::Sequence< rtl::OUString > SAL_CALL XMLElementWrapper_XmlSecImpl_getSupportedServiceNames(  ) 
     throw (cssu::RuntimeException)
 {
     cssu::Sequence < rtl::OUString > aRet(1);
@@ -112,17 +112,17 @@ cssu::Reference< cssu::XInterface > SAL_CALL
 }
 
 /* XServiceInfo */
-rtl::OUString SAL_CALL XMLElementWrapper_XmlSecImpl::getImplementationName(  )
+rtl::OUString SAL_CALL XMLElementWrapper_XmlSecImpl::getImplementationName(  ) 
     throw (cssu::RuntimeException)
 {
     return XMLElementWrapper_XmlSecImpl_getImplementationName();
 }
-sal_Bool SAL_CALL XMLElementWrapper_XmlSecImpl::supportsService( const rtl::OUString& rServiceName )
+sal_Bool SAL_CALL XMLElementWrapper_XmlSecImpl::supportsService( const rtl::OUString& rServiceName ) 
     throw (cssu::RuntimeException)
 {
     return XMLElementWrapper_XmlSecImpl_supportsService( rServiceName );
 }
-cssu::Sequence< rtl::OUString > SAL_CALL XMLElementWrapper_XmlSecImpl::getSupportedServiceNames(  )
+cssu::Sequence< rtl::OUString > SAL_CALL XMLElementWrapper_XmlSecImpl::getSupportedServiceNames(  ) 
     throw (cssu::RuntimeException)
 {
     return XMLElementWrapper_XmlSecImpl_getSupportedServiceNames();
@@ -132,26 +132,26 @@ xmlNodePtr XMLElementWrapper_XmlSecImpl::getNativeElement(  ) const
 /****** XMLElementWrapper_XmlSecImpl/getNativeElement *************************
  *
  *   NAME
- *  getNativeElement -- Retrieves the libxml2 node wrapped by this object
+ *	getNativeElement -- Retrieves the libxml2 node wrapped by this object
  *
  *   SYNOPSIS
- *  pNode = getNativeElement();
+ *	pNode = getNativeElement();
  *
  *   FUNCTION
- *  see NAME
+ *	see NAME
  *
  *   INPUTS
- *  empty
+ *	empty
  *
  *   RESULT
- *  pNode - the libxml2 node wrapped by this object
+ *	pNode - the libxml2 node wrapped by this object
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     return m_pElement;
@@ -161,26 +161,26 @@ void XMLElementWrapper_XmlSecImpl::setNativeElement(const xmlNodePtr pNode)
 /****** XMLElementWrapper_XmlSecImpl/setNativeElement *************************
  *
  *   NAME
- *  setNativeElement -- Configures the libxml2 node wrapped by this object
+ *	setNativeElement -- Configures the libxml2 node wrapped by this object
  *
  *   SYNOPSIS
- *  setNativeElement( pNode );
+ *	setNativeElement( pNode );
  *
  *   FUNCTION
- *  see NAME
+ *	see NAME
  *
  *   INPUTS
- *  pNode - the new libxml2 node to be wrapped by this object
+ *	pNode -	the new libxml2 node to be wrapped by this object
  *
  *   RESULT
- *  empty
+ *	empty
  *
  *   HISTORY
- *  05.01.2004 -    implemented
+ *	05.01.2004 -	implemented
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
     m_pElement = pNode;
diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
index dbd7ff941ca2..764620f4d756 100644
--- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
+++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 <libxml/tree.h>
 
-class XMLElementWrapper_XmlSecImpl : public cppu::WeakImplHelper3
-<
+class XMLElementWrapper_XmlSecImpl : public cppu::WeakImplHelper3 
+< 
     com::sun::star::xml::wrapper::XXMLElementWrapper,
     com::sun::star::lang::XUnoTunnel,
     com::sun::star::lang::XServiceInfo
@@ -46,43 +46,43 @@ class XMLElementWrapper_XmlSecImpl : public cppu::WeakImplHelper3
 /****** XMLElementWrapper_XmlSecImpl.hxx/CLASS XMLElementWrapper_XmlSecImpl ***
  *
  *   NAME
- *  XMLElementWrapper_XmlSecImpl -- Class to wrap a libxml2 node
+ *	XMLElementWrapper_XmlSecImpl -- Class to wrap a libxml2 node
  *
  *   FUNCTION
- *  Used as a wrapper class to transfer a libxml2 node structure
- *  between different UNO components.
+ *	Used as a wrapper class to transfer a libxml2 node structure
+ *	between different UNO components.
  *
  *   HISTORY
- *  05.01.2004 -    Interface supported: XXMLElementWrapper, XUnoTunnel
- *          XServiceInfo
+ *	05.01.2004 -	Interface supported: XXMLElementWrapper, XUnoTunnel
+ *			XServiceInfo
  *
  *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
+ *	Michael Mi
+ *	Email: michael.mi@sun.com
  ******************************************************************************/
 {
 private:
     /* the libxml2 node wrapped by this object */
     xmlNodePtr m_pElement;
-
+    
 public:
     explicit XMLElementWrapper_XmlSecImpl(const xmlNodePtr pNode);
     virtual ~XMLElementWrapper_XmlSecImpl() {};
 
     /* XXMLElementWrapper */
-
+    
     /* com::sun::star::lang::XUnoTunnel */
     virtual sal_Int64 SAL_CALL getSomething( const com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier )
         throw (com::sun::star::uno::RuntimeException);
-    static com::sun::star::uno::Sequence < sal_Int8 > getUnoTunnelImplementationId( void )
+    static com::sun::star::uno::Sequence < sal_Int8 > getUnoTunnelImplementationId( void ) 
         throw(com::sun::star::uno::RuntimeException);
-
+    
     /* com::sun::star::lang::XServiceInfo */
-    virtual rtl::OUString SAL_CALL getImplementationName(  )
+    virtual rtl::OUString SAL_CALL getImplementationName(  ) 
         throw (com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName )
+    virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) 
         throw (com::sun::star::uno::RuntimeException);
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(  ) 
         throw (com::sun::star::uno::RuntimeException);
 
 public:
@@ -93,10 +93,10 @@ public:
 rtl::OUString XMLElementWrapper_XmlSecImpl_getImplementationName()
     throw ( com::sun::star::uno::RuntimeException );
 
-sal_Bool SAL_CALL XMLElementWrapper_XmlSecImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL XMLElementWrapper_XmlSecImpl_supportsService( const rtl::OUString& ServiceName ) 
     throw ( com::sun::star::uno::RuntimeException );
 
-com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL XMLElementWrapper_XmlSecImpl_getSupportedServiceNames(  )
+com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL XMLElementWrapper_XmlSecImpl_getSupportedServiceNames(  ) 
     throw ( com::sun::star::uno::RuntimeException );
 
 com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.cxx b/xmlsecurity/source/xmlsec/xmlstreamio.cxx
index 739af895c849..8785cc6ab42f 100644
--- a/xmlsecurity/source/xmlsec/xmlstreamio.cxx
+++ b/xmlsecurity/source/xmlsec/xmlstreamio.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,20 +64,20 @@ int xmlStreamMatch( const char* uri )
         ( enableXmlStreamIO & XMLSTREAMIO_REGISTERED ) ) {
         if( uri == NULL || !m_xUriBinding.is() )
             return 0 ;
-        //XMLSec first unescapes the uri and  calls this function. For example, we pass the Uri
-        //ObjectReplacements/Object%201 then XMLSec passes ObjectReplacements/Object 1
-        //first. If this failed it would try this
+        //XMLSec first unescapes the uri and  calls this function. For example, we pass the Uri 
+        //ObjectReplacements/Object%201 then XMLSec passes ObjectReplacements/Object 1  
+        //first. If this failed it would try this 
         //again with the original escaped string. However, it does not get this far, because there
         //is another callback registered by libxml which claims to be able to handle this uri.
         ::rtl::OUString sUri =
-            ::rtl::Uri::encode( ::rtl::OUString::createFromAscii( uri ),
-            rtl_UriCharClassUric, rtl_UriEncodeKeepEscapes, RTL_TEXTENCODING_UTF8);
+            ::rtl::Uri::encode( ::rtl::OUString::createFromAscii( uri ), 
+            rtl_UriCharClassUric, rtl_UriEncodeKeepEscapes, RTL_TEXTENCODING_UTF8); 
         xInputStream = m_xUriBinding->getUriBinding( sUri ) ;
         if (!xInputStream.is())
         {
             //Try the the passed in uri directly.
-            //For old documents prior OOo 3.0. We did not use URIs then.
-            xInputStream = m_xUriBinding->getUriBinding(
+            //For old documents prior OOo 3.0. We did not use URIs then.   
+            xInputStream = m_xUriBinding->getUriBinding( 
                 ::rtl::OUString::createFromAscii(uri));
         }
     }
@@ -100,17 +100,17 @@ void* xmlStreamOpen( const char* uri )
 
         //see xmlStreamMatch
         ::rtl::OUString sUri =
-            ::rtl::Uri::encode( ::rtl::OUString::createFromAscii( uri ),
-            rtl_UriCharClassUric, rtl_UriEncodeKeepEscapes, RTL_TEXTENCODING_UTF8);
+            ::rtl::Uri::encode( ::rtl::OUString::createFromAscii( uri ), 
+            rtl_UriCharClassUric, rtl_UriEncodeKeepEscapes, RTL_TEXTENCODING_UTF8); 
         xInputStream = m_xUriBinding->getUriBinding( sUri ) ;
         if (!xInputStream.is())
         {
             //For old documents.
             //try the the passed in uri directly.
-            xInputStream = m_xUriBinding->getUriBinding(
+            xInputStream = m_xUriBinding->getUriBinding( 
                 ::rtl::OUString::createFromAscii(uri));
         }
-
+    
         if( xInputStream.is() ) {
             pInputStream = xInputStream.get() ;
             pInputStream->acquire() ;
@@ -169,12 +169,12 @@ int xmlEnableStreamInputCallbacks()
     if( !( enableXmlStreamIO & XMLSTREAMIO_INITIALIZED ) ) {
         //Register the callbacks into libxml2
         //cbs = xmlRegisterInputCallbacks(
-        //          xmlStreamMatch,
-        //          xmlStreamOpen,
-        //          xmlStreamRead,
-        //          xmlStreamClose ) ;
+        //			xmlStreamMatch,
+        //			xmlStreamOpen,
+        //			xmlStreamRead,
+        //			xmlStreamClose ) ;
         //if( cbs < 0 ) {
-        //  return -1 ;
+        //	return -1 ;
         //}
 
         //Register the callbacks into xmlSec
diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.hxx b/xmlsecurity/source/xmlsec/xmlstreamio.hxx
index eb61e9897606..188db15c9a1a 100644
--- a/xmlsecurity/source/xmlsec/xmlstreamio.hxx
+++ b/xmlsecurity/source/xmlsec/xmlstreamio.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@
 int xmlEnableStreamInputCallbacks( void ) ;
 void xmlDisableStreamInputCallbacks( void ) ;
 
-int xmlRegisterStreamInputCallbacks(
+int xmlRegisterStreamInputCallbacks( 
     ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XUriBinding >& aUriBinding
 ) ;
 
diff --git a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
index f8b12075f639..cd31bcb6b211 100644
--- a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
+++ b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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
 class SerialNumberAdapterImpl : public WeakImplHelper1<
         ::com::sun::star::security::XSerialNumberAdapter >
 {
-    virtual OUString SAL_CALL toString( const Sequence< sal_Int8 >& rSerialNumber )
+    virtual OUString SAL_CALL toString( const Sequence< sal_Int8 >& rSerialNumber ) 
         throw (RuntimeException)
     {
         return bigIntegerToNumericString(rSerialNumber);
@@ -121,7 +121,7 @@ sal_Bool SAL_CALL component_writeInfo( void* pServiceManager , void* pRegistryKe
     Reference< XRegistryKey > xKey( reinterpret_cast< XRegistryKey* >( pRegistryKey ) ) ;
 
     if( xKey.is() ) {
-        //  try {
+        //	try {
         // XMLElementWrapper_XmlSecImpl
         sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ;
         sKeyName += XMLElementWrapper_XmlSecImpl_getImplementationName() ;
@@ -163,7 +163,7 @@ sal_Bool SAL_CALL component_writeInfo( void* pServiceManager , void* pRegistryKe
         if( !result )
             return sal_False ;
 #endif
-
+        
 #if defined( XMLSEC_CRYPTO_MSCRYPTO )
         result = mscrypt_component_writeInfo( pServiceManager, pRegistryKey ) ;
         if( !result )
@@ -171,8 +171,8 @@ sal_Bool SAL_CALL component_writeInfo( void* pServiceManager , void* pRegistryKe
 #endif
 
         //} catch( InvalidRegistryException & ) {
-        //  //we should not ignore exceptions
-        //  return sal_False ;
+        //	//we should not ignore exceptions
+        //	return sal_False ;
         //}
     }
 
@@ -185,21 +185,21 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplName , void* pServiceM
     Reference< XInterface > xFactory ;
 
     if( pImplName != NULL && pServiceManager != NULL ) {
-        if( XMLElementWrapper_XmlSecImpl_getImplementationName().equals( OUString::createFromAscii( pImplName ) ) )
+        if( XMLElementWrapper_XmlSecImpl_getImplementationName().equals( OUString::createFromAscii( pImplName ) ) ) 
         {
             xFactory = Reference< XSingleServiceFactory >( createSingleFactory(
                 reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
                 OUString::createFromAscii( pImplName ),
                 XMLElementWrapper_XmlSecImpl_createInstance, XMLElementWrapper_XmlSecImpl_getSupportedServiceNames() ) );
         }
-        else if( XMLDocumentWrapper_XmlSecImpl_getImplementationName().equals( OUString::createFromAscii( pImplName ) ) )
+        else if( XMLDocumentWrapper_XmlSecImpl_getImplementationName().equals( OUString::createFromAscii( pImplName ) ) ) 
         {
             xFactory = Reference< XSingleServiceFactory >( createSingleFactory(
                 reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
                 OUString::createFromAscii( pImplName ),
                 XMLDocumentWrapper_XmlSecImpl_createInstance, XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames() ) );
         }
-        else if( SerialNumberAdapterImpl_getImplementationName().equals( OUString::createFromAscii( pImplName ) ) )
+        else if( SerialNumberAdapterImpl_getImplementationName().equals( OUString::createFromAscii( pImplName ) ) ) 
         {
             xFactory = ::cppu::createSingleComponentFactory(
               SerialNumberAdapterImpl_createInstance,
@@ -217,7 +217,7 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplName , void* pServiceM
         if( pRet != NULL )
             return pRet ;
 #endif
-
+        
 #if defined( XMLSEC_CRYPTO_MSCRYPTO )
         pRet = mscrypt_component_getFactory( pImplName, pServiceManager, pRegistryKey ) ;
         if( pRet != NULL )
diff --git a/xmlsecurity/test_docs/tools/httpserv/build.xml b/xmlsecurity/test_docs/tools/httpserv/build.xml
index 831e963bce65..092141f01440 100755
--- a/xmlsecurity/test_docs/tools/httpserv/build.xml
+++ b/xmlsecurity/test_docs/tools/httpserv/build.xml
@@ -12,9 +12,9 @@
     <import file="nbproject/build-impl.xml"/>
     <!--
 
-    There exist several targets which are by default empty and which can be
-    used for execution of your tasks. These targets are usually executed
-    before and after some main targets. They are:
+    There exist several targets which are by default empty and which can be 
+    used for execution of your tasks. These targets are usually executed 
+    before and after some main targets. They are: 
 
       -pre-init:                 called before initialization of project properties
       -post-init:                called after initialization of project properties
@@ -40,12 +40,12 @@
             </obfuscate>
         </target>
 
-    For list of available properties check the imported
-    nbproject/build-impl.xml file.
+    For list of available properties check the imported 
+    nbproject/build-impl.xml file. 
 
 
     Another way to customize the build is by overriding existing main targets.
-    The targets of interest are:
+    The targets of interest are: 
 
       -init-macrodef-javac:     defines macro for javac compilation
       -init-macrodef-junit:     defines macro for junit execution
@@ -53,7 +53,7 @@
       -init-macrodef-java:      defines macro for class execution
       -do-jar-with-manifest:    JAR building (if you are using a manifest)
       -do-jar-without-manifest: JAR building (if you are not using a manifest)
-      run:                      execution of project
+      run:                      execution of project 
       -javadoc-build:           Javadoc generation
       test-report:              JUnit report generation
 
@@ -65,10 +65,10 @@
             </exec>
         </target>
 
-    Notice that the overridden target depends on the jar target and not only on
-    the compile target as the regular run target does. Again, for a list of available
+    Notice that the overridden target depends on the jar target and not only on 
+    the compile target as the regular run target does. Again, for a list of available 
     properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file.
+    nbproject/build-impl.xml file. 
 
     -->
 </project>
diff --git a/xmlsecurity/test_docs/tools/httpserv/nbproject/build-impl.xml b/xmlsecurity/test_docs/tools/httpserv/nbproject/build-impl.xml
index 9064a3305e2d..ed83ec2db418 100755
--- a/xmlsecurity/test_docs/tools/httpserv/nbproject/build-impl.xml
+++ b/xmlsecurity/test_docs/tools/httpserv/nbproject/build-impl.xml
@@ -28,9 +28,9 @@ is divided into following sections:
         </condition>
     </fail>
     <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
-    <!--
+    <!-- 
                 ======================
-                INITIALIZATION SECTION
+                INITIALIZATION SECTION 
                 ======================
             -->
     <target name="-pre-init">
diff --git a/xmlsecurity/test_docs/tools/httpserv/src/httpserv/Main.java b/xmlsecurity/test_docs/tools/httpserv/src/httpserv/Main.java
index c67e41549c5f..4466a430549d 100755
--- a/xmlsecurity/test_docs/tools/httpserv/src/httpserv/Main.java
+++ b/xmlsecurity/test_docs/tools/httpserv/src/httpserv/Main.java
@@ -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
@@ -114,7 +114,7 @@ public class Main {
                         }
                         break;
                     }
-                }
+                } 
             }
         }
 
diff --git a/xmlsecurity/tools/demo/JavaFlatFilter.java b/xmlsecurity/tools/demo/JavaFlatFilter.java
index 331ace804072..5df9027e9a0c 100644
--- a/xmlsecurity/tools/demo/JavaFlatFilter.java
+++ b/xmlsecurity/tools/demo/JavaFlatFilter.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,92 +53,92 @@ public class JavaFlatFilter extends Object
         implements XDocumentHandler, XParser, XTypeProvider, XServiceInfo
 {
     XDocumentHandler m_xDocumentHandler;
-
+    
     /* XDocumentHandler */
-    public void startDocument()
-        throws com.sun.star.xml.sax.SAXException
+    public void startDocument() 
+        throws com.sun.star.xml.sax.SAXException 
     {
         m_xDocumentHandler.startDocument();
     }
-
+    
     public void endDocument()
-        throws com.sun.star.xml.sax.SAXException
+        throws com.sun.star.xml.sax.SAXException 
     {
         m_xDocumentHandler.endDocument();
     }
-
-    public void startElement (String aName, com.sun.star.xml.sax.XAttributeList xAttribs )
-        throws com.sun.star.xml.sax.SAXException
+    
+    public void startElement (String aName, com.sun.star.xml.sax.XAttributeList xAttribs ) 
+        throws com.sun.star.xml.sax.SAXException 
     {
         m_xDocumentHandler.startElement(aName, xAttribs);
     }
-
-    public void endElement ( String aName )
-        throws com.sun.star.xml.sax.SAXException
+    
+    public void endElement ( String aName ) 
+        throws com.sun.star.xml.sax.SAXException 
     {
         m_xDocumentHandler.endElement(aName);
     }
-
-    public void characters ( String aChars )
-        throws com.sun.star.xml.sax.SAXException
+    
+    public void characters ( String aChars ) 
+        throws com.sun.star.xml.sax.SAXException 
     {
         m_xDocumentHandler.characters(aChars);
     }
-
-    public void ignorableWhitespace ( String aWhitespaces )
-        throws com.sun.star.xml.sax.SAXException
+    
+    public void ignorableWhitespace ( String aWhitespaces ) 
+        throws com.sun.star.xml.sax.SAXException 
     {
         m_xDocumentHandler.ignorableWhitespace(aWhitespaces);
     }
-
-    public void processingInstruction ( String aTarget, String aData )
-        throws com.sun.star.xml.sax.SAXException
+    
+    public void processingInstruction ( String aTarget, String aData ) 
+        throws com.sun.star.xml.sax.SAXException 
     {
         m_xDocumentHandler.processingInstruction(aTarget, aData);
     }
-
-    public void setDocumentLocator (com.sun.star.xml.sax.XLocator xLocator )
+    
+    public void setDocumentLocator (com.sun.star.xml.sax.XLocator xLocator ) 
         throws com.sun.star.xml.sax.SAXException
     {
         m_xDocumentHandler.setDocumentLocator(xLocator);
     }
-
+    
     /* XParser */
     public void parseStream(InputSource strucInputSource)
     {
     }
-
+    
     public void setDocumentHandler(XDocumentHandler xDocumentHandler)
     {
         m_xDocumentHandler = xDocumentHandler;
     }
-
+    
     public void setDTDHandler(XDTDHandler xHandler)
     {
     }
-
+    
     public void setEntityResolver(XEntityResolver xResolver)
     {
     }
-
+    
     public void setErrorHandler(XErrorHandler xHandler)
     {
     }
-
+    
     public void setLocale(Locale locale)
     {
     }
-
+    
     /*
      * XTypeProvider implementation
      * maintain a static implementation id for all instances of JavaFlatFilter
      * initialized by the first call to getImplementationId()
      */
     protected static byte[] _implementationId;
-    public com.sun.star.uno.Type[] getTypes()
+    public com.sun.star.uno.Type[] getTypes() 
     {
         com.sun.star.uno.Type[] retValue = new com.sun.star.uno.Type[4];
-
+        
         /*
          * instantiate Type instances for each interface you support and add them to Type[] array
          * this object implements XServiceInfo, XTypeProvider and XSignFilter
@@ -147,15 +147,15 @@ public class JavaFlatFilter extends Object
         retValue[1]= new com.sun.star.uno.Type( XTypeProvider.class);
         retValue[2]= new com.sun.star.uno.Type( XDocumentHandler.class);
         retValue[3]= new com.sun.star.uno.Type( XParser.class);
-
+        
         /*
          * XInterface is not needed for Java components, the UnoRuntime does its job
          */
-
+         
         return retValue;
     }
-
-    synchronized public byte[] getImplementationId()
+    
+    synchronized public byte[] getImplementationId() 
     {
         if (_implementationId == null) {
         _implementationId= new byte[16];
@@ -166,42 +166,42 @@ public class JavaFlatFilter extends Object
         _implementationId[3] = (byte)((hash >>>24) & 0xff);
         }
         return _implementationId;
-    }
-
-
+    }	
+    
+    
     /*
      * XServiceInfo implementation
      * hold the service name in a private static member variable of the class
      */
     protected static final String __serviceName = "com.sun.star.xml.crypto.eval.JavaFlatFilter";
-    public String getImplementationName( )
+    public String getImplementationName( ) 
     {
         return getClass().getName();
     }
-
-    public boolean supportsService(String serviceName)
+    
+    public boolean supportsService(String serviceName) 
     {
         boolean rc = false;
-
+        
         if ( serviceName.equals( __serviceName))
         {
             rc = true;
         }
-
+        
         return rc;
     }
-
-    public String[] getSupportedServiceNames( )
+    
+    public String[] getSupportedServiceNames( ) 
     {
         String[] retValue= new String[0];
         retValue[0]= __serviceName;
         return retValue;
     }
-
+    
     /* static __getServiceFactory() implementation */
     public static XSingleServiceFactory __getServiceFactory(String implName,
         XMultiServiceFactory multiFactory,
-        com.sun.star.registry.XRegistryKey regKey)
+        com.sun.star.registry.XRegistryKey regKey) 
     {
         com.sun.star.lang.XSingleServiceFactory xSingleServiceFactory = null;
         if (implName.equals( JavaFlatFilter.class.getName()) )
@@ -211,15 +211,15 @@ public class JavaFlatFilter extends Object
                 multiFactory,
                 regKey);
         }
-
+        
         return xSingleServiceFactory;
-    }
-
+    }	
+    
     /* static __writeRegistryServiceInfo implementation */
-    public static boolean __writeRegistryServiceInfo(XRegistryKey regKey)
+    public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) 
     {
         return FactoryHelper.writeRegistryServiceInfo( JavaFlatFilter.class.getName(),
                                 __serviceName,
                                 regKey);
-    }
+    }	
 }
diff --git a/xmlsecurity/tools/demo/mozprofile.cxx b/xmlsecurity/tools/demo/mozprofile.cxx
index 4c08e3a82e5a..a6326018ff80 100644
--- a/xmlsecurity/tools/demo/mozprofile.cxx
+++ b/xmlsecurity/tools/demo/mozprofile.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ int SAL_CALL main( int argc, char **argv )
         fprintf( stdout, "\n\nERROR: Can't create Service Factory\n" );
         exit (-1);
     }
-
+    
     uno::Reference<mozilla::XMozillaBootstrap> xMozillaBootstrap( xMSF->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap" ) ) ), uno::UNO_QUERY );
     if ( !xMozillaBootstrap.is() )
     {
         fprintf( stdout, "\n\nERROR: Can't create Mozilla Bootstrap Service\n" );
         exit (-1);
     }
-
+    
     int nProducts = 4;
     mozilla::MozillaProductType productTypes[4] = { mozilla::MozillaProductType_Thunderbird, mozilla::MozillaProductType_Mozilla, mozilla::MozillaProductType_Firefox, mozilla::MozillaProductType_Default };
     for ( int i = 0; i < nProducts; i++)
@@ -84,12 +84,12 @@ int SAL_CALL main( int argc, char **argv )
             fprintf( stdout, "NOT FOUND" );
         }
     }
-
+    
     /*
      * creates a signature helper
      */
     XMLSignatureHelper aSignatureHelper( xMSF );
-
+    
     /*
      * creates a security context.
      */
@@ -102,7 +102,7 @@ int SAL_CALL main( int argc, char **argv )
     else
     {
         fprintf( stdout, "\n\nSecurity environment can be initialized successfully.\n\n" );
-    }
+    }	
 
     return 0;
 }
diff --git a/xmlsecurity/tools/demo/multisigdemo.cxx b/xmlsecurity/tools/demo/multisigdemo.cxx
index 356616451ed6..f5d2b95650ca 100644
--- a/xmlsecurity/tools/demo/multisigdemo.cxx
+++ b/xmlsecurity/tools/demo/multisigdemo.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ long startVerifyHandler( void *, void * )
 
 int SAL_CALL main( int argc, char **argv )
 {
-    if( argc < 5 )
+    if( argc < 5 ) 
     {
         fprintf( stderr, "Usage: %s <signature file 1> <signature file 2> <xml stream file> <binary stream file> [<cryptoken>]\n" , argv[0] ) ;
         return -1 ;
@@ -77,7 +77,7 @@ int SAL_CALL main( int argc, char **argv )
     bool bDone;
     SignatureInformations signatureInformations;
     uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler> xDocumentHandler;
-
+    
     // -------- START -------
 
     XMLSignatureHelper aSignatureHelper( xMSF );
@@ -88,11 +88,11 @@ int SAL_CALL main( int argc, char **argv )
         fprintf( stderr, "Error initializing security context!\n" );
         return -1;
     }
-
+        
     fprintf( stdout, "\n\nTEST MISSION 1: Create the first signature file\n");
-
+    
     aSignatureHelper.StartMission();
-
+        
     /*
      * select a private key certificate
      */
@@ -127,14 +127,14 @@ int SAL_CALL main( int argc, char **argv )
         fprintf( stdout, "\nSTATUS MISSION 1: Signature successfully created!\n" );
 
     aSignatureHelper.EndMission();
-
-
+    
+    
     fprintf( stdout, "\n\nTEST MISSION 2: Transfer the second signature to a new signature file\n");
-
+    
     /*
      * You can use an uninitialized SignatureHelper to perform this mission.
      */
-
+    
     /*
      * configures the start-verify handler. Don't need to verify for transfering...
      */
@@ -149,16 +149,16 @@ int SAL_CALL main( int argc, char **argv )
         fprintf( stderr, "\nSTATUS MISSION 2: Error in reading Signature!\n" );
     else
         fprintf( stdout, "\nSTATUS MISSION 2: Signature successfully transfered!\n" );
-
+    
     /*
      * get all signature information
      */
     signatureInformations = aSignatureHelper.GetSignatureInformations();
-
+    
     /*
      * write the first signature into the second signature file.
-     */
-
+     */		
+    
     xOutputStream = OpenOutputStream( aSIGFileName2 );
     xDocumentHandler = aSignatureHelper.CreateDocumentHandlerWithHeader( xOutputStream);
     aSignatureHelper.ExportSignature( xDocumentHandler, signatureInformations[1]);
@@ -168,7 +168,7 @@ int SAL_CALL main( int argc, char **argv )
     fprintf( stdout, "\n\nTEST MISSION 3: Insert a new signature to the first signature file\n");
 
     aSignatureHelper.StartMission();
-
+        
     nSecurityId = aSignatureHelper.GetNewSecurityId();
 
     // Select certificate...
@@ -181,10 +181,10 @@ int SAL_CALL main( int argc, char **argv )
     aSignatureHelper.AddForSigning( nSecurityId, aBINFileName, aBINFileName, sal_True );
     aSignatureHelper.SetDateTime( nSecurityId, Date(), Time() );
 
-
+    
     xOutputStream = OpenOutputStream( aSIGFileName );
     xDocumentHandler = aSignatureHelper.CreateDocumentHandlerWithHeader( xOutputStream);
-
+        
     aSignatureHelper.ExportSignature( xDocumentHandler, signatureInformations[0]);
     bDone = aSignatureHelper.CreateAndWriteSignature( xDocumentHandler );
     aSignatureHelper.ExportSignature( xDocumentHandler, signatureInformations[1]);
@@ -198,7 +198,7 @@ int SAL_CALL main( int argc, char **argv )
     aSignatureHelper.EndMission();
 
     fprintf( stdout, "\n\nTEST MISSION 4 : Verify the first signature file\n");
-
+    
     aSignatureHelper.SetStartVerifySignatureHdl( Link( NULL, startVerifyHandler ) );
 
     aSignatureHelper.StartMission();
@@ -206,7 +206,7 @@ int SAL_CALL main( int argc, char **argv )
     xInputStream = OpenInputStream( aSIGFileName );
     bDone = aSignatureHelper.ReadAndVerifySignature( xInputStream );
     xInputStream->closeInput();
-
+    
     if ( !bDone )
         fprintf( stderr, "\nSTATUS MISSION 4: Error verifying Signatures!\n" );
     else
@@ -217,13 +217,13 @@ int SAL_CALL main( int argc, char **argv )
     QueryPrintSignatureDetails( aSignatureHelper.GetSignatureInformations(), aSignatureHelper.GetSecurityEnvironment() );
 
     fprintf( stdout, "\n\nTEST MISSION 5: Verify the second signature file\n");
-
+    
     aSignatureHelper.StartMission();
 
     xInputStream = OpenInputStream( aSIGFileName2 );
     bDone = aSignatureHelper.ReadAndVerifySignature( xInputStream );
     xInputStream->closeInput();
-
+    
     if ( !bDone )
         fprintf( stderr, "\nSTATUS MISSION 5: Error verifying Signatures!\n" );
     else
diff --git a/xmlsecurity/tools/demo/performance.cxx b/xmlsecurity/tools/demo/performance.cxx
index bcf0d203bfad..374e85428a17 100644
--- a/xmlsecurity/tools/demo/performance.cxx
+++ b/xmlsecurity/tools/demo/performance.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -151,7 +151,7 @@ class XSecTester;
  * The XSecTester class is a C++ version of SecurityFramworkController.java
  *
  */
-
+ 
 class SecurityEntity
 {
 private:
@@ -159,58 +159,58 @@ private:
     rtl::OUString m_ouKeyURI;
 
 protected:
-    com::sun::star::uno::Reference<
+    com::sun::star::uno::Reference< 
         com::sun::star::lang::XMultiServiceFactory > mxMSF;
-
-    com::sun::star::uno::Reference<
-        com::sun::star::xml::crypto::sax::XReferenceResolvedListener >
+        
+    com::sun::star::uno::Reference< 
+        com::sun::star::xml::crypto::sax::XReferenceResolvedListener > 
         m_xReferenceListener;
-
-    com::sun::star::uno::Reference<
-        com::sun::star::xml::crypto::sax::XSecuritySAXEventKeeper >
+        
+    com::sun::star::uno::Reference< 
+        com::sun::star::xml::crypto::sax::XSecuritySAXEventKeeper > 
         m_xSAXEventKeeper;
 
-    com::sun::star::uno::Reference<
-        com::sun::star::xml::crypto::XXMLSecurityContext >
+    com::sun::star::uno::Reference< 
+        com::sun::star::xml::crypto::XXMLSecurityContext > 
         m_xXMLSecurityContext;
 
-    com::sun::star::uno::Reference<
-        com::sun::star::xml::crypto::XXMLSignature >
+    com::sun::star::uno::Reference< 
+        com::sun::star::xml::crypto::XXMLSignature > 
         m_xXMLSignature;
-
+    
     int m_nSecurityId;
 
-private:
+private:	
     int getNextSecurityId() const;
 
 protected:
     SecurityEntity(
-        const com::sun::star::uno::Reference<
-            com::sun::star::xml::crypto::sax::XSecuritySAXEventKeeper >&
+        const com::sun::star::uno::Reference< 
+            com::sun::star::xml::crypto::sax::XSecuritySAXEventKeeper >& 
             xSAXEventKeeper,
-        const com::sun::star::uno::Reference<
-            com::sun::star::xml::crypto::XXMLSecurityContext >&
+        const com::sun::star::uno::Reference< 
+            com::sun::star::xml::crypto::XXMLSecurityContext >& 
             xXMLSecurityContext,
-        const com::sun::star::uno::Reference<
-            com::sun::star::xml::crypto::XXMLSignature >&
+        const com::sun::star::uno::Reference< 
+            com::sun::star::xml::crypto::XXMLSignature >& 
             xXMLSignature,
-        const com::sun::star::uno::Reference<
+        const com::sun::star::uno::Reference< 
             com::sun::star::lang::XMultiServiceFactory >&
             rsMSF);
-
+    
 public:
     void setKeyId(int nId);
-
+    
     int getSecurityId() const;
-
-    com::sun::star::uno::Reference<
-        com::sun::star::xml::crypto::sax::XReferenceResolvedListener >
+    
+    com::sun::star::uno::Reference< 
+        com::sun::star::xml::crypto::sax::XReferenceResolvedListener > 
         getReferenceListener() const;
-
+        
     bool setKey( const rtl::OUString& ouUri, bool bIsExporting );
-
+    
     void setKeyURI(const rtl::OUString& ouUri);
-
+    
     bool endMission();
 };
 
@@ -225,12 +225,12 @@ private:
 
 public:
     SignatureEntity(
-        const com::sun::star::uno::Reference<
+        const com::sun::star::uno::Reference< 
             com::sun::star::xml::crypto::sax::XSecuritySAXEventKeeper >&
             xSAXEventKeeper,
-        bool bIsExporting,
+        bool bIsExporting, 
         XSecTester* pListener,
-        const com::sun::star::uno::Reference<
+        const com::sun::star::uno::Reference< 
             com::sun::star::xml::crypto::XXMLSecurityContext >&
             xXMLSecurityContext,
         const com::sun::star::uno::Reference<
@@ -240,7 +240,7 @@ public:
             com::sun::star::lang::XMultiServiceFactory >&
             rsMSF);
     ~SignatureEntity(){};
-
+    
     void setReferenceNumber() const;
     bool setReference( const rtl::OUString& ouUri, bool bIsExporting ) const;
     void addReferenceURI( const rtl::OUString& ouUri );
@@ -249,17 +249,17 @@ public:
 struct AncestorEvent
 {
     AncestorEvent( sal_Int32 nAttrNum ):aAttributeList(nAttrNum){};
-
+    
     bool bIsStartElement;
     rtl::OUString ouName;
-
-    com::sun::star::uno::Sequence<
+    
+    com::sun::star::uno::Sequence< 
         com::sun::star::xml::csax::XMLAttribute >
         aAttributeList;
 };
-
+    
 class XSecTester : public cppu::WeakImplHelper4
-<
+< 
     com::sun::star::xml::crypto::sax::XSignatureCreationResultListener,
     com::sun::star::xml::crypto::sax::XSignatureVerifyResultListener,
     com::sun::star::xml::crypto::sax::XSAXEventKeeperStatusChangeListener,
@@ -268,160 +268,160 @@ class XSecTester : public cppu::WeakImplHelper4
 {
 private:
     com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > mxMSF;
-
+    
     sal_Int32 m_nTotalSignatureNumber;
     sal_Int32 m_nSuccessfulSignatureNumber;
 
     com::sun::star::uno::Reference<
-        com::sun::star::xml::sax::XDocumentHandler >
+        com::sun::star::xml::sax::XDocumentHandler > 
         m_xExportHandler;
-
+        
     com::sun::star::uno::Reference<
         com::sun::star::xml::crypto::sax::XSecuritySAXEventKeeper >
         m_xSAXEventKeeper;
-
+        
     com::sun::star::uno::Reference<
-        com::sun::star::xml::wrapper::XXMLDocumentWrapper >
+        com::sun::star::xml::wrapper::XXMLDocumentWrapper > 
         m_xXMLDocumentWrapper;
-
+        
     com::sun::star::uno::Reference<
-        com::sun::star::xml::sax::XDocumentHandler >
+        com::sun::star::xml::sax::XDocumentHandler > 
         m_xOutputHandler;
-
-    com::sun::star::uno::Reference<
+        
+    com::sun::star::uno::Reference< 
         com::sun::star::xml::sax::XParser >
         m_xSaxParser;
 
     std::stack< void* > m_stCurrentPath;
     std::stack< bool > m_stCurrentPathType;
-
+    
     std::vector< AncestorEvent* > m_vAncestorEvents;
     std::vector< SignatureEntity* > m_vSignatureList;
-
+    
     std::vector< rtl::OUString > m_vUnsolvedReferenceURIs;
     std::vector< int > m_vUnsolvedReferenceKeeperIds;
     std::vector< int > m_vUnsolvedReferenceRefNums;
-
+    
     bool m_bIsExporting;
     bool m_bIsBlocking;
-
+    
     bool m_bIsInsideCollectedElement;
     bool m_bIsSAXEventKeeperOnTheSAXChain;
-
+    
     com::sun::star::uno::Reference<
-        com::sun::star::xml::crypto::XXMLSecurityContext >
+        com::sun::star::xml::crypto::XXMLSecurityContext > 
         m_xXMLSecurityContext;
-
+        
     com::sun::star::uno::Reference<
-        com::sun::star::xml::crypto::XXMLSignature >
+        com::sun::star::xml::crypto::XXMLSignature > 
         m_xXMLSignature;
-
+    
     rtl::OUString m_ouJavaCryptokenDir;
     rtl::OUString m_ouCCryptokenDir;
     rtl::OUString m_ouXMLDocumentWrapperComponentName;
-
+    
 private:
-    com::sun::star::uno::Reference<
-        com::sun::star::io::XOutputStream >
+    com::sun::star::uno::Reference< 
+        com::sun::star::io::XOutputStream > 
         createOutputStream( const rtl::OUString& ouFile );
-
+        
     rtl::OUString parseFile(
-        const rtl::OUString& ouInputFileName,
-        const rtl::OUString& ouOutputFileName,
+        const rtl::OUString& ouInputFileName, 
+        const rtl::OUString& ouOutputFileName, 
         bool bIsExporting,
         bool bIsJavaBased);
-
+        
     void changeOutput();
-
+    
     bool foundSecurityRelated();
-
+    
     void findKeyOrReference(SecurityEntity* pSecurityEntity, const rtl::OUString& ouUri, bool bIsFindKey);
-
+    
     bool checkSecurityElement(
         const rtl::OUString& ouLocalName,
         const com::sun::star::uno::Reference<
             com::sun::star::xml::sax::XAttributeList>& xAttribs);
-
+            
     void checkReference(
         const rtl::OUString& ouLocalName,
         const com::sun::star::uno::Reference<
             com::sun::star::xml::sax::XAttributeList>& xAttribs,
         const rtl::OUString& ouId);
-
+        
     void endMission();
-
+    
     void addStartAncestorEvent(
         const rtl::OUString& ouName,
         const com::sun::star::uno::Reference<
             com::sun::star::xml::sax::XAttributeList>& xAttribs);
-
+        
     void addEndAncestorEvent( const rtl::OUString& ouName );
-
+    
     void flushAncestorEvents(
         const com::sun::star::uno::Reference<
             com::sun::star::xml::sax::XDocumentHandler >& xDocumentHandler);
-
+    
     void XSecTester::sendAncestorStartElementEvent(
-        const rtl::OUString& ouName,
+        const rtl::OUString& ouName, 
         const com::sun::star::uno::Sequence<
             com::sun::star::xml::csax::XMLAttribute >& xAttrList,
         const com::sun::star::uno::Reference<
             com::sun::star::xml::sax::XDocumentHandler >& xDocumentHandler) const;
-
+        
     void XSecTester::sendAncestorEndElementEvent(
         const rtl::OUString& ouName,
         const com::sun::star::uno::Reference<
             com::sun::star::xml::sax::XDocumentHandler >& xDocumentHandler) const;
-
-    std::vector< AncestorEvent* >::const_iterator XSecTester::checkAncestorStartElementEvent(
+        
+    std::vector< AncestorEvent* >::const_iterator XSecTester::checkAncestorStartElementEvent( 
         const std::vector< AncestorEvent* >::const_iterator& ii,
         const com::sun::star::uno::Reference<
             com::sun::star::xml::sax::XDocumentHandler >& xDocumentHandler) const;
-
+    
 public:
     XSecTester(const com::sun::star::uno::Reference<
         com::sun::star::lang::XMultiServiceFactory >& rxMSF)
         :mxMSF( rxMSF ){};
     virtual ~XSecTester(){};
-
+    
     /* XSignatureCreationResultListener */
-    virtual void SAL_CALL signatureCreated(
-        sal_Int32 securityId,
+    virtual void SAL_CALL signatureCreated( 
+        sal_Int32 securityId, 
         com::sun::star::xml::crypto::SecurityOperationStatus creationResult )
         throw (com::sun::star::uno::RuntimeException);
 
     /* XSignatureVerifyResultListener */
-    virtual void SAL_CALL signatureVerified(
-        sal_Int32 securityId,
+    virtual void SAL_CALL signatureVerified( 
+        sal_Int32 securityId, 
         com::sun::star::xml::crypto::SecurityOperationStatus verifyResult )
         throw (com::sun::star::uno::RuntimeException);
-
+        
     /* XSAXEventKeeperStatusChangeListener */
     virtual void SAL_CALL blockingStatusChanged( sal_Bool isBlocking )
         throw (com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL collectionStatusChanged(
+    virtual void SAL_CALL collectionStatusChanged( 
         sal_Bool isInsideCollectedElement )
         throw (com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL bufferStatusChanged( sal_Bool isBufferEmpty )
         throw (com::sun::star::uno::RuntimeException);
-
+    
     /* XXMLSecTester */
-    virtual rtl::OUString SAL_CALL transfer_without_sec(
-        const rtl::OUString& inputFileName,
+    virtual rtl::OUString SAL_CALL transfer_without_sec( 
+        const rtl::OUString& inputFileName, 
         const rtl::OUString& outputFileName,
         sal_Bool isBridgeInvolved)
         throw (com::sun::star::uno::RuntimeException);
     virtual rtl::OUString SAL_CALL export_xml(
-        const rtl::OUString& inputFileName,
+        const rtl::OUString& inputFileName, 
         const rtl::OUString& outputFileName,
         sal_Bool isJavaBased)
         throw (com::sun::star::uno::RuntimeException);
     virtual rtl::OUString SAL_CALL import_xml(
-        const rtl::OUString& inputFileName,
+        const rtl::OUString& inputFileName, 
         const rtl::OUString& outputFileName,
         sal_Bool isJavaBased)
         throw (com::sun::star::uno::RuntimeException);
-
+        
     virtual void SAL_CALL setCryptoDir(
         const rtl::OUString & javaDirName,
         const rtl::OUString & cDirName)
@@ -439,7 +439,7 @@ public:
     virtual void SAL_CALL ignorableWhitespace(const rtl::OUString&)
         throw (com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL startElement(
-        const rtl::OUString&,
+        const rtl::OUString&, 
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >&)
         throw (com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL endElement(const rtl::OUString&)
@@ -450,23 +450,23 @@ public:
 };
 
 rtl::OUString XSecTester::parseFile(
-    const rtl::OUString& ouInputFileName,
-    const rtl::OUString& ouOutputFileName,
+    const rtl::OUString& ouInputFileName, 
+    const rtl::OUString& ouOutputFileName, 
     bool bIsExporting,
     bool bIsJavaBased)
 {
     rtl::OUString ouMessage;
-
+    
     cssu::Reference<cssi::XInputStream> xInputStream = OpenInputStream(ouInputFileName);
-
-    if (xInputStream != NULL )
+    
+    if (xInputStream != NULL ) 
     {
         /* initialization */
         rtl::OUString SEInitializer_comp;
         rtl::OUString XMLSignature_comp;
         rtl::OUString tokenPath;
         cssu::Reference < cssxc::XSEInitializer > xSEInitializer;
-
+        
         if (bIsJavaBased)
         {
             SEInitializer_comp = rtl::OUString::createFromAscii( SEINITIALIZER_JAVA_COMPONENT );
@@ -481,51 +481,51 @@ rtl::OUString XSecTester::parseFile(
             m_ouXMLDocumentWrapperComponentName = rtl::OUString::createFromAscii( XMLDOCUMENT_C_COMPONENT );
             tokenPath = m_ouCCryptokenDir;
         }
-
+        
         xSEInitializer = cssu::Reference < cssxc::XSEInitializer > (
              mxMSF->createInstance( SEInitializer_comp ),
-             cssu::UNO_QUERY );
-
+             cssu::UNO_QUERY );		
+             
         m_xXMLSignature = cssu::Reference<cssxc::XXMLSignature> (
             mxMSF->createInstance( XMLSignature_comp ),
             cssu::UNO_QUERY );
-
+            
         if ( xSEInitializer.is() && m_xXMLSignature.is())
         {
             /* create SAX Parser */
-            const rtl::OUString sSaxParser (
+            const rtl::OUString sSaxParser ( 
                 RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Parser") );
             m_xSaxParser = cssu::Reference < cssxs::XParser > ( mxMSF->createInstance( sSaxParser ), cssu::UNO_QUERY );
-
+    
             /* create SAX Writer */
-            const rtl::OUString sSaxWriter (
+            const rtl::OUString sSaxWriter ( 
                 RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Writer") );
             cssu::Reference < cssi::XActiveDataSource > xSaxWriter
                 ( mxMSF->createInstance( sSaxWriter ), cssu::UNO_QUERY );
-
+            
             cssu::Reference< cssi::XOutputStream > xOutputStream = OpenOutputStream(ouOutputFileName);
             xSaxWriter->setOutputStream( xOutputStream );
-
+    
             cssxs::InputSource aInput;
             aInput.sSystemId = ouInputFileName;
             aInput.aInputStream = xInputStream;
-
+            
             cssu::Reference < cssxs::XDocumentHandler > xSaxWriterHandler( xSaxWriter, cssu::UNO_QUERY);
-
-            m_xXMLSecurityContext =
+    
+            m_xXMLSecurityContext = 
                 xSEInitializer->createSecurityContext(tokenPath);
-
+            
             m_bIsExporting = bIsExporting;
             m_xExportHandler = xSaxWriterHandler;
             m_xOutputHandler = xSaxWriterHandler;
-
+            
             m_xXMLDocumentWrapper = NULL;
             m_xSAXEventKeeper = NULL;
             m_bIsSAXEventKeeperOnTheSAXChain = false;
-
+    
             m_bIsBlocking = false;
             m_bIsInsideCollectedElement = false;
-
+            
             OSL_ASSERT(m_vSignatureList.size() == 0);
             OSL_ASSERT(m_vUnsolvedReferenceURIs.size() == 0);
             OSL_ASSERT(m_vUnsolvedReferenceKeeperIds.size() == 0);
@@ -533,51 +533,51 @@ rtl::OUString XSecTester::parseFile(
             OSL_ASSERT(m_stCurrentPath.empty());
             OSL_ASSERT(m_stCurrentPathType.empty());
             OSL_ASSERT(m_vAncestorEvents.empty());
-
+    
             changeOutput();
-
+    
             /* foundSecurityRelated(); */
-
+            
             /* Begin to parse */
             TimeValue startTime, endTime;
             osl_getSystemTime( &startTime );
-
+            
             xSaxWriterHandler->startDocument();
-
-            if (m_bIsExporting)
+            
+            if (m_bIsExporting) 
             {
                 m_xSaxParser->setDocumentHandler(this);
                 m_xSaxParser->parseStream(aInput);
             }
-            else
+            else 
             {
                 m_xSaxParser->setDocumentHandler(this);
                 m_xSaxParser->parseStream(aInput);
             }
-
+            
             endMission();
             xSaxWriterHandler->endDocument();
-
+    
             osl_getSystemTime( &endTime );
-
+    
             flushAncestorEvents( NULL );
-
+            
             // Bug in SAXWriter, done in endDocument()
             // xOutputStream->closeOutput();
             xInputStream->closeInput();
-
-
+            
+            
             /*
              * Free the security context
              */
             xSEInitializer->freeSecurityContext(m_xXMLSecurityContext);
             m_xXMLSecurityContext = NULL;
-
+            
             /* Calculate the time */
             double diff = ((double)((endTime.Nanosec + endTime.Seconds*1000000000.0)
-                    - (startTime.Nanosec + startTime.Seconds*1000000000.0))) /
+                    - (startTime.Nanosec + startTime.Seconds*1000000000.0))) / 
                 ((double)1000000000.0);
-
+    
             char buf[32];
             sprintf(buf, "%.2f", diff);
             ouMessage += rtl::OUString(RTL_ASCII_USTRINGPARAM(buf));
@@ -586,24 +586,24 @@ rtl::OUString XSecTester::parseFile(
         {
             ouMessage += rtl::OUString::createFromAscii( "N/A" );
         }
-
+        
     }
     else
     {
         ouMessage += rtl::OUString::createFromAscii( "-" );
     }
-
+    
     return ouMessage;
 }
 
 /* XSignatureCreationResultListener */
 void SAL_CALL XSecTester::signatureCreated(
-    sal_Int32 securityId,
+    sal_Int32 securityId, 
     cssxc::SecurityOperationStatus creationResult )
     throw (cssu::RuntimeException)
 {
     m_nTotalSignatureNumber++;
-    if (creationResult == cssxc::SecurityOperationStatus_OPERATION_SUCCEEDED)
+    if (creationResult == cssxc::SecurityOperationStatus_OPERATION_SUCCEEDED) 
     {
         m_nSuccessfulSignatureNumber++;
     }
@@ -611,29 +611,29 @@ void SAL_CALL XSecTester::signatureCreated(
 
 /* XSignatureVerifyResultListener */
 void SAL_CALL XSecTester::signatureVerified(
-    sal_Int32 securityId,
+    sal_Int32 securityId, 
     cssxc::SecurityOperationStatus verifyResult )
     throw (cssu::RuntimeException)
 {
     m_nTotalSignatureNumber++;
-    if (verifyResult == cssxc::SecurityOperationStatus_OPERATION_SUCCEEDED)
+    if (verifyResult == cssxc::SecurityOperationStatus_OPERATION_SUCCEEDED) 
     {
         m_nSuccessfulSignatureNumber++;
     }
 }
-
+    
 /* XSAXEventKeeperStatusChangeListener */
 void SAL_CALL XSecTester::blockingStatusChanged( sal_Bool isBlocking )
     throw (cssu::RuntimeException)
 {
     this->m_bIsBlocking = isBlocking;
 }
-
+    
 void SAL_CALL XSecTester::collectionStatusChanged( sal_Bool isInsideCollectedElement )
     throw (cssu::RuntimeException)
 {
     this->m_bIsInsideCollectedElement = isInsideCollectedElement;
-
+    
     if ( !m_bIsInsideCollectedElement && !m_bIsBlocking)
     {
         m_bIsSAXEventKeeperOnTheSAXChain = false;
@@ -644,14 +644,14 @@ void SAL_CALL XSecTester::collectionStatusChanged( sal_Bool isInsideCollectedEle
     }
     changeOutput();
 }
-
+    
 void SAL_CALL XSecTester::bufferStatusChanged( sal_Bool isBufferEmpty )
     throw (cssu::RuntimeException)
 {
     if (isBufferEmpty)
     {
         m_xXMLDocumentWrapper = NULL;
-
+        
         m_xSAXEventKeeper = NULL;
         m_bIsSAXEventKeeperOnTheSAXChain = false;
         changeOutput();
@@ -663,12 +663,12 @@ rtl::OUString SAL_CALL XSecTester::export_xml( const rtl::OUString& inputFileNam
     throw (cssu::RuntimeException)
 {
     rtl::OUString ouMessage;
-
+    
     m_nTotalSignatureNumber = 0;
     m_nSuccessfulSignatureNumber = 0;
-
+    
     ouMessage += parseFile(inputFileName, outputFileName, sal_True, isJavaBased);
-
+    
     rtl::OUString ouRemark = rtl::OUString::valueOf(m_nSuccessfulSignatureNumber) +
         rtl::OUString(RTL_ASCII_USTRINGPARAM( "/" ))
         + rtl::OUString::valueOf(m_nTotalSignatureNumber);
@@ -676,7 +676,7 @@ rtl::OUString SAL_CALL XSecTester::export_xml( const rtl::OUString& inputFileNam
 
     return ouMessage;
 }
-
+    
 rtl::OUString SAL_CALL XSecTester::import_xml( const rtl::OUString& inputFileName, const rtl::OUString& outputFileName, sal_Bool isJavaBased)
     throw (cssu::RuntimeException)
 {
@@ -695,31 +695,31 @@ rtl::OUString SAL_CALL XSecTester::import_xml( const rtl::OUString& inputFileNam
     return ouMessage;
 }
 
-rtl::OUString SAL_CALL XSecTester::transfer_without_sec(
-    const rtl::OUString& inputFileName,
+rtl::OUString SAL_CALL XSecTester::transfer_without_sec( 
+    const rtl::OUString& inputFileName, 
     const rtl::OUString& outputFileName,
     sal_Bool isBridgeInvolved)
     throw (cssu::RuntimeException)
 {
     rtl::OUString ouMessage;
-
+    
     cssu::Reference< cssi::XInputStream > xInputStream = OpenInputStream(inputFileName);
-
-    if (xInputStream != NULL )
+    
+    if (xInputStream != NULL ) 
     {
         /* create SAX Parser */
-        const rtl::OUString sSaxParser (
+        const rtl::OUString sSaxParser ( 
             RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Parser") );
         m_xSaxParser = cssu::Reference < cssxs::XParser > ( mxMSF->createInstance( sSaxParser ), cssu::UNO_QUERY );
 
         /* create SAX Writer */
-        const rtl::OUString sSaxWriter (
+        const rtl::OUString sSaxWriter ( 
             RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Writer") );
         cssu::Reference < cssi::XActiveDataSource > xSaxWriter
             ( mxMSF->createInstance( sSaxWriter ), cssu::UNO_QUERY );
-        cssu::Reference < cssxs::XDocumentHandler > xSaxWriterHandler(
+        cssu::Reference < cssxs::XDocumentHandler > xSaxWriterHandler( 
             xSaxWriter, cssu::UNO_QUERY);
-
+            
         if (!isBridgeInvolved)
         {
             /* connect the SAX Parser and the SAX Writer */
@@ -728,7 +728,7 @@ rtl::OUString SAL_CALL XSecTester::transfer_without_sec(
         else
         {
             /* create Java Flat Filter */
-            const rtl::OUString sJavaFlatFilter(
+            const rtl::OUString sJavaFlatFilter( 
                 RTL_CONSTASCII_USTRINGPARAM( JAVAFLATFILTER_COMPONENT ) );
             cssu::Reference < cssxs::XParser > xJavaFilterParser
                 ( mxMSF->createInstance( sJavaFlatFilter ), cssu::UNO_QUERY );
@@ -742,7 +742,7 @@ rtl::OUString SAL_CALL XSecTester::transfer_without_sec(
             xJavaFilterParser->setDocumentHandler( xSaxWriterHandler );
             m_xSaxParser->setDocumentHandler ( xJavaFilterHandler );
         }
-
+        
 
         /* set output stream */
         cssu::Reference< cssi::XOutputStream > xOutputStream =
@@ -753,17 +753,17 @@ rtl::OUString SAL_CALL XSecTester::transfer_without_sec(
         cssxs::InputSource aInput;
         aInput.sSystemId = inputFileName;
         aInput.aInputStream = xInputStream;
-
+        
         TimeValue startTime, endTime;
         osl_getSystemTime( &startTime );
 
         m_xSaxParser->parseStream ( aInput );
-
+        
         // xOutputStream->closeOutput();
         xInputStream->closeInput();
-
+        
         osl_getSystemTime( &endTime );
-
+        
         double diff = ((double)((endTime.Nanosec + endTime.Seconds*1000000000.0)
                  - (startTime.Nanosec + startTime.Seconds*1000000000.0)))/((double)1000000000.0);
         char buf[32];
@@ -782,7 +782,7 @@ void SAL_CALL XSecTester::setCryptoDir(const rtl::OUString & javaDirName, const
 }
 
 
-cssu::Reference< cssu::XInterface > SAL_CALL XSecTester_createInstance(
+cssu::Reference< cssu::XInterface > SAL_CALL XSecTester_createInstance( 
     const cssu::Reference< cssl::XMultiServiceFactory > & rSMgr)
     throw( cssu::Exception )
 {
@@ -804,7 +804,7 @@ SecurityEntity::SecurityEntity(
 {
     m_nSecurityId = getNextSecurityId();
 }
-
+    
 int SecurityEntity::getNextSecurityId() const
 {
     int nId = m_nNextSecurityId++;
@@ -836,16 +836,16 @@ int SecurityEntity::getSecurityId() const
 bool SecurityEntity::setKey(const rtl::OUString& ouUri, bool bIsExporting)
 {
     bool rc = false;
-
+    
      if (m_ouKeyURI != rtl::OUString(RTL_ASCII_USTRINGPARAM("")) &&
          m_ouKeyURI == ouUri)
     {
         int nKeeperId = m_xSAXEventKeeper->addSecurityElementCollector(
             bIsExporting ?
             (cssxc::sax::ElementMarkPriority_BEFOREMODIFY):
-            (cssxc::sax::ElementMarkPriority_AFTERMODIFY),
+            (cssxc::sax::ElementMarkPriority_AFTERMODIFY), 
             true);
-
+            
         setKeyId(nKeeperId);
         m_xSAXEventKeeper->setSecurityId(nKeeperId, m_nSecurityId);
 
@@ -853,24 +853,24 @@ bool SecurityEntity::setKey(const rtl::OUString& ouUri, bool bIsExporting)
             (m_xSAXEventKeeper, cssu::UNO_QUERY);
         xReferenceResolvedBroadcaster->addReferenceResolvedListener(nKeeperId,
             m_xReferenceListener);
-
+            
         rc = true;
     }
-
+    
     return rc;
 }
 
 bool SecurityEntity::endMission()
 {
-    cssu::Reference<cssxc::sax::XMissionTaker> xMissionTaker
+    cssu::Reference<cssxc::sax::XMissionTaker> xMissionTaker 
         (m_xReferenceListener, cssu::UNO_QUERY);
-
+        
     return xMissionTaker->endMission();
 }
 
 SignatureEntity::SignatureEntity(
     const cssu::Reference<cssxc::sax::XSecuritySAXEventKeeper>& xSAXEventKeeper,
-    bool bIsExporting,
+    bool bIsExporting, 
     XSecTester* pListener,
     const cssu::Reference<cssxc::XXMLSecurityContext>& xXMLSecurityContext,
     const cssu::Reference<cssxc::XXMLSignature>& xXMLSignature,
@@ -880,9 +880,9 @@ SignatureEntity::SignatureEntity(
             xXMLSignature,
             rsMSF)
 {
-    if (bIsExporting)
+    if (bIsExporting) 
     {
-        m_nSignatureElementCollectorId =
+        m_nSignatureElementCollectorId = 
             m_xSAXEventKeeper->addSecurityElementCollector(
                 cssxc::sax::ElementMarkPriority_AFTERMODIFY,
                 true);
@@ -894,59 +894,59 @@ SignatureEntity::SignatureEntity(
             cssu::UNO_QUERY);
 
         cssu::Reference<cssl::XInitialization> xInitialization(m_xReferenceListener, cssu::UNO_QUERY);
-
+        
         cssu::Sequence<cssu::Any> args(5);
         char buf[16];
-
+        
         sprintf(buf, "%d", m_nSecurityId);
         args[0] = cssu::makeAny(rtl::OUString(RTL_ASCII_USTRINGPARAM(buf)));
         args[1] = cssu::makeAny(m_xSAXEventKeeper);
-
+        
         sprintf(buf, "%d", m_nSignatureElementCollectorId);
         args[2] = cssu::makeAny(rtl::OUString(RTL_ASCII_USTRINGPARAM(buf)));
         args[3] = cssu::makeAny(m_xXMLSecurityContext->getSecurityEnvironment());
         args[4] = cssu::makeAny(m_xXMLSignature);
-
+        
         xInitialization->initialize(args);
-
+        
         int nBlockerId = m_xSAXEventKeeper->addBlocker();
         m_xSAXEventKeeper->setSecurityId(nBlockerId, m_nSecurityId);
-
+    
         cssu::Reference<cssxc::sax::XBlockerMonitor> xBlockerMonitor(m_xReferenceListener, cssu::UNO_QUERY);
         xBlockerMonitor->setBlockerId(nBlockerId);
-
+        
         cssu::Reference< cssxc::sax::XSignatureCreationResultBroadcaster > xSignatureCreationResultBroadcaster
             (m_xReferenceListener, cssu::UNO_QUERY);
         xSignatureCreationResultBroadcaster->addSignatureCreationResultListener(pListener);
     }
-    else
+    else 
     {
-        m_nSignatureElementCollectorId =
+        m_nSignatureElementCollectorId = 
             m_xSAXEventKeeper->addSecurityElementCollector(
                 cssxc::sax::ElementMarkPriority_BEFOREMODIFY,
                 false);
-
+            
         m_xSAXEventKeeper->setSecurityId(m_nSignatureElementCollectorId, m_nSecurityId);
 
         m_xReferenceListener = cssu::Reference< cssxc::sax::XReferenceResolvedListener >(
             mxMSF->createInstance( rtl::OUString::createFromAscii( SIGNATUREVERIFIER_COMPONENT )),
-            cssu::UNO_QUERY);
-
+            cssu::UNO_QUERY);	
+        
         cssu::Reference<cssl::XInitialization> xInitialization(m_xReferenceListener, cssu::UNO_QUERY);
-
+        
         cssu::Sequence<cssu::Any> args(5);
         char buf[16];
-
+        
         sprintf(buf, "%d", m_nSecurityId);
         args[0] = cssu::makeAny(rtl::OUString(RTL_ASCII_USTRINGPARAM(buf)));
         args[1] = cssu::makeAny(m_xSAXEventKeeper);
-
+        
         sprintf(buf, "%d", m_nSignatureElementCollectorId);
         args[2] = cssu::makeAny(rtl::OUString(RTL_ASCII_USTRINGPARAM(buf)));
         args[3] = cssu::makeAny(m_xXMLSecurityContext);
         args[4] = cssu::makeAny(m_xXMLSignature);
         xInitialization->initialize(args);
-
+        
         cssu::Reference< cssxc::sax::XSignatureVerifyResultBroadcaster > xSignatureVerifyResultBroadcaster
             (m_xReferenceListener, cssu::UNO_QUERY);
         xSignatureVerifyResultBroadcaster->addSignatureVerifyResultListener(pListener);
@@ -962,56 +962,56 @@ void SignatureEntity::addReferenceURI(const rtl::OUString& ouUri)
 {
     m_vReferenceIds.push_back(ouUri);
 }
-
+    
 void SignatureEntity::setReferenceNumber() const
 {
     cssu::Reference<cssxc::sax::XReferenceCollector> xReferenceCollector
         (m_xReferenceListener, cssu::UNO_QUERY);
     xReferenceCollector->setReferenceCount(m_vReferenceIds.size());
 }
-
+    
 bool SignatureEntity::hasReference(const rtl::OUString& ouUri) const
 {
     bool rc = false;
-
+    
     std::vector<const rtl::OUString>::const_iterator ii;
-    for (ii = m_vReferenceIds.begin(); ii != m_vReferenceIds.end(); ++ii)
+    for (ii = m_vReferenceIds.begin(); ii != m_vReferenceIds.end(); ++ii) 
     {
-        if (ouUri == *ii)
+        if (ouUri == *ii) 
         {
             rc = true;
             break;
         }
     }
-
+        
     return rc;
 }
-
+    
 bool SignatureEntity::setReference(const rtl::OUString& ouUri, bool bIsExporting) const
 {
     bool rc = false;
-
-    if (hasReference(ouUri))
+    
+    if (hasReference(ouUri)) 
     {
         int nKeeperId = m_xSAXEventKeeper->addSecurityElementCollector(
                 bIsExporting ?
                 (cssxc::sax::ElementMarkPriority_AFTERMODIFY):
                 (cssxc::sax::ElementMarkPriority_BEFOREMODIFY),
                 false);
-
+                
         m_xSAXEventKeeper->setSecurityId(nKeeperId, m_nSecurityId);
 
-        cssu::Reference<cssxc::sax::XReferenceResolvedBroadcaster> xReferenceResolvedBroadcaster
+        cssu::Reference<cssxc::sax::XReferenceResolvedBroadcaster> xReferenceResolvedBroadcaster  
             (m_xSAXEventKeeper, cssu::UNO_QUERY);
         xReferenceResolvedBroadcaster->addReferenceResolvedListener(nKeeperId, m_xReferenceListener);
-
+        
         cssu::Reference<cssxc::sax::XReferenceCollector> xReferenceCollector
             (m_xReferenceListener, cssu::UNO_QUERY);
         xReferenceCollector->setReferenceId(nKeeperId);
-
+                
         rc = true;
     }
-
+    
     return rc;
 }
 
@@ -1049,45 +1049,45 @@ void SAL_CALL XSecTester::startElement(const rtl::OUString & name, const cssu::R
 {
     rtl::OUString ouIdAttr = xAttribs->getValueByName(
         rtl::OUString(RTL_ASCII_USTRINGPARAM("id")));
-
-    if (ouIdAttr == NULL)
+        
+    if (ouIdAttr == NULL) 
     {
         ouIdAttr = xAttribs->getValueByName(
             rtl::OUString(RTL_ASCII_USTRINGPARAM("Id")));
     }
-
+            
     bool bHasIdAttr = (ouIdAttr != NULL && ouIdAttr.getLength() > 0 );
     bool needResend = false;
-
-    if (bHasIdAttr || name.equalsAscii( SIGNATURE_STR ))
+            
+    if (bHasIdAttr || name.equalsAscii( SIGNATURE_STR )) 
     {
-        if (foundSecurityRelated() && ! m_bIsExporting)
+        if (foundSecurityRelated() && ! m_bIsExporting) 
         {
             needResend = true;
         }
     }
-
+    
     if ( !m_bIsSAXEventKeeperOnTheSAXChain )
     {
         addStartAncestorEvent(name, xAttribs);
     }
-
+    
     bool bSuppressingForwarding = checkSecurityElement(name, xAttribs);
-
+            
     checkReference(name, xAttribs, ouIdAttr);
-
-    if (needResend)
+            
+    if (needResend) 
     {
         m_xSAXEventKeeper->setNextHandler(NULL);
-
-        cssu::Reference<cssxs::XDocumentHandler> xSAXEventKeeperHandler
+                
+        cssu::Reference<cssxs::XDocumentHandler> xSAXEventKeeperHandler 
             (m_xSAXEventKeeper, cssu::UNO_QUERY);
-
+            
         xSAXEventKeeperHandler->startElement(name, xAttribs);
         m_xSAXEventKeeper->setNextHandler(this);
     }
-
-    if (!bSuppressingForwarding)
+    
+    if (!bSuppressingForwarding) 
     {
         m_xExportHandler->startElement(name, xAttribs);
     }
@@ -1096,21 +1096,21 @@ void SAL_CALL XSecTester::startElement(const rtl::OUString & name, const cssu::R
 void SAL_CALL XSecTester::endElement(const rtl::OUString& name)
     throw (cssu::RuntimeException)
 {
-    if (!m_stCurrentPath.empty())
+    if (!m_stCurrentPath.empty()) 
     {
         void* pSignedInfo = m_stCurrentPath.top();
         bool bIsStringType = m_stCurrentPathType.top();
-
+        
         m_stCurrentPath.pop();
         m_stCurrentPathType.pop();
-
+            
         if (bIsStringType && !strcmp((const char *)pSignedInfo, SIGNEDINFO_STR))
         {
-            if (!m_stCurrentPath.empty())
+            if (!m_stCurrentPath.empty()) 
             {
                 void* pSignature = m_stCurrentPath.top();
                 bIsStringType = m_stCurrentPathType.top();
-
+                
                 if (!bIsStringType && pSignature != NULL)
                 {
                     ((SignatureEntity *) pSignature)->setReferenceNumber();
@@ -1118,12 +1118,12 @@ void SAL_CALL XSecTester::endElement(const rtl::OUString& name)
             }
         }
     }
-
+    
     if ( !m_bIsSAXEventKeeperOnTheSAXChain )
     {
         addEndAncestorEvent(name);
     }
-
+        
     m_xExportHandler->endElement(name);
 }
 
@@ -1134,39 +1134,39 @@ void SAL_CALL XSecTester::setDocumentLocator( const cssu::Reference<cssxs::XLoca
 
 void XSecTester::changeOutput()
 {
-    if (m_bIsExporting)
+    if (m_bIsExporting) 
     {
-        if (m_bIsSAXEventKeeperOnTheSAXChain)
+        if (m_bIsSAXEventKeeperOnTheSAXChain) 
         {
             m_xExportHandler = cssu::Reference<cssxs::XDocumentHandler>
                 (m_xSAXEventKeeper, cssu::UNO_QUERY);
-
+                
             m_xSAXEventKeeper->setNextHandler(NULL);
-
+            
             flushAncestorEvents(m_xExportHandler);
 
             m_xSAXEventKeeper->setNextHandler(m_xOutputHandler);
         }
-        else
+        else 
         {
             m_xExportHandler = m_xOutputHandler;
         }
     }
-     else
+     else 
      {
-        if (m_bIsSAXEventKeeperOnTheSAXChain)
+        if (m_bIsSAXEventKeeperOnTheSAXChain) 
         {
             cssu::Reference<cssxs::XDocumentHandler> xSAXEventKeeperHandler
                 (m_xSAXEventKeeper, cssu::UNO_QUERY);
-
+                
             m_xSAXEventKeeper->setNextHandler(NULL);
-
+            
             flushAncestorEvents(xSAXEventKeeperHandler);
 
             m_xSaxParser->setDocumentHandler(xSAXEventKeeperHandler);
             m_xSAXEventKeeper->setNextHandler(this);
         }
-        else
+        else 
         {
             m_xSaxParser->setDocumentHandler(this);
         }
@@ -1176,7 +1176,7 @@ void XSecTester::changeOutput()
 
 bool XSecTester::foundSecurityRelated()
 {
-    if (m_xSAXEventKeeper == NULL)
+    if (m_xSAXEventKeeper == NULL) 
     {
         m_bIsBlocking = false;
         m_bIsInsideCollectedElement = false;
@@ -1194,19 +1194,19 @@ bool XSecTester::foundSecurityRelated()
         cssu::Sequence <cssu::Any> arg(1);
         arg[0] = cssu::makeAny(m_xXMLDocumentWrapper);
         xInitialization->initialize(arg);
-
+        
         cssu::Reference<cssxc::sax::XSAXEventKeeperStatusChangeBroadcaster>
-            xSAXEventKeeperStatusChangeBroadcaster(m_xSAXEventKeeper, cssu::UNO_QUERY);
+            xSAXEventKeeperStatusChangeBroadcaster(m_xSAXEventKeeper, cssu::UNO_QUERY); 
         xSAXEventKeeperStatusChangeBroadcaster->addSAXEventKeeperStatusChangeListener(this);
     }
-
+        
     bool rc = false;
-
-    if (!m_bIsSAXEventKeeperOnTheSAXChain)
+    
+    if (!m_bIsSAXEventKeeperOnTheSAXChain) 
     {
         rc = true;
     }
-
+        
     m_bIsSAXEventKeeperOnTheSAXChain=true;
     changeOutput();
 
@@ -1222,15 +1222,15 @@ void XSecTester::findKeyOrReference(SecurityEntity* pSecurityEntity, const rtl::
     for (ii_referenceURIs = m_vUnsolvedReferenceURIs.begin(),
          ii_referenceKeeperIds = m_vUnsolvedReferenceKeeperIds.begin(),
          ii_referenceRefNums = m_vUnsolvedReferenceRefNums.begin();
-          ii_referenceURIs != m_vUnsolvedReferenceURIs.end(); )
+          ii_referenceURIs != m_vUnsolvedReferenceURIs.end(); ) 
     {
         rtl::OUString ouReferenceUri = *ii_referenceURIs;
-
-        if (ouReferenceUri == ouUri)
+            
+        if (ouReferenceUri == ouUri) 
         {
             int nKeeperId = *ii_referenceKeeperIds;
             int nRefNum = *ii_referenceRefNums;
-
+            
             if ( bIsFindingKey )
             {
                  int nClonedKeeperId = m_xSAXEventKeeper->cloneElementCollector(
@@ -1238,11 +1238,11 @@ void XSecTester::findKeyOrReference(SecurityEntity* pSecurityEntity, const rtl::
                      m_bIsExporting?
                      (cssxc::sax::ElementMarkPriority_BEFOREMODIFY):
                     (cssxc::sax::ElementMarkPriority_AFTERMODIFY));
-
+    
                  pSecurityEntity->setKeyId(nClonedKeeperId);
-
+    
                  m_xSAXEventKeeper->setSecurityId(nClonedKeeperId, pSecurityEntity->getSecurityId());
-
+    
                  cssu::Reference<cssxc::sax::XReferenceResolvedBroadcaster>
                     xReferenceResolvedBroadcaster(m_xSAXEventKeeper, cssu::UNO_QUERY);
                 xReferenceResolvedBroadcaster->addReferenceResolvedListener(
@@ -1252,35 +1252,35 @@ void XSecTester::findKeyOrReference(SecurityEntity* pSecurityEntity, const rtl::
             else
             {
                 int nClonedKeeperId = m_xSAXEventKeeper->cloneElementCollector(
-                    nKeeperId,
+                    nKeeperId, 
                     m_bIsExporting?
                     (cssxc::sax::ElementMarkPriority_AFTERMODIFY):
                     (cssxc::sax::ElementMarkPriority_BEFOREMODIFY));
-
+                    
                 m_xSAXEventKeeper->setSecurityId(nClonedKeeperId, pSecurityEntity->getSecurityId());
-
+                
                 cssu::Reference<cssxc::sax::XReferenceResolvedBroadcaster>
-                    xReferenceResolvedBroadcaster
+                    xReferenceResolvedBroadcaster 
                     (m_xSAXEventKeeper, cssu::UNO_QUERY);
                 xReferenceResolvedBroadcaster->addReferenceResolvedListener(
                     nClonedKeeperId,
                     pSecurityEntity->getReferenceListener());
-
-                cssu::Reference<cssxc::sax::XReferenceCollector> xReferenceCollector
+                    
+                cssu::Reference<cssxc::sax::XReferenceCollector> xReferenceCollector 
                         (pSecurityEntity->getReferenceListener(), cssu::UNO_QUERY);
                 xReferenceCollector->setReferenceId(nClonedKeeperId);
             }
 
             nRefNum--;
-            if (nRefNum == 0)
+            if (nRefNum == 0) 
             {
                 m_xSAXEventKeeper->removeElementCollector(nKeeperId);
-
+                
                 ii_referenceURIs = m_vUnsolvedReferenceURIs.erase(ii_referenceURIs);
                 ii_referenceKeeperIds = m_vUnsolvedReferenceKeeperIds.erase(ii_referenceKeeperIds);
                 ii_referenceRefNums = m_vUnsolvedReferenceRefNums.erase(ii_referenceRefNums);
             }
-            else
+            else 
             {
                 (*ii_referenceRefNums) = nRefNum;
 
@@ -1288,13 +1288,13 @@ void XSecTester::findKeyOrReference(SecurityEntity* pSecurityEntity, const rtl::
                 ii_referenceKeeperIds++;
                 ii_referenceRefNums++;
             }
-
+            
             if (bIsFindingKey)
             {
                 break;
             }
         }
-        else
+        else 
         {
             ii_referenceURIs++;
             ii_referenceKeeperIds++;
@@ -1308,7 +1308,7 @@ bool XSecTester::checkSecurityElement(
     const cssu::Reference<cssxs::XAttributeList>& xAttribs)
 {
     bool rc = false;
-
+        
     if (ouLocalName.equalsAscii(SIGNATURE_STR))
     {
         SignatureEntity* pSignatureEntity = new SignatureEntity(
@@ -1318,23 +1318,23 @@ bool XSecTester::checkSecurityElement(
             m_xXMLSecurityContext,
             m_xXMLSignature,
             mxMSF);
-
+        
         m_vSignatureList.push_back(pSignatureEntity);
-
+        
         m_stCurrentPath.push(pSignatureEntity);
         m_stCurrentPathType.push(false);
     }
     else if (ouLocalName.equalsAscii(REFERENCE_STR))
     {
-        if (!m_stCurrentPath.empty())
+        if (!m_stCurrentPath.empty()) 
         {
              void* pSignedInfo = m_stCurrentPath.top();
              bool bIsStringType = m_stCurrentPathType.top();
-
+             
             m_stCurrentPath.pop();
             m_stCurrentPathType.pop();
-
-            if (bIsStringType && !m_stCurrentPath.empty())
+             
+            if (bIsStringType && !m_stCurrentPath.empty()) 
             {
                 void* pSignature = m_stCurrentPath.top();
                 bool bIsStringType2 = m_stCurrentPathType.top();
@@ -1343,13 +1343,13 @@ bool XSecTester::checkSecurityElement(
                 {
                     rtl::OUString ouUri = xAttribs->getValueByName
                         (rtl::OUString(RTL_ASCII_USTRINGPARAM( URI_ATTR_STR )));
-
+                    
                     if (ouUri.matchAsciiL("#", 1, 0))
                     {
                         rtl::OUString uri = ouUri.copy(1);
                          SignatureEntity* pSignatureEntity = (SignatureEntity *)pSignature;
-
-                        if (uri != NULL && uri.getLength()>0)
+        
+                        if (uri != NULL && uri.getLength()>0) 
                         {
                             pSignatureEntity->addReferenceURI(uri);
                             findKeyOrReference(pSignatureEntity, uri, true);
@@ -1363,82 +1363,82 @@ bool XSecTester::checkSecurityElement(
         m_stCurrentPath.push( (void *)REFERENCE_STR);
         m_stCurrentPathType.push(true);
     }
-    else if(ouLocalName.equalsAscii(KEYVALUE_STR) ||
-        ouLocalName.equalsAscii(KEYNAME_STR) ||
-        ouLocalName.equalsAscii(X509DATA_STR) ||
-        ouLocalName.equalsAscii(ENCRYPTEDKEY_STR))
+    else if(ouLocalName.equalsAscii(KEYVALUE_STR) || 
+        ouLocalName.equalsAscii(KEYNAME_STR) || 
+        ouLocalName.equalsAscii(X509DATA_STR) || 
+        ouLocalName.equalsAscii(ENCRYPTEDKEY_STR)) 
     {
-        if (!m_stCurrentPath.empty())
+        if (!m_stCurrentPath.empty()) 
         {
             void* pKeyInfo = m_stCurrentPath.top();
             bool bIsStringType = m_stCurrentPathType.top();
-
+            
             m_stCurrentPath.pop();
             m_stCurrentPathType.pop();
-
-             if (bIsStringType && !m_stCurrentPath.empty())
+            
+             if (bIsStringType && !m_stCurrentPath.empty()) 
              {
                 bool bIsStringType2 = m_stCurrentPathType.top();
-
+                
                 if (!bIsStringType2)
                 {
-                    SecurityEntity *pSecurityEntity =
+                    SecurityEntity *pSecurityEntity = 
                         (SecurityEntity *) (m_stCurrentPath.top());
                     pSecurityEntity->setKeyId(0);
                 }
              }
-
+             
             m_stCurrentPath.push(pKeyInfo);
             m_stCurrentPathType.push(bIsStringType);
         }
-
+        
         m_stCurrentPath.push((void *)KEYVALUE_STR);
         m_stCurrentPathType.push(true);
     }
-    else if(ouLocalName.equalsAscii(RETRIEVALMETHOD_STR))
+    else if(ouLocalName.equalsAscii(RETRIEVALMETHOD_STR)) 
     {
-        if (!m_stCurrentPath.empty())
+        if (!m_stCurrentPath.empty()) 
         {
             void* pKeyInfo = m_stCurrentPath.top();
             bool bIsStringType = m_stCurrentPathType.top();
-
+            
             m_stCurrentPath.pop();
             m_stCurrentPathType.pop();
-
-            if (bIsStringType && !m_stCurrentPath.empty())
+            
+            if (bIsStringType && !m_stCurrentPath.empty()) 
             {
                 bool bIsStringType2 = m_stCurrentPathType.top();
-
+                
                 if (!bIsStringType2)
                 {
-                    SecurityEntity *pSecurityEntity =
+                    SecurityEntity *pSecurityEntity = 
                         (SecurityEntity *) m_stCurrentPath.top();
                     rtl::OUString ouUri = xAttribs->getValueByName(
                         rtl::OUString(RTL_ASCII_USTRINGPARAM( URI_ATTR_STR )));
-
-                    if (!strcmp((const char *)pKeyInfo, KEYINFO_STR) &&
-                        ouUri != NULL && ouUri.getLength()>0)
+                    
+                    if (!strcmp((const char *)pKeyInfo, KEYINFO_STR) && 
+                        ouUri != NULL && ouUri.getLength()>0) 
                     {
                         pSecurityEntity->setKeyURI(ouUri);
                         findKeyOrReference(pSecurityEntity, ouUri, true);
                     }
                 }
-
+                
             }
-
+            
             m_stCurrentPath.push(pKeyInfo);
             m_stCurrentPathType.push(bIsStringType);
         }
-
+        
         m_stCurrentPath.push((void *)RETRIEVALMETHOD_STR);
         m_stCurrentPathType.push(true);
     }
-    else if(ouLocalName.equalsAscii(KEYINFO_STR))
+    else if(ouLocalName.equalsAscii(KEYINFO_STR)) 
     {
         m_stCurrentPath.push((void *)KEYINFO_STR);
         m_stCurrentPathType.push(true);
     }
-    else if(ouLocalName.equalsAscii(SIGNEDINFO_STR))
+    else if(ouLocalName.equalsAscii(SIGNEDINFO_STR)) 
     {
         m_stCurrentPath.push((void *)SIGNEDINFO_STR);
         m_stCurrentPathType.push(true);
@@ -1448,7 +1448,7 @@ bool XSecTester::checkSecurityElement(
         m_stCurrentPath.push((void *)OTHER_ELEMENT_STR);
         m_stCurrentPathType.push(true);
     }
-
+    
     return rc;
 }
 
@@ -1457,38 +1457,38 @@ void XSecTester::checkReference(
     const cssu::Reference<cssxs::XAttributeList>& xAttribs,
     const rtl::OUString& ouId)
 {
-    rtl::OUString refNumStr =
+    rtl::OUString refNumStr = 
         xAttribs->getValueByName(rtl::OUString(RTL_ASCII_USTRINGPARAM(REFNUM_ATTR_STR)));
-
-    if (ouId != NULL && ouId.getLength()>0 )
+        
+    if (ouId != NULL && ouId.getLength()>0 ) 
     {
         int nRefNum = 999;
-        if (refNumStr != NULL && refNumStr.getLength()>0 )
+        if (refNumStr != NULL && refNumStr.getLength()>0 ) 
         {
             nRefNum = refNumStr.toInt32();
         }
-
+        
         int nLength = m_vSignatureList.size();
-        for (int i = 0; i<nLength; ++i)
+        for (int i = 0; i<nLength; ++i) 
         {
             SignatureEntity* pSignatureEntity = m_vSignatureList.at(i);
-
-            if (pSignatureEntity->setReference(ouId, m_bIsExporting))
+                
+            if (pSignatureEntity->setReference(ouId, m_bIsExporting)) 
             {
                 nRefNum--;
             }
-
-            if (pSignatureEntity->setKey(ouId, m_bIsExporting))
+                
+            if (pSignatureEntity->setKey(ouId, m_bIsExporting)) 
             {
                 nRefNum--;
             }
         }
-
-        if (nRefNum>0)
+        
+        if (nRefNum>0) 
         {
             int nKeeperId;
-
-            if (ouLocalName.equalsAscii(ENCRYPTEDKEY_STR))
+            
+            if (ouLocalName.equalsAscii(ENCRYPTEDKEY_STR)) 
             {
                 nKeeperId = m_xSAXEventKeeper->addSecurityElementCollector(
                     m_bIsExporting ?
@@ -1496,7 +1496,7 @@ void XSecTester::checkReference(
                     (cssxc::sax::ElementMarkPriority_AFTERMODIFY),
                     true);
             }
-            else
+            else 
             {
                 nKeeperId = m_xSAXEventKeeper->addSecurityElementCollector(
                     m_bIsExporting?
@@ -1504,7 +1504,7 @@ void XSecTester::checkReference(
                     (cssxc::sax::ElementMarkPriority_BEFOREMODIFY),
                     false);
             }
-
+                    
             m_vUnsolvedReferenceURIs.push_back(ouId);
             m_vUnsolvedReferenceKeeperIds.push_back(nKeeperId);
             m_vUnsolvedReferenceRefNums.push_back(nRefNum);
@@ -1516,7 +1516,7 @@ void XSecTester::endMission()
 {
     while (m_vSignatureList.size() > 0)
     {
-        if (m_vSignatureList.size()>0)
+        if (m_vSignatureList.size()>0) 
         {
             SignatureEntity * pSignatureEntity = m_vSignatureList.at(0);
             m_vSignatureList.erase(m_vSignatureList.begin());
@@ -1524,8 +1524,8 @@ void XSecTester::endMission()
             delete pSignatureEntity;
         }
     }
-
-    while (m_vUnsolvedReferenceURIs.size()>0)
+        
+    while (m_vUnsolvedReferenceURIs.size()>0) 
     {
         int nKeeperId = m_vUnsolvedReferenceKeeperIds.at(0);
         m_xSAXEventKeeper->removeElementCollector(nKeeperId);
@@ -1541,31 +1541,31 @@ void XSecTester::addStartAncestorEvent(
 {
     sal_Int32 nLength = xAttribs->getLength();
     AncestorEvent* ancestorEvent = new AncestorEvent( nLength );
-
+    
     ancestorEvent->bIsStartElement = true;
     ancestorEvent->ouName = ouName;
-
-    for (int i = 0; i<nLength; ++i)
+    
+    for (int i = 0; i<nLength; ++i) 
     {
         (ancestorEvent->aAttributeList[i]).sName = xAttribs->getNameByIndex((short)i);
         (ancestorEvent->aAttributeList[i]).sValue =xAttribs->getValueByIndex((short)i);
     }
-
+    
     m_vAncestorEvents.push_back(ancestorEvent);
 }
 
 void XSecTester::addEndAncestorEvent(const rtl::OUString& ouName)
 {
     AncestorEvent* ancestorEvent = new AncestorEvent(0);
-
+    
     ancestorEvent->bIsStartElement = false;
     ancestorEvent->ouName = ouName;
-
+    
     m_vAncestorEvents.push_back(ancestorEvent);
 }
 
 void XSecTester::sendAncestorStartElementEvent(
-    const rtl::OUString& ouName,
+    const rtl::OUString& ouName, 
     const cssu::Sequence< cssxcsax::XMLAttribute >& attrList,
     const cssu::Reference< cssxs::XDocumentHandler >& xDocumentHandler) const
 {
@@ -1574,12 +1574,12 @@ void XSecTester::sendAncestorStartElementEvent(
         = cssu::Reference< cssxs::XAttributeList > (pAttributeList);
 
     sal_Int32 nLength = attrList.getLength();
-
-    for (int i = 0; i<nLength; ++i)
+    
+    for (int i = 0; i<nLength; ++i) 
     {
         pAttributeList->AddAttribute( attrList[i].sName, attrList[i].sValue);
     }
-
+    
     xDocumentHandler->startElement(ouName, xAttrList);
 }
 
@@ -1590,12 +1590,12 @@ void XSecTester::sendAncestorEndElementEvent(
     xDocumentHandler->endElement(ouName);
 }
 
-std::vector< AncestorEvent* >::const_iterator XSecTester::checkAncestorStartElementEvent(
+std::vector< AncestorEvent* >::const_iterator XSecTester::checkAncestorStartElementEvent( 
     const std::vector< AncestorEvent* >::const_iterator& ii,
     const cssu::Reference< cssxs::XDocumentHandler >& xDocumentHandler) const
 {
     std::vector< AncestorEvent* >::const_iterator next = ii+1;
-
+    
     if (next == m_vAncestorEvents.end())
     {
         sendAncestorStartElementEvent(
@@ -1607,29 +1607,29 @@ std::vector< AncestorEvent* >::const_iterator XSecTester::checkAncestorStartElem
         {
             next = checkAncestorStartElementEvent(next, xDocumentHandler);
         }
-
+        
         if (next != m_vAncestorEvents.end())
         {
             next++;
         }
     }
-
+    
     return next;
 }
-
+    
 void XSecTester::flushAncestorEvents(
     const cssu::Reference< cssxs::XDocumentHandler >& xDocumentHandler)
 {
     std::vector< AncestorEvent* >::const_iterator ii;
-
+    
     if (xDocumentHandler != NULL)
     {
         ii = m_vAncestorEvents.begin();
-
+        
         while (ii != m_vAncestorEvents.end())
         {
             AncestorEvent* ancestorEvent = *ii;
-
+            
             if (ancestorEvent->bIsStartElement)
             {
                 ii = checkAncestorStartElementEvent(ii, xDocumentHandler);
@@ -1641,11 +1641,11 @@ void XSecTester::flushAncestorEvents(
             }
         }
     }
-
+    
     /* free the ancestor events list */
     std::vector< AncestorEvent* >::iterator jj;
-
-    while (m_vAncestorEvents.size()>0)
+    
+    while (m_vAncestorEvents.size()>0) 
     {
         jj = m_vAncestorEvents.begin();
         delete *jj;
@@ -1676,8 +1676,8 @@ void outputHeader()
 /*
  * print the output on the screen as well as in the GNUPlot data file
  */
-void output(const rtl::OUString& ouInputFileName,
-    const rtl::OUString& ouTime_C,
+void output(const rtl::OUString& ouInputFileName, 
+    const rtl::OUString& ouTime_C, 
     const rtl::OUString& ouTime_Java,
     const rtl::OUString& ouTime_NoSecurity,
     const rtl::OUString& ouTime_JavaForwardOnly,
@@ -1696,16 +1696,16 @@ void output(const rtl::OUString& ouInputFileName,
 
     fprintf(stderr, "%4s", bIsExporting?"E":"I");
     fprintf(stderr, "%7dK", nSize/1024);
-    fprintf(stderr, "%8s %3s",
+    fprintf(stderr, "%8s %3s", 
         rtl::OString(ouTime_C, ouTime_C.getLength(), RTL_TEXTENCODING_ASCII_US).getStr(),
         rtl::OString(ouRemark_C, ouRemark_C.getLength(), RTL_TEXTENCODING_ASCII_US).getStr());
-    fprintf(stderr, "%8s %3s",
+    fprintf(stderr, "%8s %3s", 
         rtl::OString(ouTime_Java, ouTime_Java.getLength(), RTL_TEXTENCODING_ASCII_US).getStr(),
         rtl::OString(ouRemark_Java, ouRemark_Java.getLength(), RTL_TEXTENCODING_ASCII_US).getStr());
     fprintf(stderr, "%12s", rtl::OString(ouTime_JavaForwardOnly, ouTime_JavaForwardOnly.getLength(), RTL_TEXTENCODING_ASCII_US).getStr());
     fprintf(stderr, "%12s", rtl::OString(ouTime_NoSecurity, ouTime_NoSecurity.getLength(), RTL_TEXTENCODING_ASCII_US).getStr());
     fprintf(stderr, "\n");
-
+    
     /* output the data as GNUPlot data file */
     /*
     char str[32];
@@ -1723,7 +1723,7 @@ void output(const rtl::OUString& ouInputFileName,
 
 int main( int argc, char **argv )
 {
-    if (argc < 3)
+    if (argc < 3) 
     {
         fprintf(stderr, "Usage: testtool <exportbatchfile> <importbatchfile> [<cppcryptotoken>] [<javacryptotoken>]\n");
         exit (-1);
@@ -1738,15 +1738,15 @@ int main( int argc, char **argv )
     if ( argc > 4 )
         aJavaCryptoToken = rtl::OUString::createFromAscii(argv[4]);
 
-    try
+    try 
     {
         uno::Reference< lang::XMultiServiceFactory > xMSF = CreateDemoServiceFactory();
 
         XSecTester* pTester = new XSecTester( xMSF );
         uno::Reference< xml::sax::XDocumentHandler > xKeepARef = pTester;
-
+        
         pTester->setCryptoDir( aJavaCryptoToken, aCPPCryptoToken );
-
+        
         rtl::OUString ouTime_C, ouTime_Java, ouTime_NoSecurity, ouTime_JavaForwardOnly;
         rtl::OUString ouInputFileName;
         rtl::OUString outputFileName1;
@@ -1761,17 +1761,17 @@ int main( int argc, char **argv )
 
         const int MAX_LINE = 80;
         char line[MAX_LINE + 1];
-
-        while (batch_export.getline(line, MAX_LINE))
+        
+        while (batch_export.getline(line, MAX_LINE)) 
         {
             ouInputFileName = rtl::OUString::createFromAscii(line);
             int nPosition = ouInputFileName.lastIndexOf('.');
             int nPosition1;
-
+            
             /*
              * export the file with signautre/encryption (C++)
              */
-            outputFileName1 = ouInputFileName.copy(0, nPosition) +
+            outputFileName1 = ouInputFileName.copy(0, nPosition) + 
                 rtl::OUString::createFromAscii("-ex.xml");
             ouTime_C = pTester->export_xml(ouInputFileName, outputFileName1, sal_False);
             nPosition1 = ouTime_C.lastIndexOf('\t');
@@ -1781,27 +1781,27 @@ int main( int argc, char **argv )
             /*
              * export the file with signautre/encryption (Java)
              */
-            outputFileName1 = ouInputFileName.copy(0, nPosition) +
+            outputFileName1 = ouInputFileName.copy(0, nPosition) + 
                 rtl::OUString::createFromAscii("-ex2.xml");
             ouTime_Java = pTester->export_xml(ouInputFileName, outputFileName1, sal_True);
             nPosition1 = ouTime_Java.lastIndexOf('\t');
             ouRemark_Java = ouTime_Java.copy(nPosition1 + 1);
             ouTime_Java = ouTime_Java.copy(0, nPosition1);
-
+            
             /*
              * export the file without signautre/encryption
              */
-            outputFileName2 = ouInputFileName.copy(0, nPosition) +
+            outputFileName2 = ouInputFileName.copy(0, nPosition) + 
                 rtl::OUString::createFromAscii("-ex-no.xml");
             ouTime_NoSecurity = pTester->transfer_without_sec(ouInputFileName, outputFileName2, sal_False);
 
             /*
              * export the file with Java Flat Filter
              */
-            outputFileName2 = ouInputFileName.copy(0, nPosition) +
+            outputFileName2 = ouInputFileName.copy(0, nPosition) + 
                 rtl::OUString::createFromAscii("-ex-jf.xml");
             ouTime_JavaForwardOnly = pTester->transfer_without_sec(ouInputFileName, outputFileName2, sal_True);
-
+            
             /*
              * print output
              */
@@ -1812,16 +1812,16 @@ int main( int argc, char **argv )
 
         batch_import.open(OUStringToOString( aImportBatchFile, RTL_TEXTENCODING_ASCII_US ).getStr());
 
-        while (batch_import.getline(line, MAX_LINE))
+        while (batch_import.getline(line, MAX_LINE)) 
         {
             ouInputFileName = rtl::OUString::createFromAscii(line);
             int nPosition = ouInputFileName.lastIndexOf('.');
             int nPosition1;
-
+            
             /*
              * import the file with signautre/encryption (C++)
              */
-            outputFileName1 = ouInputFileName.copy(0, nPosition) +
+            outputFileName1 = ouInputFileName.copy(0, nPosition) + 
                 rtl::OUString::createFromAscii("-im.xml");
             ouTime_C = pTester->import_xml(ouInputFileName, outputFileName1, sal_False);
             nPosition1 = ouTime_C.lastIndexOf('\t');
@@ -1831,7 +1831,7 @@ int main( int argc, char **argv )
             /*
              * import the file with signautre/encryption (Java)
              */
-            outputFileName1 = ouInputFileName.copy(0, nPosition) +
+            outputFileName1 = ouInputFileName.copy(0, nPosition) + 
                 rtl::OUString::createFromAscii("-im2.xml");
             ouTime_Java = pTester->import_xml(ouInputFileName, outputFileName1, sal_True);
             nPosition1 = ouTime_Java.lastIndexOf('\t');
@@ -1841,7 +1841,7 @@ int main( int argc, char **argv )
             /*
              * import the file without signautre/encryption
              */
-            outputFileName2 = ouInputFileName.copy(0, nPosition) +
+            outputFileName2 = ouInputFileName.copy(0, nPosition) + 
                 rtl::OUString::createFromAscii("-im-no.xml");
             ouTime_NoSecurity = pTester->transfer_without_sec(ouInputFileName, outputFileName2, sal_False);
 
@@ -1849,10 +1849,10 @@ int main( int argc, char **argv )
              * import the file without signautre/encryption
              */
 
-            outputFileName2 = ouInputFileName.copy(0, nPosition) +
+            outputFileName2 = ouInputFileName.copy(0, nPosition) + 
                 rtl::OUString::createFromAscii("-im-jf.xml");
             ouTime_JavaForwardOnly = pTester->transfer_without_sec(ouInputFileName, outputFileName2, sal_True);
-
+            
             /*
              * print output
              */
@@ -1863,9 +1863,9 @@ int main( int argc, char **argv )
 
         fprintf(stderr, "\n");
     }
-    catch( cssu::Exception& e )
+    catch( cssu::Exception& e ) 
     {
-        fprintf( stderr , "\nEXCEPTION! Error Message: %s\n" ,
+        fprintf( stderr , "\nEXCEPTION! Error Message: %s\n" , 
                  rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).getStr() ) ;
     }
 
diff --git a/xmlsecurity/tools/demo/signdemo.cxx b/xmlsecurity/tools/demo/signdemo.cxx
index a3c59345cfba..723a8df0bfe1 100644
--- a/xmlsecurity/tools/demo/signdemo.cxx
+++ b/xmlsecurity/tools/demo/signdemo.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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;
 
 int SAL_CALL main( int argc, char **argv )
 {
-    if( argc < 4 )
+    if( argc < 4 ) 
     {
         fprintf( stderr, "Usage: %s <signature file> <xml stream file> <binary stream file> [<cryptoken>]\n" , argv[0] ) ;
         return -1 ;
@@ -56,14 +56,14 @@ int SAL_CALL main( int argc, char **argv )
     rtl::OUString aCryptoToken;
     if ( argc >= 5 )
         aCryptoToken = rtl::OUString::createFromAscii(argv[4]);
-
+    
     uno::Reference< lang::XMultiServiceFactory > xMSF = CreateDemoServiceFactory();
-
+    
     /*
      * creates a signature helper
      */
     XMLSignatureHelper aSignatureHelper( xMSF );
-
+    
     /*
      * creates a security context.
      */
@@ -73,30 +73,30 @@ int SAL_CALL main( int argc, char **argv )
         fprintf( stderr, "Error initializing security context!\n" );
         return -1;
     }
-
+    
     aSignatureHelper.StartMission();
-
+    
     /*
      * select a private key certificate
      */
     sal_Int32 i;
     sal_Int32 nEnvCount = aSignatureHelper.GetSecurityEnvironmentNumber();
-    if( nEnvCount == 0 )
+    if( nEnvCount == 0 ) 
     {
         fprintf( stdout, "\nNo SecurityEnvironment found!\n" ) ;
         return -1;
     }
-
+    
     uno::Sequence< uno::Reference< xml::crypto::XSecurityEnvironment > > xSecurityEnvironments(nEnvCount) ;
     for( i=0; i < nEnvCount; i++ )
         xSecurityEnvironments[i] = aSignatureHelper.GetSecurityEnvironmentByIndex(i);
 
     fprintf( stdout, "\nSelect a SecurityEnvironment:\n" ) ;
-    for( i = 0; i < nEnvCount; i ++ )
+    for( i = 0; i < nEnvCount; i ++ ) 
         fprintf( stdout, "\n[%d] %s", i+1, rtl::OUStringToOString( xSecurityEnvironments[i]->getSecurityEnvironmentInformation() ,RTL_TEXTENCODING_ASCII_US ).getStr());
 
     sal_Int32 nEnvIndex = QuerySelectNumber( 1, nEnvCount ) -1;
-
+    
     uno::Reference< ::com::sun::star::security::XCertificate > xPersonalCert = getCertificateFromEnvironment(xSecurityEnvironments[nEnvIndex], true);
 
     if ( !xPersonalCert.is() )
@@ -109,7 +109,7 @@ int SAL_CALL main( int argc, char **argv )
      * creates a new signature id
      */
     sal_Int32 nSecurityId = aSignatureHelper.GetNewSecurityId();
-
+    
     /*
      * configures the X509 certificate
      */
@@ -123,23 +123,23 @@ int SAL_CALL main( int argc, char **argv )
      * configures date/time
      */
     aSignatureHelper.SetDateTime( nSecurityId, Date(), Time());
-
+    
     /*
      * signs the xml stream
      */
     aSignatureHelper.AddForSigning( nSecurityId, aXMLFileName, aXMLFileName, sal_False );
-
+    
     /*
      * signs the binary stream
      */
     aSignatureHelper.AddForSigning( nSecurityId, aBINFileName, aBINFileName, sal_True );
-
+    
     /*
      * creates signature
      */
     uno::Reference< io::XOutputStream > xOutputStream = OpenOutputStream( aSIGFileName );
     bool bDone = aSignatureHelper.CreateAndWriteSignature( xOutputStream );
-
+    
     if ( !bDone )
     {
         fprintf( stderr, "\nSTATUS: Error creating Signature!\n" );
diff --git a/xmlsecurity/tools/demo/util.cxx b/xmlsecurity/tools/demo/util.cxx
index b81724f15c4e..f495db978512 100644
--- a/xmlsecurity/tools/demo/util.cxx
+++ b/xmlsecurity/tools/demo/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
@@ -50,13 +50,13 @@ cssu::Reference< cssl::XMultiServiceFactory > CreateDemoServiceFactory()
 {
     cssu::Reference< cssl::XMultiServiceFactory > xMSF;
 
-    try
+    try 
     {
         cssu::Reference< cssl::XMultiComponentFactory > xLocalServiceManager = NULL ;
         cssu::Reference< cssu::XComponentContext > xLocalComponentContext = NULL ;
 
-        cssu::Reference< ::com::sun::star::registry::XSimpleRegistry > xSimpleRegistry
-            = ::cppu::createSimpleRegistry();
+        cssu::Reference< ::com::sun::star::registry::XSimpleRegistry > xSimpleRegistry 
+            = ::cppu::createSimpleRegistry(); 
         OSL_ENSURE( xSimpleRegistry.is(),
             "serviceManager - "
             "Cannot create simple registry" ) ;
@@ -77,7 +77,7 @@ cssu::Reference< cssl::XMultiServiceFactory > CreateDemoServiceFactory()
             "Cannot create intial service manager" ) ;
 
         xMSF = cssu::Reference< cssl::XMultiServiceFactory >(xLocalServiceManager, cssu::UNO_QUERY) ;
-
+        
         ::comphelper::setProcessServiceFactory( xMSF );
     }
     catch( cssu::Exception& e )
diff --git a/xmlsecurity/tools/demo/util.hxx b/xmlsecurity/tools/demo/util.hxx
index 080f62458fc5..48916a11275a 100644
--- a/xmlsecurity/tools/demo/util.hxx
+++ b/xmlsecurity/tools/demo/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
@@ -48,6 +48,6 @@ long QueryVerifySignature();
 ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > OpenOutputStream( const ::rtl::OUString& rStreamName );
 
 ::rtl::OUString getSignatureInformations( const SignatureInformations& SignatureInformations, ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > xSecurityEnvironment );
-::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > getCertificateFromEnvironment( ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > xSecurityEnvironment, BOOL nType);
+::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > getCertificateFromEnvironment( ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment >	xSecurityEnvironment, BOOL nType);
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/tools/demo/util2.cxx b/xmlsecurity/tools/demo/util2.cxx
index d40506bc498e..b5a44ce67e51 100644
--- a/xmlsecurity/tools/demo/util2.cxx
+++ b/xmlsecurity/tools/demo/util2.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 "precompiled_xmlsecurity.hxx"
 
 #include <rtl/locale.h>
-#include <osl/nlsupport.h>
+#include <osl/nlsupport.h> 
 #include <osl/process.h>
 
 #include <util.hxx>
@@ -100,20 +100,20 @@ void convertDateTime( ::rtl::OUStringBuffer& rBuffer,
 {
     int length = data.getLength();
     ::rtl::OUString result;
-
+    
     char number[4];
     for (int j=0; j<length; j++)
     {
         sprintf(number, "%02X ", (unsigned char)data[j]);
         result += rtl::OUString::createFromAscii( number );
     }
-
+    
     return result;
 }
 
 
-::rtl::OUString getSignatureInformation(
-    const SignatureInformation& infor,
+::rtl::OUString getSignatureInformation( 
+    const SignatureInformation& infor, 
     cssu::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment >& xSecurityEnvironment )
 {
     char* status[50] = {
@@ -167,9 +167,9 @@ void convertDateTime( ::rtl::OUStringBuffer& rBuffer,
         "DSIG_NO_REFERENCES",
         "DSIG_INVALID_REFERENCE",
         "ASSERTION"};
-
+    
     rtl::OUString result;
-
+    
     result += rtl::OUString::createFromAscii( "Security Id : " )
         +rtl::OUString::valueOf(infor.nSecurityId)
         +rtl::OUString::createFromAscii( "\n" );
@@ -178,11 +178,11 @@ void convertDateTime( ::rtl::OUStringBuffer& rBuffer,
         +rtl::OUString::createFromAscii( "] " )
         +rtl::OUString::createFromAscii(status[infor.nStatus])
         +rtl::OUString::createFromAscii( "\n" );
-
+    
     const SignatureReferenceInformations& rInfors = infor.vSignatureReferenceInfors;
     int i;
     int size = rInfors.size();
-
+    
     result += rtl::OUString::createFromAscii( "--References :\n" );
     for (i=0; i<size; i++)
     {
@@ -207,7 +207,7 @@ void convertDateTime( ::rtl::OUStringBuffer& rBuffer,
             result += infor.ouX509SerialNumber;
             result += rtl::OUString::createFromAscii( "\n" );
         }
-
+        
         if (infor.ouX509Certificate.getLength()>0)
         {
             result += rtl::OUString::createFromAscii( "--X509Certificate :\n" );
@@ -223,7 +223,7 @@ void convertDateTime( ::rtl::OUStringBuffer& rBuffer,
         }
 
            result += rtl::OUString::createFromAscii( "--Date :\n" );
-
+           
     ::rtl::OUStringBuffer buffer;
     convertDateTime( buffer, infor.stDateTime );
     result += buffer.makeStringAndClear();
@@ -234,7 +234,7 @@ void convertDateTime( ::rtl::OUStringBuffer& rBuffer,
             result += rtl::OUString::createFromAscii( "--Certificate Path :\n" );
             cssu::Reference< ::com::sun::star::security::XCertificate > xCert = xSecurityEnvironment->getCertificate( infor.ouX509IssuerName, numericStringToBigInteger(infor.ouX509SerialNumber) );
             cssu::Sequence < cssu::Reference< ::com::sun::star::security::XCertificate > > xCertPath;
-            if(! xCert.is() )
+            if(! xCert.is() ) 
             {
                 fprintf(stdout , " xCert is NULL , so can not buildCertificatePath\n");
                 return result ;
@@ -243,8 +243,8 @@ void convertDateTime( ::rtl::OUStringBuffer& rBuffer,
             {
                 xCertPath = xSecurityEnvironment->buildCertificatePath( xCert ) ;
             }
-
-        for( int i = 0; i < xCertPath.getLength(); i++ )
+            
+        for( int i = 0; i < xCertPath.getLength(); i++ ) 
         {
             result += xCertPath[i]->getSubjectName();
                     result += rtl::OUString::createFromAscii( "\n    Subject public key algorithm : " );
@@ -266,10 +266,10 @@ void convertDateTime( ::rtl::OUStringBuffer& rBuffer,
 
                     result += rtl::OUString::createFromAscii( "\n  <<\n" );
         }
-
+        
                    result += rtl::OUString::createFromAscii( "\n    Key Usage : " );
                    sal_Int32 usage = xCert->getCertificateUsage();
-
+                   
                    if (usage & ::com::sun::star::security::KeyUsage::DIGITAL_SIGNATURE)
                    {
                        result += rtl::OUString::createFromAscii( "DIGITAL_SIGNATURE " );
@@ -279,27 +279,27 @@ void convertDateTime( ::rtl::OUStringBuffer& rBuffer,
                    {
                        result += rtl::OUString::createFromAscii( "NON_REPUDIATION " );
                    }
-
+                   
                    if (usage & ::com::sun::star::security::KeyUsage::KEY_ENCIPHERMENT)
                    {
                        result += rtl::OUString::createFromAscii( "KEY_ENCIPHERMENT " );
                    }
-
+                   
                    if (usage & ::com::sun::star::security::KeyUsage::DATA_ENCIPHERMENT)
                    {
                        result += rtl::OUString::createFromAscii( "DATA_ENCIPHERMENT " );
                    }
-
+                   
                    if (usage & ::com::sun::star::security::KeyUsage::KEY_AGREEMENT)
                    {
                        result += rtl::OUString::createFromAscii( "KEY_AGREEMENT " );
                    }
-
+                   
                    if (usage & ::com::sun::star::security::KeyUsage::KEY_CERT_SIGN)
                    {
                        result += rtl::OUString::createFromAscii( "KEY_CERT_SIGN " );
                    }
-
+                   
                    if (usage & ::com::sun::star::security::KeyUsage::CRL_SIGN)
                    {
                        result += rtl::OUString::createFromAscii( "CRL_SIGN " );
@@ -307,32 +307,32 @@ void convertDateTime( ::rtl::OUStringBuffer& rBuffer,
 
                    result += rtl::OUString::createFromAscii( "\n" );
         }
-
+        
     result += rtl::OUString::createFromAscii( "\n" );
     return result;
 }
 
-::rtl::OUString getSignatureInformations(
+::rtl::OUString getSignatureInformations( 
     const SignatureInformations& SignatureInformations,
-    cssu::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > xSecurityEnvironment )
+    cssu::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > xSecurityEnvironment ) 
 {
     rtl::OUString result;
     int i;
     int size = SignatureInformations.size();
-
+    
     for (i=0; i<size; i++)
     {
         const SignatureInformation& infor = SignatureInformations[i];
         result += getSignatureInformation( infor, xSecurityEnvironment );
     }
-
+    
     result += rtl::OUString::createFromAscii( "\n" );
-
+    
     return result;
 }
 
-::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >
-    getCertificateFromEnvironment( ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment >  xSecurityEnvironment , BOOL nType)
+::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > 
+    getCertificateFromEnvironment( ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment >	xSecurityEnvironment , BOOL nType)
 {
     cssu::Sequence< cssu::Reference< ::com::sun::star::security::XCertificate > > xPersonalCerts ;
     int length = 0;
@@ -347,18 +347,18 @@ void convertDateTime( ::rtl::OUStringBuffer& rBuffer,
 
     if( nType != FALSE )
         xPersonalCerts = xSecurityEnvironment->getPersonalCertificates() ;
-    else
+    else 
         return NULL; // not support then;
 
     length = xPersonalCerts.getLength();
-    if(length == 0)
+    if(length == 0) 
     {
         fprintf( stdout, "\nNo certificate found!\n" ) ;
         return NULL;
     }
 
     fprintf( stdout, "\nSelect a certificate:\n" ) ;
-    for( i = 0; i < length; i ++ )
+    for( i = 0; i < length; i ++ ) 
     {
         rtl::OUString xxxIssuer;
         rtl::OUString xxxSubject;
@@ -376,7 +376,7 @@ void convertDateTime( ::rtl::OUStringBuffer& rBuffer,
             yyySubject.getStr(),
             yyyIssuer.getStr());
     }
-
+    
     int sel = QuerySelectNumber( 1, length ) -1;
     return xPersonalCerts[sel] ;
 }
@@ -394,13 +394,13 @@ void QueryPrintSignatureDetails( const SignatureInformations& SignatureInformati
         sal_uInt16 encoding = osl_getTextEncodingFromLocale( pLocale ) ;
 
         fprintf( stdout, "------------- Signature details START -------------\n" );
-        fprintf( stdout, "%s",
+        fprintf( stdout, "%s", 
             rtl::OUStringToOString(
                 getSignatureInformations( SignatureInformations, rSecEnv),
                 encoding).getStr());
 
         fprintf( stdout, "------------- Signature details END -------------\n" );
-    }
+    }	
 }
 
 int QuerySelectNumber( int nMin, int nMax )
diff --git a/xmlsecurity/tools/demo/verifydemo.cxx b/xmlsecurity/tools/demo/verifydemo.cxx
index d96d539cee10..f4af57ab70aa 100644
--- a/xmlsecurity/tools/demo/verifydemo.cxx
+++ b/xmlsecurity/tools/demo/verifydemo.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ long startVerifyHandler( void *, void * )
 
 int SAL_CALL main( int argc, char **argv )
 {
-    if( argc < 2 )
+    if( argc < 2 ) 
     {
         fprintf( stderr, "Usage: %s <signature file> [<cryptoken>]\n" , argv[0] ) ;
         return -1 ;
@@ -58,7 +58,7 @@ int SAL_CALL main( int argc, char **argv )
 
     uno::Reference< lang::XMultiServiceFactory > xMSF = CreateDemoServiceFactory();
 
-
+    
     /*
      * creates a signature helper
      */
@@ -86,12 +86,12 @@ int SAL_CALL main( int argc, char **argv )
      */
     uno::Reference< io::XInputStream > xInputStream = OpenInputStream( aSIGFileName );
     bool bDone = aSignatureHelper.ReadAndVerifySignature( xInputStream );
-
+    
     /*
      * closes the signature stream
      */
     xInputStream->closeInput();
-
+    
     if ( !bDone )
     {
         fprintf( stderr, "\nSTATUS: Error verifying Signature!\n" );
diff --git a/xmlsecurity/tools/examples/enc-1.xml b/xmlsecurity/tools/examples/enc-1.xml
index bfd2f11195e8..8d6551421d33 100644
--- a/xmlsecurity/tools/examples/enc-1.xml
+++ b/xmlsecurity/tools/examples/enc-1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<!--
-XML Security Library example: Simple encryption template file for encrypt1 example.
+<!-- 
+XML Security Library example: Simple encryption template file for encrypt1 example. 
 -->
 <Envelope xmlns="urn:envelope">
   The encrypted data is <Data>Hello, World!</Data>
@@ -16,12 +16,12 @@ XML Security Library example: Simple encryption template file for encrypt1 examp
                 <X509SerialNumber>123450001</X509SerialNumber>
             </X509IssuerSerial>
             </X509Data>
-          </KeyInfo>
+          </KeyInfo>   
           <CipherData>
             <CipherValue/>
           </CipherData>
         </EncryptedKey>
-    </KeyInfo>
+    </KeyInfo>   
     <CipherData>
       <CipherValue></CipherValue>
     </CipherData>
diff --git a/xmlsecurity/tools/examples/enc-2.xml b/xmlsecurity/tools/examples/enc-2.xml
index 98fc553c0c08..e56d2300ab51 100644
--- a/xmlsecurity/tools/examples/enc-2.xml
+++ b/xmlsecurity/tools/examples/enc-2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<!--
-XML Security Library example: Simple encryption template file for encrypt1 example.
+<!-- 
+XML Security Library example: Simple encryption template file for encrypt1 example. 
 -->
 <Envelope xmlns="urn:envelope">
   The encrypted data is <Data>Hello, World!</Data>
@@ -16,12 +16,12 @@ XML Security Library example: Simple encryption template file for encrypt1 examp
                 <X509SerialNumber>123450001</X509SerialNumber>
             </X509IssuerSerial>
             </X509Data>
-          </KeyInfo>
+          </KeyInfo>   
           <CipherData>
             <CipherValue/>
           </CipherData>
         </EncryptedKey>
-    </KeyInfo>
+    </KeyInfo>   
     <CipherData>
       <CipherValue/>
     </CipherData>
@@ -40,19 +40,19 @@ XML Security Library example: Simple encryption template file for encrypt1 examp
                 <X509SerialNumber>123450001</X509SerialNumber>
             </X509IssuerSerial>
           </X509Data>
-          </KeyInfo>
+          </KeyInfo>   
           <CipherData>
                 <CipherValue/>
           </CipherData>
             </EncryptedKey>
-        </KeyInfo>
+        </KeyInfo>   
         <CipherData>
           <CipherValue></CipherValue>
         </CipherData>
         </EncryptedData>
                 <Data>
           This is an embeded encryption!
-        </Data>
-      </Data>
+        </Data>		
+      </Data>  
 </Envelope>
 
diff --git a/xmlsecurity/tools/examples/s-in-e-1.xml b/xmlsecurity/tools/examples/s-in-e-1.xml
index d4c0c0eba80c..c08839a1b717 100644
--- a/xmlsecurity/tools/examples/s-in-e-1.xml
+++ b/xmlsecurity/tools/examples/s-in-e-1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<!--
-XML Security Library example: Simple encryption template file for encrypt1 example.
+<!-- 
+XML Security Library example: Simple encryption template file for encrypt1 example. 
 -->
 <Envelope xmlns="urn:envelope">
   a signature in an encryption.
@@ -16,12 +16,12 @@ XML Security Library example: Simple encryption template file for encrypt1 examp
                 <X509SerialNumber>123450001</X509SerialNumber>
             </X509IssuerSerial>
             </X509Data>
-          </KeyInfo>
+          </KeyInfo>   
           <CipherData>
             <CipherValue/>
           </CipherData>
         </EncryptedKey>
-    </KeyInfo>
+    </KeyInfo>   
     <CipherData>
       <CipherValue/>
     </CipherData>
@@ -48,6 +48,6 @@ XML Security Library example: Simple encryption template file for encrypt1 examp
             </KeyInfo>
         </Signature>
         <Data id="target" refNum="1">Signed Data</Data>
-  </Data>
+  </Data>  
 </Envelope>
 
diff --git a/xmlsecurity/tools/examples/s-in-e-2.xml b/xmlsecurity/tools/examples/s-in-e-2.xml
index fd3ba0cb5f9c..29e3e45df754 100644
--- a/xmlsecurity/tools/examples/s-in-e-2.xml
+++ b/xmlsecurity/tools/examples/s-in-e-2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<!--
-XML Security Library example: Simple encryption template file for encrypt1 example.
+<!-- 
+XML Security Library example: Simple encryption template file for encrypt1 example. 
 -->
 <Envelope xmlns="urn:envelope">
   a signature in an encryption.
@@ -16,12 +16,12 @@ XML Security Library example: Simple encryption template file for encrypt1 examp
                 <X509SerialNumber>123450001</X509SerialNumber>
             </X509IssuerSerial>
             </X509Data>
-          </KeyInfo>
+          </KeyInfo>   
           <CipherData>
             <CipherValue/>
           </CipherData>
         </EncryptedKey>
-    </KeyInfo>
+    </KeyInfo>   
     <CipherData>
       <CipherValue/>
     </CipherData>
@@ -47,7 +47,7 @@ XML Security Library example: Simple encryption template file for encrypt1 examp
               </X509Data>
             </KeyInfo>
         </Signature>
-  </Data>
+  </Data>  
   <SignData id="target" refNum="1">Signed Data</SignData>
 </Envelope>
 
diff --git a/xmlsecurity/tools/standalone/csfit/certmngr.cxx b/xmlsecurity/tools/standalone/csfit/certmngr.cxx
index 5c6d78c89d9a..b5763e6079e1 100644
--- a/xmlsecurity/tools/standalone/csfit/certmngr.cxx
+++ b/xmlsecurity/tools/standalone/csfit/certmngr.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 @@ using namespace ::com::sun::star::xml::crypto ;
 
 int SAL_CALL main( int argc, char **argv )
 {
-    CERTCertDBHandle*   certHandle ;
-    PK11SlotInfo*       slot ;
+    CERTCertDBHandle*	certHandle ;
+    PK11SlotInfo*		slot ;
 
     if( argc != 3 ) {
         fprintf( stderr, "Usage: %s < CertDir > <rdb file>\n\n" , argv[0] ) ;
@@ -148,7 +148,7 @@ int SAL_CALL main( int argc, char **argv )
             fprintf( stdout, "\tCertificate Serial Number[%s]\n", OUStringToOString( bigIntegerToNumericString( xPersonalCerts[i]->getSerialNumber() ), RTL_TEXTENCODING_ASCII_US ).getStr() ) ;
             fprintf( stdout, "\tCertificate Subject[%s]\n", OUStringToOString( xPersonalCerts[i]->getSubjectName(), RTL_TEXTENCODING_ASCII_US ).getStr() ) ;
 
-            //build the certificate path
+            //build the certificate path 
             xCertPath = pSecEnv->buildCertificatePath( xPersonalCerts[i] ) ;
             //Print the certificate path.
             fprintf( stdout, "\tCertificate Path\n" ) ;
diff --git a/xmlsecurity/tools/standalone/csfit/decrypter.cxx b/xmlsecurity/tools/standalone/csfit/decrypter.cxx
index b1177efe58d1..b196e2625ca0 100644
--- a/xmlsecurity/tools/standalone/csfit/decrypter.cxx
+++ b/xmlsecurity/tools/standalone/csfit/decrypter.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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 "libxslt/xslt.h"
 #endif
 
-
+                                                                                
 #include "securityenvironment_nssimpl.hxx"
 #include "xmlelementwrapper_xmlsecimpl.hxx"
 
@@ -82,12 +82,12 @@ using namespace ::com::sun::star::xml::crypto ;
 
 int SAL_CALL main( int argc, char **argv )
 {
-    CERTCertDBHandle*   certHandle = NULL ;
-    PK11SlotInfo*       slot = NULL ;
-    xmlDocPtr           doc = NULL ;
-    xmlNodePtr          tplNode ;
-    xmlNodePtr          tarNode ;
-    FILE*               dstFile = NULL ;
+    CERTCertDBHandle*	certHandle = NULL ;
+    PK11SlotInfo*		slot = NULL ;
+    xmlDocPtr			doc = NULL ;
+    xmlNodePtr			tplNode ;
+    xmlNodePtr			tarNode ;
+    FILE*				dstFile = NULL ;
 
 
     if( argc != 5 ) {
@@ -102,7 +102,7 @@ int SAL_CALL main( int argc, char **argv )
     xmlSubstituteEntitiesDefault(1);
 
     #ifndef XMLSEC_NO_XSLT
-    xmlIndentTreeOutput = 1;
+    xmlIndentTreeOutput = 1; 
     #endif // XMLSEC_NO_XSLT
 
 
@@ -264,7 +264,7 @@ done:
 
     /* Shutdown libxslt/libxml */
     #ifndef XMLSEC_NO_XSLT
-    xsltCleanupGlobals();
+    xsltCleanupGlobals();            
     #endif /* XMLSEC_NO_XSLT */
     xmlCleanupParser();
 
diff --git a/xmlsecurity/tools/standalone/csfit/encrypter.cxx b/xmlsecurity/tools/standalone/csfit/encrypter.cxx
index ce6e4c15ccdf..34e2dafa0d09 100644
--- a/xmlsecurity/tools/standalone/csfit/encrypter.cxx
+++ b/xmlsecurity/tools/standalone/csfit/encrypter.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,13 +79,13 @@ using namespace ::com::sun::star::xml::crypto ;
 
 int SAL_CALL main( int argc, char **argv )
 {
-    CERTCertDBHandle*   certHandle ;
-    PK11SlotInfo*       slot = NULL ;
-    PK11SymKey*         symKey = NULL ;
-    xmlDocPtr           doc = NULL ;
-    xmlNodePtr          tplNode ;
-    xmlNodePtr          tarNode ;
-    FILE*               dstFile = NULL ;
+    CERTCertDBHandle*	certHandle ;
+    PK11SlotInfo*		slot = NULL ;
+    PK11SymKey*			symKey = NULL ;
+    xmlDocPtr			doc = NULL ;
+    xmlNodePtr			tplNode ;
+    xmlNodePtr			tarNode ;
+    FILE*				dstFile = NULL ;
 
     if( argc != 7 ) {
         fprintf( stderr, "Usage: %s < CertDir > <file_url of template> <file_url of result> <target element name> <target element namespace> <rdb file>\n\n" , argv[0] ) ;
@@ -99,7 +99,7 @@ int SAL_CALL main( int argc, char **argv )
     xmlSubstituteEntitiesDefault(1);
 
     #ifndef XMLSEC_NO_XSLT
-    xmlIndentTreeOutput = 1;
+    xmlIndentTreeOutput = 1; 
     #endif // XMLSEC_NO_XSLT
 
     //Initialize NSPR and NSS
@@ -301,7 +301,7 @@ done:
 
     /* Shutdown libxslt/libxml */
     #ifndef XMLSEC_NO_XSLT
-    xsltCleanupGlobals();
+    xsltCleanupGlobals();            
     #endif /* XMLSEC_NO_XSLT */
     xmlCleanupParser();
 
diff --git a/xmlsecurity/tools/standalone/csfit/helper.cxx b/xmlsecurity/tools/standalone/csfit/helper.cxx
index fb2b6b0933c5..62f44cf9dff1 100644
--- a/xmlsecurity/tools/standalone/csfit/helper.cxx
+++ b/xmlsecurity/tools/standalone/csfit/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
@@ -48,7 +48,7 @@ Reference< XInputStream > createStreamFromFile( const OUString sFile )
     if( pcFile != NULL ) {
         FILE *f = fopen( pcFile , "rb" );
         Reference<  XInputStream >  r;
-
+    
         if( f ) {
             fseek( f , 0 , SEEK_END );
             int nLength = ftell( f );
@@ -58,7 +58,7 @@ Reference< XInputStream > createStreamFromFile( const OUString sFile )
             fread( seqIn.getArray() , nLength , 1 , f );
 
             r = Reference< XInputStream > ( new OInputStream( seqIn ) );
-            fclose( f );
+            fclose( f );				
         }
         return r;
     } else {
@@ -103,7 +103,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
         "No rdb URI specified" ) ;
 
     if( sUnoUrl.equalsAscii( "local" ) ) {
-        Reference< XSimpleRegistry > xSimpleRegistry = createSimpleRegistry();
+        Reference< XSimpleRegistry > xSimpleRegistry = createSimpleRegistry(); 
         OSL_ENSURE( xSimpleRegistry.is() ,
             "serviceManager - "
             "Cannot create simple registry" ) ;
diff --git a/xmlsecurity/tools/standalone/csfit/helper.hxx b/xmlsecurity/tools/standalone/csfit/helper.hxx
index 108ebf73358a..79e8b48f895f 100644
--- a/xmlsecurity/tools/standalone/csfit/helper.hxx
+++ b/xmlsecurity/tools/standalone/csfit/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
@@ -88,7 +88,7 @@ class OInputStream : public WeakImplHelper1 < XInputStream >
 {
     public:
         OInputStream( const Sequence< sal_Int8 >&seq ) : m_seq( seq ), nPos( 0 ) {}
-
+        
         virtual sal_Int32 SAL_CALL readBytes(
             Sequence< sal_Int8 >& aData ,
             sal_Int32 nBytesToRead
@@ -199,7 +199,7 @@ class OUriBinding : public WeakImplHelper1 < ::com::sun::star::xml::crypto::XUri
 
         virtual void SAL_CALL setUriBinding(
             const ::rtl::OUString& aUri ,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& aInputStream
+            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& aInputStream 
         ) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ) {
             m_vUris.push_back( aUri ) ;
             m_vStreams.push_back( aInputStream ) ;
@@ -215,7 +215,7 @@ class OUriBinding : public WeakImplHelper1 < ::com::sun::star::xml::crypto::XUri
                     break;
                 }
             }
-
+                                        
             return xInputStream;
         }
 
diff --git a/xmlsecurity/tools/standalone/csfit/signer.cxx b/xmlsecurity/tools/standalone/csfit/signer.cxx
index 40e6a64a2b78..4e3a2cf37991 100644
--- a/xmlsecurity/tools/standalone/csfit/signer.cxx
+++ b/xmlsecurity/tools/standalone/csfit/signer.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,18 +77,18 @@ using namespace ::com::sun::star::xml::crypto ;
 
 int SAL_CALL main( int argc, char **argv )
 {
-    CERTCertDBHandle*   certHandle ;
-    PK11SlotInfo*       slot ;
-    xmlDocPtr           doc ;
-    xmlNodePtr          tplNode ;
-    xmlNodePtr          tarNode ;
-    xmlAttrPtr          idAttr ;
-    xmlChar*            idValue ;
-    xmlAttrPtr          uriAttr ;
-    xmlChar*            uriValue ;
-    OUString*           uri ;
-    Reference< XUriBinding >    xUriBinding ;
-    FILE*               dstFile ;
+    CERTCertDBHandle*	certHandle ;
+    PK11SlotInfo*		slot ;
+    xmlDocPtr			doc ;
+    xmlNodePtr			tplNode ;
+    xmlNodePtr			tarNode ;
+    xmlAttrPtr			idAttr ;
+    xmlChar*			idValue ;
+    xmlAttrPtr			uriAttr ;
+    xmlChar*			uriValue ;
+    OUString*			uri ;
+    Reference< XUriBinding >	xUriBinding ;
+    FILE*				dstFile ;
 
     if( argc != 5 ) {
         fprintf( stderr, "Usage: %s < CertDir > <file_url of template> <file_url of result> <rdb file>\n\n" , argv[0] ) ;
@@ -109,7 +109,7 @@ int SAL_CALL main( int argc, char **argv )
     xmlSubstituteEntitiesDefault(1);
 
     #ifndef XMLSEC_NO_XSLT
-    xmlIndentTreeOutput = 1;
+    xmlIndentTreeOutput = 1; 
     #endif // XMLSEC_NO_XSLT
 
 
@@ -202,7 +202,7 @@ int SAL_CALL main( int argc, char **argv )
 
     if( strchr( ( const char* )uriValue, '/' ) != NULL && strchr( ( const char* )uriValue, '#' ) == NULL ) {
         fprintf( stdout , "### Find a stream URI [%s]\n", uriValue ) ;
-    //  uri = new ::rtl::OUString( ( const sal_Unicode* )uriValue ) ;
+    //	uri = new ::rtl::OUString( ( const sal_Unicode* )uriValue ) ;
         uri = new ::rtl::OUString( ( const sal_Char* )uriValue, xmlStrlen( uriValue ), RTL_TEXTENCODING_ASCII_US ) ;
     }
 
@@ -360,7 +360,7 @@ done:
 
     /* Shutdown libxslt/libxml */
     #ifndef XMLSEC_NO_XSLT
-    xsltCleanupGlobals();
+    xsltCleanupGlobals();            
     #endif /* XMLSEC_NO_XSLT */
     xmlCleanupParser();
 
diff --git a/xmlsecurity/tools/standalone/csfit/verifier.cxx b/xmlsecurity/tools/standalone/csfit/verifier.cxx
index a109b63931fe..ca97fcdca9cf 100644
--- a/xmlsecurity/tools/standalone/csfit/verifier.cxx
+++ b/xmlsecurity/tools/standalone/csfit/verifier.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,17 +80,17 @@ using namespace ::com::sun::star::xml::crypto ;
 
 int SAL_CALL main( int argc, char **argv )
 {
-    CERTCertDBHandle*   certHandle = NULL ;
-    PK11SlotInfo*       slot = NULL ;
-    xmlDocPtr           doc = NULL ;
-    xmlNodePtr          tplNode ;
-    xmlNodePtr          tarNode ;
-    xmlAttrPtr          idAttr ;
-    xmlChar*            idValue ;
-    xmlAttrPtr          uriAttr ;
-    xmlChar*            uriValue ;
-    OUString*           uri = NULL ;
-    Reference< XUriBinding >    xUriBinding ;
+    CERTCertDBHandle*	certHandle = NULL ;
+    PK11SlotInfo*		slot = NULL ;
+    xmlDocPtr			doc = NULL ;
+    xmlNodePtr			tplNode ;
+    xmlNodePtr			tarNode ;
+    xmlAttrPtr			idAttr ;
+    xmlChar*			idValue ;
+    xmlAttrPtr			uriAttr ;
+    xmlChar*			uriValue ;
+    OUString*			uri = NULL ;
+    Reference< XUriBinding >	xUriBinding ;
 
     if( argc != 4 ) {
         fprintf( stderr, "Usage: %s < CertDir > <file_url> <rdb file>\n" , argv[0] ) ;
@@ -104,7 +104,7 @@ int SAL_CALL main( int argc, char **argv )
     xmlSubstituteEntitiesDefault(1);
 
     #ifndef XMLSEC_NO_XSLT
-    xmlIndentTreeOutput = 1;
+    xmlIndentTreeOutput = 1; 
     #endif // XMLSEC_NO_XSLT
 
 
@@ -138,7 +138,7 @@ int SAL_CALL main( int argc, char **argv )
     if( tarNode == NULL ) {
         tarNode = xmlSecFindNode( xmlDocGetRootElement( doc ), ( xmlChar* )"document", NULL ) ;
     }
-
+                                        
     //Find the "id" attrbute in the element
     if( tarNode != NULL ) {
         if( ( idAttr = xmlHasProp( tarNode, ( xmlChar* )"id" ) ) != NULL ) {
@@ -149,7 +149,7 @@ int SAL_CALL main( int argc, char **argv )
             idAttr = NULL ;
         }
     }
-
+                                        
     //Add ID to DOM
     if( idAttr != NULL ) {
         idValue = xmlNodeListGetString( tarNode->doc, idAttr->children, 1 ) ;
@@ -157,7 +157,7 @@ int SAL_CALL main( int argc, char **argv )
             fprintf( stderr , "### the ID value is NULL!\n" ) ;
             goto done ;
         }
-
+                                        
         if( xmlAddID( NULL, doc, idValue, idAttr ) == NULL ) {
             fprintf( stderr , "### Can not add the ID value!\n" ) ;
             goto done ;
@@ -188,7 +188,7 @@ int SAL_CALL main( int argc, char **argv )
 
     if( strchr( ( const char* )uriValue, '/' ) != NULL && strchr( ( const char* )uriValue, '#' ) == NULL ) {
         fprintf( stdout , "### Find a stream URI [%s]\n", uriValue ) ;
-    //  uri = new ::rtl::OUString( ( const sal_Unicode* )uriValue ) ;
+    //	uri = new ::rtl::OUString( ( const sal_Unicode* )uriValue ) ;
         uri = new ::rtl::OUString( ( const sal_Char* )uriValue, xmlStrlen( uriValue ), RTL_TEXTENCODING_ASCII_US ) ;
     }
 
@@ -332,7 +332,7 @@ done :
 
     /* Shutdown libxslt/libxml */
     #ifndef XMLSEC_NO_XSLT
-    xsltCleanupGlobals();
+    xsltCleanupGlobals();	    
     #endif /* XMLSEC_NO_XSLT */
     xmlCleanupParser();
 
diff --git a/xmlsecurity/tools/standalone/mscsfit/certmngr.cxx b/xmlsecurity/tools/standalone/mscsfit/certmngr.cxx
index 2856967cbd26..c9fa5261a00e 100644
--- a/xmlsecurity/tools/standalone/mscsfit/certmngr.cxx
+++ b/xmlsecurity/tools/standalone/mscsfit/certmngr.cxx
@@ -113,7 +113,7 @@ int SAL_CALL main( int argc, char **argv )
             fprintf( stdout, "\tCertificate Serial Number[%s]\n", OUStringToOString( bigIntegerToNumericString( xPersonalCerts[i]->getSerialNumber() ), RTL_TEXTENCODING_ASCII_US ).getStr() ) ;
             fprintf( stdout, "\tCertificate Subject[%s]\n", OUStringToOString( xPersonalCerts[i]->getSubjectName(), RTL_TEXTENCODING_ASCII_US ).getStr() ) ;
 
-            //build the certificate path
+            //build the certificate path 
             xCertPath = pSecEnv->buildCertificatePath( xPersonalCerts[i] ) ;
             //Print the certificate path.
             fprintf( stdout, "\tCertificate Path\n" ) ;
diff --git a/xmlsecurity/tools/standalone/mscsfit/decrypter.cxx b/xmlsecurity/tools/standalone/mscsfit/decrypter.cxx
index 1b0015c6d92e..a36f6a30b628 100644
--- a/xmlsecurity/tools/standalone/mscsfit/decrypter.cxx
+++ b/xmlsecurity/tools/standalone/mscsfit/decrypter.cxx
@@ -12,7 +12,7 @@
 #include "libxslt/xslt.h"
 #endif
 
-
+                                                                                
 #include "securityenvironment_mscryptimpl.hxx"
 #include "xmlelementwrapper_xmlsecimpl.hxx"
 
@@ -56,12 +56,12 @@ using namespace ::com::sun::star::xml::crypto ;
 
 int SAL_CALL main( int argc, char **argv )
 {
-    CERTCertDBHandle*   certHandle = NULL ;
-    PK11SlotInfo*       slot = NULL ;
-    xmlDocPtr           doc = NULL ;
-    xmlNodePtr          tplNode ;
-    xmlNodePtr          tarNode ;
-    FILE*               dstFile = NULL ;
+    CERTCertDBHandle*	certHandle = NULL ;
+    PK11SlotInfo*		slot = NULL ;
+    xmlDocPtr			doc = NULL ;
+    xmlNodePtr			tplNode ;
+    xmlNodePtr			tarNode ;
+    FILE*				dstFile = NULL ;
 
 
     if( argc != 5 ) {
@@ -76,7 +76,7 @@ int SAL_CALL main( int argc, char **argv )
     xmlSubstituteEntitiesDefault(1);
 
     #ifndef XMLSEC_NO_XSLT
-    xmlIndentTreeOutput = 1;
+    xmlIndentTreeOutput = 1; 
     #endif // XMLSEC_NO_XSLT
 
 
@@ -238,7 +238,7 @@ done:
 
     /* Shutdown libxslt/libxml */
     #ifndef XMLSEC_NO_XSLT
-    xsltCleanupGlobals();
+    xsltCleanupGlobals();            
     #endif /* XMLSEC_NO_XSLT */
     xmlCleanupParser();
 
diff --git a/xmlsecurity/tools/standalone/mscsfit/encrypter.cxx b/xmlsecurity/tools/standalone/mscsfit/encrypter.cxx
index d580649ed0e6..3bf6831459a5 100644
--- a/xmlsecurity/tools/standalone/mscsfit/encrypter.cxx
+++ b/xmlsecurity/tools/standalone/mscsfit/encrypter.cxx
@@ -45,16 +45,16 @@ using namespace ::com::sun::star::xml::crypto ;
 
 int SAL_CALL main( int argc, char **argv )
 {
-    const char*         n_pCertStore ;
-    HCERTSTORE          n_hStoreHandle ;
+    const char* 		n_pCertStore ;
+    HCERTSTORE			n_hStoreHandle ;
 
-    xmlDocPtr           doc = NULL ;
-    xmlNodePtr          tplNode ;
-    xmlNodePtr          tarNode ;
-    FILE*               dstFile = NULL ;
+    xmlDocPtr			doc = NULL ;
+    xmlNodePtr			tplNode ;
+    xmlNodePtr			tarNode ;
+    FILE*				dstFile = NULL ;
 
-    HCRYPTPROV          hCryptProv = NULL ;
-    HCRYPTKEY           symKey = NULL ;
+    HCRYPTPROV			hCryptProv = NULL ;
+    HCRYPTKEY			symKey = NULL ;
 
     if( argc != 6 && argc != 7 ) {
         fprintf( stderr, "Usage: %s <file_url of template> <file_url of result> <target element name> <target element namespace> <rdb file>\n\n" , argv[0] ) ;
@@ -69,7 +69,7 @@ int SAL_CALL main( int argc, char **argv )
     xmlSubstituteEntitiesDefault(1);
 
     #ifndef XMLSEC_NO_XSLT
-    xmlIndentTreeOutput = 1;
+    xmlIndentTreeOutput = 1; 
     #endif // XMLSEC_NO_XSLT
 
     //Initialize the crypto engine
@@ -258,8 +258,8 @@ int SAL_CALL main( int argc, char **argv )
         OSL_ENSURE( xTemplate.is() ,
             "Encryptor - "
             "Cannot encrypt the xml document" ) ;
-
-
+            
+            
         com::sun::star::xml::crypto::SecurityOperationStatus m_nStatus = xTemplate->getStatus();
         if (m_nStatus == SecurityOperationStatus_OPERATION_SUCCEEDED)
         {
@@ -300,7 +300,7 @@ done:
 
     /* Shutdown libxslt/libxml */
     #ifndef XMLSEC_NO_XSLT
-    xsltCleanupGlobals();
+    xsltCleanupGlobals();            
     #endif /* XMLSEC_NO_XSLT */
     xmlCleanupParser();
 
diff --git a/xmlsecurity/tools/standalone/mscsfit/helper.cxx b/xmlsecurity/tools/standalone/mscsfit/helper.cxx
index 631ae1c397b7..e4c497558514 100644
--- a/xmlsecurity/tools/standalone/mscsfit/helper.cxx
+++ b/xmlsecurity/tools/standalone/mscsfit/helper.cxx
@@ -16,7 +16,7 @@ Reference< XInputStream > createStreamFromFile( const OUString sFile )
     if( pcFile != NULL ) {
         FILE *f = fopen( pcFile , "rb" );
         Reference<  XInputStream >  r;
-
+    
         if( f ) {
             fseek( f , 0 , SEEK_END );
             int nLength = ftell( f );
@@ -26,7 +26,7 @@ Reference< XInputStream > createStreamFromFile( const OUString sFile )
             fread( seqIn.getArray() , nLength , 1 , f );
 
             r = Reference< XInputStream > ( new OInputStream( seqIn ) );
-            fclose( f );
+            fclose( f );				
         }
         return r;
     } else {
@@ -71,7 +71,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
         "No rdb URI specified" ) ;
 
     if( sUnoUrl.equalsAscii( "local" ) ) {
-        Reference< XSimpleRegistry > xSimpleRegistry = createSimpleRegistry();
+        Reference< XSimpleRegistry > xSimpleRegistry = createSimpleRegistry(); 
         OSL_ENSURE( xSimpleRegistry.is() ,
             "serviceManager - "
             "Cannot create simple registry" ) ;
diff --git a/xmlsecurity/tools/standalone/mscsfit/helper.hxx b/xmlsecurity/tools/standalone/mscsfit/helper.hxx
index 928c9415e997..fa782b387707 100644
--- a/xmlsecurity/tools/standalone/mscsfit/helper.hxx
+++ b/xmlsecurity/tools/standalone/mscsfit/helper.hxx
@@ -57,7 +57,7 @@ class OInputStream : public WeakImplHelper1 < XInputStream >
 {
     public:
         OInputStream( const Sequence< sal_Int8 >&seq ) : m_seq( seq ), nPos( 0 ) {}
-
+        
         virtual sal_Int32 SAL_CALL readBytes(
             Sequence< sal_Int8 >& aData ,
             sal_Int32 nBytesToRead
@@ -168,7 +168,7 @@ class OUriBinding : public WeakImplHelper1 < ::com::sun::star::xml::crypto::XUri
 
         virtual void SAL_CALL setUriBinding(
             const ::rtl::OUString& aUri ,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& aInputStream
+            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& aInputStream 
         ) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ) {
             m_vUris.push_back( aUri ) ;
             m_vStreams.push_back( aInputStream ) ;
@@ -184,7 +184,7 @@ class OUriBinding : public WeakImplHelper1 < ::com::sun::star::xml::crypto::XUri
                     break;
                 }
             }
-
+                                        
             return xInputStream;
         }
 
diff --git a/xmlsecurity/tools/standalone/mscsfit/signer.cxx b/xmlsecurity/tools/standalone/mscsfit/signer.cxx
index ffa88577444a..84fa6aa93ce2 100644
--- a/xmlsecurity/tools/standalone/mscsfit/signer.cxx
+++ b/xmlsecurity/tools/standalone/mscsfit/signer.cxx
@@ -43,19 +43,19 @@ using namespace ::com::sun::star::xml::crypto ;
 
 int SAL_CALL main( int argc, char **argv )
 {
-    const char*         n_pCertStore ;
-    HCERTSTORE          n_hStoreHandle ;
-
-    xmlDocPtr           doc = NULL ;
-    xmlNodePtr          tplNode ;
-    xmlNodePtr          tarNode ;
-    xmlAttrPtr          idAttr ;
-    xmlChar*            idValue ;
-    xmlAttrPtr          uriAttr ;
-    xmlChar*            uriValue ;
-    OUString*           uri = NULL ;
-    Reference< XUriBinding >    xUriBinding ;
-    FILE*               dstFile = NULL ;
+    const char* 		n_pCertStore ;
+    HCERTSTORE			n_hStoreHandle ;
+
+    xmlDocPtr			doc = NULL ;
+    xmlNodePtr			tplNode ;
+    xmlNodePtr			tarNode ;
+    xmlAttrPtr			idAttr ;
+    xmlChar*			idValue ;
+    xmlAttrPtr			uriAttr ;
+    xmlChar*			uriValue ;
+    OUString*			uri = NULL ;
+    Reference< XUriBinding >	xUriBinding ;
+    FILE*				dstFile = NULL ;
 
     if( argc !=4 && argc != 5 ) {
         fprintf( stderr, "Usage: %s <file_url of template> <file_url of result> <rdb file>\n" , argv[0] ) ;
@@ -72,7 +72,7 @@ int SAL_CALL main( int argc, char **argv )
     xmlSubstituteEntitiesDefault(1);
 
     #ifndef XMLSEC_NO_XSLT
-    xmlIndentTreeOutput = 1;
+    xmlIndentTreeOutput = 1; 
     #endif // XMLSEC_NO_XSLT
 
     //Initialize the crypto engine
@@ -159,7 +159,7 @@ int SAL_CALL main( int argc, char **argv )
 
     if( strchr( ( const char* )uriValue, '/' ) != NULL && strchr( ( const char* )uriValue, '#' ) == NULL ) {
         fprintf( stdout , "### Find a stream URI [%s]\n", uriValue ) ;
-    //  uri = new ::rtl::OUString( ( const sal_Unicode* )uriValue ) ;
+    //	uri = new ::rtl::OUString( ( const sal_Unicode* )uriValue ) ;
         uri = new ::rtl::OUString( ( const sal_Char* )uriValue, xmlStrlen( uriValue ), RTL_TEXTENCODING_ASCII_US ) ;
     }
 
@@ -289,10 +289,10 @@ int SAL_CALL main( int argc, char **argv )
         xTemplate = xSigner->generate( xTemplate , xSecEnv ) ;
         OSL_ENSURE( xTemplate.is() ,
             "Signer - "
-            "Cannot generate the xml signature" ) ;
-
+            "Cannot generate the xml signature" ) ; 
+        
         SecurityOperationStatus m_nStatus = xTemplate->getStatus();
-
+        
         if (m_nStatus == SecurityOperationStatus_OPERATION_SUCCEEDED)
         {
             fprintf( stdout, "Operation succeeds.\n") ;
@@ -332,7 +332,7 @@ done:
 
     /* Shutdown libxslt/libxml */
     #ifndef XMLSEC_NO_XSLT
-    xsltCleanupGlobals();
+    xsltCleanupGlobals();            
     #endif /* XMLSEC_NO_XSLT */
     xmlCleanupParser();
 
diff --git a/xmlsecurity/tools/standalone/mscsfit/verifier.cxx b/xmlsecurity/tools/standalone/mscsfit/verifier.cxx
index c66233eebdf6..d7eac01a6e2c 100644
--- a/xmlsecurity/tools/standalone/mscsfit/verifier.cxx
+++ b/xmlsecurity/tools/standalone/mscsfit/verifier.cxx
@@ -46,19 +46,19 @@ using namespace ::com::sun::star::xml::crypto ;
 
 int SAL_CALL main( int argc, char **argv )
 {
-    const char*         n_pCertStore ;
-    HCERTSTORE          n_hStoreHandle ;
-
-    xmlDocPtr           doc = NULL ;
-    xmlNodePtr          tplNode ;
-    xmlNodePtr          tarNode ;
-    xmlAttrPtr          idAttr ;
-    xmlChar*            idValue ;
-    xmlAttrPtr          uriAttr ;
-    xmlChar*            uriValue ;
-    OUString*           uri = NULL ;
-    Reference< XUriBinding >    xUriBinding ;
-    FILE*               dstFile = NULL ;
+    const char* 		n_pCertStore ;
+    HCERTSTORE			n_hStoreHandle ;
+
+    xmlDocPtr			doc = NULL ;
+    xmlNodePtr			tplNode ;
+    xmlNodePtr			tarNode ;
+    xmlAttrPtr			idAttr ;
+    xmlChar*			idValue ;
+    xmlAttrPtr			uriAttr ;
+    xmlChar*			uriValue ;
+    OUString*			uri = NULL ;
+    Reference< XUriBinding >	xUriBinding ;
+    FILE*				dstFile = NULL ;
 
     if( argc !=3 && argc != 4 ) {
         fprintf( stderr, "Usage: %s <file_url> <rdb file>\n" , argv[0] ) ;
@@ -75,7 +75,7 @@ int SAL_CALL main( int argc, char **argv )
     xmlSubstituteEntitiesDefault(1);
 
     #ifndef XMLSEC_NO_XSLT
-    xmlIndentTreeOutput = 1;
+    xmlIndentTreeOutput = 1; 
     #endif // XMLSEC_NO_XSLT
 
     //Initialize the crypto engine
@@ -111,7 +111,7 @@ int SAL_CALL main( int argc, char **argv )
     if( tarNode == NULL ) {
         tarNode = xmlSecFindNode( xmlDocGetRootElement( doc ), ( xmlChar* )"document", NULL ) ;
     }
-
+                                        
     //Find the "id" attrbute in the element
     if( tarNode != NULL ) {
         if( ( idAttr = xmlHasProp( tarNode, ( xmlChar* )"id" ) ) != NULL ) {
@@ -122,7 +122,7 @@ int SAL_CALL main( int argc, char **argv )
             idAttr = NULL ;
         }
     }
-
+                                        
     //Add ID to DOM
     if( idAttr != NULL ) {
         idValue = xmlNodeListGetString( tarNode->doc, idAttr->children, 1 ) ;
@@ -130,7 +130,7 @@ int SAL_CALL main( int argc, char **argv )
             fprintf( stderr , "### the ID value is NULL!\n" ) ;
             goto done ;
         }
-
+                                        
         if( xmlAddID( NULL, doc, idValue, idAttr ) == NULL ) {
             fprintf( stderr , "### Can not add the ID value!\n" ) ;
             goto done ;
@@ -161,7 +161,7 @@ int SAL_CALL main( int argc, char **argv )
 
     if( strchr( ( const char* )uriValue, '/' ) != NULL && strchr( ( const char* )uriValue, '#' ) == NULL ) {
         fprintf( stdout , "### Find a stream URI [%s]\n", uriValue ) ;
-    //  uri = new ::rtl::OUString( ( const sal_Unicode* )uriValue ) ;
+    //	uri = new ::rtl::OUString( ( const sal_Unicode* )uriValue ) ;
         uri = new ::rtl::OUString( ( const sal_Char* )uriValue, xmlStrlen( uriValue ), RTL_TEXTENCODING_ASCII_US ) ;
     }
 
@@ -288,9 +288,9 @@ int SAL_CALL main( int argc, char **argv )
 
         //perform validation
         xTemplate = xSigner->validate( xTemplate , xSecCtx ) ;
-
+        
         com::sun::star::xml::crypto::SecurityOperationStatus m_nStatus = xTemplate->getStatus();
-
+        
         if (m_nStatus == SecurityOperationStatus_OPERATION_SUCCEEDED)
         {
             fprintf( stdout, "Operation succeeds.\n") ;
@@ -318,7 +318,7 @@ done :
 
     /* Shutdown libxslt/libxml */
     #ifndef XMLSEC_NO_XSLT
-    xsltCleanupGlobals();
+    xsltCleanupGlobals();	    
     #endif /* XMLSEC_NO_XSLT */
     xmlCleanupParser();
 
diff --git a/xmlsecurity/tools/uno/AdapterNode.java b/xmlsecurity/tools/uno/AdapterNode.java
index bed8e2a3631c..b42b7a3b32ef 100644
--- a/xmlsecurity/tools/uno/AdapterNode.java
+++ b/xmlsecurity/tools/uno/AdapterNode.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,11 +37,11 @@ import org.w3c.dom.NamedNodeMap;
  * display in the tree. It also returns children, index values,
  * and child counts.
  */
-class AdapterNode
-{
+class AdapterNode 
+{ 
     private Node m_domNode;
     static final int ELEMENT_TYPE =   Node.ELEMENT_NODE;
-
+    
     /*
      * An array of names for DOM node-types
      */
@@ -60,105 +60,105 @@ class AdapterNode
         "DocFragment",
         "Notation",
         };
-
+    
     protected Node getNode()
     {
         return m_domNode;
     }
-
+    
     /*
      * Construct an Adapter node from a DOM node
      */
-    protected AdapterNode(org.w3c.dom.Node node)
+    protected AdapterNode(org.w3c.dom.Node node) 
     {
         m_domNode = node;
     }
-
+    
     /*
      * Return children, index, and count values
      */
-    protected int index(AdapterNode child)
+    protected int index(AdapterNode child) 
     {
         int count = childCount();
-        for (int i=0; i<count; ++i)
+        for (int i=0; i<count; ++i) 
         {
             AdapterNode n = this.child(i);
             if (child.m_domNode == n.m_domNode) return i;
         }
         return -1;
     }
-
-    protected AdapterNode child(int searchIndex)
+    
+    protected AdapterNode child(int searchIndex) 
     {
         if (m_domNode == null) return null;
-
+        
         /*
-         * Note: JTree index is zero-based.
+         * Note: JTree index is zero-based. 
          */
-        org.w3c.dom.Node node =
+        org.w3c.dom.Node node = 
             m_domNode.getChildNodes().item(searchIndex);
-
-        return new AdapterNode(node);
+            
+        return new AdapterNode(node); 
     }
-
-    protected int childCount()
+    
+    protected int childCount() 
     {
         int rc = 0;
-
+        
         if (m_domNode != null)
         {
             rc = m_domNode.getChildNodes().getLength();
         }
-
+        
         return rc;
     }
-
+    
     /*
      * Return a string that identifies this node in the tree
      */
-    public String toString()
+    public String toString() 
     {
         String rc = null;
-
+        
         if (m_domNode != null)
         {
             String s = typeName[m_domNode.getNodeType()];
             String nodeName = m_domNode.getNodeName();
-
-            if (! nodeName.startsWith("#"))
+            
+            if (! nodeName.startsWith("#")) 
             {
                 s += ": " + nodeName;
             }
-
-            if (m_domNode.getNodeValue() != null)
+            
+            if (m_domNode.getNodeValue() != null) 
             {
-                if (s.startsWith("ProcInstr"))
+                if (s.startsWith("ProcInstr")) 
                 {
-                    s += ", ";
+                    s += ", "; 
                 }
-                else
+                else 
                 {
                     s += ": ";
                 }
-
+                
                 String t = m_domNode.getNodeValue();
                 s += t;
             }
-
+            
             if (m_domNode.getNodeType() == ELEMENT_TYPE)
             {
                 NamedNodeMap attrs = m_domNode.getAttributes();
-
+                
                 int length = attrs.getLength();
                 for (int i=0; i<length; ++i)
                 {
                     Attr attr = (Attr)(attrs.item(i));
-                    s += " "+ attr.getName()+"='"+attr.getValue() + "'";
+                    s += " "+ attr.getName()+"='"+attr.getValue() + "'"; 
                 }
             }
             rc = s;
         }
-
+        
         return rc;
     }
 }
diff --git a/xmlsecurity/tools/uno/AttributeListHelper.java b/xmlsecurity/tools/uno/AttributeListHelper.java
index c95067bcecb6..7eb92b647201 100644
--- a/xmlsecurity/tools/uno/AttributeListHelper.java
+++ b/xmlsecurity/tools/uno/AttributeListHelper.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 com.sun.star.xml.sax.XAttributeList;
 public class AttributeListHelper implements com.sun.star.xml.sax.XAttributeList
 {
     private Vector m_AttributeList;
-
+        
     public AttributeListHelper()
     {
         m_AttributeList = new Vector();
@@ -55,7 +55,7 @@ public class AttributeListHelper implements com.sun.star.xml.sax.XAttributeList
     {
         int nLength = m_AttributeList.size();
         boolean bFound = false;
-
+        
         for (int i=0; i<nLength; ++i)
         {
             if (getNameByIndex((short)i).equals(name))
@@ -67,7 +67,7 @@ public class AttributeListHelper implements com.sun.star.xml.sax.XAttributeList
                 break;
             }
         }
-
+        
         if (!bFound)
         {
             Vector attribute = new Vector();
@@ -81,22 +81,22 @@ public class AttributeListHelper implements com.sun.star.xml.sax.XAttributeList
     public String getAttributeItem(short index, int itemIndex)
     {
         String item = null;
-
+        
         if (index>=0 && index<getLength())
         {
             Vector attribute = (Vector)m_AttributeList.get(index);
             item = (String)(attribute.get(itemIndex));
         }
-
+        
         return item;
     }
-
+    
     /* XAttributeList */
     public short getLength()
     {
         return (short)m_AttributeList.size();
     }
-
+    
     public String getNameByIndex(short i)
     {
         return getAttributeItem(i, 0);
@@ -111,12 +111,12 @@ public class AttributeListHelper implements com.sun.star.xml.sax.XAttributeList
     {
         return getAttributeItem(i, 2);
     }
-
+    
     public String getTypeByName(String aName)
     {
         int nLength = m_AttributeList.size();
         String type = null;
-
+        
         for (int i=0; i<nLength; ++i)
         {
             if (getNameByIndex((short)i).equals(aName))
@@ -125,15 +125,15 @@ public class AttributeListHelper implements com.sun.star.xml.sax.XAttributeList
                 break;
             }
         }
-
+        
         return type;
     }
-
+        
     public String getValueByName(String aName)
     {
         int nLength = m_AttributeList.size();
         String value = null;
-
+        
         for (int i=0; i<nLength; ++i)
         {
             if (getNameByIndex((short)i).equals(aName))
diff --git a/xmlsecurity/tools/uno/DomToTreeModelAdapter.java b/xmlsecurity/tools/uno/DomToTreeModelAdapter.java
index 709d0efa9515..9ca44256ad12 100644
--- a/xmlsecurity/tools/uno/DomToTreeModelAdapter.java
+++ b/xmlsecurity/tools/uno/DomToTreeModelAdapter.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,11 +35,11 @@ import java.util.Enumeration;
 import java.util.Vector;
 
 /*
- * This adapter converts the current Document (a DOM) into
- * a JTree model.
+ * This adapter converts the current Document (a DOM) into 
+ * a JTree model. 
  */
-class DomToTreeModelAdapter
-    implements javax.swing.tree.TreeModel
+class DomToTreeModelAdapter 
+    implements javax.swing.tree.TreeModel 
 {
     private Document m_document;
     private Vector m_listenerList = new Vector();
@@ -50,50 +50,50 @@ class DomToTreeModelAdapter
     }
 
     /*
-     * Basic TreeModel operations
+     * Basic TreeModel operations 
      */
-    public Object  getRoot()
+    public Object  getRoot() 
     {
         return new AdapterNode(m_document);
     }
 
-    public boolean isLeaf(Object aNode)
+    public boolean isLeaf(Object aNode) 
     {
         boolean rc = true;
-
+        
         /*
          * Determines whether the icon shows up to the left.
          * Return true for any node with no children.
          */
         AdapterNode node = (AdapterNode) aNode;
-
+        
         if (node.childCount() > 0)
         {
             rc = false;
         }
-
+        
         return rc;
     }
-
-    public int getChildCount(Object parent)
+    
+    public int getChildCount(Object parent) 
     {
         AdapterNode node = (AdapterNode) parent;
         return node.childCount();
     }
-
-    public Object getChild(Object parent, int index)
+    
+    public Object getChild(Object parent, int index) 
     {
         AdapterNode node = (AdapterNode) parent;
         return node.child(index);
     }
-
-    public int getIndexOfChild(Object parent, Object child)
+    
+    public int getIndexOfChild(Object parent, Object child) 
     {
         AdapterNode node = (AdapterNode) parent;
         return node.index((AdapterNode) child);
     }
-
-    public void valueForPathChanged(TreePath path, Object newValue)
+    
+    public void valueForPathChanged(TreePath path, Object newValue) 
     {
         /*
          * Null. We won't be making changes in the GUI
@@ -102,60 +102,60 @@ class DomToTreeModelAdapter
          */
     }
 
-    public void addTreeModelListener(TreeModelListener listener)
+    public void addTreeModelListener(TreeModelListener listener) 
     {
-        if ( listener != null
-            && ! m_listenerList.contains( listener ) )
+        if ( listener != null 
+            && ! m_listenerList.contains( listener ) ) 
         {
             m_listenerList.addElement( listener );
         }
     }
-
-    public void removeTreeModelListener(TreeModelListener listener)
+    
+    public void removeTreeModelListener(TreeModelListener listener) 
     {
-        if ( listener != null )
+        if ( listener != null ) 
         {
             m_listenerList.removeElement( listener );
         }
     }
-
-    public void fireTreeNodesChanged( TreeModelEvent e )
+    
+    public void fireTreeNodesChanged( TreeModelEvent e ) 
     {
         Enumeration listeners = m_listenerList.elements();
-        while ( listeners.hasMoreElements() )
+        while ( listeners.hasMoreElements() ) 
         {
-            TreeModelListener listener =
+            TreeModelListener listener = 
             (TreeModelListener) listeners.nextElement();
             listener.treeNodesChanged( e );
         }
-    }
+    } 
 
-    public void fireTreeNodesInserted( TreeModelEvent e )
+    public void fireTreeNodesInserted( TreeModelEvent e ) 
     {
         Enumeration listeners = m_listenerList.elements();
-        while ( listeners.hasMoreElements() )
+        while ( listeners.hasMoreElements() ) 
         {
             TreeModelListener listener =
             (TreeModelListener) listeners.nextElement();
             listener.treeNodesInserted( e );
         }
-    }
+    }   
 
-    public void fireTreeNodesRemoved( TreeModelEvent e )
+    public void fireTreeNodesRemoved( TreeModelEvent e ) 
     {
         Enumeration listeners = m_listenerList.elements();
-        while ( listeners.hasMoreElements() )
+        while ( listeners.hasMoreElements() ) 
         {
-            TreeModelListener listener =
+            TreeModelListener listener = 
             (TreeModelListener) listeners.nextElement();
             listener.treeNodesRemoved( e );
         }
-    }
+    }   
 
-    public void fireTreeStructureChanged( TreeModelEvent e )
+    public void fireTreeStructureChanged( TreeModelEvent e ) 
     {
         Enumeration listeners = m_listenerList.elements();
-        while ( listeners.hasMoreElements() )
+        while ( listeners.hasMoreElements() ) 
         {
             TreeModelListener listener =
             (TreeModelListener) listeners.nextElement();
diff --git a/xmlsecurity/tools/uno/EncryptionEntity.java b/xmlsecurity/tools/uno/EncryptionEntity.java
index 51f14b2bbf6b..49e1c8630618 100644
--- a/xmlsecurity/tools/uno/EncryptionEntity.java
+++ b/xmlsecurity/tools/uno/EncryptionEntity.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 @@ import com.sun.star.xml.crypto.sax.*;
 class EncryptionEntity extends SecurityEntity
 {
     private int m_nEncryptionElementCollectorId;
-
+    
     EncryptionEntity(
         XSecuritySAXEventKeeper xSAXEventKeeper,
         boolean isExporting,
@@ -55,13 +55,13 @@ class EncryptionEntity extends SecurityEntity
     {
         super(xSAXEventKeeper, xXMLSecurityContext, xXMLSignature,
              xXMLEncryption, xRemoteServiceManager, xRemoteContext);
-
+        
         m_nEncryptionElementCollectorId = m_xSAXEventKeeper.addSecurityElementCollector(
             ElementMarkPriority.AFTERMODIFY,
             true);
-
+            
         m_xSAXEventKeeper.setSecurityId(m_nEncryptionElementCollectorId, m_nSecurityId);
-
+        
         if (isExporting)
         {
             try
@@ -71,11 +71,11 @@ class EncryptionEntity extends SecurityEntity
                  */
                 Object encryptor = m_xRemoteServiceManager.createInstanceWithContext(
                     TestTool.ENCRYPTOR_COMPONENT, m_xRemoteContext);
-
-                m_xReferenceResolvedListener =
+                    
+                m_xReferenceResolvedListener = 
                     (XReferenceResolvedListener)UnoRuntime.queryInterface(
-                        XReferenceResolvedListener.class, encryptor);
-
+                        XReferenceResolvedListener.class, encryptor); 
+    
                 /*
                  * initializes the Encryptor.
                  */
@@ -89,11 +89,11 @@ class EncryptionEntity extends SecurityEntity
                 args[3] = m_xXMLSecurityContext.getSecurityEnvironment();
                 args[4] = m_xXMLEncryption;
                 xInitialization.initialize(args);
-
+                
                 /*
                  * sets encryption result listener.
                  */
-                XEncryptionResultBroadcaster m_xEncryptionResultBroadcaster =
+                XEncryptionResultBroadcaster m_xEncryptionResultBroadcaster = 
                     (XEncryptionResultBroadcaster)UnoRuntime.queryInterface(
                         XEncryptionResultBroadcaster.class, m_xReferenceResolvedListener);
                 m_xEncryptionResultBroadcaster.addEncryptionResultListener(
@@ -113,11 +113,11 @@ class EncryptionEntity extends SecurityEntity
                  */
                 Object decryptor = m_xRemoteServiceManager.createInstanceWithContext(
                     TestTool.DECRYPTOR_COMPONENT, m_xRemoteContext);
-
-                m_xReferenceResolvedListener =
+                    
+                m_xReferenceResolvedListener = 
                     (XReferenceResolvedListener)UnoRuntime.queryInterface(
-                        XReferenceResolvedListener.class, decryptor);
-
+                        XReferenceResolvedListener.class, decryptor); 
+    
                 /*
                  * initializes the Decryptor.
                  */
@@ -129,11 +129,11 @@ class EncryptionEntity extends SecurityEntity
                 args[3] = m_xXMLSecurityContext;
                 args[4] = m_xXMLEncryption;
                 xInitialization.initialize(args);
-
+                
                 /*
                  * sets decryption result listener.
                  */
-                XDecryptionResultBroadcaster m_xDecryptionResultBroadcaster =
+                XDecryptionResultBroadcaster m_xDecryptionResultBroadcaster = 
                     (XDecryptionResultBroadcaster)UnoRuntime.queryInterface(
                         XDecryptionResultBroadcaster.class, m_xReferenceResolvedListener);
                 m_xDecryptionResultBroadcaster.addDecryptionResultListener(
@@ -145,13 +145,13 @@ class EncryptionEntity extends SecurityEntity
                 e.printStackTrace();
             }
         }
-
+        
         /*
          * creates a Blocker.
          */
         int blockerId = m_xSAXEventKeeper.addBlocker();
         m_xSAXEventKeeper.setSecurityId(blockerId, m_nSecurityId);
-
+        
         try
         {
             XBlockerMonitor xBlockerMonitor = (XBlockerMonitor)UnoRuntime.queryInterface(
@@ -166,12 +166,12 @@ class EncryptionEntity extends SecurityEntity
         /*
          * configures the resolve listener for the encryption template.
          */
-        XReferenceResolvedBroadcaster xReferenceResolvedBroadcaster =
+        XReferenceResolvedBroadcaster xReferenceResolvedBroadcaster = 
             (XReferenceResolvedBroadcaster)UnoRuntime.queryInterface(
                 XReferenceResolvedBroadcaster.class, m_xSAXEventKeeper);
         xReferenceResolvedBroadcaster.addReferenceResolvedListener(m_nEncryptionElementCollectorId, m_xReferenceResolvedListener);
     }
-
+    
     /*
      * add the reference to this encryption.
      *
@@ -185,23 +185,23 @@ class EncryptionEntity extends SecurityEntity
     protected boolean setReference(boolean isExporting)
     {
         boolean rc = false;
-
+        
         int referenceId = m_xSAXEventKeeper.addSecurityElementCollector(
             isExporting?
             (ElementMarkPriority.AFTERMODIFY):(ElementMarkPriority.BEFOREMODIFY),
             true);
-
+                
         m_xSAXEventKeeper.setSecurityId(referenceId, m_nSecurityId);
 
-        XReferenceResolvedBroadcaster xReferenceResolvedBroadcaster =
+        XReferenceResolvedBroadcaster xReferenceResolvedBroadcaster = 
             (XReferenceResolvedBroadcaster)UnoRuntime.queryInterface(
                 XReferenceResolvedBroadcaster.class, m_xSAXEventKeeper);
         xReferenceResolvedBroadcaster.addReferenceResolvedListener(
             referenceId, m_xReferenceResolvedListener);
-
+            
         try
         {
-            XReferenceCollector xReferenceCollector =
+            XReferenceCollector xReferenceCollector = 
                 (XReferenceCollector)UnoRuntime.queryInterface(
                     XReferenceCollector.class, m_xReferenceResolvedListener);
             xReferenceCollector.setReferenceId(referenceId);
@@ -211,7 +211,7 @@ class EncryptionEntity extends SecurityEntity
             e.printStackTrace();
             rc = false;
         }
-
+        
         return rc;
     }
 }
diff --git a/xmlsecurity/tools/uno/ParsingThread.java b/xmlsecurity/tools/uno/ParsingThread.java
index f4bfea4a442e..adffbb271979 100644
--- a/xmlsecurity/tools/uno/ParsingThread.java
+++ b/xmlsecurity/tools/uno/ParsingThread.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,33 +41,33 @@ class ParsingThread
      * the Node which will be handled with in the next step
      */
     private Node m_node;
-
+    
     /*
      * the event to be handled in the next step.
      * true means endElement event, false otherwise.
      */
     private boolean m_bIsEndEvent;
-
+    
     /*
      * the document handler which receives generated SAX events
      */
     private XDocumentHandler m_xDocumentHandler;
-
+    
     /*
      * the TestTool which receives UI feedbacks
      */
     private TestTool m_testTool;
-
-
-        ParsingThread(Node node, XDocumentHandler xDocumentHandler, TestTool testTool)
+    
+         
+        ParsingThread(Node node, XDocumentHandler xDocumentHandler, TestTool testTool) 
         {
             m_node = node;
             m_xDocumentHandler = xDocumentHandler;
             m_testTool = testTool;
-
+            
             m_bIsEndEvent = false;
         }
-
+        
         /*
          * changes the document handler.
          */
@@ -75,7 +75,7 @@ class ParsingThread
         {
             this.m_xDocumentHandler = xDocumentHandler;
         }
-
+ 
         /*
          * sends the next SAX event.
          * when there is no further step, then false is returned,
@@ -84,7 +84,7 @@ class ParsingThread
         protected boolean nextStep()
         {
             boolean rc = true;
-
+            
             try
             {
                 String message;
@@ -103,11 +103,11 @@ class ParsingThread
                     break;
                 case Node.ELEMENT_NODE: /* startElement */
                     String nodeName = m_node.getNodeName();
-                    message = "startElement:"+nodeName;
+                    message = "startElement:"+nodeName;			
                     NamedNodeMap attrs = m_node.getAttributes();
-
+                    
                     AttributeListHelper attributeListHelper = new AttributeListHelper();
-
+                    
                     int length = attrs.getLength();
                     for (int i=0; i<length; ++i)
                     {
@@ -115,10 +115,10 @@ class ParsingThread
                         attributeListHelper.setAttribute(attr.getName(), "CDATA", attr.getValue());
                         message += " "+attr.getName()+"='"+attr.getValue()+"'";
                     }
-
+                    
                     m_testTool.updatesCurrentSAXEventInformation(message);
                     m_xDocumentHandler.startElement(m_node.getNodeName(), attributeListHelper);
-
+                    
                     m_testTool.updatesUIs();
                     break;
                 case Node.TEXT_NODE: /* characters */
@@ -138,16 +138,16 @@ class ParsingThread
                     m_testTool.updatesUIs();
                     break;
                 }
-
+                
                 /*
                  * figures out the event for the next step.
                  */
-                switch (type)
+                switch (type) 
                 {
-                    case Node.DOCUMENT_NODE:
+                    case Node.DOCUMENT_NODE: 
                     case Node.ELEMENT_NODE:
-                        if (m_node.hasChildNodes())
-                        /*
+                        if (m_node.hasChildNodes()) 
+                        /* 
                          * for a Document node or an Element node,
                          * if the node has children, then the next event will be for its
                          * first child node.
@@ -155,27 +155,27 @@ class ParsingThread
                         {
                             m_node = m_node.getFirstChild();
                         }
-                        else
+                        else 
                         /*
                          * otherwise, the next event will be endElement.
                          */
                         {
-                            m_bIsEndEvent = true;
+                            m_bIsEndEvent = true; 
                         }
-                        break;
+                        break; 
                     case Node.TEXT_NODE:
                     case Node.PROCESSING_INSTRUCTION_NODE:
-                    case Node.COMMENT_NODE:
+                    case Node.COMMENT_NODE: 
                         Node nextNode = m_node.getNextSibling();
-                        if (nextNode != null)
+                        if (nextNode != null) 
                         /*
                          * for other kinds of node,
                          * if it has a next sibling, then the next event will be for that
                          * sibling.
                          */
                         {
-                            m_node = nextNode;
-                        }
+                            m_node = nextNode; 
+                        } 
                         else
                         /*
                          * otherwise, the next event will be the endElement for the node's
@@ -183,9 +183,9 @@ class ParsingThread
                          */
                         {
                             m_node = m_node.getParentNode();
-                            m_bIsEndEvent = true;
+                            m_bIsEndEvent = true; 
                         }
-                        break;
+                        break; 
                 }
             }
             else
@@ -196,20 +196,20 @@ class ParsingThread
                 switch (type)
                 {
                     case Node.DOCUMENT_NODE: /* endDocument */
-                        m_testTool.updatesCurrentSAXEventInformation("endDocument");
-                        m_xDocumentHandler.endDocument();
+                        m_testTool.updatesCurrentSAXEventInformation("endDocument"); 
+                        m_xDocumentHandler.endDocument(); 
                         m_testTool.updatesUIs();
-
+                        
                         /*
                          * no further steps.
                          */
                         rc = false;
                         break;
                     case Node.ELEMENT_NODE: /* endElement */
-                        m_testTool.updatesCurrentSAXEventInformation("endElement:"+m_node.getNodeName());
-                        m_xDocumentHandler.endElement(m_node.getNodeName());
+                        m_testTool.updatesCurrentSAXEventInformation("endElement:"+m_node.getNodeName()); 
+                        m_xDocumentHandler.endElement(m_node.getNodeName()); 
                         m_testTool.updatesUIs();
-
+                            
                         Node nextNode = m_node.getNextSibling();
                         if (nextNode != null)
                         /*
@@ -235,13 +235,13 @@ class ParsingThread
         catch(  com.sun.star.xml.sax.SAXException e)
         {
             e.printStackTrace();
-
+            
             /*
              * forces to end.
              */
             rc = false;
         }
-
+        
         return rc;
     }
 }
diff --git a/xmlsecurity/tools/uno/SAXEventCollector.java b/xmlsecurity/tools/uno/SAXEventCollector.java
index e94c55252083..cb796515bcb1 100644
--- a/xmlsecurity/tools/uno/SAXEventCollector.java
+++ b/xmlsecurity/tools/uno/SAXEventCollector.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,10 +27,10 @@
 
 package com.sun.star.xml.security.uno;
 
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.DocumentBuilder; 
+import javax.xml.parsers.DocumentBuilderFactory;  
 import javax.xml.parsers.ParserConfigurationException;
-
+ 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -51,73 +51,73 @@ class SAXEventCollector implements XDocumentHandler
      * the document which keeps received SAX events
      */
     private Document m_document;
-
+    
     /*
      * the current Element to which the next received
      * SAX event will be added.
      */
     private Node m_currentElement;
-
+    
     /*
      * the TestTool which receives UI feedbacks
      */
     private TestTool m_testTool;
-
+    
     /*
      * whether displays information on console.
      */
     private boolean m_systemDisplay;
-
+    
     SAXEventCollector(TestTool testTool)
     {
         this(testTool, false);
     }
-
+    
     SAXEventCollector(TestTool testTool, boolean sysDis)
     {
         m_systemDisplay = sysDis;
         m_testTool = testTool;
-
+        
         DocumentBuilderFactory factory =
             DocumentBuilderFactory.newInstance();
-
-        try
+            
+        try 
         {
             DocumentBuilder builder = factory.newDocumentBuilder();
             m_document = builder.newDocument();
-
+            
             m_currentElement = m_document;
         }
         catch (ParserConfigurationException pce) {
             pce.printStackTrace();
         }
     }
-
+    
     protected Document getDocument()
     {
         return m_document;
     }
-
+    
     protected Node getCurrentElement()
     {
         return m_currentElement;
     }
-
+    
         /*
          * XDocumentHandler
          */
-    public void  startDocument ()
+    public void  startDocument ()	
     {
     }
-
+    
     public void endDocument()
     {
     }
-
+        
     public void startElement (String str, com.sun.star.xml.sax.XAttributeList xattribs)
     {
         Element newElement = m_document.createElement(str);
-
+        
         if (xattribs !=null)
         {
             int length = xattribs.getLength();
@@ -128,15 +128,15 @@ class SAXEventCollector implements XDocumentHandler
                     xattribs.getValueByIndex(i));
             }
         }
-
+        
         if (m_systemDisplay)
         {
             System.out.println("startElement:"+m_currentElement.toString());
         }
-
+            
         m_currentElement.appendChild(newElement);
         m_currentElement = newElement;
-
+        
         if (m_testTool != null)
         {
             m_testTool.updatesUIs();
@@ -149,19 +149,19 @@ class SAXEventCollector implements XDocumentHandler
         {
             System.out.println("endElement:"+str+" "+m_currentElement.toString());
         }
-
+        
             m_currentElement = m_currentElement.getParentNode();
         if (m_systemDisplay)
         {
             System.out.println("----> "+m_currentElement.toString());
         }
-
+        
         if (m_testTool != null)
         {
             m_testTool.updatesUIs();
         }
     }
-
+    
     public void characters(String str)
     {
             Text newText = m_document.createTextNode(str);
@@ -171,14 +171,14 @@ class SAXEventCollector implements XDocumentHandler
             m_testTool.updatesUIs();
         }
     }
-
+    
     public void ignorableWhitespace(String str)
     {
     }
-
+    
     public void processingInstruction(String aTarget, String aData)
     {
-        ProcessingInstruction newPI
+        ProcessingInstruction newPI 
             = m_document.createProcessingInstruction(aTarget, aData);
         m_currentElement.appendChild(newPI);
         if (m_testTool != null)
@@ -187,7 +187,7 @@ class SAXEventCollector implements XDocumentHandler
         }
     }
 
-    public void setDocumentLocator (com.sun.star.xml.sax.XLocator xLocator )
+    public void setDocumentLocator (com.sun.star.xml.sax.XLocator xLocator ) 
         throws com.sun.star.xml.sax.SAXException
     {
     }
diff --git a/xmlsecurity/tools/uno/SAXEventPrinter.java b/xmlsecurity/tools/uno/SAXEventPrinter.java
index d841926bdd13..7dc518a3f731 100644
--- a/xmlsecurity/tools/uno/SAXEventPrinter.java
+++ b/xmlsecurity/tools/uno/SAXEventPrinter.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
@@ -48,25 +48,25 @@ class SAXEventPrinter implements XDocumentHandler
      * how many spaces as the indent of line
      */
     private int m_nIndent;
-
+    
     /*
-     * whether a NEW LINE character need to be appended to
+     * whether a NEW LINE character need to be appended to 
      * each line
      */
     private boolean m_bIsFormatted;
-
+    
     /*
      * the output stream to write
      */
     private FileOutputStream m_fileOutputStream;
-
+    
     SAXEventPrinter(FileOutputStream fileOutputStream, boolean isFormatted)
     {
         m_nIndent = 0;
         m_fileOutputStream = fileOutputStream;
         m_bIsFormatted = isFormatted;
     }
-
+    
     protected static void outputIndent(int m_nIndent, FileOutputStream fileOutputStream)
         throws IOException
     {
@@ -75,7 +75,7 @@ class SAXEventPrinter implements XDocumentHandler
             fileOutputStream.write(" ".getBytes());
         }
     }
-
+    
     /*
      * displays the tree of a Node.
      */
@@ -88,67 +88,67 @@ class SAXEventPrinter implements XDocumentHandler
             String message;
             NodeList children;
             int i, length;
-
+            
             switch (type)
             {
             case Node.DOCUMENT_NODE:
                 children = node.getChildNodes();
-                length = children.getLength();
+                length = children.getLength(); 
                 for (i=0; i<length; ++i)
                 {
                     display(children.item(i), indent+2, fileOutputStream, isFormatted);
                 }
-
+                
                 break;
-
+                
             case Node.ELEMENT_NODE:
                 message = new String("<"+node.getNodeName());
                 NamedNodeMap attrs = node.getAttributes();
-
+                
                 length = attrs.getLength();
                 for (i=0; i<length; ++i)
                 {
                     Attr attr = (Attr)attrs.item(i);
                     message += " "+attr.getNodeName()+"=\""+attr.getNodeValue()+"\"";
                 }
-
+                
                 message += ">";
-
+                
                 if (isFormatted)
                 {
                     outputIndent(indent, fileOutputStream);
                 }
-
+                
                 fileOutputStream.write(message.getBytes("UTF-8"));
-
+                
                 if (isFormatted)
                 {
                     fileOutputStream.write("\n".getBytes());
                 }
-
+                
                 children = node.getChildNodes();
                 length = children.getLength();
                 for (i=0; i<length; ++i)
                 {
                     display(children.item(i), indent+2, fileOutputStream, isFormatted);
                 }
-
+                
                 if (isFormatted)
                 {
                     outputIndent(indent, fileOutputStream);
                 }
-
+                
                 fileOutputStream.write("</".getBytes());
                 fileOutputStream.write(node.getNodeName().getBytes("UTF-8"));
                 fileOutputStream.write(">".getBytes());
-
+                
                 if (isFormatted)
                 {
                     fileOutputStream.write("\n".getBytes());
                 }
-
+                
                 break;
-
+                
             case Node.TEXT_NODE:
                 message = node.getNodeValue();
                 if (message != null )
@@ -157,32 +157,32 @@ class SAXEventPrinter implements XDocumentHandler
                     {
                         outputIndent(indent, fileOutputStream);
                     }
-
+                    
                     fileOutputStream.write(node.getNodeValue().getBytes("UTF-8"));
-
+                    
                     if (isFormatted)
                     {
                         fileOutputStream.write("\n".getBytes());
                     }
                 }
                 break;
-
+                
             case Node.PROCESSING_INSTRUCTION_NODE:
                 if (isFormatted)
                 {
                     outputIndent(indent, fileOutputStream);
                 }
-
+                
                 fileOutputStream.write("<?".getBytes());
                 fileOutputStream.write(node.getNodeName().getBytes("UTF-8"));
                 fileOutputStream.write(node.getNodeValue().getBytes("UTF-8"));
                 fileOutputStream.write("?>".getBytes());
-
+                
                 if (isFormatted)
                 {
                     fileOutputStream.write("\n".getBytes());
                 }
-
+                
                 break;
             default:
                 break;
@@ -193,20 +193,20 @@ class SAXEventPrinter implements XDocumentHandler
     /*
      * XDocumentHandler
      */
-    public void  startDocument ()
+    public void  startDocument ()	
     {
     }
-
+    
     public void endDocument()
     {
     }
-
+    
     public void startElement (String str, com.sun.star.xml.sax.XAttributeList xattribs)
     {
         try
         {
             String message;
-
+            
             message = new String("<"+str);
             if (xattribs !=null)
             {
@@ -217,19 +217,19 @@ class SAXEventPrinter implements XDocumentHandler
                 }
             }
             message += ">";
-
+            
             if (m_bIsFormatted)
             {
                 outputIndent(m_nIndent, m_fileOutputStream);
             }
-
+            
             m_fileOutputStream.write(message.getBytes("UTF-8"));
-
+            
             if (m_bIsFormatted)
             {
                 m_fileOutputStream.write("\n".getBytes());
             }
-
+            
             m_nIndent += 2;
         }
         catch (IOException e)
@@ -247,11 +247,11 @@ class SAXEventPrinter implements XDocumentHandler
             {
                 outputIndent(m_nIndent, m_fileOutputStream);
             }
-
+            
             m_fileOutputStream.write("</".getBytes());
             m_fileOutputStream.write(str.getBytes("UTF-8"));
             m_fileOutputStream.write(">".getBytes());
-
+            
             if (m_bIsFormatted)
             {
                 m_fileOutputStream.write("\n".getBytes());
@@ -262,7 +262,7 @@ class SAXEventPrinter implements XDocumentHandler
             e.printStackTrace();
         }
     }
-
+    
     public void characters(String str)
     {
         try
@@ -271,9 +271,9 @@ class SAXEventPrinter implements XDocumentHandler
             {
                 outputIndent(m_nIndent, m_fileOutputStream);
             }
-
+            
             m_fileOutputStream.write(str.getBytes("UTF-8"));
-
+            
             if (m_bIsFormatted)
             {
                 m_fileOutputStream.write("\n".getBytes());
@@ -284,11 +284,11 @@ class SAXEventPrinter implements XDocumentHandler
             e.printStackTrace();
         }
     }
-
+    
     public void ignorableWhitespace(String str)
     {
     }
-
+    
     public void processingInstruction(String aTarget, String aData)
     {
         try
@@ -297,11 +297,11 @@ class SAXEventPrinter implements XDocumentHandler
             {
                 outputIndent(m_nIndent, m_fileOutputStream);
             }
-
+            
             m_fileOutputStream.write("<?".getBytes());
             m_fileOutputStream.write(aTarget.getBytes("UTF-8"));
             m_fileOutputStream.write("?>".getBytes());
-
+            
             if (m_bIsFormatted)
             {
                 m_fileOutputStream.write("\n".getBytes());
@@ -313,7 +313,7 @@ class SAXEventPrinter implements XDocumentHandler
         }
     }
 
-    public void setDocumentLocator (com.sun.star.xml.sax.XLocator xLocator )
+    public void setDocumentLocator (com.sun.star.xml.sax.XLocator xLocator ) 
         throws com.sun.star.xml.sax.SAXException
     {
     }
diff --git a/xmlsecurity/tools/uno/SecurityEntity.java b/xmlsecurity/tools/uno/SecurityEntity.java
index 85ef5ed49891..8f6e66551437 100644
--- a/xmlsecurity/tools/uno/SecurityEntity.java
+++ b/xmlsecurity/tools/uno/SecurityEntity.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 @@ class SecurityEntity
      */
     private static int m_nNextSecurityId = 1;
     protected int m_nSecurityId;
-
+    
     /*
      * xml security related components
      */
@@ -62,7 +62,7 @@ class SecurityEntity
      * the uri of the key material of this security entity
      */
     private String m_keyURI;
-
+    
     SecurityEntity(
         XSecuritySAXEventKeeper xSAXEventKeeper,
         XXMLSecurityContext xXMLSecurityContext,
@@ -77,7 +77,7 @@ class SecurityEntity
         m_xXMLEncryption = xXMLEncryption;
         m_xRemoteServiceManager = xRemoteServiceManager;
         m_xRemoteContext = xRemoteContext;
-
+        
         m_nSecurityId = getNextSecurityId();
         m_keyURI = null;
     }
@@ -85,7 +85,7 @@ class SecurityEntity
 /**************************************************************************************
  * private methods
  **************************************************************************************/
-
+    
     /*
      * generates a new security id.
      */
@@ -98,7 +98,7 @@ class SecurityEntity
 /**************************************************************************************
  * protected methods
  **************************************************************************************/
-
+    
     /*
      * notifies the key collector about the key id, this key id
      * is used to ask the SAXEventKeeper to release the bufferred
@@ -110,7 +110,7 @@ class SecurityEntity
     {
         try
         {
-            XKeyCollector xKeyCollector =
+            XKeyCollector xKeyCollector = 
                 (XKeyCollector)UnoRuntime.queryInterface(
                     XKeyCollector.class, m_xReferenceResolvedListener);
             xKeyCollector.setKeyId(id);
@@ -120,7 +120,7 @@ class SecurityEntity
             e.printStackTrace();
         }
     }
-
+    
     /*
      * set the key uri, which will be the value of the id attribute
      * of the key element
@@ -129,17 +129,17 @@ class SecurityEntity
     {
         m_keyURI = new String(uri);
     }
-
+    
     protected XReferenceResolvedListener getReferenceListener()
     {
         return m_xReferenceResolvedListener;
     }
-
+    
     protected int getSecurityId()
     {
         return m_nSecurityId;
     }
-
+    
     /*
      * configures the key material to the security entity.
      *
@@ -154,7 +154,7 @@ class SecurityEntity
     protected boolean setKey(String uri, boolean isExporting)
     {
         boolean rc = false;
-
+        
         if (m_keyURI != null &&
             m_keyURI.equals(uri))
         {
@@ -162,40 +162,40 @@ class SecurityEntity
                 isExporting?
                 (ElementMarkPriority.BEFOREMODIFY):(ElementMarkPriority.AFTERMODIFY),
                 false );
-
+                
             setKeyId(referenceId);
             m_xSAXEventKeeper.setSecurityId(referenceId, m_nSecurityId);
 
-            XReferenceResolvedBroadcaster xReferenceResolvedBroadcaster =
+            XReferenceResolvedBroadcaster xReferenceResolvedBroadcaster = 
                 (XReferenceResolvedBroadcaster)UnoRuntime.queryInterface(
                     XReferenceResolvedBroadcaster.class, m_xSAXEventKeeper);
-
+            
             xReferenceResolvedBroadcaster.addReferenceResolvedListener(referenceId, m_xReferenceResolvedListener);
-
+                
             rc = true;
         }
-
+        
         return rc;
     }
-
+    
     /*
      * ends this misstion, asks the security engine to clear up all
      * resources.
      */
     protected boolean endMission()
     {
-        XMissionTaker xMissionTaker =
+        XMissionTaker xMissionTaker = 
             (XMissionTaker)UnoRuntime.queryInterface(
                 XMissionTaker.class, m_xReferenceResolvedListener);
-
+        
         boolean rc = xMissionTaker.endMission();
-
+        
         m_xXMLSecurityContext = null;
         m_xXMLSignature = null;
         m_xXMLEncryption = null;
         m_xReferenceResolvedListener = null;
         m_xSAXEventKeeper = null;
-
+        
         return rc;
     }
 }
diff --git a/xmlsecurity/tools/uno/SignatureEntity.java b/xmlsecurity/tools/uno/SignatureEntity.java
index d02ad3ee74d7..da69beeb4407 100644
--- a/xmlsecurity/tools/uno/SignatureEntity.java
+++ b/xmlsecurity/tools/uno/SignatureEntity.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.XComponentContext;
 
 import com.sun.star.xml.crypto.*;
 import com.sun.star.xml.crypto.sax.*;
-
+    
 /*
  * this class maintains the data for a signature operation.
  */
@@ -45,10 +45,10 @@ class SignatureEntity extends SecurityEntity
 {
     private Vector m_vReferenceIds;
     private int    m_nSignatureElementCollectorId;
-
+    
     SignatureEntity(
         XSecuritySAXEventKeeper xSAXEventKeeper,
-        boolean isExporting,
+        boolean isExporting, 
         Object resultListener,
         XXMLSecurityContext xXMLSecurityContext,
         XXMLSignature xXMLSignature,
@@ -58,9 +58,9 @@ class SignatureEntity extends SecurityEntity
     {
         super(xSAXEventKeeper, xXMLSecurityContext, xXMLSignature,
             xXMLEncryption, xRemoteServiceManager, xRemoteContext);
-
+        
         m_vReferenceIds = new Vector();
-
+        
         if (isExporting)
         {
             m_nSignatureElementCollectorId = m_xSAXEventKeeper.addSecurityElementCollector(
@@ -70,24 +70,24 @@ class SignatureEntity extends SecurityEntity
             m_xSAXEventKeeper.setSecurityId(m_nSignatureElementCollectorId, m_nSecurityId);
 
             try
-            {
+            {	
                 /*
                  * creates a SignatureCreator.
                  */
                 Object signatureCreator = m_xRemoteServiceManager.createInstanceWithContext(
                     TestTool.SIGNATURECREATOR_COMPONENT, m_xRemoteContext);
-
-                m_xReferenceResolvedListener =
+                
+                m_xReferenceResolvedListener = 
                     (XReferenceResolvedListener)UnoRuntime.queryInterface(
-                        XReferenceResolvedListener.class, signatureCreator);
-
+                        XReferenceResolvedListener.class, signatureCreator); 
+                            
                             /*
                              * initializes the SignatureCreator.
                              */
-                XInitialization xInitialization =
+                XInitialization xInitialization = 
                     (XInitialization)UnoRuntime.queryInterface(
                         XInitialization.class, m_xReferenceResolvedListener);
-
+                    
                 Object args[]=new Object[5];
                 args[0] = new Integer(m_nSecurityId).toString();
                 args[1] = m_xSAXEventKeeper;
@@ -95,21 +95,21 @@ class SignatureEntity extends SecurityEntity
                 args[3] = m_xXMLSecurityContext.getSecurityEnvironment();
                 args[4] = m_xXMLSignature;
                 xInitialization.initialize(args);
-
+                
                 /*
                  * creates a Blocker.
                  */
                 int blockerId = m_xSAXEventKeeper.addBlocker();
                 m_xSAXEventKeeper.setSecurityId(blockerId, m_nSecurityId);
-
+            
                 XBlockerMonitor xBlockerMonitor = (XBlockerMonitor)UnoRuntime.queryInterface(
                     XBlockerMonitor.class, m_xReferenceResolvedListener);
                 xBlockerMonitor.setBlockerId(blockerId);
-
+                
                 /*
                  * sets signature creation result listener.
                  */
-                XSignatureCreationResultBroadcaster xSignatureCreationResultBroadcaster =
+                XSignatureCreationResultBroadcaster xSignatureCreationResultBroadcaster = 
                     (XSignatureCreationResultBroadcaster)UnoRuntime.queryInterface(
                         XSignatureCreationResultBroadcaster.class, m_xReferenceResolvedListener);
                 xSignatureCreationResultBroadcaster.addSignatureCreationResultListener(
@@ -120,15 +120,15 @@ class SignatureEntity extends SecurityEntity
             {
                 e.printStackTrace();
             }
-
+                
         }
         else
         {
             m_nSignatureElementCollectorId = m_xSAXEventKeeper.addSecurityElementCollector(
                 ElementMarkPriority.BEFOREMODIFY, false);
-
+                
             m_xSAXEventKeeper.setSecurityId(m_nSignatureElementCollectorId, m_nSecurityId);
-
+            
             try
             {
                 /*
@@ -136,15 +136,15 @@ class SignatureEntity extends SecurityEntity
                  */
                 Object signatureVerifier = m_xRemoteServiceManager.createInstanceWithContext(
                     TestTool.SIGNATUREVERIFIER_COMPONENT, m_xRemoteContext);
-
-                m_xReferenceResolvedListener =
+                    
+                m_xReferenceResolvedListener = 
                     (XReferenceResolvedListener)UnoRuntime.queryInterface(
-                        XReferenceResolvedListener.class, signatureVerifier);
-
+                        XReferenceResolvedListener.class, signatureVerifier); 
+                        
                             /*
                              * initializes the SignatureVerifier.
                              */
-                XInitialization xInitialization =
+                XInitialization xInitialization = 
                     (XInitialization)UnoRuntime.queryInterface(
                         XInitialization.class, m_xReferenceResolvedListener);
                 Object args[]=new Object[5];
@@ -154,11 +154,11 @@ class SignatureEntity extends SecurityEntity
                 args[3] = m_xXMLSecurityContext;
                 args[4] = m_xXMLSignature;
                 xInitialization.initialize(args);
-
+                
                 /*
                  * sets signature verify result listener.
                  */
-                XSignatureVerifyResultBroadcaster xSignatureVerifyResultBroadcaster =
+                XSignatureVerifyResultBroadcaster xSignatureVerifyResultBroadcaster = 
                     (XSignatureVerifyResultBroadcaster)UnoRuntime.queryInterface(
                         XSignatureVerifyResultBroadcaster.class, m_xReferenceResolvedListener);
                 xSignatureVerifyResultBroadcaster.addSignatureVerifyResultListener(
@@ -174,7 +174,7 @@ class SignatureEntity extends SecurityEntity
         /*
          * configures the resolve listener for the signature template.
          */
-        XReferenceResolvedBroadcaster xReferenceResolvedBroadcaster =
+        XReferenceResolvedBroadcaster xReferenceResolvedBroadcaster = 
             (XReferenceResolvedBroadcaster)UnoRuntime.queryInterface(
                 XReferenceResolvedBroadcaster.class, m_xSAXEventKeeper);
         xReferenceResolvedBroadcaster.addReferenceResolvedListener(
@@ -192,7 +192,7 @@ class SignatureEntity extends SecurityEntity
     private boolean hasReference(String id)
     {
         boolean rc = false;
-
+        
         int length = m_vReferenceIds.size();
         for (int i=0; i<length; ++i)
         {
@@ -202,15 +202,15 @@ class SignatureEntity extends SecurityEntity
                 break;
             }
         }
-
+        
         return rc;
     }
-
+    
 
 /**************************************************************************************
  * protected methods
  **************************************************************************************/
-
+    
     /*
      * adds a new reference id.
      */
@@ -218,7 +218,7 @@ class SignatureEntity extends SecurityEntity
     {
         m_vReferenceIds.add(referenceId);
     }
-
+    
     /*
      * notifies how many reference in this signature.
      */
@@ -226,7 +226,7 @@ class SignatureEntity extends SecurityEntity
     {
         try
         {
-            XReferenceCollector xReferenceCollector =
+            XReferenceCollector xReferenceCollector = 
                 (XReferenceCollector)UnoRuntime.queryInterface(
                     XReferenceCollector.class, m_xReferenceResolvedListener);
             xReferenceCollector.setReferenceCount(m_vReferenceIds.size());
@@ -236,7 +236,7 @@ class SignatureEntity extends SecurityEntity
             e.printStackTrace();
         }
     }
-
+    
     /*
      * tries to add a reference to this signature.
      *
@@ -251,25 +251,25 @@ class SignatureEntity extends SecurityEntity
     protected boolean setReference(String id, boolean isExporting)
     {
         boolean rc = false;
-
+        
         if (hasReference(id))
         {
             int referenceId = m_xSAXEventKeeper.addSecurityElementCollector(
                 isExporting?
                 (ElementMarkPriority.AFTERMODIFY):(ElementMarkPriority.BEFOREMODIFY),
                 false );
-
+                
             m_xSAXEventKeeper.setSecurityId(referenceId, m_nSecurityId);
 
-            XReferenceResolvedBroadcaster xReferenceResolvedBroadcaster =
+            XReferenceResolvedBroadcaster xReferenceResolvedBroadcaster = 
                 (XReferenceResolvedBroadcaster)UnoRuntime.queryInterface(
                     XReferenceResolvedBroadcaster.class, m_xSAXEventKeeper);
             xReferenceResolvedBroadcaster.addReferenceResolvedListener(
                 referenceId, m_xReferenceResolvedListener);
-
+            
             try
             {
-                XReferenceCollector xReferenceCollector =
+                XReferenceCollector xReferenceCollector = 
                     (XReferenceCollector)UnoRuntime.queryInterface(
                         XReferenceCollector.class, m_xReferenceResolvedListener);
                 xReferenceCollector.setReferenceId(referenceId);
@@ -278,7 +278,7 @@ class SignatureEntity extends SecurityEntity
             {
                 e.printStackTrace();
             }
-
+                
             rc = true;
         }
 
diff --git a/xmlsecurity/tools/uno/TestTool.java b/xmlsecurity/tools/uno/TestTool.java
index 6c87b34bbb43..4be3370f59f6 100644
--- a/xmlsecurity/tools/uno/TestTool.java
+++ b/xmlsecurity/tools/uno/TestTool.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,8 +27,8 @@
 
 package com.sun.star.xml.security.uno;
 
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.DocumentBuilder; 
+import javax.xml.parsers.DocumentBuilderFactory;  
 import javax.xml.parsers.ParserConfigurationException;
 
 import java.io.File;
@@ -93,7 +93,7 @@ import com.sun.star.xml.sax.XDocumentHandler;
 
 import com.sun.star.xml.crypto.*;
 import com.sun.star.xml.crypto.sax.*;
-
+    
 public class TestTool extends JFrame implements ActionListener
 {
     /*
@@ -104,7 +104,7 @@ public class TestTool extends JFrame implements ActionListener
     public static String ENCRYPTOR_COMPONENT = "com.sun.star.xml.crypto.sax.Encryptor";
     public static String DECRYPTOR_COMPONENT = "com.sun.star.xml.crypto.sax.Decryptor";
     public static String SAXEVENTKEEPER_COMPONENT = "com.sun.star.xml.crypto.sax.SAXEventKeeper";
-
+     
     /*
      * Java-based component names
      */
@@ -112,7 +112,7 @@ public class TestTool extends JFrame implements ActionListener
     public static String XMLSIGNATURE_COMPONENT_JAVA = "com.sun.star.xml.security.bridge.jxsec.XMLSignature_JxsecImpl";
     public static String XMLENCRYPTION_COMPONENT_JAVA = "com.sun.star.xml.security.bridge.jxsec.XMLEncryption_JxsecImpl";
     public static String XMLDOCUMENTWRAPPER_COMPONENT_JAVA = "com.sun.star.xml.security.bridge.jxsec.XMLDocumentWrapper_JxsecImpl";
-
+                    
     /*
      * C-based component names
      */
@@ -120,19 +120,19 @@ public class TestTool extends JFrame implements ActionListener
     public static String XMLSIGNATURE_COMPONENT_C = "com.sun.star.xml.crypto.XMLSignature";
     public static String XMLENCRYPTION_COMPONENT_C = "com.sun.star.xml.crypto.XMLEncryption";
     public static String XMLDOCUMENTWRAPPER_COMPONENT_C = "com.sun.star.xml.wrapper.XMLDocumentWrapper";
-
+    
     /* url resolver name */
     public static String UNOURLRESOLVER = "com.sun.star.bridge.UnoUrlResolver";
-
+    
     /*
      * connection URL
      */
     private String m_unoURL = "uno:socket,host=localhost,port=2002;urp;StarOffice.ServiceManager";
-
+    
     /* key file */
     private String m_javaTokenFile = null;
     private String m_nssTokenPath = null;
-
+    
     /* User Interfaces */
     private JButton m_goButton;
     private JButton m_stepButton;
@@ -151,21 +151,21 @@ public class TestTool extends JFrame implements ActionListener
     private JLabel m_saxChainLabel;
     private JTextField m_saxEventText;
     private JTable m_unsolvedReferenceTable;
-
+    
     /*
-     * whether a batch file is running,
-     * if so, no message box is popped up
+     * whether a batch file is running, 
+     * if so, no message box is popped up 
      */
     private boolean m_bIsBatchRunning = false;
-
-    /*
+    
+    /* 
      * whether the UI needs to be updated.
      * when user click the "go" button, the UI needs
      * not to be updated step by step for performance
      * reason
      */
     private boolean m_bIsUIUpdateSuppressed = false;
-
+    
     /*
      * three DOM tree adapter
      */
@@ -174,33 +174,33 @@ public class TestTool extends JFrame implements ActionListener
     private DomToTreeModelAdapter m_rightTreeModelAdapter;
 
     /*
-     * the current directory, which reserves the default
+     * the current directory, which reserves the default 
      * location when user open/save a file.
      */
     private File m_currentDirectory = null;
-
+    
     /*
      * the log file
      */
     private FileOutputStream m_logFileOutputStream = null;
-
+    
     /*
      * the thread which is parsing the current XML
      * file
      */
     private ParsingThread m_parsingThread;
-
+    
     /*
      * whether is exporting or importing
      */
     private boolean m_bIsExporting;
-
+    
     /*
      * whether java based component or c based component
      * is used now
      */
     private boolean m_bIsJavaBased;
-
+    
     /*
      * XML security component interface
      */
@@ -221,10 +221,10 @@ public class TestTool extends JFrame implements ActionListener
      * security framework controller
      */
     private XMLSecurityFrameworkController m_xmlSecurityFrameworkController = null;
-
+    
     /* org.w3c.dom.Document */
     private Document m_document;
-
+    
     /* represents whether "Go" or "Step" */
     private boolean stepMode = true;
 
@@ -245,55 +245,55 @@ public class TestTool extends JFrame implements ActionListener
         m_leftTreeModelAdapter = new DomToTreeModelAdapter(m_document);
         m_middleTreeModelAdapter = new DomToTreeModelAdapter(m_document);
         m_rightTreeModelAdapter = new DomToTreeModelAdapter(m_document);
-
+            
         m_parsingThread = null;
-
+            
         m_leftTree.setModel(m_leftTreeModelAdapter);
         m_middleTree.setModel(m_middleTreeModelAdapter);
         m_rightTree.setModel(m_rightTreeModelAdapter);
     }
-
+    
     /*
      * constructs the user interface.
      */
     private Container buildUI(int width, int height)
     {
         JPanel mainPanel = new JPanel();
-
+        
         int frameHeight = height-40;
         int leftWindowWidth = (width-40)/3;
         int middleWindowWidth = leftWindowWidth;
         int rightWindowWidth = leftWindowWidth;
         int leftPaneWidth = leftWindowWidth+middleWindowWidth;
         int frameWidth = leftPaneWidth + rightWindowWidth;
-
+    
         /* Make a nice border */
         EmptyBorder emptyBorder = new EmptyBorder(5,5,5,5);
         BevelBorder bevelBorder = new BevelBorder(BevelBorder.LOWERED);
         CompoundBorder compoundBorder = new CompoundBorder(emptyBorder,bevelBorder);
         mainPanel.setBorder(new CompoundBorder(compoundBorder,emptyBorder));
-
+        
         /* Set up the tree */
         m_leftTreeModelAdapter = new DomToTreeModelAdapter(m_document);
         m_middleTreeModelAdapter = new DomToTreeModelAdapter(m_document);
         m_rightTreeModelAdapter = new DomToTreeModelAdapter(m_document);
-
+        
         m_leftTree = new JTree(m_leftTreeModelAdapter);
         m_leftTextArea = new JTextArea();
         m_middleTree = new JTree(m_middleTreeModelAdapter);
         m_rightTree = new JTree(m_rightTreeModelAdapter);
-
+        
         ToolTipManager.sharedInstance().registerComponent(m_leftTree);
         ToolTipManager.sharedInstance().registerComponent(m_middleTree);
         ToolTipManager.sharedInstance().registerComponent(m_rightTree);
-
+        
         /* Builds left tab pane */
         JScrollPane leftTreePane = new JScrollPane(m_leftTree);
         JScrollPane leftTextPane = new JScrollPane(m_leftTextArea);
         m_leftTabPane= new JTabbedPane();
         m_leftTabPane.add("Tree View",leftTreePane);
         m_leftTabPane.add("Text View",leftTextPane);
-
+        
         /* Builds middle tree pane */
         JScrollPane middleTreePane = new JScrollPane(m_middleTree);
 
@@ -302,17 +302,17 @@ public class TestTool extends JFrame implements ActionListener
         rightTreePane.setBorder(BorderFactory.createCompoundBorder(
                         BorderFactory.createTitledBorder("Result"),
                         BorderFactory.createEmptyBorder(8,8,8,8)));
-
-        m_leftTabPane.setPreferredSize(
+        
+        m_leftTabPane.setPreferredSize(  
             new Dimension( leftWindowWidth, frameHeight ));
-        middleTreePane.setPreferredSize(
+        middleTreePane.setPreferredSize(  
             new Dimension( middleWindowWidth, frameHeight ));
-        rightTreePane.setPreferredSize(
+        rightTreePane.setPreferredSize(  
             new Dimension( rightWindowWidth, frameHeight ));
 
         /* Builds the SAX event text box */
         m_saxEventText = new JTextField();
-
+        
         /* Builds the unsolved reference table */
         m_unsolvedReferenceTable = new JTable(
                 new UnsolvedReferenceTableModel(this));
@@ -322,93 +322,93 @@ public class TestTool extends JFrame implements ActionListener
 
         /* Builds the SAX chain information label */
         m_saxChainLabel = new JLabel();
-
+        
         /* Builds the left pane */
         JPanel tabPaneWithSaxEventPane = new JPanel();
         tabPaneWithSaxEventPane.setLayout(new BorderLayout());
         tabPaneWithSaxEventPane.add("Center",m_leftTabPane);
         tabPaneWithSaxEventPane.add("South",new JScrollPane(m_saxEventText));
-
-        JSplitPane leftPane =
+        
+        JSplitPane leftPane = 
             new JSplitPane( JSplitPane.VERTICAL_SPLIT,
                 tabPaneWithSaxEventPane,
                 new JScrollPane(m_unsolvedReferenceTable));
         leftPane.setBorder(BorderFactory.createCompoundBorder(
                         BorderFactory.createTitledBorder("Original"),
                         BorderFactory.createEmptyBorder(8,8,8,8)));
-
+                        
         leftPane.setContinuousLayout( true );
         leftPane.setDividerLocation( frameHeight*2/3 );
-        leftPane.setPreferredSize(
+        leftPane.setPreferredSize( 
             new Dimension( leftWindowWidth, frameHeight ));
-
+        
         /* Builds the middle pane */
         JPanel bufferNodeWithSaxChainPane = new JPanel();
         bufferNodeWithSaxChainPane.setLayout(new BorderLayout());
         bufferNodeWithSaxChainPane.add("Center",m_bufferNodeTextArea);
         bufferNodeWithSaxChainPane.add("South",new JScrollPane(m_saxChainLabel));
-
-        JSplitPane middlePane =
+        
+        JSplitPane middlePane = 
             new JSplitPane( JSplitPane.VERTICAL_SPLIT,
                 middleTreePane,
                 new JScrollPane(bufferNodeWithSaxChainPane));
-
+                
         middlePane.setBorder(BorderFactory.createCompoundBorder(
                         BorderFactory.createTitledBorder("Insight SAXEventKeeper"),
                         BorderFactory.createEmptyBorder(8,8,8,8)));
-
+                
         middlePane.setContinuousLayout( true );
         middlePane.setDividerLocation( frameHeight/2+5 );
-        middlePane.setPreferredSize(
+        middlePane.setPreferredSize( 
             new Dimension( middleWindowWidth, frameHeight ));
 
         /* Builds the whole frame pane */
-        JSplitPane leftWithMiddlePane =
+        JSplitPane leftWithMiddlePane = 
             new JSplitPane( JSplitPane.HORIZONTAL_SPLIT,
                 leftPane,
                 middlePane );
         leftWithMiddlePane.setContinuousLayout( true );
         leftWithMiddlePane.setDividerLocation( leftWindowWidth );
-        leftWithMiddlePane.setPreferredSize(
+        leftWithMiddlePane.setPreferredSize( 
             new Dimension( leftPaneWidth + 10, frameHeight+10 ));
-
-        JSplitPane framePane =
+        
+        JSplitPane framePane = 
             new JSplitPane( JSplitPane.HORIZONTAL_SPLIT,
                 leftWithMiddlePane,
                 rightTreePane );
-
-
+                
+                
         framePane.setContinuousLayout( true );
         framePane.setDividerLocation(leftPaneWidth+10 );
-        framePane.setPreferredSize(
+        framePane.setPreferredSize( 
             new Dimension( frameWidth + 20, frameHeight+10 ));
-
+        
         /* Adds all GUI components to the main panel */
         mainPanel.setLayout(new BorderLayout());
         mainPanel.add("Center", framePane );
-
+        
         m_openButton = new JButton("Open...");
         m_openButton.addActionListener(this);
-
+        
         m_goButton = new JButton("Go!");
         m_goButton.addActionListener(this);
-
+        
         m_stepButton = new JButton("Step");
         m_stepButton.addActionListener(this);
-
+        
         m_startButton = new JButton("Start");
         m_startButton.addActionListener(this);
         m_startButton.setEnabled(false);
-
+        
         m_isExportingButton = new JCheckBox("export, not import", true);
         m_isJavaComponentButton = new JCheckBox("use java component", false);
-
+        
         m_saveButton = new JButton("Save...");
         m_saveButton.addActionListener(this);
 
         m_batchButton = new JButton("Batch...");
         m_batchButton.addActionListener(this);
-
+        
         JPanel buttonPanel = new JPanel();
         buttonPanel.add(m_batchButton);
         buttonPanel.add(m_openButton);
@@ -418,11 +418,11 @@ public class TestTool extends JFrame implements ActionListener
         buttonPanel.add(m_isExportingButton);
         buttonPanel.add(m_isJavaComponentButton);
         buttonPanel.add(m_saveButton);
-
+        
         mainPanel.add("South", buttonPanel);
-
+        
         enableGoButton(false);
-
+        
         return mainPanel;
     }
 
@@ -434,7 +434,7 @@ public class TestTool extends JFrame implements ActionListener
         m_goButton.setEnabled(enabled);
         m_stepButton.setEnabled(enabled);
     }
-
+    
     /*
      * updates the unsolved reference information.
      */
@@ -442,7 +442,7 @@ public class TestTool extends JFrame implements ActionListener
     {
         m_unsolvedReferenceTable.setModel(new UnsolvedReferenceTableModel(this));
     }
-
+    
     /*
      * adjusts the view of the tree in order to make the
      * particular Node into the focus tree leaf.
@@ -451,23 +451,23 @@ public class TestTool extends JFrame implements ActionListener
     {
         int i=0;
         int currentLine = 0;
-
+        
         while (i<tree.getRowCount())
         {
             TreePath treePath = tree.getPathForRow(i);
             tree.expandPath(treePath);
-
+            
             AdapterNode adapterNode = (AdapterNode)treePath.getLastPathComponent();
-
+            
             if (node == adapterNode.getNode())
             {
                 tree.addSelectionPath(treePath);
                 currentLine = i;
             }
-
+            
             ++i;
         }
-
+        
         tree.setCellRenderer(new XMLTreeCellRanderer(node));
         tree.scrollRowToVisible(currentLine);
     }
@@ -475,7 +475,7 @@ public class TestTool extends JFrame implements ActionListener
     /******************************************************************************
      * action listener related methods.
      ******************************************************************************/
-
+    
     /*
      * reads in a document, either the document is a file or
      * is a text paragraph.
@@ -493,7 +493,7 @@ public class TestTool extends JFrame implements ActionListener
         else
         {
             String text = m_leftTextArea.getText();
-
+            
             try
             {
                 parseStream(new ByteArrayInputStream(text.getBytes("UTF-8")));
@@ -502,11 +502,11 @@ public class TestTool extends JFrame implements ActionListener
             {
                 e.printStackTrace();
             }
-
+            
             m_leftTabPane.setSelectedIndex(0);
         }
     }
-
+    
     /*
      * save the result tree to a file.
      */
@@ -514,10 +514,10 @@ public class TestTool extends JFrame implements ActionListener
     {
         saveFile();
     }
-
+    
     /*
      * selects a batch file to excute.
-     */
+     */ 
     private void openBatch()
     {
         File f = openFile();
@@ -534,21 +534,21 @@ public class TestTool extends JFrame implements ActionListener
     {
         enableGoButton(false);
         m_parsingThread = null;
-
+        
         if (m_xmlSecurityFrameworkController != null)
         {
             m_xmlSecurityFrameworkController.endMission();
         }
-
+        
         updatesUIs();
-
+        
         m_xmlSecurityFrameworkController = null;
         freeComponents();
-
+        
         System.gc();
     }
-
-
+    
+    
     /******************************************************************************
      * UNO component related methods
      ******************************************************************************/
@@ -562,7 +562,7 @@ public class TestTool extends JFrame implements ActionListener
         {
             m_unoURL = new String(unoUrlString);
         }
-
+        
         try
         {
             m_xRemoteServiceManager = getRemoteServiceManager(m_unoURL);
@@ -572,7 +572,7 @@ public class TestTool extends JFrame implements ActionListener
             e.printStackTrace();
         }
     }
-
+    
     /*
      * creates UNO components.
      */
@@ -584,7 +584,7 @@ public class TestTool extends JFrame implements ActionListener
             String XMLSignature_comp;
             String XMLEncryption_comp;
             String tokenPath;
-
+            
             if (m_bIsJavaBased)
             {
                 SEInitializer_comp = SEINITIALIZER_COMPONENT_JAVA;
@@ -599,24 +599,24 @@ public class TestTool extends JFrame implements ActionListener
                 XMLEncryption_comp = XMLENCRYPTION_COMPONENT_C;
                 tokenPath = m_nssTokenPath;
             }
-
+                
             Object seInitializerObj = m_xRemoteServiceManager.createInstanceWithContext(
                 SEInitializer_comp, m_xRemoteContext);
-
+                
             if (seInitializerObj == null)
             {
                 freeComponents();
                 return false;
             }
-
+            
             m_xSEInitializer = (XSEInitializer)UnoRuntime.queryInterface(
-                        XSEInitializer.class, seInitializerObj);
-
+                        XSEInitializer.class, seInitializerObj); 
+                        
             m_xXMLSecurityContext = m_xSEInitializer.createSecurityContext(tokenPath);
-
+            
             Object xmlSignatureObj = m_xRemoteServiceManager.createInstanceWithContext(
                 XMLSignature_comp, m_xRemoteContext);
-
+                
             if (xmlSignatureObj == null)
             {
                 freeComponents();
@@ -624,11 +624,11 @@ public class TestTool extends JFrame implements ActionListener
             }
 
             m_xXMLSignature = (XXMLSignature)UnoRuntime.queryInterface(
-                        XXMLSignature.class, xmlSignatureObj);
-
+                        XXMLSignature.class, xmlSignatureObj); 
+            
             Object xmlEncryptionObj = m_xRemoteServiceManager.createInstanceWithContext(
                 XMLEncryption_comp, m_xRemoteContext);
-
+                
             if (xmlEncryptionObj == null)
             {
                 freeComponents();
@@ -636,8 +636,8 @@ public class TestTool extends JFrame implements ActionListener
             }
 
             m_xXMLEncryption = (XXMLEncryption)UnoRuntime.queryInterface(
-                        XXMLEncryption.class, xmlEncryptionObj);
-
+                        XXMLEncryption.class, xmlEncryptionObj); 
+                        
             return true;
         }
         catch(Exception e)
@@ -647,7 +647,7 @@ public class TestTool extends JFrame implements ActionListener
             return false;
         }
     }
-
+        
         /*
          * frees UNO components.
          */
@@ -660,7 +660,7 @@ public class TestTool extends JFrame implements ActionListener
                 m_xSEInitializer.freeSecurityContext(m_xXMLSecurityContext);
                 m_xXMLSecurityContext = null;
             }
-
+            
             m_xXMLSignature = null;
             m_xXMLEncryption = null;
             m_xSEInitializer = null;
@@ -670,13 +670,13 @@ public class TestTool extends JFrame implements ActionListener
             e.printStackTrace();
         }
     }
-
+    
     /*
      * getRemoteServiceManager
      */
-    private XMultiComponentFactory getRemoteServiceManager(String unoUrl) throws java.lang.Exception
+    private XMultiComponentFactory getRemoteServiceManager(String unoUrl) throws java.lang.Exception 
     {
-        if (m_xRemoteContext == null)
+        if (m_xRemoteContext == null) 
         {
             /*
              * First step: create local component context, get local servicemanager and
@@ -692,7 +692,7 @@ public class TestTool extends JFrame implements ActionListener
              */
             XUnoUrlResolver xUnoUrlResolver = (XUnoUrlResolver) UnoRuntime.queryInterface(
                 XUnoUrlResolver.class, urlResolver );
-
+                
             /*
              * Second step: use xUrlResolver interface to import the remote StarOffice.ServiceManager,
              * retrieve its property DefaultContext and get the remote servicemanager
@@ -706,21 +706,21 @@ public class TestTool extends JFrame implements ActionListener
         }
         return m_xRemoteContext.getServiceManager();
     }
-
+    
 
     /******************************************************************************
      * XML related methods
      ******************************************************************************/
 
     /*
-     * removes all empty text node inside the particular element
+     * removes all empty text node inside the particular element 
      */
     private void removeEmptyText(Node node)
     {
         int type = node.getNodeType();
         NodeList children;
         int i;
-
+        
         switch (type)
         {
         case Node.DOCUMENT_NODE:
@@ -730,9 +730,9 @@ public class TestTool extends JFrame implements ActionListener
             {
                 Node nextSibling = child.getNextSibling();
                 int childType = child.getNodeType();
-
+                
                 if (childType==Node.TEXT_NODE)
-                {
+                {	
                     String message = child.getNodeValue().trim();
                     if (message == null || message.length()<=0)
                     {
@@ -743,7 +743,7 @@ public class TestTool extends JFrame implements ActionListener
                 {
                     removeEmptyText(child);
                 }
-
+                
                 child = nextSibling;
             }
             break;
@@ -762,22 +762,22 @@ public class TestTool extends JFrame implements ActionListener
             m_document = null;
             m_startButton.setEnabled(false);
             initUI();
-
+            
             /* factory.setValidating(true); */
             /* factory.setNamespaceAware(true); */
-
-            try
+            
+            try 
             {
                 DocumentBuilder builder = factory.newDocumentBuilder();
                 m_document = builder.parse(is);
                 m_startButton.setEnabled(true);
                 initUI();
             }
-            catch (ParserConfigurationException pce)
+            catch (ParserConfigurationException pce) 
             {
                 pce.printStackTrace();
             }
-            catch (IOException ioe)
+            catch (IOException ioe) 
             {
                 ioe.printStackTrace();
             }
@@ -792,7 +792,7 @@ public class TestTool extends JFrame implements ActionListener
     /******************************************************************************
      * file operation related methods
      ******************************************************************************/
-
+    
     /*
      * opens a file, and parses it into the original tree.
      */
@@ -810,21 +810,21 @@ public class TestTool extends JFrame implements ActionListener
         }
     }
 
-
+    
     /*
      * selects a file to open
      */
     private File openFile()
     {
         File rc = null;
-
+        
         JFileChooser fileChooser= new JFileChooser();
-
+        
         fileChooser.setDialogTitle("Select File To Open");
         fileChooser.setDialogType(JFileChooser.OPEN_DIALOG);
-
+            
         fileChooser.setApproveButtonText("Ok");
-
+        
         if (m_currentDirectory == null)
         {
             fileChooser.rescanCurrentDirectory();
@@ -833,7 +833,7 @@ public class TestTool extends JFrame implements ActionListener
         {
             fileChooser.setCurrentDirectory(m_currentDirectory);
         }
-
+        
         fileChooser.setFileFilter(new XMLFileFilter());
 
         int result = fileChooser.showDialog(this,null);
@@ -842,19 +842,19 @@ public class TestTool extends JFrame implements ActionListener
             m_currentDirectory = fileChooser.getCurrentDirectory();
             rc = fileChooser.getSelectedFile();
         }
-
+        
         return rc;
     }
-
+    
     private void saveFile()
     {
         JFileChooser fileChooser= new JFileChooser();
-
+        
         fileChooser.setDialogTitle("Select File To Save");
         fileChooser.setDialogType(JFileChooser.SAVE_DIALOG);
-
+            
         fileChooser.setApproveButtonText("Ok");
-
+        
         if (m_currentDirectory == null)
         {
             fileChooser.rescanCurrentDirectory();
@@ -863,7 +863,7 @@ public class TestTool extends JFrame implements ActionListener
         {
             fileChooser.setCurrentDirectory(m_currentDirectory);
         }
-
+        
         fileChooser.setFileFilter(new XMLFileFilter());
 
         int result = fileChooser.showDialog(this,null);
@@ -888,20 +888,20 @@ public class TestTool extends JFrame implements ActionListener
     private void runBatch(File f)
     {
         FileInputStream fis = null;
-
+        
         try
         {
             fis = new FileInputStream(f);
             StringBuffer commandBuffer = new StringBuffer();
-
+            
             m_logFileOutputStream = new FileOutputStream("TestTool-log.txt");
             m_bIsBatchRunning = true;
             int ch = 0;
-
+            
             while (ch != -1)
             {
                 ch = fis.read();
-
+                
                 if (ch != 0x0a && ch != -1)
                 {
                     if (ch != 0x0d)
@@ -943,7 +943,7 @@ public class TestTool extends JFrame implements ActionListener
                         {
                             m_isExportingButton.setSelected(false);
                         }
-
+                        
                         startsUp();
                         if (m_parsingThread != null)
                         {
@@ -957,7 +957,7 @@ public class TestTool extends JFrame implements ActionListener
                                 System.out.println("exception happen during batch:"+e);
                                 e.printStackTrace();
                             }
-
+                                                        
                             m_bIsUIUpdateSuppressed = false;
                             updatesUIs();
                         }
@@ -970,15 +970,15 @@ public class TestTool extends JFrame implements ActionListener
                         saveFile(new File(fileName));
                         m_logFileOutputStream.write("command end \n\n".getBytes());
                     }
-
+                    
                     commandBuffer = new StringBuffer();
                 }
             }
-
+    
             m_bIsBatchRunning = false;
             m_logFileOutputStream.close();
             m_logFileOutputStream = null;
-
+            
             fis.close();
             fis = null;
         }
@@ -1007,7 +1007,7 @@ public class TestTool extends JFrame implements ActionListener
     /******************************************************************************
      * others
      ******************************************************************************/
-
+    
     /*
      * starts up the operation.
      */
@@ -1017,20 +1017,20 @@ public class TestTool extends JFrame implements ActionListener
         {
             m_parsingThread = null;
         }
-
+        
         m_bIsExporting = m_isExportingButton.isSelected();
         m_bIsJavaBased = m_isJavaComponentButton.isSelected();
-
+        
         if (createComponents())
         {
             m_rightTreeEventCollector = new SAXEventCollector(this);
-
+            
             m_parsingThread = new ParsingThread(
                 m_document,
                 null,
                 this);
-
-            m_xmlSecurityFrameworkController =
+            
+            m_xmlSecurityFrameworkController = 
                 new XMLSecurityFrameworkController(
                     this,
                     m_bIsExporting,
@@ -1042,7 +1042,7 @@ public class TestTool extends JFrame implements ActionListener
                     m_xXMLEncryption,
                     m_xRemoteServiceManager,
                     m_xRemoteContext);
-
+                
             enableGoButton(true);
         }
         else
@@ -1050,15 +1050,15 @@ public class TestTool extends JFrame implements ActionListener
             showMessage("Error in creating XML Security Components!");
         }
     }
-
+    
 /**************************************************************************************
  * protected methods
  **************************************************************************************/
-
+ 
     /******************************************************************************
      * UI related methods
      ******************************************************************************/
-
+    
     /*
      * updates the sax chain information.
      */
@@ -1074,7 +1074,7 @@ public class TestTool extends JFrame implements ActionListener
     {
         m_saxEventText.setText(event);
     }
-
+    
     /*
      * updates all information in the UI.
      */
@@ -1084,7 +1084,7 @@ public class TestTool extends JFrame implements ActionListener
         {
             m_leftTree.clearSelection();
             updatesTree(null, m_leftTree);
-
+            
             if (m_xmlSecurityFrameworkController != null)
             {
                 String bufferNodeTreeText = m_xmlSecurityFrameworkController.getBufferNodeTreeInformation();
@@ -1097,7 +1097,7 @@ public class TestTool extends JFrame implements ActionListener
                 {
                     m_middleTreeEventCollector = new SAXEventCollector(null);
                     m_xmlSecurityFrameworkController.getDocument(m_middleTreeEventCollector);
-
+                    
                     m_middleTreeModelAdapter = new DomToTreeModelAdapter(m_middleTreeEventCollector.getDocument());
                     m_middleTree.setModel(m_middleTreeModelAdapter);
                     updatesTree(null, m_middleTree);
@@ -1110,18 +1110,18 @@ public class TestTool extends JFrame implements ActionListener
                 m_middleTree.setVisible(false);
                 m_bufferNodeTextArea.setText("No XMLImporter/XMLExporter");
             }
-
+            
             if (m_rightTreeEventCollector != null)
             {
                 m_rightTreeModelAdapter = new DomToTreeModelAdapter((Document)m_rightTreeEventCollector.getDocument());
                 m_rightTree.setModel(m_rightTreeModelAdapter);
                 updatesTree((Node)m_rightTreeEventCollector.getCurrentElement(), m_rightTree);
             }
-
+    
             updatesUnsolvedReferencesInformation();
         }
     }
-
+    
     /*
      * shows a message.
      */
@@ -1135,7 +1135,7 @@ public class TestTool extends JFrame implements ActionListener
                 {
                     byte [] b = msg.getBytes();
                     m_logFileOutputStream.write("        ".getBytes());
-
+                    
                     for (int i=0; i<b.length; ++i)
                     {
                         m_logFileOutputStream.write(b[i]);
@@ -1162,7 +1162,7 @@ public class TestTool extends JFrame implements ActionListener
             else
             {
                 Object[] options = { "OK", "Go back to step mode" };
-                if (1 == JOptionPane.showOptionDialog(this, msg, "TestTool Notification",
+                if (1 == JOptionPane.showOptionDialog(this, msg, "TestTool Notification", 
                     JOptionPane.DEFAULT_OPTION, JOptionPane.PLAIN_MESSAGE,
                     null, options, options[0]))
                 {
@@ -1185,7 +1185,7 @@ public class TestTool extends JFrame implements ActionListener
     protected Vector getUnsolvedReferenceIds()
     {
         Vector rc;
-
+        
         if (m_xmlSecurityFrameworkController == null)
         {
             rc = new Vector();
@@ -1195,10 +1195,10 @@ public class TestTool extends JFrame implements ActionListener
             rc = ((XMLSecurityFrameworkController)m_xmlSecurityFrameworkController).
                 getUnsolvedReferenceIds();
         }
-
+        
         return rc;
     }
-
+    
     /*
      * gets all unsolved reference keeper ids.
      * a reference keeper id is the id which the SAXEventKeeper uses
@@ -1207,7 +1207,7 @@ public class TestTool extends JFrame implements ActionListener
     protected Vector getUnsolvedReferenceKeeperIds()
     {
         Vector rc;
-
+        
         if (m_xmlSecurityFrameworkController == null)
         {
             rc = new Vector();
@@ -1217,7 +1217,7 @@ public class TestTool extends JFrame implements ActionListener
             rc = ((XMLSecurityFrameworkController)m_xmlSecurityFrameworkController).
                 getUnsolvedReferenceKeeperIds();
         }
-
+        
         return rc;
     }
 
@@ -1229,7 +1229,7 @@ public class TestTool extends JFrame implements ActionListener
     protected Vector getUnsolvedReferenceRefNum()
     {
         Vector rc;
-
+        
         if (m_xmlSecurityFrameworkController == null)
         {
             rc = new Vector();
@@ -1239,7 +1239,7 @@ public class TestTool extends JFrame implements ActionListener
             rc = ((XMLSecurityFrameworkController)m_xmlSecurityFrameworkController).
                 getUnsolvedReferenceRefNum();
         }
-
+        
         return rc;
     }
 
@@ -1272,7 +1272,7 @@ public class TestTool extends JFrame implements ActionListener
                 {
                     if (stepMode) break;
                 }
-
+                
                 if (!notOver) endMission();
             }
         }
@@ -1299,14 +1299,14 @@ public class TestTool extends JFrame implements ActionListener
             openBatch();
         }
     }
-
+    
     /*
      * void-consturctor method
      */
     public TestTool()
     {
             getRootPane().putClientProperty("defeatSystemEventQueueCheck", Boolean.TRUE);
-
+            
             try
             {
                 m_currentDirectory = new File(System.getProperty("user.dir"));
@@ -1316,7 +1316,7 @@ public class TestTool extends JFrame implements ActionListener
             System.out.println("getProperty error :"+e);
         }
     }
-
+    
     /*
      * consturctor method with a specific connection URL
      */
@@ -1325,24 +1325,24 @@ public class TestTool extends JFrame implements ActionListener
         this();
         m_unoURL = new String(connecturl);
     }
-
+    
     public static void main(String argv[])
     {
-        Dimension screenSize =
+        Dimension screenSize = 
             Toolkit.getDefaultToolkit().getScreenSize();
-
+        
         TestTool tt;
-
+        
         if (argv.length < 1)
         {
             System.out.println("Usage: java TestTool [javaTokenFile] [nssTokenPath] [xml file]?");
             return;
         }
-
+        
         boolean hasFile = false;
         boolean hasBatch = false;
         String fileName = null;
-
+        
         if (argv.length >= 3)
         {
             if (argv[2].startsWith("-b"))
@@ -1356,25 +1356,25 @@ public class TestTool extends JFrame implements ActionListener
                 hasFile = true;
             }
         }
-
+        
         tt = new TestTool();
         tt.m_javaTokenFile = new String(argv[0]);
         tt.m_nssTokenPath = new String(argv[1]);
         tt.connectSO(null);
-
+        
         /* Set up a GUI framework */
         JFrame myFrame = new JFrame("XML Security Components Tester");
         myFrame.addWindowListener(
             new WindowAdapter() {
                 public void windowClosing(WindowEvent e) {System.exit(0);}
-            }
+            }  
             );
-
+            
         myFrame.setContentPane(tt.buildUI(screenSize.width, screenSize.height));
         myFrame.pack();
         int w = screenSize.width-30;
         int h = screenSize.height-30;
-        myFrame.setLocation(screenSize.width/2 - w/2,
+        myFrame.setLocation(screenSize.width/2 - w/2, 
         screenSize.height/2 - h/2);
         myFrame.setSize(w, h);
         myFrame.setVisible(true);
diff --git a/xmlsecurity/tools/uno/UnsolvedReferenceTableModel.java b/xmlsecurity/tools/uno/UnsolvedReferenceTableModel.java
index 21f17de8877d..a5a38c3939b3 100644
--- a/xmlsecurity/tools/uno/UnsolvedReferenceTableModel.java
+++ b/xmlsecurity/tools/uno/UnsolvedReferenceTableModel.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,39 +30,39 @@ package com.sun.star.xml.security.uno;
 import javax.swing.table.AbstractTableModel;
 
 /*
- * this class is used to maintain the unsolved reference
+ * this class is used to maintain the unsolved reference 
  * table.
  */
 class UnsolvedReferenceTableModel extends AbstractTableModel
 {
-    private String[] m_columnNames = {"id",
+    private String[] m_columnNames = {"id", 
                            "refNum",
                            "EC's id"};
-
+    
     private TestTool m_testTool;
-
+    
     UnsolvedReferenceTableModel(TestTool testTool)
     {
         m_testTool = testTool;
     }
-
-    public String getColumnName(int col)
-    {
-        return m_columnNames[col].toString();
+    
+    public String getColumnName(int col) 
+    { 
+        return m_columnNames[col].toString(); 
     }
-
-    public int getRowCount()
+    
+    public int getRowCount() 
     {
-        return m_testTool.getUnsolvedReferenceIds().size();
+        return m_testTool.getUnsolvedReferenceIds().size(); 
     }
-
-    public int getColumnCount()
+    
+    public int getColumnCount() 
     {
-        return m_columnNames.length;
+        return m_columnNames.length; 
     }
-
-    public Object getValueAt(int row, int col)
-    {
+    
+    public Object getValueAt(int row, int col) 
+    { 
             if (col == 0)
             {
                 return (String)m_testTool.getUnsolvedReferenceIds().elementAt(row);
@@ -80,10 +80,10 @@ class UnsolvedReferenceTableModel extends AbstractTableModel
             return null;
         }
     }
-
+    
     public boolean isCellEditable(int row, int col)
     {
-        return false;
+        return false; 
     }
 }
 
diff --git a/xmlsecurity/tools/uno/XMLFileFilter.java b/xmlsecurity/tools/uno/XMLFileFilter.java
index b9436cacfbda..765de1fc5935 100644
--- a/xmlsecurity/tools/uno/XMLFileFilter.java
+++ b/xmlsecurity/tools/uno/XMLFileFilter.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,31 +36,31 @@ import javax.swing.filechooser.FileFilter;
  */
 class XMLFileFilter extends FileFilter
 {
-    public static String getExtension(File f)
+    public static String getExtension(File f) 
     {
         String ext = null;
         String s = f.getName();
         int i = s.lastIndexOf('.');
-
+        
         if (i > 0 &&  i < s.length() - 1) {
             ext = s.substring(i+1).toLowerCase();
         }
-
+        
         return ext;
     }
-
-    public boolean accept(File f)
+    
+    public boolean accept(File f) 
     {
         boolean rc = false;
-
-        if (f.isDirectory())
+        
+        if (f.isDirectory()) 
         {
             rc = true;
         }
         else
         {
             String extension = getExtension(f);
-            if (extension != null)
+            if (extension != null) 
             {
                 if (extension.equals("xml") || extension.equals("txt"))
                 {
@@ -68,10 +68,10 @@ class XMLFileFilter extends FileFilter
                 }
             }
         }
-
+        
         return rc;
     }
-
+    
     public String getDescription()
     {
         return "XML and batch files (.xml,.txt)";
diff --git a/xmlsecurity/tools/uno/XMLSecurityFrameworkController.java b/xmlsecurity/tools/uno/XMLSecurityFrameworkController.java
index 058981b460b0..ed512ed083bc 100644
--- a/xmlsecurity/tools/uno/XMLSecurityFrameworkController.java
+++ b/xmlsecurity/tools/uno/XMLSecurityFrameworkController.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 @@ import com.sun.star.xml.wrapper.*;
 /*
  * the XMLSecurityFrameworkController class is used to controll the xml security framework.
  */
-public class XMLSecurityFrameworkController
+public class XMLSecurityFrameworkController 
     implements XDocumentHandler, XSignatureCreationResultListener, XSignatureVerifyResultListener,
            XEncryptionResultListener, XDecryptionResultListener, XSAXEventKeeperStatusChangeListener
 {
@@ -55,7 +55,7 @@ public class XMLSecurityFrameworkController
      */
     private XMultiComponentFactory  m_xRemoteServiceManager;
     private XComponentContext       m_xRemoteContext;
-
+    
     /*
      * xml security related UNO components
      */
@@ -65,62 +65,62 @@ public class XMLSecurityFrameworkController
     private XXMLSecurityContext     m_xXMLSecurityContext;
     private XXMLSignature           m_xXMLSignature;
     private XXMLEncryption          m_xXMLEncryption;
-
+    
         /*
          * used to reserve the current SAX ancestor path
          */
     private Stack  m_currentPath;
-
+    
     /*
      * maintains all SignatureEntities.
      */
     private Vector m_signatureList;
-
+    
     /*
      * maintains all EncryptionEntities.
      */
     private Vector m_encryptionList;
-
+    
     /*
      * maintains all unsolved reference Ids.
      * These ids are strings which is the value of the id attribute
      * of the referenced element.
      */
     private Vector m_vUnsolvedReferenceIds;
-
+    
     /*
      * maintains all unsolved reference keeper ids.
      * The keeper id is used to uniquely identify a bufferred element
      * by the SAXEventKeeper.
      */
     private Vector m_vUnsolvedReferencedKeeperIds;
-
+    
     /*
-     * maintains the left time that each unsolved reference can be
+     * maintains the left time that each unsolved reference can be 
      * claimed.
      */
     private Vector m_vUnsolvedReferenceRefNum;
-
+    
     /*
      * whether exporting or importing
      */
     private boolean m_bIsExporting;
-
+    
     /*
      * whether java or c
      */
     private boolean m_bIsJavaBased;
-
+    
     /*
      * whether the SAXEventKeeper is blocking
      */
     private boolean m_bIsBlocking;
-
+    
     /*
      * whether it is collecting a bufferred element
      */
     private boolean m_bIsInsideCollectedElement;
-
+    
     /*
      * whether a SAXEventKeeper is in the SAX chain
      */
@@ -130,7 +130,7 @@ public class XMLSecurityFrameworkController
      * the ParsingThread used to parse the document
      */
     private ParsingThread m_parsingThread;
-
+    
     /*
      * the next document handler that will receives SAX events
      * from the parsing thread.
@@ -139,18 +139,18 @@ public class XMLSecurityFrameworkController
      * variable will be the xOutputHandler.
      */
     private XDocumentHandler m_xExportHandler;
-
+    
     /*
      * the TestTool used to feedback information
      */
     private TestTool m_testTool;
-
+    
     /*
      * for encryption target
      */
     private boolean m_bIsEncryptionTarget;
     private EncryptionEntity m_EncryptionForTarget;
-
+    
     XMLSecurityFrameworkController(
         TestTool testTool,
         boolean bIsExporting,
@@ -165,45 +165,45 @@ public class XMLSecurityFrameworkController
     {
         m_bIsExporting = bIsExporting;
         m_bIsJavaBased = bIsJavaBased;
-
+        
         m_xOutputHandler = xOutputHandler;
         m_xXMLSecurityContext = xXMLSecurityContext;
         m_xXMLSignature = xXMLSignature;
         m_xXMLEncryption = xXMLEncryption;
         m_xRemoteServiceManager = xRemoteServiceManager;
         m_xRemoteContext = xRemoteContext;
-
+        
         m_testTool = testTool;
         m_parsingThread = parsingThread;
-
+        
         m_signatureList = new Vector();
         m_encryptionList = new Vector();
-
+        
         m_vUnsolvedReferenceIds = new Vector();
         m_vUnsolvedReferencedKeeperIds = new Vector();
         m_vUnsolvedReferenceRefNum = new Vector();
-
+        
         m_xXMLDocumentWrapper = null;
         m_xSAXEventKeeper = null;
-
+        
         m_bSAXEventKeeperIncluded = false;
         m_bIsBlocking = false;
         m_bIsInsideCollectedElement = false;
-
+        
         m_bIsEncryptionTarget = false;
         m_EncryptionForTarget = null;
 
         changeOutput();
-
+        
         m_currentPath = new Stack();
-
+        
         foundSecurityRelated();
     }
-
+    
 /**************************************************************************************
  * private methods
  **************************************************************************************/
-
+ 
         /*
          * changes the output document handler.
          */
@@ -212,7 +212,7 @@ public class XMLSecurityFrameworkController
         if (m_bIsExporting)
         {
             m_parsingThread.setHandler(this);
-
+            
             /*
              * If the SAXEventKeeper is in the SAX chain, then redirects output
              * to the SAXEventKeeper, otherwise, to the m_xOutputHandler
@@ -222,7 +222,7 @@ public class XMLSecurityFrameworkController
                 m_xExportHandler = (XDocumentHandler)UnoRuntime.queryInterface(
                             XDocumentHandler.class, m_xSAXEventKeeper);
                 m_xSAXEventKeeper.setNextHandler(m_xOutputHandler);
-
+                
                 m_testTool.updatesSAXChainInformation("XMLExporter -> SAXEventKeeper -> SAXWriter");
             }
             else
@@ -248,14 +248,14 @@ public class XMLSecurityFrameworkController
             m_xExportHandler = m_xOutputHandler;
         }
     }
-
+        
         /*
          * handles the situation when a security related element is found.
          * if the SAXEventKeeper is not initialized, then creates a
          * SAXEventKeeper.
          * the return value represents whether the SAXEventKeeper is newly
          * created.
-         */
+         */	
     private boolean foundSecurityRelated()
     {
         if (m_xSAXEventKeeper == null)
@@ -263,7 +263,7 @@ public class XMLSecurityFrameworkController
             m_testTool.showMessage("Message from : "+
                         (m_bIsExporting?"XMLExporter":"XMLImporter")+
                         "\n\nA security related content found, a SAXEventKeeper is created.\n ");
-
+            
             m_bIsBlocking = false;
             m_bIsInsideCollectedElement = false;
 
@@ -273,7 +273,7 @@ public class XMLSecurityFrameworkController
                  * creates an XMLDocumentWrapper component.
                  */
                 Object xmlDocumentObj = null;
-
+                
                 if (m_bIsJavaBased)
                 {
                     xmlDocumentObj = m_xRemoteServiceManager.createInstanceWithContext(
@@ -284,24 +284,24 @@ public class XMLSecurityFrameworkController
                     xmlDocumentObj = m_xRemoteServiceManager.createInstanceWithContext(
                         TestTool.XMLDOCUMENTWRAPPER_COMPONENT_C, m_xRemoteContext);
                 }
-
+                
                 m_xXMLDocumentWrapper = (XXMLDocumentWrapper)UnoRuntime.queryInterface(
                     XXMLDocumentWrapper.class, xmlDocumentObj);
-
+                    
                 /*
                  * creates a SAXEventKeeper component.
                  */
                 Object saxEventKeeperObj = m_xRemoteServiceManager.createInstanceWithContext(
                     TestTool.SAXEVENTKEEPER_COMPONENT, m_xRemoteContext);
 
-                m_xSAXEventKeeper =
+                m_xSAXEventKeeper = 
                     (XSecuritySAXEventKeeper)UnoRuntime.queryInterface(
-                        XSecuritySAXEventKeeper.class, saxEventKeeperObj);
-
+                        XSecuritySAXEventKeeper.class, saxEventKeeperObj); 
+                            
                             /*
                              * initializes the SAXEventKeeper component with the XMLDocumentWrapper component.
                              */
-                XInitialization xInitialization =
+                XInitialization xInitialization = 
                     (XInitialization)UnoRuntime.queryInterface(
                         XInitialization.class, m_xSAXEventKeeper);
                 Object args[]=new Object[1];
@@ -312,18 +312,18 @@ public class XMLSecurityFrameworkController
             {
                 e.printStackTrace();
             }
-
+            
             /*
              * configures the SAXEventKeeper's status change listener.
              */
-            XSAXEventKeeperStatusChangeBroadcaster xSaxEventKeeperStatusChangeBroadcaster =
+            XSAXEventKeeperStatusChangeBroadcaster xSaxEventKeeperStatusChangeBroadcaster = 
                 (XSAXEventKeeperStatusChangeBroadcaster)UnoRuntime.queryInterface(
-                    XSAXEventKeeperStatusChangeBroadcaster.class, m_xSAXEventKeeper);
+                    XSAXEventKeeperStatusChangeBroadcaster.class, m_xSAXEventKeeper); 
             xSaxEventKeeperStatusChangeBroadcaster.addSAXEventKeeperStatusChangeListener(this);
         }
-
+        
         boolean rc = !m_bSAXEventKeeperIncluded;
-
+        
         /*
          * changes the export document handler.
          */
@@ -339,16 +339,16 @@ public class XMLSecurityFrameworkController
     private void findKeyOrReference(SecurityEntity signatureEntity, String uriStr, boolean isFindingKey)
     {
         int i=0;
-
+        
         while (i<m_vUnsolvedReferenceIds.size())
         {
             String id = (String)m_vUnsolvedReferenceIds.elementAt(i);
-
+            
             if (id.equals(uriStr))
             {
                 int refNum = ((Integer)m_vUnsolvedReferenceRefNum.elementAt(i)).intValue();
                 int keeperId = ((Integer)m_vUnsolvedReferencedKeeperIds.elementAt(i)).intValue();
-
+                
                 if (isFindingKey)
                 {
                     /*
@@ -358,17 +358,17 @@ public class XMLSecurityFrameworkController
                         keeperId,
                         m_bIsExporting?
                         (ElementMarkPriority.BEFOREMODIFY):(ElementMarkPriority.AFTERMODIFY));
-
+                    
                     /*
                      * notifies the key keeper id.
                      */
                     signatureEntity.setKeyId(cloneKeeperId);
-
+                    
                     /*
                      * sets the security id for the key.
                      */
                     m_xSAXEventKeeper.setSecurityId(cloneKeeperId, signatureEntity.getSecurityId());
-
+    
                     /*
                      * sets the resolve listener.
                      */
@@ -385,15 +385,15 @@ public class XMLSecurityFrameworkController
                      * clones a new ElementCollector for the referenced element.
                      */
                     int cloneKeeperId = m_xSAXEventKeeper.cloneElementCollector(
-                        keeperId,
+                        keeperId, 
                         m_bIsExporting?
                         (ElementMarkPriority.AFTERMODIFY):(ElementMarkPriority.BEFOREMODIFY));
-
+                    
                     /*
                      * sets the security id.
                      */
                     m_xSAXEventKeeper.setSecurityId(cloneKeeperId, signatureEntity.getSecurityId());
-
+                    
                     /*
                      * sets the resolve listener.
                      */
@@ -402,7 +402,7 @@ public class XMLSecurityFrameworkController
                             XReferenceResolvedBroadcaster.class, m_xSAXEventKeeper);
                     xReferenceResolvedBroadcaster.addReferenceResolvedListener(cloneKeeperId,
                         signatureEntity.getReferenceListener());
-
+                        
                     try{
                         XReferenceCollector xReferenceCollector =
                             (XReferenceCollector)UnoRuntime.queryInterface(
@@ -414,7 +414,7 @@ public class XMLSecurityFrameworkController
                         e.printStackTrace();
                     }
                 }
-
+                    
                 /*
                  * if this unsolved reference reaches its max reference number, remove this reference
                  * from all vectors.
@@ -432,7 +432,7 @@ public class XMLSecurityFrameworkController
                     m_vUnsolvedReferenceRefNum.setElementAt(new Integer(refNum),(i));
                     ++i;
                 }
-
+                
                 /*
                  * If it is find a key, then no further search is needed, one
                  * signature has one key at most.
@@ -448,7 +448,7 @@ public class XMLSecurityFrameworkController
             }
         }
     }
-
+        
     /*
      * checks whether a startElement event represents any security related information.
      * return true if this event can't be forwarded into the SAX chain.
@@ -456,7 +456,7 @@ public class XMLSecurityFrameworkController
     private boolean checkSecurityElement(String localName, com.sun.star.xml.sax.XAttributeList xattribs)
     {
         boolean rc = false;
-
+        
         if (localName.equals("Signature"))
         /*
          * this element is a Signature element.
@@ -480,23 +480,23 @@ public class XMLSecurityFrameworkController
             if (!m_currentPath.empty())
             {
                 Object signedInfo = m_currentPath.pop();
-
+                
                 if (!m_currentPath.empty())
                 {
                     Object objSignature = m_currentPath.peek();
-
+            
                     if ((objSignature instanceof SignatureEntity) && signedInfo.toString().equals("SignedInfo"))
                     /*
                      * this element is a Reference element in a signature.
                      */
                     {
                         String uriStr = xattribs.getValueByName("URI");
-
+                        
                         if (uriStr.charAt(0) == '#')
                         {
                             uriStr = uriStr.substring(1);
                             SignatureEntity signatureEntity = (SignatureEntity)objSignature;
-
+            
                             if (uriStr != null && uriStr.length()>0)
                             {
                                 signatureEntity.addReferenceId(uriStr);
@@ -509,7 +509,7 @@ public class XMLSecurityFrameworkController
             }
             m_currentPath.push(localName);
         }
-        else if(localName.equals("KeyValue") ||
+        else if(localName.equals("KeyValue") || 
                 localName.equals("KeyName") ||
                 localName.equals("X509Data") ||
                 localName.equals("EncryptedKey"))
@@ -517,11 +517,11 @@ public class XMLSecurityFrameworkController
             if (!m_currentPath.empty())
             {
                 Object keyInfo = m_currentPath.pop();
-
+                
                 if (!m_currentPath.empty())
                 {
                     Object objSorE = m_currentPath.peek();
-
+                    
                     if ((objSorE instanceof SignatureEntity) && keyInfo.toString().equals("KeyInfo"))
                     /*
                      * this element is the key element of a signature.
@@ -541,7 +541,7 @@ public class XMLSecurityFrameworkController
                 }
                 m_currentPath.push(keyInfo);
             }
-
+            
             m_currentPath.push(localName);
         }
         else if(localName.equals("RetrievalMethod"))
@@ -549,11 +549,11 @@ public class XMLSecurityFrameworkController
             if (!m_currentPath.empty())
             {
                 Object keyInfo = m_currentPath.pop();
-
+                
                 if (!m_currentPath.empty())
                 {
                     Object objSorE = m_currentPath.peek();
-
+                    
                     if ((objSorE instanceof SignatureEntity) && keyInfo.toString().equals("KeyInfo"))
                     /*
                      * this element is the RetrievalMethod element in a signature,
@@ -562,7 +562,7 @@ public class XMLSecurityFrameworkController
                     {
                         String uriStr = xattribs.getValueByName("URI");
                         SignatureEntity signatureEntity = (SignatureEntity)objSorE;
-
+        
                         if (uriStr != null && uriStr.length()>0)
                         {
                             signatureEntity.setKeyURI(uriStr);
@@ -577,7 +577,7 @@ public class XMLSecurityFrameworkController
                     {
                         String uriStr = xattribs.getValueByName("URI");
                         EncryptionEntity theEncryption = (EncryptionEntity)objSorE;
-
+        
                         if (uriStr != null && uriStr.length()>0)
                         {
                             theEncryption.setKeyURI(uriStr);
@@ -603,9 +603,9 @@ public class XMLSecurityFrameworkController
                 m_xXMLEncryption,
                 m_xRemoteServiceManager,
                 m_xRemoteContext);
-
+                
             m_encryptionList.add(theEncryption);
-
+            
             if (m_bIsExporting)
             {
                 m_currentPath.push(theEncryption);
@@ -622,7 +622,7 @@ public class XMLSecurityFrameworkController
                 {
                     theEncryption.setKeyId(0);
                 }
-
+                
                 rc = true;
             }
         }
@@ -633,23 +633,23 @@ public class XMLSecurityFrameworkController
         {
             m_currentPath.push(localName);
         }
-
+        
         return rc;
     }
-
+    
     /*
      * checks whether a startElement event is referenced by any security entity.
      */
     private void checkReference(String localName, com.sun.star.xml.sax.XAttributeList xattribs, String id)
     {
         String refNumStr = xattribs.getValueByName("refNum");
-
+        
         if ( m_bIsEncryptionTarget )
         {
             m_EncryptionForTarget.setReference(m_bIsExporting);
             m_bIsEncryptionTarget = false;
         }
-
+        
         if (id != null && id.length()>0 )
         /*
          * only if this element has id attribute, then it can be referenced by
@@ -662,14 +662,14 @@ public class XMLSecurityFrameworkController
              * referencing number to 999.
              */
             int refNum = 999;
-
+            
             if (refNumStr != null && refNumStr.length()>0 )
             {
                 refNum = new Integer(refNumStr).intValue();
             }
-
+            
             int length;
-
+                
             /*
              * searches the signature list to check whether any sigture has
              * reference on this element.
@@ -678,18 +678,18 @@ public class XMLSecurityFrameworkController
             for (int i=0; i<length; ++i)
             {
                 SignatureEntity signatureEntity = (SignatureEntity)m_signatureList.elementAt(i);
-
+                
                 if (signatureEntity.setReference(id, m_bIsExporting))
                 {
                     refNum--;
                 }
-
+                
                 if (signatureEntity.setKey(id, m_bIsExporting))
                 {
                     refNum--;
                 }
             }
-
+            
             /*
              * searches the encryption list for reference.
              */
@@ -697,13 +697,13 @@ public class XMLSecurityFrameworkController
             for (int i=0; i<length; ++i)
             {
                 EncryptionEntity theEncryption = (EncryptionEntity)m_encryptionList.elementAt(i);
-
+                
                 if (theEncryption.setKey(id, m_bIsExporting))
                 {
                     refNum--;
                 }
             }
-
+            
             /*
              * if the max referencing number is not reached, then add this element
              * into the unsolved reference list.
@@ -711,7 +711,7 @@ public class XMLSecurityFrameworkController
             if (refNum>0)
             {
                 int keeperId;
-
+                
                 if (localName.equals("EncryptedKey"))
                 {
                     keeperId = m_xSAXEventKeeper.addSecurityElementCollector(
@@ -726,14 +726,14 @@ public class XMLSecurityFrameworkController
                         (ElementMarkPriority.AFTERMODIFY):(ElementMarkPriority.BEFOREMODIFY),
                         false);
                 }
-
+                    
                 m_vUnsolvedReferenceIds.add(id);
                 m_vUnsolvedReferencedKeeperIds.add(new Integer(keeperId));
                 m_vUnsolvedReferenceRefNum.add(new Integer(refNum));
             }
         }
     }
-
+    
     /*
      * configures the output handler.
      */
@@ -742,12 +742,12 @@ public class XMLSecurityFrameworkController
         m_xOutputHandler = handler;
         changeOutput();
     }
-
-
+    
+    
 /**************************************************************************************
  * protected methods
  **************************************************************************************/
-
+        
         /*
          * methods used to transfer unsolved reference information.
          */
@@ -755,7 +755,7 @@ public class XMLSecurityFrameworkController
     {
         return m_vUnsolvedReferenceIds;
     }
-
+    
     protected Vector getUnsolvedReferenceKeeperIds()
     {
         return m_vUnsolvedReferencedKeeperIds;
@@ -765,7 +765,7 @@ public class XMLSecurityFrameworkController
     {
         return m_vUnsolvedReferenceRefNum;
     }
-
+    
     protected String getBufferNodeTreeInformation()
     {
         if (m_xSAXEventKeeper != null)
@@ -777,7 +777,7 @@ public class XMLSecurityFrameworkController
             return null;
         }
     }
-
+    
     protected void getDocument(XDocumentHandler handler)
     {
         if (m_xXMLDocumentWrapper != null)
@@ -792,7 +792,7 @@ public class XMLSecurityFrameworkController
             }
         }
     }
-
+    
     protected void endMission()
     {
         while (m_signatureList.size()>0 || m_encryptionList.size()>0)
@@ -810,7 +810,7 @@ public class XMLSecurityFrameworkController
                 theEncryption.endMission();
             }
         }
-
+        
         while (m_vUnsolvedReferenceIds.size()>0)
         {
             int keeperId = ((Integer)m_vUnsolvedReferencedKeeperIds.elementAt(0)).intValue();
@@ -819,21 +819,21 @@ public class XMLSecurityFrameworkController
             m_vUnsolvedReferencedKeeperIds.remove(0);
             m_vUnsolvedReferenceRefNum.remove(0);
         }
-
+        
         m_xSAXEventKeeper.setNextHandler(null);
-
-        XSAXEventKeeperStatusChangeBroadcaster xSaxEventKeeperStatusChangeBroadcaster =
+        
+        XSAXEventKeeperStatusChangeBroadcaster xSaxEventKeeperStatusChangeBroadcaster = 
             (XSAXEventKeeperStatusChangeBroadcaster)UnoRuntime.queryInterface(
-                XSAXEventKeeperStatusChangeBroadcaster.class, m_xSAXEventKeeper);
+                XSAXEventKeeperStatusChangeBroadcaster.class, m_xSAXEventKeeper); 
         xSaxEventKeeperStatusChangeBroadcaster.addSAXEventKeeperStatusChangeListener(null);
-
+        
         m_xSAXEventKeeper = null;
         m_xXMLDocumentWrapper = null;
         m_xOutputHandler = null;
         m_xXMLSecurityContext = null;
         m_xXMLSignature = null;
         m_xXMLEncryption = null;
-
+        
         m_xExportHandler = null;
         m_parsingThread.setHandler(null);
     }
@@ -854,7 +854,7 @@ public class XMLSecurityFrameworkController
         {
             e.printStackTrace();
         }
-
+        
     }
 
         public void endDocument()
@@ -867,7 +867,7 @@ public class XMLSecurityFrameworkController
             e.printStackTrace();
         }
     }
-
+    
     public void startElement (String str, com.sun.star.xml.sax.XAttributeList xattribs)
     {
         try{
@@ -876,10 +876,10 @@ public class XMLSecurityFrameworkController
             {
                 idAttr = xattribs.getValueByName("Id");
             }
-
+            
             boolean hasIdAttr = (idAttr != null && idAttr.length()>0 );
             boolean needResend = false;
-
+            
             if (hasIdAttr ||
                 (str.equals("Signature")||str.equals("EncryptedData")))/* || str.equals("EncryptedKey"))) */
             {
@@ -888,16 +888,16 @@ public class XMLSecurityFrameworkController
                     needResend = true;
                 }
             }
-
+            
             boolean suppressToNext = checkSecurityElement(str, xattribs);
-
+            
             checkReference(str, xattribs, idAttr);
-
+            
             if (needResend)
             {
                 m_xSAXEventKeeper.setNextHandler(null);
-
-                XDocumentHandler saxEventKeeperHandler =
+                
+                XDocumentHandler saxEventKeeperHandler = 
                     (XDocumentHandler)UnoRuntime.queryInterface(
                         XDocumentHandler.class, m_xSAXEventKeeper);
                 saxEventKeeperHandler.startElement(str, xattribs);
@@ -920,7 +920,7 @@ public class XMLSecurityFrameworkController
         if (!m_currentPath.empty())
         {
                 Object obj = m_currentPath.pop();
-
+            
                 if (obj.toString().equals("SignedInfo"))
                 {
                 if (!m_currentPath.empty())
@@ -939,7 +939,7 @@ public class XMLSecurityFrameworkController
 
                 }
             }
-
+        
         try{
             m_xExportHandler.endElement(str);
         }
@@ -948,7 +948,7 @@ public class XMLSecurityFrameworkController
             e.printStackTrace();
         }
     }
-
+    
     public void characters(String str)
     {
         try{
@@ -959,11 +959,11 @@ public class XMLSecurityFrameworkController
             e.printStackTrace();
         }
     }
-
+    
     public void ignorableWhitespace(String str)
     {
     }
-
+    
     public void processingInstruction(String aTarget, String aData)
     {
         try{
@@ -975,12 +975,12 @@ public class XMLSecurityFrameworkController
         }
     }
 
-    public void setDocumentLocator (com.sun.star.xml.sax.XLocator xLocator )
+    public void setDocumentLocator (com.sun.star.xml.sax.XLocator xLocator ) 
         throws com.sun.star.xml.sax.SAXException
     {
     }
-
-
+    
+    
     /*
      * XSignatureCreationResultListener
      */
@@ -990,7 +990,7 @@ public class XMLSecurityFrameworkController
         message += "A Signature is created:";
         message += "\nSecurity Id = "+securityId;
         message += "\nCreation result = "+((creationResult==SecurityOperationStatus.OPERATION_SUCCEEDED)?"Succeed":"Fail");
-
+        
         m_testTool.showMessage("Message from : SignatureCreator\n\n"+message+"\n ");
     }
 
@@ -1003,7 +1003,7 @@ public class XMLSecurityFrameworkController
         message += "A Signature is verified:";
         message += "\nSecurity Id = "+securityId;
         message += "\nVerify result = "+((verifyResult==SecurityOperationStatus.OPERATION_SUCCEEDED)?"Succeed":"Fail");
-
+        
         m_testTool.showMessage("Message from : SignatureVerifier\n\n"+message+"\n ");
     }
 
@@ -1016,10 +1016,10 @@ public class XMLSecurityFrameworkController
         message += "An EncryptedData is encrypted:";
         message += "\nSecurity Id = "+securityId;
         message += "\nEncrypt result = "+((encryptionResult==SecurityOperationStatus.OPERATION_SUCCEEDED)?"Succeed":"Fail");
-
+        
         m_testTool.showMessage("Message from : Encryptor\n\n"+message+"\n ");
     }
-
+    
     /*
      * XDecryptionResultListener methods
      */
@@ -1029,10 +1029,10 @@ public class XMLSecurityFrameworkController
         message += "An EncryptedData is decrypted:";
         message += "\nSecurity Id = "+securityId;
         message += "\nDecrypt result = "+((decryptionResult==SecurityOperationStatus.OPERATION_SUCCEEDED)?"Succeed":"Fail");
-
+        
         m_testTool.showMessage("Message from : Decryptor\n\n"+message+"\n ");
     }
-
+    
     /*
      * XSAXEventKeeperStatusChangeListener methods
      */
@@ -1041,19 +1041,19 @@ public class XMLSecurityFrameworkController
         m_testTool.showMessage("Message from : SAXEventKeeper\n\n"+
                     (isBlocking?"The SAX event stream is blocked.":"The SAX event stream is unblocked.")+
                     "\n ");
-
+        
         this.m_bIsBlocking = isBlocking;
     }
-
+    
     public void collectionStatusChanged(boolean isInsideCollectedElement)
     {
         m_testTool.showMessage("Message from : SAXEventKeeper\n\n"+
                     (isInsideCollectedElement?"Begin to buffer data ...":"End of data bufferring.")+
                     "\n ");
-
+                    
         /*
         this.m_bIsInsideCollectedElement = isInsideCollectedElement;
-
+        
         if ( !m_bIsInsideCollectedElement && !m_bIsBlocking)
         {
             m_bSAXEventKeeperIncluded = false;
@@ -1065,7 +1065,7 @@ public class XMLSecurityFrameworkController
         changeOutput();
         */
     }
-
+    
     public void bufferStatusChanged(boolean isBufferEmpty)
     {
         m_testTool.showMessage("Message from : SAXEventKeeper\n\n"+
diff --git a/xmlsecurity/tools/uno/XMLTreeCellRanderer.java b/xmlsecurity/tools/uno/XMLTreeCellRanderer.java
index 77891a239853..567ba2111217 100644
--- a/xmlsecurity/tools/uno/XMLTreeCellRanderer.java
+++ b/xmlsecurity/tools/uno/XMLTreeCellRanderer.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,27 +34,27 @@ import java.awt.Component;
 import javax.swing.JTree;
 
 /*
- * a TreeCellRender which can show a graph on the current
+ * a TreeCellRender which can show a graph on the current 
  * tree node.
  */
-class XMLTreeCellRanderer extends DefaultTreeCellRenderer
+class XMLTreeCellRanderer extends DefaultTreeCellRenderer 
 {
     /*
      * the icon for the current Node
      */
     private ImageIcon m_currentIcon;
-
+    
     /*
      * the current Node
      */
     private Node m_currentNode;
-
+    
     XMLTreeCellRanderer(Node currentNode)
     {
         m_currentNode = currentNode;
         m_currentIcon = new ImageIcon("current.gif");
     }
-
+    
     public Component getTreeCellRendererComponent(
                     JTree tree,
                     Object value,
@@ -62,14 +62,14 @@ class XMLTreeCellRanderer extends DefaultTreeCellRenderer
                     boolean expanded,
                     boolean leaf,
                     int row,
-                    boolean hasFocus)
+                    boolean hasFocus) 
     {
         super.getTreeCellRendererComponent(
                         tree, value, sel,
                         expanded, leaf, row,
                         hasFocus);
-
-        if (((AdapterNode)value).getNode() == m_currentNode)
+                        
+        if (((AdapterNode)value).getNode() == m_currentNode) 
         {
             setIcon(m_currentIcon);
             setToolTipText("This is the current element.");
@@ -77,8 +77,8 @@ class XMLTreeCellRanderer extends DefaultTreeCellRenderer
         else
         {
             setToolTipText(null); /* no tool tip */
-        }
-
+        } 
+        
         return this;
     }
 }
diff --git a/xmlsecurity/workben/signaturetest.cxx b/xmlsecurity/workben/signaturetest.cxx
index 32abb131d5cd..0d2e507d2925 100644
--- a/xmlsecurity/workben/signaturetest.cxx
+++ b/xmlsecurity/workben/signaturetest.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER 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,16 +69,16 @@ using namespace ::com::sun::star;
 
 void Main();
 
-#define TEXTFIELDWIDTH  80
-#define TEXTFIELDSTARTX 10
+#define TEXTFIELDWIDTH	80
+#define TEXTFIELDSTARTX	10
 
-#define EDITWIDTH       200
-#define EDITHEIGHT      20
+#define EDITWIDTH		200
+#define EDITHEIGHT		20
 
-#define FIXEDLINEHEIGHT 15
+#define FIXEDLINEHEIGHT	15
 
-#define BUTTONWIDTH     50
-#define BUTTONHEIGHT    22
+#define BUTTONWIDTH		50
+#define BUTTONHEIGHT	22
 #define BUTTONSPACE     20
 
 #define LISTBOXHEIGHT   120
@@ -141,32 +141,32 @@ class MyWin : public WorkWindow
 private:
     FixedLine   maTokenLine;
     CheckBox    maCryptoCheckBox;
-    FixedText   maFixedTextTokenName;
-    FileControl maEditTokenName;
+    FixedText	maFixedTextTokenName;
+    FileControl	maEditTokenName;
     FixedLine   maTest1Line;
-    FixedText   maFixedTextXMLFileName;
-    FileControl maEditXMLFileName;
-    FixedText   maFixedTextBINFileName;
-    FileControl maEditBINFileName;
-    FixedText   maFixedTextSIGFileName;
-    FileControl maEditSIGFileName;
-    PushButton  maSignButton;
-    PushButton  maVerifyButton;
+    FixedText	maFixedTextXMLFileName;
+    FileControl	maEditXMLFileName;
+    FixedText	maFixedTextBINFileName;
+    FileControl	maEditBINFileName;
+    FixedText	maFixedTextSIGFileName;
+    FileControl	maEditSIGFileName;
+    PushButton	maSignButton;
+    PushButton	maVerifyButton;
     FixedLine   maTest2Line;
-    FixedText   maFixedTextDOCFileName;
-    FileControl maEditDOCFileName;
-    PushButton  maDigitalSignaturesButton;
-    PushButton  maVerifyDigitalSignaturesButton;
+    FixedText	maFixedTextDOCFileName;
+    FileControl	maEditDOCFileName;
+    PushButton	maDigitalSignaturesButton;
+    PushButton	maVerifyDigitalSignaturesButton;
     FixedLine   maHintLine;
-    FixedText   maHintText;
+    FixedText	maHintText;
 
-    DECL_LINK(  CryptoCheckBoxHdl, CheckBox* );
-    DECL_LINK(  SignButtonHdl, Button* );
-    DECL_LINK(  VerifyButtonHdl, Button* );
-    DECL_LINK(  DigitalSignaturesWithServiceHdl, Button* );
-    DECL_LINK(  VerifyDigitalSignaturesHdl, Button* );
-    DECL_LINK(  DigitalSignaturesWithTokenHdl, Button* );
-    DECL_LINK(  StartVerifySignatureHdl, void* );
+    DECL_LINK(	CryptoCheckBoxHdl, CheckBox* );
+    DECL_LINK(	SignButtonHdl, Button* );
+    DECL_LINK(	VerifyButtonHdl, Button* );
+    DECL_LINK(	DigitalSignaturesWithServiceHdl, Button* );
+    DECL_LINK(	VerifyDigitalSignaturesHdl, Button* );
+    DECL_LINK(	DigitalSignaturesWithTokenHdl, Button* );
+    DECL_LINK(	StartVerifySignatureHdl, void* );
 
 public:
                 MyWin( Window* pParent, WinBits nWinStyle );
@@ -296,7 +296,7 @@ MyWin::MyWin( Window* pParent, WinBits nWinStyle ) :
     maTest2Line.SetPosSizePixel( TEXTFIELDSTARTX, nY, aOutputSize.Width()-2*TEXTFIELDSTARTX, FIXEDLINEHEIGHT );
     maTest2Line.SetText( String( RTL_CONSTASCII_USTRINGPARAM( "Test Office Document" ) ) );
     maTest2Line.Show();
-
+    
     nY += EDITHEIGHT*3/2;
 
 
@@ -342,13 +342,13 @@ MyWin::MyWin( Window* pParent, WinBits nWinStyle ) :
     maEditDOCFileName.SetText( aNSSFolder + String( RTL_CONSTASCII_USTRINGPARAM( "demo-sample.sxw" ) ) );
     maEditSIGFileName.SetText( aNSSFolder + String( RTL_CONSTASCII_USTRINGPARAM( "demo-result.xml" ) ) );
     maEditTokenName.SetText( aNSSFolder );
-
+    
 #ifdef WNT
     maEditTokenName.SetText( String() );
     maEditTokenName.Disable();
     maCryptoCheckBox.Disable();
-#endif
-
+#endif 	
+    
 }
 
 IMPL_LINK( MyWin, CryptoCheckBoxHdl, CheckBox*, EMPTYARG )
@@ -369,25 +369,25 @@ IMPL_LINK( MyWin, CryptoCheckBoxHdl, CheckBox*, EMPTYARG )
 IMPL_LINK( MyWin, DigitalSignaturesWithServiceHdl, Button*, EMPTYARG )
 {
     rtl::OUString aDocFileName = maEditDOCFileName.GetText();
-    uno::Reference < embed::XStorage > xStore = ::comphelper::OStorageHelper::GetStorageFromURL(
+    uno::Reference < embed::XStorage > xStore = ::comphelper::OStorageHelper::GetStorageFromURL( 
             aDocFileName, embed::ElementModes::READWRITE, comphelper::getProcessServiceFactory() );
 
-    uno::Reference< security::XDocumentDigitalSignatures > xD(
+    uno::Reference< security::XDocumentDigitalSignatures > xD( 
         comphelper::getProcessServiceFactory()->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.security.DocumentDigitalSignatures" ) ) ), uno::UNO_QUERY );
     if ( xD.is() )
         xD->signDocumentContent( xStore, NULL );
 
-
+    
     return 0;
 }
 
 IMPL_LINK( MyWin, VerifyDigitalSignaturesHdl, Button*, EMPTYARG )
 {
     rtl::OUString aDocFileName = maEditDOCFileName.GetText();
-    uno::Reference < embed::XStorage > xStore = ::comphelper::OStorageHelper::GetStorageFromURL(
+    uno::Reference < embed::XStorage > xStore = ::comphelper::OStorageHelper::GetStorageFromURL( 
             aDocFileName, embed::ElementModes::READWRITE, comphelper::getProcessServiceFactory() );
 
-    uno::Reference< security::XDocumentDigitalSignatures > xD(
+    uno::Reference< security::XDocumentDigitalSignatures > xD( 
         comphelper::getProcessServiceFactory()->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.security.DocumentDigitalSignatures" ) ) ), uno::UNO_QUERY );
     if ( xD.is() )
     {
@@ -404,10 +404,10 @@ IMPL_LINK( MyWin, VerifyDigitalSignaturesHdl, Button*, EMPTYARG )
             aText += String( RTL_CONSTASCII_USTRINGPARAM( "valid" ) );
             InfoBox( this, aText ).Execute();
         }
-
+        
     }
 
-
+    
     return 0;
 }
 
@@ -428,13 +428,13 @@ IMPL_LINK( MyWin, DigitalSignaturesWithTokenHdl, Button*, EMPTYARG )
         return 0;
     }
 
-    uno::Reference < embed::XStorage > xStore = ::comphelper::OStorageHelper::GetStorageFromURL(
+    uno::Reference < embed::XStorage > xStore = ::comphelper::OStorageHelper::GetStorageFromURL( 
             aDocFileName, embed::ElementModes::READWRITE, comphelper::getProcessServiceFactory() );
 
     aSignaturesDialog.SetStorage( xStore );
 
     aSignaturesDialog.Execute();
-
+    
     return 0;
 }
 
@@ -471,15 +471,15 @@ IMPL_LINK( MyWin, SignButtonHdl, Button*, EMPTYARG )
     sal_Int32 nSecurityId = aSignatureHelper.GetNewSecurityId();
 
     aSignatureHelper.SetX509Certificate( nSecurityId, xCertToUse->getIssuerName(), bigIntegerToNumericString( xCertToUse->getSerialNumber() ) );
-
+    
     aSignatureHelper.AddForSigning( nSecurityId, aXMLFileName, aXMLFileName, sal_False );
     aSignatureHelper.AddForSigning( nSecurityId, aBINFileName, aBINFileName, sal_True );
-
+    
     SvFileStream* pStream = new SvFileStream( aSIGFileName, STREAM_WRITE );
     SvLockBytesRef xLockBytes = new SvLockBytes( pStream, TRUE );
      uno::Reference< io::XOutputStream > xOutputStream = new utl::OOutputStreamHelper( xLockBytes );
     bool bDone = aSignatureHelper.CreateAndWriteSignature( xOutputStream );
-
+    
     aSignatureHelper.EndMission();
 
     if ( !bDone )
@@ -491,7 +491,7 @@ IMPL_LINK( MyWin, SignButtonHdl, Button*, EMPTYARG )
         rtl::OUString aInfo( String( RTL_CONSTASCII_USTRINGPARAM( "Signature successfully created!\n\n" ) ) );
         // aInfo += getSignatureInformationmations( aSignatureHelper.getAllSignatureInformation(), aSignatureHelper.GetSecurityEnvironment() );
 
-
+                    
         InfoBox( this, aInfo ).Execute();
     }
 
@@ -531,7 +531,7 @@ IMPL_LINK( MyWin, VerifyButtonHdl, Button*, EMPTYARG )
      uno::Reference< io::XInputStream > xInputStream = new utl::OInputStreamHelper( xLockBytes, nBytes );
     bool bDone = aSignatureHelper.ReadAndVerifySignature( xInputStream );
     xInputStream->closeInput();
-
+    
     aSignatureHelper.EndMission();
 
     if ( !bDone )