diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-12-01 13:29:10 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-12-01 13:29:10 +0000 |
| commit | 5d5c07f86281cadde9ebbb6c16b4091c3ed6d21b (patch) | |
| tree | 8299e79acbd72f98557c0c3d459ae571efa86048 /filter/source/placeware/tempfile.cxx | |
| parent | 1ed6846733a8f95ca42bb38c0446c3796ba2d735 (diff) | |
INTEGRATION: CWS wfilter (1.4.50); FILE MERGED
2006/11/17 08:40:43 sj 1.4.50.1: #i69283# making filter module warning free
Diffstat (limited to 'filter/source/placeware/tempfile.cxx')
| -rw-r--r-- | filter/source/placeware/tempfile.cxx | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/filter/source/placeware/tempfile.cxx b/filter/source/placeware/tempfile.cxx index 5d6f024603bc..650f0d5fce6f 100644 --- a/filter/source/placeware/tempfile.cxx +++ b/filter/source/placeware/tempfile.cxx @@ -4,9 +4,9 @@ * * $RCSfile: tempfile.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2006-09-17 07:43:58 $ + * last change: $Author: rt $ $Date: 2006-12-01 14:29:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -83,11 +83,18 @@ oslFileError SAL_CALL my_getTempDirURL( rtl_uString** pustrTempDir ) # define _CTYPE_DISABLE_MACROS /* wg. dynamischer C-Runtime MH */ #endif +#if defined _MSC_VER +#pragma warning(push, 1) +#endif + #define WIN32_LEAN_AND_MEAN #include <windows.h> - #include <malloc.h> +#if defined _MSC_VER +#pragma warning(pop) +#endif + #define elementsof(arr) (sizeof(arr)/sizeof(arr[0])) oslFileError SAL_CALL my_getTempDirURL( rtl_uString** pustrTempDir ) @@ -135,7 +142,7 @@ oslFileError SAL_CALL my_getTempDirURL( rtl_uString** pustrTempDir ) using namespace rtl; TempFile::TempFile( const OUString& rTempFileURL ) -:maURL( rTempFileURL ), osl::File( rTempFileURL ) +:osl::File( rTempFileURL ), maURL( rTempFileURL ) { } @@ -154,7 +161,7 @@ OUString TempFile::createTempFileURL() const sal_uInt32 nRadix = 26; OUString aTempDirURL; - oslFileError nRC = my_getTempDirURL( &aTempDirURL.pData ); + /* oslFileError nRC = */ my_getTempDirURL( &aTempDirURL.pData ); static sal_uInt32 u = osl_getGlobalTimer(); for ( sal_uInt32 nOld = u; ++u != nOld; ) |