Skip to content

C
core
Kaydet (Commit) 47972346 authored tarafından Jens-Heiner Rechtien's avatar Jens-Heiner Rechtien
Dosyalara gözat
Seçenekler

INTEGRATION: CWS jl13 (1.12.4); FILE MERGED 

2004/09/20 15:23:58 dbo 1.12.4.1: #i32854# correct union initializer
üst b32cd255
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 51 deletions
cppuhelper/inc/cppuhelper/implbase3.hxx
Dosyayı görüntüle @ 47972346
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: implbase3.hxx,v $ * $RCSfile: implbase3.hxx,v $
* *
* $Revision: 1.12 $ * $Revision: 1.13 $
* *
* last change: $Author: rt $ $Date: 2004-08-23 08:25:24 $ * last change: $Author: hr $ $Date: 2004-11-09 13:38:25 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -90,10 +90,10 @@ namespace cppu ...@@ -90,10 +90,10 @@ namespace cppu
3 +1, sal_False, sal_False, 3 +1, sal_False, sal_False,
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
{ {
{ Ifc1::static_type, ((sal_Int32)(Ifc1 *) (Impl *) 16) - 16 }, { { Ifc1::static_type }, ((sal_Int32)(Ifc1 *) (Impl *) 16) - 16 },
{ Ifc2::static_type, ((sal_Int32)(Ifc2 *) (Impl *) 16) - 16 }, { { Ifc2::static_type }, ((sal_Int32)(Ifc2 *) (Impl *) 16) - 16 },
{ Ifc3::static_type, ((sal_Int32)(Ifc3 *) (Impl *) 16) - 16 }, { { Ifc3::static_type }, ((sal_Int32)(Ifc3 *) (Impl *) 16) - 16 },
{ ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 } { { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
} }
}; };
return reinterpret_cast< class_data * >(&s_cd); return reinterpret_cast< class_data * >(&s_cd);
......
cppuhelper/inc/cppuhelper/implbase4.hxx
Dosyayı görüntüle @ 47972346
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: implbase4.hxx,v $ * $RCSfile: implbase4.hxx,v $
* *
* $Revision: 1.12 $ * $Revision: 1.13 $
* *
* last change: $Author: rt $ $Date: 2004-08-23 08:25:36 $ * last change: $Author: hr $ $Date: 2004-11-09 13:38:39 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -91,11 +91,11 @@ namespace cppu ...@@ -91,11 +91,11 @@ namespace cppu
4 +1, sal_False, sal_False, 4 +1, sal_False, sal_False,
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
{ {
{ Ifc1::static_type, ((sal_Int32)(Ifc1 *) (Impl *) 16) - 16 }, { { Ifc1::static_type }, ((sal_Int32)(Ifc1 *) (Impl *) 16) - 16 },
{ Ifc2::static_type, ((sal_Int32)(Ifc2 *) (Impl *) 16) - 16 }, { { Ifc2::static_type }, ((sal_Int32)(Ifc2 *) (Impl *) 16) - 16 },
{ Ifc3::static_type, ((sal_Int32)(Ifc3 *) (Impl *) 16) - 16 }, { { Ifc3::static_type }, ((sal_Int32)(Ifc3 *) (Impl *) 16) - 16 },
{ Ifc4::static_type, ((sal_Int32)(Ifc4 *) (Impl *) 16) - 16 }, { { Ifc4::static_type }, ((sal_Int32)(Ifc4 *) (Impl *) 16) - 16 },
{ ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 } { { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
} }
}; };
return reinterpret_cast< class_data * >(&s_cd); return reinterpret_cast< class_data * >(&s_cd);
......
cppuhelper/inc/cppuhelper/implbase5.hxx
Dosyayı görüntüle @ 47972346
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: implbase5.hxx,v $ * $RCSfile: implbase5.hxx,v $
* *
* $Revision: 1.12 $ * $Revision: 1.13 $
* *
* last change: $Author: rt $ $Date: 2004-08-23 08:25:47 $ * last change: $Author: hr $ $Date: 2004-11-09 13:38:56 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -91,12 +91,12 @@ namespace cppu ...@@ -91,12 +91,12 @@ namespace cppu
5 +1, sal_False, sal_False, 5 +1, sal_False, sal_False,
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
{ {
{ Ifc1::static_type, ((sal_Int32)(Ifc1 *) (Impl *) 16) - 16 }, { { Ifc1::static_type }, ((sal_Int32)(Ifc1 *) (Impl *) 16) - 16 },
{ Ifc2::static_type, ((sal_Int32)(Ifc2 *) (Impl *) 16) - 16 }, { { Ifc2::static_type }, ((sal_Int32)(Ifc2 *) (Impl *) 16) - 16 },
{ Ifc3::static_type, ((sal_Int32)(Ifc3 *) (Impl *) 16) - 16 }, { { Ifc3::static_type }, ((sal_Int32)(Ifc3 *) (Impl *) 16) - 16 },
{ Ifc4::static_type, ((sal_Int32)(Ifc4 *) (Impl *) 16) - 16 }, { { Ifc4::static_type }, ((sal_Int32)(Ifc4 *) (Impl *) 16) - 16 },
{ Ifc5::static_type, ((sal_Int32)(Ifc5 *) (Impl *) 16) - 16 }, { { Ifc5::static_type }, ((sal_Int32)(Ifc5 *) (Impl *) 16) - 16 },
{ ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 } { { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
} }
}; };
return reinterpret_cast< class_data * >(&s_cd); return reinterpret_cast< class_data * >(&s_cd);
......
cppuhelper/inc/cppuhelper/implbase6.hxx
Dosyayı görüntüle @ 47972346
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: implbase6.hxx,v $ * $RCSfile: implbase6.hxx,v $
* *
* $Revision: 1.12 $ * $Revision: 1.13 $
* *
* last change: $Author: rt $ $Date: 2004-08-23 08:25:59 $ * last change: $Author: hr $ $Date: 2004-11-09 13:39:09 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -91,13 +91,13 @@ namespace cppu ...@@ -91,13 +91,13 @@ namespace cppu
6 +1, sal_False, sal_False, 6 +1, sal_False, sal_False,
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
{ {
{ Ifc1::static_type, ((sal_Int32)(Ifc1 *) (Impl *) 16) - 16 }, { { Ifc1::static_type }, ((sal_Int32)(Ifc1 *) (Impl *) 16) - 16 },
{ Ifc2::static_type, ((sal_Int32)(Ifc2 *) (Impl *) 16) - 16 }, { { Ifc2::static_type }, ((sal_Int32)(Ifc2 *) (Impl *) 16) - 16 },
{ Ifc3::static_type, ((sal_Int32)(Ifc3 *) (Impl *) 16) - 16 }, { { Ifc3::static_type }, ((sal_Int32)(Ifc3 *) (Impl *) 16) - 16 },
{ Ifc4::static_type, ((sal_Int32)(Ifc4 *) (Impl *) 16) - 16 }, { { Ifc4::static_type }, ((sal_Int32)(Ifc4 *) (Impl *) 16) - 16 },
{ Ifc5::static_type, ((sal_Int32)(Ifc5 *) (Impl *) 16) - 16 }, { { Ifc5::static_type }, ((sal_Int32)(Ifc5 *) (Impl *) 16) - 16 },
{ Ifc6::static_type, ((sal_Int32)(Ifc6 *) (Impl *) 16) - 16 }, { { Ifc6::static_type }, ((sal_Int32)(Ifc6 *) (Impl *) 16) - 16 },
{ ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 } { { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
} }
}; };
return reinterpret_cast< class_data * >(&s_cd); return reinterpret_cast< class_data * >(&s_cd);
......
cppuhelper/inc/cppuhelper/implbase7.hxx
Dosyayı görüntüle @ 47972346
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: implbase7.hxx,v $ * $RCSfile: implbase7.hxx,v $
* *
* $Revision: 1.12 $ * $Revision: 1.13 $
* *
* last change: $Author: rt $ $Date: 2004-08-23 08:26:11 $ * last change: $Author: hr $ $Date: 2004-11-09 13:39:23 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -91,14 +91,14 @@ namespace cppu ...@@ -91,14 +91,14 @@ namespace cppu
7 +1, sal_False, sal_False, 7 +1, sal_False, sal_False,
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
{ {
{ Ifc1::static_type, ((sal_Int32)(Ifc1 *) (Impl *) 16) - 16 }, { { Ifc1::static_type }, ((sal_Int32)(Ifc1 *) (Impl *) 16) - 16 },
{ Ifc2::static_type, ((sal_Int32)(Ifc2 *) (Impl *) 16) - 16 }, { { Ifc2::static_type }, ((sal_Int32)(Ifc2 *) (Impl *) 16) - 16 },
{ Ifc3::static_type, ((sal_Int32)(Ifc3 *) (Impl *) 16) - 16 }, { { Ifc3::static_type }, ((sal_Int32)(Ifc3 *) (Impl *) 16) - 16 },
{ Ifc4::static_type, ((sal_Int32)(Ifc4 *) (Impl *) 16) - 16 }, { { Ifc4::static_type }, ((sal_Int32)(Ifc4 *) (Impl *) 16) - 16 },
{ Ifc5::static_type, ((sal_Int32)(Ifc5 *) (Impl *) 16) - 16 }, { { Ifc5::static_type }, ((sal_Int32)(Ifc5 *) (Impl *) 16) - 16 },
{ Ifc6::static_type, ((sal_Int32)(Ifc6 *) (Impl *) 16) - 16 }, { { Ifc6::static_type }, ((sal_Int32)(Ifc6 *) (Impl *) 16) - 16 },
{ Ifc7::static_type, ((sal_Int32)(Ifc7 *) (Impl *) 16) - 16 }, { { Ifc7::static_type }, ((sal_Int32)(Ifc7 *) (Impl *) 16) - 16 },
{ ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 } { { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
} }
}; };
return reinterpret_cast< class_data * >(&s_cd); return reinterpret_cast< class_data * >(&s_cd);
......
cppuhelper/inc/cppuhelper/implbase8.hxx
Dosyayı görüntüle @ 47972346
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: implbase8.hxx,v $ * $RCSfile: implbase8.hxx,v $
* *
* $Revision: 1.12 $ * $Revision: 1.13 $
* *
* last change: $Author: rt $ $Date: 2004-08-23 08:26:25 $ * last change: $Author: hr $ $Date: 2004-11-09 13:39:35 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -91,15 +91,15 @@ namespace cppu ...@@ -91,15 +91,15 @@ namespace cppu
8 +1, sal_False, sal_False, 8 +1, sal_False, sal_False,
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
{ {
{ Ifc1::static_type, ((sal_Int32)(Ifc1 *) (Impl *) 16) - 16 }, { { Ifc1::static_type }, ((sal_Int32)(Ifc1 *) (Impl *) 16) - 16 },
{ Ifc2::static_type, ((sal_Int32)(Ifc2 *) (Impl *) 16) - 16 }, { { Ifc2::static_type }, ((sal_Int32)(Ifc2 *) (Impl *) 16) - 16 },
{ Ifc3::static_type, ((sal_Int32)(Ifc3 *) (Impl *) 16) - 16 }, { { Ifc3::static_type }, ((sal_Int32)(Ifc3 *) (Impl *) 16) - 16 },
{ Ifc4::static_type, ((sal_Int32)(Ifc4 *) (Impl *) 16) - 16 }, { { Ifc4::static_type }, ((sal_Int32)(Ifc4 *) (Impl *) 16) - 16 },
{ Ifc5::static_type, ((sal_Int32)(Ifc5 *) (Impl *) 16) - 16 }, { { Ifc5::static_type }, ((sal_Int32)(Ifc5 *) (Impl *) 16) - 16 },
{ Ifc6::static_type, ((sal_Int32)(Ifc6 *) (Impl *) 16) - 16 }, { { Ifc6::static_type }, ((sal_Int32)(Ifc6 *) (Impl *) 16) - 16 },
{ Ifc7::static_type, ((sal_Int32)(Ifc7 *) (Impl *) 16) - 16 }, { { Ifc7::static_type }, ((sal_Int32)(Ifc7 *) (Impl *) 16) - 16 },
{ Ifc8::static_type, ((sal_Int32)(Ifc8 *) (Impl *) 16) - 16 }, { { Ifc8::static_type }, ((sal_Int32)(Ifc8 *) (Impl *) 16) - 16 },
{ ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 } { { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
} }
}; };
return reinterpret_cast< class_data * >(&s_cd); return reinterpret_cast< class_data * >(&s_cd);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment