diff options
Diffstat (limited to 'sd/source/ui/slidesorter/inc')
29 files changed, 97 insertions, 97 deletions
diff --git a/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx b/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx index de5fec6dadd8..fe70b2461658 100644 --- a/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx +++ b/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.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/inc/cache/SlsPageCache.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx index 0eadb8beec1c..95d9bf1be815 100644 --- a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx +++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.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/inc/cache/SlsPageCacheManager.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx index a3150ff65df5..2416c99295b0 100644 --- a/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx +++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.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 @@ -92,7 +92,7 @@ public: /** This is an information to the cache manager that the size of preview bitmaps in the specified cache has changed. - + */ ::boost::shared_ptr<Cache> ChangeSize ( const ::boost::shared_ptr<Cache>& rpCache, @@ -135,7 +135,7 @@ private: slide sorter. */ const sal_uInt32 mnMaximalRecentlyCacheCount; - + PageCacheManager (void); ~PageCacheManager (void); diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx index be2f09b58f73..4c7c8ac8edf5 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.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 @@ -79,7 +79,7 @@ public: */ SlideSorterController (SlideSorter& rSlideSorter); - /** Late initialization. Call this method once a new new object has been + /** Late initialization. Call this method once a new new object has been created. */ virtual void Init (void); @@ -139,7 +139,7 @@ public: void FuPermanent (SfxRequest& rRequest); void FuSupport (SfxRequest& rRequest); bool Command ( - const CommandEvent& rEvent, + const CommandEvent& rEvent, ::sd::Window* pWindow); void GetCtrlState (SfxItemSet &rSet); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx index 3fa16dee7f65..75660b90f174 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.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/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx index a475b7a7166b..20d0e788f31e 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.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 @@ -85,16 +85,16 @@ public: sal_Int8 AcceptDrop ( const AcceptDropEvent& rEvt, - DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, + DropTargetHelper& rTargetHelper, + ::sd::Window* pTargetWindow = NULL, + USHORT nPage = SDRPAGE_NOTFOUND, USHORT nLayer = SDRPAGE_NOTFOUND ); sal_Int8 ExecuteDrop ( - const ExecuteDropEvent& rEvt, + const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, + ::sd::Window* pTargetWindow = NULL, + USHORT nPage = SDRPAGE_NOTFOUND, USHORT nLayer = SDRPAGE_NOTFOUND); protected: @@ -129,7 +129,7 @@ private: bool mbUpdateSelectionPending; void CreateSlideTransferable ( - ::Window* pWindow, + ::Window* pWindow, bool bDrag); /** Select the pages stored in the maPagesToSelect member. The list in diff --git a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx index 6bc502be4768..769cb2372cca 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.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 @@ -75,7 +75,7 @@ public: /** Release all references to model data. */ void PrepareModelChange (void); - + /** Modify inner state in reaction to a change of the SlideSorterModel. */ void HandleModelChange (void); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx index 9a3df93f5f96..f647f914e318 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.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 @@ -48,7 +48,7 @@ namespace sd { namespace slidesorter { namespace controller { focused state of the focus page can be toggled with the ToggleFocus() method. */ -class FocusManager +class FocusManager { public: /** Create a new focus manager that operates on the pages of the model @@ -174,7 +174,7 @@ public: typically the tool bar with the close button. */ void SetFocusToToolBox (void); - + /** Create an instance of this class to temporarily hide the focus indicator. It is restored to its former visibility state when the FocusHider is destroyed. @@ -203,7 +203,7 @@ private: bool mbPageIsFocused; ::std::vector<Link> maFocusChangeListeners; - + /** Reset the focus state of the given descriptor and request a repaint so that the focus indicator is hidden. @param pDescriptor diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageObjectFactory.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageObjectFactory.hxx index db39444aea1f..fef75520ca22 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsPageObjectFactory.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsPageObjectFactory.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 @@ -56,7 +56,7 @@ class Properties; /** This class is a factory for the creation of objects that represent page objects (shapes). This includes the contact objects of the drawing layer. - + <p>The factory methods are called by the model::PageDescriptor and the standard implementations of the contact objects.</p> diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx index 58c44698c7ec..11594a03a493 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.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 @@ -86,7 +86,7 @@ public: method is a subsitute for SlideSorterModel::GetPageDescriptor(i)->IsSelected() is included here to make this class more self contained. - */ + */ bool IsPageSelected (int nPageIndex); /** Deselect the descriptor that is associated with the given page. @@ -123,7 +123,7 @@ public: works only when the page has not been de-selected in the mean time. This method helps the view when it scrolls the selection into the visible area. - @return + @return When the selection is empty or when the most recently selected page has been deselected already (but other pages are still selected) then NULL is returned, even when a selection did exist @@ -173,7 +173,7 @@ private: /// Anchor for a range selection. model::SharedPageDescriptor mpSelectionAnchor; model::SharedPageDescriptor mpCurrentPage; - + void CountSelectedPages (void); }; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx index 7a6eeac00eba..905f5aeccc72 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsProperties.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/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx index 1f9e0552f1fb..d3c25c81025e 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.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 @@ -53,7 +53,7 @@ namespace sd { namespace slidesorter { namespace controller { /** Manage the horizontal and vertical scroll bars. Listen for events, set their sizes, place them in the window, determine their visibilities. - + <p>Handle auto scrolling, i.e. the scrolling of the window when the mouse comes near the window border while dragging a selection.</p> @@ -93,7 +93,7 @@ public: into a cache for later reuse. */ void Disconnect (void); - + /** Set up the scroll bar, i.e. thumb size and position. Call this method when the content of the browser window changed, i.e. pages were inserted or deleted, the layout or the zoom factor has @@ -170,7 +170,7 @@ private: objects of this class. It is given to the constructor. */ ::boost::shared_ptr<ScrollBar> mpHorizontalScrollBar; - + /** The vertical scroll bar. Note that is used but not owned by objects of this class. It is given to the constructor. */ diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx index f0ff0e1dea52..f69f6e1fefa2 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.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 @@ -48,24 +48,24 @@ namespace sd { namespace slidesorter { namespace controller { class SlideSorterController; -class SelectionFunction +class SelectionFunction : public SlideFunction { public: TYPEINFO(); static FunctionReference Create( SlideSorter& rSlideSorter, SfxRequest& rRequest ); - + // Mouse- & Key-Events virtual BOOL KeyInput(const KeyEvent& rKEvt); virtual BOOL MouseMove(const MouseEvent& rMEvt); virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); virtual void Paint(const Rectangle&, ::sd::Window* ); - - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren - + + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren + virtual void ScrollStart(); virtual void ScrollEnd(); @@ -82,7 +82,7 @@ public: This is used when a function gets a KEY_ESCAPE but can also be called directly. - @returns + @returns true if a active function was aborted */ virtual bool cancel(); @@ -110,7 +110,7 @@ private: /// Box of the insert marker in model coordinates. Rectangle maInsertionMarkerBox; - + /** We use this flag to filter out the cases where MouseMotion() is called with a pressed mouse button but without a prior MouseButtonDown() call. This is an indication that the mouse button was pressed over diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx index 344adf3e8775..70cfc409214b 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.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 @@ public: /** Create a new SelectionManger for the given slide sorter. */ SelectionManager (SlideSorter& rSlideSorter); - + ~SelectionManager (void); /** Delete the currently selected slides. When this method returns the @@ -80,7 +80,7 @@ public: moved to the visible area of the slide sorter view. */ bool IsMakeSelectionVisiblePending (void) const; - + enum SelectionHint { SH_FIRST, SH_LAST, SH_RECENT }; /** Try to make all currently selected page objects visible, i.e. set diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx index ca7ee78c957d..3a1b46675673 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.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/inc/controller/SlsSlotManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx index 083267da5c07..d56fc1b44388 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.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 @@ -49,7 +49,7 @@ class Command; /** This manager takes over the work of handling slot calls from the controller of the slide sorter. */ -class SlotManager +class SlotManager { public: /** Create a new slot manager that handles slot calls for the controller diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx index cef44ec61ac3..9cb743ffc174 100644 --- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.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 @@ -126,7 +126,7 @@ public: */ sal_Int32 GetIndex ( const ::com::sun::star::uno::Reference<com::sun::star::drawing::XDrawPage>& rxSlide) const; - + /** Call this method after the document has changed its structure. This will get the model in sync with the SdDrawDocument. This method tries not to throw away to much information already gathered. This diff --git a/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx b/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx index fe4b1cc12506..ff3e45018957 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsEnumeration.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 @@ -47,7 +47,7 @@ public: virtual T GetNextElement (void) = 0; virtual void Rewind (void) = 0; virtual ::std::auto_ptr<Enumeration<T> > Clone (void) = 0; -}; +}; } } } // end of namespace ::sd::slidesorter::model diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx index d184777fa605..892b3b8171d3 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.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 @@ -59,9 +59,9 @@ class SlideRenderer; namespace css = ::com::sun::star; -/** Each PageDescriptor object represents the preview of one draw page, +/** Each PageDescriptor object represents the preview of one draw page, slide, or master page of a Draw or Impress document as they are displayed - in the slide sorter. This class gives access to some associated + in the slide sorter. This class gives access to some associated information like prerendered preview or position on the screen. <p>Bounding boxes of page objects come in four varieties: @@ -79,7 +79,7 @@ public: @param pPage The page pointer can in some situations not be detected from rxPage, e.g. after undo of page deletion. Therefore supply it - seperately. + seperately. @param nIndex This index is displayed in the view as page number. It is not necessaryily the page index (not even when you add or subtract 1 @@ -109,8 +109,8 @@ public: /** Return <TRUE/> when the page object is fully or parially visible. */ bool IsVisible (void) const; - /** Set the visible state that is returned by the IsVisible() method. - This method is typically called by the view who renders the object + /** Set the visible state that is returned by the IsVisible() method. + This method is typically called by the view who renders the object onto the screen. */ void SetVisible (bool bVisible); @@ -184,9 +184,9 @@ private: /// The factory that is used to create PageObject objects. const controller::PageObjectFactory* mpPageObjectFactory; - + /** The page object will be destroyed by the page into which it has - been inserted. + been inserted. */ view::PageObject* mpPageObject; diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx index 36a49f720589..abbd121c1d16 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.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 @@ -120,7 +120,7 @@ private: PageEnumeration (::std::auto_ptr<Enumeration<SharedPageDescriptor> > pImpl); // Default constructor not implemented. - PageEnumeration (void); + PageEnumeration (void); }; } } } // end of namespace ::sd::slidesorter::model diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageEnumerationProvider.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageEnumerationProvider.hxx index 6f9923308374..f587586e5b60 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageEnumerationProvider.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageEnumerationProvider.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 @@ -49,12 +49,12 @@ public: selected slides of the given model. */ static PageEnumeration CreateSelectedPagesEnumeration (const SlideSorterModel& rModel); - + /** The returned enumeration of slides iterates over the slides (partially) inside the visible area. */ static PageEnumeration CreateVisiblePagesEnumeration (const SlideSorterModel& rModel); -}; +}; } } } // end of namespace ::sd::slidesorter::model diff --git a/sd/source/ui/slidesorter/inc/model/SlsSharedPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsSharedPageDescriptor.hxx index 93bcf89215e6..746681530e9c 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsSharedPageDescriptor.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsSharedPageDescriptor.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/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx index b4cdfecbcd2e..d9ccff6451f4 100644 --- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.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 @@ -77,7 +77,7 @@ public: @param rViewShell This reference is simply passed to the base class and not used by this class. - + */ SlideSorterView (SlideSorter& rSlideSorter); @@ -187,7 +187,7 @@ public: view::ViewOverlay& GetOverlay (void); /** Set the bounding box of the insertion marker in model coordinates. - + It will be painted as a dark rectangle that fills the given box. */ void SetInsertionMarker (const Rectangle& rBBox); @@ -197,7 +197,7 @@ public: void SetInsertionMarkerVisibility (bool bVisible); /** Set the size and position of the selection rectangle. - + It will be painted as a dashed rectangle. */ void SetSelectionRectangle (const Rectangle& rBox); diff --git a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx index 82487471edb0..bef3a05c5706 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.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/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx index 22a614d65fe6..e5ed8f553799 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.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 @@ -41,7 +41,7 @@ class Size; namespace sd { namespace slidesorter { namespace view { -/** Calculate the size and position of page objects displayed by a slide +/** Calculate the size and position of page objects displayed by a slide sorter. The layouter takes into account various input values: 1.) Size of the window in which the slide sorter is displayed. 2.) Desired and minimal and maximal widths of page objects. @@ -55,7 +55,7 @@ namespace sd { namespace slidesorter { namespace view { 2.) The number of columns. 3.) The size of the enclosing page. - <p>Sizes and lengths are all in pixel except where explicitly stated + <p>Sizes and lengths are all in pixel except where explicitly stated otherwise.</p> <p>The GetIndex... methods may return indices that are larger than or @@ -115,7 +115,7 @@ public: @param nMaximalColumnCount The default value is 5. */ - void SetColumnCount (sal_Int32 nMinimalColumnCount, + void SetColumnCount (sal_Int32 nMinimalColumnCount, sal_Int32 nMaximalColumnCount); /** Central method of this class. It takes the input values and @@ -134,12 +134,12 @@ public: used to obtain valid values (<TRUE/>). */ bool RearrangeHorizontal ( - const Size& rWindowSize, + const Size& rWindowSize, const Size& rPageObjectSize, OutputDevice* pDevice, const sal_uInt32 nPageCount); bool RearrangeVertical ( - const Size& rWindowSize, + const Size& rWindowSize, const Size& rPageObjectSize, OutputDevice* pDevice); @@ -187,7 +187,7 @@ public: the right of the page object. */ Rectangle GetInsertionMarkerBox ( - sal_Int32 nIndex, + sal_Int32 nIndex, bool bVertical, bool bLeftOrTop) const; @@ -268,12 +268,12 @@ public: const DoublePoint&rLayouterPoint) const; typedef ::std::vector<Rectangle> BackgroundRectangleList; - + private: - class ScreenAndModelValue {public: + class ScreenAndModelValue {public: sal_Int32 mnScreen,mnModel; explicit ScreenAndModelValue (sal_Int32 nScreen, sal_Int32 nModel = 0) - : mnScreen(nScreen),mnModel(nModel) {} + : mnScreen(nScreen),mnModel(nModel) {} }; ScreenAndModelValue mnRequestedLeftBorder; ScreenAndModelValue mnRequestedRightBorder; @@ -322,7 +322,7 @@ private: row above or below respectively. */ sal_Int32 GetRowAtPosition ( - sal_Int32 nYPosition, + sal_Int32 nYPosition, bool bIncludeBordersAndGaps, GapMembership eGapMembership = GM_NONE) const; @@ -342,13 +342,13 @@ private: gap area with the column to the left or right respectively. */ sal_Int32 GetColumnAtPosition ( - sal_Int32 nXPosition, + sal_Int32 nXPosition, bool bIncludeBordersAndGaps, GapMembership eGapMembership = GM_NONE) const; /** This method is typically called from GetRowAtPosition() and GetColumnAtPosition() to handle a position that lies inside the gap - between two adjacent rows or columns. + between two adjacent rows or columns. @param nDistanceIntoGap Vertical distance from the bottom of the upper row down into the gap or or horizontal distance from the right edge right into the diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObject.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObject.hxx index 27207ed9570b..e58e48ca701c 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObject.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObject.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 @@ -44,7 +44,7 @@ class PageObject { public: PageObject ( - const Rectangle& rRect, + const Rectangle& rRect, SdrPage* pPage, const model::SharedPageDescriptor& rpDescriptor); diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx index 815a9382b682..59033cd101c7 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.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 @@ -53,16 +53,16 @@ class PageObjectViewContact { public: PageObjectViewContact ( - SdrPageObj& rPageObj, + SdrPageObj& rPageObj, const model::SharedPageDescriptor& rpDescriptor); ~PageObjectViewContact (void); /** Create a ViewObjectContact object that buffers its output in a - bitmap. + bitmap. @return Ownership of the new object passes to the caller. */ - virtual ::sdr::contact::ViewObjectContact& + virtual ::sdr::contact::ViewObjectContact& CreateObjectSpecificViewObjectContact( ::sdr::contact::ObjectContact& rObjectContact); diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx index 4040d31aa694..df3d69f14cc0 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.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 @@ -78,7 +78,7 @@ public: preview is created every time when requested. */ PageObjectViewObjectContact ( - ::sdr::contact::ObjectContact& rObjectContact, + ::sdr::contact::ObjectContact& rObjectContact, ::sdr::contact::ViewContact& rViewContact, const ::boost::shared_ptr<cache::PageCache>& rpCache, const ::boost::shared_ptr<controller::Properties>& rpProperties); @@ -158,7 +158,7 @@ public: enum CoordinateSystem { ModelCoordinateSystem, PixelCoordinateSystem }; /** Return the bounding box of the page object or one of its graphical - parts. + parts. @param rDevice This device is used to translate between model and window coordinates. diff --git a/sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx b/sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx index f4a0fbba4693..bebaf347726b 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsViewOverlay.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 @@ -193,7 +193,7 @@ protected: private: sal_Int32 mnInsertionIndex; Rectangle maBoundingBox; - + void SetPositionAndSize (const Rectangle& rBoundingBox); }; @@ -242,7 +242,7 @@ private: The view overlay itself simply gives access to the more specialized classes that handle individual indicators. - + */ class ViewOverlay { |