summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorter.cxx12
1 files changed, 10 insertions, 2 deletions
diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
index 9e9c189aa6ee..24b92c983cce 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
@@ -529,10 +529,18 @@ bool SlideSorter::RelocateToWindow (::Window* pParentWindow)
ReleaseListeners();
- if (mpViewShell != NULL)
+ Window *pParentWindow;
+ if (mpViewShell)
+ {
mpViewShell->ViewShell::RelocateToParentWindow(pParentWindow);
+ pParentWindow = mpViewShell->GetParentWindow();
+ }
+ else
+ {
+ pParentWindow = NULL;
+ }
- SetupControls(mpViewShell->GetParentWindow());
+ SetupControls(pParentWindow);
SetupListeners();
// For accessibility we have to shortly hide the content window. This