diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:12:08 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:12:08 +0200 |
| commit | 49ac1b530b440d4fa3ec0bff9cd3d4e70bef838a (patch) | |
| tree | d432fa8e42251e69e95f7d56cca7fc1b03f18f2c /sd/source/ui/func/fudraw.cxx | |
| parent | 315eec9e4dbdd27063f4b970c25e9c719e86bcd8 (diff) | |
recreated tag libreoffice-3.3.3.1 which had these commits:
commit a74d3413eb0220f6c35f38a8ce955098b9fb6eb6 (tag: refs/tags/libreoffice-3.3.3.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue May 31 17:39:06 2011 +0200
Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1)
commit 64665cb6c5b6ace06e81d3c98c424b6cf2beb49c
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue May 31 16:35:37 2011 +0200
Remove extra bracket to fix build
build breakage added by the previous commit
sd/source/filter/eppt/pptx-epptbase.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 9dd7ef585a463bafa8750e5b30acb38949bbf1ce
Author: Tor Lillqvist <tlillqvist@novell.com>
Date: Fri May 20 11:00:26 2011 +0300
Add sanity check before dereference, bnc#694119
Signed-off-by: Petr Mladek <pmladek@suse.cz>
sd/source/filter/eppt/pptx-epptbase.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit d53f1f6ee9f02d3d77c76910023986f7f346fc30
Author: Caolán McNamara <caolanm@redhat.com>
Date: Fri Mar 18 13:19:59 2011 +0100
Fix fdo#33947 crash in Impress after printing
Fixes lifetime issue with DrawViewShell - solved by not handing
one in to the print preview DocumentRenderer
Signed-off-by: Thorsten Behrens <tbehrens@novell.com>
sd/source/ui/view/DocumentRenderer.cxx | 2 +-
sd/source/ui/view/drawview.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Notes
split repo tag: impress_libreoffice-3.3.3.1
split repo tag: impress_libreoffice-3.3.4.1
Diffstat (limited to 'sd/source/ui/func/fudraw.cxx')
| -rw-r--r-- | sd/source/ui/func/fudraw.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 5caaf842aa41..d4217eee6918 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -130,8 +130,8 @@ BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt) { FrameView* pFrameView = mpViewShell->GetFrameView(); -// BOOL bOrtho = mpView->IsOrthoDesired() || pFrameView->IsOrtho(); -// bOrtho = bOrtho != rMEvt.IsShift(); +// BOOL bOrtho = mpView->IsOrthoDesired() || pFrameView->IsOrtho(); +// bOrtho = bOrtho != rMEvt.IsShift(); BOOL bOrtho = FALSE; BOOL bRestricted = TRUE; @@ -252,8 +252,8 @@ BOOL FuDraw::MouseMove(const MouseEvent& rMEvt) FrameView* pFrameView = mpViewShell->GetFrameView(); Point aPos = mpWindow->PixelToLogic( rMEvt.GetPosPixel() ); -// BOOL bOrtho = mpView->IsOrthoDesired() || pFrameView->IsOrtho(); -// bOrtho = bOrtho != rMEvt.IsShift(); +// BOOL bOrtho = mpView->IsOrthoDesired() || pFrameView->IsOrtho(); +// bOrtho = bOrtho != rMEvt.IsShift(); BOOL bOrtho = FALSE; BOOL bRestricted = TRUE; @@ -688,8 +688,8 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) { UINT16 nSdrObjKind = aVEvt.pObj->GetObjIdentifier(); - if ( nSdrObjKind != OBJ_TEXT && - nSdrObjKind != OBJ_TITLETEXT && + if ( nSdrObjKind != OBJ_TEXT && + nSdrObjKind != OBJ_TITLETEXT && nSdrObjKind != OBJ_OUTLINETEXT && aVEvt.pObj->IsEmptyPresObj() ) { @@ -785,8 +785,8 @@ BOOL FuDraw::SetPointer(SdrObject* pObj, const Point& rPos) || (mpView->ISA(DrawView) && SlideShow::IsRunning( mpViewShell->GetViewShellBase() ) && - (pInfo->meClickAction == presentation::ClickAction_VANISH || - pInfo->meClickAction == presentation::ClickAction_INVISIBLE || + (pInfo->meClickAction == presentation::ClickAction_VANISH || + pInfo->meClickAction == presentation::ClickAction_INVISIBLE || pInfo->meClickAction == presentation::ClickAction_STOPPRESENTATION || (pInfo->mbActive && ( pInfo->meEffect != presentation::AnimationEffect_NONE || |