strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS impress38 (1.64.30); FILE MERGED

Browse source 
2005/03/20 16:07:17 af 1.64.30.1: #i45568# Ignoring calls to Activate()/Deactivate() when updates are locked.
This commit is contained in:
Rüdiger Timm 2005-03-30 08:28:04 +00:00
parent 7e8eb14c83
commit 858d8d4853
1 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
sd/source/ui/view/outlnvsh.cxx
View file

@ -2,9 +2,9 @@
* *
* $RCSfile: outlnvsh.cxx,v $ * $RCSfile: outlnvsh.cxx,v $
* *
* $Revision: 1.65 $ * $Revision: 1.66 $
* *
* last change: $Author: vg $ $Date: 2005-03-23 14:05:25 $ * last change: $Author: rt $ $Date: 2005-03-30 09:28:04 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -205,6 +205,7 @@
#ifndef SD_VIEW_SHELL_BASE_HXX #ifndef SD_VIEW_SHELL_BASE_HXX
#include "ViewShellBase.hxx" #include "ViewShellBase.hxx"
#endif #endif
#include "UpdateLockManager.hxx"
using namespace ::rtl; using namespace ::rtl;
using namespace ::com::sun::star; using namespace ::com::sun::star;
@ -552,15 +553,18 @@ void OutlineViewShell::RemoveWindow (::sd::Window* pWin)
\************************************************************************/ \************************************************************************/
void OutlineViewShell::Activate( BOOL bIsMDIActivate ) void OutlineViewShell::Activate( BOOL bIsMDIActivate )
{ {
ViewShell::Activate( bIsMDIActivate ); if ( ! GetViewShellBase().GetUpdateLockManager().IsLocked())
pOlView->SetLinks();
pOlView->ConnectToApplication();
if( bIsMDIActivate )
{ {
OutlinerView* pOutlinerView = pOlView->GetViewByWindow( GetActiveWindow() ); ViewShell::Activate( bIsMDIActivate );
::Outliner* pOutl = pOutlinerView->GetOutliner(); pOlView->SetLinks();
pOutl->UpdateFields(); pOlView->ConnectToApplication();
if( bIsMDIActivate )
{
OutlinerView* pOutlinerView = pOlView->GetViewByWindow( GetActiveWindow() );
::Outliner* pOutl = pOutlinerView->GetOutliner();
pOutl->UpdateFields();
}
} }
} }
@ -571,13 +575,16 @@ void OutlineViewShell::Activate( BOOL bIsMDIActivate )
\************************************************************************/ \************************************************************************/
void OutlineViewShell::Deactivate( BOOL bIsMDIActivate ) void OutlineViewShell::Deactivate( BOOL bIsMDIActivate )
{ {
pOlView->DisconnectFromApplication(); if ( ! GetViewShellBase().GetUpdateLockManager().IsLocked())
{
pOlView->DisconnectFromApplication();
// #96416# Links must be kept also on deactivated viewshell, to allow drag'n'drop // #96416# Links must be kept also on deactivated viewshell, to allow drag'n'drop
// to function properly // to function properly
// pOlView->ResetLinks(); // pOlView->ResetLinks();
ViewShell::Deactivate( bIsMDIActivate ); ViewShell::Deactivate( bIsMDIActivate );
}
} }
/************************************************************************* /*************************************************************************