diff options
| author | Niklas Nebel <nn@openoffice.org> | 2001-04-27 18:31:24 +0000 |
|---|---|---|
| committer | Niklas Nebel <nn@openoffice.org> | 2001-04-27 18:31:24 +0000 |
| commit | e1d41657a237ec5bcbacde8bc5bd6a66dbfff26c (patch) | |
| tree | ee502df5820b77facc6f7985bcb436c542b17d1e /sc/source/ui/docshell/arealink.cxx | |
| parent | 137a8e5a58a3cbd7f79cee28a29fc82e66fe8f16 (diff) | |
user interface for linked areas / external data sources
Diffstat (limited to 'sc/source/ui/docshell/arealink.cxx')
| -rw-r--r-- | sc/source/ui/docshell/arealink.cxx | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index 875acdc7c25a..c539e8fd842d 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.10 $ + * $Revision: 1.11 $ * - * last change: $Author: dr $ $Date: 2001-04-24 14:48:21 $ + * last change: $Author: nn $ $Date: 2001-04-27 19:30:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,6 +85,7 @@ #include "markdata.hxx" #include "hints.hxx" #include "htmlimp.hxx" +#include "linkarea.hxx" // dialog #include "attrib.hxx" // raus, wenn ResetAttrib am Dokument #include "patattr.hxx" // raus, wenn ResetAttrib am Dokument @@ -122,16 +123,19 @@ __EXPORT ScAreaLink::~ScAreaLink() BOOL __EXPORT ScAreaLink::Edit(Window* pParent) { + // use own dialog instead of SvBaseLink::Edit... // DefModalDialogParent setzen, weil evtl. aus der DocShell beim ConvertFrom // ein Optionen-Dialog kommt... - Window* pOldParent = Application::GetDefDialogParent(); - if (pParent) - Application::SetDefDialogParent(pParent); - - BOOL bRet = SvBaseLink::Edit(pParent); - - Application::SetDefDialogParent(pOldParent); + BOOL bRet = FALSE; + ScLinkedAreaDlg* pDlg = new ScLinkedAreaDlg( pParent ); + pDlg->InitFromOldLink( aFileName, aFilterName, aOptions, aSourceArea, GetRefreshDelay() ); + if (pDlg->Execute() == RET_OK) + { + aOptions = pDlg->GetOptions(); + bRet = Refresh( pDlg->GetURL(), pDlg->GetFilter(), pDlg->GetSource(), pDlg->GetRefresh() ); + } + delete pDlg; return bRet; } @@ -466,8 +470,9 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter, if ( aOldRange.aEnd.Row() != aNewRange.aEnd.Row() ) nPaintEndY = MAXROW; - pDocShell->PostPaint( aDestPos.Col(),aDestPos.Row(),nDestTab, - nPaintEndX,nPaintEndY,nDestTab, PAINT_GRID ); + if ( !pDocShell->AdjustRowHeight( aDestPos.Row(), nPaintEndY, nDestTab ) ) + pDocShell->PostPaint( aDestPos.Col(),aDestPos.Row(),nDestTab, + nPaintEndX,nPaintEndY,nDestTab, PAINT_GRID ); aModificator.SetDocumentModified(); } else |