diff options
author | Noel Grandin <noel@peralex.com> | 2015-07-20 09:21:24 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-20 09:39:36 +0000 |
commit | b4ee16da65eab7b50b29dcd42dc0f0be6b97b174 (patch) | |
tree | 81e7d930894f13718f9a36772e55034d660e0cc1 /basic/source/classes | |
parent | c02e79874951ba86d926186e284612806d8bc0a3 (diff) |
com::sun::star->css in basic
Change-Id: I637fd7aedeb97b7dca22521474a54a1d4274f212
Reviewed-on: https://gerrit.libreoffice.org/17206
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'basic/source/classes')
-rw-r--r-- | basic/source/classes/global.cxx | 2 | ||||
-rw-r--r-- | basic/source/classes/propacc.cxx | 28 | ||||
-rw-r--r-- | basic/source/classes/sb.cxx | 2 | ||||
-rw-r--r-- | basic/source/classes/sbunoobj.cxx | 16 | ||||
-rw-r--r-- | basic/source/classes/sbxmod.cxx | 8 |
5 files changed, 28 insertions, 28 deletions
diff --git a/basic/source/classes/global.cxx b/basic/source/classes/global.cxx index f0fa7426eeb3..0c45b282f094 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 677897a97cc3..9f3fc9ea34bc 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 a22330e34b21..dd3cd4215d10 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 00f30ec124b1..5d484a2ca448 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 db0d7ce3673c..c584619b1bf4 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 ) { |