diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-22 21:20:15 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-23 03:38:49 +0000 |
| commit | 0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf (patch) | |
| tree | 5024cba9f9ea5e3b23ea26025323f6aef39488d0 /vcl/win/source | |
| parent | b81ac16e65b311d6e43c05c22c65d2040c9d7e04 (diff) | |
Remove unneccessary comments
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb
Reviewed-on: https://gerrit.libreoffice.org/8182
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/win/source')
| -rw-r--r-- | vcl/win/source/app/saldata.cxx | 10 | ||||
| -rw-r--r-- | vcl/win/source/app/salinfo.cxx | 4 | ||||
| -rw-r--r-- | vcl/win/source/app/salinst.cxx | 78 | ||||
| -rw-r--r-- | vcl/win/source/app/salshl.cxx | 4 | ||||
| -rw-r--r-- | vcl/win/source/app/saltimer.cxx | 4 | ||||
| -rw-r--r-- | vcl/win/source/gdi/salbmp.cxx | 40 | ||||
| -rw-r--r-- | vcl/win/source/gdi/salgdi.cxx | 82 | ||||
| -rw-r--r-- | vcl/win/source/gdi/salgdi2.cxx | 24 | ||||
| -rw-r--r-- | vcl/win/source/gdi/salgdi3.cxx | 82 | ||||
| -rw-r--r-- | vcl/win/source/gdi/salgdi_gdiplus.cxx | 8 | ||||
| -rw-r--r-- | vcl/win/source/gdi/salnativewidgets-luna.cxx | 2 | ||||
| -rw-r--r-- | vcl/win/source/gdi/salvd.cxx | 10 | ||||
| -rw-r--r-- | vcl/win/source/gdi/winlayout.cxx | 84 | ||||
| -rw-r--r-- | vcl/win/source/gdi/wntgdi.cxx | 6 | ||||
| -rw-r--r-- | vcl/win/source/window/salframe.cxx | 200 | ||||
| -rw-r--r-- | vcl/win/source/window/salmenu.cxx | 2 | ||||
| -rw-r--r-- | vcl/win/source/window/salobj.cxx | 32 |
17 files changed, 336 insertions, 336 deletions
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx index fc9967459dda..73d2e6edf22e 100644 --- a/vcl/win/source/app/saldata.cxx +++ b/vcl/win/source/app/saldata.cxx @@ -42,7 +42,7 @@ rtl_TextEncoding ImplSalGetSystemEncoding() return eEncoding; } -// ----------------------------------------------------------------------- + OUString ImplSalGetUniString(const sal_Char* pStr, sal_Int32 const nLen) { @@ -88,28 +88,28 @@ BOOL ImplPostMessage( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ) return PostMessageW( hWnd, nMsg, wParam, lParam ); } -// ----------------------------------------------------------------------- + BOOL ImplSendMessage( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ) { return SendMessageW( hWnd, nMsg, wParam, lParam ); } -// ----------------------------------------------------------------------- + BOOL ImplGetMessage( LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax ) { return GetMessageW( lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax ); } -// ----------------------------------------------------------------------- + BOOL ImplPeekMessage( LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax, UINT wRemoveMsg ) { return PeekMessageW( lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg ); } -// ----------------------------------------------------------------------- + LONG ImplDispatchMessage( CONST MSG *lpMsg ) { diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx index fdb5cc57b2d7..178693f15615 100644 --- a/vcl/win/source/app/salinfo.cxx +++ b/vcl/win/source/app/salinfo.cxx @@ -43,7 +43,7 @@ WinSalSystem::~WinSalSystem() { } -// ----------------------------------------------------------------------- + static BOOL CALLBACK ImplEnumMonitorProc( HMONITOR hMonitor, HDC hDC, @@ -178,7 +178,7 @@ OUString WinSalSystem::GetDisplayScreenName( unsigned int nScreen ) return (nScreen < m_aMonitors.size()) ? m_aMonitors[nScreen].m_aName : OUString(); } -// ----------------------------------------------------------------------- + /* We have to map the button identifier to the identifier used by the Win32 Platform SDK to specify the default button for the MessageBox API. The first dimension is the button combination, the second dimension diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index 316c5443df95..ece177210cb2 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -127,7 +127,7 @@ public: sal_uLong GetAcquireCount( sal_uLong nThreadId ); }; -// ----------------------------------------------------------------------- + SalYieldMutex::SalYieldMutex( WinSalInstance* pInstData ) { @@ -136,7 +136,7 @@ SalYieldMutex::SalYieldMutex( WinSalInstance* pInstData ) mnThreadId = 0; } -// ----------------------------------------------------------------------- + void SalYieldMutex::acquire() { @@ -145,7 +145,7 @@ void SalYieldMutex::acquire() mnThreadId = GetCurrentThreadId(); } -// ----------------------------------------------------------------------- + void SalYieldMutex::release() { @@ -187,7 +187,7 @@ void SalYieldMutex::release() } } -// ----------------------------------------------------------------------- + bool SalYieldMutex::tryToAcquire() { @@ -201,7 +201,7 @@ bool SalYieldMutex::tryToAcquire() return false; } -// ----------------------------------------------------------------------- + sal_uLong SalYieldMutex::GetAcquireCount( sal_uLong nThreadId ) { @@ -211,7 +211,7 @@ sal_uLong SalYieldMutex::GetAcquireCount( sal_uLong nThreadId ) return 0; } -// ----------------------------------------------------------------------- + void ImplSalYieldMutexAcquireWithWait() { @@ -259,7 +259,7 @@ void ImplSalYieldMutexAcquireWithWait() pInst->mpSalYieldMutex->acquire(); } -// ----------------------------------------------------------------------- + sal_Bool ImplSalYieldMutexTryToAcquire() { @@ -270,7 +270,7 @@ sal_Bool ImplSalYieldMutexTryToAcquire() return FALSE; } -// ----------------------------------------------------------------------- + void ImplSalYieldMutexAcquire() { @@ -279,7 +279,7 @@ void ImplSalYieldMutexAcquire() pInst->mpSalYieldMutex->acquire(); } -// ----------------------------------------------------------------------- + void ImplSalYieldMutexRelease() { @@ -291,7 +291,7 @@ void ImplSalYieldMutexRelease() } } -// ----------------------------------------------------------------------- + sal_uLong ImplSalReleaseYieldMutex() { @@ -311,7 +311,7 @@ sal_uLong ImplSalReleaseYieldMutex() return nCount; } -// ----------------------------------------------------------------------- + void ImplSalAcquireYieldMutex( sal_uLong nCount ) { @@ -327,7 +327,7 @@ void ImplSalAcquireYieldMutex( sal_uLong nCount ) } } -// ----------------------------------------------------------------------- + bool WinSalInstance::CheckYieldMutex() { @@ -367,9 +367,9 @@ void SalData::initKeyCodeMap() } // ======================================================================= -// ------- + // SalData -// ------- + SalData::SalData() { @@ -468,7 +468,7 @@ void DeInitSalData() delete pSalData; } -// ----------------------------------------------------------------------- + void InitSalMain() { @@ -485,7 +485,7 @@ void InitSalMain() } } -// ----------------------------------------------------------------------- + SalInstance* CreateSalInstance() { @@ -569,7 +569,7 @@ SalInstance* CreateSalInstance() return pInst; } -// ----------------------------------------------------------------------- + void DestroySalInstance( SalInstance* pInst ) { @@ -586,7 +586,7 @@ void DestroySalInstance( SalInstance* pInst ) delete pInst; } -// ----------------------------------------------------------------------- + WinSalInstance::WinSalInstance() { @@ -598,7 +598,7 @@ WinSalInstance::WinSalInstance() ::tools::SolarMutex::SetSolarMutex( mpSalYieldMutex ); } -// ----------------------------------------------------------------------- + WinSalInstance::~WinSalInstance() { @@ -609,28 +609,28 @@ WinSalInstance::~WinSalInstance() DestroyWindow( mhComWnd ); } -// ----------------------------------------------------------------------- + comphelper::SolarMutex* WinSalInstance::GetYieldMutex() { return mpSalYieldMutex; } -// ----------------------------------------------------------------------- + sal_uLong WinSalInstance::ReleaseYieldMutex() { return ImplSalReleaseYieldMutex(); } -// ----------------------------------------------------------------------- + void WinSalInstance::AcquireYieldMutex( sal_uLong nCount ) { ImplSalAcquireYieldMutex( nCount ); } -// ----------------------------------------------------------------------- + static void ImplSalDispatchMessage( MSG* pMsg ) { @@ -645,7 +645,7 @@ static void ImplSalDispatchMessage( MSG* pMsg ) ImplSalPostDispatchMsg( pMsg, lResult ); } -// ----------------------------------------------------------------------- + void ImplSalYield( sal_Bool bWait, sal_Bool bHandleAllCurrentEvents ) { @@ -676,7 +676,7 @@ void ImplSalYield( sal_Bool bWait, sal_Bool bHandleAllCurrentEvents ) } } -// ----------------------------------------------------------------------- + void WinSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents ) { @@ -727,7 +727,7 @@ void WinSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents ) } } -// ----------------------------------------------------------------------- + LRESULT CALLBACK SalComWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, int& rDef ) { @@ -873,7 +873,7 @@ LRESULT CALLBACK SalComWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lPa return nRet; } -// ----------------------------------------------------------------------- + bool WinSalInstance::AnyInput( sal_uInt16 nType ) { @@ -955,7 +955,7 @@ bool WinSalInstance::AnyInput( sal_uInt16 nType ) return FALSE; } -// ----------------------------------------------------------------------- + void SalTimer::Start( sal_uLong nMS ) { @@ -972,7 +972,7 @@ void SalTimer::Start( sal_uLong nMS ) ImplSalStartTimer( nMS, FALSE ); } -// ----------------------------------------------------------------------- + SalFrame* WinSalInstance::CreateChildFrame( SystemParentData* pSystemParentData, sal_uLong nSalFrameStyle ) { @@ -980,7 +980,7 @@ SalFrame* WinSalInstance::CreateChildFrame( SystemParentData* pSystemParentData, return (SalFrame*)(sal_IntPtr)ImplSendMessage( mhComWnd, SAL_MSG_CREATEFRAME, nSalFrameStyle, (LPARAM)pSystemParentData->hWnd ); } -// ----------------------------------------------------------------------- + SalFrame* WinSalInstance::CreateFrame( SalFrame* pParent, sal_uLong nSalFrameStyle ) { @@ -993,14 +993,14 @@ SalFrame* WinSalInstance::CreateFrame( SalFrame* pParent, sal_uLong nSalFrameSty return (SalFrame*)(sal_IntPtr)ImplSendMessage( mhComWnd, SAL_MSG_CREATEFRAME, nSalFrameStyle, (LPARAM)hWndParent ); } -// ----------------------------------------------------------------------- + void WinSalInstance::DestroyFrame( SalFrame* pFrame ) { ImplSendMessage( mhComWnd, SAL_MSG_DESTROYFRAME, 0, (LPARAM)pFrame ); } -// ----------------------------------------------------------------------- + SalObject* WinSalInstance::CreateObject( SalFrame* pParent, SystemWindowData* /*pWindowData*/, // SystemWindowData meaningless on Windows @@ -1010,14 +1010,14 @@ SalObject* WinSalInstance::CreateObject( SalFrame* pParent, return (SalObject*)(sal_IntPtr)ImplSendMessage( mhComWnd, SAL_MSG_CREATEOBJECT, 0, (LPARAM)static_cast<WinSalFrame*>(pParent) ); } -// ----------------------------------------------------------------------- + void WinSalInstance::DestroyObject( SalObject* pObject ) { ImplSendMessage( mhComWnd, SAL_MSG_DESTROYOBJECT, 0, (LPARAM)pObject ); } -// ----------------------------------------------------------------------- + void* WinSalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ) { @@ -1026,7 +1026,7 @@ void* WinSalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rReturn return const_cast<char *>(""); } -// ----------------------------------------------------------------------- + /** Add a file to the system shells recent document list if there is any. This function may have no effect under Unix because there is no @@ -1108,14 +1108,14 @@ void WinSalInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUS } } -// ----------------------------------------------------------------------- + SalTimer* WinSalInstance::CreateSalTimer() { return new WinSalTimer(); } -// ----------------------------------------------------------------------- + SalBitmap* WinSalInstance::CreateSalBitmap() { @@ -1139,7 +1139,7 @@ SalI18NImeStatus* WinSalInstance::CreateI18NImeStatus() return new WinImeStatus(); } -// ----------------------------------------------------------------------- + const OUString& SalGetDesktopEnvironment() { @@ -1153,7 +1153,7 @@ SalSession* WinSalInstance::CreateSalSession() } #if !defined ( __MINGW32__ ) || defined ( _WIN64 ) -// ----------------------------------------------------------------------- + int WinSalInstance::WorkaroundExceptionHandlingInUSER32Lib(int, LPEXCEPTION_POINTERS pExceptionInfo) { // Decide if an exception is a c++ (mostly UNO) exception or a process violation. diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/source/app/salshl.cxx index 9e6fd34e020b..fa66249df02e 100644 --- a/vcl/win/source/app/salshl.cxx +++ b/vcl/win/source/app/salshl.cxx @@ -67,7 +67,7 @@ HCURSOR ImplLoadSalCursor( int nId ) return hCursor; } -// ----------------------------------------------------------------------- + HBITMAP ImplLoadSalBitmap( int nId ) { @@ -80,7 +80,7 @@ HBITMAP ImplLoadSalBitmap( int nId ) return hBitmap; } -// ----------------------------------------------------------------------- + sal_Bool ImplLoadSalIcon( int nId, HICON& rIcon, HICON& rSmallIcon ) { diff --git a/vcl/win/source/app/saltimer.cxx b/vcl/win/source/app/saltimer.cxx index 95ab585e981d..68cd6ca5098e 100644 --- a/vcl/win/source/app/saltimer.cxx +++ b/vcl/win/source/app/saltimer.cxx @@ -56,7 +56,7 @@ void ImplSalStartTimer( sal_uLong nMS, sal_Bool bMutex ) pSalData->mnNextTimerTime = pSalData->mnLastEventTime + nMS; } -// ----------------------------------------------------------------------- + WinSalTimer::~WinSalTimer() { @@ -90,7 +90,7 @@ void WinSalTimer::Stop() } } -// ----------------------------------------------------------------------- + void CALLBACK SalTimerProc( HWND, UINT, UINT_PTR nId, DWORD ) { diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx index f0e150975e89..5324581d4c6d 100644 --- a/vcl/win/source/gdi/salbmp.cxx +++ b/vcl/win/source/gdi/salbmp.cxx @@ -64,7 +64,7 @@ #endif -// ------------------------------------------------------------------ + // - Inlines - inline void ImplSetPixel4( const HPBYTE pScanline, long nX, const BYTE cIndex ) @@ -75,7 +75,7 @@ inline void ImplSetPixel4( const HPBYTE pScanline, long nX, const BYTE cIndex ) ( rByte &= 0x0f, rByte |= ( cIndex << 4 ) ); } -// ------------------------------------------------------------------ + // Helper class to manage Gdiplus::Bitmap instances inside of // WinSalBitmap @@ -194,13 +194,13 @@ public: } }; -// ------------------------------------------------------------------ + // Global instance of GdiPlusBuffer which manages Gdiplus::Bitmap // instances static GdiPlusBuffer aGdiPlusBuffer; -// ------------------------------------------------------------------ + // - WinSalBitmap - WinSalBitmap::WinSalBitmap() @@ -213,14 +213,14 @@ WinSalBitmap::WinSalBitmap() { } -// ------------------------------------------------------------------ + WinSalBitmap::~WinSalBitmap() { Destroy(); } -// ------------------------------------------------------------------ + void WinSalBitmap::Destroy() { @@ -238,7 +238,7 @@ void WinSalBitmap::Destroy() mnBitCount = 0; } -// ------------------------------------------------------------------ + GdiPlusBmpPtr WinSalBitmap::ImplGetGdiPlusBitmap(const WinSalBitmap* pAlphaSource) const { @@ -281,7 +281,7 @@ GdiPlusBmpPtr WinSalBitmap::ImplGetGdiPlusBitmap(const WinSalBitmap* pAlphaSourc return maGdiPlusBitmap; } -// ------------------------------------------------------------------ + Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap() { @@ -372,7 +372,7 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap() return pRetval; } -// ------------------------------------------------------------------ + Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap(const WinSalBitmap& rAlphaSource) { @@ -530,7 +530,7 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap(const WinSalBitmap& rAlph return pRetval; } -// ------------------------------------------------------------------ + bool WinSalBitmap::Create( HANDLE hBitmap, bool bDIB, bool bCopyHandle ) { @@ -581,7 +581,7 @@ bool WinSalBitmap::Create( HANDLE hBitmap, bool bDIB, bool bCopyHandle ) return bRet; } -// ------------------------------------------------------------------ + bool WinSalBitmap::Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ) { @@ -599,7 +599,7 @@ bool WinSalBitmap::Create( const Size& rSize, sal_uInt16 nBitCount, const Bitmap return bRet; } -// ------------------------------------------------------------------ + bool WinSalBitmap::Create( const SalBitmap& rSSalBitmap ) { @@ -628,7 +628,7 @@ bool WinSalBitmap::Create( const SalBitmap& rSSalBitmap ) return bRet; } -// ------------------------------------------------------------------ + bool WinSalBitmap::Create( const SalBitmap& rSSalBmp, SalGraphics* pSGraphics ) { @@ -674,7 +674,7 @@ bool WinSalBitmap::Create( const SalBitmap& rSSalBmp, SalGraphics* pSGraphics ) return bRet; } -// ------------------------------------------------------------------ + bool WinSalBitmap::Create( const SalBitmap& rSSalBmp, sal_uInt16 nNewBitCount ) { @@ -726,7 +726,7 @@ bool WinSalBitmap::Create( const SalBitmap& rSSalBmp, sal_uInt16 nNewBitCount ) return bRet; } -// ------------------------------------------------------------------ + bool WinSalBitmap::Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > xBitmapCanvas, Size& /*rSize*/, bool bMask ) { @@ -775,7 +775,7 @@ sal_uInt16 WinSalBitmap::ImplGetDIBColorCount( HGLOBAL hDIB ) return nColors; } -// ------------------------------------------------------------------ + HGLOBAL WinSalBitmap::ImplCreateDIB( const Size& rSize, sal_uInt16 nBits, const BitmapPalette& rPal ) { @@ -832,7 +832,7 @@ HGLOBAL WinSalBitmap::ImplCreateDIB( const Size& rSize, sal_uInt16 nBits, const return hDIB; } -// ------------------------------------------------------------------ + HANDLE WinSalBitmap::ImplCopyDIBOrDDB( HANDLE hHdl, bool bDIB ) { @@ -878,7 +878,7 @@ HANDLE WinSalBitmap::ImplCopyDIBOrDDB( HANDLE hHdl, bool bDIB ) return hCopy; } -// ------------------------------------------------------------------ + BitmapBuffer* WinSalBitmap::AcquireBuffer( bool /*bReadOnly*/ ) { @@ -977,7 +977,7 @@ BitmapBuffer* WinSalBitmap::AcquireBuffer( bool /*bReadOnly*/ ) return pBuffer; } -// ------------------------------------------------------------------ + void WinSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ) { @@ -1001,7 +1001,7 @@ void WinSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ) } } -// ------------------------------------------------------------------ + void WinSalBitmap::ImplDecodeRLEBuffer( const BYTE* pSrcBuf, BYTE* pDstBuf, const Size& rSizePixel, bool bRLE4 ) diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index c999f0df8373..845fb22a43af 100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -60,7 +60,7 @@ struct SysColorEntry static SysColorEntry* pFirstSysColor = NULL; static SysColorEntry* pActSysColor = NULL; -// ----------------------------------------------------------------------------- + // Blue7 static PALETTEENTRY aImplExtraColor1 = @@ -68,7 +68,7 @@ static PALETTEENTRY aImplExtraColor1 = 0, 184, 255, 0 }; -// ----------------------------------------------------------------------------- + static PALETTEENTRY aImplSalSysPalEntryAry[ DITHER_MAX_SYSCOLOR ] = { @@ -90,7 +90,7 @@ static PALETTEENTRY aImplSalSysPalEntryAry[ DITHER_MAX_SYSCOLOR ] = { 0xFF, 0xFF, 0xFF, 0 } }; -// ----------------------------------------------------------------------------- + static BYTE aOrdDither8Bit[8][8] = { @@ -104,7 +104,7 @@ static BYTE aOrdDither8Bit[8][8] = { 33, 20, 30, 17, 32, 20, 29, 16 } }; -// ----------------------------------------------------------------------------- + static BYTE aOrdDither16Bit[8][8] = { @@ -309,7 +309,7 @@ void ImplInitSalGDI() ReleaseDC( 0, hDC ); } -// ----------------------------------------------------------------------- + void ImplFreeSalGDI() { @@ -383,7 +383,7 @@ void ImplFreeSalGDI() ImplReleaseTempFonts( *pSalData ); } -// ----------------------------------------------------------------------- + static int ImplIsPaletteEntry( BYTE nRed, BYTE nGreen, BYTE nBlue ) { @@ -492,7 +492,7 @@ void ImplUpdateSysColorEntries() ImplInsertSysColorEntry( COLOR_INACTIVECAPTIONTEXT ); } -// ----------------------------------------------------------------------- + static SalColor ImplGetROPSalColor( SalROPColor nROPColor ) { @@ -523,7 +523,7 @@ void ImplSalInitGraphics( WinSalGraphics* pData ) ::SetROP2( pData->getHDC(), R2_COPYPEN ); } -// ----------------------------------------------------------------------- + void ImplSalDeInitGraphics( WinSalGraphics* pData ) { @@ -741,7 +741,7 @@ WinSalGraphics::WinSalGraphics() mnPenWidth = GSL_PEN_WIDTH; } -// ----------------------------------------------------------------------- + WinSalGraphics::~WinSalGraphics() { @@ -776,7 +776,7 @@ WinSalGraphics::~WinSalGraphics() delete mpFontKernPairs; } -// ----------------------------------------------------------------------- + void WinSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) { @@ -790,14 +790,14 @@ void WinSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) rDPIX = rDPIY = 600; } -// ----------------------------------------------------------------------- + sal_uInt16 WinSalGraphics::GetBitCount() const { return (sal_uInt16)GetDeviceCaps( getHDC(), BITSPIXEL ); } -// ----------------------------------------------------------------------- + long WinSalGraphics::GetGraphicsWidth() const { @@ -821,7 +821,7 @@ long WinSalGraphics::GetGraphicsWidth() const return 0; } -// ----------------------------------------------------------------------- + void WinSalGraphics::ResetClipRegion() { @@ -834,7 +834,7 @@ void WinSalGraphics::ResetClipRegion() SelectClipRgn( getHDC(), 0 ); } -// ----------------------------------------------------------------------- + bool WinSalGraphics::setClipRegion( const Region& i_rClip ) { @@ -1065,7 +1065,7 @@ bool WinSalGraphics::setClipRegion( const Region& i_rClip ) return true; } -// ----------------------------------------------------------------------- + void WinSalGraphics::SetLineColor() { @@ -1088,7 +1088,7 @@ void WinSalGraphics::SetLineColor() mbStockPen = TRUE; } -// ----------------------------------------------------------------------- + void WinSalGraphics::SetLineColor( SalColor nSalColor ) { @@ -1147,7 +1147,7 @@ void WinSalGraphics::SetLineColor( SalColor nSalColor ) mbStockPen = bStockPen; } -// ----------------------------------------------------------------------- + void WinSalGraphics::SetFillColor() { @@ -1170,7 +1170,7 @@ void WinSalGraphics::SetFillColor() mbStockBrush = TRUE; } -// ----------------------------------------------------------------------- + void WinSalGraphics::SetFillColor( SalColor nSalColor ) { @@ -1275,7 +1275,7 @@ void WinSalGraphics::SetFillColor( SalColor nSalColor ) mbStockBrush = bStockBrush; } -// ----------------------------------------------------------------------- + void WinSalGraphics::SetXORMode( bool bSet, bool ) { @@ -1283,21 +1283,21 @@ void WinSalGraphics::SetXORMode( bool bSet, bool ) ::SetROP2( getHDC(), bSet ? R2_XORPEN : R2_COPYPEN ); } -// ----------------------------------------------------------------------- + void WinSalGraphics::SetROPLineColor( SalROPColor nROPColor ) { SetLineColor( ImplGetROPSalColor( nROPColor ) ); } -// ----------------------------------------------------------------------- + void WinSalGraphics::SetROPFillColor( SalROPColor nROPColor ) { SetFillColor( ImplGetROPSalColor( nROPColor ) ); } -// ----------------------------------------------------------------------- + void WinSalGraphics::drawPixel( long nX, long nY ) { @@ -1313,7 +1313,7 @@ void WinSalGraphics::drawPixel( long nX, long nY ) SetPixel( getHDC(), (int)nX, (int)nY, mnPenColor ); } -// ----------------------------------------------------------------------- + void WinSalGraphics::drawPixel( long nX, long nY, SalColor nSalColor ) { @@ -1338,7 +1338,7 @@ void WinSalGraphics::drawPixel( long nX, long nY, SalColor nSalColor ) ::SetPixel( getHDC(), (int)nX, (int)nY, nCol ); } -// ----------------------------------------------------------------------- + void WinSalGraphics::drawLine( long nX1, long nY1, long nX2, long nY2 ) { @@ -1380,7 +1380,7 @@ void WinSalGraphics::drawLine( long nX1, long nY1, long nX2, long nY2 ) } } -// ----------------------------------------------------------------------- + void WinSalGraphics::drawRect( long nX, long nY, long nWidth, long nHeight ) { @@ -1405,7 +1405,7 @@ void WinSalGraphics::drawRect( long nX, long nY, long nWidth, long nHeight ) WIN_Rectangle( getHDC(), (int)nX, (int)nY, (int)(nX+nWidth), (int)(nY+nHeight) ); } -// ----------------------------------------------------------------------- + void WinSalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) { @@ -1454,7 +1454,7 @@ void WinSalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) } } -// ----------------------------------------------------------------------- + void WinSalGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) { @@ -1468,7 +1468,7 @@ void WinSalGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) WIN_Polygon( getHDC(), pWinPtAry, MAX_64KSALPOINTS ); } -// ----------------------------------------------------------------------- + void WinSalGraphics::drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ) @@ -1537,11 +1537,11 @@ void WinSalGraphics::drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoint delete [] pWinPointAryAry; } -// ----------------------------------------------------------------------- + #define SAL_POLY_STACKBUF 32 -// ----------------------------------------------------------------------- + bool WinSalGraphics::drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry ) { @@ -1558,7 +1558,7 @@ bool WinSalGraphics::drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPt #endif } -// ----------------------------------------------------------------------- + bool WinSalGraphics::drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry ) { @@ -1610,7 +1610,7 @@ bool WinSalGraphics::drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtA #endif } -// ----------------------------------------------------------------------- + bool WinSalGraphics::drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry ) @@ -1667,7 +1667,7 @@ bool WinSalGraphics::drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* #endif } -// ----------------------------------------------------------------------- + #define POSTSCRIPT_BUFSIZE 0x4000 // MAXIMUM BUFSIZE EQ 0xFFFF @@ -1770,7 +1770,7 @@ bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* aBuf.append( "aa" ); // #107797# Write out EPS encapsulation header - // ---------------------------------------------------------------------------------- + // directly taken from the PLRM 3.0, p. 726. Note: // this will definitely cause problems when @@ -1801,7 +1801,7 @@ bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* // #i10737# Apply clipping manually - // ---------------------------------------------------------------------------------- + // Windows seems to ignore any clipping at the HDC, // when followed by a POSTSCRIPT_PASSTHROUGH @@ -1843,13 +1843,13 @@ bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* } // #107797# Write out buffer - // ---------------------------------------------------------------------------------- + *((sal_uInt16*)aBuf.getStr()) = (sal_uInt16)( aBuf.getLength() - 2 ); Escape ( getHDC(), nEscape, aBuf.getLength(), (LPTSTR)aBuf.getStr(), 0 ); // #107797# Write out EPS transformation code - // ---------------------------------------------------------------------------------- + double dM11 = nWidth / ( nBoundingBox[2] - nBoundingBox[0] ); double dM22 = nHeight / (nBoundingBox[1] - nBoundingBox[3] ); // reserve a sal_uInt16 again @@ -1869,7 +1869,7 @@ bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* // #107797# Write out actual EPS content - // ---------------------------------------------------------------------------------- + sal_uLong nToDo = nSize; sal_uLong nDoNow; while ( nToDo ) @@ -1889,7 +1889,7 @@ bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* // #107797# Write out EPS encapsulation footer - // ---------------------------------------------------------------------------------- + // reserve a sal_uInt16 again aBuf.setLength( 2 ); aBuf.append( "%%EndDocument\n" @@ -1906,7 +1906,7 @@ bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* return bRetValue; } -// ----------------------------------------------------------------------- + SystemGraphicsData WinSalGraphics::GetGraphicsData() const { @@ -1916,6 +1916,6 @@ SystemGraphicsData WinSalGraphics::GetGraphicsData() const return aRes; } -// ----------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/win/source/gdi/salgdi2.cxx b/vcl/win/source/gdi/salgdi2.cxx index 9e8537952e13..d81229604ebb 100644 --- a/vcl/win/source/gdi/salgdi2.cxx +++ b/vcl/win/source/gdi/salgdi2.cxx @@ -96,7 +96,7 @@ void WinSalGraphics::copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraph } } -// ----------------------------------------------------------------------- + void ImplCalcOutSideRgn( const RECT& rSrcRect, int nLeft, int nTop, int nRight, int nBottom, @@ -139,7 +139,7 @@ void ImplCalcOutSideRgn( const RECT& rSrcRect, } } -// ----------------------------------------------------------------------- + void WinSalGraphics::copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, @@ -335,7 +335,7 @@ void WinSalGraphics::copyArea( long nDestX, long nDestY, } -// ----------------------------------------------------------------------- + void ImplDrawBitmap( HDC hDC, const SalTwoRect& rPosAry, const WinSalBitmap& rSalBitmap, @@ -443,7 +443,7 @@ void ImplDrawBitmap( HDC hDC, } } -// ----------------------------------------------------------------------- + void WinSalGraphics::drawBitmap(const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap) { @@ -472,7 +472,7 @@ void WinSalGraphics::drawBitmap(const SalTwoRect& rPosAry, const SalBitmap& rSal mbXORMode ? SRCINVERT : SRCCOPY ); } -// ----------------------------------------------------------------------- + void WinSalGraphics::drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSSalBitmap, @@ -528,7 +528,7 @@ void WinSalGraphics::drawBitmap( const SalTwoRect& rPosAry, delete pMask; } -// ----------------------------------------------------------------------- + void WinSalGraphics::drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSSalBitmap, @@ -623,7 +623,7 @@ void WinSalGraphics::drawBitmap( const SalTwoRect& rPosAry, } } -// ----------------------------------------------------------------------- + bool WinSalGraphics::drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency ) @@ -652,7 +652,7 @@ bool WinSalGraphics::drawAlphaRect( long nX, long nY, long nWidth, return bRet; } -// ----------------------------------------------------------------------- + void WinSalGraphics::drawMask( const SalTwoRect& rPosAry, const SalBitmap& rSSalBitmap, @@ -686,7 +686,7 @@ void WinSalGraphics::drawMask( const SalTwoRect& rPosAry, DeleteBrush( hMaskBrush ); } -// ----------------------------------------------------------------------- + SalBitmap* WinSalGraphics::getBitmap( long nX, long nY, long nDX, long nDY ) { @@ -724,7 +724,7 @@ SalBitmap* WinSalGraphics::getBitmap( long nX, long nY, long nDX, long nDY ) return pSalBitmap; } -// ----------------------------------------------------------------------- + SalColor WinSalGraphics::getPixel( long nX, long nY ) { @@ -738,7 +738,7 @@ SalColor WinSalGraphics::getPixel( long nX, long nY ) GetBValue( aWinCol ) ); } -// ----------------------------------------------------------------------- + void WinSalGraphics::invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ) { @@ -783,7 +783,7 @@ void WinSalGraphics::invert( long nX, long nY, long nWidth, long nHeight, SalInv } } -// ----------------------------------------------------------------------- + void WinSalGraphics::invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nSalFlags ) { diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index be8ea7845218..2fd048fed949 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -59,9 +59,9 @@ using namespace vcl; static const int MAXFONTHEIGHT = 2048; -// ----------- + // - Inlines - -// ----------- + inline FIXED FixedFromDouble( double d ) { @@ -69,7 +69,7 @@ inline FIXED FixedFromDouble( double d ) return *(FIXED*) &l; } -// ----------------------------------------------------------------------- + inline int IntTimes256FromFixed(FIXED f) { @@ -86,7 +86,7 @@ static bool bImplSalCourierNew = false; // ======================================================================= -// ----------------------------------------------------------------------- + // TODO: also support temporary TTC font files typedef std::map< OUString, ImplDevFontAttributes > FontAttrMap; @@ -649,7 +649,7 @@ static rtl_TextEncoding ImplCharSetToSal( BYTE nCharSet ) return eTextEncoding; } -// ----------------------------------------------------------------------- + static FontFamily ImplFamilyToSal( BYTE nFamily ) { @@ -677,7 +677,7 @@ static FontFamily ImplFamilyToSal( BYTE nFamily ) return FAMILY_DONTKNOW; } -// ----------------------------------------------------------------------- + static BYTE ImplFamilyToWin( FontFamily eFamily ) { @@ -708,7 +708,7 @@ static BYTE ImplFamilyToWin( FontFamily eFamily ) return FF_DONTCARE; } -// ----------------------------------------------------------------------- + static FontWeight ImplWeightToSal( int nWeight ) { @@ -732,7 +732,7 @@ static FontWeight ImplWeightToSal( int nWeight ) return WEIGHT_BLACK; } -// ----------------------------------------------------------------------- + static int ImplWeightToWin( FontWeight eWeight ) { @@ -773,7 +773,7 @@ static int ImplWeightToWin( FontWeight eWeight ) return 0; } -// ----------------------------------------------------------------------- + inline FontPitch ImplLogPitchToSal( BYTE nPitch ) { @@ -783,7 +783,7 @@ inline FontPitch ImplLogPitchToSal( BYTE nPitch ) return PITCH_VARIABLE; } -// ----------------------------------------------------------------------- + inline FontPitch ImplMetricPitchToSal( BYTE nPitch ) { @@ -794,7 +794,7 @@ inline FontPitch ImplMetricPitchToSal( BYTE nPitch ) return PITCH_VARIABLE; } -// ----------------------------------------------------------------------- + inline BYTE ImplPitchToWin( FontPitch ePitch ) { @@ -806,7 +806,7 @@ inline BYTE ImplPitchToWin( FontPitch ePitch ) return DEFAULT_PITCH; } -// ----------------------------------------------------------------------- + static ImplDevFontAttributes WinFont2DevFontAttributes( const ENUMLOGFONTEXA& rEnumFont, const NEWTEXTMETRICA& rMetric, DWORD nFontType ) @@ -881,7 +881,7 @@ static ImplDevFontAttributes WinFont2DevFontAttributes( const ENUMLOGFONTEXA& rE return aDFA; } -// ----------------------------------------------------------------------- + static ImplDevFontAttributes WinFont2DevFontAttributes( const ENUMLOGFONTEXW& rEnumFont, const NEWTEXTMETRICW& rMetric, DWORD nFontType ) @@ -956,7 +956,7 @@ static ImplDevFontAttributes WinFont2DevFontAttributes( const ENUMLOGFONTEXW& rE return aDFA; } -// ----------------------------------------------------------------------- + static ImplWinFontData* ImplLogMetricToDevFontDataA( const ENUMLOGFONTEXA* pLogFont, const NEWTEXTMETRICA* pMetric, @@ -975,7 +975,7 @@ static ImplWinFontData* ImplLogMetricToDevFontDataA( const ENUMLOGFONTEXA* pLogF return pData; } -// ----------------------------------------------------------------------- + static ImplWinFontData* ImplLogMetricToDevFontDataW( const ENUMLOGFONTEXW* pLogFont, const NEWTEXTMETRICW* pMetric, @@ -994,7 +994,7 @@ static ImplWinFontData* ImplLogMetricToDevFontDataW( const ENUMLOGFONTEXW* pLogF return pData; } -// ----------------------------------------------------------------------- + void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont ) { @@ -1180,7 +1180,7 @@ ImplWinFontData::ImplWinFontData( const ImplDevFontAttributes& rDFS, #endif } -// ----------------------------------------------------------------------- + ImplWinFontData::~ImplWinFontData() { @@ -1198,19 +1198,19 @@ ImplWinFontData::~ImplWinFontData() delete mpEncodingVector; } -// ----------------------------------------------------------------------- + sal_IntPtr ImplWinFontData::GetFontId() const { return mnId; } -// ----------------------------------------------------------------------- + static unsigned GetUInt( const unsigned char* p ) { return((p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]);} static inline DWORD CalcTag( const char p[4]) { return (p[0]+(p[1]<<8)+(p[2]<<16)+(p[3]<<24)); } -// ----------------------------------------------------------------------- + void ImplWinFontData::UpdateFromHDC( HDC hDC ) const { @@ -1267,7 +1267,7 @@ const gr_face* ImplWinFontData::GraphiteFace() const return (mpGraphiteData)? mpGraphiteData->getFace() : NULL; } #endif -// ----------------------------------------------------------------------- + bool ImplWinFontData::HasGSUBstitutions( HDC hDC ) const { @@ -1276,14 +1276,14 @@ bool ImplWinFontData::HasGSUBstitutions( HDC hDC ) const return !maGsubTable.empty(); } -// ----------------------------------------------------------------------- + bool ImplWinFontData::IsGSUBstituted( sal_UCS4 cChar ) const { return( maGsubTable.find( cChar ) != maGsubTable.end() ); } -// ----------------------------------------------------------------------- + const ImplFontCharMap* ImplWinFontData::GetImplFontCharMap() const { @@ -1298,7 +1298,7 @@ bool ImplWinFontData::GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabi return !rFontCapabilities.maUnicodeRange.empty() || !rFontCapabilities.maCodePageRange.empty(); } -// ----------------------------------------------------------------------- + void ImplWinFontData::ReadGsubTable( HDC hDC ) const { @@ -1345,7 +1345,7 @@ void ImplWinFontData::ReadGsubTable( HDC hDC ) const CloseTTFont( pTTFont ); } -// ----------------------------------------------------------------------- + void ImplWinFontData::ReadCmapTable( HDC hDC ) const { @@ -1433,7 +1433,7 @@ void WinSalGraphics::SetTextColor( SalColor nSalColor ) ::SetTextColor( getHDC(), aCol ); } -// ----------------------------------------------------------------------- + int CALLBACK SalEnumQueryFontProcExW( const ENUMLOGFONTEXW*, const NEWTEXTMETRICEXW*, @@ -1443,7 +1443,7 @@ int CALLBACK SalEnumQueryFontProcExW( const ENUMLOGFONTEXW*, return 0; } -// ----------------------------------------------------------------------- + void ImplGetLogFontFromFontSelect( HDC hDC, const FontSelectPattern* pFont, @@ -1516,7 +1516,7 @@ void ImplGetLogFontFromFontSelect( HDC hDC, } } -// ----------------------------------------------------------------------- + HFONT WinSalGraphics::ImplDoSetFont( FontSelectPattern* i_pFont, float& o_rFontScale, HFONT& o_rOldFont ) { @@ -1665,7 +1665,7 @@ sal_uInt16 WinSalGraphics::SetFont( FontSelectPattern* pFont, int nFallbackLevel return 0; } -// ----------------------------------------------------------------------- + void WinSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackLevel ) { @@ -1743,7 +1743,7 @@ void WinSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackLe pMetric->mnMinKashida = GetMinKashidaWidth(); } -// ----------------------------------------------------------------------- + sal_uLong WinSalGraphics::GetKernPairs() { @@ -1774,7 +1774,7 @@ sal_uLong WinSalGraphics::GetKernPairs() return mnFontKernPairCount; } -// ----------------------------------------------------------------------- + const ImplFontCharMap* WinSalGraphics::GetImplFontCharMap() const { @@ -1790,7 +1790,7 @@ bool WinSalGraphics::GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabil return mpWinFontData[0]->GetImplFontCapabilities(rFontCapabilities); } -// ----------------------------------------------------------------------- + int CALLBACK SalEnumFontsProcExA( const ENUMLOGFONTEXA* pLogFont, const NEWTEXTMETRICEXA* pMetric, @@ -1846,7 +1846,7 @@ int CALLBACK SalEnumFontsProcExA( const ENUMLOGFONTEXA* pLogFont, return 1; } -// ----------------------------------------------------------------------- + int CALLBACK SalEnumFontsProcExW( const ENUMLOGFONTEXW* pLogFont, const NEWTEXTMETRICEXW* pMetric, @@ -1896,7 +1896,7 @@ int CALLBACK SalEnumFontsProcExW( const ENUMLOGFONTEXW* pLogFont, return 1; } -// ----------------------------------------------------------------------- + struct TempFontItem { @@ -1975,7 +1975,7 @@ bool ImplAddTempFont( SalData& rSalData, const OUString& rFontFileURL ) return (nRet > 0); } -// ----------------------------------------------------------------------- + void ImplReleaseTempFonts( SalData& rSalData ) { @@ -2006,7 +2006,7 @@ void ImplReleaseTempFonts( SalData& rSalData ) #endif // FR_PRIVATE } -// ----------------------------------------------------------------------- + static bool ImplGetFontAttrFromFile( const OUString& rFontFileURL, ImplDevFontAttributes& rDFA ) @@ -2103,7 +2103,7 @@ static bool ImplGetFontAttrFromFile( const OUString& rFontFileURL, return true; } -// ----------------------------------------------------------------------- + bool WinSalGraphics::AddTempDevFont( ImplDevFontList* pFontList, const OUString& rFontFileURL, const OUString& rFontName ) @@ -2161,7 +2161,7 @@ bool WinSalGraphics::AddTempDevFont( ImplDevFontList* pFontList, return true; } -// ----------------------------------------------------------------------- + void WinSalGraphics::GetDevFontList( ImplDevFontList* pFontList ) { @@ -2263,7 +2263,7 @@ void WinSalGraphics::ClearDevFontCache() //anything to do here ? } -// ----------------------------------------------------------------------- + bool WinSalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect ) { @@ -2295,7 +2295,7 @@ bool WinSalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect ) return true; } -// ----------------------------------------------------------------------- + bool WinSalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId, ::basegfx::B2DPolyPolygon& rB2DPolyPoly ) @@ -2479,7 +2479,7 @@ bool WinSalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId, return true; } -// ----------------------------------------------------------------------- + class ScopedFont { diff --git a/vcl/win/source/gdi/salgdi_gdiplus.cxx b/vcl/win/source/gdi/salgdi_gdiplus.cxx index aee96e196b3f..23b286abdd88 100644 --- a/vcl/win/source/gdi/salgdi_gdiplus.cxx +++ b/vcl/win/source/gdi/salgdi_gdiplus.cxx @@ -61,7 +61,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> -// ----------------------------------------------------------------------- + void impAddB2DPolygonToGDIPlusGraphicsPathReal(Gdiplus::GpPath *pPath, const basegfx::B2DPolygon& rPolygon, bool bNoLineJoin) { @@ -324,7 +324,7 @@ bool WinSalGraphics::drawPolyLine( return true; } -// ----------------------------------------------------------------------- + void paintToGdiPlus( Gdiplus::Graphics& rGraphics, @@ -359,7 +359,7 @@ void paintToGdiPlus( 0); } -// ----------------------------------------------------------------------- + void setInterpolationMode( Gdiplus::Graphics& rGraphics, @@ -459,7 +459,7 @@ bool WinSalGraphics::drawAlphaBitmap( return false; } -// ----------------------------------------------------------------------- + bool WinSalGraphics::drawTransformedBitmap( const basegfx::B2DPoint& rNull, diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx index 40346f3c6e91..0703bbbbb64a 100644 --- a/vcl/win/source/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx @@ -388,7 +388,7 @@ Rectangle ImplGetThemeRect( HTHEME hTheme, HDC hDC, int iPart, int iState, const } // Helper functions -// ---- + void ImplConvertSpinbuttonValues( int nControlPart, const ControlState& rState, const Rectangle& rRect, int* pLunaPart, int *pLunaState, RECT *pRect ) diff --git a/vcl/win/source/gdi/salvd.cxx b/vcl/win/source/gdi/salvd.cxx index 603dd40918f9..420d312711da 100644 --- a/vcl/win/source/gdi/salvd.cxx +++ b/vcl/win/source/gdi/salvd.cxx @@ -151,7 +151,7 @@ SalVirtualDevice* WinSalInstance::CreateVirtualDevice( SalGraphics* pSGraphics, } } -// ----------------------------------------------------------------------- + void WinSalInstance::DestroyVirtualDevice( SalVirtualDevice* pDevice ) { @@ -172,7 +172,7 @@ WinSalVirtualDevice::WinSalVirtualDevice() mbForeignDC = FALSE; // uses a foreign DC instead of a bitmap } -// ----------------------------------------------------------------------- + WinSalVirtualDevice::~WinSalVirtualDevice() { @@ -197,7 +197,7 @@ WinSalVirtualDevice::~WinSalVirtualDevice() mpGraphics = NULL; } -// ----------------------------------------------------------------------- + SalGraphics* WinSalVirtualDevice::GetGraphics() { @@ -210,14 +210,14 @@ SalGraphics* WinSalVirtualDevice::GetGraphics() return mpGraphics; } -// ----------------------------------------------------------------------- + void WinSalVirtualDevice::ReleaseGraphics( SalGraphics* ) { mbGraphics = FALSE; } -// ----------------------------------------------------------------------- + bool WinSalVirtualDevice::SetSize( long nDX, long nDY ) { diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index b6bb33490d49..947219a582f7 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -102,7 +102,7 @@ private: mutable int mnMinKashidaGlyph; }; -// ----------------------------------------------------------------------- + inline void ImplWinFontEntry::CacheGlyphWidth( int nCharCode, int nCharWidth ) { @@ -198,14 +198,14 @@ WinLayout::WinLayout( HDC hDC, const ImplWinFontData& rWFD, ImplWinFontEntry& rW mrWinFontEntry( rWFE ) {} -// ----------------------------------------------------------------------- + void WinLayout::InitFont() const { ::SelectObject( mhDC, mhFont ); } -// ----------------------------------------------------------------------- + // Using reasonably sized fonts to emulate huge fonts works around // a lot of problems in printer and display drivers. Huge fonts are @@ -251,7 +251,7 @@ SimpleWinLayout::SimpleWinLayout( HDC hDC, BYTE nCharSet, mbDisableGlyphs = true; } -// ----------------------------------------------------------------------- + SimpleWinLayout::~SimpleWinLayout() { @@ -265,7 +265,7 @@ SimpleWinLayout::~SimpleWinLayout() delete[] mpOutGlyphs; } -// ----------------------------------------------------------------------- + bool SimpleWinLayout::LayoutText( ImplLayoutArgs& rArgs ) { @@ -530,7 +530,7 @@ bool SimpleWinLayout::LayoutText( ImplLayoutArgs& rArgs ) return true; } -// ----------------------------------------------------------------------- + int SimpleWinLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIds, Point& rPos, int& nStart, long* pGlyphAdvances, int* pCharIndexes, @@ -599,7 +599,7 @@ int SimpleWinLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIds, Point& rPo return nCount; } -// ----------------------------------------------------------------------- + void SimpleWinLayout::DrawText( SalGraphics& rGraphics ) const { @@ -647,7 +647,7 @@ void SimpleWinLayout::DrawText( SalGraphics& rGraphics ) const DeleteFont( SelectFont( aHDC, hOrigFont ) ); } -// ----------------------------------------------------------------------- + long SimpleWinLayout::FillDXArray( long* pDXArray ) const { @@ -667,7 +667,7 @@ long SimpleWinLayout::FillDXArray( long* pDXArray ) const return mnWidth; } -// ----------------------------------------------------------------------- + sal_Int32 SimpleWinLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) const // NOTE: the nFactor is used to prevent rounding errors for small nCharExtra values @@ -692,7 +692,7 @@ sal_Int32 SimpleWinLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nF return -1; } -// ----------------------------------------------------------------------- + void SimpleWinLayout::GetCaretPositions( int nMaxIdx, long* pCaretXArray ) const { @@ -736,7 +736,7 @@ void SimpleWinLayout::GetCaretPositions( int nMaxIdx, long* pCaretXArray ) const } } -// ----------------------------------------------------------------------- + void SimpleWinLayout::Justify( long nNewWidth ) { @@ -773,7 +773,7 @@ void SimpleWinLayout::Justify( long nNewWidth ) } } -// ----------------------------------------------------------------------- + void SimpleWinLayout::AdjustLayout( ImplLayoutArgs& rArgs ) { @@ -812,7 +812,7 @@ void SimpleWinLayout::AdjustLayout( ImplLayoutArgs& rArgs ) } } -// ----------------------------------------------------------------------- + void SimpleWinLayout::ApplyDXArray( const ImplLayoutArgs& rArgs ) { @@ -857,7 +857,7 @@ void SimpleWinLayout::ApplyDXArray( const ImplLayoutArgs& rArgs ) } } -// ----------------------------------------------------------------------- + void SimpleWinLayout::MoveGlyph( int nStart, long nNewXPos ) { @@ -885,14 +885,14 @@ void SimpleWinLayout::MoveGlyph( int nStart, long nNewXPos ) mnBaseAdv += nDelta; } -// ----------------------------------------------------------------------- + void SimpleWinLayout::DropGlyph( int nStart ) { mpOutGlyphs[ nStart ] = DROPPED_OUTGLYPH; } -// ----------------------------------------------------------------------- + void SimpleWinLayout::Simplify( bool /*bIsBase*/ ) { @@ -995,7 +995,7 @@ public: bool HasKashidas() const { return mbHasKashidas; } }; -// ----------------------------------------------------------------------- + class UniscribeLayout : public WinLayout { @@ -1067,7 +1067,7 @@ static bool bUspInited = false; static bool bManualCellAlign = true; -// ----------------------------------------------------------------------- + static bool InitUSP() { @@ -1107,7 +1107,7 @@ static bool InitUSP() return true; } -// ----------------------------------------------------------------------- + UniscribeLayout::UniscribeLayout( HDC hDC, const ImplWinFontData& rWinFontData, ImplWinFontEntry& rWinFontEntry ) @@ -1132,7 +1132,7 @@ UniscribeLayout::UniscribeLayout( HDC hDC, mbDisableGlyphInjection( false ) {} -// ----------------------------------------------------------------------- + UniscribeLayout::~UniscribeLayout() { @@ -1148,7 +1148,7 @@ UniscribeLayout::~UniscribeLayout() delete[] mpGlyphs2Chars; } -// ----------------------------------------------------------------------- + bool UniscribeLayout::LayoutText( ImplLayoutArgs& rArgs ) { @@ -1568,7 +1568,7 @@ bool UniscribeLayout::LayoutText( ImplLayoutArgs& rArgs ) return true; } -// ----------------------------------------------------------------------- + // calculate the range of relevant glyphs for this visual item bool UniscribeLayout::GetItemSubrange( const VisualItem& rVisualItem, @@ -1631,7 +1631,7 @@ bool UniscribeLayout::GetItemSubrange( const VisualItem& rVisualItem, return true; } -// ----------------------------------------------------------------------- + int UniscribeLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos, int& nStartx8, sal_Int32* pGlyphAdvances, int* pCharPosAry, @@ -1898,7 +1898,7 @@ int UniscribeLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos, return nCount; } -// ----------------------------------------------------------------------- + void UniscribeLayout::MoveGlyph( int nStartx8, long nNewXPos ) { @@ -1965,7 +1965,7 @@ void UniscribeLayout::MoveGlyph( int nStartx8, long nNewXPos ) } } -// ----------------------------------------------------------------------- + void UniscribeLayout::DropGlyph( int nStartx8 ) { @@ -1994,7 +1994,7 @@ void UniscribeLayout::DropGlyph( int nStartx8 ) mpOutGlyphs[ nStart ] = DROPPED_OUTGLYPH; } -// ----------------------------------------------------------------------- + void UniscribeLayout::Simplify( bool /*bIsBase*/ ) { @@ -2097,7 +2097,7 @@ void UniscribeLayout::Simplify( bool /*bIsBase*/ ) } } -// ----------------------------------------------------------------------- + void UniscribeLayout::DrawText( SalGraphics& ) const { @@ -2149,7 +2149,7 @@ void UniscribeLayout::DrawText( SalGraphics& ) const DeleteFont( SelectFont( mhDC, hOrigFont ) ); } -// ----------------------------------------------------------------------- + long UniscribeLayout::FillDXArray( long* pDXArray ) const { @@ -2180,7 +2180,7 @@ long UniscribeLayout::FillDXArray( long* pDXArray ) const return nWidth; } -// ----------------------------------------------------------------------- + sal_Int32 UniscribeLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) const { @@ -2225,7 +2225,7 @@ sal_Int32 UniscribeLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nF return -1; } -// ----------------------------------------------------------------------- + void UniscribeLayout::GetCaretPositions( int nMaxIdx, long* pCaretXArray ) const { @@ -2294,7 +2294,7 @@ void UniscribeLayout::GetCaretPositions( int nMaxIdx, long* pCaretXArray ) const } } -// ----------------------------------------------------------------------- + void UniscribeLayout::AdjustLayout( ImplLayoutArgs& rArgs ) { @@ -2307,7 +2307,7 @@ void UniscribeLayout::AdjustLayout( ImplLayoutArgs& rArgs ) Justify( rArgs.mnLayoutWidth ); } -// ----------------------------------------------------------------------- + void UniscribeLayout::ApplyDXArray( const ImplLayoutArgs& rArgs ) { @@ -2446,7 +2446,7 @@ void UniscribeLayout::ApplyDXArray( const ImplLayoutArgs& rArgs ) } } -// ----------------------------------------------------------------------- + void UniscribeLayout::InitKashidaHandling() { @@ -2590,7 +2590,7 @@ bool UniscribeLayout::KashidaWordFix ( int nMinGlyphPos, int nEndGlyphPos, int* return true; } -// ----------------------------------------------------------------------- + void UniscribeLayout::Justify( long nNewWidth ) { @@ -2642,7 +2642,7 @@ void UniscribeLayout::Justify( long nNewWidth ) } } -// ----------------------------------------------------------------------- + bool UniscribeLayout::IsKashidaPosValid ( int nCharPos ) const { @@ -2950,7 +2950,7 @@ SalLayout* WinSalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe return pWinLayout; } -// ----------------------------------------------------------------------- + int WinSalGraphics::GetMinKashidaWidth() { @@ -2974,7 +2974,7 @@ ImplWinFontEntry::ImplWinFontEntry( FontSelectPattern& rFSD ) maScriptCache = NULL; } -// ----------------------------------------------------------------------- + ImplWinFontEntry::~ImplWinFontEntry() { @@ -2983,14 +2983,14 @@ ImplWinFontEntry::~ImplWinFontEntry() delete[] mpKerningPairs; } -// ----------------------------------------------------------------------- + bool ImplWinFontEntry::HasKernData() const { return (mnKerningPairs >= 0); } -// ----------------------------------------------------------------------- + void ImplWinFontEntry::SetKernData( int nPairCount, const KERNINGPAIR* pPairData ) { @@ -2999,7 +2999,7 @@ void ImplWinFontEntry::SetKernData( int nPairCount, const KERNINGPAIR* pPairData ::memcpy( mpKerningPairs, (const void*)pPairData, nPairCount*sizeof(KERNINGPAIR) ); } -// ----------------------------------------------------------------------- + int ImplWinFontEntry::GetKerning( sal_Unicode cLeft, sal_Unicode cRight ) const { @@ -3020,7 +3020,7 @@ int ImplWinFontEntry::GetKerning( sal_Unicode cLeft, sal_Unicode cRight ) const return nKernAmount; } -// ----------------------------------------------------------------------- + bool ImplWinFontEntry::InitKashidaHandling( HDC hDC ) { @@ -3059,7 +3059,7 @@ PhysicalFontFace* ImplWinFontData::Clone() const return pClone; } -// ----------------------------------------------------------------------- + ImplFontEntry* ImplWinFontData::CreateFontInstance( FontSelectPattern& rFSD ) const { diff --git a/vcl/win/source/gdi/wntgdi.cxx b/vcl/win/source/gdi/wntgdi.cxx index 86067035de53..54ae7ea58b32 100644 --- a/vcl/win/source/gdi/wntgdi.cxx +++ b/vcl/win/source/gdi/wntgdi.cxx @@ -26,7 +26,7 @@ #pragma warning(pop) #endif -// ----------------------------------------------------------------------- + extern "C" { @@ -36,7 +36,7 @@ BOOL WINAPI WIN_Rectangle( HDC hDC, int X1, int Y1, int X2, int Y2 ) } } -// ----------------------------------------------------------------------- + extern "C" { @@ -46,7 +46,7 @@ BOOL WINAPI WIN_Polygon( HDC hDC, CONST POINT * ppt, int ncnt ) } } -// ----------------------------------------------------------------------- + extern "C" { diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 77528383e6cb..390d051cb320 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -197,7 +197,7 @@ static void ImplSaveFrameState( WinSalFrame* pFrame ) } } -// ----------------------------------------------------------------------- + // if pParentRect is set, the workarea of the monitor that contains pParentRect is returned void ImplSalGetWorkArea( HWND hWnd, RECT *pRect, const RECT *pParentRect ) @@ -703,7 +703,7 @@ static UINT ImplSalGetWheelScrollLines() return nScrLines; } -// ----------------------------------------------------------------------- + static UINT ImplSalGetWheelScrollChars() { @@ -729,7 +729,7 @@ static UINT ImplSalGetWheelScrollChars() return nScrChars; } -// ----------------------------------------------------------------------- + static void ImplSalAddBorder( const WinSalFrame* pFrame, int& width, int& height ) { @@ -745,7 +745,7 @@ static void ImplSalAddBorder( const WinSalFrame* pFrame, int& width, int& height height = aWinRect.bottom - aWinRect.top + 1; } -// ----------------------------------------------------------------------- + static void ImplSalCalcFullScreenSize( const WinSalFrame* pFrame, int& rX, int& rY, int& rDX, int& rDY ) @@ -824,7 +824,7 @@ static void ImplSalCalcFullScreenSize( const WinSalFrame* pFrame, rDY = nScreenDY+(nFrameY*2)+nCaptionY; } -// ----------------------------------------------------------------------- + static void ImplSalFrameFullScreenPos( WinSalFrame* pFrame, sal_Bool bAlways = FALSE ) { @@ -842,7 +842,7 @@ static void ImplSalFrameFullScreenPos( WinSalFrame* pFrame, sal_Bool bAlways = F } } -// ----------------------------------------------------------------------- + WinSalFrame::WinSalFrame() { @@ -912,7 +912,7 @@ WinSalFrame::WinSalFrame() pSalData->mpFirstFrame = this; } -// ----------------------------------------------------------------------- + void WinSalFrame::updateScreenNumber() { if( mnDisplay == -1 ) // spans all monitors @@ -935,7 +935,7 @@ void WinSalFrame::updateScreenNumber() } } -// ----------------------------------------------------------------------- + WinSalFrame::~WinSalFrame() { @@ -992,7 +992,7 @@ WinSalFrame::~WinSalFrame() } } -// ----------------------------------------------------------------------- + SalGraphics* WinSalFrame::GetGraphics() { @@ -1071,7 +1071,7 @@ SalGraphics* WinSalFrame::GetGraphics() } } -// ----------------------------------------------------------------------- + void WinSalFrame::ReleaseGraphics( SalGraphics* pGraphics ) { @@ -1095,14 +1095,14 @@ void WinSalFrame::ReleaseGraphics( SalGraphics* pGraphics ) mbGraphics = FALSE; } -// ----------------------------------------------------------------------- + bool WinSalFrame::PostEvent( void* pData ) { return (sal_Bool)ImplPostMessage( mhWnd, SAL_MSG_USEREVENT, 0, (LPARAM)pData ); } -// ----------------------------------------------------------------------- + void WinSalFrame::SetTitle( const OUString& rTitle ) { @@ -1111,7 +1111,7 @@ void WinSalFrame::SetTitle( const OUString& rTitle ) SetWindowTextW( mhWnd, reinterpret_cast<LPCWSTR>(rTitle.getStr()) ); } -// ----------------------------------------------------------------------- + void WinSalFrame::SetIcon( sal_uInt16 nIcon ) { @@ -1133,7 +1133,7 @@ void WinSalFrame::SetIcon( sal_uInt16 nIcon ) ImplSendMessage( mhWnd, WM_SETICON, ICON_SMALL, (LPARAM)hSmIcon ); } -// ----------------------------------------------------------------------- + void WinSalFrame::SetMenu( SalMenu* pSalMenu ) { @@ -1147,7 +1147,7 @@ void WinSalFrame::DrawMenuBar() ::DrawMenuBar( mhWnd ); } -// ----------------------------------------------------------------------- + HWND ImplGetParentHwnd( HWND hWnd ) { WinSalFrame* pFrame = GetWindowPtr( hWnd ); @@ -1161,14 +1161,14 @@ HWND ImplGetParentHwnd( HWND hWnd ) } -// ----------------------------------------------------------------------- + SalFrame* WinSalFrame::GetParent() const { return GetWindowPtr( ImplGetParentHwnd( mhWnd ) ); } -// ----------------------------------------------------------------------- + static void ImplSalShow( HWND hWnd, sal_Bool bVisible, sal_Bool bNoActivate ) { @@ -1246,14 +1246,14 @@ static void ImplSalShow( HWND hWnd, sal_Bool bVisible, sal_Bool bNoActivate ) } } -// ----------------------------------------------------------------------- + void WinSalFrame::SetExtendedFrameStyle( SalExtStyle ) { } -// ----------------------------------------------------------------------- + void WinSalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) { @@ -1266,14 +1266,14 @@ void WinSalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) ImplSalShow( mhWnd, bVisible, bNoActivate ); } -// ----------------------------------------------------------------------- + void WinSalFrame::Enable( sal_Bool bEnable ) { EnableWindow( mhWnd, bEnable ); } -// ----------------------------------------------------------------------- + void WinSalFrame::SetMinClientSize( long nWidth, long nHeight ) { @@ -1287,7 +1287,7 @@ void WinSalFrame::SetMaxClientSize( long nWidth, long nHeight ) mnMaxHeight = nHeight; } -// ----------------------------------------------------------------------- + void WinSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) @@ -1500,7 +1500,7 @@ void WinSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, CallCallback( nEvent, NULL ); } -// ----------------------------------------------------------------------- + static void ImplSetParentFrame( WinSalFrame* pThis, HWND hNewParentWnd, sal_Bool bAsChild ) { @@ -1651,7 +1651,7 @@ static void ImplSetParentFrame( WinSalFrame* pThis, HWND hNewParentWnd, sal_Bool SAL_MSG_DESTROYHWND, (WPARAM) 0, (LPARAM)hWndOld); } -// ----------------------------------------------------------------------- + void WinSalFrame::SetParent( SalFrame* pNewParent ) { @@ -1674,7 +1674,7 @@ bool WinSalFrame::SetPluginParent( SystemParentData* pNewParent ) } -// ----------------------------------------------------------------------- + void WinSalFrame::GetWorkArea( Rectangle &rRect ) { @@ -1686,7 +1686,7 @@ void WinSalFrame::GetWorkArea( Rectangle &rRect ) rRect.Bottom() = aRect.bottom-1; } -// ----------------------------------------------------------------------- + void WinSalFrame::GetClientSize( long& rWidth, long& rHeight ) { @@ -1694,7 +1694,7 @@ void WinSalFrame::GetClientSize( long& rWidth, long& rHeight ) rHeight = maGeometry.nHeight; } -// ----------------------------------------------------------------------- + void WinSalFrame::SetWindowState( const SalFrameState* pState ) { @@ -1855,7 +1855,7 @@ void WinSalFrame::SetWindowState( const SalFrameState* pState ) mbDefPos = FALSE; // window was positioned } -// ----------------------------------------------------------------------- + bool WinSalFrame::GetWindowState( SalFrameState* pState ) { @@ -1873,7 +1873,7 @@ bool WinSalFrame::GetWindowState( SalFrameState* pState ) return FALSE; } -// ----------------------------------------------------------------------- + void WinSalFrame::SetScreenNumber( unsigned int nNewScreen ) { @@ -1944,7 +1944,7 @@ void WinSalFrame::SetApplicationID( const OUString &rApplicationID ) } } -// ----------------------------------------------------------------------- + void WinSalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) { @@ -2009,7 +2009,7 @@ void WinSalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) } } -// ----------------------------------------------------------------------- + void WinSalFrame::StartPresentation( sal_Bool bStart ) { @@ -2064,7 +2064,7 @@ void WinSalFrame::StartPresentation( sal_Bool bStart ) } } -// ----------------------------------------------------------------------- + void WinSalFrame::SetAlwaysOnTop( sal_Bool bOnTop ) { @@ -2076,7 +2076,7 @@ void WinSalFrame::SetAlwaysOnTop( sal_Bool bOnTop ) SetWindowPos( mhWnd, hWnd, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE ); } -// ----------------------------------------------------------------------- + static void ImplSalToTop( HWND hWnd, sal_uInt16 nFlags ) { @@ -2131,7 +2131,7 @@ static void ImplSalToTop( HWND hWnd, sal_uInt16 nFlags ) } } -// ----------------------------------------------------------------------- + void WinSalFrame::ToTop( sal_uInt16 nFlags ) { @@ -2145,7 +2145,7 @@ void WinSalFrame::ToTop( sal_uInt16 nFlags ) ImplSalToTop( mhWnd, nFlags ); } -// ----------------------------------------------------------------------- + void WinSalFrame::SetPointer( PointerStyle ePointerStyle ) { @@ -2280,7 +2280,7 @@ void WinSalFrame::SetPointer( PointerStyle ePointerStyle ) } } -// ----------------------------------------------------------------------- + void WinSalFrame::CaptureMouse( sal_Bool bCapture ) { @@ -2294,7 +2294,7 @@ void WinSalFrame::CaptureMouse( sal_Bool bCapture ) ImplSendMessage( mhWnd, nMsg, 0, 0 ); } -// ----------------------------------------------------------------------- + void WinSalFrame::SetPointerPos( long nX, long nY ) { @@ -2305,21 +2305,21 @@ void WinSalFrame::SetPointerPos( long nX, long nY ) SetCursorPos( aPt.x, aPt.y ); } -// ----------------------------------------------------------------------- + void WinSalFrame::Flush() { GdiFlush(); } -// ----------------------------------------------------------------------- + void WinSalFrame::Sync() { GdiFlush(); } -// ----------------------------------------------------------------------- + static void ImplSalFrameSetInputContext( HWND hWnd, const SalInputContext* pContext ) { @@ -2381,7 +2381,7 @@ static void ImplSalFrameSetInputContext( HWND hWnd, const SalInputContext* pCont } } -// ----------------------------------------------------------------------- + void WinSalFrame::SetInputContext( SalInputContext* pContext ) { @@ -2389,7 +2389,7 @@ void WinSalFrame::SetInputContext( SalInputContext* pContext ) ImplSendMessage( mhWnd, SAL_MSG_SETINPUTCONTEXT, 0, (LPARAM)(void*)pContext ); } -// ----------------------------------------------------------------------- + static void ImplSalFrameEndExtTextInput( HWND hWnd, sal_uInt16 nFlags ) { @@ -2407,7 +2407,7 @@ static void ImplSalFrameEndExtTextInput( HWND hWnd, sal_uInt16 nFlags ) } } -// ----------------------------------------------------------------------- + void WinSalFrame::EndExtTextInput( sal_uInt16 nFlags ) { @@ -2415,7 +2415,7 @@ void WinSalFrame::EndExtTextInput( sal_uInt16 nFlags ) ImplSendMessage( mhWnd, SAL_MSG_ENDEXTTEXTINPUT, (WPARAM)nFlags, 0 ); } -// ----------------------------------------------------------------------- + static void ImplGetKeyNameText( LONG lParam, sal_Unicode* pBuf, UINT& rCount, UINT nMaxSize, @@ -2487,7 +2487,7 @@ static void ImplGetKeyNameText( LONG lParam, sal_Unicode* pBuf, rCount = 0; } -// ----------------------------------------------------------------------- + OUString WinSalFrame::GetKeyName( sal_uInt16 nKeyCode ) { @@ -2689,14 +2689,14 @@ OUString WinSalFrame::GetKeyName( sal_uInt16 nKeyCode ) return OUString( aKeyBuf, sal::static_int_cast< sal_uInt16 >(nKeyBufLen) ); } -// ----------------------------------------------------------------------- + inline Color ImplWinColorToSal( COLORREF nColor ) { return Color( GetRValue( nColor ), GetGValue( nColor ), GetBValue( nColor ) ); } -// ----------------------------------------------------------------------- + static void ImplSalUpdateStyleFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont ) { @@ -2716,7 +2716,7 @@ static void ImplSalUpdateStyleFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rF } } -// ----------------------------------------------------------------------- + static long ImplA2I( const BYTE* pStr ) { @@ -2741,7 +2741,7 @@ static long ImplA2I( const BYTE* pStr ) return n; } -// ----------------------------------------------------------------------- + void WinSalFrame::UpdateSettings( AllSettings& rSettings ) { @@ -2973,14 +2973,14 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings ) WinSalGraphics::updateSettingsNative( rSettings ); } -// ----------------------------------------------------------------------- + const SystemEnvData* WinSalFrame::GetSystemData() const { return &maSysData; } -// ----------------------------------------------------------------------- + void WinSalFrame::Beep() { @@ -2988,7 +2988,7 @@ void WinSalFrame::Beep() MessageBeep( 0 ); } -// ----------------------------------------------------------------------- + SalFrame::SalPointerState WinSalFrame::GetPointerState() { @@ -3015,7 +3015,7 @@ SalFrame::SalPointerState WinSalFrame::GetPointerState() return aState; } -// ----------------------------------------------------------------------- + SalFrame::SalIndicatorState WinSalFrame::GetIndicatorState() { @@ -3050,14 +3050,14 @@ void WinSalFrame::SimulateKeyPress( sal_uInt16 nKeyCode ) } } -// ----------------------------------------------------------------------- + void WinSalFrame::ResetClipRegion() { SetWindowRgn( mhWnd, 0, TRUE ); } -// ----------------------------------------------------------------------- + void WinSalFrame::BeginSetClipRegion( sal_uLong nRects ) { @@ -3074,7 +3074,7 @@ void WinSalFrame::BeginSetClipRegion( sal_uLong nRects ) mbFirstClipRect = TRUE; } -// ----------------------------------------------------------------------- + void WinSalFrame::UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) { @@ -3117,7 +3117,7 @@ void WinSalFrame::UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) mpNextClipRect++; } -// ----------------------------------------------------------------------- + void WinSalFrame::EndSetClipRegion() { @@ -3157,7 +3157,7 @@ void WinSalFrame::EndSetClipRegion() } } -// ----------------------------------------------------------------------- + static long ImplHandleMouseMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ) @@ -3324,7 +3324,7 @@ static long ImplHandleMouseMsg( HWND hWnd, UINT nMsg, return nRet; } -// ----------------------------------------------------------------------- + static long ImplHandleMouseActivateMsg( HWND hWnd ) { @@ -3344,7 +3344,7 @@ static long ImplHandleMouseActivateMsg( HWND hWnd ) return pFrame->CallCallback( SALEVENT_MOUSEACTIVATE, &aMouseActivateEvt ); } -// ----------------------------------------------------------------------- + static long ImplHandleWheelMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ) { @@ -3416,7 +3416,7 @@ static long ImplHandleWheelMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lPar return nRet; } -// ----------------------------------------------------------------------- + static sal_uInt16 ImplSalGetKeyCode( WPARAM wParam ) { @@ -3438,7 +3438,7 @@ static sal_uInt16 ImplSalGetKeyCode( WPARAM wParam ) return nKeyCode; } -// ----------------------------------------------------------------------- + static void ImplUpdateInputLang( WinSalFrame* pFrame ) { @@ -3465,7 +3465,7 @@ static sal_Unicode ImplGetCharCode( WinSalFrame* pFrame, WPARAM nCharCode ) return (sal_Unicode)nCharCode; } -// ----------------------------------------------------------------------- + LanguageType WinSalFrame::GetInputLanguage() { @@ -3478,7 +3478,7 @@ LanguageType WinSalFrame::GetInputLanguage() return (LanguageType) mnInputLang; } -// ----------------------------------------------------------------------- + bool WinSalFrame::MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ) { @@ -3516,7 +3516,7 @@ bool WinSalFrame::MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangT return bRet; } -// ----------------------------------------------------------------------- + static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, LRESULT& rResult ) @@ -3800,7 +3800,7 @@ static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg, } } -// ----------------------------------------------------------------------- + long ImplHandleSalObjKeyMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ) @@ -3853,7 +3853,7 @@ long ImplHandleSalObjKeyMsg( HWND hWnd, UINT nMsg, return 0; } -// ----------------------------------------------------------------------- + long ImplHandleSalObjSysCharMsg( HWND hWnd, WPARAM wParam, LPARAM lParam ) { @@ -3891,7 +3891,7 @@ long ImplHandleSalObjSysCharMsg( HWND hWnd, WPARAM wParam, LPARAM lParam ) return nRet; } -// ----------------------------------------------------------------------- + static bool ImplHandlePaintMsg( HWND hWnd ) { @@ -3960,7 +3960,7 @@ static bool ImplHandlePaintMsg( HWND hWnd ) return bMutex ? true : false; } -// ----------------------------------------------------------------------- + static void ImplHandlePaintMsg2( HWND hWnd, RECT* pRect ) { @@ -3980,7 +3980,7 @@ static void ImplHandlePaintMsg2( HWND hWnd, RECT* pRect ) ImplPostMessage( hWnd, SAL_MSG_POSTPAINT, (WPARAM)pRect, 0 ); } -// ----------------------------------------------------------------------- + static void SetMaximizedFrameGeometry( HWND hWnd, WinSalFrame* pFrame, RECT* pParentRect ) { @@ -4066,7 +4066,7 @@ static void UpdateFrameGeometry( HWND hWnd, WinSalFrame* pFrame ) pFrame->updateScreenNumber(); } -// ----------------------------------------------------------------------- + static void ImplCallMoveHdl( HWND hWnd ) { @@ -4080,7 +4080,7 @@ static void ImplCallMoveHdl( HWND hWnd ) } } -// ----------------------------------------------------------------------- + static void ImplCallClosePopupsHdl( HWND hWnd ) { @@ -4091,7 +4091,7 @@ static void ImplCallClosePopupsHdl( HWND hWnd ) } } -// ----------------------------------------------------------------------- + static void ImplHandleMoveMsg( HWND hWnd ) { @@ -4130,7 +4130,7 @@ static void ImplHandleMoveMsg( HWND hWnd ) ImplPostMessage( hWnd, SAL_MSG_POSTMOVE, 0, 0 ); } -// ----------------------------------------------------------------------- + static void ImplCallSizeHdl( HWND hWnd ) { @@ -4153,7 +4153,7 @@ static void ImplCallSizeHdl( HWND hWnd ) ImplPostMessage( hWnd, SAL_MSG_POSTCALLSIZE, 0, 0 ); } -// ----------------------------------------------------------------------- + static void ImplHandleSizeMsg( HWND hWnd, WPARAM wParam, LPARAM lParam ) { @@ -4174,7 +4174,7 @@ static void ImplHandleSizeMsg( HWND hWnd, WPARAM wParam, LPARAM lParam ) } } -// ----------------------------------------------------------------------- + static void ImplHandleFocusMsg( HWND hWnd ) { @@ -4212,7 +4212,7 @@ static void ImplHandleFocusMsg( HWND hWnd ) ImplPostMessage( hWnd, SAL_MSG_POSTFOCUS, 0, 0 ); } -// ----------------------------------------------------------------------- + static void ImplHandleCloseMsg( HWND hWnd ) { @@ -4230,7 +4230,7 @@ static void ImplHandleCloseMsg( HWND hWnd ) ImplPostMessage( hWnd, WM_CLOSE, 0, 0 ); } -// ----------------------------------------------------------------------- + static long ImplHandleShutDownMsg( HWND hWnd ) { @@ -4245,7 +4245,7 @@ static long ImplHandleShutDownMsg( HWND hWnd ) return nRet; } -// ----------------------------------------------------------------------- + static void ImplHandleSettingsChangeMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ) @@ -4297,7 +4297,7 @@ static void ImplHandleSettingsChangeMsg( HWND hWnd, UINT nMsg, ImplSalYieldMutexRelease(); } -// ----------------------------------------------------------------------- + static void ImplHandleUserEvent( HWND hWnd, LPARAM lParam ) { @@ -4310,7 +4310,7 @@ static void ImplHandleUserEvent( HWND hWnd, LPARAM lParam ) ImplSalYieldMutexRelease(); } -// ----------------------------------------------------------------------- + static void ImplHandleForcePalette( HWND hWnd ) { @@ -4344,7 +4344,7 @@ static void ImplHandleForcePalette( HWND hWnd ) } } -// ----------------------------------------------------------------------- + static LRESULT ImplHandlePalette( sal_Bool bFrame, HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, int& rDef ) @@ -4494,7 +4494,7 @@ static LRESULT ImplHandlePalette( sal_Bool bFrame, HWND hWnd, UINT nMsg, return nCols; } -// ----------------------------------------------------------------------- + static int ImplHandleMinMax( HWND hWnd, LPARAM lParam ) { @@ -4571,7 +4571,7 @@ static int ImplHandleMinMax( HWND hWnd, LPARAM lParam ) return bRet; } -// ----------------------------------------------------------------------- + // retrieves the SalMenuItem pointer from a hMenu // the pointer is stored in every item, so if no position @@ -5092,7 +5092,7 @@ static int ImplHandleSysCommand( HWND hWnd, WPARAM wParam, LPARAM lParam ) return FALSE; } -// ----------------------------------------------------------------------- + static void ImplHandleInputLangChange( HWND hWnd, WPARAM, LPARAM lParam ) { @@ -5125,7 +5125,7 @@ static void ImplHandleInputLangChange( HWND hWnd, WPARAM, LPARAM lParam ) ImplSalYieldMutexRelease(); } -// ----------------------------------------------------------------------- + static void ImplUpdateIMECursorPos( WinSalFrame* pFrame, HIMC hIMC ) { @@ -5156,7 +5156,7 @@ static void ImplUpdateIMECursorPos( WinSalFrame* pFrame, HIMC hIMC ) } } -// ----------------------------------------------------------------------- + static sal_Bool ImplHandleIMEStartComposition( HWND hWnd ) { @@ -5186,7 +5186,7 @@ static sal_Bool ImplHandleIMEStartComposition( HWND hWnd ) return bDef; } -// ----------------------------------------------------------------------- + static sal_Bool ImplHandleIMECompositionInput( WinSalFrame* pFrame, HIMC hIMC, LPARAM lParam ) @@ -5317,7 +5317,7 @@ static sal_Bool ImplHandleIMECompositionInput( WinSalFrame* pFrame, return !bDef; } -// ----------------------------------------------------------------------- + static sal_Bool ImplHandleIMEComposition( HWND hWnd, LPARAM lParam ) { @@ -5364,7 +5364,7 @@ static sal_Bool ImplHandleIMEComposition( HWND hWnd, LPARAM lParam ) return bDef; } -// ----------------------------------------------------------------------- + static sal_Bool ImplHandleIMEEndComposition( HWND hWnd ) { @@ -5384,7 +5384,7 @@ static sal_Bool ImplHandleIMEEndComposition( HWND hWnd ) return bDef; } -// ----------------------------------------------------------------------- + static boolean ImplHandleAppCommand( HWND hWnd, LPARAM lParam ) { @@ -5485,7 +5485,7 @@ static void ImplHandleIMENotify( HWND hWnd, WPARAM wParam ) } } -// ----------------------------------------------------------------------- + static bool ImplHandleGetObject(HWND hWnd, LPARAM lParam, WPARAM wParam, LRESULT & nRet) @@ -5525,7 +5525,7 @@ ImplHandleGetObject(HWND hWnd, LPARAM lParam, WPARAM wParam, LRESULT & nRet) return false; } -// ----------------------------------------------------------------------- + static LRESULT ImplHandleIMEReconvertString( HWND hWnd, LPARAM lParam ) { @@ -5580,7 +5580,7 @@ static LRESULT ImplHandleIMEReconvertString( HWND hWnd, LPARAM lParam ) return nRet; } -// ----------------------------------------------------------------------- + static LRESULT ImplHandleIMEConfirmReconvertString( HWND hWnd, LPARAM lParam ) { @@ -5648,7 +5648,7 @@ static LRESULT ImplHandleIMEQueryCharPosition( HWND hWnd, LPARAM lParam ) { return TRUE; } -// ----------------------------------------------------------------------- + void SalTestMouseLeave() { @@ -5663,7 +5663,7 @@ void SalTestMouseLeave() } } -// ----------------------------------------------------------------------- + static int ImplSalWheelMousePos( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam , LRESULT& rResult ) @@ -5693,7 +5693,7 @@ static int ImplSalWheelMousePos( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lPa return TRUE; } -// ----------------------------------------------------------------------- + LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, int& rDef ) { @@ -6171,7 +6171,7 @@ LRESULT CALLBACK SalFrameWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM l return nRet; } -// ----------------------------------------------------------------------- + sal_Bool ImplHandleGlobalMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, LRESULT& rlResult ) { @@ -6194,7 +6194,7 @@ sal_Bool ImplHandleGlobalMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam return bResult; } -// ----------------------------------------------------------------------- + sal_Bool ImplWriteLastError( DWORD lastError, const char *szApiCall ) { @@ -6256,7 +6256,7 @@ sal_Bool ImplWriteLastError( DWORD lastError, const char *szApiCall ) return TRUE; } -// ----------------------------------------------------------------------- + #ifdef _WIN32 bool HasAtHook() diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/source/window/salmenu.cxx index b4d40a692016..1284636990dc 100644 --- a/vcl/win/source/window/salmenu.cxx +++ b/vcl/win/source/window/salmenu.cxx @@ -398,6 +398,6 @@ WinSalMenuItem::~WinSalMenuItem() ImplRemoveItemById( mpSalMenu, mnId ); } -// ------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx index f6287e7c93b7..ac70f7a8183a 100644 --- a/vcl/win/source/window/salobj.cxx +++ b/vcl/win/source/window/salobj.cxx @@ -52,7 +52,7 @@ static sal_Bool ImplIsSysWindowOrChild( HWND hWndParent, HWND hWndChild ) return FALSE; } -// ----------------------------------------------------------------------- + WinSalObject* ImplFindSalObject( HWND hWndChild ) { @@ -69,7 +69,7 @@ WinSalObject* ImplFindSalObject( HWND hWndChild ) return NULL; } -// ----------------------------------------------------------------------- + WinSalFrame* ImplFindSalObjectFrame( HWND hWnd ) { @@ -92,7 +92,7 @@ WinSalFrame* ImplFindSalObjectFrame( HWND hWnd ) return pFrame; } -// ----------------------------------------------------------------------- + LRESULT CALLBACK SalSysMsgProc( int nCode, WPARAM wParam, LPARAM lParam ) { @@ -149,7 +149,7 @@ LRESULT CALLBACK SalSysMsgProc( int nCode, WPARAM wParam, LPARAM lParam ) return CallNextHookEx( pSalData->mhSalObjMsgHook, nCode, wParam, lParam ); } -// ----------------------------------------------------------------------- + sal_Bool ImplSalPreDispatchMsg( MSG* pMsg ) { @@ -234,7 +234,7 @@ sal_Bool ImplSalPreDispatchMsg( MSG* pMsg ) return FALSE; } -// ----------------------------------------------------------------------- + void ImplSalPostDispatchMsg( MSG* pMsg, LRESULT /* nDispatchResult */ ) { @@ -388,7 +388,7 @@ LRESULT CALLBACK SalSysObjWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM return nRet; } -// ----------------------------------------------------------------------- + LRESULT CALLBACK SalSysObjChildWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, int& rDef ) { @@ -584,7 +584,7 @@ WinSalObject::WinSalObject() pSalData->mpFirstObject = this; } -// ----------------------------------------------------------------------- + WinSalObject::~WinSalObject() { @@ -626,21 +626,21 @@ WinSalObject::~WinSalObject() ImplSendMessage( hWndParent, SAL_MSG_FORCEPALETTE, 0, 0 ); } -// ----------------------------------------------------------------------- + void WinSalObject::ResetClipRegion() { SetWindowRgn( mhWnd, 0, TRUE ); } -// ----------------------------------------------------------------------- + sal_uInt16 WinSalObject::GetClipRegionType() { return SAL_OBJECT_CLIP_INCLUDERECTS; } -// ----------------------------------------------------------------------- + void WinSalObject::BeginSetClipRegion( sal_uLong nRectCount ) { @@ -662,7 +662,7 @@ void WinSalObject::BeginSetClipRegion( sal_uLong nRectCount ) mbFirstClipRect = TRUE; } -// ----------------------------------------------------------------------- + void WinSalObject::UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) { @@ -701,7 +701,7 @@ void WinSalObject::UnionClipRegion( long nX, long nY, long nWidth, long nHeight mpNextClipRect++; } -// ----------------------------------------------------------------------- + void WinSalObject::EndSetClipRegion() { @@ -726,7 +726,7 @@ void WinSalObject::EndSetClipRegion() SetWindowRgn( mhWnd, hRegion, TRUE ); } -// ----------------------------------------------------------------------- + void WinSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight ) { @@ -742,7 +742,7 @@ void WinSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight ) SWP_NOZORDER | SWP_NOACTIVATE | nStyle ); } -// ----------------------------------------------------------------------- + void WinSalObject::Show( sal_Bool bVisible ) { @@ -752,14 +752,14 @@ void WinSalObject::Show( sal_Bool bVisible ) ShowWindow( mhWnd, SW_HIDE ); } -// ----------------------------------------------------------------------- + void WinSalObject::Enable( sal_Bool bEnable ) { EnableWindow( mhWnd, bEnable ); } -// ----------------------------------------------------------------------- + void WinSalObject::GrabFocus() { |