Commits

Anonymous committed b8f389c Merge

CWS-TOOLING: integrate CWS solaris11

Comments (0)

Files changed (27)

avmedia/source/gstreamer/gstframegrabber.cxx

 #include <vcl/graph.hxx>
 #include <vcl/bmpacc.hxx>
 
+#include <string>
+
+
 using namespace ::com::sun::star;
 
 namespace avmedia { namespace gst {

avmedia/source/gstreamer/gstplayer.cxx

     {}
 };
 
+
+// -----------------------------------------------------------------------
+extern "C"
+{
+
+static gpointer
+lcl_implThreadFunc( gpointer pData )
+{
+    return( pData ? static_cast< Player* >( pData )->run() : NULL );
+}
+
+static gboolean
+lcl_implBusCheck( GSource* pSource )
+{
+    GstBusSource* pBusSource = static_cast< GstBusSource* >( pSource );
+
+    return( pBusSource &&
+           GST_IS_BUS( pBusSource->mpBus ) &&
+           gst_bus_have_pending( GST_BUS_CAST( pBusSource->mpBus ) ) );
+}
+
+
+static gboolean
+lcl_implBusPrepare( GSource* pSource, gint* pTimeout )
+{
+    if (pTimeout)
+    {
+        *pTimeout = 0;
+    }
+
+    return lcl_implBusCheck(pSource);
+}
+
+static gboolean
+lcl_implBusDispatch( GSource* pSource,
+                     GSourceFunc /*aCallback*/,
+                     gpointer pData )
+{
+    GstBusSource* pBusSource = static_cast< GstBusSource* >( pSource );
+    gboolean bRet = false;
+
+    if( pData && pBusSource && GST_IS_BUS( pBusSource->mpBus ) )
+    {
+        GstMessage* pMsg = gst_bus_pop( pBusSource->mpBus );
+
+        if( pMsg )
+        {
+            bRet = static_cast< Player* >( pData )->busCallback(
+                        pBusSource->mpBus, pMsg );
+            gst_message_unref( pMsg );
+        }
+    }
+
+    return( bRet );
+}
+
+static void
+lcl_implBusFinalize( GSource* pSource )
+{
+    GstBusSource* pBusSource = static_cast< GstBusSource* >( pSource );
+
+    if( pBusSource && pBusSource->mpBus )
+    {
+        gst_object_unref( pBusSource->mpBus );
+        pBusSource->mpBus = NULL;
+    }
+}
+
+static gboolean
+lcl_implIdleFunc( gpointer pData )
+{
+    return( pData ? static_cast< Player* >( pData )->idle() : true );
+}
+
+static GstBusSyncReply
+lcl_implHandleCreateWindowFunc( GstBus* pBus, GstMessage* pMsg, gpointer pData )
+{
+    return (pData)
+        ? static_cast< Player* >( pData )->handleCreateWindow( pBus, pMsg )
+        : GST_BUS_PASS;
+}
+
+} // extern "C"
+
+
+
 // ---------------
 // - Player -
 // ---------------
         OSL_TRACE( ">>> --------------------------------" );
         OSL_TRACE( ">>> Creating Player object with URL: %s", pURI->str );
 
-        mpThread = g_thread_create( Player::implThreadFunc, this, true, NULL );
+        mpThread = g_thread_create( &lcl_implThreadFunc, this, true, NULL );
     }
 }
 
 void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
      throw( uno::RuntimeException )
 {
-    if( bSet && !isPlaybackLoop() )
-        g_atomic_int_inc( &mnLooping );
-    else if( !bSet && isPlaybackLoop() )
-        g_atomic_int_dec_and_test( &mnLooping );
+    if (bSet)
+    {
+        g_atomic_int_compare_and_exchange(&mnLooping, 0, 1);
+    }
+    else
+    {
+        g_atomic_int_compare_and_exchange(&mnLooping, 1, 0);
+    }
 }
 
 // ------------------------------------------------------------------------------
 }
 
 // ------------------------------------------------------------------------------
-gboolean Player::implBusPrepare( GSource* pSource,
-                                 gint* pTimeout )
-{
-    if( pTimeout )
-    {
-        *pTimeout = 0;
-    }
-
-    return( implBusCheck( pSource ) );
-}
-
-// ------------------------------------------------------------------------------
-gboolean Player::implBusCheck( GSource* pSource )
-{
-    GstBusSource* pBusSource = static_cast< GstBusSource* >( pSource );
-
-    return( pBusSource &&
-           GST_IS_BUS( pBusSource->mpBus ) &&
-           gst_bus_have_pending( GST_BUS_CAST( pBusSource->mpBus ) ) );
-}
-
-// ------------------------------------------------------------------------------
-gboolean Player::implBusDispatch( GSource* pSource,
-                                  GSourceFunc /*aCallback*/,
-                                  gpointer pData )
-{
-    GstBusSource* pBusSource = static_cast< GstBusSource* >( pSource );
-    gboolean bRet = false;
-
-    if( pData && pBusSource && GST_IS_BUS( pBusSource->mpBus ) )
-    {
-        GstMessage* pMsg = gst_bus_pop( pBusSource->mpBus );
-
-        if( pMsg )
-        {
-            bRet = static_cast< Player* >( pData )->busCallback( pBusSource->mpBus, pMsg );
-            gst_message_unref( pMsg );
-        }
-    }
-
-    return( bRet );
-}
-
-// ------------------------------------------------------------------------------
-void Player::implBusFinalize( GSource* pSource )
-{
-    GstBusSource* pBusSource = static_cast< GstBusSource* >( pSource );
-
-    if( pBusSource && pBusSource->mpBus )
-    {
-        gst_object_unref( pBusSource->mpBus );
-        pBusSource->mpBus = NULL;
-    }
-}
-
-// ------------------------------------------------------------------------------
 gboolean Player::busCallback( GstBus* /*pBus*/,
                               GstMessage* pMsg )
 {
 }
 
 // ------------------------------------------------------------------------------
