diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 09:52:13 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 09:52:13 +0000 |
| commit | cfb664bbb42277a4c197a62afecc17735b4a958f (patch) | |
| tree | a2e3f3b06c0925fa4bb48fb46a4cc387939a3cb5 /fpicker | |
| parent | 202903e92a32c09ad479cd29f2043e3b13d4345b (diff) | |
INTEGRATION: CWS sb59 (1.3.100); FILE MERGED
2006/08/10 12:04:51 sb 1.3.100.1: #i67487# Made code warning-free (wntmsci10).
Diffstat (limited to 'fpicker')
3 files changed, 20 insertions, 8 deletions
diff --git a/fpicker/source/win32/filepicker/customcontrolfactory.hxx b/fpicker/source/win32/filepicker/customcontrolfactory.hxx index 973e0ba5185a..fb20e27e8214 100644 --- a/fpicker/source/win32/filepicker/customcontrolfactory.hxx +++ b/fpicker/source/win32/filepicker/customcontrolfactory.hxx @@ -4,9 +4,9 @@ * * $RCSfile: customcontrolfactory.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-08 23:43:37 $ + * last change: $Author: obo $ $Date: 2006-10-12 10:51:45 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,7 +36,13 @@ #ifndef _CUSTOMCONTROLFACTORY_HXX_ #define _CUSTOMCONTROLFACTORY_HXX_ +#if defined _MSC_VER +#pragma warning(push, 1) +#endif #include <windows.h> +#if defined _MSC_VER +#pragma warning(pop) +#endif //----------------------------------- // forward declaration diff --git a/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx b/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx index 0960581bb263..96c77dca9747 100644 --- a/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx +++ b/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx @@ -4,9 +4,9 @@ * * $RCSfile: dialogcustomcontrols.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2006-09-16 17:55:53 $ + * last change: $Author: obo $ $Date: 2006-10-12 10:51:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -107,7 +107,7 @@ void SAL_CALL CDialogCustomControlBase::AlignToBuddy(HWND aBuddyHandle) // //----------------------------------- -CDummyCustomControl::CDummyCustomControl(HWND aControlHandle, HWND aParentHandle) +CDummyCustomControl::CDummyCustomControl(HWND, HWND) { } @@ -124,7 +124,7 @@ void SAL_CALL CDummyCustomControl::Align() // //----------------------------------- -void SAL_CALL CDummyCustomControl::SetFont(HFONT hFont) +void SAL_CALL CDummyCustomControl::SetFont(HFONT) { // do nothing } diff --git a/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx b/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx index f51c2021dbde..79b58a5d051b 100644 --- a/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx +++ b/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx @@ -4,9 +4,9 @@ * * $RCSfile: dialogcustomcontrols.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-08 23:44:07 $ + * last change: $Author: obo $ $Date: 2006-10-12 10:52:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -40,7 +40,13 @@ #include "customcontrol.hxx" #endif +#if defined _MSC_VER +#pragma warning(push, 1) +#endif #include <windows.h> +#if defined _MSC_VER +#pragma warning(pop) +#endif //----------------------------------- // |