Kaydet (Commit) 956c775c authored tarafından Fridrich Štrba's avatar Fridrich Štrba

mingw64: Don't cast from MAKELONG to pointer directly

Change-Id: Ia0ff071a5676f27d39175e30d7c5f472e32c99b3
üst 008147e8
...@@ -280,7 +280,7 @@ CFilePreview::~CFilePreview( ) ...@@ -280,7 +280,7 @@ CFilePreview::~CFilePreview( )
{ {
// unregister preview window class // unregister preview window class
sal_Bool bRet = UnregisterClass( sal_Bool bRet = UnregisterClass(
(LPCTSTR)MAKELONG( m_atomPrevWndClass, 0 ), (LPCTSTR)(DWORD_PTR)MAKELONG( m_atomPrevWndClass, 0 ),
m_hInstance ); m_hInstance );
OSL_POSTCOND( bRet, "Unregister preview window class failed" ); OSL_POSTCOND( bRet, "Unregister preview window class failed" );
} }
......
...@@ -48,12 +48,6 @@ namespace /* private */ ...@@ -48,12 +48,6 @@ namespace /* private */
#define PREVIEWWND_CLASS_NAME TEXT("DIBPreviewWnd###") #define PREVIEWWND_CLASS_NAME TEXT("DIBPreviewWnd###")
// means 3 pixel left and 3 pixel right
#define HORZ_BODER_SPACE 6
// means 3 pixel top and 3 pixel bottom
#define VERT_BORDER_SPACE 6
//--------------------------------------------------- //---------------------------------------------------
// static member initialization // static member initialization
//--------------------------------------------------- //---------------------------------------------------
...@@ -445,7 +439,7 @@ void SAL_CALL CDIBPreview::UnregisterDibPreviewWindowClass() ...@@ -445,7 +439,7 @@ void SAL_CALL CDIBPreview::UnregisterDibPreviewWindowClass()
if (0 == s_RegisterDibPreviewWndCount) if (0 == s_RegisterDibPreviewWndCount)
{ {
UnregisterClass((LPCTSTR)MAKELONG(s_ClassAtom,0),m_Instance); UnregisterClass((LPCTSTR)(DWORD_PTR)MAKELONG(s_ClassAtom,0),m_Instance);
s_ClassAtom = 0; s_ClassAtom = 0;
} }
} }
......
...@@ -585,7 +585,7 @@ void SAL_CALL CHelpPopupWindow::UnregisterWindowClass( ) ...@@ -585,7 +585,7 @@ void SAL_CALL CHelpPopupWindow::UnregisterWindowClass( )
if ( 0 == s_RegisterWndClassCount ) if ( 0 == s_RegisterWndClassCount )
{ {
if ( !UnregisterClass( if ( !UnregisterClass(
(LPCTSTR)MAKELONG( s_ClassAtom, 0 ), m_hInstance ) ) (LPCTSTR)(DWORD_PTR)MAKELONG( s_ClassAtom, 0 ), m_hInstance ) )
{ {
OSL_FAIL( "unregister window class failed" ); OSL_FAIL( "unregister window class failed" );
} }
......
...@@ -815,7 +815,7 @@ void SAL_CALL CMtaFolderPicker::UnregisterStaRequestWindowClass( ) ...@@ -815,7 +815,7 @@ void SAL_CALL CMtaFolderPicker::UnregisterStaRequestWindowClass( )
if ( 0 == s_StaRequestWndRegisterCount ) if ( 0 == s_StaRequestWndRegisterCount )
{ {
UnregisterClass( UnregisterClass(
(LPCTSTR)MAKELONG( s_ClassAtom, 0 ), m_hInstance ); (LPCTSTR)(DWORD_PTR)MAKELONG( s_ClassAtom, 0 ), m_hInstance );
s_ClassAtom = 0; s_ClassAtom = 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment