summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sc/inc/arealink.hxx22
-rw-r--r--sc/source/core/data/documen8.cxx6
-rw-r--r--sc/source/ui/docshell/arealink.cxx36
-rw-r--r--sc/source/ui/docshell/docfunc.cxx11
-rw-r--r--sc/source/ui/docshell/docsh.cxx10
-rw-r--r--sc/source/ui/inc/docfunc.hxx7
-rw-r--r--sc/source/ui/inc/undoblk.hxx16
-rw-r--r--sc/source/ui/inc/viewfunc.hxx6
-rw-r--r--sc/source/ui/undo/undoblk3.cxx48
-rw-r--r--sc/source/ui/view/gridwin.cxx6
-rw-r--r--sc/source/ui/view/viewfun2.cxx10
11 files changed, 102 insertions, 76 deletions
diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx
index 5a2f5e89d641..f6a73984a691 100644
--- a/sc/inc/arealink.hxx
+++ b/sc/inc/arealink.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: arealink.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: jp $ $Date: 2001-03-08 20:45:14 $
+ * last change: $Author: dr $ $Date: 2001-04-05 10:42:48 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -82,6 +82,7 @@ private:
String aOptions;
String aSourceArea;
ScRange aDestArea;
+ ULONG nRefreshDelay; // refresh delay in seconds; 0 = off
BOOL bAddUndo;
BOOL bInCreate;
BOOL bDoInsert; // wird fuer das erste Update auf FALSE gesetzt
@@ -90,7 +91,7 @@ public:
TYPEINFO();
ScAreaLink( SfxObjectShell* pShell, const String& rFile,
const String& rFilter, const String& rOpt,
- const String& rArea, const ScRange& rDest );
+ const String& rArea, const ScRange& rDest, ULONG nRefresh );
virtual ~ScAreaLink();
virtual void Closed();
@@ -99,22 +100,25 @@ public:
virtual BOOL Edit(Window* pParent);
- BOOL Refresh( const String& rNewFile, const String& rNewFilter, const String& rNewArea );
+ BOOL Refresh( const String& rNewFile, const String& rNewFilter,
+ const String& rNewArea, ULONG nNewRefresh );
void SetInCreate(BOOL bSet) { bInCreate = bSet; }
void SetDoInsert(BOOL bSet) { bDoInsert = bSet; }
void SetDestArea(const ScRange& rNew);
+ void SetRefreshDelay(ULONG nRefresh) { nRefreshDelay = nRefresh; }
void SetSource(const String& rDoc, const String& rFlt, const String& rOpt,
const String& rArea);
BOOL IsEqual( const String& rFile, const String& rFilter, const String& rOpt,
const String& rSource, const ScRange& rDest ) const;
- const String& GetFile() const { return aFileName; }
- const String& GetFilter() const { return aFilterName; }
- const String& GetOptions() const { return aOptions; }
- const String& GetSource() const { return aSourceArea; }
- const ScRange& GetDestArea() const { return aDestArea; }
+ const String& GetFile() const { return aFileName; }
+ const String& GetFilter() const { return aFilterName; }
+ const String& GetOptions() const { return aOptions; }
+ const String& GetSource() const { return aSourceArea; }
+ const ScRange& GetDestArea() const { return aDestArea; }
+ ULONG GetRefreshDelay() const { return nRefreshDelay; }
};
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index d1762f4ea4fc..7f29059cf916 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: documen8.cxx,v $
*
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
*
- * last change: $Author: nn $ $Date: 2001-03-27 13:48:15 $
+ * last change: $Author: dr $ $Date: 2001-04-05 10:46:04 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1463,7 +1463,7 @@ void ScDocument::LoadAreaLinks(SvStream& rStream)
aHdr.EndEntry();
ScAreaLink* pLink = new ScAreaLink( pShell, aFile, aFilter, aOptions,
- aSource, aDestArea.aStart );
+ aSource, aDestArea.aStart, 0 );
pLink->SetInCreate( TRUE );
pLink->SetDestArea( aDestArea );
pLinkManager->InsertFileLink( *pLink, OBJECT_CLIENT_FILE, aFile, &aFilter, &aSource );
diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx
index 47f358a14b06..1c8efdfd2363 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.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: jp $ $Date: 2001-03-08 20:49:42 $
+ * last change: $Author: dr $ $Date: 2001-04-05 10:48:47 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -95,17 +95,19 @@ TYPEINIT1(ScAreaLink,::so3::SvBaseLink);
ScAreaLink::ScAreaLink( SfxObjectShell* pShell, const String& rFile,
const String& rFilter, const String& rOpt,
- const String& rArea, const ScRange& rDest ) :
+ const String& rArea, const ScRange& rDest,
+ ULONG nRefresh ) :
::so3::SvBaseLink(LINKUPDATE_ONCALL,FORMAT_FILE),
- pDocShell ((ScDocShell*)pShell),
- aFileName (rFile),
- aFilterName (rFilter),
- aOptions (rOpt),
- aSourceArea (rArea),
- aDestArea (rDest),
- bAddUndo (TRUE),
- bInCreate (FALSE),
- bDoInsert (TRUE)
+ pDocShell ((ScDocShell*)pShell),
+ aFileName (rFile),
+ aFilterName (rFilter),
+ aOptions (rOpt),
+ aSourceArea (rArea),
+ aDestArea (rDest),
+ nRefreshDelay (nRefresh),
+ bAddUndo (TRUE),
+ bInCreate (FALSE),
+ bDoInsert (TRUE)
{
DBG_ASSERT(pShell->ISA(ScDocShell), "ScAreaLink mit falscher ObjectShell");
}
@@ -163,7 +165,7 @@ void __EXPORT ScAreaLink::DataChanged( const String&,
SetName( aLinkName );
}
- Refresh(aFile,aFilter,aArea);
+ Refresh( aFile, aFilter, aArea, nRefreshDelay );
}
}
@@ -177,7 +179,7 @@ void __EXPORT ScAreaLink::Closed()
{
pDocShell->GetUndoManager()->AddUndoAction( new ScUndoRemoveAreaLink( pDocShell,
aFileName, aFilterName, aOptions,
- aSourceArea, aDestArea ) );
+ aSourceArea, aDestArea, nRefreshDelay ) );
bAddUndo = FALSE; // nur einmal
}
@@ -209,7 +211,7 @@ BOOL ScAreaLink::IsEqual( const String& rFile, const String& rFilter, const Stri
// ausfuehren:
BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
- const String& rNewArea )
+ const String& rNewArea, ULONG nNewRefresh )
{
// Dokument laden - wie TabLink
@@ -389,9 +391,9 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
pDocShell->GetUndoManager()->AddUndoAction(
new ScUndoUpdateAreaLink( pDocShell,
aFileName, aFilterName, aOptions,
- aSourceArea, aOldRange,
+ aSourceArea, aOldRange, nRefreshDelay,
aNewUrl, rNewFilter, aNewOpt,
- rNewArea, aNewRange,
+ rNewArea, aNewRange, nNewRefresh,
pUndoDoc, pRedoDoc, bDoInsert ) );
}
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 50b24658652c..89456e337221 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: docfunc.cxx,v $
*
- * $Revision: 1.13 $
+ * $Revision: 1.14 $
*
- * last change: $Author: nn $ $Date: 2001-03-27 08:48:22 $
+ * last change: $Author: dr $ $Date: 2001-04-05 10:48:47 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -3721,7 +3721,8 @@ BOOL ScDocFunc::ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNewEnd
BOOL ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter,
const String& rOptions, const String& rSource,
- const ScRange& rDestRange, BOOL bFitBlock, BOOL bApi )
+ const ScRange& rDestRange, ULONG nRefresh,
+ BOOL bFitBlock, BOOL bApi )
{
//! auch fuer ScViewFunc::InsertAreaLink benutzen!
@@ -3740,7 +3741,7 @@ BOOL ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter,
SvxLinkManager* pLinkManager = pDoc->GetLinkManager();
ScAreaLink* pLink = new ScAreaLink( &rDocShell, rFile, aFilterName,
- aNewOptions, rSource, rDestRange );
+ aNewOptions, rSource, rDestRange, nRefresh );
pLinkManager->InsertFileLink( *pLink, OBJECT_CLIENT_FILE, rFile, &aFilterName, &rSource );
// Undo fuer den leeren Link
@@ -3748,7 +3749,7 @@ BOOL ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter,
if (bUndo)
rDocShell.GetUndoManager()->AddUndoAction( new ScUndoInsertAreaLink( &rDocShell,
rFile, aFilterName, aNewOptions,
- rSource, rDestRange ) );
+ rSource, rDestRange, nRefresh ) );
// Update hat sein eigenes Undo
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 5297dcfeca7d..bf1ca3ce65ea 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: docsh.cxx,v $
*
- * $Revision: 1.19 $
+ * $Revision: 1.20 $
*
- * last change: $Author: sab $ $Date: 2001-03-29 10:49:18 $
+ * last change: $Author: dr $ $Date: 2001-04-05 10:48:47 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -170,6 +170,7 @@ static const sal_Char __FAR_DATA pFilterDBase[] = "dBase";
static const sal_Char __FAR_DATA pFilterDif[] = "DIF";
static const sal_Char __FAR_DATA pFilterSylk[] = "SYLK";
static const sal_Char __FAR_DATA pFilterHtml[] = "HTML (StarCalc)";
+static const sal_Char __FAR_DATA pFilterHtmlWebQ[] = "calc_HTML_WebQuery";
static const sal_Char __FAR_DATA pFilterRtf[] = "Rich Text Format (StarCalc)";
//----------------------------------------------------------------------
@@ -1225,9 +1226,10 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
if ( eError != eERR_OK && !GetError() )
SetError(eError);
}
- else if (aFltName.EqualsAscii(pFilterHtml))
+ else if (aFltName.EqualsAscii(pFilterHtml) || aFltName.EqualsAscii(pFilterHtmlWebQ))
{
FltError eError = SCERR_IMPORT_UNKNOWN;
+ BOOL bWebQuery = aFltName.EqualsAscii(pFilterHtmlWebQ);
if( !rMedium.IsStorage() )
{
SvStream* pInStream = rMedium.GetInStream();
@@ -1238,7 +1240,7 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
// HTML macht eigenes ColWidth/RowHeight
CalcOutputFactor();
eError = ScImportHTML( *pInStream, &aDocument, aRange,
- GetOutputFactor() );
+ GetOutputFactor(), !bWebQuery );
if (eError != eERR_OK)
{
if (!GetError())
diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx
index 422ed66776ae..a0521634b393 100644
--- a/sc/source/ui/inc/docfunc.hxx
+++ b/sc/source/ui/inc/docfunc.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: docfunc.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: nn $ $Date: 2001-03-26 19:21:58 $
+ * last change: $Author: dr $ $Date: 2001-04-05 10:49:47 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -190,7 +190,8 @@ public:
BOOL InsertAreaLink( const String& rFile, const String& rFilter,
const String& rOptions, const String& rSource,
- const ScRange& rDestRange, BOOL bFitBlock, BOOL bApi );
+ const ScRange& rDestRange, ULONG nRefresh,
+ BOOL bFitBlock, BOOL bApi );
};
diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx
index 9e2f1568996c..a126a8d8aa43 100644
--- a/sc/source/ui/inc/undoblk.hxx
+++ b/sc/source/ui/inc/undoblk.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: undoblk.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: nn $ $Date: 2001-03-27 08:47:00 $
+ * last change: $Author: dr $ $Date: 2001-04-05 10:49:47 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -729,7 +729,8 @@ public:
ScUndoInsertAreaLink( ScDocShell* pShell,
const String& rDoc,
const String& rFlt, const String& rOpt,
- const String& rArea, const ScRange& rDestRange );
+ const String& rArea, const ScRange& rDestRange,
+ ULONG nRefreshDelay );
virtual ~ScUndoInsertAreaLink();
virtual void Undo();
@@ -745,6 +746,7 @@ private:
String aOptions;
String aAreaName;
ScRange aRange;
+ ULONG nRefreshDelay;
};
@@ -755,7 +757,8 @@ public:
ScUndoRemoveAreaLink( ScDocShell* pShell,
const String& rDoc,
const String& rFlt, const String& rOpt,
- const String& rArea, const ScRange& rDestRange );
+ const String& rArea, const ScRange& rDestRange,
+ ULONG nRefreshDelay );
virtual ~ScUndoRemoveAreaLink();
virtual void Undo();
@@ -771,6 +774,7 @@ private:
String aOptions;
String aAreaName;
ScRange aRange;
+ ULONG nRefreshDelay;
};
@@ -782,9 +786,11 @@ public:
const String& rOldD,
const String& rOldF, const String& rOldO,
const String& rOldA, const ScRange& rOldR,
+ ULONG nOldRD,
const String& rNewD,
const String& rNewF, const String& rNewO,
const String& rNewA, const ScRange& rNewR,
+ ULONG nNewRD,
ScDocument* pUndo, ScDocument* pRedo,
BOOL bDoInsert );
virtual ~ScUndoUpdateAreaLink();
@@ -809,6 +815,8 @@ private:
ScRange aNewRange;
ScDocument* pUndoDoc;
ScDocument* pRedoDoc;
+ ULONG nOldRefresh;
+ ULONG nNewRefresh;
BOOL bWithInsert;
void DoChange( const BOOL bUndo ) const;
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index 11910bfa112e..3b131d2bf443 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: viewfunc.hxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: nn $ $Date: 2001-03-30 19:12:07 $
+ * last change: $Author: dr $ $Date: 2001-04-05 10:49:47 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -306,7 +306,7 @@ public:
const String& rTabName );
void InsertAreaLink( const String& rFile,
const String& rFilter, const String& rOptions,
- const String& rSource );
+ const String& rSource, ULONG nRefresh );
void ShowTable( const String& rName );
void HideTable( USHORT nTabNr );
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index 3bc51000470e..80a1afb87d8a 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: undoblk3.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: jp $ $Date: 2001-03-08 20:51:30 $
+ * last change: $Author: dr $ $Date: 2001-04-05 10:50:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1729,15 +1729,17 @@ ScAreaLink* lcl_FindAreaLink( SvxLinkManager* pLinkManager, const String& rDoc,
ScUndoInsertAreaLink::ScUndoInsertAreaLink( ScDocShell* pShell,
const String& rDoc,
const String& rFlt, const String& rOpt,
- const String& rArea, const ScRange& rDestRange )
+ const String& rArea, const ScRange& rDestRange,
+ ULONG nRefresh )
//
- : ScSimpleUndo( pShell ),
+ : ScSimpleUndo ( pShell ),
//
- aDocName ( rDoc ),
- aFltName ( rFlt ),
- aOptions ( rOpt ),
- aAreaName ( rArea ),
- aRange ( rDestRange )
+ aDocName ( rDoc ),
+ aFltName ( rFlt ),
+ aOptions ( rOpt ),
+ aAreaName ( rArea ),
+ aRange ( rDestRange ),
+ nRefreshDelay ( nRefresh )
{
}
@@ -1781,7 +1783,7 @@ void __EXPORT ScUndoInsertAreaLink::Redo()
SvxLinkManager* pLinkManager = pDoc->GetLinkManager();
ScAreaLink* pLink = new ScAreaLink( pDocShell, aDocName, aFltName, aOptions,
- aAreaName, aRange.aStart );
+ aAreaName, aRange.aStart, nRefreshDelay );
pLink->SetInCreate( TRUE );
pLink->SetDestArea( aRange );
pLinkManager->InsertFileLink( *pLink, OBJECT_CLIENT_FILE, aDocName, &aFltName, &aAreaName );
@@ -1817,15 +1819,17 @@ BOOL __EXPORT ScUndoInsertAreaLink::CanRepeat(SfxRepeatTarget& rTarget) const
ScUndoRemoveAreaLink::ScUndoRemoveAreaLink( ScDocShell* pShell,
const String& rDoc, const String& rFlt, const String& rOpt,
- const String& rArea, const ScRange& rDestRange )
+ const String& rArea, const ScRange& rDestRange,
+ ULONG nRefresh )
//
- : ScSimpleUndo( pShell ),
+ : ScSimpleUndo ( pShell ),
//
- aDocName ( rDoc ),
- aFltName ( rFlt ),
- aOptions ( rOpt ),
- aAreaName ( rArea ),
- aRange ( rDestRange )
+ aDocName ( rDoc ),
+ aFltName ( rFlt ),
+ aOptions ( rOpt ),
+ aAreaName ( rArea ),
+ aRange ( rDestRange ),
+ nRefreshDelay ( nRefresh )
{
}
@@ -1853,7 +1857,7 @@ void __EXPORT ScUndoRemoveAreaLink::Undo()
SvxLinkManager* pLinkManager = pDoc->GetLinkManager();
ScAreaLink* pLink = new ScAreaLink( pDocShell, aDocName, aFltName, aOptions,
- aAreaName, aRange.aStart );
+ aAreaName, aRange.aStart, nRefreshDelay );
pLink->SetInCreate( TRUE );
pLink->SetDestArea( aRange );
pLinkManager->InsertFileLink( *pLink, OBJECT_CLIENT_FILE, aDocName, &aFltName, &aAreaName );
@@ -1905,9 +1909,9 @@ BOOL __EXPORT ScUndoRemoveAreaLink::CanRepeat(SfxRepeatTarget& rTarget) const
ScUndoUpdateAreaLink::ScUndoUpdateAreaLink( ScDocShell* pShell,
const String& rOldD, const String& rOldF, const String& rOldO,
- const String& rOldA, const ScRange& rOldR,
+ const String& rOldA, const ScRange& rOldR, ULONG nOldRD,
const String& rNewD, const String& rNewF, const String& rNewO,
- const String& rNewA, const ScRange& rNewR,
+ const String& rNewA, const ScRange& rNewR, ULONG nNewRD,
ScDocument* pUndo, ScDocument* pRedo, BOOL bDoInsert )
//
: ScSimpleUndo( pShell ),
@@ -1924,6 +1928,8 @@ ScUndoUpdateAreaLink::ScUndoUpdateAreaLink( ScDocShell* pShell,
aNewRange ( rNewR ),
pUndoDoc ( pUndo ),
pRedoDoc ( pRedo ),
+ nOldRefresh ( nOldRD ),
+ nNewRefresh ( nNewRD ),
bWithInsert ( bDoInsert )
{
DBG_ASSERT( aOldRange.aStart == aNewRange.aStart, "AreaLink verschoben ??!??" );
@@ -2011,6 +2017,7 @@ void __EXPORT ScUndoUpdateAreaLink::Undo()
{
pLink->SetSource( aOldDoc, aOldFlt, aOldOpt, aOldArea ); // alte Werte im Link
pLink->SetDestArea( aOldRange );
+ pLink->SetRefreshDelay( nOldRefresh );
}
DoChange(TRUE);
@@ -2029,6 +2036,7 @@ void __EXPORT ScUndoUpdateAreaLink::Redo()
{
pLink->SetSource( aNewDoc, aNewFlt, aNewOpt, aNewArea ); // neue Werte im Link
pLink->SetDestArea( aNewRange );
+ pLink->SetRefreshDelay( nNewRefresh );
}
DoChange(FALSE);
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index bd4e56c25e17..5d0a8e9271f3 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: gridwin.cxx,v $
*
- * $Revision: 1.13 $
+ * $Revision: 1.14 $
*
- * last change: $Author: nn $ $Date: 2001-04-03 17:42:35 $
+ * last change: $Author: dr $ $Date: 2001-04-05 10:52:34 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -2960,7 +2960,7 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt )
pView->MoveCursorAbs( nPosX, nPosY, SC_FOLLOW_NONE, FALSE, FALSE );
pView->InsertAreaLink( rData.aLinkDoc, EMPTY_STRING, EMPTY_STRING,
- rData.aLinkArea );
+ rData.aLinkArea, 0 );
}
else
{
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 8057a9a03025..6a7b1eb874ad 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: viewfun2.cxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: nn $ $Date: 2001-03-26 19:24:33 $
+ * last change: $Author: dr $ $Date: 2001-04-05 10:52:34 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1803,7 +1803,7 @@ BOOL ScViewFunc::RenameTable( const String& rName, USHORT nTab )
void ScViewFunc::InsertAreaLink( const String& rFile,
const String& rFilter, const String& rOptions,
- const String& rSource )
+ const String& rSource, ULONG nRefresh )
{
ScDocShell* pDocSh = GetViewData()->GetDocShell();
ScDocument* pDoc = pDocSh->GetDocument();
@@ -1820,7 +1820,7 @@ void ScViewFunc::InsertAreaLink( const String& rFile,
SvxLinkManager* pLinkManager = pDoc->GetLinkManager();
- ScAreaLink* pLink = new ScAreaLink( pDocSh, rFile, aFilterName, aNewOptions, rSource, aPos );
+ ScAreaLink* pLink = new ScAreaLink( pDocSh, rFile, aFilterName, aNewOptions, rSource, aPos, nRefresh );
pLinkManager->InsertFileLink( *pLink, OBJECT_CLIENT_FILE, rFile, &aFilterName, &rSource );
// Undo fuer den leeren Link
@@ -1829,7 +1829,7 @@ void ScViewFunc::InsertAreaLink( const String& rFile,
{
pDocSh->GetUndoManager()->AddUndoAction( new ScUndoInsertAreaLink( pDocSh,
rFile, aFilterName, aNewOptions,
- rSource, ScRange(aPos) ) );
+ rSource, ScRange(aPos), nRefresh ) );
}
// Update hat sein eigenes Undo