Improve indentation consistency

Change-Id: I27a692be8d1c3aa10bdf46883fd502491aff4674

vcl/inc/salbmp.hxx

@@ -56,7 +56,6 @@ public:
     virtual BitmapBuffer*   AcquireBuffer( bool bReadOnly ) = 0;
     virtual void            ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ) = 0;
     virtual bool            GetSystemData( BitmapSystemData& rData ) = 0;
-
 };
 
 #endif

vcl/inc/salframe.hxx

@@ -24,10 +24,9 @@
 #include <vcl/dllapi.h>
 
 #ifdef __cplusplus
-
 #include <vcl/ptrstyle.hxx>
-
 #endif // __cplusplus
+
 #include <salwtype.hxx>
 #include <salgeom.hxx>
 #include <tools/gen.hxx>
@@ -43,15 +42,11 @@ class SalBitmap;
 class SalMenu;
 class Window;
 
-
 struct SalFrameState;
 struct SalInputContext;
 struct SystemEnvData;
 
-// -----------------
-// - SalFrameTypes -
-// -----------------
-
+// SalFrame types
 #define SAL_FRAME_TOTOP_RESTOREWHENMIN      ((sal_uInt16)0x0001)
 #define SAL_FRAME_TOTOP_FOREGROUNDTASK      ((sal_uInt16)0x0002)
 #define SAL_FRAME_TOTOP_GRABFOCUS           ((sal_uInt16)0x0004)
@@ -60,17 +55,13 @@ struct SystemEnvData;
 #define SAL_FRAME_ENDEXTTEXTINPUT_COMPLETE  ((sal_uInt16)0x0001)
 #define SAL_FRAME_ENDEXTTEXTINPUT_CANCEL    ((sal_uInt16)0x0002)
 
-
-// -----------------
-// - SalFrameStyle -
-// -----------------
-
+// SalFrame styles
 #define SAL_FRAME_STYLE_DEFAULT             ((sal_uLong)0x00000001)
 #define SAL_FRAME_STYLE_MOVEABLE            ((sal_uLong)0x00000002)
 #define SAL_FRAME_STYLE_SIZEABLE            ((sal_uLong)0x00000004)
 #define SAL_FRAME_STYLE_CLOSEABLE           ((sal_uLong)0x00000008)
 
-// no shadow effect on WindowsXP
+// no shadow effect on Windows XP
 #define SAL_FRAME_STYLE_NOSHADOW            ((sal_uLong)0x00000010)
 // indicate tooltip windows, so they can always be topmost
 #define SAL_FRAME_STYLE_TOOLTIP             ((sal_uLong)0x00000020)
@@ -93,18 +84,13 @@ struct SystemEnvData;
 // the window containing the intro bitmap, aka splashscreen
 #define SAL_FRAME_STYLE_INTRO               ((sal_uLong)0x80000000)
 
-// ----------------------------------------
 // - extended frame style                 -
 // - (sal equivalent to extended WinBits) -
-// ----------------------------------------
 typedef sal_uInt64 SalExtStyle;
 #define SAL_FRAME_EXT_STYLE_DOCUMENT        SalExtStyle(0x00000001)
 #define SAL_FRAME_EXT_STYLE_DOCMODIFIED     SalExtStyle(0x00000002)
 
-// ------------------------
-// - Flags for SetPosSize -
-// ------------------------
-
+// Flags for SetPosSize
 #define SAL_FRAME_POSSIZE_X                 ((sal_uInt16)0x0001)
 #define SAL_FRAME_POSSIZE_Y                 ((sal_uInt16)0x0002)
 #define SAL_FRAME_POSSIZE_WIDTH             ((sal_uInt16)0x0004)
@@ -122,14 +108,13 @@ class VCL_PLUGIN_PUBLIC SalFrame : public vcl::DeletionNotifier
     // the VCL window corresponding to this frame
     Window*                 m_pWindow;
     SALFRAMEPROC            m_pProc;
+
 public:                     // public for Sal Implementation
     SalFrame() : m_pWindow( NULL ), m_pProc( NULL ) {}
     virtual ~SalFrame();
 
-public:                     // public for Sal Implementation
     SalFrameGeometry        maGeometry;
 
-public:
     // SalGraphics or NULL, but two Graphics for all SalFrames
     // must be returned
     virtual SalGraphics*    GetGraphics() = 0;
@@ -162,9 +147,11 @@ public:
     // Note: x will be mirrored at parent if UI mirroring is active
     SalFrameGeometry        GetGeometry();
     const SalFrameGeometry& GetUnmirroredGeometry() const { return maGeometry; }
+
     virtual void            SetWindowState( const SalFrameState* pState ) = 0;
     virtual sal_Bool        GetWindowState( SalFrameState* pState ) = 0;
     virtual void            ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nDisplay ) = 0;
+
     // Enable/Disable ScreenSaver, SystemAgents, ...
     virtual void            StartPresentation( sal_Bool bStart ) = 0;
     // Show Window over all other Windows
@@ -202,7 +189,8 @@ public:
     virtual void            UpdateSettings( AllSettings& rSettings ) = 0;
 
     // returns system data (most prominent: window handle)
-    virtual const SystemEnvData*    GetSystemData() const = 0;
+    virtual const SystemEnvData*
+                            GetSystemData() const = 0;
 
     // get current modifier, button mask and mouse position
     struct SalPointerState
@@ -250,7 +238,8 @@ public:
         { m_pWindow = pWindow; m_pProc = pProc; }
 
     // returns the instance set
-    Window*                       GetWindow() const { return m_pWindow; }
+    Window*                 GetWindow() const
+        { return m_pWindow; }
 
     // Call the callback set; this sometimes necessary for implementation classes
     // that should not know more than necessary about the SalFrame implementation

