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/Outliner.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/Outliner.hxx')
-rw-r--r-- | sd/inc/Outliner.hxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx index 61ca41a59b8c..e7e9c9dc70f9 100644 --- a/sd/inc/Outliner.hxx +++ b/sd/inc/Outliner.hxx @@ -37,6 +37,7 @@ #include "OutlinerIterator.hxx" #include <svx/SpellPortions.hxx> #include <memory> +#include <boost/shared_ptr.hpp> class Dialog; class SdPage; @@ -203,7 +204,7 @@ private: /// The view which displays the searched objects. ::sd::View* mpView; /// The view shell containing the view. - ViewShell* mpViewShell; + ::boost::shared_ptr<ViewShell> mpViewShell; /// This window contains the view. ::sd::Window* mpWindow; /// The document on whose objects and pages this class operates. @@ -543,7 +544,7 @@ private: It handles i.e. registering at the associated view as selection change listener. */ - void SetViewShell (ViewShell* pViewShell); + void SetViewShell (const ::boost::shared_ptr<ViewShell>& rpViewShell); /** Activate or deactivate the search in the current selection. Call this method whenever the selection has changed. This method creates |