diff options
Diffstat (limited to 'framework/source/services/frame.cxx')
| -rw-r--r-- | framework/source/services/frame.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 1d63a503b2..709bfb6bd0 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -106,7 +106,7 @@ #endif #include <toolkit/awt/vclxwindow.hxx> #include <comphelper/processfactory.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #ifdef ENABLE_ASSERTIONS #ifndef _RTL_STRBUF_HXX_ @@ -630,7 +630,7 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >& implts_startWindowListening(); impl_enablePropertySet(); - + // create WindowCommandDispatch; it is supposed to release itself at frame destruction (void)new WindowCommandDispatch(xSMGR, this); @@ -2297,7 +2297,7 @@ aEvent // Look for rejected calls. // Sometimes called during dispose() => soft exceptions TransactionGuard aTransaction( m_aTransactionManager, E_SOFTEXCEPTIONS ); - + /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ReadGuard aReadLock( m_aLock ); @@ -2652,7 +2652,7 @@ void SAL_CALL Frame::impl_setPropertyValue(const ::rtl::OUString& /*sProperty*/, css::uno::Reference< css::frame::XLayoutManager > xOldLayoutManager = m_xLayoutManager; css::uno::Reference< css::frame::XLayoutManager > xNewLayoutManager; aValue >>= xNewLayoutManager; - + if (xOldLayoutManager != xNewLayoutManager) { m_xLayoutManager = xNewLayoutManager; |