Kill superfluous spacing before semicolons

Change-Id: I53689e78221f3fe074e47d6b47f1a2c3fef96222

91 files changed, 576 insertions, 576 deletions

diff --git a/framework/inc/classes/checkediterator.hxx b/framework/inc/classes/checkediterator.hxx
index 5a4d1dbb4ffe..8fca4a63f462 100644
--- a/framework/inc/classes/checkediterator.hxx
+++ b/framework/inc/classes/checkediterator.hxx
@@ -99,8 +99,8 @@ class CheckedIterator
             if( m_eEndState == E_UNKNOWN )
             {
                 // Set new container and update other member.
-                m_pContainer = &rContainer          ;
-                m_eEndState  = E_BEFOREEND          ;
+                m_pContainer = &rContainer;
+                m_eEndState  = E_BEFOREEND;
                 m_pPosition  = m_pContainer->begin();
             }
         }
@@ -120,8 +120,8 @@ class CheckedIterator
 
         inline void setEnd()
         {
-            m_pContainer = NULL  ;
-            m_eEndState  = E_END ;
+            m_pContainer = NULL;
+            m_eEndState  = E_END;
         }
 
         /*-****************************************************************************************************
@@ -139,8 +139,8 @@ class CheckedIterator
 
         inline void setAfterEnd()
         {
-            m_pContainer = NULL       ;
-            m_eEndState  = E_AFTEREND ;
+            m_pContainer = NULL;
+            m_eEndState  = E_AFTEREND;
         }
 
         /*-****************************************************************************************************
@@ -293,9 +293,9 @@ class CheckedIterator
             E_AFTEREND
         };
 
-        const TContainer*           m_pContainer    ;   // pointer to current container
-        EEndState                   m_eEndState     ;   // "position state" of iterator!
-        typename TContainer::const_iterator  m_pPosition     ;   // point to actual element in container
+        const TContainer*           m_pContainer;   // pointer to current container
+        EEndState                   m_eEndState;   // "position state" of iterator!
+        typename TContainer::const_iterator  m_pPosition;   // point to actual element in container
 };
 
 }       //  namespace framework
diff --git a/framework/inc/classes/filtercache.hxx b/framework/inc/classes/filtercache.hxx
index 16aa3a430df9..cac2c2ae4596 100644
--- a/framework/inc/classes/filtercache.hxx
+++ b/framework/inc/classes/filtercache.hxx
@@ -310,10 +310,10 @@ class FilterCache   :   private TransactionBase
 
     private:
 
-        static sal_Int32        m_nRefCount         ;
-        static DataContainer*   m_pData             ;
-        static sal_Int32        m_nVersion          ;
-        static sal_Int16        m_nMode             ;
+        static sal_Int32        m_nRefCount;
+        static DataContainer*   m_pData;
+        static sal_Int32        m_nVersion;
+        static sal_Int16        m_nMode;
 
 };      //  class FilterCache
 
diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx
index 246b53428274..5fd4d00ea939 100644
--- a/framework/inc/classes/filtercachedata.hxx
+++ b/framework/inc/classes/filtercachedata.hxx
@@ -88,11 +88,11 @@ struct FileType
 
         inline void impl_clear()
         {
-            bPreferred          = sal_False         ;
-            sName               = OUString() ;
-            sMediaType          = OUString() ;
-            sClipboardFormat    = OUString() ;
-            nDocumentIconID     = 0                 ;
+            bPreferred          = sal_False;
+            sName               = OUString();
+            sMediaType          = OUString();
+            sClipboardFormat    = OUString();
+            nDocumentIconID     = 0;
             lUINames.free   ();
             lURLPattern.free();
             lExtensions.free();
@@ -100,14 +100,14 @@ struct FileType
 
         inline FileType& impl_copy( const FileType& rCopy )
         {
-            bPreferred          = rCopy.bPreferred      ;
-            sName               = rCopy.sName           ;
-            lUINames            = rCopy.lUINames        ;
-            sMediaType          = rCopy.sMediaType      ;
+            bPreferred          = rCopy.bPreferred;
+            sName               = rCopy.sName;
+            lUINames            = rCopy.lUINames;
+            sMediaType          = rCopy.sMediaType;
             sClipboardFormat    = rCopy.sClipboardFormat;
-            nDocumentIconID     = rCopy.nDocumentIconID ;
-            lURLPattern         = rCopy.lURLPattern     ;
-            lExtensions         = rCopy.lExtensions     ;
+            nDocumentIconID     = rCopy.nDocumentIconID;
+            lURLPattern         = rCopy.lURLPattern;
+            lExtensions         = rCopy.lExtensions;
             return (*this);
         }
 
@@ -115,14 +115,14 @@ struct FileType
 
     public:
 
-        sal_Bool            bPreferred          ;
-        OUString     sName               ;
-        OUStringHashMap     lUINames            ;
-        OUString     sMediaType          ;
-        OUString     sClipboardFormat    ;
-        sal_Int32           nDocumentIconID     ;
-        OUStringList        lURLPattern         ;
-        OUStringList        lExtensions         ;
+        sal_Bool            bPreferred;
+        OUString     sName;
+        OUStringHashMap     lUINames;
+        OUString     sMediaType;
+        OUString     sClipboardFormat;
+        sal_Int32           nDocumentIconID;
+        OUStringList        lURLPattern;
+        OUStringList        lExtensions;
 };
 
 // These struct describe a filter which is registered for one type.
@@ -149,14 +149,14 @@ struct Filter
 
         inline void impl_clear()
         {
-            nOrder              = 0                ;
+            nOrder              = 0;
             sName               = OUString();
             sType               = OUString();
             sDocumentService    = OUString();
             sFilterService      = OUString();
             sUIComponent        = OUString();
-            nFlags              = 0                ;
-            nFileFormatVersion  = 0                ;
+            nFlags              = 0;
+            nFileFormatVersion  = 0;
             sTemplateName       = OUString();
             lUINames.free   ();
             lUserData.free  ();
@@ -164,17 +164,17 @@ struct Filter
 
         inline Filter& impl_copy( const Filter& rCopy )
         {
-            nOrder              = rCopy.nOrder              ;
-            sName               = rCopy.sName               ;
-            sType               = rCopy.sType               ;
-            lUINames            = rCopy.lUINames            ;
-            sDocumentService    = rCopy.sDocumentService    ;
-            sFilterService      = rCopy.sFilterService      ;
-            sUIComponent        = rCopy.sUIComponent        ;
-            nFlags              = rCopy.nFlags              ;
-            nFileFormatVersion  = rCopy.nFileFormatVersion  ;
-            sTemplateName       = rCopy.sTemplateName       ;
-            lUserData           = rCopy.lUserData           ;
+            nOrder              = rCopy.nOrder;
+            sName               = rCopy.sName;
+            sType               = rCopy.sType;
+            lUINames            = rCopy.lUINames;
+            sDocumentService    = rCopy.sDocumentService;
+            sFilterService      = rCopy.sFilterService;
+            sUIComponent        = rCopy.sUIComponent;
+            nFlags              = rCopy.nFlags;
+            nFileFormatVersion  = rCopy.nFileFormatVersion;
+            sTemplateName       = rCopy.sTemplateName;
+            lUserData           = rCopy.lUserData;
             return (*this);
         }
 
@@ -182,17 +182,17 @@ struct Filter
 
     public:
 
-        sal_Int32           nOrder              ;
-        OUString     sName               ;
-        OUString     sType               ;
-        OUStringHashMap     lUINames            ;
-        OUString     sDocumentService    ;
-        OUString     sFilterService      ;
-        OUString     sUIComponent        ;
-        sal_Int32           nFlags              ;
-        OUStringList        lUserData           ;
-        sal_Int32           nFileFormatVersion  ;
-        OUString     sTemplateName       ;
+        sal_Int32           nOrder;
+        OUString     sName;
+        OUString     sType;
+        OUStringHashMap     lUINames;
+        OUString     sDocumentService;
+        OUString     sFilterService;
+        OUString     sUIComponent;
+        sal_Int32           nFlags;
+        OUStringList        lUserData;
+        sal_Int32           nFileFormatVersion;
+        OUString     sTemplateName;
 };
 
 // Programmer can register his own services for an content detection of different types.
@@ -224,8 +224,8 @@ struct Detector
 
         inline Detector& impl_copy( const Detector& rCopy )
         {
-            sName  = rCopy.sName  ;
-            lTypes = rCopy.lTypes ;
+            sName  = rCopy.sName;
+            lTypes = rCopy.lTypes;
             return (*this);
         }
 
@@ -233,8 +233,8 @@ struct Detector
 
     public:
 
-        OUString     sName       ;
-        OUStringList        lTypes      ;
+        OUString     sName;
+        OUStringList        lTypes;
 };
 
 // Programmer can register his own services for loading documents in a frame.
@@ -267,9 +267,9 @@ struct Loader
 
         inline Loader& impl_copy( const Loader& rCopy )
         {
-            sName       = rCopy.sName       ;
-            lUINames    = rCopy.lUINames    ;
-            lTypes      = rCopy.lTypes      ;
+            sName       = rCopy.sName;
+            lUINames    = rCopy.lUINames;
+            lTypes      = rCopy.lTypes;
             return (*this);
         }
 
@@ -277,9 +277,9 @@ struct Loader
 
     public:
 
-        OUString sName       ;
-        OUStringHashMap lUINames    ;
-        OUStringList    lTypes      ;
+        OUString sName;
+        OUStringHashMap lUINames;
+        OUStringList    lTypes;
 };
 
 // Programmer can register his own services to handle a FileType and intercept dispatches.
@@ -310,7 +310,7 @@ struct ContentHandler
 
         inline ContentHandler& impl_copy( const ContentHandler& rCopy )
         {
-            sName  = rCopy.sName ;
+            sName  = rCopy.sName;
             lTypes = rCopy.lTypes;
             return (*this);
         }
@@ -319,8 +319,8 @@ struct ContentHandler
 
     public:
 
-        OUString     sName   ;
-        OUStringList        lTypes  ;
+        OUString     sName;
+        OUStringList        lTypes;
 };
 
 // We need different hash maps for different tables of our configuration management.
@@ -357,9 +357,9 @@ class SetNodeHash : public ::boost::unordered_map< OUString                    ,
     // member
 
     public:
-        OUStringList  lAddedItems    ;
-        OUStringList  lChangedItems  ;
-        OUStringList  lRemovedItems  ;
+        OUStringList  lAddedItems;
+        OUStringList  lChangedItems;
+        OUStringList  lRemovedItems;
 };
 
 // Use these hashes to implement different tables which assign types to frame loader or detect services.
@@ -416,19 +416,19 @@ class PerformanceHash   :   public  ::boost::unordered_map<    OUString
 
 // Define easy usable types
 
-typedef SetNodeHash< FileType >                                     FileTypeHash                ;
-typedef SetNodeHash< Filter >                                       FilterHash                  ;
-typedef SetNodeHash< Detector >                                     DetectorHash                ;
-typedef SetNodeHash< Loader >                                       LoaderHash                  ;
-typedef SetNodeHash< ContentHandler >                               ContentHandlerHash          ;
-typedef OUStringHashMap                                             PreferredHash               ;
-typedef OUStringList                                                OrderList                   ;
+typedef SetNodeHash< FileType >                                     FileTypeHash;
+typedef SetNodeHash< Filter >                                       FilterHash;
+typedef SetNodeHash< Detector >                                     DetectorHash;
+typedef SetNodeHash< Loader >                                       LoaderHash;
+typedef SetNodeHash< ContentHandler >                               ContentHandlerHash;
+typedef OUStringHashMap                                             PreferredHash;
+typedef OUStringList                                                OrderList;
 
-typedef CheckedIterator< OUStringList >                             CheckedStringListIterator   ;
-typedef CheckedIterator< FileTypeHash >                             CheckedTypeIterator         ;
-typedef CheckedIterator< PerformanceHash >                          CheckedPerformanceIterator  ;
+typedef CheckedIterator< OUStringList >                             CheckedStringListIterator;
+typedef CheckedIterator< FileTypeHash >                             CheckedTypeIterator;
+typedef CheckedIterator< PerformanceHash >                          CheckedPerformanceIterator;
 
-typedef ::std::vector< FilterHash::const_iterator >                 FilterQuery                 ;
+typedef ::std::vector< FilterHash::const_iterator >                 FilterQuery;
 
 // Use private static data container to hold all values of configuration!
 
@@ -543,23 +543,23 @@ class DataContainer
 
     public:
 
-        FileTypeHash            m_aTypeCache                ;     /// hold all information about registered file types
-        FilterHash              m_aFilterCache              ;     /// hold all information about registered filters
-        DetectorHash            m_aDetectorCache            ;     /// hold all information about registered detect services
-        LoaderHash              m_aLoaderCache              ;     /// hold all information about registered loader services
-        ContentHandlerHash      m_aContentHandlerCache      ;     /// hold all information about registered content handler services
-        PerformanceHash         m_aFastFilterCache          ;     /// hold all registered filter for a special file type
-        PerformanceHash         m_aFastDetectorCache        ;     /// hold all registered detect services for a special file type
-        PerformanceHash         m_aFastLoaderCache          ;     /// hold all registered loader services for a special file type
-        PerformanceHash         m_aFastContentHandlerCache  ;     /// hold all registered content handler services for a special file type
-        PreferredHash           m_aPreferredTypesCache      ;     /// assignment of extensions to preferred types for it
-        Loader                  m_aGenericLoader            ;     /// information about our default frame loader
-        OUString         m_sLocale                   ;     /// current set locale of configuration to handle right UIName from set of all UINames!
-        sal_Bool                m_bTypesModified            ;
-        sal_Bool                m_bFiltersModified          ;
-        sal_Bool                m_bDetectorsModified        ;
-        sal_Bool                m_bLoadersModified          ;
-        sal_Bool                m_bHandlersModified         ;
+        FileTypeHash            m_aTypeCache;               /// hold all information about registered file types
+        FilterHash              m_aFilterCache;             /// hold all information about registered filters
+        DetectorHash            m_aDetectorCache;           /// hold all information about registered detect services
+        LoaderHash              m_aLoaderCache;             /// hold all information about registered loader services
+        ContentHandlerHash      m_aContentHandlerCache;     /// hold all information about registered content handler services
+        PerformanceHash         m_aFastFilterCache;         /// hold all registered filter for a special file type
+        PerformanceHash         m_aFastDetectorCache;       /// hold all registered detect services for a special file type
+        PerformanceHash         m_aFastLoaderCache;         /// hold all registered loader services for a special file type
+        PerformanceHash         m_aFastContentHandlerCache; /// hold all registered content handler services for a special file type
+        PreferredHash           m_aPreferredTypesCache;     /// assignment of extensions to preferred types for it
+        Loader                  m_aGenericLoader;           /// information about our default frame loader
+        OUString                m_sLocale;                  /// current set locale of configuration to handle right UIName from set of all UINames!
+        sal_Bool                m_bTypesModified;
+        sal_Bool                m_bFiltersModified;
+        sal_Bool                m_bDetectorsModified;
+        sal_Bool                m_bLoadersModified;
+        sal_Bool                m_bHandlersModified;
 };
 
 /*-************************************************************************************************************
@@ -637,15 +637,15 @@ class FilterCFGAccess : public ::utl::ConfigItem
     //  member
 
     private:
-        EFilterPackage  m_ePackage                     ;   // ... not really used yet! should split configuration in STANDARD and ADDITIONAL filter
-        sal_Int32       m_nVersion                     ;   // file format version of configuration! (necessary for "xml2xcd" transformation!)
-        sal_Int32       m_nKeyCountTypes               ;   // follow key counts present count of configuration properties for types/filters ... and depends from m_nVersion - must be set right!
-        sal_Int32       m_nKeyCountFilters             ;
-        sal_Int32       m_nKeyCountDetectors           ;
-        sal_Int32       m_nKeyCountLoaders             ;
-        sal_Int32       m_nKeyCountContentHandlers     ;
-        OUString m_sProductName                 ;
-        OUString m_sFormatVersion               ;
+        EFilterPackage  m_ePackage;   // ... not really used yet! should split configuration in STANDARD and ADDITIONAL filter
+        sal_Int32       m_nVersion;   // file format version of configuration! (necessary for "xml2xcd" transformation!)
+        sal_Int32       m_nKeyCountTypes;   // follow key counts present count of configuration properties for types/filters ... and depends from m_nVersion - must be set right!
+        sal_Int32       m_nKeyCountFilters;
+        sal_Int32       m_nKeyCountDetectors;
+        sal_Int32       m_nKeyCountLoaders;
+        sal_Int32       m_nKeyCountContentHandlers;
+        OUString m_sProductName;
+        OUString m_sFormatVersion;
 };
 
 }       //  namespace framework
diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx
index c95af80b88c2..f8a2990e29e5 100644
--- a/framework/inc/classes/framecontainer.hxx
+++ b/framework/inc/classes/framecontainer.hxx
@@ -40,9 +40,9 @@
 
 namespace framework{
 
-typedef ::std::vector< css::uno::Reference< css::frame::XFrame > >  TFrameContainer     ;
-typedef TFrameContainer::iterator                                   TFrameIterator      ;
-typedef TFrameContainer::const_iterator                             TConstFrameIterator ;
+typedef ::std::vector< css::uno::Reference< css::frame::XFrame > >  TFrameContainer;
+typedef TFrameContainer::iterator                                   TFrameIterator;
+typedef TFrameContainer::const_iterator                             TConstFrameIterator;
 
 /*-************************************************************************************************************
     @short          implement a container to hold children of frame, task or desktop
diff --git a/framework/inc/dispatch/dispatchprovider.hxx b/framework/inc/dispatch/dispatchprovider.hxx
index a0e28ffe6e33..9aa714344415 100644
--- a/framework/inc/dispatch/dispatchprovider.hxx
+++ b/framework/inc/dispatch/dispatchprovider.hxx
@@ -85,7 +85,7 @@ class DispatchProvider  :   private TransactionBase                     ,
         /// weakreference to owner frame (Don't use a hard reference. Owner can't delete us then!)
         css::uno::WeakReference< css::frame::XFrame > m_xFrame;
         /// different dispatcher to handle special dispatch calls, protocols or URLs (they will be created on demand.)
-        css::uno::Reference< css::frame::XDispatch > m_xMenuDispatcher     ;
+        css::uno::Reference< css::frame::XDispatch > m_xMenuDispatcher;
         /// cache of some other dispatch provider which are registered inside configuration to handle special URL protocols
         HandlerCache m_aProtocolHandlerCache;
 
diff --git a/framework/inc/dispatch/menudispatcher.hxx b/framework/inc/dispatch/menudispatcher.hxx
index 5460f5f63cc1..be4102791c40 100644
--- a/framework/inc/dispatch/menudispatcher.hxx
+++ b/framework/inc/dispatch/menudispatcher.hxx
@@ -225,13 +225,13 @@ class MenuDispatcher   :        public  ::cppu::WeakImplHelper2<
 
     private:
 
-        css::uno::WeakReference< css::frame::XFrame >           m_xOwnerWeak        ;   /// css::uno::WeakReference to owner (Don't use a hard css::uno::Reference. Owner can't delete us then!)
-        css::uno::Reference< css::uno::XComponentContext >      m_xContext          ;   /// factory shared with our owner to create new services!
+        css::uno::WeakReference< css::frame::XFrame >           m_xOwnerWeak;   /// css::uno::WeakReference to owner (Don't use a hard css::uno::Reference. Owner can't delete us then!)
+        css::uno::Reference< css::uno::XComponentContext >      m_xContext;   /// factory shared with our owner to create new services!
         osl::Mutex m_mutex;
         IMPL_ListenerHashContainer                              m_aListenerContainer;   /// hash table for listener at specified URLs
-        sal_Bool                                                m_bAlreadyDisposed  ;   /// Protection against multiple disposing calls.
-        sal_Bool                                                m_bActivateListener ;   /// dispatcher is listener for frame activation
-        MenuManager*                                            m_pMenuManager      ;   /// menu manager controlling menu dispatches
+        sal_Bool                                                m_bAlreadyDisposed;   /// Protection against multiple disposing calls.
+        sal_Bool                                                m_bActivateListener;   /// dispatcher is listener for frame activation
+        MenuManager*                                            m_pMenuManager;   /// menu manager controlling menu dispatches
 
 };      //  class MenuDispatcher
 
diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx
index 505097c91446..b8d6d2eb4a56 100644
--- a/framework/inc/dispatch/oxt_handler.hxx
+++ b/framework/inc/dispatch/oxt_handler.hxx
@@ -103,9 +103,9 @@ class Oxt_Handler  :    public  ::cppu::WeakImplHelper3<
     private:
         osl::Mutex m_mutex;
 
-        css::uno::Reference< css::lang::XMultiServiceFactory >     m_xFactory          ;   /// global uno service factory to create new services
-        css::uno::Reference< css::uno::XInterface >                m_xSelfHold         ;   /// we must protect us against dieing during async(!) dispatch() call!
-        css::uno::Reference< css::frame::XDispatchResultListener > m_xListener         ;
+        css::uno::Reference< css::lang::XMultiServiceFactory >     m_xFactory;   /// global uno service factory to create new services
+        css::uno::Reference< css::uno::XInterface >                m_xSelfHold;   /// we must protect us against dieing during async(!) dispatch() call!
+        css::uno::Reference< css::frame::XDispatchResultListener > m_xListener;
 
 };      //  class Oxt_Handler
 
diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx
index 71d2d45ab9e4..518ed3df3930 100644
--- a/framework/inc/dispatch/popupmenudispatcher.hxx
+++ b/framework/inc/dispatch/popupmenudispatcher.hxx
@@ -130,14 +130,14 @@ class PopupMenuDispatcher :     public  ::cppu::WeakImplHelper5<
 
     //  variables
     private:
-        css::uno::WeakReference< css::frame::XFrame >           m_xWeakFrame        ;   /// css::uno::WeakReference to frame (Don't use a hard css::uno::Reference. Owner can't delete us then!)
-        css::uno::Reference< css::container::XNameAccess >      m_xPopupCtrlQuery   ;   /// reference to query for popup controller
-        css::uno::Reference< css::uri::XUriReferenceFactory >   m_xUriRefFactory    ;   /// reference to the uri reference factory
-        css::uno::Reference< css::uno::XComponentContext >      m_xContext          ;   /// factory shared with our owner to create new services!
+        css::uno::WeakReference< css::frame::XFrame >           m_xWeakFrame;   /// css::uno::WeakReference to frame (Don't use a hard css::uno::Reference. Owner can't delete us then!)
+        css::uno::Reference< css::container::XNameAccess >      m_xPopupCtrlQuery;   /// reference to query for popup controller
+        css::uno::Reference< css::uri::XUriReferenceFactory >   m_xUriRefFactory;   /// reference to the uri reference factory
+        css::uno::Reference< css::uno::XComponentContext >      m_xContext;   /// factory shared with our owner to create new services!
         osl::Mutex m_mutex;
         IMPL_ListenerHashContainer                              m_aListenerContainer;   /// hash table for listener at specified URLs
-        sal_Bool                                                m_bAlreadyDisposed  ;   /// Protection against multiple disposing calls.
-        sal_Bool                                                m_bActivateListener ;   /// dispatcher is listener for frame activation
+        sal_Bool                                                m_bAlreadyDisposed;   /// Protection against multiple disposing calls.
+        sal_Bool                                                m_bActivateListener;   /// dispatcher is listener for frame activation
 
 }; //  class PopupMenuDispatcher
 
diff --git a/framework/inc/helper/dockingareadefaultacceptor.hxx b/framework/inc/helper/dockingareadefaultacceptor.hxx
index d906333d5813..7bfc6535a22f 100644
--- a/framework/inc/helper/dockingareadefaultacceptor.hxx
+++ b/framework/inc/helper/dockingareadefaultacceptor.hxx
@@ -68,7 +68,7 @@ class DockingAreaDefaultAcceptor    :   public ::cppu::WeakImplHelper1< ::com::s
 
     private:
 
-        css::uno::WeakReference< css::frame::XFrame >       m_xOwner            ;   /// weak reference to our frame object!
+        css::uno::WeakReference< css::frame::XFrame >       m_xOwner;   /// weak reference to our frame object!
 };
 
 } // namespace framework
diff --git a/framework/inc/helper/ocomponentaccess.hxx b/framework/inc/helper/ocomponentaccess.hxx
index c5f7293a3d7a..405c6b0f6adc 100644
--- a/framework/inc/helper/ocomponentaccess.hxx
+++ b/framework/inc/helper/ocomponentaccess.hxx
@@ -213,7 +213,7 @@ class OComponentAccess  :   public ::cppu::WeakImplHelper1< ::com::sun::star::co
 
     private:
 
-        css::uno::WeakReference< css::frame::XDesktop >     m_xOwner    ;   /// weak reference to the desktop object!
+        css::uno::WeakReference< css::frame::XDesktop >     m_xOwner;   /// weak reference to the desktop object!
 
 };      //  class OComponentAccess
 
diff --git a/framework/inc/helper/ocomponentenumeration.hxx b/framework/inc/helper/ocomponentenumeration.hxx
index 03ae18a9838c..39f77d76bfba 100644
--- a/framework/inc/helper/ocomponentenumeration.hxx
+++ b/framework/inc/helper/ocomponentenumeration.hxx
@@ -197,8 +197,8 @@ class OComponentEnumeration :   public ::cppu::WeakImplHelper2< ::com::sun::star
 
     private:
 
-        sal_uInt32                                                              m_nPosition         ;   /// current position in enumeration
-        css::uno::Sequence< css::uno::Reference< css::lang::XComponent > >      m_seqComponents     ;   /// list of current components
+        sal_uInt32                                                              m_nPosition;   /// current position in enumeration
+        css::uno::Sequence< css::uno::Reference< css::lang::XComponent > >      m_seqComponents;   /// list of current components
 
 };      //  class OComponentEnumeration
 
diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx
index 92e41ec606b9..687960b6546e 100644
--- a/framework/inc/helper/oframes.hxx
+++ b/framework/inc/helper/oframes.hxx
@@ -263,9 +263,9 @@ class OFrames   :   public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XFr
     //  (should be private everyway!)
 
     private:
-        css::uno::WeakReference< css::frame::XFrame >               m_xOwner                        ;   /// reference to owner of this instance (Hold no hard reference!)
-        FrameContainer*                                             m_pFrameContainer               ;   /// with owner shared list to hold all direct children of an XFramesSupplier
-        sal_Bool                                                    m_bRecursiveSearchProtection    ;   /// flag to protect against recursive searches of frames at parents
+        css::uno::WeakReference< css::frame::XFrame >               m_xOwner;   /// reference to owner of this instance (Hold no hard reference!)
+        FrameContainer*                                             m_pFrameContainer;   /// with owner shared list to hold all direct children of an XFramesSupplier
+        sal_Bool                                                    m_bRecursiveSearchProtection;   /// flag to protect against recursive searches of frames at parents
 
 };
 
diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx
index 1e5d6d5eccaf..47d3ce058353 100644
--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -97,9 +97,9 @@ struct IndicatorInfo
                             sal_Int32                                           nRange    )
         {
             m_xIndicator = xIndicator;
-            m_sText      = sText     ;
-            m_nRange     = nRange    ;
-            m_nValue     = 0         ;
+            m_sText      = sText;
+            m_nRange     = nRange;
+            m_nValue     = 0;
         }
 
         /** @short  Don't forget to free used references!
diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx
index fa2b6afb2492..66e70ce6ca71 100644
--- a/framework/inc/macros/registration.hxx
+++ b/framework/inc/macros/registration.hxx
@@ -57,16 +57,16 @@ ________________________________________________________________________________
                                                             void*     /*pRegistryKey*/      )                                           \
     {                                                                                                                                   \
         /* Set default return value for this operation - if it failed. */                                                               \
-        void* pReturn = NULL ;                                                                                                          \
+        void* pReturn = NULL;                                                                                                          \
         if  (                                                                                                                           \
                 ( pImplementationName   !=  NULL ) &&                                                                                   \
                 ( pServiceManager       !=  NULL )                                                                                      \
             )                                                                                                                           \
         {                                                                                                                               \
             /* Define variables which are used in following macros. */                                                                  \
-            ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >   xFactory            ;                   \
-            ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    xServiceManager     ;                   \
-            xServiceManager = reinterpret_cast< ::com::sun::star::lang::XMultiServiceFactory* >( pServiceManager )  ;                   \
+            ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >   xFactory;                   \
+            ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    xServiceManager;                   \
+            xServiceManager = reinterpret_cast< ::com::sun::star::lang::XMultiServiceFactory* >( pServiceManager );                   \
             /* These parameter will expand to      */                                                                                   \
             /* "IF_NAME_CREATECOMPONENTFACTORY(a)  */                                                                                   \
             /*  else                               */                                                                                   \
@@ -82,7 +82,7 @@ ________________________________________________________________________________
             }                                                                                                                           \
         }                                                                                                                               \
         /* Return with result of this operation. */                                                                                     \
-        return pReturn ;                                                                                                                \
+        return pReturn;                                                                                                                \
     }
 
 //}     //  namespace framework
diff --git a/framework/inc/macros/xinterface.hxx b/framework/inc/macros/xinterface.hxx
index 4651e6721be0..d3329904e90a 100644
--- a/framework/inc/macros/xinterface.hxx
+++ b/framework/inc/macros/xinterface.hxx
@@ -108,7 +108,7 @@ ________________________________________________________________________________
         if ( !aReturn.hasValue() )                                                                                                                          \
         {                                                                                                                                                   \
             /* ... search in second group. (cppuhelper support 12 items only!) */                                                                           \
-            aReturn = ::cppu::queryInterface INTERFACES_SECOND ;                                                                                            \
+            aReturn = ::cppu::queryInterface INTERFACES_SECOND;                                                                                            \
             /* If searched interface not supported by this class ... */                                                                                     \
             if ( !aReturn.hasValue() )                                                                                                                      \
             {                                                                                                                                               \
diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx
index 3bfa0b034d63..22fd2015ab79 100644
--- a/framework/inc/macros/xserviceinfo.hxx
+++ b/framework/inc/macros/xserviceinfo.hxx
@@ -70,13 +70,13 @@ namespace framework{
     css::uno::Sequence< OUString > CLASS::impl_getStaticSupportedServiceNames()                                                                     \
     {                                                                                                                                               \
         css::uno::Sequence< OUString > seqServiceNames( 1 );                                                                                        \
-        seqServiceNames.getArray() [0] = SERVICENAME ;                                                                                              \
+        seqServiceNames.getArray() [0] = SERVICENAME;                                                                                              \
         return seqServiceNames;                                                                                                                     \
     }                                                                                                                                               \
                                                                                                                                                     \
     OUString CLASS::impl_getStaticImplementationName()                                                                                              \
     {                                                                                                                                               \
-        return IMPLEMENTATIONNAME ;                                                                                                                 \
+        return IMPLEMENTATIONNAME;                                                                                                                 \
     }
 
 #define PRIVATE_DEFINE_XSERVICEINFO_OLDSTYLE( CLASS, XINTERFACECAST, SERVICENAME, IMPLEMENTATIONNAME )                                              \
diff --git a/framework/inc/macros/xtypeprovider.hxx b/framework/inc/macros/xtypeprovider.hxx
index cf8fcf6a628f..1aa3dd1cc601 100644
--- a/framework/inc/macros/xtypeprovider.hxx
+++ b/framework/inc/macros/xtypeprovider.hxx
@@ -69,7 +69,7 @@ ________________________________________________________________________________
         /* And we don't must use a mutex at every call!                 */                                                                      \
         /* For the first call; pTypeCollection is NULL -                */                                                                      \
         /* for the second call pTypeCollection is different from NULL!  */                                                                      \
-        static ::cppu::OTypeCollection* pTypeCollection = NULL ;                                                                                \
+        static ::cppu::OTypeCollection* pTypeCollection = NULL;                                                                                \
         if ( pTypeCollection == NULL )                                                                                                          \
         {                                                                                                                                       \
             /* Ready for multithreading; get global mutex for first call of this method only! see before   */                                   \
@@ -79,9 +79,9 @@ ________________________________________________________________________________
             {                                                                                                                                   \
                 /* Create a static typecollection ...           */                                                                              \
                 /* Attention: "TYPES" will expand to "(...)"!   */                                                                              \
-                static ::cppu::OTypeCollection aTypeCollection TYPES ;                                                                          \
+                static ::cppu::OTypeCollection aTypeCollection TYPES;                                                                          \
                 /* ... and set his address to static pointer! */                                                                                \
-                pTypeCollection = &aTypeCollection ;                                                                                            \
+                pTypeCollection = &aTypeCollection;                                                                                            \
             }                                                                                                                                   \
         }                                                                                                                                       \
         return pTypeCollection->getTypes();                                                                                                     \
@@ -98,7 +98,7 @@ ________________________________________________________________________________
         /* And we don't must use a mutex at every call!                 */                                                                      \
         /* For the first call; pTypeCollection is NULL -                */                                                                      \
         /* for the second call pTypeCollection is different from NULL!  */                                                                      \
-        static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >* pTypeCollection = NULL ;                                         \
+        static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >* pTypeCollection = NULL;                                         \
         if ( pTypeCollection == NULL )                                                                                                          \
         {                                                                                                                                       \
             /* Ready for multithreading; get global mutex for first call of this method only! see before   */                                   \
@@ -108,8 +108,8 @@ ________________________________________________________________________________
             {                                                                                                                                   \
                 /* Create two typecollections                           */                                                                      \
                 /* (cppuhelper support 12 items per collection only!)   */                                                                      \
-                ::cppu::OTypeCollection aTypeCollection1 TYPES_FIRST    ;                                                                       \
-                ::cppu::OTypeCollection aTypeCollection2 TYPES_SECOND   ;                                                                       \
+                ::cppu::OTypeCollection aTypeCollection1 TYPES_FIRST;                                                                       \
+                ::cppu::OTypeCollection aTypeCollection2 TYPES_SECOND;                                                                       \
                 /* Copy all items from both sequences to one result list! */                                                                    \
                 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >          seqTypes1   = aTypeCollection1.getTypes();              \
                 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >          seqTypes2   = aTypeCollection2.getTypes();              \
@@ -149,7 +149,7 @@ ________________________________________________________________________________
         /* And we don't must use a mutex at every call!                 */                                                                      \
         /* For the first call; pTypeCollection is NULL -                */                                                                      \
         /* for the second call pTypeCollection is different from NULL!  */                                                                      \
-        static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >* pTypeCollection = NULL ;                                         \
+        static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >* pTypeCollection = NULL;                                         \
         if ( pTypeCollection == NULL )                                                                                                          \
         {                                                                                                                                       \
             /* Ready for multithreading; get global mutex for first call of this method only! see before   */                                   \
@@ -158,7 +158,7 @@ ________________________________________________________________________________
             if ( pTypeCollection == NULL )                                                                                                      \
             {                                                                                                                                   \
                 /* Create static typecollection for my own interfaces!  */                                                                      \
-                static ::cppu::OTypeCollection aTypeCollection TYPES ;                                                                          \
+                static ::cppu::OTypeCollection aTypeCollection TYPES;                                                                          \
                 /* Copy all items from my list sequences and from my baseclass  */                                                              \
                 /* to one result list!                                          */                                                              \
                 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >          seqTypes1   = aTypeCollection.getTypes();               \
diff --git a/framework/inc/properties.h b/framework/inc/properties.h
index ea547aeed256..689f724af00b 100644
--- a/framework/inc/properties.h
+++ b/framework/inc/properties.h
@@ -272,7 +272,7 @@ class PropHelper
         {
             // ... set information of change.
             aOldValue     = aCurrentValue;
-            aChangedValue = aNewValue    ;
+            aChangedValue = aNewValue;
         }
 
         return bChanged;
diff --git a/framework/inc/queries.h b/framework/inc/queries.h
index 15d456647c83..968d0835fcc1 100644
--- a/framework/inc/queries.h
+++ b/framework/inc/queries.h
@@ -136,8 +136,8 @@ class QueryBuilder
         }
 
     private:
-        OUString         m_sBase     ;
-        OUStringBuffer   m_sParams   ;
+        OUString         m_sBase;
+        OUStringBuffer   m_sParams;
 
 };      // class QueryBuilder
 
@@ -320,13 +320,13 @@ class QueryAnalyzer
         // access to additional parameter values
         // Methods return default of really set values!
 
-        sal_uInt32 getIFlags       () const { return m_nIFlags       ; }
-        sal_uInt32 getEFlags       () const { return m_nEFlags       ; }
-        ESortProp  getSortProp     () const { return m_eSortProp     ; }
-        sal_Bool   getDescending   () const { return m_bDescending   ; }
+        sal_uInt32 getIFlags       () const { return m_nIFlags; }
+        sal_uInt32 getEFlags       () const { return m_nEFlags; }
+        ESortProp  getSortProp     () const { return m_eSortProp; }
+        sal_Bool   getDescending   () const { return m_bDescending; }
         sal_Bool   getCaseSensitive() const { return m_bCaseSensitive; }
-        sal_Bool   getUseOrder     () const { return m_bUseOrder     ; }
-        sal_Bool   getDefaultFirst () const { return m_bDefaultFirst ; }
+        sal_Bool   getUseOrder     () const { return m_bUseOrder; }
+        sal_Bool   getDefaultFirst () const { return m_bDefaultFirst; }
 
         // this method checks if given string match any supported query.
         // (ignore additional parameters!)
@@ -340,14 +340,14 @@ class QueryAnalyzer
         }
 
     private:
-        EQuery      m_eQuery         ;
-        sal_uInt32  m_nIFlags        ;
-        sal_uInt32  m_nEFlags        ;
-        ESortProp   m_eSortProp      ;
-        sal_Bool    m_bDescending    ;
-        sal_Bool    m_bCaseSensitive ;
-        sal_Bool    m_bUseOrder      ;
-        sal_Bool    m_bDefaultFirst  ;
+        EQuery      m_eQuery;
+        sal_uInt32  m_nIFlags;
+        sal_uInt32  m_nEFlags;
+        ESortProp   m_eSortProp;
+        sal_Bool    m_bDescending;
+        sal_Bool    m_bCaseSensitive;
+        sal_Bool    m_bUseOrder;
+        sal_Bool    m_bDefaultFirst;
 
 };      // class QueryAnalyzer
 
diff --git a/framework/inc/recording/dispatchrecorder.hxx b/framework/inc/recording/dispatchrecorder.hxx
index 99726c42feda..0f03a48c06b4 100644
--- a/framework/inc/recording/dispatchrecorder.hxx
+++ b/framework/inc/recording/dispatchrecorder.hxx
@@ -56,7 +56,7 @@ class DispatchRecorder
     // private member
     private:
         DispatchStatementList                                  m_aStatements;
-        sal_Int32                                              m_nRecordingID ;
+        sal_Int32                                              m_nRecordingID;
         css::uno::Reference< css::script::XTypeConverter >     m_xConverter;
 
     // public interface
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index eb5bccab234c..4a687dd20e83 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -393,7 +393,7 @@ class Desktop : private cppu::BaseMutex,
         static sal_Bool implcp_addEventListener         ( const css::uno::Reference< css::lang::XEventListener >&           xListener        );
         static sal_Bool implcp_removeEventListener      ( const css::uno::Reference< css::lang::XEventListener >&           xListener        );
 
-        sal_Bool m_bIsTerminated ;  /// check flag to protect us against dispose before terminate!
+        sal_Bool m_bIsTerminated;  /// check flag to protect us against dispose before terminate!
                                     /// see dispose() for further information!
 
     //  variables
@@ -401,19 +401,19 @@ class Desktop : private cppu::BaseMutex,
 
     private:
 
-        css::uno::Reference< css::uno::XComponentContext >              m_xContext                  ;   /// reference to factory, which has create this instance
-        FrameContainer                                                  m_aChildTaskContainer       ;   /// array of child tasks (children of desktop are tasks; and tasks are also frames - But pure frames are not accepted!)
-        ::cppu::OMultiTypeInterfaceContainerHelper                      m_aListenerContainer        ;   /// container for ALL Listener
-        css::uno::Reference< css::frame::XFrames >                      m_xFramesHelper             ;   /// helper for XFrames, XIndexAccess, XElementAccess and implementation of a childcontainer!
-        css::uno::Reference< css::frame::XDispatchProvider >            m_xDispatchHelper           ;   /// helper to dispatch something for new tasks, created by "_blank"!
-        ELoadState                                                      m_eLoadState                ;   /// hold information about state of asynchron loading of component for loadComponentFromURL()!
-        css::uno::Reference< css::frame::XFrame >                       m_xLastFrame                ;   /// last target of "loadComponentFromURL()"!
-        css::uno::Any                                                   m_aInteractionRequest       ;
-        sal_Bool                                                        m_bSuspendQuickstartVeto    ;   /// don't ask quickstart for a veto
-        SvtCommandOptions                                               m_aCommandOptions           ;   /// ref counted class to support disabling commands defined by configuration file
-        OUString                                                 m_sName                     ;
-        OUString                                                 m_sTitle                    ;
-        css::uno::Reference< css::frame::XDispatchRecorderSupplier >    m_xDispatchRecorderSupplier ;
+        css::uno::Reference< css::uno::XComponentContext >              m_xContext;               /// reference to factory, which has create this instance
+        FrameContainer                                                  m_aChildTaskContainer;    /// array of child tasks (children of desktop are tasks; and tasks are also frames - But pure frames are not accepted!)
+        ::cppu::OMultiTypeInterfaceContainerHelper                      m_aListenerContainer;     /// container for ALL Listener
+        css::uno::Reference< css::frame::XFrames >                      m_xFramesHelper;          /// helper for XFrames, XIndexAccess, XElementAccess and implementation of a childcontainer!
+        css::uno::Reference< css::frame::XDispatchProvider >            m_xDispatchHelper;        /// helper to dispatch something for new tasks, created by "_blank"!
+        ELoadState                                                      m_eLoadState;             /// hold information about state of asynchron loading of component for loadComponentFromURL()!
+        css::uno::Reference< css::frame::XFrame >                       m_xLastFrame;             /// last target of "loadComponentFromURL()"!
+        css::uno::Any                                                   m_aInteractionRequest;
+        sal_Bool                                                        m_bSuspendQuickstartVeto; /// don't ask quickstart for a veto
+        SvtCommandOptions                                               m_aCommandOptions;        /// ref counted class to support disabling commands defined by configuration file
+        OUString                                                 m_sName;
+        OUString                                                 m_sTitle;
+        css::uno::Reference< css::frame::XDispatchRecorderSupplier >    m_xDispatchRecorderSupplier;
 
         /** special terminate listener to close pipe and block external requests
           * during/after termination process is/was running
diff --git a/framework/inc/threadhelp/gate.hxx b/framework/inc/threadhelp/gate.hxx
index a6b9d04a64da..deaa0b4a8258 100644
--- a/framework/inc/threadhelp/gate.hxx
+++ b/framework/inc/threadhelp/gate.hxx
@@ -203,10 +203,10 @@ class Gate : public  IGate
 
     private:
 
-        ::osl::Mutex        m_aAccessLock   ;
-        ::osl::Condition    m_aPassage      ;
-        sal_Bool            m_bClosed       ;
-        sal_Bool            m_bGapOpen      ;
+        ::osl::Mutex        m_aAccessLock;
+        ::osl::Condition    m_aPassage;
+        sal_Bool            m_bClosed;
+        sal_Bool            m_bGapOpen;
 
 };      //  class Gate
 
diff --git a/framework/inc/threadhelp/transactionbase.hxx b/framework/inc/threadhelp/transactionbase.hxx
index 70308e781dad..4d2cd5b1b363 100644
--- a/framework/inc/threadhelp/transactionbase.hxx
+++ b/framework/inc/threadhelp/transactionbase.hxx
@@ -43,7 +43,7 @@ struct TransactionBase
 
     public:
 
-        mutable TransactionManager    m_aTransactionManager    ;   /// "your" public manager-member!
+        mutable TransactionManager    m_aTransactionManager;   /// "your" public manager-member!
                                                                    /// Make it mutable for using in const functions!
 
 };      //  struct TransactionBase
diff --git a/framework/inc/threadhelp/transactionguard.hxx b/framework/inc/threadhelp/transactionguard.hxx
index 02ff6f1a27a1..2423b6eb3475 100644
--- a/framework/inc/threadhelp/transactionguard.hxx
+++ b/framework/inc/threadhelp/transactionguard.hxx
@@ -144,7 +144,7 @@ class TransactionGuard : private boost::noncopyable
 
     private:
 
-        ITransactionManager*   m_pManager   ;   /// pointer to safed transaction manager
+        ITransactionManager*   m_pManager;   /// pointer to safed transaction manager
 
 };      //  class TransactionGuard
 
diff --git a/framework/inc/threadhelp/transactionmanager.hxx b/framework/inc/threadhelp/transactionmanager.hxx
index 31fd6c4200b8..8b204aff39fc 100644
--- a/framework/inc/threadhelp/transactionmanager.hxx
+++ b/framework/inc/threadhelp/transactionmanager.hxx
@@ -73,10 +73,10 @@ class FWI_DLLPUBLIC TransactionManager : public  ITransactionManager
 
     private:
 
-        mutable ::osl::Mutex    m_aAccessLock           ;   /// regulate access on internal member of this instance
-        Gate                    m_aBarrier              ;   /// used to block transactions requests during change or work mode
-        EWorkingMode            m_eWorkingMode          ;   /// current working mode of object which use this manager (used to reject calls at wrong time)
-        sal_Int32               m_nTransactionCount     ;   /// every transaction request is registered by this counter
+        mutable ::osl::Mutex    m_aAccessLock;   /// regulate access on internal member of this instance
+        Gate                    m_aBarrier;   /// used to block transactions requests during change or work mode
+        EWorkingMode            m_eWorkingMode;   /// current working mode of object which use this manager (used to reject calls at wrong time)
+        sal_Int32               m_nTransactionCount;   /// every transaction request is registered by this counter
 
 };      //  class TransactionManager
 
diff --git a/framework/source/accelerators/acceleratorcache.cxx b/framework/source/accelerators/acceleratorcache.cxx
index 61c8289bc066..5ed4aa75fa6d 100644
--- a/framework/source/accelerators/acceleratorcache.cxx
+++ b/framework/source/accelerators/acceleratorcache.cxx
@@ -80,7 +80,7 @@ AcceleratorCache::TKeyList AcceleratorCache::getAllKeys() const
     TKey2Commands::const_iterator pIt;
     TKey2Commands::const_iterator pEnd = m_lKey2Commands.end();
     for (  pIt  = m_lKey2Commands.begin();
-           pIt != pEnd  ;
+           pIt != pEnd;
          ++pIt                           )
     {
         lKeys.push_back(pIt->first);
@@ -149,9 +149,9 @@ void AcceleratorCache::removeCommand(const OUString& sCommand)
     SolarMutexGuard g;
 
     const TKeyList&                            lKeys = getKeysByCommand(sCommand);
-    AcceleratorCache::TKeyList::const_iterator pKey ;
+    AcceleratorCache::TKeyList::const_iterator pKey;
     for (  pKey  = lKeys.begin();
-           pKey != lKeys.end()  ;
+           pKey != lKeys.end();
          ++pKey                 )
     {
         const css::awt::KeyEvent& rKey = *pKey;
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index b8b72c510935..51c91474d461 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -1014,8 +1014,8 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util:
         // So we try to split the path into 3 parts (module isnt important here, because we already know it ... because
         // these instance is bound to a specific module configuration ... or it''s the global configuration where no module is given at all.
 
-        OUString sOrgPath ;
-        OUString sPath    ;
+        OUString sOrgPath;
+        OUString sPath;
         OUString sKey;
 
         aChange.Accessor >>= sOrgPath;
diff --git a/framework/source/accelerators/keymapping.cxx b/framework/source/accelerators/keymapping.cxx
index bd9ea14e6113..c5d219860110 100644
--- a/framework/source/accelerators/keymapping.cxx
+++ b/framework/source/accelerators/keymapping.cxx
@@ -146,7 +146,7 @@ KeyMapping::KeyMapping()
         OUString sIdentifier = OUString::createFromAscii(KeyIdentifierMap[i].Identifier);
         sal_Int16       nCode       = KeyIdentifierMap[i].Code;
 
-        m_lIdentifierHash[sIdentifier] = nCode      ;
+        m_lIdentifierHash[sIdentifier] = nCode;
         m_lCodeHash      [nCode]       = sIdentifier;
 
         ++i;
diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx
index e35d617d8b2a..291e68396adc 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -333,10 +333,10 @@ void PresetHandler::connectToResource(      PresetHandler::EConfigType
 
     {
         SolarMutexGuard g;
-        m_eConfigType   = eConfigType  ;
-        m_sResourceType = sResource    ;
-        m_sModule       = sModule      ;
-        m_aLanguageTag  = rLanguageTag ;
+        m_eConfigType   = eConfigType;
+        m_sResourceType = sResource;
+        m_sModule       = sModule;
+        m_aLanguageTag  = rLanguageTag;
     }
 
     css::uno::Reference< css::embed::XStorage > xShare;
@@ -442,7 +442,7 @@ void PresetHandler::connectToResource(      PresetHandler::EConfigType
         // Fallbacks are allowed there.
         OUString             aShareLocale( rLanguageTag.getBcp47());
         OUString      sLocalizedSharePath(sRelPathShare);
-        sal_Bool             bAllowFallbacks    = sal_True     ;
+        sal_Bool             bAllowFallbacks    = sal_True;
         xShare = impl_openLocalizedPathIgnoringErrors(sLocalizedSharePath, eShareMode, sal_True , aShareLocale, bAllowFallbacks);
 
         // The try to locate the right sub dir inside user layer ... without using fallbacks!
@@ -450,19 +450,19 @@ void PresetHandler::connectToResource(      PresetHandler::EConfigType
         // Because we allow creation of storages inside user layer by default.
         OUString             aUserLocale( rLanguageTag.getBcp47());
         OUString      sLocalizedUserPath(sRelPathUser);
-                             bAllowFallbacks    = sal_False  ;
+                             bAllowFallbacks    = sal_False;
         xUser = impl_openLocalizedPathIgnoringErrors(sLocalizedUserPath, eUserMode , sal_False, aUserLocale, bAllowFallbacks);
 
         sRelPathShare = sLocalizedSharePath;
-        sRelPathUser  = sLocalizedUserPath ;
+        sRelPathUser  = sLocalizedUserPath;
     }
 
     // read content of level 3 (presets, targets)
-          css::uno::Reference< css::container::XNameAccess > xAccess ;
-          css::uno::Sequence< OUString >              lNames  ;
-    const OUString*                                   pNames  ;
-          sal_Int32                                          c       ;
-          sal_Int32                                          i       ;
+          css::uno::Reference< css::container::XNameAccess > xAccess;
+          css::uno::Sequence< OUString >              lNames;
+    const OUString*                                   pNames;
+          sal_Int32                                          c;
+          sal_Int32                                          i;
           OUStringList                                       lPresets;
           OUStringList                                       lTargets;
 
@@ -504,9 +504,9 @@ void PresetHandler::connectToResource(      PresetHandler::EConfigType
 
     {
         SolarMutexGuard g;
-        m_xWorkingStorageShare = xShare  ;
+        m_xWorkingStorageShare = xShare;
         m_xWorkingStorageNoLang= xNoLang;
-        m_xWorkingStorageUser  = xUser   ;
+        m_xWorkingStorageUser  = xUser;
         m_lPresets             = lPresets;
         m_lTargets             = lTargets;
         m_sRelPathShare        = sRelPathShare;
@@ -536,7 +536,7 @@ void PresetHandler::copyPresetToTarget(const OUString& sPreset,
         SolarMutexGuard g;
         xWorkingShare = m_xWorkingStorageShare;
         xWorkingNoLang= m_xWorkingStorageNoLang;
-        xWorkingUser  = m_xWorkingStorageUser ;
+        xWorkingUser  = m_xWorkingStorageUser;
     }
 
     // e.g. module without any config data ?!
@@ -763,7 +763,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoring
     else
     {
         for (  pFound  = lLocalizedValues.begin();
-               pFound != lLocalizedValues.end()  ;
+               pFound != lLocalizedValues.end();
              ++pFound                            )
         {
             if (*pFound == rLanguageTag)
diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx
index d1f0a7251f31..10a524035ff4 100644
--- a/framework/source/accelerators/storageholder.cxx
+++ b/framework/source/accelerators/storageholder.cxx
@@ -59,7 +59,7 @@ void StorageHolder::forgetCachedStorages()
     osl::MutexGuard g(m_mutex);
     TPath2StorageInfo::iterator pIt;
     for (  pIt  = m_lStorages.begin();
-           pIt != m_lStorages.end()  ;
+           pIt != m_lStorages.end();
          ++pIt                       )
     {
         TStorageInfo& rInfo = pIt->second;
@@ -93,12 +93,12 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const OUStri
     aReadLock.clear();
     // <- SAFE ----------------------------------
 
-    css::uno::Reference< css::embed::XStorage > xChild  ;
+    css::uno::Reference< css::embed::XStorage > xChild;
     OUString                             sRelPath;
-    OUStringList::const_iterator                pIt     ;
+    OUStringList::const_iterator                pIt;
 
     for (  pIt  = lFolders.begin();
-           pIt != lFolders.end()  ;
+           pIt != lFolders.end();
          ++pIt                    )
     {
         const OUString& sChild     = *pIt;
@@ -171,13 +171,13 @@ StorageHolder::TStorageList StorageHolder::getAllPathStorages(const OUString& sP
     OUStringList    lFolders    = StorageHolder::impl_st_parsePath(sNormedPath);
 
     StorageHolder::TStorageList  lStoragesOfPath;
-    OUString              sRelPath       ;
-    OUStringList::const_iterator pIt            ;
+    OUString              sRelPath;
+    OUStringList::const_iterator pIt;
 
     osl::MutexGuard g(m_mutex);
 
     for (  pIt  = lFolders.begin();
-           pIt != lFolders.end()  ;
+           pIt != lFolders.end();
          ++pIt                    )
     {
         const OUString& sChild     = *pIt;
@@ -211,7 +211,7 @@ void StorageHolder::commitPath(const OUString& sPath)
     css::uno::Reference< css::embed::XTransactedObject > xCommit;
     StorageHolder::TStorageList::reverse_iterator pIt;
     for (  pIt  = lStorages.rbegin(); // order of commit is important ... otherwise changes are not recognized!
-           pIt != lStorages.rend()  ;
+           pIt != lStorages.rend();
          ++pIt                      )
     {
         xCommit = css::uno::Reference< css::embed::XTransactedObject >(*pIt, css::uno::UNO_QUERY);
@@ -240,10 +240,10 @@ void StorageHolder::closePath(const OUString& rPath)
         [1] = "path_2" => "path_1/path_2"
         [2] = "path_3" => "path_1/path_2/path_3"
     */
-    OUStringList::iterator pIt1       ;
+    OUStringList::iterator pIt1;
     OUString        sParentPath;
     for (  pIt1  = lFolders.begin();
-           pIt1 != lFolders.end()  ;
+           pIt1 != lFolders.end();
          ++pIt1                    )
     {
         OUString sCurrentRelPath  = sParentPath;
@@ -257,7 +257,7 @@ void StorageHolder::closePath(const OUString& rPath)
 
     OUStringList::reverse_iterator pIt2;
     for (  pIt2  = lFolders.rbegin();
-           pIt2 != lFolders.rend()  ;
+           pIt2 != lFolders.rend();
          ++pIt2                     )
     {
         OUString             sPath = *pIt2;
@@ -288,7 +288,7 @@ void StorageHolder::notifyPath(const OUString& sPath)
     TStorageInfo& rInfo = pIt1->second;
     TStorageListenerList::iterator pIt2;
     for (  pIt2  = rInfo.Listener.begin();
-           pIt2 != rInfo.Listener.end()  ;
+           pIt2 != rInfo.Listener.end();
          ++pIt2                          )
     {
         IStorageListener* pListener = *pIt2;
@@ -337,7 +337,7 @@ OUString StorageHolder::getPathOfStorage(const css::uno::Reference< css::embed::
 
     TPath2StorageInfo::const_iterator pIt;
     for (  pIt  = m_lStorages.begin();
-           pIt != m_lStorages.end()  ;
+           pIt != m_lStorages.end();
          ++pIt                       )
     {
         const TStorageInfo& rInfo = pIt->second;
diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx
index b7b850a7d1b5..21393a5f2d66 100644
--- a/framework/source/classes/taskcreator.cxx
+++ b/framework/source/classes/taskcreator.cxx
@@ -89,7 +89,7 @@ css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const OUStrin
         xCreator = css::frame::TaskCreator::create(m_xContext);
 
     css::uno::Sequence< css::uno::Any > lArgs(5);
-    css::beans::NamedValue              aArg    ;
+    css::beans::NamedValue              aArg;
 
     aArg.Name    = OUString(ARGUMENT_PARENTFRAME);
     aArg.Value <<= css::uno::Reference< css::frame::XFrame >( css::frame::Desktop::create( m_xContext ), css::uno::UNO_QUERY_THROW);
diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx
index febf48b9cf6b..19f0381f8218 100644
--- a/framework/source/dispatch/dispatchinformationprovider.cxx
+++ b/framework/source/dispatch/dispatchinformationprovider.cxx
@@ -110,9 +110,9 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL DispatchInformati
     i1 = 0;
 
     css::uno::Sequence< css::frame::DispatchInformation >       lReturn(c1);
-    BaseHash< css::frame::DispatchInformation >::const_iterator pStepp ;
-    for (  pStepp  = lInfos.begin()          ;
-           pStepp != lInfos.end  () && i1<c1 ;
+    BaseHash< css::frame::DispatchInformation >::const_iterator pStepp;
+    for (  pStepp  = lInfos.begin();
+           pStepp != lInfos.end  () && i1<c1;
          ++pStepp, ++i1                      )
     {
         lReturn[i1] = pStepp->second;
@@ -133,7 +133,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvide
     css::uno::Reference< css::frame::XDispatchInformationProvider > xController   (xFrame->getController()                                      , css::uno::UNO_QUERY);
     css::uno::Reference< css::frame::XDispatchInformationProvider > xAppDispatcher = css::frame::AppDispatchProvider::create(m_xContext);
     css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvider > > lProvider(3);
-    lProvider[0] = xController   ;
+    lProvider[0] = xController;
     lProvider[1] = xCloseDispatch;
     lProvider[2] = xAppDispatcher;
 
diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx
index 80c9026049e1..af2e05ffb740 100644
--- a/framework/source/dispatch/dispatchprovider.cxx
+++ b/framework/source/dispatch/dispatchprovider.cxx
@@ -456,7 +456,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
 css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_searchProtocolHandler( const css::util::URL& aURL )
 {
     css::uno::Reference< css::frame::XDispatch > xDispatcher;
-    ProtocolHandler                              aHandler   ;
+    ProtocolHandler                              aHandler;
 
     // This member is threadsafe by himself and lives if we live - we don't need any mutex here.
     if (m_aProtocolHandlerCache.search(aURL,&aHandler))
diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx
index 8d23fc2ceb3c..44f0e620230c 100644
--- a/framework/source/dispatch/interceptionhelper.cxx
+++ b/framework/source/dispatch/interceptionhelper.cxx
@@ -247,7 +247,7 @@ void SAL_CALL InterceptionHelper::disposing(const css::lang::EventObject& aEvent
 
     InterceptionHelper::InterceptorList::iterator pIt;
     for (  pIt  = aCopy.begin();
-           pIt != aCopy.end()  ;
+           pIt != aCopy.end();
          ++pIt                 )
     {
         InterceptionHelper::InterceptorInfo& rInfo = *pIt;
diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx
index e87fbcf2e38e..6f44bd72ba1a 100644
--- a/framework/source/dispatch/menudispatcher.cxx
+++ b/framework/source/dispatch/menudispatcher.cxx
@@ -46,15 +46,15 @@
 
 namespace framework{
 
-using namespace ::com::sun::star                ;
-using namespace ::com::sun::star::awt           ;
-using namespace ::com::sun::star::beans         ;
-using namespace ::com::sun::star::container     ;
-using namespace ::com::sun::star::frame         ;
-using namespace ::com::sun::star::lang          ;
-using namespace ::com::sun::star::uno           ;
-using namespace ::com::sun::star::util          ;
-using namespace ::cppu                          ;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::awt;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::frame;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::util;
+using namespace ::cppu;
 
 const sal_uInt16 SLOTID_MDIWINDOWLIST = 5610;
 
@@ -311,10 +311,10 @@ static sal_Bool impldbg_checkParameter_addStatusListener( const   uno::Reference
             ( aURL.Complete.isEmpty()               )
         )
     {
-        bOK = sal_False ;
+        bOK = sal_False;
     }
     // Return result of check.
-    return bOK ;
+    return bOK;
 }
 
 // The same goes for these case! We have added valid listener for correct URL only.
@@ -331,10 +331,10 @@ static sal_Bool impldbg_checkParameter_removeStatusListener(  const   uno::Refer
             ( aURL.Complete.isEmpty()               )
         )
     {
-        bOK = sal_False ;
+        bOK = sal_False;
     }
     // Return result of check.
-    return bOK ;
+    return bOK;
 }
 
 }       //  namespace framework
diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx
index 1f29b10ff362..9623ebd89866 100644
--- a/framework/source/dispatch/popupmenudispatcher.cxx
+++ b/framework/source/dispatch/popupmenudispatcher.cxx
@@ -45,17 +45,17 @@
 
 namespace framework{
 
-using namespace ::com::sun::star                ;
-using namespace ::com::sun::star::awt           ;
-using namespace ::com::sun::star::beans         ;
-using namespace ::com::sun::star::container     ;
-using namespace ::com::sun::star::frame         ;
-using namespace ::com::sun::star::lang          ;
-using namespace ::com::sun::star::uno           ;
-using namespace ::com::sun::star::util          ;
-using namespace ::cppu                          ;
-using namespace ::osl                           ;
-using namespace ::rtl                           ;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::awt;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::frame;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::util;
+using namespace ::cppu;
+using namespace ::osl;
+using namespace ::rtl;
 
 PopupMenuDispatcher::PopupMenuDispatcher(
     const uno::Reference< XComponentContext >& xContext )
diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx
index d59089974ac0..6b5630c64061 100644
--- a/framework/source/dispatch/servicehandler.cxx
+++ b/framework/source/dispatch/servicehandler.cxx
@@ -186,7 +186,7 @@ css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( con
     // and use it to create and start the component
     OUString sServiceAndArguments = aURL.Complete.copy(PROTOCOL_LENGTH);
     OUString sServiceName;
-    OUString sArguments  ;
+    OUString sArguments;
 
     sal_Int32 nArgStart = sServiceAndArguments.indexOf('?',0);
     if (nArgStart!=-1)
diff --git a/framework/source/fwe/classes/actiontriggercontainer.cxx b/framework/source/fwe/classes/actiontriggercontainer.cxx
index 904b3e3fae2e..e03ecf19d140 100644
--- a/framework/source/fwe/classes/actiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/actiontriggercontainer.cxx
@@ -128,12 +128,12 @@ Sequence< Type > SAL_CALL ActionTriggerContainer::getTypes() throw ( RuntimeExce
     // Optimize this method !
     // We initialize a static variable only one time. And we don't must use a mutex at every call!
     // For the first call; pTypeCollection is NULL - for the second call pTypeCollection is different from NULL!
-    static ::cppu::OTypeCollection* pTypeCollection = NULL ;
+    static ::cppu::OTypeCollection* pTypeCollection = NULL;
 
     if ( pTypeCollection == NULL )
     {
         // Ready for multithreading; get global mutex for first call of this method only! see before
-        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
+        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() );
 
         // Control these pointer again ... it can be, that another instance will be faster then these!
         if ( pTypeCollection == NULL )
@@ -143,14 +143,14 @@ Sequence< Type > SAL_CALL ActionTriggerContainer::getTypes() throw ( RuntimeExce
                         ::getCppuType(( const Reference< XMultiServiceFactory   >*)NULL ) ,
                         ::getCppuType(( const Reference< XIndexContainer        >*)NULL ) ,
                         ::getCppuType(( const Reference< XServiceInfo           >*)NULL ) ,
-                        ::getCppuType(( const Reference< XTypeProvider          >*)NULL ) ) ;
+                        ::getCppuType(( const Reference< XTypeProvider          >*)NULL ) );
 
             // ... and set his address to static pointer!
-            pTypeCollection = &aTypeCollection ;
+            pTypeCollection = &aTypeCollection;
         }
     }
 
-    return pTypeCollection->getTypes() ;
+    return pTypeCollection->getTypes();
 }
 
 Sequence< sal_Int8 > SAL_CALL ActionTriggerContainer::getImplementationId() throw ( RuntimeException, std::exception )
diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
index 7a6a478eda62..2290aab92017 100644
--- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
@@ -123,12 +123,12 @@ Sequence< Type > SAL_CALL ActionTriggerPropertySet::getTypes() throw ( RuntimeEx
     // Optimize this method !
     // We initialize a static variable only one time. And we don't must use a mutex at every call!
     // For the first call; pTypeCollection is NULL - for the second call pTypeCollection is different from NULL!
-    static ::cppu::OTypeCollection* pTypeCollection = NULL ;
+    static ::cppu::OTypeCollection* pTypeCollection = NULL;
 
     if ( pTypeCollection == NULL )
     {
         // Ready for multithreading; get global mutex for first call of this method only! see before
-        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
+        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() );
 
         // Control these pointer again ... it can be, that another instance will be faster then these!
         if ( pTypeCollection == NULL )
@@ -139,14 +139,14 @@ Sequence< Type > SAL_CALL ActionTriggerPropertySet::getTypes() throw ( RuntimeEx
                         ::getCppuType(( const Reference< XFastPropertySet       >*)NULL ) ,
                         ::getCppuType(( const Reference< XMultiPropertySet      >*)NULL ) ,
                         ::getCppuType(( const Reference< XServiceInfo           >*)NULL ) ,
-                        ::getCppuType(( const Reference< XTypeProvider          >*)NULL ) ) ;
+                        ::getCppuType(( const Reference< XTypeProvider          >*)NULL ) );
 
             // ... and set his address to static pointer!
-            pTypeCollection = &aTypeCollection ;
+            pTypeCollection = &aTypeCollection;
         }
     }
 
-    return pTypeCollection->getTypes() ;
+    return pTypeCollection->getTypes();
 }
 
 Sequence< sal_Int8 > SAL_CALL ActionTriggerPropertySet::getImplementationId() throw ( RuntimeException, std::exception )
@@ -175,11 +175,11 @@ throw( IllegalArgumentException )
             break;
 
         case HANDLE_HELPURL:
-            bReturn = impl_tryToChangeProperty( m_aHelpURL, aValue, aOldValue, aConvertedValue ) ;
+            bReturn = impl_tryToChangeProperty( m_aHelpURL, aValue, aOldValue, aConvertedValue );
             break;
 
         case HANDLE_IMAGE:
-            bReturn = impl_tryToChangeProperty( m_xBitmap, aValue, aOldValue, aConvertedValue ) ;
+            bReturn = impl_tryToChangeProperty( m_xBitmap, aValue, aOldValue, aConvertedValue );
             break;
 
         case HANDLE_SUBCONTAINER:
@@ -187,7 +187,7 @@ throw( IllegalArgumentException )
             break;
 
         case HANDLE_TEXT:
-            bReturn = impl_tryToChangeProperty( m_aText, aValue, aOldValue, aConvertedValue ) ;
+            bReturn = impl_tryToChangeProperty( m_aText, aValue, aOldValue, aConvertedValue );
             break;
     }
 
@@ -287,7 +287,7 @@ throw ( RuntimeException, std::exception )
     // Optimize this method !
     // We initialize a static variable only one time. And we don't must use a mutex at every call!
     // For the first call; pInfo is NULL - for the second call pInfo is different from NULL!
-    static Reference< XPropertySetInfo >* pInfo = NULL ;
+    static Reference< XPropertySetInfo >* pInfo = NULL;
 
     if( pInfo == NULL )
     {
@@ -321,7 +321,7 @@ const Sequence< Property > ActionTriggerPropertySet::impl_getStaticPropertyDescr
     const Sequence< Property > seqActionTriggerPropertyDescriptor( pActionTriggerPropertys, PROPERTYCOUNT );
 
     // Return "PropertyDescriptor"
-    return seqActionTriggerPropertyDescriptor ;
+    return seqActionTriggerPropertyDescriptor;
 }
 
 sal_Bool ActionTriggerPropertySet::impl_tryToChangeProperty(
@@ -335,23 +335,23 @@ throw( IllegalArgumentException )
     sal_Bool bReturn = sal_False;
     // Get new value from any.
     // IllegalArgumentException() can be thrown!
-    OUString sValue ;
+    OUString sValue;
     convertPropertyValue( sValue, aNewValue );
 
     // If value change ...
     if( sValue != sCurrentValue )
     {
         // ... set information of change.
-        aOldValue       <<= sCurrentValue   ;
-        aConvertedValue <<= sValue          ;
+        aOldValue       <<= sCurrentValue;
+        aConvertedValue <<= sValue;
         // Return OK - "value will be change ..."
         bReturn = sal_True;
     }
     else
     {
         // ... clear information of return parameter!
-        aOldValue.clear         () ;
-        aConvertedValue.clear   () ;
+        aOldValue.clear         ();
+        aConvertedValue.clear   ();
         // Return NOTHING - "value will not be change ..."
         bReturn = sal_False;
     }
@@ -370,23 +370,23 @@ throw( IllegalArgumentException )
     sal_Bool bReturn = sal_False;
     // Get new value from any.
     // IllegalArgumentException() can be thrown!
-    Reference< XBitmap > aValue ;
+    Reference< XBitmap > aValue;
     convertPropertyValue( aValue, aNewValue );
 
     // If value change ...
     if( aValue != aCurrentValue )
     {
         // ... set information of change.
-        aOldValue       <<= aCurrentValue   ;
-        aConvertedValue <<= aValue          ;
+        aOldValue       <<= aCurrentValue;
+        aConvertedValue <<= aValue;
         // Return OK - "value will be change ..."
         bReturn = sal_True;
     }
     else
     {
         // ... clear information of return parameter!
-        aOldValue.clear         () ;
-        aConvertedValue.clear   () ;
+        aOldValue.clear         ();
+        aConvertedValue.clear   ();
         // Return NOTHING - "value will not be change ..."
         bReturn = sal_False;
     }
@@ -405,23 +405,23 @@ throw( IllegalArgumentException )
     sal_Bool bReturn = sal_False;
     // Get new value from any.
     // IllegalArgumentException() can be thrown!
-    Reference< XInterface > aValue ;
+    Reference< XInterface > aValue;
     convertPropertyValue( aValue, aNewValue );
 
     // If value change ...
     if( aValue != aCurrentValue )
     {
         // ... set information of change.
-        aOldValue       <<= aCurrentValue   ;
-        aConvertedValue <<= aValue          ;
+        aOldValue       <<= aCurrentValue;
+        aConvertedValue <<= aValue;
         // Return OK - "value will be change ..."
         bReturn = sal_True;
     }
     else
     {
         // ... clear information of return parameter!
-        aOldValue.clear         () ;
-        aConvertedValue.clear   () ;
+        aOldValue.clear         ();
+        aConvertedValue.clear   ();
         // Return NOTHING - "value will not be change ..."
         bReturn = sal_False;
     }
diff --git a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
index 956fdddf4c2c..6e4e93e73437 100644
--- a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
@@ -116,12 +116,12 @@ Sequence< Type > SAL_CALL ActionTriggerSeparatorPropertySet::getTypes() throw (
     // Optimize this method !
     // We initialize a static variable only one time. And we don't must use a mutex at every call!
     // For the first call; pTypeCollection is NULL - for the second call pTypeCollection is different from NULL!
-    static ::cppu::OTypeCollection* pTypeCollection = NULL ;
+    static ::cppu::OTypeCollection* pTypeCollection = NULL;
 
     if ( pTypeCollection == NULL )
     {
         // Ready for multithreading; get global mutex for first call of this method only! see before
-        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
+        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() );
 
         // Control these pointer again ... it can be, that another instance will be faster then these!
         if ( pTypeCollection == NULL )
@@ -132,14 +132,14 @@ Sequence< Type > SAL_CALL ActionTriggerSeparatorPropertySet::getTypes() throw (
                         ::getCppuType(( const Reference< XFastPropertySet       >*)NULL ) ,
                         ::getCppuType(( const Reference< XMultiPropertySet      >*)NULL ) ,
                         ::getCppuType(( const Reference< XServiceInfo           >*)NULL ) ,
-                        ::getCppuType(( const Reference< XTypeProvider          >*)NULL ) ) ;
+                        ::getCppuType(( const Reference< XTypeProvider          >*)NULL ) );
 
             // ... and set his address to static pointer!
-            pTypeCollection = &aTypeCollection ;
+            pTypeCollection = &aTypeCollection;
         }
     }
 
-    return pTypeCollection->getTypes() ;
+    return pTypeCollection->getTypes();
 }
 
 Sequence< sal_Int8 > SAL_CALL ActionTriggerSeparatorPropertySet::getImplementationId() throw ( RuntimeException, std::exception )
@@ -232,7 +232,7 @@ throw ( RuntimeException, std::exception )
     // Optimize this method !
     // We initialize a static variable only one time. And we don't must use a mutex at every call!
     // For the first call; pInfo is NULL - for the second call pInfo is different from NULL!
-    static Reference< XPropertySetInfo >* pInfo = NULL ;
+    static Reference< XPropertySetInfo >* pInfo = NULL;
 
     if( pInfo == NULL )
     {
@@ -262,7 +262,7 @@ const Sequence< Property > ActionTriggerSeparatorPropertySet::impl_getStaticProp
     const Sequence< Property > seqActionTriggerPropertyDescriptor( pActionTriggerPropertys, PROPERTYCOUNT );
 
     // Return "PropertyDescriptor"
-    return seqActionTriggerPropertyDescriptor ;
+    return seqActionTriggerPropertyDescriptor;
 }
 
 sal_Bool ActionTriggerSeparatorPropertySet::impl_tryToChangeProperty(
@@ -283,16 +283,16 @@ throw( IllegalArgumentException )
     if( aValue != aCurrentValue )
     {
         // ... set information of change.
-        aOldValue       <<= aCurrentValue   ;
-        aConvertedValue <<= aValue          ;
+        aOldValue       <<= aCurrentValue;
+        aConvertedValue <<= aValue;
         // Return OK - "value will be change ..."
         bReturn = sal_True;
     }
     else
     {
         // ... clear information of return parameter!
-        aOldValue.clear         () ;
-        aConvertedValue.clear   () ;
+        aOldValue.clear         ();
+        aConvertedValue.clear   ();
         // Return NOTHING - "value will not be change ..."
         bReturn = sal_False;
     }
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index e723cb4d24f1..368131890c62 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -40,12 +40,12 @@
 
 //  namespaces
 
-using namespace ::std                   ;
-using namespace ::utl                   ;
-using namespace ::osl                   ;
-using namespace ::com::sun::star::uno   ;
-using namespace ::com::sun::star::beans ;
-using namespace ::com::sun::star::lang  ;
+using namespace ::std;
+using namespace ::utl;
+using namespace ::osl;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star;
 
 #define ROOTNODE_ADDONMENU                              OUString("Office.Addons" )
@@ -258,13 +258,13 @@ class AddonsOptions_Impl : public ConfigItem
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        bool                                            HasAddonsMenu        () const ;
-        sal_Int32                                       GetAddonsToolBarCount() const ;
-        const Sequence< Sequence< PropertyValue > >&    GetAddonsMenu        () const ;
-        const Sequence< Sequence< PropertyValue > >&    GetAddonsMenuBarPart () const ;
-        const Sequence< Sequence< PropertyValue > >&    GetAddonsToolBarPart ( sal_uInt32 nIndex ) const ;
+        bool                                            HasAddonsMenu        () const;
+        sal_Int32                                       GetAddonsToolBarCount() const;
+        const Sequence< Sequence< PropertyValue > >&    GetAddonsMenu        () const;
+        const Sequence< Sequence< PropertyValue > >&    GetAddonsMenuBarPart () const;
+        const Sequence< Sequence< PropertyValue > >&    GetAddonsToolBarPart ( sal_uInt32 nIndex ) const;
         const OUString                           GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const;
-        const Sequence< Sequence< PropertyValue > >&    GetAddonsHelpMenu    () const ;
+        const Sequence< Sequence< PropertyValue > >&    GetAddonsHelpMenu    () const;
         Image                                           GetImageFromURL( const OUString& aURL, bool bBig, bool bNoScale );
         const MergeMenuInstructionContainer&            GetMergeMenuInstructions() const;
         bool                                            GetMergeToolbarInstructions( const OUString& rToolbarName, MergeToolbarInstructionContainer& rToolbarInstructions ) const;
@@ -1587,7 +1587,7 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesMenuItem( const OUStrin
     Sequence< OUString > lResult( PROPERTYCOUNT_MENUITEM );
 
     // Create property names dependent from the root node name
-    lResult[OFFSET_MENUITEM_URL]             = aPropertyRootNode + m_aPropNames[ INDEX_URL          ] ;
+    lResult[OFFSET_MENUITEM_URL]             = aPropertyRootNode + m_aPropNames[ INDEX_URL          ];
     lResult[OFFSET_MENUITEM_TITLE]           = aPropertyRootNode + m_aPropNames[ INDEX_TITLE            ];
     lResult[OFFSET_MENUITEM_IMAGEIDENTIFIER] = aPropertyRootNode + m_aPropNames[ INDEX_IMAGEIDENTIFIER ];
     lResult[OFFSET_MENUITEM_TARGET]          = aPropertyRootNode + m_aPropNames[ INDEX_TARGET           ];
@@ -1669,8 +1669,8 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesImages( const OUString&
 //  DON'T DO IT IN YOUR HEADER!
 //  see definition for further information
 
-AddonsOptions_Impl*     AddonsOptions::m_pDataContainer = NULL  ;
-sal_Int32               AddonsOptions::m_nRefCount      = 0     ;
+AddonsOptions_Impl*     AddonsOptions::m_pDataContainer = NULL;
+sal_Int32               AddonsOptions::m_nRefCount      = 0;
 
 //  constructor
 
diff --git a/framework/source/fwe/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx
index b3cc463ce49a..de7b2617daeb 100644
--- a/framework/source/fwe/classes/framelistanalyzer.cxx
+++ b/framework/source/fwe/classes/framelistanalyzer.cxx
@@ -211,7 +211,7 @@ void FrameListAnalyzer::impl_analyze()
             if ((m_eDetectMode & E_MODEL) == E_MODEL)
             {
                 css::uno::Reference< css::frame::XController > xController = xFrame->getController();
-                css::uno::Reference< css::frame::XModel >      xModel      ;
+                css::uno::Reference< css::frame::XModel >      xModel;
                 if (xController.is())
                     xModel = xController->getModel();
                 if (xModel==xReferenceModel)
diff --git a/framework/source/fwe/classes/imagewrapper.cxx b/framework/source/fwe/classes/imagewrapper.cxx
index 3693ec06d03f..9f3df1fcc6dd 100644
--- a/framework/source/fwe/classes/imagewrapper.cxx
+++ b/framework/source/fwe/classes/imagewrapper.cxx
@@ -35,8 +35,8 @@ namespace framework
 static Sequence< sal_Int8 > impl_getStaticIdentifier()
 {
     static const sal_uInt8 pGUID[16] = { 0x46, 0xAD, 0x69, 0xFB, 0xA7, 0xBE, 0x44, 0x83, 0xB2, 0xA7, 0xB3, 0xEC, 0x59, 0x4A, 0xB7, 0x00 };
-    static ::com::sun::star::uno::Sequence< sal_Int8 > seqID((const sal_Int8*)pGUID,16) ;
-    return seqID ;
+    static ::com::sun::star::uno::Sequence< sal_Int8 > seqID((const sal_Int8*)pGUID,16);
+    return seqID;
 }
 
 ImageWrapper::ImageWrapper( const Image& aImage ) : m_aImage( aImage )
diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
index 88ab372c8786..291afd10946c 100644
--- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
@@ -39,8 +39,8 @@ namespace framework
 static Sequence< sal_Int8 > impl_getStaticIdentifier()
 {
     static const sal_uInt8 pGUID[16] = { 0x17, 0x0F, 0xA2, 0xC9, 0xCA, 0x50, 0x4A, 0xD3, 0xA6, 0x3B, 0x39, 0x99, 0xC5, 0x96, 0x43, 0x27 };
-    static ::com::sun::star::uno::Sequence< sal_Int8 > seqID((const sal_Int8*)pGUID,16) ;
-    return seqID ;
+    static ::com::sun::star::uno::Sequence< sal_Int8 > seqID((const sal_Int8*)pGUID,16);
+    return seqID;
 }
 
 RootActionTriggerContainer::RootActionTriggerContainer( const Menu* pMenu, const OUString* pMenuIdentifier ) :
@@ -249,12 +249,12 @@ Sequence< Type > SAL_CALL RootActionTriggerContainer::getTypes() throw ( Runtime
     // Optimize this method !
     // We initialize a static variable only one time. And we don't must use a mutex at every call!
     // For the first call; pTypeCollection is NULL - for the second call pTypeCollection is different from NULL!
-    static ::cppu::OTypeCollection* pTypeCollection = NULL ;
+    static ::cppu::OTypeCollection* pTypeCollection = NULL;
 
     if ( pTypeCollection == NULL )
     {
         // Ready for multithreading; get global mutex for first call of this method only! see before
-        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
+        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() );
 
         // Control these pointer again ... it can be, that another instance will be faster then these!
         if ( pTypeCollection == NULL )
@@ -266,14 +266,14 @@ Sequence< Type > SAL_CALL RootActionTriggerContainer::getTypes() throw ( Runtime
                         ::getCppuType(( const Reference< XServiceInfo           >*)NULL ) ,
                         ::getCppuType(( const Reference< XTypeProvider          >*)NULL ) ,
                         ::getCppuType(( const Reference< XUnoTunnel             >*)NULL ) ,
-                        ::getCppuType(( const Reference< XNamed                 >*)NULL )) ;
+                        ::getCppuType(( const Reference< XNamed                 >*)NULL ));
 
             // ... and set his address to static pointer!
-            pTypeCollection = &aTypeCollection ;
+            pTypeCollection = &aTypeCollection;
         }
     }
 
-    return pTypeCollection->getTypes() ;
+    return pTypeCollection->getTypes();
 }
 
 Sequence< sal_Int8 > SAL_CALL RootActionTriggerContainer::getImplementationId() throw ( RuntimeException, std::exception )
diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx
index 76ab044bece2..8bb4634ae285 100644
--- a/framework/source/fwe/dispatch/interaction.cxx
+++ b/framework/source/fwe/dispatch/interaction.cxx
@@ -95,7 +95,7 @@ public:
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
 private:
-    ::com::sun::star::uno::Any                                                                                                 m_aRequest      ;
+    ::com::sun::star::uno::Any                                                                                                 m_aRequest;
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >    m_lContinuations;
     comphelper::OInteractionAbort* m_pAbort;
     ContinuationFilterSelect* m_pFilter;
diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx
index 1e0d8d8dbfdf..d1a647796d11 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -334,7 +334,7 @@ void TitleHelper::impl_updateTitleForModel (const css::uno::Reference< css::fram
         return;
 
     OUString sTitle;
-    OUString sURL  ;
+    OUString sURL;
 
     css::uno::Reference< css::frame::XStorable > xURLProvider(xModel , css::uno::UNO_QUERY);
     if (xURLProvider.is())
diff --git a/framework/source/fwe/interaction/preventduplicateinteraction.cxx b/framework/source/fwe/interaction/preventduplicateinteraction.cxx
index caef1881d302..4b84364cb7fc 100644
--- a/framework/source/fwe/interaction/preventduplicateinteraction.cxx
+++ b/framework/source/fwe/interaction/preventduplicateinteraction.cxx
@@ -84,7 +84,7 @@ void SAL_CALL PreventDuplicateInteraction::handle(const css::uno::Reference< css
 
     InteractionList::iterator pIt;
     for (  pIt  = m_lInteractionRules.begin();
-           pIt != m_lInteractionRules.end()  ;
+           pIt != m_lInteractionRules.end();
          ++pIt                               )
     {
         InteractionInfo& rInfo = *pIt;
@@ -138,7 +138,7 @@ sal_Bool SAL_CALL PreventDuplicateInteraction::handleInteractionRequest( const c
 
     InteractionList::iterator pIt;
     for (  pIt  = m_lInteractionRules.begin();
-           pIt != m_lInteractionRules.end()  ;
+           pIt != m_lInteractionRules.end();
          ++pIt                               )
     {
         InteractionInfo& rInfo = *pIt;
@@ -191,13 +191,13 @@ void PreventDuplicateInteraction::addInteractionRule(const PreventDuplicateInter
 
     InteractionList::iterator pIt;
     for (  pIt  = m_lInteractionRules.begin();
-           pIt != m_lInteractionRules.end()  ;
+           pIt != m_lInteractionRules.end();
          ++pIt                               )
     {
         InteractionInfo& rInfo = *pIt;
         if (rInfo.m_aInteraction == aInteractionInfo.m_aInteraction)
         {
-            rInfo.m_nMaxCount  = aInteractionInfo.m_nMaxCount ;
+            rInfo.m_nMaxCount  = aInteractionInfo.m_nMaxCount;
             rInfo.m_nCallCount = aInteractionInfo.m_nCallCount;
             return;
         }
@@ -217,7 +217,7 @@ bool PreventDuplicateInteraction::getInteractionInfo(const css::uno::Type&
 
     PreventDuplicateInteraction::InteractionList::const_iterator pIt;
     for (  pIt  = m_lInteractionRules.begin();
-           pIt != m_lInteractionRules.end()  ;
+           pIt != m_lInteractionRules.end();
          ++pIt                               )
     {
         const PreventDuplicateInteraction::InteractionInfo& rInfo = *pIt;
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx
index 4f02287d7001..7fda794be26c 100644
--- a/framework/source/fwe/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -78,8 +78,8 @@ static const char ITEM_DESCRIPTOR_STYLE[]       = "Style";
 // special popup menus (filled during runtime) must be saved as an empty popup menu or menuitem!!!
 static const sal_Int32 CMD_PROTOCOL_SIZE        = 5;
 static const char CMD_PROTOCOL[]                = ".uno:";
-static const char ADDDIRECT_CMD[]               = ".uno:AddDirect" ;
-static const char AUTOPILOTMENU_CMD[]           = ".uno:AutoPilotMenu" ;
+static const char ADDDIRECT_CMD[]               = ".uno:AddDirect";
+static const char AUTOPILOTMENU_CMD[]           = ".uno:AutoPilotMenu";
 
 //  using namespaces
 
diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx
index cf4ce24b5aa6..042876987869 100644
--- a/framework/source/fwe/xml/statusbardocumenthandler.cxx
+++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx
@@ -204,7 +204,7 @@ throw(  SAXException, RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
-    StatusBarHashMap::const_iterator pStatusBarEntry = m_aStatusBarMap.find( aName ) ;
+    StatusBarHashMap::const_iterator pStatusBarEntry = m_aStatusBarMap.find( aName );
     if ( pStatusBarEntry != m_aStatusBarMap.end() )
     {
         switch ( pStatusBarEntry->second )
@@ -403,7 +403,7 @@ throw(  SAXException, RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
-    StatusBarHashMap::const_iterator pStatusBarEntry = m_aStatusBarMap.find( aName ) ;
+    StatusBarHashMap::const_iterator pStatusBarEntry = m_aStatusBarMap.find( aName );
     if ( pStatusBarEntry != m_aStatusBarMap.end() )
     {
         switch ( pStatusBarEntry->second )
diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index f4425bc8be0b..caf1b6056847 100644
--- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
@@ -217,7 +217,7 @@ throw(  SAXException, RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
-    ToolBoxHashMap::const_iterator pToolBoxEntry = m_aToolBoxMap.find( aName ) ;
+    ToolBoxHashMap::const_iterator pToolBoxEntry = m_aToolBoxMap.find( aName );
     if ( pToolBoxEntry != m_aToolBoxMap.end() )
     {
         switch ( pToolBoxEntry->second )
@@ -535,7 +535,7 @@ throw(  SAXException, RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
-    ToolBoxHashMap::const_iterator pToolBoxEntry = m_aToolBoxMap.find( aName ) ;
+    ToolBoxHashMap::const_iterator pToolBoxEntry = m_aToolBoxMap.find( aName );
     if ( pToolBoxEntry != m_aToolBoxMap.end() )
     {
         switch ( pToolBoxEntry->second )
diff --git a/framework/source/fwi/classes/converter.cxx b/framework/source/fwi/classes/converter.cxx
index 4799f083ced0..330eb38e2bea 100644
--- a/framework/source/fwi/classes/converter.cxx
+++ b/framework/source/fwi/classes/converter.cxx
@@ -31,7 +31,7 @@ css::uno::Sequence< css::beans::NamedValue > Converter::convert_seqPropVal2seqNa
     css::uno::Sequence< css::beans::NamedValue > lDestination(nCount);
     for (sal_Int32 nItem=0; nItem<nCount; ++nItem)
     {
-        lDestination[nItem].Name  = lSource[nItem].Name ;
+        lDestination[nItem].Name  = lSource[nItem].Name;
         lDestination[nItem].Value = lSource[nItem].Value;
     }
     return lDestination;
diff --git a/framework/source/fwi/classes/propertysethelper.cxx b/framework/source/fwi/classes/propertysethelper.cxx
index 4a0600be050c..5cd8d1cdb7c8 100644
--- a/framework/source/fwi/classes/propertysethelper.cxx
+++ b/framework/source/fwi/classes/propertysethelper.cxx
@@ -339,10 +339,10 @@ css::uno::Sequence< css::beans::Property > SAL_CALL PropertySetHelper::getProper
 
     sal_Int32                                        c     = (sal_Int32)m_lProps.size();
     css::uno::Sequence< css::beans::Property >       lProps(c);
-    PropertySetHelper::TPropInfoHash::const_iterator pIt   ;
+    PropertySetHelper::TPropInfoHash::const_iterator pIt;
 
     for (  pIt  = m_lProps.begin();
-           pIt != m_lProps.end()  ;
+           pIt != m_lProps.end();
          ++pIt                    )
     {
         lProps[--c] = pIt->second;
diff --git a/framework/source/fwi/classes/protocolhandlercache.cxx b/framework/source/fwi/classes/protocolhandlercache.cxx
index 43b59e7e1f6e..20ed248460ea 100644
--- a/framework/source/fwi/classes/protocolhandlercache.cxx
+++ b/framework/source/fwi/classes/protocolhandlercache.cxx
@@ -68,7 +68,7 @@ PatternHash::iterator PatternHash::findPatternKey( const OUString& sURL )
  */
 HandlerHash* HandlerCache::m_pHandler  = NULL;
 PatternHash* HandlerCache::m_pPattern  = NULL;
-sal_Int32    HandlerCache::m_nRefCount = 0   ;
+sal_Int32    HandlerCache::m_nRefCount = 0;
 HandlerCFGAccess* HandlerCache::m_pConfig = NULL;
 
 /**
@@ -239,7 +239,7 @@ void HandlerCFGAccess::read( HandlerHash** ppHandler ,
 
         // register his pattern into the performance search hash
         for (OUStringList::iterator pItem =aHandler.m_lProtocols.begin();
-                                    pItem!=aHandler.m_lProtocols.end()  ;
+                                    pItem!=aHandler.m_lProtocols.end();
                                     ++pItem                             )
         {
             (**ppPattern)[*pItem] = lNames[nSource];
diff --git a/framework/source/fwi/threadhelp/transactionmanager.cxx b/framework/source/fwi/threadhelp/transactionmanager.cxx
index 9f4cdd98dc36..a5cbf48e30c4 100644
--- a/framework/source/fwi/threadhelp/transactionmanager.cxx
+++ b/framework/source/fwi/threadhelp/transactionmanager.cxx
@@ -90,7 +90,7 @@ void  TransactionManager::setWorkingMode( EWorkingMode eMode )
 {
     // Safe member access.
     ::osl::ClearableMutexGuard  aAccessGuard( m_aAccessLock );
-    sal_Bool                    bWaitFor    = sal_False      ;
+    sal_Bool                    bWaitFor    = sal_False;
     // Change working mode first!
     if  (
             ( m_eWorkingMode == E_INIT        && eMode == E_WORK        ) ||
@@ -256,13 +256,13 @@ sal_Bool  TransactionManager::isCallRejected( ERejectReason& eReason ) const
     ::osl::MutexGuard aAccessGuard( m_aAccessLock );
     switch( m_eWorkingMode )
     {
-        case E_INIT        : eReason = E_UNINITIALIZED ;
+        case E_INIT        : eReason = E_UNINITIALIZED;
                                 break;
-        case E_WORK        : eReason = E_NOREASON      ;
+        case E_WORK        : eReason = E_NOREASON;
                                 break;
-        case E_BEFORECLOSE : eReason = E_INCLOSE       ;
+        case E_BEFORECLOSE : eReason = E_INCLOSE;
                                 break;
-        case E_CLOSE       : eReason = E_CLOSED        ;
+        case E_CLOSE       : eReason = E_CLOSED;
                                 break;
     }
     return( eReason!=E_NOREASON );
diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx
index f5f7a3fa0c13..1f453922d435 100644
--- a/framework/source/fwi/uielement/constitemcontainer.cxx
+++ b/framework/source/fwi/uielement/constitemcontainer.cxx
@@ -294,7 +294,7 @@ throw (::com::sun::star::uno::RuntimeException, std::exception)
     if( pInfo == NULL )
     {
         // Ready for multithreading
-        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
+        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() );
         // Control this pointer again, another instance can be faster then these!
         if( pInfo == NULL )
         {
@@ -370,7 +370,7 @@ throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang
     if( pInfoHelper == NULL )
     {
         // Ready for multithreading
-        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
+        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() );
 
         // Control this pointer again, another instance can be faster then these!
         if( pInfoHelper == NULL )
diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx
index 0d209caa9fd3..8eb4893e9d6d 100644
--- a/framework/source/fwi/uielement/rootitemcontainer.cxx
+++ b/framework/source/fwi/uielement/rootitemcontainer.cxx
@@ -278,7 +278,7 @@ throw( com::sun::star::lang::IllegalArgumentException )
     }
 
     // Return state of operation.
-    return bReturn ;
+    return bReturn;
 }
 
 void SAL_CALL RootItemContainer::setFastPropertyValue_NoBroadcast( sal_Int32               nHandle ,
@@ -314,7 +314,7 @@ void SAL_CALL RootItemContainer::getFastPropertyValue( com::sun::star::uno::Any&
     if( pInfoHelper == NULL )
     {
         // Ready for multithreading
-        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
+        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() );
 
         // Control this pointer again, another instance can be faster then these!
         if( pInfoHelper == NULL )
@@ -341,7 +341,7 @@ throw (::com::sun::star::uno::RuntimeException, std::exception)
     if( pInfo == NULL )
     {
         // Ready for multithreading
-        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
+        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() );
         // Control this pointer again, another instance can be faster then these!
         if( pInfo == NULL )
         {
diff --git a/framework/source/helper/dockingareadefaultacceptor.cxx b/framework/source/helper/dockingareadefaultacceptor.cxx
index 33c79a8492f8..3199b12011cf 100644
--- a/framework/source/helper/dockingareadefaultacceptor.cxx
+++ b/framework/source/helper/dockingareadefaultacceptor.cxx
@@ -27,12 +27,12 @@
 
 namespace framework{
 
-using namespace ::com::sun::star::container     ;
-using namespace ::com::sun::star::frame         ;
-using namespace ::com::sun::star::lang          ;
-using namespace ::com::sun::star::uno           ;
-using namespace ::cppu                          ;
-using namespace ::osl                           ;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::frame;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+using namespace ::cppu;
+using namespace ::osl;
 
 //  constructor
 
diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx
index 63238bc90416..c1acf844d02f 100644
--- a/framework/source/helper/ocomponentaccess.cxx
+++ b/framework/source/helper/ocomponentaccess.cxx
@@ -26,13 +26,13 @@
 
 namespace framework{
 
-using namespace ::com::sun::star::container     ;
-using namespace ::com::sun::star::frame         ;
-using namespace ::com::sun::star::lang          ;
-using namespace ::com::sun::star::uno           ;
-using namespace ::cppu                          ;
-using namespace ::osl                           ;
-using namespace ::rtl                           ;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::frame;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+using namespace ::cppu;
+using namespace ::osl;
+using namespace ::rtl;
 
 //  constructor
 
diff --git a/framework/source/helper/ocomponentenumeration.cxx b/framework/source/helper/ocomponentenumeration.cxx
index 650228013e61..e92c06593868 100644
--- a/framework/source/helper/ocomponentenumeration.cxx
+++ b/framework/source/helper/ocomponentenumeration.cxx
@@ -23,12 +23,12 @@
 
 namespace framework{
 
-using namespace ::com::sun::star::container     ;
-using namespace ::com::sun::star::lang          ;
-using namespace ::com::sun::star::uno           ;
-using namespace ::cppu                          ;
-using namespace ::osl                           ;
-using namespace ::rtl                           ;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+using namespace ::cppu;
+using namespace ::osl;
+using namespace ::rtl;
 
 //  constructor
 
@@ -116,7 +116,7 @@ void OComponentEnumeration::impl_resetObject()
     // But a position of 0 in a list of 0 items is an invalid state. This constellation can't work in future.
     // End of enumeration is arrived!
     // (see hasMoreElements() for more details...)
-    m_nPosition = 0 ;
+    m_nPosition = 0;
 }
 
 //  debug methods
@@ -141,10 +141,10 @@ sal_Bool OComponentEnumeration::impldbg_checkParameter_OComponentEnumerationCtor
             ( &seqComponents == NULL )
         )
     {
-        bOK = sal_False ;
+        bOK = sal_False;
     }
     // Return result of check.
-    return bOK ;
+    return bOK;
 }
 
 sal_Bool OComponentEnumeration::impldbg_checkParameter_disposing( const EventObject& aEvent )
diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx
index c1ca703da3aa..8234a5a17962 100644
--- a/framework/source/helper/oframes.cxx
+++ b/framework/source/helper/oframes.cxx
@@ -26,13 +26,13 @@
 
 namespace framework{
 
-using namespace ::com::sun::star::container     ;
-using namespace ::com::sun::star::frame         ;
-using namespace ::com::sun::star::lang          ;
-using namespace ::com::sun::star::uno           ;
-using namespace ::cppu                          ;
-using namespace ::osl                           ;
-using namespace ::std                           ;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::frame;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+using namespace ::cppu;
+using namespace ::osl;
+using namespace ::std;
 
 //  constructor
 
@@ -389,10 +389,10 @@ sal_Bool OFrames::impldbg_checkParameter_queryFrames( sal_Int32 nSearchFlags )
             ( !( nSearchFlags &  FrameSearchFlag::GLOBAL    ) )
         )
     {
-        bOK = sal_False ;
+        bOK = sal_False;
     }
     // Return result of check.
-    return bOK ;
+    return bOK;
 }
 
 }       //  namespace framework
diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx
index 5f138561e8d8..101039e1be29 100644
--- a/framework/source/helper/statusindicatorfactory.cxx
+++ b/framework/source/helper/statusindicatorfactory.cxx
@@ -349,7 +349,7 @@ void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed()
     if (xFrame.is())
     {
         css::uno::Reference< css::frame::XController > xController;
-        css::uno::Reference< css::frame::XModel >      xModel     ;
+        css::uno::Reference< css::frame::XModel >      xModel;
         xController = xFrame->getController();
         if (xController.is())
             xModel = xController->getModel();
diff --git a/framework/source/helper/tagwindowasmodified.cxx b/framework/source/helper/tagwindowasmodified.cxx
index 6ebaa567357c..69802119989e 100644
--- a/framework/source/helper/tagwindowasmodified.cxx
+++ b/framework/source/helper/tagwindowasmodified.cxx
@@ -60,7 +60,7 @@ void SAL_CALL TagWindowAsModified::initialize(const css::uno::Sequence< css::uno
 
     {
         SolarMutexGuard g;
-        m_xFrame = xFrame ;
+        m_xFrame = xFrame;
     }
 
     xFrame->addFrameActionListener(this);
@@ -161,7 +161,7 @@ void TagWindowAsModified::impl_update (const css::uno::Reference< css::frame::XF
 
     css::uno::Reference< css::awt::XWindow >       xWindow     = xFrame->getContainerWindow ();
     css::uno::Reference< css::frame::XController > xController = xFrame->getController ();
-    css::uno::Reference< css::frame::XModel >      xModel ;
+    css::uno::Reference< css::frame::XModel >      xModel;
     if (xController.is ())
         xModel = xController->getModel ();
 
@@ -176,7 +176,7 @@ void TagWindowAsModified::impl_update (const css::uno::Reference< css::frame::XF
         // Note: frame was set as member outside ! we have to refresh connections
         // regarding window and model only here.
         m_xWindow = xWindow;
-        m_xModel  = xModel ;
+        m_xModel  = xModel;
     }
 
     css::uno::Reference< css::util::XModifyBroadcaster > xModifiable(xModel, css::uno::UNO_QUERY);
diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx
index bf3a8c86093a..e93535c41e08 100644
--- a/framework/source/helper/uiconfigelementwrapperbase.cxx
+++ b/framework/source/helper/uiconfigelementwrapperbase.cxx
@@ -246,7 +246,7 @@ sal_Bool SAL_CALL UIConfigElementWrapperBase::convertFastPropertyValue( Any&
     }
 
     // Return state of operation.
-    return bReturn ;
+    return bReturn;
 }
 
 void SAL_CALL UIConfigElementWrapperBase::setFastPropertyValue_NoBroadcast(   sal_Int32               nHandle ,
@@ -383,7 +383,7 @@ void SAL_CALL UIConfigElementWrapperBase::getFastPropertyValue( com::sun::star::
     if( pInfoHelper == NULL )
     {
         // Ready for multithreading
-        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
+        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() );
 
         // Control this pointer again, another instance can be faster then these!
         if( pInfoHelper == NULL )
@@ -409,7 +409,7 @@ com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CA
     if( pInfo == NULL )
     {
         // Ready for multithreading
-        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
+        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() );
         // Control this pointer again, another instance can be faster then these!
         if( pInfo == NULL )
         {
diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx
index c376635f41c8..90c150a861f7 100644
--- a/framework/source/helper/uielementwrapperbase.cxx
+++ b/framework/source/helper/uielementwrapperbase.cxx
@@ -141,7 +141,7 @@ sal_Bool SAL_CALL UIElementWrapperBase::convertFastPropertyValue( Any&       /*a
 {
     //  Initialize state with sal_False !!!
     //  (Handle can be invalid)
-    return sal_False ;
+    return sal_False;
 }
 
 void SAL_CALL UIElementWrapperBase::setFastPropertyValue_NoBroadcast(   sal_Int32               /*nHandle*/ ,
@@ -177,7 +177,7 @@ void SAL_CALL UIElementWrapperBase::getFastPropertyValue( com::sun::star::uno::A
     if( pInfoHelper == NULL )
     {
         // Ready for multithreading
-        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
+        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() );
 
         // Control this pointer again, another instance can be faster then these!
         if( pInfoHelper == NULL )
@@ -203,7 +203,7 @@ com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CA
     if( pInfo == NULL )
     {
         // Ready for multithreading
-        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
+        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() );
         // Control this pointer again, another instance can be faster then these!
         if( pInfo == NULL )
         {
diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx
index be7821e07738..18562325b487 100644
--- a/framework/source/inc/accelerators/keymapping.hxx
+++ b/framework/source/inc/accelerators/keymapping.hxx
@@ -47,7 +47,7 @@ class KeyMapping
          */
         struct KeyIdentifierInfo
         {
-            sal_Int16       Code      ;
+            sal_Int16       Code;
             const char*     Identifier;
         };
 
diff --git a/framework/source/inc/loadenv/actionlockguard.hxx b/framework/source/inc/loadenv/actionlockguard.hxx
index 1cedab697e53..accc6fa003a5 100644
--- a/framework/source/inc/loadenv/actionlockguard.hxx
+++ b/framework/source/inc/loadenv/actionlockguard.hxx
@@ -120,7 +120,7 @@ class ActionLockGuard
             // SAFE -> ..........................
             osl::ClearableMutexGuard aMutexLock(m_mutex);
 
-            css::uno::Reference< css::document::XActionLockable > xLock   = m_xActionLock  ;
+            css::uno::Reference< css::document::XActionLockable > xLock   = m_xActionLock;
             sal_Bool                                              bLocked = m_bActionLocked;
 
             m_xActionLock.clear();
diff --git a/framework/source/interaction/quietinteraction.cxx b/framework/source/interaction/quietinteraction.cxx
index 6675787f1cf5..0e40a5975c79 100644
--- a/framework/source/interaction/quietinteraction.cxx
+++ b/framework/source/interaction/quietinteraction.cxx
@@ -57,10 +57,10 @@ void SAL_CALL QuietInteraction::handle( const css::uno::Reference< css::task::XI
     // We need XAbort as possible continuation as minimum!
     // An optional filter selection we can handle too.
     css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > lContinuations = xRequest->getContinuations();
-    css::uno::Reference< css::task::XInteractionAbort >                              xAbort     ;
-    css::uno::Reference< css::task::XInteractionApprove >                            xApprove   ;
-    css::uno::Reference< css::document::XInteractionFilterSelect >                   xFilter    ;
-    css::uno::Reference< css::document::XInteractionFilterOptions >                  xFOptions  ;
+    css::uno::Reference< css::task::XInteractionAbort >                              xAbort;
+    css::uno::Reference< css::task::XInteractionApprove >                            xApprove;
+    css::uno::Reference< css::document::XInteractionFilterSelect >                   xFilter;
+    css::uno::Reference< css::document::XInteractionFilterOptions >                  xFOptions;
 
     sal_Int32 nCount=lContinuations.getLength();
     for (sal_Int32 i=0; i<nCount; ++i)
@@ -80,7 +80,7 @@ void SAL_CALL QuietInteraction::handle( const css::uno::Reference< css::task::XI
 
     // differ between abortable interactions (error, unknown filter ...)
     // and other ones (ambigous but not unknown filter ...)
-    css::task::ErrorCodeRequest          aErrorCodeRequest     ;
+    css::task::ErrorCodeRequest          aErrorCodeRequest;
     css::document::AmbigousFilterRequest aAmbigousFilterRequest;
     css::document::LockedDocumentRequest aLockedDocumentRequest;
     css::document::FilterOptionsRequest  aFilterOptionsRequest;
diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx
index ff55ba5b5700..b5cc8c70c0af 100644
--- a/framework/source/jobs/helponstartup.cxx
+++ b/framework/source/jobs/helponstartup.cxx
@@ -182,7 +182,7 @@ OUString HelpOnStartup::its_getModuleIdFromEnv(const css::uno::Sequence< css::be
     // on the desktop instance. Ignore e.g. life previews, which are top frames too ...
     // but not registered at this global desktop instance.
     css::uno::Reference< css::frame::XDesktop >    xDesktopCheck;
-    css::uno::Reference< css::frame::XFrame >      xFrame       ;
+    css::uno::Reference< css::frame::XFrame >      xFrame;
     css::uno::Reference< css::frame::XController > xController  = xDoc->getCurrentController();
     if (xController.is())
         xFrame = xController->getFrame();
@@ -233,8 +233,8 @@ OUString HelpOnStartup::its_getCurrentHelpURL()
         css::uno::Reference< css::frame::XFramesSupplier >  xHelpRoot  (xHelp                 , css::uno::UNO_QUERY_THROW);
         css::uno::Reference< css::container::XIndexAccess > xHelpChildren(xHelpRoot->getFrames(), css::uno::UNO_QUERY_THROW);
 
-        css::uno::Reference< css::frame::XFrame >      xHelpChild  ;
-        css::uno::Reference< css::frame::XController > xHelpView   ;
+        css::uno::Reference< css::frame::XFrame >      xHelpChild;
+        css::uno::Reference< css::frame::XController > xHelpView;
         css::uno::Reference< css::frame::XModel >      xHelpContent;
 
         xHelpChildren->getByIndex(0) >>= xHelpChild;
diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx
index 0ce101790895..ac85b4409609 100644
--- a/framework/source/jobs/job.cxx
+++ b/framework/source/jobs/job.cxx
@@ -122,7 +122,7 @@ void Job::setDispatchResultFake( /*IN*/ const css::uno::Reference< css::frame::X
         return;
     }
 
-    m_xResultListener   = xListener  ;
+    m_xResultListener   = xListener;
     m_xResultSourceFake = xSourceFake;
 }
 
@@ -363,7 +363,7 @@ css::uno::Sequence< css::beans::NamedValue > Job::impl_generateJobArgs( /*IN*/ c
     // get the configuration data from the job data container ... if possible
     // Means: if this job has any configuration data. Note: only really
     // filled lists will be set to the return structure at the end of this method.
-    css::uno::Sequence< css::beans::NamedValue > lConfigArgs   ;
+    css::uno::Sequence< css::beans::NamedValue > lConfigArgs;
     css::uno::Sequence< css::beans::NamedValue > lJobConfigArgs;
     if (eMode==JobData::E_ALIAS || eMode==JobData::E_EVENT)
     {
diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx
index 2ea5d5d66c1b..55270fc1f058 100644
--- a/framework/source/jobs/jobdata.cxx
+++ b/framework/source/jobs/jobdata.cxx
@@ -76,13 +76,13 @@ void JobData::operator=( const JobData& rCopy )
     SolarMutexGuard g;
     // Please don't copy the uno service manager reference.
     // That can change the uno context, which isn't a good idea!
-    m_eMode                = rCopy.m_eMode               ;
-    m_eEnvironment         = rCopy.m_eEnvironment        ;
-    m_sAlias               = rCopy.m_sAlias              ;
-    m_sService             = rCopy.m_sService            ;
-    m_sContext             = rCopy.m_sContext            ;
-    m_sEvent               = rCopy.m_sEvent              ;
-    m_lArguments           = rCopy.m_lArguments          ;
+    m_eMode                = rCopy.m_eMode;
+    m_eEnvironment         = rCopy.m_eEnvironment;
+    m_sAlias               = rCopy.m_sAlias;
+    m_sService             = rCopy.m_sService;
+    m_sContext             = rCopy.m_sContext;
+    m_sEvent               = rCopy.m_sEvent;
+    m_lArguments           = rCopy.m_lArguments;
     m_aLastExecutionResult = rCopy.m_aLastExecutionResult;
 }
 
@@ -252,7 +252,7 @@ void JobData::setJobConfig( const css::uno::Sequence< css::beans::NamedValue >&
 
             for (sal_Int32 i=0; i<nCount; ++i)
             {
-                lNames [i] = m_lArguments[i].Name ;
+                lNames [i] = m_lArguments[i].Name;
                 lValues[i] = m_lArguments[i].Value;
             }
 
diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx
index bbf0eecf2e54..1c3ee7471e79 100644
--- a/framework/source/jobs/jobexecutor.cxx
+++ b/framework/source/jobs/jobexecutor.cxx
@@ -301,7 +301,7 @@ void SAL_CALL JobExecutor::notifyEvent( const css::document::EventObject& aEvent
     // step over all enabled jobs and execute it
     ::comphelper::SequenceAsVector< JobData::TJob2DocEventBinding >::const_iterator pIt;
     for (  pIt  = lJobs.begin();
-           pIt != lJobs.end()  ;
+           pIt != lJobs.end();
          ++pIt                 )
     {
         rtl::Reference<Job> pJob;
diff --git a/framework/source/jobs/jobresult.cxx b/framework/source/jobs/jobresult.cxx
index f4a94110e2ae..535ee7a0642c 100644
--- a/framework/source/jobs/jobresult.cxx
+++ b/framework/source/jobs/jobresult.cxx
@@ -132,11 +132,11 @@ JobResult::JobResult( /*IN*/ const css::uno::Any& aResult )
 */
 JobResult::JobResult( const JobResult& rCopy )
 {
-    m_aPureResult     = rCopy.m_aPureResult     ;
-    m_eParts          = rCopy.m_eParts          ;
-    m_lArguments      = rCopy.m_lArguments      ;
-    m_bDeactivate     = rCopy.m_bDeactivate     ;
-    m_aDispatchResult = rCopy.m_aDispatchResult ;
+    m_aPureResult     = rCopy.m_aPureResult;
+    m_eParts          = rCopy.m_eParts;
+    m_lArguments      = rCopy.m_lArguments;
+    m_bDeactivate     = rCopy.m_bDeactivate;
+    m_aDispatchResult = rCopy.m_aDispatchResult;
 }
 
 /**
@@ -158,11 +158,11 @@ JobResult::~JobResult()
 void JobResult::operator=( const JobResult& rCopy )
 {
     SolarMutexGuard g;
-    m_aPureResult     = rCopy.m_aPureResult     ;
-    m_eParts          = rCopy.m_eParts          ;
-    m_lArguments      = rCopy.m_lArguments      ;
-    m_bDeactivate     = rCopy.m_bDeactivate     ;
-    m_aDispatchResult = rCopy.m_aDispatchResult ;
+    m_aPureResult     = rCopy.m_aPureResult;
+    m_eParts          = rCopy.m_eParts;
+    m_lArguments      = rCopy.m_lArguments;
+    m_bDeactivate     = rCopy.m_bDeactivate;
+    m_aDispatchResult = rCopy.m_aDispatchResult;
 }
 
 /**
diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx
index 575fed00a499..4dad4fb8f285 100644
--- a/framework/source/jobs/joburl.cxx
+++ b/framework/source/jobs/joburl.cxx
@@ -54,7 +54,7 @@ JobURL::JobURL( /*IN*/ const OUString& sURL )
         {
             // separate all token of "{[event=<name>],[alias=<name>],[service=<name>]}"
             OUString sToken = sURL.getToken(0, JOBURL_PART_SEPARATOR, t);
-            OUString sPartValue    ;
+            OUString sPartValue;
             OUString sPartArguments;
 
             // check for "event="
@@ -64,9 +64,9 @@ JobURL::JobURL( /*IN*/ const OUString& sURL )
                )
             {
                 // set the part value
-                m_sEvent     = sPartValue    ;
+                m_sEvent     = sPartValue;
                 m_sEventArgs = sPartArguments;
-                m_eRequest  |= E_EVENT       ;
+                m_eRequest  |= E_EVENT;
             }
             else
             // check for "alias="
@@ -76,9 +76,9 @@ JobURL::JobURL( /*IN*/ const OUString& sURL )
                )
             {
                 // set the part value
-                m_sAlias     = sPartValue    ;
+                m_sAlias     = sPartValue;
                 m_sAliasArgs = sPartArguments;
-                m_eRequest  |= E_ALIAS       ;
+                m_eRequest  |= E_ALIAS;
             }
             else
             // check for "service="
@@ -88,9 +88,9 @@ JobURL::JobURL( /*IN*/ const OUString& sURL )
                )
             {
                 // set the part value
-                m_sService     = sPartValue    ;
+                m_sService     = sPartValue;
                 m_sServiceArgs = sPartArguments;
-                m_eRequest    |= E_SERVICE     ;
+                m_eRequest    |= E_SERVICE;
             }
         }
         while(t!=-1);
@@ -235,7 +235,7 @@ sal_Bool JobURL::implst_split( /*IN*/  const OUString& sPart           ,
         // Arguments will be set to an empty string as default.
         // If we detect the right sign - we split the arguments and overwrite the default.
         OUString sValueAndArguments = sPart.copy(nPartLength);
-        OUString sValue             = sValueAndArguments     ;
+        OUString sValue             = sValueAndArguments;
         OUString sArguments;
 
         sal_Int32 nArgStart = sValueAndArguments.indexOf('?',0);
@@ -246,7 +246,7 @@ sal_Bool JobURL::implst_split( /*IN*/  const OUString& sPart           ,
             sArguments = sValueAndArguments.copy(nArgStart);
         }
 
-        rPartValue     = sValue    ;
+        rPartValue     = sValue;
         rPartArguments = sArguments;
     }
 
@@ -276,7 +276,7 @@ void JobURL::impldbg_checkIt()
     // Tab and spaces before a separator will be used as value!
     JobURL::impldbg_checkURL("vnd.sun.star.job:event=onMyEvent;alias=myAlias;service=css.Service"  , E_EVENT | E_ALIAS | E_SERVICE , "onMyEvent", "myAlias", "css.Service" , NULL, NULL, NULL);
     JobURL::impldbg_checkURL("vnd.sun.star.job:service=css.Service;alias=myAlias"                  , E_ALIAS | E_SERVICE           , ""         , "myAlias", "css.Service" , NULL, NULL, NULL);
-    JobURL::impldbg_checkURL("vnd.sun.star.job:service=css.Service ;alias=myAlias"                 , E_ALIAS | E_SERVICE           , ""         , "myAlias", "css.Service ", NULL, NULL, NULL);
+    JobURL::impldbg_checkURL("vnd.sun.star.job:service=css.Service;alias=myAlias"                 , E_ALIAS | E_SERVICE           , ""         , "myAlias", "css.Service ", NULL, NULL, NULL);
     JobURL::impldbg_checkURL("vnd.sun.star.job:service=css.Service; alias=myAlias"                 , E_UNKNOWN                     , ""         , ""       , ""            , NULL, NULL, NULL);
     JobURL::impldbg_checkURL("vnd.sun.star.job : event=onMyEvent"                                  , E_UNKNOWN                     , ""         , ""       , ""            , NULL, NULL, NULL);
     JobURL::impldbg_checkURL("vnd.sun.star.job:event=onMyEvent;event=onMyEvent;service=css.Service", E_UNKNOWN                     , ""         , ""       , ""            , NULL, NULL, NULL);
@@ -342,11 +342,11 @@ void JobURL::impldbg_checkURL( /*IN*/ const sal_Char*  pURL                 ,
                                /*IN*/ const sal_Char*  pExpectedAliasArgs   ,
                                /*IN*/ const sal_Char*  pExpectedServiceArgs )
 {
-    OUString sEvent      ;
-    OUString sAlias      ;
-    OUString sService    ;
-    OUString sEventArgs  ;
-    OUString sAliasArgs  ;
+    OUString sEvent;
+    OUString sAlias;
+    OUString sService;
+    OUString sEventArgs;
+    OUString sAliasArgs;
     OUString sServiceArgs;
     OUString sURL    (OUString::createFromAscii(pURL));
     sal_Bool        bOK     = sal_True;
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 1729d9d29ed1..73063becb8b4 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -3180,7 +3180,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL LayoutManager::getPropertySet
 
     if( pInfo == NULL )
     {
-        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
+        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() );
 
         if( pInfo == NULL )
         {
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 0ba6d67449d0..6f3fb0705961 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -2443,13 +2443,13 @@ void ToolbarLayoutManager::implts_calcWindowPosSizeOnSingleRowColumn(
                 if ( isHorizontalDockingArea( nDockingArea ))
                 {
                     // Try to move this and all user elements behind with the calculated difference
-                    for ( sal_uInt32 j = i; j < nCount ; j++ )
+                    for ( sal_uInt32 j = i; j < nCount; j++ )
                         rRowColumnWindowData.aRowColumnWindowSizes[j].X += nDiff;
                 }
                 else
                 {
                     // Try to move this and all user elements behind with the calculated difference
-                    for ( sal_uInt32 j = i; j < nCount ; j++ )
+                    for ( sal_uInt32 j = i; j < nCount; j++ )
                         rRowColumnWindowData.aRowColumnWindowSizes[j].Y += nDiff;
                 }
                 nDiff = 0;
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 72d0458be12e..2d5d6b706232 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -228,15 +228,15 @@ void LoadEnv::initializeLoading(const OUString&
 
     // take over all new parameters.
     m_xTargetFrame.clear();
-    m_xBaseFrame                    = xBaseFrame        ;
+    m_xBaseFrame                    = xBaseFrame;
     m_lMediaDescriptor              = impl_mergeMediaDescriptorWithMightExistingModelArgs(lMediaDescriptor);
-    m_sTarget                       = sTarget           ;
-    m_nSearchFlags                  = nSearchFlags      ;
-    m_eFeature                      = eFeature          ;
-    m_eContentType                  = eContentType      ;
-    m_bCloseFrameOnError            = sal_False         ;
-    m_bReactivateControllerOnError  = sal_False         ;
-    m_bLoaded                       = sal_False         ;
+    m_sTarget                       = sTarget;
+    m_nSearchFlags                  = nSearchFlags;
+    m_eFeature                      = eFeature;
+    m_eContentType                  = eContentType;
+    m_bCloseFrameOnError            = sal_False;
+    m_bReactivateControllerOnError  = sal_False;
+    m_bLoaded                       = sal_False;
 
     // try to find out, if its really a content, which can be loaded or must be "handled"
     // We use a default value for this in-parameter. Then we have to start a complex check method
@@ -294,8 +294,8 @@ void LoadEnv::initializeUIDefaults( const css::uno::Reference< css::uno::XCompon
                                     QuietInteraction** o_ppQuietInteraction )
 {
     css::uno::Reference< css::task::XInteractionHandler > xInteractionHandler;
-    sal_Int16                                             nMacroMode         ;
-    sal_Int16                                             nUpdateMode        ;
+    sal_Int16                                             nMacroMode;
+    sal_Int16                                             nUpdateMode;
 
     if ( i_bUIMode )
     {
@@ -594,9 +594,9 @@ LoadEnv::EContentType LoadEnv::classifyContent(const OUString&
 
     OUString sType = xDetect->queryTypeByURL(sURL);
 
-    css::uno::Sequence< css::beans::NamedValue >           lQuery(1)   ;
+    css::uno::Sequence< css::beans::NamedValue >           lQuery(1);
     css::uno::Reference< css::frame::XLoaderFactory >      xLoaderFactory;
-    css::uno::Reference< css::container::XEnumeration >    xSet        ;
+    css::uno::Reference< css::container::XEnumeration >    xSet;
     css::uno::Sequence< OUString >                  lTypesReg(1);
 
     // (iii) If a FrameLoader service (or at least
@@ -1181,7 +1181,7 @@ css::uno::Reference< css::uno::XInterface > LoadEnv::impl_searchLoader()
         // Ignore any loader, which makes trouble :-)
         ::comphelper::SequenceAsHashMap             lLoaderProps(xSet->nextElement());
         OUString                             sLoader     = lLoaderProps.getUnpackedValueOrDefault(sPROP_NAME, OUString());
-        css::uno::Reference< css::uno::XInterface > xLoader     ;
+        css::uno::Reference< css::uno::XInterface > xLoader;
         try
         {
             xLoader = xLoaderFactory->createInstance(sLoader);
@@ -1740,7 +1740,7 @@ void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::aw
         // read window state from the configuration
         // and apply it on the window.
         // Do nothing, if no configuration entry exists!
-        OUString sWindowState ;
+        OUString sWindowState;
         ::comphelper::ConfigurationHelper::readRelativeKey(xModuleCfg, sModule, OFFICEFACTORY_PROPNAME_WINDOWATTRIBUTES) >>= sWindowState;
         if (!sWindowState.isEmpty())
         {
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index f9eccb764128..50ffc2791a94 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -1572,7 +1572,7 @@ void SAL_CALL AutoRecovery::addStatusListener(const css::uno::Reference< css::fr
 
     AutoRecovery::TDocumentList::iterator pIt;
     for(  pIt  = m_lDocCache.begin();
-          pIt != m_lDocCache.end()  ;
+          pIt != m_lDocCache.end();
         ++pIt                       )
     {
         AutoRecovery::TDocumentInfo&  rInfo = *pIt;
@@ -1903,10 +1903,10 @@ void AutoRecovery::implts_readConfig()
             AutoRecovery::TDocumentInfo aInfo;
             aInfo.NewTempURL = "";
             aInfo.Document   = css::uno::Reference< css::frame::XModel >();
-            xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_ORIGINALURL)) >>= aInfo.OrgURL       ;
-            xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_TEMPURL)) >>= aInfo.OldTempURL   ;
-            xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_TEMPLATEURL)) >>= aInfo.TemplateURL  ;
-            xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_FILTER)) >>= aInfo.RealFilter   ;
+            xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_ORIGINALURL)) >>= aInfo.OrgURL;
+            xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_TEMPURL)) >>= aInfo.OldTempURL;
+            xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_TEMPLATEURL)) >>= aInfo.TemplateURL;
+            xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_FILTER)) >>= aInfo.RealFilter;
             xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_DOCUMENTSTATE)) >>= aInfo.DocumentState;
             xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_MODULE)) >>= aInfo.AppModule;
             xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_TITLE)) >>= aInfo.Title;
@@ -2069,7 +2069,7 @@ void AutoRecovery::implts_persistAllActiveViewNames()
     // This list will be filled with every document
     AutoRecovery::TDocumentList::iterator pIt;
     for (  pIt  = m_lDocCache.begin();
-           pIt != m_lDocCache.end()  ;
+           pIt != m_lDocCache.end();
          ++pIt                       )
     {
         implts_collectActiveViewNames( *pIt );
@@ -2743,7 +2743,7 @@ AutoRecovery::TDocumentList::iterator AutoRecovery::impl_searchDocument(      Au
 {
     AutoRecovery::TDocumentList::iterator pIt;
     for (  pIt  = rList.begin();
-           pIt != rList.end()  ;
+           pIt != rList.end();
          ++pIt                 )
     {
         const AutoRecovery::TDocumentInfo& rInfo = *pIt;
@@ -2824,7 +2824,7 @@ void AutoRecovery::implts_prepareSessionShutdown()
 
     AutoRecovery::TDocumentList::iterator pIt;
     for (  pIt  = m_lDocCache.begin();
-           pIt != m_lDocCache.end()  ;
+           pIt != m_lDocCache.end();
          ++pIt                       )
     {
         AutoRecovery::TDocumentInfo& rInfo = *pIt;
@@ -2915,7 +2915,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_saveDocs(      sal_Bool        bAl
     OUString                              sBackupPath(SvtPathOptions().GetBackupPath());
 
     css::uno::Reference< css::frame::XController > xActiveController;
-    css::uno::Reference< css::frame::XModel >      xActiveModel     ;
+    css::uno::Reference< css::frame::XModel >      xActiveModel;
     css::uno::Reference< css::frame::XFrame >      xActiveFrame     = xDesktop->getActiveFrame();
     if (xActiveFrame.is())
         xActiveController = xActiveFrame->getController();
@@ -2946,7 +2946,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_saveDocs(      sal_Bool        bAl
 
     AutoRecovery::TDocumentList::iterator pIt;
     for (  pIt  = m_lDocCache.begin();
-           pIt != m_lDocCache.end()  ;
+           pIt != m_lDocCache.end();
          ++pIt                       )
     {
         AutoRecovery::TDocumentInfo aInfo = *pIt;
@@ -3053,7 +3053,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_saveDocs(      sal_Bool        bAl
     // Try to save it ... but may be it will fail !
     ::std::vector< AutoRecovery::TDocumentList::iterator >::iterator pIt2;
     for (  pIt2  = lDangerousDocs.begin();
-           pIt2 != lDangerousDocs.end()  ;
+           pIt2 != lDangerousDocs.end();
          ++pIt2                          )
     {
         pIt = *pIt2;
@@ -3219,7 +3219,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa
     sal_Int32                             eJob = m_eJob;
     AutoRecovery::TDocumentList::iterator pIt;
     for (  pIt  = m_lDocCache.begin();
-           pIt != m_lDocCache.end()  ;
+           pIt != m_lDocCache.end();
          ++pIt                       )
     {
         AutoRecovery::TDocumentInfo& rInfo = *pIt;
@@ -3280,7 +3280,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa
         }
 
         OUString sLoadOriginalURL;
-        OUString sLoadBackupURL  ;
+        OUString sLoadBackupURL;
 
         if (!bBackupWasTried)
             sLoadBackupURL = rInfo.OldTempURL;
@@ -3665,7 +3665,7 @@ css::frame::FeatureStateEvent AutoRecovery::implst_createFeatureStateEvent(
         aInfo.put( OUString(CFG_ENTRY_PROP_FACTORYURL), pInfo->FactoryURL );
         aInfo.put( OUString(CFG_ENTRY_PROP_TEMPLATEURL), pInfo->TemplateURL );
         aInfo.put( OUString(CFG_ENTRY_PROP_TEMPURL), pInfo->OldTempURL.isEmpty() ? pInfo->NewTempURL : pInfo->OldTempURL );
-        aInfo.put( OUString(CFG_ENTRY_PROP_MODULE), pInfo->AppModule) ;
+        aInfo.put( OUString(CFG_ENTRY_PROP_MODULE), pInfo->AppModule);
         aInfo.put( OUString(CFG_ENTRY_PROP_TITLE), pInfo->Title);
         aInfo.put( OUString(CFG_ENTRY_PROP_VIEWNAMES), pInfo->ViewNames);
         aInfo.put( OUString(CFG_ENTRY_PROP_DOCUMENTSTATE), pInfo->DocumentState);
@@ -3685,11 +3685,11 @@ void AutoRecovery::implts_resetHandleStates(sal_Bool /*bLoadCache*/)
 
     AutoRecovery::TDocumentList::iterator pIt;
     for (  pIt  = m_lDocCache.begin();
-           pIt != m_lDocCache.end()  ;
+           pIt != m_lDocCache.end();
          ++pIt                       )
     {
         AutoRecovery::TDocumentInfo& rInfo = *pIt;
-        rInfo.DocumentState &= ~AutoRecovery::E_HANDLED  ;
+        rInfo.DocumentState &= ~AutoRecovery::E_HANDLED;
         rInfo.DocumentState &= ~AutoRecovery::E_POSTPONED;
 
         // } /* SAFE */
@@ -3892,7 +3892,7 @@ void AutoRecovery::implts_backupWorkingEntry(const DispatchParams& aParams)
 
     AutoRecovery::TDocumentList::iterator pIt;
     for (  pIt  = m_lDocCache.begin();
-           pIt != m_lDocCache.end()  ;
+           pIt != m_lDocCache.end();
          ++pIt                       )
     {
         const AutoRecovery::TDocumentInfo& rInfo = *pIt;
@@ -3928,7 +3928,7 @@ void AutoRecovery::implts_cleanUpWorkingEntry(const DispatchParams& aParams)
 
     AutoRecovery::TDocumentList::iterator pIt;
     for (  pIt  = m_lDocCache.begin();
-           pIt != m_lDocCache.end()  ;
+           pIt != m_lDocCache.end();
          ++pIt                       )
     {
         AutoRecovery::TDocumentInfo& rInfo = *pIt;
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index d8483d0830bf..6db80cbb58d5 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -224,7 +224,7 @@ sal_Bool SAL_CALL Desktop::terminate()
     css::uno::Reference< css::frame::XTerminateListener > xSfxTerminator     = m_xSfxTerminator;
 
     css::lang::EventObject                                aEvent             ( static_cast< ::cppu::OWeakObject* >(this) );
-    sal_Bool                                            bAskQuickStart     = !m_bSuspendQuickstartVeto                  ;
+    sal_Bool                                            bAskQuickStart     = !m_bSuspendQuickstartVeto;
 
     aReadLock.clear();
 
@@ -1178,7 +1178,7 @@ void SAL_CALL Desktop::dispatchFinished( const css::frame::DispatchResultEvent&
     if( m_eLoadState != E_INTERACTION )
     {
         m_xLastFrame = css::uno::Reference< css::frame::XFrame >();
-        m_eLoadState = E_FAILED                                   ;
+        m_eLoadState = E_FAILED;
         if( aEvent.State == css::frame::DispatchResultState::SUCCESS )
         {
             css::uno::Reference < css::frame::XFrame > xFrame;
@@ -1248,9 +1248,9 @@ void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractio
 
     // extract continuations from request
     css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > lContinuations = xRequest->getContinuations();
-    css::uno::Reference< css::task::XInteractionAbort >                              xAbort         ;
-    css::uno::Reference< css::task::XInteractionApprove >                            xApprove       ;
-    css::uno::Reference< css::document::XInteractionFilterSelect >                   xFilterSelect  ;
+    css::uno::Reference< css::task::XInteractionAbort >                              xAbort;
+    css::uno::Reference< css::task::XInteractionApprove >                            xApprove;
+    css::uno::Reference< css::document::XInteractionFilterSelect >                   xFilterSelect;
     sal_Bool                                                                         bAbort         = sal_False;
 
     sal_Int32 nCount=lContinuations.getLength();
@@ -1268,7 +1268,7 @@ void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractio
 
     // differ between abortable interactions (error, unknown filter ...)
     // and other ones (ambigous but not unknown filter ...)
-    css::task::ErrorCodeRequest          aErrorCodeRequest     ;
+    css::task::ErrorCodeRequest          aErrorCodeRequest;
     css::document::AmbigousFilterRequest aAmbigousFilterRequest;
     if( aRequest >>= aAmbigousFilterRequest )
     {
@@ -1303,7 +1303,7 @@ void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractio
     {
         SolarMutexGuard g;
         m_eLoadState          = E_INTERACTION;
-        m_aInteractionRequest = aRequest     ;
+        m_aInteractionRequest = aRequest;
     }
 }
 
@@ -1401,7 +1401,7 @@ sal_Bool SAL_CALL Desktop::convertFastPropertyValue(       css::uno::Any&   aCon
     }
 
     // Return state of operation.
-    return bReturn ;
+    return bReturn;
 }
 
 /*-************************************************************************************************************
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 2c2d1d16292a..dc0abd799480 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -388,36 +388,36 @@ private:
 
 private:
 
-    css::uno::Reference< css::uno::XComponentContext >                      m_xContext                          ;   /// reference to factory, which has create this instance
-    css::uno::Reference< css::task::XStatusIndicatorFactory >               m_xIndicatorFactoryHelper           ;   /// reference to factory helper to create status indicator objects
-    css::uno::WeakReference< css::task::XStatusIndicator >                  m_xIndicatorInterception            ;   /// points to an external set progress, which should be used instead of the internal one.
-    css::uno::Reference< css::frame::XDispatchProvider >                    m_xDispatchHelper                   ;   /// helper for XDispatch/Provider and interception interfaces
-    css::uno::Reference< css::frame::XFrames >                              m_xFramesHelper                     ;   /// helper for XFrames, XIndexAccess and XElementAccess interfaces
-    ::cppu::OMultiTypeInterfaceContainerHelper                              m_aListenerContainer                ;   /// container for ALL Listener
-    css::uno::Reference< css::frame::XFramesSupplier >                      m_xParent                           ;   /// parent of this frame
-    css::uno::Reference< css::awt::XWindow >                                m_xContainerWindow                  ;   /// containerwindow of this frame for embedded components
-    css::uno::Reference< css::awt::XWindow >                                m_xComponentWindow                  ;   /// window of the actual component
-    css::uno::Reference< css::frame::XController >                          m_xController                       ;   /// controller of the actual frame
-    css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >      m_xDropTargetListener               ;   /// listen to drag & drop
-    EActiveState                                                            m_eActiveState                      ;   /// state, if i'am a member of active path in tree or i have the focus or ...
-    OUString                                                         m_sName                             ;   /// name of this frame
-    sal_Bool                                                                m_bIsFrameTop                       ;   /// frame has no parent or the parent is a taskor the desktop
-    sal_Bool                                                                m_bConnected                        ;   /// due to FrameActionEvent
-    sal_Int16                                                               m_nExternalLockCount                ;
-    css::uno::Reference< css::frame::XDispatchRecorderSupplier >            m_xDispatchRecorderSupplier         ;   /// is used for dispatch recording and will be set/get from outside. Frame provide it only!
-    SvtCommandOptions                                                       m_aCommandOptions                   ;   /// ref counted class to support disabling commands defined by configuration file
-    sal_Bool                                                                m_bSelfClose                        ;   /// in case of CloseVetoException on method close() wqs thrown by ourself - we must close ourself later if no internal processes are running
-    sal_Bool                                                                m_bIsHidden                         ;   /// indicates, if this frame is used in hidden mode or not
-    static css::uno::WeakReference< css::frame::XFrame2 >                   m_xCloserFrame                      ;   /// holds the only frame, which must show the special closer menu item (can be NULL!)
-    css::uno::Reference< ::css::frame::XLayoutManager2 >                    m_xLayoutManager                    ;   /// is used to layout the child windows of the frame.
-    css::uno::Reference< css::frame::XDispatchInformationProvider >         m_xDispatchInfoHelper               ;
-    css::uno::Reference< css::frame::XTitle >                               m_xTitleHelper                      ;
-
-    WindowCommandDispatch*                                                  m_pWindowCommandDispatch            ;
+    css::uno::Reference< css::uno::XComponentContext >                      m_xContext;                  /// reference to factory, which has create this instance
+    css::uno::Reference< css::task::XStatusIndicatorFactory >               m_xIndicatorFactoryHelper;   /// reference to factory helper to create status indicator objects
+    css::uno::WeakReference< css::task::XStatusIndicator >                  m_xIndicatorInterception;    /// points to an external set progress, which should be used instead of the internal one.
+    css::uno::Reference< css::frame::XDispatchProvider >                    m_xDispatchHelper;           /// helper for XDispatch/Provider and interception interfaces
+    css::uno::Reference< css::frame::XFrames >                              m_xFramesHelper;             /// helper for XFrames, XIndexAccess and XElementAccess interfaces
+    ::cppu::OMultiTypeInterfaceContainerHelper                              m_aListenerContainer;        /// container for ALL Listener
+    css::uno::Reference< css::frame::XFramesSupplier >                      m_xParent;                   /// parent of this frame
+    css::uno::Reference< css::awt::XWindow >                                m_xContainerWindow;          /// containerwindow of this frame for embedded components
+    css::uno::Reference< css::awt::XWindow >                                m_xComponentWindow;          /// window of the actual component
+    css::uno::Reference< css::frame::XController >                          m_xController;               /// controller of the actual frame
+    css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >      m_xDropTargetListener;       /// listen to drag & drop
+    EActiveState                                                            m_eActiveState;              /// state, if i'am a member of active path in tree or i have the focus or ...
+    OUString                                                                m_sName;                     /// name of this frame
+    sal_Bool                                                                m_bIsFrameTop;               /// frame has no parent or the parent is a taskor the desktop
+    sal_Bool                                                                m_bConnected;                /// due to FrameActionEvent
+    sal_Int16                                                               m_nExternalLockCount;
+    css::uno::Reference< css::frame::XDispatchRecorderSupplier >            m_xDispatchRecorderSupplier; /// is used for dispatch recording and will be set/get from outside. Frame provide it only!
+    SvtCommandOptions                                                       m_aCommandOptions;           /// ref counted class to support disabling commands defined by configuration file
+    sal_Bool                                                                m_bSelfClose;                /// in case of CloseVetoException on method close() wqs thrown by ourself - we must close ourself later if no internal processes are running
+    sal_Bool                                                                m_bIsHidden;                 /// indicates, if this frame is used in hidden mode or not
+    static css::uno::WeakReference< css::frame::XFrame2 >                   m_xCloserFrame;              /// holds the only frame, which must show the special closer menu item (can be NULL!)
+    css::uno::Reference< ::css::frame::XLayoutManager2 >                    m_xLayoutManager;            /// is used to layout the child windows of the frame.
+    css::uno::Reference< css::frame::XDispatchInformationProvider >         m_xDispatchInfoHelper;
+    css::uno::Reference< css::frame::XTitle >                               m_xTitleHelper;
+
+    WindowCommandDispatch*                                                  m_pWindowCommandDispatch;
 
 protected:
 
-    FrameContainer                                                          m_aChildFrameContainer              ;   /// array of child frames
+    FrameContainer                                                          m_aChildFrameContainer;   /// array of child frames
 
     inline css::uno::Reference< css::uno::XComponentContext > impl_getComponentContext()
     {
@@ -748,7 +748,7 @@ void SAL_CALL Frame::setActiveFrame( const css::uno::Reference< css::frame::XFra
     // m_aChildFrameContainer is threadsafe himself and he live if we live!!!
     // ...and our transaction is non breakable too ...
     css::uno::Reference< css::frame::XFrame > xActiveChild = m_aChildFrameContainer.getActive();
-    EActiveState                              eActiveState = m_eActiveState             ;
+    EActiveState                              eActiveState = m_eActiveState;
 
     aWriteLock.clear();
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
@@ -775,7 +775,7 @@ void SAL_CALL Frame::setActiveFrame( const css::uno::Reference< css::frame::XFra
         if( eActiveState == E_FOCUS )
         {
             aWriteLock.reset();
-            eActiveState   = E_ACTIVE    ;
+            eActiveState   = E_ACTIVE;
             m_eActiveState = eActiveState;
             aWriteLock.clear();
             implts_sendFrameActionEvent( css::frame::FrameAction_FRAME_UI_DEACTIVATING );
@@ -797,7 +797,7 @@ void SAL_CALL Frame::setActiveFrame( const css::uno::Reference< css::frame::XFra
     if( eActiveState == E_ACTIVE )
     {
         aWriteLock.reset();
-        eActiveState   = E_FOCUS     ;
+        eActiveState   = E_FOCUS;
         m_eActiveState = eActiveState;
         aWriteLock.clear();
         implts_sendFrameActionEvent( css::frame::FrameAction_FRAME_UI_ACTIVATED );
@@ -1357,11 +1357,11 @@ void SAL_CALL Frame::activate() throw( css::uno::RuntimeException, std::exceptio
     // he is threadsafe himself and live if we live.
     // We use a registered transaction to prevent us against
     // breaks during this operation!
-    css::uno::Reference< css::frame::XFrame >           xActiveChild    = m_aChildFrameContainer.getActive()                                ;
-    css::uno::Reference< css::frame::XFramesSupplier >  xParent         ( m_xParent, css::uno::UNO_QUERY )                                ;
+    css::uno::Reference< css::frame::XFrame >           xActiveChild    = m_aChildFrameContainer.getActive();
+    css::uno::Reference< css::frame::XFramesSupplier >  xParent         ( m_xParent, css::uno::UNO_QUERY );
     css::uno::Reference< css::frame::XFrame >           xThis           ( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY );
-    css::uno::Reference< css::awt::XWindow >            xComponentWindow( m_xComponentWindow, css::uno::UNO_QUERY )                       ;
-    EActiveState                                        eState          = m_eActiveState                                                  ;
+    css::uno::Reference< css::awt::XWindow >            xComponentWindow( m_xComponentWindow, css::uno::UNO_QUERY );
+    EActiveState                                        eState          = m_eActiveState;
 
     aWriteLock.clear();
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
@@ -1443,10 +1443,10 @@ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException, std::except
     SolarMutexResettableGuard aWriteLock;
 
     // Copy necessary member and free the lock.
-    css::uno::Reference< css::frame::XFrame >           xActiveChild    = m_aChildFrameContainer.getActive()                                     ;
-    css::uno::Reference< css::frame::XFramesSupplier >  xParent         ( m_xParent, css::uno::UNO_QUERY )                                ;
+    css::uno::Reference< css::frame::XFrame >           xActiveChild    = m_aChildFrameContainer.getActive();
+    css::uno::Reference< css::frame::XFramesSupplier >  xParent         ( m_xParent, css::uno::UNO_QUERY );
     css::uno::Reference< css::frame::XFrame >           xThis           ( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY );
-    EActiveState                                        eState          = m_eActiveState                                                  ;
+    EActiveState                                        eState          = m_eActiveState;
 
     aWriteLock.clear();
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
@@ -1468,7 +1468,7 @@ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException, std::except
             // Don't set ACTIVE as new state. This frame is deactivated for next time - due to activate().
             aWriteLock.reset();
             eState          = E_ACTIVE;
-            m_eActiveState  = eState  ;
+            m_eActiveState  = eState;
             aWriteLock.clear();
             implts_sendFrameActionEvent( css::frame::FrameAction_FRAME_UI_DEACTIVATING );
         }
@@ -1479,7 +1479,7 @@ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException, std::except
             // Set new state and send message to all listener.
             aWriteLock.reset();
             eState          = E_INACTIVE;
-            m_eActiveState  = eState    ;
+            m_eActiveState  = eState;
             aWriteLock.clear();
             implts_sendFrameActionEvent( css::frame::FrameAction_FRAME_DEACTIVATING );
         }
@@ -1676,7 +1676,7 @@ sal_Bool SAL_CALL Frame::setComponent(  const   css::uno::Reference< css::awt::X
     /* SAFE { */
     SolarMutexResettableGuard aWriteLock;
     m_xComponentWindow = xComponentWindow;
-    m_xController      = xController     ;
+    m_xController      = xController;
     m_bConnected       = (m_xComponentWindow.is() || m_xController.is());
     sal_Bool bIsConnected       = m_bConnected;
     aWriteLock.clear();
@@ -2512,7 +2512,7 @@ void SAL_CALL Frame::windowDeactivated( const css::lang::EventObject& aEvent ) t
 
     css::uno::Reference< css::frame::XFrame > xParent          ( m_xParent, css::uno::UNO_QUERY );
     css::uno::Reference< css::awt::XWindow >  xContainerWindow = m_xContainerWindow;
-    EActiveState                              eActiveState     = m_eActiveState    ;
+    EActiveState                              eActiveState     = m_eActiveState;
 
     aReadLock.clear();
 
@@ -2527,7 +2527,7 @@ void SAL_CALL Frame::windowDeactivated( const css::lang::EventObject& aEvent ) t
               !css::uno::Reference< css::frame::XDesktop >( xParent, css::uno::UNO_QUERY ).is()
             )
         {
-            css::uno::Reference< css::awt::XWindow >  xParentWindow   = xParent->getContainerWindow()             ;
+            css::uno::Reference< css::awt::XWindow >  xParentWindow   = xParent->getContainerWindow();
             Window*                                   pParentWindow   = VCLUnoHelper::GetWindow( xParentWindow    );
             //#i70261#: dialogs opened from an OLE object will cause a deactivate on the frame of the OLE object
             // on Solaris/Linux at that time pFocusWindow is still NULL because the focus handling is different; right after
@@ -3151,7 +3151,7 @@ void Frame::implts_startWindowListening()
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     // Make snapshot of necessary member!
     SolarMutexClearableGuard aReadLock;
-    css::uno::Reference< css::awt::XWindow >                            xContainerWindow    = m_xContainerWindow   ;
+    css::uno::Reference< css::awt::XWindow >                            xContainerWindow    = m_xContainerWindow;
     css::uno::Reference< css::uno::XComponentContext >                  xContext = m_xContext;
     css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >  xDragDropListener   = m_xDropTargetListener;
     css::uno::Reference< css::awt::XWindowListener >                    xWindowListener     ( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY );
@@ -3190,8 +3190,8 @@ void Frame::implts_stopWindowListening()
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     // Make snapshot of necessary member!
     SolarMutexClearableGuard aReadLock;
-    css::uno::Reference< css::awt::XWindow >                            xContainerWindow    = m_xContainerWindow   ;
-    css::uno::Reference< css::uno::XComponentContext >                  xContext            = m_xContext           ;
+    css::uno::Reference< css::awt::XWindow >                            xContainerWindow    = m_xContainerWindow;
+    css::uno::Reference< css::uno::XComponentContext >                  xContext            = m_xContext;
     css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >  xDragDropListener   = m_xDropTargetListener;
     css::uno::Reference< css::awt::XWindowListener >                    xWindowListener     ( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY );
     css::uno::Reference< css::awt::XFocusListener >                     xFocusListener      ( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY );
diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx
index 8ba63897f8fa..49ab890cb02f 100644
--- a/framework/source/services/mediatypedetectionhelper.cxx
+++ b/framework/source/services/mediatypedetectionhelper.cxx
@@ -24,8 +24,8 @@
 namespace framework
 {
 
-using namespace ::com::sun::star        ;
-using namespace ::rtl                   ;
+using namespace ::com::sun::star;
+using namespace ::rtl;
 
 //  constructor
 
diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx
index 62e84736bc37..7d3716c4bb5a 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -256,7 +256,7 @@ void SAL_CALL ModuleManager::replaceByName(const OUString& sName ,
                                                                             "/org.openoffice.Setup/Office/Factories",
                                                                             ::comphelper::ConfigurationHelper::E_STANDARD);
         css::uno::Reference< css::container::XNameAccess >  xModules (xCfg, css::uno::UNO_QUERY_THROW);
-        css::uno::Reference< css::container::XNameReplace > xModule  ;
+        css::uno::Reference< css::container::XNameReplace > xModule;
 
         xModules->getByName(sName) >>= xModule;
         if (!xModule.is())
@@ -268,7 +268,7 @@ void SAL_CALL ModuleManager::replaceByName(const OUString& sName ,
 
         ::comphelper::SequenceAsHashMap::const_iterator pProp;
         for (  pProp  = lProps.begin();
-               pProp != lProps.end()  ;
+               pProp != lProps.end();
              ++pProp                  )
         {
             const OUString& sPropName  = pProp->first;
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index 21fb2908cc63..29619dbebb45 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -708,7 +708,7 @@ void PathSettings::impl_mergeOldUserPaths(      PathSettings::PathInfo& rPath,
 {
     OUStringList::const_iterator pIt;
     for (  pIt  = lOld.begin();
-           pIt != lOld.end()  ;
+           pIt != lOld.end();
          ++pIt                )
     {
         const OUString& sOld = *pIt;
@@ -853,10 +853,10 @@ css::uno::Sequence< sal_Int32 > PathSettings::impl_mapPathName2IDList(const OUSt
     // the outside cant determine the right group ... and cant fire the right events .-)
 
     css::uno::Sequence< sal_Int32 > lIDs(IDGROUP_COUNT);
-    lIDs[0] = IDGROUP_OLDSTYLE       ;
+    lIDs[0] = IDGROUP_OLDSTYLE;
     lIDs[1] = IDGROUP_INTERNAL_PATHS;
-    lIDs[2] = IDGROUP_USER_PATHS    ;
-    lIDs[3] = IDGROUP_WRITE_PATH     ;
+    lIDs[2] = IDGROUP_USER_PATHS;
+    lIDs[3] = IDGROUP_WRITE_PATH;
 
     sal_Int32 c = m_lPropDesc.getLength();
     sal_Int32 i = 0;
@@ -964,11 +964,11 @@ void PathSettings::impl_subst(      OUStringList&
     OUStringList::iterator pIt;
 
     for (  pIt  = lVals.begin();
-           pIt != lVals.end()  ;
+           pIt != lVals.end();
          ++pIt                 )
     {
         const OUString& sOld = *pIt;
-              OUString  sNew ;
+              OUString  sNew;
         if (bReSubst)
             sNew = xSubst->reSubstituteVariables(sOld);
         else
@@ -998,13 +998,13 @@ OUString PathSettings::impl_convertPath2OldStyle(const PathSettings::PathInfo& r
     lTemp.reserve(rPath.lInternalPaths.size() + rPath.lUserPaths.size() + 1);
 
     for (  pIt  = rPath.lInternalPaths.begin();
-           pIt != rPath.lInternalPaths.end()  ;
+           pIt != rPath.lInternalPaths.end();
          ++pIt                                 )
     {
         lTemp.push_back(*pIt);
     }
     for (  pIt  = rPath.lUserPaths.begin();
-           pIt != rPath.lUserPaths.end()  ;
+           pIt != rPath.lUserPaths.end();
          ++pIt                             )
     {
         lTemp.push_back(*pIt);
@@ -1015,7 +1015,7 @@ OUString PathSettings::impl_convertPath2OldStyle(const PathSettings::PathInfo& r
 
     OUStringBuffer sPathVal(256);
     for (  pIt  = lTemp.begin();
-           pIt != lTemp.end()  ;
+           pIt != lTemp.end();
                                )
     {
         sPathVal.append(*pIt);
@@ -1047,7 +1047,7 @@ void PathSettings::impl_purgeKnownPaths(const PathSettings::PathInfo& rPath,
 {
     OUStringList::const_iterator pIt;
     for (  pIt  = rPath.lInternalPaths.begin();
-           pIt != rPath.lInternalPaths.end()  ;
+           pIt != rPath.lInternalPaths.end();
          ++pIt                                 )
     {
         const OUString& rItem = *pIt;
@@ -1056,7 +1056,7 @@ void PathSettings::impl_purgeKnownPaths(const PathSettings::PathInfo& rPath,
             lList.erase(pItem);
     }
     for (  pIt  = rPath.lUserPaths.begin();
-           pIt != rPath.lUserPaths.end()  ;
+           pIt != rPath.lUserPaths.end();
          ++pIt                             )
     {
         const OUString& rItem = *pIt;
@@ -1081,7 +1081,7 @@ void PathSettings::impl_rebuildPropertyDescriptor()
 
     PathHash::const_iterator pIt;
     for (  pIt  = m_lPaths.begin();
-           pIt != m_lPaths.end()  ;
+           pIt != m_lPaths.end();
          ++pIt                     )
     {
         const PathSettings::PathInfo& rPath = pIt->second;
@@ -1202,7 +1202,7 @@ void PathSettings::impl_setPathValue(      sal_Int32      nID ,
                 {
                     OUStringList::const_iterator pIt;
                     for (  pIt  = lList.begin();
-                           pIt != lList.end()  ;
+                           pIt != lList.end();
                          ++pIt                 )
                     {
                         aChangePath.lUserPaths.push_back(*pIt);
@@ -1277,7 +1277,7 @@ sal_Bool PathSettings::impl_isValidPath(const OUStringList& lPath) const
 {
     OUStringList::const_iterator pIt;
     for (  pIt  = lPath.begin();
-           pIt != lPath.end()  ;
+           pIt != lPath.end();
          ++pIt                 )
     {
         const OUString& rVal = *pIt;
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index db50d8ffd0bc..abc4b721e0db 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -1270,7 +1270,7 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable
 
     // Get inspath and userpath from bootstrap mechanism in every case as file URL
     ::utl::Bootstrap::PathStatus aState;
-    OUString              sVal  ;
+    OUString              sVal;
 
     aState = utl::Bootstrap::locateUserData( sVal );
     //There can be the valid case that there is no user installation.
diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx
index d187419a1c32..309693cebd5e 100644
--- a/framework/source/services/taskcreatorsrv.cxx
+++ b/framework/source/services/taskcreatorsrv.cxx
@@ -245,25 +245,25 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai
     css::awt::WindowDescriptor aDescriptor;
     if (bTopWindow)
     {
-        aDescriptor.Type                =   css::awt::WindowClass_TOP                       ;
+        aDescriptor.Type                =   css::awt::WindowClass_TOP;
         aDescriptor.WindowServiceName   =   "window";
-        aDescriptor.ParentIndex         =   -1                                              ;
-        aDescriptor.Parent              =   css::uno::Reference< css::awt::XWindowPeer >()  ;
-        aDescriptor.Bounds              =   aPosSize                                        ;
+        aDescriptor.ParentIndex         =   -1;
+        aDescriptor.Parent              =   css::uno::Reference< css::awt::XWindowPeer >();
+        aDescriptor.Bounds              =   aPosSize;
         aDescriptor.WindowAttributes    =   css::awt::WindowAttribute::BORDER               |
                                             css::awt::WindowAttribute::MOVEABLE             |
                                             css::awt::WindowAttribute::SIZEABLE             |
                                             css::awt::WindowAttribute::CLOSEABLE            |
-                                            css::awt::VclWindowPeerAttribute::CLIPCHILDREN  ;
+                                            css::awt::VclWindowPeerAttribute::CLIPCHILDREN;
     }
     else
     {
-        aDescriptor.Type                =   css::awt::WindowClass_TOP                       ;
+        aDescriptor.Type                =   css::awt::WindowClass_TOP;
         aDescriptor.WindowServiceName   =   "dockingwindow";
-        aDescriptor.ParentIndex         =   1                                               ;
-        aDescriptor.Parent              =   xParentWindowPeer                               ;
-        aDescriptor.Bounds              =   aPosSize                                        ;
-        aDescriptor.WindowAttributes    =   css::awt::VclWindowPeerAttribute::CLIPCHILDREN  ;
+        aDescriptor.ParentIndex         =   1;
+        aDescriptor.Parent              =   xParentWindowPeer;
+        aDescriptor.Bounds              =   aPosSize;
+        aDescriptor.WindowAttributes    =   css::awt::VclWindowPeerAttribute::CLIPCHILDREN;
     }
 
     // create a new blank container window and get access to parent container to append new created task.
diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx
index 7511af83e98a..c19f9d6decdf 100644
--- a/framework/source/services/urltransformer.cxx
+++ b/framework/source/services/urltransformer.cxx
@@ -235,7 +235,7 @@ sal_Bool SAL_CALL URLTransformer::assemble( css::util::URL& aURL ) throw( css::u
 {
     // Safe impossible cases.
     if  ( &aURL == NULL )
-        return sal_False ;
+        return sal_False;
 
     // Initialize parser.
     INetURLObject aParser;
diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx
index 0c0e30a9514c..46b91c57c885 100644
--- a/framework/source/tabwin/tabwindow.cxx
+++ b/framework/source/tabwin/tabwindow.cxx
@@ -824,7 +824,7 @@ throw( css::lang::IllegalArgumentException )
     }
 
     // Return state of operation.
-    return bReturn ;
+    return bReturn;
 }
 
 void SAL_CALL TabWindow::setFastPropertyValue_NoBroadcast( sal_Int32,
@@ -857,7 +857,7 @@ void SAL_CALL TabWindow::getFastPropertyValue( css::uno::Any& aValue  ,
     if( pInfoHelper == NULL )
     {
         // Ready for multithreading
-        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
+        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() );
 
         // Control this pointer again, another instance can be faster then these!
         if( pInfoHelper == NULL )
@@ -884,7 +884,7 @@ throw ( css::uno::RuntimeException, std::exception )
     if( pInfo == NULL )
     {
         // Ready for multithreading
-        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
+        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() );
         // Control this pointer again, another instance can be faster then these!
         if( pInfo == NULL )
         {
diff --git a/framework/source/tabwin/tabwinfactory.cxx b/framework/source/tabwin/tabwinfactory.cxx
index 7b93711f485e..bcc705b2813d 100644
--- a/framework/source/tabwin/tabwinfactory.cxx
+++ b/framework/source/tabwin/tabwinfactory.cxx
@@ -107,10 +107,10 @@ throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
     {
         // describe window properties.
         css::awt::WindowDescriptor aDescriptor;
-        aDescriptor.Type                =   css::awt::WindowClass_TOP                                           ;
-        aDescriptor.ParentIndex         =   -1                                                                  ;
-        aDescriptor.Parent              =   css::uno::Reference< css::awt::XWindowPeer >()                      ;
-        aDescriptor.Bounds              =   css::awt::Rectangle(0,0,0,0)                                        ;
+        aDescriptor.Type                =   css::awt::WindowClass_TOP;
+        aDescriptor.ParentIndex         =   -1;
+        aDescriptor.Parent              =   css::uno::Reference< css::awt::XWindowPeer >();
+        aDescriptor.Bounds              =   css::awt::Rectangle(0,0,0,0);
         aDescriptor.WindowAttributes    =   css::awt::WindowAttribute::BORDER|
                                             css::awt::WindowAttribute::SIZEABLE|
                                             css::awt::WindowAttribute::MOVEABLE|
diff --git a/framework/source/uifactory/addonstoolbarfactory.cxx b/framework/source/uifactory/addonstoolbarfactory.cxx
index 4c9b2526d86e..26f61b472bd8 100644
--- a/framework/source/uifactory/addonstoolbarfactory.cxx
+++ b/framework/source/uifactory/addonstoolbarfactory.cxx
@@ -153,7 +153,7 @@ sal_Bool AddonsToolBarFactory::hasButtonsInContext(
             {
                 OUString aURL;
                 rPropSeq[j].Value >>= aURL;
-                bIsButton = aURL != "private:separator" ;
+                bIsButton = aURL != "private:separator";
                 nPropChecked++;
             }
 
diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx
index 3759c82d44ac..74b7cf16b59a 100644
--- a/framework/source/xml/acceleratorconfigurationreader.cxx
+++ b/framework/source/xml/acceleratorconfigurationreader.cxx
@@ -105,7 +105,7 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const OUString&
         m_bInsideAcceleratorItem = sal_True;
 
         OUString    sCommand;
-        css::awt::KeyEvent aEvent  ;
+        css::awt::KeyEvent aEvent;
 
         sal_Int16 c = xAttributeList->getLength();
         sal_Int16 i = 0;
diff --git a/framework/source/xml/acceleratorconfigurationwriter.cxx b/framework/source/xml/acceleratorconfigurationwriter.cxx
index 53dccc5978f8..fce62f848930 100644
--- a/framework/source/xml/acceleratorconfigurationwriter.cxx
+++ b/framework/source/xml/acceleratorconfigurationwriter.cxx
@@ -65,9 +65,9 @@ void AcceleratorConfigurationWriter::flush()
 
     // TODO think about threadsafe using of cache
     AcceleratorCache::TKeyList                 lKeys = m_rContainer.getAllKeys();
-    AcceleratorCache::TKeyList::const_iterator pKey  ;
+    AcceleratorCache::TKeyList::const_iterator pKey;
     for (  pKey  = lKeys.begin();
-           pKey != lKeys.end()  ;
+           pKey != lKeys.end();
          ++pKey                 )
     {
         const css::awt::KeyEvent& rKey     = *pKey;
diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx
index 2c8fb17d41c0..245ad1e3f736 100644
--- a/framework/source/xml/imagesdocumenthandler.cxx
+++ b/framework/source/xml/imagesdocumenthandler.cxx
@@ -167,7 +167,7 @@ void SAL_CALL OReadImagesDocumentHandler::startElement(
 {
     SolarMutexGuard g;
 
-    ImageHashMap::const_iterator pImageEntry = m_aImageMap.find( aName ) ;
+    ImageHashMap::const_iterator pImageEntry = m_aImageMap.find( aName );
     if ( pImageEntry != m_aImageMap.end() )
     {
         switch ( pImageEntry->second )
@@ -501,7 +501,7 @@ void SAL_CALL OReadImagesDocumentHandler::endElement(const OUString& aName)
 {
     SolarMutexGuard g;
 
-    ImageHashMap::const_iterator pImageEntry = m_aImageMap.find( aName ) ;
+    ImageHashMap::const_iterator pImageEntry = m_aImageMap.find( aName );
     if ( pImageEntry != m_aImageMap.end() )
     {
         switch ( pImageEntry->second )