change: old data transfer API to the new

svx/inc/linkmgr.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: linkmgr.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jp $ $Date: 2001-01-19 09:41:21 $
+ *  last change: $Author: jp $ $Date: 2001-03-08 21:14:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,7 +62,7 @@
 #define _SVXLINKMGR_HXX
 
 
-#ifndef _LINKMGR_HXX //autogen
+#ifndef _LINKMGR_HXX
 #include <so3/linkmgr.hxx>
 #endif
 
@@ -80,38 +80,38 @@ enum LinkState
     STATE_LOAD_ABORT
 };
 
-class SvxLinkManager : public SvLinkManager
+class SvxLinkManager : public so3::SvLinkManager
 {
-    SvxLinkManager( const SvLinkManager& );
-    SvxLinkManager& operator=( const SvLinkManager& );
+    SvxLinkManager( const SvxLinkManager& );
+    SvxLinkManager& operator=( const SvxLinkManager& );
 
 public:
     SvxLinkManager( SvPersist * pCacheCont );
 
     // den Link mit einem PseudoObject verbinden und in die Liste eintragen
-    BOOL InsertFileLink( SvBaseLink&,
+    BOOL InsertFileLink( so3::SvBaseLink&,
                         USHORT nFileType,
                         const String& rTxt,
                         const String* pFilterNm = 0,
                         const String* pRange = 0 );
 
             // falls am Link schon alles eingestellt ist !
-    BOOL InsertFileLink( SvBaseLink& );
+    BOOL InsertFileLink( so3::SvBaseLink& );
 
         // erfrage die Strings fuer den Dialog
-    virtual BOOL GetDisplayNames( const SvBaseLink&,
+    virtual BOOL GetDisplayNames( const so3::SvBaseLink*,
                                     String* pType,
                                     String* pFile = 0,
                                     String* pLink = 0,
                                     String* pFilter = 0 ) const;
 
-    virtual SvPseudoObjectRef CreateObj( SvBaseLink & );
+    virtual so3::SvLinkSourceRef CreateObj( so3::SvBaseLink * );
 
     // eine Uebertragung wird abgebrochen, also alle DownloadMedien canceln
     // (ist zur Zeit nur fuer die FileLinks interressant!)
     void CancelTransfers();
 
-    static void SetTransferPriority( SvBaseLink& rLink, USHORT nPrio );
+    static void SetTransferPriority( so3::SvBaseLink& rLink, USHORT nPrio );
 
     // um Status Informationen aus dem FileObject an den BaseLink zu
     // senden, gibt es eine eigene ClipBoardId. Das SvData-Object hat
@@ -119,12 +119,14 @@ public:
     // Wird zur Zeit fuer FileObject in Verbindung mit JavaScript benoetigt
     // - das braucht Informationen ueber Load/Abort/Error
     static ULONG  RegisterStatusInfoId();
-};
-
 
-// siehe im Cache nach, ob diese Graphic schon existiert
-BOOL GetCacheGraphic( const String& rName, Graphic* pGrf, Size* pSize );
+    // if the mimetype says graphic/bitmap/gdimetafile then get the
+    // graphic from the Any. Return says no errors
+    static BOOL GetGraphicFromAny( const String& rMimeType,
+                                const ::com::sun::star::uno::Any & rValue,
+                                Graphic& rGrf );
 
+};
 
 
 #endif

svx/source/svdraw/svdograf.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdograf.cxx,v $
  *
- *  $Revision: 1.21 $
+ *  $Revision: 1.22 $
  *
- *  last change: $Author: sj $ $Date: 2001-03-08 16:36:12 $
+ *  last change: $Author: jp $ $Date: 2001-03-08 21:15:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -115,7 +115,7 @@
 // - SdrGraphicLink -
 // ------------------
 
-class SdrGraphicLink : public SvBaseLink
+class SdrGraphicLink : public so3::SvBaseLink
 {
     SdrGrafObj*         pGrafObj;
 
@@ -124,19 +124,20 @@ public:
     virtual             ~SdrGraphicLink();
 
     virtual void        Closed();
-    virtual void        DataChanged(SvData& rData);
+    virtual void        DataChanged( const String& rMimeType,
+                                const ::com::sun::star::uno::Any & rValue );
 
-    BOOL                Connect() { return 0 != SvBaseLink::GetRealObject(); }
+    BOOL                Connect() { return 0 != GetRealObject(); }
     void                UpdateSynchron();
 };
 
 // -----------------------------------------------------------------------------
 
 SdrGraphicLink::SdrGraphicLink(SdrGrafObj* pObj):
-    SvBaseLink(LINKUPDATE_ONCALL, SOT_FORMATSTR_ID_SVXB),
+    so3::SvBaseLink( LINKUPDATE_ONCALL, SOT_FORMATSTR_ID_SVXB ),
     pGrafObj(pObj)
 {
-    SetSynchron(FALSE);
+    SetSynchron( FALSE );
 }
 
 // -----------------------------------------------------------------------------
@@ -147,71 +148,32 @@ SdrGraphicLink::~SdrGraphicLink()
 
 // -----------------------------------------------------------------------------
 
-void SdrGraphicLink::DataChanged(SvData& rData)
+void SdrGraphicLink::DataChanged( const String& rMimeType,
+                                const ::com::sun::star::uno::Any & rValue )
 {
-    SdrModel*       pModel      = pGrafObj==NULL ? NULL : pGrafObj->GetModel();
-    SvxLinkManager* pLinkManager= pModel  ==NULL ? NULL : pModel->GetLinkManager();
+    SdrModel*       pModel      = pGrafObj ? pGrafObj->GetModel() : 0;
+    SvxLinkManager* pLinkManager= pModel  ? pModel->GetLinkManager() : 0;
 
-    if (pLinkManager!=NULL)
+    if( pLinkManager && rValue.hasValue() )
     {
-        const ULONG nFormat = rData.GetFormat();
-        GraphicType eOldGraphicType = pGrafObj->GetGraphicType();  // kein Hereinswappen
-        BOOL bIsChanged = pModel->IsChanged();
-        pLinkManager->GetDisplayNames(*this,NULL,&pGrafObj->aFileName,NULL,&pGrafObj->aFilterName);
+        pLinkManager->GetDisplayNames( this, 0, &pGrafObj->aFileName,
+                                            0, &pGrafObj->aFilterName );
 
-        if (nFormat == SOT_FORMATSTR_ID_SVXB)
+        Graphic aGraphic;
+        if( SvxLinkManager::GetGraphicFromAny( rMimeType, rValue, aGraphic ))
         {
-            Graphic* pGraphic = NULL;
-
-            if (rData.GetData((SvDataCopyStream**) &pGraphic, Graphic::StaticType(), TRANSFER_REFERENCE))
-            {
-                pGrafObj->SetGraphic( *pGraphic );
-
-                if (eOldGraphicType != GRAPHIC_NONE)
-                    pGrafObj->SetChanged();
-                else
-                    pModel->SetChanged(bIsChanged);
-            }
-        }
-        else if (rData.GetFormat() != SvxLinkManager::RegisterStatusInfoId())
-        {
-            switch( nFormat)
-            {
-                case FORMAT_GDIMETAFILE:
-                {
-                    GDIMetaFile* pMetaFile=NULL;
-                    if (rData.GetData(&pMetaFile,TRANSFER_REFERENCE))
-                    {
-                        pGrafObj->SetGraphic(*pMetaFile);
-
-                        if (eOldGraphicType != GRAPHIC_NONE)
-                            pGrafObj->SetChanged();
-                        else
-                            pModel->SetChanged(bIsChanged);
-                    }
-                }
-                break;
-
-                case FORMAT_BITMAP:
-                {
-                    Bitmap* pBmp=NULL;
-                    if (rData.GetData(&pBmp,TRANSFER_REFERENCE))
-                    {
-                        pGrafObj->SetGraphic(*pBmp);
-
-                        if (eOldGraphicType != GRAPHIC_NONE)
-                            pGrafObj->SetChanged();
-                        else
-                            pModel->SetChanged(bIsChanged);
-                    }
-                }
-                break;
+            GraphicType eOldGraphicType = pGrafObj->GetGraphicType();  // kein Hereinswappen
+            BOOL bIsChanged = pModel->IsChanged();
 
-                default:
-                    pGrafObj->SendRepaintBroadcast();
-                break;
-            }
+            pGrafObj->SetGraphic( aGraphic );
+            if( GRAPHIC_NONE != eOldGraphicType )
+                pGrafObj->SetChanged();
+            else
+                pModel->SetChanged( bIsChanged );
         }
+        else if( SotExchange::GetFormatIdFromMimeType( rMimeType ) !=
+                    SvxLinkManager::RegisterStatusInfoId() )
+            pGrafObj->SendRepaintBroadcast();
     }
 }
 
@@ -232,10 +194,10 @@ void SdrGraphicLink::UpdateSynchron()
 {
     if( GetObj() )
     {
-        SvData aData( GetContentType() );
-        aData.SetAspect( ASPECT_DOCPRINT );
-        GetObj()->GetData( &aData );
-        DataChanged( aData );
+        String aMimeType( SotExchange::GetFormatMimeType( GetContentType() ));
+        ::com::sun::star::uno::Any aValue;
+        GetObj()->GetData( aValue, aMimeType, TRUE );
+        DataChanged( aMimeType, aValue );
     }
 }
 
@@ -545,7 +507,7 @@ void SdrGrafObj::ImpLinkAbmeldung()
     if( pLinkManager != NULL && pGraphicLink!=NULL)
     {
         // Bei Remove wird *pGraphicLink implizit deleted
-        pLinkManager->Remove( *pGraphicLink );
+        pLinkManager->Remove( pGraphicLink );
         pGraphicLink=NULL;
     }
 

svx/source/svdraw/svdogrp.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdogrp.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: aw $ $Date: 2001-02-15 16:11:33 $
+ *  last change: $Author: jp $ $Date: 2001-03-08 21:15:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -134,14 +134,20 @@
 //
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-class ImpSdrObjGroupLink: public SvBaseLink {
+class ImpSdrObjGroupLink: public so3::SvBaseLink
+{
     SdrObject* pSdrObj;
 public:
-    ImpSdrObjGroupLink(SdrObject* pObj1): SvBaseLink(LINKUPDATE_ONCALL,FORMAT_FILE),pSdrObj(pObj1) {}
+    ImpSdrObjGroupLink( SdrObject* pObj1 )
+        : ::so3::SvBaseLink( so3::LINKUPDATE_ONCALL, FORMAT_FILE ),
+        pSdrObj( pObj1 )
+    {}
     virtual ~ImpSdrObjGroupLink();
     virtual void Closed();
-    virtual void DataChanged(SvData& rData);
-    FASTBOOL     Connect() { return 0 != SvBaseLink::GetRealObject(); }
+    virtual void DataChanged( const String& rMimeType,
+                                const ::com::sun::star::uno::Any & rValue );
+
+    FASTBOOL     Connect() { return 0 != GetRealObject(); }
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -165,19 +171,24 @@ void ImpSdrObjGroupLink::Closed()
 }
 
 
-void ImpSdrObjGroupLink::DataChanged(SvData& rData)
+void ImpSdrObjGroupLink::DataChanged( const String& ,
+                                      const ::com::sun::star::uno::Any& )
 {
     FASTBOOL bForceReload=FALSE;
-    SdrModel*       pModel      = pSdrObj  ==NULL ? NULL : pSdrObj->GetModel();
-    SvxLinkManager* pLinkManager= pModel==NULL ? NULL : pModel->GetLinkManager();
-    if (pLinkManager!=NULL) {
-        ImpSdrObjGroupLinkUserData* pData=((SdrObjGroup*)pSdrObj)->GetLinkUserData();
-        if (pData!=NULL) {
+    SdrModel* pModel = pSdrObj ? pSdrObj->GetModel() : 0;
+    SvxLinkManager* pLinkManager= pModel ? pModel->GetLinkManager() : 0;
+    if( pLinkManager )
+    {
+        ImpSdrObjGroupLinkUserData* pData=
+                                ((SdrObjGroup*)pSdrObj)->GetLinkUserData();
+        if( pData )
+        {
             String aFile;
             String aName;
-            pLinkManager->GetDisplayNames(*this,NULL,&aFile,&aName,NULL);
+            pLinkManager->GetDisplayNames( this, 0, &aFile, &aName, 0 );
 
-            if(!pData->aFileName.Equals(aFile) || !pData->aObjName.Equals(aName))
+            if( !pData->aFileName.Equals( aFile ) ||
+                !pData->aObjName.Equals( aName ))
             {
                 pData->aFileName=aFile;
                 pData->aObjName=aName;
@@ -186,9 +197,8 @@ void ImpSdrObjGroupLink::DataChanged(SvData& rData)
             }
         }
     }
-    if (pSdrObj!=NULL) {
-        ((SdrObjGroup*)pSdrObj)->ReloadLinkedGroup(bForceReload);
-    }
+    if( pSdrObj )
+        ((SdrObjGroup*)pSdrObj)->ReloadLinkedGroup( bForceReload );
 }
 
 #endif // SVX_LIGHT
@@ -592,7 +602,7 @@ void SdrObjGroup::ImpLinkAbmeldung()
     SvxLinkManager* pLinkManager=pModel!=NULL ? pModel->GetLinkManager() : NULL;
     if (pLinkManager!=NULL && pData!=NULL && pData->pLink!=NULL) { // Nicht 2x Abmelden
         // Bei Remove wird *pLink implizit deleted
-        pLinkManager->Remove(*pData->pLink);
+        pLinkManager->Remove( pData->pLink );
         pData->pLink=NULL;
     }
 #endif // SVX_LIGHT

svx/source/svdraw/svdoole2.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdoole2.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: aw $ $Date: 2001-02-15 16:11:33 $
+ *  last change: $Author: jp $ $Date: 2001-03-08 21:15:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -86,10 +86,6 @@
 #endif
 
 #ifndef SVX_LIGHT
-#ifndef _LNKBASE_HXX //autogen
-#include <so3/lnkbase.hxx>
-#endif
-
 #ifndef _IPCLIENT_HXX //autogen
 #include <so3/ipclient.hxx>
 #endif
@@ -101,6 +97,8 @@
 #endif
 #endif
 
+#include <sot/formats.hxx>
+
 #ifndef _IPENV_HXX //autogen
 #include <so3/ipenv.hxx>
 #endif
@@ -156,82 +154,6 @@ SO2_DECL_REF(SvInPlaceObject)
 #endif
 #endif // SVX_LIGHT
 
-#ifndef SVX_LIGHT
-/*************************************************************************
-|*
-|* SdrOleLink zur Verbindung von SdrOle2Obj und LinkManager
-|*
-\************************************************************************/
-
-class SdrOleLink : public SvBaseLink
-{
-private:
-    SdrOle2Obj*                 pOle2Obj;
-
-public:
-    SdrOleLink(SdrOle2Obj* pObj, SvPseudoObject* pPseudoObj);
-    virtual ~SdrOleLink();
-
-    virtual void Closed();
-    virtual void DataChanged( SvData& ) {}
-    FASTBOOL     Connect() { return 0 != SvBaseLink::GetRealObject(); }
-    SvLinkName*  GetCacheName() const { return SvBaseLink::GetCacheName(); }
-};
-
-#ifndef SV_DECL_SDROLELINK_DEFINED
-#define SV_DECL_SDROLELINK_DEFINED
-SV_DECL_REF(SdrOleLink)
-#endif
-
-SV_IMPL_REF (SdrOleLink)
-
-#endif // SVX_LIGHT
-
-#ifndef SVX_LIGHT
-
-/*************************************************************************
-|*
-|* Ctor
-|*
-\************************************************************************/
-
-SdrOleLink::SdrOleLink(SdrOle2Obj* pObj, SvPseudoObject* pPseudoObj):
-    SvBaseLink(String(),OBJECT_CLIENT_OLE_CACHE,pPseudoObj),
-    pOle2Obj(pObj)
-{
-}
-
-/*************************************************************************
-|*
-|* Dtor
-|*
-\************************************************************************/
-
-SdrOleLink::~SdrOleLink()
-{
-}
-
-/*************************************************************************
-|*
-|* Link an oder abmelden
-|*
-\************************************************************************/
-
-void SdrOleLink::Closed()
-{
-    // Die Verbindung wird aufgehoben
-    SdrModel* pModel = pOle2Obj->GetModel();
-    SvxLinkManager* pLinkManager = pModel->GetLinkManager();
-
-    if (pLinkManager!=NULL)
-        pLinkManager->Remove(*this);
-    // Basisklasse erst zum Schluss rufen, weil Closed()
-    // die Instanz zerstoert! (Wer programmiert denn sowas?!?)
-    // JP 28.02.96: Der Witz ist, das man sich eine LinkReferenz und nicht
-    //              den direkten Pointer haelt!!!!!
-    SvBaseLink::Closed();
-}
-#endif // SVX_LIGHT
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -241,22 +163,18 @@ SdrOle2Obj::SdrOle2Obj(FASTBOOL bFrame_)
 {
     Init();
 
-    xOleLinkRef = NULL;
     ppObjRef=new SvInPlaceObjectRef;
     bFrame=bFrame_;
-    bTestIfLinked=TRUE;
 }
 
 SdrOle2Obj::SdrOle2Obj(const SvInPlaceObjectRef& rNewObjRef, FASTBOOL bFrame_)
 {
     Init();
 #ifndef SVX_LIGHT
-    xOleLinkRef.Clear();
     ppObjRef=new SvInPlaceObjectRef(rNewObjRef);
 #endif // !SVX_LIGHT
 
     bFrame=bFrame_;
-    bTestIfLinked=TRUE;
 
     SvInPlaceObjectRef& rIPRef = *ppObjRef;
 
@@ -275,13 +193,11 @@ SdrOle2Obj::SdrOle2Obj(const SvInPlaceObjectRef& rNewObjRef, const XubString& rN
     Init();
 
 #ifndef SVX_LIGHT
-    xOleLinkRef.Clear();
     ppObjRef=new SvInPlaceObjectRef(rNewObjRef);
 #endif
 
     aName=rNewObjName;
     bFrame=bFrame_;
-    bTestIfLinked=TRUE;
 
     SvInPlaceObjectRef& rIPRef = *ppObjRef;
 
@@ -300,13 +216,11 @@ SdrOle2Obj::SdrOle2Obj(const SvInPlaceObjectRef& rNewObjRef, const XubString& rN
     Init();
 
 #ifndef SVX_LIGHT
-    xOleLinkRef.Clear();
     ppObjRef=new SvInPlaceObjectRef(rNewObjRef);
 #endif
 
     aName=rNewObjName;
     bFrame=bFrame_;
-    bTestIfLinked=TRUE;
 
     SvInPlaceObjectRef& rIPRef = *ppObjRef;
 
@@ -400,8 +314,6 @@ void SdrOle2Obj::ImpAnmeldung()
                 xIObj = pInfo = new SvEmbeddedInfoObject(*ppObjRef,aName);
             }
 
-            SetOleLink((SvEmbeddedInfoObject*) pInfo);
-
             if ( !pPers->HasObject(aName) )
             {
                 pPers->Move(pInfo, aName);
@@ -467,15 +379,6 @@ void SdrOle2Obj::ImpAbmeldung()
         // Aus Cache entfernen
         GetSdrGlobalData().GetOLEObjCache().RemoveObj(this);
 
-        if (xOleLinkRef.Is())
-        {
-            xOleLinkRef->Closed();
-            // Closed() deleted die Instanz bereits! (Wer programmiert denn sowas?!?)
-            // JP 28.02.96: Der Witz ist, das man sich eine LinkReferenz
-            //              und nicht den direkten Pointer haelt!!!!!
-            xOleLinkRef.Clear();
-        }
-
         if ( ppObjRef->Is() )
         {
             (*ppObjRef)->DoClose();
@@ -1010,35 +913,6 @@ void SdrOle2Obj::ReadData(const SdrObjIOHeader& rHead, SvStream& rIn)
     }
 }
 
-void SdrOle2Obj::SetOleLink(SvEmbeddedInfoObject* pInfoObj)
-{
-#ifndef SVX_LIGHT
-    if (xOleLinkRef.Is())
-    {
-        // Erst Verbindung aufheben
-        xOleLinkRef->Closed();
-        // Closed() deleted die Instanz bereits! (Wer programmiert denn sowas?!?)
-        // JP 28.02.96: Der Witz ist, das man sich eine LinkReferenz
-        //              und nicht den direkten Pointer haelt!!!!!
-        xOleLinkRef.Clear();
-    }
-
-    if (pModel!=NULL && pInfoObj && ppObjRef->Is()) {
-        if (pInfoObj->IsLink()) {
-            // Verbindung herstellen
-            xOleLinkRef = new SdrOleLink(this,&(*ppObjRef));
-            SvxLinkManager* pLinkManager=pModel->GetLinkManager();
-
-            if (pLinkManager!=NULL) {
-                pLinkManager->InsertSoLink(*xOleLinkRef);
-            }
-        }
-    }
-
-    bTestIfLinked = FALSE;
-#endif // SVX_LIGHT
-}
-
 void SdrOle2Obj::NbcMove(const Size& rSize)
 {
     SdrRectObj::NbcMove(rSize);
@@ -1118,15 +992,6 @@ const SvInPlaceObjectRef& SdrOle2Obj::GetObjRef() const
                     pModel->SetChanged(FALSE);
             }
 
-            if( bTestIfLinked )
-            {
-                // Ist das Objekt ev. gelinkt? (nur einmal pruefen)
-                SvInfoObjectRef xIObj;
-                SvEmbeddedInfoObject* pInfo;
-                xIObj=pInfo=new SvEmbeddedInfoObject( *ppObjRef, aName );
-                ( (SdrOle2Obj*) this )->SetOleLink( pInfo );
-            }
-
             if ( (*ppObjRef)->GetMiscStatus() & SVOBJ_MISCSTATUS_RESIZEONPRINTERCHANGE )
             {
                 if (pModel && pModel->GetRefDevice() &&

svx/source/svdraw/svdotxln.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdotxln.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: ka $ $Date: 2000-11-10 15:12:27 $
+ *  last change: $Author: jp $ $Date: 2001-03-08 21:15:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -112,16 +112,20 @@
 //
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-class ImpSdrObjTextLink: public SvBaseLink
+class ImpSdrObjTextLink: public ::so3::SvBaseLink
 {
     SdrTextObj*                 pSdrObj;
 
 public:
-    ImpSdrObjTextLink(SdrTextObj* pObj1): SvBaseLink(LINKUPDATE_ONCALL,FORMAT_FILE),pSdrObj(pObj1) {}
+    ImpSdrObjTextLink( SdrTextObj* pObj1 )
+        : ::so3::SvBaseLink( LINKUPDATE_ONCALL, FORMAT_FILE ),
+            pSdrObj( pObj1 )
+    {}
     virtual ~ImpSdrObjTextLink();
 
     virtual void Closed();
-    virtual void DataChanged(SvData& rData);
+    virtual void DataChanged( const String& rMimeType,
+                                const ::com::sun::star::uno::Any & rValue );
 
     BOOL Connect() { return 0 != SvBaseLink::GetRealObject(); }
 };
@@ -132,7 +136,8 @@ ImpSdrObjTextLink::~ImpSdrObjTextLink()
 
 void ImpSdrObjTextLink::Closed()
 {
-    if (pSdrObj!=NULL) {
+    if (pSdrObj )
+    {
         // pLink des Objekts auf NULL setzen, da die Link-Instanz ja gerade destruiert wird.
         ImpSdrObjTextLinkUserData* pData=pSdrObj->GetLinkUserData();
         if (pData!=NULL) pData->pLink=NULL;
@@ -141,19 +146,24 @@ void ImpSdrObjTextLink::Closed()
     SvBaseLink::Closed();
 }
 
-void ImpSdrObjTextLink::DataChanged(SvData& rData)
+
+void ImpSdrObjTextLink::DataChanged( const String& rMimeType,
+                                const ::com::sun::star::uno::Any & rValue )
 {
     FASTBOOL bForceReload=FALSE;
-    SdrModel*       pModel      = pSdrObj  ==NULL ? NULL : pSdrObj->GetModel();
-    SvxLinkManager* pLinkManager= pModel==NULL ? NULL : pModel->GetLinkManager();
-    if (pLinkManager!=NULL) {
+    SdrModel* pModel = pSdrObj ? pSdrObj->GetModel() : 0;
+    SvxLinkManager* pLinkManager= pModel ? pModel->GetLinkManager() : 0;
+    if( pLinkManager )
+    {
         ImpSdrObjTextLinkUserData* pData=pSdrObj->GetLinkUserData();
-        if (pData!=NULL) {
+        if( pData )
+        {
             String aFile;
             String aFilter;
-            pLinkManager->GetDisplayNames(*this,NULL,&aFile,NULL,&aFilter);
+            pLinkManager->GetDisplayNames( this, 0,&aFile, 0, &aFilter );
 
-            if(!pData->aFileName.Equals(aFile) || !pData->aFilterName.Equals(aFilter))
+            if( !pData->aFileName.Equals( aFile ) ||
+                !pData->aFilterName.Equals( aFilter ))
             {
                 pData->aFileName = aFile;
                 pData->aFilterName = aFilter;
@@ -162,9 +172,8 @@ void ImpSdrObjTextLink::DataChanged(SvData& rData)
             }
         }
     }
-    if (pSdrObj!=NULL) {
-        pSdrObj->ReloadLinkedText(bForceReload);
-    }
+    if (pSdrObj )
+        pSdrObj->ReloadLinkedText( bForceReload );
 }
 #endif // SVX_LIGHT
 
@@ -456,7 +465,7 @@ void SdrTextObj::ImpLinkAbmeldung()
     SvxLinkManager* pLinkManager=pModel!=NULL ? pModel->GetLinkManager() : NULL;
     if (pLinkManager!=NULL && pData!=NULL && pData->pLink!=NULL) { // Nicht 2x Abmelden
         // Bei Remove wird *pLink implizit deleted
-        pLinkManager->Remove(*pData->pLink);
+        pLinkManager->Remove( pData->pLink );
         pData->pLink=NULL;
     }
 #endif // SVX_LIGHT

svx/source/svxlink/fileobj.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fileobj.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:01:26 $
+ *  last change: $Author: jp $ $Date: 2001-03-08 21:28:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,8 +64,8 @@
 #ifndef _STRING_HXX //autogen
 #include <tools/string.hxx>
 #endif
-#ifndef _PSEUDO_HXX //autogen
-#include <so3/pseudo.hxx>
+#ifndef _LINKSRC_HXX //autogen
+#include <so3/linksrc.hxx>
 #endif
 #ifndef _SFXDOCFILE_HXX //autogen
 #include <sfx2/docfile.hxx>
@@ -74,7 +74,8 @@
 class Graphic;
 struct Impl_DownLoadData;
 
-class SvFileObject : public SvPseudoObject
+
+class SvFileObject : public so3::SvLinkSource
 {
     String sFileNm;
     String sFilter;
@@ -94,8 +95,7 @@ class SvFileObject : public SvPseudoObject
     BOOL bMedUseCache : 1;
     BOOL bNativFormat : 1;
     BOOL bClearMedium : 1;
-
-    SvDataTypeList aTypeList;
+    BOOL bStateChangeCalled : 1;
 
     BOOL GetGraphic_Impl( Graphic&, SvStream* pStream = 0 );
     BOOL LoadFile_Impl();
@@ -104,28 +104,28 @@ class SvFileObject : public SvPseudoObject
     DECL_STATIC_LINK( SvFileObject, DelMedium_Impl, SfxMediumRef* );
     DECL_STATIC_LINK( SvFileObject, LoadGrfReady_Impl, void* );
     DECL_STATIC_LINK( SvFileObject, LoadGrfNewData_Impl, void* );
-    DECL_STATIC_LINK( SvFileObject, OldCacheGrf_Impl, void* );
 protected:
     virtual ~SvFileObject();
 
 public:
     SvFileObject();
 
-    virtual const SvDataTypeList & GetTypeList() const;
-    virtual BOOL GetData( SvData * );
+    virtual BOOL GetData( ::com::sun::star::uno::Any & rData /*out param*/,
+                            const String & rMimeType,
+                            BOOL bSynchron = FALSE );
 
-    virtual BOOL Connect( SvBaseLink& );
-    virtual SvLinkName* Edit( Window*, const SvBaseLink& );
+    virtual BOOL Connect( so3::SvBaseLink* );
+    virtual String Edit( Window*, so3::SvBaseLink* );
 
     // erfrage ob das man direkt auf die Daten zugreifen kann oder ob das
     // erst angestossen werden muss
-    virtual ULONG GetUpToDateStatus();
+    virtual BOOL IsPending() const;
+    virtual BOOL IsDataComplete() const;
 
     void CancelTransfers();
     void SetTransferPriority( USHORT nPrio );
 };
 
 
-
 #endif