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 /stoc/source/tdmanager | |
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 'stoc/source/tdmanager')
-rw-r--r-- | stoc/source/tdmanager/lrucache.hxx | 8 | ||||
-rw-r--r-- | stoc/source/tdmanager/tdmgr.cxx | 6 | ||||
-rw-r--r-- | stoc/source/tdmanager/tdmgr_check.cxx | 2 | ||||
-rw-r--r-- | stoc/source/tdmanager/tdmgr_common.hxx | 6 | ||||
-rw-r--r-- | stoc/source/tdmanager/tdmgr_tdenumeration.cxx | 6 | ||||
-rw-r--r-- | stoc/source/tdmanager/tdmgr_tdenumeration.hxx | 4 |
6 files changed, 14 insertions, 18 deletions
diff --git a/stoc/source/tdmanager/lrucache.hxx b/stoc/source/tdmanager/lrucache.hxx index b7a6895a5808..0ab1712fb793 100644 --- a/stoc/source/tdmanager/lrucache.hxx +++ b/stoc/source/tdmanager/lrucache.hxx @@ -224,16 +224,16 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::clear() } //================================================================================================== -struct FctHashOUString : public ::std::unary_function< ::rtl::OUString const &, size_t > +struct FctHashOUString : public ::std::unary_function< OUString const &, size_t > { - size_t operator()( ::rtl::OUString const & rKey ) const + size_t operator()( OUString const & rKey ) const { return (size_t)rKey.hashCode(); } }; /** Template instance for OUString keys, Any values.<br> */ -typedef LRU_Cache< ::rtl::OUString, ::com::sun::star::uno::Any, - FctHashOUString, ::std::equal_to< ::rtl::OUString > > +typedef LRU_Cache< OUString, ::com::sun::star::uno::Any, + FctHashOUString, ::std::equal_to< OUString > > LRU_CacheAnyByOUString; diff --git a/stoc/source/tdmanager/tdmgr.cxx b/stoc/source/tdmanager/tdmgr.cxx index 458bded2165c..2ac14838d434 100644 --- a/stoc/source/tdmanager/tdmgr.cxx +++ b/stoc/source/tdmanager/tdmgr.cxx @@ -59,8 +59,6 @@ using namespace com::sun::star::reflection; using namespace com::sun::star::container; using namespace com::sun::star::registry; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; static const sal_Int32 CACHE_SIZE = 512; @@ -179,7 +177,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XTypeDescriptionEnumeration > SAL_CALL createTypeDescriptionEnumeration( - const ::rtl::OUString& moduleName, + const OUString& moduleName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::TypeClass >& types, ::com::sun::star::reflection::TypeDescriptionSearchDepth depth ) @@ -1000,7 +998,7 @@ Reference< XTypeDescription > ManagerImpl::getInstantiatedStruct( && name[i] == '>' && !args.empty(); } // args.size() cannot exceed SAL_MAX_INT32, as each argument consumes at - // least one position within an rtl::OUString (which is no longer than + // least one position within an OUString (which is no longer than // SAL_MAX_INT32): if (!good || (args.size() diff --git a/stoc/source/tdmanager/tdmgr_check.cxx b/stoc/source/tdmanager/tdmgr_check.cxx index ff9e763bea1e..2ffb80a32c97 100644 --- a/stoc/source/tdmanager/tdmgr_check.cxx +++ b/stoc/source/tdmanager/tdmgr_check.cxx @@ -33,8 +33,6 @@ #include "com/sun/star/reflection/XSingletonTypeDescription2.hpp" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::stoc_tdmgr; diff --git a/stoc/source/tdmanager/tdmgr_common.hxx b/stoc/source/tdmanager/tdmgr_common.hxx index 33f1a2ad307b..e841f5de5a3a 100644 --- a/stoc/source/tdmanager/tdmgr_common.hxx +++ b/stoc/source/tdmanager/tdmgr_common.hxx @@ -33,15 +33,15 @@ namespace stoc_tdmgr struct IncompatibleTypeException { - ::rtl::OUString m_cause; - IncompatibleTypeException( ::rtl::OUString const & cause ) + OUString m_cause; + IncompatibleTypeException( OUString const & cause ) : m_cause( cause ) {} }; void check( css::uno::Reference<css::reflection::XTypeDescription> const & xNewTD, css::uno::Reference<css::reflection::XTypeDescription> const & xExistingTD, - ::rtl::OUString const & context = ::rtl::OUString() ); + OUString const & context = OUString() ); /* throw (css::uno::RuntimeException, IncompatibleTypeException) */ } // namespace stoc_tdmgr diff --git a/stoc/source/tdmanager/tdmgr_tdenumeration.cxx b/stoc/source/tdmanager/tdmgr_tdenumeration.cxx index ea44a750835e..0cacac0b86e8 100644 --- a/stoc/source/tdmanager/tdmgr_tdenumeration.cxx +++ b/stoc/source/tdmanager/tdmgr_tdenumeration.cxx @@ -37,7 +37,7 @@ namespace stoc_tdmgr //========================================================================= TypeDescriptionEnumerationImpl::TypeDescriptionEnumerationImpl( - const rtl::OUString & rModuleName, + const OUString & rModuleName, const com::sun::star::uno::Sequence< com::sun::star::uno::TypeClass > & rTypes, com::sun::star::reflection::TypeDescriptionSearchDepth eDepth, @@ -88,7 +88,7 @@ uno::Any SAL_CALL TypeDescriptionEnumerationImpl::nextElement() return xEnum->nextElement(); throw container::NoSuchElementException( - rtl::OUString("No further elements in enumeration!"), + OUString("No further elements in enumeration!"), static_cast< cppu::OWeakObject * >( this ) ); } @@ -110,7 +110,7 @@ TypeDescriptionEnumerationImpl::nextTypeDescription() return xEnum->nextTypeDescription(); throw container::NoSuchElementException( - rtl::OUString("No further elements in enumeration!"), + OUString("No further elements in enumeration!"), static_cast< cppu::OWeakObject * >( this ) ); } diff --git a/stoc/source/tdmanager/tdmgr_tdenumeration.hxx b/stoc/source/tdmanager/tdmgr_tdenumeration.hxx index d8ad3ffffb7b..81672ce5c0f8 100644 --- a/stoc/source/tdmanager/tdmgr_tdenumeration.hxx +++ b/stoc/source/tdmanager/tdmgr_tdenumeration.hxx @@ -39,7 +39,7 @@ class TypeDescriptionEnumerationImpl { public: TypeDescriptionEnumerationImpl( - const rtl::OUString & rModuleName, + const OUString & rModuleName, const com::sun::star::uno::Sequence< com::sun::star::uno::TypeClass > & rTypes, com::sun::star::reflection::TypeDescriptionSearchDepth eDepth, @@ -67,7 +67,7 @@ private: queryCurrentChildEnumeration(); osl::Mutex m_aMutex; - rtl::OUString m_aModuleName; + OUString m_aModuleName; com::sun::star::uno::Sequence< com::sun::star::uno::TypeClass > m_aTypes; com::sun::star::reflection::TypeDescriptionSearchDepth m_eDepth; TDEnumerationAccessStack m_aChildren; |