summaryrefslogtreecommitdiff
path: root/vcl/win/source
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/win/source')
-rw-r--r--vcl/win/source/app/saldata.cxx16
-rw-r--r--vcl/win/source/app/salinfo.cxx4
-rw-r--r--vcl/win/source/app/salinst.cxx86
-rw-r--r--vcl/win/source/app/salshl.cxx11
-rw-r--r--vcl/win/source/app/saltimer.cxx9
-rw-r--r--vcl/win/source/gdi/salbmp.cxx38
-rw-r--r--vcl/win/source/gdi/salgdi.cxx111
-rw-r--r--vcl/win/source/gdi/salgdi2.cxx27
-rw-r--r--vcl/win/source/gdi/salgdi3.cxx103
-rw-r--r--vcl/win/source/gdi/salgdi_gdiplus.cxx9
-rw-r--r--vcl/win/source/gdi/salnativewidgets-luna.cxx7
-rw-r--r--vcl/win/source/gdi/salvd.cxx13
-rw-r--r--vcl/win/source/gdi/winlayout.cxx105
-rw-r--r--vcl/win/source/gdi/wntgdi.cxx7
-rw-r--r--vcl/win/source/window/keynames.cxx5
-rw-r--r--vcl/win/source/window/salframe.cxx218
-rw-r--r--vcl/win/source/window/salmenu.cxx17
-rw-r--r--vcl/win/source/window/salobj.cxx41
18 files changed, 0 insertions, 827 deletions
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx
index a650c8e2d99d..0e9a32a8541b 100644
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.cxx
@@ -23,8 +23,6 @@
#include "win/saldata.hxx"
-
-
rtl_TextEncoding ImplSalGetSystemEncoding()
{
static UINT nOldAnsiCodePage = 0;
@@ -42,8 +40,6 @@ rtl_TextEncoding ImplSalGetSystemEncoding()
return eEncoding;
}
-
-
OUString ImplSalGetUniString(const sal_Char* pStr, sal_Int32 const nLen)
{
return OUString( pStr, (-1 == nLen) ? strlen(pStr) : nLen,
@@ -53,8 +49,6 @@ OUString ImplSalGetUniString(const sal_Char* pStr, sal_Int32 const nLen)
RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT );
}
-
-
int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 )
{
int nRet;
@@ -81,36 +75,26 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 )
return nRet;
}
-
-
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 )
{
return DispatchMessageW( lpMsg );
diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx
index 19234fdf387e..3b4ededbb09f 100644
--- a/vcl/win/source/app/salinfo.cxx
+++ b/vcl/win/source/app/salinfo.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "svsys.h"
#include "rtl/ustrbuf.hxx"
@@ -43,8 +42,6 @@ WinSalSystem::~WinSalSystem()
{
}
-
-
static BOOL CALLBACK ImplEnumMonitorProc( HMONITOR hMonitor,
HDC hDC,
LPRECT lpRect,
@@ -178,7 +175,6 @@ 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 e831106c998d..88a76c346383 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <string.h>
#include <svsys.h>
#include <process.h>
@@ -82,8 +81,6 @@
#include <sehandler.hxx>
#endif
-
-
void SalAbort( const OUString& rErrorText, bool )
{
ImplFreeSalGDI();
@@ -102,13 +99,9 @@ void SalAbort( const OUString& rErrorText, bool )
}
}
-
-
LRESULT CALLBACK SalComWndProcA( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam );
LRESULT CALLBACK SalComWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam );
-
-
class SalYieldMutex : public comphelper::SolarMutex
{
osl::Mutex m_mutex;
@@ -128,8 +121,6 @@ public:
sal_uLong GetAcquireCount( sal_uLong nThreadId );
};
-
-
SalYieldMutex::SalYieldMutex( WinSalInstance* pInstData )
{
mpInstData = pInstData;
@@ -137,8 +128,6 @@ SalYieldMutex::SalYieldMutex( WinSalInstance* pInstData )
mnThreadId = 0;
}
-
-
void SalYieldMutex::acquire()
{
m_mutex.acquire();
@@ -146,8 +135,6 @@ void SalYieldMutex::acquire()
mnThreadId = GetCurrentThreadId();
}
-
-
void SalYieldMutex::release()
{
DWORD nThreadId = GetCurrentThreadId();
@@ -188,8 +175,6 @@ void SalYieldMutex::release()
}
}
-
-
bool SalYieldMutex::tryToAcquire()
{
if( m_mutex.tryToAcquire() )
@@ -202,8 +187,6 @@ bool SalYieldMutex::tryToAcquire()
return false;
}
-
-
sal_uLong SalYieldMutex::GetAcquireCount( sal_uLong nThreadId )
{
if ( nThreadId == mnThreadId )
@@ -212,8 +195,6 @@ sal_uLong SalYieldMutex::GetAcquireCount( sal_uLong nThreadId )
return 0;
}
-
-
void ImplSalYieldMutexAcquireWithWait()
{
WinSalInstance* pInst = GetSalData()->mpFirstInstance;
@@ -260,8 +241,6 @@ void ImplSalYieldMutexAcquireWithWait()
pInst->mpSalYieldMutex->acquire();
}
-
-
bool ImplSalYieldMutexTryToAcquire()
{
WinSalInstance* pInst = GetSalData()->mpFirstInstance;
@@ -271,8 +250,6 @@ bool ImplSalYieldMutexTryToAcquire()
return FALSE;
}
-
-
void ImplSalYieldMutexAcquire()
{
WinSalInstance* pInst = GetSalData()->mpFirstInstance;
@@ -280,8 +257,6 @@ void ImplSalYieldMutexAcquire()
pInst->mpSalYieldMutex->acquire();
}
-
-
void ImplSalYieldMutexRelease()
{
WinSalInstance* pInst = GetSalData()->mpFirstInstance;
@@ -292,8 +267,6 @@ void ImplSalYieldMutexRelease()
}
}
-
-
sal_uLong ImplSalReleaseYieldMutex()
{
WinSalInstance* pInst = GetSalData()->mpFirstInstance;
@@ -312,8 +285,6 @@ sal_uLong ImplSalReleaseYieldMutex()
return nCount;
}
-
-
void ImplSalAcquireYieldMutex( sal_uLong nCount )
{
WinSalInstance* pInst = GetSalData()->mpFirstInstance;
@@ -328,8 +299,6 @@ void ImplSalAcquireYieldMutex( sal_uLong nCount )
}
}
-
-
bool WinSalInstance::CheckYieldMutex()
{
SalData* pSalData = GetSalData();
@@ -341,8 +310,6 @@ bool WinSalInstance::CheckYieldMutex()
return true;
}
-
-
void SalData::initKeyCodeMap()
{
UINT nKey = 0xffffffff;
@@ -367,11 +334,8 @@ void SalData::initKeyCodeMap()
initKey( ';', KEY_SEMICOLON );
}
-
-
// SalData
-
SalData::SalData()
{
mhInst = 0; // default instance handle
@@ -454,7 +418,6 @@ void InitSalData()
Gdiplus::GdiplusStartup(&pSalData->gdiplusToken, &gdiplusStartupInput, NULL);
}
-
void DeInitSalData()
{
CoUninitialize();
@@ -469,8 +432,6 @@ void DeInitSalData()
delete pSalData;
}
-
-
void InitSalMain()
{
// remember data, copied from WinMain
@@ -486,8 +447,6 @@ void InitSalMain()
}
}
-
-
SalInstance* CreateSalInstance()
{
SalData* pSalData = GetSalData();
@@ -570,8 +529,6 @@ SalInstance* CreateSalInstance()
return pInst;
}
-
-
void DestroySalInstance( SalInstance* pInst )
{
SalData* pSalData = GetSalData();
@@ -587,8 +544,6 @@ void DestroySalInstance( SalInstance* pInst )
delete pInst;
}
-
-
WinSalInstance::WinSalInstance()
{
mhComWnd = 0;
@@ -599,8 +554,6 @@ WinSalInstance::WinSalInstance()
::tools::SolarMutex::SetSolarMutex( mpSalYieldMutex );
}
-
-
WinSalInstance::~WinSalInstance()
{
::tools::SolarMutex::SetSolarMutex( 0 );
@@ -610,29 +563,21 @@ 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 )
{
SalData* pSalData = GetSalData();
@@ -646,8 +591,6 @@ static void ImplSalDispatchMessage( MSG* pMsg )
ImplSalPostDispatchMsg( pMsg, lResult );
}
-
-
void ImplSalYield( bool bWait, bool bHandleAllCurrentEvents )
{
MSG aMsg;
@@ -677,8 +620,6 @@ void ImplSalYield( bool bWait, bool bHandleAllCurrentEvents )
}
}
-
-
void WinSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
{
SalYieldMutex* pYieldMutex = mpSalYieldMutex;
@@ -728,13 +669,10 @@ void WinSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
}
}
-
-
LRESULT CALLBACK SalComWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, int& rDef )
{
LRESULT nRet = 0;
-
switch ( nMsg )
{
case SAL_MSG_PRINTABORTJOB:
@@ -874,8 +812,6 @@ LRESULT CALLBACK SalComWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lPa
return nRet;
}
-
-
bool WinSalInstance::AnyInput( sal_uInt16 nType )
{
MSG aMsg;
@@ -956,8 +892,6 @@ bool WinSalInstance::AnyInput( sal_uInt16 nType )
return FALSE;
}
-
-
void SalTimer::Start( sal_uLong nMS )
{
// to switch to Main-Thread
@@ -973,16 +907,12 @@ void SalTimer::Start( sal_uLong nMS )
ImplSalStartTimer( nMS, FALSE );
}
-
-
SalFrame* WinSalInstance::CreateChildFrame( SystemParentData* pSystemParentData, sal_uLong nSalFrameStyle )
{
// to switch to Main-Thread
return (SalFrame*)(sal_IntPtr)ImplSendMessage( mhComWnd, SAL_MSG_CREATEFRAME, nSalFrameStyle, (LPARAM)pSystemParentData->hWnd );
}
-
-
SalFrame* WinSalInstance::CreateFrame( SalFrame* pParent, sal_uLong nSalFrameStyle )
{
// to switch to Main-Thread
@@ -994,15 +924,11 @@ 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
bool /*bShow*/ )
@@ -1011,15 +937,11 @@ 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 )
{
rReturnedBytes = 1;
@@ -1027,8 +949,6 @@ 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
standard API among the different desktop managers.
@@ -1109,15 +1029,11 @@ void WinSalInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUS
}
}
-
-
SalTimer* WinSalInstance::CreateSalTimer()
{
return new WinSalTimer();
}
-
-
SalBitmap* WinSalInstance::CreateSalBitmap()
{
return new WinSalBitmap();
@@ -1140,8 +1056,6 @@ SalI18NImeStatus* WinSalInstance::CreateI18NImeStatus()
return new WinImeStatus();
}
-
-
const OUString& SalGetDesktopEnvironment()
{
static OUString aDesktopEnvironment( "Windows" );
diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/source/app/salshl.cxx
index cddc07f16d9a..0aa2b752902f 100644
--- a/vcl/win/source/app/salshl.cxx
+++ b/vcl/win/source/app/salshl.cxx
@@ -17,17 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <svsys.h>
#include <tools/debug.hxx>
#include <win/saldata.hxx>
-
-
SalShlData aSalShlData;
-
-
extern "C"
{
@@ -54,8 +49,6 @@ BOOL WINAPI LibMain( HINSTANCE hInst, DWORD nReason, LPVOID pReserved )
}
-
-
HCURSOR ImplLoadSalCursor( int nId )
{
DBG_ASSERT( aSalShlData.mhInst, "no DLL instance handle" );
@@ -67,8 +60,6 @@ HCURSOR ImplLoadSalCursor( int nId )
return hCursor;
}
-
-
HBITMAP ImplLoadSalBitmap( int nId )
{
DBG_ASSERT( aSalShlData.mhInst, "no DLL instance handle" );
@@ -80,8 +71,6 @@ HBITMAP ImplLoadSalBitmap( int nId )
return hBitmap;
}
-
-
bool ImplLoadSalIcon( int nId, HICON& rIcon, HICON& rSmallIcon )
{
DBG_ASSERT( aSalShlData.mhInst, "no DLL instance handle" );
diff --git a/vcl/win/source/app/saltimer.cxx b/vcl/win/source/app/saltimer.cxx
index c3d2e4e8ed8f..c0aba2842dee 100644
--- a/vcl/win/source/app/saltimer.cxx
+++ b/vcl/win/source/app/saltimer.cxx
@@ -26,14 +26,9 @@
#include <sehandler.hxx>
#endif
-
-
-
// maximum period
#define MAX_SYSPERIOD 65533
-
-
void ImplSalStartTimer( sal_uLong nMS, bool bMutex )
{
SalData* pSalData = GetSalData();
@@ -56,8 +51,6 @@ void ImplSalStartTimer( sal_uLong nMS, bool bMutex )
pSalData->mnNextTimerTime = pSalData->mnLastEventTime + nMS;
}
-
-
WinSalTimer::~WinSalTimer()
{
}
@@ -90,8 +83,6 @@ void WinSalTimer::Stop()
}
}
-
-
void CALLBACK SalTimerProc( HWND, UINT, UINT_PTR nId, DWORD )
{
#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx
index 5324581d4c6d..e1d53aadb592 100644
--- a/vcl/win/source/gdi/salbmp.cxx
+++ b/vcl/win/source/gdi/salbmp.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <svsys.h>
#include <vcl/bitmap.hxx>
#include <vcl/salbtype.hxx>
@@ -63,8 +62,6 @@
#pragma warning(pop)
#endif
-
-
// - Inlines -
inline void ImplSetPixel4( const HPBYTE pScanline, long nX, const BYTE cIndex )
@@ -75,7 +72,6 @@ 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 +190,11 @@ public:
}
};
-
// Global instance of GdiPlusBuffer which manages Gdiplus::Bitmap
// instances
static GdiPlusBuffer aGdiPlusBuffer;
-
// - WinSalBitmap -
WinSalBitmap::WinSalBitmap()
@@ -213,15 +207,11 @@ WinSalBitmap::WinSalBitmap()
{
}
-
-
WinSalBitmap::~WinSalBitmap()
{
Destroy();
}
-
-
void WinSalBitmap::Destroy()
{
if(maGdiPlusBitmap.get())
@@ -238,8 +228,6 @@ void WinSalBitmap::Destroy()
mnBitCount = 0;
}
-
-
GdiPlusBmpPtr WinSalBitmap::ImplGetGdiPlusBitmap(const WinSalBitmap* pAlphaSource) const
{
WinSalBitmap* pThat = const_cast< WinSalBitmap* >(this);
@@ -281,8 +269,6 @@ GdiPlusBmpPtr WinSalBitmap::ImplGetGdiPlusBitmap(const WinSalBitmap* pAlphaSourc
return maGdiPlusBitmap;
}
-
-
Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap()
{
Gdiplus::Bitmap* pRetval(0);
@@ -372,8 +358,6 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap()
return pRetval;
}
-
-
Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap(const WinSalBitmap& rAlphaSource)
{
Gdiplus::Bitmap* pRetval(0);
@@ -530,8 +514,6 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap(const WinSalBitmap& rAlph
return pRetval;
}
-
-
bool WinSalBitmap::Create( HANDLE hBitmap, bool bDIB, bool bCopyHandle )
{
bool bRet = TRUE;
@@ -581,8 +563,6 @@ bool WinSalBitmap::Create( HANDLE hBitmap, bool bDIB, bool bCopyHandle )
return bRet;
}
-
-
bool WinSalBitmap::Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal )
{
bool bRet = FALSE;
@@ -599,8 +579,6 @@ bool WinSalBitmap::Create( const Size& rSize, sal_uInt16 nBitCount, const Bitmap
return bRet;
}
-
-
bool WinSalBitmap::Create( const SalBitmap& rSSalBitmap )
{
bool bRet = FALSE;
@@ -628,8 +606,6 @@ bool WinSalBitmap::Create( const SalBitmap& rSSalBitmap )
return bRet;
}
-
-
bool WinSalBitmap::Create( const SalBitmap& rSSalBmp, SalGraphics* pSGraphics )
{
bool bRet = FALSE;
@@ -674,8 +650,6 @@ bool WinSalBitmap::Create( const SalBitmap& rSSalBmp, SalGraphics* pSGraphics )
return bRet;
}
-
-
bool WinSalBitmap::Create( const SalBitmap& rSSalBmp, sal_uInt16 nNewBitCount )
{
bool bRet = FALSE;
@@ -726,8 +700,6 @@ 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 )
{
::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet >
@@ -775,8 +747,6 @@ sal_uInt16 WinSalBitmap::ImplGetDIBColorCount( HGLOBAL hDIB )
return nColors;
}
-
-
HGLOBAL WinSalBitmap::ImplCreateDIB( const Size& rSize, sal_uInt16 nBits, const BitmapPalette& rPal )
{
DBG_ASSERT( nBits == 1 || nBits == 4 || nBits == 8 || nBits == 16 || nBits == 24, "Unsupported BitCount!" );
@@ -832,8 +802,6 @@ HGLOBAL WinSalBitmap::ImplCreateDIB( const Size& rSize, sal_uInt16 nBits, const
return hDIB;
}
-
-
HANDLE WinSalBitmap::ImplCopyDIBOrDDB( HANDLE hHdl, bool bDIB )
{
HANDLE hCopy = 0;
@@ -878,8 +846,6 @@ HANDLE WinSalBitmap::ImplCopyDIBOrDDB( HANDLE hHdl, bool bDIB )
return hCopy;
}
-
-
BitmapBuffer* WinSalBitmap::AcquireBuffer( bool /*bReadOnly*/ )
{
BitmapBuffer* pBuffer = NULL;
@@ -977,8 +943,6 @@ BitmapBuffer* WinSalBitmap::AcquireBuffer( bool /*bReadOnly*/ )
return pBuffer;
}
-
-
void WinSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly )
{
if( pBuffer )
@@ -1001,8 +965,6 @@ 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 464583d4f5b4..9cb39cc15f20 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <stdio.h>
#include <string.h>
#include <svsys.h>
@@ -33,13 +32,9 @@
#include <win/salframe.h>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
-
-
// comment out to prevent use of beziers on GDI functions
#define USE_GDI_BEZIERS
-
-
#define DITHER_PAL_DELTA 51
#define DITHER_PAL_STEPS 6
#define DITHER_PAL_COUNT (DITHER_PAL_STEPS*DITHER_PAL_STEPS*DITHER_PAL_STEPS)
@@ -47,29 +42,21 @@
#define DITHER_EXTRA_COLORS 1
#define DMAP( _def_nVal, _def_nThres ) ((pDitherDiff[_def_nVal]>(_def_nThres))?pDitherHigh[_def_nVal]:pDitherLow[_def_nVal])
-
-
struct SysColorEntry
{
DWORD nRGB;
SysColorEntry* pNext;
};
-
-
static SysColorEntry* pFirstSysColor = NULL;
static SysColorEntry* pActSysColor = NULL;
-
-
// Blue7
static PALETTEENTRY aImplExtraColor1 =
{
0, 184, 255, 0
};
-
-
static PALETTEENTRY aImplSalSysPalEntryAry[ DITHER_MAX_SYSCOLOR ] =
{
{ 0, 0, 0, 0 },
@@ -90,8 +77,6 @@ static PALETTEENTRY aImplSalSysPalEntryAry[ DITHER_MAX_SYSCOLOR ] =
{ 0xFF, 0xFF, 0xFF, 0 }
};
-
-
static BYTE aOrdDither8Bit[8][8] =
{
{ 0, 38, 9, 48, 2, 40, 12, 50 },
@@ -104,8 +89,6 @@ static BYTE aOrdDither8Bit[8][8] =
{ 33, 20, 30, 17, 32, 20, 29, 16 }
};
-
-
static BYTE aOrdDither16Bit[8][8] =
{
{ 0, 6, 1, 7, 0, 6, 1, 7 },
@@ -118,20 +101,14 @@ static BYTE aOrdDither16Bit[8][8] =
{ 5, 3, 4, 2, 5, 3, 4, 2 }
};
-
-
// we must create pens with 1-pixel width; otherwise the S3-graphics card
// map has many paint problems when drawing polygons/polyLines and a
// complex is set
#define GSL_PEN_WIDTH 1
-
-
#define SAL_POLYPOLYCOUNT_STACKBUF 8
#define SAL_POLYPOLYPOINTS_STACKBUF 64
-
-
void ImplInitSalGDI()
{
SalData* pSalData = GetSalData();
@@ -309,8 +286,6 @@ void ImplInitSalGDI()
ReleaseDC( 0, hDC );
}
-
-
void ImplFreeSalGDI()
{
SalData* pSalData = GetSalData();
@@ -383,8 +358,6 @@ void ImplFreeSalGDI()
ImplReleaseTempFonts( *pSalData );
}
-
-
static int ImplIsPaletteEntry( BYTE nRed, BYTE nGreen, BYTE nBlue )
{
// dither color?
@@ -411,8 +384,6 @@ static int ImplIsPaletteEntry( BYTE nRed, BYTE nGreen, BYTE nBlue )
return FALSE;
}
-
-
int ImplIsSysColorEntry( SalColor nSalColor )
{
SysColorEntry* pEntry = pFirstSysColor;
@@ -430,8 +401,6 @@ int ImplIsSysColorEntry( SalColor nSalColor )
return FALSE;
}
-
-
static void ImplInsertSysColorEntry( int nSysIndex )
{
const DWORD nRGB = GetSysColor( nSysIndex );
@@ -453,8 +422,6 @@ static void ImplInsertSysColorEntry( int nSysIndex )
}
}
-
-
void ImplUpdateSysColorEntries()
{
// delete old SysColorList
@@ -492,8 +459,6 @@ void ImplUpdateSysColorEntries()
ImplInsertSysColorEntry( COLOR_INACTIVECAPTIONTEXT );
}
-
-
static SalColor ImplGetROPSalColor( SalROPColor nROPColor )
{
SalColor nSalColor;
@@ -504,8 +469,6 @@ static SalColor ImplGetROPSalColor( SalROPColor nROPColor )
return nSalColor;
}
-
-
void ImplSalInitGraphics( WinSalGraphics* pData )
{
// calculate the minimal line width for the printer
@@ -523,8 +486,6 @@ void ImplSalInitGraphics( WinSalGraphics* pData )
::SetROP2( pData->getHDC(), R2_COPYPEN );
}
-
-
void ImplSalDeInitGraphics( WinSalGraphics* pData )
{
// clear clip region
@@ -538,8 +499,6 @@ void ImplSalDeInitGraphics( WinSalGraphics* pData )
SelectFont( pData->getHDC(), pData->mhDefFont );
}
-
-
HDC ImplGetCachedDC( sal_uLong nID, HBITMAP hBmp )
{
SalData* pSalData = GetSalData();
@@ -572,8 +531,6 @@ HDC ImplGetCachedDC( sal_uLong nID, HBITMAP hBmp )
return pC->mhDC;
}
-
-
void ImplReleaseCachedDC( sal_uLong nID )
{
SalData* pSalData = GetSalData();
@@ -583,8 +540,6 @@ void ImplReleaseCachedDC( sal_uLong nID )
SelectObject( pC->mhDC, pC->mhSelBmp );
}
-
-
void ImplClearHDCCache( SalData* pData )
{
for( sal_uLong i = 0; i < CACHESIZE_HDC; i++ )
@@ -604,8 +559,6 @@ void ImplClearHDCCache( SalData* pData )
}
}
-
-
// #100127# Fill point and flag memory from array of points which
// might also contain bezier control points for the PolyDraw() GDI method
// Make sure pWinPointAry and pWinFlagAry are big enough
@@ -677,8 +630,6 @@ void ImplPreparePolyDraw( bool bCloseFigures,
}
}
-
-
// #100127# draw an array of points which might also contain bezier control points
void ImplRenderPath( HDC hdc, sal_uLong nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry )
{
@@ -707,8 +658,6 @@ void ImplRenderPath( HDC hdc, sal_uLong nPoints, const SalPoint* pPtAry, const B
}
}
-
-
WinSalGraphics::WinSalGraphics()
{
for( int i = 0; i < MAX_FALLBACK; ++i )
@@ -741,8 +690,6 @@ WinSalGraphics::WinSalGraphics()
mnPenWidth = GSL_PEN_WIDTH;
}
-
-
WinSalGraphics::~WinSalGraphics()
{
// free obsolete GDI objects
@@ -776,8 +723,6 @@ WinSalGraphics::~WinSalGraphics()
delete mpFontKernPairs;
}
-
-
void WinSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY )
{
rDPIX = GetDeviceCaps( getHDC(), LOGPIXELSX );
@@ -790,15 +735,11 @@ 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
{
if( mhWnd && IsWindow( mhWnd ) )
@@ -821,8 +762,6 @@ long WinSalGraphics::GetGraphicsWidth() const
return 0;
}
-
-
void WinSalGraphics::ResetClipRegion()
{
if ( mhRegion )
@@ -834,8 +773,6 @@ void WinSalGraphics::ResetClipRegion()
SelectClipRgn( getHDC(), 0 );
}
-
-
bool WinSalGraphics::setClipRegion( const Region& i_rClip )
{
if ( mhRegion )
@@ -1065,8 +1002,6 @@ bool WinSalGraphics::setClipRegion( const Region& i_rClip )
return true;
}
-
-
void WinSalGraphics::SetLineColor()
{
// create and select new pen
@@ -1088,8 +1023,6 @@ void WinSalGraphics::SetLineColor()
mbStockPen = TRUE;
}
-
-
void WinSalGraphics::SetLineColor( SalColor nSalColor )
{
maLineColor = nSalColor;
@@ -1147,8 +1080,6 @@ void WinSalGraphics::SetLineColor( SalColor nSalColor )
mbStockPen = bStockPen;
}
-
-
void WinSalGraphics::SetFillColor()
{
// create and select new brush
@@ -1170,8 +1101,6 @@ void WinSalGraphics::SetFillColor()
mbStockBrush = TRUE;
}
-
-
void WinSalGraphics::SetFillColor( SalColor nSalColor )
{
maFillColor = nSalColor;
@@ -1275,30 +1204,22 @@ void WinSalGraphics::SetFillColor( SalColor nSalColor )
mbStockBrush = bStockBrush;
}
-
-
void WinSalGraphics::SetXORMode( bool bSet, bool )
{
mbXORMode = bSet;
::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 )
{
if ( mbXORMode )
@@ -1313,8 +1234,6 @@ void WinSalGraphics::drawPixel( long nX, long nY )
SetPixel( getHDC(), (int)nX, (int)nY, mnPenColor );
}
-
-
void WinSalGraphics::drawPixel( long nX, long nY, SalColor nSalColor )
{
COLORREF nCol = PALETTERGB( SALCOLOR_RED( nSalColor ),
@@ -1338,8 +1257,6 @@ 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 )
{
MoveToEx( getHDC(), (int)nX1, (int)nY1, NULL );
@@ -1380,8 +1297,6 @@ void WinSalGraphics::drawLine( long nX1, long nY1, long nX2, long nY2 )
}
}
-
-
void WinSalGraphics::drawRect( long nX, long nY, long nWidth, long nHeight )
{
if ( !mbPen )
@@ -1405,8 +1320,6 @@ 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 )
{
// for NT, we can handover the array directly
@@ -1454,8 +1367,6 @@ void WinSalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry )
}
}
-
-
void WinSalGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
// for NT, we can handover the array directly
@@ -1468,8 +1379,6 @@ 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,12 +1446,8 @@ 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 )
{
#ifdef USE_GDI_BEZIERS
@@ -1558,8 +1463,6 @@ bool WinSalGraphics::drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPt
#endif
}
-
-
bool WinSalGraphics::drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry )
{
#ifdef USE_GDI_BEZIERS
@@ -1610,8 +1513,6 @@ 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,8 +1568,6 @@ bool WinSalGraphics::drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32*
#endif
}
-
-
#define POSTSCRIPT_BUFSIZE 0x4000 // MAXIMUM BUFSIZE EQ 0xFFFF
static BYTE* ImplSearchEntry( BYTE* pSource, BYTE* pDest, sal_uLong nComp, sal_uLong nSize )
@@ -1771,7 +1670,6 @@ bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void*
// #107797# Write out EPS encapsulation header
-
// directly taken from the PLRM 3.0, p. 726. Note:
// this will definitely cause problems when
// recursively creating and embedding PostScript files
@@ -1799,10 +1697,8 @@ bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void*
" } if\n"
"} if\n\n" );
-
// #i10737# Apply clipping manually
-
// Windows seems to ignore any clipping at the HDC,
// when followed by a POSTSCRIPT_PASSTHROUGH
@@ -1847,7 +1743,6 @@ bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void*
*((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] );
@@ -1867,7 +1762,6 @@ bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void*
*((sal_uInt16*)aBuf.getStr()) = (sal_uInt16)( aBuf.getLength() - 2 );
Escape ( getHDC(), nEscape, aBuf.getLength(), (LPTSTR)aBuf.getStr(), 0 );
-
// #107797# Write out actual EPS content
sal_uLong nToDo = nSize;
@@ -1887,7 +1781,6 @@ bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void*
nToDo -= nResult;
}
-
// #107797# Write out EPS encapsulation footer
// reserve a sal_uInt16 again
@@ -1906,8 +1799,6 @@ bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void*
return bRetValue;
}
-
-
SystemGraphicsData WinSalGraphics::GetGraphicsData() const
{
SystemGraphicsData aRes;
@@ -1916,6 +1807,4 @@ 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 dc7f4c5d749e..720a61c35bc7 100644
--- a/vcl/win/source/gdi/salgdi2.cxx
+++ b/vcl/win/source/gdi/salgdi2.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <string.h>
#include <stdlib.h>
@@ -55,8 +54,6 @@ bool WinSalGraphics::supportsOperation( OutDevSupportType eType ) const
return bRet;
}
-
-
void WinSalGraphics::copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics )
{
HDC hSrcDC;
@@ -96,8 +93,6 @@ void WinSalGraphics::copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraph
}
}
-
-
void ImplCalcOutSideRgn( const RECT& rSrcRect,
int nLeft, int nTop, int nRight, int nBottom,
HRGN& rhInvalidateRgn )
@@ -139,8 +134,6 @@ void ImplCalcOutSideRgn( const RECT& rSrcRect,
}
}
-
-
void WinSalGraphics::copyArea( long nDestX, long nDestY,
long nSrcX, long nSrcY,
long nSrcWidth, long nSrcHeight,
@@ -335,8 +328,6 @@ void WinSalGraphics::copyArea( long nDestX, long nDestY,
}
-
-
void ImplDrawBitmap( HDC hDC,
const SalTwoRect& rPosAry, const WinSalBitmap& rSalBitmap,
bool bPrinter, int nDrawMode )
@@ -443,8 +434,6 @@ void ImplDrawBitmap( HDC hDC,
}
}
-
-
void WinSalGraphics::drawBitmap(const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap)
{
bool bTryDirectPaint(!mbPrinter && !mbXORMode);
@@ -472,8 +461,6 @@ void WinSalGraphics::drawBitmap(const SalTwoRect& rPosAry, const SalBitmap& rSal
mbXORMode ? SRCINVERT : SRCCOPY );
}
-
-
void WinSalGraphics::drawBitmap( const SalTwoRect& rPosAry,
const SalBitmap& rSSalBitmap,
SalColor nTransparentColor )
@@ -528,8 +515,6 @@ void WinSalGraphics::drawBitmap( const SalTwoRect& rPosAry,
delete pMask;
}
-
-
void WinSalGraphics::drawBitmap( const SalTwoRect& rPosAry,
const SalBitmap& rSSalBitmap,
const SalBitmap& rSTransparentBitmap )
@@ -623,8 +608,6 @@ void WinSalGraphics::drawBitmap( const SalTwoRect& rPosAry,
}
}
-
-
bool WinSalGraphics::drawAlphaRect( long nX, long nY, long nWidth,
long nHeight, sal_uInt8 nTransparency )
{
@@ -652,8 +635,6 @@ bool WinSalGraphics::drawAlphaRect( long nX, long nY, long nWidth,
return bRet;
}
-
-
void WinSalGraphics::drawMask( const SalTwoRect& rPosAry,
const SalBitmap& rSSalBitmap,
SalColor nMaskColor )
@@ -686,8 +667,6 @@ void WinSalGraphics::drawMask( const SalTwoRect& rPosAry,
DeleteBrush( hMaskBrush );
}
-
-
SalBitmap* WinSalGraphics::getBitmap( long nX, long nY, long nDX, long nDY )
{
DBG_ASSERT( !mbPrinter, "No ::GetBitmap() from printer possible!" );
@@ -724,8 +703,6 @@ SalBitmap* WinSalGraphics::getBitmap( long nX, long nY, long nDX, long nDY )
return pSalBitmap;
}
-
-
SalColor WinSalGraphics::getPixel( long nX, long nY )
{
COLORREF aWinCol = ::GetPixel( getHDC(), (int) nX, (int) nY );
@@ -738,8 +715,6 @@ SalColor WinSalGraphics::getPixel( long nX, long nY )
GetBValue( aWinCol ) );
}
-
-
void WinSalGraphics::invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags )
{
if ( nFlags & SAL_INVERT_TRACKFRAME )
@@ -783,8 +758,6 @@ void WinSalGraphics::invert( long nX, long nY, long nWidth, long nHeight, SalInv
}
}
-
-
void WinSalGraphics::invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nSalFlags )
{
HPEN hPen;
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index c88cc5882c8f..1154967df349 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -49,40 +49,28 @@
#include "win/saldata.hxx"
#include "win/salgdi.h"
-
using namespace vcl;
static const int MAXFONTHEIGHT = 2048;
-
// - Inlines -
-
inline FIXED FixedFromDouble( double d )
{
const long l = (long) ( d * 65536. );
return *(FIXED*) &l;
}
-
-
inline int IntTimes256FromFixed(FIXED f)
{
int nFixedTimes256 = (f.value << 8) + ((f.fract+0x80) >> 8);
return nFixedTimes256;
}
-
-
// these variables can be static because they store system wide settings
static bool bImplSalCourierScalable = false;
static bool bImplSalCourierNew = false;
-
-
-
-
-
// TODO: also support temporary TTC font files
typedef std::map< OUString, ImplDevFontAttributes > FontAttrMap;
@@ -223,8 +211,6 @@ void ImplFontAttrCache::AddFontAttr( const OUString& rFontFileName, const ImplDe
}
}
-
-
// raw font data with a scoped lifetime
class RawFontData
{
@@ -289,7 +275,6 @@ RawFontData::RawFontData( HDC hDC, DWORD nTableTag )
}
}
-
// platform specific font substitution hooks for glyph fallback enhancement
// TODO: move into i18n module (maybe merge with svx/ucsubset.*
// or merge with i18nutil/source/utility/unicode_data.h)
@@ -597,8 +582,6 @@ bool WinGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFon
return bFound;
}
-
-
struct ImplEnumInfo
{
HDC mhDC;
@@ -614,8 +597,6 @@ struct ImplEnumInfo
int mnFontCount;
};
-
-
static rtl_TextEncoding ImplCharSetToSal( BYTE nCharSet )
{
rtl_TextEncoding eTextEncoding;
@@ -645,8 +626,6 @@ static rtl_TextEncoding ImplCharSetToSal( BYTE nCharSet )
return eTextEncoding;
}
-
-
static FontFamily ImplFamilyToSal( BYTE nFamily )
{
switch ( nFamily & 0xF0 )
@@ -673,8 +652,6 @@ static FontFamily ImplFamilyToSal( BYTE nFamily )
return FAMILY_DONTKNOW;
}
-
-
static BYTE ImplFamilyToWin( FontFamily eFamily )
{
switch ( eFamily )
@@ -704,8 +681,6 @@ static BYTE ImplFamilyToWin( FontFamily eFamily )
return FF_DONTCARE;
}
-
-
static FontWeight ImplWeightToSal( int nWeight )
{
if ( nWeight <= FW_THIN )
@@ -728,8 +703,6 @@ static FontWeight ImplWeightToSal( int nWeight )
return WEIGHT_BLACK;
}
-
-
static int ImplWeightToWin( FontWeight eWeight )
{
switch ( eWeight )
@@ -769,8 +742,6 @@ static int ImplWeightToWin( FontWeight eWeight )
return 0;
}
-
-
inline FontPitch ImplLogPitchToSal( BYTE nPitch )
{
if ( nPitch & FIXED_PITCH )
@@ -779,8 +750,6 @@ inline FontPitch ImplLogPitchToSal( BYTE nPitch )
return PITCH_VARIABLE;
}
-
-
inline FontPitch ImplMetricPitchToSal( BYTE nPitch )
{
// Grrrr! See NT help
@@ -790,8 +759,6 @@ inline FontPitch ImplMetricPitchToSal( BYTE nPitch )
return PITCH_VARIABLE;
}
-
-
inline BYTE ImplPitchToWin( FontPitch ePitch )
{
if ( ePitch == PITCH_FIXED )
@@ -802,8 +769,6 @@ inline BYTE ImplPitchToWin( FontPitch ePitch )
return DEFAULT_PITCH;
}
-
-
static ImplDevFontAttributes WinFont2DevFontAttributes( const ENUMLOGFONTEXA& rEnumFont,
const NEWTEXTMETRICA& rMetric, DWORD nFontType )
{
@@ -877,8 +842,6 @@ static ImplDevFontAttributes WinFont2DevFontAttributes( const ENUMLOGFONTEXA& rE
return aDFA;
}
-
-
static ImplDevFontAttributes WinFont2DevFontAttributes( const ENUMLOGFONTEXW& rEnumFont,
const NEWTEXTMETRICW& rMetric, DWORD nFontType )
{
@@ -952,8 +915,6 @@ static ImplDevFontAttributes WinFont2DevFontAttributes( const ENUMLOGFONTEXW& rE
return aDFA;
}
-
-
static ImplWinFontData* ImplLogMetricToDevFontDataA( const ENUMLOGFONTEXA* pLogFont,
const NEWTEXTMETRICA* pMetric,
DWORD nFontType )
@@ -971,8 +932,6 @@ static ImplWinFontData* ImplLogMetricToDevFontDataA( const ENUMLOGFONTEXA* pLogF
return pData;
}
-
-
static ImplWinFontData* ImplLogMetricToDevFontDataW( const ENUMLOGFONTEXW* pLogFont,
const NEWTEXTMETRICW* pMetric,
DWORD nFontType )
@@ -990,8 +949,6 @@ static ImplWinFontData* ImplLogMetricToDevFontDataW( const ENUMLOGFONTEXW* pLogF
return pData;
}
-
-
void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont )
{
OUString aFontName( reinterpret_cast<const sal_Unicode*>(rLogFont.lfFaceName) );
@@ -1029,7 +986,6 @@ void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont )
}
}
-
#if ENABLE_GRAPHITE
#ifdef DEBUG
@@ -1176,8 +1132,6 @@ ImplWinFontData::ImplWinFontData( const ImplDevFontAttributes& rDFS,
#endif
}
-
-
ImplWinFontData::~ImplWinFontData()
{
delete[] mpFontCharSets;
@@ -1194,20 +1148,14 @@ 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
{
// short circuit if already initialized
@@ -1264,7 +1212,6 @@ const gr_face* ImplWinFontData::GraphiteFace() const
}
#endif
-
bool ImplWinFontData::HasGSUBstitutions( HDC hDC ) const
{
if( !mbGsubRead )
@@ -1272,15 +1219,11 @@ 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
{
if( !mpUnicodeMap )
@@ -1294,8 +1237,6 @@ bool ImplWinFontData::GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabi
return !rFontCapabilities.maUnicodeRange.empty() || !rFontCapabilities.maCodePageRange.empty();
}
-
-
void ImplWinFontData::ReadGsubTable( HDC hDC ) const
{
mbGsubRead = true;
@@ -1341,8 +1282,6 @@ void ImplWinFontData::ReadGsubTable( HDC hDC ) const
CloseTTFont( pTTFont );
}
-
-
void ImplWinFontData::ReadCmapTable( HDC hDC ) const
{
if( mpUnicodeMap != NULL )
@@ -1411,8 +1350,6 @@ void ImplWinFontData::GetFontCapabilities( HDC hDC ) const
}
}
-
-
void WinSalGraphics::SetTextColor( SalColor nSalColor )
{
COLORREF aCol = PALETTERGB( SALCOLOR_RED( nSalColor ),
@@ -1429,8 +1366,6 @@ void WinSalGraphics::SetTextColor( SalColor nSalColor )
::SetTextColor( getHDC(), aCol );
}
-
-
int CALLBACK SalEnumQueryFontProcExW( const ENUMLOGFONTEXW*,
const NEWTEXTMETRICEXW*,
DWORD, LPARAM lParam )
@@ -1439,8 +1374,6 @@ int CALLBACK SalEnumQueryFontProcExW( const ENUMLOGFONTEXW*,
return 0;
}
-
-
void ImplGetLogFontFromFontSelect( HDC hDC,
const FontSelectPattern* pFont,
LOGFONTW& rLogFont,
@@ -1512,8 +1445,6 @@ void ImplGetLogFontFromFontSelect( HDC hDC,
}
}
-
-
HFONT WinSalGraphics::ImplDoSetFont( FontSelectPattern* i_pFont, float& o_rFontScale, HFONT& o_rOldFont )
{
HFONT hNewFont = 0;
@@ -1661,8 +1592,6 @@ sal_uInt16 WinSalGraphics::SetFont( FontSelectPattern* pFont, int nFallbackLevel
return 0;
}
-
-
void WinSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackLevel )
{
// temporarily change the HDC to the font in the fallback level
@@ -1739,8 +1668,6 @@ void WinSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackLe
pMetric->mnMinKashida = GetMinKashidaWidth();
}
-
-
sal_uLong WinSalGraphics::GetKernPairs()
{
if ( mbFontKernInit )
@@ -1770,8 +1697,6 @@ sal_uLong WinSalGraphics::GetKernPairs()
return mnFontKernPairCount;
}
-
-
const ImplFontCharMap* WinSalGraphics::GetImplFontCharMap() const
{
if( !mpWinFontData[0] )
@@ -1786,8 +1711,6 @@ bool WinSalGraphics::GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabil
return mpWinFontData[0]->GetImplFontCapabilities(rFontCapabilities);
}
-
-
int CALLBACK SalEnumFontsProcExA( const ENUMLOGFONTEXA* pLogFont,
const NEWTEXTMETRICEXA* pMetric,
DWORD nFontType, LPARAM lParam )
@@ -1842,8 +1765,6 @@ int CALLBACK SalEnumFontsProcExA( const ENUMLOGFONTEXA* pLogFont,
return 1;
}
-
-
int CALLBACK SalEnumFontsProcExW( const ENUMLOGFONTEXW* pLogFont,
const NEWTEXTMETRICEXW* pMetric,
DWORD nFontType, LPARAM lParam )
@@ -1892,8 +1813,6 @@ int CALLBACK SalEnumFontsProcExW( const ENUMLOGFONTEXW* pLogFont,
return 1;
}
-
-
struct TempFontItem
{
OUString maFontFilePath;
@@ -1971,8 +1890,6 @@ bool ImplAddTempFont( SalData& rSalData, const OUString& rFontFileURL )
return (nRet > 0);
}
-
-
void ImplReleaseTempFonts( SalData& rSalData )
{
int nCount = 0;
@@ -2002,8 +1919,6 @@ void ImplReleaseTempFonts( SalData& rSalData )
#endif // FR_PRIVATE
}
-
-
static bool ImplGetFontAttrFromFile( const OUString& rFontFileURL,
ImplDevFontAttributes& rDFA )
{
@@ -2095,12 +2010,9 @@ static bool ImplGetFontAttrFromFile( const OUString& rFontFileURL,
// byte offsets 0x4D0/0x4D1: winascent+windescent-emunits
// byte offsets 0x4DF/0x4E0: avgwidth
-
return true;
}
-
-
bool WinSalGraphics::AddTempDevFont( PhysicalFontCollection* pFontCollection,
const OUString& rFontFileURL, const OUString& rFontName )
{
@@ -2157,8 +2069,6 @@ bool WinSalGraphics::AddTempDevFont( PhysicalFontCollection* pFontCollection,
return true;
}
-
-
void WinSalGraphics::GetDevFontList( PhysicalFontCollection* pFontCollection )
{
// make sure all fonts are registered at least temporarily
@@ -2259,8 +2169,6 @@ void WinSalGraphics::ClearDevFontCache()
//anything to do here ?
}
-
-
bool WinSalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect )
{
HDC hDC = getHDC();
@@ -2291,8 +2199,6 @@ bool WinSalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect )
return true;
}
-
-
bool WinSalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId,
::basegfx::B2DPolyPolygon& rB2DPolyPoly )
{
@@ -2475,8 +2381,6 @@ bool WinSalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId,
return true;
}
-
-
class ScopedFont
{
public:
@@ -2690,7 +2594,6 @@ bool WinSalGraphics::CreateFontSubset( const OUString& rToFile,
return (nRC == SF_OK);
}
-
const void* WinSalGraphics::GetEmbedFontData( const PhysicalFontFace* pFont,
const sal_Unicode* pUnicodes, sal_Int32* pCharWidths,
FontSubsetInfo& rInfo, long* pDataLen )
@@ -2746,13 +2649,11 @@ const void* WinSalGraphics::GetEmbedFontData( const PhysicalFontFace* pFont,
return (void*)pData;
}
-
void WinSalGraphics::FreeEmbedFontData( const void* pData, long /*nLen*/ )
{
delete[] reinterpret_cast<char*>(const_cast<void*>(pData));
}
-
const Ucs2SIntMap* WinSalGraphics::GetFontEncodingVector( const PhysicalFontFace* pFont, const Ucs2OStrMap** pNonEncoded )
{
// TODO: even for builtin fonts we get here... why?
@@ -2778,7 +2679,6 @@ const Ucs2SIntMap* WinSalGraphics::GetFontEncodingVector( const PhysicalFontFace
return pEncoding;
}
-
void WinSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFont,
bool bVertical,
Int32Vector& rWidths,
@@ -2871,11 +2771,9 @@ void WinSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFont,
}
}
-
void WinSalGraphics::DrawServerFontLayout( const ServerFontLayout& )
{}
-
SystemFontData WinSalGraphics::GetSysFontData( int nFallbacklevel ) const
{
SystemFontData aSysFontData;
@@ -2891,5 +2789,4 @@ SystemFontData WinSalGraphics::GetSysFontData( int nFallbacklevel ) const
return aSysFontData;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/win/source/gdi/salgdi_gdiplus.cxx b/vcl/win/source/gdi/salgdi_gdiplus.cxx
index 23b286abdd88..1dc4f05a088a 100644
--- a/vcl/win/source/gdi/salgdi_gdiplus.cxx
+++ b/vcl/win/source/gdi/salgdi_gdiplus.cxx
@@ -61,8 +61,6 @@
#include <basegfx/polygon/b2dpolygon.hxx>
-
-
void impAddB2DPolygonToGDIPlusGraphicsPathReal(Gdiplus::GpPath *pPath, const basegfx::B2DPolygon& rPolygon, bool bNoLineJoin)
{
sal_uInt32 nCount(rPolygon.count());
@@ -324,8 +322,6 @@ bool WinSalGraphics::drawPolyLine(
return true;
}
-
-
void paintToGdiPlus(
Gdiplus::Graphics& rGraphics,
const SalTwoRect& rTR,
@@ -359,8 +355,6 @@ void paintToGdiPlus(
0);
}
-
-
void setInterpolationMode(
Gdiplus::Graphics& rGraphics,
const long& rSrcWidth,
@@ -394,7 +388,6 @@ void setInterpolationMode(
}
}
-
bool WinSalGraphics::tryDrawBitmapGdiPlus(const SalTwoRect& rTR, const SalBitmap& rSrcBitmap)
{
if(rTR.mnSrcWidth && rTR.mnSrcHeight && rTR.mnDestWidth && rTR.mnDestHeight)
@@ -459,8 +452,6 @@ bool WinSalGraphics::drawAlphaBitmap(
return false;
}
-
-
bool WinSalGraphics::drawTransformedBitmap(
const basegfx::B2DPoint& rNull,
const basegfx::B2DPoint& rX,
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index 45d6c5997987..8fcc16ef2540 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -50,11 +50,9 @@
using namespace std;
-
typedef map< wstring, HTHEME > ThemeMap;
static ThemeMap aThemeMap;
-
/****************************************************
wrap visual styles API to avoid linking against it
it is not available on all Windows platforms
@@ -194,7 +192,6 @@ void SalData::initNWF( void )
pSVData->maNWFData.mbMenuBarDockingAreaCommonBG = true;
}
-
// *********************************************************
// * Release theming handles
// ********************************************************
@@ -343,7 +340,6 @@ bool WinSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nP
return (hTheme != NULL);
}
-
/*
* HitTestNativeControl()
*
@@ -376,7 +372,6 @@ bool ImplDrawTheme( HTHEME hTheme, HDC hDC, int iPart, int iState, RECT rc, cons
return (hr == S_OK);
}
-
Rectangle ImplGetThemeRect( HTHEME hTheme, HDC hDC, int iPart, int iState, const Rectangle& /* aRect */, THEMESIZE eTS = TS_TRUE )
{
SIZE aSz;
@@ -389,7 +384,6 @@ 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 )
{
@@ -1277,7 +1271,6 @@ bool WinSalGraphics::drawNativeControl( ControlType nType,
// restore alignment
SetTextAlign( getHDC(), ta );
-
//GdiFlush();
return bOk;
diff --git a/vcl/win/source/gdi/salvd.cxx b/vcl/win/source/gdi/salvd.cxx
index f349cd943f37..fec719b1aaa1 100644
--- a/vcl/win/source/gdi/salvd.cxx
+++ b/vcl/win/source/gdi/salvd.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <svsys.h>
#include <vcl/sysdata.hxx>
@@ -28,8 +27,6 @@
#include <win/salgdi.h>
#include <win/salvd.h>
-
-
static HBITMAP ImplCreateVirDevBitmap( HDC hDC, long nDX, long nDY,
sal_uInt16 nBitCount )
{
@@ -67,8 +64,6 @@ static HBITMAP ImplCreateVirDevBitmap( HDC hDC, long nDX, long nDY,
return hBitmap;
}
-
-
SalVirtualDevice* WinSalInstance::CreateVirtualDevice( SalGraphics* pSGraphics,
long nDX, long nDY,
sal_uInt16 nBitCount,
@@ -163,8 +158,6 @@ WinSalVirtualDevice::WinSalVirtualDevice()
mbForeignDC = FALSE; // uses a foreign DC instead of a bitmap
}
-
-
WinSalVirtualDevice::~WinSalVirtualDevice()
{
// remove VirDev from list of virtual devices
@@ -188,8 +181,6 @@ WinSalVirtualDevice::~WinSalVirtualDevice()
mpGraphics = NULL;
}
-
-
SalGraphics* WinSalVirtualDevice::AcquireGraphics()
{
if ( mbGraphics )
@@ -201,15 +192,11 @@ SalGraphics* WinSalVirtualDevice::AcquireGraphics()
return mpGraphics;
}
-
-
void WinSalVirtualDevice::ReleaseGraphics( SalGraphics* )
{
mbGraphics = FALSE;
}
-
-
bool WinSalVirtualDevice::SetSize( long nDX, long nDY )
{
if( mbForeignDC || !mhBmp )
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index f47456bf286d..adbb98eb1441 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <svsys.h>
#include "rtl/ustring.hxx"
@@ -59,11 +58,8 @@ typedef boost::unordered_map<int,int> IntMap;
#define DROPPED_OUTGLYPH 0xFFFF
-
#include <config_mingw.h>
-
-
// win32 specific physical font instance
class ImplWinFontEntry : public ImplFontEntry
{
@@ -102,8 +98,6 @@ private:
mutable int mnMinKashidaGlyph;
};
-
-
inline void ImplWinFontEntry::CacheGlyphWidth( int nCharCode, int nCharWidth )
{
maWidthMap[ nCharCode ] = nCharWidth;
@@ -117,8 +111,6 @@ inline int ImplWinFontEntry::GetCachedGlyphWidth( int nCharCode ) const
return it->second;
}
-
-
class WinLayout : public SalLayout
{
public:
@@ -141,8 +133,6 @@ protected:
ImplWinFontEntry& mrWinFontEntry;
};
-
-
class SimpleWinLayout : public WinLayout
{
public:
@@ -187,8 +177,6 @@ private:
BYTE mnCharSet;
};
-
-
WinLayout::WinLayout( HDC hDC, const ImplWinFontData& rWFD, ImplWinFontEntry& rWFE )
: mhDC( hDC ),
mhFont( (HFONT)::GetCurrentObject(hDC,OBJ_FONT) ),
@@ -198,15 +186,11 @@ 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
// mostly used by high resolution reference devices which are never
@@ -229,8 +213,6 @@ HFONT WinLayout::DisableFontScaling() const
return SelectFont( mhDC, hHugeFont );
}
-
-
SimpleWinLayout::SimpleWinLayout( HDC hDC, BYTE nCharSet,
const ImplWinFontData& rWinFontData, ImplWinFontEntry& rWinFontEntry )
: WinLayout( hDC, rWinFontData, rWinFontEntry ),
@@ -251,8 +233,6 @@ SimpleWinLayout::SimpleWinLayout( HDC hDC, BYTE nCharSet,
mbDisableGlyphs = true;
}
-
-
SimpleWinLayout::~SimpleWinLayout()
{
delete[] mpGlyphRTLFlags;
@@ -265,8 +245,6 @@ SimpleWinLayout::~SimpleWinLayout()
delete[] mpOutGlyphs;
}
-
-
bool SimpleWinLayout::LayoutText( ImplLayoutArgs& rArgs )
{
// prepare layout
@@ -537,8 +515,6 @@ bool SimpleWinLayout::LayoutText( ImplLayoutArgs& rArgs )
return true;
}
-
-
int SimpleWinLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIds, Point& rPos, int& nStart,
long* pGlyphAdvances, int* pCharIndexes,
const PhysicalFontFace** /*pFallbackFonts*/ ) const
@@ -606,8 +582,6 @@ int SimpleWinLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIds, Point& rPo
return nCount;
}
-
-
void SimpleWinLayout::DrawText( SalGraphics& rGraphics ) const
{
if( mnGlyphCount <= 0 )
@@ -654,8 +628,6 @@ void SimpleWinLayout::DrawText( SalGraphics& rGraphics ) const
DeleteFont( SelectFont( aHDC, hOrigFont ) );
}
-
-
long SimpleWinLayout::FillDXArray( long* pDXArray ) const
{
if( !mnWidth )
@@ -674,8 +646,6 @@ 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
{
@@ -699,8 +669,6 @@ sal_Int32 SimpleWinLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nF
return -1;
}
-
-
void SimpleWinLayout::GetCaretPositions( int nMaxIdx, long* pCaretXArray ) const
{
long nXPos = mnBaseAdv;
@@ -743,8 +711,6 @@ void SimpleWinLayout::GetCaretPositions( int nMaxIdx, long* pCaretXArray ) const
}
}
-
-
void SimpleWinLayout::Justify( long nNewWidth )
{
long nOldWidth = mnWidth;
@@ -780,8 +746,6 @@ void SimpleWinLayout::Justify( long nNewWidth )
}
}
-
-
void SimpleWinLayout::AdjustLayout( ImplLayoutArgs& rArgs )
{
SalLayout::AdjustLayout( rArgs );
@@ -819,8 +783,6 @@ void SimpleWinLayout::AdjustLayout( ImplLayoutArgs& rArgs )
}
}
-
-
void SimpleWinLayout::ApplyDXArray( const ImplLayoutArgs& rArgs )
{
// try to avoid disturbance of text flow for LSB rounding case;
@@ -864,8 +826,6 @@ void SimpleWinLayout::ApplyDXArray( const ImplLayoutArgs& rArgs )
}
}
-
-
void SimpleWinLayout::MoveGlyph( int nStart, long nNewXPos )
{
if( nStart > mnGlyphCount )
@@ -892,15 +852,11 @@ void SimpleWinLayout::MoveGlyph( int nStart, long nNewXPos )
mnBaseAdv += nDelta;
}
-
-
void SimpleWinLayout::DropGlyph( int nStart )
{
mpOutGlyphs[ nStart ] = DROPPED_OUTGLYPH;
}
-
-
void SimpleWinLayout::Simplify( bool /*bIsBase*/ )
{
// return early if no glyph has been dropped
@@ -981,8 +937,6 @@ void SimpleWinLayout::Simplify( bool /*bIsBase*/ )
mnWidth = mnBaseAdv = 0;
}
-
-
struct VisualItem
{
public:
@@ -1002,8 +956,6 @@ public:
bool HasKashidas() const { return mbHasKashidas; }
};
-
-
class UniscribeLayout : public WinLayout
{
public:
@@ -1074,8 +1026,6 @@ static bool bUspInited = false;
static bool bManualCellAlign = true;
-
-
static bool InitUSP()
{
// get the usp10.dll version info
@@ -1114,8 +1064,6 @@ static bool InitUSP()
return true;
}
-
-
UniscribeLayout::UniscribeLayout( HDC hDC,
const ImplWinFontData& rWinFontData, ImplWinFontEntry& rWinFontEntry )
: WinLayout( hDC, rWinFontData, rWinFontEntry ),
@@ -1139,8 +1087,6 @@ UniscribeLayout::UniscribeLayout( HDC hDC,
mbDisableGlyphInjection( false )
{}
-
-
UniscribeLayout::~UniscribeLayout()
{
delete[] mpScriptItems;
@@ -1155,8 +1101,6 @@ UniscribeLayout::~UniscribeLayout()
delete[] mpGlyphs2Chars;
}
-
-
bool UniscribeLayout::LayoutText( ImplLayoutArgs& rArgs )
{
// for a base layout only the context glyphs have to be dropped
@@ -1575,8 +1519,6 @@ bool UniscribeLayout::LayoutText( ImplLayoutArgs& rArgs )
return true;
}
-
-
// calculate the range of relevant glyphs for this visual item
bool UniscribeLayout::GetItemSubrange( const VisualItem& rVisualItem,
int& rMinGlyphPos, int& rEndGlyphPos ) const
@@ -1638,8 +1580,6 @@ 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,
const PhysicalFontFace** /*pFallbackFonts*/ ) const
@@ -1905,8 +1845,6 @@ int UniscribeLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos,
return nCount;
}
-
-
void UniscribeLayout::MoveGlyph( int nStartx8, long nNewXPos )
{
DBG_ASSERT( !(nStartx8 & 0xff), "USP::MoveGlyph(): glyph injection not disabled!" );
@@ -1972,8 +1910,6 @@ void UniscribeLayout::MoveGlyph( int nStartx8, long nNewXPos )
}
}
-
-
void UniscribeLayout::DropGlyph( int nStartx8 )
{
DBG_ASSERT( !(nStartx8 & 0xff), "USP::DropGlyph(): glyph injection not disabled!" );
@@ -2001,8 +1937,6 @@ void UniscribeLayout::DropGlyph( int nStartx8 )
mpOutGlyphs[ nStart ] = DROPPED_OUTGLYPH;
}
-
-
void UniscribeLayout::Simplify( bool /*bIsBase*/ )
{
static const WCHAR cDroppedGlyph = DROPPED_OUTGLYPH;
@@ -2104,8 +2038,6 @@ void UniscribeLayout::Simplify( bool /*bIsBase*/ )
}
}
-
-
void UniscribeLayout::DrawText( SalGraphics& ) const
{
HFONT hOrigFont = DisableFontScaling();
@@ -2156,8 +2088,6 @@ void UniscribeLayout::DrawText( SalGraphics& ) const
DeleteFont( SelectFont( mhDC, hOrigFont ) );
}
-
-
long UniscribeLayout::FillDXArray( long* pDXArray ) const
{
// calculate width of the complete layout
@@ -2187,8 +2117,6 @@ long UniscribeLayout::FillDXArray( long* pDXArray ) const
return nWidth;
}
-
-
sal_Int32 UniscribeLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) const
{
long nWidth = 0;
@@ -2232,8 +2160,6 @@ sal_Int32 UniscribeLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nF
return -1;
}
-
-
void UniscribeLayout::GetCaretPositions( int nMaxIdx, long* pCaretXArray ) const
{
int i;
@@ -2301,8 +2227,6 @@ void UniscribeLayout::GetCaretPositions( int nMaxIdx, long* pCaretXArray ) const
}
}
-
-
void UniscribeLayout::AdjustLayout( ImplLayoutArgs& rArgs )
{
SalLayout::AdjustLayout( rArgs );
@@ -2314,8 +2238,6 @@ void UniscribeLayout::AdjustLayout( ImplLayoutArgs& rArgs )
Justify( rArgs.mnLayoutWidth );
}
-
-
void UniscribeLayout::ApplyDXArray( const ImplLayoutArgs& rArgs )
{
const long* pDXArray = rArgs.mpDXArray;
@@ -2453,8 +2375,6 @@ void UniscribeLayout::ApplyDXArray( const ImplLayoutArgs& rArgs )
}
}
-
-
void UniscribeLayout::InitKashidaHandling()
{
if( mnMinKashidaGlyph != 0 ) // already initialized
@@ -2597,8 +2517,6 @@ bool UniscribeLayout::KashidaWordFix ( int nMinGlyphPos, int nEndGlyphPos, int*
return true;
}
-
-
void UniscribeLayout::Justify( long nNewWidth )
{
long nOldWidth = 0;
@@ -2649,8 +2567,6 @@ void UniscribeLayout::Justify( long nNewWidth )
}
}
-
-
bool UniscribeLayout::IsKashidaPosValid ( int nCharPos ) const
{
// we have to find the visual item first since the mpLogClusters[]
@@ -2904,7 +2820,6 @@ void GraphiteWinLayout::Simplify( bool is_base )
}
#endif // ENABLE_GRAPHITE
-
SalLayout* WinSalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLevel )
{
DBG_ASSERT( mpWinFontEntry[nFallbackLevel], "WinSalGraphics mpWinFontEntry==NULL");
@@ -2957,8 +2872,6 @@ SalLayout* WinSalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe
return pWinLayout;
}
-
-
int WinSalGraphics::GetMinKashidaWidth()
{
if( !mpWinFontEntry[0] )
@@ -2968,8 +2881,6 @@ int WinSalGraphics::GetMinKashidaWidth()
return nMinKashida;
}
-
-
ImplWinFontEntry::ImplWinFontEntry( FontSelectPattern& rFSD )
: ImplFontEntry( rFSD )
, mpKerningPairs( NULL )
@@ -2981,8 +2892,6 @@ ImplWinFontEntry::ImplWinFontEntry( FontSelectPattern& rFSD )
maScriptCache = NULL;
}
-
-
ImplWinFontEntry::~ImplWinFontEntry()
{
if( maScriptCache != NULL )
@@ -2990,15 +2899,11 @@ ImplWinFontEntry::~ImplWinFontEntry()
delete[] mpKerningPairs;
}
-
-
bool ImplWinFontEntry::HasKernData() const
{
return (mnKerningPairs >= 0);
}
-
-
void ImplWinFontEntry::SetKernData( int nPairCount, const KERNINGPAIR* pPairData )
{
mnKerningPairs = nPairCount;
@@ -3006,8 +2911,6 @@ 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
{
int nKernAmount = 0;
@@ -3027,8 +2930,6 @@ int ImplWinFontEntry::GetKerning( sal_Unicode cLeft, sal_Unicode cRight ) const
return nKernAmount;
}
-
-
bool ImplWinFontEntry::InitKashidaHandling( HDC hDC )
{
if( mnMinKashidaWidth >= 0 ) // already cached?
@@ -3052,8 +2953,6 @@ bool ImplWinFontEntry::InitKashidaHandling( HDC hDC )
return true;
}
-
-
PhysicalFontFace* ImplWinFontData::Clone() const
{
if( mpUnicodeMap )
@@ -3066,14 +2965,10 @@ PhysicalFontFace* ImplWinFontData::Clone() const
return pClone;
}
-
-
ImplFontEntry* ImplWinFontData::CreateFontInstance( FontSelectPattern& rFSD ) const
{
ImplFontEntry* pEntry = new ImplWinFontEntry( rFSD );
return pEntry;
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/win/source/gdi/wntgdi.cxx b/vcl/win/source/gdi/wntgdi.cxx
index 54ae7ea58b32..7beb176814bd 100644
--- a/vcl/win/source/gdi/wntgdi.cxx
+++ b/vcl/win/source/gdi/wntgdi.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#if defined _MSC_VER
#pragma warning(push, 1)
#endif
@@ -26,8 +25,6 @@
#pragma warning(pop)
#endif
-
-
extern "C"
{
BOOL WINAPI WIN_Rectangle( HDC hDC, int X1, int Y1, int X2, int Y2 )
@@ -36,8 +33,6 @@ BOOL WINAPI WIN_Rectangle( HDC hDC, int X1, int Y1, int X2, int Y2 )
}
}
-
-
extern "C"
{
BOOL WINAPI WIN_Polygon( HDC hDC, CONST POINT * ppt, int ncnt )
@@ -46,8 +41,6 @@ BOOL WINAPI WIN_Polygon( HDC hDC, CONST POINT * ppt, int ncnt )
}
}
-
-
extern "C"
{
BOOL WINAPI WIN_PolyPolygon( HDC hDC, CONST POINT * ppt, LPINT npcnt, int ncnt )
diff --git a/vcl/win/source/window/keynames.cxx b/vcl/win/source/window/keynames.cxx
index 00dd4351d076..0038ae9dc211 100644
--- a/vcl/win/source/window/keynames.cxx
+++ b/vcl/win/source/window/keynames.cxx
@@ -44,7 +44,6 @@
#define PAPUGA_KEY_SHIFT 0x22A0000
#define PAPUGA_KEY_ALT 0x2380000
-
namespace vcl_sal {
struct KeysNameReplacement
@@ -60,14 +59,10 @@ namespace vcl_sal {
int nReplacements;
};
-
-
// CAUTION CAUTION CAUTION
// Every string value in the replacements tables must be in UTF-8
// but with the UTF-8 bytes encoded, not as such! Be careful!
-
-
static const struct KeysNameReplacement aImplReplacements_Asturian[] =
{
{ PAPUGA_KEY_BACK, "Retrocesu" },
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 1aa874331fb3..90b36e034a58 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -113,21 +113,15 @@ using namespace ::com::sun::star::beans;
# define WM_MOUSEHWHEEL 0x020E
#endif
-
-
const unsigned int WM_USER_SYSTEM_WINDOW_ACTIVATED = RegisterWindowMessageA("SYSTEM_WINDOW_ACTIVATED");
bool WinSalFrame::mbInReparent = FALSE;
-
-
// Macros for support of WM_UNICHAR & Keyman 6.0
//#define Uni_UTF32ToSurrogate1(ch) (((unsigned long) (ch) - 0x10000) / 0x400 + 0xD800)
#define Uni_UTF32ToSurrogate2(ch) (((unsigned long) (ch) - 0x10000) % 0x400 + 0xDC00)
#define Uni_SupplementaryPlanesStart 0x10000
-
-
static void UpdateFrameGeometry( HWND hWnd, WinSalFrame* pFrame );
static void SetMaximizedFrameGeometry( HWND hWnd, WinSalFrame* pFrame, RECT* pParentRect = NULL );
@@ -197,8 +191,6 @@ 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 )
{
@@ -282,8 +274,6 @@ void ImplSalGetWorkArea( HWND hWnd, RECT *pRect, const RECT *pParentRect )
}
}
-
-
SalFrame* ImplSalCreateFrame( WinSalInstance* pInst,
HWND hWndParent, sal_uLong nSalFrameStyle )
{
@@ -525,8 +515,6 @@ HWND ImplSalReCreateHWND( HWND hWndParent, HWND oldhWnd, bool bAsChild )
hWndParent, 0, hInstance, (void*)GetWindowPtr( oldhWnd ) );
}
-
-
// translation table from System keycodes into StartView keycodes
#define KEY_TAB_SIZE 146
@@ -681,8 +669,6 @@ static const sal_uInt16 aImplTranslateKeyTab[KEY_TAB_SIZE] =
0 // SCROLLLOCK 145
};
-
-
static UINT ImplSalGetWheelScrollLines()
{
UINT nScrLines = 0;
@@ -703,8 +689,6 @@ static UINT ImplSalGetWheelScrollLines()
return nScrLines;
}
-
-
static UINT ImplSalGetWheelScrollChars()
{
UINT nScrChars = 0;
@@ -729,8 +713,6 @@ static UINT ImplSalGetWheelScrollChars()
return nScrChars;
}
-
-
static void ImplSalAddBorder( const WinSalFrame* pFrame, int& width, int& height )
{
// transform client size into window size
@@ -745,8 +727,6 @@ 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,8 +804,6 @@ static void ImplSalCalcFullScreenSize( const WinSalFrame* pFrame,
rDY = nScreenDY+(nFrameY*2)+nCaptionY;
}
-
-
static void ImplSalFrameFullScreenPos( WinSalFrame* pFrame, bool bAlways = FALSE )
{
if ( bAlways || !IsIconic( pFrame->mhWnd ) )
@@ -842,8 +820,6 @@ static void ImplSalFrameFullScreenPos( WinSalFrame* pFrame, bool bAlways = FALSE
}
}
-
-
WinSalFrame::WinSalFrame()
{
SalData* pSalData = GetSalData();
@@ -912,7 +888,6 @@ WinSalFrame::WinSalFrame()
pSalData->mpFirstFrame = this;
}
-
void WinSalFrame::updateScreenNumber()
{
if( mnDisplay == -1 ) // spans all monitors
@@ -935,8 +910,6 @@ void WinSalFrame::updateScreenNumber()
}
}
-
-
WinSalFrame::~WinSalFrame()
{
SalData* pSalData = GetSalData();
@@ -992,8 +965,6 @@ WinSalFrame::~WinSalFrame()
}
}
-
-
SalGraphics* WinSalFrame::AcquireGraphics()
{
if ( mbGraphics )
@@ -1071,8 +1042,6 @@ SalGraphics* WinSalFrame::AcquireGraphics()
}
}
-
-
void WinSalFrame::ReleaseGraphics( SalGraphics* pGraphics )
{
if ( mpGraphics2 == pGraphics )
@@ -1095,15 +1064,11 @@ void WinSalFrame::ReleaseGraphics( SalGraphics* pGraphics )
mbGraphics = FALSE;
}
-
-
bool WinSalFrame::PostEvent( void* pData )
{
return (bool)ImplPostMessage( mhWnd, SAL_MSG_USEREVENT, 0, (LPARAM)pData );
}
-
-
void WinSalFrame::SetTitle( const OUString& rTitle )
{
DBG_ASSERT( sizeof( WCHAR ) == sizeof( sal_Unicode ), "WinSalFrame::SetTitle(): WCHAR != sal_Unicode" );
@@ -1111,8 +1076,6 @@ void WinSalFrame::SetTitle( const OUString& rTitle )
SetWindowTextW( mhWnd, reinterpret_cast<LPCWSTR>(rTitle.getStr()) );
}
-
-
void WinSalFrame::SetIcon( sal_uInt16 nIcon )
{
// If we have a window without an Icon (for example a dialog), ignore this call
@@ -1133,8 +1096,6 @@ void WinSalFrame::SetIcon( sal_uInt16 nIcon )
ImplSendMessage( mhWnd, WM_SETICON, ICON_SMALL, (LPARAM)hSmIcon );
}
-
-
void WinSalFrame::SetMenu( SalMenu* pSalMenu )
{
WinSalMenu* pWMenu = static_cast<WinSalMenu*>(pSalMenu);
@@ -1147,7 +1108,6 @@ void WinSalFrame::DrawMenuBar()
::DrawMenuBar( mhWnd );
}
-
HWND ImplGetParentHwnd( HWND hWnd )
{
WinSalFrame* pFrame = GetWindowPtr( hWnd );
@@ -1161,15 +1121,11 @@ HWND ImplGetParentHwnd( HWND hWnd )
}
-
-
SalFrame* WinSalFrame::GetParent() const
{
return GetWindowPtr( ImplGetParentHwnd( mhWnd ) );
}
-
-
static void ImplSalShow( HWND hWnd, bool bVisible, bool bNoActivate )
{
WinSalFrame* pFrame = GetWindowPtr( hWnd );
@@ -1246,15 +1202,10 @@ static void ImplSalShow( HWND hWnd, bool bVisible, bool bNoActivate )
}
}
-
-
-
void WinSalFrame::SetExtendedFrameStyle( SalExtStyle )
{
}
-
-
void WinSalFrame::Show( bool bVisible, bool bNoActivate )
{
// Post this Message to the window, because this only works
@@ -1266,15 +1217,11 @@ void WinSalFrame::Show( bool bVisible, bool bNoActivate )
ImplSalShow( mhWnd, bVisible, bNoActivate );
}
-
-
void WinSalFrame::Enable( bool bEnable )
{
EnableWindow( mhWnd, bEnable );
}
-
-
void WinSalFrame::SetMinClientSize( long nWidth, long nHeight )
{
mnMinWidth = nWidth;
@@ -1287,8 +1234,6 @@ void WinSalFrame::SetMaxClientSize( long nWidth, long nHeight )
mnMaxHeight = nHeight;
}
-
-
void WinSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight,
sal_uInt16 nFlags )
{
@@ -1390,7 +1335,6 @@ void WinSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight,
int nScreenWidth;
int nScreenHeight;
-
RECT aRect;
ImplSalGetWorkArea( mhWnd, &aRect, NULL );
nScreenX = aRect.left;
@@ -1448,7 +1392,6 @@ void WinSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight,
nY = ((aRect2.bottom-aRect2.top)-nHeight)/2 + aRect2.top;
}
-
//if ( bVisible )
// mbDefPos = FALSE;
@@ -1457,7 +1400,6 @@ void WinSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight,
nEvent = SALEVENT_MOVERESIZE;
}
-
// Adjust Window in the screen
bool bCheckOffScreen = TRUE;
@@ -1500,8 +1442,6 @@ void WinSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight,
CallCallback( nEvent, NULL );
}
-
-
static void ImplSetParentFrame( WinSalFrame* pThis, HWND hNewParentWnd, bool bAsChild )
{
// save hwnd, will be overwritten in WM_CREATE during createwindow
@@ -1635,7 +1575,6 @@ static void ImplSetParentFrame( WinSalFrame* pThis, HWND hNewParentWnd, bool bAs
}
}
-
// TODO: add SetParent() call for SalObjects
DBG_ASSERT( systemChildren.empty(), "WinSalFrame::SetParent() parent of living system child window will be destroyed!");
@@ -1651,8 +1590,6 @@ static void ImplSetParentFrame( WinSalFrame* pThis, HWND hNewParentWnd, bool bAs
SAL_MSG_DESTROYHWND, (WPARAM) 0, (LPARAM)hWndOld);
}
-
-
void WinSalFrame::SetParent( SalFrame* pNewParent )
{
WinSalFrame::mbInReparent = TRUE;
@@ -1673,9 +1610,6 @@ bool WinSalFrame::SetPluginParent( SystemParentData* pNewParent )
return true;
}
-
-
-
void WinSalFrame::GetWorkArea( Rectangle &rRect )
{
RECT aRect;
@@ -1686,16 +1620,12 @@ void WinSalFrame::GetWorkArea( Rectangle &rRect )
rRect.Bottom() = aRect.bottom-1;
}
-
-
void WinSalFrame::GetClientSize( long& rWidth, long& rHeight )
{
rWidth = maGeometry.nWidth;
rHeight = maGeometry.nHeight;
}
-
-
void WinSalFrame::SetWindowState( const SalFrameState* pState )
{
// Check if the window fits into the screen, in case the screen
@@ -1855,8 +1785,6 @@ void WinSalFrame::SetWindowState( const SalFrameState* pState )
mbDefPos = FALSE; // window was positioned
}
-
-
bool WinSalFrame::GetWindowState( SalFrameState* pState )
{
if ( maState.mnWidth && maState.mnHeight )
@@ -1873,8 +1801,6 @@ bool WinSalFrame::GetWindowState( SalFrameState* pState )
return FALSE;
}
-
-
void WinSalFrame::SetScreenNumber( unsigned int nNewScreen )
{
WinSalSystem* pSys = static_cast<WinSalSystem*>(ImplGetSalSystem());
@@ -1944,8 +1870,6 @@ void WinSalFrame::SetApplicationID( const OUString &rApplicationID )
}
}
-
-
void WinSalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay )
{
if ( (mbFullScreen == bFullScreen) && (!bFullScreen || (mnDisplay == nDisplay)) )
@@ -2009,8 +1933,6 @@ void WinSalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay )
}
}
-
-
void WinSalFrame::StartPresentation( bool bStart )
{
if ( mbPresentation == bStart )
@@ -2064,8 +1986,6 @@ void WinSalFrame::StartPresentation( bool bStart )
}
}
-
-
void WinSalFrame::SetAlwaysOnTop( bool bOnTop )
{
HWND hWnd;
@@ -2076,8 +1996,6 @@ void WinSalFrame::SetAlwaysOnTop( bool bOnTop )
SetWindowPos( mhWnd, hWnd, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE );
}
-
-
static void ImplSalToTop( HWND hWnd, sal_uInt16 nFlags )
{
WinSalFrame* pToTopFrame = GetWindowPtr( hWnd );
@@ -2131,8 +2049,6 @@ static void ImplSalToTop( HWND hWnd, sal_uInt16 nFlags )
}
}
-
-
void WinSalFrame::ToTop( sal_uInt16 nFlags )
{
nFlags &= ~SAL_FRAME_TOTOP_GRABFOCUS; // this flag is not needed on win32
@@ -2145,8 +2061,6 @@ void WinSalFrame::ToTop( sal_uInt16 nFlags )
ImplSalToTop( mhWnd, nFlags );
}
-
-
void WinSalFrame::SetPointer( PointerStyle ePointerStyle )
{
struct ImplPtrData
@@ -2280,8 +2194,6 @@ void WinSalFrame::SetPointer( PointerStyle ePointerStyle )
}
}
-
-
void WinSalFrame::CaptureMouse( bool bCapture )
{
// Send this Message to the window, because CaptureMouse() only work
@@ -2294,8 +2206,6 @@ void WinSalFrame::CaptureMouse( bool bCapture )
ImplSendMessage( mhWnd, nMsg, 0, 0 );
}
-
-
void WinSalFrame::SetPointerPos( long nX, long nY )
{
POINT aPt;
@@ -2305,22 +2215,16 @@ 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 )
{
WinSalFrame* pFrame = GetWindowPtr( hWnd );
@@ -2381,16 +2285,12 @@ static void ImplSalFrameSetInputContext( HWND hWnd, const SalInputContext* pCont
}
}
-
-
void WinSalFrame::SetInputContext( SalInputContext* pContext )
{
// Must be called in the main thread!
ImplSendMessage( mhWnd, SAL_MSG_SETINPUTCONTEXT, 0, (LPARAM)(void*)pContext );
}
-
-
static void ImplSalFrameEndExtTextInput( HWND hWnd, sal_uInt16 nFlags )
{
HIMC hIMC = ImmGetContext( hWnd );
@@ -2407,16 +2307,12 @@ static void ImplSalFrameEndExtTextInput( HWND hWnd, sal_uInt16 nFlags )
}
}
-
-
void WinSalFrame::EndExtTextInput( sal_uInt16 nFlags )
{
// Must be called in the main thread!
ImplSendMessage( mhWnd, SAL_MSG_ENDEXTTEXTINPUT, (WPARAM)nFlags, 0 );
}
-
-
static void ImplGetKeyNameText( LONG lParam, sal_Unicode* pBuf,
UINT& rCount, UINT nMaxSize,
const sal_Char* pReplace )
@@ -2487,8 +2383,6 @@ static void ImplGetKeyNameText( LONG lParam, sal_Unicode* pBuf,
rCount = 0;
}
-
-
OUString WinSalFrame::GetKeyName( sal_uInt16 nKeyCode )
{
static const UINT nMaxKeyLen = 350;
@@ -2689,15 +2583,11 @@ 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 )
{
ImplSalLogFontToFontW( hDC, rLogFont, rFont );
@@ -2716,8 +2606,6 @@ static void ImplSalUpdateStyleFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rF
}
}
-
-
static long ImplA2I( const BYTE* pStr )
{
long n = 0;
@@ -2741,8 +2629,6 @@ static long ImplA2I( const BYTE* pStr )
return n;
}
-
-
void WinSalFrame::UpdateSettings( AllSettings& rSettings )
{
MouseSettings aMouseSettings = rSettings.GetMouseSettings();
@@ -2979,23 +2865,17 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings )
WinSalGraphics::updateSettingsNative( rSettings );
}
-
-
const SystemEnvData* WinSalFrame::GetSystemData() const
{
return &maSysData;
}
-
-
void WinSalFrame::Beep()
{
// a simple beep
MessageBeep( 0 );
}
-
-
SalFrame::SalPointerState WinSalFrame::GetPointerState()
{
SalPointerState aState;
@@ -3021,8 +2901,6 @@ SalFrame::SalPointerState WinSalFrame::GetPointerState()
return aState;
}
-
-
SalFrame::SalIndicatorState WinSalFrame::GetIndicatorState()
{
SalIndicatorState aState;
@@ -3056,15 +2934,11 @@ void WinSalFrame::SimulateKeyPress( sal_uInt16 nKeyCode )
}
}
-
-
void WinSalFrame::ResetClipRegion()
{
SetWindowRgn( mhWnd, 0, TRUE );
}
-
-
void WinSalFrame::BeginSetClipRegion( sal_uLong nRects )
{
if( mpClipRgnData )
@@ -3080,8 +2954,6 @@ void WinSalFrame::BeginSetClipRegion( sal_uLong nRects )
mbFirstClipRect = TRUE;
}
-
-
void WinSalFrame::UnionClipRegion( long nX, long nY, long nWidth, long nHeight )
{
if( ! mpClipRgnData )
@@ -3123,8 +2995,6 @@ void WinSalFrame::UnionClipRegion( long nX, long nY, long nWidth, long nHeight )
mpNextClipRect++;
}
-
-
void WinSalFrame::EndSetClipRegion()
{
if( ! mpClipRgnData )
@@ -3163,8 +3033,6 @@ void WinSalFrame::EndSetClipRegion()
}
}
-
-
static long ImplHandleMouseMsg( HWND hWnd, UINT nMsg,
WPARAM wParam, LPARAM lParam )
{
@@ -3330,8 +3198,6 @@ static long ImplHandleMouseMsg( HWND hWnd, UINT nMsg,
return nRet;
}
-
-
static long ImplHandleMouseActivateMsg( HWND hWnd )
{
WinSalFrame* pFrame = GetWindowPtr( hWnd );
@@ -3350,8 +3216,6 @@ static long ImplHandleMouseActivateMsg( HWND hWnd )
return pFrame->CallCallback( SALEVENT_MOUSEACTIVATE, &aMouseActivateEvt );
}
-
-
static long ImplHandleWheelMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam )
{
DBG_ASSERT( nMsg == WM_MOUSEWHEEL ||
@@ -3422,8 +3286,6 @@ static long ImplHandleWheelMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lPar
return nRet;
}
-
-
static sal_uInt16 ImplSalGetKeyCode( WPARAM wParam )
{
sal_uInt16 nKeyCode;
@@ -3444,8 +3306,6 @@ static sal_uInt16 ImplSalGetKeyCode( WPARAM wParam )
return nKeyCode;
}
-
-
static void ImplUpdateInputLang( WinSalFrame* pFrame )
{
UINT nLang = LOWORD( GetKeyboardLayout( 0 ) );
@@ -3461,7 +3321,6 @@ static void ImplUpdateInputLang( WinSalFrame* pFrame )
return;
}
-
static sal_Unicode ImplGetCharCode( WinSalFrame* pFrame, WPARAM nCharCode )
{
ImplUpdateInputLang( pFrame );
@@ -3471,8 +3330,6 @@ static sal_Unicode ImplGetCharCode( WinSalFrame* pFrame, WPARAM nCharCode )
return (sal_Unicode)nCharCode;
}
-
-
LanguageType WinSalFrame::GetInputLanguage()
{
if( !mnInputLang )
@@ -3484,8 +3341,6 @@ LanguageType WinSalFrame::GetInputLanguage()
return (LanguageType) mnInputLang;
}
-
-
bool WinSalFrame::MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode )
{
bool bRet = FALSE;
@@ -3522,8 +3377,6 @@ bool WinSalFrame::MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangT
return bRet;
}
-
-
static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg,
WPARAM wParam, LPARAM lParam, LRESULT& rResult )
{
@@ -3806,8 +3659,6 @@ static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg,
}
}
-
-
long ImplHandleSalObjKeyMsg( HWND hWnd, UINT nMsg,
WPARAM wParam, LPARAM lParam )
{
@@ -3859,8 +3710,6 @@ long ImplHandleSalObjKeyMsg( HWND hWnd, UINT nMsg,
return 0;
}
-
-
long ImplHandleSalObjSysCharMsg( HWND hWnd, WPARAM wParam, LPARAM lParam )
{
WinSalFrame* pFrame = GetWindowPtr( hWnd );
@@ -3897,8 +3746,6 @@ long ImplHandleSalObjSysCharMsg( HWND hWnd, WPARAM wParam, LPARAM lParam )
return nRet;
}
-
-
static bool ImplHandlePaintMsg( HWND hWnd )
{
bool bMutex = FALSE;
@@ -3966,8 +3813,6 @@ static bool ImplHandlePaintMsg( HWND hWnd )
return bMutex ? true : false;
}
-
-
static void ImplHandlePaintMsg2( HWND hWnd, RECT* pRect )
{
// Paint
@@ -3986,8 +3831,6 @@ static void ImplHandlePaintMsg2( HWND hWnd, RECT* pRect )
ImplPostMessage( hWnd, SAL_MSG_POSTPAINT, (WPARAM)pRect, 0 );
}
-
-
static void SetMaximizedFrameGeometry( HWND hWnd, WinSalFrame* pFrame, RECT* pParentRect )
{
// calculate and set frame geometry of a maximized window - useful if the window is still hidden
@@ -4072,8 +3915,6 @@ static void UpdateFrameGeometry( HWND hWnd, WinSalFrame* pFrame )
pFrame->updateScreenNumber();
}
-
-
static void ImplCallMoveHdl( HWND hWnd )
{
WinSalFrame* pFrame = GetWindowPtr( hWnd );
@@ -4086,8 +3927,6 @@ static void ImplCallMoveHdl( HWND hWnd )
}
}
-
-
static void ImplCallClosePopupsHdl( HWND hWnd )
{
WinSalFrame* pFrame = GetWindowPtr( hWnd );
@@ -4097,8 +3936,6 @@ static void ImplCallClosePopupsHdl( HWND hWnd )
}
}
-
-
static void ImplHandleMoveMsg( HWND hWnd )
{
if ( ImplSalYieldMutexTryToAcquire() )
@@ -4136,8 +3973,6 @@ static void ImplHandleMoveMsg( HWND hWnd )
ImplPostMessage( hWnd, SAL_MSG_POSTMOVE, 0, 0 );
}
-
-
static void ImplCallSizeHdl( HWND hWnd )
{
// as Windows can send these messages also, we have to use
@@ -4159,8 +3994,6 @@ static void ImplCallSizeHdl( HWND hWnd )
ImplPostMessage( hWnd, SAL_MSG_POSTCALLSIZE, 0, 0 );
}
-
-
static void ImplHandleSizeMsg( HWND hWnd, WPARAM wParam, LPARAM lParam )
{
if ( (wParam != SIZE_MAXSHOW) && (wParam != SIZE_MAXHIDE) )
@@ -4180,8 +4013,6 @@ static void ImplHandleSizeMsg( HWND hWnd, WPARAM wParam, LPARAM lParam )
}
}
-
-
static void ImplHandleFocusMsg( HWND hWnd )
{
if ( ImplSalYieldMutexTryToAcquire() )
@@ -4218,8 +4049,6 @@ static void ImplHandleFocusMsg( HWND hWnd )
ImplPostMessage( hWnd, SAL_MSG_POSTFOCUS, 0, 0 );
}
-
-
static void ImplHandleCloseMsg( HWND hWnd )
{
if ( ImplSalYieldMutexTryToAcquire() )
@@ -4236,8 +4065,6 @@ static void ImplHandleCloseMsg( HWND hWnd )
ImplPostMessage( hWnd, WM_CLOSE, 0, 0 );
}
-
-
static long ImplHandleShutDownMsg( HWND hWnd )
{
ImplSalYieldMutexAcquireWithWait();
@@ -4251,8 +4078,6 @@ static long ImplHandleShutDownMsg( HWND hWnd )
return nRet;
}
-
-
static void ImplHandleSettingsChangeMsg( HWND hWnd, UINT nMsg,
WPARAM wParam, LPARAM lParam )
{
@@ -4303,8 +4128,6 @@ static void ImplHandleSettingsChangeMsg( HWND hWnd, UINT nMsg,
ImplSalYieldMutexRelease();
}
-
-
static void ImplHandleUserEvent( HWND hWnd, LPARAM lParam )
{
ImplSalYieldMutexAcquireWithWait();
@@ -4316,8 +4139,6 @@ static void ImplHandleUserEvent( HWND hWnd, LPARAM lParam )
ImplSalYieldMutexRelease();
}
-
-
static void ImplHandleForcePalette( HWND hWnd )
{
SalData* pSalData = GetSalData();
@@ -4350,8 +4171,6 @@ static void ImplHandleForcePalette( HWND hWnd )
}
}
-
-
static LRESULT ImplHandlePalette( bool bFrame, HWND hWnd, UINT nMsg,
WPARAM wParam, LPARAM lParam, int& rDef )
{
@@ -4500,8 +4319,6 @@ static LRESULT ImplHandlePalette( bool bFrame, HWND hWnd, UINT nMsg,
return nCols;
}
-
-
static int ImplHandleMinMax( HWND hWnd, LPARAM lParam )
{
int bRet = FALSE;
@@ -4577,8 +4394,6 @@ 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
// is specified we just use the first item (ie, pos=0)
@@ -5098,8 +4913,6 @@ static int ImplHandleSysCommand( HWND hWnd, WPARAM wParam, LPARAM lParam )
return FALSE;
}
-
-
static void ImplHandleInputLangChange( HWND hWnd, WPARAM, LPARAM lParam )
{
ImplSalYieldMutexAcquireWithWait();
@@ -5131,8 +4944,6 @@ static void ImplHandleInputLangChange( HWND hWnd, WPARAM, LPARAM lParam )
ImplSalYieldMutexRelease();
}
-
-
static void ImplUpdateIMECursorPos( WinSalFrame* pFrame, HIMC hIMC )
{
COMPOSITIONFORM aForm;
@@ -5162,8 +4973,6 @@ static void ImplUpdateIMECursorPos( WinSalFrame* pFrame, HIMC hIMC )
}
}
-
-
static bool ImplHandleIMEStartComposition( HWND hWnd )
{
bool bDef = TRUE;
@@ -5192,8 +5001,6 @@ static bool ImplHandleIMEStartComposition( HWND hWnd )
return bDef;
}
-
-
static bool ImplHandleIMECompositionInput( WinSalFrame* pFrame,
HIMC hIMC, LPARAM lParam )
{
@@ -5323,8 +5130,6 @@ static bool ImplHandleIMECompositionInput( WinSalFrame* pFrame,
return !bDef;
}
-
-
static bool ImplHandleIMEComposition( HWND hWnd, LPARAM lParam )
{
bool bDef = TRUE;
@@ -5370,8 +5175,6 @@ static bool ImplHandleIMEComposition( HWND hWnd, LPARAM lParam )
return bDef;
}
-
-
static bool ImplHandleIMEEndComposition( HWND hWnd )
{
bool bDef = TRUE;
@@ -5390,8 +5193,6 @@ static bool ImplHandleIMEEndComposition( HWND hWnd )
return bDef;
}
-
-
static boolean ImplHandleAppCommand( HWND hWnd, LPARAM lParam )
{
sal_Int16 nCommand = 0;
@@ -5437,7 +5238,6 @@ static boolean ImplHandleAppCommand( HWND hWnd, LPARAM lParam )
return false;
}
-
static void ImplHandleIMENotify( HWND hWnd, WPARAM wParam )
{
if ( wParam == (WPARAM)IMN_OPENCANDIDATE )
@@ -5491,8 +5291,6 @@ static void ImplHandleIMENotify( HWND hWnd, WPARAM wParam )
}
}
-
-
static bool
ImplHandleGetObject(HWND hWnd, LPARAM lParam, WPARAM wParam, LRESULT & nRet)
{
@@ -5531,8 +5329,6 @@ ImplHandleGetObject(HWND hWnd, LPARAM lParam, WPARAM wParam, LRESULT & nRet)
return false;
}
-
-
static LRESULT ImplHandleIMEReconvertString( HWND hWnd, LPARAM lParam )
{
WinSalFrame* pFrame = GetWindowPtr( hWnd );
@@ -5586,8 +5382,6 @@ static LRESULT ImplHandleIMEReconvertString( HWND hWnd, LPARAM lParam )
return nRet;
}
-
-
static LRESULT ImplHandleIMEConfirmReconvertString( HWND hWnd, LPARAM lParam )
{
WinSalFrame* pFrame = GetWindowPtr( hWnd );
@@ -5654,8 +5448,6 @@ static LRESULT ImplHandleIMEQueryCharPosition( HWND hWnd, LPARAM lParam ) {
return TRUE;
}
-
-
void SalTestMouseLeave()
{
SalData* pSalData = GetSalData();
@@ -5669,8 +5461,6 @@ void SalTestMouseLeave()
}
}
-
-
static int ImplSalWheelMousePos( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ,
LRESULT& rResult )
{
@@ -5699,8 +5489,6 @@ 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 )
{
LRESULT nRet = 0;
@@ -6177,8 +5965,6 @@ LRESULT CALLBACK SalFrameWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM l
return nRet;
}
-
-
bool ImplHandleGlobalMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, LRESULT& rlResult )
{
// handle all messages concerning all frames so they get processed only once
@@ -6200,8 +5986,6 @@ bool ImplHandleGlobalMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, LR
return bResult;
}
-
-
bool ImplWriteLastError( DWORD lastError, const char *szApiCall )
{
static int first=1;
@@ -6262,8 +6046,6 @@ 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 522bf2134827..075860413b1a 100644
--- a/vcl/win/source/window/salmenu.cxx
+++ b/vcl/win/source/window/salmenu.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <svsys.h>
#include <vcl/menu.hxx>
@@ -39,8 +38,6 @@
static DWORD myerr=0;
-
-
bool SalData::IsKnownMenuHandle( HMENU hMenu )
{
if( mhMenuSet.find( hMenu ) == mhMenuSet.end() )
@@ -49,8 +46,6 @@ bool SalData::IsKnownMenuHandle( HMENU hMenu )
return TRUE;
}
-
-
// WinSalInst factory methods
SalMenu* WinSalInstance::CreateMenu( bool bMenuBar, Menu* )
@@ -75,7 +70,6 @@ void WinSalInstance::DestroyMenu( SalMenu* pSalMenu )
delete pSalMenu;
}
-
SalMenuItem* WinSalInstance::CreateMenuItem( const SalItemParams* pItemData )
{
if( !pItemData )
@@ -124,9 +118,6 @@ void WinSalInstance::DestroyMenuItem( SalMenuItem* pSalMenuItem )
delete pSalMenuItem;
}
-
-
-
static void ImplDrawMenuBar( SalMenu *pMenu )
{
if( pMenu->VisibleMenuBar() )
@@ -140,9 +131,6 @@ static void ImplDrawMenuBar( SalMenu *pMenu )
}
}
-
-
-
/*
* WinSalMenu
*/
@@ -377,13 +365,10 @@ void WinSalMenu::GetSystemMenuData( SystemMenuData* pData )
pData->hMenu = mhMenu;
}
-
-
/*
* SalMenuItem
*/
-
WinSalMenuItem::WinSalMenuItem()
{
memset( &mInfo, 0, sizeof( MENUITEMINFOW ) );
@@ -398,6 +383,4 @@ 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 981937638e25..d79c52271b4c 100644
--- a/vcl/win/source/window/salobj.cxx
+++ b/vcl/win/source/window/salobj.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <string.h>
#include <svsys.h>
@@ -31,8 +30,6 @@
#include <win/salframe.h>
#include <win/salobj.h>
-
-
static bool ImplIsSysWindowOrChild( HWND hWndParent, HWND hWndChild )
{
if ( hWndParent == hWndChild )
@@ -52,8 +49,6 @@ static bool ImplIsSysWindowOrChild( HWND hWndParent, HWND hWndChild )
return FALSE;
}
-
-
WinSalObject* ImplFindSalObject( HWND hWndChild )
{
SalData* pSalData = GetSalData();
@@ -69,8 +64,6 @@ WinSalObject* ImplFindSalObject( HWND hWndChild )
return NULL;
}
-
-
WinSalFrame* ImplFindSalObjectFrame( HWND hWnd )
{
WinSalFrame* pFrame = NULL;
@@ -92,8 +85,6 @@ WinSalFrame* ImplFindSalObjectFrame( HWND hWnd )
return pFrame;
}
-
-
LRESULT CALLBACK SalSysMsgProc( int nCode, WPARAM wParam, LPARAM lParam )
{
// Used for Unicode and none Unicode
@@ -149,8 +140,6 @@ LRESULT CALLBACK SalSysMsgProc( int nCode, WPARAM wParam, LPARAM lParam )
return CallNextHookEx( pSalData->mhSalObjMsgHook, nCode, wParam, lParam );
}
-
-
bool ImplSalPreDispatchMsg( MSG* pMsg )
{
// Used for Unicode and none Unicode
@@ -234,8 +223,6 @@ bool ImplSalPreDispatchMsg( MSG* pMsg )
return FALSE;
}
-
-
void ImplSalPostDispatchMsg( MSG* pMsg, LRESULT /* nDispatchResult */ )
{
// Used for Unicode and none Unicode
@@ -260,8 +247,6 @@ void ImplSalPostDispatchMsg( MSG* pMsg, LRESULT /* nDispatchResult */ )
pSalData->mnSalObjWantKeyEvt = 0;
}
-
-
LRESULT CALLBACK SalSysObjWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, int& rDef )
{
WinSalObject* pSysObj;
@@ -388,8 +373,6 @@ 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 )
{
LRESULT nRet = 0;
@@ -470,8 +453,6 @@ LRESULT CALLBACK SalSysObjChildWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LP
return nRet;
}
-
-
SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent )
{
SalData* pSalData = GetSalData();
@@ -567,8 +548,6 @@ SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent )
return NULL;
}
-
-
WinSalObject::WinSalObject()
{
SalData* pSalData = GetSalData();
@@ -584,8 +563,6 @@ WinSalObject::WinSalObject()
pSalData->mpFirstObject = this;
}
-
-
WinSalObject::~WinSalObject()
{
SalData* pSalData = GetSalData();
@@ -626,22 +603,16 @@ 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 )
{
sal_uLong nRectBufSize = sizeof(RECT)*nRectCount;
@@ -662,8 +633,6 @@ void WinSalObject::BeginSetClipRegion( sal_uLong nRectCount )
mbFirstClipRect = TRUE;
}
-
-
void WinSalObject::UnionClipRegion( long nX, long nY, long nWidth, long nHeight )
{
RECT* pRect = mpNextClipRect;
@@ -701,8 +670,6 @@ void WinSalObject::UnionClipRegion( long nX, long nY, long nWidth, long nHeight
mpNextClipRect++;
}
-
-
void WinSalObject::EndSetClipRegion()
{
HRGN hRegion;
@@ -726,8 +693,6 @@ void WinSalObject::EndSetClipRegion()
SetWindowRgn( mhWnd, hRegion, TRUE );
}
-
-
void WinSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight )
{
sal_uLong nStyle = 0;
@@ -742,8 +707,6 @@ void WinSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight )
SWP_NOZORDER | SWP_NOACTIVATE | nStyle );
}
-
-
void WinSalObject::Show( bool bVisible )
{
if ( bVisible )
@@ -752,15 +715,11 @@ void WinSalObject::Show( bool bVisible )
ShowWindow( mhWnd, SW_HIDE );
}
-
-
void WinSalObject::Enable( bool bEnable )
{
EnableWindow( mhWnd, bEnable );
}
-
-
void WinSalObject::GrabFocus()
{
if ( mhLastFocusWnd &&
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 08:50:56 +0000