diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /framework/source/fwi | |
parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'framework/source/fwi')
-rw-r--r-- | framework/source/fwi/classes/converter.cxx | 6 | ||||
-rw-r--r-- | framework/source/fwi/classes/propertysethelper.cxx | 18 | ||||
-rw-r--r-- | framework/source/fwi/classes/protocolhandlercache.cxx | 18 | ||||
-rw-r--r-- | framework/source/fwi/helper/mischelper.cxx | 11 | ||||
-rw-r--r-- | framework/source/fwi/helper/networkdomain.cxx | 30 | ||||
-rw-r--r-- | framework/source/fwi/jobs/configaccess.cxx | 2 | ||||
-rw-r--r-- | framework/source/fwi/threadhelp/lockhelper.cxx | 4 |
7 files changed, 44 insertions, 45 deletions
diff --git a/framework/source/fwi/classes/converter.cxx b/framework/source/fwi/classes/converter.cxx index 9083a877084b..87c682a1ddf6 100644 --- a/framework/source/fwi/classes/converter.cxx +++ b/framework/source/fwi/classes/converter.cxx @@ -42,7 +42,7 @@ css::uno::Sequence< css::beans::NamedValue > Converter::convert_seqPropVal2seqNa /** * converts a sequence of unicode strings into a vector of such items */ -OUStringList Converter::convert_seqOUString2OUStringList( const css::uno::Sequence< ::rtl::OUString >& lSource ) +OUStringList Converter::convert_seqOUString2OUStringList( const css::uno::Sequence< OUString >& lSource ) { OUStringList lDestination; sal_Int32 nCount = lSource.getLength(); @@ -55,9 +55,9 @@ OUStringList Converter::convert_seqOUString2OUStringList( const css::uno::Sequen return lDestination; } -::rtl::OUString Converter::convert_DateTime2ISO8601( const DateTime& aSource ) +OUString Converter::convert_DateTime2ISO8601( const DateTime& aSource ) { - ::rtl::OUStringBuffer sBuffer(25); + OUStringBuffer sBuffer(25); sal_Int32 nYear = aSource.GetYear(); sal_Int32 nMonth = aSource.GetMonth(); diff --git a/framework/source/fwi/classes/propertysethelper.cxx b/framework/source/fwi/classes/propertysethelper.cxx index c8bed4010278..7c23fc2b5daa 100644 --- a/framework/source/fwi/classes/propertysethelper.cxx +++ b/framework/source/fwi/classes/propertysethelper.cxx @@ -76,7 +76,7 @@ void SAL_CALL PropertySetHelper::impl_addPropertyInfo(const css::beans::Property } //----------------------------------------------------------------------------- -void SAL_CALL PropertySetHelper::impl_removePropertyInfo(const ::rtl::OUString& sProperty) +void SAL_CALL PropertySetHelper::impl_removePropertyInfo(const OUString& sProperty) throw(css::beans::UnknownPropertyException, css::uno::Exception ) { @@ -184,7 +184,7 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL PropertySetHelper:: } //----------------------------------------------------------------------------- -void SAL_CALL PropertySetHelper::setPropertyValue(const ::rtl::OUString& sProperty, +void SAL_CALL PropertySetHelper::setPropertyValue(const OUString& sProperty, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException , @@ -250,7 +250,7 @@ void SAL_CALL PropertySetHelper::setPropertyValue(const ::rtl::OUString& sProper } //----------------------------------------------------------------------------- -css::uno::Any SAL_CALL PropertySetHelper::getPropertyValue(const ::rtl::OUString& sProperty) +css::uno::Any SAL_CALL PropertySetHelper::getPropertyValue(const OUString& sProperty) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException , css::uno::RuntimeException ) @@ -273,7 +273,7 @@ css::uno::Any SAL_CALL PropertySetHelper::getPropertyValue(const ::rtl::OUString } //----------------------------------------------------------------------------- -void SAL_CALL PropertySetHelper::addPropertyChangeListener(const ::rtl::OUString& sProperty, +void SAL_CALL PropertySetHelper::addPropertyChangeListener(const OUString& sProperty, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException , @@ -295,7 +295,7 @@ void SAL_CALL PropertySetHelper::addPropertyChangeListener(const ::rtl::OUString } //----------------------------------------------------------------------------- -void SAL_CALL PropertySetHelper::removePropertyChangeListener(const ::rtl::OUString& sProperty, +void SAL_CALL PropertySetHelper::removePropertyChangeListener(const OUString& sProperty, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException , @@ -317,7 +317,7 @@ void SAL_CALL PropertySetHelper::removePropertyChangeListener(const ::rtl::OUStr } //----------------------------------------------------------------------------- -void SAL_CALL PropertySetHelper::addVetoableChangeListener(const ::rtl::OUString& sProperty, +void SAL_CALL PropertySetHelper::addVetoableChangeListener(const OUString& sProperty, const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException , @@ -339,7 +339,7 @@ void SAL_CALL PropertySetHelper::addVetoableChangeListener(const ::rtl::OUString } //----------------------------------------------------------------------------- -void SAL_CALL PropertySetHelper::removeVetoableChangeListener(const ::rtl::OUString& sProperty, +void SAL_CALL PropertySetHelper::removeVetoableChangeListener(const OUString& sProperty, const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException , @@ -385,7 +385,7 @@ css::uno::Sequence< css::beans::Property > SAL_CALL PropertySetHelper::getProper } //----------------------------------------------------------------------------- -css::beans::Property SAL_CALL PropertySetHelper::getPropertyByName(const ::rtl::OUString& sName) +css::beans::Property SAL_CALL PropertySetHelper::getPropertyByName(const OUString& sName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException ) { @@ -403,7 +403,7 @@ css::beans::Property SAL_CALL PropertySetHelper::getPropertyByName(const ::rtl:: } //----------------------------------------------------------------------------- -sal_Bool SAL_CALL PropertySetHelper::hasPropertyByName(const ::rtl::OUString& sName) +sal_Bool SAL_CALL PropertySetHelper::hasPropertyByName(const OUString& sName) throw(css::uno::RuntimeException) { TransactionGuard aTransaction(m_rTransactionManager, E_HARDEXCEPTIONS); diff --git a/framework/source/fwi/classes/protocolhandlercache.cxx b/framework/source/fwi/classes/protocolhandlercache.cxx index 22440c3690e8..9b5a4517e2cd 100644 --- a/framework/source/fwi/classes/protocolhandlercache.cxx +++ b/framework/source/fwi/classes/protocolhandlercache.cxx @@ -49,7 +49,7 @@ namespace framework{ @return An iterator which points to the found item inside the hash or PatternHash::end() if no pattern match this given <var>sURL</var>. */ -PatternHash::iterator PatternHash::findPatternKey( const ::rtl::OUString& sURL ) +PatternHash::iterator PatternHash::findPatternKey( const OUString& sURL ) { PatternHash::iterator pItem = this->begin(); while( pItem!=this->end() ) @@ -139,7 +139,7 @@ HandlerCache::~HandlerCache() @descr It frees all used memory. In further implementations (may if we support write access too) it's a good place to flush changes back to the configuration - but not needed yet. */ -sal_Bool HandlerCache::search( const ::rtl::OUString& sURL, ProtocolHandler* pReturn ) const +sal_Bool HandlerCache::search( const OUString& sURL, ProtocolHandler* pReturn ) const { sal_Bool bFound = sal_False; /* SAFE */{ @@ -198,10 +198,10 @@ void HandlerCache::takeOver(HandlerHash* pHandler, PatternHash* pPattern) @param sPackage specifies the package name of the configuration data which should be used */ -HandlerCFGAccess::HandlerCFGAccess( const ::rtl::OUString& sPackage ) +HandlerCFGAccess::HandlerCFGAccess( const OUString& sPackage ) : ConfigItem( sPackage ) { - css::uno::Sequence< ::rtl::OUString > lListenPaths(1); + css::uno::Sequence< OUString > lListenPaths(1); lListenPaths[0] = SETNAME_HANDLER; EnableNotification(lListenPaths); } @@ -223,18 +223,18 @@ void HandlerCFGAccess::read( HandlerHash** ppHandler , PatternHash** ppPattern ) { // list of all uno implementation names without encoding - css::uno::Sequence< ::rtl::OUString > lNames = GetNodeNames( SETNAME_HANDLER, ::utl::CONFIG_NAME_LOCAL_PATH ); + css::uno::Sequence< OUString > lNames = GetNodeNames( SETNAME_HANDLER, ::utl::CONFIG_NAME_LOCAL_PATH ); sal_Int32 nSourceCount = lNames.getLength(); sal_Int32 nTargetCount = nSourceCount; // list of all full qualified path names of configuration entries - css::uno::Sequence< ::rtl::OUString > lFullNames ( nTargetCount ); + css::uno::Sequence< OUString > lFullNames ( nTargetCount ); // expand names to full path names sal_Int32 nSource=0; sal_Int32 nTarget=0; for( nSource=0; nSource<nSourceCount; ++nSource ) { - ::rtl::OUStringBuffer sPath( SETNAME_HANDLER ); + OUStringBuffer sPath( SETNAME_HANDLER ); sPath.append(CFG_PATH_SEPERATOR); sPath.append(lNames[nSource]); sPath.append(CFG_PATH_SEPERATOR); @@ -257,7 +257,7 @@ void HandlerCFGAccess::read( HandlerHash** ppHandler , aHandler.m_sUNOName = ::utl::extractFirstFromConfigurationPath(lNames[nSource]); // unpack all values of this handler - css::uno::Sequence< ::rtl::OUString > lTemp; + css::uno::Sequence< OUString > lTemp; lValues[nTarget] >>= lTemp; aHandler.m_lProtocols = Converter::convert_seqOUString2OUStringList(lTemp); @@ -276,7 +276,7 @@ void HandlerCFGAccess::read( HandlerHash** ppHandler , } //_________________________________________________________________________________________________________________ -void HandlerCFGAccess::Notify(const css::uno::Sequence< rtl::OUString >& /*lPropertyNames*/) +void HandlerCFGAccess::Notify(const css::uno::Sequence< OUString >& /*lPropertyNames*/) { HandlerHash* pHandler = new HandlerHash; PatternHash* pPattern = new PatternHash; diff --git a/framework/source/fwi/helper/mischelper.cxx b/framework/source/fwi/helper/mischelper.cxx index b8a43a8868fb..a9a0684796f3 100644 --- a/framework/source/fwi/helper/mischelper.cxx +++ b/framework/source/fwi/helper/mischelper.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -using ::rtl::OUString; namespace framework @@ -65,16 +64,16 @@ uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGues } -::rtl::OUString RetrieveLabelFromCommand( - const ::rtl::OUString& aCmdURL, +OUString RetrieveLabelFromCommand( + const OUString& aCmdURL, const uno::Reference< uno::XComponentContext >& _xContext, uno::Reference< container::XNameAccess >& _xUICommandLabels, const uno::Reference< frame::XFrame >& _xFrame, - ::rtl::OUString& _rModuleIdentifier, + OUString& _rModuleIdentifier, sal_Bool& _rIni, const sal_Char* _pName) { - ::rtl::OUString aLabel; + OUString aLabel; // Retrieve popup menu labels if ( !_xUICommandLabels.is() ) @@ -109,7 +108,7 @@ uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGues { if ( !aCmdURL.isEmpty() ) { - rtl::OUString aStr; + OUString aStr; Sequence< PropertyValue > aPropSeq; if( _xUICommandLabels->hasByName( aCmdURL ) ) { diff --git a/framework/source/fwi/helper/networkdomain.cxx b/framework/source/fwi/helper/networkdomain.cxx index 07a46429474e..3bf207806758 100644 --- a/framework/source/fwi/helper/networkdomain.cxx +++ b/framework/source/fwi/helper/networkdomain.cxx @@ -38,7 +38,7 @@ static DWORD WINAPI GetUserDomainW_NT( LPWSTR lpBuffer, DWORD nSize ) return GetEnvironmentVariable( TEXT("USERDOMAIN"), lpBuffer, nSize ); } -static rtl::OUString GetUserDomain() +static OUString GetUserDomain() { sal_Unicode aBuffer[256]; DWORD nResult; @@ -46,9 +46,9 @@ static rtl::OUString GetUserDomain() nResult = GetUserDomainW_NT( reinterpret_cast<LPWSTR>(aBuffer), sizeof( aBuffer ) ); if ( nResult > 0 ) - return rtl::OUString( aBuffer ); + return OUString( aBuffer ); else - return rtl::OUString(); + return OUString(); } //_________________________________________________________________________________________________________________ @@ -58,12 +58,12 @@ static rtl::OUString GetUserDomain() namespace framework { -rtl::OUString NetworkDomain::GetYPDomainName() +OUString NetworkDomain::GetYPDomainName() { - return ::rtl::OUString(); + return OUString(); } -rtl::OUString NetworkDomain::GetNTDomainName() +OUString NetworkDomain::GetNTDomainName() { return GetUserDomain(); } @@ -188,18 +188,18 @@ static rtl_uString *getDomainName() namespace framework { -rtl::OUString NetworkDomain::GetYPDomainName() +OUString NetworkDomain::GetYPDomainName() { rtl_uString* pResult = getDomainName(); if ( pResult ) - return rtl::OUString( pResult ); + return OUString( pResult ); else - return rtl::OUString(); + return OUString(); } -rtl::OUString NetworkDomain::GetNTDomainName() +OUString NetworkDomain::GetNTDomainName() { - return ::rtl::OUString(); + return OUString(); } } @@ -213,14 +213,14 @@ rtl::OUString NetworkDomain::GetNTDomainName() namespace framework { -rtl::OUString NetworkDomain::GetYPDomainName() +OUString NetworkDomain::GetYPDomainName() { - return rtl::OUString(); + return OUString(); } -rtl::OUString NetworkDomain::GetNTDomainName() +OUString NetworkDomain::GetNTDomainName() { - return rtl::OUString(); + return OUString(); } } diff --git a/framework/source/fwi/jobs/configaccess.cxx b/framework/source/fwi/jobs/configaccess.cxx index 848c2274f440..695342d3b287 100644 --- a/framework/source/fwi/jobs/configaccess.cxx +++ b/framework/source/fwi/jobs/configaccess.cxx @@ -48,7 +48,7 @@ namespace framework{ force opening of the configuration access in readonly or in read/write mode */ ConfigAccess::ConfigAccess( /*IN*/ const css::uno::Reference< css::uno::XComponentContext >& rxContext, - /*IN*/ const ::rtl::OUString& sRoot ) + /*IN*/ const OUString& sRoot ) : ThreadHelpBase( ) , m_xContext ( rxContext) , m_sRoot ( sRoot ) diff --git a/framework/source/fwi/threadhelp/lockhelper.cxx b/framework/source/fwi/threadhelp/lockhelper.cxx index 12ce3134d059..710c08bc5b74 100644 --- a/framework/source/fwi/threadhelp/lockhelper.cxx +++ b/framework/source/fwi/threadhelp/lockhelper.cxx @@ -499,8 +499,8 @@ ELockType& LockHelper::implts_getLockType() { static ELockType eType = FALLBACK_LOCKTYPE; - ::rtl::OUString aEnvVar( ENVVAR_LOCKTYPE ); - ::rtl::OUString sValue ; + OUString aEnvVar( ENVVAR_LOCKTYPE ); + OUString sValue ; if( osl_getEnvironment( aEnvVar.pData, &sValue.pData ) == osl_Process_E_None ) { eType = (ELockType)(sValue.toInt32()); |