vcl/inc/salinst.hxx

@@ -80,10 +80,11 @@ public:
     virtual void            DestroyObject( SalObject* pObject ) = 0;
 
     // VirtualDevice
-    // nDX and nDY in Pixel
-    // nBitCount: 0 == Default(=as window) / 1 == Mono
+    // nDX and nDY in pixels
+    // nBitCount: 0 == default(=as window) / 1 == mono
     // pData allows for using a system dependent graphics or device context
-    virtual SalVirtualDevice*   CreateVirtualDevice( SalGraphics* pGraphics,
+    virtual SalVirtualDevice*
+                            CreateVirtualDevice( SalGraphics* pGraphics,
                                                  long nDX, long nDY,
                                                  sal_uInt16 nBitCount, const SystemGraphicsData *pData = NULL ) = 0;
     virtual void            DestroyVirtualDevice( SalVirtualDevice* pDevice ) = 0;
@@ -106,14 +107,16 @@ public:
     // SalTimer
     virtual SalTimer*       CreateSalTimer() = 0;
     // SalI18NImeStatus
-    virtual SalI18NImeStatus*   CreateI18NImeStatus() = 0;
+    virtual SalI18NImeStatus*
+                            CreateI18NImeStatus() = 0;
     // SalSystem
     virtual SalSystem*      CreateSalSystem() = 0;
     // SalBitmap
     virtual SalBitmap*      CreateSalBitmap() = 0;
 
     // YieldMutex
-    virtual osl::SolarMutex*    GetYieldMutex() = 0;
+    virtual osl::SolarMutex*
+                            GetYieldMutex() = 0;
     virtual sal_uLong       ReleaseYieldMutex() = 0;
     virtual void            AcquireYieldMutex( sal_uLong nCount ) = 0;
     // return true, if yield mutex is owned by this thread, else false
@@ -125,7 +128,7 @@ public:
     virtual void            Yield( bool bWait, bool bHandleAllCurrentEvents ) = 0;
     virtual bool            AnyInput( sal_uInt16 nType ) = 0;
 
-                            // Menues
+    // menus
     virtual SalMenu*        CreateMenu( sal_Bool bMenuBar, Menu* pMenu );
     virtual void            DestroyMenu( SalMenu* pMenu);
     virtual SalMenuItem*    CreateMenuItem( const SalItemParams* pItemData );
@@ -138,8 +141,10 @@ public:
 
     void                    SetEventCallback( rtl::Reference< vcl::DisplayConnectionDispatch > const & pInstance )
         { m_pEventInst = pInstance; }
+
     bool                    CallEventCallback( void* pEvent, int nBytes )
         { return m_pEventInst.is() && m_pEventInst->dispatchEvent( pEvent, nBytes ); }
+
     bool                    CallErrorCallback( void* pEvent, int nBytes )
         { return m_pEventInst.is() && m_pEventInst->dispatchErrorEvent( pEvent, nBytes ); }
 
@@ -154,8 +159,10 @@ public:
     // dtrans implementation
     virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
                             CreateClipboard( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& i_rArguments );
-    virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDragSource();
-    virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDropTarget();
+    virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
+                            CreateDragSource();
+    virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
+                            CreateDropTarget();
     virtual void            AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType) = 0;
 
     virtual bool            hasNativeFileSelection() const { return false; }
@@ -164,9 +171,9 @@ public:
                             createFilePicker( const com::sun::star::uno::Reference<
                                               com::sun::star::uno::XComponentContext >& )
         { return com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFilePicker2 >(); }
+
     virtual com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFolderPicker2 >
-        createFolderPicker( const com::sun::star::uno::Reference<
-                              com::sun::star::uno::XComponentContext >& )
+                            createFolderPicker( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& )
         { return com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFolderPicker2 >(); }
 
     // callbacks for printer updates

vcl/inc/sallayout.hxx

@@ -39,10 +39,7 @@ class PhysicalFontFace;
 
 #define MAX_FALLBACK 16
 
-// ----------------
-// - LayoutOption -
-// ----------------
-
+// Layout options
 #define SAL_LAYOUT_BIDI_RTL                 0x0001
 #define SAL_LAYOUT_BIDI_STRONG              0x0002
 #define SAL_LAYOUT_RIGHT_ALIGN              0x0004

vcl/inc/salsys.hxx

@@ -24,8 +24,7 @@
 #include <vcl/dllapi.h>
 #include <rtl/ustring.hxx>
 
-/* Button combinations for ShowNativeMessageBox
-*/
+// Button combinations for ShowNativeMessageBox
 const int SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_OK                 = 0;
 const int SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_OK_CANCEL          = 1;
 const int SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_ABORT_RETRY_IGNORE = 2;
@@ -33,8 +32,7 @@ const int SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_YES_NO_CANCEL      = 3;
 const int SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_YES_NO             = 4;
 const int SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_RETRY_CANCEL       = 5;
 
-/* Button identifier for ShowNativeMessageBox
-*/
+// Button identifier for ShowNativeMessageBox
 const int SALSYSTEM_SHOWNATIVEMSGBOX_BTN_OK     = 1;
 const int SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL = 2;
 const int SALSYSTEM_SHOWNATIVEMSGBOX_BTN_ABORT  = 3;
@@ -43,7 +41,6 @@ const int SALSYSTEM_SHOWNATIVEMSGBOX_BTN_IGNORE = 5;
 const int SALSYSTEM_SHOWNATIVEMSGBOX_BTN_YES    = 6;
 const int SALSYSTEM_SHOWNATIVEMSGBOX_BTN_NO     = 7;
 
-
 class VCL_PLUGIN_PUBLIC SalSystem
 {
 public: