[Libreoffice-commits] core.git: basic/inc basic/qa basic/source
Noel Grandin
noel at peralex.com
Mon Jul 20 02:40:08 PDT 2015
basic/inc/sbobjmod.hxx | 10
basic/qa/cppunit/basictest.hxx | 4
basic/source/basmgr/basicmanagerrepository.cxx | 4
basic/source/classes/global.cxx | 2
basic/source/classes/propacc.cxx | 28 -
basic/source/classes/sb.cxx | 2
basic/source/classes/sbunoobj.cxx | 16
basic/source/classes/sbxmod.cxx | 8
basic/source/comp/codegen.cxx | 6
basic/source/comp/parser.cxx | 4
basic/source/inc/date.hxx | 12
basic/source/inc/dlgcont.hxx | 59 +-
basic/source/inc/errobject.hxx | 8
basic/source/inc/namecont.hxx | 497 ++++++++++++-------------
basic/source/inc/propacc.hxx | 69 +--
basic/source/inc/runtime.hxx | 6
basic/source/inc/sbunoobj.hxx | 80 ++--
basic/source/inc/scriptcont.hxx | 87 ++--
basic/source/runtime/comenumwrapper.hxx | 10
basic/source/runtime/methods.cxx | 30 -
basic/source/runtime/methods1.cxx | 4
basic/source/runtime/runtime.cxx | 6
basic/source/sbx/sbxdec.cxx | 4
basic/source/sbx/sbxdec.hxx | 4
basic/source/sbx/sbxvalue.cxx | 4
basic/source/sbx/sbxvar.cxx | 2
basic/source/uno/dlgcont.cxx | 13
basic/source/uno/namecont.cxx | 12
basic/source/uno/scriptcont.cxx | 18
29 files changed, 496 insertions(+), 513 deletions(-)
New commits:
commit b4ee16da65eab7b50b29dcd42dc0f0be6b97b174
Author: Noel Grandin <noel at peralex.com>
Date: Mon Jul 20 09:21:24 2015 +0200
com::sun::star->css in basic
Change-Id: I637fd7aedeb97b7dca22521474a54a1d4274f212
Reviewed-on: https://gerrit.libreoffice.org/17206
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/basic/inc/sbobjmod.hxx b/basic/inc/sbobjmod.hxx
index c71c20a..0b178ae 100644
--- a/basic/inc/sbobjmod.hxx
+++ b/basic/inc/sbobjmod.hxx
@@ -38,21 +38,21 @@ protected:
public:
TYPEINFO_OVERRIDE();
- SbObjModule( const OUString& rName, const com::sun::star::script::ModuleInfo& mInfo, bool bIsVbaCompatible );
+ SbObjModule( const OUString& rName, const css::script::ModuleInfo& mInfo, bool bIsVbaCompatible );
virtual SbxVariable* Find( const OUString& rName, SbxClassType t ) SAL_OVERRIDE;
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
using SbxValue::GetObject;
SbxVariable* GetObject();
- void SetUnoObject( const com::sun::star::uno::Any& aObj )throw ( com::sun::star::uno::RuntimeException, std::exception ) ;
+ void SetUnoObject( const css::uno::Any& aObj )throw ( css::uno::RuntimeException, std::exception ) ;
};
class FormObjEventListenerImpl;
class BASIC_DLLPUBLIC SbUserFormModule : public SbObjModule
{
- com::sun::star::script::ModuleInfo m_mInfo;
+ css::script::ModuleInfo m_mInfo;
::rtl::Reference< FormObjEventListenerImpl > m_DialogListener;
css::uno::Reference<css::awt::XDialog> m_xDialog;
css::uno::Reference<css::frame::XModel> m_xModel;
@@ -62,7 +62,7 @@ class BASIC_DLLPUBLIC SbUserFormModule : public SbObjModule
void InitObject();
public:
TYPEINFO_OVERRIDE();
- SbUserFormModule( const OUString& rName, const com::sun::star::script::ModuleInfo& mInfo, bool bIsVBACompat );
+ SbUserFormModule( const OUString& rName, const css::script::ModuleInfo& mInfo, bool bIsVBACompat );
virtual ~SbUserFormModule();
virtual SbxVariable* Find( const OUString& rName, SbxClassType t ) SAL_OVERRIDE;
void ResetApiObj( bool bTriggerTerminateEvent = true );
@@ -91,7 +91,7 @@ class BASIC_DLLPUBLIC SbUserFormModuleInstance : public SbUserFormModule
public:
SbUserFormModuleInstance( SbUserFormModule* pParentModule, const OUString& rName,
- const com::sun::star::script::ModuleInfo& mInfo, bool bIsVBACompat );
+ const css::script::ModuleInfo& mInfo, bool bIsVBACompat );
virtual bool IsClass( const OUString& ) const SAL_OVERRIDE;
virtual SbxVariable* Find( const OUString& rName, SbxClassType t ) SAL_OVERRIDE;
diff --git a/basic/qa/cppunit/basictest.hxx b/basic/qa/cppunit/basictest.hxx
index 1b9c634..49bbb29 100644
--- a/basic/qa/cppunit/basictest.hxx
+++ b/basic/qa/cppunit/basictest.hxx
@@ -88,7 +88,7 @@ class MacroSnippet
MakeModule( sSource );
}
- SbxVariableRef Run( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArgs )
+ SbxVariableRef Run( const css::uno::Sequence< css::uno::Any >& rArgs )
{
SbxVariableRef pReturn = NULL;
if ( !Compile() )
@@ -114,7 +114,7 @@ class MacroSnippet
SbxVariableRef Run()
{
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aArgs;
+ css::uno::Sequence< css::uno::Any > aArgs;
return Run( aArgs );
}
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx
index c7c0500a..5952941 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -176,7 +176,7 @@ namespace basic
);
// OEventListenerAdapter overridables
- virtual void _disposing( const ::com::sun::star::lang::EventObject& _rSource ) SAL_OVERRIDE;
+ virtual void _disposing( const css::lang::EventObject& _rSource ) SAL_OVERRIDE;
// SfxListener overridables
virtual void Notify( SfxBroadcaster& _rBC, const SfxHint& _rHint ) SAL_OVERRIDE;
@@ -535,7 +535,7 @@ namespace basic
}
- void ImplRepository::_disposing( const ::com::sun::star::lang::EventObject& _rSource )
+ void ImplRepository::_disposing( const css::lang::EventObject& _rSource )
{
SolarMutexGuard g;
diff --git a/basic/source/classes/global.cxx b/basic/source/classes/global.cxx
index f0fa742..0c45b28 100644
--- a/basic/source/classes/global.cxx
+++ b/basic/source/classes/global.cxx
@@ -26,7 +26,7 @@ namespace
lclTransliterationWrapper()
: m_aTransliteration(
comphelper::getProcessComponentContext(),
- com::sun::star::i18n::TransliterationModules_IGNORE_CASE )
+ css::i18n::TransliterationModules_IGNORE_CASE )
{
const LanguageType eOfficeLanguage = Application::GetSettings().GetLanguageTag().getLanguageType();
m_aTransliteration.loadModuleIfNeeded( eOfficeLanguage );
diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index 677897a..9f3fc9e 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -94,11 +94,11 @@ size_t SbPropertyValues::GetIndex_Impl( const OUString &rPropName ) const
void SbPropertyValues::setPropertyValue(
const OUString& aPropertyName,
const Any& aValue)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::beans::PropertyVetoException,
- ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::beans::UnknownPropertyException,
+ css::beans::PropertyVetoException,
+ css::lang::IllegalArgumentException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception)
{
size_t const nIndex = GetIndex_Impl( aPropertyName );
PropertyValue & rPropVal = m_aPropVals[nIndex];
@@ -109,9 +109,9 @@ void SbPropertyValues::setPropertyValue(
Any SbPropertyValues::getPropertyValue(
const OUString& aPropertyName)
- throw(::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception)
+ throw(css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception)
{
size_t const nIndex = GetIndex_Impl( aPropertyName );
return m_aPropVals[nIndex].Value;
@@ -159,7 +159,7 @@ void SbPropertyValues::removeVetoableChangeListener(
-Sequence< PropertyValue > SbPropertyValues::getPropertyValues() throw (::com::sun::star::uno::RuntimeException, std::exception)
+Sequence< PropertyValue > SbPropertyValues::getPropertyValues() throw (css::uno::RuntimeException, std::exception)
{
Sequence<PropertyValue> aRet( m_aPropVals.size() );
for (size_t n = 0; n < m_aPropVals.size(); ++n)
@@ -170,11 +170,11 @@ Sequence< PropertyValue > SbPropertyValues::getPropertyValues() throw (::com::su
void SbPropertyValues::setPropertyValues(const Sequence< PropertyValue >& rPropertyValues )
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::beans::PropertyVetoException,
- ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::beans::UnknownPropertyException,
+ css::beans::PropertyVetoException,
+ css::lang::IllegalArgumentException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception)
{
if ( !m_aPropVals.empty() )
throw IllegalArgumentException();
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index a22330e..dd3cd42 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1972,7 +1972,7 @@ bool StarBASIC::StoreData( SvStream& r ) const
return true;
}
-bool StarBASIC::GetUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::uno::Any& aOut )
+bool StarBASIC::GetUNOConstant( const sal_Char* _pAsciiName, css::uno::Any& aOut )
{
bool bRes = false;
OUString sVarName( OUString::createFromAscii( _pAsciiName ) );
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 00f30ec..5d484a2 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -2254,7 +2254,7 @@ void SbUnoObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
const ParamInfo& rInfo = pParamInfos[i];
const Reference< XIdlClass >& rxClass = rInfo.aType;
- com::sun::star::uno::Type aType( rxClass->getTypeClass(), rxClass->getName() );
+ css::uno::Type aType( rxClass->getTypeClass(), rxClass->getName() );
// ATTENTION: Don't forget for Sbx-Parameter the offset!
pAnyArgs[i] = sbxToUnoValue( pParams->Get( (sal_uInt16)(i+1) ), aType );
@@ -2670,7 +2670,7 @@ SbxVariable* SbUnoObject::Find( const OUString& rName, SbxClassType t )
SbxDataType eRealSbxType = ( ( rProp.Attributes & PropertyAttribute::MAYBEVOID ) ? unoToSbxType( rProp.Type.getTypeClass() ) : eSbxType );
// create the property and superimpose it
- SbUnoProperty* pProp = new SbUnoProperty( rProp.Name, eSbxType, eRealSbxType, rProp, 0, false, ( rProp.Type.getTypeClass() == com::sun::star::uno::TypeClass_STRUCT ) );
+ SbUnoProperty* pProp = new SbUnoProperty( rProp.Name, eSbxType, eRealSbxType, rProp, 0, false, ( rProp.Type.getTypeClass() == css::uno::TypeClass_STRUCT ) );
SbxVariableRef xVarRef = pProp;
QuickInsert( static_cast<SbxVariable*>(xVarRef) );
pRes = xVarRef;
@@ -2852,7 +2852,7 @@ void SbUnoObject::implCreateAll()
SbxDataType eRealSbxType = ( ( rProp.Attributes & PropertyAttribute::MAYBEVOID ) ? unoToSbxType( rProp.Type.getTypeClass() ) : eSbxType );
// Create property and superimpose it
- SbxVariableRef xVarRef = new SbUnoProperty( rProp.Name, eSbxType, eRealSbxType, rProp, i, false, ( rProp.Type.getTypeClass() == com::sun::star::uno::TypeClass_STRUCT ) );
+ SbxVariableRef xVarRef = new SbUnoProperty( rProp.Name, eSbxType, eRealSbxType, rProp, i, false, ( rProp.Type.getTypeClass() == css::uno::TypeClass_STRUCT ) );
QuickInsert( static_cast<SbxVariable*>(xVarRef) );
}
@@ -3699,7 +3699,7 @@ void SbUnoService::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
Reference< XTypeDescription > xParamTypeDesc = xParam->getType();
if( !xParamTypeDesc.is() )
continue;
- com::sun::star::uno::Type aType( xParamTypeDesc->getTypeClass(), xParamTypeDesc->getName() );
+ css::uno::Type aType( xParamTypeDesc->getTypeClass(), xParamTypeDesc->getName() );
// sbx parameter needs offset 1
pAnyArgs[i] = sbxToUnoValue( pParams->Get( iSbx ), aType );
@@ -4867,8 +4867,8 @@ SbxVariable* SbUnoStructRefObject::Find( const OUString& rName, SbxClassType t )
SbxDataType eRealSbxType = eSbxType;
Property aProp;
aProp.Name = rName;
- aProp.Type = com::sun::star::uno::Type( it->second->getTypeClass(), it->second->getTypeName() );
- SbUnoProperty* pProp = new SbUnoProperty( rName, eSbxType, eRealSbxType, aProp, 0, false, ( aProp.Type.getTypeClass() == com::sun::star::uno::TypeClass_STRUCT) );
+ aProp.Type = css::uno::Type( it->second->getTypeClass(), it->second->getTypeName() );
+ SbUnoProperty* pProp = new SbUnoProperty( rName, eSbxType, eRealSbxType, aProp, 0, false, ( aProp.Type.getTypeClass() == css::uno::TypeClass_STRUCT) );
SbxVariableRef xVarRef = pProp;
QuickInsert( static_cast<SbxVariable*>(xVarRef) );
pRes = xVarRef;
@@ -4927,8 +4927,8 @@ void SbUnoStructRefObject::implCreateAll()
SbxDataType eRealSbxType = eSbxType;
Property aProp;
aProp.Name = rName;
- aProp.Type = com::sun::star::uno::Type( it->second->getTypeClass(), it->second->getTypeName() );
- SbUnoProperty* pProp = new SbUnoProperty( rName, eSbxType, eRealSbxType, aProp, 0, false, ( aProp.Type.getTypeClass() == com::sun::star::uno::TypeClass_STRUCT) );
+ aProp.Type = css::uno::Type( it->second->getTypeClass(), it->second->getTypeName() );
+ SbUnoProperty* pProp = new SbUnoProperty( rName, eSbxType, eRealSbxType, aProp, 0, false, ( aProp.Type.getTypeClass() == css::uno::TypeClass_STRUCT) );
SbxVariableRef xVarRef = pProp;
QuickInsert( static_cast<SbxVariable*>(xVarRef) );
}
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index db0d7ce..c584619 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -2175,7 +2175,7 @@ SbJScriptMethod::~SbJScriptMethod()
{}
-SbObjModule::SbObjModule( const OUString& rName, const com::sun::star::script::ModuleInfo& mInfo, bool bIsVbaCompatible )
+SbObjModule::SbObjModule( const OUString& rName, const css::script::ModuleInfo& mInfo, bool bIsVbaCompatible )
: SbModule( rName, bIsVbaCompatible )
{
SetModuleType( mInfo.ModuleType );
@@ -2201,7 +2201,7 @@ SbObjModule::SetUnoObject( const uno::Any& aObj ) throw ( uno::RuntimeException,
return;
pDocObject = new SbUnoObject( GetName(), aObj );
- com::sun::star::uno::Reference< com::sun::star::lang::XServiceInfo > xServiceInfo( aObj, com::sun::star::uno::UNO_QUERY_THROW );
+ css::uno::Reference< css::lang::XServiceInfo > xServiceInfo( aObj, css::uno::UNO_QUERY_THROW );
if( xServiceInfo->supportsService( "ooo.vba.excel.Worksheet" ) )
{
SetClassName( "Worksheet" );
@@ -2441,7 +2441,7 @@ public:
}
};
-SbUserFormModule::SbUserFormModule( const OUString& rName, const com::sun::star::script::ModuleInfo& mInfo, bool bIsCompat )
+SbUserFormModule::SbUserFormModule( const OUString& rName, const css::script::ModuleInfo& mInfo, bool bIsCompat )
: SbObjModule( rName, mInfo, bIsCompat )
, m_mInfo( mInfo )
, mbInit( false )
@@ -2557,7 +2557,7 @@ SbUserFormModuleInstance* SbUserFormModule::CreateInstance()
}
SbUserFormModuleInstance::SbUserFormModuleInstance( SbUserFormModule* pParentModule,
- const OUString& rName, const com::sun::star::script::ModuleInfo& mInfo, bool bIsVBACompat )
+ const OUString& rName, const css::script::ModuleInfo& mInfo, bool bIsVBACompat )
: SbUserFormModule( rName, mInfo, bIsVBACompat )
, m_pParentModule( pParentModule )
{
diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx
index 08b695a..d6d481d 100644
--- a/basic/source/comp/codegen.cxx
+++ b/basic/source/comp/codegen.cxx
@@ -141,7 +141,7 @@ void SbiCodeGen::Save()
p->SetFlag( SbiImageFlags::EXPLICIT );
int nIfaceCount = 0;
- if( rMod.mnType == com::sun::star::script::ModuleType::CLASS )
+ if( rMod.mnType == css::script::ModuleType::CLASS )
{
OSL_TRACE("COdeGen::save() classmodule processing");
rMod.bIsProxyModule = true;
@@ -169,9 +169,9 @@ void SbiCodeGen::Save()
{
GetSbData()->pClassFac->RemoveClassModule( &rMod );
// Only a ClassModule can revert to Normal
- if ( rMod.mnType == com::sun::star::script::ModuleType::CLASS )
+ if ( rMod.mnType == css::script::ModuleType::CLASS )
{
- rMod.mnType = com::sun::star::script::ModuleType::NORMAL;
+ rMod.mnType = css::script::ModuleType::NORMAL;
}
rMod.bIsProxyModule = false;
}
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index d867cb4..df1b489 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -129,7 +129,7 @@ SbiParser::SbiParser( StarBASIC* pb, SbModule* pm )
bSingleLineIf =
bCodeCompleting =
bExplicit = false;
- bClassModule = ( pm->GetModuleType() == com::sun::star::script::ModuleType::CLASS );
+ bClassModule = ( pm->GetModuleType() == css::script::ModuleType::CLASS );
OSL_TRACE("Parser - %s, bClassModule %d", OUStringToOString( pm->GetName(), RTL_TEXTENCODING_UTF8 ).getStr(), bClassModule );
pPool = &aPublics;
for( short i = 0; i < 26; i++ )
@@ -806,7 +806,7 @@ void SbiParser::Option()
case CLASSMODULE:
bClassModule = true;
- aGen.GetModule().SetModuleType( com::sun::star::script::ModuleType::CLASS );
+ aGen.GetModule().SetModuleType( css::script::ModuleType::CLASS );
break;
case VBASUPPORT: // Option VBASupport used to override the module mode ( in fact this must reset the mode
if( Next() == NUMBER )
diff --git a/basic/source/inc/date.hxx b/basic/source/inc/date.hxx
index 864aab8..9611f3a 100644
--- a/basic/source/inc/date.hxx
+++ b/basic/source/inc/date.hxx
@@ -40,12 +40,12 @@ sal_Int16 implGetHour( double dDate );
sal_Int16 implGetMinute( double dDate );
sal_Int16 implGetSecond( double dDate );
-::com::sun::star::util::Date SbxDateToUNODate( const SbxValue* );
-void SbxDateFromUNODate( SbxValue*, const ::com::sun::star::util::Date& );
-::com::sun::star::util::Time SbxDateToUNOTime( const SbxValue* );
-void SbxDateFromUNOTime( SbxValue*, const ::com::sun::star::util::Time& );
-::com::sun::star::util::DateTime SbxDateToUNODateTime( const SbxValue* );
-void SbxDateFromUNODateTime( SbxValue*, const ::com::sun::star::util::DateTime& );
+css::util::Date SbxDateToUNODate( const SbxValue* );
+void SbxDateFromUNODate( SbxValue*, const css::util::Date& );
+css::util::Time SbxDateToUNOTime( const SbxValue* );
+void SbxDateFromUNOTime( SbxValue*, const css::util::Time& );
+css::util::DateTime SbxDateToUNODateTime( const SbxValue* );
+void SbxDateFromUNODateTime( SbxValue*, const css::util::DateTime& );
#endif
diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx
index c3084be..d60d0e6 100644
--- a/basic/source/inc/dlgcont.hxx
+++ b/basic/source/inc/dlgcont.hxx
@@ -40,22 +40,22 @@ class SfxDialogLibraryContainer : public SfxLibraryContainer
virtual SfxLibrary* SAL_CALL implCreateLibraryLink
( const OUString& aName, const OUString& aLibInfoFileURL,
const OUString& StorageURL, bool ReadOnly ) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Any SAL_CALL createEmptyLibraryElement() SAL_OVERRIDE;
+ virtual css::uno::Any SAL_CALL createEmptyLibraryElement() SAL_OVERRIDE;
virtual bool SAL_CALL isLibraryElementValid(const css::uno::Any& rElement) const SAL_OVERRIDE;
virtual void SAL_CALL writeLibraryElement
(
- const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>& xLibrary,
+ const css::uno::Reference< css::container::XNameContainer>& xLibrary,
const OUString& aElementName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xOutput
+ const css::uno::Reference< css::io::XOutputStream >& xOutput
)
- throw(::com::sun::star::uno::Exception) SAL_OVERRIDE;
+ throw(css::uno::Exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Any SAL_CALL importLibraryElement
+ virtual css::uno::Any SAL_CALL importLibraryElement
(
- const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>& xLibrary,
+ const css::uno::Reference< css::container::XNameContainer>& xLibrary,
const OUString& aElementName,
const OUString& aFile,
- const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xElementStream ) SAL_OVERRIDE;
+ const css::uno::Reference< css::io::XInputStream >& xElementStream ) SAL_OVERRIDE;
virtual void SAL_CALL importFromOldStorage( const OUString& aFile ) SAL_OVERRIDE;
@@ -70,58 +70,57 @@ class SfxDialogLibraryContainer : public SfxLibraryContainer
public:
SfxDialogLibraryContainer();
- SfxDialogLibraryContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
+ SfxDialogLibraryContainer( const css::uno::Reference< css::embed::XStorage >& xStorage );
// Methods XStorageBasedLibraryContainer
virtual void SAL_CALL storeLibrariesToStorage(
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& RootStorage )
+ const css::uno::Reference< css::embed::XStorage >& RootStorage )
throw (css::uno::RuntimeException,
css::lang::WrappedTargetException,
std::exception) SAL_OVERRIDE;
// Resource handling
- ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourcePersistence >
+ css::uno::Reference< css::resource::XStringResourcePersistence >
implCreateStringResource( class SfxDialogLibrary* pDialog );
// Methods XServiceInfo
virtual OUString SAL_CALL getImplementationName( )
- 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;
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XLibraryQueryExecutable
virtual sal_Bool SAL_CALL HasExecutableCode(const OUString&)
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
-typedef ::cppu::ImplHelper1 < ::com::sun::star::resource::XStringResourceSupplier
+typedef ::cppu::ImplHelper1 < css::resource::XStringResourceSupplier
> SfxDialogLibrary_BASE;
class SfxDialogLibrary :public SfxLibrary
,public SfxDialogLibrary_BASE
{
- SfxDialogLibraryContainer* m_pParent;
- ::com::sun::star::uno::Reference
- < ::com::sun::star::resource::XStringResourcePersistence> m_xStringResourcePersistence;
- OUString m_aName;
+ SfxDialogLibraryContainer* m_pParent;
+ css::uno::Reference< css::resource::XStringResourcePersistence> m_xStringResourcePersistence;
+ OUString m_aName;
// Provide modify state including resources
virtual bool isModified() SAL_OVERRIDE;
virtual void storeResources() SAL_OVERRIDE;
virtual void storeResourcesAsURL( const OUString& URL, const OUString& NewName ) SAL_OVERRIDE;
virtual void storeResourcesToURL( const OUString& URL,
- const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ) SAL_OVERRIDE;
- virtual void storeResourcesToStorage( const ::com::sun::star::uno::Reference
- < ::com::sun::star::embed::XStorage >& xStorage ) SAL_OVERRIDE;
+ const css::uno::Reference< css::task::XInteractionHandler >& xHandler ) SAL_OVERRIDE;
+ virtual void storeResourcesToStorage( const css::uno::Reference
+ < css::embed::XStorage >& xStorage ) SAL_OVERRIDE;
public:
SfxDialogLibrary
(
ModifiableHelper& _rModifiable,
const OUString& aName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
- const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xSFI,
+ const css::uno::Reference< css::uno::XComponentContext >& xContext,
+ const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xSFI,
SfxDialogLibraryContainer* pParent
);
@@ -129,8 +128,8 @@ public:
(
ModifiableHelper& _rModifiable,
const OUString& aName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
- const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xSFI,
+ const css::uno::Reference< css::uno::XComponentContext >& xContext,
+ const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xSFI,
const OUString& aLibInfoFileURL, const OUString& aStorageURL, bool ReadOnly,
SfxDialogLibraryContainer* pParent
);
@@ -139,19 +138,19 @@ public:
DECLARE_XTYPEPROVIDER()
// XStringResourceSupplier
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceResolver >
- SAL_CALL getStringResource( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::resource::XStringResourceResolver >
+ SAL_CALL getStringResource( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
OUString getName()
{ return m_aName; }
- ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourcePersistence >
+ css::uno::Reference< css::resource::XStringResourcePersistence >
getStringResourcePersistence()
{
return m_xStringResourcePersistence;
}
- static bool containsValidDialog( const ::com::sun::star::uno::Any& aElement );
+ static bool containsValidDialog( const css::uno::Any& aElement );
protected:
virtual bool SAL_CALL isLibraryElementValid(const css::uno::Any& rElement) const SAL_OVERRIDE;
diff --git a/basic/source/inc/errobject.hxx b/basic/source/inc/errobject.hxx
index e2c354e..88cef68 100644
--- a/basic/source/inc/errobject.hxx
+++ b/basic/source/inc/errobject.hxx
@@ -26,17 +26,17 @@
class SbxErrObject : public SbUnoObject
{
class ErrObject* m_pErrObject;
- com::sun::star::uno::Reference< ooo::vba::XErrObject > m_xErr;
+ css::uno::Reference< ooo::vba::XErrObject > m_xErr;
- SbxErrObject( const OUString& aName_, const com::sun::star::uno::Any& aUnoObj_ );
+ SbxErrObject( const OUString& aName_, const css::uno::Any& aUnoObj_ );
virtual ~SbxErrObject();
public:
static SbxVariableRef getErrObject();
- static com::sun::star::uno::Reference< ooo::vba::XErrObject > getUnoErrObject();
+ static css::uno::Reference< ooo::vba::XErrObject > getUnoErrObject();
void setNumberAndDescription( ::sal_Int32 _number, const OUString& _description )
- throw (com::sun::star::uno::RuntimeException);
+ throw (css::uno::RuntimeException);
};
#endif
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index af86eee..19e611a 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -61,9 +61,9 @@ class BasicManager;
namespace basic
{
typedef ::cppu::WeakImplHelper<
- ::com::sun::star::container::XNameContainer,
- ::com::sun::star::container::XContainer,
- ::com::sun::star::util::XChangesNotifier > NameContainer_BASE;
+ css::container::XNameContainer,
+ css::container::XContainer,
+ css::util::XChangesNotifier > NameContainer_BASE;
@@ -72,18 +72,18 @@ class NameContainer : public ::cppu::BaseMutex, public NameContainer_BASE
typedef std::unordered_map < OUString, sal_Int32, OUStringHash > NameContainerNameMap;
NameContainerNameMap mHashMap;
- ::com::sun::star::uno::Sequence< OUString > mNames;
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > mValues;
+ css::uno::Sequence< OUString > mNames;
+ css::uno::Sequence< css::uno::Any > mValues;
sal_Int32 mnElementCount;
- ::com::sun::star::uno::Type mType;
- ::com::sun::star::uno::XInterface* mpxEventSource;
+ css::uno::Type mType;
+ css::uno::XInterface* mpxEventSource;
::cppu::OInterfaceContainerHelper maContainerListeners;
::cppu::OInterfaceContainerHelper maChangesListeners;
public:
- NameContainer( const ::com::sun::star::uno::Type& rType )
+ NameContainer( const css::uno::Type& rType )
: mnElementCount( 0 )
, mType( rType )
, mpxEventSource( NULL )
@@ -91,7 +91,7 @@ public:
, maChangesListeners( m_aMutex )
{}
- void setEventSource( ::com::sun::star::uno::XInterface* pxEventSource )
+ void setEventSource( css::uno::XInterface* pxEventSource )
{ mpxEventSource = pxEventSource; }
void insertCheck(const OUString& aName, const css::uno::Any& aElement)
@@ -106,54 +106,50 @@ public:
css::uno::RuntimeException, std::exception);
// Methods XElementAccess
- virtual ::com::sun::star::uno::Type SAL_CALL getElementType( )
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Type SAL_CALL getElementType( )
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL hasElements( )
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Methods XNameAccess
- virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName )
- throw(::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( )
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
+ throw(css::container::NoSuchElementException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( )
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Methods XNameReplace
- virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement )
- throw(::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement )
+ throw(css::lang::IllegalArgumentException,
+ css::container::NoSuchElementException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Methods XNameContainer
- virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement )
- throw(::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::container::ElementExistException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement )
+ throw(css::lang::IllegalArgumentException,
+ css::container::ElementExistException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeByName( const OUString& Name )
- throw(::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::container::NoSuchElementException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Methods XContainer
- virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference<
- ::com::sun::star::container::XContainerListener >& xListener )
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference<
- ::com::sun::star::container::XContainerListener >& xListener )
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL addContainerListener( const css::uno::Reference<css::container::XContainerListener >& xListener )
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL removeContainerListener( const css::uno::Reference<css::container::XContainerListener >& xListener )
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Methods XChangesNotifier
- virtual void SAL_CALL addChangesListener( const ::com::sun::star::uno::Reference<
- ::com::sun::star::util::XChangesListener >& xListener )
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL removeChangesListener( const ::com::sun::star::uno::Reference<
- ::com::sun::star::util::XChangesListener >& xListener )
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL addChangesListener( const css::uno::Reference<css::util::XChangesListener >& xListener )
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL removeChangesListener( const css::uno::Reference<css::util::XChangesListener >& xListener )
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
@@ -176,12 +172,12 @@ public:
inline bool isModified() const { return mbModified; }
void setModified( bool _bModified );
- inline void addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& _rxListener )
+ inline void addModifyListener( const css::uno::Reference< css::util::XModifyListener >& _rxListener )
{
m_aModifyListeners.addInterface( _rxListener );
}
- inline void removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& _rxListener )
+ inline void removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& _rxListener )
{
m_aModifyListeners.removeInterface( _rxListener );
}
@@ -190,8 +186,8 @@ public:
typedef ::comphelper::OListenerContainerBase<
- ::com::sun::star::script::vba::XVBAScriptListener,
- ::com::sun::star::script::vba::VBAScriptEvent > VBAScriptListenerContainer_BASE;
+ css::script::vba::XVBAScriptListener,
+ css::script::vba::VBAScriptEvent > VBAScriptListenerContainer_BASE;
class VBAScriptListenerContainer : public VBAScriptListenerContainer_BASE
{
@@ -200,9 +196,9 @@ public:
private:
virtual bool implTypedNotify(
- const ::com::sun::star::uno::Reference< ::com::sun::star::script::vba::XVBAScriptListener >& rxListener,
- const ::com::sun::star::script::vba::VBAScriptEvent& rEvent )
- throw (::com::sun::star::uno::Exception) SAL_OVERRIDE;
+ const css::uno::Reference< css::script::vba::XVBAScriptListener >& rxListener,
+ const css::script::vba::VBAScriptEvent& rEvent )
+ throw (css::uno::Exception) SAL_OVERRIDE;
};
@@ -210,15 +206,15 @@ private:
class SfxLibrary;
typedef ::cppu::WeakComponentImplHelper<
- ::com::sun::star::lang::XInitialization,
- ::com::sun::star::script::XStorageBasedLibraryContainer,
- ::com::sun::star::script::XLibraryContainerPassword,
- ::com::sun::star::script::XLibraryContainerExport,
- ::com::sun::star::script::XLibraryContainer3,
- ::com::sun::star::container::XContainer,
- ::com::sun::star::script::XLibraryQueryExecutable,
- ::com::sun::star::script::vba::XVBACompatibility,
- ::com::sun::star::lang::XServiceInfo > SfxLibraryContainer_BASE;
+ css::lang::XInitialization,
+ css::script::XStorageBasedLibraryContainer,
+ css::script::XLibraryContainerPassword,
+ css::script::XLibraryContainerExport,
+ css::script::XLibraryContainer3,
+ css::container::XContainer,
+ css::script::XLibraryQueryExecutable,
+ css::script::vba::XVBACompatibility,
+ css::lang::XServiceInfo > SfxLibraryContainer_BASE;
class SfxLibraryContainer : public SfxLibraryContainer_BASE, public ::utl::OEventListenerAdapter
{
@@ -227,10 +223,10 @@ class SfxLibraryContainer : public SfxLibraryContainer_BASE, public ::utl::OEven
bool mbVBACompat;
OUString msProjectName;
protected:
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
- ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 > mxSFI;
- ::com::sun::star::uno::Reference< ::com::sun::star::util::XStringSubstitution > mxStringSubstitution;
- ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XModel > mxOwnerDocument;
+ css::uno::Reference< css::uno::XComponentContext > mxContext;
+ css::uno::Reference< css::ucb::XSimpleFileAccess3 > mxSFI;
+ css::uno::Reference< css::util::XStringSubstitution > mxStringSubstitution;
+ css::uno::WeakReference< css::frame::XModel > mxOwnerDocument;
::osl::Mutex maMutex;
ModifiableHelper maModifiable;
@@ -246,7 +242,7 @@ protected:
OUString maLibraryPath;
OUString maLibrariesDir;
- ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > mxStorage;
+ css::uno::Reference< css::embed::XStorage > mxStorage;
BasicManager* mpBasMgr;
bool mbOwnBasMgr;
@@ -261,28 +257,28 @@ protected:
void implStoreLibrary( SfxLibrary* pLib,
const OUString& rName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rStorage );
+ const css::uno::Reference< css::embed::XStorage >& rStorage );
// New variant for library export
void implStoreLibrary( SfxLibrary* pLib,
const OUString& rName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rStorage,
+ const css::uno::Reference< css::embed::XStorage >& rStorage,
const OUString& rTargetURL,
- const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& rToUseSFI,
- const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& rHandler );
+ const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& rToUseSFI,
+ const css::uno::Reference< css::task::XInteractionHandler >& rHandler );
void implStoreLibraryIndexFile( SfxLibrary* pLib, const ::xmlscript::LibDescriptor& rLib,
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
+ const css::uno::Reference< css::embed::XStorage >& xStorage );
// New variant for library export
void implStoreLibraryIndexFile( SfxLibrary* pLib, const ::xmlscript::LibDescriptor& rLib,
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
+ const css::uno::Reference< css::embed::XStorage >& xStorage,
const OUString& aTargetURL,
- const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& rToUseSFI );
+ const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& rToUseSFI );
bool implLoadLibraryIndexFile( SfxLibrary* pLib,
::xmlscript::LibDescriptor& rLib,
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
+ const css::uno::Reference< css::embed::XStorage >& xStorage,
const OUString& aIndexFileName );
void implImportLibDescriptor( SfxLibrary* pLib, ::xmlscript::LibDescriptor& rLib );
@@ -292,38 +288,38 @@ protected:
virtual SfxLibrary* SAL_CALL implCreateLibraryLink
( const OUString& aName, const OUString& aLibInfoFileURL,
const OUString& StorageURL, bool ReadOnly ) = 0;
- virtual ::com::sun::star::uno::Any SAL_CALL createEmptyLibraryElement() = 0;
+ virtual css::uno::Any SAL_CALL createEmptyLibraryElement() = 0;
virtual bool SAL_CALL isLibraryElementValid(const css::uno::Any& rElement) const = 0;
virtual void SAL_CALL writeLibraryElement
(
- const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>& xLibrary,
+ const css::uno::Reference< css::container::XNameContainer>& xLibrary,
const OUString& aElementName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xOutput
+ const css::uno::Reference< css::io::XOutputStream >& xOutput
)
- throw(::com::sun::star::uno::Exception) = 0;
+ throw(css::uno::Exception) = 0;
- virtual ::com::sun::star::uno::Any SAL_CALL importLibraryElement
+ virtual css::uno::Any SAL_CALL importLibraryElement
(
- const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>& xLibrary,
+ const css::uno::Reference< css::container::XNameContainer>& xLibrary,
const OUString& aElementName,
const OUString& aFile,
- const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xElementStream ) = 0;
+ const css::uno::Reference< css::io::XInputStream >& xElementStream ) = 0;
virtual void SAL_CALL importFromOldStorage( const OUString& aFile ) = 0;
// Password encryption
virtual bool implStorePasswordLibrary( SfxLibrary* pLib, const OUString& aName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler );
+ const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::task::XInteractionHandler >& Handler );
// New variant for library export
virtual bool implStorePasswordLibrary( SfxLibrary* pLib, const OUString& aName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rStorage,
+ const css::uno::Reference< css::embed::XStorage >& rStorage,
const OUString& aTargetURL,
- const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& rToUseSFI, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler );
+ const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& rToUseSFI, const css::uno::Reference< css::task::XInteractionHandler >& Handler );
virtual bool implLoadPasswordLibrary( SfxLibrary* pLib, const OUString& Name,
bool bVerifyPasswordOnly=false )
- throw(::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ throw(css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception);
virtual void onNewRootStorage() = 0;
@@ -338,7 +334,7 @@ protected:
OUString createAppLibraryFolder( SfxLibrary* pLib, const OUString& aName );
void init( const OUString& rInitialDocumentURL,
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxInitialStorage );
+ const css::uno::Reference< css::embed::XStorage >& _rxInitialStorage );
virtual const sal_Char* SAL_CALL getInfoFileName() const = 0;
virtual const sal_Char* SAL_CALL getOldInfoFileName() const = 0;
@@ -354,26 +350,26 @@ protected:
OUString& aUnexpandedStorageURL
);
OUString expand_url( const OUString& url )
- throw(::com::sun::star::uno::RuntimeException);
+ throw(css::uno::RuntimeException);
SfxLibrary* getImplLib( const OUString& rLibraryName );
void storeLibraries_Impl(
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
+ const css::uno::Reference< css::embed::XStorage >& xStorage,
bool bComplete );
void SAL_CALL initializeFromDocumentURL( const OUString& _rInitialDocumentURL );
- void SAL_CALL initializeFromDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XStorageBasedDocument >& _rxDocument );
+ void SAL_CALL initializeFromDocument( const css::uno::Reference< css::document::XStorageBasedDocument >& _rxDocument );
// OEventListenerAdapter
- virtual void _disposing( const ::com::sun::star::lang::EventObject& _rSource ) SAL_OVERRIDE;
+ virtual void _disposing( const css::lang::EventObject& _rSource ) SAL_OVERRIDE;
// OComponentHelper
virtual void SAL_CALL disposing() SAL_OVERRIDE;
private:
void init_Impl( const OUString& rInitialDocumentURL,
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxInitialStorage );
+ const css::uno::Reference< css::embed::XStorage >& _rxInitialStorage );
void implScanExtensions();
public:
@@ -393,146 +389,146 @@ public:
void checkDisposed() const;
// Methods XElementAccess
- virtual ::com::sun::star::uno::Type SAL_CALL getElementType()
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Type SAL_CALL getElementType()
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL hasElements()
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Methods XNameAccess
- virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName )
- throw(::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames()
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
+ throw(css::container::NoSuchElementException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Members XStorageBasedLibraryContainer
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL getRootStorage() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL setRootStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rootstorage ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL storeLibrariesToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& RootStorage ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getRootStorage() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setRootStorage( const css::uno::Reference< css::embed::XStorage >& _rootstorage ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL storeLibrariesToStorage( const css::uno::Reference< css::embed::XStorage >& RootStorage ) throw (css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Methods XModifiable (base of XPersistentLibraryContainer)
- virtual sal_Bool SAL_CALL isModified( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL setModified( sal_Bool bModified ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL isModified( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setModified( sal_Bool bModified ) throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Methods XPersistentLibraryContainer (base of XStorageBasedLibraryContainer)
- virtual ::com::sun::star::uno::Any SAL_CALL getRootLocation() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual OUString SAL_CALL getContainerLocationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL storeLibraries( ) throw (::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Any SAL_CALL getRootLocation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getContainerLocationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL storeLibraries( ) throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//Methods XLibraryContainer3
virtual OUString SAL_CALL getOriginalLibraryLinkURL( const OUString& Name )
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (css::lang::IllegalArgumentException,
+ css::container::NoSuchElementException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Methods XLibraryContainer2 (base of XPersistentLibraryContainer)
virtual sal_Bool SAL_CALL isLibraryLink( const OUString& Name )
- throw (::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (css::container::NoSuchElementException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual OUString SAL_CALL getLibraryLinkURL( const OUString& Name )
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (css::lang::IllegalArgumentException,
+ css::container::NoSuchElementException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isLibraryReadOnly( const OUString& Name )
- throw (::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (css::container::NoSuchElementException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setLibraryReadOnly( const OUString& Name, sal_Bool bReadOnly )
- throw (::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (css::container::NoSuchElementException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL renameLibrary( const OUString& Name, const OUString& NewName )
- throw (::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::container::ElementExistException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (css::container::NoSuchElementException,
+ css::container::ElementExistException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Methods XLibraryContainer (base of XLibraryContainer2)
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL
+ virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL
createLibrary( const OUString& Name )
- throw(::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::container::ElementExistException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL createLibraryLink
+ throw(css::lang::IllegalArgumentException,
+ css::container::ElementExistException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL createLibraryLink
( const OUString& Name, const OUString& StorageURL, sal_Bool ReadOnly )
- throw(::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::container::ElementExistException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::lang::IllegalArgumentException,
+ css::container::ElementExistException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeLibrary( const OUString& Name )
- throw(::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::container::NoSuchElementException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isLibraryLoaded( const OUString& Name )
- throw(::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::container::NoSuchElementException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL loadLibrary( const OUString& Name )
- throw(::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::container::NoSuchElementException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Methods XInitialization
- virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence<
- ::com::sun::star::uno::Any >& aArguments )
- throw (::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL initialize( const css::uno::Sequence<
+ css::uno::Any >& aArguments )
+ throw (css::uno::Exception,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Methods XLibraryContainerPassword
virtual sal_Bool SAL_CALL isLibraryPasswordProtected( const OUString& Name )
- throw (::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (css::container::NoSuchElementException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isLibraryPasswordVerified( const OUString& Name )
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (css::lang::IllegalArgumentException,
+ css::container::NoSuchElementException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL verifyLibraryPassword( const OUString& Name, const OUString& Password )
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (css::lang::IllegalArgumentException,
+ css::container::NoSuchElementException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL changeLibraryPassword( const OUString& Name,
const OUString& OldPassword, const OUString& NewPassword )
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (css::lang::IllegalArgumentException,
+ css::container::NoSuchElementException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Methods XContainer
- virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference<
- ::com::sun::star::container::XContainerListener >& xListener )
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference<
- ::com::sun::star::container::XContainerListener >& xListener )
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL addContainerListener( const css::uno::Reference<
+ css::container::XContainerListener >& xListener )
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL removeContainerListener( const css::uno::Reference<
+ css::container::XContainerListener >& xListener )
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Methods XLibraryContainerExport
virtual void SAL_CALL exportLibrary( const OUString& Name, const OUString& URL,
- const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler )
- throw (::com::sun::star::uno::Exception,
- ::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ const css::uno::Reference< css::task::XInteractionHandler >& Handler )
+ throw (css::uno::Exception,
+ css::container::NoSuchElementException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Methods XServiceInfo
virtual OUString SAL_CALL getImplementationName( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0;
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0;
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 = 0;
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0;
// Methods XVBACompatibility
- virtual sal_Bool SAL_CALL getVBACompatibilityMode() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL setVBACompatibilityMode( sal_Bool _vbacompatmodeon ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual OUString SAL_CALL getProjectName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return msProjectName; }
- virtual void SAL_CALL setProjectName( const OUString& _projectname ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL getVBACompatibilityMode() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setVBACompatibilityMode( sal_Bool _vbacompatmodeon ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getProjectName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return msProjectName; }
+ virtual void SAL_CALL setProjectName( const OUString& _projectname ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getRunningVBAScripts()
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addVBAScriptListener(
- const ::com::sun::star::uno::Reference< ::com::sun::star::script::vba::XVBAScriptListener >& Listener )
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ const css::uno::Reference< css::script::vba::XVBAScriptListener >& Listener )
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeVBAScriptListener(
- const ::com::sun::star::uno::Reference< ::com::sun::star::script::vba::XVBAScriptListener >& Listener )
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ const css::uno::Reference< css::script::vba::XVBAScriptListener >& Listener )
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL broadcastVBAScriptEvent( sal_Int32 nIdentifier, const OUString& rModuleName )
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
@@ -554,9 +550,9 @@ public:
class SfxLibrary
- : public ::com::sun::star::container::XNameContainer
- , public ::com::sun::star::container::XContainer
- , public ::com::sun::star::util::XChangesNotifier
+ : public css::container::XNameContainer
+ , public css::container::XContainer
+ , public css::util::XChangesNotifier
, public ::cppu::BaseMutex
, public ::cppu::OComponentHelper
{
@@ -564,8 +560,8 @@ class SfxLibrary
friend class SfxDialogLibraryContainer;
friend class SfxScriptLibraryContainer;
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
- ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 > mxSFI;
+ css::uno::Reference< css::uno::XComponentContext > mxContext;
+ css::uno::Reference< css::ucb::XSimpleFileAccess3 > mxSFI;
ModifiableHelper& mrModifiable;
NameContainer maNameContainer;
@@ -603,9 +599,8 @@ private:
virtual void storeResources() = 0;
virtual void storeResourcesAsURL( const OUString& URL, const OUString& NewName ) = 0;
virtual void storeResourcesToURL( const OUString& URL,
- const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ) = 0;
- virtual void storeResourcesToStorage( const ::com::sun::star::uno::Reference
- < ::com::sun::star::embed::XStorage >& xStorage ) = 0;
+ const css::uno::Reference< css::task::XInteractionHandler >& xHandler ) = 0;
+ virtual void storeResourcesToStorage( const css::uno::Reference< css::embed::XStorage >& xStorage ) = 0;
protected:
inline bool implIsModified() const { return mbIsModified; }
@@ -626,80 +621,80 @@ private:
public:
SfxLibrary(
ModifiableHelper& _rModifiable,
- const ::com::sun::star::uno::Type& aType,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
- const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xSFI
+ const css::uno::Type& aType,
+ const css::uno::Reference< css::uno::XComponentContext >& xContext,
+ const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xSFI
);
SfxLibrary(
ModifiableHelper& _rModifiable,
- const ::com::sun::star::uno::Type& aType,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
- const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xSFI,
+ const css::uno::Type& aType,
+ const css::uno::Reference< css::uno::XComponentContext >& xContext,
+ const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xSFI,
const OUString& aLibInfoFileURL,
const OUString& aStorageURL,
bool ReadOnly
);
// Methods 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 { OComponentHelper::acquire(); }
virtual void SAL_CALL release() throw() SAL_OVERRIDE { OComponentHelper::release(); }
// Methods XElementAccess
- virtual ::com::sun::star::uno::Type SAL_CALL getElementType( )
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Type SAL_CALL getElementType( )
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL hasElements( )
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Methods XNameAccess
- virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName )
- throw(::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( )
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
+ throw(css::container::NoSuchElementException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( )
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Methods XNameReplace
- virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement )
- throw(::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement )
+ throw(css::lang::IllegalArgumentException,
+ css::container::NoSuchElementException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Methods XNameContainer
- virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement )
- throw(::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::container::ElementExistException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement )
+ throw(css::lang::IllegalArgumentException,
+ css::container::ElementExistException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeByName( const OUString& Name )
- throw(::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::container::NoSuchElementException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XTypeProvider
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( )
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( )
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// Methods XContainer
- virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference<
- ::com::sun::star::container::XContainerListener >& xListener )
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference<
- ::com::sun::star::container::XContainerListener >& xListener )
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL addContainerListener( const css::uno::Reference<
+ css::container::XContainerListener >& xListener )
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL removeContainerListener( const css::uno::Reference<
+ css::container::XContainerListener >& xListener )
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Methods XChangesNotifier
- virtual void SAL_CALL addChangesListener( const ::com::sun::star::uno::Reference<
- ::com::sun::star::util::XChangesListener >& xListener )
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL removeChangesListener( const ::com::sun::star::uno::Reference<
- ::com::sun::star::util::XChangesListener >& xListener )
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL addChangesListener( const css::uno::Reference<
+ css::util::XChangesListener >& xListener )
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL removeChangesListener( const css::uno::Reference<
+ css::util::XChangesListener >& xListener )
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
public:
struct LibraryContainerAccess { friend class SfxLibraryContainer; private: LibraryContainerAccess() { } };
@@ -718,24 +713,23 @@ protected:
class ScriptSubPackageIterator
{
- com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > m_xMainPackage;
+ css::uno::Reference< css::deployment::XPackage > m_xMainPackage;
bool m_bIsValid;
bool m_bIsBundle;
- com::sun::star::uno::Sequence< com::sun::star::uno::Reference
- < com::sun::star::deployment::XPackage > > m_aSubPkgSeq;
+ css::uno::Sequence< css::uno::Reference< css::deployment::XPackage > > m_aSubPkgSeq;
sal_Int32 m_nSubPkgCount;
sal_Int32 m_iNextSubPkg;
- static com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >
- implDetectScriptPackage( const com::sun::star::uno::Reference
- < com::sun::star::deployment::XPackage >& rPackage, bool& rbPureDialogLib );
+ static css::uno::Reference< css::deployment::XPackage >
+ implDetectScriptPackage( const css::uno::Reference
+ < css::deployment::XPackage >& rPackage, bool& rbPureDialogLib );
public:
- ScriptSubPackageIterator( com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xMainPackage );
+ ScriptSubPackageIterator( css::uno::Reference< css::deployment::XPackage > xMainPackage );
- com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > getNextScriptSubPackage( bool& rbPureDialogLib );
+ css::uno::Reference< css::deployment::XPackage > getNextScriptSubPackage( bool& rbPureDialogLib );
};
@@ -747,14 +741,14 @@ public:
OUString nextBasicOrDialogLibrary( bool& rbPureDialogLib );
protected:
- com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >
+ css::uno::Reference< css::deployment::XPackage >
implGetNextUserScriptPackage( bool& rbPureDialogLib );
- com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >
+ css::uno::Reference< css::deployment::XPackage >
implGetNextSharedScriptPackage( bool& rbPureDialogLib );
- com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >
+ css::uno::Reference< css::deployment::XPackage >
implGetNextBundledScriptPackage( bool& rbPureDialogLib );
- com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
enum IteratorState
{
@@ -764,16 +758,13 @@ protected:
END_REACHED
} m_eState;
- com::sun::star::uno::Sequence< com::sun::star::uno::Reference
- < com::sun::star::deployment::XPackage > > m_aUserPackagesSeq;
+ css::uno::Sequence< css::uno::Reference< css::deployment::XPackage > > m_aUserPackagesSeq;
bool m_bUserPackagesLoaded;
- com::sun::star::uno::Sequence< com::sun::star::uno::Reference
- < com::sun::star::deployment::XPackage > > m_aSharedPackagesSeq;
+ css::uno::Sequence< css::uno::Reference< css::deployment::XPackage > > m_aSharedPackagesSeq;
bool m_bSharedPackagesLoaded;
- com::sun::star::uno::Sequence< com::sun::star::uno::Reference
- < com::sun::star::deployment::XPackage > > m_aBundledPackagesSeq;
+ css::uno::Sequence< css::uno::Reference< css::deployment::XPackage > > m_aBundledPackagesSeq;
bool m_bBundledPackagesLoaded;
int m_iUserPackage;
diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx
index c5de2b1..a74d2b2 100644
--- a/basic/source/inc/propacc.hxx
+++ b/basic/source/inc/propacc.hxx
@@ -27,11 +27,10 @@
#include <cppuhelper/implbase.hxx>
#include <boost/ptr_container/ptr_vector.hpp>
-typedef ::boost::ptr_vector< ::com::sun::star::beans::PropertyValue >
- SbPropertyValueArr_Impl;
+typedef ::boost::ptr_vector< css::beans::PropertyValue > SbPropertyValueArr_Impl;
-typedef ::cppu::WeakImplHelper< ::com::sun::star::beans::XPropertySet,
- ::com::sun::star::beans::XPropertyAccess > SbPropertyValuesHelper;
+typedef ::cppu::WeakImplHelper< css::beans::XPropertySet,
+ css::beans::XPropertyAccess > SbPropertyValuesHelper;
@@ -39,7 +38,7 @@ typedef ::cppu::WeakImplHelper< ::com::sun::star::beans::XPropertySet,
class SbPropertyValues: public SbPropertyValuesHelper
{
SbPropertyValueArr_Impl m_aPropVals;
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > m_xInfo;
+ css::uno::Reference< css::beans::XPropertySetInfo > m_xInfo;
private:
size_t GetIndex_Impl( const OUString &rPropName ) const;
@@ -49,65 +48,65 @@ public:
virtual ~SbPropertyValues();
// XPropertySet
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL
- getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
+ getPropertySetInfo() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL setPropertyValue(
const OUString& aPropertyName,
- const ::com::sun::star::uno::Any& aValue)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::beans::PropertyVetoException,
- ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName )
- throw( ::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ const css::uno::Any& aValue)
+ throw (css::beans::UnknownPropertyException,
+ css::beans::PropertyVetoException,
+ css::lang::IllegalArgumentException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName )
+ throw( css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addPropertyChangeListener(
const OUString& aPropertyName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& )
+ const css::uno::Reference< css::beans::XPropertyChangeListener >& )
throw (std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removePropertyChangeListener(
const OUString& aPropertyName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& )
+ const css::uno::Reference< css::beans::XPropertyChangeListener >& )
throw (std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addVetoableChangeListener(
const OUString& aPropertyName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& )
+ const css::uno::Reference< css::beans::XVetoableChangeListener >& )
throw (std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeVetoableChangeListener(
const OUString& aPropertyName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& )
+ const css::uno::Reference< css::beans::XVetoableChangeListener >& )
throw (std::exception) SAL_OVERRIDE;
// XPropertyAccess
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& PropertyValues_) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setPropertyValues(const css::uno::Sequence< css::beans::PropertyValue >& PropertyValues_) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
-typedef ::cppu::WeakImplHelper< ::com::sun::star::beans::XPropertySetInfo > SbPropertySetInfoHelper;
+typedef ::cppu::WeakImplHelper< css::beans::XPropertySetInfo > SbPropertySetInfoHelper;
// AB 20.3.2000 Help Class for XPropertySetInfo implementation
class PropertySetInfoImpl
{
friend class SbPropertySetInfo;
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > _aProps;
+ css::uno::Sequence< css::beans::Property > _aProps;
sal_Int32 GetIndex_Impl( const OUString &rPropName ) const;
public:
PropertySetInfoImpl();
- PropertySetInfoImpl( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& rProps );
+ PropertySetInfoImpl( css::uno::Sequence< css::beans::Property >& rProps );
// XPropertySetInfo
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties() throw () { return _aProps;}
- ::com::sun::star::beans::Property SAL_CALL getPropertyByName(const OUString& Name)
- throw( ::com::sun::star::uno::RuntimeException );
+ css::uno::Sequence< css::beans::Property > SAL_CALL getProperties() throw () { return _aProps;}
+ css::beans::Property SAL_CALL getPropertyByName(const OUString& Name)
+ throw( css::uno::RuntimeException );
bool SAL_CALL hasPropertyByName(const OUString& Name)
- throw ( ::com::sun::star::uno::RuntimeException );
+ throw ( css::uno::RuntimeException );
};
class SbPropertySetInfo: public SbPropertySetInfoHelper
@@ -119,12 +118,12 @@ public:
virtual ~SbPropertySetInfo();
// XPropertySetInfo
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties()
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName(const OUString& Name)
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::beans::Property SAL_CALL getPropertyByName(const OUString& Name)
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& Name)
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
};
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index 8e7e884..acf3747 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -122,11 +122,7 @@ public:
// time are managed by chained instances. There is all the data that only lives
// when the BASIC is living too, like the I/O-system.
-typedef ::std::vector
-<
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
->
-ComponentVector_t;
+typedef std::vector< css::uno::Reference< css::lang::XComponent > > ComponentVector_t;
class SbiInstance
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index 21754c6..b9c2a6d9b 100644
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -43,24 +43,24 @@ void registerComponentToBeDisposedForBasic( css::uno::Reference< css::lang::XCom
class StructRefInfo
{
- com::sun::star::uno::Any& maAny;
+ css::uno::Any& maAny;
css::uno::Type maType;
sal_Int32 mnPos;
public:
- StructRefInfo( com::sun::star::uno::Any& aAny, css::uno::Type const & rType, sal_Int32 nPos ) : maAny( aAny ), maType( rType ), mnPos( nPos ) {}
+ StructRefInfo( css::uno::Any& aAny, css::uno::Type const & rType, sal_Int32 nPos ) : maAny( aAny ), maType( rType ), mnPos( nPos ) {}
sal_Int32 getPos() const { return mnPos; }
css::uno::Type getType() const { return maType; }
OUString getTypeName() const;
- com::sun::star::uno::Any& getRootAnyRef() { return maAny; };
+ css::uno::Any& getRootAnyRef() { return maAny; };
- com::sun::star::uno::TypeClass getTypeClass() const;
+ css::uno::TypeClass getTypeClass() const;
void* getInst();
bool isEmpty() { return (mnPos == -1); }
- ::com::sun::star::uno::Any getValue();
- bool setValue( const ::com::sun::star::uno::Any& );
+ css::uno::Any getValue();
+ bool setValue( const css::uno::Any& );
};
class SbUnoStructRefObject: public SbxObject
@@ -96,20 +96,20 @@ public:
{ implCreateAll(); }
// give out value
- ::com::sun::star::uno::Any getUnoAny();
+ css::uno::Any getUnoAny();
void Notify( SfxBroadcaster&, const SfxHint& rHint ) SAL_OVERRIDE;
};
class SbUnoObject: public SbxObject
{
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess > mxUnoAccess;
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMaterialHolder > mxMaterialHolder;
- ::com::sun::star::uno::Reference< ::com::sun::star::script::XInvocation > mxInvocation;
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XExactName > mxExactName;
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XExactName > mxExactNameInvocation;
+ css::uno::Reference< css::beans::XIntrospectionAccess > mxUnoAccess;
+ css::uno::Reference< css::beans::XMaterialHolder > mxMaterialHolder;
+ css::uno::Reference< css::script::XInvocation > mxInvocation;
+ css::uno::Reference< css::beans::XExactName > mxExactName;
+ css::uno::Reference< css::beans::XExactName > mxExactNameInvocation;
bool bNeedIntrospection;
bool bNativeCOMObject;
- ::com::sun::star::uno::Any maTmpUnoObj; // Only to save obj for doIntrospection!
+ css::uno::Any maTmpUnoObj; // Only to save obj for doIntrospection!
::boost::shared_ptr< SbUnoStructRefObject > maStructInfo;
// help method to establish the dbg_-properties
void implCreateDbgProperties();
@@ -121,7 +121,7 @@ class SbUnoObject: public SbxObject
public:
static bool getDefaultPropName( SbUnoObject* pUnoObj, OUString& sDfltProp );
TYPEINFO_OVERRIDE();
- SbUnoObject( const OUString& aName_, const ::com::sun::star::uno::Any& aUnoObj_ );
+ SbUnoObject( const OUString& aName_, const css::uno::Any& aUnoObj_ );
virtual ~SbUnoObject();
// #76470 do introspection on demand
@@ -135,9 +135,9 @@ public:
{ implCreateAll(); }
// give out value
- ::com::sun::star::uno::Any getUnoAny();
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess > getIntrospectionAccess() { return mxUnoAccess; }
- ::com::sun::star::uno::Reference< ::com::sun::star::script::XInvocation > getInvocation() { return mxInvocation; }
+ css::uno::Any getUnoAny();
+ css::uno::Reference< css::beans::XIntrospectionAccess > getIntrospectionAccess() { return mxUnoAccess; }
+ css::uno::Reference< css::script::XInvocation > getInvocation() { return mxInvocation; }
void Notify( SfxBroadcaster&, const SfxHint& rHint ) SAL_OVERRIDE;
@@ -156,8 +156,8 @@ class SbUnoMethod : public SbxMethod
friend void clearUnoMethods();
friend void clearUnoMethodsForBasic( StarBASIC* pBasic );
- ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlMethod > m_xUnoMethod;
- ::com::sun::star::uno::Sequence< ::com::sun::star::reflection::ParamInfo >* pParamInfoSeq;
+ css::uno::Reference< css::reflection::XIdlMethod > m_xUnoMethod;
+ css::uno::Sequence< css::reflection::ParamInfo >* pParamInfoSeq;
// #67781 reference to the previous and the next method in the method list
SbUnoMethod* pPrev;
@@ -168,12 +168,12 @@ class SbUnoMethod : public SbxMethod
public:
TYPEINFO_OVERRIDE();
- SbUnoMethod( const OUString& aName_, SbxDataType eSbxType, ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlMethod > xUnoMethod_,
+ SbUnoMethod( const OUString& aName_, SbxDataType eSbxType, css::uno::Reference< css::reflection::XIdlMethod > xUnoMethod_,
bool bInvocation );
virtual ~SbUnoMethod();
virtual SbxInfo* GetInfo() SAL_OVERRIDE;
- const ::com::sun::star::uno::Sequence< ::com::sun::star::reflection::ParamInfo >& getParamInfos();
+ const css::uno::Sequence< css::reflection::ParamInfo >& getParamInfos();
bool isInvocationBased()
{ return mbInvocation; }
@@ -186,7 +186,7 @@ class SbUnoProperty : public SbxProperty
friend class SbUnoObject;
friend class SbUnoStructRefObject;
- ::com::sun::star::beans::Property aUnoProp;
+ css::beans::Property aUnoProp;
sal_Int32 nId;
bool mbInvocation; // Property is based on invocation
@@ -199,7 +199,7 @@ public:
TYPEINFO_OVERRIDE();
SbUnoProperty( const OUString& aName_, SbxDataType eSbxType, SbxDataType eRealSbxType,
- const ::com::sun::star::beans::Property& aUnoProp_, sal_Int32 nId_, bool bInvocation, bool bUnoStruct );
+ const css::beans::Property& aUnoProp_, sal_Int32 nId_, bool bInvocation, bool bUnoStruct );
bool isUnoStruct() { return mbUnoStruct; }
bool isInvocationBased()
@@ -218,14 +218,14 @@ public:
// wrapper for an uno-class
class SbUnoClass : public SbxObject
{
- const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > m_xClass;
+ const css::uno::Reference< css::reflection::XIdlClass > m_xClass;
public:
TYPEINFO_OVERRIDE();
SbUnoClass( const OUString& aName_ )
: SbxObject( aName_ )
{}
- SbUnoClass( const OUString& aName_, const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass >& xClass_ )
+ SbUnoClass( const OUString& aName_, const css::uno::Reference< css::reflection::XIdlClass >& xClass_ )
: SbxObject( aName_ )
, m_xClass( xClass_ )
{}
@@ -234,7 +234,7 @@ public:
virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE;
- const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass >& getUnoClass() { return m_xClass; }
+ const css::uno::Reference< css::reflection::XIdlClass >& getUnoClass() { return m_xClass; }
};
@@ -247,13 +247,13 @@ SbUnoClass* findUnoClass( const OUString& rName );
// Wrapper for UNO Service
class SbUnoService : public SbxObject
{
- const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XServiceTypeDescription2 > m_xServiceTypeDesc;
+ const css::uno::Reference< css::reflection::XServiceTypeDescription2 > m_xServiceTypeDesc;
bool m_bNeedsInit;
public:
TYPEINFO_OVERRIDE();
SbUnoService( const OUString& aName_,
- const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XServiceTypeDescription2 >& xServiceTypeDesc )
+ const css::uno::Reference< css::reflection::XServiceTypeDescription2 >& xServiceTypeDesc )
: SbxObject( aName_ )
, m_xServiceTypeDesc( xServiceTypeDesc )
, m_bNeedsInit( true )
@@ -274,18 +274,18 @@ class SbUnoServiceCtor : public SbxMethod
friend class SbUnoService;
friend void clearUnoServiceCtors();
- ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XServiceConstructorDescription > m_xServiceCtorDesc;
+ css::uno::Reference< css::reflection::XServiceConstructorDescription > m_xServiceCtorDesc;
SbUnoServiceCtor* pNext;
public:
TYPEINFO_OVERRIDE();
- SbUnoServiceCtor( const OUString& aName_, ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XServiceConstructorDescription > xServiceCtorDesc );
+ SbUnoServiceCtor( const OUString& aName_, css::uno::Reference< css::reflection::XServiceConstructorDescription > xServiceCtorDesc );
virtual ~SbUnoServiceCtor();
virtual SbxInfo* GetInfo() SAL_OVERRIDE;
- ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XServiceConstructorDescription > getServiceCtorDesc()
+ css::uno::Reference< css::reflection::XServiceConstructorDescription > getServiceCtorDesc()
{ return m_xServiceCtorDesc; }
};
@@ -293,12 +293,12 @@ public:
// Wrapper for UNO Singleton
class SbUnoSingleton : public SbxObject
{
- const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XSingletonTypeDescription > m_xSingletonTypeDesc;
+ const css::uno::Reference< css::reflection::XSingletonTypeDescription > m_xSingletonTypeDesc;
public:
TYPEINFO_OVERRIDE();
SbUnoSingleton( const OUString& aName_,
- const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XSingletonTypeDescription >& xSingletonTypeDesc );
+ const css::uno::Reference< css::reflection::XSingletonTypeDescription >& xSingletonTypeDesc );
void Notify( SfxBroadcaster&, const SfxHint& rHint ) SAL_OVERRIDE;
};
@@ -309,15 +309,15 @@ SbUnoSingleton* findUnoSingleton( const OUString& rName );
// #105565 Special Object to wrap a strongly typed Uno Any
class SbUnoAnyObject: public SbxObject
{
- ::com::sun::star::uno::Any mVal;
+ css::uno::Any mVal;
public:
- SbUnoAnyObject( const ::com::sun::star::uno::Any& rVal )
+ SbUnoAnyObject( const css::uno::Any& rVal )
: SbxObject( OUString() )
, mVal( rVal )
{}
- const ::com::sun::star::uno::Any& getValue()
+ const css::uno::Any& getValue()
{ return mVal; }
TYPEINFO_OVERRIDE();
@@ -329,14 +329,14 @@ public:
class AutomationNamedArgsSbxArray : public SbxArray
{
- ::com::sun::star::uno::Sequence< OUString > maNameSeq;
+ css::uno::Sequence< OUString > maNameSeq;
public:
TYPEINFO_OVERRIDE();
AutomationNamedArgsSbxArray( sal_Int32 nSeqSize )
: maNameSeq( nSeqSize )
{}
- ::com::sun::star::uno::Sequence< OUString >& getNames()
+ css::uno::Sequence< OUString >& getNames()
{ return maNameSeq; }
};
@@ -384,7 +384,7 @@ public:
virtual void Clear() SAL_OVERRIDE;
};
-typedef std::unordered_map< OUString, ::com::sun::star::uno::Any, OUStringHash, ::std::equal_to< OUString > > VBAConstantsHash;
+typedef std::unordered_map< OUString, css::uno::Any, OUStringHash, ::std::equal_to< OUString > > VBAConstantsHash;
typedef std::vector< OUString > VBAConstantsVector;
@@ -406,7 +406,7 @@ public:
SbxVariable* getDefaultProp( SbxVariable* pRef );
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createComListener( const ::com::sun::star::uno::Any& aControlAny,
+css::uno::Reference< css::uno::XInterface > createComListener( const css::uno::Any& aControlAny,
const OUString& aVBAType,
const OUString& aPrefix,
SbxObjectRef xScopeObj );
diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx
index dd33cd0..232552c 100644
--- a/basic/source/inc/scriptcont.hxx
+++ b/basic/source/inc/scriptcont.hxx
@@ -33,29 +33,29 @@ namespace basic
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list