diff options
Diffstat (limited to 'embeddedobj/source/general')
-rw-r--r-- | embeddedobj/source/general/docholder.cxx | 42 | ||||
-rw-r--r-- | embeddedobj/source/general/dummyobject.cxx | 4 | ||||
-rw-r--r-- | embeddedobj/source/general/intercept.cxx | 92 | ||||
-rw-r--r-- | embeddedobj/source/general/xcreator.cxx | 2 |
4 files changed, 70 insertions, 70 deletions
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index 93e152db1e73..1659fadf3e4d 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -273,20 +273,20 @@ void DocumentHolder::FreeOffice() // whether the office can be terminated, so it is better to have unnecessary process running than // to loose any data -// uno::Reference< frame::XFramesSupplier > xFramesSupplier( xDesktop, uno::UNO_QUERY ); -// if ( xFramesSupplier.is() ) -// { -// uno::Reference< frame::XFrames > xFrames = xFramesSupplier->getFrames(); -// if ( xFrames.is() && !xFrames->hasElements() ) -// { -// try -// { -// xDesktop->terminate(); -// } -// catch( uno::Exception & ) -// {} -// } -// } +// uno::Reference< frame::XFramesSupplier > xFramesSupplier( xDesktop, uno::UNO_QUERY ); +// if ( xFramesSupplier.is() ) +// { +// uno::Reference< frame::XFrames > xFrames = xFramesSupplier->getFrames(); +// if ( xFrames.is() && !xFrames->hasElements() ) +// { +// try +// { +// xDesktop->terminate(); +// } +// catch( uno::Exception & ) +// {} +// } +// } } } @@ -962,9 +962,9 @@ uno::Reference< frame::XFrame > DocumentHolder::GetDocFrame() } } catch ( uno::Exception& ) - { + { } - + return m_xFrame; } @@ -983,7 +983,7 @@ void DocumentHolder::SetComponent( const uno::Reference< util::XCloseable >& xDo m_xComponent = xDoc; // done outside currently uno::Reference < container::XChild > xChild( m_xComponent, uno::UNO_QUERY ); // done outside currently if ( xChild.is() && m_pEmbedObj ) - // done outside currently xChild->setParent( m_pEmbedObj->getParent() ); + // done outside currently xChild->setParent( m_pEmbedObj->getParent() ); m_bReadOnly = bReadOnly; m_bAllowClosing = sal_False; @@ -1027,12 +1027,12 @@ sal_Bool DocumentHolder::LoadDocToFrame( sal_Bool bInPlace ) aArgs.put( "PluginMode", sal_Int16(1) ); ::rtl::OUString sUrl; uno::Reference< lang::XServiceInfo> xServiceInfo(xDoc,uno::UNO_QUERY); - if ( xServiceInfo.is() - && xServiceInfo->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.ReportDefinition"))) ) + if ( xServiceInfo.is() + && xServiceInfo->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.ReportDefinition"))) ) { sUrl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".component:DB/ReportDesign")); } - else if( xServiceInfo.is() + else if( xServiceInfo.is() && xServiceInfo->supportsService( ::rtl::OUString::createFromAscii("com.sun.star.chart2.ChartDocument")) ) sUrl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/schart")); else diff --git a/embeddedobj/source/general/dummyobject.cxx b/embeddedobj/source/general/dummyobject.cxx index 3079edc21aff..8f82a0a95582 100644 --- a/embeddedobj/source/general/dummyobject.cxx +++ b/embeddedobj/source/general/dummyobject.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,7 +74,7 @@ void ODummyEmbeddedObject::PostEvent_Impl( const ::rtl::OUString& aEventName, aEvent.Source = uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >( this ) ); // For now all the events are sent as object events // aEvent.Source = ( xSource.is() ? xSource - // : uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >( this ) ) ); + // : uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >( this ) ) ); ::cppu::OInterfaceIteratorHelper aIt( *pIC ); while( aIt.hasMoreElements() ) { diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx index ec919a957f47..3839cedb9bcf 100644 --- a/embeddedobj/source/general/intercept.cxx +++ b/embeddedobj/source/general/intercept.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ uno::Sequence< ::rtl::OUString > Interceptor::m_aInterceptedURL(IUL); struct equalOUString { - bool operator()( + bool operator()( const rtl::OUString& rKey1, const rtl::OUString& rKey2 ) const { @@ -84,27 +84,27 @@ void Interceptor::DisconnectDocHolder() } void SAL_CALL -Interceptor::addEventListener( +Interceptor::addEventListener( const uno::Reference<lang::XEventListener >& Listener ) throw( uno::RuntimeException ) { osl::MutexGuard aGuard( m_aMutex ); - + if ( ! m_pDisposeEventListeners ) m_pDisposeEventListeners = new cppu::OInterfaceContainerHelper( m_aMutex ); - + m_pDisposeEventListeners->addInterface( Listener ); } void SAL_CALL -Interceptor::removeEventListener( +Interceptor::removeEventListener( const uno::Reference< lang::XEventListener >& Listener ) throw( uno::RuntimeException ) { osl::MutexGuard aGuard( m_aMutex ); - + if ( m_pDisposeEventListeners ) m_pDisposeEventListeners->removeInterface( Listener ); } @@ -120,11 +120,11 @@ Interceptor::Interceptor( DocumentHolder* pDocHolder ) m_aInterceptedURL[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:SaveAll")); m_aInterceptedURL[2] = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM(".uno:CloseDoc")); + RTL_CONSTASCII_USTRINGPARAM(".uno:CloseDoc")); m_aInterceptedURL[3] = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM(".uno:CloseWin")); + RTL_CONSTASCII_USTRINGPARAM(".uno:CloseWin")); m_aInterceptedURL[4] = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM(".uno:CloseFrame")); + RTL_CONSTASCII_USTRINGPARAM(".uno:CloseFrame")); m_aInterceptedURL[5] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:SaveAs")); @@ -143,8 +143,8 @@ Interceptor::~Interceptor() //XDispatch -void SAL_CALL -Interceptor::dispatch( +void SAL_CALL +Interceptor::dispatch( const util::URL& URL, const uno::Sequence< beans::PropertyValue >& Arguments ) @@ -180,7 +180,7 @@ Interceptor::dispatch( } nInd++; } - + if ( nInd == aNewArgs.getLength() ) { aNewArgs.realloc( nInd + 1 ); @@ -197,9 +197,9 @@ Interceptor::dispatch( } void SAL_CALL -Interceptor::addStatusListener( - const uno::Reference< - frame::XStatusListener >& Control, +Interceptor::addStatusListener( + const uno::Reference< + frame::XStatusListener >& Control, const util::URL& URL ) throw ( uno::RuntimeException @@ -207,8 +207,8 @@ Interceptor::addStatusListener( { if(!Control.is()) return; - - if(URL.Complete == m_aInterceptedURL[0]) + + if(URL.Complete == m_aInterceptedURL[0]) { // Save frame::FeatureStateEvent aStateEvent; aStateEvent.FeatureURL.Complete = m_aInterceptedURL[0]; @@ -218,18 +218,18 @@ Interceptor::addStatusListener( aStateEvent.Requery = sal_False; aStateEvent.State <<= (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("($1) ")) + m_pDocHolder->GetTitle() ); Control->statusChanged(aStateEvent); - + { osl::MutexGuard aGuard(m_aMutex); if(!m_pStatCL) - m_pStatCL = + m_pStatCL = new StatusChangeListenerContainer(m_aMutex); } - + m_pStatCL->addInterface(URL.Complete,Control); return; } - + sal_Int32 i = 2; if(URL.Complete == m_aInterceptedURL[i] || URL.Complete == m_aInterceptedURL[++i] || @@ -243,20 +243,20 @@ Interceptor::addStatusListener( aStateEvent.Requery = sal_False; aStateEvent.State <<= (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("($2) ")) + m_pDocHolder->GetTitle() ); Control->statusChanged(aStateEvent); - - + + { osl::MutexGuard aGuard(m_aMutex); if(!m_pStatCL) - m_pStatCL = + m_pStatCL = new StatusChangeListenerContainer(m_aMutex); } - + m_pStatCL->addInterface(URL.Complete,Control); return; } - if(URL.Complete == m_aInterceptedURL[5]) + if(URL.Complete == m_aInterceptedURL[5]) { // SaveAs frame::FeatureStateEvent aStateEvent; aStateEvent.FeatureURL.Complete = m_aInterceptedURL[5]; @@ -266,14 +266,14 @@ Interceptor::addStatusListener( aStateEvent.Requery = sal_False; aStateEvent.State <<= (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("($3)"))); Control->statusChanged(aStateEvent); - + { osl::MutexGuard aGuard(m_aMutex); if(!m_pStatCL) - m_pStatCL = + m_pStatCL = new StatusChangeListenerContainer(m_aMutex); } - + m_pStatCL->addInterface(URL.Complete,Control); return; } @@ -283,9 +283,9 @@ Interceptor::addStatusListener( void SAL_CALL Interceptor::removeStatusListener( - const uno::Reference< - frame::XStatusListener >& Control, - const util::URL& URL ) + const uno::Reference< + frame::XStatusListener >& Control, + const util::URL& URL ) throw ( uno::RuntimeException ) @@ -300,15 +300,15 @@ Interceptor::removeStatusListener( //XInterceptorInfo -uno::Sequence< ::rtl::OUString > -SAL_CALL +uno::Sequence< ::rtl::OUString > +SAL_CALL Interceptor::getInterceptedURLs( ) throw ( uno::RuntimeException ) { // now implemented as update - + return m_aInterceptedURL; } @@ -316,9 +316,9 @@ Interceptor::getInterceptedURLs( ) // XDispatchProvider uno::Reference< frame::XDispatch > SAL_CALL -Interceptor::queryDispatch( +Interceptor::queryDispatch( const util::URL& URL, - const ::rtl::OUString& TargetFrameName, + const ::rtl::OUString& TargetFrameName, sal_Int32 SearchFlags ) throw ( uno::RuntimeException @@ -359,7 +359,7 @@ Interceptor::queryDispatches( aRet = m_xSlaveDispatchProvider->queryDispatches(Requests); else aRet.realloc(Requests.getLength()); - + for(sal_Int32 i = 0; i < Requests.getLength(); ++i) if(m_aInterceptedURL[0] == Requests[i].FeatureURL.Complete) aRet[i] = (frame::XDispatch*) this; @@ -381,8 +381,8 @@ Interceptor::queryDispatches( //XDispatchProviderInterceptor -uno::Reference< frame::XDispatchProvider > SAL_CALL -Interceptor::getSlaveDispatchProvider( ) +uno::Reference< frame::XDispatchProvider > SAL_CALL +Interceptor::getSlaveDispatchProvider( ) throw ( uno::RuntimeException ) @@ -392,7 +392,7 @@ Interceptor::getSlaveDispatchProvider( ) } void SAL_CALL -Interceptor::setSlaveDispatchProvider( +Interceptor::setSlaveDispatchProvider( const uno::Reference< frame::XDispatchProvider >& NewDispatchProvider ) throw ( uno::RuntimeException @@ -404,18 +404,18 @@ Interceptor::setSlaveDispatchProvider( uno::Reference< frame::XDispatchProvider > SAL_CALL -Interceptor::getMasterDispatchProvider( ) +Interceptor::getMasterDispatchProvider( ) throw ( uno::RuntimeException ) { osl::MutexGuard aGuard(m_aMutex); - return m_xMasterDispatchProvider; + return m_xMasterDispatchProvider; } - + void SAL_CALL -Interceptor::setMasterDispatchProvider( +Interceptor::setMasterDispatchProvider( const uno::Reference< frame::XDispatchProvider >& NewSupplier ) throw ( uno::RuntimeException diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx index 46846f778541..cd0529781041 100644 --- a/embeddedobj/source/general/xcreator.cxx +++ b/embeddedobj/source/general/xcreator.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |