diff options
| author | Armin Weiss <aw@openoffice.org> | 2006-12-13 15:57:09 +0000 |
|---|---|---|
| committer | Armin Weiss <aw@openoffice.org> | 2006-12-13 15:57:09 +0000 |
| commit | f5895d9ed55f990e1d1281ff961f6a961775d6d4 (patch) | |
| tree | f9c2ed653effef68496eb02932342f90d0aee3b9 /drawinglayer/inc | |
| parent | f92e40c650d6ee40b39714be06f0238bb2348b10 (diff) | |
#i39532# adaptions for solaris version
Diffstat (limited to 'drawinglayer/inc')
3 files changed, 15 insertions, 8 deletions
diff --git a/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx b/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx index 70dacb52bc1d..f7e00a1ebe62 100644 --- a/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx +++ b/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: viewinformation2d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:31:22 $ + * last change: $Author: aw $ $Date: 2006-12-13 16:57:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,6 +36,13 @@ #ifndef INCLUDED_DRAWINGLAYER_GEOMETRY_VIEWINFORMATION2D_HXX #define INCLUDED_DRAWINGLAYER_GEOMETRY_VIEWINFORMATION2D_HXX +// the solaris compiler defines 'sun' as '1'. To avoid that (and to allow +// pre-declarations of com/sun/star namespace), include sal/config.h here +// where sun is redefined as 'sun' (so i guess the problem is known). +#ifndef _SAL_CONFIG_H_ +#include <sal/config.h> +#endif + ////////////////////////////////////////////////////////////////////////////// // predefines diff --git a/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx index 8c4e3742c539..804e8d2971b0 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: baseprimitive2d.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2006-11-28 11:03:56 $ + * last change: $Author: aw $ $Date: 2006-12-13 16:57:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -69,7 +69,7 @@ virtual sal_uInt32 getPrimitiveID() const; #define ImplPrimitrive2DIDBlock(TheClass, a, b, c, d) \ - sal_uInt32 TheClass##::getPrimitiveID() const { return Create2DPrimitiveID(a, b, c, d); } + sal_uInt32 TheClass::getPrimitiveID() const { return Create2DPrimitiveID(a, b, c, d); } ////////////////////////////////////////////////////////////////////////////// // predefines diff --git a/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx index b90d0867a1e8..c10580ab8979 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: baseprimitive3d.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: aw $ $Date: 2006-11-07 15:49:05 $ + * last change: $Author: aw $ $Date: 2006-12-13 16:57:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -69,7 +69,7 @@ virtual sal_uInt32 getPrimitiveID() const; #define ImplPrimitrive3DIDBlock(TheClass, a, b, c, d) \ - sal_uInt32 TheClass##::getPrimitiveID() const { return Create3DPrimitiveID(a, b, c, d); } + sal_uInt32 TheClass::getPrimitiveID() const { return Create3DPrimitiveID(a, b, c, d); } ////////////////////////////////////////////////////////////////////////////// // basePrimitive3D class |