diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 09:54:56 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 09:54:56 +0000 |
| commit | 2377d2cc88656c411ce2c4e147ddf3e70cfff0e0 (patch) | |
| tree | 33bd14ed5c7d16cfeaf8752609758a3008c3ee70 /fpicker/source | |
| parent | d411d3369a7e3ac2a8caa179c359cf36fbd0f1a5 (diff) | |
INTEGRATION: CWS sb59 (1.3.100); FILE MERGED
2006/08/10 12:04:53 sb 1.3.100.1: #i67487# Made code warning-free (wntmsci10).
Diffstat (limited to 'fpicker/source')
| -rw-r--r-- | fpicker/source/win32/filepicker/previewbase.hxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/fpicker/source/win32/filepicker/previewbase.hxx b/fpicker/source/win32/filepicker/previewbase.hxx index eb01086f145c..618e4dd17b4c 100644 --- a/fpicker/source/win32/filepicker/previewbase.hxx +++ b/fpicker/source/win32/filepicker/previewbase.hxx @@ -4,9 +4,9 @@ * * $RCSfile: previewbase.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-08 23:48:00 $ + * last change: $Author: obo $ $Date: 2006-10-12 10:54:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -56,7 +56,13 @@ #include <com/sun/star/uno/Any.hxx> #endif +#if defined _MSC_VER +#pragma warning(push, 1) +#endif #include <windows.h> +#if defined _MSC_VER +#pragma warning(pop) +#endif //--------------------------------------------- // Common interface for previews @@ -90,7 +96,7 @@ public: virtual void SAL_CALL getImage(sal_Int16& aImageFormat,com::sun::star::uno::Any& aImage); - sal_Int16 SAL_CALL getImaginaryShowState() const; + sal_Bool SAL_CALL getImaginaryShowState() const; virtual HWND SAL_CALL getWindowHandle() const; |