diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-06-10 12:57:30 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-06-10 14:03:35 +0200 |
| commit | 956c775c54fd60647fbd936402269db3fea88059 (patch) | |
| tree | 55187715fbbb9eda7f0914ef713af14faaf4e05d | |
| parent | 008147e8056f31bcc71da0158e2593e088ffec6d (diff) | |
mingw64: Don't cast from MAKELONG to pointer directly
Change-Id: Ia0ff071a5676f27d39175e30d7c5f472e32c99b3
| -rw-r--r-- | fpicker/source/win32/filepicker/PreviewCtrl.cxx | 2 | ||||
| -rw-r--r-- | fpicker/source/win32/filepicker/dibpreview.cxx | 8 | ||||
| -rw-r--r-- | fpicker/source/win32/filepicker/helppopupwindow.cxx | 2 | ||||
| -rw-r--r-- | fpicker/source/win32/folderpicker/MtaFop.cxx | 2 |
4 files changed, 4 insertions, 10 deletions
diff --git a/fpicker/source/win32/filepicker/PreviewCtrl.cxx b/fpicker/source/win32/filepicker/PreviewCtrl.cxx index bc37fbad9666..e061a63f3b3a 100644 --- a/fpicker/source/win32/filepicker/PreviewCtrl.cxx +++ b/fpicker/source/win32/filepicker/PreviewCtrl.cxx @@ -280,7 +280,7 @@ CFilePreview::~CFilePreview( ) { // unregister preview window class sal_Bool bRet = UnregisterClass( - (LPCTSTR)MAKELONG( m_atomPrevWndClass, 0 ), + (LPCTSTR)(DWORD_PTR)MAKELONG( m_atomPrevWndClass, 0 ), m_hInstance ); OSL_POSTCOND( bRet, "Unregister preview window class failed" ); } diff --git a/fpicker/source/win32/filepicker/dibpreview.cxx b/fpicker/source/win32/filepicker/dibpreview.cxx index e3b437dbf38c..1bfb21d35d29 100644 --- a/fpicker/source/win32/filepicker/dibpreview.cxx +++ b/fpicker/source/win32/filepicker/dibpreview.cxx @@ -48,12 +48,6 @@ namespace /* private */ #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 //--------------------------------------------------- @@ -445,7 +439,7 @@ void SAL_CALL CDIBPreview::UnregisterDibPreviewWindowClass() 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; } } diff --git a/fpicker/source/win32/filepicker/helppopupwindow.cxx b/fpicker/source/win32/filepicker/helppopupwindow.cxx index 732d3e01b920..63be5564a7f2 100644 --- a/fpicker/source/win32/filepicker/helppopupwindow.cxx +++ b/fpicker/source/win32/filepicker/helppopupwindow.cxx @@ -585,7 +585,7 @@ void SAL_CALL CHelpPopupWindow::UnregisterWindowClass( ) if ( 0 == s_RegisterWndClassCount ) { if ( !UnregisterClass( - (LPCTSTR)MAKELONG( s_ClassAtom, 0 ), m_hInstance ) ) + (LPCTSTR)(DWORD_PTR)MAKELONG( s_ClassAtom, 0 ), m_hInstance ) ) { OSL_FAIL( "unregister window class failed" ); } diff --git a/fpicker/source/win32/folderpicker/MtaFop.cxx b/fpicker/source/win32/folderpicker/MtaFop.cxx index 10705cd4b795..c45519009e0a 100644 --- a/fpicker/source/win32/folderpicker/MtaFop.cxx +++ b/fpicker/source/win32/folderpicker/MtaFop.cxx @@ -815,7 +815,7 @@ void SAL_CALL CMtaFolderPicker::UnregisterStaRequestWindowClass( ) if ( 0 == s_StaRequestWndRegisterCount ) { UnregisterClass( - (LPCTSTR)MAKELONG( s_ClassAtom, 0 ), m_hInstance ); + (LPCTSTR)(DWORD_PTR)MAKELONG( s_ClassAtom, 0 ), m_hInstance ); s_ClassAtom = 0; } |