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.

1 files changed, 7 insertions, 8 deletions

diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index 43c568b375d4..0c1cbd47f8e5 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -429,9 +429,8 @@ bool SlideSorterController::Command (
                 // When there is no selection, then we show the insertion
                 // indicator so that the user knows where a page insertion
                 // would take place.
-                mrView.GetOverlay().GetInsertionIndicatorOverlay()
-                    .SetPosition(
-                        pWindow->PixelToLogic(rEvent.GetMousePosPixel()));
+                mrView.GetOverlay().GetInsertionIndicatorOverlay().SetPosition(
+                    pWindow->PixelToLogic(rEvent.GetMousePosPixel()));
                 mrView.GetOverlay().GetInsertionIndicatorOverlay().Show();
             }
 
@@ -473,11 +472,11 @@ bool SlideSorterController::Command (
             mbIsContextMenuOpen = false;
             if (pPage == NULL)
             {
-                // Select slide before the insertion indicator before it is
-                // hidden, so that a pending slide insertion slot finds the
-                // right place to insert a new slide.
-                mpPageSelector->SelectPage(
-                    mrView.GetOverlay().GetInsertionIndicatorOverlay().GetInsertionPageIndex()-1);
+                // Remember the position of the insertion indicator before
+                // it is hidden, so that a pending slide insertion slot call
+                // finds the right place to insert a new slide.
+                GetSelectionManager()->SetInsertionPosition(
+                    mrView.GetOverlay().GetInsertionIndicatorOverlay().GetInsertionPageIndex());
                 mrView.GetOverlay().GetInsertionIndicatorOverlay().Hide();
             }
             bEventHasBeenHandled = true;