diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-01-08 22:50:33 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-01-08 22:50:33 +0100 |
| commit | 5f05cb55bcac03a31fc78b2d984195e12798f786 (patch) | |
| tree | a95a1f883717a512e4d63bf058718ba3e6f3a277 /sd/source/ui/view/ToolBarManager.cxx | |
| parent | 63c6c5d78c2712b824c9194269d13422d4835487 (diff) | |
| parent | 1f680bfe9c50b03c7623bf34755d84ec0796ea32 (diff) | |
autorecovery: merge after rebase to m69
Diffstat (limited to 'sd/source/ui/view/ToolBarManager.cxx')
| -rw-r--r-- | sd/source/ui/view/ToolBarManager.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index 487794816270..21ad0c484473 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -721,8 +721,8 @@ void ToolBarManager::Implementation::SetValid (bool bValid) if (mbIsValid) { Reference<frame::XFrame> xFrame; - if (mrBase.GetViewFrame() != NULL && mrBase.GetViewFrame()->GetFrame()) - xFrame = mrBase.GetViewFrame()->GetFrame()->GetFrameInterface(); + if (mrBase.GetViewFrame() != NULL) + xFrame = mrBase.GetViewFrame()->GetFrame().GetFrameInterface(); try { Reference<beans::XPropertySet> xFrameProperties (xFrame, UNO_QUERY_THROW); |