summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/bookmrk.hxx23
-rw-r--r--sw/inc/ddefld.hxx11
-rw-r--r--sw/inc/doc.hxx16
-rw-r--r--sw/inc/docsh.hxx12
-rw-r--r--sw/inc/ndgrf.hxx8
-rw-r--r--sw/inc/ndole.hxx39
-rw-r--r--sw/inc/section.hxx23
-rw-r--r--sw/inc/swbaslnk.hxx17
-rw-r--r--sw/inc/swserv.hxx23
-rw-r--r--sw/inc/swtable.hxx13
10 files changed, 80 insertions, 105 deletions
diff --git a/sw/inc/bookmrk.hxx b/sw/inc/bookmrk.hxx
index f3699be239b1..5b8e2bf71a8d 100644
--- a/sw/inc/bookmrk.hxx
+++ b/sw/inc/bookmrk.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: bookmrk.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: os $ $Date: 2001-01-10 13:40:27 $
+ * last change: $Author: jp $ $Date: 2001-03-08 21:17:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -70,19 +70,20 @@
#ifndef _KEYCOD_HXX //autogen
#include <vcl/keycod.hxx>
#endif
-#ifndef _SO2REF_HXX //autogen
-#include <so3/so2ref.hxx>
+#ifndef _TOOLS_REF_HXX
+#include <tools/ref.hxx>
#endif
-#ifndef _BKMRKE_HXX //autogen
+
+#ifndef _BKMRKE_HXX
#include <bkmrke.hxx>
#endif
-
-#include "calbck.hxx"
+#ifndef _CALBCK_HXX
+#include <calbck.hxx>
+#endif
#ifndef SW_DECL_SWSERVEROBJECT_DEFINED
#define SW_DECL_SWSERVEROBJECT_DEFINED
-class SvPseudoObject;
-SO2_DECL_REF( SwServerObject )
+SV_DECL_REF( SwServerObject )
#endif
@@ -112,7 +113,7 @@ public:
const KeyCode& rCode,
const String& rName, const String& rShortName);
// Beim Loeschen von Text werden Bookmarks mitgeloescht!
- ~SwBookmark();
+ virtual ~SwBookmark();
const SwPosition& GetPos() const { return *pPos1; }
const SwPosition* GetOtherPos() const { return pPos2; }
@@ -146,7 +147,7 @@ public:
const SvxMacro& GetEndMacro() { return aEndMacro; }
// Daten Server-Methoden
- void SetRefObject( SvPseudoObject* pObj );
+ void SetRefObject( SwServerObject* pObj );
const SwServerObject* GetObject() const { return &refObj; }
SwServerObject* GetObject() { return &refObj; }
BOOL IsServer() const { return refObj.Is(); }
diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx
index 32e48f01a814..7cb6491c953b 100644
--- a/sw/inc/ddefld.hxx
+++ b/sw/inc/ddefld.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ddefld.hxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:14:25 $
+ * last change: $Author: jp $ $Date: 2001-03-08 21:17:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -77,7 +77,7 @@ class SwDDEFieldType : public SwFieldType
String aName;
String aExpansion;
- SvBaseLinkRef refLink;
+ ::so3::SvBaseLinkRef refLink;
SwDoc* pDoc;
USHORT nRefCnt;
@@ -109,11 +109,12 @@ public:
BOOL IsDeleted() const { return bDeleted; }
void SetDeleted( BOOL b ) { bDeleted = b; }
- BOOL IsConnected() const { return 0 != refLink->GetObject(); }
+ BOOL IsConnected() const { return 0 != refLink->GetObj(); }
void UpdateNow() { refLink->Update(); }
void Disconnect() { refLink->Disconnect(); }
- const SvBaseLink& GetBaseLink() const { return *refLink; }
+ const ::so3::SvBaseLink& GetBaseLink() const { return *refLink; }
+ ::so3::SvBaseLink& GetBaseLink() { return *refLink; }
const SwDoc* GetDoc() const { return pDoc; }
SwDoc* GetDoc() { return pDoc; }
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index f60db0e0f582..4e7d5809088e 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: doc.hxx,v $
*
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
*
- * last change: $Author: jp $ $Date: 2001-03-02 14:35:07 $
+ * last change: $Author: jp $ $Date: 2001-03-08 21:17:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -121,7 +121,6 @@ class SvData;
class SvEmbeddedObjectRef;
class SvNumberFormatter;
class SvPersist;
-class SvPseudoObject;
class SvStorage;
class SvStrings;
class SvStringsSort;
@@ -237,6 +236,9 @@ namespace uno {
namespace utl {
class TransliterationWrapper;
};
+namespace so3 {
+ class SvLinkSource;
+};
//PageDescriptor-Schnittstelle, Array hier wegen inlines.
typedef SwPageDesc* SwPageDescPtr;
@@ -1566,9 +1568,11 @@ public:
void SetInLoadAsynchron( sal_Bool bFlag ) { bInLoadAsynchron = bFlag; }
// SS fuers Linken von Dokumentteilen
- sal_Bool GetData( const String& rItem, SvData& rData ) const;
- sal_Bool ChangeData( const String& rItem, const SvData& rData );
- SvPseudoObject* CreateHotLink( const String& rItem );
+ sal_Bool GetData( const String& rItem, const String& rMimeType,
+ ::com::sun::star::uno::Any & rValue ) const;
+ sal_Bool SetData( const String& rItem, const String& rMimeType,
+ const ::com::sun::star::uno::Any & rValue );
+ ::so3::SvLinkSource* CreateLinkSource( const String& rItem );
// erzeuge um das zu Servende Object eine Selektion
sal_Bool SelectServerObj( const String& rStr, SwPaM*& rpPam,
SwNodeRange*& rpRange ) const;
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index c8f8d93a576f..1123accf7ba6 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: docsh.hxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: os $ $Date: 2001-02-13 14:58:22 $
+ * last change: $Author: jp $ $Date: 2001-03-08 21:17:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -261,9 +261,11 @@ public:
// und Streams
Sw3Io* GetIoSystem() { return pIo; }
- virtual long DdeGetData( const String& rItem, SvData& rData );
- virtual long DdeSetData( const String& rItem, const SvData& rData );
- virtual SvPseudoObject* DdeCreateHotLink( const String& rItem );
+ virtual long DdeGetData( const String& rItem, const String& rMimeType,
+ ::com::sun::star::uno::Any & rValue );
+ virtual long DdeSetData( const String& rItem, const String& rMimeType,
+ const ::com::sun::star::uno::Any & rValue );
+ virtual ::so3::SvLinkSource* DdeCreateLinkSource( const String& rItem );
virtual void FillClass( SvGlobalName * pClassName,
ULONG * pClipFormat,
String * pAppName,
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index b15983ddc1d8..ce7a33b97009 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ndgrf.hxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: mib $ $Date: 2001-03-06 10:23:51 $
+ * last change: $Author: jp $ $Date: 2001-03-08 21:17:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -85,7 +85,7 @@ class SwGrfNode: public SwNoTxtNode
friend class SwGrfFrm;
GraphicObject aGrfObj;
- SvBaseLinkRef refLink; // falls Grafik nur als Link, dann Pointer gesetzt
+ ::so3::SvBaseLinkRef refLink; // falls Grafik nur als Link, dann Pointer gesetzt
Size nGrfSize;
// String aStrmName; // SW3: Name des Storage-Streams fuer Embedded
String aNewStrmName; // SW3/XML: new stream name (either SW3 stream
@@ -191,7 +191,7 @@ public:
BOOL IsGrfLink() const { return refLink.Is(); }
inline BOOL IsLinkedFile() const;
inline BOOL IsLinkedDDE() const;
- SvBaseLinkRef GetLink() const { return refLink; }
+ ::so3::SvBaseLinkRef GetLink() const { return refLink; }
BOOL GetFileFilterNms( String* pFileNm, String* pFilterNm ) const;
void ReleaseLink();
diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx
index 7a00e889080e..fe41c53b38bc 100644
--- a/sw/inc/ndole.hxx
+++ b/sw/inc/ndole.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ndole.hxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:14:27 $
+ * last change: $Author: jp $ $Date: 2001-03-08 21:17:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -61,9 +61,6 @@
#ifndef _NDOLE_HXX
#define _NDOLE_HXX
-#ifndef _SWBASLNK_HXX
-#include <swbaslnk.hxx> // fuer SwBaseLink
-#endif
#ifndef _NDNOTXT_HXX
#include <ndnotxt.hxx>
#endif
@@ -84,7 +81,6 @@ class SwOLEObj
static SwOLELRUCache* pOLELRU_Cache;
const SwOLENode* pOLENd;
- SvBaseLinkRef refLink; // falls Object nur als Link, dann Pointer gesetzt
//Entweder Ref oder Name sind bekannt, wenn nur der Name bekannt ist, wird
//dir Ref bei Anforderung durch GetOleRef() vom Sfx besorgt.
@@ -110,12 +106,6 @@ public:
const String &GetName() const { return aName; }
BOOL IsOleRef() const; //Damit das Objekt nicht unnoetig geladen werden muss.
-
- BOOL IsOLELink() const { return refLink.Is(); }
- inline SwOLELink* GetLink() const;
- inline void SetLink( SwOLELink* pLink );
- void ReleaseLink();
-
#endif
};
@@ -177,27 +167,6 @@ public:
#endif
};
-// --------------------
-// SwOLELink
-// --------------------
-
-class SwOLELink : public SwBaseLink
-{
- friend class Sw3IoImp;
- void SetCacheObj( SvEmbeddedObject * pObj )
- { SvBaseLink::SetCacheObj( pObj ); }
-
-public:
- SwOLELink( SwOLENode& rNode, SvPseudoObject* pObj )
- : SwBaseLink( aEmptyStr, OBJECT_CLIENT_OLE_CACHE, pObj, &rNode )
- {}
-
- SwOLELink( SwOLENode& rNode )
- : SwBaseLink( 0, 0, &rNode )
- {}
-};
-
-
// Inline Metoden aus Node.hxx - erst hier ist der TxtNode bekannt !!
inline SwOLENode *SwNode::GetOLENode()
{
@@ -208,10 +177,6 @@ inline const SwOLENode *SwNode::GetOLENode() const
return ND_OLENODE == nNodeType ? (const SwOLENode*)this : 0;
}
-#ifndef _FESHVIEW_ONLY_INLINE_NEEDED
-inline SwOLELink* SwOLEObj::GetLink() const { return (SwOLELink*)&refLink; }
-inline void SwOLEObj::SetLink( SwOLELink* pLink ) { refLink = pLink; }
-#endif
#endif // _NDOLE_HXX
diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index da3a3070d08a..ddaae2e2b23d 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: section.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: jp $ $Date: 2001-03-02 14:35:07 $
+ * last change: $Author: jp $ $Date: 2001-03-08 21:17:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -72,12 +72,12 @@
#ifndef _RTTI_HXX
#include <tools/rtti.hxx>
#endif
+#ifndef _TOOLS_REF_HXX
+#include <tools/ref.hxx>
+#endif
#ifndef _SVARRAY_HXX
#include <svtools/svarray.hxx>
#endif
-#ifndef _SO2REF_HXX
-#include <so3/so2ref.hxx>
-#endif
#ifndef _FRMFMT_HXX
#include <frmfmt.hxx>
#endif
@@ -90,8 +90,7 @@ class SwTOXBase;
#ifndef SW_DECL_SWSERVEROBJECT_DEFINED
#define SW_DECL_SWSERVEROBJECT_DEFINED
-class SvPseudoObject;
-SO2_DECL_REF( SwServerObject )
+SV_DECL_REF( SwServerObject )
#endif
SV_DECL_PTRARR( SwSections, SwSection*, 0, 4 )
@@ -131,7 +130,7 @@ class SwSection : public SwClient
::com::sun::star::uno::Sequence <sal_Int8> aPasswd;
SwServerObjectRef refObj; // falls DataServer -> Pointer gesetzt
- SvBaseLinkRef refLink;
+ ::so3::SvBaseLinkRef refLink;
SectionType eType;
@@ -210,7 +209,7 @@ public:
{ aPasswd = rNew; }
// Daten Server-Methoden
- void SetRefObject( SvPseudoObject* pObj );
+ void SetRefObject( SwServerObject* pObj );
const SwServerObject* GetObject() const { return &refObj; }
SwServerObject* GetObject() { return &refObj; }
BOOL IsServer() const { return refObj.Is(); }
@@ -223,7 +222,8 @@ public:
void UpdateNow() { refLink->Update(); }
void Disconnect() { refLink->Disconnect(); }
- const SvBaseLink& GetBaseLink() const { return *refLink; }
+ const ::so3::SvBaseLink& GetBaseLink() const { return *refLink; }
+ ::so3::SvBaseLink& GetBaseLink() { return *refLink; }
void CreateLink( LinkCreateType eType );
@@ -324,6 +324,9 @@ inline SwSection* SwSectionFmt::GetParentSection() const
/*************************************************************************
$Log: not supported by cvs2svn $
+ Revision 1.3 2001/03/02 14:35:07 jp
+ password change: use sequence instead of string
+
Revision 1.2 2001/02/27 18:46:19 jp
new: Password for single section
diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx
index 34aed0581ced..0eb6d34d4804 100644
--- a/sw/inc/swbaslnk.hxx
+++ b/sw/inc/swbaslnk.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: swbaslnk.hxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:14:28 $
+ * last change: $Author: jp $ $Date: 2001-03-08 21:17:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -70,7 +70,7 @@ class SwNode;
class SwCntntNode;
class SwNodeIndex;
-class SwBaseLink : public SvBaseLink
+class SwBaseLink : public ::so3::SvBaseLink
{
SwCntntNode* pCntntNode;
BOOL bSwapIn : 1;
@@ -80,9 +80,9 @@ class SwBaseLink : public SvBaseLink
protected:
SwBaseLink() {}
- SwBaseLink( const String& rNm, USHORT nObjectType, SvPseudoObject* pObj,
+ SwBaseLink( const String& rNm, USHORT nObjectType, ::so3::SvLinkSource* pObj,
SwCntntNode* pNode = 0 )
- : SvBaseLink( rNm, nObjectType, pObj ), pCntntNode( pNode ),
+ : ::so3::SvBaseLink( rNm, nObjectType, pObj ), pCntntNode( pNode ),
bSwapIn( FALSE ), bNoDataFlag( FALSE ), bIgnoreDataChanged( FALSE )
{}
@@ -90,12 +90,14 @@ public:
TYPEINFO();
SwBaseLink( USHORT nMode, USHORT nFormat, SwCntntNode* pNode = 0 )
- : SvBaseLink( nMode, nFormat ), pCntntNode( pNode ),
+ : ::so3::SvBaseLink( nMode, nFormat ), pCntntNode( pNode ),
bSwapIn( FALSE ), bNoDataFlag( FALSE ), bIgnoreDataChanged( FALSE )
{}
virtual ~SwBaseLink();
- virtual void DataChanged( SvData& rData );
+ virtual void DataChanged( const String& rMimeType,
+ const ::com::sun::star::uno::Any & rValue );
+
virtual void Closed();
virtual const SwNode* GetAnchor() const;
@@ -108,7 +110,6 @@ public:
FASTBOOL IsShowQuickDrawBmp() const; // nur fuer Grafiken
FASTBOOL Connect() { return 0 != SvBaseLink::GetRealObject(); }
- SvLinkName* GetCacheName() const { return SvBaseLink::GetCacheName(); }
// nur fuer Grafik-Links ( zum Umschalten zwischen DDE / Grf-Link)
void SetObjType( USHORT nType ) { SvBaseLink::SetObjType( nType ); }
diff --git a/sw/inc/swserv.hxx b/sw/inc/swserv.hxx
index 5e5a51171a18..802c679e3bd6 100644
--- a/sw/inc/swserv.hxx
+++ b/sw/inc/swserv.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: swserv.hxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:14:28 $
+ * last change: $Author: jp $ $Date: 2001-03-08 21:17:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -62,8 +62,8 @@
#ifndef _SWSERV_HXX
#define _SWSERV_HXX
-#ifndef _PSEUDO_HXX //autogen
-#include <so3/pseudo.hxx>
+#ifndef _LINKSRC_HXX
+#include <so3/linksrc.hxx>
#endif
class SwBookmark;
@@ -73,7 +73,7 @@ class SwTableNode;
struct SwPosition;
class SwPaM;
-class SwServerObject : public SvPseudoObject
+class SwServerObject : public ::so3::SvLinkSource
{
protected:
enum ServerModes { BOOKMARK_SERVER, TABLE_SERVER, SECTION_SERVER, NONE_SERVER } eType;
@@ -103,11 +103,12 @@ public:
}
virtual ~SwServerObject();
- virtual BOOL GetData( SvData* );
- virtual BOOL ChangeData( SvData& );
+ virtual BOOL GetData( ::com::sun::star::uno::Any & rData,
+ const String & rMimeType,
+ BOOL bSynchron = FALSE );
- ULONG GetSelectorCount() const
- { return SvPseudoObject::GetSelectorCount(); }
+ BOOL SetData( const String & rMimeType,
+ const ::com::sun::star::uno::Any& rData );
virtual void SendDataChanged( const SwPosition& rPos );
virtual void SendDataChanged( const SwPaM& rRange );
@@ -120,10 +121,8 @@ public:
#ifndef SW_DECL_SWSERVEROBJECT_DEFINED
#define SW_DECL_SWSERVEROBJECT_DEFINED
-class SvPseudoObject;
-SO2_DECL_REF( SwServerObject )
+SV_DECL_REF( SwServerObject )
#endif
-
#endif // _SWSERV_HXX
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 23ea03e1aa93..f98cdfcd89da 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: swtable.hxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:14:28 $
+ * last change: $Author: jp $ $Date: 2001-03-08 21:17:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -64,8 +64,8 @@
#ifndef _SVMEMPOOL_HXX //autogen
#include <tools/mempool.hxx>
#endif
-#ifndef _SO2REF_HXX //autogen
-#include <so3/so2ref.hxx>
+#ifndef _TOOLS_REF_HXX
+#include <tools/ref.hxx>
#endif
#ifndef _SVARRAY_HXX //autogen
#include <svtools/svarray.hxx>
@@ -116,8 +116,7 @@ class SwUndoTblCpyTbl;
#ifndef SW_DECL_SWSERVEROBJECT_DEFINED
#define SW_DECL_SWSERVEROBJECT_DEFINED
-class SvPseudoObject;
-SO2_DECL_REF( SwServerObject )
+SV_DECL_REF( SwServerObject )
#endif
SV_DECL_PTRARR_DEL(SwTableLines, SwTableLine*, 10, 20);
@@ -249,7 +248,7 @@ public:
SwTableNode* GetTableNode() const;
// Daten Server-Methoden
- void SetRefObject( SvPseudoObject* );
+ void SetRefObject( SwServerObject* );
const SwServerObject* GetObject() const { return &refObj; }
SwServerObject* GetObject() { return &refObj; }
BOOL IsServer() const { return refObj.Is(); }
generated by cgit (git 2.34.1) at 2025-02-21 10:38:11 +0000