CWS-TOOLING: integrate CWS solaris11

10 files changed, 20 insertions, 21 deletions

diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index 5d30d108cde6..408a514c2f06 100644
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -83,8 +83,6 @@ $(eval $(call gb_Library_add_exception_objects,fwe,\
     framework/source/fwe/interaction/preventduplicateinteraction \
     framework/source/fwe/xml/eventsconfiguration \
     framework/source/fwe/xml/eventsdocumenthandler \
-    framework/source/fwe/xml/imagesconfiguration \
-    framework/source/fwe/xml/imagesdocumenthandler \
     framework/source/fwe/xml/menuconfiguration \
     framework/source/fwe/xml/menudocumenthandler \
     framework/source/fwe/xml/saxnamespacefilter \
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index a34a1bc59720..3953d129afc2 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -183,6 +183,8 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
     framework/source/uifactory/windowcontentfactorymanager \
     framework/source/xml/acceleratorconfigurationreader \
     framework/source/xml/acceleratorconfigurationwriter \
+    framework/source/xml/imagesconfiguration \
+    framework/source/xml/imagesdocumenthandler \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/framework/Package_inc.mk b/framework/Package_inc.mk
index 6d1c03a5975b..d72dd52128b8 100644
--- a/framework/Package_inc.mk
+++ b/framework/Package_inc.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_Package_add_file,framework_inc,inc/framework/undomanagerhelper.
 $(eval $(call gb_Package_add_file,framework_inc,inc/framework/imutex.hxx,framework/imutex.hxx))
 $(eval $(call gb_Package_add_file,framework_inc,inc/framework/iguard.hxx,framework/iguard.hxx))
 $(eval $(call gb_Package_add_file,framework_inc,inc/framework/imageproducer.hxx,framework/imageproducer.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/imagesconfiguration.hxx,framework/imagesconfiguration.hxx))
 $(eval $(call gb_Package_add_file,framework_inc,inc/framework/interaction.hxx,framework/interaction.hxx))
 $(eval $(call gb_Package_add_file,framework_inc,inc/framework/menuconfiguration.hxx,framework/menuconfiguration.hxx))
 $(eval $(call gb_Package_add_file,framework_inc,inc/framework/menuextensionsupplier.hxx,framework/menuextensionsupplier.hxx))
diff --git a/framework/inc/framework/imagesconfiguration.hxx b/framework/inc/xml/imagesconfiguration.hxx
index 0771e2d8f7f1..3174e6d51b22 100644
--- a/framework/inc/framework/imagesconfiguration.hxx
+++ b/framework/inc/xml/imagesconfiguration.hxx
@@ -25,8 +25,8 @@
  *
  ************************************************************************/
 
-#ifndef __FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_
-#define __FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_
+#ifndef FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_
+#define FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_
 
 #include <framework/fwedllapi.h>
 #include <svl/svarray.hxx>
@@ -50,7 +50,7 @@ enum ImageMaskMode
     ImageMaskMode_Bitmap
 };
 
-struct FWE_DLLPUBLIC ImageItemDescriptor
+struct ImageItemDescriptor
 {
     ImageItemDescriptor() : nIndex( -1 ) {}
 
@@ -58,7 +58,7 @@ struct FWE_DLLPUBLIC ImageItemDescriptor
     long    nIndex;                     // index of the bitmap inside the bitmaplist
 };
 
-struct FWE_DLLPUBLIC ExternalImageItemDescriptor
+struct ExternalImageItemDescriptor
 {
     String  aCommandURL;                // URL command to dispatch
     String  aURL;                       // a URL to an external bitmap
@@ -70,7 +70,7 @@ SV_DECL_PTRARR_DEL( ImageItemListDescriptor, ImageItemDescriptorPtr, 10, 2)
 typedef ExternalImageItemDescriptor* ExternalImageItemDescriptorPtr;
 SV_DECL_PTRARR_DEL( ExternalImageItemListDescriptor, ExternalImageItemDescriptorPtr, 10, 2)
 
-struct FWE_DLLPUBLIC ImageListItemDescriptor
+struct ImageListItemDescriptor
 {
     ImageListItemDescriptor() : nMaskMode( ImageMaskMode_Color ),
                                 pImageItemList( 0 ) {}
@@ -89,7 +89,7 @@ struct FWE_DLLPUBLIC ImageListItemDescriptor
 typedef ImageListItemDescriptor* ImageListItemDescriptorPtr;
 SV_DECL_PTRARR_DEL( ImageListDescriptor, ImageListItemDescriptorPtr, 10, 2)
 
-struct FWE_DLLPUBLIC ImageListsDescriptor
+struct ImageListsDescriptor
 {
     ImageListsDescriptor() : pImageList( 0 ),
                      pExternalImageList( 0 ) {}
@@ -99,7 +99,7 @@ struct FWE_DLLPUBLIC ImageListsDescriptor
     ExternalImageItemListDescriptor*    pExternalImageList;
 };
 
-class FWE_DLLPUBLIC ImagesConfiguration
+class ImagesConfiguration
 {
     public:
         // #110897#
diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx
index 59d1e4abdb3a..4aa370c013d7 100644
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -25,8 +25,8 @@
  *
  ************************************************************************/
 
-#ifndef __FRAMEWORK_XML_IMAGEDOCUMENTHANDLER_HXX_
-#define __FRAMEWORK_XML_IMAGEDOCUMENTHANDLER_HXX_
+#ifndef FRAMEWORK_XML_IMAGEDOCUMENTHANDLER_HXX_
+#define FRAMEWORK_XML_IMAGEDOCUMENTHANDLER_HXX_
 
 #include <framework/fwedllapi.h>
 
@@ -34,14 +34,12 @@
 //  interface includes
 //_________________________________________________________________________________________________________________
 
-#ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  other includes
 //_________________________________________________________________________________________________________________
-#include <framework/imagesconfiguration.hxx>
+#include <xml/imagesconfiguration.hxx>
 #include <threadhelp/threadhelpbase.hxx>
 #include <rtl/ustring.hxx>
 #include <cppuhelper/implbase1.hxx>
diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx
index 2a57e72e1ce4..776af9982de4 100644
--- a/framework/source/uiconfiguration/imagemanager.cxx
+++ b/framework/source/uiconfiguration/imagemanager.cxx
@@ -27,9 +27,10 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
+
 #include <uiconfiguration/imagemanager.hxx>
 #include <threadhelp/resetableguard.hxx>
-#include <framework/imagesconfiguration.hxx>
+#include <xml/imagesconfiguration.hxx>
 #include <uiconfiguration/graphicnameaccess.hxx>
 #include <services.h>
 #include "imagemanagerimpl.hxx"
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 537fe623d633..d0caee82297e 100755
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -27,9 +27,10 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
+
 #include <imagemanagerimpl.hxx>
 #include <threadhelp/resetableguard.hxx>
-#include <framework/imagesconfiguration.hxx>
+#include <xml/imagesconfiguration.hxx>
 #include <uiconfiguration/graphicnameaccess.hxx>
 #include <services.h>
 
diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx
index fc90dd102912..0e0f828a253f 100644
--- a/framework/source/uiconfiguration/moduleimagemanager.cxx
+++ b/framework/source/uiconfiguration/moduleimagemanager.cxx
@@ -27,10 +27,11 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
+
 #include <rtl/logfile.hxx>
 #include <uiconfiguration/moduleimagemanager.hxx>
 #include <threadhelp/resetableguard.hxx>
-#include <framework/imagesconfiguration.hxx>
+#include <xml/imagesconfiguration.hxx>
 #include <uiconfiguration/graphicnameaccess.hxx>
 #include <services.h>
 #include "imagemanagerimpl.hxx"
diff --git a/framework/source/fwe/xml/imagesconfiguration.cxx b/framework/source/xml/imagesconfiguration.cxx
index d561a76d5995..946b5b9d0f11 100644
--- a/framework/source/fwe/xml/imagesconfiguration.cxx
+++ b/framework/source/xml/imagesconfiguration.cxx
@@ -27,12 +27,11 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
-#include <framework/imagesconfiguration.hxx>
+
+#include <xml/imagesconfiguration.hxx>
 #include <services.h>
 
-#ifndef __FRAMEWORK_CLASSES_IMAGESDOCUMENTHANDLER_HXX_
 #include <xml/imagesdocumenthandler.hxx>
-#endif
 #include <xml/saxnamespacefilter.hxx>
 
 //_________________________________________________________________________________________________________________
diff --git a/framework/source/fwe/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx
index cdf20958332a..cdf20958332a 100644
--- a/framework/source/fwe/xml/imagesdocumenthandler.cxx
+++ b/framework/source/xml/imagesdocumenthandler.cxx