[Libreoffice-commits] core.git: embeddedobj/source embeddedobj/test
Noel Grandin
noel at peralex.com
Thu Oct 1 01:03:52 PDT 2015
embeddedobj/source/commonembedding/embedobj.cxx | 10
embeddedobj/source/commonembedding/specialobject.cxx | 8
embeddedobj/source/commonembedding/xfactory.hxx | 54 +-
embeddedobj/source/general/docholder.cxx | 46 +-
embeddedobj/source/inc/closepreventer.hxx | 8
embeddedobj/source/inc/commonembobj.hxx | 384 +++++++++----------
embeddedobj/source/inc/docholder.hxx | 118 ++---
embeddedobj/source/inc/dummyobject.hxx | 234 +++++------
embeddedobj/source/inc/intercept.hxx | 84 ++--
embeddedobj/source/inc/oleembobj.hxx | 372 +++++++++---------
embeddedobj/source/inc/specialobject.hxx | 62 +--
embeddedobj/source/inc/xcreator.hxx | 30 -
embeddedobj/source/msole/closepreventer.cxx | 14
embeddedobj/source/msole/mtnotification.hxx | 8
embeddedobj/source/msole/olecomponent.cxx | 12
embeddedobj/source/msole/olecomponent.hxx | 66 +--
embeddedobj/source/msole/oleembed.cxx | 10
embeddedobj/source/msole/olemisc.cxx | 4
embeddedobj/source/msole/ownview.cxx | 2
embeddedobj/source/msole/ownview.hxx | 26 -
embeddedobj/source/msole/xdialogcreator.cxx | 2
embeddedobj/source/msole/xdialogcreator.hxx | 26 -
embeddedobj/source/msole/xolefactory.hxx | 30 -
embeddedobj/test/MainThreadExecutor/xexecutor.hxx | 30 -
embeddedobj/test/mtexecutor/bitmapcreator.hxx | 22 -
embeddedobj/test/mtexecutor/mainthreadexecutor.hxx | 28 -
26 files changed, 845 insertions(+), 845 deletions(-)
New commits:
commit e6534a6099cc667dba3fe154023cf2c573fda9f1
Author: Noel Grandin <noel at peralex.com>
Date: Tue Sep 29 15:07:23 2015 +0200
com::sun::star->css in embeddedobj/
Change-Id: Ia04fc28ce8e1d70f86520edf2df8c98f7b455465
Reviewed-on: https://gerrit.libreoffice.org/19024
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx
index 74e1196..de75e9f 100644
--- a/embeddedobj/source/commonembedding/embedobj.cxx
+++ b/embeddedobj/source/commonembedding/embedobj.cxx
@@ -298,7 +298,7 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState )
{
uno::Reference< embed::XInplaceClient > xInplaceClient( m_xClientSite, uno::UNO_QUERY_THROW );
// TODO:
- uno::Reference< ::com::sun::star::frame::XLayoutManager > xContainerLM =
+ uno::Reference< css::frame::XLayoutManager > xContainerLM =
xInplaceClient->getLayoutManager();
if ( xContainerLM.is() )
{
@@ -365,7 +365,7 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState )
if ( nNextState == embed::EmbedStates::INPLACE_ACTIVE )
{
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();
bool bOk = false;
@@ -670,12 +670,12 @@ void SAL_CALL OCommonEmbeddedObject::setContainerName( const OUString& 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;
}
-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;
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
-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
m_aDefaultSizeForChart_In_100TH_MM = rSize_100TH_MM;
diff --git a/embeddedobj/source/commonembedding/specialobject.cxx b/embeddedobj/source/commonembedding/specialobject.cxx
index 52fcb32..fe665bf 100644
--- a/embeddedobj/source/commonembedding/specialobject.cxx
+++ b/embeddedobj/source/commonembedding/specialobject.cxx
@@ -160,10 +160,10 @@ sal_Int32 SAL_CALL OSpecialEmbeddedObject::getMapUnit( sal_Int64 nAspect )
}
void SAL_CALL OSpecialEmbeddedObject::changeState( sal_Int32 nNewState )
- throw ( ::com::sun::star::embed::UnreachableStateException,
- ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception )
+ throw ( css::embed::UnreachableStateException,
+ css::embed::WrongStateException,
+ css::uno::Exception,
+ css::uno::RuntimeException, std::exception )
{
if ( nNewState == embed::EmbedStates::UI_ACTIVE )
nNewState = embed::EmbedStates::INPLACE_ACTIVE;
diff --git a/embeddedobj/source/commonembedding/xfactory.hxx b/embeddedobj/source/commonembedding/xfactory.hxx
index 81f1506..36bfb30 100644
--- a/embeddedobj/source/commonembedding/xfactory.hxx
+++ b/embeddedobj/source/commonembedding/xfactory.hxx
@@ -28,85 +28,85 @@
#include <comphelper/mimeconfighelper.hxx>
class OOoEmbeddedObjectFactory : public ::cppu::WeakImplHelper<
- ::com::sun::star::embed::XEmbeddedObjectCreator,
+ css::embed::XEmbeddedObjectCreator,
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;
public:
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_aConfigHelper( rxContext )
{
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 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
+ 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 );
// 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 ::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 ::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 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 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 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
- 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
- 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
- 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
- virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::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 ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 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 (css::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<
- ::com::sun::star::embed::XEmbedObjectFactory,
- ::com::sun::star::lang::XServiceInfo >
+ css::embed::XEmbedObjectFactory,
+ 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;
public:
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_aConfigHelper( rxContext )
{
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 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
+ 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 );
// 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
- virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::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 ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 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 (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
#endif
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index 0212200..9e78fa2 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -361,7 +361,7 @@ bool DocumentHolder::SetFrameLMVisibility( const uno::Reference< frame::XFrame >
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 );
xPropSet->getPropertyValue("LayoutManager") >>= xLayoutManager;
if ( xLayoutManager.is() )
@@ -516,10 +516,10 @@ uno::Reference< container::XIndexAccess > DocumentHolder::RetrieveOwnMenu_Impl()
{
uno::Reference< container::XIndexAccess > xResult;
- uno::Reference< ::com::sun::star::ui::XUIConfigurationManagerSupplier > xUIConfSupplier(
+ uno::Reference< css::ui::XUIConfigurationManagerSupplier > xUIConfSupplier(
m_xComponent,
uno::UNO_QUERY );
- uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > xUIConfigManager;
+ uno::Reference< css::ui::XUIConfigurationManager > xUIConfigManager;
if( xUIConfSupplier.is())
{
xUIConfigManager.set(
@@ -550,7 +550,7 @@ uno::Reference< container::XIndexAccess > DocumentHolder::RetrieveOwnMenu_Impl()
{
uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xModConfSupplier =
ui::theModuleUIConfigurationManagerSupplier::get(m_xContext);
- uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > xModUIConfMan(
+ uno::Reference< css::ui::XUIConfigurationManager > xModUIConfMan(
xModConfSupplier->getUIConfigurationManager( aModuleIdent ),
uno::UNO_QUERY_THROW );
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,
- const uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContLM,
+bool DocumentHolder::MergeMenus_Impl( const uno::Reference< css::frame::XLayoutManager >& xOwnLM,
+ const uno::Reference< css::frame::XLayoutManager >& xContLM,
const uno::Reference< frame::XDispatchProvider >& xContDisp,
const OUString& aContModuleName )
{
bool bMenuMerged = false;
try
{
- uno::Reference< ::com::sun::star::ui::XUIElementSettings > xUISettings(
+ uno::Reference< css::ui::XUIElementSettings > xUISettings(
xContLM->getElement(
OUString( "private:resource/menubar/menubar" ) ),
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< 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 );
bMenuMerged = xMerge->setMergedMenuBar( xMergedMenu );
}
@@ -673,7 +673,7 @@ bool DocumentHolder::MergeMenus_Impl( const uno::Reference< ::com::sun::star::fr
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 OUString& aContModuleName )
{
@@ -681,8 +681,8 @@ bool DocumentHolder::ShowUI( const uno::Reference< ::com::sun::star::frame::XLay
if ( xContainerLM.is() )
{
// the LM of the embedded frame and its current DockingAreaAcceptor
- uno::Reference< ::com::sun::star::frame::XLayoutManager > xOwnLM;
- uno::Reference< ::com::sun::star::ui::XDockingAreaAcceptor > xDocAreaAcc;
+ uno::Reference< css::frame::XLayoutManager > xOwnLM;
+ uno::Reference< css::ui::XDockingAreaAcceptor > xDocAreaAcc;
try
{
@@ -746,10 +746,10 @@ bool DocumentHolder::ShowUI( const uno::Reference< ::com::sun::star::frame::XLay
if ( bLock )
xOwnLM->lock();
xOwnLM->setVisible( sal_False );
- xOwnLM->setDockingAreaAcceptor( uno::Reference< ::com::sun::star::ui::XDockingAreaAcceptor >() );
+ xOwnLM->setDockingAreaAcceptor( uno::Reference< css::ui::XDockingAreaAcceptor >() );
// 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();
}
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;
if ( xContainerLM.is() )
{
- uno::Reference< ::com::sun::star::frame::XLayoutManager > xOwnLM;
+ uno::Reference< css::frame::XLayoutManager > xOwnLM;
try {
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() )
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->lock();
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();
xContainerLM->setDockingAreaAcceptor( xDocAreaAcc );
@@ -855,7 +855,7 @@ uno::Reference< frame::XFrame > DocumentHolder::GetDocFrame()
if ( m_xComponent.is() )
{
- uno::Reference< ::com::sun::star::frame::XLayoutManager > xOwnLM;
+ uno::Reference< css::frame::XLayoutManager > xOwnLM;
try {
uno::Reference< beans::XPropertySet > xPropSet( m_xFrame, uno::UNO_QUERY_THROW );
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)
{
if ( m_xComponent.is() && m_xComponent == aSource.Source )
@@ -1252,7 +1252,7 @@ awt::Rectangle SAL_CALL DocumentHolder::calcAdjustedRectangle( const awt::Rectan
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) ||
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 );
}
- 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()
}
- catch ( const com::sun::star::uno::Exception& )
+ catch ( const css::uno::Exception& )
{
// no outgoing exceptions specified here
}
@@ -1290,7 +1290,7 @@ void DocumentHolder::ResizeHatchWindow()
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
// so UIDeactivation is actively triggered by the container
diff --git a/embeddedobj/source/inc/closepreventer.hxx b/embeddedobj/source/inc/closepreventer.hxx
index 892585e..1a0c126 100644
--- a/embeddedobj/source/inc/closepreventer.hxx
+++ b/embeddedobj/source/inc/closepreventer.hxx
@@ -23,12 +23,12 @@
#include <com/sun/star/util/XCloseListener.hpp>
#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 notifyClosing( const ::com::sun::star::lang::EventObject& Source ) throw (::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 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
diff --git a/embeddedobj/source/inc/commonembobj.hxx b/embeddedobj/source/inc/commonembobj.hxx
index c035282..676847a 100644
--- a/embeddedobj/source/inc/commonembobj.hxx
+++ b/embeddedobj/source/inc/commonembobj.hxx
@@ -71,12 +71,12 @@ namespace comphelper {
class Interceptor;
-class OCommonEmbeddedObject : public ::com::sun::star::embed::XEmbeddedObject
- , public ::com::sun::star::embed::XEmbedPersist2
- , public ::com::sun::star::embed::XLinkageSupport
- , public ::com::sun::star::embed::XInplaceObject
- , public ::com::sun::star::container::XChild
- , public ::com::sun::star::chart2::XDefaultSizeTransmitter
+class OCommonEmbeddedObject : public css::embed::XEmbeddedObject
+ , public css::embed::XEmbedPersist2
+ , public css::embed::XLinkageSupport
+ , public css::embed::XInplaceObject
+ , public css::container::XChild
+ , public css::chart2::XDefaultSizeTransmitter
, public ::cppu::OWeakObject
{
protected:
@@ -95,11 +95,11 @@ protected:
sal_Int32 m_nTargetState; // should be -1 except during state changing
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_aDocServiceName;
@@ -107,13 +107,13 @@ protected:
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;
- ::com::sun::star::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< sal_Int32 > m_aAcceptedStates;
+ css::uno::Sequence< sal_Int32 > m_pIntermediateStatesSeqs[NUM_SUPPORTED_STATES][NUM_SUPPORTED_STATES];
+ 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_aDefaultParentBaseURL;
@@ -124,21 +124,21 @@ protected:
// following information will be used between SaveAs and SaveCompleted
bool m_bWaitSaveCompleted;
OUString m_aNewEntryName;
- ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xNewParentStorage;
- ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xNewObjectStorage;
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aNewDocMediaDescriptor;
+ css::uno::Reference< css::embed::XStorage > m_xNewParentStorage;
+ css::uno::Reference< css::embed::XStorage > m_xNewObjectStorage;
+ css::uno::Sequence< css::beans::PropertyValue > m_aNewDocMediaDescriptor;
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xClientWindow; // ???
- ::com::sun::star::awt::Rectangle m_aOwnRectangle;
- ::com::sun::star::awt::Rectangle m_aClipRectangle;
+ css::uno::Reference< css::awt::XWindow > m_xClientWindow; // ???
+ css::awt::Rectangle m_aOwnRectangle;
+ css::awt::Rectangle m_aClipRectangle;
bool m_bIsLink;
// embedded object related stuff
OUString m_aEntryName;
- ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xParentStorage;
- ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xObjectStorage;
- ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xRecoveryStorage;
+ css::uno::Reference< css::embed::XStorage > m_xParentStorage;
+ css::uno::Reference< css::embed::XStorage > m_xObjectStorage;
+ css::uno::Reference< css::embed::XStorage > m_xRecoveryStorage;
// link related stuff
OUString m_aLinkURL;
@@ -146,34 +146,34 @@ protected:
bool m_bLinkHasPassword;
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
- ::com::sun::star::awt::Size m_aClonedSize;
+ css::awt::Size m_aClonedSize;
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:
- 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,
- const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr,
- const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aObjectDescr );
+ void LinkInit_Impl( const css::uno::Sequence< css::beans::NamedValue >& aObjectProps,
+ const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr,
+ const css::uno::Sequence< css::beans::PropertyValue >& aObjectDescr );
void SwitchOwnPersistence(
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xNewParentStorage,
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xNewObjectStorage,
+ const css::uno::Reference< css::embed::XStorage >& xNewParentStorage,
+ const css::uno::Reference< css::embed::XStorage >& xNewObjectStorage,
const OUString& aNewName );
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 );
OUString GetDocumentServiceName() const { return m_aDocServiceName; }
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,
const OUString& aBaseURL,
const OUString& aHierarchName );
@@ -186,14 +186,14 @@ private:
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;
- ::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(
const css::uno::Reference<css::embed::XStorage>& xStorage,
@@ -204,53 +204,53 @@ private:
bool bAttachToStorage );
void SwitchDocToStorage_Impl(
- const ::com::sun::star::uno::Reference< ::com::sun::star::document::XStorageBasedDocument >& xDoc,
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
+ const css::uno::Reference< css::document::XStorageBasedDocument >& xDoc,
+ const css::uno::Reference< css::embed::XStorage >& xStorage );
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
) const;
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;
- ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > CreateDocFromMediaDescr_Impl(
- const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMedDescr );
+ css::uno::Reference< css::util::XCloseable > CreateDocFromMediaDescr_Impl(
+ 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;
static OUString GetBaseURLFrom_Impl(
- const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments,
- const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs );
+ const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
+ const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs );
public:
OCommonEmbeddedObject(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
- const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aObjectProps );
+ const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+ const css::uno::Sequence< css::beans::NamedValue >& aObjectProps );
// no persistence for linked objects, so the descriptors are provided in constructor
OCommonEmbeddedObject(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
- const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aObjectProps,
- const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr,
- const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aObjectDescr );
+ const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+ const css::uno::Sequence< css::beans::NamedValue >& aObjectProps,
+ const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr,
+ const css::uno::Sequence< css::beans::PropertyValue >& aObjectDescr );
virtual ~OCommonEmbeddedObject();
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
void PostEvent_Impl( const OUString& aEventName );
// XInterface
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType )
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
virtual void SAL_CALL acquire()
throw() SAL_OVERRIDE;
@@ -261,165 +261,165 @@ public:
// XEmbeddedObject
virtual void SAL_CALL changeState( sal_Int32 nNewState )
- throw ( ::com::sun::star::embed::UnreachableStateException,
- ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::embed::UnreachableStateException,
+ css::embed::WrongStateException,
+ css::uno::Exception,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getReachableStates()
- throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< sal_Int32 > SAL_CALL getReachableStates()
+ throw ( css::embed::WrongStateException,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getCurrentState()
- throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::embed::WrongStateException,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL doVerb( sal_Int32 nVerbID )
- throw ( ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::embed::UnreachableStateException,
- ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::lang::IllegalArgumentException,
+ css::embed::WrongStateException,
+ css::embed::UnreachableStateException,
+ css::uno::Exception,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::embed::VerbDescriptor > SAL_CALL getSupportedVerbs()
- throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< css::embed::VerbDescriptor > SAL_CALL getSupportedVerbs()
+ throw ( css::embed::WrongStateException,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL setClientSite(
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedClient >& xClient )
- throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ const css::uno::Reference< css::embed::XEmbeddedClient >& xClient )
+ throw ( css::embed::WrongStateException,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedClient > SAL_CALL getClientSite()
- throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::embed::XEmbeddedClient > SAL_CALL getClientSite()
+ throw ( css::embed::WrongStateException,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL update()
- throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::embed::WrongStateException,
+ css::uno::Exception,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL setUpdateMode( sal_Int32 nMode )
- throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::embed::WrongStateException,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Int64 SAL_CALL getStatus( sal_Int64 nAspect )
- throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::embed::WrongStateException,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
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
- virtual void SAL_CALL setVisualAreaSize( sal_Int64 nAspect, const ::com::sun::star::awt::Size& aSize )
- throw ( ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL setVisualAreaSize( sal_Int64 nAspect, const css::awt::Size& aSize )
+ throw ( css::lang::IllegalArgumentException,
+ css::embed::WrongStateException,
+ css::uno::Exception,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual ::com::sun::star::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect )
- throw ( ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect )
+ throw ( css::lang::IllegalArgumentException,
+ css::embed::WrongStateException,
+ css::uno::Exception,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual ::com::sun::star::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect )
- throw ( ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect )
+ throw ( css::lang::IllegalArgumentException,
+ css::embed::WrongStateException,
+ css::uno::Exception,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getMapUnit( sal_Int64 nAspect )
- throw ( ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw ( css::uno::Exception,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XEmbedPersist
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,
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::embed::WrongStateException,
- ::com::sun::star::io::IOException,
- ::com::sun::star::uno::Exception,
- ::com::sun::star::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 )
- throw ( ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::io::IOException,
- ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
+ const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
+ throw ( css::lang::IllegalArgumentException,
+ css::embed::WrongStateException,
+ css::io::IOException,
+ css::uno::Exception,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ 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 ( css::lang::IllegalArgumentException,
+ css::embed::WrongStateException,
+ css::io::IOException,
+ css::uno::Exception,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
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 ::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::embed::WrongStateException,
- ::com::sun::star::io::IOException,
- ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
+ const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
+ throw ( css::lang::IllegalArgumentException,
+ css::embed::WrongStateException,
+ css::io::IOException,
+ css::uno::Exception,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL saveCompleted( sal_Bool bUseNew )
- throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::embed::WrongStateException,
+ css::uno::Exception,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL hasEntry()
- throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::embed::WrongStateException,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual OUString SAL_CALL getEntryName()
- throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::embed::WrongStateException,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// 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 )
- throw ( ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::io::IOException,
- ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::lang::IllegalArgumentException,
+ css::embed::WrongStateException,
+ css::io::IOException,
+ css::uno::Exception,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isLink()
- throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw ( css::embed::WrongStateException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual OUString SAL_CALL getLinkURL()
- throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw ( css::embed::WrongStateException,
+ css::uno::Exception,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XCommonEmbedPersist
virtual void SAL_CALL storeOwn()
- throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::io::IOException,
- ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::embed::WrongStateException,
+ css::io::IOException,
+ css::uno::Exception,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isReadonly()
- throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::embed::WrongStateException,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL reload(
- 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::embed::WrongStateException,
- ::com::sun::star::io::IOException,
- ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
+ const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
+ throw ( css::lang::IllegalArgumentException,
+ css::embed::WrongStateException,
+ css::io::IOException,
+ css::uno::Exception,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XEmbedPersist2
@@ -428,75 +428,75 @@ public:
// XInplaceObject
- virtual void SAL_CALL setObjectRectangles( const ::com::sun::star::awt::Rectangle& aPosRect,
- const ::com::sun::star::awt::Rectangle& aClipRect )
- throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL setObjectRectangles( const css::awt::Rectangle& aPosRect,
+ const css::awt::Rectangle& aClipRect )
+ throw ( css::embed::WrongStateException,
+ css::uno::Exception,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL enableModeless( sal_Bool bEnable )
- throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::embed::WrongStateException,
+ css::uno::Exception,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL translateAccelerators(
- const ::com::sun::star::uno::Sequence< ::com::sun::star::awt::KeyEvent >& aKeys )
- throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ const css::uno::Sequence< css::awt::KeyEvent >& aKeys )
+ throw ( css::embed::WrongStateException,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XClassifiedObject
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getClassID()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getClassID()
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
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(
- const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName )
- throw ( ::com::sun::star::lang::NoSupportException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName )
+ throw ( css::lang::NoSupportException,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XComponentSupplier
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > SAL_CALL getComponent()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::util::XCloseable > SAL_CALL getComponent()
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// 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 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 addStateChangeListener( const css::uno::Reference< css::embed::XStateChangeListener >& xListener ) throw (css::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
virtual void SAL_CALL close( sal_Bool DeliverOwnership )
- throw ( ::com::sun::star::util::CloseVetoException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::util::CloseVetoException,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL addCloseListener(
- const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener >& Listener )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ const css::uno::Reference< css::util::XCloseListener >& Listener )
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL removeCloseListener(
- const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener >& Listener )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ const css::uno::Reference< css::util::XCloseListener >& Listener )
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XEventBroadcaster
virtual void SAL_CALL addEventListener(
- const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& Listener )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ const css::uno::Reference< css::document::XEventListener >& Listener )
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL removeEventListener(
- const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& Listener )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ const css::uno::Reference< css::document::XEventListener >& Listener )
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// 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 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 css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw (css::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
//#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
diff --git a/embeddedobj/source/inc/docholder.hxx b/embeddedobj/source/inc/docholder.hxx
index 7fe5549..0eb8a1b 100644
--- a/embeddedobj/source/inc/docholder.hxx
+++ b/embeddedobj/source/inc/docholder.hxx
@@ -42,30 +42,30 @@ class Interceptor;
class DocumentHolder :
public ::cppu::WeakImplHelper<
- ::com::sun::star::util::XCloseListener,
- ::com::sun::star::frame::XTerminateListener,
- ::com::sun::star::util::XModifyListener,
- ::com::sun::star::document::XEventListener,
- ::com::sun::star::frame::XBorderResizeListener,
- ::com::sun::star::embed::XHatchWindowController >
+ css::util::XCloseListener,
+ css::frame::XTerminateListener,
+ css::util::XModifyListener,
+ css::document::XEventListener,
+ css::frame::XBorderResizeListener,
+ css::embed::XHatchWindowController >
{
private:
OCommonEmbeddedObject* m_pEmbedObj;
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;
- ::com::sun::star::uno::Reference< ::com::sun::star::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::frame::XFrame > m_xFrame;
+ css::uno::Reference< css::awt::XWindow > m_xOwnWindow; // set for inplace objects
+ css::uno::Reference< css::awt::XWindow > m_xHatchWindow; // set for inplace objects
- ::com::sun::star::awt::Rectangle m_aObjRect;
- ::com::sun::star::frame::BorderWidths m_aBorderWidths;
+ css::awt::Rectangle m_aObjRect;
+ css::frame::BorderWidths m_aBorderWidths;
OUString m_aContainerName;
OUString m_aDocumentNamePart;
@@ -79,49 +79,49 @@ private:
sal_Int32 m_nNoBorderResizeReact;
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 );
- ::com::sun::star::awt::Rectangle CalculateBorderedArea( const ::com::sun::star::awt::Rectangle& aRect );
- ::com::sun::star::awt::Rectangle AddBorderToArea( const ::com::sun::star::awt::Rectangle& aRect );
+ css::awt::Rectangle CalculateBorderedArea( const css::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(
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& xOwnLM,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContLM,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xContDisp,
+ const css::uno::Reference< css::frame::XLayoutManager >& xOwnLM,
+ const css::uno::Reference< css::frame::XLayoutManager >& xContLM,
+ const css::uno::Reference< css::frame::XDispatchProvider >& xContDisp,
const OUString& aContModuleName );
public:
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] )
- throw ( ::com::sun::star::uno::Exception );
+ throw ( css::uno::Exception );
- static ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > MergeMenusForInplace(
- const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xContMenu,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xContDisp,
+ static css::uno::Reference< css::container::XIndexAccess > MergeMenusForInplace(
+ const css::uno::Reference< css::container::XIndexAccess >& xContMenu,
+ const css::uno::Reference< css::frame::XDispatchProvider >& xContDisp,
const OUString& aContModuleName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xOwnMenu,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xOwnDisp )
- throw ( ::com::sun::star::uno::Exception );
+ const css::uno::Reference< css::container::XIndexAccess >& xOwnMenu,
+ const css::uno::Reference< css::frame::XDispatchProvider >& xOwnDisp )
+ 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 );
virtual ~DocumentHolder();
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 FreeOffice();
@@ -133,66 +133,66 @@ public:
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; }
- 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 ShowInplace( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent,
- const ::com::sun::star::awt::Rectangle& aRectangleToShow,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xContainerDP );
+ bool ShowInplace( const css::uno::Reference< css::awt::XWindowPeer >& xParent,
+ const css::awt::Rectangle& aRectangleToShow,
+ const css::uno::Reference< css::frame::XDispatchProvider >& xContainerDP );
bool ShowUI(
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContainerLM,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xContainerDP,
+ const css::uno::Reference< css::frame::XLayoutManager >& xContainerLM,
+ const css::uno::Reference< css::frame::XDispatchProvider >& xContainerDP,
const OUString& aContModuleName );
bool HideUI(
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContainerLM );
+ const css::uno::Reference< css::frame::XLayoutManager >& xContainerLM );
void Show();
- bool SetExtent( sal_Int64 nAspect, const ::com::sun::star::awt::Size& aSize );
- bool GetExtent( sal_Int64 nAspect, ::com::sun::star::awt::Size *pSize );
+ bool SetExtent( sal_Int64 nAspect, const css::awt::Size& aSize );
+ bool GetExtent( sal_Int64 nAspect, css::awt::Size *pSize );
sal_Int32 GetMapUnit( sal_Int64 nAspect );
void SetOutplaceDispatchInterceptor(
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >&
+ const css::uno::Reference< css::frame::XDispatchProviderInterceptor >&
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
- 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
- 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 notifyClosing( const ::com::sun::star::lang::EventObject& Source ) throw (::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 css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// 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 notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::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 css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// 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
- 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
- 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
- virtual void SAL_CALL requestPositioning( const ::com::sun::star::awt::Rectangle& aRect ) throw (::com::sun::star::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 void SAL_CALL activated( ) throw (::com::sun::star::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 requestPositioning( const css::awt::Rectangle& aRect ) throw (css::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 (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL deactivated( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
#endif
diff --git a/embeddedobj/source/inc/dummyobject.hxx b/embeddedobj/source/inc/dummyobject.hxx
index 81e2c39..4d93ee5 100644
--- a/embeddedobj/source/inc/dummyobject.hxx
+++ b/embeddedobj/source/inc/dummyobject.hxx
@@ -45,27 +45,27 @@ namespace cppu {
}
class ODummyEmbeddedObject : public ::cppu::WeakImplHelper
- < ::com::sun::star::embed::XEmbeddedObject
- , ::com::sun::star::embed::XEmbedPersist >
+ < css::embed::XEmbeddedObject
+ , css::embed::XEmbedPersist >
{
::osl::Mutex m_aMutex;
::cppu::OMultiTypeInterfaceContainerHelper* m_pInterfaceContainer;
bool m_bDisposed;
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;
- ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedClient > m_xClientSite;
+ css::uno::Reference< css::embed::XEmbeddedClient > m_xClientSite;
sal_Int64 m_nCachedAspect;
- ::com::sun::star::awt::Size m_aCachedSize;
+ css::awt::Size m_aCachedSize;
bool m_bHasCachedSize;
// following information will be used between SaveAs and SaveCompleted
bool m_bWaitSaveCompleted;
OUString m_aNewEntryName;
- ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xNewParentStorage;
+ css::uno::Reference< css::embed::XStorage > m_xNewParentStorage;
protected:
void CheckInit_WrongState(); //throw WrongStateException on m_nObjectState == -1
@@ -88,193 +88,193 @@ public:
// XEmbeddedObject
virtual void SAL_CALL changeState( sal_Int32 nNewState )
- throw ( ::com::sun::star::embed::UnreachableStateException,
- ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::embed::UnreachableStateException,
+ css::embed::WrongStateException,
+ css::uno::Exception,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getReachableStates()
- throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< sal_Int32 > SAL_CALL getReachableStates()
+ throw ( css::embed::WrongStateException,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getCurrentState()
- throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::embed::WrongStateException,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL doVerb( sal_Int32 nVerbID )
- throw ( ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::embed::UnreachableStateException,
- ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::lang::IllegalArgumentException,
+ css::embed::WrongStateException,
+ css::embed::UnreachableStateException,
+ css::uno::Exception,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::embed::VerbDescriptor > SAL_CALL getSupportedVerbs()
- throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< css::embed::VerbDescriptor > SAL_CALL getSupportedVerbs()
+ throw ( css::embed::WrongStateException,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL setClientSite(
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedClient >& xClient )
- throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ const css::uno::Reference< css::embed::XEmbeddedClient >& xClient )
+ throw ( css::embed::WrongStateException,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedClient > SAL_CALL getClientSite()
- throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::embed::XEmbeddedClient > SAL_CALL getClientSite()
+ throw ( css::embed::WrongStateException,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL update()
- throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::embed::WrongStateException,
+ css::uno::Exception,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL setUpdateMode( sal_Int32 nMode )
- throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::embed::WrongStateException,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Int64 SAL_CALL getStatus( sal_Int64 nAspect )
- throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::embed::WrongStateException,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
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
- virtual void SAL_CALL setVisualAreaSize( sal_Int64 nAspect, const ::com::sun::star::awt::Size& aSize )
- throw ( ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL setVisualAreaSize( sal_Int64 nAspect, const css::awt::Size& aSize )
+ throw ( css::lang::IllegalArgumentException,
+ css::embed::WrongStateException,
+ css::uno::Exception,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual ::com::sun::star::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect )
- throw ( ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect )
+ throw ( css::lang::IllegalArgumentException,
+ css::embed::WrongStateException,
+ css::uno::Exception,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual ::com::sun::star::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect )
- throw ( ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect )
+ throw ( css::lang::IllegalArgumentException,
+ css::embed::WrongStateException,
+ css::uno::Exception,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getMapUnit( sal_Int64 nAspect )
- throw ( ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw ( css::uno::Exception,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XEmbedPersist
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,
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::embed::WrongStateException,
- ::com::sun::star::io::IOException,
- ::com::sun::star::uno::Exception,
- ::com::sun::star::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 )
- throw ( ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::io::IOException,
- ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
+ const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
+ throw ( css::lang::IllegalArgumentException,
+ css::embed::WrongStateException,
+ css::io::IOException,
+ css::uno::Exception,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ 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 ( css::lang::IllegalArgumentException,
+ css::embed::WrongStateException,
+ css::io::IOException,
+ css::uno::Exception,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
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 ::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::embed::WrongStateException,
- ::com::sun::star::io::IOException,
- ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
+ const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
+ throw ( css::lang::IllegalArgumentException,
+ css::embed::WrongStateException,
+ css::io::IOException,
+ css::uno::Exception,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL saveCompleted( sal_Bool bUseNew )
- throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::embed::WrongStateException,
+ css::uno::Exception,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL hasEntry()
- throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::embed::WrongStateException,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual OUString SAL_CALL getEntryName()
- throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::embed::WrongStateException,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XCommonEmbedPersist
virtual void SAL_CALL storeOwn()
- throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::io::IOException,
- ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::embed::WrongStateException,
+ css::io::IOException,
+ css::uno::Exception,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isReadonly()
- throw ( ::com::sun::star::embed::WrongStateException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::embed::WrongStateException,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL reload(
- 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::embed::WrongStateException,
- ::com::sun::star::io::IOException,
- ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
+ const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
+ throw ( css::lang::IllegalArgumentException,
+ css::embed::WrongStateException,
+ css::io::IOException,
+ css::uno::Exception,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XClassifiedObject
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getClassID()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getClassID()
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
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(
- const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName )
- throw ( ::com::sun::star::lang::NoSupportException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName )
+ throw ( css::lang::NoSupportException,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XComponentSupplier
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > SAL_CALL getComponent()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::util::XCloseable > SAL_CALL getComponent()
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// 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 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 addStateChangeListener( const css::uno::Reference< css::embed::XStateChangeListener >& xListener ) throw (css::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
virtual void SAL_CALL close( sal_Bool DeliverOwnership )
- throw ( ::com::sun::star::util::CloseVetoException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::util::CloseVetoException,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL addCloseListener(
- const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener >& Listener )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ const css::uno::Reference< css::util::XCloseListener >& Listener )
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL removeCloseListener(
- const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener >& Listener )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ const css::uno::Reference< css::util::XCloseListener >& Listener )
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XEventBroadcaster
virtual void SAL_CALL addEventListener(
- const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& Listener )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ const css::uno::Reference< css::document::XEventListener >& Listener )
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL removeEventListener(
- const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& Listener )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ const css::uno::Reference< css::document::XEventListener >& Listener )
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
};
diff --git a/embeddedobj/source/inc/intercept.hxx b/embeddedobj/source/inc/intercept.hxx
index c5d554c..9cbe1df 100644
--- a/embeddedobj/source/inc/intercept.hxx
+++ b/embeddedobj/source/inc/intercept.hxx
@@ -31,9 +31,9 @@
class StatusChangeListenerContainer;
class DocumentHolder;
-class Interceptor : public ::cppu::WeakImplHelper< ::com::sun::star::frame::XDispatchProviderInterceptor,
- ::com::sun::star::frame::XInterceptorInfo,
- ::com::sun::star::frame::XDispatch>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list