diff options
author | Kurt Zenker <kz@openoffice.org> | 2004-10-04 19:26:52 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2004-10-04 19:26:52 +0000 |
commit | b64174253f2e3afb4c946a63e7eb4d7d98de6d1e (patch) | |
tree | a4783c78e557150bfd08f09b46fcaa8e03abd332 /sc/source/ui/view/tabvwshd.cxx | |
parent | 8586880b2b03c038caaba5e67720b8c93c9df62d (diff) |
INTEGRATION: CWS mav09 (1.2.428); FILE MERGED
2004/07/15 10:41:13 mba 1.2.428.2: #i27773#: cleaning up todos
2004/05/04 14:02:03 mba 1.2.428.1: #i27773#: remove so3
Diffstat (limited to 'sc/source/ui/view/tabvwshd.cxx')
-rw-r--r-- | sc/source/ui/view/tabvwshd.cxx | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/sc/source/ui/view/tabvwshd.cxx b/sc/source/ui/view/tabvwshd.cxx index 2565b2263378..bcf4cae7abbd 100644 --- a/sc/source/ui/view/tabvwshd.cxx +++ b/sc/source/ui/view/tabvwshd.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabvwshd.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: nn $ $Date: 2001-12-03 20:32:45 $ + * last change: $Author: kz $ $Date: 2004-10-04 20:26:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,7 +76,6 @@ #include <sfx2/childwin.hxx> #include <sfx2/request.hxx> #include <sfx2/topfrm.hxx> -#include <so3/ipenv.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> @@ -119,16 +118,13 @@ Window* ScTabViewShell::GetDialogParent() ScDocShell* pDocSh = GetViewData()->GetDocShell(); if ( pDocSh->IsOle() ) { - SvInPlaceEnvironment* pEnv = pDocSh->GetIPEnv(); - if (pEnv) - return pEnv->GetEditWin(); + //TODO/LATER: how to GetEditWindow in embedded document?! + //It should be OK to return the VieShell Window! + return GetWindow(); + //SvInPlaceEnvironment* pEnv = pDocSh->GetIPEnv(); + //if (pEnv) + // return pEnv->GetEditWin(); } -#if 0 - else if ( !GetViewFrame()->ISA(SfxTopViewFrame) ) // z.B. PlugIn - { - return GetActiveWin(); - } -#endif return GetActiveWin(); // for normal views, too } |