summaryrefslogtreecommitdiff
path: root/sd/inc
diff options
context:
space:
mode:
authorNoel Power <noel.power@suse.com>2013-06-25 11:01:52 +0100
committerNoel Power <noel.power@suse.com>2013-06-25 11:01:52 +0100
commit90ffe25cdda7f7922ea7def4a5bf99ff1671b0d3 (patch)
treeb370fe9b7af71abc357b540e5878b2bd17d16f35 /sd/inc
parent69dcacedaccd1d698a54eed615ee8739747bc975 (diff)
remove unwanted files added with ee51444ed1f7003dafc93c8181b5f8c1b0fd165b
<sigh> added some files that were part of a patch that I was testing were not intended as part of commit Change-Id: I34ed7f55de28fa09739c0dd8d5084824de676477
Diffstat (limited to 'sd/inc')
-rw-r--r--sd/inc/drawdoc.hxx1
-rw-r--r--sd/inc/shapelist.hxx21
2 files changed, 13 insertions, 9 deletions
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 1d05eb36115b..77ac6b676b2a 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -145,7 +145,6 @@ private:
Timer* mpWorkStartupTimer;
Timer* mpOnlineSpellingTimer;
sd::ShapeList* mpOnlineSpellingList;
- sd::ShapeList::const_iterator maShapeListIterator;
SvxSearchItem* mpOnlineSearchItem;
std::vector<sd::FrameView*> maFrameViewList;
SdCustomShowList* mpCustomShowList;
diff --git a/sd/inc/shapelist.hxx b/sd/inc/shapelist.hxx
index 2d759a2bd493..f828ebc61d31 100644
--- a/sd/inc/shapelist.hxx
+++ b/sd/inc/shapelist.hxx
@@ -29,10 +29,6 @@ namespace sd
class ShapeList : public sdr::ObjectUser
{
public:
- /** const_iterator guarantee only that the list itself is not
- altered. The objects referenced by the list are still mutable. */
- typedef std::list< SdrObject* >::const_iterator const_iterator;
-
ShapeList();
virtual ~ShapeList();
@@ -52,17 +48,26 @@ namespace sd
/** @return true if given shape is part of this list */
bool hasShape( SdrObject& rObject ) const;
- /** @return const_iterator pointing to the first element */
- const_iterator cbegin() const;
+ /** returns the shape the internal iterator points to, or 0 if
+ * the list end is reached. moves the internal iterator to the
+ * next shape. */
+ SdrObject* getNextShape();
+
+ /** Sets the internal iterator to the shape at given index. */
+ void seekShape( sal_uInt32 nIndex );
+
+ /**
+ */
+ bool hasMore() const;
- /** @return const_iterator pointing to the list termination element */
- const_iterator cend() const;
+ const std::list< SdrObject* >& getList() const { return maShapeList; }
private:
virtual void ObjectInDestruction(const SdrObject& rObject);
typedef std::list< SdrObject* > ListImpl;
ListImpl maShapeList;
+ ListImpl::iterator maIter;
};
}