summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sd/source/ui/dlg/sdtreelb.cxx32
1 files changed, 9 insertions, 23 deletions
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 56a856c07fe8..8d00e1bf6130 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -1143,34 +1143,20 @@ void SdPageObjsTLB::KeyInput( const KeyEvent& rKEvt )
{
sal_Bool bMarked=sal_False;
SvTreeListEntry* pNewEntry = GetCurEntry();
- if( GetParent(pNewEntry) == NULL )
+ if (!pNewEntry)
return;
- OUString aStr=GetSelectEntry();
- Window* pWindow=NULL;
- SdNavigatorWin* pSdNavigatorWin=NULL;
- sd::DrawDocShell* pSdDrawDocShell = NULL;
- if(pNewEntry)
- pWindow=(Window*)GetParent(pNewEntry);
- if(pWindow)
- pSdNavigatorWin = (SdNavigatorWin*)pWindow;
- if( pSdNavigatorWin )
- pSdDrawDocShell = pSdNavigatorWin->GetDrawDocShell(mpDoc);
- if(pSdDrawDocShell)
+ SvTreeListEntry* pParentEntry = GetParent(pNewEntry);
+ if (!pParentEntry)
+ return;
+ OUString aStr(GetSelectEntry());
+ SdNavigatorWin* pSdNavigatorWin = (SdNavigatorWin*)pParentEntry;
+ sd::DrawDocShell* pSdDrawDocShell = pSdNavigatorWin->GetDrawDocShell(mpDoc);
+ if (pSdDrawDocShell)
{
pSdDrawDocShell->GotoTreeBookmark(aStr);
bMarked=pSdDrawDocShell->GetObjectIsmarked(aStr);
}
- if(pNewEntry)
- {
- if(bMarked)
- {
- pNewEntry->SetMarked(sal_True);
- }
- else
- {
- pNewEntry->SetMarked( sal_False );
- }
- }
+ pNewEntry->SetMarked(bMarked);
Invalidate();
}
}