1 files changed, 20 insertions, 4 deletions
diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx
index 2b71fc6b4311..6631ec70d413 100644
--- a/sdext/source/presenter/PresenterWindowManager.hxx
+++ b/sdext/source/presenter/PresenterWindowManager.hxx
@@ -113,15 +113,29 @@ public:
     void Update (void);
     void Layout (void);
 
-    enum LayoutMode { Standard, Notes, Generic };
+    void SetSlideSorterState (bool bIsActive);
+    void SetHelpViewState (bool bIsActive);
+
+    enum LayoutMode { LM_Standard, LM_Notes, LM_Generic };
+private:
     void SetLayoutMode (const LayoutMode eMode);
     LayoutMode GetLayoutMode (void) const;
 
-    void SetSlideSorterState (bool bIsActive);
     bool IsSlideSorterActive (void) const;
-
-    void SetHelpViewState (bool bIsActive);
     bool IsHelpViewActive (void) const;
+public:
+    enum ViewMode { VM_Standard, VM_Notes, VM_SlideOverview, VM_Help };
+    /** The high-level method to switch the view mode.  Use this instead of
+        SetLayoutMode and Set(Help|SlideSorter)State when possible.
+    */
+    void SetViewMode (const ViewMode eMode);
+
+    ViewMode GetViewMode (void) const;
+
+    /** Restore the layout mode (or slide sorter state) from the
+        configuration.
+    */
+    void RestoreViewMode (void);
 
     void AddLayoutListener (
         const css::uno::Reference<css::document::XEventListener>& rxListener);
@@ -219,6 +233,8 @@ private:
 
     void Invalidate (void);
 
+    void StoreViewMode (const ViewMode eViewMode);
+
     void LayoutStandardMode (void);
     void LayoutNotesMode (void);
     void LayoutUnknownMode (void);