-gboolean Player::implIdleFunc( gpointer pData )
-{
-    return( pData ? static_cast< Player* >( pData )->idle() : true );
-}
-
-// ------------------------------------------------------------------------------
-gpointer Player::implThreadFunc( gpointer pData )
-{
-    return( pData ? static_cast< Player* >( pData )->run() : NULL );
-}
-
-// ------------------------------------------------------------------------------
-GstBusSyncReply Player::implHandleCreateWindowFunc( GstBus* pBus,
-                                                    GstMessage* pMsg,
-                                                    gpointer pData )
-{
-    return( pData ? static_cast< Player* >( pData )->handleCreateWindow( pBus, pMsg ) : GST_BUS_PASS );
-}
-
-// ------------------------------------------------------------------------------
 void Player::implHandleNewElementFunc( GstBin* /* pBin */,
                                        GstElement* pElement,
                                        gpointer pData )
 // ------------------------------------------------------------------------------
 gboolean Player::idle()
 {
-    // test if main loop should quit and set flag mnQuit to 1
-    bool bQuit = g_atomic_int_compare_and_exchange( &mnQuit, 1, 1 );
+    // test if main loop should quit by comparing with 1
+    // and set flag mnQuit to 0 so we call g_main_loop_quit exactly once
+    bool const bQuit = g_atomic_int_compare_and_exchange( &mnQuit, 1, 0 );
 
     if( bQuit )
     {
-        // set mnQuit back to 0 to avoid mutiple g_main_loop_quit calls
-        // in case Player::idle() is called again later;
-        // the flag should have been set only once within Ctor called from
-        // the application thread
-        g_atomic_int_dec_and_test( &mnQuit );
         g_main_loop_quit( mpLoop );
     }
 
 {
     static GSourceFuncs aSourceFuncs =
     {
-        Player::implBusPrepare,
-        Player::implBusCheck,
-        Player::implBusDispatch,
-        Player::implBusFinalize,
+        &lcl_implBusPrepare,
+        &lcl_implBusCheck,
+        &lcl_implBusDispatch,
+        &lcl_implBusFinalize,
         NULL,
         NULL
     };
 
         // add idle callback
         GSource* pIdleSource = g_idle_source_new();
-        g_source_set_callback( pIdleSource, Player::implIdleFunc, this, NULL );
+        g_source_set_callback( pIdleSource, &lcl_implIdleFunc, this, NULL );
         g_source_attach( pIdleSource, mpContext );
 
         // add bus callback
 
         // add bus sync handler to intercept video window creation for setting our own window
         gst_bus_set_sync_handler( static_cast< GstBusSource* >( pBusSource )->mpBus,
-                                  Player::implHandleCreateWindowFunc, this );
+                                  &lcl_implHandleCreateWindowFunc, this );
 
         // watch for all elements (and pads) that will be added to the playbin,
         // in order to retrieve properties like video width and height

avmedia/source/gstreamer/gstplayer.hxx

     virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
      throw( ::com::sun::star::uno::RuntimeException );
 
-
-protected:
-
-    Player( GString* pURI = NULL );
-
+// these are public because the C callbacks call them
     virtual gboolean busCallback( GstBus* pBus,
                                   GstMessage* pMsg );
 
     virtual GstBusSyncReply handleCreateWindow( GstBus* pBus,
                                                 GstMessage* pMsg );
 
+protected:
+
+    Player( GString* pURI = NULL );
+
     void implQuitThread();
 
     bool implInitPlayer();
 
     Player& operator=( const Player& );
 
-    static gboolean implBusPrepare( GSource* pSource,
-                                    gint* pTimeout );
-
-    static gboolean implBusCheck( GSource* pSource );
-
-    static gboolean implBusDispatch( GSource* pSource,
-                                     GSourceFunc aCallback,
-                                     gpointer pData );
-
-    static void implBusFinalize( GSource* pSource );
-
-    static gboolean implIdleFunc( gpointer pData );
-
-    static gpointer implThreadFunc( gpointer pData );
-
-    static GstBusSyncReply implHandleCreateWindowFunc( GstBus* pBus,
-                                                       GstMessage* pMsg,
-                                                       gpointer pDData );
-
     static void implHandleNewElementFunc( GstBin* pBin,
                                           GstElement* pElement,
                                           gpointer pData );

avmedia/source/gstreamer/makefile.mk

 SHL1IMPLIB=i$(TARGET)
 SHL1LIBS=$(SLB)$/$(TARGET).lib
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
+# on Solaris checkdll does not work: LD_LIBRARY_PATH breaks the 2 libxml2.so.2
+SHL1NOCHECK=t
 
 DEF1NAME=$(SHL1TARGET)
 DEF1EXPORTFILE=exports.dxp
         if test "$JDK" != "gcj" -o "$_gij_longver" -ge "40200"; then
       # check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr
       if test "$JAVA_HOME" = "/usr" -a "x$with_jdk_home" = "x"; then
-
-         if basename $(readlink $(readlink $JAVACOMPILER)) >/dev/null 2>/dev/null; then
+         javac_link_f=`readlink -f "$JAVACOMPILER" 2>/dev/null`
+         if test $? == 0 && test "$JAVACOMPILER" != "$javac_link_f"; then
           # try to recover first by looking whether we have a alternatives
           # system as in Debian or newer SuSEs where following /usr/bin/javac
           # over /etc/alternatives/javac leads to the right bindir where we
           # just need to strip a bit away to get a valid JAVA_HOME
-            JAVA_HOME=$(readlink $(readlink $JAVACOMPILER))
+          # Solaris 11 is even worse, because target is relative, so use -f
+            JAVA_HOME="$javac_link_f"
          elif readlink $JAVACOMPILER >/dev/null 2>/dev/null; then
-            # maybe only one level of symlink (e.g. on Mac)
-            JAVA_HOME=$(readlink $JAVACOMPILER)
+          # Darwin readlink(1) is so primitive it doesn't even support -f
+          # maybe only one level of symlink (e.g. on Mac)
+            JAVA_HOME=`readlink $JAVACOMPILER`
          else
           # else warn
           { echo "$as_me:$LINENO: WARNING: JAVA_HOME is set to /usr - this is very likely to be incorrect" >&5
 
 
 if test -z "$with_gnu_cp"; then
-   for ac_prog in gnucp cp
+   # check the place where the good stuff is hidden on Solaris...
+   if test -x /usr/gnu/bin/cp; then
+      GNUCP=/usr/gnu/bin/cp
+   else
+      for ac_prog in gnucp cp
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
   test -n "$GNUCP" && break
 done
 
+   fi
    if test -z $GNUCP; then
       { { echo "$as_me:$LINENO: error: Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it" >&5
 echo "$as_me: error: Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it" >&2;}
                 if test -f $ANT_HOME/lib/ant/ant.jar; then
                     ANT_LIB="$ANT_HOME/lib/ant"
                 else
-                    { { echo "$as_me:$LINENO: error: Ant libraries not found!" >&5
+                   if test -f /usr/share/lib/ant/ant.jar; then
+                       ANT_LIB=/usr/share/lib/ant
+                   else
+                       { { echo "$as_me:$LINENO: error: Ant libraries not found!" >&5
 echo "$as_me: error: Ant libraries not found!" >&2;}
    { (exit 1); exit 1; }; }
+                   fi
                 fi
              fi
           fi
         if test -e /usr/share/java/junit4.jar; then
             OOO_JUNIT_JAR=/usr/share/java/junit4.jar
         else
-            OOO_JUNIT_JAR=/usr/share/java/junit.jar
+           if test -e /usr/share/lib/java/junit.jar; then
+              OOO_JUNIT_JAR=/usr/share/lib/java/junit.jar
+           else
+              OOO_JUNIT_JAR=/usr/share/java/junit.jar
+           fi
         fi
     else
         OOO_JUNIT_JAR=$with_junit
     if test "$JDK" != "gcj" -o "$_gij_longver" -ge "40200"; then
       # check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr
       if test "$JAVA_HOME" = "/usr" -a "x$with_jdk_home" = "x"; then
-
-         if basename $(readlink $(readlink $JAVACOMPILER)) >/dev/null 2>/dev/null; then
+         javac_link_f=`readlink -f "$JAVACOMPILER" 2>/dev/null`
+         if test $? == 0 && test "$JAVACOMPILER" != "$javac_link_f"; then
           # try to recover first by looking whether we have a alternatives 
           # system as in Debian or newer SuSEs where following /usr/bin/javac
           # over /etc/alternatives/javac leads to the right bindir where we
           # just need to strip a bit away to get a valid JAVA_HOME
-            JAVA_HOME=$(readlink $(readlink $JAVACOMPILER))
+          # Solaris 11 is even worse, because target is relative, so use -f
+            JAVA_HOME="$javac_link_f"
          elif readlink $JAVACOMPILER >/dev/null 2>/dev/null; then
-            # maybe only one level of symlink (e.g. on Mac)
-            JAVA_HOME=$(readlink $JAVACOMPILER)
+          # Darwin readlink(1) is so primitive it doesn't even support -f
+          # maybe only one level of symlink (e.g. on Mac)
+            JAVA_HOME=`readlink $JAVACOMPILER`
          else
           # else warn
           AC_MSG_WARN([JAVA_HOME is set to /usr - this is very likely to be incorrect])
 dnl We also need to check for --with-gnu-cp
 
 if test -z "$with_gnu_cp"; then
-   AC_PATH_PROGS(GNUCP, gnucp cp)
+   # check the place where the good stuff is hidden on Solaris...
+   if test -x /usr/gnu/bin/cp; then
+      GNUCP=/usr/gnu/bin/cp
+   else
+      AC_PATH_PROGS(GNUCP, gnucp cp)
+   fi
    if test -z $GNUCP; then
       AC_MSG_ERROR([Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it])
    fi
                 if test -f $ANT_HOME/lib/ant/ant.jar; then
                     ANT_LIB="$ANT_HOME/lib/ant"
                 else
-                    AC_MSG_ERROR([Ant libraries not found!])
+                   if test -f /usr/share/lib/ant/ant.jar; then
+                       ANT_LIB=/usr/share/lib/ant
+                   else
+                       AC_MSG_ERROR([Ant libraries not found!])
+                   fi
                 fi  
              fi
           fi
         if test -e /usr/share/java/junit4.jar; then
             OOO_JUNIT_JAR=/usr/share/java/junit4.jar
         else
-            OOO_JUNIT_JAR=/usr/share/java/junit.jar
+           if test -e /usr/share/lib/java/junit.jar; then
+              OOO_JUNIT_JAR=/usr/share/lib/java/junit.jar
+           else
+              OOO_JUNIT_JAR=/usr/share/java/junit.jar
+           fi
         fi
     else
         OOO_JUNIT_JAR=$with_junit

framework/Library_fwe.mk

 	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 \

framework/Library_fwk.mk

 	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:

framework/Package_inc.mk

 $(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))

framework/inc/framework/imagesconfiguration.hxx

-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef __FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_
-#define __FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_
-
-#include <framework/fwedllapi.h>
-#include <svl/svarray.hxx>
-#include <tools/string.hxx>
-#include <tools/stream.hxx>
-#include <tools/color.hxx>
-
-// #110897#
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
-
-#include <vector>
-
-namespace framework
-{
-
-enum ImageMaskMode
-{
-	ImageMaskMode_Color,
-	ImageMaskMode_Bitmap
-};
-
-struct FWE_DLLPUBLIC ImageItemDescriptor
-{
-	ImageItemDescriptor() : nIndex( -1 ) {}
-
-	String	aCommandURL;				// URL command to dispatch
-	long	nIndex;						// index of the bitmap inside the bitmaplist
-};
-
-struct FWE_DLLPUBLIC ExternalImageItemDescriptor
-{
-	String	aCommandURL;				// URL command to dispatch
-	String	aURL;						// a URL to an external bitmap
-};
-
-typedef ImageItemDescriptor* ImageItemDescriptorPtr;
-SV_DECL_PTRARR_DEL( ImageItemListDescriptor, ImageItemDescriptorPtr, 10, 2)
-
-typedef ExternalImageItemDescriptor* ExternalImageItemDescriptorPtr;
-SV_DECL_PTRARR_DEL( ExternalImageItemListDescriptor, ExternalImageItemDescriptorPtr, 10, 2) 
-
-struct FWE_DLLPUBLIC ImageListItemDescriptor
-{
-    ImageListItemDescriptor() : nMaskMode( ImageMaskMode_Color ),
-                                pImageItemList( 0 ) {}
-
-    ~ImageListItemDescriptor() { delete pImageItemList; }
-
-    String						aURL;				// an URL to a bitmap with several images inside
-    Color						aMaskColor;			// a color used as transparent
-    String						aMaskURL;			// an URL to an optional bitmap used as a mask
-    ImageMaskMode				      nMaskMode;			// an enum to describe the current mask mode
-    ImageItemListDescriptor*              pImageItemList;		// an array	of ImageItemDescriptors that describes every image
-    String						aHighContrastURL;		// an URL to an optional high contrast bitmap with serveral images inside
-    String						aHighContrastMaskURL;	// an URL to an optional high contrast bitmap as a mask
-};
-
-typedef ImageListItemDescriptor* ImageListItemDescriptorPtr;
-SV_DECL_PTRARR_DEL( ImageListDescriptor, ImageListItemDescriptorPtr, 10, 2)
-
-struct FWE_DLLPUBLIC ImageListsDescriptor
-{
-	ImageListsDescriptor() : pImageList( 0 ),
-					 pExternalImageList( 0 ) {}
-	~ImageListsDescriptor() { delete pImageList; delete pExternalImageList; }
-
-	ImageListDescriptor*			pImageList;
-	ExternalImageItemListDescriptor*	pExternalImageList;
-};
-
-class FWE_DLLPUBLIC ImagesConfiguration
-{
-	public:
-		// #110897#
-		static sal_Bool	LoadImages( 
-			const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
-			SvStream& rInStream, ImageListsDescriptor& aItems );
-
-		// #110897#
-		static sal_Bool	StoreImages( 
-			const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
-			SvStream& rOutStream, const ImageListsDescriptor& aItems );
-
-        static sal_Bool LoadImages(
-			const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream,
-            ImageListsDescriptor& rItems );
-
-        static sal_Bool StoreImages(
-			const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream,
-            const ImageListsDescriptor& rItems );
-};
-
-} // namespace framework
-
-#endif // __FRAMEWORK_CLASSES_IMAGES

framework/inc/xml/imagesconfiguration.hxx

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_
+#define FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_
+
+#include <framework/fwedllapi.h>
+#include <svl/svarray.hxx>
+#include <tools/string.hxx>
+#include <tools/stream.hxx>
+#include <tools/color.hxx>
+
+// #110897#
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/io/XOutputStream.hpp>
+
+#include <vector>
+
+namespace framework
+{
+
+enum ImageMaskMode
+{
+	ImageMaskMode_Color,
+	ImageMaskMode_Bitmap
+};
+
+struct ImageItemDescriptor
+{
+	ImageItemDescriptor() : nIndex( -1 ) {}
+
+	String	aCommandURL;				// URL command to dispatch
+	long	nIndex;						// index of the bitmap inside the bitmaplist
+};
+
+struct ExternalImageItemDescriptor
+{
+	String	aCommandURL;				// URL command to dispatch
+	String	aURL;						// a URL to an external bitmap
+};
+
+typedef ImageItemDescriptor* ImageItemDescriptorPtr;
+SV_DECL_PTRARR_DEL( ImageItemListDescriptor, ImageItemDescriptorPtr, 10, 2)
+
+typedef ExternalImageItemDescriptor* ExternalImageItemDescriptorPtr;
+SV_DECL_PTRARR_DEL( ExternalImageItemListDescriptor, ExternalImageItemDescriptorPtr, 10, 2) 
+
+struct ImageListItemDescriptor
+{
+    ImageListItemDescriptor() : nMaskMode( ImageMaskMode_Color ),
+                                pImageItemList( 0 ) {}
+
+    ~ImageListItemDescriptor() { delete pImageItemList; }
+
+    String						aURL;				// an URL to a bitmap with several images inside
+    Color						aMaskColor;			// a color used as transparent
+    String						aMaskURL;			// an URL to an optional bitmap used as a mask
+    ImageMaskMode				      nMaskMode;			// an enum to describe the current mask mode
+    ImageItemListDescriptor*              pImageItemList;		// an array	of ImageItemDescriptors that describes every image
+    String						aHighContrastURL;		// an URL to an optional high contrast bitmap with serveral images inside
+    String						aHighContrastMaskURL;	// an URL to an optional high contrast bitmap as a mask
+};
+
+typedef ImageListItemDescriptor* ImageListItemDescriptorPtr;
+SV_DECL_PTRARR_DEL( ImageListDescriptor, ImageListItemDescriptorPtr, 10, 2)
+
+struct ImageListsDescriptor
+{
+	ImageListsDescriptor() : pImageList( 0 ),
+					 pExternalImageList( 0 ) {}
+	~ImageListsDescriptor() { delete pImageList; delete pExternalImageList; }
+
+	ImageListDescriptor*			pImageList;
+	ExternalImageItemListDescriptor*	pExternalImageList;
+};
+
+class ImagesConfiguration
+{
+	public:
+		// #110897#
+		static sal_Bool	LoadImages( 
+			const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
+			SvStream& rInStream, ImageListsDescriptor& aItems );
+
+		// #110897#
+		static sal_Bool	StoreImages( 
+			const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
+			SvStream& rOutStream, const ImageListsDescriptor& aItems );
+
+        static sal_Bool LoadImages(
+			const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream,
+            ImageListsDescriptor& rItems );
+
+        static sal_Bool StoreImages(
+			const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream,
+            const ImageListsDescriptor& rItems );
+};
+
+} // namespace framework
+
+#endif // __FRAMEWORK_CLASSES_IMAGES

framework/inc/xml/imagesdocumenthandler.hxx

  *
  ************************************************************************/
 
-#ifndef __FRAMEWORK_XML_IMAGEDOCUMENTHANDLER_HXX_
-#define __FRAMEWORK_XML_IMAGEDOCUMENTHANDLER_HXX_
+#ifndef FRAMEWORK_XML_IMAGEDOCUMENTHANDLER_HXX_
+#define FRAMEWORK_XML_IMAGEDOCUMENTHANDLER_HXX_
 
 #include <framework/fwedllapi.h>
 
 //	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>

framework/source/fwe/xml/imagesconfiguration.cxx

-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_framework.hxx"
-#include <framework/imagesconfiguration.hxx>
-#include <services.h>
-
-#ifndef __FRAMEWORK_CLASSES_IMAGESDOCUMENTHANDLER_HXX_
-#include <xml/imagesdocumenthandler.hxx>
-#endif
-#include <xml/saxnamespacefilter.hxx>
-
-//_________________________________________________________________________________________________________________
-//	interface includes
-//_________________________________________________________________________________________________________________
-#include <com/sun/star/xml/sax/XParser.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-
-//_________________________________________________________________________________________________________________
-//	other includes
-//_________________________________________________________________________________________________________________
-
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
-#include <comphelper/processfactory.hxx>
-#endif
-#include <unotools/streamwrap.hxx>
-#include <tools/debug.hxx>
-
-//_________________________________________________________________________________________________________________
-//	namespace
-//_________________________________________________________________________________________________________________
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::xml::sax;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::io;
-
-
-namespace framework
-{
-
-SV_IMPL_PTRARR( ImageItemListDescriptor, ImageItemDescriptorPtr );
-SV_IMPL_PTRARR( ExternalImageItemListDescriptor, ExternalImageItemDescriptorPtr );
-SV_IMPL_PTRARR( ImageListDescriptor, ImageListItemDescriptorPtr );
-
-static Reference< XParser > GetSaxParser(
-	// #110897#
-	const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory
-	)
-{
-	//Reference< XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory();
-	//return Reference< XParser >( xServiceManager->createInstance( SERVICENAME_SAXPARSER), UNO_QUERY);
-	return Reference< XParser >( xServiceFactory->createInstance( SERVICENAME_SAXPARSER), UNO_QUERY);
-}
-
-static Reference< XDocumentHandler > GetSaxWriter(
-	// #110897#
-	const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory
-	)
-{
-	//Reference< XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory();
-	//return Reference< XDocumentHandler >( xServiceManager->createInstance( SERVICENAME_SAXWRITER), UNO_QUERY) ;
-	return Reference< XDocumentHandler >( xServiceFactory->createInstance( SERVICENAME_SAXWRITER), UNO_QUERY) ;
-}
-
-// #110897#
-sal_Bool ImagesConfiguration::LoadImages(
-	const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
-	SvStream& rInStream, ImageListsDescriptor& aItems )
-{
-	Reference< XParser > xParser( GetSaxParser( xServiceFactory ) );
-	Reference< XInputStream > xInputStream(
-								(::cppu::OWeakObject *)new utl::OInputStreamWrapper( rInStream ),
-								UNO_QUERY );
-
-	// connect stream to input stream to the parser
-	InputSource aInputSource;
-
-	aInputSource.aInputStream = xInputStream;
-
-	// create namespace filter and set document handler inside to support xml namespaces
-	Reference< XDocumentHandler > xDocHandler( new OReadImagesDocumentHandler( aItems ));
-	Reference< XDocumentHandler > xFilter( new SaxNamespaceFilter( xDocHandler ));
-
-	// connect parser and filter
-	xParser->setDocumentHandler( xFilter );
-
-	try
-	{
-		xParser->parseStream( aInputSource );
-		return sal_True;
-	}
-	catch ( RuntimeException& )
-	{
-		return sal_False;
-	}
-	catch( SAXException& )
-	{
-		return sal_False;
-	}
-	catch( ::com::sun::star::io::IOException& )
-	{
-		return sal_False;
-	}
-}
-
-
-// #110897#
-sal_Bool ImagesConfiguration::StoreImages(
-	const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
-	SvStream& rOutStream, const ImageListsDescriptor& aItems )
-{
-	Reference< XDocumentHandler > xWriter( GetSaxWriter( xServiceFactory ) );
-
-	Reference< XOutputStream > xOutputStream(
-								(::cppu::OWeakObject *)new utl::OOutputStreamWrapper( rOutStream ),
-								UNO_QUERY );
-
-	Reference< ::com::sun::star::io::XActiveDataSource> xDataSource( xWriter , UNO_QUERY );
-	xDataSource->setOutputStream( xOutputStream );
-
-	try
-	{
-		OWriteImagesDocumentHandler aWriteImagesDocumentHandler( aItems, xWriter );
-		aWriteImagesDocumentHandler.WriteImagesDocument();
-		return sal_True;
-	}
-	catch ( RuntimeException& )
-	{
-		return sal_False;
-	}
-	catch ( SAXException& )
-	{
-		return sal_False;
-	}
-	catch ( ::com::sun::star::io::IOException& )
-	{
-		return sal_False;
-	}
-}
-
-sal_Bool ImagesConfiguration::LoadImages(
-	const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
-    const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream,
-    ImageListsDescriptor& rItems )
-{
-	Reference< XParser > xParser( GetSaxParser( xServiceFactory ) );
-
-    // connect stream to input stream to the parser
-	InputSource aInputSource;
-
-	aInputSource.aInputStream = rInputStream;
-
-	// create namespace filter and set document handler inside to support xml namespaces
-	Reference< XDocumentHandler > xDocHandler( new OReadImagesDocumentHandler( rItems ));
-	Reference< XDocumentHandler > xFilter( new SaxNamespaceFilter( xDocHandler ));
-
-	// connect parser and filter
-	xParser->setDocumentHandler( xFilter );
-
-	try
-	{
-		xParser->parseStream( aInputSource );
-		return sal_True;
-	}
-	catch ( RuntimeException& )
-	{
-		return sal_False;
-	}
-	catch( SAXException& )
-	{
-		return sal_False;
-	}
-	catch( ::com::sun::star::io::IOException& )
-	{
-		return sal_False;
-	}
-}
-
-sal_Bool ImagesConfiguration::StoreImages(
-	const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
-    const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream,
-    const ImageListsDescriptor& rItems )
-{
-	Reference< XDocumentHandler > xWriter( GetSaxWriter( xServiceFactory ) );
-
-	Reference< ::com::sun::star::io::XActiveDataSource> xDataSource( xWriter , UNO_QUERY );
-	xDataSource->setOutputStream( rOutputStream );
-
-	try
-	{
-		OWriteImagesDocumentHandler aWriteImagesDocumentHandler( rItems, xWriter );
-		aWriteImagesDocumentHandler.WriteImagesDocument();
-		return sal_True;
-	}
-	catch ( RuntimeException& )
-	{
-		return sal_False;
-	}
-	catch ( SAXException& )
-	{
-		return sal_False;
-	}
-	catch ( ::com::sun::star::io::IOException& )
-	{
-		return sal_False;
-	}
-}
-
-}
-

framework/source/fwe/xml/imagesdocumenthandler.cxx

-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_framework.hxx"
-
-#include <stdio.h>
-
-//_________________________________________________________________________________________________________________
-//	my own includes
-//_________________________________________________________________________________________________________________
-
-#include <threadhelp/resetableguard.hxx>
-#include <xml/imagesdocumenthandler.hxx>
-#include <macros/debug.hxx>
-
-//_________________________________________________________________________________________________________________
-//	interface includes
-//_________________________________________________________________________________________________________________
-
-#ifndef __COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HPP_
-#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
-#endif
-
-//_________________________________________________________________________________________________________________
-//	other includes
-//_________________________________________________________________________________________________________________
-#include <vcl/svapp.hxx>
-#include <vcl/toolbox.hxx>
-#include <rtl/ustrbuf.hxx>
-
-#include <comphelper/attributelist.hxx>
-
-//_________________________________________________________________________________________________________________
-//	namespace
-//_________________________________________________________________________________________________________________
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::xml::sax;
-
-#define ELEMENT_IMAGECONTAINER		"imagescontainer"
-#define ELEMENT_IMAGES				"images"
-#define ELEMENT_ENTRY				"entry"
-#define ELEMENT_EXTERNALIMAGES		"externalimages"
-#define ELEMENT_EXTERNALENTRY		"externalentry"
-
-#define ELEMENT_NS_IMAGESCONTAINER	"image:imagescontainer"
-#define ELEMENT_NS_IMAGES			"image:images"
-#define ELEMENT_NS_ENTRY			"image:entry"
-#define ELEMENT_NS_EXTERNALIMAGES	"image:externalimages"
-#define ELEMENT_NS_EXTERNALENTRY	"image:externalentry"
-
-#define ATTRIBUTE_HREF					"href"
-#define ATTRIBUTE_MASKCOLOR				"maskcolor"
-#define ATTRIBUTE_COMMAND				"command"
-#define ATTRIBUTE_BITMAPINDEX			"bitmap-index"
-#define ATTRIBUTE_MASKURL				"maskurl"
-#define ATTRIBUTE_MASKMODE				"maskmode"
-#define ATTRIBUTE_HIGHCONTRASTURL		"highcontrasturl"
-#define ATTRIBUTE_HIGHCONTRASTMASKURL	"highcontrastmaskurl"
-#define ATTRIBUTE_TYPE_CDATA			"CDATA"
-
-#define ATTRIBUTE_MASKMODE_BITMAP	"maskbitmap"
-#define ATTRIBUTE_MASKMODE_COLOR	"maskcolor"
-
-#define ATTRIBUTE_XMLNS_IMAGE		"xmlns:image"
-#define ATTRIBUTE_XMLNS_XLINK		"xmlns:xlink"
-
-#define ATTRIBUTE_XLINK_TYPE		"xlink:type"
-#define ATTRIBUTE_XLINK_TYPE_VALUE	"simple"
-
-#define XMLNS_IMAGE					"http://openoffice.org/2001/image"
-#define XMLNS_XLINK					"http://www.w3.org/1999/xlink"
-#define XMLNS_IMAGE_PREFIX			"image:"
-#define XMLNS_XLINK_PREFIX			"xlink:"
-
-#define XMLNS_FILTER_SEPARATOR		"^"
-
-#define IMAGES_DOCTYPE	"<!DOCTYPE image:imagecontainer PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"image.dtd\">"
-
-namespace framework
-{
-
-struct ImageXMLEntryProperty
-{
-	OReadImagesDocumentHandler::Image_XML_Namespace	nNamespace;
-	char											aEntryName[20];
-};
-
-ImageXMLEntryProperty ImagesEntries[OReadImagesDocumentHandler::IMG_XML_ENTRY_COUNT] =
-{
-	{ OReadImagesDocumentHandler::IMG_NS_IMAGE,	ELEMENT_IMAGECONTAINER			},
-	{ OReadImagesDocumentHandler::IMG_NS_IMAGE,	ELEMENT_IMAGES					},
-	{ OReadImagesDocumentHandler::IMG_NS_IMAGE,	ELEMENT_ENTRY					},
-	{ OReadImagesDocumentHandler::IMG_NS_IMAGE,	ELEMENT_EXTERNALIMAGES			},
-	{ OReadImagesDocumentHandler::IMG_NS_IMAGE,	ELEMENT_EXTERNALENTRY			},
-	{ OReadImagesDocumentHandler::IMG_NS_XLINK,	ATTRIBUTE_HREF					},
-	{ OReadImagesDocumentHandler::IMG_NS_IMAGE,	ATTRIBUTE_MASKCOLOR				},
-	{ OReadImagesDocumentHandler::IMG_NS_IMAGE,	ATTRIBUTE_COMMAND				},
-    { OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_BITMAPINDEX			},
-    { OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_MASKURL				},
-    { OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_MASKMODE				},
-	{ OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_HIGHCONTRASTURL		},
-	{ OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_HIGHCONTRASTMASKURL	}
-};
-
-
-OReadImagesDocumentHandler::OReadImagesDocumentHandler( ImageListsDescriptor& aItems ) :
-	ThreadHelpBase( &Application::GetSolarMutex() ),
-	m_aImageList( aItems ),
-	m_pImages( 0 ),
-	m_pExternalImages( 0 )
-{
-	m_aImageList.pImageList			= NULL;
-	m_aImageList.pExternalImageList = NULL;
-
-	m_nHashMaskModeBitmap	= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKMODE_BITMAP )).hashCode();
-	m_nHashMaskModeColor	= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKMODE_COLOR )).hashCode();
-
-	// create hash map to speed up lookup
-	for ( int i = 0; i < (int)IMG_XML_ENTRY_COUNT; i++ )
-	{
-		::rtl::OUStringBuffer temp( 20 );
-
-		if ( ImagesEntries[i].nNamespace == IMG_NS_IMAGE )
-			temp.appendAscii( XMLNS_IMAGE );
-		else
-			temp.appendAscii( XMLNS_XLINK );
-
-		temp.appendAscii( XMLNS_FILTER_SEPARATOR );
-		temp.appendAscii( ImagesEntries[i].aEntryName );
-		m_aImageMap.insert( ImageHashMap::value_type( temp.makeStringAndClear(), (Image_XML_Entry)i ) );
-	}
-
-	// reset states
-	m_bImageContainerStartFound		= sal_False;
-	m_bImageContainerEndFound		= sal_False;
-	m_bImagesStartFound				= sal_False;
-	m_bImagesEndFound				= sal_False;
-	m_bImageStartFound				= sal_False;
-	m_bExternalImagesStartFound		= sal_False;
-	m_bExternalImagesEndFound		= sal_False;
-	m_bExternalImageStartFound		= sal_False;
-}
-
-OReadImagesDocumentHandler::~OReadImagesDocumentHandler()
-{
-}
-
-// XDocumentHandler
-void SAL_CALL OReadImagesDocumentHandler::startDocument(void)
-throw (	SAXException, RuntimeException )
-{
-}
-
-void SAL_CALL OReadImagesDocumentHandler::endDocument(void)
-throw(	SAXException, RuntimeException )
-{
-	ResetableGuard aGuard( m_aLock );
-
-	if (( m_bImageContainerStartFound && !m_bImageContainerEndFound ) ||
-		( !m_bImageContainerStartFound && m_bImageContainerEndFound )	 )
-	{
-		::rtl::OUString aErrorMessage = getErrorLineString();
-		aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No matching start or end element 'image:imagecontainer' found!" ));
-		throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-	}
-}
-
-void SAL_CALL OReadImagesDocumentHandler::startElement(
-	const ::rtl::OUString& aName, const Reference< XAttributeList > &xAttribs )
-throw(	SAXException, RuntimeException )
-{
-	ResetableGuard aGuard( m_aLock );
-
-	ImageHashMap::const_iterator pImageEntry = m_aImageMap.find( aName ) ;
-	if ( pImageEntry != m_aImageMap.end() )
-	{
-		switch ( pImageEntry->second )
-		{
-			case IMG_ELEMENT_IMAGECONTAINER:
-			{
-				// image:imagecontainer element (container element for all further image elements)
-				if ( m_bImageContainerStartFound )
-				{
-					::rtl::OUString aErrorMessage = getErrorLineString();
-					aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:imagecontainer' cannot be embeded into 'image:imagecontainer'!" ));
-					throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-				}
-
-				m_bImageContainerStartFound = sal_True;
-			}
-			break;
-
-			case IMG_ELEMENT_IMAGES:
-			{
-				if ( !m_bImageContainerStartFound )
-				{
-					::rtl::OUString aErrorMessage = getErrorLineString();
-					aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:images' must be embeded into element 'image:imagecontainer'!" ));
-					throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-				}
-
-				if ( m_bImagesStartFound )
-				{
-					::rtl::OUString aErrorMessage = getErrorLineString();
-					aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:images' cannot be embeded into 'image:images'!" ));
-					throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-				}
-
-				if ( !m_aImageList.pImageList )
-					m_aImageList.pImageList = new ImageListDescriptor;
-
-				m_bImagesStartFound = sal_True;
-				m_pImages = new ImageListItemDescriptor;
-
-				for ( sal_Int16 n = 0; n < xAttribs->getLength(); n++ )
-				{
-					pImageEntry = m_aImageMap.find( xAttribs->getNameByIndex( n ) );
-					if ( pImageEntry != m_aImageMap.end() )
-					{
-						switch ( pImageEntry->second )
-						{
-							case IMG_ATTRIBUTE_HREF:
-							{
-								m_pImages->aURL = xAttribs->getValueByIndex( n );
-							}
-							break;
-
-							case IMG_ATTRIBUTE_MASKCOLOR:
-							{
-								::rtl::OUString aColor = xAttribs->getValueByIndex( n );
-
-								if ( aColor.getLength() > 0 )
-								{
-									if ( aColor.getStr()[0] == '#' )
-									{
-										// the color value is given as #rrggbb and used the hexadecimal system!!
-										sal_uInt32 nColor = aColor.copy( 1 ).toInt32( 16 );
-
-										m_pImages->aMaskColor = Color( COLORDATA_RGB( nColor ) );
-									}
-								}
-							}
-							break;
-
-							case IMG_ATTRIBUTE_MASKURL:
-							{
-								m_pImages->aMaskURL = xAttribs->getValueByIndex( n );
-							}
-							break;
-
-							case IMG_ATTRIBUTE_MASKMODE:
-							{
-								sal_Int32 nHashCode = xAttribs->getValueByIndex( n ).hashCode();
-								if ( nHashCode == m_nHashMaskModeBitmap )
-									m_pImages->nMaskMode = ImageMaskMode_Bitmap;
-								else if ( nHashCode == m_nHashMaskModeColor )
-									m_pImages->nMaskMode = ImageMaskMode_Color;
-								else
-								{
-									delete m_pImages;
-									m_pImages = NULL;
-
-									::rtl::OUString aErrorMessage = getErrorLineString();
-									aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Attribute image:maskmode must be 'maskcolor' or 'maskbitmap'!" ));
-									throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-								}
-							}
-							break;
-
-							case IMG_ATTRIBUTE_HIGHCONTRASTURL:
-							{
-								m_pImages->aHighContrastURL = xAttribs->getValueByIndex( n );
-							}
-							break;
-
-							case IMG_ATTRIBUTE_HIGHCONTRASTMASKURL:
-							{
-								m_pImages->aHighContrastMaskURL = xAttribs->getValueByIndex( n );
-							}
-							break;
-
-                                          default:
-                                              break;
-						}
-					}
-				} // for
-
-				if ( m_pImages->aURL.Len() == 0 )
-				{
-					delete m_pImages;
-					m_pImages = NULL;
-
-					::rtl::OUString aErrorMessage = getErrorLineString();
-					aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Required attribute xlink:href must have a value!" ));
-					throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-				}
-			}
-			break;
-
-			case IMG_ELEMENT_ENTRY:
-			{
-				// Check that image:entry is embeded into image:images!
-				if ( !m_bImagesStartFound )
-				{
-					delete m_pImages;
-					m_pImages = NULL;
-
-					::rtl::OUString aErrorMessage = getErrorLineString();
-					aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:entry' must be embeded into element 'image:images'!" ));
-					throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-				}
-
-				if ( !m_pImages->pImageItemList )
-					m_pImages->pImageItemList = new ImageItemListDescriptor;
-
-				m_bImageStartFound = sal_True;
-
-				// Create new image item descriptor
-				ImageItemDescriptor* pItem = new ImageItemDescriptor;
-				pItem->nIndex = -1;
-
-				// Read attributes for this image definition
-				for ( sal_Int16 n = 0; n < xAttribs->getLength(); n++ )
-				{
-					pImageEntry = m_aImageMap.find( xAttribs->getNameByIndex( n ) );
-					if ( pImageEntry != m_aImageMap.end() )
-					{
-						switch ( pImageEntry->second )
-						{
-							case IMG_ATTRIBUTE_COMMAND:
-							{
-								pItem->aCommandURL	= xAttribs->getValueByIndex( n );
-							}
-							break;
-
-							case IMG_ATTRIBUTE_BITMAPINDEX:
-							{
-								pItem->nIndex		= xAttribs->getValueByIndex( n ).toInt32();
-							}
-							break;
-
-                                          default:
-                                              break;
-						}
-					}
-				}
-
-				// Check required attribute "bitmap-index"
-				if ( pItem->nIndex < 0 )
-				{
-					delete pItem;
-					delete m_pImages;
-					m_pImages = NULL;
-
-					::rtl::OUString aErrorMessage = getErrorLineString();
-					aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Required attribute 'image:bitmap-index' must have a value >= 0!" ));
-					throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-				}
-
-				// Check required attribute "command"
-				if ( pItem->aCommandURL.Len() == 0 )
-				{
-					delete pItem;
-					delete m_pImages;
-					m_pImages = NULL;
-
-					::rtl::OUString aErrorMessage = getErrorLineString();
-					aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Required attribute 'image:command' must have a value!" ));
-					throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-				}
-
-				if ( m_pImages )
-					m_pImages->pImageItemList->Insert( pItem, m_pImages->pImageItemList->Count() );
-			}
-			break;
-
-			case IMG_ELEMENT_EXTERNALIMAGES:
-			{
-				// Check that image:externalimages is embeded into image:imagecontainer
-				if ( !m_bImageContainerStartFound )
-				{
-					delete m_pImages;
-					m_pImages = NULL;
-
-					::rtl::OUString aErrorMessage = getErrorLineString();
-					aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:externalimages' must be embeded into element 'image:imagecontainer'!" ));
-					throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-				}
-
-				// Check that image:externalentry is NOT embeded into image:externalentry
-				if ( m_bExternalImagesStartFound )
-				{
-					delete m_pImages;
-					m_pImages = NULL;
-
-					::rtl::OUString aErrorMessage = getErrorLineString();
-					aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:externalimages' cannot be embeded into 'image:externalimages'!" ));
-					throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-				}
-
-				// Create unique external image container
-				m_bExternalImagesStartFound = sal_True;
-				m_pExternalImages = new ExternalImageItemListDescriptor;
-			}
-			break;
-
-			case IMG_ELEMENT_EXTERNALENTRY:
-			{
-				if ( !m_bExternalImagesStartFound )
-				{
-					delete m_pImages;
-					delete m_pExternalImages;
-					m_pImages = NULL;
-					m_pExternalImages = NULL;
-
-					::rtl::OUString aErrorMessage = getErrorLineString();
-					aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:externalentry' must be embeded into 'image:externalimages'!" ));
-					throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-				}
-
-				if ( m_bExternalImageStartFound )
-				{
-					delete m_pImages;
-					delete m_pExternalImages;
-					m_pImages = NULL;
-					m_pExternalImages = NULL;
-
-					::rtl::OUString aErrorMessage = getErrorLineString();
-					aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:externalentry' cannot be embeded into 'image:externalentry'!" ));
-					throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-				}
-
-				m_bExternalImageStartFound = sal_True;
-
-				ExternalImageItemDescriptor* pItem = new ExternalImageItemDescriptor;
-
-				// Read attributes for this external image definition
-				for ( sal_Int16 n = 0; n < xAttribs->getLength(); n++ )
-				{
-					pImageEntry = m_aImageMap.find( xAttribs->getNameByIndex( n ) );
-					if ( pImageEntry != m_aImageMap.end() )
-					{
-						switch ( pImageEntry->second )
-						{
-							case IMG_ATTRIBUTE_COMMAND:
-							{
-								pItem->aCommandURL	= xAttribs->getValueByIndex( n );
-							}
-							break;
-
-							case IMG_ATTRIBUTE_HREF:
-							{
-								pItem->aURL			= xAttribs->getValueByIndex( n );
-							}
-							break;
-
-                                          default:
-                                              break;
-						}
-					}
-				}
-
-				// Check required attribute "command"
-				if ( pItem->aCommandURL.Len() == 0 )
-				{
-					delete pItem;
-					delete m_pImages;
-					delete m_pExternalImages;
-					m_pImages = NULL;
-					m_pExternalImages = NULL;
-
-					::rtl::OUString aErrorMessage = getErrorLineString();
-					aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Required attribute 'image:command' must have a value!" ));
-					throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-				}
-
-				// Check required attribute "href"
-				if ( pItem->aURL.Len() == 0 )
-				{
-					delete pItem;
-					delete m_pImages;
-					delete m_pExternalImages;
-					m_pImages = NULL;
-					m_pExternalImages = NULL;
-
-					::rtl::OUString aErrorMessage = getErrorLineString();
-					aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Required attribute 'xlink:href' must have a value!" ));
-					throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-				}
-
-				if ( m_pExternalImages )
-					m_pExternalImages->Insert( pItem, m_pExternalImages->Count() );
-			}
-			break;
-
-                  default:
-                      break;
-		}
-	}
-}
-
-void SAL_CALL OReadImagesDocumentHandler::endElement(const ::rtl::OUString& aName)
-throw(	SAXException, RuntimeException )
-{
-	ResetableGuard aGuard( m_aLock );
-
-	ImageHashMap::const_iterator pImageEntry = m_aImageMap.find( aName ) ;
-	if ( pImageEntry != m_aImageMap.end() )
-	{
-		switch ( pImageEntry->second )
-		{
-			case IMG_ELEMENT_IMAGECONTAINER:
-			{
-				m_bImageContainerEndFound = sal_True;
-			}
-			break;
-
-			case IMG_ELEMENT_IMAGES:
-			{
-				if ( m_pImages )
-				{
-					if ( m_aImageList.pImageList )
-						m_aImageList.pImageList->Insert( m_pImages, m_aImageList.pImageList->Count() );
-					m_pImages = NULL;
-				}
-				m_bImagesStartFound = sal_False;
-			}
-			break;
-
-			case IMG_ELEMENT_ENTRY:
-			{
-				m_bImageStartFound = sal_False;
-			}
-			break;
-
-			case IMG_ELEMENT_EXTERNALIMAGES:
-			{
-				if ( m_pExternalImages && !m_aImageList.pExternalImageList )
-				{
-					if ( !m_aImageList.pExternalImageList )
-						m_aImageList.pExternalImageList = m_pExternalImages;
-				}
-
-				m_bExternalImagesStartFound = sal_False;
-				m_pExternalImages = NULL;
-			}
-			break;
-
-			case IMG_ELEMENT_EXTERNALENTRY:
-			{
-				m_bExternalImageStartFound = sal_False;
-			}
-			break;
-
-                  default:
-                      break;
-		}
-	}
-}
-
-void SAL_CALL OReadImagesDocumentHandler::characters(const ::rtl::OUString&)
-throw(	SAXException, RuntimeException )
-{
-}
-
-void SAL_CALL OReadImagesDocumentHandler::ignorableWhitespace(const ::rtl::OUString&)
-throw(	SAXException, RuntimeException )
-{
-}
-
-void SAL_CALL OReadImagesDocumentHandler::processingInstruction(
-	const ::rtl::OUString& /*aTarget*/, const ::rtl::OUString& /*aData*/ )
-throw(	SAXException, RuntimeException )
-{
-}
-
-void SAL_CALL OReadImagesDocumentHandler::setDocumentLocator(
-	const Reference< XLocator > &xLocator)
-throw(	SAXException, RuntimeException )
-{
-	ResetableGuard aGuard( m_aLock );
-
-	m_xLocator = xLocator;
-}
-
-::rtl::OUString OReadImagesDocumentHandler::getErrorLineString()
-{
-	ResetableGuard aGuard( m_aLock );
-
-	char buffer[32];
-
-	if ( m_xLocator.is() )
-	{
-		snprintf( buffer, sizeof(buffer), "Line: %ld - ", static_cast<long>( m_xLocator->getLineNumber() ));
-		return ::rtl::OUString::createFromAscii( buffer );
-	}
-	else
-		return ::rtl::OUString();
-}
-
-
-//_________________________________________________________________________________________________________________
-//	OWriteImagesDocumentHandler
-//_________________________________________________________________________________________________________________
-
-OWriteImagesDocumentHandler::OWriteImagesDocumentHandler(
-	const ImageListsDescriptor& aItems,
-	Reference< XDocumentHandler > rWriteDocumentHandler ) :
-    ThreadHelpBase( &Application::GetSolarMutex() ),
-	m_aImageListsItems( aItems ),
-	m_xWriteDocumentHandler( rWriteDocumentHandler )
-{
-	::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
-	m_xEmptyList			= Reference< XAttributeList >( (XAttributeList *) pList, UNO_QUERY );
-	m_aAttributeType		= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA ));
-	m_aXMLImageNS			= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_IMAGE_PREFIX ));
-	m_aXMLXlinkNS			= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK_PREFIX ));
-	m_aAttributeXlinkType	= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XLINK_TYPE ));
-	m_aAttributeValueSimple = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XLINK_TYPE_VALUE ));
-}
-
-OWriteImagesDocumentHandler::~OWriteImagesDocumentHandler()
-{
-}
-
-void OWriteImagesDocumentHandler::WriteImagesDocument() throw
-( SAXException, RuntimeException )
-{
-	ResetableGuard aGuard( m_aLock );
-
-	m_xWriteDocumentHandler->startDocument();
-
-	// write DOCTYPE line!
-	Reference< XExtendedDocumentHandler > xExtendedDocHandler( m_xWriteDocumentHandler, UNO_QUERY );
-	if ( xExtendedDocHandler.is() )
-	{
-		xExtendedDocHandler->unknown( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( IMAGES_DOCTYPE )) );
-		m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
-	}
-
-	::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
-	Reference< XAttributeList > xList( (XAttributeList *) pList , UNO_QUERY );
-
-	pList->AddAttribute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XMLNS_IMAGE )),
-						 m_aAttributeType,
-						 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_IMAGE )) );
-
-	pList->AddAttribute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XMLNS_XLINK )),
-						 m_aAttributeType,
-						 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK )) );
-
-	m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_IMAGESCONTAINER )), pList );
-	m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
-
-	if ( m_aImageListsItems.pImageList )
-	{
-		ImageListDescriptor* pImageList = m_aImageListsItems.pImageList;
-
-		for ( sal_uInt16 i = 0; i < m_aImageListsItems.pImageList->Count(); i++ )
-		{
-			const ImageListItemDescriptor* pImageItems = (*pImageList)[i];
-			WriteImageList( pImageItems );
-		}
-	}
-
-	if ( m_aImageListsItems.pExternalImageList )
-	{
-		WriteExternalImageList( m_aImageListsItems.pExternalImageList );
-	}
-
-	m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
-	m_xWriteDocumentHandler->endElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_IMAGESCONTAINER )) );
-	m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
-	m_xWriteDocumentHandler->endDocument();
-}
-
-//_________________________________________________________________________________________________________________
-//	protected member functions
-//_________________________________________________________________________________________________________________
-
-void OWriteImagesDocumentHandler::WriteImageList( const ImageListItemDescriptor* pImageList ) throw
-( SAXException, RuntimeException )
-{
-	::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
-	Reference< XAttributeList > xList( (XAttributeList *) pList , UNO_QUERY );
-
-    // save required attributes
-	pList->AddAttribute( m_aAttributeXlinkType,
-						 m_aAttributeType,
-						 m_aAttributeValueSimple );
-
-	pList->AddAttribute( m_aXMLXlinkNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_HREF )),
-						 m_aAttributeType,
-						 pImageList->aURL );
-
-	if ( pImageList->nMaskMode == ImageMaskMode_Bitmap )
-	{
-		pList->AddAttribute( m_aXMLImageNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKMODE )),
-							 m_aAttributeType,
-							 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKMODE_BITMAP )) );
-
-		pList->AddAttribute( m_aXMLImageNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKURL )),
-							 m_aAttributeType,
-							 pImageList->aMaskURL );
-
-		if ( pImageList->aHighContrastMaskURL.Len() > 0 )
-		{
-			pList->AddAttribute( m_aXMLImageNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_HIGHCONTRASTMASKURL )),
-								 m_aAttributeType,
-								 pImageList->aHighContrastMaskURL );
-		}
-	}
-	else
-	{
-		::rtl::OUStringBuffer	aColorStrBuffer( 8 );
-		sal_Int64		nValue = pImageList->aMaskColor.GetRGBColor();
-
-		aColorStrBuffer.appendAscii( "#" );
-		aColorStrBuffer.append( ::rtl::OUString::valueOf( nValue, 16 ));
-
-		pList->AddAttribute( m_aXMLImageNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKCOLOR )),
-							 m_aAttributeType,
-							 aColorStrBuffer.makeStringAndClear() );
-
-		pList->AddAttribute( m_aXMLImageNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKMODE )),
-							 m_aAttributeType,
-							 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKMODE_COLOR )) );
-	}
-
-	if ( pImageList->aHighContrastURL.Len() > 0 )
-	{
-		pList->AddAttribute( m_aXMLImageNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_HIGHCONTRASTURL )),
-							 m_aAttributeType,
-							 pImageList->aHighContrastURL );
-	}
-
-    m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_IMAGES )), xList );
-    m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
-
-	ImageItemListDescriptor* pImageItemList = pImageList->pImageItemList;
-	if ( pImageItemList )
-	{
-		for ( sal_uInt16 i = 0; i < pImageItemList->Count(); i++ )
-			WriteImage( (*pImageItemList)[i] );
-	}
-
-	m_xWriteDocumentHandler->endElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_IMAGES )) );
-	m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
-}
-
-void OWriteImagesDocumentHandler::WriteImage( const ImageItemDescriptor* pImage ) throw
-( SAXException, RuntimeException )
-{
-	::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
-	Reference< XAttributeList > xList( (XAttributeList *) pList , UNO_QUERY );
-
-	pList->AddAttribute( m_aXMLImageNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_BITMAPINDEX )),
-						 m_aAttributeType,
-						 ::rtl::OUString::valueOf( (sal_Int32)pImage->nIndex ) );
-
-	pList->AddAttribute( m_aXMLImageNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_COMMAND )),
-						 m_aAttributeType,
-						 pImage->aCommandURL );
-
-	m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_ENTRY )), xList );
-	m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
-
-	m_xWriteDocumentHandler->endElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_ENTRY )) );
-	m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
-}
-
-void OWriteImagesDocumentHandler::WriteExternalImageList( const ExternalImageItemListDescriptor* pExternalImageList ) throw
-( SAXException, RuntimeException )
-{
-	m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_EXTERNALIMAGES )), m_xEmptyList );
-	m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
-
-	for ( sal_uInt16 i = 0; i < pExternalImageList->Count(); i++ )
-	{
-		ExternalImageItemDescriptor* pItem = (*pExternalImageList)[i];
-		WriteExternalImage( pItem );
-	}
-
-	m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
-	m_xWriteDocumentHandler->endElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_EXTERNALIMAGES )) );
-	m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
-}
-
-void OWriteImagesDocumentHandler::WriteExternalImage( const ExternalImageItemDescriptor* pExternalImage ) throw
-( SAXException, RuntimeException )
-{
-	::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
-	Reference< XAttributeList > xList( (XAttributeList *) pList , UNO_QUERY );
-
-    // save required attributes
-	pList->AddAttribute( m_aAttributeXlinkType,
-						 m_aAttributeType,
-						 m_aAttributeValueSimple );
-
-	if ( pExternalImage->aURL.Len() > 0 )
-	{
-		pList->AddAttribute( m_aXMLXlinkNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_HREF )),
-							 m_aAttributeType,
-							 pExternalImage->aURL );
-	}
-
-	if ( pExternalImage->aCommandURL.Len() > 0 )
-	{
-		pList->AddAttribute( m_aXMLImageNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_COMMAND )),
-							 m_aAttributeType,
-							 pExternalImage->aCommandURL );
-	}
-
-	m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_EXTERNALENTRY )), xList );
-	m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
-
-	m_xWriteDocumentHandler->endElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_EXTERNALENTRY )) );
-	m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
-}
-
-} // namespace framework
-
-
-
-

framework/source/uiconfiguration/imagemanager.cxx

 
 // 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"

framework/source/uiconfiguration/imagemanagerimpl.cxx

 
 // 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>
 

framework/source/uiconfiguration/moduleimagemanager.cxx