diff options
Diffstat (limited to 'sd/source/ui/slidesorter/controller')
22 files changed, 149 insertions, 149 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index baccbfd51a1e..4dc825808c06 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.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 @@ -162,7 +162,7 @@ SlideSorterController::SlideSorterController (SlideSorter& rSlideSorter) void SlideSorterController::Init (void) { mrView.HandleModelChange(); - + mpCurrentSlideManager.reset(new CurrentSlideManager(mrSlideSorter)); mpPageSelector.reset(new PageSelector(mrSlideSorter)); mpFocusManager.reset(new FocusManager(mrSlideSorter)); @@ -353,7 +353,7 @@ bool SlideSorterController::Command ( bool bEventHasBeenHandled = false; ViewShell* pViewShell = mrSlideSorter.GetViewShell(); - + switch (rEvent.GetCommand()) { case COMMAND_CONTEXTMENU: @@ -495,7 +495,7 @@ void SlideSorterController::PreModelChange (void) if (mbPostModelChangePending) return; mbPreModelChangeDone = true; - + if (mrSlideSorter.GetViewShell() != NULL) mrSlideSorter.GetViewShell()->Broadcast( ViewShellHint(ViewShellHint::HINT_COMPLEX_MODEL_CHANGE_START)); @@ -598,7 +598,7 @@ IMPL_LINK(SlideSorterController, WindowEventHandler, VclWindowEvent*, pEvent) if (pActiveWindow != NULL) pActiveWindow->SetDrawMode(nDrawMode); mrView.HandleDrawModeChange(); - + // When the system font has changed a layout has to be done. mrView.Resize(); FontProvider::Instance().Invalidate(); @@ -628,7 +628,7 @@ void SlideSorterController::GetCtrlState (SfxItemSet& rSet) { pSlideViewFrame->GetSlotState (SID_RELOAD, NULL, &rSet); } - else // MI sagt: kein MDIFrame --> disablen + else // MI sagt: kein MDIFrame --> disablen { rSet.DisableItem(SID_RELOAD); } @@ -948,7 +948,7 @@ void SlideSorterController::SetDocumentSlides (const Reference<container::XIndex { ModelChangeLock aLock (*this); PreModelChange(); - + mrModel.SetDocumentSlides(rxSlides); mrView.Layout(); } diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx index 92853fddb7e6..67a06164c3b7 100644 --- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx +++ b/sd/source/ui/slidesorter/controller/SlsAnimator.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 @@ -128,7 +128,7 @@ bool Animator::ServeAnimations (void) void Animator::CleanUpAnimationList (void) { AnimationList aActiveAnimations; - + AnimationList::const_iterator iAnimation; for (iAnimation=maAnimations.begin(); iAnimation!=maAnimations.end(); ++iAnimation) { @@ -174,7 +174,7 @@ Animator::Animation::Animation ( maAnimation(mnValue); mnValue = mnDelta; - + } diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index 662ba4293c95..a15d10f67ecd 100644 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.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 @@ -228,7 +228,7 @@ sal_Int32 Clipboard::GetInsertionPosition (::Window* pWindow) // b) When the focus indicator is visible, then before or after the // focused page, depending on user input to a dialog. // c) When there is a selection but no focus, then after the - // selection. + // selection. // d) After the last page when there is no selection and no focus. view::InsertionIndicatorOverlay& rInsertionIndicatorOverlay ( @@ -269,18 +269,18 @@ sal_Int32 Clipboard::PasteTransferable (sal_Int32 nInsertPosition) { const List& rBookmarkList = pClipTransferable->GetPageBookmarks(); const SolarMutexGuard aGuard; - + nInsertPageCount = (USHORT) rBookmarkList.Count(); mrSlideSorter.GetModel().GetDocument()->InsertBookmarkAsPage( const_cast<List*>(&rBookmarkList), - NULL, - FALSE, - FALSE, - nInsertIndex, - FALSE, - pClipTransferable->GetPageDocShell(), - TRUE, - bMergeMasterPages, + NULL, + FALSE, + FALSE, + nInsertIndex, + FALSE, + pClipTransferable->GetPageDocShell(), + TRUE, + bMergeMasterPages, FALSE); } else @@ -289,23 +289,23 @@ sal_Int32 Clipboard::PasteTransferable (sal_Int32 nInsertPosition) DrawDocShell* pDataDocSh = (DrawDocShell*)pShell; SdDrawDocument* pDataDoc = pDataDocSh->GetDoc(); - if (pDataDoc!=NULL + if (pDataDoc!=NULL && pDataDoc->GetSdPageCount(PK_STANDARD)) { const SolarMutexGuard aGuard; - + bMergeMasterPages = (pDataDoc != mrSlideSorter.GetModel().GetDocument()); nInsertPageCount = pDataDoc->GetSdPageCount( PK_STANDARD ); mrSlideSorter.GetModel().GetDocument()->InsertBookmarkAsPage( - NULL, - NULL, - FALSE, - FALSE, + NULL, + NULL, + FALSE, + FALSE, nInsertIndex, - FALSE, - pDataDocSh, - TRUE, - bMergeMasterPages, + FALSE, + pDataDocSh, + TRUE, + bMergeMasterPages, FALSE); } } @@ -343,7 +343,7 @@ void Clipboard::SelectPageRange (sal_Int32 nFirstIndex, sal_Int32 nPageCount) void Clipboard::CreateSlideTransferable ( - ::Window* pWindow, + ::Window* pWindow, bool bDrag) { List aBookmarkList; @@ -395,7 +395,7 @@ void Clipboard::CreateSlideTransferable ( if (pViewShell != NULL) pActionWindow = pViewShell->GetActiveWindow(); } - + pTransferable->SetStartPos (pActionWindow->PixelToLogic( pActionWindow->GetPointerPosPixel())); pTransferable->SetObjectDescriptor (aObjDesc); @@ -455,8 +455,8 @@ void Clipboard::DragFinished (sal_Int8 nDropAction) // in the same document.) rSelector.DeselectAllPages(); PageList::iterator aDraggedPage; - for (aDraggedPage=maPagesToRemove.begin(); - aDraggedPage!=maPagesToRemove.end(); + for (aDraggedPage=maPagesToRemove.begin(); + aDraggedPage!=maPagesToRemove.end(); aDraggedPage++) { rSelector.SelectPage (*aDraggedPage); @@ -487,10 +487,10 @@ void Clipboard::SelectPages (void) sal_Int8 Clipboard::AcceptDrop ( - const AcceptDropEvent& rEvent, - DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow, - USHORT nPage, + const AcceptDropEvent& rEvent, + DropTargetHelper& rTargetHelper, + ::sd::Window* pTargetWindow, + USHORT nPage, USHORT nLayer) { sal_Int8 nResult = DND_ACTION_NONE; @@ -515,7 +515,7 @@ sal_Int8 Clipboard::AcceptDrop ( { nResult = DND_ACTION_COPY; } - + // Show the insertion marker and the substitution for a drop. Point aPosition = pTargetWindow->PixelToLogic (rEvent.maPosPixel); view::ViewOverlay& rOverlay (mrSlideSorter.GetView().GetOverlay()); @@ -549,10 +549,10 @@ sal_Int8 Clipboard::AcceptDrop ( sal_Int8 Clipboard::ExecuteDrop ( - const ExecuteDropEvent& rEvent, + const ExecuteDropEvent& rEvent, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow, - USHORT nPage, + ::sd::Window* pTargetWindow, + USHORT nPage, USHORT nLayer) { sal_Int8 nResult = DND_ACTION_NONE; @@ -564,14 +564,14 @@ sal_Int8 Clipboard::ExecuteDrop ( const SdTransferable* pDragTransferable = SD_MOD()->pTransferDrag; const Point aEventModelPosition ( pTargetWindow->PixelToLogic (rEvent.maPosPixel)); - long int nXOffset = labs (pDragTransferable->GetStartPos().X() + long int nXOffset = labs (pDragTransferable->GetStartPos().X() - aEventModelPosition.X()); - long int nYOffset = labs (pDragTransferable->GetStartPos().Y() + long int nYOffset = labs (pDragTransferable->GetStartPos().Y() - aEventModelPosition.Y()); - const bool bContinue = - ( pDragTransferable->GetView() != &mrSlideSorter.GetView() ) + const bool bContinue = + ( pDragTransferable->GetView() != &mrSlideSorter.GetView() ) || ( nXOffset >= 2 && nYOffset >= 2 ); - + // Get insertion position and then turn off the insertion indicator. view::ViewOverlay& rOverlay (mrSlideSorter.GetView().GetOverlay()); rOverlay.GetInsertionIndicatorOverlay().SetPosition( @@ -580,7 +580,7 @@ sal_Int8 Clipboard::ExecuteDrop ( OSL_TRACE ("Clipboard::AcceptDrop() called for index %d", nIndex); rOverlay.GetInsertionIndicatorOverlay().setVisible(false); - + if (bContinue) { SlideSorterController::ModelChangeLock aModelChangeLock (mrController); @@ -650,7 +650,7 @@ USHORT Clipboard::DetermineInsertPosition (const SdTransferable& ) // This is now converted that to an SdModel index that also starts with 1. if (nInsertionIndex >= 0) nInsertPosition = (USHORT)nInsertionIndex * 2 + 1; - + return nInsertPosition; } @@ -758,7 +758,7 @@ sal_Int8 Clipboard::ExecuteOrAcceptShapeDrop ( nPage, nLayer); break; - + case DC_EXECUTE: nResult = pDrawViewShell->ExecuteDrop( *reinterpret_cast<const ExecuteDropEvent*>(pDropEvent), diff --git a/sd/source/ui/slidesorter/controller/SlsCommand.hxx b/sd/source/ui/slidesorter/controller/SlsCommand.hxx index 7198e0a2b211..d6dee9911742 100644 --- a/sd/source/ui/slidesorter/controller/SlsCommand.hxx +++ b/sd/source/ui/slidesorter/controller/SlsCommand.hxx @@ -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 diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx index 0f9cb1b1becb..546d25906a72 100644 --- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.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 diff --git a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx index 83f34270c1b3..4e6af1de67ed 100644 --- a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsFocusManager.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 @@ -85,7 +85,7 @@ void FocusManager::MoveFocus (FocusMoveDirection eDirection) SetFocusToToolBox(); } break; - + case FMD_RIGHT: mnPageIndex += 1; if (mnPageIndex >= mrSlideSorter.GetModel().GetPageCount()) @@ -108,7 +108,7 @@ void FocusManager::MoveFocus (FocusMoveDirection eDirection) if (nCandidateColumn > nColumn) mnPageIndex = nCandidate - (nCandidateColumn-nColumn); else if (nCandidateColumn < nColumn) - mnPageIndex = nCandidate + mnPageIndex = nCandidate - nColumnCount + (nColumn - nCandidateColumn); else @@ -330,9 +330,9 @@ void FocusManager::NotifyFocusChangeListeners (void) const { // Create a copy of the listener list to be safe when that is modified. ::std::vector<Link> aListeners (maFocusChangeListeners); - + // Tell the slection change listeners that the selection has changed. - ::std::vector<Link>::iterator iListener (aListeners.begin()); + ::std::vector<Link>::iterator iListener (aListeners.begin()); ::std::vector<Link>::iterator iEnd (aListeners.end()); for (; iListener!=iEnd; ++iListener) { diff --git a/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx b/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx index 46917e48c1c2..8f776432738f 100644 --- a/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.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 @@ -85,7 +85,7 @@ void HideSlideFunction::DoExecute (SfxRequest& rRequest) model::PageEnumeration aSelectedPages ( model::PageEnumerationProvider::CreateSelectedPagesEnumeration(mrSlideSorter.GetModel())); - + ExclusionState eState (UNDEFINED); switch (rRequest.GetSlot()) @@ -144,14 +144,14 @@ HideSlideFunction::ExclusionState HideSlideFunction::GetExclusionState ( break; case EXCLUDED: - // The pages before where all not part of the show, + // The pages before where all not part of the show, // this one is. if ( ! bState) eState = MIXED; break; case INCLUDED: - // The pages before where all part of the show, + // The pages before where all part of the show, // this one is not. if (bState) eState = MIXED; diff --git a/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.hxx b/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.hxx index 6bdf37e4c249..9fb32c2c088f 100644 --- a/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.hxx +++ b/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.hxx @@ -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 @@ -40,14 +40,14 @@ namespace sd { namespace slidesorter { namespace controller { hidden. When all selected pages have the same state this state is toggled for all of them */ -class HideSlideFunction +class HideSlideFunction : public SlideFunction { public: TYPEINFO(); virtual ~HideSlideFunction (void); - + static FunctionReference Create( SlideSorter& rSlideSorter, SfxRequest& rRequest ); virtual void DoExecute( SfxRequest& rReq ); @@ -59,7 +59,7 @@ public: excluded from the slide show. */ static ExclusionState GetExclusionState (model::PageEnumeration& rPageSet); - + protected: HideSlideFunction ( SlideSorter& rSlideSorter, diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index 176dd8a9fc8a..c3b470143303 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.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,7 +130,7 @@ Listener::Listener ( { StartListening (*pMainViewShell); } - + Link aLink (LINK(this, Listener, EventMultiplexerCallback)); mpBase->GetEventMultiplexer()->AddEventListener( aLink, @@ -213,13 +213,13 @@ void Listener::ReleaseListeners (void) void Listener::ConnectToController (void) { ViewShell* pShell = mrSlideSorter.GetViewShell(); - + // Register at the controller of the main view shell (if we are that not // ourself). if (pShell==NULL || ! pShell->IsMainViewShell()) { Reference<frame::XController> xController (mrSlideSorter.GetXController()); - + // Listen to changes of certain properties. Reference<beans::XPropertySet> xSet (xController, UNO_QUERY); if (xSet.is()) @@ -270,10 +270,10 @@ void Listener::DisconnectFromController (void) if (xSet.is()) { xSet->removePropertyChangeListener ( - String::CreateFromAscii("CurrentPage"), + String::CreateFromAscii("CurrentPage"), this); xSet->removePropertyChangeListener ( - String::CreateFromAscii("IsMasterPageMode"), + String::CreateFromAscii("IsMasterPageMode"), this); } @@ -372,11 +372,11 @@ IMPL_LINK(Listener, EventMultiplexerCallback, ::sd::tools::EventMultiplexerEvent } break; - + case tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED: mbIsMainViewChangePending = true; break; - + case tools::EventMultiplexerEvent::EID_CONFIGURATION_UPDATED: if (mbIsMainViewChangePending && mpBase != NULL) { @@ -398,7 +398,7 @@ IMPL_LINK(Listener, EventMultiplexerCallback, ::sd::tools::EventMultiplexerEvent } break; - + case tools::EventMultiplexerEvent::EID_CONTROLLER_DETACHED: DisconnectFromController(); break; @@ -421,7 +421,7 @@ void SAL_CALL Listener::disposing ( { if ((mbListeningToDocument || mbListeningToUNODocument) && mrSlideSorter.GetModel().GetDocument()!=NULL - && rEventObject.Source + && rEventObject.Source == mrSlideSorter.GetModel().GetDocument()->getUnoModel()) { mbListeningToDocument = false; diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx index 23faf53128b5..3a9f511d05b6 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.hxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx @@ -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 @@ -58,7 +58,7 @@ class SlideSorter; namespace sd { namespace slidesorter { namespace controller { -typedef cppu::WeakComponentImplHelper4< +typedef cppu::WeakComponentImplHelper4< ::com::sun::star::document::XEventListener, ::com::sun::star::beans::XPropertyChangeListener, ::com::sun::star::accessibility::XAccessibleEventListener, @@ -105,7 +105,7 @@ public: const SfxHint& rHint); //===== lang::XEventListener ============================================ - virtual void SAL_CALL + virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& rEventObject) throw (::com::sun::star::uno::RuntimeException); @@ -117,7 +117,7 @@ public: throw (::com::sun::star::uno::RuntimeException); //===== beans::XPropertySetListener ===================================== - virtual void SAL_CALL + virtual void SAL_CALL propertyChange ( const com::sun::star::beans::PropertyChangeEvent& rEvent) throw (::com::sun::star::uno::RuntimeException); @@ -125,7 +125,7 @@ public: //===== accessibility::XAccessibleEventListener ========================== virtual void SAL_CALL notifyEvent ( - const ::com::sun::star::accessibility::AccessibleEventObject& + const ::com::sun::star::accessibility::AccessibleEventObject& rEvent) throw (::com::sun::star::uno::RuntimeException); @@ -134,7 +134,7 @@ public: frame it is listening to. This usually happens when the view shell in the center pane is replaced by another view shell. */ - virtual void SAL_CALL + virtual void SAL_CALL frameAction (const ::com::sun::star::frame::FrameActionEvent& rEvent) throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/slidesorter/controller/SlsPageObjectFactory.cxx b/sd/source/ui/slidesorter/controller/SlsPageObjectFactory.cxx index 726371d6ea7d..7e49d884bedf 100644 --- a/sd/source/ui/slidesorter/controller/SlsPageObjectFactory.cxx +++ b/sd/source/ui/slidesorter/controller/SlsPageObjectFactory.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 @@ -72,26 +72,26 @@ view::PageObject* PageObjectFactory::CreatePageObject ( -::sdr::contact::ViewContact* +::sdr::contact::ViewContact* PageObjectFactory::CreateViewContact ( view::PageObject* pPageObject, const model::SharedPageDescriptor& rpDescriptor) const { return new view::PageObjectViewContact ( - *pPageObject, + *pPageObject, rpDescriptor); } -::sdr::contact::ViewObjectContact* +::sdr::contact::ViewObjectContact* PageObjectFactory::CreateViewObjectContact ( ::sdr::contact::ObjectContact& rObjectContact, ::sdr::contact::ViewContact& rViewContact) const { return new view::PageObjectViewObjectContact ( - rObjectContact, + rObjectContact, rViewContact, mpPageCache, mpProperties); diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx index 30b1db5998fa..52c5b3d54de7 100644 --- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx +++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.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 @@ -85,7 +85,7 @@ void PageSelector::DeselectAllPages (void) int nPageCount = mrModel.GetPageCount(); for (int nPageIndex=0; nPageIndex<nPageCount; nPageIndex++) DeselectPage (nPageIndex); - DBG_ASSERT (mnSelectedPageCount==0, + DBG_ASSERT (mnSelectedPageCount==0, "PageSelector::DeselectAllPages: the selected pages counter is not 0"); mnSelectedPageCount = 0; mpMostRecentlySelectedPage.reset(); diff --git a/sd/source/ui/slidesorter/controller/SlsProperties.cxx b/sd/source/ui/slidesorter/controller/SlsProperties.cxx index 02168ca4eb2d..1dedfe74b8d9 100644 --- a/sd/source/ui/slidesorter/controller/SlsProperties.cxx +++ b/sd/source/ui/slidesorter/controller/SlsProperties.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 diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx index 0785f786366f..70dad4a5c8ee 100644 --- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.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 @@ -95,13 +95,13 @@ void ScrollBarManager::Connect (void) mpVerticalScrollBar->SetScrollHdl ( LINK( this, - ScrollBarManager, + ScrollBarManager, VerticalScrollBarHandler)); if (mpHorizontalScrollBar != NULL) mpHorizontalScrollBar->SetScrollHdl ( LINK( this, - ScrollBarManager, + ScrollBarManager, HorizontalScrollBarHandler)); } @@ -121,14 +121,14 @@ void ScrollBarManager::Disconnect (void) /** Placing the scroll bars is an iterative process. The visibility of one scroll bar affects the remaining size and thus may lead to the other - scroll bar becoming visible. + scroll bar becoming visible. First we determine the visibility of the horizontal scroll bar. After that we do the same for the vertical scroll bar. To have an initial value for the required size we call the layouter before that. When one of the two scroll bars is made visible then the size of the browser window changes and a second call to the layouter becomes necessary. - That call is made anyway after this method returns. + That call is made anyway after this method returns. */ Rectangle ScrollBarManager::PlaceScrollBars (const Rectangle& rAvailableArea) { @@ -155,11 +155,11 @@ void ScrollBarManager::PlaceHorizontalScrollBar (const Rectangle& aAvailableArea // Place the scroll bar. Size aScrollBarSize (mpHorizontalScrollBar->GetSizePixel()); mpHorizontalScrollBar->SetPosSizePixel ( - Point(aAvailableArea.Left(), + Point(aAvailableArea.Left(), aAvailableArea.Bottom()-aScrollBarSize.Height()+1), - Size (aAvailableArea.GetWidth() - GetVerticalScrollBarWidth(), + Size (aAvailableArea.GetWidth() - GetVerticalScrollBarWidth(), aScrollBarSize.Height())); - + // Restore the relative position. mpHorizontalScrollBar->SetThumbPos( (long)(0.5 + mnHorizontalPosition * mpHorizontalScrollBar->GetRange().Len())); @@ -168,13 +168,13 @@ void ScrollBarManager::PlaceHorizontalScrollBar (const Rectangle& aAvailableArea - + void ScrollBarManager::PlaceVerticalScrollBar (const Rectangle& aArea) { if (mpVerticalScrollBar != NULL && mpVerticalScrollBar->IsVisible()) { - view::Layouter::DoublePoint aLayouterPosition + view::Layouter::DoublePoint aLayouterPosition = mrSlideSorter.GetView().GetLayouter().ConvertModelToLayouterCoordinates ( Point (0, mpVerticalScrollBar->GetThumbPos())); @@ -239,10 +239,10 @@ void ScrollBarManager::UpdateScrollBars (bool bResetThumbPosition, bool bUseScro mnHorizontalPosition = 0; } else - mnHorizontalPosition = + mnHorizontalPosition = double(mpHorizontalScrollBar->GetThumbPos()) / double(mpHorizontalScrollBar->GetRange().Len()); - + mpHorizontalScrollBar->SetVisibleSize (aWindowModelSize.Width()); const long nWidth (mpContentWindow->PixelToLogic( @@ -268,10 +268,10 @@ void ScrollBarManager::UpdateScrollBars (bool bResetThumbPosition, bool bUseScro mnVerticalPosition = 0; } else - mnVerticalPosition = + mnVerticalPosition = double(mpVerticalScrollBar->GetThumbPos()) / double(mpVerticalScrollBar->GetRange().Len()); - + mpVerticalScrollBar->SetVisibleSize (aWindowModelSize.Height()); const long nHeight (mpContentWindow->PixelToLogic( @@ -313,7 +313,7 @@ IMPL_LINK(ScrollBarManager, VerticalScrollBarHandler, ScrollBar*, pScrollBar) / double(pScrollBar->GetRange().Len()); mrSlideSorter.GetView().InvalidatePageObjectVisibilities(); mrSlideSorter.GetView().GetWindow()->SetVisibleXY ( - -1, + -1, nRelativePosition); } return TRUE; @@ -324,7 +324,7 @@ IMPL_LINK(ScrollBarManager, VerticalScrollBarHandler, ScrollBar*, pScrollBar) IMPL_LINK(ScrollBarManager, HorizontalScrollBarHandler, ScrollBar*, pScrollBar) { - if (pScrollBar!=NULL + if (pScrollBar!=NULL && pScrollBar==mpHorizontalScrollBar.get() && pScrollBar->IsVisible() && mrSlideSorter.GetView().GetWindow()!=NULL) @@ -542,15 +542,15 @@ void ScrollBarManager::CalcAutoScrollOffset (const Point& rMouseWindowPosition) if (rMouseWindowPosition.X() < maScrollBorder.Width() && aWindowArea.Left() > aViewPixelArea.Left()) { - nDx = -1 + (int)(mnHorizontalScrollFactor + nDx = -1 + (int)(mnHorizontalScrollFactor * (rMouseWindowPosition.X() - maScrollBorder.Width())); } if (rMouseWindowPosition.X() >= (aWindowSize.Width() - maScrollBorder.Width()) && aWindowArea.Right() < aViewPixelArea.Right()) { - nDx = 1 + (int)(mnHorizontalScrollFactor - * (rMouseWindowPosition.X() - aWindowSize.Width() + nDx = 1 + (int)(mnHorizontalScrollFactor + * (rMouseWindowPosition.X() - aWindowSize.Width() + maScrollBorder.Width())); } } @@ -561,15 +561,15 @@ void ScrollBarManager::CalcAutoScrollOffset (const Point& rMouseWindowPosition) if (rMouseWindowPosition.Y() < maScrollBorder.Height() && aWindowArea.Top() > aViewPixelArea.Top()) { - nDy = -1 + (int)(mnVerticalScrollFactor + nDy = -1 + (int)(mnVerticalScrollFactor * (rMouseWindowPosition.Y() - maScrollBorder.Height())); } if (rMouseWindowPosition.Y() >= (aWindowSize.Height() - maScrollBorder.Height()) && aWindowArea.Bottom() < aViewPixelArea.Bottom()) { - nDy = 1 + (int)(mnVerticalScrollFactor - * (rMouseWindowPosition.Y() - aWindowSize.Height() + nDy = 1 + (int)(mnVerticalScrollFactor + * (rMouseWindowPosition.Y() - aWindowSize.Height() + maScrollBorder.Height())); } } @@ -609,7 +609,7 @@ bool ScrollBarManager::RepeatAutoScroll (void) if (mrSlideSorter.GetViewShell() != NULL) { mrSlideSorter.GetViewShell()->ScrollLines( - maAutoScrollOffset.Width(), + maAutoScrollOffset.Width(), maAutoScrollOffset.Height()); return true; } diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx index 905c3c3a7557..a6228a75df21 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.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 @@ -68,10 +68,10 @@ void SelectionCommand::operator() (void) OSL_ASSERT(mpCurrentSlideManager.get()!=NULL); mrPageSelector.DeselectAllPages(); - + if (mnCurrentPageIndex >= 0) mpCurrentSlideManager->SwitchCurrentSlide(mnCurrentPageIndex); - + PageList::iterator iPage = maPagesToSelect.begin(); PageList::iterator iEnd = maPagesToSelect.end(); for (; iPage!=iEnd; ++iPage) diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx index 8ca7f727ffa1..e42138a4f813 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx @@ -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 diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index c55e3dcc38b0..1a4f14be656c 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.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 @@ -147,7 +147,7 @@ public: sal_uInt32 mnEventCode; EventDescriptor ( - sal_uInt32 nEventType, + sal_uInt32 nEventType, const MouseEvent& rEvent, SlideSorter& rSlideSorter); EventDescriptor ( @@ -170,7 +170,7 @@ SelectionFunction::SelectionFunction ( mbProcessingMouseButtonDown(false), mpSubstitutionHandler(new SubstitutionHandler(mrSlideSorter)) { - //af aDelayToScrollTimer.SetTimeout(50); + //af aDelayToScrollTimer.SetTimeout(50); aDragTimer.SetTimeoutHdl( LINK( this, SelectionFunction, DragSlideHdl ) ); } @@ -231,7 +231,7 @@ BOOL SelectionFunction::MouseMove (const MouseEvent& rEvent) else aDragTimer.Stop(); } - + Rectangle aRectangle (Point(0,0),mpWindow->GetOutputSizePixel()); if ( ! aRectangle.IsInside(aMousePosition) && rOverlay.GetSubstitutionOverlay().isVisible()) @@ -239,7 +239,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. @@ -265,7 +265,7 @@ BOOL SelectionFunction::MouseButtonUp (const MouseEvent& rEvent) if (aDragTimer.IsActive()) aDragTimer.Stop(); - + ProcessMouseEvent(BUTTON_UP, rEvent); mbProcessingMouseButtonDown = false; @@ -373,7 +373,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 @@ -398,7 +398,7 @@ BOOL SelectionFunction::KeyInput (const KeyEvent& rEvent) if (rEvent.GetKeyCode().IsShift()) ProcessKeyEvent(rEvent); break; - + default: break; } @@ -579,7 +579,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 ( @@ -592,7 +592,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)) { @@ -773,7 +773,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); @@ -904,7 +904,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. @@ -1090,7 +1090,7 @@ void SelectionFunction::SwitchView (const model::SharedPageDescriptor& rpDescrip //===== EventDescriptor ======================================================= SelectionFunction::EventDescriptor::EventDescriptor ( - sal_uInt32 nEventType, + sal_uInt32 nEventType, const MouseEvent& rEvent, SlideSorter& rSlideSorter) : maMousePosition(), diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx index e42bc19bb3cf..77e39f48156b 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.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 diff --git a/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx index fdcb02f35946..800586e3a1ef 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlideFunction.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 @@ -47,7 +47,7 @@ SlideFunction::SlideFunction ( SfxRequest& rRequest) : FuPoor ( rSlideSorter.GetViewShell(), - rSlideSorter.GetView().GetWindow(), + rSlideSorter.GetView().GetWindow(), &rSlideSorter.GetView(), rSlideSorter.GetModel().GetDocument(), rRequest) diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index fd90023c6b92..6fb08e4e24f7 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.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 @@ -293,7 +293,7 @@ void SlotManager::FuPermanent (SfxRequest& rRequest) } //! das ist nur bis das ENUM-Slots sind - // Invalidate( SID_OBJECT_SELECT ); + // Invalidate( SID_OBJECT_SELECT ); } void SlotManager::FuSupport (SfxRequest& rRequest) @@ -615,7 +615,7 @@ void SlotManager::GetMenuState ( SfxItemSet& rSet) break; } } - + PageKind ePageKind = mrSlideSorter.GetModel().GetPageType(); if( (eEditMode == EM_MASTERPAGE) && (ePageKind != PK_HANDOUT ) ) { @@ -760,10 +760,10 @@ void SlotManager::GetStatusBarState (SfxItemSet& rSet) if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_STATUS_PAGE ) || SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_STATUS_LAYOUT ) ) */ - SdPage* pPage = NULL; + SdPage* pPage = NULL; SdPage* pFirstPage = NULL; - USHORT nFirstPage; - USHORT nSelectedPages = (USHORT)mrSlideSorter.GetController().GetPageSelector().GetSelectedPageCount(); + USHORT nFirstPage; + USHORT nSelectedPages = (USHORT)mrSlideSorter.GetController().GetPageSelector().GetSelectedPageCount(); String aPageStr; String aLayoutStr; @@ -1025,7 +1025,7 @@ void SlotManager::InsertSlide (SfxRequest& rRequest) = mrSlideSorter.GetController().GetSelectionManager()->GetInsertionPosition() - 1; rSelector.SelectPage(nInsertionIndex); } - + // Select the last page when there is at least one page. else if (rSelector.GetPageCount() > 0) { diff --git a/sd/source/ui/slidesorter/controller/SlsTransferable.cxx b/sd/source/ui/slidesorter/controller/SlsTransferable.cxx index d39033ab67a5..a2da21e383d8 100644 --- a/sd/source/ui/slidesorter/controller/SlsTransferable.cxx +++ b/sd/source/ui/slidesorter/controller/SlsTransferable.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 @@ -37,8 +37,8 @@ namespace sd { namespace slidesorter { namespace controller { Transferable::Transferable ( - SdDrawDocument* pSrcDoc, - ::sd::View* pWorkView, + SdDrawDocument* pSrcDoc, + ::sd::View* pWorkView, BOOL bInitOnGetData, SlideSorterViewShell* pViewShell) : SdTransferable (pSrcDoc, pWorkView, bInitOnGetData), diff --git a/sd/source/ui/slidesorter/controller/SlsTransferable.hxx b/sd/source/ui/slidesorter/controller/SlsTransferable.hxx index 84b522b5a3b7..1cf448511b9e 100644 --- a/sd/source/ui/slidesorter/controller/SlsTransferable.hxx +++ b/sd/source/ui/slidesorter/controller/SlsTransferable.hxx @@ -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 @@ -32,10 +32,10 @@ #include "sdxfer.hxx" class SdDrawDocument; -namespace sd +namespace sd { class pWorkView; - namespace slidesorter + namespace slidesorter { class SlideSorterViewShell; } @@ -49,10 +49,10 @@ namespace sd { namespace slidesorter { namespace controller { class Transferable : public SdTransferable { -public: +public: Transferable ( - SdDrawDocument* pSrcDoc, - ::sd::View* pWorkView, + SdDrawDocument* pSrcDoc, + ::sd::View* pWorkView, BOOL bInitOnGetData, SlideSorterViewShell* pViewShell); |