diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 09:54:01 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 09:54:01 +0000 |
| commit | d98b7d2ba5d92a39e7b410c012d755ed75449a33 (patch) | |
| tree | 1687ae6e79a4b51abba7def82940fa76844cc7ac /fpicker/source | |
| parent | 62814e77df53f44d18420f093f9ea057b4c019ab (diff) | |
INTEGRATION: CWS sb59 (1.5.100); FILE MERGED
2006/08/10 12:04:52 sb 1.5.100.1: #i67487# Made code warning-free (wntmsci10).
Diffstat (limited to 'fpicker/source')
| -rw-r--r-- | fpicker/source/win32/filepicker/getfilenamewrapper.hxx | 10 | ||||
| -rw-r--r-- | fpicker/source/win32/filepicker/helppopupwindow.hxx | 17 |
2 files changed, 18 insertions, 9 deletions
diff --git a/fpicker/source/win32/filepicker/getfilenamewrapper.hxx b/fpicker/source/win32/filepicker/getfilenamewrapper.hxx index 79c621a1205a..6f925509a259 100644 --- a/fpicker/source/win32/filepicker/getfilenamewrapper.hxx +++ b/fpicker/source/win32/filepicker/getfilenamewrapper.hxx @@ -4,9 +4,9 @@ * * $RCSfile: getfilenamewrapper.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2005-09-08 23:46:19 $ + * last change: $Author: obo $ $Date: 2006-10-12 10:53:35 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -45,8 +45,14 @@ #endif #define WIN32_LEAN_AND_MEAN +#if defined _MSC_VER +#pragma warning(push, 1) +#endif #include <windows.h> #include <commdlg.h> +#if defined _MSC_VER +#pragma warning(pop) +#endif /* A simple wrapper around the GetOpenFileName/GetSaveFileName API. diff --git a/fpicker/source/win32/filepicker/helppopupwindow.hxx b/fpicker/source/win32/filepicker/helppopupwindow.hxx index ee54e2bd79fa..b136db1c1bfd 100644 --- a/fpicker/source/win32/filepicker/helppopupwindow.hxx +++ b/fpicker/source/win32/filepicker/helppopupwindow.hxx @@ -4,9 +4,9 @@ * * $RCSfile: helppopupwindow.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2005-09-08 23:46:46 $ + * last change: $Author: obo $ $Date: 2006-10-12 10:54:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -53,7 +53,13 @@ #endif #define WIN32_LEAN_AND_MEAN +#if defined _MSC_VER +#pragma warning(push, 1) +#endif #include <windows.h> +#if defined _MSC_VER +#pragma warning(pop) +#endif //--------------------------------------------- // declaration @@ -85,10 +91,7 @@ public: */ CHelpPopupWindow( HINSTANCE hInstance, - HWND hwndParent = NULL, - sal_Int32 minWidth = 0, - sal_Int32 hMargins = 0, - sal_Int32 vMargins = 0 ); + HWND hwndParent ); /* dtor @@ -113,7 +116,7 @@ public: private: void SAL_CALL onPaint( HWND, HDC ); - void SAL_CALL onNcDestroy( HWND ); + void SAL_CALL onNcDestroy(); void SAL_CALL onCreate( HWND ); POINT SAL_CALL calcUpperLeftCorner( ); |