summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-08-19 23:17:18 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-08-19 23:17:18 +0000
commitd6b65dc91dd9bab14da9968d038a4b47c1c75ac1 (patch)
tree48dd851462768bceb72a2ce7c62ad93f4b5d20c4 /sd
parenta8f2e963c10c634d096b43eb5f6a6e3d1fe7a3a0 (diff)
INTEGRATION: CWS aw033 (1.17.24); FILE MERGED
2008/07/11 11:40:04 aw 1.17.24.3: RESYNC: (1.17-1.18); FILE MERGED 2008/07/10 12:56:27 aw 1.17.24.2: #i39532# XOutputDevice removed, PrepareDelete removed 2008/05/16 13:06:03 aw 1.17.24.1: adaptions after resync
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx12
1 files changed, 4 insertions, 8 deletions
diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
index 3cd679ad9ab3..4f72e5d12457 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: SlideSorterController.hxx,v $
- * $Revision: 1.18 $
+ * $Revision: 1.19 $
*
* This file is part of OpenOffice.org.
*
@@ -139,6 +139,9 @@ public:
::boost::shared_ptr<SlotManager> GetSlotManager (void) const;
::boost::shared_ptr<SelectionManager> GetSelectionManager (void) const;
+ // forward VCLs PrePaint window event to DrawingLayer
+ void PrePaint();
+
/** This method forwards the call to the SlideSorterView and executes
pending operations like moving selected pages into the visible area.
*/
@@ -278,11 +281,6 @@ public:
*/
::boost::shared_ptr<Animator> GetAnimator (void) const;
- /** The highlight object is used to highlight the current slide (when
- that is activated in the Properties.)
- */
- view::HighlightObject* GetHighlightObject (void) const;
-
private:
SlideSorter& mrSlideSorter;
model::SlideSorterModel& mrModel;
@@ -343,8 +341,6 @@ private:
*/
::boost::shared_ptr<Properties> mpProperties;
- view::HighlightObject* mpHighlightObject;
-
/** Delete the given list of normal pages. This method is a helper
function for DeleteSelectedPages().
@param rSelectedNormalPages