summaryrefslogtreecommitdiff
path: root/sd/source/ui/view/UpdateLockManager.cxx
diff options
context:
space:
mode:
authorFrank Schoenheit [fs] <frank.schoenheit@sun.com>2010-01-08 22:50:33 +0100
committerFrank Schoenheit [fs] <frank.schoenheit@sun.com>2010-01-08 22:50:33 +0100
commit5f05cb55bcac03a31fc78b2d984195e12798f786 (patch)
treea95a1f883717a512e4d63bf058718ba3e6f3a277 /sd/source/ui/view/UpdateLockManager.cxx
parent63c6c5d78c2712b824c9194269d13422d4835487 (diff)
parent1f680bfe9c50b03c7623bf34755d84ec0796ea32 (diff)
autorecovery: merge after rebase to m69
Diffstat (limited to 'sd/source/ui/view/UpdateLockManager.cxx')
-rw-r--r--sd/source/ui/view/UpdateLockManager.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/sd/source/ui/view/UpdateLockManager.cxx b/sd/source/ui/view/UpdateLockManager.cxx
index 40515bf20197..51285533a389 100644
--- a/sd/source/ui/view/UpdateLockManager.cxx
+++ b/sd/source/ui/view/UpdateLockManager.cxx
@@ -399,11 +399,10 @@ Reference< ::com::sun::star::frame::XLayoutManager>
if (mxLayoutManager.get() == NULL)
{
- if (mrBase.GetViewFrame()!=NULL
- && mrBase.GetViewFrame()->GetFrame()!=NULL)
+ if (mrBase.GetViewFrame()!=NULL)
{
Reference<beans::XPropertySet> xFrameProperties (
- mrBase.GetViewFrame()->GetFrame()->GetFrameInterface(),
+ mrBase.GetViewFrame()->GetFrame().GetFrameInterface(),
UNO_QUERY);
if (xFrameProperties.is())
{