diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-03-12 10:20:22 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-03-12 10:20:22 +0000 |
| commit | aed524fe0309511ba43db9994fa31613434af5e8 (patch) | |
| tree | fac418e66d2171c6707552063555a5f5a91eb5a8 /sd | |
| parent | 5b00c453d3d1d37af3acf42ad663de25086c026d (diff) | |
INTEGRATION: CWS impresstables2 (1.4.380); FILE MERGED
2007/07/26 17:47:51 cl 1.4.380.1: #i68103# added cell text to search & spellchecking
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/inc/OutlinerIterator.hxx | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx index 6258232bc102..d532c10d55d0 100644 --- a/sd/inc/OutlinerIterator.hxx +++ b/sd/inc/OutlinerIterator.hxx @@ -4,9 +4,9 @@ * * $RCSfile: OutlinerIterator.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-09 02:51:55 $ + * last change: $Author: rt $ $Date: 2008-03-12 11:20:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,6 +36,8 @@ #ifndef SD_OUTLINER_ITERATOR_HXX #define SD_OUTLINER_ITERATOR_HXX +#include <svx/svdobj.hxx> + #include "pres.hxx" #ifndef _SAL_TYPES_H_ #include "sal/types.h" @@ -43,7 +45,6 @@ #include <vector> class SdDrawDocument; -class SdrObject; namespace sd { @@ -271,7 +272,7 @@ private: This specifies at which object the iterator points initially. */ Iterator CreateSelectionIterator ( - const ::std::vector<SdrObject*>& rObjectList, + const ::std::vector<SdrObjectWeakRef>& rObjectList, SdDrawDocument* pDocument, DrawViewShell* pViewShell, bool bDirectionIsForward=true, @@ -365,8 +366,8 @@ public: IteratorPosition (const IteratorPosition& aPosition); /** Create a new object and set its data members to the given values. */ - IteratorPosition (SdrObject* pObject, sal_Int32 nPageIndex,// SdView* pView, - PageKind ePageKind, EditMode eEditMode); + IteratorPosition (SdrObject* pObject, sal_Int32 nText, sal_Int32 nPageIndex, PageKind ePageKind, EditMode eEditMode); + /// The destructor is a no-op at the moment. ~IteratorPosition (void); /** Assign the content of the given position to this one. @@ -385,7 +386,11 @@ public: bool operator== (const IteratorPosition& aPosition) const; /// Pointer to the actual <type>SdrObject</type> object. - SdrObject* mpObject; + SdrObjectWeakRef mxObject; + + /// Number of the actual SdrText from the current <type>SdrObject</type> + sal_Int32 mnText; + /// The index of a page where the object is located on. sal_Int32 mnPageIndex; /// Page kind of the view. |