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, 1 insertions, 13 deletions

diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index 192a5b58e224..f157968d6c2d 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -251,19 +251,7 @@ sal_Int32 Clipboard::GetInsertionPosition (::Window* pWindow)
     }
     else
     {
-        model::PageEnumeration aSelectedPages
-            (model::PageEnumerationProvider::CreateSelectedPagesEnumeration(
-                mrSlideSorter.GetModel()));
-        // Initialize (for the case of an empty selection) with the position
-        // at the end of the document.
-        nInsertPosition = mrSlideSorter.GetModel().GetPageCount();
-        while (aSelectedPages.HasMoreElements())
-        {
-            nInsertPosition = aSelectedPages.GetNextElement()->GetPage()->GetPageNum();
-            // Convert *2+1 index to straight index ((n-1)/2) after the page
-            // (+1).
-            nInsertPosition = (nInsertPosition-1)/2 + 1;
-        }
+        nInsertPosition = mrController.GetSelectionManager()->GetInsertionPosition();
     }
 
     return nInsertPosition;