mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

com::sun::star->css in embeddedobj/

Browse Source 
Change-Id: Ia04fc28ce8e1d70f86520edf2df8c98f7b455465
Reviewed-on: https://gerrit.libreoffice.org/19024
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Noel Grandin 2015-09-29 15:07:23 +02:00 committed by Noel Grandin
parent 6a93b970c5
commit e6534a6099
26 changed files with 842 additions and 842 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
embeddedobj/source/commonembedding/embedobj.cxx
View File

@ -298,7 +298,7 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState )
{ {
uno::Reference< embed::XInplaceClient > xInplaceClient( m_xClientSite, uno::UNO_QUERY_THROW ); uno::Reference< embed::XInplaceClient > xInplaceClient( m_xClientSite, uno::UNO_QUERY_THROW );
// TODO: // TODO:
uno::Reference< ::com::sun::star::frame::XLayoutManager > xContainerLM = uno::Reference< css::frame::XLayoutManager > xContainerLM =
xInplaceClient->getLayoutManager(); xInplaceClient->getLayoutManager();
if ( xContainerLM.is() ) if ( xContainerLM.is() )
{ {
@ -365,7 +365,7 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState )
if ( nNextState == embed::EmbedStates::INPLACE_ACTIVE ) if ( nNextState == embed::EmbedStates::INPLACE_ACTIVE )
{ {
uno::Reference< embed::XInplaceClient > xInplaceClient( m_xClientSite, uno::UNO_QUERY_THROW ); uno::Reference< embed::XInplaceClient > xInplaceClient( m_xClientSite, uno::UNO_QUERY_THROW );
uno::Reference< ::com::sun::star::frame::XLayoutManager > xContainerLM = uno::Reference< css::frame::XLayoutManager > xContainerLM =
xInplaceClient->getLayoutManager(); xInplaceClient->getLayoutManager();
bool bOk = false; bool bOk = false;
@ -670,12 +670,12 @@ void SAL_CALL OCommonEmbeddedObject::setContainerName( const OUString& sName )
m_aContainerName = sName; m_aContainerName = sName;
} }
com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL OCommonEmbeddedObject::getParent() throw (::com::sun::star::uno::RuntimeException, std::exception) css::uno::Reference< css::uno::XInterface > SAL_CALL OCommonEmbeddedObject::getParent() throw (css::uno::RuntimeException, std::exception)
{ {
return m_xParent; return m_xParent;
} }
void SAL_CALL OCommonEmbeddedObject::setParent( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& xParent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) void SAL_CALL OCommonEmbeddedObject::setParent( const css::uno::Reference< css::uno::XInterface >& xParent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception)
{ {
m_xParent = xParent; m_xParent = xParent;
if ( m_nObjectState != -1 && m_nObjectState != embed::EmbedStates::LOADED ) if ( m_nObjectState != -1 && m_nObjectState != embed::EmbedStates::LOADED )
@ -687,7 +687,7 @@ void SAL_CALL OCommonEmbeddedObject::setParent( const com::sun::star::uno::Refer
} }
// XDefaultSizeTransmitter // XDefaultSizeTransmitter
void SAL_CALL OCommonEmbeddedObject::setDefaultSize( const ::com::sun::star::awt::Size& rSize_100TH_MM ) throw (::com::sun::star::uno::RuntimeException, std::exception) void SAL_CALL OCommonEmbeddedObject::setDefaultSize( const css::awt::Size& rSize_100TH_MM ) throw (css::uno::RuntimeException, std::exception)
{ {
//#i103460# charts do not necessaryly have an own size within ODF files, in this case they need to use the size settings from the surrounding frame, which is made available with this method //#i103460# charts do not necessaryly have an own size within ODF files, in this case they need to use the size settings from the surrounding frame, which is made available with this method
m_aDefaultSizeForChart_In_100TH_MM = rSize_100TH_MM; m_aDefaultSizeForChart_In_100TH_MM = rSize_100TH_MM;

8
embeddedobj/source/commonembedding/specialobject.cxx
View File

@ -160,10 +160,10 @@ sal_Int32 SAL_CALL OSpecialEmbeddedObject::getMapUnit( sal_Int64 nAspect )
} }
void SAL_CALL OSpecialEmbeddedObject::changeState( sal_Int32 nNewState ) void SAL_CALL OSpecialEmbeddedObject::changeState( sal_Int32 nNewState )
throw ( ::com::sun::star::embed::UnreachableStateException, throw ( css::embed::UnreachableStateException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) css::uno::RuntimeException, std::exception )
{ {
if ( nNewState == embed::EmbedStates::UI_ACTIVE ) if ( nNewState == embed::EmbedStates::UI_ACTIVE )
nNewState = embed::EmbedStates::INPLACE_ACTIVE; nNewState = embed::EmbedStates::INPLACE_ACTIVE;

54
embeddedobj/source/commonembedding/xfactory.hxx
View File

@ -28,85 +28,85 @@
#include <comphelper/mimeconfighelper.hxx> #include <comphelper/mimeconfighelper.hxx>
class OOoEmbeddedObjectFactory : public ::cppu::WeakImplHelper< class OOoEmbeddedObjectFactory : public ::cppu::WeakImplHelper<
::com::sun::star::embed::XEmbeddedObjectCreator, css::embed::XEmbeddedObjectCreator,
css::embed::XLinkFactory, css::embed::XLinkFactory,
::com::sun::star::lang::XServiceInfo > css::lang::XServiceInfo >
{ {
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; css::uno::Reference< css::uno::XComponentContext > m_xContext;
::comphelper::MimeConfigurationHelper m_aConfigHelper; ::comphelper::MimeConfigurationHelper m_aConfigHelper;
public: public:
explicit OOoEmbeddedObjectFactory( explicit OOoEmbeddedObjectFactory(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ) const css::uno::Reference< css::uno::XComponentContext >& rxContext )
: m_xContext( rxContext ) : m_xContext( rxContext )
, m_aConfigHelper( rxContext ) , m_aConfigHelper( rxContext )
{ {
OSL_ENSURE( rxContext.is(), "No service manager is provided!\n" ); OSL_ENSURE( rxContext.is(), "No service manager is provided!\n" );
} }
static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); static css::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames();
static OUString SAL_CALL impl_staticGetImplementationName(); static OUString SAL_CALL impl_staticGetImplementationName();
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL static css::uno::Reference< css::uno::XInterface > SAL_CALL
impl_staticCreateSelfInstance( impl_staticCreateSelfInstance(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
// XEmbedObjectCreator // XEmbedObjectCreator
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitNew( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitNew( const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XEmbedObjectFactory // XEmbedObjectFactory
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, sal_Int32 nEntryConnectionMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceUserInit( const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, sal_Int32 nEntryConnectionMode, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XLinkCreator // XLinkCreator
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceLink( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XLinkFactory // XLinkFactory
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLinkUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceLinkUserInit( const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
}; };
class OOoSpecialEmbeddedObjectFactory : public ::cppu::WeakImplHelper< class OOoSpecialEmbeddedObjectFactory : public ::cppu::WeakImplHelper<
::com::sun::star::embed::XEmbedObjectFactory, css::embed::XEmbedObjectFactory,
::com::sun::star::lang::XServiceInfo > css::lang::XServiceInfo >
{ {
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; css::uno::Reference< css::uno::XComponentContext > m_xContext;
::comphelper::MimeConfigurationHelper m_aConfigHelper; ::comphelper::MimeConfigurationHelper m_aConfigHelper;
public: public:
explicit OOoSpecialEmbeddedObjectFactory( explicit OOoSpecialEmbeddedObjectFactory(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ) const css::uno::Reference< css::uno::XComponentContext >& rxContext )
: m_xContext( rxContext ) : m_xContext( rxContext )
, m_aConfigHelper( rxContext ) , m_aConfigHelper( rxContext )
{ {
OSL_ENSURE( rxContext.is(), "No service manager is provided!\n" ); OSL_ENSURE( rxContext.is(), "No service manager is provided!\n" );
} }
static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); static css::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames();
static OUString SAL_CALL impl_staticGetImplementationName(); static OUString SAL_CALL impl_staticGetImplementationName();
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL static css::uno::Reference< css::uno::XInterface > SAL_CALL
impl_staticCreateSelfInstance( impl_staticCreateSelfInstance(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
// XEmbedObjectFactory // XEmbedObjectFactory
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, sal_Int32 nEntryConnectionMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceUserInit( const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, sal_Int32 nEntryConnectionMode, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
}; };
#endif #endif

46
embeddedobj/source/general/docholder.cxx
View File

@ -361,7 +361,7 @@ bool DocumentHolder::SetFrameLMVisibility( const uno::Reference< frame::XFrame >
try try
{ {
uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; uno::Reference< css::frame::XLayoutManager > xLayoutManager;
uno::Reference< beans::XPropertySet > xPropSet( xFrame, uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xPropSet( xFrame, uno::UNO_QUERY_THROW );
xPropSet->getPropertyValue("LayoutManager") >>= xLayoutManager; xPropSet->getPropertyValue("LayoutManager") >>= xLayoutManager;
if ( xLayoutManager.is() ) if ( xLayoutManager.is() )
@ -516,10 +516,10 @@ uno::Reference< container::XIndexAccess > DocumentHolder::RetrieveOwnMenu_Impl()
{ {
uno::Reference< container::XIndexAccess > xResult; uno::Reference< container::XIndexAccess > xResult;
uno::Reference< ::com::sun::star::ui::XUIConfigurationManagerSupplier > xUIConfSupplier( uno::Reference< css::ui::XUIConfigurationManagerSupplier > xUIConfSupplier(
m_xComponent, m_xComponent,
uno::UNO_QUERY ); uno::UNO_QUERY );
uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > xUIConfigManager; uno::Reference< css::ui::XUIConfigurationManager > xUIConfigManager;
if( xUIConfSupplier.is()) if( xUIConfSupplier.is())
{ {
xUIConfigManager.set( xUIConfigManager.set(
@ -550,7 +550,7 @@ uno::Reference< container::XIndexAccess > DocumentHolder::RetrieveOwnMenu_Impl()
{ {
uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xModConfSupplier = uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xModConfSupplier =
ui::theModuleUIConfigurationManagerSupplier::get(m_xContext); ui::theModuleUIConfigurationManagerSupplier::get(m_xContext);
uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > xModUIConfMan( uno::Reference< css::ui::XUIConfigurationManager > xModUIConfMan(
xModConfSupplier->getUIConfigurationManager( aModuleIdent ), xModConfSupplier->getUIConfigurationManager( aModuleIdent ),
uno::UNO_QUERY_THROW ); uno::UNO_QUERY_THROW );
xResult = xModUIConfMan->getSettings( xResult = xModUIConfMan->getSettings(
@ -643,15 +643,15 @@ uno::Reference< container::XIndexAccess > DocumentHolder::MergeMenusForInplace(
} }
bool DocumentHolder::MergeMenus_Impl( const uno::Reference< ::com::sun::star::frame::XLayoutManager >& xOwnLM, bool DocumentHolder::MergeMenus_Impl( const uno::Reference< css::frame::XLayoutManager >& xOwnLM,
const uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContLM, const uno::Reference< css::frame::XLayoutManager >& xContLM,
const uno::Reference< frame::XDispatchProvider >& xContDisp, const uno::Reference< frame::XDispatchProvider >& xContDisp,
const OUString& aContModuleName ) const OUString& aContModuleName )
{ {
bool bMenuMerged = false; bool bMenuMerged = false;
try try
{ {
uno::Reference< ::com::sun::star::ui::XUIElementSettings > xUISettings( uno::Reference< css::ui::XUIElementSettings > xUISettings(
xContLM->getElement( xContLM->getElement(
OUString( "private:resource/menubar/menubar" ) ), OUString( "private:resource/menubar/menubar" ) ),
uno::UNO_QUERY_THROW ); uno::UNO_QUERY_THROW );
@ -663,7 +663,7 @@ bool DocumentHolder::MergeMenus_Impl( const uno::Reference< ::com::sun::star::fr
uno::Reference< frame::XDispatchProvider > xOwnDisp( m_xFrame, uno::UNO_QUERY_THROW ); uno::Reference< frame::XDispatchProvider > xOwnDisp( m_xFrame, uno::UNO_QUERY_THROW );
uno::Reference< container::XIndexAccess > xMergedMenu = MergeMenusForInplace( xContMenu, xContDisp, aContModuleName, xOwnMenu, xOwnDisp ); uno::Reference< container::XIndexAccess > xMergedMenu = MergeMenusForInplace( xContMenu, xContDisp, aContModuleName, xOwnMenu, xOwnDisp );
uno::Reference< ::com::sun::star::frame::XMenuBarMergingAcceptor > xMerge( xOwnLM, uno::Reference< css::frame::XMenuBarMergingAcceptor > xMerge( xOwnLM,
uno::UNO_QUERY_THROW ); uno::UNO_QUERY_THROW );
bMenuMerged = xMerge->setMergedMenuBar( xMergedMenu ); bMenuMerged = xMerge->setMergedMenuBar( xMergedMenu );
} }
@ -673,7 +673,7 @@ bool DocumentHolder::MergeMenus_Impl( const uno::Reference< ::com::sun::star::fr
return bMenuMerged; return bMenuMerged;
} }
bool DocumentHolder::ShowUI( const uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContainerLM, bool DocumentHolder::ShowUI( const uno::Reference< css::frame::XLayoutManager >& xContainerLM,
const uno::Reference< frame::XDispatchProvider >& xContainerDP, const uno::Reference< frame::XDispatchProvider >& xContainerDP,
const OUString& aContModuleName ) const OUString& aContModuleName )
{ {
@ -681,8 +681,8 @@ bool DocumentHolder::ShowUI( const uno::Reference< ::com::sun::star::frame::XLay
if ( xContainerLM.is() ) if ( xContainerLM.is() )
{ {
// the LM of the embedded frame and its current DockingAreaAcceptor // the LM of the embedded frame and its current DockingAreaAcceptor
uno::Reference< ::com::sun::star::frame::XLayoutManager > xOwnLM; uno::Reference< css::frame::XLayoutManager > xOwnLM;
uno::Reference< ::com::sun::star::ui::XDockingAreaAcceptor > xDocAreaAcc; uno::Reference< css::ui::XDockingAreaAcceptor > xDocAreaAcc;
try try
{ {
@ -746,10 +746,10 @@ bool DocumentHolder::ShowUI( const uno::Reference< ::com::sun::star::frame::XLay
if ( bLock ) if ( bLock )
xOwnLM->lock(); xOwnLM->lock();
xOwnLM->setVisible( sal_False ); xOwnLM->setVisible( sal_False );
xOwnLM->setDockingAreaAcceptor( uno::Reference< ::com::sun::star::ui::XDockingAreaAcceptor >() ); xOwnLM->setDockingAreaAcceptor( uno::Reference< css::ui::XDockingAreaAcceptor >() );
// unmerge menu // unmerge menu
uno::Reference< ::com::sun::star::frame::XMenuBarMergingAcceptor > xMerge( xOwnLM, uno::UNO_QUERY_THROW ); uno::Reference< css::frame::XMenuBarMergingAcceptor > xMerge( xOwnLM, uno::UNO_QUERY_THROW );
xMerge->removeMergedMenuBar(); xMerge->removeMergedMenuBar();
} }
catch( const uno::Exception& ) {} catch( const uno::Exception& ) {}
@ -771,13 +771,13 @@ bool DocumentHolder::ShowUI( const uno::Reference< ::com::sun::star::frame::XLay
} }
bool DocumentHolder::HideUI( const uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContainerLM ) bool DocumentHolder::HideUI( const uno::Reference< css::frame::XLayoutManager >& xContainerLM )
{ {
bool bResult = false; bool bResult = false;
if ( xContainerLM.is() ) if ( xContainerLM.is() )
{ {
uno::Reference< ::com::sun::star::frame::XLayoutManager > xOwnLM; uno::Reference< css::frame::XLayoutManager > xOwnLM;
try { try {
uno::Reference< beans::XPropertySet > xPropSet( m_xFrame, uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xPropSet( m_xFrame, uno::UNO_QUERY_THROW );
@ -792,13 +792,13 @@ bool DocumentHolder::HideUI( const uno::Reference< ::com::sun::star::frame::XLay
if ( xSupp.is() ) if ( xSupp.is() )
xSupp->setActiveFrame( 0 ); xSupp->setActiveFrame( 0 );
uno::Reference< ::com::sun::star::ui::XDockingAreaAcceptor > xDocAreaAcc = xOwnLM->getDockingAreaAcceptor(); uno::Reference< css::ui::XDockingAreaAcceptor > xDocAreaAcc = xOwnLM->getDockingAreaAcceptor();
xOwnLM->setDockingAreaAcceptor( uno::Reference < ui::XDockingAreaAcceptor >() ); xOwnLM->setDockingAreaAcceptor( uno::Reference < ui::XDockingAreaAcceptor >() );
xOwnLM->lock(); xOwnLM->lock();
xOwnLM->setVisible( sal_False ); xOwnLM->setVisible( sal_False );
uno::Reference< ::com::sun::star::frame::XMenuBarMergingAcceptor > xMerge( xOwnLM, uno::UNO_QUERY_THROW ); uno::Reference< css::frame::XMenuBarMergingAcceptor > xMerge( xOwnLM, uno::UNO_QUERY_THROW );
xMerge->removeMergedMenuBar(); xMerge->removeMergedMenuBar();
xContainerLM->setDockingAreaAcceptor( xDocAreaAcc ); xContainerLM->setDockingAreaAcceptor( xDocAreaAcc );
@ -855,7 +855,7 @@ uno::Reference< frame::XFrame > DocumentHolder::GetDocFrame()
if ( m_xComponent.is() ) if ( m_xComponent.is() )
{ {
uno::Reference< ::com::sun::star::frame::XLayoutManager > xOwnLM; uno::Reference< css::frame::XLayoutManager > xOwnLM;
try { try {
uno::Reference< beans::XPropertySet > xPropSet( m_xFrame, uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xPropSet( m_xFrame, uno::UNO_QUERY_THROW );
xPropSet->getPropertyValue("LayoutManager") >>= xOwnLM; xPropSet->getPropertyValue("LayoutManager") >>= xOwnLM;
@ -1092,7 +1092,7 @@ awt::Rectangle DocumentHolder::AddBorderToArea( const awt::Rectangle& aRect )
} }
void SAL_CALL DocumentHolder::disposing( const com::sun::star::lang::EventObject& aSource ) void SAL_CALL DocumentHolder::disposing( const css::lang::EventObject& aSource )
throw (uno::RuntimeException, std::exception) throw (uno::RuntimeException, std::exception)
{ {
if ( m_xComponent.is() && m_xComponent == aSource.Source ) if ( m_xComponent.is() && m_xComponent == aSource.Source )
@ -1252,7 +1252,7 @@ awt::Rectangle SAL_CALL DocumentHolder::calcAdjustedRectangle( const awt::Rectan
return aResult; return aResult;
} }
void SAL_CALL DocumentHolder::activated( ) throw (::com::sun::star::uno::RuntimeException, std::exception) void SAL_CALL DocumentHolder::activated( ) throw (css::uno::RuntimeException, std::exception)
{ {
if ( (m_pEmbedObj->getStatus(embed::Aspects::MSOLE_CONTENT)&embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE) || if ( (m_pEmbedObj->getStatus(embed::Aspects::MSOLE_CONTENT)&embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE) ||
svt::EmbeddedObjectRef::IsGLChart(m_pEmbedObj) ) svt::EmbeddedObjectRef::IsGLChart(m_pEmbedObj) )
@ -1264,11 +1264,11 @@ void SAL_CALL DocumentHolder::activated( ) throw (::com::sun::star::uno::Runtim
{ {
m_pEmbedObj->changeState( embed::EmbedStates::UI_ACTIVE ); m_pEmbedObj->changeState( embed::EmbedStates::UI_ACTIVE );
} }
catch ( const com::sun::star::embed::StateChangeInProgressException& ) catch ( const css::embed::StateChangeInProgressException& )
{ {
// must catch this exception because focus is grabbed while UI activation in doVerb() // must catch this exception because focus is grabbed while UI activation in doVerb()
} }
catch ( const com::sun::star::uno::Exception& ) catch ( const css::uno::Exception& )
{ {
// no outgoing exceptions specified here // no outgoing exceptions specified here
} }
@ -1290,7 +1290,7 @@ void DocumentHolder::ResizeHatchWindow()
xHatchWindow->setHatchBorderSize( awt::Size( HATCH_BORDER_WIDTH, HATCH_BORDER_WIDTH ) ); xHatchWindow->setHatchBorderSize( awt::Size( HATCH_BORDER_WIDTH, HATCH_BORDER_WIDTH ) );
} }
void SAL_CALL DocumentHolder::deactivated( ) throw (::com::sun::star::uno::RuntimeException, std::exception) void SAL_CALL DocumentHolder::deactivated( ) throw (css::uno::RuntimeException, std::exception)
{ {
// deactivation is too unspecific to be useful; usually we only trigger code from activation // deactivation is too unspecific to be useful; usually we only trigger code from activation
// so UIDeactivation is actively triggered by the container // so UIDeactivation is actively triggered by the container

8
embeddedobj/source/inc/closepreventer.hxx
View File

@ -23,12 +23,12 @@
#include <com/sun/star/util/XCloseListener.hpp> #include <com/sun/star/util/XCloseListener.hpp>
#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase.hxx>
class OClosePreventer : public ::cppu::WeakImplHelper < ::com::sun::star::util::XCloseListener > class OClosePreventer : public ::cppu::WeakImplHelper < css::util::XCloseListener >
{ {
virtual void SAL_CALL queryClosing( const ::com::sun::star::lang::EventObject& Source, sal_Bool GetsOwnership ) throw (::com::sun::star::util::CloseVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL queryClosing( const css::lang::EventObject& Source, sal_Bool GetsOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL notifyClosing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL notifyClosing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
}; };
#endif #endif

382
embeddedobj/source/inc/commonembobj.hxx
View File

@ -71,12 +71,12 @@ namespace comphelper {
class Interceptor; class Interceptor;
class OCommonEmbeddedObject : public ::com::sun::star::embed::XEmbeddedObject class OCommonEmbeddedObject : public css::embed::XEmbeddedObject
, public ::com::sun::star::embed::XEmbedPersist2 , public css::embed::XEmbedPersist2
, public ::com::sun::star::embed::XLinkageSupport , public css::embed::XLinkageSupport
, public ::com::sun::star::embed::XInplaceObject , public css::embed::XInplaceObject
, public ::com::sun::star::container::XChild , public css::container::XChild
, public ::com::sun::star::chart2::XDefaultSizeTransmitter , public css::chart2::XDefaultSizeTransmitter
, public ::cppu::OWeakObject , public ::cppu::OWeakObject
{ {
protected: protected:
@ -95,11 +95,11 @@ protected:
sal_Int32 m_nTargetState; // should be -1 except during state changing sal_Int32 m_nTargetState; // should be -1 except during state changing
sal_Int32 m_nUpdateMode; sal_Int32 m_nUpdateMode;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; css::uno::Reference< css::uno::XComponentContext > m_xContext;
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aDocMediaDescriptor; css::uno::Sequence< css::beans::PropertyValue > m_aDocMediaDescriptor;
::com::sun::star::uno::Sequence< sal_Int8 > m_aClassID; css::uno::Sequence< sal_Int8 > m_aClassID;
OUString m_aClassName; OUString m_aClassName;
OUString m_aDocServiceName; OUString m_aDocServiceName;
@ -107,13 +107,13 @@ protected:
sal_Int64 m_nMiscStatus; sal_Int64 m_nMiscStatus;
::com::sun::star::uno::Sequence< ::com::sun::star::embed::VerbDescriptor > m_aObjectVerbs; css::uno::Sequence< css::embed::VerbDescriptor > m_aObjectVerbs;
::com::sun::star::uno::Sequence< sal_Int32 > m_aAcceptedStates; css::uno::Sequence< sal_Int32 > m_aAcceptedStates;
::com::sun::star::uno::Sequence< sal_Int32 > m_pIntermediateStatesSeqs[NUM_SUPPORTED_STATES][NUM_SUPPORTED_STATES]; css::uno::Sequence< sal_Int32 > m_pIntermediateStatesSeqs[NUM_SUPPORTED_STATES][NUM_SUPPORTED_STATES];
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int32 > > m_aVerbTable; css::uno::Sequence< css::uno::Sequence< sal_Int32 > > m_aVerbTable;
::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedClient > m_xClientSite; css::uno::Reference< css::embed::XEmbeddedClient > m_xClientSite;
OUString m_aContainerName; OUString m_aContainerName;
OUString m_aDefaultParentBaseURL; OUString m_aDefaultParentBaseURL;
@ -124,21 +124,21 @@ protected:
// following information will be used between SaveAs and SaveCompleted // following information will be used between SaveAs and SaveCompleted
bool m_bWaitSaveCompleted; bool m_bWaitSaveCompleted;
OUString m_aNewEntryName; OUString m_aNewEntryName;
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xNewParentStorage; css::uno::Reference< css::embed::XStorage > m_xNewParentStorage;
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xNewObjectStorage; css::uno::Reference< css::embed::XStorage > m_xNewObjectStorage;
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aNewDocMediaDescriptor; css::uno::Sequence< css::beans::PropertyValue > m_aNewDocMediaDescriptor;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xClientWindow; // ??? css::uno::Reference< css::awt::XWindow > m_xClientWindow; // ???
::com::sun::star::awt::Rectangle m_aOwnRectangle; css::awt::Rectangle m_aOwnRectangle;
::com::sun::star::awt::Rectangle m_aClipRectangle; css::awt::Rectangle m_aClipRectangle;
bool m_bIsLink; bool m_bIsLink;
// embedded object related stuff // embedded object related stuff
OUString m_aEntryName; OUString m_aEntryName;
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xParentStorage; css::uno::Reference< css::embed::XStorage > m_xParentStorage;
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xObjectStorage; css::uno::Reference< css::embed::XStorage > m_xObjectStorage;
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xRecoveryStorage; css::uno::Reference< css::embed::XStorage > m_xRecoveryStorage;
// link related stuff // link related stuff
OUString m_aLinkURL; OUString m_aLinkURL;
@ -146,34 +146,34 @@ protected:
bool m_bLinkHasPassword; bool m_bLinkHasPassword;
OUString m_aLinkPassword; OUString m_aLinkPassword;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xParent; css::uno::Reference< css::uno::XInterface > m_xParent;
bool m_bHasClonedSize; // the object has cached size bool m_bHasClonedSize; // the object has cached size
::com::sun::star::awt::Size m_aClonedSize; css::awt::Size m_aClonedSize;
sal_Int32 m_nClonedMapUnit; sal_Int32 m_nClonedMapUnit;
::com::sun::star::awt::Size m_aDefaultSizeForChart_In_100TH_MM;//#i103460# charts do not necessaryly have an own size within ODF files, in this case they need to use the size settings from the surrounding frame, which is made available with this member css::awt::Size m_aDefaultSizeForChart_In_100TH_MM;//#i103460# charts do not necessaryly have an own size within ODF files, in this case they need to use the size settings from the surrounding frame, which is made available with this member
private: private:
void CommonInit_Impl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aObjectProps ); void CommonInit_Impl( const css::uno::Sequence< css::beans::NamedValue >& aObjectProps );
void LinkInit_Impl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aObjectProps, void LinkInit_Impl( const css::uno::Sequence< css::beans::NamedValue >& aObjectProps,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aObjectDescr ); const css::uno::Sequence< css::beans::PropertyValue >& aObjectDescr );
void SwitchOwnPersistence( void SwitchOwnPersistence(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xNewParentStorage, const css::uno::Reference< css::embed::XStorage >& xNewParentStorage,
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xNewObjectStorage, const css::uno::Reference< css::embed::XStorage >& xNewObjectStorage,
const OUString& aNewName ); const OUString& aNewName );
void SwitchOwnPersistence( void SwitchOwnPersistence(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xNewParentStorage, const css::uno::Reference< css::embed::XStorage >& xNewParentStorage,
const OUString& aNewName ); const OUString& aNewName );
OUString GetDocumentServiceName() const { return m_aDocServiceName; } OUString GetDocumentServiceName() const { return m_aDocServiceName; }
OUString GetPresetFilterName() const { return m_aPresetFilterName; } OUString GetPresetFilterName() const { return m_aPresetFilterName; }
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > css::uno::Reference< css::io::XInputStream >
StoreDocumentToTempStream_Impl( sal_Int32 nStorageFormat, StoreDocumentToTempStream_Impl( sal_Int32 nStorageFormat,
const OUString& aBaseURL, const OUString& aBaseURL,
const OUString& aHierarchName ); const OUString& aHierarchName );
@ -186,14 +186,14 @@ private:
void SwitchStateTo_Impl( sal_Int32 nNextState ); void SwitchStateTo_Impl( sal_Int32 nNextState );
::com::sun::star::uno::Sequence< sal_Int32 > GetIntermediateStatesSequence_Impl( sal_Int32 nNewState ); css::uno::Sequence< sal_Int32 > GetIntermediateStatesSequence_Impl( sal_Int32 nNewState );
OUString GetFilterName( sal_Int32 nVersion ) const; OUString GetFilterName( sal_Int32 nVersion ) const;
::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > LoadDocumentFromStorage_Impl(); css::uno::Reference< css::util::XCloseable > LoadDocumentFromStorage_Impl();
::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > LoadLink_Impl(); css::uno::Reference< css::util::XCloseable > LoadLink_Impl();
::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > InitNewDocument_Impl(); css::uno::Reference< css::util::XCloseable > InitNewDocument_Impl();
void StoreDocToStorage_Impl( void StoreDocToStorage_Impl(
const css::uno::Reference<css::embed::XStorage>& xStorage, const css::uno::Reference<css::embed::XStorage>& xStorage,
@ -204,53 +204,53 @@ private:
bool bAttachToStorage ); bool bAttachToStorage );
void SwitchDocToStorage_Impl( void SwitchDocToStorage_Impl(
const ::com::sun::star::uno::Reference< ::com::sun::star::document::XStorageBasedDocument >& xDoc, const css::uno::Reference< css::document::XStorageBasedDocument >& xDoc,
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); const css::uno::Reference< css::embed::XStorage >& xStorage );
void FillDefaultLoadArgs_Impl( void FillDefaultLoadArgs_Impl(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rxStorage, const css::uno::Reference< css::embed::XStorage >& i_rxStorage,
::comphelper::NamedValueCollection& o_rLoadArgs ::comphelper::NamedValueCollection& o_rLoadArgs
) const; ) const;
void EmbedAndReparentDoc_Impl( void EmbedAndReparentDoc_Impl(
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable >& i_rxDocument const css::uno::Reference< css::util::XCloseable >& i_rxDocument
) const; ) const;
::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > CreateDocFromMediaDescr_Impl( css::uno::Reference< css::util::XCloseable > CreateDocFromMediaDescr_Impl(
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMedDescr ); const css::uno::Sequence< css::beans::PropertyValue >& aMedDescr );
::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > CreateTempDocFromLink_Impl(); css::uno::Reference< css::util::XCloseable > CreateTempDocFromLink_Impl();
OUString GetBaseURL_Impl() const; OUString GetBaseURL_Impl() const;
static OUString GetBaseURLFrom_Impl( static OUString GetBaseURLFrom_Impl(
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ); const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs );
public: public:
OCommonEmbeddedObject( OCommonEmbeddedObject(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aObjectProps ); const css::uno::Sequence< css::beans::NamedValue >& aObjectProps );
// no persistence for linked objects, so the descriptors are provided in constructor // no persistence for linked objects, so the descriptors are provided in constructor
OCommonEmbeddedObject( OCommonEmbeddedObject(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aObjectProps, const css::uno::Sequence< css::beans::NamedValue >& aObjectProps,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aObjectDescr ); const css::uno::Sequence< css::beans::PropertyValue >& aObjectDescr );
virtual ~OCommonEmbeddedObject(); virtual ~OCommonEmbeddedObject();
void SaveObject_Impl(); void SaveObject_Impl();
void requestPositioning( const ::com::sun::star::awt::Rectangle& aRect ); void requestPositioning( const css::awt::Rectangle& aRect );
// not a real listener and should not be // not a real listener and should not be
void PostEvent_Impl( const OUString& aEventName ); void PostEvent_Impl( const OUString& aEventName );
// XInterface // XInterface
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
virtual void SAL_CALL acquire() virtual void SAL_CALL acquire()
throw() SAL_OVERRIDE; throw() SAL_OVERRIDE;
@ -261,165 +261,165 @@ public:
// XEmbeddedObject // XEmbeddedObject
virtual void SAL_CALL changeState( sal_Int32 nNewState ) virtual void SAL_CALL changeState( sal_Int32 nNewState )
throw ( ::com::sun::star::embed::UnreachableStateException, throw ( css::embed::UnreachableStateException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getReachableStates() virtual css::uno::Sequence< sal_Int32 > SAL_CALL getReachableStates()
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getCurrentState() virtual sal_Int32 SAL_CALL getCurrentState()
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL doVerb( sal_Int32 nVerbID ) virtual void SAL_CALL doVerb( sal_Int32 nVerbID )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( css::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::embed::UnreachableStateException, css::embed::UnreachableStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::embed::VerbDescriptor > SAL_CALL getSupportedVerbs() virtual css::uno::Sequence< css::embed::VerbDescriptor > SAL_CALL getSupportedVerbs()
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL setClientSite( virtual void SAL_CALL setClientSite(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedClient >& xClient ) const css::uno::Reference< css::embed::XEmbeddedClient >& xClient )
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedClient > SAL_CALL getClientSite() virtual css::uno::Reference< css::embed::XEmbeddedClient > SAL_CALL getClientSite()
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL update() virtual void SAL_CALL update()
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL setUpdateMode( sal_Int32 nMode ) virtual void SAL_CALL setUpdateMode( sal_Int32 nMode )
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Int64 SAL_CALL getStatus( sal_Int64 nAspect ) virtual sal_Int64 SAL_CALL getStatus( sal_Int64 nAspect )
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL setContainerName( const OUString& sName ) virtual void SAL_CALL setContainerName( const OUString& sName )
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XVisualObject // XVisualObject
virtual void SAL_CALL setVisualAreaSize( sal_Int64 nAspect, const ::com::sun::star::awt::Size& aSize ) virtual void SAL_CALL setVisualAreaSize( sal_Int64 nAspect, const css::awt::Size& aSize )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( css::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect ) virtual css::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( css::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect ) virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( css::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getMapUnit( sal_Int64 nAspect ) virtual sal_Int32 SAL_CALL getMapUnit( sal_Int64 nAspect )
throw ( ::com::sun::star::uno::Exception, throw ( css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XEmbedPersist // XEmbedPersist
virtual void SAL_CALL setPersistentEntry( virtual void SAL_CALL setPersistentEntry(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const css::uno::Reference< css::embed::XStorage >& xStorage,
const OUString& sEntName, const OUString& sEntName,
sal_Int32 nEntryConnectionMode, sal_Int32 nEntryConnectionMode,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( css::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::io::IOException, css::io::IOException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL storeToEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) virtual void SAL_CALL storeToEntry( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( css::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::io::IOException, css::io::IOException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL storeAsEntry( virtual void SAL_CALL storeAsEntry(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const css::uno::Reference< css::embed::XStorage >& xStorage,
const OUString& sEntName, const OUString& sEntName,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( css::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::io::IOException, css::io::IOException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL saveCompleted( sal_Bool bUseNew ) virtual void SAL_CALL saveCompleted( sal_Bool bUseNew )
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL hasEntry() virtual sal_Bool SAL_CALL hasEntry()
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual OUString SAL_CALL getEntryName() virtual OUString SAL_CALL getEntryName()
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XLinkageSupport // XLinkageSupport
virtual void SAL_CALL breakLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, virtual void SAL_CALL breakLink( const css::uno::Reference< css::embed::XStorage >& xStorage,
const OUString& sEntName ) const OUString& sEntName )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( css::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::io::IOException, css::io::IOException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isLink() virtual sal_Bool SAL_CALL isLink()
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual OUString SAL_CALL getLinkURL() virtual OUString SAL_CALL getLinkURL()
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XCommonEmbedPersist // XCommonEmbedPersist
virtual void SAL_CALL storeOwn() virtual void SAL_CALL storeOwn()
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::io::IOException, css::io::IOException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isReadonly() virtual sal_Bool SAL_CALL isReadonly()
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL reload( virtual void SAL_CALL reload(
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( css::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::io::IOException, css::io::IOException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XEmbedPersist2 // XEmbedPersist2
@ -428,75 +428,75 @@ public:
// XInplaceObject // XInplaceObject
virtual void SAL_CALL setObjectRectangles( const ::com::sun::star::awt::Rectangle& aPosRect, virtual void SAL_CALL setObjectRectangles( const css::awt::Rectangle& aPosRect,
const ::com::sun::star::awt::Rectangle& aClipRect ) const css::awt::Rectangle& aClipRect )
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL enableModeless( sal_Bool bEnable ) virtual void SAL_CALL enableModeless( sal_Bool bEnable )
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL translateAccelerators( virtual void SAL_CALL translateAccelerators(
const ::com::sun::star::uno::Sequence< ::com::sun::star::awt::KeyEvent >& aKeys ) const css::uno::Sequence< css::awt::KeyEvent >& aKeys )
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XClassifiedObject // XClassifiedObject
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getClassID() virtual css::uno::Sequence< sal_Int8 > SAL_CALL getClassID()
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual OUString SAL_CALL getClassName() virtual OUString SAL_CALL getClassName()
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL setClassInfo( virtual void SAL_CALL setClassInfo(
const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName ) const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName )
throw ( ::com::sun::star::lang::NoSupportException, throw ( css::lang::NoSupportException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XComponentSupplier // XComponentSupplier
virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > SAL_CALL getComponent() virtual css::uno::Reference< css::util::XCloseable > SAL_CALL getComponent()
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XStateChangeBroadcaster // XStateChangeBroadcaster
virtual void SAL_CALL addStateChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStateChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addStateChangeListener( const css::uno::Reference< css::embed::XStateChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeStateChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStateChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeStateChangeListener( const css::uno::Reference< css::embed::XStateChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XCloseable // XCloseable
virtual void SAL_CALL close( sal_Bool DeliverOwnership ) virtual void SAL_CALL close( sal_Bool DeliverOwnership )
throw ( ::com::sun::star::util::CloseVetoException, throw ( css::util::CloseVetoException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL addCloseListener( virtual void SAL_CALL addCloseListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener >& Listener ) const css::uno::Reference< css::util::XCloseListener >& Listener )
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL removeCloseListener( virtual void SAL_CALL removeCloseListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener >& Listener ) const css::uno::Reference< css::util::XCloseListener >& Listener )
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XEventBroadcaster // XEventBroadcaster
virtual void SAL_CALL addEventListener( virtual void SAL_CALL addEventListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& Listener ) const css::uno::Reference< css::document::XEventListener >& Listener )
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL removeEventListener( virtual void SAL_CALL removeEventListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& Listener ) const css::uno::Reference< css::document::XEventListener >& Listener )
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XChild // XChild
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XDefaultSizeTransmitter // XDefaultSizeTransmitter
//#i103460# charts do not necessaryly have an own size within ODF files, in this case they need to use the size settings from the surrounding frame, which is made available with this method //#i103460# charts do not necessaryly have an own size within ODF files, in this case they need to use the size settings from the surrounding frame, which is made available with this method
virtual void SAL_CALL setDefaultSize( const ::com::sun::star::awt::Size& rSize_100TH_MM ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setDefaultSize( const css::awt::Size& rSize_100TH_MM ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
}; };
#endif #endif

118
embeddedobj/source/inc/docholder.hxx
View File

@ -42,30 +42,30 @@ class Interceptor;
class DocumentHolder : class DocumentHolder :
public ::cppu::WeakImplHelper< public ::cppu::WeakImplHelper<
::com::sun::star::util::XCloseListener, css::util::XCloseListener,
::com::sun::star::frame::XTerminateListener, css::frame::XTerminateListener,
::com::sun::star::util::XModifyListener, css::util::XModifyListener,
::com::sun::star::document::XEventListener, css::document::XEventListener,
::com::sun::star::frame::XBorderResizeListener, css::frame::XBorderResizeListener,
::com::sun::star::embed::XHatchWindowController > css::embed::XHatchWindowController >
{ {
private: private:
OCommonEmbeddedObject* m_pEmbedObj; OCommonEmbeddedObject* m_pEmbedObj;
Interceptor* m_pInterceptor; Interceptor* m_pInterceptor;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor > m_xOutplaceInterceptor; css::uno::Reference< css::frame::XDispatchProviderInterceptor > m_xOutplaceInterceptor;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; css::uno::Reference< css::uno::XComponentContext > m_xContext;
::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > m_xComponent; css::uno::Reference< css::util::XCloseable > m_xComponent;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; css::uno::Reference< css::frame::XFrame > m_xFrame;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xOwnWindow; // set for inplace objects css::uno::Reference< css::awt::XWindow > m_xOwnWindow; // set for inplace objects
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xHatchWindow; // set for inplace objects css::uno::Reference< css::awt::XWindow > m_xHatchWindow; // set for inplace objects
::com::sun::star::awt::Rectangle m_aObjRect; css::awt::Rectangle m_aObjRect;
::com::sun::star::frame::BorderWidths m_aBorderWidths; css::frame::BorderWidths m_aBorderWidths;
OUString m_aContainerName; OUString m_aContainerName;
OUString m_aDocumentNamePart; OUString m_aDocumentNamePart;
@ -79,49 +79,49 @@ private:
sal_Int32 m_nNoBorderResizeReact; sal_Int32 m_nNoBorderResizeReact;
sal_Int32 m_nNoResizeReact; sal_Int32 m_nNoResizeReact;
::com::sun::star::uno::Reference< ::com::sun::star::ui::XDockingAreaAcceptor > m_xCachedDocAreaAcc; css::uno::Reference< css::ui::XDockingAreaAcceptor > m_xCachedDocAreaAcc;
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > m_aOutplaceFrameProps; css::uno::Sequence< css::uno::Any > m_aOutplaceFrameProps;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > GetDocFrame(); css::uno::Reference< css::frame::XFrame > GetDocFrame();
bool LoadDocToFrame( bool ); bool LoadDocToFrame( bool );
::com::sun::star::awt::Rectangle CalculateBorderedArea( const ::com::sun::star::awt::Rectangle& aRect ); css::awt::Rectangle CalculateBorderedArea( const css::awt::Rectangle& aRect );
::com::sun::star::awt::Rectangle AddBorderToArea( const ::com::sun::star::awt::Rectangle& aRect ); css::awt::Rectangle AddBorderToArea( const css::awt::Rectangle& aRect );
void ResizeWindows_Impl( const ::com::sun::star::awt::Rectangle& aHatchRect ); void ResizeWindows_Impl( const css::awt::Rectangle& aHatchRect );
::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > RetrieveOwnMenu_Impl(); css::uno::Reference< css::container::XIndexAccess > RetrieveOwnMenu_Impl();
bool MergeMenus_Impl( bool MergeMenus_Impl(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& xOwnLM, const css::uno::Reference< css::frame::XLayoutManager >& xOwnLM,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContLM, const css::uno::Reference< css::frame::XLayoutManager >& xContLM,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xContDisp, const css::uno::Reference< css::frame::XDispatchProvider >& xContDisp,
const OUString& aContModuleName ); const OUString& aContModuleName );
public: public:
static void FindConnectPoints( static void FindConnectPoints(
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xMenu, const css::uno::Reference< css::container::XIndexAccess >& xMenu,
sal_Int32 nConnectPoints[2] ) sal_Int32 nConnectPoints[2] )
throw ( ::com::sun::star::uno::Exception ); throw ( css::uno::Exception );
static ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > MergeMenusForInplace( static css::uno::Reference< css::container::XIndexAccess > MergeMenusForInplace(
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xContMenu, const css::uno::Reference< css::container::XIndexAccess >& xContMenu,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xContDisp, const css::uno::Reference< css::frame::XDispatchProvider >& xContDisp,
const OUString& aContModuleName, const OUString& aContModuleName,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xOwnMenu, const css::uno::Reference< css::container::XIndexAccess >& xOwnMenu,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xOwnDisp ) const css::uno::Reference< css::frame::XDispatchProvider >& xOwnDisp )
throw ( ::com::sun::star::uno::Exception ); throw ( css::uno::Exception );
DocumentHolder( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, DocumentHolder( const css::uno::Reference< css::uno::XComponentContext >& xContext,
OCommonEmbeddedObject* pEmbObj ); OCommonEmbeddedObject* pEmbObj );
virtual ~DocumentHolder(); virtual ~DocumentHolder();
OCommonEmbeddedObject* GetEmbedObject() { return m_pEmbedObj; } OCommonEmbeddedObject* GetEmbedObject() { return m_pEmbedObj; }
void SetComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable >& xDoc, bool bReadOnly ); void SetComponent( const css::uno::Reference< css::util::XCloseable >& xDoc, bool bReadOnly );
void ResizeHatchWindow(); void ResizeHatchWindow();
void FreeOffice(); void FreeOffice();
@ -133,66 +133,66 @@ public:
return m_aContainerName + " - " + m_aDocumentNamePart; return m_aContainerName + " - " + m_aDocumentNamePart;
} }
void SetOutplaceFrameProperties( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aProps ) void SetOutplaceFrameProperties( const css::uno::Sequence< css::uno::Any >& aProps )
{ m_aOutplaceFrameProps = aProps; } { m_aOutplaceFrameProps = aProps; }
void PlaceFrame( const ::com::sun::star::awt::Rectangle& aNewRect ); void PlaceFrame( const css::awt::Rectangle& aNewRect );
static bool SetFrameLMVisibility( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, static bool SetFrameLMVisibility( const css::uno::Reference< css::frame::XFrame >& xFrame,
bool bVisible ); bool bVisible );
bool ShowInplace( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent, bool ShowInplace( const css::uno::Reference< css::awt::XWindowPeer >& xParent,
const ::com::sun::star::awt::Rectangle& aRectangleToShow, const css::awt::Rectangle& aRectangleToShow,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xContainerDP ); const css::uno::Reference< css::frame::XDispatchProvider >& xContainerDP );
bool ShowUI( bool ShowUI(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContainerLM, const css::uno::Reference< css::frame::XLayoutManager >& xContainerLM,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xContainerDP, const css::uno::Reference< css::frame::XDispatchProvider >& xContainerDP,
const OUString& aContModuleName ); const OUString& aContModuleName );
bool HideUI( bool HideUI(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContainerLM ); const css::uno::Reference< css::frame::XLayoutManager >& xContainerLM );
void Show(); void Show();
bool SetExtent( sal_Int64 nAspect, const ::com::sun::star::awt::Size& aSize ); bool SetExtent( sal_Int64 nAspect, const css::awt::Size& aSize );
bool GetExtent( sal_Int64 nAspect, ::com::sun::star::awt::Size *pSize ); bool GetExtent( sal_Int64 nAspect, css::awt::Size *pSize );
sal_Int32 GetMapUnit( sal_Int64 nAspect ); sal_Int32 GetMapUnit( sal_Int64 nAspect );
void SetOutplaceDispatchInterceptor( void SetOutplaceDispatchInterceptor(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& const css::uno::Reference< css::frame::XDispatchProviderInterceptor >&
xOutplaceInterceptor ) xOutplaceInterceptor )
{ {
m_xOutplaceInterceptor = xOutplaceInterceptor; m_xOutplaceInterceptor = xOutplaceInterceptor;
} }
::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > GetComponent() { return m_xComponent; } css::uno::Reference< css::util::XCloseable > GetComponent() { return m_xComponent; }
// XEventListener // XEventListener
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XCloseListener // XCloseListener
virtual void SAL_CALL queryClosing( const ::com::sun::star::lang::EventObject& Source, sal_Bool GetsOwnership ) throw (::com::sun::star::util::CloseVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL queryClosing( const css::lang::EventObject& Source, sal_Bool GetsOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL notifyClosing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL notifyClosing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XTerminateListener // XTerminateListener
virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XModifyListener // XModifyListener
virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XEventListener // XEventListener
virtual void SAL_CALL notifyEvent( const ::com::sun::star::document::EventObject& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL notifyEvent( const css::document::EventObject& Event ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XBorderResizeListener // XBorderResizeListener
virtual void SAL_CALL borderWidthsChanged( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& aObject, const ::com::sun::star::frame::BorderWidths& aNewSize ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL borderWidthsChanged( const css::uno::Reference< css::uno::XInterface >& aObject, const css::frame::BorderWidths& aNewSize ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XHatchWindowController // XHatchWindowController
virtual void SAL_CALL requestPositioning( const ::com::sun::star::awt::Rectangle& aRect ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL requestPositioning( const css::awt::Rectangle& aRect ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Rectangle SAL_CALL calcAdjustedRectangle( const ::com::sun::star::awt::Rectangle& aRect ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::awt::Rectangle SAL_CALL calcAdjustedRectangle( const css::awt::Rectangle& aRect ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL activated( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL activated( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL deactivated( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL deactivated( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
}; };
#endif #endif

232
embeddedobj/source/inc/dummyobject.hxx
View File

@ -45,27 +45,27 @@ namespace cppu {
} }
class ODummyEmbeddedObject : public ::cppu::WeakImplHelper class ODummyEmbeddedObject : public ::cppu::WeakImplHelper
< ::com::sun::star::embed::XEmbeddedObject < css::embed::XEmbeddedObject
, ::com::sun::star::embed::XEmbedPersist > , css::embed::XEmbedPersist >
{ {
::osl::Mutex m_aMutex; ::osl::Mutex m_aMutex;
::cppu::OMultiTypeInterfaceContainerHelper* m_pInterfaceContainer; ::cppu::OMultiTypeInterfaceContainerHelper* m_pInterfaceContainer;
bool m_bDisposed; bool m_bDisposed;
OUString m_aEntryName; OUString m_aEntryName;
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xParentStorage; css::uno::Reference< css::embed::XStorage > m_xParentStorage;
sal_Int32 m_nObjectState; sal_Int32 m_nObjectState;
::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedClient > m_xClientSite; css::uno::Reference< css::embed::XEmbeddedClient > m_xClientSite;
sal_Int64 m_nCachedAspect; sal_Int64 m_nCachedAspect;
::com::sun::star::awt::Size m_aCachedSize; css::awt::Size m_aCachedSize;
bool m_bHasCachedSize; bool m_bHasCachedSize;
// following information will be used between SaveAs and SaveCompleted // following information will be used between SaveAs and SaveCompleted
bool m_bWaitSaveCompleted; bool m_bWaitSaveCompleted;
OUString m_aNewEntryName; OUString m_aNewEntryName;
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xNewParentStorage; css::uno::Reference< css::embed::XStorage > m_xNewParentStorage;
protected: protected:
void CheckInit_WrongState(); //throw WrongStateException on m_nObjectState == -1 void CheckInit_WrongState(); //throw WrongStateException on m_nObjectState == -1
@ -88,193 +88,193 @@ public:
// XEmbeddedObject // XEmbeddedObject
virtual void SAL_CALL changeState( sal_Int32 nNewState ) virtual void SAL_CALL changeState( sal_Int32 nNewState )
throw ( ::com::sun::star::embed::UnreachableStateException, throw ( css::embed::UnreachableStateException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getReachableStates() virtual css::uno::Sequence< sal_Int32 > SAL_CALL getReachableStates()
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getCurrentState() virtual sal_Int32 SAL_CALL getCurrentState()
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL doVerb( sal_Int32 nVerbID ) virtual void SAL_CALL doVerb( sal_Int32 nVerbID )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( css::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::embed::UnreachableStateException, css::embed::UnreachableStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::embed::VerbDescriptor > SAL_CALL getSupportedVerbs() virtual css::uno::Sequence< css::embed::VerbDescriptor > SAL_CALL getSupportedVerbs()
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL setClientSite( virtual void SAL_CALL setClientSite(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedClient >& xClient ) const css::uno::Reference< css::embed::XEmbeddedClient >& xClient )
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedClient > SAL_CALL getClientSite() virtual css::uno::Reference< css::embed::XEmbeddedClient > SAL_CALL getClientSite()
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL update() virtual void SAL_CALL update()
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL setUpdateMode( sal_Int32 nMode ) virtual void SAL_CALL setUpdateMode( sal_Int32 nMode )
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Int64 SAL_CALL getStatus( sal_Int64 nAspect ) virtual sal_Int64 SAL_CALL getStatus( sal_Int64 nAspect )
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL setContainerName( const OUString& sName ) virtual void SAL_CALL setContainerName( const OUString& sName )
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XVisualObject // XVisualObject
virtual void SAL_CALL setVisualAreaSize( sal_Int64 nAspect, const ::com::sun::star::awt::Size& aSize ) virtual void SAL_CALL setVisualAreaSize( sal_Int64 nAspect, const css::awt::Size& aSize )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( css::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect ) virtual css::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( css::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect ) virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( css::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getMapUnit( sal_Int64 nAspect ) virtual sal_Int32 SAL_CALL getMapUnit( sal_Int64 nAspect )
throw ( ::com::sun::star::uno::Exception, throw ( css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XEmbedPersist // XEmbedPersist
virtual void SAL_CALL setPersistentEntry( virtual void SAL_CALL setPersistentEntry(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const css::uno::Reference< css::embed::XStorage >& xStorage,
const OUString& sEntName, const OUString& sEntName,
sal_Int32 nEntryConnectionMode, sal_Int32 nEntryConnectionMode,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( css::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::io::IOException, css::io::IOException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL storeToEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) virtual void SAL_CALL storeToEntry( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( css::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::io::IOException, css::io::IOException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL storeAsEntry( virtual void SAL_CALL storeAsEntry(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const css::uno::Reference< css::embed::XStorage >& xStorage,
const OUString& sEntName, const OUString& sEntName,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( css::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::io::IOException, css::io::IOException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL saveCompleted( sal_Bool bUseNew ) virtual void SAL_CALL saveCompleted( sal_Bool bUseNew )
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL hasEntry() virtual sal_Bool SAL_CALL hasEntry()
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual OUString SAL_CALL getEntryName() virtual OUString SAL_CALL getEntryName()
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XCommonEmbedPersist // XCommonEmbedPersist
virtual void SAL_CALL storeOwn() virtual void SAL_CALL storeOwn()
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::io::IOException, css::io::IOException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isReadonly() virtual sal_Bool SAL_CALL isReadonly()
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL reload( virtual void SAL_CALL reload(
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( css::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::io::IOException, css::io::IOException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XClassifiedObject // XClassifiedObject
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getClassID() virtual css::uno::Sequence< sal_Int8 > SAL_CALL getClassID()
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual OUString SAL_CALL getClassName() virtual OUString SAL_CALL getClassName()
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL setClassInfo( virtual void SAL_CALL setClassInfo(
const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName ) const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName )
throw ( ::com::sun::star::lang::NoSupportException, throw ( css::lang::NoSupportException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XComponentSupplier // XComponentSupplier
virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > SAL_CALL getComponent() virtual css::uno::Reference< css::util::XCloseable > SAL_CALL getComponent()
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XStateChangeBroadcaster // XStateChangeBroadcaster
virtual void SAL_CALL addStateChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStateChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addStateChangeListener( const css::uno::Reference< css::embed::XStateChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeStateChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStateChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeStateChangeListener( const css::uno::Reference< css::embed::XStateChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XCloseable // XCloseable
virtual void SAL_CALL close( sal_Bool DeliverOwnership ) virtual void SAL_CALL close( sal_Bool DeliverOwnership )
throw ( ::com::sun::star::util::CloseVetoException, throw ( css::util::CloseVetoException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL addCloseListener( virtual void SAL_CALL addCloseListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener >& Listener ) const css::uno::Reference< css::util::XCloseListener >& Listener )
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL removeCloseListener( virtual void SAL_CALL removeCloseListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener >& Listener ) const css::uno::Reference< css::util::XCloseListener >& Listener )
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XEventBroadcaster // XEventBroadcaster
virtual void SAL_CALL addEventListener( virtual void SAL_CALL addEventListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& Listener ) const css::uno::Reference< css::document::XEventListener >& Listener )
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL removeEventListener( virtual void SAL_CALL removeEventListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& Listener ) const css::uno::Reference< css::document::XEventListener >& Listener )
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
}; };

84
embeddedobj/source/inc/intercept.hxx
View File

@ -31,9 +31,9 @@
class StatusChangeListenerContainer; class StatusChangeListenerContainer;
class DocumentHolder; class DocumentHolder;
class Interceptor : public ::cppu::WeakImplHelper< ::com::sun::star::frame::XDispatchProviderInterceptor, class Interceptor : public ::cppu::WeakImplHelper< css::frame::XDispatchProviderInterceptor,
::com::sun::star::frame::XInterceptorInfo, css::frame::XInterceptorInfo,
::com::sun::star::frame::XDispatch> css::frame::XDispatch>
{ {
public: public:
@ -45,87 +45,87 @@ public:
//XDispatch //XDispatch
virtual void SAL_CALL virtual void SAL_CALL
dispatch( dispatch(
const ::com::sun::star::util::URL& URL, const css::util::URL& URL,
const ::com::sun::star::uno::Sequence< const css::uno::Sequence<
::com::sun::star::beans::PropertyValue >& Arguments ) css::beans::PropertyValue >& Arguments )
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL virtual void SAL_CALL
addStatusListener( addStatusListener(
const ::com::sun::star::uno::Reference< const css::uno::Reference<
::com::sun::star::frame::XStatusListener >& Control, css::frame::XStatusListener >& Control,
const ::com::sun::star::util::URL& URL ) const css::util::URL& URL )
throw ( throw (
::com::sun::star::uno::RuntimeException, std::exception css::uno::RuntimeException, std::exception
) SAL_OVERRIDE; ) SAL_OVERRIDE;
virtual void SAL_CALL virtual void SAL_CALL
removeStatusListener( removeStatusListener(
const ::com::sun::star::uno::Reference< const css::uno::Reference<
::com::sun::star::frame::XStatusListener >& Control, css::frame::XStatusListener >& Control,
const ::com::sun::star::util::URL& URL ) const css::util::URL& URL )
throw ( throw (
::com::sun::star::uno::RuntimeException, std::exception css::uno::RuntimeException, std::exception
) SAL_OVERRIDE; ) SAL_OVERRIDE;
//XInterceptorInfo //XInterceptorInfo
virtual ::com::sun::star::uno::Sequence< OUString > virtual css::uno::Sequence< OUString >
SAL_CALL getInterceptedURLs( ) SAL_CALL getInterceptedURLs( )
throw ( throw (
::com::sun::star::uno::RuntimeException, std::exception css::uno::RuntimeException, std::exception
) SAL_OVERRIDE; ) SAL_OVERRIDE;
//XDispatchProvider ( inherited by XDispatchProviderInterceptor ) //XDispatchProvider ( inherited by XDispatchProviderInterceptor )
virtual ::com::sun::star::uno::Reference< virtual css::uno::Reference<
::com::sun::star::frame::XDispatch > SAL_CALL css::frame::XDispatch > SAL_CALL
queryDispatch( queryDispatch(
const ::com::sun::star::util::URL& URL, const css::util::URL& URL,
const OUString& TargetFrameName, const OUString& TargetFrameName,
sal_Int32 SearchFlags ) sal_Int32 SearchFlags )
throw ( throw (
::com::sun::star::uno::RuntimeException, std::exception css::uno::RuntimeException, std::exception
) SAL_OVERRIDE; ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< virtual css::uno::Sequence<
::com::sun::star::uno::Reference< css::uno::Reference<
::com::sun::star::frame::XDispatch > > SAL_CALL css::frame::XDispatch > > SAL_CALL
queryDispatches( queryDispatches(
const ::com::sun::star::uno::Sequence< const css::uno::Sequence<
::com::sun::star::frame::DispatchDescriptor >& Requests ) css::frame::DispatchDescriptor >& Requests )
throw ( throw (
::com::sun::star::uno::RuntimeException, std::exception css::uno::RuntimeException, std::exception
) SAL_OVERRIDE; ) SAL_OVERRIDE;
//XDispatchProviderInterceptor //XDispatchProviderInterceptor
virtual ::com::sun::star::uno::Reference< virtual css::uno::Reference<
::com::sun::star::frame::XDispatchProvider > SAL_CALL css::frame::XDispatchProvider > SAL_CALL
getSlaveDispatchProvider( ) getSlaveDispatchProvider( )
throw ( throw (
::com::sun::star::uno::RuntimeException, std::exception css::uno::RuntimeException, std::exception
) SAL_OVERRIDE; ) SAL_OVERRIDE;
virtual void SAL_CALL virtual void SAL_CALL
setSlaveDispatchProvider( setSlaveDispatchProvider(
const ::com::sun::star::uno::Reference< const css::uno::Reference<
::com::sun::star::frame::XDispatchProvider >& NewDispatchProvider ) css::frame::XDispatchProvider >& NewDispatchProvider )
throw ( throw (
::com::sun::star::uno::RuntimeException, std::exception css::uno::RuntimeException, std::exception
) SAL_OVERRIDE; ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< virtual css::uno::Reference<
::com::sun::star::frame::XDispatchProvider > SAL_CALL css::frame::XDispatchProvider > SAL_CALL
getMasterDispatchProvider( ) getMasterDispatchProvider( )
throw ( throw (
::com::sun::star::uno::RuntimeException, std::exception css::uno::RuntimeException, std::exception
) SAL_OVERRIDE; ) SAL_OVERRIDE;
virtual void SAL_CALL virtual void SAL_CALL
setMasterDispatchProvider( setMasterDispatchProvider(
const ::com::sun::star::uno::Reference< const css::uno::Reference<
::com::sun::star::frame::XDispatchProvider >& NewSupplier ) css::frame::XDispatchProvider >& NewSupplier )
throw ( throw (
::com::sun::star::uno::RuntimeException, std::exception css::uno::RuntimeException, std::exception
) SAL_OVERRIDE; ) SAL_OVERRIDE;
@ -135,10 +135,10 @@ private:
DocumentHolder* m_pDocHolder; DocumentHolder* m_pDocHolder;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xSlaveDispatchProvider; css::uno::Reference< css::frame::XDispatchProvider > m_xSlaveDispatchProvider;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xMasterDispatchProvider; css::uno::Reference< css::frame::XDispatchProvider > m_xMasterDispatchProvider;
static ::com::sun::star::uno::Sequence< OUString > m_aInterceptedURL; static css::uno::Sequence< OUString > m_aInterceptedURL;
cppu::OInterfaceContainerHelper* m_pDisposeEventListeners; cppu::OInterfaceContainerHelper* m_pDisposeEventListeners;
StatusChangeListenerContainer* m_pStatCL; StatusChangeListenerContainer* m_pStatCL;

370
embeddedobj/source/inc/oleembobj.hxx
View File

@ -104,11 +104,11 @@ public:
class OleComponent; class OleComponent;
class OwnView_Impl; class OwnView_Impl;
class OleEmbeddedObject : public ::cppu::WeakImplHelper class OleEmbeddedObject : public ::cppu::WeakImplHelper
< ::com::sun::star::embed::XEmbeddedObject < css::embed::XEmbeddedObject
, ::com::sun::star::embed::XEmbedPersist , css::embed::XEmbedPersist
, ::com::sun::star::embed::XLinkageSupport , css::embed::XLinkageSupport
, ::com::sun::star::embed::XInplaceObject , css::embed::XInplaceObject
, ::com::sun::star::container::XChild > , css::container::XChild >
{ {
friend class OleComponent; friend class OleComponent;
@ -125,26 +125,26 @@ class OleEmbeddedObject : public ::cppu::WeakImplHelper
sal_Int32 m_nTargetState; sal_Int32 m_nTargetState;
sal_Int32 m_nUpdateMode; sal_Int32 m_nUpdateMode;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory;
::com::sun::star::uno::Sequence< sal_Int8 > m_aClassID; css::uno::Sequence< sal_Int8 > m_aClassID;
OUString m_aClassName; OUString m_aClassName;
::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedClient > m_xClientSite; css::uno::Reference< css::embed::XEmbeddedClient > m_xClientSite;
OUString m_aContainerName; OUString m_aContainerName;
::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener > m_xClosePreventer; css::uno::Reference< css::util::XCloseListener > m_xClosePreventer;
bool m_bWaitSaveCompleted; bool m_bWaitSaveCompleted;
bool m_bNewVisReplInStream; bool m_bNewVisReplInStream;
::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xNewCachedVisRepl; css::uno::Reference< css::io::XStream > m_xNewCachedVisRepl;
OUString m_aNewEntryName; OUString m_aNewEntryName;
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xNewParentStorage; css::uno::Reference< css::embed::XStorage > m_xNewParentStorage;
::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xNewObjectStream; css::uno::Reference< css::io::XStream > m_xNewObjectStream;
bool m_bStoreLoaded; bool m_bStoreLoaded;
::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xCachedVisualRepresentation; css::uno::Reference< css::io::XStream > m_xCachedVisualRepresentation;
bool m_bVisReplInitialized; bool m_bVisReplInitialized;
bool m_bVisReplInStream; bool m_bVisReplInStream;
bool m_bStoreVisRepl; bool m_bStoreVisRepl;
@ -153,11 +153,11 @@ class OleEmbeddedObject : public ::cppu::WeakImplHelper
// TODO/LATER: may need to cache more than one aspect in future // TODO/LATER: may need to cache more than one aspect in future
bool m_bHasCachedSize; // the object has cached size bool m_bHasCachedSize; // the object has cached size
::com::sun::star::awt::Size m_aCachedSize; css::awt::Size m_aCachedSize;
sal_Int64 m_nCachedAspect; sal_Int64 m_nCachedAspect;
bool m_bHasSizeToSet; // the object has cached size that should be set to OLE component bool m_bHasSizeToSet; // the object has cached size that should be set to OLE component
::com::sun::star::awt::Size m_aSizeToSet; // this size might be different from the cached one ( scaling is applied ) css::awt::Size m_aSizeToSet; // this size might be different from the cached one ( scaling is applied )
sal_Int64 m_nAspectToSet; sal_Int64 m_nAspectToSet;
@ -169,8 +169,8 @@ class OleEmbeddedObject : public ::cppu::WeakImplHelper
// embedded object related stuff // embedded object related stuff
OUString m_aEntryName; OUString m_aEntryName;
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xParentStorage; css::uno::Reference< css::embed::XStorage > m_xParentStorage;
::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xObjectStream; css::uno::Reference< css::io::XStream > m_xObjectStream;
// link related stuff // link related stuff
OUString m_aLinkURL; // ??? OUString m_aLinkURL; // ???
@ -190,20 +190,20 @@ class OleEmbeddedObject : public ::cppu::WeakImplHelper
VerbExecutionController m_aVerbExecutionController; VerbExecutionController m_aVerbExecutionController;
// if the following member is set, the object works in wrapper mode // if the following member is set, the object works in wrapper mode
::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject > m_xWrappedObject; css::uno::Reference< css::embed::XEmbeddedObject > m_xWrappedObject;
bool m_bTriedConversion; bool m_bTriedConversion;
OUString m_aFilterName; // if m_bTriedConversion, then the filter detected by that OUString m_aFilterName; // if m_bTriedConversion, then the filter detected by that
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xParent; css::uno::Reference< css::uno::XInterface > m_xParent;
protected: protected:
::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > TryToGetAcceptableFormat_Impl( css::uno::Reference< css::io::XStream > TryToGetAcceptableFormat_Impl(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xStream ) const css::uno::Reference< css::io::XStream >& xStream )
throw ( ::com::sun::star::uno::Exception ); throw ( css::uno::Exception );
::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > GetNewFilledTempStream_Impl( css::uno::Reference< css::io::XStream > GetNewFilledTempStream_Impl(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream ) const css::uno::Reference< css::io::XInputStream >& xInStream )
throw( css::io::IOException, css::uno::RuntimeException ); throw( css::io::IOException, css::uno::RuntimeException );
#ifdef WNT #ifdef WNT
void SwitchComponentToRunningState_Impl(); void SwitchComponentToRunningState_Impl();
@ -211,55 +211,55 @@ protected:
void MakeEventListenerNotification_Impl( const OUString& aEventName ); void MakeEventListenerNotification_Impl( const OUString& aEventName );
#ifdef WNT #ifdef WNT
void StateChangeNotification_Impl( sal_Bool bBeforeChange, sal_Int32 nOldState, sal_Int32 nNewState ); void StateChangeNotification_Impl( sal_Bool bBeforeChange, sal_Int32 nOldState, sal_Int32 nNewState );
::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > GetStreamForSaving(); css::uno::Reference< css::io::XOutputStream > GetStreamForSaving();
::com::sun::star::uno::Sequence< sal_Int32 > GetIntermediateVerbsSequence_Impl( sal_Int32 nNewState ); css::uno::Sequence< sal_Int32 > GetIntermediateVerbsSequence_Impl( sal_Int32 nNewState );
::com::sun::star::uno::Sequence< sal_Int32 > GetReachableStatesList_Impl( css::uno::Sequence< sal_Int32 > GetReachableStatesList_Impl(
const ::com::sun::star::uno::Sequence< ::com::sun::star::embed::VerbDescriptor >& aVerbList ); const css::uno::Sequence< css::embed::VerbDescriptor >& aVerbList );
#endif #endif
void Dispose(); void Dispose();
void SwitchOwnPersistence( void SwitchOwnPersistence(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xNewParentStorage, const css::uno::Reference< css::embed::XStorage >& xNewParentStorage,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xNewObjectStream, const css::uno::Reference< css::io::XStream >& xNewObjectStream,
const OUString& aNewName ); const OUString& aNewName );
void SwitchOwnPersistence( void SwitchOwnPersistence(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xNewParentStorage, const css::uno::Reference< css::embed::XStorage >& xNewParentStorage,
const OUString& aNewName ); const OUString& aNewName );
void GetRidOfComponent(); void GetRidOfComponent();
void StoreToLocation_Impl( void StoreToLocation_Impl(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const css::uno::Reference< css::embed::XStorage >& xStorage,
const OUString& sEntName, const OUString& sEntName,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs,
bool bSaveAs ) bool bSaveAs )
throw ( ::com::sun::star::uno::Exception ); throw ( css::uno::Exception );
#ifdef WNT #ifdef WNT
void StoreObjectToStream( ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > xOutStream ) void StoreObjectToStream( css::uno::Reference< css::io::XOutputStream > xOutStream )
throw ( ::com::sun::star::uno::Exception ); throw ( css::uno::Exception );
#endif #endif
void InsertVisualCache_Impl( void InsertVisualCache_Impl(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xTargetStream, const css::uno::Reference< css::io::XStream >& xTargetStream,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xCachedVisualRepresentation ) const css::uno::Reference< css::io::XStream >& xCachedVisualRepresentation )
throw ( ::com::sun::star::uno::Exception ); throw ( css::uno::Exception );
void RemoveVisualCache_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xTargetStream ) void RemoveVisualCache_Impl( const css::uno::Reference< css::io::XStream >& xTargetStream )
throw ( ::com::sun::star::uno::Exception ); throw ( css::uno::Exception );
void SetVisReplInStream( bool bExists ); void SetVisReplInStream( bool bExists );
bool HasVisReplInStream(); bool HasVisReplInStream();
::com::sun::star::embed::VisualRepresentation GetVisualRepresentationInNativeFormat_Impl( css::embed::VisualRepresentation GetVisualRepresentationInNativeFormat_Impl(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > xCachedVisRepr ) const css::uno::Reference< css::io::XStream > xCachedVisRepr )
throw ( ::com::sun::star::uno::Exception ); throw ( css::uno::Exception );
::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > TryToRetrieveCachedVisualRepresentation_Impl( css::uno::Reference< css::io::XStream > TryToRetrieveCachedVisualRepresentation_Impl(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xStream, const css::uno::Reference< css::io::XStream >& xStream,
bool bAllowRepair50 = false ) bool bAllowRepair50 = false )
throw (); throw ();
#ifdef WNT #ifdef WNT
@ -275,23 +275,23 @@ protected:
// the following 4 methods are related to switch to wrapping mode // the following 4 methods are related to switch to wrapping mode
void MoveListeners(); void MoveListeners();
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > CreateTemporarySubstorage( OUString& o_aStorageName ); css::uno::Reference< css::embed::XStorage > CreateTemporarySubstorage( OUString& o_aStorageName );
OUString MoveToTemporarySubstream(); OUString MoveToTemporarySubstream();
bool TryToConvertToOOo(); bool TryToConvertToOOo();
public: public:
// in case a new object must be created the class ID must be specified // in case a new object must be created the class ID must be specified
OleEmbeddedObject( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory, OleEmbeddedObject( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory,
const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const css::uno::Sequence< sal_Int8 >& aClassID,
const OUString& aClassName ); const OUString& aClassName );
// in case object will be loaded from a persistent entry or from a file the class ID will be detected on loading // in case object will be loaded from a persistent entry or from a file the class ID will be detected on loading
// factory can do it for OOo objects, but for OLE objects OS dependent code is required // factory can do it for OOo objects, but for OLE objects OS dependent code is required
OleEmbeddedObject( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory, OleEmbeddedObject( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory,
bool bLink ); bool bLink );
#ifdef WNT #ifdef WNT
// this constructor let object be initialized from clipboard // this constructor let object be initialized from clipboard
OleEmbeddedObject( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory ); OleEmbeddedObject( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
#endif #endif
virtual ~OleEmbeddedObject(); virtual ~OleEmbeddedObject();
@ -305,232 +305,232 @@ public:
// XEmbeddedObject // XEmbeddedObject
virtual void SAL_CALL changeState( sal_Int32 nNewState ) virtual void SAL_CALL changeState( sal_Int32 nNewState )
throw ( ::com::sun::star::embed::UnreachableStateException, throw ( css::embed::UnreachableStateException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getReachableStates() virtual css::uno::Sequence< sal_Int32 > SAL_CALL getReachableStates()
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getCurrentState() virtual sal_Int32 SAL_CALL getCurrentState()
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL doVerb( sal_Int32 nVerbID ) virtual void SAL_CALL doVerb( sal_Int32 nVerbID )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( css::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::embed::UnreachableStateException, css::embed::UnreachableStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::embed::VerbDescriptor > SAL_CALL getSupportedVerbs() virtual css::uno::Sequence< css::embed::VerbDescriptor > SAL_CALL getSupportedVerbs()
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL setClientSite( virtual void SAL_CALL setClientSite(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedClient >& xClient ) const css::uno::Reference< css::embed::XEmbeddedClient >& xClient )
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedClient > SAL_CALL getClientSite() virtual css::uno::Reference< css::embed::XEmbeddedClient > SAL_CALL getClientSite()
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL update() virtual void SAL_CALL update()
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL setUpdateMode( sal_Int32 nMode ) virtual void SAL_CALL setUpdateMode( sal_Int32 nMode )
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Int64 SAL_CALL getStatus( sal_Int64 nAspect ) virtual sal_Int64 SAL_CALL getStatus( sal_Int64 nAspect )
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL setContainerName( const OUString& sName ) virtual void SAL_CALL setContainerName( const OUString& sName )
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XVisualObject // XVisualObject
virtual void SAL_CALL setVisualAreaSize( sal_Int64 nAspect, const ::com::sun::star::awt::Size& aSize ) virtual void SAL_CALL setVisualAreaSize( sal_Int64 nAspect, const css::awt::Size& aSize )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( css::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect ) virtual css::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( css::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect ) virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( css::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getMapUnit( sal_Int64 nAspect ) virtual sal_Int32 SAL_CALL getMapUnit( sal_Int64 nAspect )
throw ( ::com::sun::star::uno::Exception, throw ( css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XEmbedPersist // XEmbedPersist
virtual void SAL_CALL setPersistentEntry( virtual void SAL_CALL setPersistentEntry(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const css::uno::Reference< css::embed::XStorage >& xStorage,
const OUString& sEntName, const OUString& sEntName,
sal_Int32 nEntryConnectionMode, sal_Int32 nEntryConnectionMode,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( css::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::io::IOException, css::io::IOException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL storeToEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) virtual void SAL_CALL storeToEntry( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( css::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::io::IOException, css::io::IOException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL storeAsEntry( virtual void SAL_CALL storeAsEntry(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const css::uno::Reference< css::embed::XStorage >& xStorage,
const OUString& sEntName, const OUString& sEntName,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( css::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::io::IOException, css::io::IOException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL saveCompleted( sal_Bool bUseNew ) virtual void SAL_CALL saveCompleted( sal_Bool bUseNew )
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL hasEntry() virtual sal_Bool SAL_CALL hasEntry()
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual OUString SAL_CALL getEntryName() virtual OUString SAL_CALL getEntryName()
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XLinkageSupport // XLinkageSupport
virtual void SAL_CALL breakLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, virtual void SAL_CALL breakLink( const css::uno::Reference< css::embed::XStorage >& xStorage,
const OUString& sEntName ) const OUString& sEntName )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( css::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::io::IOException, css::io::IOException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isLink() virtual sal_Bool SAL_CALL isLink()
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual OUString SAL_CALL getLinkURL() virtual OUString SAL_CALL getLinkURL()
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XCommonEmbedPersist // XCommonEmbedPersist
virtual void SAL_CALL storeOwn() virtual void SAL_CALL storeOwn()
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::io::IOException, css::io::IOException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isReadonly() virtual sal_Bool SAL_CALL isReadonly()
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL reload( virtual void SAL_CALL reload(
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( css::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::io::IOException, css::io::IOException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XClassifiedObject // XClassifiedObject
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getClassID() virtual css::uno::Sequence< sal_Int8 > SAL_CALL getClassID()
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual OUString SAL_CALL getClassName() virtual OUString SAL_CALL getClassName()
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL setClassInfo( virtual void SAL_CALL setClassInfo(
const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName ) const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName )
throw ( ::com::sun::star::lang::NoSupportException, throw ( css::lang::NoSupportException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XStateChangeBroadcaster // XStateChangeBroadcaster
virtual void SAL_CALL addStateChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStateChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addStateChangeListener( const css::uno::Reference< css::embed::XStateChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeStateChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStateChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeStateChangeListener( const css::uno::Reference< css::embed::XStateChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XComponentSupplier // XComponentSupplier
virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > SAL_CALL getComponent() virtual css::uno::Reference< css::util::XCloseable > SAL_CALL getComponent()
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XCloseable // XCloseable
virtual void SAL_CALL close( sal_Bool DeliverOwnership ) virtual void SAL_CALL close( sal_Bool DeliverOwnership )
throw ( ::com::sun::star::util::CloseVetoException, throw ( css::util::CloseVetoException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL addCloseListener( virtual void SAL_CALL addCloseListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener >& Listener ) const css::uno::Reference< css::util::XCloseListener >& Listener )
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL removeCloseListener( virtual void SAL_CALL removeCloseListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener >& Listener ) const css::uno::Reference< css::util::XCloseListener >& Listener )
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XEventBroadcaster // XEventBroadcaster
virtual void SAL_CALL addEventListener( virtual void SAL_CALL addEventListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& Listener ) const css::uno::Reference< css::document::XEventListener >& Listener )
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL removeEventListener( virtual void SAL_CALL removeEventListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& Listener ) const css::uno::Reference< css::document::XEventListener >& Listener )
throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XInplaceObject ( only for wrapping scenario here ) // XInplaceObject ( only for wrapping scenario here )
virtual void SAL_CALL setObjectRectangles( const ::com::sun::star::awt::Rectangle& aPosRect, virtual void SAL_CALL setObjectRectangles( const css::awt::Rectangle& aPosRect,
const ::com::sun::star::awt::Rectangle& aClipRect ) const css::awt::Rectangle& aClipRect )
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL enableModeless( sal_Bool bEnable ) virtual void SAL_CALL enableModeless( sal_Bool bEnable )
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL translateAccelerators( virtual void SAL_CALL translateAccelerators(
const ::com::sun::star::uno::Sequence< ::com::sun::star::awt::KeyEvent >& aKeys ) const css::uno::Sequence< css::awt::KeyEvent >& aKeys )
throw ( ::com::sun::star::embed::WrongStateException, throw ( css::embed::WrongStateException,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XChild ( only for wrapping scenario here ) // XChild ( only for wrapping scenario here )
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
}; };

62
embeddedobj/source/inc/specialobject.hxx
View File

@ -27,51 +27,51 @@
class OSpecialEmbeddedObject : public OCommonEmbeddedObject class OSpecialEmbeddedObject : public OCommonEmbeddedObject
{ {
private: private:
com::sun::star::awt::Size maSize; css::awt::Size maSize;
public: public:
OSpecialEmbeddedObject( OSpecialEmbeddedObject(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aObjectProps ); const css::uno::Sequence< css::beans::NamedValue >& aObjectProps );
// XInterface // XInterface
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
// XVisualObject // XVisualObject
virtual ::com::sun::star::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect ) virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( css::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL setVisualAreaSize( sal_Int64 nAspect, const ::com::sun::star::awt::Size& aSize ) virtual void SAL_CALL setVisualAreaSize( sal_Int64 nAspect, const css::awt::Size& aSize )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( css::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect ) virtual css::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( css::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getMapUnit( sal_Int64 nAspect ) virtual sal_Int32 SAL_CALL getMapUnit( sal_Int64 nAspect )
throw ( ::com::sun::star::uno::Exception, throw ( css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL changeState( sal_Int32 nNewState ) virtual void SAL_CALL changeState( sal_Int32 nNewState )
throw ( ::com::sun::star::embed::UnreachableStateException, throw ( css::embed::UnreachableStateException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL doVerb( sal_Int32 nVerbID ) virtual void SAL_CALL doVerb( sal_Int32 nVerbID )
throw ( ::com::sun::star::lang::IllegalArgumentException, throw ( css::lang::IllegalArgumentException,
::com::sun::star::embed::WrongStateException, css::embed::WrongStateException,
::com::sun::star::embed::UnreachableStateException, css::embed::UnreachableStateException,
::com::sun::star::uno::Exception, css::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
}; };
#endif #endif

30
embeddedobj/source/inc/xcreator.hxx
View File

@ -28,45 +28,45 @@
#include <comphelper/mimeconfighelper.hxx> #include <comphelper/mimeconfighelper.hxx>
class UNOEmbeddedObjectCreator : public ::cppu::WeakImplHelper< class UNOEmbeddedObjectCreator : public ::cppu::WeakImplHelper<
::com::sun::star::embed::XEmbeddedObjectCreator, css::embed::XEmbeddedObjectCreator,
::com::sun::star::lang::XServiceInfo > css::lang::XServiceInfo >
{ {
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; css::uno::Reference< css::uno::XComponentContext > m_xContext;
::comphelper::MimeConfigurationHelper m_aConfigHelper; ::comphelper::MimeConfigurationHelper m_aConfigHelper;
public: public:
UNOEmbeddedObjectCreator( UNOEmbeddedObjectCreator(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ) const css::uno::Reference< css::uno::XComponentContext >& rxContext )
: m_xContext( rxContext ) : m_xContext( rxContext )
, m_aConfigHelper( rxContext ) , m_aConfigHelper( rxContext )
{ {
OSL_ENSURE( rxContext.is(), "No service manager is provided!\n" ); OSL_ENSURE( rxContext.is(), "No service manager is provided!\n" );
} }
static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); static css::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames();
static OUString SAL_CALL impl_staticGetImplementationName(); static OUString SAL_CALL impl_staticGetImplementationName();
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL static css::uno::Reference< css::uno::XInterface > SAL_CALL
impl_staticCreateSelfInstance( impl_staticCreateSelfInstance(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
// XEmbedObjectCreator // XEmbedObjectCreator
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitNew( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitNew( const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMedDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMedDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XEmbedObjectFactory // XEmbedObjectFactory
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& sClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, sal_Int32 nEntryConnectionMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aObjectArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceUserInit( const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& sClassName, const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, sal_Int32 nEntryConnectionMode, const css::uno::Sequence< css::beans::PropertyValue >& aArgs, const css::uno::Sequence< css::beans::PropertyValue >& aObjectArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XLinkCreator // XLinkCreator
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceLink( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
}; };

14
embeddedobj/source/msole/closepreventer.cxx
View File

@ -21,21 +21,21 @@
#include <osl/diagnose.h> #include <osl/diagnose.h>
void SAL_CALL OClosePreventer::queryClosing( const ::com::sun::star::lang::EventObject&, sal_Bool ) void SAL_CALL OClosePreventer::queryClosing( const css::lang::EventObject&, sal_Bool )
throw (::com::sun::star::util::CloseVetoException, ::com::sun::star::uno::RuntimeException, std::exception) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception)
{ {
throw ::com::sun::star::util::CloseVetoException(); throw css::util::CloseVetoException();
} }
void SAL_CALL OClosePreventer::notifyClosing( const com::sun::star::lang::EventObject& ) void SAL_CALL OClosePreventer::notifyClosing( const css::lang::EventObject& )
throw (::com::sun::star::uno::RuntimeException, std::exception) throw (css::uno::RuntimeException, std::exception)
{ {
// just a disaster // just a disaster
OSL_FAIL( "The object can not be prevented from closing!\n" ); OSL_FAIL( "The object can not be prevented from closing!\n" );
} }
void SAL_CALL OClosePreventer::disposing( const com::sun::star::lang::EventObject& ) void SAL_CALL OClosePreventer::disposing( const css::lang::EventObject& )
throw (::com::sun::star::uno::RuntimeException, std::exception) throw (css::uno::RuntimeException, std::exception)
{ {
// just a disaster // just a disaster
OSL_FAIL( "The object can not be prevented from closing!\n" ); OSL_FAIL( "The object can not be prevented from closing!\n" );

8
embeddedobj/source/msole/mtnotification.hxx
View File

@ -32,17 +32,17 @@ class OleEmbeddedObject;
#define OLECOMP_ONVIEWCHANGE 1 #define OLECOMP_ONVIEWCHANGE 1
#define OLECOMP_ONCLOSE 2 #define OLECOMP_ONCLOSE 2
class MainThreadNotificationRequest : public cppu::WeakImplHelper< com::sun::star::awt::XCallback > class MainThreadNotificationRequest : public cppu::WeakImplHelper< css::awt::XCallback >
{ {
OleEmbeddedObject* m_pObject; OleEmbeddedObject* m_pObject;
::com::sun::star::uno::WeakReference< ::com::sun::star::embed::XEmbeddedObject > m_xObject; css::uno::WeakReference< css::embed::XEmbeddedObject > m_xObject;
sal_uInt16 m_nNotificationType; sal_uInt16 m_nNotificationType;
sal_uInt32 m_nAspect; sal_uInt32 m_nAspect;
public: public:
virtual void SAL_CALL notify (const com::sun::star::uno::Any& rUserData) virtual void SAL_CALL notify (const css::uno::Any& rUserData)
throw (com::sun::star::uno::RuntimeException); throw (css::uno::RuntimeException);
MainThreadNotificationRequest( const ::rtl::Reference< OleEmbeddedObject >& xObj, sal_uInt16 nNotificationType, sal_uInt32 nAspect = 0 ); MainThreadNotificationRequest( const ::rtl::Reference< OleEmbeddedObject >& xObj, sal_uInt16 nNotificationType, sal_uInt32 nAspect = 0 );
~MainThreadNotificationRequest(); ~MainThreadNotificationRequest();
}; };

12
embeddedobj/source/msole/olecomponent.cxx
View File

@ -1649,7 +1649,7 @@ sal_Bool SAL_CALL OleComponent::isDataFlavorSupported( const datatransfer::DataF
return sal_False; return sal_False;
} }
void SAL_CALL OleComponent::dispose() throw (::com::sun::star::uno::RuntimeException) void SAL_CALL OleComponent::dispose() throw (css::uno::RuntimeException)
{ {
try try
{ {
@ -1686,7 +1686,7 @@ void SAL_CALL OleComponent::removeEventListener( const uno::Reference< lang::XEv
xListener ); xListener );
} }
sal_Int64 SAL_CALL OleComponent::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException) sal_Int64 SAL_CALL OleComponent::getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException)
{ {
try try
{ {
@ -1719,13 +1719,13 @@ sal_Int64 SAL_CALL OleComponent::getSomething( const ::com::sun::star::uno::Sequ
return 0; return 0;
} }
sal_Bool SAL_CALL OleComponent::isModified() throw (::com::sun::star::uno::RuntimeException) sal_Bool SAL_CALL OleComponent::isModified() throw (css::uno::RuntimeException)
{ {
return m_bModified; return m_bModified;
} }
void SAL_CALL OleComponent::setModified( sal_Bool bModified ) void SAL_CALL OleComponent::setModified( sal_Bool bModified )
throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException) throw (css::beans::PropertyVetoException, css::uno::RuntimeException)
{ {
m_bModified = bModified; m_bModified = bModified;
@ -1752,7 +1752,7 @@ void SAL_CALL OleComponent::setModified( sal_Bool bModified )
} }
} }
void SAL_CALL OleComponent::addModifyListener( const com::sun::star::uno::Reference < com::sun::star::util::XModifyListener >& xListener ) throw(::com::sun::star::uno::RuntimeException) void SAL_CALL OleComponent::addModifyListener( const css::uno::Reference < css::util::XModifyListener >& xListener ) throw(css::uno::RuntimeException)
{ {
::osl::MutexGuard aGuard( m_aMutex ); ::osl::MutexGuard aGuard( m_aMutex );
if ( m_bDisposed ) if ( m_bDisposed )
@ -1764,7 +1764,7 @@ void SAL_CALL OleComponent::addModifyListener( const com::sun::star::uno::Refere
m_pInterfaceContainer->addInterface( cppu::UnoType<util::XModifyListener>::get(), xListener ); m_pInterfaceContainer->addInterface( cppu::UnoType<util::XModifyListener>::get(), xListener );
} }
void SAL_CALL OleComponent::removeModifyListener( const com::sun::star::uno::Reference < com::sun::star::util::XModifyListener >& xListener) throw(::com::sun::star::uno::RuntimeException) void SAL_CALL OleComponent::removeModifyListener( const css::uno::Reference < css::util::XModifyListener >& xListener) throw(css::uno::RuntimeException)
{ {
::osl::MutexGuard aGuard( m_aMutex ); ::osl::MutexGuard aGuard( m_aMutex );
if ( m_bDisposed ) if ( m_bDisposed )

66
embeddedobj/source/msole/olecomponent.hxx
View File

@ -52,9 +52,9 @@ class OleWrapperAdviseSink;
class OleEmbeddedObject; class OleEmbeddedObject;
struct OleComponentNative_Impl; struct OleComponentNative_Impl;
class OleComponent : public ::cppu::WeakImplHelper< ::com::sun::star::util::XCloseable, ::com::sun::star::lang::XComponent, class OleComponent : public ::cppu::WeakImplHelper< css::util::XCloseable, css::lang::XComponent,
::com::sun::star::lang::XUnoTunnel, ::com::sun::star::util::XModifiable, css::lang::XUnoTunnel, css::util::XModifiable,
::com::sun::star::datatransfer::XTransferable > css::datatransfer::XTransferable >
{ {
::osl::Mutex m_aMutex; ::osl::Mutex m_aMutex;
::cppu::OMultiTypeInterfaceContainerHelper* m_pInterfaceContainer; ::cppu::OMultiTypeInterfaceContainerHelper* m_pInterfaceContainer;
@ -70,10 +70,10 @@ class OleComponent : public ::cppu::WeakImplHelper< ::com::sun::star::util::XClo
sal_Int32 m_nOLEMiscFlags; sal_Int32 m_nOLEMiscFlags;
sal_Int32 m_nAdvConn; sal_Int32 m_nAdvConn;
::com::sun::star::uno::Sequence< ::com::sun::star::embed::VerbDescriptor > m_aVerbList; css::uno::Sequence< css::embed::VerbDescriptor > m_aVerbList;
::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > m_aDataFlavors; css::uno::Sequence< css::datatransfer::DataFlavor > m_aDataFlavors;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory;
sal_Bool m_bOleInitialized; sal_Bool m_bOleInitialized;
@ -89,7 +89,7 @@ class OleComponent : public ::cppu::WeakImplHelper< ::com::sun::star::util::XClo
public: public:
OleComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& m_xFactory, OleComponent( const css::uno::Reference< css::lang::XMultiServiceFactory >& m_xFactory,
OleEmbeddedObject* pOleObj ); OleEmbeddedObject* pOleObj );
virtual ~OleComponent(); virtual ~OleComponent();
@ -98,18 +98,18 @@ public:
void disconnectEmbeddedObject(); void disconnectEmbeddedObject();
static ::com::sun::star::awt::Size CalculateWithFactor( const ::com::sun::star::awt::Size& aSize, static css::awt::Size CalculateWithFactor( const css::awt::Size& aSize,
const ::com::sun::star::awt::Size& aMultiplier, const css::awt::Size& aMultiplier,
const ::com::sun::star::awt::Size& aDivisor ); const css::awt::Size& aDivisor );
::com::sun::star::awt::Size CalculateTheRealSize( const ::com::sun::star::awt::Size& aContSize, sal_Bool bUpdate ); css::awt::Size CalculateTheRealSize( const css::awt::Size& aContSize, sal_Bool bUpdate );
// ==== Initialization ================================================== // ==== Initialization ==================================================
void LoadEmbeddedObject( const OUString& aTempURL ); void LoadEmbeddedObject( const OUString& aTempURL );
void CreateObjectFromClipboard(); void CreateObjectFromClipboard();
void CreateNewEmbeddedObject( const ::com::sun::star::uno::Sequence< sal_Int8 >& aSeqCLSID ); void CreateNewEmbeddedObject( const css::uno::Sequence< sal_Int8 >& aSeqCLSID );
void CreateObjectFromData( void CreateObjectFromData(
const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTransfer ); const css::uno::Reference< css::datatransfer::XTransferable >& xTransfer );
void CreateObjectFromFile( const OUString& aFileName ); void CreateObjectFromFile( const OUString& aFileName );
void CreateLinkFromFile( const OUString& aFileName ); void CreateLinkFromFile( const OUString& aFileName );
void InitEmbeddedCopyOfLink( OleComponent* pOleLinkComponent ); void InitEmbeddedCopyOfLink( OleComponent* pOleLinkComponent );
@ -118,19 +118,19 @@ public:
void RunObject(); // switch OLE object to running state void RunObject(); // switch OLE object to running state
void CloseObject(); // switch OLE object to loaded state void CloseObject(); // switch OLE object to loaded state
::com::sun::star::uno::Sequence< ::com::sun::star::embed::VerbDescriptor > GetVerbList(); css::uno::Sequence< css::embed::VerbDescriptor > GetVerbList();
void ExecuteVerb( sal_Int32 nVerbID ); void ExecuteVerb( sal_Int32 nVerbID );
void SetHostName( const OUString& aContName, const OUString& aEmbDocName ); void SetHostName( const OUString& aContName, const OUString& aEmbDocName );
void SetExtent( const ::com::sun::star::awt::Size& aVisAreaSize, sal_Int64 nAspect ); void SetExtent( const css::awt::Size& aVisAreaSize, sal_Int64 nAspect );
::com::sun::star::awt::Size GetExtent( sal_Int64 nAspect ); css::awt::Size GetExtent( sal_Int64 nAspect );
::com::sun::star::awt::Size GetCachedExtent( sal_Int64 nAspect ); css::awt::Size GetCachedExtent( sal_Int64 nAspect );
::com::sun::star::awt::Size GetReccomendedExtent( sal_Int64 nAspect ); css::awt::Size GetReccomendedExtent( sal_Int64 nAspect );
sal_Int64 GetMiscStatus( sal_Int64 nAspect ); sal_Int64 GetMiscStatus( sal_Int64 nAspect );
::com::sun::star::uno::Sequence< sal_Int8 > GetCLSID(); css::uno::Sequence< sal_Int8 > GetCLSID();
sal_Bool IsWorkaroundActive() { return m_bWorkaroundActive; } sal_Bool IsWorkaroundActive() { return m_bWorkaroundActive; }
sal_Bool IsDirty(); sal_Bool IsDirty();
@ -143,29 +143,29 @@ public:
void OnClose_Impl(); void OnClose_Impl();
// XCloseable // XCloseable
virtual void SAL_CALL close( sal_Bool DeliverOwnership ) throw (::com::sun::star::util::CloseVetoException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL close( sal_Bool DeliverOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException);
virtual void SAL_CALL addCloseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener >& Listener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addCloseListener( const css::uno::Reference< css::util::XCloseListener >& Listener ) throw (css::uno::RuntimeException);
virtual void SAL_CALL removeCloseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener >& Listener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& Listener ) throw (css::uno::RuntimeException);
// XTransferable // XTransferable
virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw (::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) throw (css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) throw (::com::sun::star::uno::RuntimeException); virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) throw (css::uno::RuntimeException);
virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) throw (css::uno::RuntimeException);
// XComponent // XComponent
virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL dispose() throw (css::uno::RuntimeException);
virtual void SAL_CALL addEventListener(const com::sun::star::uno::Reference < com::sun::star::lang::XEventListener >& aListener) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addEventListener(const css::uno::Reference < css::lang::XEventListener >& aListener) throw (css::uno::RuntimeException);
virtual void SAL_CALL removeEventListener(const com::sun::star::uno::Reference < com::sun::star::lang::XEventListener >& aListener) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeEventListener(const css::uno::Reference < css::lang::XEventListener >& aListener) throw (css::uno::RuntimeException);
// XUnoTunnel // XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException) ; virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException) ;
// XModifiable // XModifiable
virtual sal_Bool SAL_CALL isModified() throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException);
virtual void SAL_CALL setModified( sal_Bool bModified ) virtual void SAL_CALL setModified( sal_Bool bModified )
throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException); throw (css::beans::PropertyVetoException, css::uno::RuntimeException);
virtual void SAL_CALL addModifyListener( const com::sun::star::uno::Reference < com::sun::star::util::XModifyListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addModifyListener( const css::uno::Reference < css::util::XModifyListener >& xListener ) throw(css::uno::RuntimeException);
virtual void SAL_CALL removeModifyListener( const com::sun::star::uno::Reference < com::sun::star::util::XModifyListener >& xListener) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeModifyListener( const css::uno::Reference < css::util::XModifyListener >& xListener) throw(css::uno::RuntimeException);
}; };
#endif #endif

10
embeddedobj/source/msole/oleembed.cxx
View File

@ -692,8 +692,8 @@ namespace
//Dump the objects content to a tempfile, just the "CONTENTS" stream if //Dump the objects content to a tempfile, just the "CONTENTS" stream if
//there is one for non-compound documents, otherwise the whole content. //there is one for non-compound documents, otherwise the whole content.
//On success a file is returned which must be removed by the caller //On success a file is returned which must be removed by the caller
OUString lcl_ExtractObject(::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory, OUString lcl_ExtractObject(css::uno::Reference< css::lang::XMultiServiceFactory > xFactory,
::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > xObjectStream) css::uno::Reference< css::io::XStream > xObjectStream)
{ {
OUString sUrl; OUString sUrl;
@ -879,9 +879,9 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID )
if (!m_aTempDumpURL.isEmpty()) if (!m_aTempDumpURL.isEmpty())
{ {
uno::Reference< ::com::sun::star::system::XSystemShellExecute > xSystemShellExecute( uno::Reference< css::system::XSystemShellExecute > xSystemShellExecute(
::com::sun::star::system::SystemShellExecute::create(comphelper::getComponentContext(m_xFactory)) ); css::system::SystemShellExecute::create(comphelper::getComponentContext(m_xFactory)) );
xSystemShellExecute->execute(m_aTempDumpURL, OUString(), ::com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY); xSystemShellExecute->execute(m_aTempDumpURL, OUString(), css::system::SystemShellExecuteFlags::URIS_ONLY);
} }
else else
throw embed::UnreachableStateException(); throw embed::UnreachableStateException();

4
embeddedobj/source/msole/olemisc.cxx
View File

@ -665,7 +665,7 @@ void SAL_CALL OleEmbeddedObject::translateAccelerators(
// XChild // XChild
com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL OleEmbeddedObject::getParent() throw (::com::sun::star::uno::RuntimeException, std::exception) css::uno::Reference< css::uno::XInterface > SAL_CALL OleEmbeddedObject::getParent() throw (css::uno::RuntimeException, std::exception)
{ {
// begin wrapping related part ==================== // begin wrapping related part ====================
uno::Reference< container::XChild > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY ); uno::Reference< container::XChild > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@ -680,7 +680,7 @@ com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL OleEm
} }
void SAL_CALL OleEmbeddedObject::setParent( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& xParent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) void SAL_CALL OleEmbeddedObject::setParent( const css::uno::Reference< css::uno::XInterface >& xParent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception)
{ {
// begin wrapping related part ==================== // begin wrapping related part ====================
uno::Reference< container::XChild > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY ); uno::Reference< container::XChild > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );

2
embeddedobj/source/msole/ownview.cxx
View File

@ -186,7 +186,7 @@ bool OwnView_Impl::CreateModel( bool bUseNative )
OUString OwnView_Impl::GetFilterNameFromExtentionAndInStream( OUString OwnView_Impl::GetFilterNameFromExtentionAndInStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory, const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory,
const OUString& aNameWithExtention, const OUString& aNameWithExtention,
const uno::Reference< io::XInputStream >& xInputStream ) const uno::Reference< io::XInputStream >& xInputStream )
{ {

26
embeddedobj/source/msole/ownview.hxx
View File

@ -30,13 +30,13 @@
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
class OwnView_Impl : public ::cppu::WeakImplHelper < ::com::sun::star::util::XCloseListener, class OwnView_Impl : public ::cppu::WeakImplHelper < css::util::XCloseListener,
::com::sun::star::document::XEventListener > css::document::XEventListener >
{ {
::osl::Mutex m_aMutex; ::osl::Mutex m_aMutex;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; css::uno::Reference< css::frame::XModel > m_xModel;
OUString m_aTempFileURL; OUString m_aTempFileURL;
OUString m_aNativeTempURL; OUString m_aNativeTempURL;
@ -52,30 +52,30 @@ private:
bool CreateModel( bool bUseNative ); bool CreateModel( bool bUseNative );
bool ReadContentsAndGenerateTempFile( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xStream, bool bParseHeader ); bool ReadContentsAndGenerateTempFile( const css::uno::Reference< css::io::XInputStream >& xStream, bool bParseHeader );
void CreateNative(); void CreateNative();
public: public:
static OUString GetFilterNameFromExtentionAndInStream( static OUString GetFilterNameFromExtentionAndInStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory, const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory,
const OUString& aNameWithExtention, const OUString& aNameWithExtention,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInputStream ); const css::uno::Reference< css::io::XInputStream >& xInputStream );
OwnView_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory, OwnView_Impl( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xStream ); const css::uno::Reference< css::io::XInputStream >& xStream );
virtual ~OwnView_Impl(); virtual ~OwnView_Impl();
bool Open(); bool Open();
void Close(); void Close();
virtual void SAL_CALL notifyEvent( const ::com::sun::star::document::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL notifyEvent( const css::document::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL queryClosing( const ::com::sun::star::lang::EventObject& Source, sal_Bool GetsOwnership ) throw (::com::sun::star::util::CloseVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL queryClosing( const css::lang::EventObject& Source, sal_Bool GetsOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL notifyClosing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL notifyClosing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
}; };
#endif #endif

2
embeddedobj/source/msole/xdialogcreator.cxx
View File

@ -49,7 +49,7 @@ public:
InitializedOleGuard() InitializedOleGuard()
{ {
if ( !SUCCEEDED( OleInitialize( NULL ) ) ) if ( !SUCCEEDED( OleInitialize( NULL ) ) )
throw ::com::sun::star::uno::RuntimeException(); throw css::uno::RuntimeException();
} }
~InitializedOleGuard() ~InitializedOleGuard()

26
embeddedobj/source/msole/xdialogcreator.hxx
View File

@ -28,39 +28,39 @@
class MSOLEDialogObjectCreator : public ::cppu::WeakImplHelper< class MSOLEDialogObjectCreator : public ::cppu::WeakImplHelper<
::com::sun::star::embed::XInsertObjectDialog, css::embed::XInsertObjectDialog,
::com::sun::star::embed::XEmbedObjectClipboardCreator, css::embed::XEmbedObjectClipboardCreator,
::com::sun::star::lang::XServiceInfo > css::lang::XServiceInfo >
{ {
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory;
public: public:
MSOLEDialogObjectCreator( MSOLEDialogObjectCreator(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory ) const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory )
: m_xFactory( xFactory ) : m_xFactory( xFactory )
{ {
OSL_ENSURE( xFactory.is(), "No service manager is provided!\n" ); OSL_ENSURE( xFactory.is(), "No service manager is provided!\n" );
} }
static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); static css::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames();
static OUString SAL_CALL impl_staticGetImplementationName(); static OUString SAL_CALL impl_staticGetImplementationName();
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL static css::uno::Reference< css::uno::XInterface > SAL_CALL
impl_staticCreateSelfInstance( impl_staticCreateSelfInstance(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
// XInsertObjectDialog // XInsertObjectDialog
virtual ::com::sun::star::embed::InsertedObjectInfo SAL_CALL createInstanceByDialog( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual css::embed::InsertedObjectInfo SAL_CALL createInstanceByDialog( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException);
// XEmbedObjectClipboardCreator // XEmbedObjectClipboardCreator
virtual ::com::sun::star::embed::InsertedObjectInfo SAL_CALL createInstanceInitFromClipboard( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntryName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aObjectArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual css::embed::InsertedObjectInfo SAL_CALL createInstanceInitFromClipboard( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntryName, const css::uno::Sequence< css::beans::PropertyValue >& aObjectArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException);
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException);
}; };

30
embeddedobj/source/msole/xolefactory.hxx
View File

@ -29,43 +29,43 @@
class OleEmbeddedObjectFactory : public ::cppu::WeakImplHelper< class OleEmbeddedObjectFactory : public ::cppu::WeakImplHelper<
::com::sun::star::embed::XEmbeddedObjectCreator, css::embed::XEmbeddedObjectCreator,
::com::sun::star::lang::XServiceInfo > css::lang::XServiceInfo >
{ {
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory;
public: public:
OleEmbeddedObjectFactory( OleEmbeddedObjectFactory(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory ) const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory )
: m_xFactory( xFactory ) : m_xFactory( xFactory )
{ {
OSL_ENSURE( xFactory.is(), "No service manager is provided!\n" ); OSL_ENSURE( xFactory.is(), "No service manager is provided!\n" );
} }
static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); static css::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames();
static OUString SAL_CALL impl_staticGetImplementationName(); static OUString SAL_CALL impl_staticGetImplementationName();
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL static css::uno::Reference< css::uno::XInterface > SAL_CALL
impl_staticCreateSelfInstance( impl_staticCreateSelfInstance(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
// XEmbedObjectCreator // XEmbedObjectCreator
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitNew( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitNew( const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMedDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMedDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XEmbedObjectFactory // XEmbedObjectFactory
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, sal_Int32 nEntryConnectionMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceUserInit( const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, sal_Int32 nEntryConnectionMode, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XLinkCreator // XLinkCreator
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceLink( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
}; };

30
embeddedobj/test/MainThreadExecutor/xexecutor.hxx
View File

@ -28,45 +28,45 @@
#include <tools/link.hxx> #include <tools/link.hxx>
class UNOMainThreadExecutor : public ::cppu::WeakImplHelper< ::com::sun::star::task::XJob, class UNOMainThreadExecutor : public ::cppu::WeakImplHelper< css::task::XJob,
::com::sun::star::lang::XServiceInfo > css::lang::XServiceInfo >
{ {
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory;
public: public:
UNOMainThreadExecutor( UNOMainThreadExecutor(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory ) const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory )
: m_xFactory( xFactory ) : m_xFactory( xFactory )
{ {
} }
static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); static css::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames();
static OUString SAL_CALL impl_staticGetImplementationName(); static OUString SAL_CALL impl_staticGetImplementationName();
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL static css::uno::Reference< css::uno::XInterface > SAL_CALL
impl_staticCreateSelfInstance( impl_staticCreateSelfInstance(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
// XJob // XJob
virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual css::uno::Any SAL_CALL execute( const css::uno::Sequence< css::beans::NamedValue >& Arguments ) throw (css::lang::IllegalArgumentException, css::uno::Exception, css::uno::RuntimeException);
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException);
}; };
class MainThreadExecutor_Impl class MainThreadExecutor_Impl
{ {
::com::sun::star::uno::Reference< ::com::sun::star::task::XJob > m_xJob; css::uno::Reference< css::task::XJob > m_xJob;
::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > m_aArgs; css::uno::Sequence< css::beans::NamedValue > m_aArgs;
sal_Bool m_bExecuted; sal_Bool m_bExecuted;
public: public:
MainThreadExecutor_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XJob >& xJob, MainThreadExecutor_Impl( const css::uno::Reference< css::task::XJob >& xJob,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aArguments ); const css::uno::Sequence< css::beans::NamedValue >& aArguments );
void execute(); void execute();

22
embeddedobj/test/mtexecutor/bitmapcreator.hxx
View File

@ -28,30 +28,30 @@
#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase.hxx>
class VCLBitmapCreator : public ::cppu::WeakImplHelper< class VCLBitmapCreator : public ::cppu::WeakImplHelper<
::com::sun::star::lang::XSingleServiceFactory, css::lang::XSingleServiceFactory,
::com::sun::star::lang::XServiceInfo > css::lang::XServiceInfo >
{ {
public: public:
VCLBitmapCreator( VCLBitmapCreator(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory ) const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory )
{} {}
static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); static css::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames();
static OUString SAL_CALL impl_staticGetImplementationName(); static OUString SAL_CALL impl_staticGetImplementationName();
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
// XSingleServiceFactory // XSingleServiceFactory
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( ) throw (css::uno::Exception, css::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException);
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException);
}; };

28
embeddedobj/test/mtexecutor/mainthreadexecutor.hxx
View File

@ -31,43 +31,43 @@
class MainThreadExecutorRequest class MainThreadExecutorRequest
{ {
::com::sun::star::uno::Reference< ::com::sun::star::task::XJob > m_xJob; css::uno::Reference< css::task::XJob > m_xJob;
::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > m_aValues; css::uno::Sequence< css::beans::NamedValue > m_aValues;
public: public:
MainThreadExecutorRequest( MainThreadExecutorRequest(
const ::com::sun::star::uno::Reference< ::com::sun::star::task::XJob >& xJob, const css::uno::Reference< css::task::XJob >& xJob,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aValues ); const css::uno::Sequence< css::beans::NamedValue >& aValues );
void doIt(); void doIt();
}; };
class MainThreadExecutor : public ::cppu::WeakImplHelper< class MainThreadExecutor : public ::cppu::WeakImplHelper<
::com::sun::star::task::XJob, css::task::XJob,
::com::sun::star::lang::XServiceInfo > css::lang::XServiceInfo >
{ {
public: public:
MainThreadExecutor( MainThreadExecutor(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory ) const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory )
{} {}
static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); static css::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames();
static OUString SAL_CALL impl_staticGetImplementationName(); static OUString SAL_CALL impl_staticGetImplementationName();
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
DECL_STATIC_LINK( MainThreadExecutor, worker, MainThreadExecutorRequest* ); DECL_STATIC_LINK( MainThreadExecutor, worker, MainThreadExecutorRequest* );
// XJob // XJob
virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual css::uno::Any SAL_CALL execute( const css::uno::Sequence< css::beans::NamedValue >& Arguments ) throw (css::lang::IllegalArgumentException, css::uno::Exception, css::uno::RuntimeException);
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException);
}; };