INTEGRATION: CWS components1 (1.12.38); FILE MERGED
2007/01/31 13:52:30 af 1.12.38.1: #i68075# UpdateLockManager stored as shared_ptr.
This commit is contained in:
parent
754fec534e
commit
688e70e905
1 changed files with 4 additions and 4 deletions
|
@ -4,9 +4,9 @@
|
|||
*
|
||||
* $RCSfile: SlsViewOverlay.cxx,v $
|
||||
*
|
||||
* $Revision: 1.12 $
|
||||
* $Revision: 1.13 $
|
||||
*
|
||||
* last change: $Author: kz $ $Date: 2006-12-12 18:39:08 $
|
||||
* last change: $Author: rt $ $Date: 2007-04-03 16:19:27 $
|
||||
*
|
||||
* The Contents of this file are made available subject to
|
||||
* the terms of GNU Lesser General Public License Version 2.1.
|
||||
|
@ -615,7 +615,7 @@ void MouseOverIndicatorOverlay::SetSlideUnderMouse (
|
|||
const model::SharedPageDescriptor& rpDescriptor)
|
||||
{
|
||||
SlideSorterViewShell& rViewShell (mrViewOverlay.GetViewShell());
|
||||
if ( ! rViewShell.GetViewShellBase().GetUpdateLockManager().IsLocked())
|
||||
if ( ! rViewShell.GetViewShellBase().GetUpdateLockManager()->IsLocked())
|
||||
{
|
||||
model::SharedPageDescriptor pDescriptor;
|
||||
if ( ! mpPageUnderMouse.expired())
|
||||
|
@ -657,7 +657,7 @@ void MouseOverIndicatorOverlay::Paint (void)
|
|||
if (pDescriptor.get() != NULL)
|
||||
{
|
||||
SlideSorterViewShell& rViewShell (mrViewOverlay.GetViewShell());
|
||||
if ( ! rViewShell.GetViewShellBase().GetUpdateLockManager().IsLocked())
|
||||
if ( ! rViewShell.GetViewShellBase().GetUpdateLockManager()->IsLocked())
|
||||
{
|
||||
SlideSorterView& rView (rViewShell.GetSlideSorterController().GetView());
|
||||
OutputDevice* pDevice = rView.GetWindow();
|
||||
|
|
Loading…
Reference in a new issue