summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-03-12 10:17:06 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-03-12 11:02:15 +0000
commit40ad078ffb84872c9771922c2bef23fed4416bcf (patch)
treecd8384b99e7c4278a654fe02e521b579e9405659 /sd
parentd689dad8376764340c5adf9eaea91ad90481bd93 (diff)
fix coverity#704768
Change-Id: Ifa33288c01d9b1f8f578db5b4a0f5f03ab5ceaad
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorter.cxx10
1 files changed, 4 insertions, 6 deletions
diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
index 24b92c983cce..4666cc3e56b2 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
@@ -529,18 +529,16 @@ bool SlideSorter::RelocateToWindow (::Window* pParentWindow)
ReleaseListeners();
- Window *pParentWindow;
+ ::Window *pNewWindow = NULL;
if (mpViewShell)
{
mpViewShell->ViewShell::RelocateToParentWindow(pParentWindow);
- pParentWindow = mpViewShell->GetParentWindow();
- }
+ pNewWindow = mpViewShell->GetParentWindow();
else
- {
- pParentWindow = NULL;
+ pNewWindow = NULL;
}
- SetupControls(pParentWindow);
+ SetupControls(pNewWindow);
SetupListeners();
// For accessibility we have to shortly hide the content window. This