CWS-TOOLING: integrate CWS impress170

2009-04-28 10:31:12 +0200 wg  r271308 : i101397
2009-04-14 17:56:43 +0200 af  r270805 : #i100829# Removed line that became obsolete in last change.
2009-04-14 15:12:19 +0200 af  r270782 : #i97199# Made accelerators in text attribute dialog unique.
2009-04-14 14:42:53 +0200 af  r270775 : #i98364# Create regular task pane master previews even in high contrast mode.
2009-04-09 14:43:32 +0200 af  r270708 : #i92792# Show icon instead of text and register resource for 'Table Design'.
2009-04-09 14:42:51 +0200 af  r270707 : #i92792# Show icon instead of text and register resource for 'Table Design'.
2009-04-09 11:15:32 +0200 af  r270683 : #i85921# Applied patch that adds direct activation of master mode to task pane context menu.
2009-04-08 15:12:54 +0200 af  r270654 : #i94775# Passing snap line index from context menu to FuSnapLine.
2009-04-06 15:33:04 +0200 af  r270555 : #i95371# Return early from MoveToTop() when the dispatcher is (not yet) available.
2009-04-06 13:15:42 +0200 af  r270538 : #i97571# Fixed forwarding MouseButtonUp() calls to parent.
2009-04-03 16:10:08 +0200 af  r270498 : #i100830# Adjusted the sizes of some rectangles displayed by the slide sorter.
2009-04-03 16:02:08 +0200 af  r270496 : #i93086# Storing position of insertion indicator explicitly at SelectionManager.
2009-04-03 15:55:59 +0200 af  r270493 : #i100829# Calling UpdatePageBorders() when the model is changed.

2 files changed, 34 insertions, 3 deletions

diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index 7a4ad2865140..d85b09d6ab07 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -475,6 +475,24 @@ private:
     */
     void StopSlideShow (bool bCloseFrame);
 
+    /** Show the context menu for snap lines and points.  Because snap lines
+        can not be selected the index of the snap line/point for which the
+        popup menu is opened has to be passed to the processing slot
+        handlers.  This can be done only by manually showing the popup menu.
+        @param rPageView
+            The page view is used to access the help lines.
+        @param nSnapLineIndex
+            Index of the snap line or snap point for which to show the
+            context menu.
+        @param rMouseLocation
+            The mouse location defines the location at which to display the
+            context menu.
+    */
+    void ShowSnapLineContextMenu (
+        SdrPageView& rPageView,
+        const USHORT nSnapLineIndex,
+        const Point& rMouseLocation);
+
     using ViewShell::Notify;
 };
 
diff --git a/sd/source/ui/inc/PreviewRenderer.hxx b/sd/source/ui/inc/PreviewRenderer.hxx
index 54cd483272d5..c508410045aa 100644
--- a/sd/source/ui/inc/PreviewRenderer.hxx
+++ b/sd/source/ui/inc/PreviewRenderer.hxx
@@ -78,11 +78,17 @@ public:
             When the actual preview can not be created for some reason, then
             this text is painted in an empty rectangle of the requested size
             instead.
+        @param bObeyHighContrastMode
+            When <FALSE/> then the high contrast mode of the application is
+            ignored and the preview is rendered in normal mode.  When
+            <TRUE/> and high contrast mode is active then the preview is
+            rendered in high contrast mode.
     */
     Image RenderPage (
         const SdPage* pPage,
         const sal_Int32 nWidth,
-        const String& sSubstitutionText);
+        const String& sSubstitutionText,
+        const bool bObeyHighContrastMode = true);
 
     /** Render a page with the given pixel size.
         @param pPage
@@ -93,11 +99,17 @@ public:
             When the actual preview can not be created for some reason, then
             this text is painted in an empty rectangle of the requested size
             instead.
+        @param bObeyHighContrastMode
+            When <FALSE/> then the high contrast mode of the application is
+            ignored and the preview is rendered in normal mode.  When
+            <TRUE/> and high contrast mode is active then the preview is
+            rendered in high contrast mode.
     */
     Image RenderPage (
         const SdPage* pPage,
         const Size aPreviewPixelSize,
-        const String& sSubstitutionText);
+        const String& sSubstitutionText,
+        const bool bObeyHighContrastMode = true);
 
     /** Render an image that contains the given substitution text instead of a
         slide preview.
@@ -131,7 +143,8 @@ private:
 
     bool Initialize (
         const SdPage* pPage,
-        const Size& rPixelSize);
+        const Size& rPixelSize,
+        const bool bObeyHighContrastMode);
     void Cleanup (void);
     void PaintPage (const SdPage* pPage);
     void PaintSubstitutionText (const String& rSubstitutionText);