diff options
Diffstat (limited to 'basic')
-rw-r--r-- | basic/source/classes/sbunoobj.cxx | 4 | ||||
-rw-r--r-- | basic/source/runtime/comenumwrapper.cxx | 4 | ||||
-rw-r--r-- | basic/source/runtime/iosys.cxx | 2 | ||||
-rw-r--r-- | basic/source/runtime/methods.cxx | 2 | ||||
-rw-r--r-- | basic/source/uno/dlgcont.cxx | 8 | ||||
-rw-r--r-- | basic/source/uno/namecont.cxx | 6 |
6 files changed, 13 insertions, 13 deletions
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 3f645660f667..c6bb54841288 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -201,7 +201,7 @@ Reference< XHierarchicalNameAccess > getTypeProvider_Impl() if( xContext.is() ) { xContext->getValueByName( - OUString( "/singletons/com.sun.star.reflection.theTypeDescriptionManager" ) ) + "/singletons/com.sun.star.reflection.theTypeDescriptionManager" ) >>= xAccess; OSL_ENSURE( xAccess.is(), "### TypeDescriptionManager singleton not accessible!?" ); } @@ -1726,7 +1726,7 @@ bool checkUnoObjectType(SbUnoObject& rUnoObj, const OUString& rClass) if ( xInv.is() ) { OUString sTypeName; - xInv->getValue( OUString( "$GetTypeName" ) ) >>= sTypeName; + xInv->getValue( "$GetTypeName" ) >>= sTypeName; if ( sTypeName.isEmpty() || sTypeName == "IDispatch" ) { // can't check type, leave it pass diff --git a/basic/source/runtime/comenumwrapper.cxx b/basic/source/runtime/comenumwrapper.cxx index 24e90d960ed1..eefff5d46645 100644 --- a/basic/source/runtime/comenumwrapper.cxx +++ b/basic/source/runtime/comenumwrapper.cxx @@ -31,7 +31,7 @@ sal_Bool SAL_CALL ComEnumerationWrapper::hasMoreElements() if ( m_xInvocation.is() ) { sal_Int32 nLength = 0; - bResult = ( ( m_xInvocation->getValue( OUString("length" ) ) >>= nLength ) && nLength > m_nCurInd ); + bResult = ( ( m_xInvocation->getValue( "length" ) >>= nLength ) && nLength > m_nCurInd ); } } catch(const uno::Exception& ) @@ -55,7 +55,7 @@ uno::Any SAL_CALL ComEnumerationWrapper::nextElement() aArgs[0] <<= m_nCurInd++; - return m_xInvocation->invoke( OUString("item"), + return m_xInvocation->invoke( "item", aArgs, aNamedParamIndex, aNamedParam ); diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index 7958051d207e..e2b978bfa632 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -293,7 +293,7 @@ bool hasUno() { Reference< XUniversalContentBroker > xManager = UniversalContentBroker::create(xContext); - if ( !( xManager->queryContentProvider( OUString("file:///" ) ).is() ) ) + if ( !( xManager->queryContentProvider( "file:///" ).is() ) ) { // No UCB bRetVal = false; diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 6c396ae507db..0a44213f0625 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -3884,7 +3884,7 @@ OUString getObjectTypeName( SbxVariable* pVar ) { try { - xInv->getValue( OUString( "$GetTypeName" ) ) >>= sRet; + xInv->getValue( "$GetTypeName" ) >>= sRet; } catch(const Exception& ) { diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx index 9766d74d1141..be8cd6a113e8 100644 --- a/basic/source/uno/dlgcont.cxx +++ b/basic/source/uno/dlgcont.cxx @@ -384,7 +384,7 @@ Reference< css::resource::XStringResourcePersistence > return xRet; } - xRet = resource::StringResourceWithStorage::create(mxContext, xLibraryStor, bReadOnly, aLocale, OUString(aResourceFileNameBase), aComment); + xRet = resource::StringResourceWithStorage::create(mxContext, xLibraryStor, bReadOnly, aLocale, aResourceFileNameBase, aComment); } else { @@ -392,7 +392,7 @@ Reference< css::resource::XStringResourcePersistence > // TODO: Real handler? Reference< task::XInteractionHandler > xDummyHandler; - xRet = resource::StringResourceWithLocation::create(mxContext, aLocation, bReadOnly, aLocale, OUString(aResourceFileNameBase), aComment, xDummyHandler); + xRet = resource::StringResourceWithLocation::create(mxContext, aLocation, bReadOnly, aLocale, aResourceFileNameBase, aComment, xDummyHandler); } return xRet; @@ -539,7 +539,7 @@ void SfxDialogLibrary::storeResourcesToURL( const OUString& URL, if( m_xStringResourcePersistence.is() ) { m_xStringResourcePersistence->storeToURL - ( URL, OUString(aResourceFileNameBase), aComment, xHandler ); + ( URL, aResourceFileNameBase, aComment, xHandler ); } } @@ -551,7 +551,7 @@ void SfxDialogLibrary::storeResourcesToStorage( const css::uno::Reference< css:: if( m_xStringResourcePersistence.is() ) { m_xStringResourcePersistence->storeToStorage - ( xStorage, OUString(aResourceFileNameBase), aComment ); + ( xStorage, aResourceFileNameBase, aComment ); } } diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 6996ab1e70d1..30f551b5dd66 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -3450,7 +3450,7 @@ Reference< deployment::XPackage > ScriptExtensionIterator::implGetNextUserScript try { Reference< XExtensionManager > xManager = ExtensionManager::get( m_xContext ); - m_aUserPackagesSeq = xManager->getDeployedExtensions(OUString("user"), + m_aUserPackagesSeq = xManager->getDeployedExtensions("user", Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); } @@ -3505,7 +3505,7 @@ Reference< deployment::XPackage > ScriptExtensionIterator::implGetNextSharedScri try { Reference< XExtensionManager > xSharedManager = ExtensionManager::get( m_xContext ); - m_aSharedPackagesSeq = xSharedManager->getDeployedExtensions(OUString("shared"), + m_aSharedPackagesSeq = xSharedManager->getDeployedExtensions("shared", Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); } @@ -3559,7 +3559,7 @@ Reference< deployment::XPackage > ScriptExtensionIterator::implGetNextBundledScr try { Reference< XExtensionManager > xManager = ExtensionManager::get( m_xContext ); - m_aBundledPackagesSeq = xManager->getDeployedExtensions(OUString("bundled"), + m_aBundledPackagesSeq = xManager->getDeployedExtensions("bundled", Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); } |