diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:06:51 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:06:51 +0000 |
| commit | f0d1a5872f30402f2a8fe9fddb6d4f0561fb86ea (patch) | |
| tree | 6756394aad928b0650af14ebe2384a9159828bdf /vos | |
| parent | 1e92ed7108858be350e71ffd54d082491822d793 (diff) | |
INTEGRATION: CWS warnings01 (1.3.126); FILE MERGED
2006/01/25 21:59:16 sb 1.3.126.4: RESYNC: (1.4-1.5); FILE MERGED
2005/11/21 15:07:03 sb 1.3.126.3: #i53898# Made code warning-free.
2005/09/23 00:18:15 sb 1.3.126.2: RESYNC: (1.3-1.4); FILE MERGED
2005/09/07 16:34:15 sb 1.3.126.1: #i53898# Made code warning-free.
Diffstat (limited to 'vos')
| -rw-r--r-- | vos/source/object.cxx | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/vos/source/object.cxx b/vos/source/object.cxx index 39c3cfe35d5a..3dd2872ff41f 100644 --- a/vos/source/object.cxx +++ b/vos/source/object.cxx @@ -4,9 +4,9 @@ * * $RCSfile: object.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: vg $ $Date: 2006-06-02 12:42:35 $ + * last change: $Author: hr $ $Date: 2006-06-20 04:06:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -33,11 +33,6 @@ * ************************************************************************/ - -#if defined(WIN32) || defined(WIN16) -#include <windows.h> -#endif - #include <string.h> #include <rtl/alloc.h> @@ -58,7 +53,7 @@ OObject::OObject() { } -OObject::OObject(const OCreateParam& rParam) +OObject::OObject(const OCreateParam&) { } @@ -75,7 +70,7 @@ void* OObject::operator new(size_t size) return (p); } -void* OObject::operator new(size_t size, void* p) +void* OObject::operator new(size_t, void* p) { return (p); } |