ooo-build r13125 - trunk/patches/test/vba

From: noelpwer svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r13125 - trunk/patches/test/vba
Date: Wed, 9 Jul 2008 15:17:09 +0000 (UTC)
Author: noelpwer
Date: Wed Jul  9 15:17:09 2008
New Revision: 13125
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13125&view=rev

Log:
more bits working, now at least images ( linked and unlinked ) are read and
written ( and more or less handled ) for document read/save, some
problems exist :-( and only image control works, e.g. buttons with image ( and other controls don't seem to work )


Modified:
   trunk/patches/test/vba/HackyImageControlWithNonLinkedImages.diff

Modified: trunk/patches/test/vba/HackyImageControlWithNonLinkedImages.diff
==============================================================================
--- trunk/patches/test/vba/HackyImageControlWithNonLinkedImages.diff	(original)
+++ trunk/patches/test/vba/HackyImageControlWithNonLinkedImages.diff	Wed Jul  9 15:17:09 2008
@@ -1,7 +1,6 @@
-diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
-index 1ba9f90..03499a1 100644
---- a/forms/source/component/ImageControl.cxx
-+++ b/forms/source/component/ImageControl.cxx
+diff -rup /data4/M21/ooo-build/build-src/dev300-m21/forms/source/component/ImageControl.cxx forms/source/component/ImageControl.cxx
+--- /data4/M21/ooo-build/build-src/dev300-m21/forms/source/component/ImageControl.cxx	2008-04-11 09:16:50.000000000 +0100
++++ forms/source/component/ImageControl.cxx	2008-07-08 00:04:54.000000000 +0100
 @@ -57,6 +57,9 @@
  #include <com/sun/star/io/NotConnectedException.hpp>
  #include <com/sun/star/beans/PropertyValue.hpp>
@@ -48,10 +47,9 @@
  
      if ( xImageStream.is() )
      {
-diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx
-index 01fa8ac..503fb6c 100644
---- a/forms/source/component/imgprod.cxx
-+++ b/forms/source/component/imgprod.cxx
+diff -rup /data4/M21/ooo-build/build-src/dev300-m21/forms/source/component/imgprod.cxx forms/source/component/imgprod.cxx
+--- /data4/M21/ooo-build/build-src/dev300-m21/forms/source/component/imgprod.cxx	2008-05-05 16:21:55.000000000 +0100
++++ forms/source/component/imgprod.cxx	2008-07-07 22:49:39.000000000 +0100
 @@ -49,6 +49,8 @@
  // - ImgProdLockBytes -
  // --------------------
@@ -83,12 +81,18 @@
  }
  
  namespace frm
-diff --git a/goodies/source/unographic/descriptor.cxx b/goodies/source/unographic/descriptor.cxx
-diff --git a/goodies/source/unographic/descriptor.hxx b/goodies/source/unographic/descriptor.hxx
-diff --git a/goodies/source/unographic/provider.cxx b/goodies/source/unographic/provider.cxx
-index f51b852..5f79bdd 100644
---- a/goodies/source/unographic/provider.cxx
-+++ b/goodies/source/unographic/provider.cxx
+Only in forms/source/resource: localize.sdf
+Only in goodies/source/filter.vcl/egif: localize.sdf
+Only in goodies/source/filter.vcl/eos2met: localize.sdf
+Only in goodies/source/filter.vcl/epbm: localize.sdf
+Only in goodies/source/filter.vcl/epgm: localize.sdf
+Only in goodies/source/filter.vcl/epict: localize.sdf
+Only in goodies/source/filter.vcl/eppm: localize.sdf
+Only in goodies/source/filter.vcl/eps: localize.sdf
+Only in goodies/source/inv: localize.sdf
+diff -rup /data4/M21/ooo-build/build-src/dev300-m21/goodies/source/unographic/provider.cxx goodies/source/unographic/provider.cxx
+--- /data4/M21/ooo-build/build-src/dev300-m21/goodies/source/unographic/provider.cxx	2008-04-11 01:08:51.000000000 +0100
++++ goodies/source/unographic/provider.cxx	2008-07-07 23:05:02.000000000 +0100
 @@ -52,6 +52,8 @@
  #include <com/sun/star/io/XStream.hpp>
  #include <com/sun/star/text/GraphicCrop.hpp>
@@ -184,10 +188,21 @@
  		}
  	
  		delete pIStm;
-diff --git a/offapi/com/sun/star/graphic/makefile.mk b/offapi/com/sun/star/graphic/makefile.mk
-index 600f60d..94abf95 100755
---- a/offapi/com/sun/star/graphic/makefile.mk
-+++ b/offapi/com/sun/star/graphic/makefile.mk
+diff -rup /data4/M21/ooo-build/build-src/dev300-m21/offapi/com/sun/star/document/makefile.mk offapi/com/sun/star/document/makefile.mk
+--- /data4/M21/ooo-build/build-src/dev300-m21/offapi/com/sun/star/document/makefile.mk	2008-07-09 13:18:21.000000000 +0100
++++ offapi/com/sun/star/document/makefile.mk	2008-07-09 09:32:56.000000000 +0100
+@@ -92,6 +92,7 @@ IDLFILES=\
+ 	XFilter.idl\
+ 	XFilterAdapter.idl\
+ 	XGraphicObjectResolver.idl\
++	XGraphicResolver.idl\
+ 	XImporter.idl\
+ 	XInteractionFilterOptions.idl\
+ 	XInteractionFilterSelect.idl\
+Only in offapi/com/sun/star/document: XGraphicResolver.idl
+diff -rup /data4/M21/ooo-build/build-src/dev300-m21/offapi/com/sun/star/graphic/makefile.mk offapi/com/sun/star/graphic/makefile.mk
+--- /data4/M21/ooo-build/build-src/dev300-m21/offapi/com/sun/star/graphic/makefile.mk	2008-04-11 01:03:27.000000000 +0100
++++ offapi/com/sun/star/graphic/makefile.mk	2008-07-07 16:22:04.000000000 +0100
 @@ -53,7 +53,8 @@ IDLFILES= \
  	XGraphic.idl \
  	XGraphicProvider.idl \
@@ -198,10 +213,121 @@
  	
  # --- Targets ------------------------------------------------------
  
-diff --git a/toolkit/inc/toolkit/controls/unocontrols.hxx b/toolkit/inc/toolkit/controls/unocontrols.hxx
-index 72c7db8..df58c56 100644
---- a/toolkit/inc/toolkit/controls/unocontrols.hxx
-+++ b/toolkit/inc/toolkit/controls/unocontrols.hxx
+Only in offapi/com/sun/star/graphic: XGraphicLinkProvider.idl
+Only in svx/inc/: localize.sdf
+diff -rup /data4/M21/ooo-build/build-src/dev300-m21/svx/inc/xmlgrhlp.hxx svx/inc/xmlgrhlp.hxx
+--- /data4/M21/ooo-build/build-src/dev300-m21/svx/inc/xmlgrhlp.hxx	2008-04-10 20:13:29.000000000 +0100
++++ svx/inc/xmlgrhlp.hxx	2008-07-09 10:35:12.000000000 +0100
+@@ -37,8 +37,9 @@
+ #include <vector>
+ #include <set>
+ #include <utility>
+-#include <com/sun/star/document/XGraphicObjectResolver.hpp>
++#include <com/sun/star/document/XGraphicResolver.hpp>
+ #include <com/sun/star/document/XBinaryStreamResolver.hpp>
++#include <com/sun/star/graphic/XGraphic.hpp>
+ #include <com/sun/star/embed/XStorage.hpp>
+ #include "svx/svxdllapi.h"
+ 
+@@ -61,8 +62,9 @@ struct SvxGraphicHelperStream_Impl
+     ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream > xStream;
+ };
+ 
+-class SVX_DLLPUBLIC SvXMLGraphicHelper : public ::cppu::WeakComponentImplHelper2<	::com::sun::star::document::XGraphicObjectResolver,
+-                                                                    ::com::sun::star::document::XBinaryStreamResolver >
++typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::document::XGraphicResolver, ::com::sun::star::document::XBinaryStreamResolver > SvXMLGraphicHelper_BASE;
++
++class SVX_DLLPUBLIC SvXMLGraphicHelper : public SvXMLGraphicHelper_BASE
+ {
+ private:
+ 
+@@ -118,6 +120,7 @@ public:
+ 
+ public:
+ 
++    virtual ::rtl::OUString SAL_CALL resolveGraphicObject( const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rxGraphic ) throw(::com::sun::star::uno::RuntimeException);
+ 	// XGraphicObjectResolver
+     virtual ::rtl::OUString SAL_CALL resolveGraphicObjectURL( const ::rtl::OUString& aURL ) throw(::com::sun::star::uno::RuntimeException);
+ 
+Only in svx/source/accessibility: localize.sdf
+Only in svx/source/dialog: localize.sdf
+Only in svx/source/editeng: localize.sdf
+Only in svx/source/engine3d: localize.sdf
+Only in svx/source/fmcomp: localize.sdf
+Only in svx/source/form: localize.sdf
+Only in svx/source/gallery2: localize.sdf
+Only in svx/source/intro: localize.sdf
+Only in svx/source/items: localize.sdf
+Only in svx/source/mnuctrls: localize.sdf
+Only in svx/source/options: localize.sdf
+Only in svx/source/outliner: localize.sdf
+Only in svx/source/src: localize.sdf
+Only in svx/source/stbctrls: localize.sdf
+Only in svx/source/svdraw: localize.sdf
+Only in svx/source/svxlink: localize.sdf
+Only in svx/source/table: localize.sdf
+Only in svx/source/tbxctrls: localize.sdf
+Only in svx/source/toolbars: localize.sdf
+Only in svx/source/unodialogs/textconversiondlgs: localize.sdf
+Only in svx/source/unodraw: localize.sdf
+diff -rup /data4/M21/ooo-build/build-src/dev300-m21/svx/source/xml/xmlgrhlp.cxx svx/source/xml/xmlgrhlp.cxx
+--- /data4/M21/ooo-build/build-src/dev300-m21/svx/source/xml/xmlgrhlp.cxx	2008-04-11 05:11:07.000000000 +0100
++++ svx/source/xml/xmlgrhlp.cxx	2008-07-09 10:54:27.000000000 +0100
+@@ -38,7 +38,9 @@
+ #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+ #include <com/sun/star/lang/XServiceInfo.hpp>
+ #include <com/sun/star/lang/XInitialization.hpp>
++#include <com/sun/star/graphic/XGraphicProvider.hpp>
+ #include <cppuhelper/compbase4.hxx>
++#include <comphelper/processfactory.hxx>
+ 
+ #include <unotools/ucbstreamhelper.hxx>
+ #include <unotools/streamwrap.hxx>
+@@ -401,16 +403,12 @@ const GraphicObject& SvXMLGraphicOutputS
+ // - SvXMLGraphicHelper -
+ // ----------------------
+ 
+-SvXMLGraphicHelper::SvXMLGraphicHelper( SvXMLGraphicHelperMode eCreateMode ) :
+-	::cppu::WeakComponentImplHelper2< ::com::sun::star::document::XGraphicObjectResolver,
+-                                      ::com::sun::star::document::XBinaryStreamResolver >( maMutex )
++SvXMLGraphicHelper::SvXMLGraphicHelper( SvXMLGraphicHelperMode eCreateMode ) : SvXMLGraphicHelper_BASE( maMutex )
+ {
+ 	Init( NULL, eCreateMode, sal_False );
+ }
+ 
+-SvXMLGraphicHelper::SvXMLGraphicHelper() :
+-	::cppu::WeakComponentImplHelper2< ::com::sun::star::document::XGraphicObjectResolver,
+-                                      ::com::sun::star::document::XBinaryStreamResolver >( maMutex )
++SvXMLGraphicHelper::SvXMLGraphicHelper() : SvXMLGraphicHelper_BASE( maMutex )
+ {
+ }
+ 
+@@ -820,6 +818,22 @@ void SvXMLGraphicHelper::Destroy( SvXMLG
+ 
+ // -----------------------------------------------------------------------------
+ 
++OUString SAL_CALL SvXMLGraphicHelper::resolveGraphicObject( const uno::Reference< graphic::XGraphic > & rxGraphic ) throw(uno::RuntimeException)
++{
++    rtl::OUString sRet;
++    // Create tmp GraphicObject
++    GraphicObject tmpGraphic( rxGraphic ); 
++    const OUString          aId( OUString::createFromAscii( tmpGraphic.GetUniqueID().GetBuffer() ) );
++
++    if( aId.getLength() )
++    {
++        sRet = OUString::createFromAscii( XML_GRAPHICOBJECT_URL_BASE );
++        sRet += aId;
++        sRet = resolveGraphicObjectURL( sRet ); 
++    }
++    return sRet;
++}
++
+ // XGraphicObjectResolver
+ OUString SAL_CALL SvXMLGraphicHelper::resolveGraphicObjectURL( const OUString& aURL )
+ 	throw(uno::RuntimeException)
+diff -rup /data4/M21/ooo-build/build-src/dev300-m21/toolkit/inc/toolkit/controls/unocontrols.hxx toolkit/inc/toolkit/controls/unocontrols.hxx
+--- /data4/M21/ooo-build/build-src/dev300-m21/toolkit/inc/toolkit/controls/unocontrols.hxx	2008-04-11 10:00:24.000000000 +0100
++++ toolkit/inc/toolkit/controls/unocontrols.hxx	2008-07-07 18:02:37.000000000 +0100
 @@ -54,6 +54,8 @@
  #include <com/sun/star/awt/XCurrencyField.hpp>
  #include <com/sun/star/awt/XPatternField.hpp>
@@ -249,10 +375,9 @@
  
  	::com::sun::star::uno::Any	SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
      ::com::sun::star::uno::Any	SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-diff --git a/toolkit/inc/toolkit/helper/property.hxx b/toolkit/inc/toolkit/helper/property.hxx
-index db61c94..73e861e 100644
---- a/toolkit/inc/toolkit/helper/property.hxx
-+++ b/toolkit/inc/toolkit/helper/property.hxx
+diff -rup /data4/M21/ooo-build/build-src/dev300-m21/toolkit/inc/toolkit/helper/property.hxx toolkit/inc/toolkit/helper/property.hxx
+--- /data4/M21/ooo-build/build-src/dev300-m21/toolkit/inc/toolkit/helper/property.hxx	2008-07-09 13:18:03.000000000 +0100
++++ toolkit/inc/toolkit/helper/property.hxx	2008-07-07 17:01:58.000000000 +0100
 @@ -190,6 +190,7 @@ namespace rtl {
  #define BASEPROPERTY_CUSTOMUNITTEXT                 136  // ::rtl::OUString
  #define BASEPROPERTY_ENABLEVISIBLE                  137  // sal_Bool
@@ -261,10 +386,9 @@
  
  // Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
  #define BASEPROPERTY_FONTDESCRIPTORPART_START			1000
-diff --git a/toolkit/inc/toolkit/helper/servicenames.hxx b/toolkit/inc/toolkit/helper/servicenames.hxx
-index 78a507a..6404f07 100644
---- a/toolkit/inc/toolkit/helper/servicenames.hxx
-+++ b/toolkit/inc/toolkit/helper/servicenames.hxx
+diff -rup /data4/M21/ooo-build/build-src/dev300-m21/toolkit/inc/toolkit/helper/servicenames.hxx toolkit/inc/toolkit/helper/servicenames.hxx
+--- /data4/M21/ooo-build/build-src/dev300-m21/toolkit/inc/toolkit/helper/servicenames.hxx	2008-04-11 10:05:43.000000000 +0100
++++ toolkit/inc/toolkit/helper/servicenames.hxx	2008-07-07 18:10:57.000000000 +0100
 @@ -98,6 +98,7 @@ extern const sal_Char __FAR_DATA szServi
  extern const sal_Char __FAR_DATA szServiceName_UnoSimpleAnimationControl[], szServiceName_UnoSimpleAnimationControlModel[];
  extern const sal_Char __FAR_DATA szServiceName_UnoThrobberControl[], szServiceName_UnoThrobberControlModel[];
@@ -273,10 +397,10 @@
  
  // ExtUnoWrapper:
  extern const char __FAR_DATA szServiceName_ImageProducer[], szServiceName2_ImageProducer[];
-diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
-index 3fd5723..a5e52a6 100644
---- a/toolkit/source/controls/dialogcontrol.cxx
-+++ b/toolkit/source/controls/dialogcontrol.cxx
+Only in toolkit/source/awt: localize.sdf
+diff -rup /data4/M21/ooo-build/build-src/dev300-m21/toolkit/source/controls/dialogcontrol.cxx toolkit/source/controls/dialogcontrol.cxx
+--- /data4/M21/ooo-build/build-src/dev300-m21/toolkit/source/controls/dialogcontrol.cxx	2008-07-09 13:18:03.000000000 +0100
++++ toolkit/source/controls/dialogcontrol.cxx	2008-07-07 23:08:03.000000000 +0100
 @@ -2118,7 +2118,8 @@ throw (RuntimeException)
  	rbase  >>= baseLocation;
  	rUrl  >>= url;
@@ -287,10 +411,9 @@
  	{
  		INetURLObject urlObj(baseLocation);
  		urlObj.removeSegment();
-diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx
-index 6f3b633..4e24a16 100644
---- a/toolkit/source/controls/unocontrolmodel.cxx
-+++ b/toolkit/source/controls/unocontrolmodel.cxx
+diff -rup /data4/M21/ooo-build/build-src/dev300-m21/toolkit/source/controls/unocontrolmodel.cxx toolkit/source/controls/unocontrolmodel.cxx
+--- /data4/M21/ooo-build/build-src/dev300-m21/toolkit/source/controls/unocontrolmodel.cxx	2008-07-09 13:18:03.000000000 +0100
++++ toolkit/source/controls/unocontrolmodel.cxx	2008-07-07 17:31:51.000000000 +0100
 @@ -37,6 +37,7 @@
  #include <com/sun/star/awt/FontWeight.hpp>
  #include <com/sun/star/awt/FontSlant.hpp>
@@ -308,10 +431,9 @@
              case BASEPROPERTY_VERTICALALIGN:
              case BASEPROPERTY_BORDERCOLOR:
              case BASEPROPERTY_SYMBOL_COLOR:
-diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
-index 821c1b9..bbcdb82 100644
---- a/toolkit/source/controls/unocontrols.cxx
-+++ b/toolkit/source/controls/unocontrols.cxx
+diff -rup /data4/M21/ooo-build/build-src/dev300-m21/toolkit/source/controls/unocontrols.cxx toolkit/source/controls/unocontrols.cxx
+--- /data4/M21/ooo-build/build-src/dev300-m21/toolkit/source/controls/unocontrols.cxx	2008-04-11 10:33:44.000000000 +0100
++++ toolkit/source/controls/unocontrols.cxx	2008-07-09 12:40:45.000000000 +0100
 @@ -37,6 +37,8 @@
  #include <com/sun/star/awt/VisualEffect.hpp>
  #include <com/sun/star/awt/LineEndFormat.hpp>
@@ -399,7 +521,7 @@
      {
          uno::Reference< graphic::XGraphic > xGraphic;
          if ( !_rURL.getLength() )
-@@ -593,6 +636,13 @@ namespace
+@@ -593,18 +636,34 @@ namespace
                  uno::Sequence< beans::PropertyValue > aMediaProperties(1);
                  aMediaProperties[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) );
                  aMediaProperties[0].Value <<= _rURL;
@@ -413,7 +535,11 @@
                  xGraphic = xProvider->queryGraphic( aMediaProperties );
              }
          }
-@@ -603,8 +653,16 @@ namespace
+         catch( const Exception& )
+         {
++		OSL_TRACE("unhandled details URL %s Storage is ( %d )", rtl::OUStringToOString( _rURL, RTL_TEXTENCODING_UTF8 ).getStr(), xStorage.is() );	
+         	DBG_UNHANDLED_EXCEPTION();
+         }
  
          return xGraphic;
      }
@@ -430,7 +556,7 @@
  void SAL_CALL ImageProducerControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception)
  {
      UnoControlModel::setFastPropertyValue_NoBroadcast( nHandle, rValue );
-@@ -615,17 +673,45 @@ void SAL_CALL ImageProducerControlModel:
+@@ -615,17 +674,45 @@ void SAL_CALL ImageProducerControlModel:
      {
          switch ( nHandle )
          {
@@ -478,7 +604,7 @@
          case BASEPROPERTY_GRAPHIC:
              if ( !mbAdjustingGraphic && ImplHasProperty( BASEPROPERTY_IMAGEURL ) )
              {
-@@ -676,8 +762,18 @@ void ImageProducerControlModel::removeCo
+@@ -676,8 +763,18 @@ void ImageProducerControlModel::removeCo
  
  void ImageProducerControlModel::startProduction(  ) throw (::com::sun::star::uno::RuntimeException)
  {
@@ -498,10 +624,9 @@
  	uno::Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
  	uno::Reference< awt::XImageProducer > xImageProducer( xMSF->createInstanceWithArguments( ::rtl::OUString::createFromAscii( "com.sun.star.awt.ImageProducer" ), aArgs ), uno::UNO_QUERY );
  	if ( xImageProducer.is() )
-diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx
-index a7fc25b..1186c26 100644
---- a/toolkit/source/helper/property.cxx
-+++ b/toolkit/source/helper/property.cxx
+diff -rup /data4/M21/ooo-build/build-src/dev300-m21/toolkit/source/helper/property.cxx toolkit/source/helper/property.cxx
+--- /data4/M21/ooo-build/build-src/dev300-m21/toolkit/source/helper/property.cxx	2008-07-09 13:18:03.000000000 +0100
++++ toolkit/source/helper/property.cxx	2008-07-07 17:34:34.000000000 +0100
 @@ -53,6 +53,7 @@
  #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
  #include <com/sun/star/beans/PropertyAttribute.hpp>
@@ -518,10 +643,9 @@
              DECL_PROP_2     ( "HelpText",               HELPTEXT,           ::rtl::OUString,    BOUND, MAYBEDEFAULT ),
              DECL_PROP_2     ( "HelpURL",                HELPURL,            ::rtl::OUString,    BOUND, MAYBEDEFAULT ),
              DECL_PROP_2     ( "HideInactiveSelection",  HIDEINACTIVESELECTION, bool,            BOUND, MAYBEDEFAULT ),
-diff --git a/toolkit/source/helper/registerservices.cxx b/toolkit/source/helper/registerservices.cxx
-index 9898393..ab5c14f 100644
---- a/toolkit/source/helper/registerservices.cxx
-+++ b/toolkit/source/helper/registerservices.cxx
+diff -rup /data4/M21/ooo-build/build-src/dev300-m21/toolkit/source/helper/registerservices.cxx toolkit/source/helper/registerservices.cxx
+--- /data4/M21/ooo-build/build-src/dev300-m21/toolkit/source/helper/registerservices.cxx	2008-07-09 13:18:24.000000000 +0100
++++ toolkit/source/helper/registerservices.cxx	2008-07-07 18:09:17.000000000 +0100
 @@ -198,6 +198,7 @@ IMPL_CREATEINSTANCE( UnoSimpleAnimationC
  IMPL_CREATEINSTANCE( UnoSimpleAnimationControlModel )
  IMPL_CREATEINSTANCE( UnoThrobberControl )
@@ -546,20 +670,65 @@
  
      	if ( rtl_str_compare( sImplementationName, "com.sun.star.awt.comp.AsyncCallback" ) == 0 )
              return comp_AsyncCallback_component_getFactory( sImplementationName, _pServiceManager, _pRegistryKey );
-diff --git a/toolkit/source/helper/servicenames.cxx b/toolkit/source/helper/servicenames.cxx
-index 3b27e91..2b65c99 100644
---- a/toolkit/source/helper/servicenames.cxx
-+++ b/toolkit/source/helper/servicenames.cxx
+diff -rup /data4/M21/ooo-build/build-src/dev300-m21/toolkit/source/helper/servicenames.cxx toolkit/source/helper/servicenames.cxx
+--- /data4/M21/ooo-build/build-src/dev300-m21/toolkit/source/helper/servicenames.cxx	2008-04-11 10:37:36.000000000 +0100
++++ toolkit/source/helper/servicenames.cxx	2008-07-07 17:37:51.000000000 +0100
 @@ -101,4 +101,4 @@ const sal_Char __FAR_DATA szServiceName_
  const sal_Char __FAR_DATA szServiceName_UnoThrobberControl[] = "com.sun.star.awt.UnoThrobberControl";
  const sal_Char __FAR_DATA szServiceName_UnoControlFixedHyperlink[] = "com.sun.star.awt.UnoControlFixedHyperlink";
  const sal_Char __FAR_DATA szServiceName_UnoControlFixedHyperlinkModel[] = "com.sun.star.awt.UnoControlFixedHyperlinkModel";
 -
 +const sal_Char __FAR_DATA szServiceName_GraphLinkProvider[] = "com.sun.star.awt.GraphicLinkProvider";
-diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
-index edc0c77..698688c 100644
---- a/xmloff/source/forms/elementimport.cxx
-+++ b/xmloff/source/forms/elementimport.cxx
+diff -rup /data4/M21/ooo-build/build-src/dev300-m21/xmloff/inc/xmloff/xmlexp.hxx xmloff/inc/xmloff/xmlexp.hxx
+--- /data4/M21/ooo-build/build-src/dev300-m21/xmloff/inc/xmloff/xmlexp.hxx	2008-04-15 15:17:24.000000000 +0100
++++ xmloff/inc/xmloff/xmlexp.hxx	2008-07-09 10:00:11.000000000 +0100
+@@ -42,6 +42,7 @@
+ #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
+ #include <com/sun/star/xml/sax/XAttributeList.hpp>
+ #include <com/sun/star/xml/sax/XLocator.hpp>
++#include <com/sun/star/graphic/XGraphic.hpp>
+ #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
+ #include <com/sun/star/lang/XUnoTunnel.hpp>
+ #include <rtl/ustring.hxx>
+@@ -57,6 +58,7 @@
+ #include <com/sun/star/document/XFilter.hpp>
+ #include <com/sun/star/lang/XServiceInfo.hpp>
+ #include <com/sun/star/document/XExporter.hpp>
++#include <com/sun/star/document/XGraphicResolver.hpp>
+ #ifndef _COM_SUN_STAR_DRAWING_XGRAPHICOBJECTRESOLVER_HPP_
+ #include <com/sun/star/document/XGraphicObjectResolver.hpp>
+ #endif
+@@ -461,6 +463,8 @@ public:
+ 
+ 	::rtl::OUString AddEmbeddedGraphicObject(
+ 							const ::rtl::OUString& rGraphicObjectURL );
++	::rtl::OUString AddEmbeddedGraphicObject(
++							const com::sun::star::uno::Reference< com::sun::star::graphic::XGraphic >& rxGraphic );
+     sal_Bool AddEmbeddedGraphicObjectAsBase64(
+                             const ::rtl::OUString& rGraphicObjectURL );
+ 
+diff -rup /data4/M21/ooo-build/build-src/dev300-m21/xmloff/source/core/xmlexp.cxx xmloff/source/core/xmlexp.cxx
+--- /data4/M21/ooo-build/build-src/dev300-m21/xmloff/source/core/xmlexp.cxx	2008-05-28 11:08:31.000000000 +0100
++++ xmloff/source/core/xmlexp.cxx	2008-07-09 10:02:45.000000000 +0100
+@@ -1774,6 +1774,15 @@ sal_Int32 SvXMLExport::dataStyleForceSys
+ }
+ 
+ 
++OUString SvXMLExport::AddEmbeddedGraphicObject( const Reference< graphic::XGraphic >& rxGraphic )
++{
++    rtl::OUString sRes; 
++    Reference< document::XGraphicResolver > xResolv( mxGraphicResolver, UNO_QUERY );
++    if ( xResolv.is() )
++        sRes = xResolv->resolveGraphicObject( rxGraphic );
++    return sRes;
++}
++
+ OUString SvXMLExport::AddEmbeddedGraphicObject( const OUString& rGraphicObjectURL )
+ {
+ 	OUString sRet( rGraphicObjectURL );
+diff -rup /data4/M21/ooo-build/build-src/dev300-m21/xmloff/source/forms/elementimport.cxx xmloff/source/forms/elementimport.cxx
+--- /data4/M21/ooo-build/build-src/dev300-m21/xmloff/source/forms/elementimport.cxx	2008-07-09 13:18:29.000000000 +0100
++++ xmloff/source/forms/elementimport.cxx	2008-07-07 23:10:54.000000000 +0100
 @@ -47,6 +47,7 @@
  #include "gridcolumnproptranslator.hxx"
  #include <comphelper/extract.hxx>
@@ -617,10 +786,9 @@
  
      //=====================================================================
  	//= OReferredControlImport
-diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx
-index 58d279a..57e69b0 100644
---- a/xmloff/source/forms/elementimport.hxx
-+++ b/xmloff/source/forms/elementimport.hxx
+diff -rup /data4/M21/ooo-build/build-src/dev300-m21/xmloff/source/forms/elementimport.hxx xmloff/source/forms/elementimport.hxx
+--- /data4/M21/ooo-build/build-src/dev300-m21/xmloff/source/forms/elementimport.hxx	2008-04-10 23:01:44.000000000 +0100
++++ xmloff/source/forms/elementimport.hxx	2008-07-07 20:23:21.000000000 +0100
 @@ -41,6 +41,7 @@
  #include <com/sun/star/lang/XMultiServiceFactory.hpp>
  #include <com/sun/star/form/XGridColumnFactory.hpp>
@@ -647,109 +815,94 @@
          // OPropertyImport overridables
  		virtual void	handleAttribute( sal_uInt16 _nNamespaceKey,
  			const ::rtl::OUString& _rLocalName,
-diff --git a/unotools/inc/unotools/streamhelper.hxx b/unotools/inc/unotools/streamhelper.hxx
-index 375d8b3..77704d5 100644
---- a/unotools/inc/unotools/streamhelper.hxx
-+++ b/unotools/inc/unotools/streamhelper.hxx
-@@ -111,7 +111,6 @@ public:
-     virtual void SAL_CALL flush(  ) throw(stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, staruno::RuntimeException);
-     virtual void SAL_CALL closeOutput(  ) throw(stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, staruno::RuntimeException);
- };
--
- }	// namespace utl
- 
- 
-diff --git a/unotools/inc/unotools/ucbstreamhelper.hxx b/unotools/inc/unotools/ucbstreamhelper.hxx
-index c33855b..16f646b 100644
---- a/unotools/inc/unotools/ucbstreamhelper.hxx
-+++ b/unotools/inc/unotools/ucbstreamhelper.hxx
-@@ -33,6 +33,7 @@
- #include <com/sun/star/uno/Reference.hxx>
- #include <com/sun/star/io/XInputStream.hpp>
- #include <com/sun/star/io/XStream.hpp>
-+#include <com/sun/star/embed/XStorage.hpp>
- #include "unotools/unotoolsdllapi.h"
- 
- #include <tools/stream.hxx>
-@@ -81,6 +82,15 @@ namespace utl
-         static SvStream*    CreateStream( NS_UNO::Reference < NS_IO::XInputStream > xStream, sal_Bool bCloseStream );
-         static SvStream*    CreateStream( NS_UNO::Reference < NS_IO::XStream > xStream, sal_Bool bCloseStream );
-     };
-+
-+class UNOTOOLS_DLLPUBLIC SvPictureStreamHelper
-+{
-+    public:
-+	// Probably these functions are probably in the wrong place, but first 
-+	// lets just kill the cut'n'paste rot, where is SvStream defined, svtools? maybe there then
-+	static bool IsPackagePictureURL( const rtl::OUString& rURL );
-+	static SvStream* GetStreamFromPackagePictureURL( const rtl::OUString& rURL, const NS_UNO::Reference< ::com::sun::star::embed::XStorage >& rxRoot )throw ( NS_UNO::Exception );
-+};
- }
- 
- #endif
-diff --git a/unotools/source/ucbhelper/ucbstreamhelper.cxx b/unotools/source/ucbhelper/ucbstreamhelper.cxx
-index f9e56ba..3624c9e 100644
---- a/unotools/source/ucbhelper/ucbstreamhelper.cxx
-+++ b/unotools/source/ucbhelper/ucbstreamhelper.cxx
-@@ -41,6 +41,7 @@
- #endif
- #include <com/sun/star/ucb/InsertCommandArgument.hpp>
- #include <com/sun/star/io/XActiveDataStreamer.hpp>
-+#include <com/sun/star/embed/ElementModes.hpp>
- 
- #include <ucbhelper/contentbroker.hxx>
- #include <ucbhelper/content.hxx>
-@@ -54,6 +55,7 @@ using namespace ::com::sun::star::ucb;
- using namespace ::com::sun::star::task;
- using namespace ::com::sun::star::lang;
- using namespace ::com::sun::star::beans;
-+using namespace ::com::sun::star::embed;
- 
- namespace utl
- {
-@@ -248,4 +250,38 @@ SvStream* UcbStreamHelper::CreateStream(
-     return pStream;
- };
- 
-+SvStream* SvPictureStreamHelper::GetStreamFromPackagePictureURL( const rtl::OUString& rURL, const Reference< XStorage >& rxRoot ) throw ( Exception )
-+{
-+	SvStream* pIs = NULL;
-+	if( rURL.getLength() )
-+	{
-+		sal_Int32 nIndex = 0;
-+		const rtl::OUString aPicturePath( rURL.getToken( 1, ':', nIndex ) );
-+		nIndex = 0;
-+		const rtl::OUString aPictureStorageName( aPicturePath.getToken( 0, '/', nIndex ) );
-+		const rtl::OUString aPictureStreamName( aPicturePath.getToken( 0, '/', nIndex ) );
+diff -rup /data4/M21/ooo-build/build-src/dev300-m21/xmloff/source/forms/propertyexport.cxx xmloff/source/forms/propertyexport.cxx
+--- /data4/M21/ooo-build/build-src/dev300-m21/xmloff/source/forms/propertyexport.cxx	2008-04-10 23:10:41.000000000 +0100
++++ xmloff/source/forms/propertyexport.cxx	2008-07-09 12:10:11.000000000 +0100
+@@ -44,6 +44,10 @@
+ #include <com/sun/star/util/Date.hpp>
+ #include <com/sun/star/util/Time.hpp>
+ #include <com/sun/star/util/DateTime.hpp>
++#include <com/sun/star/graphic/XGraphicLinkProvider.hpp>
++#include <com/sun/star/graphic/XGraphic.hpp>
++#include <unotools/ucbstreamhelper.hxx>
 +
-+		if ( aPictureStreamName.getLength() && aPictureStorageName.getLength() )
-+		{
-+			if ( rxRoot->isStorageElement( aPictureStorageName ) )
-+			{
-+				Reference< XStorage > xPictureStorage =
-+				rxRoot->openStorageElement( aPictureStorageName, ElementModes::READ );
-+				if( xPictureStorage.is() && xPictureStorage->isStreamElement( aPictureStreamName ) )
-+				{
-+					Reference< XStream > xStream = xPictureStorage->openStreamElement( aPictureStreamName, ElementModes::READ );
-+					if ( xStream.is() )
-+						pIs = UcbStreamHelper::CreateStream( xStream );
-+				}
-+			}
-+		}
-+	}
-+	return pIs;
-+}
+ #include <osl/diagnose.h>
+ #include <comphelper/extract.hxx>
+ #include <comphelper/sequence.hxx>
+@@ -62,6 +66,7 @@ namespace xmloff
+ 	using namespace ::com::sun::star::uno;
+ 	using namespace ::com::sun::star::lang;
+ 	using namespace ::com::sun::star::beans;
++	using namespace ::com::sun::star::graphic;
+ 
+ 	// NO using namespace ...util !!!
+ 	// need a tools Date/Time/DateTime below, which would conflict with the uno types then
+@@ -437,6 +442,35 @@ namespace xmloff
+ 		exportedProperty(_sPropertyName);
+ 	}
+ 	//---------------------------------------------------------------------
 +
-+bool SvPictureStreamHelper::IsPackagePictureURL( const rtl::OUString& rURL )
-+{
-+	return rURL.toAsciiLowerCase().indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.package:") ) ) == 0; 
-+}
++	void OPropertyExport::exportImageDataAttribute()
++        { 
++            rtl::OUString sURL;
++            m_xProps->getPropertyValue( PROPERTY_IMAGEURL ) >>= sURL;
++            Reference< XGraphicLinkProvider > xProv;
++            Reference< XGraphic> xGraphic;
++            m_xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "GraphicLinkProvider" ) ) ) >>= xProv;
++            if ( xProv.is() ) 
++            {
++                   m_xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Graphic" ) ) ) >>= xGraphic;
++                   rtl::OUString newURL = m_rContext.getGlobalContext().AddEmbeddedGraphicObject( xGraphic );
++                   // stick on the Package scheme if we got a URL back
++                   if ( newURL.getLength() )
++                   {
++                       newURL = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.Package:" ) ) + newURL;
++                       // reset things
++                       Sequence< Any > aArgs( 2 );
++                       aArgs[ 0 ] = makeAny( newURL );
++                       aArgs[ 1 ] = makeAny(  m_rContext.getGlobalContext().GetModel() );
++                       // set up new GraphicProvider because we have a new
++                       // intra document URL
++                       xProv.set( m_rContext.getGlobalContext().getServiceFactory()->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.GraphicLinkProvider" ) ), aArgs ), UNO_QUERY );
++                       m_xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("GraphicLinkProvider" ) ), makeAny( xProv ) );
++                   }
++            }
++            exportRelativeTargetLocation(PROPERTY_IMAGEURL,CCA_IMAGE_DATA);
++        }
 +
