diff options
| author | Mathias Bauer <mba@openoffice.org> | 2000-10-12 16:30:29 +0000 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2000-10-12 16:30:29 +0000 |
| commit | c7464781ba4164e376e696e9d067ec04bbfcd056 (patch) | |
| tree | 537bce504182893a751ce728036d53ba3b7bce73 /sfx2 | |
| parent | 06d1eaedf1c9bff81a74f15c043c2d8495181d2e (diff) | |
#79440#: get WorkWindow always from Frame
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appchild.cxx | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/sfx2/source/appl/appchild.cxx b/sfx2/source/appl/appchild.cxx index 66a97c433ce8..ce2ffeec7eb9 100644 --- a/sfx2/source/appl/appchild.cxx +++ b/sfx2/source/appl/appchild.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appchild.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:52:26 $ + * last change: $Author: mba $ $Date: 2000-10-12 17:30:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -312,25 +312,12 @@ SfxHelpPI* SfxApplication::GetHelpPI() SfxWorkWindow* SfxApplication::GetWorkWindow_Impl(const SfxViewFrame *pFrame) const { - SfxInPlaceFrame *pIPFrame = PTR_CAST(SfxInPlaceFrame,pFrame); - if ( pIPFrame ) - return pIPFrame->GetEnv_Impl()->GetWorkWindow(); + if ( pFrame ) + return pFrame->GetFrame()->GetWorkWindow_Impl(); + else if ( pViewFrame ) + return pViewFrame->GetFrame()->GetWorkWindow_Impl(); else - { - if ( pFrame ) - return pFrame->GetFrame()->GetWorkWindow_Impl(); - else if ( pViewFrame ) - { - SfxInPlaceFrame *pIPFrame = PTR_CAST(SfxInPlaceFrame,pViewFrame); - if ( pIPFrame ) - return pViewFrame->GetParentViewFrame_Impl()->GetFrame()->GetWorkWindow_Impl(); -// return pIPFrame->GetEnv_Impl()->GetWorkWindow(); - else - return pViewFrame->GetFrame()->GetWorkWindow_Impl(); - } - else - return NULL; - } + return NULL; } //-------------------------------------------------------------------- |