INTEGRATION: CWS warnings01 (1.5.32); FILE MERGED

2005/10/28 14:48:25 cd 1.5.32.1: #i55991# Warning free code changes for gcc

framework/inc/xml/imagesconfiguration.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: imagesconfiguration.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-09 00:52:37 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 11:08:39 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -33,8 +33,8 @@
  *
  ************************************************************************/
 
-#ifndef __FRAMEWORK_CLASSES_IMAGESCONFIGURATION_HXX_
-#define __FRAMEWORK_CLASSES_IMAGESCONFIGURATION_HXX_
+#ifndef __FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_
+#define __FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_
 
 #ifndef _SVARRAY_HXX
 #include <svtools/svarray.hxx>
@@ -93,8 +93,9 @@ SV_DECL_PTRARR_DEL( ExternalImageItemListDescriptor, ExternalImageItemDescriptor
 
 struct ImageListItemDescriptor
 {
-    ImageListItemDescriptor() : pImageItemList( 0 )
-                                , nMaskMode( ImageMaskMode_Color ) {}
+    ImageListItemDescriptor() : nMaskMode( ImageMaskMode_Color ),
+                                pImageItemList( 0 ) {}
+
     ~ImageListItemDescriptor() { delete pImageItemList; }
 
     String                      aURL;               // an URL to a bitmap with several images inside