diff options
| author | Andre Fischer <af@openoffice.org> | 2010-02-17 18:06:39 +0100 |
|---|---|---|
| committer | Andre Fischer <af@openoffice.org> | 2010-02-17 18:06:39 +0100 |
| commit | e1f5c8ef3c5bb207946f23c3769f9cd6e536c362 (patch) | |
| tree | 5a22166572d6ed75917e4f5719a983c1588308f4 /sd/source/ui/slidesorter/inc | |
| parent | 70ebb85a47952a76a58577e1d85f3db3f091d4a4 (diff) | |
renaissance1: #i107215# Added detection for assignment of master pages.
Diffstat (limited to 'sd/source/ui/slidesorter/inc')
| -rw-r--r-- | sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx index d1266efae992..bffb7d4574ba 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx @@ -252,6 +252,8 @@ public: */ ::boost::shared_ptr<Animator> GetAnimator (void) const; + void CheckForMasterPageAssignment (void); + private: SlideSorter& mrSlideSorter; model::SlideSorterModel& mrModel; diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx index 34c092e4b3f8..c7f3eb159899 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx @@ -42,6 +42,7 @@ #include <boost/enable_shared_from_this.hpp> class SdPage; +class SdrPage; namespace sdr { namespace contact { class ObjectContact; @@ -110,6 +111,8 @@ public: */ sal_Int32 GetPageIndex (void) const; + bool UpdateMasterPage (void); + enum State { ST_Visible, ST_Selected, ST_WasSelected, ST_Focused, ST_MouseOver, ST_Current, ST_Excluded }; @@ -137,6 +140,7 @@ public: private: SdPage* mpPage; css::uno::Reference<css::drawing::XDrawPage> mxPage; + SdrPage const* mpMasterPage; /** This index is displayed as page number in the view. It may or may not be the actual page index. */ |