diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-02-12 12:44:26 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-02-12 12:44:26 +0000 |
| commit | 98bd0fd01cc03b171d83f41664b0633547004405 (patch) | |
| tree | b6e02a19fe6abf3a868c7fc9498eaae5a4f73199 /sd/inc/OutlinerIterator.hxx | |
| parent | 20549ebe3730fa436e48ba2cd418761828cf4bca (diff) | |
CWS-TOOLING: integrate CWS impress166
2009-01-27 11:42:29 +0100 af r266972 : #i98508# Handle non DrawViewShell view shells correctly.
2009-01-21 10:41:32 +0100 af r266635 : #i98069# Do not call PreModelChange() for every ModelLock.
2009-01-20 15:25:41 +0100 af r266588 : #i98069# Added friend declaration that became necessary on Solaris after recent changes.
2009-01-19 13:48:47 +0100 af r266493 : #i97478# Prevent SID_PARASPACE_(DE|IN)CREASE from crashing when style sheet is missing.
2009-01-16 11:52:37 +0100 af r266411 : #i97338# Check the dispatcher before using it to show a context menu.
2009-01-15 14:33:55 +0100 sj r266373 : #153716# taking care of font-independent line spacing (editmode and hittest)
2009-01-15 14:29:46 +0100 sj r266372 : #153716# taking care of font-independent line spacing also in presentation styles
2009-01-14 14:04:16 +0100 af r266301 : #i97634# Do view change synchronously. Use shared pointers for view shells.
2009-01-14 14:01:27 +0100 af r266300 : #i97634# Added non-API methods that update the configuration synchronously.
2009-01-14 13:34:40 +0100 af r266295 : #i98069# Be more carefull with handling model updates to avoid assertion regarding number of selected pages.
2009-01-14 11:34:57 +0100 cl r266270 : #i97261# force outliner para oibject after text edit
2009-01-14 10:49:08 +0100 cl r266269 : #i97413# dispose cell undo action if shape dies
2009-01-13 18:50:05 +0100 cl r266247 : #i97347# fixed cell undo crash
2009-01-12 14:16:56 +0100 af r266156 : #i97296# Using is() method to check WeakReference for validity.
2009-01-12 13:52:00 +0100 af r266155 : #i97190# Turned static_cast to dynamic_cast in CreateChildList.
2009-01-12 13:06:57 +0100 af r266153 : #i97552# Catching Exceptions caught while accessing OLE-Object that is to be inserted.
2009-01-12 13:06:37 +0100 cl r266152 : #i96164# applied patch to fix ambiguous operation
Diffstat (limited to 'sd/inc/OutlinerIterator.hxx')
| -rw-r--r-- | sd/inc/OutlinerIterator.hxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx index 36e1b6269615..62646f66fe3d 100644 --- a/sd/inc/OutlinerIterator.hxx +++ b/sd/inc/OutlinerIterator.hxx @@ -36,12 +36,13 @@ #include "pres.hxx" #include "sal/types.h" #include <vector> +#include <boost/shared_ptr.hpp> class SdDrawDocument; namespace sd { -class DrawViewShell; +class ViewShell; class Outliner; class View; @@ -267,7 +268,7 @@ private: Iterator CreateSelectionIterator ( const ::std::vector<SdrObjectWeakRef>& rObjectList, SdDrawDocument* pDocument, - DrawViewShell* pViewShell, + const ::boost::shared_ptr<ViewShell>& rpViewShell, bool bDirectionIsForward=true, IteratorLocation aLocation=BEGIN); @@ -285,7 +286,7 @@ private: */ Iterator CreateViewIterator ( SdDrawDocument* pDocument, - DrawViewShell* pViewShell, + const boost::shared_ptr<ViewShell>& rpViewShell, bool bDirectionIsForward=true, IteratorLocation aLocation=BEGIN); @@ -302,7 +303,7 @@ private: */ Iterator CreateDocumentIterator ( SdDrawDocument* pDocument, - DrawViewShell* pViewShell, + const ::boost::shared_ptr<ViewShell>& rpViewShell, bool bDirectionIsForward=true, IteratorLocation aLocation=BEGIN); @@ -323,8 +324,9 @@ private: @param aLocation This specifies at which object the iterator points initially. */ - sal_Int32 GetPageIndex (SdDrawDocument* pDocument, - DrawViewShell* pViewShell, + sal_Int32 GetPageIndex ( + SdDrawDocument* pDocument, + const ::boost::shared_ptr<ViewShell>& rpViewShell, PageKind ePageKind, EditMode eEditMode, bool bDirectionIsForward, |