diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 14:51:59 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 14:51:59 +0000 |
| commit | 8b9403e99da95c4a38be4e8a739577dbe77d80d7 (patch) | |
| tree | 7d54293bdbb0ba0691220a1d4c976015ce64a8fb /sfx2 | |
| parent | 51ba61c238016d55134903cf2cab7a707da0aa54 (diff) | |
INTEGRATION: CWS fwk20 (1.35.88); FILE MERGED
2005/08/01 14:39:46 cd 1.35.88.1: #i49599# Docking window must float when OOo is running as embedded object in OLE container
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/dockwin.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 9bbfcbf82dd5..06ccb20d6ff2 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -4,9 +4,9 @@ * * $RCSfile: dockwin.cxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: rt $ $Date: 2005-09-07 18:17:14 $ + * last change: $Author: hr $ $Date: 2005-09-23 15:51:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -194,7 +194,7 @@ BOOL SfxDockingWindow::PrepareToggleFloatingMode() // Testen, ob das Workwindow gerade ein Andocken erlaubt SfxWorkWindow *pWorkWin = pBindings->GetWorkWindow_Impl(); - if ( !pWorkWin->IsDockingAllowed() ) + if ( !pWorkWin->IsDockingAllowed() || !pWorkWin->IsInternalDockingAllowed() ) return FALSE; } @@ -347,7 +347,8 @@ BOOL SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect ) return IsFloatingMode(); } - if ( pImp->bDockingPrevented ) + SfxWorkWindow *pWorkWin = pBindings->GetWorkWindow_Impl(); + if ( pImp->bDockingPrevented || !pWorkWin->IsInternalDockingAllowed() ) return FALSE; BOOL bFloatMode = FALSE; @@ -718,7 +719,7 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo) if ( GetAlignment() != SFX_ALIGN_NOALIGNMENT ) { // check if SfxWorkWindow is able to allow docking at its border - if ( !pWorkWin->IsDockingAllowed() || ( GetFloatStyle() & WB_STANDALONE ) + if ( !pWorkWin->IsDockingAllowed() || !pWorkWin->IsInternalDockingAllowed() || ( GetFloatStyle() & WB_STANDALONE ) && Application::IsInModalMode() ) SetAlignment( SFX_ALIGN_NOALIGNMENT ); } |