diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-10-04 19:14:15 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-10-04 19:14:15 +0000 |
| commit | 3922c9753448b28c1ec205e055ca88b718842d6b (patch) | |
| tree | 41fb0d57a5024b06323eff0bf0c263e1cb4f7a9a /sc/source/ui/docshell | |
| parent | 1f52777fdb66947a43c196dc026b2e75a0ce3b37 (diff) | |
INTEGRATION: CWS mav09 (1.16.84); FILE MERGED
2004/07/09 02:27:05 mav 1.16.84.3: RESYNC: (1.17-1.18); FILE MERGED
2004/05/17 18:11:10 mav 1.16.84.2: RESYNC: (1.16-1.17); FILE MERGED
2004/04/29 08:57:04 mav 1.16.84.1: #i27773# one more step further
Diffstat (limited to 'sc/source/ui/docshell')
| -rw-r--r-- | sc/source/ui/docshell/arealink.cxx | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index 08a36f059e33..d4fdaf66a2c4 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -2,9 +2,9 @@ * * $RCSfile: arealink.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: obo $ $Date: 2004-06-04 11:22:20 $ + * last change: $Author: kz $ $Date: 2004-10-04 20:14:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,6 +70,7 @@ #include <sfx2/app.hxx> #include <sfx2/docfile.hxx> #include <sfx2/fcontnr.hxx> +#include <sfx2/sfxsids.hrc> #include <svx/linkmgr.hxx> #include <svtools/stritem.hxx> #include <vcl/msgbox.hxx> @@ -94,7 +95,7 @@ #include "sc.hrc" //CHINA001 #include "scabstdlg.hxx" //CHINA001 -TYPEINIT1(ScAreaLink,::so3::SvBaseLink); +TYPEINIT1(ScAreaLink,::sfx2::SvBaseLink); //------------------------------------------------------------------------ @@ -102,7 +103,7 @@ ScAreaLink::ScAreaLink( SfxObjectShell* pShell, const String& rFile, const String& rFilter, const String& rOpt, const String& rArea, const ScRange& rDest, ULONG nRefresh ) : - ::so3::SvBaseLink(so3::LINKUPDATE_ONCALL,FORMAT_FILE), + ::sfx2::SvBaseLink(sfx2::LINKUPDATE_ONCALL,FORMAT_FILE), ScRefreshTimer ( nRefresh ), pDocShell ((ScDocShell*)pShell), aFileName (rFile), @@ -145,7 +146,7 @@ BOOL __EXPORT ScAreaLink::Edit(Window* pParent) // copy source data from members (set in Refresh) into link name for dialog String aLinkName; - so3::MakeLnkName( aLinkName, NULL, aFileName, aSourceArea, &aFilterName ); + sfx2::MakeLnkName( aLinkName, NULL, aFileName, aSourceArea, &aFilterName ); SetName( aLinkName ); } delete pDlg; @@ -181,7 +182,7 @@ void __EXPORT ScAreaLink::DataChanged( const String&, // adjust in dialog: String aLinkName; - so3::MakeLnkName( aLinkName, NULL, aFile, aArea, &aFilter ); + sfx2::MakeLnkName( aLinkName, NULL, aFile, aArea, &aFilter ); SetName( aLinkName ); } @@ -222,7 +223,7 @@ void ScAreaLink::SetSource(const String& rDoc, const String& rFlt, const String& // also update link name for dialog String aLinkName; - so3::MakeLnkName( aLinkName, NULL, aFileName, aSourceArea, &aFilterName ); + sfx2::MakeLnkName( aLinkName, NULL, aFileName, aSourceArea, &aFilterName ); SetName( aLinkName ); } @@ -301,7 +302,8 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter, SfxMedium* pMed = new SfxMedium(aNewUrl, STREAM_STD_READ, FALSE, pFilter); ScDocShell* pSrcShell = new ScDocShell(SFX_CREATE_MODE_INTERNAL); - SvEmbeddedObjectRef aRef = pSrcShell; +//REMOVE SvEmbeddedObjectRef aRef = pSrcShell; + SfxObjectShellRef aRef = pSrcShell; pSrcShell->DoLoad(pMed); ScDocument* pSrcDoc = pSrcShell->GetDocument(); |