- }
-diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
-index e8ef25c..4653eb8 100644
---- a/extensions/source/propctrlr/formcomponenthandler.cxx
-+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
+ 	void OPropertyExport::flagStyleProperties()
+ 	{
+ 		// flag all the properties which are part of the style as "handled"
+diff -rup /data4/M21/ooo-build/build-src/dev300-m21/xmloff/source/forms/propertyexport.hxx xmloff/source/forms/propertyexport.hxx
+--- /data4/M21/ooo-build/build-src/dev300-m21/xmloff/source/forms/propertyexport.hxx	2008-04-10 23:11:00.000000000 +0100
++++ xmloff/source/forms/propertyexport.hxx	2008-07-08 13:11:03.000000000 +0100
+@@ -242,7 +242,7 @@ namespace xmloff
+ 
+ 			<p>The property needs a special handling because the URL's need to be made relative</p>
+ 		*/
+-		inline void exportImageDataAttribute() { exportRelativeTargetLocation(PROPERTY_IMAGEURL,CCA_IMAGE_DATA); }
++		void exportImageDataAttribute();
+ 
+ 		/** flag the style properties as 'already exported'
+ 
+Only in basctl/source/basicide: localize.sdf
+Only in basctl/source/dlged: localize.sdf
+diff -rup /data4/M21/ooo-build/build-src/dev300-m21/basctl/source/dlged/propbrw.cxx basctl/source/dlged/propbrw.cxx
+--- /data4/M21/ooo-build/build-src/dev300-m21/basctl/source/dlged/propbrw.cxx	2008-04-11 12:05:43.000000000 +0100
++++ basctl/source/dlged/propbrw.cxx	2008-07-08 09:32:28.000000000 +0100
+@@ -209,7 +209,8 @@ void PropBrw::ImplReCreateController()
+         ::cppu::ContextEntry_Init aHandlerContextInfo[] =
+         {
+             ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DialogParentWindow" ) ), makeAny( VCLUnoHelper::GetInterface ( this ) ) ),
+-            ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContextDocument" ) ), makeAny( m_xContextDocument ) )
++            ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContextDocument" ) ), makeAny( m_xContextDocument ) ),
++            ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SupportNonLinkedImage" ) ), makeAny( sal_False ) )
+         };
+         Reference< XComponentContext > xInspectorContext(
+             ::cppu::createComponentContext( aHandlerContextInfo, sizeof( aHandlerContextInfo ) / sizeof( aHandlerContextInfo[0] ),
+diff -rup /data4/M21/ooo-build/build-src/dev300-m21/extensions/source/propctrlr/formcomponenthandler.cxx extensions/source/propctrlr/formcomponenthandler.cxx
+--- /data4/M21/ooo-build/build-src/dev300-m21/extensions/source/propctrlr/formcomponenthandler.cxx	2008-06-16 13:42:41.000000000 +0100
++++ extensions/source/propctrlr/formcomponenthandler.cxx	2008-07-08 12:09:44.000000000 +0100
 @@ -1360,10 +1360,20 @@ namespace pcr
              break;
  
@@ -865,10 +1018,9 @@
      // -------------------------------------------------------------------------
      ::cppu::IPropertyArrayHelper* FormComponentPropertyHandler::createArrayHelper( ) const
      {
-diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx
-index 2216704..e7b4d76 100644
---- a/extensions/source/propctrlr/formcomponenthandler.hxx
-+++ b/extensions/source/propctrlr/formcomponenthandler.hxx
+diff -rup /data4/M21/ooo-build/build-src/dev300-m21/extensions/source/propctrlr/formcomponenthandler.hxx extensions/source/propctrlr/formcomponenthandler.hxx
+--- /data4/M21/ooo-build/build-src/dev300-m21/extensions/source/propctrlr/formcomponenthandler.hxx	2008-05-20 20:11:31.000000000 +0100
++++ extensions/source/propctrlr/formcomponenthandler.hxx	2008-07-08 12:06:01.000000000 +0100
 @@ -309,7 +309,7 @@ namespace pcr
                  <TRUE/> if and only if a new image URL has been chosen by the user.
                  In this case, ->_out_rNewValue is filled with the new property value
@@ -887,17 +1039,120 @@
      private:
          DECL_LINK( OnDesignerClosed, void* );
  
-diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
-index bfc59b0..9df7945 100644
---- a/basctl/source/dlged/propbrw.cxx
-+++ b/basctl/source/dlged/propbrw.cxx
-@@ -209,7 +209,8 @@ void PropBrw::ImplReCreateController()
-         ::cppu::ContextEntry_Init aHandlerContextInfo[] =
-         {
-             ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DialogParentWindow" ) ), makeAny( VCLUnoHelper::GetInterface ( this ) ) ),
--            ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContextDocument" ) ), makeAny( m_xContextDocument ) )
-+            ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContextDocument" ) ), makeAny( m_xContextDocument ) ),
-+            ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SupportNonLinkedImage" ) ), makeAny( sal_False ) )
-         };
-         Reference< XComponentContext > xInspectorContext(
-             ::cppu::createComponentContext( aHandlerContextInfo, sizeof( aHandlerContextInfo ) / sizeof( aHandlerContextInfo[0] ),
+Only in extensions/source/propctrlr/: localize.sdf
+--- /dev/null	2008-04-22 00:28:44.000000000 +0100
++++ offapi/com/sun/star/document/XGraphicResolver.idl	2008-07-09 09:33:53.000000000 +0100
+@@ -0,0 +1,64 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XGraphicObjectResolver.idl,v $
++ * $Revision: 1.7 $
++ *
++ * 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 __com_sun_star_document_XGraphicResolver_idl__ 
++#define __com_sun_star_document_XGraphicResolver_idl__ 
++ 
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++
++#ifndef __com_sun_star_document_XGraphicObjectResolver_idl__ 
++#include <com/sun/star/document/XGraphicObjectResolver.idl>
++#endif
++#ifndef __com_sun_star_graphic_XGraphic_idl__ 
++#include <com/sun/star/graphic/XGraphic.idl>
++#endif
++//============================================================================= 
++ 
++module com {  module sun {  module star {  module document {  
++ 
++//============================================================================= 
++ 
++/** this interface converts graphic object from one URL space to another.
++ */
++published interface XGraphicResolver
++{ 
++	interface com::sun::star::document::XGraphicObjectResolver;
++	/** converts the given XGraphic from the source URL namespace to the destination
++		URL space of this instance.
++	*/
++	string resolveGraphicObject( [in] ::com::sun::star::graphic::XGraphic gObj );
++}; 
++ 
++//============================================================================= 
++ 
++}; }; }; };  
++ 
++#endif 
+--- /dev/null	2008-04-22 00:28:44.000000000 +0100
++++ offapi/com/sun/star/graphic/XGraphicLinkProvider.idl	2008-07-07 17:45:45.000000000 +0100
+@@ -0,0 +1,46 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XGraphicProvider.idl,v $
++ * $Revision: 1.5 $
++ *
++ * 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 com_sun_star_graphic_XGraphicLinkProvider_idl
++#define com_sun_star_graphic_XGraphicLinkProvider_idl
++
++#include <com/sun/star/uno/XInterface.idl>
++#include <com/sun/star/embed/XStorage.idl>
++
++module com { module sun { module star { module graphic
++{
++interface XGraphicLinkProvider : ::com::sun::star::uno::XInterface
++{
++    [readonly, attribute] com::sun::star::embed::XStorage Storage;
++    [readonly, attribute] string SourceURL;
++} ; } ; } ; } ; 
++};
++
++#endif
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]