summaryrefslogtreecommitdiffstats
path: root/sd
diff options
context:
space:
mode:
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/slidesorter/controller/SlideSorterController.cxx14
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx4
2 files changed, 6 insertions, 12 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index f41bff18c843..41ef617abcf0 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -695,17 +695,15 @@ void SlideSorterController::Resize (const Rectangle& rAvailableSpace)
}
}
-Rectangle SlideSorterController::Rearrange (bool bForce)
+void SlideSorterController::Rearrange (bool bForce)
{
- Rectangle aNewContentArea (maTotalWindowArea);
-
- if (aNewContentArea.IsEmpty())
- return aNewContentArea;
+ if (maTotalWindowArea.IsEmpty())
+ return;
if (mnModelChangeLockCount>0)
{
mbIsForcedRearrangePending |= bForce;
- return aNewContentArea;
+ return;
}
else
mbIsForcedRearrangePending = false;
@@ -717,7 +715,7 @@ Rectangle SlideSorterController::Rearrange (bool bForce)
mrView.UpdateOrientation();
// Place the scroll bars.
- aNewContentArea = GetScrollBarManager().PlaceScrollBars(
+ Rectangle aNewContentArea = GetScrollBarManager().PlaceScrollBars(
maTotalWindowArea,
mrView.GetOrientation() != view::Layouter::VERTICAL,
mrView.GetOrientation() != view::Layouter::HORIZONTAL);
@@ -746,8 +744,6 @@ Rectangle SlideSorterController::Rearrange (bool bForce)
mrView.RequestRepaint();
}
-
- return aNewContentArea;
}
rtl::Reference<FuPoor> SlideSorterController::CreateSelectionFunction (SfxRequest& rRequest)
diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
index 4e1618ebde38..97b93478fbe8 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
@@ -93,10 +93,8 @@ public:
window and with it the SlideSorterView is resized event when its
size does not change (the size does change when the visibility
of scroll bars changes.)
- @return
- Returns the space occupied by the browser window.
*/
- Rectangle Rearrange (bool bForce = false);
+ void Rearrange (bool bForce = false);
/** Return the descriptor of the page that is rendered under the
given position. This takes the IsOnlyPreviewTriggersMouseOver