diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-10-04 19:04:15 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-10-04 19:04:15 +0000 |
| commit | 4d8cb06d250a3f1ede35f72351592d41a6fe5e57 (patch) | |
| tree | 4d00ed8a774821a36845847fe848f3e17e27ca77 /sc/inc/tablink.hxx | |
| parent | c1276fb29abff672232b58c16a79c523286d4103 (diff) | |
INTEGRATION: CWS mav09 (1.9.194); FILE MERGED
2004/09/16 22:12:18 mav 1.9.194.4: RESYNC: (1.10-1.11); FILE MERGED
2004/05/04 14:00:37 mba 1.9.194.3: #i27773#: remove so3
2004/04/29 18:26:03 mav 1.9.194.2: RESYNC: (1.9-1.10); FILE MERGED
2004/04/29 08:56:59 mav 1.9.194.1: #i27773# one more step further
Diffstat (limited to 'sc/inc/tablink.hxx')
| -rw-r--r-- | sc/inc/tablink.hxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx index 116ad455ecf0..4026ca25b074 100644 --- a/sc/inc/tablink.hxx +++ b/sc/inc/tablink.hxx @@ -2,9 +2,9 @@ * * $RCSfile: tablink.hxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: rt $ $Date: 2004-08-23 09:26:46 $ + * last change: $Author: kz $ $Date: 2004-10-04 20:04:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,23 +70,23 @@ #include "refreshtimer.hxx" #endif -#ifndef _EMBOBJ_HXX -#include <so3/embobj.hxx> -#endif +//REMOVE #ifndef _EMBOBJ_HXX +//REMOVE #include <so3/embobj.hxx> +//REMOVE #endif #ifndef _LNKBASE_HXX //autogen -#include <so3/lnkbase.hxx> +#include <sfx2/lnkbase.hxx> #endif -#ifndef SO2_DECL_SVEMBEDDEDOBJECT_DEFINED -#define SO2_DECL_SVEMBEDDEDOBJECT_DEFINED -SO2_DECL_REF(SvEmbeddedObject) -#endif +#include <sfx2/objsh.hxx> +//REMOVE #ifndef SO2_DECL_SVEMBEDDEDOBJECT_DEFINED +//REMOVE #define SO2_DECL_SVEMBEDDEDOBJECT_DEFINED +//REMOVE SO2_DECL_REF(SvEmbeddedObject) +//REMOVE #endif class ScDocShell; -class SfxObjectShell; -class ScTableLink : public ::so3::SvBaseLink, public ScRefreshTimer +class ScTableLink : public ::sfx2::SvBaseLink, public ScRefreshTimer { private: ScDocShell* pDocShell; // Container @@ -135,7 +135,7 @@ class SC_DLLPUBLIC ScDocumentLoader { private: ScDocShell* pDocShell; - SvEmbeddedObjectRef aRef; + SfxObjectShellRef aRef; SfxMedium* pMedium; public: |