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/salgdi.hxx

@@ -69,10 +69,6 @@ namespace basegfx {
 
 #define SAL_COPYAREA_WINDOWINVALIDATE       ((sal_uInt16)0x0001)
 
-// -------------------
-// - common typedefs -
-// -------------------
-
 typedef sal_Unicode sal_Ucs; // TODO: use sal_UCS4 instead of sal_Unicode
 typedef std::map< sal_Ucs, sal_Int32 >    Ucs2SIntMap;
 typedef std::map< sal_Ucs, sal_uInt32 >   Ucs2UIntMap;
@@ -97,7 +93,6 @@ protected:
     bool                    m_bAntiAliasB2DDraw;
 
 public:
-    // get/set AA
     void                    setAntiAliasB2DDraw(bool bNew) { m_bAntiAliasB2DDraw = bNew; }
     bool                    getAntiAliasB2DDraw() const { return m_bAntiAliasB2DDraw; }
 
@@ -106,6 +101,7 @@ public:
 
 protected:
     virtual bool            setClipRegion( const Region& ) = 0;
+
     // draw --> LineColor and FillColor and RasterOp and ClipRegion
     virtual void            drawPixel( long nX, long nY ) = 0;
     virtual void            drawPixel( long nX, long nY, SalColor nSalColor ) = 0;
@@ -115,8 +111,7 @@ protected:
     virtual void            drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry ) = 0;
     virtual void            drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ) = 0;
     virtual bool            drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ) = 0;
-    virtual bool        drawPolyLine(
-        const ::basegfx::B2DPolygon&,
+    virtual bool            drawPolyLine( const ::basegfx::B2DPolygon&,
                                           double fTransparency,
                                           const ::basegfx::B2DVector& rLineWidths,
                                           basegfx::B2DLineJoin,
@@ -190,8 +185,10 @@ public:
 
     // get device resolution
     virtual void            GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) = 0;
+
     // get the depth of the device
     virtual sal_uInt16      GetBitCount() const = 0;
+
     // get the width of the device
     virtual long            GetGraphicsWidth() const = 0;
 
@@ -199,44 +196,63 @@ public:
     virtual void            ResetClipRegion() = 0;
 
     // set the line color to transparent (= don't draw lines)
+
     virtual void            SetLineColor() = 0;
+
     // set the line color to a specific color
     virtual void            SetLineColor( SalColor nSalColor ) = 0;
+
     // set the fill color to transparent (= don't fill)
     virtual void            SetFillColor() = 0;
+
     // set the fill color to a specific color, shapes will be
     // filled accordingly
     virtual void            SetFillColor( SalColor nSalColor ) = 0;
+
     // enable/disable XOR drawing
     virtual void            SetXORMode( bool bSet, bool bInvertOnly ) = 0;
+
     // set line color for raster operations
     virtual void            SetROPLineColor( SalROPColor nROPColor ) = 0;
+
     // set fill color for raster operations
     virtual void            SetROPFillColor( SalROPColor nROPColor ) = 0;
+
     // set the text color to a specific color
     virtual void            SetTextColor( SalColor nSalColor ) = 0;
+
     // set the font
     virtual sal_uInt16      SetFont( FontSelectPattern*, int nFallbackLevel ) = 0;
+
     // release the fonts
     void                    ReleaseFonts() { SetFont( NULL, 0 ); }
+
     // get the current font's metrics
     virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel = 0 ) = 0;
 
-    // get kernign pairs of the current font
+    // get kerning pairs of the current font
     // return only PairCount if (pKernPairs == NULL)
     virtual sal_uLong       GetKernPairs( sal_uLong nMaxPairCount, ImplKernPairData* ) = 0;
+
     // get the repertoire of the current font
-    virtual const ImplFontCharMap* GetImplFontCharMap() const = 0;
+    virtual const ImplFontCharMap*
+                            GetImplFontCharMap() const = 0;
+
     // get the layout capabilities of the current font
     virtual bool            GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const = 0;
+
     // graphics must fill supplied font list
     virtual void            GetDevFontList( ImplDevFontList* ) = 0;
+
     // graphics must drop any cached font info
     virtual void            ClearDevFontCache() = 0;
+
     // graphics should call ImplAddDevFontSubstitute on supplied
     // OutputDevice for all its device specific preferred font substitutions
     virtual void            GetDevFontSubstList( OutputDevice* ) = 0;
+
     virtual bool            AddTempDevFont( ImplDevFontList*, const rtl::OUString& rFileURL, const rtl::OUString& rFontName ) = 0;
+
     // CreateFontSubset: a method to get a subset of glyhps of a font
     // inside a new valid font file
     // returns sal_True if creation of subset was successful
@@ -255,8 +271,7 @@ public:
                                               sal_uInt8* pEncoding,
                                               sal_Int32* pWidths,
                                               int nGlyphs,
-                                              FontSubsetInfo& rInfo // out parameter
-                                              ) = 0;
+                                              FontSubsetInfo& rInfo ) = 0;
 
     // GetFontEncodingVector: a method to get the encoding map Unicode
     // to font encoded character; this is only used for type1 fonts and
@@ -265,7 +280,8 @@ public:
     // glyphs with only a name) exist it is set to the corresponding
     // map for non encoded glyphs; the encoding vector contains -1
     // as encoding for these cases
