diff options
Diffstat (limited to 'sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx')
-rwxr-xr-x | sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index c1d742ce7158..5b0619faa695 100755 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -1,7 +1,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 @@ -146,7 +146,7 @@ public: sal_uInt32 mnEventCode; EventDescriptor ( - sal_uInt32 nEventType, + sal_uInt32 nEventType, const MouseEvent& rEvent, SlideSorter& rSlideSorter); EventDescriptor ( @@ -169,7 +169,7 @@ SelectionFunction::SelectionFunction ( mbProcessingMouseButtonDown(false), mpSubstitutionHandler(new SubstitutionHandler(mrSlideSorter)) { - //af aDelayToScrollTimer.SetTimeout(50); + //af aDelayToScrollTimer.SetTimeout(50); aDragTimer.SetTimeoutHdl( LINK( this, SelectionFunction, DragSlideHdl ) ); } @@ -230,7 +230,7 @@ BOOL SelectionFunction::MouseMove (const MouseEvent& rEvent) else aDragTimer.Stop(); } - + Rectangle aRectangle (Point(0,0),mpWindow->GetOutputSizePixel()); if ( ! aRectangle.IsInside(aMousePosition) && rOverlay.GetSubstitutionOverlay().isVisible()) @@ -238,7 +238,7 @@ BOOL SelectionFunction::MouseMove (const MouseEvent& rEvent) // Mouse left the window with pressed left button. Make it a drag. StartDrag(); } - else + else { // Call ProcessMouseEvent() only when one of the buttons is // pressed. This prevents calling the method on every motion. @@ -264,7 +264,7 @@ BOOL SelectionFunction::MouseButtonUp (const MouseEvent& rEvent) if (aDragTimer.IsActive()) aDragTimer.Stop(); - + ProcessMouseEvent(BUTTON_UP, rEvent); mbProcessingMouseButtonDown = false; @@ -372,7 +372,7 @@ BOOL SelectionFunction::KeyInput (const KeyEvent& rEvent) if (mrController.GetProperties()->IsUIReadOnly()) break; - int nSelectedPagesCount = 0; + int nSelectedPagesCount = 0; // Count the selected pages and look if there any objects on any // of the selected pages so that we can warn the user and @@ -397,7 +397,7 @@ BOOL SelectionFunction::KeyInput (const KeyEvent& rEvent) if (rEvent.GetKeyCode().IsShift()) ProcessKeyEvent(rEvent); break; - + default: break; } @@ -578,7 +578,7 @@ void SelectionFunction::ProcessRectangleSelection (bool bToggleSelection) PageSelector& rSelector (mrController.GetPageSelector()); rOverlay.GetSelectionRectangleOverlay().setVisible(false); - + // Select all pages whose page object lies completly inside the drag // rectangle. const Rectangle& rSelectionRectangle ( @@ -591,7 +591,7 @@ void SelectionFunction::ProcessRectangleSelection (bool bToggleSelection) model::SharedPageDescriptor pDescriptor (aPages.GetNextElement()); Rectangle aPageBox (mrSlideSorter.GetView().GetPageBoundingBox( pDescriptor, - view::SlideSorterView::CS_MODEL, + view::SlideSorterView::CS_MODEL, view::SlideSorterView::BBT_SHAPE)); if (rSelectionRectangle.IsOver(aPageBox)) { @@ -772,7 +772,7 @@ void SelectionFunction::ProcessKeyEvent (const KeyEvent& rEvent) // 1. Compute some frequently used values relating to the event. ::std::auto_ptr<EventDescriptor> pEventDescriptor ( new EventDescriptor(rEvent, mrSlideSorter)); - + // 2. Encode the event. pEventDescriptor->mnEventCode = EncodeKeyEvent(*pEventDescriptor, rEvent); @@ -903,7 +903,7 @@ bool SelectionFunction::EventProcessing (const EventDescriptor& rDescriptor) case BUTTON_UP | LEFT_BUTTON | SINGLE_CLICK | OVER_UNSELECTED_PAGE | CONTROL_MODIFIER: SelectHitPage(pHitDescriptor); PrepareMouseMotion(mpWindow->PixelToLogic(rDescriptor.maMousePosition)); - + break; // Range selection with the shift modifier. @@ -1089,7 +1089,7 @@ void SelectionFunction::SwitchView (const model::SharedPageDescriptor& rpDescrip //===== EventDescriptor ======================================================= SelectionFunction::EventDescriptor::EventDescriptor ( - sal_uInt32 nEventType, + sal_uInt32 nEventType, const MouseEvent& rEvent, SlideSorter& rSlideSorter) : maMousePosition(), |