diff options
author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 13:24:35 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 13:24:35 +0000 |
commit | c2df47993e9a6cdaa47e9b7cd3090d0fa0d8d8ba (patch) | |
tree | f22e029c058ba38fc1774e294e6bdbf15be161d8 /sot | |
parent | 4627790bab43cdca3f6de8f0e79538d517da030a (diff) |
INTEGRATION: CWS mingwport06 (1.2.20); FILE MERGED
2007/08/27 14:28:27 vg 1.2.20.1: #i75499# pragma for MSVC
Diffstat (limited to 'sot')
-rw-r--r-- | sot/inc/sot/object.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sot/inc/sot/object.hxx b/sot/inc/sot/object.hxx index 153d50c159c0..83a20fc52286 100644 --- a/sot/inc/sot/object.hxx +++ b/sot/inc/sot/object.hxx @@ -4,9 +4,9 @@ * * $RCSfile: object.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: vg $ $Date: 2007-04-11 20:52:44 $ + * last change: $Author: kz $ $Date: 2007-09-06 14:24:35 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -389,7 +389,7 @@ SotFactory * ClassName::pFactory = NULL; \ SO2_IMPL_BASIC_CLASS4_DLL(ClassName,FactoryName,Super1,Super2,Super3,Super4,GlobalName) //==================class SotObject======================================== -#ifdef MSC +#ifdef _MSC_VER #pragma warning(disable: 4250) #endif |