1 files changed, 28 insertions, 32 deletions

diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
index 41f55fcc6be5..de3affaa1f5d 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
@@ -35,6 +35,7 @@
 #include "model/SlideSorterModel.hxx"
 #include "model/SlsPageDescriptor.hxx"
 #include "view/SlideSorterView.hxx"
+#include "view/SlsLayouter.hxx"
 #include "DrawController.hxx"
 #include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
@@ -47,7 +48,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing::framework;
 using ::rtl::OUString;
-using ::sd::slidesorter::view::SlideSorterView;
+using ::sd::slidesorter::view::Layouter;
 
 namespace sd { namespace slidesorter {
 
@@ -267,7 +268,7 @@ void SAL_CALL SlideSorterService::setCurrentPage(const Reference<drawing::XDrawP
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() != NULL)
-        mpSlideSorter->GetController().GetCurrentSlideManager()->CurrentSlideHasChanged(
+        mpSlideSorter->GetController().GetCurrentSlideManager()->NotifyCurrentSlideChange(
             mpSlideSorter->GetModel().GetIndex(rxSlide));
 }
 
@@ -318,7 +319,7 @@ sal_Bool SAL_CALL SlideSorterService::getIsHighlightCurrentSlide (void)
     if (mpSlideSorter.get() == NULL || ! mpSlideSorter->IsValid())
         return false;
     else
-        return mpSlideSorter->GetController().GetProperties()->IsHighlightCurrentSlide();
+        return mpSlideSorter->GetProperties()->IsHighlightCurrentSlide();
 }
 
 
@@ -330,7 +331,7 @@ void SAL_CALL SlideSorterService::setIsHighlightCurrentSlide (sal_Bool bValue)
     ThrowIfDisposed();
     if (mpSlideSorter.get() != NULL && mpSlideSorter->IsValid())
     {
-        mpSlideSorter->GetController().GetProperties()->SetHighlightCurrentSlide(bValue);
+        mpSlideSorter->GetProperties()->SetHighlightCurrentSlide(bValue);
         controller::SlideSorterController::ModelChangeLock aLock (mpSlideSorter->GetController());
         mpSlideSorter->GetController().HandleModelChange();
     }
@@ -346,7 +347,7 @@ sal_Bool SAL_CALL SlideSorterService::getIsShowSelection (void)
     if (mpSlideSorter.get() == NULL || ! mpSlideSorter->IsValid())
         return false;
     else
-        return mpSlideSorter->GetController().GetProperties()->IsShowSelection();
+        return mpSlideSorter->GetProperties()->IsShowSelection();
 }
 
 
@@ -357,7 +358,7 @@ void SAL_CALL SlideSorterService::setIsShowSelection (sal_Bool bValue)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() != NULL && mpSlideSorter->IsValid())
-        mpSlideSorter->GetController().GetProperties()->SetShowSelection(bValue);
+        mpSlideSorter->GetProperties()->SetShowSelection(bValue);
 }
 
 
@@ -370,7 +371,7 @@ sal_Bool SAL_CALL SlideSorterService::getIsShowFocus (void)
     if (mpSlideSorter.get() == NULL || ! mpSlideSorter->IsValid())
         return false;
     else
-        return mpSlideSorter->GetController().GetProperties()->IsShowFocus();
+        return mpSlideSorter->GetProperties()->IsShowFocus();
 }
 
 
@@ -381,7 +382,7 @@ void SAL_CALL SlideSorterService::setIsShowFocus (sal_Bool bValue)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() != NULL && mpSlideSorter->IsValid())
-        mpSlideSorter->GetController().GetProperties()->SetShowFocus(bValue);
+        mpSlideSorter->GetProperties()->SetShowFocus(bValue);
 }
 
 
@@ -394,7 +395,7 @@ sal_Bool SAL_CALL SlideSorterService::getIsCenterSelection (void)
     if (mpSlideSorter.get() == NULL || ! mpSlideSorter->IsValid())
         return false;
     else
-        return mpSlideSorter->GetController().GetProperties()->IsCenterSelection();
+        return mpSlideSorter->GetProperties()->IsCenterSelection();
 }
 
 
@@ -405,7 +406,7 @@ void SAL_CALL SlideSorterService::setIsCenterSelection (sal_Bool bValue)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() != NULL && mpSlideSorter->IsValid())
-        mpSlideSorter->GetController().GetProperties()->SetCenterSelection(bValue);
+        mpSlideSorter->GetProperties()->SetCenterSelection(bValue);
 }
 
 
@@ -418,7 +419,7 @@ sal_Bool SAL_CALL SlideSorterService::getIsSuspendPreviewUpdatesDuringFullScreen
     if (mpSlideSorter.get() == NULL || ! mpSlideSorter->IsValid())
         return true;
     else
-        return mpSlideSorter->GetController().GetProperties()
+        return mpSlideSorter->GetProperties()
             ->IsSuspendPreviewUpdatesDuringFullScreenPresentation();
 }
 
@@ -431,7 +432,7 @@ void SAL_CALL SlideSorterService::setIsSuspendPreviewUpdatesDuringFullScreenPres
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() != NULL && mpSlideSorter->IsValid())
-        mpSlideSorter->GetController().GetProperties()
+        mpSlideSorter->GetProperties()
             ->SetSuspendPreviewUpdatesDuringFullScreenPresentation(bValue);
 }
 
@@ -445,7 +446,7 @@ sal_Bool SAL_CALL SlideSorterService::getIsOrientationVertical (void)
     if (mpSlideSorter.get() == NULL || ! mpSlideSorter->IsValid())
         return true;
     else
-        return mpSlideSorter->GetView().GetOrientation() == SlideSorterView::VERTICAL;
+        return mpSlideSorter->GetView().GetOrientation() != Layouter::HORIZONTAL;
 }
 
 
@@ -457,8 +458,8 @@ void SAL_CALL SlideSorterService::setIsOrientationVertical (sal_Bool bValue)
     ThrowIfDisposed();
     if (mpSlideSorter.get() != NULL && mpSlideSorter->IsValid())
         mpSlideSorter->GetView().SetOrientation(bValue
-            ? SlideSorterView::VERTICAL
-            : SlideSorterView::HORIZONTAL);
+            ? Layouter::GRID
+            : Layouter::HORIZONTAL);
 }
 
 
@@ -471,7 +472,7 @@ sal_Bool SAL_CALL SlideSorterService::getIsSmoothScrolling (void)
     if (mpSlideSorter.get() == NULL || ! mpSlideSorter->IsValid())
         return false;
     else
-        return mpSlideSorter->GetController().GetProperties()->IsSmoothSelectionScrolling();
+        return mpSlideSorter->GetProperties()->IsSmoothSelectionScrolling();
 }
 
 
@@ -482,7 +483,7 @@ void SAL_CALL SlideSorterService::setIsSmoothScrolling (sal_Bool bValue)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() != NULL && mpSlideSorter->IsValid())
-        mpSlideSorter->GetController().GetProperties()->SetSmoothSelectionScrolling(bValue);
+        mpSlideSorter->GetProperties()->SetSmoothSelectionScrolling(bValue);
 }
 
 
@@ -496,7 +497,7 @@ util::Color SAL_CALL SlideSorterService::getBackgroundColor (void)
         return util::Color();
     else
         return util::Color(
-            mpSlideSorter->GetController().GetProperties()->GetBackgroundColor().GetColor());
+            mpSlideSorter->GetProperties()->GetBackgroundColor().GetColor());
 }
 
 
@@ -507,8 +508,7 @@ void SAL_CALL SlideSorterService::setBackgroundColor (util::Color aBackgroundCol
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() != NULL && mpSlideSorter->IsValid())
-        mpSlideSorter->GetController().GetProperties()->SetBackgroundColor(
-            Color(aBackgroundColor));
+        mpSlideSorter->GetProperties()->SetBackgroundColor(Color(aBackgroundColor));
 }
 
 
@@ -522,7 +522,7 @@ util::Color SAL_CALL SlideSorterService::getTextColor (void)
         return util::Color();
     else
         return util::Color(
-            mpSlideSorter->GetController().GetProperties()->GetTextColor().GetColor());
+            mpSlideSorter->GetProperties()->GetTextColor().GetColor());
 }
 
 
@@ -533,8 +533,7 @@ void SAL_CALL SlideSorterService::setTextColor (util::Color aTextColor)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() != NULL && mpSlideSorter->IsValid())
-        mpSlideSorter->GetController().GetProperties()->SetTextColor(
-            Color(aTextColor));
+        mpSlideSorter->GetProperties()->SetTextColor(Color(aTextColor));
 }
 
 
@@ -548,7 +547,7 @@ util::Color SAL_CALL SlideSorterService::getSelectionColor (void)
         return util::Color();
     else
         return util::Color(
-            mpSlideSorter->GetController().GetProperties()->GetSelectionColor().GetColor());
+            mpSlideSorter->GetProperties()->GetSelectionColor().GetColor());
 }
 
 
@@ -559,8 +558,7 @@ void SAL_CALL SlideSorterService::setSelectionColor (util::Color aSelectionColor
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() != NULL && mpSlideSorter->IsValid())
-        mpSlideSorter->GetController().GetProperties()->SetSelectionColor(
-            Color(aSelectionColor));
+        mpSlideSorter->GetProperties()->SetSelectionColor(Color(aSelectionColor));
 }
 
 
@@ -574,7 +572,7 @@ util::Color SAL_CALL SlideSorterService::getHighlightColor (void)
         return util::Color();
     else
         return util::Color(
-            mpSlideSorter->GetController().GetProperties()->GetHighlightColor().GetColor());
+            mpSlideSorter->GetProperties()->GetHighlightColor().GetColor());
 }
 
 
@@ -585,8 +583,7 @@ void SAL_CALL SlideSorterService::setHighlightColor (util::Color aHighlightColor
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() != NULL && mpSlideSorter->IsValid())
-        mpSlideSorter->GetController().GetProperties()->SetHighlightColor(
-            Color(aHighlightColor));
+        mpSlideSorter->GetProperties()->SetHighlightColor(Color(aHighlightColor));
 }
 
 
@@ -598,7 +595,7 @@ sal_Bool SAL_CALL SlideSorterService::getIsUIReadOnly (void)
     if (mpSlideSorter.get() == NULL || ! mpSlideSorter->IsValid())
         return true;
     else
-        return mpSlideSorter->GetController().GetProperties()->IsUIReadOnly();
+        return mpSlideSorter->GetProperties()->IsUIReadOnly();
 }
 
 
@@ -609,8 +606,7 @@ void SAL_CALL SlideSorterService::setIsUIReadOnly (sal_Bool bIsUIReadOnly)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() != NULL && mpSlideSorter->IsValid())
-        mpSlideSorter->GetController().GetProperties()->SetUIReadOnly(
-            bIsUIReadOnly);
+        mpSlideSorter->GetProperties()->SetUIReadOnly(bIsUIReadOnly);
 }