diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-02-10 09:05:05 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-02-10 09:05:05 +0000 |
| commit | 6cb784a1bae36862c3ba8a8edd0348e894644592 (patch) | |
| tree | cef2bbad8005eadcbdde8043da356398a7224877 /sc/source/ui/view/tabvwsh4.cxx | |
| parent | 29a58027de61a817cb1fafb3b3ff019349ce9fda (diff) | |
INTEGRATION: CWS c0301 (1.53.2); FILE MERGED
2006/02/08 12:24:07 mba 1.53.2.1: #130815#: make code robust against hanging ViewShells
Diffstat (limited to 'sc/source/ui/view/tabvwsh4.cxx')
| -rw-r--r-- | sc/source/ui/view/tabvwsh4.cxx | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 7b42db54c85c..33045c8fc576 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -4,9 +4,9 @@ * * $RCSfile: tabvwsh4.cxx,v $ * - * $Revision: 1.53 $ + * $Revision: 1.54 $ * - * last change: $Author: kz $ $Date: 2006-01-31 18:39:18 $ + * last change: $Author: rt $ $Date: 2006-02-10 10:05:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1716,9 +1716,8 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode ) pCurFrameLine = new SvxBorderLine( &aColBlack, 20, 0, 0 ); pPivotSource = new ScArea; - StartListening(*GetViewData()->GetDocShell()); - StartListening(*GetViewFrame()); - StartListening(*pSfxApp,TRUE); // SfxViewShell hoert da schon zu? + StartListening(*GetViewData()->GetDocShell(),TRUE); + StartListening(*GetViewFrame(),TRUE); SfxViewFrame* pFirst = SfxViewFrame::GetFirst(pDocSh); BOOL bFirstView = !pFirst @@ -1890,9 +1889,11 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, UpdatePageBreakData(); - uno::Reference<frame::XFrame> xFrame = pViewFrame->GetFrame()->GetFrameInterface(); + /*uno::Reference<frame::XFrame> xFrame = pViewFrame->GetFrame()->GetFrameInterface(); if (xFrame.is()) - xFrame->setComponent( uno::Reference<awt::XWindow>(), new ScTabViewObj( this ) ); + xFrame->setComponent( uno::Reference<awt::XWindow>(), new ScTabViewObj( this ) );*/ + // make Controller known to SFX + new ScTabViewObj( this ); SetCurSubShell(OST_Cell); SvBorder aBorder; @@ -1939,9 +1940,11 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, SetZoomType( rAppOpt.GetZoomType() ); } - uno::Reference<frame::XFrame> xFrame = pViewFrame->GetFrame()->GetFrameInterface(); + /*uno::Reference<frame::XFrame> xFrame = pViewFrame->GetFrame()->GetFrameInterface(); if (xFrame.is()) - xFrame->setComponent( uno::Reference<awt::XWindow>(), new ScTabViewObj( this ) ); + xFrame->setComponent( uno::Reference<awt::XWindow>(), new ScTabViewObj( this ) );*/ + // make Controller known to SFX + new ScTabViewObj( this ); SetCurSubShell(OST_Cell); SvBorder aBorder; |