-    virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded ) = 0;
+    virtual const Ucs2SIntMap*
+                            GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded ) = 0;
 
     // GetEmbedFontData: gets the font data for a font marked
     // embeddable by GetDevFontList or NULL in case of error
@@ -281,7 +297,7 @@ public:
                                               sal_Int32* pWidths,
                                               FontSubsetInfo& rInfo,
                                               long* pDataLen ) = 0;
-    // frees the font data again
+    // free the font data again
     virtual void            FreeEmbedFontData( const void* pData, long nDataLen ) = 0;
 
     // get the same widths as in CreateFontSubset and GetEmbedFontData
@@ -298,6 +314,7 @@ public:
 
     virtual SalLayout*      GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) = 0;
     virtual void            DrawServerFontLayout( const ServerFontLayout& ) = 0;
+
     /** Filter text from DrawText commands in a device specific manner
         <p>
         This function allows a device (or rather the corresponding SalGraphics
@@ -329,7 +346,12 @@ public:
         true: a substitution has taken place and rNewText rLen, rCutStart and rCutStop have been filled accordingly
         false: no substitution has taken place, rNewText, rLen, rCutStart, rCutStop remain unchanged
      */
-    virtual bool            filterText( const rtl::OUString& rOrigText, rtl::OUString& rNewText, xub_StrLen nIndex, xub_StrLen& rLen, xub_StrLen& rCutStart, xub_StrLen& rCutStop );
+    virtual bool            filterText( const rtl::OUString& rOrigText,
+                                        rtl::OUString& rNewText,
+                                        xub_StrLen nIndex,
+                                        xub_StrLen& rLen,
+                                        xub_StrLen& rCutStart,
+                                        xub_StrLen& rCutStop );
 
     virtual bool            supportsOperation( OutDevSupportType ) const = 0;
 
@@ -364,8 +386,7 @@ public:
                                              const OutputDevice *pOutDev );
     bool                    DrawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency, const OutputDevice* );
 
-    bool DrawPolyLine(
-        const basegfx::B2DPolygon& i_rPolygon,
+    bool                    DrawPolyLine( const basegfx::B2DPolygon& i_rPolygon,
                                           double i_fTransparency,
                                           const basegfx::B2DVector& i_rLineWidth,
                                           basegfx::B2DLineJoin i_eLineJoin,
@@ -387,12 +408,9 @@ public:
                                                    const OutputDevice *pOutDev );
 
     // CopyArea --> No RasterOp, but ClipRegion
-    void                    CopyArea( long nDestX,
-                                      long nDestY,
-                                      long nSrcX,
-                                      long nSrcY,
-                                      long nSrcWidth,
-                                      long nSrcHeight,
+    void                    CopyArea( long nDestX, long nDestY,
+                                      long nSrcX, long nSrcY,
+                                      long nSrcWidth, long nSrcHeight,
                                       sal_uInt16 nFlags,
                                       const OutputDevice *pOutDev );
 
@@ -415,18 +433,31 @@ public:
                                       SalColor nMaskColor,
                                       const OutputDevice *pOutDev );
 
-    SalBitmap*              GetBitmap( long nX, long nY, long nWidth, long nHeight, const OutputDevice *pOutDev );
-    SalColor                GetPixel( long nX, long nY, const OutputDevice *pOutDev );
+    SalBitmap*              GetBitmap( long nX, long nY,
+                                       long nWidth, long nHeight,
+                                       const OutputDevice *pOutDev );
+
+    SalColor                GetPixel( long nX, long nY,
+                                      const OutputDevice *pOutDev );
 
     // invert --> ClipRegion (only Windows)
-    void                    Invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags, const OutputDevice *pOutDev );
-    void                    Invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nFlags, const OutputDevice *pOutDev );
+    void                    Invert( long nX, long nY,
+                                    long nWidth, long nHeight,
+                                    SalInvert nFlags,
+                                    const OutputDevice *pOutDev );
+
+    void                    Invert( sal_uLong nPoints,
+                                    const SalPoint* pPtAry,
+                                    SalInvert nFlags,
+                                    const OutputDevice *pOutDev );
 
-    sal_Bool                    DrawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize, const OutputDevice *pOutDev );
+    sal_Bool                DrawEPS( long nX, long nY,
+                                     long nWidth, long nHeight,
+                                     void* pPtr,
+                                     sal_uLong nSize,
+                                     const OutputDevice *pOutDev );
 
-    //-------------------------------------
-    //  Native Widget Rendering functions
-    //-------------------------------------
+    //  native widget rendering functions
 
     // Query the platform layer for control support
     virtual sal_Bool        IsNativeControlSupported( ControlType nType, ControlPart nPart );
@@ -467,7 +498,9 @@ public:
     bool                    DrawAlphaRect( long nX, long nY, long nWidth, long nHeight,
                                            sal_uInt8 nTransparency, const OutputDevice *pOutDev );
 
-    virtual SystemGraphicsData   GetGraphicsData() const = 0;
+    virtual SystemGraphicsData
+                            GetGraphicsData() const = 0;
+
     virtual SystemFontData  GetSysFontData( int nFallbacklevel ) const = 0;
 };
 

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: